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

[Christian Bauer]

  User: cbauer  
  Date: 07/04/08 11:10:35

  Modified:    examples/wiki/view    dirDisplay.xhtml dirEdit.xhtml
                        docEdit.xhtml
  Log:
  Implemented Atom feeds for site and directories
  
  Revision  Changes    Path
  1.14      +12 -1     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.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- dirDisplay.xhtml	4 Apr 2007 10:38:11 -0000	1.13
  +++ dirDisplay.xhtml	8 Apr 2007 15:10:35 -0000	1.14
  @@ -41,6 +41,12 @@
   
           <s:link id="uploadFile" styleClass="linkNavigation" action="uploadFile" accesskey="U"
                   rendered="#{s:hasPermission('Node', 'create', currentDirectory)}"><u>U</u>pload File</s:link>
  +
  +        <h:outputLink styleClass="linkNavigation" rendered="#{not empty currentDirectory.feed}"
  +                      value="#{facesContext.externalContext.request.contextPath}/servlets/feeds/atom.seam?feedId=#{currentDirectory.feed.id}">
  +            Subscribe
  +        </h:outputLink>
  +
       </h:panelGroup>
   
       <h:panelGroup rendered="#{empty currentDirectory.parent}">
  @@ -49,6 +55,11 @@
   
           <s:link id="editRoot"     styleClass="linkNavigation" action="editDir" accesskey="E"
                   rendered="#{s:hasPermission('Node', 'edit', currentDirectory)}"><u>E</u>dit Wiki Root</s:link>
  +
  +        <h:outputLink styleClass="linkNavigation" rendered="#{not empty currentDirectory.feed}"
  +                      value="#{facesContext.externalContext.request.contextPath}/servlets/feeds/atom.seam?feedId=#{currentDirectory.feed.id}">
  +            Subscribe
  +        </h:outputLink>
       </h:panelGroup>
   </ui:define>
   
  @@ -141,7 +152,7 @@
               <f:facet name="header">
                   Owner
               </f:facet>
  -            #{node.createdBy.firstname} #{node.createdBy.lastname}
  +            #{node.createdBy.fullname}
           </h:column>
   
           <h:column>
  
  
  
  1.17      +9 -2      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.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- dirEdit.xhtml	4 Apr 2007 10:38:11 -0000	1.16
  +++ dirEdit.xhtml	8 Apr 2007 15:10:35 -0000	1.17
  @@ -95,6 +95,14 @@
           </div>
       </s:div>
   
  +    <s:div styleClass="entry">
  +        <div class="label">&#160;</div>
  +        <div class="input">
  +            <h:selectBooleanCheckbox value="#{directoryHome.hasFeed}" tabindex="2"/>
  +            Enable syndication feed
  +        </div>
  +    </s:div>
  +
       <s:div styleClass="entry"
              rendered="#{childNodes.rowCount>0 and s:hasPermission('Node', 'editMenu', directoryHome.instance)}">
           <div class="label">Menu items:</div>
  @@ -176,8 +184,7 @@
   
               <h:outputLink id="delete" value="javascript:Richfaces.showModalPanel('deleteConfirmation',{})"
                             rendered="#{directoryHome.managed
  -                                     and !empty directoryHome.instance.parent
  -                                     and empty directoryHome.instance.children}"
  +                                     and !empty directoryHome.instance.parent}"
                             tabindex="8" accesskey="D" styleClass="button"><span class="buttonLabel"><u>D</u>elete</span></h:outputLink>
           </div>
       </div>
  
  
  
  1.21      +1 -1      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.20
  retrieving revision 1.21
  diff -u -b -r1.20 -r1.21
  --- docEdit.xhtml	4 Apr 2007 10:38:11 -0000	1.20
  +++ docEdit.xhtml	8 Apr 2007 15:10:35 -0000	1.21
  @@ -171,7 +171,7 @@
                                      tabindex="5" accesskey="U" styleClass="button"><span class="buttonLabel"><u>U</u>pdate</span></h:commandLink>
   
                           <h:outputLink id="delete" value="javascript:Richfaces.showModalPanel('deleteConfirmation',{})"
  -                                      rendered="#{documentHome.managed}"
  +                                      rendered="#{documentHome.managed and documentHome.instance.id != wikiStart.id}"
                                         tabindex="7" accesskey="D" styleClass="button"><span class="buttonLabel"><u>D</u>elete</span></h:outputLink>
   
                       </div>