1. 08 Oct, 2019 3 commits
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: resizing block when expandig collapsible inside block · 02c6617d
      Cecilia Vela Gurovic authored
      fixes failed step in resume_page.feature
      fixes in timeline view to expand a block to fit content
      
      behatnotneeded
      
      Change-Id: I1d187f338c0c36795efff40bbe8d9447b2d66124
      02c6617d
    • Evonne's avatar
      Bug 1835329 Alert message icons · cacded84
      Evonne authored
      Taken out spans within alert and put in icons in alert:before,
      added variation for site-messages so it can be shorter and hang
      with page breakpoints. Also added icons for error messages under
      form inputs.
      
      behatnotneeded
      
      Change-Id: Ia31af160808ecc2943bb16ba68f04e8a98c0e055
      cacded84
    • Evonne's avatar
      Bug 1845104 Various small style bugs · cfc151e0
      Evonne authored
      - Chervons missing in inbox block, conflicting with text-small.
      - People list h4 wrapping portfolio list, moving it out.
      - dashboard editbuttons placement dependent on h1/h2 above, put in
        better conditions so it doesn't need it at all.
      - Plans chervon too far in, moved it out as no longer has details.
      
      behatnotneeded
      
      Change-Id: I50e60e2fb2c8be2370856823497a1b9099d1c28f
      cfc151e0
  2. 07 Oct, 2019 3 commits
    • Doris Tam's avatar
      Bug 920246: Adding category filter to admin/groups/groups.php · c541934b
      Doris Tam authored
      - Like the group/index.php page with the filter, this page also
        has a problem with the button when the width of screen is too small
      - Added a parameter to an existing helper function for groupcategory
        (build_group_list_html
      - Helper function group_get_extended_data(..) to htdocs/lib/group.php
      - Fix previous bug failure due to button class change for submit
      - Styling for table changed to to "break-word" to stop truncating words
      - overflow of buttons controlled + responsive results heading+footer
      - button moved to first level of form to stop button cutting button on
        small screen
      behatnotneeded
      
      Change-Id: I646135f6963f944b6d253d800882a77cac995e1a
      c541934b
    • Rebecca Blundell's avatar
      Bug 1840111: Update popper library to 1.15.0 · 2d85c2bc
      Rebecca Blundell authored
      also moved it to js since it's js
      
      behatnotneeded
      
      Change-Id: Ifdaa9cb44f188ec61f83f4e97ad99d4e2dab4434
      2d85c2bc
    • Robert Lyon's avatar
      Bug 1844838: Show more versioning info on site info block · 22a6111e
      Robert Lyon authored
      On the admin overview page
      
      Now lets you know:
      - if your branch version is not the latest
      - if your branch is a supported branch
      - if you are on the development branch (eg master)
      
      behatnotneeded
      
      Change-Id: I42ed605b7a298f7a006ea6f9eba9b3d551dc41ad
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      22a6111e
  3. 06 Oct, 2019 4 commits
  4. 05 Oct, 2019 1 commit
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Tidying up some lastminute problems · fa4085d5
      Cecilia Vela Gurovic authored
      like
      - 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
      
      behatnotneeded
      
      Change-Id: I3f552ce8f89125e9fd233513c855879aa7678048
      fa4085d5
  5. 04 Oct, 2019 15 commits
    • Aaron Wells's avatar
      Bug 1560778: Modal window for institution auth config · 3c396f54
      Aaron Wells authored
      Have rebased this and got it working by removing old mochikit stuff
      
      behatnotneeded
      
      Change-Id: Id4bbd0d08d6b743fdec426f27e41a2fbb9857651
      3c396f54
    • 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)
      
      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
      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: Exporting views with grid layout · b6cd876f
      Cecilia Vela Gurovic authored
      In exporting section:
      /export/index.php
      
      - 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
      
      NOTE
      borrow some code from https://reviews.mahara.org/#/c/10157/
      as an early rebase (the patch is not on master yet)
      
      behatnotneeded
      
      Change-Id: I0c36c110c6b9ef7ae3edc4d0662a0dbab302684a
      b6cd876f
    • 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
      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
      - 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: 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.
      
      TODO:
      confirmation before trnaslating a page to the new grid layout
      
      behatnotneeded
      
      Change-Id: I46f5cdbacb026519631503437c10d33f1b2800e5
      32de0b18
    • 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
      
      behatnotneeded
      
      Change-Id: Ie8183736580e7e592b24e36f4a16618b96a5bf4e
      565776fb
    • 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
      
      behatnotneeded
      
      Change-Id: Icd90bd4980b9be566f7e20aee6271476edafe321
      f9295a81
    • 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
      
      behatnotneeded
      
      Change-Id: If93da8afb3069349e5c7612dc41df0faa3394e10
      6aadcd02
    • 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
      
      behatnotneeded
      
      Change-Id: Ic8c1011745593be552cc1a4377a7351cc9a04bb9
      c0f57e7d
    • 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:
       https://reviews.mahara.org/#/c/9952
      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:
       https://reviews.mahara.org/#/c/9986
      and they will be fixed there
      
      behatnotneeded
      
      Change-Id: If4521a6315f6e8cc5d88693f536946dace359288
      2c861ec1
    • 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
      2a9211b3
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Remove 'addcolumn' functionality when editing a view · 5f57b602
      Cecilia Vela Gurovic authored
      behatnotneeded
      
      Change-Id: I99b248e03ffe5b23e622c46ce14765bdf1e47195
      5f57b602
    • 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
      
      behatnotneeded
      
      Change-Id: Iedf2882c42fa1d204e438a23842834fbb9a709f9
      Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
      466b4a8a
  6. 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.
      
      behatnotneeded
      
      Change-Id: I61d302e1582abe9b6078f6d1bfe04703da4e13bf
      77af8856
  7. 29 Sep, 2019 1 commit
  8. 26 Sep, 2019 1 commit
    • Evonne's avatar
      Bug 1827811: Journal and resume details buttons overlap · f5ca6b3a
      Evonne authored
      Fixes for journal titles and resume attachments for employment
      overlapped by details button.
      
      behatnotneeded
      
      - clean up unneccessary include in export/html/lib.php
      - fix html export for the creation of nested folder modals
       make sure the nested folders and find all nested modals
      - fix elseif typo in block-comments-details-header.tpl
      - add details bar to image gallery when displayed from folders
      - fix notes block empty modal issue due to .tpl typo
      - fix image gallery slideshow error where second gallery block
      always targets the first
      - keep the active block headers showing after pagination update
      
      Change-Id: Icf8d59ad558d74883e3ee2070f55768697af4254
      f5ca6b3a
  9. 25 Sep, 2019 7 commits
    • Lisa Seeto's avatar
      Bug 1827811: Resume Icons · 953a5eab
      Lisa Seeto authored
      - get attachment comment counts for bh icons
      - display plain text for titles in editing mode
      - change the way the commentlink is targetted via js
      - add blockid's to resume attachments
      - for folder block: add comment count, change titles from
      	links to plain text when editing
      - change notes attachment file titles from links to plain
      	text when editing
      - get rid of the single artefact block title links for html exports
      ---------------------------------------------------------
      Add fixes:
      - blocks that have set types but no artefacts attached don't have modal links
      - pdf block is now using block header and comment count is loaded
      - block headers are above titles
      - tagged journals have icons when in full and matches recent posts styling
      - deleting all comments produces correct icon on block header
      - html exports should not hang on opening modal
      - get rid of warning error re: dock.show() when redirecting from &modal=1 style url
      - code review fixes for all previous patches + fix issue with folders block
      - added in viewdetailsfilter.json.php file to save details mode to user account prefs table
      - make the details btn mode "sticky" so it stays the save value over multiple pages etc...
      - Image Gallery blocks: if displaying a folder of images will get the bar block header and
      will have a the fancy box image preview displaying on image click
      
      Change-Id: I425cc5a634e176d580aacdb60a20f869f7cb7496
      Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
      953a5eab
    • Lisa Seeto's avatar
      Bug 1827811: Embedded Media Task · b82df03d
      Lisa Seeto authored
      add the block-header to the block.
      remove the download link from page as it now shows in the modal.
      add artefactid and blockid to image.tpl
      fix issue with data-toggle collapse targeting syntax error.
      update  active block functionality for block headers
      update block-comments-details-header.tpl for icon headers
      fix Journals, and tagged entries and recent posts to use icons for block header.
      change pdf block to use block header icons
      clean up .comments-details class that is no longer needed.
      add modal functionality for image gallery blocks for thumbnails and thumbnails square presentation.
      add modal functionality for some html block, clear up js for icons that is no longer needed.
      add title text to icons and block-header
      create activateModalLinks() func to tidy up js modal click events in view/view.php
      
      Change-Id: Ib5967d44288557ef4d380eb99241e8442da90f29
      Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
      b82df03d
    • Lisa Seeto's avatar
      Bug 1827811: Exports task · e6b6ecf9
      Lisa Seeto authored
      This change creates the modals for exported html pages.
      Modals are hard-coded onto page with id's of modal_[artefactid]
      Bootstrap and jquery files are copied into export js folder.
      Profile page is also exported with any modal content.
      Add tagged posts modals
      get rid of export warning when no $commentcount set in viewposts.tpl
      Add recent posts modals so that first journal post was also a modal
      Set Parent journal link text to plain text for exports
      Add entire resume modals and one resume field modals
      Add File(s) to download modals
      refactor export_artefact_metadata_modals
      add metadata but not comments to resume page
      add metata (license info) but not comments to journal pages
      add comment count default to 0 in .tpl's if comment count not present (during export)
      remove updating comments modals for profile page as this is no longer needed.
      
      Change-Id: Iff50138285951a4f9a1573423f4f74feba97886f
      Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
      e6b6ecf9
    • Lisa Seeto's avatar
      Bug 1827811: Notes block · 1885a18d
      Lisa Seeto authored
      do not show note contents when displayed in a modal.
      if comments not allowed but license metadata is on, display details link and open model with license data.
      make small change to setting of licensemetadata smarty variable
      get rid of comments/details links and use the new block header instead.
      
      Change-Id: I9183292278d06a3766ae08b0376237fda8d7206c
      Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
      1885a18d
    • Lisa Seeto's avatar
      Bug 1827811: Resume changes · 8df0061e
      Lisa Seeto authored
      added the modal_link for resume field attachments
      fixed the modal)link typo in employmenthistory template
      update commentlink to modal_link for goals and skills template
      
      Change-Id: I8b203628dc47d7019ee75165cb11bc392ddefa03
      Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
      8df0061e
    • Lisa Seeto's avatar
      Bug 1827811: Journal changes · f7431a3a
      Lisa Seeto authored
      Journal changes:
      Change the modal contents to not show post contents or attached files.
      Recent posts and Tagged posts (if not in full display) now expandable with post contents and comment links.
      Attached files on page block now links only to download and not to display further metadata.
      Cleaned up artefact.php links.
      remove metada that will show on entry on page from also showing in modal
      stop background page scrolling when the modal is opened and "Advanced licensing" is selected.
      add the blogpost_render_in_modal.tpl file
      get rid of scrolling for data-toggle collapse
      add block-header to journal, journal entry
      add titles as modal links for recent posts and tagged journal entries
      add comments and details icons for recent posts and tagged journal entries
      fix things from code review
      
      behatnotneeded
      
      Change-Id: Ic63ebf9fe42e7848559b5e009584fdff0a40770f
      Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
      f7431a3a
    • 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:
      Image
      Note
      File(s) to download
      Journal/blogs
      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>
      be7af61f
  10. 19 Sep, 2019 1 commit
  11. 06 Sep, 2019 1 commit
  12. 28 Aug, 2019 1 commit
  13. 12 Aug, 2019 1 commit