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

[Christian Bauer]

  User: cbauer  
  Date: 07/12/29 21:33:24

  Modified:    examples/wiki/view/plugins/dirMenu   plugin.xhtml
                        dirMenuItem.xhtml
  Log:
  Complete overhaul of the preferences system
  
  Revision  Changes    Path
  1.7       +26 -43    jboss-seam/examples/wiki/view/plugins/dirMenu/plugin.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: plugin.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/plugins/dirMenu/plugin.xhtml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- plugin.xhtml	12 Oct 2007 16:31:27 -0000	1.6
  +++ plugin.xhtml	30 Dec 2007 02:33:24 -0000	1.7
  @@ -1,4 +1,4 @@
  -<wiki:plugin id="dirMenuPlugin"
  +<wiki:plugin 
           xmlns="http://www.w3.org/1999/xhtml"
           xmlns:ui="http://java.sun.com/jsf/facelets"
           xmlns:h="http://java.sun.com/jsf/html"
  @@ -7,35 +7,20 @@
           xmlns:wiki="http://jboss.com/products/seam/wiki"
           xmlns:s="http://jboss.com/products/seam/taglib">
   
  -    <s:div id="dirMenuPluginDiv"
  -           styleClass="#{showPluginPreferences and !empty dirMenuPreferencesEditor ? 'pluginPreferencesBox box' : 'box'}">
  +    <s:div styleClass="box dirMenu">
   
  -        <s:div id="dirMenuPreferences"
  -              rendered="#{showPluginPreferences and !empty dirMenuPreferencesEditor}">
  -           <div align="center">
  -               <h:message for="dirMenuPreferences" styleClass="pluginPreferencesMessage"/>
  -
  -               <ui:include src="../../includes/pluginPreferencesForm.xhtml">
  -                   <ui:param name="pluginDiv" value="dirMenuPluginDiv"/>
  -                   <ui:param name="pluginPreferencesEditor" value="#{dirMenuPreferencesEditor}"/>
  -               </ui:include>
  -           </div>
  -        </s:div>
  -
  -        <s:div styleClass="dirMenu">
  -
  -            <s:div styleClass="boxHeader" rendered="#{not dirMenuPreferences.showSubscribeIcon}">
  -                <h:outputText value="#{messages['dirMenu.label.Menu']}"/>
  +        <s:div styleClass="boxHeader" rendered="#{not preferences.get('DirMenu', currentMacro).showSubscribeIcon}">
  +            <h:outputText value="#{preferences.get('DirMenu', currentMacro).title}"/>
               </s:div>
   
  -            <h:panelGrid rendered="#{dirMenuPreferences.showSubscribeIcon}"
  +        <h:panelGrid rendered="#{preferences.get('DirMenu', currentMacro).showSubscribeIcon}"
                            columns="2" cellpadding="0" cellspacing="0" border="0"
                            styleClass="boxHeader fullWidth">
   
                   <h:panelGrid rendered="#{not empty currentDirectory.feed}" columns="2" cellpadding="0" cellspacing="0" border="0">
                       <h:outputLink  target="_top"
                                      value="#{facesContext.externalContext.request.contextPath}/servlets/feeds/atom.seam?feedId=#{currentDirectory.feed.id}">
  -                        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.atom.ongrey.gif" width="18" height="18" alt="Atom"/>
  +                    <h:graphicImage value="/themes/#{preferences.get('Wiki', currentMacro).themeName}/img/icon.atom.ongrey.gif" width="18" height="18" alt="Atom"/>
                       </h:outputLink>
                       <h:outputLink  target="_top"
                                      value="#{facesContext.externalContext.request.contextPath}/servlets/feeds/atom.seam?feedId=#{currentDirectory.feed.id}">
  @@ -57,6 +42,4 @@
   
           </s:div>
   
  -    </s:div>
  -
   </wiki:plugin>
  \ No newline at end of file
  
  
  
  1.4       +2 -12     jboss-seam/examples/wiki/view/plugins/dirMenu/dirMenuItem.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: dirMenuItem.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/plugins/dirMenu/dirMenuItem.xhtml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- dirMenuItem.xhtml	19 Dec 2007 04:29:34 -0000	1.3
  +++ dirMenuItem.xhtml	30 Dec 2007 02:33:24 -0000	1.4
  @@ -16,18 +16,8 @@
                   <h:outputText value="&#183;"/>
   
                   <s:span>
  -                    <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.dir.gif"
  -                                    width="18" height="20"
  -                                    rendered="#{wiki:isDirectory(childWrapper.wrappedNode)}"/>
  -                    <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.doc.gif"
  -                                    width="18" height="20"
  -                                    rendered="#{wiki:isDocument(childWrapper.wrappedNode)}"/>
  -                    <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{uploadTypes[childWrapper.wrappedNode.contentType].displayIcon}"
  -                                    width="18" height="20"
  -                                    rendered="#{wiki:isFile(childWrapper.wrappedNode) and !empty uploadTypes[childWrapper.wrappedNode.contentType]}"/>
  -                    <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{uploadTypes['generic'].displayIcon}"
  -                                    width="18" height="20"
  -                                    rendered="#{wiki:isFile(childWrapper.wrappedNode) and empty uploadTypes[childWrapper.wrappedNode.contentType]}"/>
  +                    <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.dir.gif"
  +                                    width="18" height="20"/>
                   </s:span>
   
                   <h:outputLink styleClass="level#{childWrapper.level}Link" target="_top"