[jboss-cvs] jboss-seam/examples/wiki/src/etc/WEB-INF ...
Christian Bauer
christian at hibernate.org
Tue Sep 4 05:33:18 EDT 2007
User: cbauer
Date: 07/09/04 05:33:18
Modified: examples/wiki/src/etc/WEB-INF urlrewrite.xml
components.xml pages.xml
Log:
New skin for cellphones
Revision Changes Path
1.7 +10 -2 jboss-seam/examples/wiki/src/etc/WEB-INF/urlrewrite.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: urlrewrite.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/WEB-INF/urlrewrite.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- urlrewrite.xml 31 Aug 2007 13:38:11 -0000 1.6
+++ urlrewrite.xml 4 Sep 2007 09:33:18 -0000 1.7
@@ -10,6 +10,14 @@
-->
<urlrewrite>
+ <!-- Mobile browser -->
+ <rule>
+ <from>.*</from>
+ <condition next="or" name="user-agent">Windows CE</condition>
+ <condition name="user-agent">BlackBerry</condition>
+ <set type="session" name="skin">m</set>
+ </rule>
+
<!-- /123.lace -->
<rule>
<from>^/([0-9]+)\.[a-zA-z]+$</from>
1.24 +3 -1 jboss-seam/examples/wiki/src/etc/WEB-INF/components.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: components.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/WEB-INF/components.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- components.xml 11 Jul 2007 22:44:13 -0000 1.23
+++ components.xml 4 Sep 2007 09:33:18 -0000 1.24
@@ -104,4 +104,6 @@
<factory name="themePath" scope="APPLICATION"
value="#{facesContext.externalContext.request.contextPath}/themes/#{wikiPreferences.themeName}"/>
+ <factory name="skin" scope="SESSION" value="d"/>
+
</components>
1.26 +79 -48 jboss-seam/examples/wiki/src/etc/WEB-INF/pages.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: pages.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/WEB-INF/pages.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- pages.xml 3 Sep 2007 11:09:15 -0000 1.25
+++ pages.xml 4 Sep 2007 09:33:18 -0000 1.26
@@ -12,16 +12,16 @@
<navigation>
<rule if-outcome="docDisplay">
<raise-event type="DocumentHome.init"/>
- <render view-id="/docDisplay.xhtml"/>
+ <render view-id="/docDisplay_#{skin}.xhtml"/>
</rule>
<rule if-outcome="dirDisplay">
<raise-event type="DirectoryHome.init"/>
- <render view-id="/dirDisplay.xhtml"/>
+ <render view-id="/dirDisplay_#{skin}.xhtml"/>
</rule>
</navigation>
</page>
- <page view-id="/docDisplay.xhtml">
+ <page view-id="/docDisplay*">
<param name="documentId" value="#{documentHome.nodeId}"/>
<action execute="#{documentHome.init}"/>
<navigation>
@@ -32,15 +32,14 @@
</navigation>
</page>
- <page view-id="/docHistory.xhtml" no-conversation-view-id="/wiki.xhtml">
- <description>Document History</description>
+ <page view-id="/docHistory*" no-conversation-view-id="/wiki.xhtml">
<param name="nodeId" value="#{nodeHistory.nodeId}"/>
<action execute="#{nodeHistory.init}"/>
<begin-conversation flush-mode="MANUAL" join="true"/>
<navigation>
<rule if-outcome="exit">
<end-conversation before-redirect="true"/>
- <redirect view-id="/docDisplay.xhtml">
+ <redirect view-id="/docDisplay_#{skin}.xhtml">
<param name="documentId" value="#{nodeHistory.currentNode.id}"/>
</redirect>
</rule>
@@ -59,7 +58,7 @@
</redirect>
</rule>
<rule if-outcome="rollback">
- <redirect view-id="/docEdit.xhtml">
+ <redirect view-id="/docEdit_#{skin}.xhtml">
<param name="documentId" value="#{nodeHistory.currentNode.id}"/>
<param name="parentDirectoryId" value="#{nodeHistory.currentNode.parent.id}"/>
</redirect>
@@ -67,8 +66,7 @@
</navigation>
</page>
- <page view-id="/docEdit.xhtml" no-conversation-view-id="/wiki.xhtml">
- <description>#{documentHome.idDefined ? 'Edit Document' : 'Create Document'}</description>
+ <page view-id="/docEdit*" no-conversation-view-id="/wiki.xhtml">
<param name="documentId" value="#{documentHome.nodeId}"/>
<param name="parentDirectoryId" value="#{documentHome.parentDirectoryId}"/>
<action execute="#{documentHome.init}"/>
@@ -81,24 +79,24 @@
</rule>
<rule if-outcome="exitManaged">
<end-conversation before-redirect="true"/>
- <redirect view-id="/docDisplay"/>
+ <redirect view-id="/docDisplay_#{skin}"/>
</rule>
<rule if-outcome="exitUnmanaged">
<end-conversation before-redirect="true"/>
- <redirect view-id="/dirDisplay.xhtml">
+ <redirect view-id="/dirDisplay_#{skin}.xhtml">
<param name="directoryId" value="#{documentHome.parentDirectoryId}"/>
</redirect>
</rule>
<rule if-outcome="removed">
<end-conversation/>
- <redirect view-id="/dirDisplay.xhtml">
+ <redirect view-id="/dirDisplay_#{skin}.xhtml">
<param name="directoryId" value="#{documentHome.parentDirectoryId}"/>
</redirect>
</rule>
</navigation>
</page>
- <page view-id="/dirDisplay.xhtml">
+ <page view-id="/dirDisplay*">
<param name="directoryId" value="#{directoryHome.nodeId}"/>
<action execute="#{directoryHome.init}"/>
<navigation>
@@ -109,8 +107,7 @@
</navigation>
</page>
- <page view-id="/dirEdit.xhtml" no-conversation-view-id="/wiki.xhtml">
- <description>#{directoryHome.idDefined ? 'Edit Directory' : 'Create Directory'}</description>
+ <page view-id="/dirEdit*" no-conversation-view-id="/wiki.xhtml">
<param name="directoryId" value="#{directoryHome.nodeId}"/>
<param name="parentDirectoryId" value="#{directoryHome.parentDirectoryId}"/>
<action execute="#{directoryHome.init}"/>
@@ -123,25 +120,24 @@
</rule>
<rule if-outcome="exitManaged">
<end-conversation before-redirect="true"/>
- <redirect view-id="/dirDisplay"/>
+ <redirect view-id="/dirDisplay_#{skin}.xhtml"/>
</rule>
<rule if-outcome="exitUnmanaged">
<end-conversation before-redirect="true"/>
- <redirect view-id="/dirDisplay.xhtml">
+ <redirect view-id="/dirDisplay_#{skin}.xhtml">
<param name="directoryId" value="#{directoryHome.parentDirectoryId}"/>
</redirect>
</rule>
<rule if-outcome="removed">
<end-conversation/>
- <redirect view-id="/dirDisplay.xhtml">
+ <redirect view-id="/dirDisplay_#{skin}.xhtml">
<param name="directoryId" value="#{directoryHome.parentDirectoryId}"/>
</redirect>
</rule>
</navigation>
</page>
- <page view-id="/fileEdit.xhtml" no-conversation-view-id="/wiki.xhtml">
- <description>#{fileHome.idDefined ? 'Edit File' : 'Create File'}</description>
+ <page view-id="/fileEdit*" no-conversation-view-id="/wiki.xhtml">
<param name="fileId" value="#{fileHome.nodeId}"/>
<param name="parentDirectoryId" value="#{fileHome.parentDirectoryId}"/>
<action execute="#{fileHome.init}"/>
@@ -154,39 +150,36 @@
</rule>
<rule if-outcome="exit">
<end-conversation before-redirect="true"/>
- <redirect view-id="/dirDisplay.xhtml">
+ <redirect view-id="/dirDisplay_#{skin}.xhtml">
<param name="directoryId" value="#{fileHome.parentDirectoryId}"/>
</redirect>
</rule>
<rule if-outcome="removed">
<end-conversation/>
- <redirect view-id="/dirDisplay.xhtml">
+ <redirect view-id="/dirDisplay_#{skin}.xhtml">
<param name="directoryId" value="#{fileHome.parentDirectoryId}"/>
</redirect>
</rule>
</navigation>
</page>
- <page view-id="/search.xhtml">
- <description>Search (Results: #{searchResult.size})</description>
+ <page view-id="/search*">
<param name="query" value="#{wikiSearch.simpleQuery}"/>
<begin-conversation flush-mode="MANUAL" join="true"/>
</page>
- <page view-id="/adminHome.xhtml" no-conversation-view-id="/wiki.xhtml">
- <description>System Administration</description>
+ <page view-id="/adminHome*" no-conversation-view-id="/wiki.xhtml">
<restrict>#{s:hasPermission('User', 'isAdmin', currentUser)}</restrict>
<begin-conversation flush-mode="MANUAL" join="true"/>
</page>
- <page view-id="/userRegister.xhtml" no-conversation-view-id="/wiki.xhtml">
- <description>#{identity.loggedIn ? 'Create Account' : 'Registration'}</description>
+ <page view-id="/userRegister*" no-conversation-view-id="/wiki.xhtml">
<action execute="#{userHome.init}"/>
<begin-conversation flush-mode="MANUAL" join="true"/>
<navigation>
<rule if-outcome="persisted" if="#{s:hasPermission('User', 'isAdmin', currentUser)}">
<end-conversation before-redirect="true"/>
- <redirect view-id="/userHome.xhtml">
+ <redirect view-id="/userHome_#{skin}.xhtml">
<param name="userId" value="#{userHome.userId}"/>
</redirect>
</rule>
@@ -197,8 +190,7 @@
</navigation>
</page>
- <page view-id="/userHome.xhtml" no-conversation-view-id="/wiki.xhtml">
- <description>Managing Account: #{userHome.instance.username}</description>
+ <page view-id="/userHome*" no-conversation-view-id="/wiki.xhtml">
<param name="userId" value="#{userHome.userId}"/>
<action execute="#{userHome.init}"/>
<begin-conversation flush-mode="MANUAL" join="true"/>
@@ -216,8 +208,7 @@
</navigation>
</page>
- <page view-id="/userList.xhtml">
- <description>Member Search (Results: #{userSearch.rowCount})</description>
+ <page view-id="/userList*">
<begin-conversation flush-mode="MANUAL" join="true"/>
</page>
@@ -248,7 +239,7 @@
<!-- 'search' is a POST submit, turn it into a bookmarkable GET -->
<rule if-outcome="search">
- <redirect view-id="/search.xhtml"/>
+ <redirect view-id="/search_#{skin}.xhtml"/>
</rule>
<rule if-outcome="error">
@@ -260,21 +251,61 @@
</page>
- <!-- Mobile browsers get a mini version of the site -->
+ <!-- Page descriptions don't support wildcards -->
+ <page view-id="/docHistory_d.xhtml">
+ <description>Document History</description>
+ </page>
+ <page view-id="/docEdit_d.xhtml">
+ <description>#{documentHome.idDefined ? 'Edit Document' : 'Create Document'}</description>
+ </page>
+ <page view-id="/dirEdit_d.xhtml">
+ <description>#{directoryHome.idDefined ? 'Edit Directory' : 'Create Directory'}</description>
+ </page>
+ <page view-id="/fileEdit_d.xhtml">
+ <description>#{fileHome.idDefined ? 'Edit File' : 'Create File'}</description>
+ </page>
+ <page view-id="/search_d.xhtml">
+ <description>Search (Results: #{wikiSearch.searchResult.size})</description>
+ </page>
+ <page view-id="/adminHome_d.xhtml">
+ <description>System Administration</description>
+ </page>
+ <page view-id="/userRegister_d.xhtml">
+ <description>#{identity.loggedIn ? 'Create Account' : 'Registration'}</description>
+ </page>
+ <page view-id="/userHome_d.xhtml">
+ <description>Managing Account: #{userHome.instance.username}</description>
+ </page>
+ <page view-id="/userList_d.xhtml">
+ <description>Member Search (Results: #{userSearch.rowCount})</description>
+ </page>
- <page view-id="/mobile/wiki.xhtml">
- <param name="nodeId" value="#{wikiRequestResolver.nodeId}"/>
- <action execute="#{wikiRequestResolver.resolve}"/>
- <navigation>
- <rule if-outcome="docDisplay">
- <raise-event type="DocumentHome.init"/>
- <render view-id="/mobile/docDisplay.xhtml"/>
- </rule>
- <rule if-outcome="dirDisplay">
- <raise-event type="DirectoryHome.init"/>
- <render view-id="/mobile/dirDisplay.xhtml"/>
- </rule>
- </navigation>
+ <page view-id="/docHistory_m.xhtml">
+ <description>Document History</description>
+ </page>
+ <page view-id="/docEdit_m.xhtml">
+ <description>#{documentHome.idDefined ? 'Edit Document' : 'Create Document'}</description>
+ </page>
+ <page view-id="/dirEdit_m.xhtml">
+ <description>#{directoryHome.idDefined ? 'Edit Directory' : 'Create Directory'}</description>
+ </page>
+ <page view-id="/fileEdit_m.xhtml">
+ <description>#{fileHome.idDefined ? 'Edit File' : 'Create File'}</description>
+ </page>
+ <page view-id="/search_m.xhtml">
+ <description>Search (Results: #{wikiSearch.searchResult.size})</description>
+ </page>
+ <page view-id="/adminHome_m.xhtml">
+ <description>System Administration</description>
+ </page>
+ <page view-id="/userRegister_m.xhtml">
+ <description>#{identity.loggedIn ? 'Create Account' : 'Registration'}</description>
+ </page>
+ <page view-id="/userHome_m.xhtml">
+ <description>Managing Account: #{userHome.instance.username}</description>
+ </page>
+ <page view-id="/userList_m.xhtml">
+ <description>Member Search (Results: #{userSearch.rowCount})</description>
</page>
More information about the jboss-cvs-commits
mailing list