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

[Christian Bauer]

  User: cbauer  
  Date: 07/12/19 08:33:34

  Modified:    examples/wiki/view/includes    userInfo.xhtml
                        commentsDisplay.xhtml ownerSelector.xhtml
  Log:
  JBSEAM-2406 - Hide e-mail address if user is not logged in (configurable)
  
  Revision  Changes    Path
  1.2       +2 -2      jboss-seam/examples/wiki/view/includes/userInfo.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: userInfo.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/userInfo.xhtml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- userInfo.xhtml	19 Dec 2007 04:29:19 -0000	1.1
  +++ userInfo.xhtml	19 Dec 2007 13:33:34 -0000	1.2
  @@ -12,11 +12,11 @@
   
           <div class="boxHeader">
               <h:outputText value="#{user.fullname}"/>
  -            <div>
  +            <s:div rendered="#{wiki:showEmailAddress()}">
                   <h:outputLink value="#{wiki:escapeEmailURL(wiki:concat('mailto:', user.email))}">
                       <h:outputText value="#{wiki:escapeAtSymbol(user.email)}"/>
                   </h:outputLink>
  -            </div>
  +            </s:div>
           </div>
   
           <div class="boxContent userInfoProfileContent">
  
  
  
  1.19      +6 -4      jboss-seam/examples/wiki/view/includes/commentsDisplay.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: commentsDisplay.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/commentsDisplay.xhtml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- commentsDisplay.xhtml	19 Dec 2007 04:29:19 -0000	1.18
  +++ commentsDisplay.xhtml	19 Dec 2007 13:33:34 -0000	1.19
  @@ -64,10 +64,12 @@
                                       <h:outputText value="#{c.createdBy.fullname}"/>
                                   </s:link>
                               </s:span>
  +                            <s:fragment rendered="#{wiki:showEmailAddress()}">
                               <h:outputText value="&#160;|&#160;"/>
                               <h:outputLink value="#{wiki:escapeEmailURL(wiki:concat('mailto:', c.createdBy.email))}">
                                   <h:outputText value="#{wiki:escapeAtSymbol(c.createdBy.email)}"/>
                               </h:outputLink>
  +                            </s:fragment>
                           </s:div>
                           <s:div rendered="#{not c.ownedByRegularUser}">
                               <h:outputText rendered="#{empty c.fromUserHomepage}" value="#{c.fromUserName}"/>
  
  
  
  1.10      +1 -1      jboss-seam/examples/wiki/view/includes/ownerSelector.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ownerSelector.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/ownerSelector.xhtml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- ownerSelector.xhtml	19 Dec 2007 04:29:19 -0000	1.9
  +++ ownerSelector.xhtml	19 Dec 2007 13:33:34 -0000	1.10
  @@ -169,7 +169,7 @@
                       #{u.lastname}
                   </h:column>
   
  -                <h:column>
  +                <h:column rendered="#{wiki:showEmailAddress()}">
                       <f:facet name="header">
                           <a:commandLink action="#{userSearch.sortBy('email')}" tabindex="20" reRender="dialogOwnerSelectionContent"
                                          oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()"