Uploaded image for project: 'Confluence Data Center'
  1. Confluence Data Center
  2. CONFSERVER-19073

Print footer got lost in new footer for 3.2

    XMLWordPrintable

Details

    Description

      The print footer, "Printed by Atlassian Confluence", got lost in the recent footer changes. It was the removal of the second <li> in the diff below:

      $ svn diff -r 101469:109817 conf-webapp/src/main/webapp/decorators/includes/footer-content.vm 
      Index: conf-webapp/src/main/webapp/decorators/includes/footer-content.vm
      ===================================================================
      --- conf-webapp/src/main/webapp/decorators/includes/footer-content.vm	(revision 101469)
      +++ conf-webapp/src/main/webapp/decorators/includes/footer-content.vm	(revision 109817)
      @@ -46,12 +46,17 @@
                   </p>
               #end
           #end
      +
           <ul id="poweredby">
      -        <li class="noprint">$action.getText('powered.by.atlassian.confluence',[$action.getText('url.atlassian.software.confluence.footer'), "$generalUtil.versionNumber","${generalUtil.buildNumber}", "${generalUtil.buildDateString}"])</li>
      -        <li class="print-only">$action.getText('printed.by.atlassian.confluence',["$generalUtil.versionNumber"])</li>
      -        <li class="noprint"><a href="$action.getText('url.bug.feature.request')" class="smalltext">$action.getText('bug.feature.request')</a> &#8211;</li>
      -        <li class="noprint"><a href="$action.getText('url.footer.atlassian.news')" class="smalltext">$action.getText('footer.atlassian.news')</a> &#8211;</li>
      -        <li class="noprint"><a href="$req.contextPath/administrators.action">$action.getText('contact.administrators')</a></li>
      +        <li class="noprint">$action.getText('powered.by.atlassian.confluence',
      +            [$action.getText('url.atlassian.software.confluence.footer'),
      +            "$generalUtil.versionNumber",
      +            "$action.getText('url.enterprise.wiki')",
      +            "$action.getText('url.intranet.software')",
      +            "$action.getText('url.documentation.software')",
      +            "$action.getText('url.knowledge.management')" ])</li>
      +        <li class="noprint"> &nbsp; |&nbsp; <a href="$action.getText('url.bug.feature.request')" class="hover-footer-link">$action.getText('bug.feature.request')</a></li>
      +        <li class="noprint"> &nbsp;|&nbsp; <a href="$action.getText('url.footer.atlassian.news')" class="hover-footer-link">$action.getText('footer.atlassian.news')</a></li>
           </ul>
       
           $!sitemeshPage.getProperty("page.coherence-copyright")
      

      We should add it back for 3.2.1.

      Attachments

        Activity

          People

            gclaps Gerry Claps
            matt@atlassian.com Matt Ryall
            Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: