mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-16 14:02:32 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-43211-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2014-01-21 01:54:00 +01:00
commit ba766c4772
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blocks/site_main_menu/styles.css
View File

@ -1,7 +1,7 @@
.block_site_main_menu li { clear: both; }
.block_site_main_menu li .column { width: 100%; }
.block_site_main_menu li .buttons { float: right; margin-top: 3px;}
.block_site_main_menu li .buttons { float: right; margin: 0; }
.dir-rtl .block_site_main_menu li .buttons { float: left; }
.block_site_main_menu li .buttons a img{ vertical-align: text-bottom; margin: 0 3px;}
.block_site_main_menu li .buttons a img{ vertical-align: text-bottom;}
.block_site_main_menu .footer { margin-top: 1em; }
.block_site_main_menu .section_add_menus noscript div { display: inline;}

6
blocks/social_activities/block_social_activities.php
View File

@ -91,8 +91,10 @@ class block_social_activities extends block_list {
}
if (!$ismoving) {
$actions = course_get_cm_edit_actions($mod, -1);
$editbuttons = '<br />'.
$courserenderer->course_section_cm_edit_actions($actions, $mod);
$editbuttons = html_writer::tag('div',
$courserenderer->course_section_cm_edit_actions($actions, $mod, array('donotenhance' => true)),
array('class' => 'buttons')
);
} else {
$editbuttons = '';
}

5
blocks/social_activities/styles.css Normal file
View File

@ -0,0 +1,5 @@
.block_social_activities li { clear: both; }
.block_social_activities li .column { width: 100%; }
.block_social_activities li .buttons { float: right; margin: 0; }
.dir-rtl .block_social_activities li .buttons { float: left; }
.block_social_activities li .buttons a img{ vertical-align: text-bottom;}

2
course/lib.php
View File

@ -1979,7 +1979,7 @@ function course_get_cm_edit_actions(cm_info $mod, $indent = -1, $sr = null) {
}
// Indent.
if ($hasmanageactivities) {
if ($hasmanageactivities && $indent >= 0) {
$indentlimits = new stdClass();
$indentlimits->min = 0;
$indentlimits->max = 16;