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

[Christian Bauer]

  User: cbauer  
  Date: 07/08/25 13:59:24

  Modified:    examples/wiki/view/themes/default  template.xhtml
  Log:
  Major refactoring of navigation
  
  Revision  Changes    Path
  1.32      +20 -12    jboss-seam/examples/wiki/view/themes/default/template.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: template.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/themes/default/template.xhtml,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -b -r1.31 -r1.32
  --- template.xhtml	17 Aug 2007 13:00:28 -0000	1.31
  +++ template.xhtml	25 Aug 2007 17:59:24 -0000	1.32
  @@ -235,21 +235,32 @@
   
       <s:div id="sidebar">
   
  +        <ui:decorate template="../../includes/mainMenu.xhtml">
  +            <ui:define name="mainMenuHeader">
           <ui:include src="../../includes/searchControl.xhtml"/>
  -
  -        <ui:insert name="sidebar"/>
  -
  -        <ui:include src="../../includes/mainMenu.xhtml"/>
  -
  +            </ui:define>
  +            <ui:define name="mainMenuFooter">
           <s:div styleClass="feeds">
               <h:outputLink value="#{facesContext.externalContext.request.contextPath}/servlets/feeds/atom.seam?feedId=#{wikiRoot.feed.id}">
                   <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.atom.gif" width="18" height="18"/>
                   <span class="feedText">Subscribe to site</span>
               </h:outputLink>
           </s:div>
  +            </ui:define>
  +        </ui:decorate>
  +
  +        <ui:insert name="sidebar"/>
  +
       </s:div>
   
       <s:div id="body">
  +        <h:form id="workspaceBreadcrumb" rendered="#{false and wiki:sizeOf(conversationList) > 0}">
  +            <h:outputText styleClass="workspaceBreadcrumbLabel" value="Workspace"/>
  +            <ui:repeat value="#{conversationStack}" var="entry">
  +                <h:outputText styleClass="workspaceBreadcrumbSeparator" value=">"/>
  +                <h:commandLink styleClass="workspaceBreadcrumbLink" value="#{entry.description}" action="#{entry.select}"/>
  +            </ui:repeat>
  +        </h:form>
   
           <s:div id="messageBoxContainer"><j4j:idProxy id="messageBoxContainer_"/>
           <s:div styleClass="shadowContainer" rendered="#{!empty facesMessages.currentGlobalMessages}"><div class="shadow1"><div class="shadow2">
  @@ -306,9 +317,6 @@
           </div>
       </div>
   
  -    <!-- Remove this to disable Facelets JSF debugging -->
  -    <ui:debug hotkey="D"/>
  -
   </s:div>
   
   </body>