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

[Christian Bauer]

  User: cbauer  
  Date: 08/01/14 00:10:46

  Modified:    examples/wiki/view    dirDisplay_m.xhtml dirDisplay_d.xhtml
                        docDisplay_d.xhtml
  Log:
  JBSEAM-2457 - Render "REST" feed/file download URLs, breaks all current feed/file bookmarks
  
  Revision  Changes    Path
  1.5       +1 -1      jboss-seam/examples/wiki/view/dirDisplay_m.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: dirDisplay_m.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/dirDisplay_m.xhtml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- dirDisplay_m.xhtml	30 Dec 2007 02:33:19 -0000	1.4
  +++ dirDisplay_m.xhtml	14 Jan 2008 05:10:46 -0000	1.5
  @@ -70,7 +70,7 @@
   
       </s:fragment>
   
  -    <h:outputLink value="#{facesContext.externalContext.request.contextPath}/servlets/feeds/atom.seam?feedId=#{directoryHome.instance.feed.id}"
  +    <h:outputLink value="#{wiki:renderFeedURL(directoryHome.instance.feed, null, null)}"
                     styleClass="linkNavigation" rendered="#{not empty directoryHome.instance.feed}">
           <h:outputText value="#{messages['lacewiki.button.DirectoryFeed']}"/>
       </h:outputLink>
  
  
  
  1.11      +1 -1      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.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- dirDisplay_d.xhtml	12 Jan 2008 10:39:02 -0000	1.10
  +++ dirDisplay_d.xhtml	14 Jan 2008 05:10:46 -0000	1.11
  @@ -68,7 +68,7 @@
   
       </s:fragment>
   
  -    <h:outputLink value="#{facesContext.externalContext.request.contextPath}/servlets/feeds/atom.seam?feedId=#{directoryHome.instance.feed.id}"
  +    <h:outputLink value="#{wiki:renderFeedURL(directoryHome.instance.feed, null, null)}"
                     styleClass="linkNavigation" rendered="#{not empty directoryHome.instance.feed}">
           <h:graphicImage styleClass="feedIcon" value="/themes/#{preferences.get('Wiki').themeName}/img/icon.atom.gif" width="18" height="18"/>
           <h:outputText value="#{messages['lacewiki.button.DirectoryFeed']}"/>
  
  
  
  1.12      +1 -1      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.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- docDisplay_d.xhtml	10 Jan 2008 08:37:45 -0000	1.11
  +++ docDisplay_d.xhtml	14 Jan 2008 05:10:46 -0000	1.12
  @@ -15,7 +15,7 @@
       <s:fragment rendered="#{not empty documentHome.instance.parent.feed}">
           <link rel="alternate" type="application/atom+xml"
                 title="#{documentHome.instance.parent.name}"
  -              href="#{facesContext.externalContext.request.contextPath}/servlets/feeds/atom.seam?feedId=#{currentDirectory.feed.id}"/>
  +              href="#{wiki:renderFeedURL(currentDirectory.feed, null, null)}"/>
           
       </s:fragment>