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

[Christian Bauer]

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

  Modified:    examples/wiki/view/plugins/tags  plugin.xhtml
  Log:
  Complete overhaul of the preferences system
  
  Revision  Changes    Path
  1.2       +8 -3      jboss-seam/examples/wiki/view/plugins/tags/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/tags/plugin.xhtml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- plugin.xhtml	12 Oct 2007 16:31:27 -0000	1.1
  +++ plugin.xhtml	30 Dec 2007 02:33:28 -0000	1.2
  @@ -1,4 +1,4 @@
  -<wiki:plugin id="tagsPlugin"
  +<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"
  @@ -19,9 +19,14 @@
                            columnClasses="defaultColumn, onePercentColumn"
                            cellpadding="0" cellspacing="0" border="0">
                   <h:column>
  -                    <s:span rendered="#{param.tag != tagCount.tag}" styleClass="undecoratedLink">
  +                    <s:span rendered="#{param.tag != tagCount.tag and preferences.get('Tags', currentMacro).linkToCurrentDocument}" styleClass="undecoratedLink">
                           <h:outputLink value="#{wiki:renderURL(currentDocument)}/Tag/#{wiki:encodeURL(tagCount.tag)}">#{tagCount.tag}</h:outputLink>
                       </s:span>
  +                    <s:span rendered="#{param.tag != tagCount.tag and not preferences.get('Tags', currentMacro).linkToCurrentDocument}" styleClass="undecoratedLink">
  +                        <s:link view="/tagDisplay_#{skin}.xhtml" value="#{tagCount.tag}">
  +                            <f:param value="#{tagCount.tag}" name="tag"/>
  +                        </s:link>
  +                    </s:span>
                       <s:span rendered="#{param.tag == tagCount.tag}">
                           <h:outputText value="&gt;&#160;#{tagCount.tag}&#160;&lt;"/>
                       </s:span>
  @@ -31,7 +36,7 @@
                   </h:column>
               </h:dataTable>
   
  -            <s:span styleClass="undecoratedLink defaultColumn">
  +            <s:span styleClass="undecoratedLink defaultColumn" rendered="#{preferences.get('Tags', currentMacro).linkToCurrentDocument}">
                   <h:outputLink value="#{wiki:renderURL(currentDocument)}">
                       <h:outputText value="#{messages['tags.label.All']}"/>
                   </h:outputLink>