Improving course catalog + fixing user information action bar

main/admin/user_information.php

@@ -12,8 +12,6 @@ require_once '../inc/global.inc.php';
 $this_section=SECTION_PLATFORM_ADMIN;
 
 api_protect_admin_script();
-require_once api_get_path(LIBRARY_PATH).'course.lib.php';
-require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
 
 $interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
 $interbreadcrumb[] = array ("url" => 'user_list.php', "name" => get_lang('UserList'));
@@ -44,7 +42,8 @@ $login_as_icon = '';
 if (api_is_platform_admin() || (api_is_session_admin() && $row['6'] == $statusname[STUDENT])) {
         $login_as_icon = '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_list.php?action=login_as&amp;user_id='.$user['user_id'].'&amp;sec_token='.$_SESSION['sec_token'].'">'.Display::return_icon('login_as.gif', get_lang('LoginAs')).'</a>';
 }
-echo '<div align="right" style="margin-right:4em;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.intval($_GET['user_id']).'" title="'.get_lang('Reporting').'">'.Display::return_icon('statistics.gif',get_lang('Reporting')).'</a>'.$login_as_icon.'</div>'."\n";
+echo '<div class="actions"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.intval($_GET['user_id']).'" title="'.get_lang('Reporting').'">'.Display::return_icon('statistics.gif',get_lang('Reporting')).'</a>'.$login_as_icon.'</div>';
+
 //getting the user image
 $sysdir_array = UserManager::get_user_picture_path_by_id($user['user_id'],'system',false,true);
 $sysdir = $sysdir_array['dir'];

main/auth/courses.php

@@ -77,10 +77,10 @@ if ($action == 'createcoursecategory') {
 	$nameTools = get_lang('CreateCourseCategory');
 }
 if ($action == 'subscribe') {
-	$nameTools = get_lang('SubscribeToCourse');
+	$nameTools = get_lang('CourseManagement');
 }
 
-if ($action == 'display_random_courses' || $action == 'display_courses') {
+if ($action == 'display_random_courses' || $action == 'display_courses' ) {
 	$nameTools = get_lang('CourseManagement');
 }
 
@@ -92,7 +92,7 @@ if (empty($nameTools)) {
 	$nameTools = get_lang('CourseManagement');
 } else {
 	
-	if (!in_array($action, array('sortmycourses', 'createcoursecategory', 'display_random_courses', 'display_courses'))) {
+	if (!in_array($action, array('sortmycourses', 'createcoursecategory', 'display_random_courses', 'display_courses', 'subscribe'))) {
 		$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'auth/courses.php', 'name' => get_lang('CourseManagement'));
 	}
 	if ($action == 'createcoursecategory') {

main/css/base.css

@@ -900,7 +900,7 @@ button:hover {
 #categories-search {
     text-align:center;
     /*height:55px; */
-    float: right;
+    float: left;
 }
 
 #categories-list {

main/template/default/auth/courses_categories.php

@@ -23,16 +23,14 @@ $stok = Security::get_token();
 if (intval($_GET['hidden_links']) != 1) { ?>
 
 <div id="actions" class="actions">
-
-        <span id="categories-search">
-            <form class="course_list" method="post" action="<?php echo api_get_self(); ?>?action=subscribe&amp;hidden_links=0">
-            <label for="search_term"><?php echo get_lang('SearchCourse'); ?></label>
-                <input type="hidden" name="sec_token" value="<?php echo $stok; ?>">
-                <input type="hidden" name="search_course" value="1" />
-                <input type="text" size="12" name="search_term" value="<?php echo (empty($_POST['search_term']) ? '' : api_htmlentities(Security::remove_XSS($_POST['search_term']))); ?>" />
-                &nbsp;<button class="search" type="submit"><?php echo get_lang('_search'); ?></button>
-            </form>
-        </span>
+	<span id="categories-search">
+    	<form class="course_list" method="post" action="<?php echo api_get_self(); ?>?action=subscribe&amp;hidden_links=0">            
+        	<input type="hidden" name="sec_token" value="<?php echo $stok; ?>">
+            <input type="hidden" name="search_course" value="1" />
+            <input type="text" name="search_term" value="<?php echo (empty($_POST['search_term']) ? '' : api_htmlentities(Security::remove_XSS($_POST['search_term']))); ?>" />
+            &nbsp;<button class="search" type="submit"><?php echo get_lang('SearchCourse'); ?></button>
+		</form>
+	</span>
 </div>
 <?php 
     $hidden_links = 0;