Fixed menus to add resources on main page and social format

diff --git a/blocks/site_main_menu/block_site_main_menu.php b/blocks/site_main_menu/block_site_main_menu.php
index 7c36cf6c513936cda54521081b702dc078eb3f09..8ce4593b5343e5962921968145358c6dac6ce7a9 100644 (file)
--- a/blocks/site_main_menu/block_site_main_menu.php
+++ b/blocks/site_main_menu/block_site_main_menu.php
@@ -118,8 +118,7 @@ class CourseBlock_site_main_menu extends MoodleBlock {
 
         if ($isediting && $modnames) {
             $this->content->footer = '<div style="text-align: right;">'.
-                popup_form($CFG->wwwroot.'/course/mod.php?id='.$this->course->id.'&amp;section='.$section->section.'&amp;add=',
-                           $modnames, 'section0', '', get_string('add').'...', 'mods', get_string('activities'), true) . '</div>';
+                print_section_add_menus($this->course, 0, $modnames, true, true).'</div>';
         } else {
             $this->content->footer = '';
         }

diff --git a/blocks/social_activities/block_social_activities.php b/blocks/social_activities/block_social_activities.php
index 222974abdc664c7c2a5f4581d7b483c5bac6cef8..e5bdd5baf101585ce172ce6d948a797d897f897d 100644 (file)
--- a/blocks/social_activities/block_social_activities.php
+++ b/blocks/social_activities/block_social_activities.php
@@ -115,8 +115,7 @@ class CourseBlock_social_activities extends MoodleBlock {
 
         if ($isediting && $modnames) {
             $this->content->footer = '<div style="text-align: right;">'.
-                popup_form($CFG->wwwroot.'/course/mod.php?id='.$this->course->id.'&amp;section='.$section->section.'&amp;add=',
-                           $modnames, 'section0', '', get_string('add').'...', 'mods', get_string('activities'), true) . '</div>';
+                print_section_add_menus($this->course, 0, $modnames, true, true).'</div>';
         } else {
             $this->content->footer = '';
         }

diff --git a/course/lib.php b/course/lib.php
index 7f536e502646b335f3c88b0faa1ac142f86d1ca9..268f41d8a4097497733695a31f31dae6fda030d5 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -890,7 +890,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
 }
 
 
-function print_section_add_menus($course, $section, $modnames) {
+function print_section_add_menus($course, $section, $modnames, $vertical=false, $return=false) {
 // Prints the menus to add activities and resources
 
     static $straddactivity, $straddresource, $resources;
@@ -906,14 +906,28 @@ function print_section_add_menus($course, $section, $modnames) {
         $resources['label'] = get_string('resourcetypelabel', 'resource');
     }
 
-    echo '<div align="right"><table align="right"><tr><td>';
-    popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&amp;section=$section&add=",
-                $resources, "ressection$section", "", $straddresource);
-    echo '</td><td>';
-    popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&amp;section=$section&add=",
-                $modnames, "section$section", "", $straddactivity);
-    echo '</td></tr></table>';
-    echo '</div>';
+    $output = '';
+
+    $output .= '<div align="right"><table align="right"><tr><td>';
+    $output .= popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&amp;section=$section&add=",
+                $resources, "ressection$section", "", $straddresource, '', '', true);
+    $output .= '</td>';
+
+    if ($vertical) {
+        $output .= '</tr><tr>';
+    }
+
+    $output .= '<td>';
+    $output .= popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&amp;section=$section&add=",
+                $modnames, "section$section", "", $straddactivity, '', '', true);
+    $output .= '</td></tr></table>';
+    $output .= '</div>';
+
+    if ($return) {
+        return $output;
+    } else {
+        echo $output;
+    }
 }
 
 function rebuild_course_cache($courseid=0) {