|
@@ -56,11 +56,7 @@ if (api_is_platform_admin()) {
|
|
|
|
|
|
// Start of tools for CourseAdmins (teachers/tutors)
|
|
|
if (api_is_allowed_to_edit(null, true) && !api_is_coach()) {
|
|
|
-<<<<<<< HEAD
|
|
|
- $content .= '<div class="courseadminview" style="border:0px; margin-top: 0px;padding:5px;">
|
|
|
-=======
|
|
|
$content .= '<div class="courseadminview" style="border:0px; margin-top: 0px;padding:5px;">
|
|
|
->>>>>>> master
|
|
|
<div class="normal-message" id="id_normal_message" style="display:none">';
|
|
|
$content .= '<img src="'.api_get_path(WEB_PATH).'main/inc/lib/javascript/indicator.gif"/> ';
|
|
|
$content .= get_lang('PleaseStandBy');
|
|
@@ -108,20 +104,7 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) {
|
|
|
$my_list = CourseHome::get_tools_category(TOOL_STUDENT_VIEW);
|
|
|
if (count($my_list) > 0) {
|
|
|
$content .= '<div class="course-student-view-activity-3col">';
|
|
|
-<<<<<<< HEAD
|
|
|
- //ordering by get_lang name
|
|
|
- $order_tool_list = array();
|
|
|
- foreach($my_list as $key=>$new_tool) {
|
|
|
- $tool_name = CourseHome::translate_tool_name($new_tool);
|
|
|
- $order_tool_list [$key]= $tool_name;
|
|
|
- }
|
|
|
- natsort($order_tool_list);
|
|
|
- $my_temp_tool_array = array();
|
|
|
- foreach($order_tool_list as $key=>$new_tool) {
|
|
|
- $my_temp_tool_array[] = $my_list[$key];
|
|
|
- }
|
|
|
- $my_list = $my_temp_tool_array;
|
|
|
-=======
|
|
|
+
|
|
|
//ordering by get_lang name
|
|
|
$order_tool_list = array();
|
|
|
foreach ($my_list as $key => $new_tool) {
|
|
@@ -134,8 +117,6 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) {
|
|
|
$my_temp_tool_array[] = $my_list[$key];
|
|
|
}
|
|
|
$my_list = $my_temp_tool_array;
|
|
|
->>>>>>> master
|
|
|
-
|
|
|
$i = 0;
|
|
|
foreach ($my_list as $new_tool) {
|
|
|
if ($i >= 10) {
|