- 04 Oct, 2019 30 commits
-
-
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
-
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
-
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
-
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
-
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
-
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
-
Cecilia Vela Gurovic authored
behatnotneeded Change-Id: Ia4f1fa57d317bc2ab81db4b4e41147e06ecc14f6
-
Cecilia Vela Gurovic authored
behatnotneeded Change-Id: Ib20121937f6b7c64df65a620acbca93dd683d18f
-
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
-
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
-
Cecilia Vela Gurovic authored
+ fix for loading block with ajax + also display group page with new layout behatnotneeded Change-Id: If93da8afb3069349e5c7612dc41df0faa3394e10
-
Cecilia Vela Gurovic authored
behatnotneeded Change-Id: If0e93ba7d1ff49fac57fc3d910c4586c9c23d877
-
Cecilia Vela Gurovic authored
added a js event 'blocksloaded' to signal the blocks were loaded in the grid and the are available in the DOM behatnotneeded Change-Id: I8f54eab5b5b71c712578d8af0f5684497d2f33bc
-
Cecilia Vela Gurovic authored
The blocks saved with the new layout are now displayed in page edit and view mode behatnotneeded Change-Id: Ic8c1011745593be552cc1a4377a7351cc9a04bb9
-
Cecilia Vela Gurovic authored
- 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
-
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
-
Cecilia Vela Gurovic authored
they won't be needed anymore also remove use of properties private $dirtyrows; private $dirtycolumns; Change-Id: I31e0c8296e72e9dd6b2381170864bdc52af766b7
-
Cecilia Vela Gurovic authored
behatnotneeded Change-Id: I99b248e03ffe5b23e622c46ce14765bdf1e47195
-
Cecilia Vela Gurovic authored
- also remove the layout pieform and the custom layout javascript code behatnotneeded Change-Id: I3e2e2b3f09106dd2a341a40d178feca693194e64
-
Cecilia Vela Gurovic authored
and remove 'unique constraint' on block_instance table on view,row,column and order columns behatnotneeded Change-Id: Icee562986422d82506f43748ec968abd9d1d7146
-
Cecilia Vela Gurovic authored
Adding gridstack and lodash library behatnotneeded Change-Id: I4143d4dcde2f34bce019d6da900253c61ae6e7a5
-
Robert Lyon authored
but now make them all in the future Change-Id: I79741ceee5f686cf11947f2a63a14d19c997075f Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
Merge "Bug 1844470: Move "Display page" and "Return to pages and collections" to right-hand side on "Edit" screen"
-
Robert Lyon authored
-
Robert Lyon authored
-
Robert Lyon authored
-
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:
Lisa Seeto <lisaseeto@catalyst.net.nz>
-
Cecilia Vela Gurovic authored
behatnotneeded Change-Id: I939a84633eda48612e8b0e21342c7e6823144ba3
-
Cecilia Vela Gurovic authored
Change-Id: Ia9ec91a5a5c93ec4117337d111cdfb97ee8ff720
-
Cecilia Vela Gurovic authored
Change-Id: Ie7bfa072c6adcad8c95f529c64bd7d3572e923a0
-
- 03 Oct, 2019 7 commits
-
-
Robert Lyon authored
Change-Id: Iae4aecb13d33f23a161af3a01544da9ebf3de6f4 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
Change-Id: I057fd490b2d6b6000522c6bc61d463f36a85fc06 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
-
Robert Lyon authored
Argument 1 passed to ArtefactTypeTask::get_tasks() must be an instance of ArtefactTypePlan, string given Change-Id: I15373b3d2cfc65bc0d167f531159560d25c06cd8 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
-
Robert Lyon authored
Change-Id: I4de0b79dae91dda86f0a90286872843e4d3b18ea Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
behatnotneeded Change-Id: Ie6bafc19ae6ad865a75538a4cae49019a7df5eb3 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
- 01 Oct, 2019 3 commits
-
-
Robert Lyon authored
-
Alexander Del Ponte authored
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
-
Robert Lyon authored
-