[jboss-cvs] JBossBlog SVN: r283 - trunk/resources/WEB-INF.

[jboss-cvs-commits at lists.jboss.org]

Author: adamw
Date: 2008-04-03 06:45:31 -0400 (Thu, 03 Apr 2008)
New Revision: 283

Modified:
   trunk/resources/WEB-INF/pages.xml
Log:


Modified: trunk/resources/WEB-INF/pages.xml
===================================================================
--- trunk/resources/WEB-INF/pages.xml	2008-04-02 09:26:50 UTC (rev 282)
+++ trunk/resources/WEB-INF/pages.xml	2008-04-03 10:45:31 UTC (rev 283)
@@ -5,14 +5,25 @@
        no-conversation-view-id="/home.xhtml"
        login-view-id="/security/login.xhtml">
 
-    <!-- Security -->
+    <!-- Global: security and group mod -->
 
-    <page view-id="*">
+    <page view-id="*" scheme="http">
         <navigation from-action="#{identity.logout}">
             <redirect view-id="/home.xhtml"/>
         </navigation>
+        <navigation from-action="#{groupMod.add}">
+            <begin-conversation nested="true" flush-mode="manual" />
+            <raise-event type="org.jboss.blog.captureView" />
+            <redirect view-id="/manage/group/group_add.xhtml" />
+        </navigation>
+        <navigation from-action="#{groupMod.cancel}">
+            <end-conversation />
+            <raise-event type="org.jboss.blog.restoreView" />
+        </navigation>
     </page>
 
+    <!-- Security -->
+
     <page view-id="/security/login.xhtml" scheme="https">        
         <navigation from-action="#{identity.login}">
             <rule if="#{identity.loggedIn}">
@@ -248,18 +259,6 @@
 
     <!-- Manage groups -->
 
-    <page view-id="*">
-        <navigation from-action="#{groupMod.add}">
-            <begin-conversation nested="true" flush-mode="manual" />
-            <raise-event type="org.jboss.blog.captureView" />
-            <redirect view-id="/manage/group/group_add.xhtml" />
-        </navigation>
-        <navigation from-action="#{groupMod.cancel}">
-            <end-conversation />
-            <raise-event type="org.jboss.blog.restoreView" />
-        </navigation>
-    </page>
-
     <page view-id="/manage/group/group_list.xhtml" login-required="true">
         <restrict>#{identity.hasPermission('management_groups', 'view')}</restrict>
         <param name="id" converterId="groupConverter" value="#{groupMod.group}" />