myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r926405 - in /myfaces/tomahawk/trunk/examples/simple20/src/main/webapp: ./ META-INF/templates/ resources/css/
Date Mon, 22 Mar 2010 23:51:44 GMT
Author: lu4242
Date: Mon Mar 22 23:51:44 2010
New Revision: 926405

URL: http://svn.apache.org/viewvc?rev=926405&view=rev
Log:
small fix on schedule example

Added:
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/footer.xhtml
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/mbean_source.xhtml
Modified:
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/template.xhtml
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/resources/css/basic.css
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule1.xhtml
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule2.xhtml
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule3.xhtml
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule4.xhtml
    myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule5.xhtml

Added: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/footer.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/footer.xhtml?rev=926405&view=auto
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/footer.xhtml
(added)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/footer.xhtml
Mon Mar 22 23:51:44 2010
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+        xmlns:f="http://java.sun.com/jsf/core"
+        xmlns:h="http://java.sun.com/jsf/html"
+        xmlns:ui="http://java.sun.com/jsf/facelets"
+        xmlns:t="http://myfaces.apache.org/tomahawk">
+<body>
+<ui:composition>
+  <br/>
+  <br/>
+  <a href="home.jsf">[HOME]</a>
+  &nbsp;
+  <a href="#{request.requestURI}.source">[SOURCE]</a>
+</ui:composition>
+</body>
+</html>
\ No newline at end of file

Added: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/mbean_source.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/mbean_source.xhtml?rev=926405&view=auto
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/mbean_source.xhtml
(added)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/mbean_source.xhtml
Mon Mar 22 23:51:44 2010
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+        xmlns:f="http://java.sun.com/jsf/core"
+        xmlns:h="http://java.sun.com/jsf/html"
+        xmlns:ui="http://java.sun.com/jsf/facelets"
+        xmlns:t="http://myfaces.apache.org/tomahawk">
+<body>
+<ui:composition>
+  <br/>
+  <br/>
+  
+  <t:dataList value="#{accessedBeans.beanList}" var="accessedBean" layout="unorderedList">
+          <h:outputText value="Usage of bean with name : "/>
+          <h:outputText value="#{accessedBean.name}"/>
+          <h:outputText value=" and class : "/>
+          <h:outputText value="#{accessedBean.clazz}"/>
+  </t:dataList>
+</ui:composition>
+</body>
+</html>
\ No newline at end of file

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/template.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/template.xhtml?rev=926405&r1=926404&r2=926405&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/template.xhtml
(original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/META-INF/templates/template.xhtml
Mon Mar 22 23:51:44 2010
@@ -15,22 +15,10 @@
 <h:body>
 <ui:insert name="body"/>
 <ui:insert name="mbean_source">
-  <br/>
-  <br/>
-  
-  <t:dataList value="#{accessedBeans.beanList}" var="accessedBean" layout="unorderedList">
-          <h:outputText value="Usage of bean with name : "/>
-          <h:outputText value="#{accessedBean.name}"/>
-          <h:outputText value=" and class : "/>
-          <h:outputText value="#{accessedBean.clazz}"/>
-  </t:dataList>
+    <ui:include src="/META-INF/templates/mbean_source.xhtml"/>
 </ui:insert>
 <ui:insert name="footer">
-  <br/>
-  <br/>
-  <a href="home.jsf">[HOME]</a>
-  &nbsp;
-  <a href="#{request.requestURI}.source">[SOURCE]</a>
-  </ui:insert>
+    <ui:include src="/META-INF/templates/footer.xhtml"/>
+</ui:insert>
 </h:body>
 </html>
\ No newline at end of file

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/resources/css/basic.css
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/resources/css/basic.css?rev=926405&r1=926404&r2=926405&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/resources/css/basic.css (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/resources/css/basic.css Mon Mar
22 23:51:44 2010
@@ -644,27 +644,3 @@ background-color: #EAF4F4;
     }
 
     */
-table.background td.evenReddish,
-table.background td.unevenReddish,
-table.background td.freeReddish {
-    font-family: Verdana, Arial, Helvetica, Sans-Serif;
-    font-size: 10px;
-    text-align: center;
-}
-
-table.background td.unevenReddish {
-    background-color: rgb(240,220,220);
-    color: rgb(230,220,220);
-}
-
-table.background td.evenReddish {
-    background-color: rgb(255,230,230);
-    color: rgb(240,230,230);
-}
-
-table.background td.freeReddish {
-	background-color: rgb(255,0,0);
-	color: rgb(255,0,0);
-}
-
-.test { color: red }

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule1.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule1.xhtml?rev=926405&r1=926404&r2=926405&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule1.xhtml (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule1.xhtml Mon Mar 22 23:51:44
2010
@@ -37,6 +37,7 @@
 				workingEndHour="17" workingStartHour="9" readonly="false"
 				theme="evolution" tooltip="true"/>
 		</t:div>
+  
 		<!--  The column on the left, containing the calendar and other controls -->
 		<t:div style="position: absolute; left: 5px; top: 5px; width: 210px; overflow: auto">
 			<h:panelGrid columns="1">
@@ -49,9 +50,14 @@
 					actionListener="#{scheduleHandler1.addSampleHoliday}"
 					value="add sample holiday" />
 			</h:panelGrid>
+
+            <ui:include src="/META-INF/templates/mbean_source.xhtml"/>
+            <ui:include src="/META-INF/templates/footer.xhtml"/>
 		</t:div>
 	</h:form>
   </ui:define>
+<ui:define name="mbean_source"></ui:define>
+<ui:define name="footer"></ui:define>
  </ui:composition>
 </body>
 </html>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule2.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule2.xhtml?rev=926405&r1=926404&r2=926405&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule2.xhtml (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule2.xhtml Mon Mar 22 23:51:44
2010
@@ -50,9 +50,14 @@
 					value="delete selected entry"
 					rendered="#{scheduleHandler1.model.entrySelected}"/>
 			</h:panelGrid>
+
+            <ui:include src="/META-INF/templates/mbean_source.xhtml"/>
+            <ui:include src="/META-INF/templates/footer.xhtml"/>
 		</t:div>
 	</h:form>
   </ui:define>
+  <ui:define name="mbean_source"></ui:define>
+  <ui:define name="footer"></ui:define>
  </ui:composition>
 </body>
 </html>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule3.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule3.xhtml?rev=926405&r1=926404&r2=926405&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule3.xhtml (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule3.xhtml Mon Mar 22 23:51:44
2010
@@ -62,9 +62,14 @@
 					action="edit_settings"
 					value="Schedule properties..." />
 			</h:panelGrid>
+
+            <ui:include src="/META-INF/templates/mbean_source.xhtml"/>
+            <ui:include src="/META-INF/templates/footer.xhtml"/>
 		</t:div>
 	</h:form>
   </ui:define>
+  <ui:define name="mbean_source"></ui:define>
+  <ui:define name="footer"></ui:define>
  </ui:composition>
 </body>
 </html>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule4.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule4.xhtml?rev=926405&r1=926404&r2=926405&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule4.xhtml (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule4.xhtml Mon Mar 22 23:51:44
2010
@@ -28,6 +28,32 @@
 //-->
 <body>
  <ui:composition template="/META-INF/templates/template.xhtml">
+  <ui:define name="head">
+<style>
+table.background td.evenReddish,
+table.background td.unevenReddish,
+table.background td.freeReddish {
+    font-family: Verdana, Arial, Helvetica, Sans-Serif;
+    font-size: 10px;
+    text-align: center;
+}
+
+table.background td.unevenReddish {
+    background-color: rgb(240,220,220);
+    color: rgb(230,220,220);
+}
+
+table.background td.evenReddish {
+    background-color: rgb(255,230,230);
+    color: rgb(240,230,230);
+}
+
+table.background td.freeReddish {
+    background-color: rgb(255,0,0);
+    color: rgb(255,0,0);
+}
+  </style>  
+  </ui:define>
   <ui:define name="body">
 	<h:form>
 		<!--  The schedule itself -->
@@ -51,9 +77,14 @@
 					actionListener="#{scheduleHandler1.addSampleHoliday}"
 					value="add sample holiday" />
 			</h:panelGrid>
+
+            <ui:include src="/META-INF/templates/mbean_source.xhtml"/>
+            <ui:include src="/META-INF/templates/footer.xhtml"/>
 		</t:div>
 	</h:form>
   </ui:define>
+  <ui:define name="mbean_source"></ui:define>
+  <ui:define name="footer"></ui:define>
  </ui:composition>
 </body>
 </html>

Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule5.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule5.xhtml?rev=926405&r1=926404&r2=926405&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule5.xhtml (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/schedule5.xhtml Mon Mar 22 23:51:44
2010
@@ -63,9 +63,14 @@
 					actionListener="#{bindingScheduleHandler.addSampleHoliday}"
 					value="add sample holiday" />
 			</h:panelGrid>
+
+            <ui:include src="/META-INF/templates/mbean_source.xhtml"/>
+            <ui:include src="/META-INF/templates/footer.xhtml"/>
 		</t:div>
 	</h:form>
   </ui:define>
+  <ui:define name="mbean_source"></ui:define>
+  <ui:define name="footer"></ui:define>
  </ui:composition>
 </body>
 </html>



Mime
View raw message