1. 16 Mar, 2012 11 commits
  2. 14 Mar, 2012 4 commits
  3. 13 Mar, 2012 2 commits
  4. 12 Mar, 2012 1 commit
  5. 05 Mar, 2012 3 commits
  6. 04 Mar, 2012 2 commits
  7. 02 Mar, 2012 3 commits
  8. 01 Mar, 2012 2 commits
  9. 29 Feb, 2012 1 commit
  10. 28 Feb, 2012 6 commits
  11. 27 Feb, 2012 5 commits
    • Francois Marier's avatar
      Merge changes I5799ccda,I36fa6945 · feb628e4
      Francois Marier authored
      * changes:
        Add author information to header (Bug 897057)
        Collection title overrides page title (Bug 896890)
      feb628e4
    • Jono Mingard's avatar
      Add author information to header (Bug 897057) · 6d6f1e0f
      Jono Mingard authored
      
      
      Added the author name to pages (regardless of whether
      they are in a collection) below the page title.
      Added a language string "viewauthor" in
      lang/en.utf8/view.php.
      
      Added a function in lib/view.php to output this string
      with the proper username and URL.
      
      Added this to theme/raw/templates/view/view.tpl by
      passing a new string to smarty ($author) in
      htdocs/view/view.php
      
      Also moved page description to be below tabbed collection
      navigation in view.tpl
      
      Change-Id: I5799ccda3a7f29888692fbd3b4d6aac836cbc677
      Signed-off-by: default avatarJono Mingard <reason.koan@gmail.com>
      6d6f1e0f
    • Jono Mingard's avatar
      Collection title overrides page title (Bug 896890) · 08104a1a
      Jono Mingard authored
      
      
      Changes htdocs/view/view.php
      If a page is in a collection with tabbed navigation, the
      collection title only is displayed. If a page is in a
      collection without tabbed navigation OR not in a collection
      at all, only the title of the page is displayed.
      
      The author has been removed from the page header (title
      used to be "PageTitle by Author" but is now just "PageTitle")
      (This includes editing a page)
      It will be added back with my fix for Bug 897057.
      
      The title is also no longer a link as without small headers
      it used to act as a link to the current page.
      
      Note: The $title variable is now global and is set only once
      (rather than twice within two if statements).
      
      Change-Id: I36fa6945862d57c8e3767828e1a6c4bd6a1e3a94
      Signed-off-by: default avatarJono Mingard <reason.koan@gmail.com>
      08104a1a
    • Chris Wharton's avatar
      Change the info for journal file upload · edf97398
      Chris Wharton authored
      
      
      Bug #901560
      
      Change help info for uploading a file into a journal
      
      Change-Id: I8886aa08fe47d327e2347930f159a515b35ff5b6
      Signed-off-by: default avatarChris Wharton <chrisw@catalyst.net.nz>
      edf97398
    • Francois Marier's avatar
      3f224fea