1. 08 Oct, 2019 1 commit
  2. 06 Oct, 2019 1 commit
    • Evonne's avatar
      Bug 1845104 Various theme fixes part 4 · c0cc88de
      Evonne authored
      Fixing plans blocktype markup, inbox blocktype redundant classes,
      alignment of add blocks button, modal thumbnail not floating right,
      resume attachment inconsistencies (to be continued)
      Change-Id: Ic7c0cc5498dbd3f95f140581cc71b175e944a0d9
  3. 05 Oct, 2019 1 commit
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Tidying up some lastminute problems · fa4085d5
      Cecilia Vela Gurovic authored
      - allow add block button to drop only inside the grid
      - navigation block in collection to copy to other pages
      - Smart evidence annotation feedback forms init tinymce
      - showing the peer can see content message again
      - allow copying of page with old layout
      Change-Id: I3f552ce8f89125e9fd233513c855879aa7678048
  4. 04 Oct, 2019 14 commits
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Accessibility settings and layout · 25082988
      Cecilia Vela Gurovic authored
      - 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)
      * 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.
      Change-Id: I08417f0f11d747a67900c88c2f675ef5f85b7499
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: User should confirm before the view is translated · 69916a3d
      Cecilia Vela Gurovic authored
      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
      Change-Id: I84e1a86d3bb494a1955da9cbfbde996b555bb132
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Exporting views with grid layout · b6cd876f
      Cecilia Vela Gurovic authored
      In exporting section:
      - Show preview of page both for old layout pages and
      new grid layout
      - Export views and collections with new grid layout
      in html
      - Export views and collections with new grid layout
      in leap2A
      - views with old layout are exported as before
      borrow some code from https://reviews.mahara.org/#/c/10157/
      as an early rebase (the patch is not on master yet)
      Change-Id: I0c36c110c6b9ef7ae3edc4d0662a0dbab302684a
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Make view versioning work with gridstack · 7b17b833
      Cecilia Vela Gurovic authored
      - 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
      Change-Id: I1abdae9e5e547dcc9bce97cac127085786dcac8a
    • 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
      - 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
      Change-Id: I43b5f9050be192c057cb1803dcd69575c137a9cc
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Translate old views to new gridstack layout on edit · 32de0b18
      Cecilia Vela Gurovic authored
      Old layout pages will be displayed as they were
      with the old layout.
      New pages are created with the new grid layout.
      If we try to edit a page with an old layout,
      the page will be translated into the new grid layout.
      To translate from an old layout to a new grid layout,
      we respect the row, column and order of blocks inside each cell.
      All blocks in the same row in old layout will be together
      in the new layout, and the first block of each column
      of the same row are displayed at the same level to each other
      in the new layout.
      The blocks will respect the column order
      they had in the old layout.
      A column of the old layout can have many blocks. In the
      new grid layout they respect the same order they had.
      As we have 12 columns in the new grid layout,
      the blocks that where included in a 5 column row,
      will be displayed in smaller columns in the new layout.
      confirmation before trnaslating a page to the new grid layout
      Change-Id: I46f5cdbacb026519631503437c10d33f1b2800e5
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: block resizing to fit content · 565776fb
      Cecilia Vela Gurovic authored
      should not resize blocks in view mode
      in view mode, if the content of the block is static,
      then the block dimensions should not change but the
      content of the block should be made smaller
      expand the height of a block only if the content is dynamic,
      like the 'Journal' block
      Change-Id: Ie8183736580e7e592b24e36f4a16618b96a5bf4e
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: remove layout button from navigation · f9295a81
      Cecilia Vela Gurovic authored
      + Also remove not used templates. They should have been deleted
      in commit 84119067
      that unifies layout and settings section
      Change-Id: Icd90bd4980b9be566f7e20aee6271476edafe321
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Display Dashboard and profile page · 6aadcd02
      Cecilia Vela Gurovic authored
      + fix for loading block with ajax
      + also display group page with new layout
      Change-Id: If93da8afb3069349e5c7612dc41df0faa3394e10
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Display a page in view mode · c0f57e7d
      Cecilia Vela Gurovic authored
      The blocks saved with the new layout
      are now displayed in page edit and view mode
      Change-Id: Ic8c1011745593be552cc1a4377a7351cc9a04bb9
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Creating a new page with gristack layout · 2c861ec1
      Cecilia Vela Gurovic authored
      add a new block, place it anywhere in the grid, edit configuration
      and delete it.
      It will save it in the db on table block_instance_dimension
      but not display it in view or edit mode yet
      Also included a small fix in xmldb postgres class generator
      to handle reserved words in getAlterFieldSQL function
      Failing tests:
      - most of them are failing when adding a new block to the page
      because they expect to have a modal to choose the position
      where to place block. That modal was removed for this patch but
      there will be a similar one in patch:
      and those tests will be fixed there
      - a few tests failed when they couldn't find text inside the
      blocks because they are not expanded to fit the content yet.
      This is added in patch:
      and they will be fixed there
      Change-Id: If4521a6315f6e8cc5d88693f536946dace359288
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: removing helper functions to reorder cells in old layout · 2a9211b3
      Cecilia Vela Gurovic authored
      they won't be needed anymore
      also remove use of properties
      private $dirtyrows;
      private $dirtycolumns;
      Change-Id: I31e0c8296e72e9dd6b2381170864bdc52af766b7
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Remove 'addcolumn' functionality when editing a view · 5f57b602
      Cecilia Vela Gurovic authored
      Change-Id: I99b248e03ffe5b23e622c46ce14765bdf1e47195
    • Lisa Seeto's avatar
      Bug 1844470: Move "Display page" and "Return to pages and collections" · 466b4a8a
      Lisa Seeto authored
      to right-hand side on "Edit" screen
      - create new edit page action buttons for return to <location> button
      - delete references to the old display page link created in file editviewtabs.tpl
      - delete file editviewtabs.tpl
      - change the edit button in editviewpageactions.tpl into a display button
      - change behat tests to reflect the change from Edit to Display page
      - change the Behat instruction for And I display the page to target updated element
      - delete the old display button styling from the style guide
      - move url, title display logic into new func get_return_to_url_and_title in lib/view.php
      - adjust blocks.php, access.php, editlayout.php to assign url, title using new func
      Change-Id: Iedf2882c42fa1d204e438a23842834fbb9a709f9
      Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
  5. 02 Oct, 2019 1 commit
    • Evonne's avatar
      Bug 1845129 Clean up styles in timeline · 77af8856
      Evonne authored
      Removed some styles that were redundant and causing issues with
      content. Added some styles to make page layout a little clearer.
      Change-Id: I61d302e1582abe9b6078f6d1bfe04703da4e13bf
  6. 25 Sep, 2019 1 commit
    • Lisa Seeto's avatar
      Bug 1827811: Move "Add comment" and "Details" into modal with "Comments" · be7af61f
      Lisa Seeto authored
      create modal using configureblock id, update various templates to use the modal for blocks:
      File(s) to download
      add JS to open/close modal, add comments, delete comments, reply to comments, paginate comments.
      add JS to handle url that redirects to view/view.php with modal open and populated.
      Further changes to each block will be completed in child patches.
      Add segment headings to the modal. Fix display of comments to cover width of modal.
      Show comment removed msg in modal/page appropriately.
      Fix behat test to close modal before continuing.
      do not show existing comments if comments not allowed on artefact.
      add validation to modal for comments/attachments
      disable image as link when editing for image block
      trigger focus on modal for accessibility
      close modal on escape keydown event
      fix merge conflict in view/view.php
      fix merge conflict with master
      make configureblock modal play nicely when comment block is on the page
      update display of error messages to always show at top of modal so user doesn't have to scroll
      add accesibility to close modal on escape key down
      handle dock show/hide events for paginated pages in modal during validation
      create block-comments-details-header template file
      create details button and custom scss file with js to show and hide header
      update comment links to save add comment and details when commentcount == 0
      add active-block class to colour the block-header when active
      toggle the details-btn active css
      add _block-comments-details-header.scss to patch
      change class invisble to class d-none
      add block-comments-details-header.tpl to blocktypecontainerviewing.tpl
      code review changes
      add .no-modal class to links on group home page, dashboard and profile page.
      add block header to appear above the title
      change assessbtn from anchor tag to button to prevent scrolling.
      make all clickable links clickable on page load (ignore assess mode)
      fix js issues surrounding assessbtn move and show/hide blocks
      change cursor on dashboard, my profile page, group homepage to default when over disabled modal links
      update assessbtn to details btn
      create tooltip for hover over file download block titles
      fix containerElm console log error by not reattaching tinymce unneccessarily.
      fix null named attributes issues on e.target when span (icons) instead of anchor is clicked.
      Change-Id: I2e5218c040f8a9e252f785165ce9c566ecc2f56e
      Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
  7. 04 Aug, 2019 2 commits
  8. 31 Jul, 2019 1 commit
    • Kristina Hoeppner's avatar
      Bug 1811904: Font Awesome icon adjustments · 0a9c9356
      Kristina Hoeppner authored
      A few icons required adjusting to use only
      free icons. Additionally, icons in the
      card header in the "Primary School" theme
      were changed or added in the first place.
      Needed to update the card icons to use the correct font awesome family
      Change-Id: Ief8f4b4393b1becfb18a8c39d3ef6b8966bbe9eb
  9. 09 Jul, 2019 2 commits
    • Rebecca Blundell's avatar
      Bug 1811904: Fontawesome - final name changes · c3479dc6
      Rebecca Blundell authored
      icon-clipboard      -> icon-clipboard-check
      icon-eye            -> icon-regular icon-eye
      icon-eye-slash      -> icon-regular icon-eye-slash
      icon-file-archive-o -> icon-regular
      icon-comments-o     -> icon-comments
      icon-external-link  -> icon-external-link-alt
      icon-tachometer     -> icon-tachometer-alt
      icon-rotate-right   -> icon-redo
      icon-file-archive-o -> icon-file-archive
      icon-comments-o     -> icon-comments
      icon-send           -> icon-paper-plane
      icon-lightbulb-o    -> icon-regular icon-lightbulb
      icon-code-fork      -> icon-code-branch  - changed versioning to
      'history' icon
      icon-file-o         -> icon-regular icon-file
      also changed some icons to new ones
      used text-align, width and margin-right to centre list items.
      Change-Id: I4d27e450a281dc49716d97de309a3c99b89a0bc1
    • Rebecca Blundell's avatar
      Bug 1811904: Fontawesome - yet more name changes · e84165b0
      Rebecca Blundell authored
      icon-calendar       -> icon-regular icon-calendar-alt
      icon-check-square-o -> icon-regular icon-check-square
      icon-square-o       -> icon-regular icon-square
      icon-circle-o         -> icon-regular icon-circle
      icon-legal          -> icon-gavel
      icon-level-up       -> icon-level-up-alt
      icon-long-arrow-down-> icon-long-arrow-alt-down
      long-arrow-left     -> icon-long-arrow-alt-left
      long-arrow-right    -> icon-long-arrow-alt-right
      long-arrow-up       -> icon-long-arrow-alt-up
      icon-remove         -> icon-times || icon-user-times
      (times is the 'x'used elsewhere, user-times is the 'x' next to a profile person.
      Remove has been removed so I have deleted it from the styleguide)
      icon-level-up       -> icon-level-up-alt
      icon-heart-o        -> icon-regular icon-heart
      icon-arrows         -> icon-arrows-alt
      icon-sign-in        ->icon-sign-in-alt
      Change-Id: Ia2cd81ea24119a7d0fec3000af1eaf2571a2a62b
  10. 25 Jun, 2019 2 commits
    • Rebecca Blundell's avatar
      Bug 1811904: Fontawesome: more name changes · 7db2c719
      Rebecca Blundell authored
      icon-arrows     -> icon-arrows-alt
      icon-shield     -> icon-shield-alt
      icon-refresh        -> icon-sync-alt
      icon-clock-o        -> icon-clock
      icon-pie-chart      -> icon-chart-pie
      icon-area-chart     -> icon-chart-area
      icon-commenting-o   -> icon-comment-dots
      icon-arrows     -> icon-arrows-alt
      icon-question-circle-o  -> icon-question-circle
      Change-Id: I4fb3feebc11cc335f5dde05cc6e45c50b29359a6
    • Rebecca Blundell's avatar
      Bug 1811904: Fontawesome - Name changes · 7b952964
      Rebecca Blundell authored
      new default for fontawesome is 'solid',
      where we are using a different class (regular or brand),
      we need to add these.
      also confirming that where the icon name has changed, we've
      picked that up.
      Where there's a choice of icon, I've kept it as close to what we
      currently have as possible.
      All free icons can be seen here:
      Name changes:
      icon-trash-alt      -> icon-trash
      icon-pencil         -> icon-pencil-alt
      icon-unlock-alt     -> icon-unlock
      icon-files-o        -> icon-regular icon-copy
      icon-pencil-square  -> icon-regular icon-edit
      icon-file-text      -> icon-file-alt || icon-regular icon-file-alt
      icon-image          -> icon-regular icon-image
      Change-Id: I34646a6857f6cf54dc39572f5a66c07da4f4c0e2
  11. 12 Jun, 2019 1 commit
    • Rebecca Blundell's avatar
      Bug 1827272: move theme dropdown menu to page settings · 33d1f349
      Rebecca Blundell authored
      -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
  12. 02 May, 2019 1 commit
  13. 26 Apr, 2019 1 commit
    • Doris Tam's avatar
      Bug 1825619: change body colour of cards representing pages that have been · 873eef74
      Doris Tam authored
          - removal of line under card header for cards representing submitted
          - added hover colour effect to card header of all cards to be same
            as in 18.10
          - remove hover colour over submitted pages cards footer to return to
            same grey as non-submitted
          - fix messy hovering colours and text-decoration for menu on cards of submitted pages
      Change-Id: I48461773d9f3442b10c5698ac1409af1faf6ea91
  14. 25 Apr, 2019 1 commit
    • Rebecca Blundell's avatar
      Bug 1825687: Objectionable material reported option doesn't align · 0521bf53
      Rebecca Blundell authored
      Change padding for "Objectionable material reported" (class nolink)
      to be the same as other options in the "More options"
      menu on a page
      change flag icon from green to red for the owner of a page reported as
      Change-Id: I3e5a56e964eef33331191d7ccf4ee5bbd68f87fa
  15. 23 Apr, 2019 1 commit
  16. 10 Apr, 2019 2 commits
  17. 09 Apr, 2019 1 commit
    • Evonne Cheung's avatar
      Bug #1822911 User icons not appearing circular in some themes · 74bfb4a6
      Evonne Cheung authored
      Use object-fit:cover to force non-square images to size to the min
      width/height of the image loaded so that it displays the center of
      the image in the correct ratio, hence fixing the issue of oval shapes.
      Added extra classes to tell theme what size the images are to display,
      ie .user-icon-20, .user-icon-40, .user-icon-60, etc, and
      .user-icon-inline for when username is displayed inline with user icon.
      Change-Id: I28e0b37d0961c3be0195f4baef704262a0547af0
  18. 03 Apr, 2019 1 commit
    • Liam's avatar
      Bug #1765276: Upgrading to bootstrap 4.3.1 from 4.2.1 · 29816f61
      Liam authored
      Replaces raw/scss/lib/ files and the lib/bootstrap/assets/javascripts with the new ones
      Involved adding some more variables to the bootstrap_variabes file
      Change-Id: I0440edcbdf53e8ff3994d2e52ce123a2df9ce182
  19. 27 Mar, 2019 1 commit
  20. 21 Mar, 2019 1 commit
    • Cecilia Vela Gurovic's avatar
      Bug 1815829: Move page/collection title outside main content · 7adb6e3b
      Cecilia Vela Gurovic authored
      and move page action buttons (edit, copy, etc)
      outside main content too
      the collection/page heading is now place inside a div container
      with class .pageheader for styling
      and the action buttons are placed inside a div container with
      class .pageactions
      moved profile page/SmartEvidence matrix title outside
      page content
      Change-Id: If79a6c0b6ac8234586f13df855eeebe8f64f1f4c
  21. 26 Feb, 2019 3 commits