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

Christian Bauer christian at hibernate.org
Thu Mar 8 12:50:58 EST 2007


  User: cbauer  
  Date: 07/03/08 12:50:58

  Modified:    examples/wiki/view     fileEdit.xhtml dirEdit.xhtml
                        docEdit.xhtml dirDisplay.xhtml
  Log:
  Refactored Node editing framework, work on permission system
  
  Revision  Changes    Path
  1.3       +24 -5     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.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- fileEdit.xhtml	7 Mar 2007 18:37:36 -0000	1.2
  +++ fileEdit.xhtml	8 Mar 2007 17:50:58 -0000	1.3
  @@ -52,11 +52,6 @@
   
                   <s:validateAll>
   
  -                    <div class="entry">
  -                        <div class="label">Directory:</div>
  -                        <div class="output">#{currentDirectory.name}</div>
  -                    </div>
  -
                       <s:decorate>
                           <div class="entry">
                               <div class="label">Name:</div>
  @@ -67,6 +62,30 @@
                           </div>
                       </s:decorate>
   
  +                    <s:div styleClass="entry">
  +                        <div class="label">Writable by:</div>
  +                        <div class="input">
  +                            <h:selectOneMenu value="#{nodePermissions.writableByRole}" tabindex="1">
  +                                <s:selectItems value="#{roles}"
  +                                               var="role"
  +                                               label="Role: #{role.displayName} (Level: #{role.accessLevel})"
  +                                               noSelectionLabel="User: #{authenticatedUser.username}"/>
  +                            </h:selectOneMenu>
  +                        </div>
  +                    </s:div>
  +
  +                    <s:div styleClass="entry">
  +                        <div class="label">Readable by:</div>
  +                        <div class="input">
  +                            <h:selectOneMenu value="#{nodePermissions.readableByRole}" tabindex="2">
  +                                <s:selectItems value="#{roles}"
  +                                               var="role"
  +                                               label="Role: #{role.displayName} (Level: #{role.accessLevel})"
  +                                               noSelectionLabel="User: #{authenticatedUser.username}"/>
  +                            </h:selectOneMenu>
  +                        </div>
  +                    </s:div>
  +
                       <s:div id="details" rendered="#{fileHome.managed}">
   
                           <div class="entry">
  
  
  
  1.9       +33 -5     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.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- dirEdit.xhtml	7 Mar 2007 18:37:36 -0000	1.8
  +++ dirEdit.xhtml	8 Mar 2007 17:50:58 -0000	1.9
  @@ -54,17 +54,20 @@
   
       <s:validateAll>
   
  -        <s:div styleClass="entry" rendered="#{directoryHome.managed and !empty directoryHome.instance.parent}">
  +        <s:div styleClass="entry" rendered="#{!empty directoryHome.parentDirectory}">
               <div class="label">Parent:</div>
               <div class="output">
  -                <h:outputText value="#{directoryHome.instance.parent.name}"/>
  +                <h:outputText value="#{directoryHome.parentDirectory}"/>
               </div>
           </s:div>
   
  -        <s:div styleClass="entry" rendered="#{!directoryHome.managed}">
  -            <div class="label">Parent:</div>
  +        <s:div styleClass="entry" rendered="#{directoryHome.managed}">
  +            <div class="label">Created On:</div>
               <div class="output">
  -                <h:outputText value="#{directoryHome.parentDirectory.name}"/>
  +                <h:outputText value="#{directoryHome.instance.createdOn}">
  +                    <f:convertDateTime type="both"/>
  +                </h:outputText>
  +                (#{directoryHome.instance.createdBy.username})
               </div>
           </s:div>
   
  @@ -78,6 +81,31 @@
               </div>
           </s:decorate>
   
  +
  +        <s:div styleClass="entry">
  +            <div class="label">Writable by:</div>
  +            <div class="input">
  +                <h:selectOneMenu value="#{nodePermissions.writableByRole}" tabindex="1">
  +                    <s:selectItems value="#{roles}"
  +                                   var="role"
  +                                   label="Role: #{role.displayName} (Level: #{role.accessLevel})"
  +                                   noSelectionLabel="User: #{authenticatedUser.username}"/>
  +                </h:selectOneMenu>
  +            </div>
  +        </s:div>
  +
  +        <s:div styleClass="entry">
  +            <div class="label">Readable by:</div>
  +            <div class="input">
  +                <h:selectOneMenu value="#{nodePermissions.readableByRole}" tabindex="2">
  +                    <s:selectItems value="#{roles}"
  +                                   var="role"
  +                                   label="Role: #{role.displayName} (Level: #{role.accessLevel})"
  +                                   noSelectionLabel="User: #{authenticatedUser.username}"/>
  +                </h:selectOneMenu>
  +            </div>
  +        </s:div>
  +
       </s:validateAll>
   
       <s:div styleClass="entry" rendered="#{childNodes.rowCount>0}">
  
  
  
  1.10      +6 -11     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.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- docEdit.xhtml	8 Mar 2007 10:44:15 -0000	1.9
  +++ docEdit.xhtml	8 Mar 2007 17:50:58 -0000	1.10
  @@ -56,11 +56,6 @@
   
                   <s:validateAll>
   
  -                    <div class="entry">
  -                        <div class="label">Directory:</div>
  -                        <div class="output">#{currentDirectory.name}</div>
  -                    </div>
  -
                       <s:div styleClass="entry" rendered="#{documentHome.managed}">
                           <div class="label">Created On:</div>
                           <div class="output">
  @@ -74,8 +69,8 @@
                       <s:div styleClass="entry">
                           <div class="label">Writable by:</div>
                           <div class="input">
  -                            <h:selectOneMenu value="#{documentHome.writableByRole}" tabindex="1">
  -                                <s:selectItems value="#{documentHome.roles}"
  +                            <h:selectOneMenu value="#{nodePermissions.writableByRole}" tabindex="1">
  +                                <s:selectItems value="#{roles}"
                                                  var="role"
                                                  label="Role: #{role.displayName} (Level: #{role.accessLevel})"
                                                  noSelectionLabel="User: #{authenticatedUser.username}"/>
  @@ -86,8 +81,8 @@
                       <s:div styleClass="entry">
                           <div class="label">Readable by:</div>
                           <div class="input">
  -                            <h:selectOneMenu value="#{documentHome.readableByRole}" tabindex="2">
  -                                <s:selectItems value="#{documentHome.roles}"
  +                            <h:selectOneMenu value="#{nodePermissions.readableByRole}" tabindex="2">
  +                                <s:selectItems value="#{roles}"
                                                  var="role"
                                                  label="Role: #{role.displayName} (Level: #{role.accessLevel})"
                                                  noSelectionLabel="User: #{authenticatedUser.username}"/>
  @@ -115,13 +110,13 @@
                           </div>
                       </s:decorate>
   
  -                    <div class="entry">
  +                    <s:div styleClass="entry" rendered="#{documentHome.managed}">
                           <div class="label">&#160;</div>
                           <div class="input">
                               <h:selectBooleanCheckbox value="#{documentHome.minorRevision}" tabindex="3"/>
                               Minor change, don't create a new revision
                           </div>
  -                    </div>
  +                    </s:div>
   
                   </s:validateAll>
   
  
  
  
  1.7       +12 -26    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.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- dirDisplay.xhtml	7 Mar 2007 18:37:36 -0000	1.6
  +++ dirDisplay.xhtml	8 Mar 2007 17:50:58 -0000	1.7
  @@ -43,7 +43,7 @@
       <!-- Virtual root directory -->
       <h:panelGroup rendered="#{empty currentDirectory.parent}">
           <s:link id="createArea"   styleClass="linkNavigation" action="createDir" accesskey="N"><u>N</u>ew Area</s:link>
  -        <s:link id="editArea"     styleClass="linkNavigation" action="editDir" accesskey="E"><u>E</u>dit Area</s:link>
  +        <s:link id="editRoot"     styleClass="linkNavigation" action="editDir" accesskey="E"><u>E</u>dit Wiki Root</s:link>
       </h:panelGroup>
   
   </ui:define>
  @@ -70,19 +70,11 @@
                    rendered="#{!empty currentDirectory.children}"
                    styleClass="datatable"
                    headerClass="regularHeader"
  -                 columnClasses="defaultColumn,tenPercentColumn,tenPercentColumn,twentyPercentColumn,twentyPercentColumn"
  +                 columnClasses="onePercentColumn,defaultColumn,tenPercentColumn,tenPercentColumn,twentyPercentColumn"
                    rowClasses="rowOdd,rowEven"
                    cellpadding="0" cellspacing="0" border="0">
   
  -
           <h:column>
  -            <f:facet name="header">
  -                Name
  -            </f:facet>
  -
  -            <h:panelGroup style="vertical-align:text-top;">
  -
  -
               <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/icon.dir.gif"
                               width="18" height="20"
                               rendered="#{wiki:isDirectory(node)}"/>
  @@ -95,6 +87,12 @@
               <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/#{fileMetaMap[node.contentType].displayIcon}"
                               width="18" height="20"
                               rendered="#{wiki:isFile(node)}"/>
  +        </h:column>
  +
  +        <h:column>
  +            <f:facet name="header">
  +                Name
  +            </f:facet>
   
               <s:span rendered="#{wiki:isDirectory(node)}">
                   <s:link id="browseDirectory" value="#{node.name}" view="/dirDisplay.xhtml" tabindex="2">
  @@ -114,32 +112,20 @@
                   <h:outputText value="(#{node.filename}, #{node.humanReadableFilesize}, #{node.contentType})"/>
               </s:span>
   
  -            </h:panelGroup>
  -            
           </h:column>
   
           <h:column>
               <f:facet name="header">
  -                Readable By
  +                Read Access Level
               </f:facet>
  -            Owner
  +            #{roleMap[node.readAccessLevel].displayName} (Level: #{roleMap[node.readAccessLevel].accessLevel})
           </h:column>
   
           <h:column>
               <f:facet name="header">
  -                Writable By
  +                Write Access Level
               </f:facet>
  -            All
  -        </h:column>
  -
  -        <h:column>
  -            <f:facet name="header">
  -                Created On
  -            </f:facet>
  -            <h:outputText value="#{node.createdOn}">
  -                <f:convertDateTime type="both"/>
  -            </h:outputText>
  -            (#{node.createdBy.username})
  +            #{roleMap[node.writeAccessLevel].displayName} (Level: #{roleMap[node.writeAccessLevel].accessLevel})
           </h:column>
   
           <h:column rendered="#{!empty node.lastModifiedOn and !empty node.lastModifiedBy}">
  
  
  



More information about the jboss-cvs-commits mailing list