Commit graph

3662 commits

Author SHA1 Message Date
Paul Nicholls
606554d5b0 MDL-32652 - Make block drag-drop work throughout Moodle
The central "content" region on My Home / user profile pages also needs to
be initialised in lib/ajax/blocks.php in order to allow blocks to be
dropped into that region successfully.  Some tweaks were also necessary in
order to correct the "content" region's structure in order for drag-drop
to function on this region on these pages.

Non-standard block regions (including the central "content" region
used by My Home and user profile pages) were causing the temporary empty
block region used as a drop target to sometimes appear in the wrong place.

The call to init_requirements_data (which includes the block drag-drop JS)
happens at a late enough stage in page generation that we can simply
pass the context ID through to the JS, so that it can be sent as part of
the AJAX request.  This prevents lib/ajax/blocks.php from having to try
to guess the context from the other bits of information it receives, so
block drag-drop should now work everywhere without issues.
2013-01-29 14:57:28 +13:00
Sam Hemelryk
5126bab95c Merge branch 'MDL-36881-m' of git://github.com/andrewnicols/moodle 2013-01-29 08:52:01 +13:00
Sam Hemelryk
8d8e6b1519 Merge branch 'MDL-34671-m' of git://github.com/andrewnicols/moodle 2013-01-29 08:39:35 +13:00
Andrew Robert Nicols
8a185b9ebc MDL-34671 Stop browser receiving escape keydown in modal dialogues
In certain modal dialogues, we listen on the Escape key to close a
dialogue. However, this is still passed to the browser. As a result, if the
browser is in full screen mode and that browser respects the escape key as
a means to exit full screen.

As a result, we need to ensure that we listen for the escape key at keydown
rather than keyup, and additionally prevent the default browser behaviour.

This is a workaround to http://yuilibrary.com/projects/yui3/ticket/2532616
and, should that issue be fixed, it should be removed.
2013-01-28 10:35:26 +00:00
Sam Chaffee
56c0878b45 MDL-36881 Handle poorly behaved modname_get_types functions better
The modname_get_types function is not always well implemented by
third-party plugins and some return poor data. This in turn leads to
incorrect module definitions, and can lead to problems in both the
'Add an activity...' dropdowns and the Activity chooser.

This will also prevent display of plugins which legitimately can have
subtypes but where no subtypes were found. Since such plugins cannot be
used in this fashion in any case, this is also beneficial.

Signed-off-by: Andrew Robert Nicols <andrew.nicols@lancaster.ac.uk>
2013-01-28 10:21:22 +00:00
Sam Hemelryk
56a81ad856 Merge branch 'wip-MDL-37612_master' of git://github.com/lazydaisy/moodle 2013-01-28 17:37:07 +13:00
Dan Poltawski
ebf6e8f60a Merge branch 'MDL-37473b' of git://github.com/srynot4sale/moodle 2013-01-25 12:35:40 +08:00
Aaron Barnes
10a8581f2b MDL-37473 completion: Add missing cap checks to tracked users functions
Namely get_num_tracked_users and is_tracked_user()
2013-01-25 17:08:44 +13:00
Dan Poltawski
dec70f2599 Revert "MDL-32652 - Make block drag-drop work throughout Moodle"
This reverts commit d7c29c2257.
2013-01-25 11:52:15 +08:00
Jerome Mouneyrac
821676f5b7 MDL-37476 course_create unit test fails if course completion is enabled 2013-01-23 13:54:22 +08:00
Dan Poltawski
0a93b3127f Merge branch 'MDL-37082_master' of git://github.com/markn86/moodle 2013-01-23 08:53:02 +08:00
Sam Hemelryk
8c35fcdcd9 Merge branch 'MDL-34435-master' of git://github.com/FMCorz/moodle
Conflicts:
	version.php
2013-01-23 11:08:55 +13:00
Mark Nelson
a347aee32e MDL-37082 core_course: create new course_delete_module function that handles the whole deletion process
Instead of repeating code all over the place because the original function delete_course_module only partially deletes data, we now place all the functionality needed to delete a module here.
2013-01-22 17:05:16 +08:00
Dan Poltawski
bfaf3041fa Merge branch 'wip-mdl-32526' of git://github.com/rajeshtaneja/moodle 2013-01-22 14:00:26 +08:00
Dan Poltawski
8cd57fb26a Merge branch 'MDL-37430-master' of github.com:damyon/moodle 2013-01-22 11:53:10 +08:00
Mary Evans
eb610eb90d MDL-37612 course: changed 1 instance of generalbox class to generaltable class in each of the following category.php, lib.php, search.php 2013-01-21 23:12:20 +00:00
Dan Poltawski
94abbef12f Merge branch 'MDL-32652_master' of git://github.com/pauln/moodle 2013-01-21 09:59:35 +08:00
Andrew Davis
40fcc26189 MDL-36757 course: avoid accidently overwriting the hidden/visible values set on grade items 2013-01-21 09:33:02 +13:00
Rajesh Taneja
b2da647202 MDL-34190 Course: Role with student archtype should be selected as default in user list 2013-01-18 10:10:57 +08:00
Marina Glancy
8df0765ad1 MDL-37085 bug fix with glued together class names 2013-01-17 15:19:09 +08:00
Marina Glancy
cf003abc92 MDL-37085 bug fix in link for module subtypes. Thanks to Andrew Nicols 2013-01-17 14:51:25 +13:00
Sam Hemelryk
11fbebb029 MDL-36035 course: fixed typo in function name 2013-01-17 09:15:26 +13:00
Rajesh Taneja
1a9d21dc21 MDL-32526 Course: After creating course user should be redirected to newly created course
After creating a new course if user has capability to enrol users then
enrol user page should be visible else user should see newly created course
2013-01-16 16:16:43 +08:00
Marina Glancy
aa2b293e8e MDL-37207 modchoosertoggle: added checks that user can update course 2013-01-16 15:51:02 +08:00
Dan Poltawski
c5c50786f6 Merge branch 'wip-MDL-37085-master' of git://github.com/marinaglancy/moodle 2013-01-16 14:17:40 +08:00
Marina Glancy
db82b13050 MDL-37085 changed echo to return - little bug fix 2013-01-16 17:14:51 +11:00
Marina Glancy
a3f66bdeac MDL-36968 Move function print_recent_activity() to the block recent_activity 2013-01-16 16:13:04 +11:00
Dan Poltawski
a201b57657 Merge branch 'MDL-36412-master' of git://github.com/sammarshallou/moodle 2013-01-16 09:54:26 +08:00
Eloy Lafuente (stronk7)
3431860f54 Merge branch 'w02_MDL-36988_m25_switchrole' of git://github.com/skodak/moodle 2013-01-16 02:27:48 +01:00
Sam Hemelryk
ec16ef1f85 Merge branch 'wip-MDL-35818-master' of git://github.com/phalacee/moodle 2013-01-16 11:03:39 +13:00
Sam Hemelryk
00ba185d52 Merge branch 'wip-MDL-36967-master' of git://github.com/marinaglancy/moodle
Conflicts:
	lib/deprecatedlib.php
2013-01-16 11:01:16 +13:00
Eloy Lafuente (stronk7)
493d8f781c Merge branch 'MDL-37354-master' of git://github.com/mouneyrac/moodle
Conflicts:
	message/tests/externallib_test.php
2013-01-15 21:50:31 +01:00
Petr Škoda
aae028d9e3 MDL-36988 cleanup role switching
This patch uses local URLs in parameters because it is more compatible
with various security hacks. Session key is not added automatically to
return url for safety reasons - we do not want to execute some random
action again. POST pages are now returned to course page too.
2013-01-15 21:44:20 +01:00
Eloy Lafuente (stronk7)
dcb21e6cc1 Merge branch 'wip-mdl-37062' of git://github.com/rajeshtaneja/moodle 2013-01-15 20:04:21 +01:00
Eloy Lafuente (stronk7)
ada893d339 Merge branch 'MDL-36554' of git://github.com/rwijaya/moodle 2013-01-15 18:02:26 +01:00
Eloy Lafuente (stronk7)
dfcb38a1c7 Merge branch 'wip-MDL-37207-master' of git://github.com/marinaglancy/moodle 2013-01-15 18:00:17 +01:00
Dan Poltawski
0efd8de527 Merge branch 'w02_MDL-36898_m25_ccontact' of git://github.com/skodak/moodle 2013-01-15 13:57:39 +08:00
Dan Poltawski
9d40849d46 Merge branch 'MDL-37162_master' of git://github.com/pauln/moodle 2013-01-15 13:23:02 +08:00
Dan Poltawski
fb8585521a Merge branch 'wip-MDL-36035-m25' of git://github.com/samhemelryk/moodle 2013-01-15 11:56:12 +08:00
Dan Poltawski
33919cca60 MDL-37085 - fix trailing whitespace 2013-01-15 11:42:30 +08:00
Sam Hemelryk
c8d3475e17 Merge branch 'wip-MDL-37085-master' of git://github.com/marinaglancy/moodle 2013-01-15 16:30:36 +13:00
Damyon Wiese
a83dd077f8 MDL-37430 Course - Make modules created in hidden sections visible when section is made visible. 2013-01-15 11:16:07 +08:00
Dan Poltawski
2254fb2764 Merge branch 'MDL-37194-master' of git://github.com/mouneyrac/moodle 2013-01-15 10:42:31 +08:00
Paul Nicholls
d7c29c2257 MDL-32652 - Make block drag-drop work throughout Moodle
Other than shifting the initialisation from course/lib.php to
lib/outputrequirementslib.php, some workarounds/tweaks were required
in order to make it work correctly on admin pages and My Home.
2013-01-15 14:55:31 +13:00
Eloy Lafuente (stronk7)
eaa00a071c Merge branch 'wip-MDL-37453-master' of git://github.com/marinaglancy/moodle 2013-01-15 00:06:06 +01:00
Sam Hemelryk
5a3d98c26d Merge branch 'wip-MDL-37206-master' of git://github.com/marinaglancy/moodle 2013-01-15 10:48:53 +13:00
Marina Glancy
8afb1cc8f8 MDL-37206 preload course format renderer in course/view.php
Also fixed bug with hardcoded default 'weeks' format
2013-01-14 15:14:08 +11:00
Marina Glancy
7b59f5b32a MDL-37453 fixing regression from MDL-36550 - label show/hide in AJAX works incorrectly 2013-01-14 15:13:14 +11:00
Marina Glancy
a03dfb7dbe MDL-37207 Add modchoosertoggle in renderer to allow themes to override 2013-01-14 15:10:07 +11:00
Marina Glancy
ff233851a0 MDL-36967 Deprecate function print_overview() 2013-01-14 15:05:31 +11:00