1. 01 Oct, 2019 1 commit
    • Alexander Del Ponte's avatar
      Bug 1837999: Extend the plans functionality · 6a10a44d
      Alexander Del Ponte authored and Robert Lyon's avatar Robert Lyon committed
      The plans are extended to allow for the creation
      of template plans in the personal portfolio area.
      These templates can then be used to create plans
      in many groups for students to copy into their own
      portfolio area and complete as assignments.
      
      behatnotneeded: To come later
      
      Change-Id: Ifbdf70541c0a0a254af3cbb9390d883a60e591d0
      6a10a44d
  2. 25 Sep, 2019 11 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: UI Task · fb47b831
      Lisa Seeto authored
      
      
      The change is for making sure the styling is working for the blocks.
      
      * make file(s) to download use bh icons, metadata on new line
      * resume attachments to use icons (buggy but apparently necessary)
      * show file(s) to download titles on hover over link
      * get rid of '-' for file metadata for size etc...
      * fix the editing/display descrepancy of tagged/recent posts titles
      
      Change-Id: Iad7bb30944f5924b43eca96993e3334120076c05
      Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
      fb47b831
    • 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: Folder Task · 44fcc9c9
      Lisa Seeto authored
      
      
      This change adds modal functionality for folders and nested folders
      add javascript to the folder_render_self template.
      add new class to make space between icon and title/ metadata in modals
      fix blockid warning message error
      added folder_render_in_modal.tpl to fix duplicate js script issues interferring with js events
      creaeted toggleDetailsBtn() to handle js issues
      get rid of old style comments link from showing up.
      turn off click functions so json sendrequest doesn't call a billion times.
      explicitly call dock.show() in the open_modal func.
      
      Change-Id: I938f98c33479a80afc8f940038ed81a3c84ce4ff
      Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
      44fcc9c9
    • Lisa Seeto's avatar
      Bug 1827811: Redirects · 79201b7d
      Lisa Seeto authored
      
      
      This change cleans up the last of the redirects to artefact/artefact.php
      Update the links for the journal and journal entries for elasticsearch to go to blog
      Update the links for the journal and journal entries in consideration of new reqs
      Update artefact/artefact with session msg + access denied error
      
      Change-Id: Ied34542632bd4e49a353ec17937d685614117643
      Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
      79201b7d
    • 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: 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
  3. 20 Sep, 2019 1 commit
    • Robert Lyon's avatar
      Bug 1827445: Check if a table exists in a quicker way · 6a26a0c7
      Robert Lyon authored and Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic committed
      
      
      Without needing to include the lib/ddl.php file, and create
      the xmldb table objects
      
      We do this by trying to query the table to return one value
      and capture the SQLException if it doesn't exist
      
      The places changed are where we don't manipulate the table - so have
      left upgrade places the same as we will need to do things the ddl.php
      way anyway
      
      behatnotneeded
      
      Change-Id: Ic38cee95a221a22e644370b308356cf687a1e831
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      6a26a0c7
  4. 19 Sep, 2019 1 commit
  5. 25 Aug, 2019 1 commit
  6. 12 Aug, 2019 2 commits
  7. 07 Aug, 2019 1 commit
  8. 06 Aug, 2019 1 commit
    • Robert Lyon's avatar
      Bug 1838908: Email info out of sync · 0cd7ed99
      Robert Lyon authored
      
      
      When adding a non-primary email via:
       set_profile_field($userid, 'email', $email, TRUE);
      
      we shouldn't set email field in usr table to this new email address
      as the usr.email should be the primary address one
      
      Change-Id: Id8e780f3d7efa3baaae6383932e825a9cceb5e46
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      0cd7ed99
  9. 04 Aug, 2019 1 commit
  10. 31 Jul, 2019 1 commit
    • Kristina Hoeppner's avatar
      Bug 1811904: Font Awesome icon adjustments · 0a9c9356
      Kristina Hoeppner authored and Robert Lyon's avatar Robert Lyon committed
      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
      
      behatnotneeded
      
      Change-Id: Ief8f4b4393b1becfb18a8c39d3ef6b8966bbe9eb
      0a9c9356
  11. 17 Jul, 2019 1 commit
  12. 09 Jul, 2019 2 commits
    • Rebecca Blundell's avatar
      Bug 1811904: Fontawesome - final name changes · c3479dc6
      Rebecca Blundell authored and Robert Lyon's avatar Robert Lyon committed
      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.
      
      behatnotneeded
      
      Change-Id: I4d27e450a281dc49716d97de309a3c99b89a0bc1
      c3479dc6
    • Rebecca Blundell's avatar
      Bug 1811904: Fontawesome - yet more name changes · e84165b0
      Rebecca Blundell authored and Robert Lyon's avatar Robert Lyon committed
      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
      e84165b0
  13. 05 Jul, 2019 2 commits
    • Ghada El-Zoghbi's avatar
      Bug 1833034: fix error when removing an image · af07e62f
      Ghada El-Zoghbi authored
      Sponsored by The Australian National University
      
      behatnotneeded
      
      Change-Id: If92710cc6c48d7f185f094ab84e2a6e136bfcfc0
      af07e62f
    • Doris Tam's avatar
      Bug 1714082: prevent users from emails being case sensitive. · 52ce6a21
      Doris Tam authored
      All emails are checked case-insensitively, but are kept in the db in
      the way user has typed
      - institution regisistrations are pending and don't appear in usr,
        artefact, or artefact_internal_profile_email, but in usr_registration
        so added additonal check
      - placed helper function inside user.php
      - putting in a special character before the @ will give single error
      - putting in a special char after the @ will flag a spam checker and out
        two errors
      
      behatnotneeded
      
      Change-Id: Iac1b740bc34878978ccf207d241f2399d7641040
      52ce6a21
  14. 04 Jul, 2019 1 commit
  15. 25 Jun, 2019 2 commits
    • Rebecca Blundell's avatar
      Bug 1811904: Fontawesome - more name changes 2 · 4b16a73f
      Rebecca Blundell authored and Robert Lyon's avatar Robert Lyon committed
      icon-envelope-o     -> icon-regular icon-envelope
      icon-exchange       -> icon-exchange-alt
      icon-file-image-o   -> icon-regular icon-file-image
      icon-id-badge       -> icon-regular icon-id-badge
      icon-id-card-o      -> icon-regular icon-id-card
      icon-clone          -> icon-regular icon-clone
      icon-sign-out       -> icon-sign-out-alt
      
      behatnotneeded
      
      Change-Id: I6f07f3b9c14184e98e44cd1b5568766d3fa9221a
      4b16a73f
    • Rebecca Blundell's avatar
      Bug 1811904: Fontawesome - Name changes · 7b952964
      Rebecca Blundell authored and Robert Lyon's avatar Robert Lyon committed
      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:
      https://fontawesome.com/icons?d=gallery&m=free
      
      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
      
      behatnotneeded
      
      Change-Id: I34646a6857f6cf54dc39572f5a66c07da4f4c0e2
      7b952964
  16. 24 Jun, 2019 1 commit
  17. 20 Jun, 2019 2 commits
  18. 19 Jun, 2019 1 commit
  19. 18 Jun, 2019 1 commit
  20. 14 Jun, 2019 2 commits
  21. 26 May, 2019 1 commit
    • Kevin Dibble's avatar
      Bug 1044878: Editing duplicated content · 62d8203a
      Kevin Dibble authored and Robert Lyon's avatar Robert Lyon committed
      Added a new feature that the user has to choose yes to
      start editing copy. This will force users to interact with the
      form before editing with the choice that they are editing
      all copies of this content.
      
      When selecting to use content from another note, the
      form will update based on their choice. The editor will
      remain open if yes has been selected. The editor will
      be hidden and only the content will show if 'Yes' has
      not be selected.
      
      This is a UI element only - no decision is saved to the
      DB as this is an editor based decision.
      
      behatnotneeded
      
      Change-Id: If44522c00672b296242893f0c876e7ff37561dd2
      62d8203a
  22. 13 May, 2019 1 commit
  23. 07 May, 2019 1 commit
  24. 01 May, 2019 1 commit
    • Kevin Dibble's avatar
      Bug 1044878: Editing duplicated content · 0df38c69
      Kevin Dibble authored and Robert Lyon's avatar Robert Lyon committed
      Added a new feature that the user has to choose yes to
      start editing copy. This will force users to interact with the
      form before editing with the choice that they are editing
      all copies of this content.
      
      When selecting to use content from another note, the
      form will update based on their choice. The editor will
      remain open if yes has been selected. The editor will
      be hidden and only the content will show if 'Yes' has
      not be selected.
      
      This is a UI element only - no decision is saved to the
      DB as this is an editor based decision.
      
      behatnotneeded
      
      Change-Id: Idb8d6736796a2350359bd59395393f6c7d742f96
      0df38c69