1. 07 Feb, 2012 7 commits
  2. 06 Feb, 2012 1 commit
  3. 03 Feb, 2012 1 commit
    • Richard Mansfield's avatar
      Fixes for microheaders in stylesheets · 7a882ad1
      Richard Mansfield authored
      
      
      Some recent changes to the main stylesheets have resulted in themes
      not being correctly applied when "Small page headers" are turned on.
      First, the addition of a body#micro rule for background colour in the
      raw theme was inherited by all the child themes, when it needs to be
      overridden.  Also, some rules were using the main-column id rather
      than the main-column class.
      
      Change-Id: Iea21ff4dff71ebc85a2020bca900da1e344dfa8d
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      7a882ad1
  4. 02 Feb, 2012 2 commits
    • Richard Mansfield's avatar
      Remove unnecessary sanitisation from forum notifications (bug #882894) · 1c022eed
      Richard Mansfield authored
      In commit 93c012f2
      
      , the forum and group name were added to the body
      of forum post email notifications, each wrapped in a call to
      clean_html (htmlpurifier).  This crashes cron due to out-of-memory
      errors whenever there are more than a few subscribers, and stops
      notifications from being sent out at all.
      
      The forum and group name only need to be rendered once per forum post,
      so this could be fixed by moving the clean_html call up to the
      activity constructor, rather than doing it in the get_emailmessage,
      get_htmlmessage functions.  These functions get called for every
      single subscriber notification, to ensure the string is displayed in
      the subscriber's language.
      
      But because group and forum names are never rendered as html, we don't
      need to use htmlpurifier - html escaping is more appropriate and less
      memory-hungry.
      
      Change-Id: I0a4133b0a11e0e0004bdab1c29984ab4fc5dfbbf
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      1c022eed
    • Richard Mansfield's avatar
      Fix remote avatars broken by 'profileiconbyid' commit (bug #924777) · ab3b5a19
      Richard Mansfield authored
      Commit 011c5039 changed lot of thumb.php urls to use the
      type=profileiconbyid parameter (which takes an artefact id) rather
      than type=profileicon (which takes a user id, and which cannot be
      cached).
      
      Unfortunately, when a user has no locally stored profile icon, use of
      type=profileiconbyid stops their remote gravatar image from being
      displayed.
      
      This commit updates the thumb.php urls that were changed in commit
      011c5039 to use the profile_icon_url() function, which respects
      remote avatars when no local profileicon is available.
      
      In some cases this requires a new size of the no_userphoto.png image,
      so three new sizes are added in the raw theme.  The four no_userphoto
      images in the custom theme were duplicates of those in raw, and are
      removed.
      
      Finally, the type=profileiconbyid change from commit 011c5039
      
       in the
      viewacl.tpl template has been reverted back to type=profileicon.
      Because this url is constructed in javascript, it is not worth the
      trouble to use a profile_icon_url call here until the number of
      requests to thumb.php really becomes a problem.
      
      Change-Id: I7dce7090842999fe090dc2d8c481cb4aca7720d5
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      ab3b5a19
  5. 01 Feb, 2012 4 commits
  6. 31 Jan, 2012 4 commits
    • Richard Mansfield's avatar
      Let buttons disguised as links be used in navigation tabs · 4c03ffb0
      Richard Mansfield authored
      
      
      The in-page-tabs style, used for group and profile tabs among other
      things, is only styled correctly when the tab contains a link.  In the
      user reports area it's more convenient to use a button, to submit a
      lot of post variables, so this patch applies the same style to the
      existing input.linkbtn (button disguised as a link) selector.
      
      Change-Id: I14dab9618eec9197d5b14438dc8489648c26df2f
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      4c03ffb0
    • Richard Mansfield's avatar
      Move bulk actions user list into a separate template · f5ff892c
      Richard Mansfield authored
      
      
      This allows the html to be reused on other pages
      
      Change-Id: Iad7195ff5048242515613075aa03ff5eba6a0707
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      f5ff892c
    • Richard Mansfield's avatar
      Allow get_accesslists() to return views for >1 user · eeacec10
      Richard Mansfield authored
      
      
      This function, and get_views_and_collections() currently only return
      views and access records for a single user, group, or institution.  In
      the admin reporting area, we want to be able to fetch access lists for
      several users at once.
      
      Change-Id: I0c40f7d10742efba75e44664a571e0455bcbea95
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      eeacec10
    • Richard Mansfield's avatar
      Allow staff to access the admin user search page (bug #919009) · 2f43bf94
      Richard Mansfield authored
      
      
      Staff members will be able to search through all users in their
      institutions, but they cannot edit a user unless they are also an
      administrator for them (institution or site administrator).
      
      Links from the usernames to the account settings page are only
      displayed when the logged-in user is an administrator for the listed
      user.
      
      The "edit selected users" button is only displayed to site and
      institutional admins, and the bulk actions page it links to now
      explicitly states which users have been filtered out due to lack of
      institutional admin privileges.
      
      Email addresses are removed from the list for staff users.
      
      If the logged-in user is an admin in one institution, and staff in
      another, email is displayed and usernames linked only for the
      'adminned' users.  The bulk actions page is still reachable, but any
      selected users who are not adminned by the logged-in user will be
      removed.
      
      Change-Id: Ia65a960df9af7c5794002007e7580ba5f9a4c9d7
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      2f43bf94
  7. 30 Jan, 2012 7 commits
  8. 27 Jan, 2012 1 commit
  9. 26 Jan, 2012 4 commits
  10. 25 Jan, 2012 1 commit
  11. 22 Jan, 2012 1 commit
  12. 19 Jan, 2012 2 commits
    • Jono Mingard's avatar
      include link to accounts page (Bug 901558) · d022b6fe
      Jono Mingard authored
      
      
      Changed string 'noblogfound' to 'nodefaultblogfound'
      to add link '<a href="%saccount/">account settings</a>'
      
      Changed htdocs/artefact/blog/view/index.php to use
      'die_info' instead of 'ArtefactNotFoundException'
      so that the account settings link is not escaped
      
      Change-Id: I517aeabba59373ccb19a1cd618a988af689ce0f2
      Signed-off-by: default avatarJono Mingard <reason.koan@gmail.com>
      d022b6fe
    • Jono Mingard's avatar
      Added tagging help to file edit form (Bug 897532) · 3cb578f3
      Jono Mingard authored
      
      
      When editing a file the text "Enter comma separated
      tags for this item. Items tagged with 'profile' are
      displayed in your sidebar." now displays under the
      tag textbox.
      
      Added a new table row with the language string
      'tagsdescprofile' to artefact/file/theme/raw/form/editfile.tpl
      
      Change-Id: I2d3a0f92f989fca2bb990c9888a79ce090342cb3
      Signed-off-by: default avatarJono Mingard <reason.koan@gmail.com>
      3cb578f3
  13. 17 Jan, 2012 1 commit
    • Richard Mansfield's avatar
      Check for authinstances in use when deleting institutions (bug #917873) · d1310840
      Richard Mansfield authored
      
      
      When you delete an institution, and one of the institution's
      authinstances is still in use by some users, you get an sql error and
      a nonrecoverable error screen. (This can only happen when the users
      still using the authinstance are not institution members, because
      there is already a check to stop deletion of institutions with
      members).
      
      This patch allows the institution to be deleted anyway, reassigning
      the offending users to a 'default' authinstance.  If we can't find a
      sensible default authinstance, it will at least display a more helpful
      error message.
      
      Also, when attempting to delete an institution with members, set an
      error on the form rather than throwing a ConfigException.
      
      Change-Id: I9c85a3c8c80411e3cf526767b9142efb12907e5c
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      d1310840
  14. 16 Jan, 2012 4 commits
    • Richard Mansfield's avatar
      Add support for pages accessible by both admins and staff · 0d7f8ee9
      Richard Mansfield authored
      
      
      To allow for pages that are accessible by both admins and staff, two
      new constants are added, STAFF and INSTITUTIONALSTAFF.  The existing
      checks for admin and institutional admin permissions are moved into a
      new function which also takes account of the new staff permissions.
      
      Change-Id: I60de6f74bd5f2a208be8e15e8a71f16b689c80d6
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      0d7f8ee9
    • Richard Mansfield's avatar
      Use type=profileiconbyid in more requests for thumb.php · 011c5039
      Richard Mansfield authored
      
      
      This can help to reduce the overall number of requests for thumb.php
      because the 'profileiconbyid' urls are cached for longer by the
      browser.
      
      (Where the profile_icon_url function can be used, we also avoid the
      need to generate additional requests for users without profileicons,
      when remote avatars are disabled.  But because profile_icon_url relies
      on the nouserphoto icon being available in the requested size, we
      can't use it everywhere until we either generate the nouserphoto icon
      in more sizes, or change all those pages to use standard sizes.)
      
      Change-Id: I81c5c5f4b7f9136bf9b6a6f711e55a4bceb6fa14
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      011c5039
    • Richard Mansfield's avatar
      Fetch profileicon id info along with users in more places · 56240fa6
      Richard Mansfield authored
      
      
      On the admin notifications page, and in the wall and recent forum
      posts blocks, we are fetching user information from the database and
      then subsequently generating new requests for their profile icons.
      
      By fetching the profileicon and email address along with the rest of
      the user information, we will be able to avoid the need for these
      additional requests in many cases.
      
      Change-Id: I82cbf378ace2e663d0958529aeb2f3b123364caa
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      56240fa6
    • Richard Mansfield's avatar
      Fix sql error in bulk user deletion (bug #916998) · 9bc9d15c
      Richard Mansfield authored
      
      
      When a user is deleted, deletion of notification_internal_activity
      records can fail with a foreign key error when another row in
      notification_internal_activity has a parent field pointing to one of
      the records we are trying to delete.  This is fixed by setting the
      parent fields to null before deletion.
      
      The handle_event('deleteuser') call in delete_user is also moved
      inside the transaction, to ensure that deleted users will have their
      notifications deleted correctly.  Other subscribers to the deleteuser
      event in core should be unaffected.
      
      Change-Id: Ibc0a695e986bb175a00441f02d3e40abf38cbcde
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      9bc9d15c