1. 07 Oct, 2019 3 commits
  2. 06 Oct, 2019 13 commits
    • Robert Lyon's avatar
      Bug 1835869: Remove obsolete skin options · 0e0ef413
      Robert Lyon authored
      The old options to be removed are:
      
      - header_text_font_color
      - header_link_normal_color
      - header_link_normal_underline
      - header_link_hover_color
      - header_link_hover_underline
      - header_logo_image
      - view_background_color
      - view_background_image
      - view_background_repeat
      - view_background_attachment
      - view_background_position
      - view_background_width
      - view_table_border_color
      - view_table_header_color
      - view_table_header_text_color
      - view_table_odd_row_color
      - view_table_even_row_color
      - view_button_normal_color
      - view_button_hover_color
      - view_button_text_color
      
      behatnotneeded
      
      Change-Id: I909e7bcb4f559d9cd052cf4c7b2b80982ecf109c
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      0e0ef413
    • Evonne's avatar
      Bug 1845104 Various theme fixes part 5 · e8475a33
      Evonne authored
      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
    • Doris Tam's avatar
      Bug 1835869: Add skin background image to page header area · ad7250b7
      Doris Tam authored
      - Created an option in Skin customizing where users may select an image
        as their page header
      - Reorganised tabs and their titles
      - Skin thumbnails display colour/image of header
      - drop the old viewbgimg column and add the headingbgimg column
      
      behatnotneeded: to be added later
      
      Change-Id: Ib5bb4714de479e9c10237d24aa653a5ea227a5f7
      ad7250b7
    • Evonne's avatar
      Bug 1845104 Various theme fixes part 4 · c0cc88de
      Evonne authored
      Fixing plans blocktype markup, inbox blocktype redundant classes,
      alignment of add blocks button, modal thumbnail not floating right,
      resume attachment inconsistencies (to be continued)
      
      behatnotneeded
      
      Change-Id: Ic7c0cc5498dbd3f95f140581cc71b175e944a0d9
      c0cc88de
    • Evonne's avatar
      Bug 1845104 Various theme fixes part 3 · b084c205
      Evonne authored
      Fixing buttons and styleguide
      
      behatnotneeded
      
      Change-Id: I661e6350bb14ac4c77e4bf63777b346810ce5c65
      b084c205
    • Evonne's avatar
      Bug 1845104 Various theme fixes part 2 · 5c5db761
      Evonne authored
      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
      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
      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
      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
      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
      409e6737
    • 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
    • Robert Lyon's avatar
      Bug 1843202: Allow theme fonts to be included in skin_fonts table · d61b9487
      Robert Lyon authored
      So that they can be
      - used in skins
      - viewed on the Admin -> Config -> Fonts page
      
      behatnotneeded
      
      Change-Id: I49aff91a7f56a003adbc9f3513aa9a094a3069e4
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      d61b9487
  3. 05 Oct, 2019 3 commits
    • Robert Lyon's avatar
    • Robert Lyon's avatar
      Merge changes from topic 'WR 303474' · fb9c7fc4
      Robert Lyon authored
      * changes:
        Bug 1813987: Tidying up some lastminute problems
        Bug 1813987: checking old layout tables exists before using them
        Bug 1827445: db_table_exists alternative without changing SQL exceptions
        Bug 1813987: removing layout tables from install
        Bug 1813987: Behat - block creation
        Bug 1813987: Blocks display fixes
        Bug 1813987: Accessibility settings and layout
        Bug 1813987: User should confirm before the view is translated
        Bug 1813987: Creating a view via tags with gridstack
        Bug 1813987: Importing views with grid layout
        Bug 1813987: Exporting views with grid layout
        Bug 1813987: Make view versioning work with gridstack
        Bug 1813987: Copying a page (in old or new layout) creates a page with new layout
        Bug 1813987: Translate old views to new gridstack layout on edit
        Bug 1813987: Making magic block work with gridstack layout
        Bug 1813987: Upgrade to translate site views to new layout
        Bug 1813987: create a block- fixing the saving of a new block
        Bug 1813987: block resizing to fit content
        Bug 1813987: remove layout button from navigation
        Bug 1813987: Display Dashboard and profile page
        Bug 1813987: removing old layout from mahara install
        Bug 1813987: Make the comment block work
        Bug 1813987: Display a page in view mode
        Bug 1813987: allow to choose add block to bottom/top of the grid
        Bug 1813987: Creating a new page with gristack layout
        Bug 1813987: removing helper functions to reorder cells in old layout
        Bug 1813987: Remove 'addcolumn' functionality when editing a view
        Bug 1813987: Remove edit layout section
        Bug 1813987: Creating tables for gridstack page blocks
        Bug 1813987: Adding gristack library
      fb9c7fc4
    • 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
  4. 04 Oct, 2019 21 commits
    • Robert Lyon's avatar
      Bug 1846813: Placing plan html export template in correct folder · 455e6182
      Robert Lyon authored
      Also removing the duplicate plan leap export template
      
      Change-Id: If9ca389df8f04d719f218c3ce378205a02607174
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      455e6182
    • Robert Lyon's avatar
      8ccb6979
    • Chanil Park's avatar
      Avoid progress bar overlapping border · 37637197
      Chanil Park authored
      - Remove export progress bar's scrollbar
      - Remove progress_meter overlap and have bar same height as export
      progress bar
      
      Change-Id: Ife0d77e0388d86c010838af49577622d6f6a30ca
      37637197
    • Robert Lyon's avatar
    • 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
    • Robert Lyon's avatar
      Fixing behat test for temlate_blocks · 7fefd39f
      Robert Lyon authored
      Change-Id: If97d8afc67855aac7916b57a12f06b8740487c5e
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      7fefd39f
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: checking old layout tables exists before using them · 279c2d49
      Cecilia Vela Gurovic authored
      - when deleting an institution
      - added a function to simulate the content of
      view_layout_column table that was deleted.
      This is needed when importing a portfolio with
      old layout
      - removed function addcustomlayout and some
      other code not used anymore
      - removed function get_layoutrows that was used
      when editing old layouts
      
      behatnotneeded
      
      Change-Id: Ibebf50103bf1811894e75a21a668c4700283e703
      279c2d49
    • Cecilia Vela Gurovic's avatar
      Bug 1827445: db_table_exists alternative without changing SQL exceptions · fb37ef6e
      Cecilia Vela Gurovic authored
      and the same for db_column_exists
      
      behatnotneeded
      
      Change-Id: Id69e285b39aff1dca7edbbf16847c3b7a436baa5
      fb37ef6e
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: removing layout tables from install · 24e838cf
      Cecilia Vela Gurovic authored
      - removing
      'usr_custom_layout'
      'view_layout_rows_columns'
      'view_layout'
      'view_layout_columns'
      
      behatbitneeded
      
      Change-Id: Ic53029dfc33b6366c38750d1453cbb64fd9c317e
      24e838cf
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Behat - block creation · 9cf3d8eb
      Cecilia Vela Gurovic authored
      - Data generator creates blocks for new gridstack layout
      - we don't look for nodes inside script elements
      
      behatnotneeded
      
      Change-Id: I0e791c431ab6b80e75ae397290a20b3ec9fba836
      9cf3d8eb
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Blocks display fixes · ccc2446d
      Cecilia Vela Gurovic authored
      - 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: 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: Creating a view via tags with gridstack · 1a1d2a69
      Cecilia Vela Gurovic authored
      when creating blocks via tags
      - the position of the copied blocks in the new view
      will be one on top of the other
      - if the block comes from a view with grid layout,
      it will take the width & height from its dimensions
      - if the block comes from an old layout view,
      it will be created with default dimensions
      width = 4
      height = 3
      
      behatnotneeded
      
      Change-Id: I465e09fa4af6742913302c7ef278708c3cb627bc
      1a1d2a69
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Importing views with grid layout · af08a138
      Cecilia Vela Gurovic authored
      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: 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: Making magic block work with gridstack layout · 66c08ce0
      Cecilia Vela Gurovic authored
      In view edit mode, dragging the button '+' on the
      right top menu, will add a block in the page
      with dimensions height=3 and width=4
      
      behatnotneeded
      
      Change-Id: I5f4334886f6685bd047cb5bfbf0d59dd3880109a
      66c08ce0
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: Upgrade to translate site views to new layout · 15bca1e7
      Cecilia Vela Gurovic authored
      behatnotneeded
      
      Change-Id: Ia4f1fa57d317bc2ab81db4b4e41147e06ecc14f6
      15bca1e7