[jboss-cvs] jboss-seam/examples/wiki/view ...

[Christian Bauer]

  User: cbauer  
  Date: 07/04/22 15:19:29

  Modified:    examples/wiki/view    userHome.xhtml userRegister.xhtml
                        userList.xhtml
  Log:
  Added feature: Manual account creation (for admins)
  
  Revision  Changes    Path
  1.4       +1 -1      jboss-seam/examples/wiki/view/userHome.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: userHome.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userHome.xhtml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- userHome.xhtml	21 Apr 2007 08:13:50 -0000	1.3
  +++ userHome.xhtml	22 Apr 2007 19:19:29 -0000	1.4
  @@ -180,7 +180,7 @@
                                  action="#{userHome.update}"
                                  tabindex="9" accesskey="U"><span class="buttonLabel"><u>U</u>pdate</span></h:commandLink>
   
  -                <h:outputLink id="delete" value="javascript:Richfaces.showModalPanel('deleteConfirmation',{})"
  +                <h:outputLink id="delete" value="javascript:Richfaces.showModalPanel('deleteConfirmation',{width:375, height:125})"
                                 rendered="#{s:hasPermission('User', 'delete', userHome.instance)}"
                                 tabindex="9" accesskey="D" styleClass="button"><span class="buttonLabel"><u>D</u>elete</span></h:outputLink>
   
  
  
  
  1.3       +22 -14    jboss-seam/examples/wiki/view/userRegister.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: userRegister.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userRegister.xhtml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- userRegister.xhtml	21 Apr 2007 08:13:50 -0000	1.2
  +++ userRegister.xhtml	22 Apr 2007 19:19:29 -0000	1.3
  @@ -40,7 +40,10 @@
   
   <h:form>
       <div class="form">
  -        <div class="formHead">Register a new account</div>
  +        <div class="formHead">
  +            <h:outputText rendered="#{not s:hasPermission('User', 'isAdmin', currentUser)}" value="Register new account"/>
  +            <h:outputText rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}" value="Create new account"/>
  +        </div>
   
           <div class="formFields formBorder wideLabels">
               <s:validateAll>
  @@ -117,6 +120,7 @@
                       </div>
                   </s:decorate>
   
  +                <s:div rendered="#{not s:hasPermission('User', 'isAdmin', currentUser)}">
                   <s:div styleClass="entry">
                       <div class="label">Verification question:</div>
                       <div class="output">
  @@ -132,6 +136,7 @@
                           </div>
                       </s:div>
                   </s:decorate>
  +                </s:div>
   
               </s:validateAll>
   
  @@ -143,10 +148,13 @@
                   <div class="label">&#160;</div>
                   <div class="input">
   
  -                    <h:commandLink id="register" styleClass="button"
  +                    <h:commandLink id="register" styleClass="button" rendered="#{not s:hasPermission('User', 'isAdmin', currentUser)}"
                                      action="#{userHome.persist}"
                                      tabindex="8" accesskey="G"><span class="buttonLabel">Re<u>g</u>ister</span></h:commandLink>
   
  +                    <h:commandLink id="create" styleClass="button" rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}"
  +                                   action="#{userHome.persist}"
  +                                   tabindex="8" accesskey="C"><span class="buttonLabel"><u>C</u>reate Account</span></h:commandLink>
                   </div>
               </div>
   
  
  
  
  1.14      +7 -2      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.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- userList.xhtml	21 Apr 2007 19:58:01 -0000	1.13
  +++ userList.xhtml	22 Apr 2007 19:19:29 -0000	1.14
  @@ -28,6 +28,11 @@
   </ui:define>
   
   <ui:define name="controlRight">
  +    <s:link id="createUser" styleClass="linkNavigation" action="createUser" accesskey="C"
  +            rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}" propagation="none">
  +        <f:param name="lastConversationId" value="#{conversation.id}"/>
  +        <u>C</u>reate Account</s:link>
  +
       <s:link id="exit" styleClass="linkNavigation"
               action="#{browser.exitConversation(true)}"
               accesskey="E"><u>E</u>xit</s:link>
  @@ -75,8 +80,8 @@
                       <h:outputLabel styleClass="label" for="pageSize">Show:</h:outputLabel>&#160;
                       <h:selectOneMenu value="#{userSearch.pageSize}" id="pageSize" tabindex="5" style="font-size:100%">
                           <f:selectItem itemLabel="5" itemValue="5"/>
  -                        <f:selectItem itemLabel="15" itemValue="10"/>
  -                        <f:selectItem itemLabel="50" itemValue="20"/>
  +                        <f:selectItem itemLabel="15" itemValue="15"/>
  +                        <f:selectItem itemLabel="50" itemValue="50"/>
                       </h:selectOneMenu>
                   </h:panelGroup>