svn commit: r538719 - in /myfaces/tobago/trunk: example/demo/src/main/webapp/WEB-INF/tags/layout/ example/demo/src/main/webapp/icon/ example/demo/src/main/webapp/reference/ theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarbo...

[bo...@apache.org]

Author: bommel
Date: Wed May 16 13:31:28 2007
New Revision: 538719

URL: http://svn.apache.org/viewvc?view=rev&rev=538719
Log:
favicon for demo
added possible todo in gridlayoutrenderer

Added:
    myfaces/tobago/trunk/example/demo/src/main/webapp/icon/
    myfaces/tobago/trunk/example/demo/src/main/webapp/icon/favicon.ico   (with props)
Modified:
    myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag
    myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tag-viewer.jsp
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java

Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag?view=diff&rev=538719&r1=538718&r2=538719
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag Wed May 16 13:31:28 2007
@@ -19,7 +19,7 @@
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
 <f:view locale="#{clientConfigController.locale}">
   <tc:loadBundle basename="overview" var="overviewBundle"/>
-  <tc:page label="#{overviewBundle.pageTitle}" id="page" width="800px" height="600px">
+  <tc:page applicationIcon="icon/favicon.ico" label="#{overviewBundle.pageTitle}" id="page" width="800px" height="600px">
 
     <jsp:include page="/menu.jsp" />
     <%--f:facet name="backButtonDetector">

Added: myfaces/tobago/trunk/example/demo/src/main/webapp/icon/favicon.ico
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/icon/favicon.ico?view=auto&rev=538719
==============================================================================
Binary file - no diff available.

Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/icon/favicon.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tag-viewer.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tag-viewer.jsp?view=diff&rev=538719&r1=538718&r2=538719
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tag-viewer.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tag-viewer.jsp Wed May 16 13:31:28 2007
@@ -21,7 +21,7 @@
 
 <f:view>
 
-  <tc:page label="Tag Viewer" id="page"
+  <tc:page applicationIcon="icon/favicon.ico" label="Tag Viewer" id="page"
            width="1000px" height="500px">
     <f:facet name="layout">
       <tc:gridLayout columns="*;*;2*" margin="5px"/>

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java?view=diff&rev=538719&r1=538718&r2=538719
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java Wed May 16 13:31:28 2007
@@ -100,7 +100,9 @@
           + " for all " + rows.size() + " rows of "
           + layout.getClientId(facesContext) + " !");
     }
-    layoutTokens.ensureSize(rows.size(), new RelativeLayoutToken(1)); //new FixedLayoutToken() );
+    layoutTokens.ensureSize(rows.size(), new RelativeLayoutToken(1));
+    // TODO alternative? rows.size() == 1 ? new RelativeLayoutToken(1) : new FixedLayoutToken()
+    //new FixedLayoutToken() );
     //String[] layoutTokens
     //    = LayoutInfo.createLayoutTokens(rowLayout, rows.size(),
     //        minimum ? "minimum" : "fixed");