[jboss-cvs] jboss-seam/examples/wiki/view ...
Christian Bauer
christian at hibernate.org
Sun Mar 18 19:29:19 EDT 2007
User: cbauer
Date: 07/03/18 19:29:19
Modified: examples/wiki/view fileEdit.xhtml
userProfile.xhtml dirEdit.xhtml docEdit.xhtml
docHistory.xhtml dirDisplay.xhtml userPrefs.xhtml
userAccount.xhtml userList.xhtml docDisplay.xhtml
Log:
Cleaned up XHTML
Revision Changes Path
1.6 +4 -4 jboss-seam/examples/wiki/view/fileEdit.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: fileEdit.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/fileEdit.xhtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- fileEdit.xhtml 18 Mar 2007 15:44:36 -0000 1.5
+++ fileEdit.xhtml 18 Mar 2007 23:29:19 -0000 1.6
@@ -9,7 +9,7 @@
xmlns:rich="http://richfaces.ajax4jsf.org/rich"
template="themes/#{globalPrefs.themeName}/template.xhtml">
-<ui:define name="pluginHeaders">
+<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
@@ -21,14 +21,14 @@
</ui:define>
<ui:define name="headerTopRight">
- <ui:include src="plugins/userControl/plugin.xhtml"/>
+ <ui:include src="includes/userControl.xhtml"/>
</ui:define>
<ui:define name="headerBottomLeft"> </ui:define>
<ui:define name="sidebar">
- <ui:include src="plugins/searchControl/plugin.xhtml"/>
- <ui:include src="plugins/mainMenu/plugin.xhtml"/>
+ <ui:include src="includes/searchControl.xhtml"/>
+ <ui:include src="includes/mainMenu.xhtml"/>
</ui:define>
<ui:define name="controlRight">
1.4 +5 -6 jboss-seam/examples/wiki/view/userProfile.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userProfile.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userProfile.xhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- userProfile.xhtml 18 Mar 2007 15:44:36 -0000 1.3
+++ userProfile.xhtml 18 Mar 2007 23:29:19 -0000 1.4
@@ -8,7 +8,7 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{globalPrefs.themeName}/template.xhtml">
-<ui:define name="pluginHeaders">
+<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
@@ -17,20 +17,19 @@
<ui:define name="screenname">Member Profile</ui:define>
<ui:define name="headerTopRight">
- <ui:include src="plugins/userControl/plugin.xhtml"/>
+ <ui:include src="includes/userControl.xhtml"/>
</ui:define>
<ui:define name="headerBottomLeft"> </ui:define>
<ui:define name="sidebar">
- <ui:include src="plugins/searchControl/plugin.xhtml"/>
- <ui:include src="plugins/mainMenu/plugin.xhtml"/>
+ <ui:include src="includes/searchControl.xhtml"/>
+ <ui:include src="includes/mainMenu.xhtml"/>
</ui:define>
<ui:define name="controlLeft">
<s:div rendered="#{userHome.managed}">
- <s:link id="editAccount" styleClass="linkTabActive" action="editAccount"
- rendered="#{s:hasPermission('User', 'edit', userHome.instance)}">Account</s:link>
+ <s:link id="editAccount" styleClass="linkTab" action="editAccount">Account</s:link>
<s:link id="editProfile" styleClass="linkTabActive" action="editProfile">Profile</s:link>
<s:link id="editPreferences" styleClass="linkTab" action="editPreferences">Preferences</s:link>
</s:div>
1.12 +4 -4 jboss-seam/examples/wiki/view/dirEdit.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: dirEdit.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/dirEdit.xhtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- dirEdit.xhtml 18 Mar 2007 19:01:14 -0000 1.11
+++ dirEdit.xhtml 18 Mar 2007 23:29:19 -0000 1.12
@@ -9,7 +9,7 @@
xmlns:rich="http://richfaces.ajax4jsf.org/rich"
template="themes/#{globalPrefs.themeName}/template.xhtml">
-<ui:define name="pluginHeaders">
+<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
@@ -21,14 +21,14 @@
</ui:define>
<ui:define name="headerTopRight">
- <ui:include src="plugins/userControl/plugin.xhtml"/>
+ <ui:include src="includes/userControl.xhtml"/>
</ui:define>
<ui:define name="headerBottomLeft"> </ui:define>
<ui:define name="sidebar">
- <ui:include src="plugins/searchControl/plugin.xhtml"/>
- <ui:include src="plugins/mainMenu/plugin.xhtml"/>
+ <ui:include src="includes/searchControl.xhtml"/>
+ <ui:include src="includes/mainMenu.xhtml"/>
</ui:define>
<ui:define name="controlRight">
1.14 +4 -4 jboss-seam/examples/wiki/view/docEdit.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: docEdit.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docEdit.xhtml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- docEdit.xhtml 18 Mar 2007 19:01:14 -0000 1.13
+++ docEdit.xhtml 18 Mar 2007 23:29:19 -0000 1.14
@@ -11,7 +11,7 @@
xmlns:rich="http://richfaces.ajax4jsf.org/rich"
template="themes/#{globalPrefs.themeName}/template.xhtml">
-<ui:define name="pluginHeaders">
+<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
@@ -23,14 +23,14 @@
</ui:define>
<ui:define name="headerTopRight">
- <ui:include src="plugins/userControl/plugin.xhtml"/>
+ <ui:include src="includes/userControl.xhtml"/>
</ui:define>
<ui:define name="headerBottomLeft"> </ui:define>
<ui:define name="sidebar">
- <ui:include src="plugins/searchControl/plugin.xhtml"/>
- <ui:include src="plugins/mainMenu/plugin.xhtml"/>
+ <ui:include src="includes/searchControl.xhtml"/>
+ <ui:include src="includes/mainMenu.xhtml"/>
</ui:define>
<ui:define name="controlRight">
1.3 +4 -4 jboss-seam/examples/wiki/view/docHistory.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: docHistory.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docHistory.xhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- docHistory.xhtml 18 Mar 2007 15:44:36 -0000 1.2
+++ docHistory.xhtml 18 Mar 2007 23:29:19 -0000 1.3
@@ -8,7 +8,7 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{globalPrefs.themeName}/template.xhtml">
-<ui:define name="pluginHeaders">
+<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
@@ -17,14 +17,14 @@
<ui:define name="screenname">Document History</ui:define>
<ui:define name="headerTopRight">
- <ui:include src="plugins/userControl/plugin.xhtml"/>
+ <ui:include src="includes/userControl.xhtml"/>
</ui:define>
<ui:define name="headerBottomLeft"> </ui:define>
<ui:define name="sidebar">
- <ui:include src="plugins/searchControl/plugin.xhtml"/>
- <ui:include src="plugins/mainMenu/plugin.xhtml"/>
+ <ui:include src="includes/searchControl.xhtml"/>
+ <ui:include src="includes/mainMenu.xhtml"/>
</ui:define>
<ui:define name="controlRight">
1.10 +4 -4 jboss-seam/examples/wiki/view/dirDisplay.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: dirDisplay.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/dirDisplay.xhtml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- dirDisplay.xhtml 18 Mar 2007 15:44:36 -0000 1.9
+++ dirDisplay.xhtml 18 Mar 2007 23:29:19 -0000 1.10
@@ -8,7 +8,7 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{globalPrefs.themeName}/template.xhtml">
-<ui:define name="pluginHeaders">
+<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
@@ -17,14 +17,14 @@
<ui:define name="screenname">Browse Directory</ui:define>
<ui:define name="headerTopRight">
- <ui:include src="plugins/userControl/plugin.xhtml"/>
+ <ui:include src="includes/userControl.xhtml"/>
</ui:define>
<ui:define name="headerBottomLeft"> </ui:define>
<ui:define name="sidebar">
- <ui:include src="plugins/searchControl/plugin.xhtml"/>
- <ui:include src="plugins/mainMenu/plugin.xhtml"/>
+ <ui:include src="includes/searchControl.xhtml"/>
+ <ui:include src="includes/mainMenu.xhtml"/>
</ui:define>
<ui:define name="controlRight">
1.4 +4 -4 jboss-seam/examples/wiki/view/userPrefs.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userPrefs.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userPrefs.xhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- userPrefs.xhtml 18 Mar 2007 15:44:36 -0000 1.3
+++ userPrefs.xhtml 18 Mar 2007 23:29:19 -0000 1.4
@@ -8,7 +8,7 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{globalPrefs.themeName}/template.xhtml">
-<ui:define name="pluginHeaders">
+<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
@@ -17,14 +17,14 @@
<ui:define name="screenname">Member Preferences</ui:define>
<ui:define name="headerTopRight">
- <ui:include src="plugins/userControl/plugin.xhtml"/>
+ <ui:include src="includes/userControl.xhtml"/>
</ui:define>
<ui:define name="headerBottomLeft"> </ui:define>
<ui:define name="sidebar">
- <ui:include src="plugins/searchControl/plugin.xhtml"/>
- <ui:include src="plugins/mainMenu/plugin.xhtml"/>
+ <ui:include src="includes/searchControl.xhtml"/>
+ <ui:include src="includes/mainMenu.xhtml"/>
</ui:define>
<ui:define name="controlLeft">
1.4 +7 -10 jboss-seam/examples/wiki/view/userAccount.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userAccount.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userAccount.xhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- userAccount.xhtml 18 Mar 2007 15:44:36 -0000 1.3
+++ userAccount.xhtml 18 Mar 2007 23:29:19 -0000 1.4
@@ -8,7 +8,7 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{globalPrefs.themeName}/template.xhtml">
-<ui:define name="pluginHeaders">
+<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
@@ -20,24 +20,21 @@
</ui:define>
<ui:define name="headerTopRight">
- <ui:include src="plugins/userControl/plugin.xhtml"/>
+ <ui:include src="includes/userControl.xhtml"/>
</ui:define>
<ui:define name="headerBottomLeft"> </ui:define>
<ui:define name="sidebar">
- <ui:include src="plugins/searchControl/plugin.xhtml"/>
- <ui:include src="plugins/mainMenu/plugin.xhtml"/>
+ <ui:include src="includes/searchControl.xhtml"/>
+ <ui:include src="includes/mainMenu.xhtml"/>
</ui:define>
<ui:define name="controlLeft">
<s:div rendered="#{userHome.managed}">
- <s:link id="editAccount" styleClass="linkTabActive" action="editAccount"
- rendered="#{s:hasPermission('User', 'edit', userHome.instance)}">Account</s:link>
- <s:link id="editProfile" styleClass="linkTab" action="editProfile"
- rendered="#{s:hasPermission('User', 'edit', userHome.instance)}">Profile</s:link>
- <s:link id="editPreferences" styleClass="linkTab" action="editPreferences"
- rendered="#{s:hasPermission('User', 'edit', userHome.instance)}">Preferences</s:link>
+ <s:link id="editAccount" styleClass="linkTabActive" action="editAccount">Account</s:link>
+ <s:link id="editProfile" styleClass="linkTab" action="editProfile">Profile</s:link>
+ <s:link id="editPreferences" styleClass="linkTab" action="editPreferences">Preferences</s:link>
</s:div>
</ui:define>
1.8 +5 -5 jboss-seam/examples/wiki/view/userList.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userList.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userList.xhtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- userList.xhtml 18 Mar 2007 22:02:25 -0000 1.7
+++ userList.xhtml 18 Mar 2007 23:29:19 -0000 1.8
@@ -8,7 +8,7 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{globalPrefs.themeName}/template.xhtml">
-<ui:define name="pluginHeaders">
+<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
@@ -17,14 +17,14 @@
<ui:define name="screenname">Member List</ui:define>
<ui:define name="headerTopRight">
- <ui:include src="plugins/userControl/plugin.xhtml"/>
+ <ui:include src="includes/userControl.xhtml"/>
</ui:define>
<ui:define name="headerBottomLeft"> </ui:define>
<ui:define name="sidebar">
- <ui:include src="plugins/searchControl/plugin.xhtml"/>
- <ui:include src="plugins/mainMenu/plugin.xhtml"/>
+ <ui:include src="includes/searchControl.xhtml"/>
+ <ui:include src="includes/mainMenu.xhtml"/>
</ui:define>
<ui:define name="controlRight">
@@ -204,7 +204,7 @@
</h:column>
<h:column>
- <s:link view="/userAccount.xhtml" value="Edit Account">
+ <s:link view="/userAccount.xhtml" value="Edit">
<f:param name="userId" value="#{u.id}"/>
</s:link>
</h:column>
1.10 +5 -5 jboss-seam/examples/wiki/view/docDisplay.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: docDisplay.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docDisplay.xhtml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- docDisplay.xhtml 18 Mar 2007 19:01:14 -0000 1.9
+++ docDisplay.xhtml 18 Mar 2007 23:29:19 -0000 1.10
@@ -8,7 +8,7 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{globalPrefs.themeName}/template.xhtml">
-<ui:define name="pluginHeaders">
+<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/breadcrumb.css" rel="stylesheet" type="text/css"/>
@@ -18,16 +18,16 @@
<ui:define name="screenname">Display Document</ui:define>
<ui:define name="headerTopRight">
- <ui:include src="plugins/userControl/plugin.xhtml"/>
+ <ui:include src="includes/userControl.xhtml"/>
</ui:define>
<ui:define name="headerBottomLeft">
- <ui:include src="plugins/breadcrumb/plugin.xhtml"/>
+ <ui:include src="includes/breadcrumb.xhtml"/>
</ui:define>
<ui:define name="sidebar">
- <ui:include src="plugins/searchControl/plugin.xhtml"/>
- <ui:include src="plugins/mainMenu/plugin.xhtml"/>
+ <ui:include src="includes/searchControl.xhtml"/>
+ <ui:include src="includes/mainMenu.xhtml"/>
</ui:define>
<ui:define name="controlRight">
More information about the jboss-cvs-commits
mailing list