1. 07 Apr, 2020 1 commit
  2. 29 Mar, 2020 1 commit
  3. 17 Mar, 2020 1 commit
    • Cecilia Vela Gurovic's avatar
      Bug 1833664: Enabling 'lock blocks' in group pages · 4ccfaa8a
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed
      When turning on 'Lock blocks' for a group page, prevent group members
      from removing the lock. Added a language string for site and institution
      pages to make it clearer that the locking only affects pages that are
      copied.
      
      behatnotneeded
      
      Change-Id: I26ebccb659f1c05333538dea24735ca11484b360
      4ccfaa8a
  4. 06 Mar, 2020 1 commit
    • Lisa Seeto's avatar
      Bug 1857935: Display people from own · 75a96408
      Lisa Seeto authored and Robert Lyon's avatar Robert Lyon committed
      
       institution(s) first when searching for them during portfolio sharing
      
      - added in check when searching users to display users in institutions first
      - added in select2js datasource formating to get user dropdown categories
      - limit the type of data returned in ajax calls to limit data risks (Bug 1863043)
      - refactor json and tpl
      - refactor sql, show institution display name
      
      Change-Id: I478a4d9534bf1de820ca59d60ca7768685e36a96
      Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
      75a96408
  5. 28 Feb, 2020 1 commit
  6. 28 Oct, 2019 1 commit
    • Kristina Hoeppner's avatar
      Bug 1846915: Fix some more small language issues · a5a1b327
      Kristina Hoeppner authored
      - Update page layout conversion message to use correct
        reference for preferences page.
      - Fix a capitalisation mistake for LIT submissions.
      - Fix language string in new submission report.
      - Fix language string in plan task to have correct meaning.
      
      behatnotneeded
      
      Change-Id: Ia00dab2ccf0412dd2569752e69b344a6716cacb9
      a5a1b327
  7. 06 Oct, 2019 1 commit
  8. 04 Oct, 2019 8 commits
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Blocks display fixes · ccc2446d
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed
      - assessment block: tinymce and the asseesment js
      need to be initialized after the block is loaded
      - signoff block: sing-off modal is showing now
      - embedded media init functions need to be loaded after
      the blocks are added to the grid
      - wall post block initializes the tinyMCE after it's loaded
      and refreshes the content of the block after a new post is made
      - comment block: update block size when adding a comment
      - scrolling to the block when a new one is added
      - modified the text for button to add a new block to the page
        'Drag to add a new block' for normal mode
        'Click to add a new block' for accessibility mode
      - add a block to the bottom of the page by default so it won't
      break the layout
      - add SE annotation to the bottom of the page
      - added 'Add block' button event handlers after trnaslating a view
      - annotation feedback loads the tinyMCE
      
      behatnotneeded
      
      Change-Id: I7642cacde729a2a85b497e077452de792ec72eb7
      ccc2446d
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Accessibility settings and layout · 25082988
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed
      - Added an option to set the profile to accessible.
      This can be set in account preferences and
      enables one extra field in the settings
      of a view, in the basic settings section, to make
      the layout accessible.
      
      - by default, if the user account is accessible then
      the pages will be crated as accessible.
      To have a non accessible page, the option un view settings
      needs to be set as 'No'
      
      - Accessible layout only allows to add blocks with width=12
      that is the same with of the grid.
      This makes the blocks show as a sequence one on top of the other
      like a list. The user can only reorder the position
      they have in the list.
      
      - When a page is accessible, the adding a block
      by drag & drop is disabled
      
      - Reordering of blocks is accessible by keyborad
      
      - The 'add block' button is reachable by keyboard
      
      - add an intro to the page for the screen reader
      to explain how the page works
      
      - add identification to each block for screen reader,
      blocktype and title (if it’s set)
      
      TODO
      * When adding a block to the bottom or the top of the page,
      the page should be scrolled to that block
      
      * Floating menu: should have a way to be recognized as a menu
      by the screen reader. Check the access keys for the menu.
      
      behatnotneeded
      
      Change-Id: I08417f0f11d747a67900c88c2f675ef5f85b7499
      25082988
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: User should confirm before the view is translated · 69916a3d
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed
      there is an account preference we can set for showing
      a warning message before translating the layout of an old view.
      
      By default it's true. It can be set to false in the account preferences
      or by selecting the option when the message is displayed.
      if this preference is set to
      true: if we want to edit a view with old layout,
      a message will be displayed to confirm we want to translate the layout.
      false: The view gets translated on edit without asking the user.
      
      The message has the options to accept, cancel  or don't ask again.
      
      cancel: redirects to the displayed view
      don't ask again: sets account preference to false but can be reverted
      in account preferences.
      accept: will redirect to the view edit page with a parameter
      saying the user accepted the translation
      
      behatnotneeded
      
      Change-Id: I84e1a86d3bb494a1955da9cbfbde996b555bb132
      69916a3d
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Make view versioning work with gridstack · 7b17b833
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed
      - Only allow to create a new version if the view
      is using new gridstack layout.
      
      In timeline version section:
      - For view versions that were created with old layout,
      show them as they are
      (we dont translate old view versions to new layout)
      - For view versions that are created with new grid layout,
      they are also displayed in the timeline view with the new grid
      layout
      
      behatnotneeded
      
      Change-Id: I1abdae9e5e547dcc9bce97cac127085786dcac8a
      7b17b833
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Copying a page (in old or new layout) creates a page with new layout · f342e41b
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed
      - Copy a page when original view is using
      grid layout
      - Copy a page when original view is using
      old layout: Translates the original page layout
      without modifying it,
      and creates a new page with new grid layout
      The blocks in the new page will not have height
      assigned. The height of the blocks is updated
      on first load of the page in the browser.
      This can happen when editing the page or displaying it.
      - Copy a collection with old layout: creates the new collection
      with new grid layout pages. Each page needs to be loaded on the
      browser to update the block heights
      
      behatnotneeded
      
      Change-Id: I43b5f9050be192c057cb1803dcd69575c137a9cc
      f342e41b
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: allow to choose add block to bottom/top of the grid · 6cee4292
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed
      - Also removed code in the pop-up for adding a new block to a page:
      The js functions that update the select to choose the position
      of a new block inside a column were removed.
      
      behatnotneeded
      
      Change-Id: Ie20f7bbfc98c6b9f4a61f291fcaf23d368d077e0
      6cee4292
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: removing helper functions to reorder cells in old layout · 2a9211b3
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed
      they won't be needed anymore
      
      also remove use of properties
      private $dirtyrows;
      private $dirtycolumns;
      
      Change-Id: I31e0c8296e72e9dd6b2381170864bdc52af766b7
      2a9211b3
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Remove edit layout section · d45aed8d
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed
      - also remove the layout pieform
      and the custom layout javascript code
      
      behatnotneeded
      
      Change-Id: I3e2e2b3f09106dd2a341a40d178feca693194e64
      d45aed8d
  9. 04 Aug, 2019 2 commits
    • Robert Lyon's avatar
      Bug 1829940: Restrict the chooser to one 'add' button · 4d9a5645
      Robert Lyon authored
      
      
      Done in this patch:
      - restricted the list to one shortcut button (the placeholder one)
      - cleaned up old code where one could edit the block on the without
      modal
      - moved the button to be above content layout and next to the
      instructions section
      - move the block help link to within placeholder block and be an 'i'
      on 'Content types' heading
      
      behatnotneeded
      
      Change-Id: I8a85842ffef5e50c62aca73a4b33c22579b160ca
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      4d9a5645
    • Robert Lyon's avatar
      Bug 1829940: Placeholder option update page with block of choice · 882259ee
      Robert Lyon authored
      
      
      This patch does the following:
      - Make 'placeholder' configure options clickable so that on clicking
      an option updates the block on the page and changes the configure form
      to the form of the blocktype chosen
      - On 'add placeholder' -> 'choose option' we have 'remove' option on
      form and it removes the block from the page
      - On 'add placeholder' -> 'save' -> 'configure block' -> 'choose option'
      we have 'cancel' option on form and it reverts the block back to
      'placeholder'
      
      behatnotneeded
      
      Change-Id: I1681ef92c5ccc14cda2167a040bb751501bfdbcd
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      882259ee
  10. 17 Jun, 2019 1 commit
    • Ghada El-Zoghbi's avatar
      Bug 1832805: Add missing lang strings when saving page to timeline · 1a08674a
      Ghada El-Zoghbi authored
      Four new lang strings:
      * cantversionviewinvalid
      * cantversionvieweditpermissions
      * cantversionviewsubmitted
      * cantversionviewgroupeditwindow
      
      Have separated the scenarios out for better feedback to the user.
      
      Sponsored by The Australian National University
      
      behatnotneeded
      
      Change-Id: Id4952c37f35631b2f6a1dfad8129bac48108d733
      1a08674a
  11. 12 Jun, 2019 1 commit
    • Rebecca Blundell's avatar
      Bug 1827272: move theme dropdown menu to page settings · 33d1f349
      Rebecca Blundell authored and Robert Lyon's avatar Robert Lyon committed
      -move select box from the page edit screen to
      Settings-> Advanced
      -remove no-longer-used code from views.js, blocks.tpl
      and blocks.php
      -update behat test
      -add desc field for the theme chooser
      I also fixed the 'Lock blocks' description, which had a grammatical error.
      
      Change-Id: I4cddf3fe884d11cf950408041daf92d12915b2d3
      33d1f349
  12. 17 Apr, 2019 1 commit
  13. 11 Apr, 2019 2 commits
  14. 10 Apr, 2019 1 commit
  15. 28 Mar, 2019 1 commit
  16. 23 Jan, 2019 1 commit
  17. 07 Oct, 2018 1 commit
  18. 04 Oct, 2018 1 commit
  19. 30 Sep, 2018 5 commits
  20. 24 Sep, 2018 1 commit
    • Kristina Hoeppner's avatar
      Bug 1793943: Review new language strings · b125a378
      Kristina Hoeppner authored and Robert Lyon's avatar Robert Lyon committed
      Go over new language strings since 18.04
      and fix them up where necessary. Those that
      only have impact on English do not receive a
      new language ID.
      
      behatnotneeded
      
      Change-Id: I18506b5092748111cb2fe7992702ca05b7d72e93
      b125a378
  21. 09 Sep, 2018 2 commits
    • Cecilia Vela Gurovic's avatar
      Bug 1790543: Display portfolio instructions · 5cedce1f
      Cecilia Vela Gurovic authored
      1) Add an 'instructions' field to view table via install / update.
      
      2) Add 'Instructions' textarea / wysiwyg field to view settings page and
      have it save to the database
      
      3) Move generic "This area shows a preview of what your page looks like.
      Changes are saved automatically. Drag blocks onto the page to add them.
      You can then also drag them around the page to change their position."
      text in edit page to the help icon and in it's place have an expandable
      area to display the saved 'instructions' message.
      
      4) On view display page have an expandable area to display the saved
      'instructions' message
      
      5) in view edit mode, collapsing/uncollapsing the Instruction section
      is remebered automatically for next time the view is edited
      
      behatnotneeded
      
      Change-Id: Ia56323b9b734b8ebe9498c54dce5a3b934d1fd29
      5cedce1f
    • Robert Lyon's avatar
      Bug 1784778: Peer assessment block · d1d6880e
      Robert Lyon authored and Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic committed
      
      
      A new block is created that can only be filled with content from a
      person who has the “Peer assessment” role for a portfolio. The block's
      content is not visible to the page owner until the peer published it.
      
      The block can be selected by the portfolio author for inclusion on any
      page, but it can only be used in conjunction with the peer assessor role.
      If no peer assessor is selected for a portfolio, the block stays empty.
      It is also available on the site and institution level for inclusion into
      portfolio pages there (for the creation of templates).
      
      behatnotneeded: will be added in patch 9063
      
      Change-Id: I6f9945f184b4512c345402e1a73f6fc6f21572a7
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      d1d6880e
  22. 09 Aug, 2018 1 commit
    • Gregor Anzelj's avatar
      Bug 1743870: Moderate portfolios of regular users · 4e5e0aae
      Gregor Anzelj authored and Robert Lyon's avatar Robert Lyon committed
      Allow institution admins and site admins to immediately remove all
      sharing options from a page (or collection if the page is within
      a collection) that is deemed objectionable.
      
      behatnotneeded
      
      Change-Id: I23de7ed5c4678afe8a65e51b2aec06126948c637
      4e5e0aae
  23. 08 Aug, 2018 1 commit
    • Kevin Dibble's avatar
      Bug 1781844: Lock blocks on pages · 3e76e38e
      Kevin Dibble authored and Robert Lyon's avatar Robert Lyon committed
      A lot of users in Mahara create (Template) pages to share out to users.
      This reduces the setup a new user will have to do to. There is an issue
      that on their personal copy, the blocks that were so carefully setup can
      be deleted.
      
      This functionality creates a new column in the database called
      "lockblocks" that can be enabled/disabled on the share page.
      
      When the user copies the page, this setting is copied over and the
      "delete" icon is hidden from view should the lockblocks setting be
      enabled. This only happens on normal portfolio pages.
      
      To unset - the user can edit the page settings and
      disable the lock blocks feature to enable the deletion of the blocks as
      per normal.
      
      behatnotneeded
      Change-Id: I7a2062f77431d6371f95d7f55bedcc499dd7caa2
      3e76e38e
  24. 07 Aug, 2018 1 commit
    • Cecilia Vela Gurovic's avatar
      Bug 1784781: adding peer & manager roles for user access to a view · 2ad167e5
      Cecilia Vela Gurovic authored
      - creating the role table
      - selecting the role when editing view access
      - fix: for already saved user and group access rules, show all roles
      in the dropdown to make it possible to change the value
      
      to do: display content depending on role
      
      behatnotneeded : will be added later
      
      Change-Id: Ie83e0ca84704182b40bcc2fa4a678da099a1793d
      2ad167e5
  25. 12 Jul, 2018 1 commit
  26. 04 Jul, 2018 1 commit