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

[Christian Bauer]

  User: cbauer  
  Date: 07/11/20 03:05:08

  Modified:    examples/wiki/view     dirDisplay_d.xhtml docHistory_d.xhtml
                        docDisplay_d.xhtml docDisplay_m.xhtml
  Log:
  First import of the seamframework.org theme
  
  Revision  Changes    Path
  1.4       +1 -0      jboss-seam/examples/wiki/view/dirDisplay_d.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: dirDisplay_d.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/dirDisplay_d.xhtml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- dirDisplay_d.xhtml	12 Oct 2007 16:31:24 -0000	1.3
  +++ dirDisplay_d.xhtml	20 Nov 2007 08:05:08 -0000	1.4
  @@ -73,6 +73,7 @@
   
       <h:outputLink value="#{facesContext.externalContext.request.contextPath}/servlets/feeds/atom.seam?feedId=#{directoryHome.instance.feed.id}"
                     styleClass="linkNavigation" rendered="#{not empty directoryHome.instance.feed}">
  +        <h:graphicImage styleClass="feedIcon" value="/themes/#{wikiPreferences.themeName}/img/icon.atom.gif" width="18" height="18"/>
           <h:outputText value="#{messages['lacewiki.button.DirectoryFeed']}"/>
       </h:outputLink>
   
  
  
  
  1.4       +5 -5      jboss-seam/examples/wiki/view/docHistory_d.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: docHistory_d.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docHistory_d.xhtml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- docHistory_d.xhtml	12 Oct 2007 16:31:24 -0000	1.3
  +++ docHistory_d.xhtml	20 Nov 2007 08:05:08 -0000	1.4
  @@ -115,8 +115,8 @@
   
       </div>
   
  -    <s:fragment rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}">
           <div class="formControls">
  +        <s:fragment rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}">
               <div class="entry">
                   <div class="label">&#160;</div>
                   <div class="input">
  @@ -124,13 +124,13 @@
                       <h:commandLink id="purge" action="#{nodeHistory.purgeHistory}"
                                  tabindex="4" accesskey="#{messages['lacewiki.button.docHistory.PurgeHistory.accesskey']}" 
                                  styleClass="button">
  -                        <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.docHistory.PurgeHistory']}"/>
  +                        <h:outputText styleClass="buttonLabel" escape="false" value="#{messages['lacewiki.button.docHistory.PurgeHistory']}"/>
                       </h:commandLink>
       
                   </div>
               </div>
  -        </div>
       </s:fragment>
  +    </div>
   
   </div>
   </h:form>
  
  
  
  1.8       +6 -0      jboss-seam/examples/wiki/view/docDisplay_d.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: docDisplay_d.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docDisplay_d.xhtml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- docDisplay_d.xhtml	14 Nov 2007 08:12:26 -0000	1.7
  +++ docDisplay_d.xhtml	20 Nov 2007 08:05:08 -0000	1.8
  @@ -61,6 +61,12 @@
   
       </s:fragment>
   
  +    <s:fragment rendered="#{documentHome.instance.macroPresent('hideControls') and not s:hasPermission('User', 'isAdmin', currentUser)}">
  +        <script type="text/javascript">jQuery(function() {
  +            jQuery("#wikiControls").hide();
  +        })</script>
  +    </s:fragment>
  +
   </ui:define>
   
   <ui:define name="content">
  
  
  
  1.5       +1 -1      jboss-seam/examples/wiki/view/docDisplay_m.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: docDisplay_m.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docDisplay_m.xhtml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- docDisplay_m.xhtml	12 Oct 2007 16:31:24 -0000	1.4
  +++ docDisplay_m.xhtml	20 Nov 2007 08:05:08 -0000	1.5
  @@ -124,7 +124,7 @@
           </h:panelGrid>
       </s:fragment>
   
  -    <s:fragment rendered="#{documentHome.instance.enableComments and documentHome.instance.enableCommentForm}">
  +    <s:fragment rendered="#{documentHome.instance.enableComments and documentHome.instance.enableCommentForm and not documentHome.instance.macroPresent('hideComments')}">
           <br/>
           <div class="boxHeader">#{messages['lacewiki.label.commentForm.PostComment']}:</div>
           <h:form id="commentForm"><s:validateAll>