Commit graph

4306 commits

Author SHA1 Message Date
Dan Poltawski
012b0472c5 Merge branch '42299-26' of git://github.com/samhemelryk/moodle
Conflicts:
	version.php
2013-10-24 15:47:48 +08:00
Marina Glancy
33c4c3a363 Merge branch 'MDL-41252-master' of git://github.com/mouneyrac/moodle 2013-10-24 14:15:05 +11:00
David Monllao
2a9275c4c5 MDL-40976 behat: Updating tests according to new behaviour
We only open the actions menu when is collapsed.
2013-10-23 16:19:33 +08:00
Rajesh Taneja
3f038d6d97 MDL-42283 Behat: Automated MDLQA-1777
MDLQA-1777: A teacher can set grade conditions to restrict availability of a section
2013-10-23 15:57:53 +08:00
Marina Glancy
90eb4ddd9a Merge branch '42246-26' of git://github.com/samhemelryk/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-10-23 17:22:28 +11:00
Dan Poltawski
8c8a844f2b Merge branch '42277-26' of git://github.com/samhemelryk/moodle 2013-10-23 13:18:45 +08:00
Marina Glancy
4f10bc6bb0 Merge branch '42301-26' of git://github.com/samhemelryk/moodle 2013-10-23 13:51:00 +11:00
Marina Glancy
f9c86035c9 Merge branch '42316-26' of git://github.com/samhemelryk/moodle 2013-10-23 11:05:59 +11:00
Dan Poltawski
181b0b3c3e Merge branch 'MDL-42117-master' of git://github.com/andrewnicols/moodle 2013-10-22 12:11:42 +02:00
Andrew Nicols
d5367fb566 MDL-42117 JavaScript: Ensure that new activities are fully set up
We don't need to set up anything specifically for toolboxes any more, but
other third-party JS may require additional setup following new module
creation.
2013-10-22 11:26:44 +08:00
Andrew Nicols
b676db838b MDL-42117 JavaScript: Don't rely on node data for course toolboxes
The YUI versions of getData and setData do not store the data in the DOM,
but in an instance of YUI. If you make modifications in one instance, but
apply them in another, then the data values are not accessible between
these two instances.

Additionally, there's no benefit to storing the instances on
initialisation - if anything, it increases the load overhead.

This change moves toolboxes to calculating their ancestors on click in the
same way it was done in the initialiser.
2013-10-22 11:26:36 +08:00
Petr Škoda
d5814f4e22 MDL-41811 simplify the admin tree detection logic and fix navigation in multiple areas 2013-10-21 14:17:55 +08:00
Rajesh Taneja
bafcd3f17a MDL-41811 navigation: Load site admin navigation
Go to notification page before following links within site admin
navigation, ensuring site admin navigation is loaded

With no js, test should follow site admin link and not expand it.
2013-10-21 14:17:55 +08:00
Rajesh Taneja
b92adf24a4 MDL-41811 navigation: Fixed navigation issues on pages
Few admin pages don't add navigation node and hence they should
not show site admin
2013-10-21 14:17:54 +08:00
Petr Škoda
e56c107da8 MDL-41811 tweak custom admin pages to force loading of admin tree 2013-10-21 14:17:53 +08:00
Dan Poltawski
9c5ab08e5a Merge branch 'MDL-34209-master' of git://github.com/andrewnicols/moodle 2013-10-21 13:58:14 +08:00
Sam Hemelryk
df460b5a23 MDL-42299 course: management category expansion improvements 2013-10-17 12:11:31 +13:00
Sam Hemelryk
d5de874727 MDL-42299 course: management interface remember categories expanded by AJAX
Categories that have been expanded using AJAX are now remember and
expanded again autoamtically when something triggers a page refresh.
2013-10-17 08:41:12 +13:00
Sam Hemelryk
3f08254ff8 MDL-42277 course: fixed missing set context 2013-10-17 08:41:07 +13:00
Sam Hemelryk
962885e80c MDL-42316 course: moved require_login up the script 2013-10-17 08:40:55 +13:00
Sam Hemelryk
3b681e6cf8 MDL-42246 course: improved highlighting of bulk actions 2013-10-17 08:40:44 +13:00
Sam Hemelryk
4d4f516da6 MDL-42301 course: listings now show a delete icon 2013-10-17 08:39:12 +13:00
Eloy Lafuente (stronk7)
059d7bd275 Merge branch 'MDL-42380-master' of git://github.com/damyon/moodle 2013-10-16 15:19:36 +02:00
Damyon Wiese
6de4beb8dd MDL-42380 Course unit tests: Remove assert causing oracle unit tests to die 2013-10-16 13:20:33 +08:00
Damyon Wiese
2ec214806f Merge branch '42294-26' of git://github.com/samhemelryk/moodle 2013-10-16 11:36:16 +08:00
Eloy Lafuente (stronk7)
11182e2eb1 Merge branch 'w42_MDL-42224_m26_msgredir' of https://github.com/skodak/moodle 2013-10-16 01:23:01 +02:00
Eloy Lafuente (stronk7)
cbef1d9d3f MDL-42302 course: re-shitfering management module. 2013-10-16 00:53:58 +02:00
Sam Hemelryk
b155a17034 MDL-42302 course: fixed bugs while changing visibility
* No longer uses show which is resvered on MySQL
* Selected category courses are now always returned.
2013-10-16 08:25:08 +13:00
Sam Hemelryk
af321e0f20 MDL-42294 course: fixed delete script ordering
Added a behat test for the creation and deletion of a new course.
This should turn up any such errors like this during automated
testing in the future.
2013-10-16 08:24:56 +13:00
Damyon Wiese
7aeb2cc335 Merge branch '42249-26' of git://github.com/samhemelryk/moodle 2013-10-14 15:12:17 +08:00
Damyon Wiese
36f60b226d Merge branch '42253-26' of git://github.com/samhemelryk/moodle 2013-10-14 13:02:55 +08:00
Petr Škoda
f007e89961 MDL-42224 clean up message and email redirection testing 2013-10-12 13:59:07 +02:00
Damyon Wiese
d61c05ac4a MDL-31830 category management: Fix coding_error when moving 0 courses 2013-10-11 16:06:40 +08:00
Sam Hemelryk
7c033254d4 MDL-42253 course management: fixed course pagination
If the number of courses === the number per page pagination
was being incorrectly rendered.
Fixed this and added a behat test to confirm it.
2013-10-11 12:09:23 +13:00
Sam Hemelryk
a8003c0a16 MDL-42249 course: converted all dropdowns to contextmenu icon 2013-10-11 10:49:27 +13:00
David Monllao
e9af3ed361 MDL-42013 behat: I should (not)? see checking visibility
Only for non-Javascript tests. If the step
is named I should/should not see whatever
is makes sense that has to be visible.
2013-10-10 18:40:29 +08:00
Andrew Nicols
9f3f4a3c3f MDL-34209 JavaScript: Tidy up dragdrop code. 2013-10-10 14:42:06 +08:00
Andrew Nicols
b57bc5855c MDL-34209 JavaScript: Simplify section drag/drop to fix reordering issues 2013-10-10 14:42:06 +08:00
Damyon Wiese
869dd1fc6c Merge branch 'MDL-29663_alt' of https://github.com/merrill-oakland/moodle 2013-10-09 09:39:09 +08:00
Eric Merrill
bd8f5d459d MDL-29663 forum: Replace constant FORUM_TRACKING_ON with FORUM_TRACKING_FORCED
Commit for MDL-29663 that renames the FORUM_TRACKING_ON constant
to FORUM_TRACKING_FORCED to allow easier and more consistant reading.

FORUM_TRACKING_ON retained but marked depreciated.
2013-10-08 08:04:55 -04:00
Jerome Mouneyrac
9f66c7c80a MDL-41252 Simple changes to main course page to improve accessibility - original patch of Nate Baxley 2013-10-08 16:53:06 +08:00
Damyon Wiese
033f721362 MDL-31830 course: Remove unused shifter built js files 2013-10-07 15:58:59 +08:00
Damyon Wiese
d4770c9f00 Merge branch '31830-26' of git://github.com/samhemelryk/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-10-07 15:28:45 +08:00
Sam Hemelryk
7fd307b153 MDL-31830 course: fixed up minor points as noted by Damyon's integration review
* Fixed typo breaking drag and drop of courses.
* Fixed the ' ' title for the create new button plus two other icons I found as well.
* Adding padding to items displayed in the action menu drop down. base + bootstrapbase.
* Padding adjusted to the same as on the course page. base + bootstrapbase.
* Removed hover icon from categories. base only.
* Fixed categroy typo
* Removed min-width that was being applied to coursename making its clickable area larger than normal.
* The category tree is now presented using aria attributes as per http://www.w3.org/WAI/GL/wiki/Using_ARIA_trees
* Bulk action selectors now use aria-labelledby
* Category course count now given access hidden label.
* Pagination links now have better titles.
* The course action icons now present with role=button
2013-10-07 19:41:52 +13:00
Sam Hemelryk
8aa3aa3dfd MDL-31830 course: management behat tests corrected after fixes 2013-10-07 17:34:09 +13:00
Sam Hemelryk
484c4c6cf3 MDL-31830 course: several management interface improvements
* Tidied up course detail permissions so that user is not shown information they couldn't access elsewhere.
* category link dimming now accounts for course creation as an action as well.
* category single select when in courses view mode is now limited to courses user can action in.
* There is now a check at the start of the management page to redirect to course/index.php if the user isn't able to manage in any category.
* Tweaked navigation again, to give the limited users a navbar structure similar to the system cap'd user.
* Cancelling a category delete now takes you back to the category you were viewing.
* Fixed undefined notice
* Improved placement of course request and approval links.
* Several styling tweaks/improvements to the base theme.
* Several styling tweaks/improvements to the bootstrapbase theme.
2013-10-07 10:22:57 +13:00
Sam Hemelryk
c46996ea5a MDL-31830 course: improvements to JS coding style 2013-10-07 10:22:51 +13:00
Sam Hemelryk
b488058f7d MDL-31830 course: fixed interface issues with limited user
* Navigation/settings now show best available option.
* Resorting categories works now for limited access user.
* Display of up and down arrows corrected.
* Checkboxes no longer displayed if an action can't be performed.
2013-10-07 10:22:51 +13:00
Sam Hemelryk
f454e3247d MDL-31830 course: management interface fixes as noted
* Fixed the highlighing of the default category when no categories have been selected.
* Fixed the bug preventing the action menu for AJAX loaded categories from functioning.
* Repositioned course idnumber infront of course actions.
* Fixed display of moveup on first item and movedown on last item (courses and categories)
* Fixed up resort selected categories string.
2013-10-07 10:22:45 +13:00
Sam Hemelryk
5aff38e4d8 MDL-31830 course: renamed functions for consistency
* course_move_by_one => course_change_sortorder_by_one
* course_move_after_course => course_move_after_course
* helper::action_course_move_after_course  => helper::action_course_change_sortorder_after_course
* helper::action_course_moveup 		   => helper::action_course_change_sortorder_up_one
* helper::action_course_movedown 	   => helper::action_course_change_sortorder_down_one
* helper::action_course_moveup_by_record   => helper::action_course_change_sortorder_up_one_by_record
* helper::action_course_movedown_by_record => helper::action_course_change_sortorder_down_one_by_record
* helper::action_category_movedown         => helper::action_category_change_sortorder_down_one
* helper::action_category_movedown_by_id   => helper::action_category_change_sortorder_down_one_by_id
* helper::action_category_moveup 	   => helper::action_category_change_sortorder_up_one
* helper::action_category_moveup_by_id     => helper::action_category_change_sortorder_up_one_by_id
* coursecat::move_by_one 	           => coursecat::change_sortorder_by_one
2013-10-07 10:22:36 +13:00