1. 19 Oct, 2019 1 commit
    • Evonne's avatar
      Bug 1845104 Modern theme changes · 1d1bb649
      Evonne authored and Robert Lyon's avatar Robert Lyon committed
      - removed redundant styles
      - reconvert files to make macros work on windows (has to do with woff)
      - put necessary changes back into raw
      - put in OFL file for font Raleway
      
      behatnotneeded
      
      Change-Id: If1a3eb4bfba86ec18f3f0e38104b79e6642048d0
      1d1bb649
  2. 09 Oct, 2019 1 commit
  3. 08 Oct, 2019 6 commits
    • Rebecca Blundell's avatar
      Bug 1840108: Customisations to select2 4.09 · 3dcc515f
      Rebecca Blundell authored and Robert Lyon's avatar Robert Lyon committed
      Adding in changes made as per the select2 README.Mahara
      and adding commit details to the README where that was helpful in finding
      the changes.
      
      behatnotneeded
      
      Change-Id: I8579ba86d303ecc3b1d5ec50fb9e53972c8c2ff9
      3dcc515f
    • Rebecca Blundell's avatar
      Bug 1840108: upgrade select2 library to 4.09 · 52e5dffc
      Rebecca Blundell authored and Robert Lyon's avatar Robert Lyon committed
      replaced select2 files with 4.09 versions
      
      behatnotneeded
      
      Change-Id: Ia1b4f896db75b55624d3917dbc08fcbdc3a137bd
      52e5dffc
    • Rebecca Blundell's avatar
      Bug 1840112: update tinymce library to 5 · ada3e2cd
      Rebecca Blundell authored
      Replaced tinymce 4 files with tinymce 5
      Moved from unsupported 'light' skin to new 'oxide' skin included with v5.0
      Default theme has been changed from 'modern' to 'silver'
      Changes to tooltoggle plugin to work with new version
      Updated behat steps for change in class names
      Styling changes
      
      behatnotneeded
      
      Change-Id: I731962f8c522358034178528846aa0c35187d74a
      ada3e2cd
    • Evonne's avatar
      Bug 1845104 More small style bugs · 139991ae
      Evonne authored and Robert Lyon's avatar Robert Lyon committed
      - Plan block in editor has chervons hidden under buttons.
      - Removing list-group-item first-child top border only when list
        appears directly below heading and not other cases, this gets
        repeated for in editor.
      - Tagged journal in full block should be flushed.
      - PDF has slight gap under header just like images/media.
      - PDF configure form has alert message with better spacing
      - Brand icons weren't working, like social media.
      
      behatnotneeded
      
      Change-Id: I7d373034de8188be5e8535d488468ef371516a22
      139991ae
    • Evonne's avatar
      Bug 1835329 Alert message icons · cacded84
      Evonne authored and Robert Lyon's avatar Robert Lyon committed
      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 and Robert Lyon's avatar Robert Lyon committed
      - 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
  4. 07 Oct, 2019 4 commits
    • Evonne's avatar
      Bug 1847009 Plan checkbox not clickable · 47b8964e
      Evonne authored
      When the outer-link was put in so that the entire thing can be
      clicked to expand, the checkbox was lost under the z-index. Fix
      now put the checkbox over the outer-link, making it clickable again.
      
      behatnotneeded
      
      Change-Id: Ie559560d5f43b8f841ee83538b5823d350f9387f
      47b8964e
    • Evonne's avatar
      Bug 1845104 Page and collection horizontal scroll · 178bb243
      Evonne authored
      Took out overflow-x: auto; in .view-container, can't see it
      breaking anything else so might be redundant legency css. Pages
      and Collections should no longer have an orange horizontal scroll
      under it.
      
      behatnotneeded
      
      Change-Id: I52f0a77a403cdc72163b4d7a60f19f99b28c0486
      178bb243
    • Robert Lyon's avatar
      Bug 1838915: Fixing problem with brands icons · 90df4cc6
      Robert Lyon authored
      
      
      Problem only exists on older browsers
      
      behatnotneeded
      
      Change-Id: Ie87ef3d3ae8f6bd81ec051afe69dbe0c7d228ea9
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      90df4cc6
    • Doris Tam's avatar
      Bug 920246: Adding category filter to admin/groups/groups.php · c541934b
      Doris Tam authored and Robert Lyon's avatar Robert Lyon committed
      - 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
  5. 06 Oct, 2019 9 commits
    • Evonne's avatar
      Bug 1845104 Various theme fixes part 5 · e8475a33
      Evonne authored and Robert Lyon's avatar Robert Lyon committed
      Changing attached files to not a heading and getting unified
      markup and styling of attachments and downloads across journals,
      resumes and files.
      
      behatnotneeded
      
      Change-Id: I66ae6a41068273af3780577bad5acf6f812d08d2
      e8475a33
    • Evonne's avatar
      Bug 1845104 Various theme fixes part 4 · c0cc88de
      Evonne authored and Robert Lyon's avatar Robert Lyon committed
      Fixing plans blocktype markup, inbox blocktype redundant classes,
      alignment of add blocks button, modal thumbnail not floating right,
      resume attachment inconsistencies (to be continued)
      
      behatnotneeded
      
      Change-Id: Ic7c0cc5498dbd3f95f140581cc71b175e944a0d9
      c0cc88de
    • Evonne's avatar
      Bug 1845104 Various theme fixes part 3 · b084c205
      Evonne authored and Robert Lyon's avatar Robert Lyon committed
      Fixing buttons and styleguide
      
      behatnotneeded
      
      Change-Id: I661e6350bb14ac4c77e4bf63777b346810ce5c65
      b084c205
    • Evonne's avatar
      Bug 1845104 Various theme fixes part 2 · 5c5db761
      Evonne authored and Robert Lyon's avatar Robert Lyon committed
      Fixing metadata inheriting title fonts, plans alignment, comments.
      
      behatnotneeded
      
      Change-Id: Ice9dc3e5b090ad89340bcc6debfd0286d3609395
      5c5db761
    • Evonne's avatar
      Bug 1845104 Various theme fixes part 1 · 65103626
      Evonne authored and Robert Lyon's avatar Robert Lyon committed
      Fixing some inconsistencies with user-icon sizes, on profile page,
      and recent forum posts, and taking out some redundant styles.
      
      behatnotneeded
      
      Change-Id: Ifef04d165a2257b6c89f007f82b33ef0b37edc3b
      65103626
    • Evonne's avatar
      Bug 1843823: Fixing up styling for resume blocks · fb0adb74
      Evonne authored and Robert Lyon's avatar Robert Lyon committed
      Flushing parent list-group-items, giving headings more visual
      definition, spacing around elements so there's better grouping
      of elements visually.
      
      behatnotneeded
      
      Change-Id: I0031e7a27849de3dd16a150a9899ca775e1f75ba
      fb0adb74
    • Evonne's avatar
      Bug 1845273 Rejig CSS for wall posts · 4b545041
      Evonne authored and Robert Lyon's avatar Robert Lyon committed
      Removed double <h1>. Changed the markup to reflect a list-group
      so it aligns with comments. Clean up styles.
      
      behatnotneeded
      
      Change-Id: I4920fa2c99ea057401128b4c126004345f6cc56a
      4b545041
    • Evonne's avatar
      Bug 1845061 Logo size in institution settings page · 7378486a
      Evonne authored and Robert Lyon's avatar Robert Lyon committed
      Restricting the size of the logo displayed within the form after
      a image is uploaded, the logo has max height according to navbar
      height variable, the logoxs has a set height of 48px, values based
      on raw theme.
      
      behatnotneeded
      
      Change-Id: I92813a5c7c689675e55397cd26d870919d9bc33a
      7378486a
    • Robert Lyon's avatar
      Bug 1844953: Make the font specimens appear in modal · c0889d62
      Robert Lyon authored
      
      
      Rather than a new page
      
      behatnotneeded
      
      Change-Id: If81c1b343b1d32e291ca90e036082009c2d33a4f
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      c0889d62
  6. 04 Oct, 2019 9 commits
    • Chanil Park's avatar
      Avoid progress bar overlapping border · 37637197
      Chanil Park authored and Robert Lyon's avatar Robert Lyon committed
      - Remove export progress bar's scrollbar
      - Remove progress_meter overlap and have bar same height as export
      progress bar
      
      Change-Id: Ife0d77e0388d86c010838af49577622d6f6a30ca
      37637197
    • Aaron Wells's avatar
      Bug 1560778: Modal window for institution auth config · 3c396f54
      Aaron Wells authored and Robert Lyon's avatar Robert Lyon committed
      Have rebased this and got it working by removing old mochikit stuff
      
      behatnotneeded
      
      Change-Id: Id4bbd0d08d6b743fdec426f27e41a2fbb9857651
      3c396f54
    • 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: Translate old views to new gridstack layout on edit · 32de0b18
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed
      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 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: 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: 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: 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
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Adding gristack library · 61acdaa6
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed
      Adding gridstack and lodash library
      
      behatnotneeded
      
      Change-Id: I4143d4dcde2f34bce019d6da900253c61ae6e7a5
      61acdaa6
  7. 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
  8. 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
  9. 26 Sep, 2019 2 commits
    • Evonne's avatar
      Bug 1843823: Plans block running into next plan when more than one · bf4e742f
      Evonne authored and Robert Lyon's avatar Robert Lyon committed
      Inside a plan block when there are more than two plans, the second
      plan's heading overlaps the first plan. Fix puts in a clear both
      in the div.
      
      behatnotneeded
      
      Change-Id: Ic7bbda42df5d2f5edb4f6aec3ea764b884fc8e37
      bf4e742f
    • 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
  10. 25 Sep, 2019 6 commits
    • Evonne's avatar
      Bug 1827811: UI Task theming · f8d9ec0a
      Evonne authored
      Fixing alignments and hover/active states for assessment buttons.
      
      behatnotneeded
      
      Change-Id: I8774ecc53d5d3744f1e4e0b6debf2e6476e71ce8
      f8d9ec0a
    • 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: 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