1. 30 Jul, 2020 1 commit
  2. 29 Jun, 2020 1 commit
    • Cecilia Vela Gurovic's avatar
      Bug 1885460: load platform.js only for external video block · 55a849e4
      Cecilia Vela Gurovic authored
      TODO
      embedly documentation indicates to do an async load of the file
      https://docs.embed.ly/docs/platformjs
      
      check if it's worth it to allow to define async loads in the
      get_instance_javascript inside the blocktype classes
      for example
      array(
        'file'   =>  (is_https() ? 'https:' : 'http:') . '//cdn.embedly.com/widgets/platform.js',
        'async'  => true,
      )
      
      we would need to also modify the get_all_blocktype_javascript function
      
      behatnotneeded
      
      Change-Id: I8ff3cd0b867edbce24c7b2581e6a23e88b68ff0c
      55a849e4
  3. 25 Jun, 2020 1 commit
  4. 24 Jun, 2020 1 commit
    • Cecilia Vela Gurovic's avatar
      Bug 1857936: Lock page and artefact instructions · 479ff998
      Cecilia Vela Gurovic authored
      - A new page setting “Template” is added to the
      “Advanced” panel on all portfolio page areas of
      Mahara (personal, group, institution, site)
      with a Yes/No switch
      - added 2 columns to view table:
      'templatetocopy': indicates if the view is a
        template that can be copied
      'originaltemplate': if it has a value then the view
        is a copy of a template and should have
        the instructions locked.
        The value it contains is the viewid of
        the original template.
      - if a view is a copy of a template: display
      instructions in view settings and text blocks
      but don't allow to edit them. If empty, don't show them.
      - When adding a new text block to a page,
      don't allow to add instructions
      - Allow to remove the lock on a copy for roles:
          site admins in institution and site pages
          institution admins in institution pages
          group admins in group pages
      - If a template view is deleted from the site,
      then all the locked copies it has will remain locked.
      
      behatnotneeded
      
      Change-Id: I47e98cf8413da5ba6d5dea0e29dddbd80c481317
      479ff998
  5. 15 Jun, 2020 1 commit
  6. 04 Jun, 2020 1 commit
    • Cecilia Vela Gurovic's avatar
      Bug 1857931: Add "Quick edit" and instructions to "Text" block · 86a57a9f
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed
      - add instructions field in text block
      - Instructions are displayed in collapsible section on edit modal
      - show 'quick edit' link in block header (page view mode)
      only for user that can edit page
      - display modal to configure block when clicking 'quick edit' header link
      - saving text as draft, show text content only if
      it's not draft or I'm a user that can edit the page
      - don't display text block content if the text block is in draft
      for other users that can access the page
      - adding yellow background for blocks with draft status
      - adding acessibility 'Draft' labels to blocks for screeen reader
      - display expanded instructions in config modal if they are already set
      - also display the instructions insode the block content, just above the text.
      they are displayed in both display and edit page modes. The instructions are
      always collapsed when the page is loaded
      
      behatnotneeded
      Change-Id: Ia1fa5c1beedab333728d1537d142c04adfd3c981
      86a57a9f
  7. 19 May, 2020 1 commit
    • Cecilia Vela Gurovic's avatar
      Bug 1857933: creating the progress completion page · b98b2814
      Cecilia Vela Gurovic authored
      - added progress completion page for collections
      when the setting is enabled in collection Edit
      - fixed the navigation for collection to include the
      progress completion page
      - added progress bar on progress completion page
      to show the percentage of pages that have been signed off
      - Navigation block: it shows a link to the progress completion
      page if it's enabled in the collection
      - views and collection screen: display link to progress
      completion page in card footer for a collection that has it
      enabled
      - if the signoff blocktype is not enabled then the switch in
      institution and collection settings will not be displayed,
      and the portfolio completion page will not be displayed as
      the first one of the collection
      
      behatnotneeded
      
      Change-Id: Ia836328eb586e9dbbe18d5e682186cfc16830861
      b98b2814
  8. 24 Apr, 2020 1 commit
    • Rebecca Blundell's avatar
      Bug 1839411: Update Mahara to work with PHP7.3/7.4 · 4263848b
      Rebecca Blundell authored and Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic committed
      Fixed strpos error picked up by 7.3
      I haven't found any other 7.3 issues and none have been caught by behat
      
      For 7.4:
      -Fixed implode param order (glue, parts)
       Note that Mink has a reversed implode not fixed upstream:
       external/vendor/behat/mink/src/Selector/Xpath/Escaper.php:50
       I have added a function to copy the correct code over in the interim
       I also pushed a change to an HTMLPurifier file as it is not fixed upstream
      -Changed a variable read by fread to allow for false return type
      -Calling a non-array as an array now causes an error, meaning we need to
       confirm an array value before attempting to use a variable. An obvious
       case is in multi-record db calls the return value is either an array of
       results or false. E.g.
          $array = db_call();//returns false as no results
          //do sth with result
          $var = $array[0]//error, trying to access type false as array
          //instead we need to check the value before accessing:
          $var = !empty($array[0]) ? $array[0] : false //or some equivalent
          check of the db_call's return
       Because of this change, I have attempted to check all the multi-db
       calls for possible false results and include a check for that if there
       wasn't already one.
      -In conjunction with the previous work, I noticed that trying to use
       foreach on a non-iterable result causes an error and that array
       functions (i.e. array_keys()) called on a non-array also cause an
       error. Where I found them I added checks as well.
      -A change in PHP7.2 was that items counted with count() must implement
       Countable. (i.e, int/bool is not OK). I fixed the ones I found.
      -I used the regex \{\$?\d?[^\s]\} to search for array access using {}
       instead of [] and changed those. (Note: the regex pulls in a lot more)
       CSStidy has a lot of these that aren't fixed, but those are covered by
       the CSStidy upgrade (Bug 1840099)
      
      Change-Id: I64a8feb821433ecd99463762a9999449c50ee32e
      4263848b
  9. 21 Apr, 2020 1 commit
  10. 15 Apr, 2020 1 commit
  11. 31 Mar, 2020 3 commits
  12. 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
  13. 01 Mar, 2020 1 commit
    • Cecilia Vela Gurovic's avatar
      Bug 1846994: deprecating Mozilla backpack · 41e50c17
      Cecilia Vela Gurovic authored
      - If a view has a block that contains a badge from
      a deprecated host, then a warning message will be
      displayed at the top of the block.
      There is only one message for all deprecated hosts
      
      behatnotneeded
      
      Change-Id: I8a8c70fe55ab38a69a1dd96fbb60fd0da54c7a2b
      41e50c17
  14. 28 Feb, 2020 1 commit
  15. 31 Jan, 2020 1 commit
    • Robert Lyon's avatar
      Bug 1848092: Add personal labels to groups · eaf89f91
      Robert Lyon authored
      
      
      To allow for filtering by these labels (similar to tags) on
       - the group index page
       - in the mygroups block (on profile / dashboard pages)
       - usr account setting to filter the list in sideblock
      
      Adjusted the filtering to 'OR' join so you can display groups with
      'cat' OR 'dog' labels
      
      Change-Id: Id8c36f05b7dd27d9bf9b90722b2d66c6f3db877e
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      eaf89f91
  16. 10 Jan, 2020 1 commit
  17. 12 Dec, 2019 1 commit
  18. 07 Nov, 2019 1 commit
  19. 22 Oct, 2019 2 commits
  20. 17 Oct, 2019 1 commit
  21. 08 Oct, 2019 2 commits
  22. 07 Oct, 2019 1 commit
  23. 06 Oct, 2019 1 commit
  24. 05 Oct, 2019 1 commit
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Tidying up some lastminute problems · fa4085d5
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed
      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
  25. 04 Oct, 2019 7 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: Importing views with grid layout · af08a138
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed
      Importing views and collection with new grid layout
      
      - leap2A files containing views/collections with
      new grid layout are imported and created with the new layout
      
      - leap2A files containing collections/view with old layout
      will be created with a grid layout. This new layout is
      the translation of the old layout they had in the leap2A file.
      The heights of the blocks will be updated when the
      views are first displayed in the browser.
      
      behatnotneeded
      
      Change-Id: Ia43b7a5c11109023d3caa65ba16e3b6aebcdbe75
      af08a138
    • 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: block resizing to fit content · 565776fb
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed
      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: removing old layout from mahara install · b8afbd15
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed
      behatnotneeded
      
      Change-Id: If0e93ba7d1ff49fac57fc3d910c4586c9c23d877
      b8afbd15
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Creating a new page with gristack layout · 2c861ec1
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed
      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 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
  26. 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
  27. 25 Sep, 2019 4 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: Plans block · ece65af4
      Lisa Seeto authored
      
      
      behatnotneeded
      
      The plan block's 'details' link will only display if license metadata is available.
      The link will open the modal with licensing information.
      Update how the licensemetadata is set in smarty variable.
      remove old details link and use new block header instead.
      remove the use of modal functionality, block headers & smarty vars
      
      Change-Id: I5f06d9ba84ff018a50ba774763be3fcede9b2576
      Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
      ece65af4
    • 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