Browse Source

Minor style fixes

Julio Montoya 13 years ago
parent
commit
5dc1b2972d

+ 4 - 3
main/attendance/attendance_calendar.php

@@ -15,11 +15,12 @@ if (isset($_SESSION['gradebook'])) {
 	$param_gradebook = '&gradebook='.Security::remove_XSS($_SESSION['gradebook']);
 }
 if (!$is_locked_attendance || api_is_platform_admin()) {
-	echo '<div class="actions" style="margin-bottom:30px">';
-	echo '<a href="index.php?'.api_get_cidreq().'&action=attendance_sheet_list&attendance_id='.$attendance_id.$param_gradebook.'">'.Display::return_icon('back.png',get_lang('AttendanceSheet'),'','32').'</a>';
+	echo '<div class="actions" style="margin-bottom:30px">';	
 	if ($action == 'calendar_add') {
-		//echo '<a href="index.php?'.api_get_cidreq().'&action=calendar_list&attendance_id='.$attendance_id.$param_gradebook.'">'.Display::return_icon('attendance_calendar.png',get_lang('AttendanceCalendar'),'','32').'</a>';
+		echo '<a href="index.php?'.api_get_cidreq().'&action=calendar_list&attendance_id='.$attendance_id.$param_gradebook.'">'.Display::return_icon('back.png',get_lang('AttendanceCalendar'),'','32').'</a>';
 	} else {
+		echo '<a href="index.php?'.api_get_cidreq().'&action=attendance_sheet_list&attendance_id='.$attendance_id.$param_gradebook.'">'.Display::return_icon('back.png',get_lang('AttendanceSheet'),'','32').'</a>';
+		
 		echo '<a href="index.php?'.api_get_cidreq().'&action=calendar_add&attendance_id='.$attendance_id.$param_gradebook.'">'.Display::return_icon('add.png',get_lang('AddDateAndTime'),'','32').'</a>';
 		echo '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDeleteAllDates').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=calendar_all_delete&attendance_id='.$attendance_id.$param_gradebook.'">'.Display::return_icon('clean.png',get_lang('CleanCalendar'),'','32').'</a>';
 	}

+ 5 - 1
main/attendance/attendance_list.php

@@ -19,6 +19,7 @@ if (api_is_allowed_to_edit(null, true)) {
 	echo '<a href="index.php?'.api_get_cidreq().$param_gradebook.'&action=attendance_add">'.Display::return_icon('new_attendance_list.png',get_lang('CreateANewAttendance'),'','32').'</a>';	
 	echo '</div>';
 }
+
 $table = new SortableTable('attendance_list', array('Attendance', 'get_number_of_attendances'), array('Attendance', 'get_attendance_data'), $default_column);
 $table->set_additional_parameters($parameters);
 $table->set_header(0, '', false, array('style'=>'width:20px;'));
@@ -30,4 +31,7 @@ if (api_is_allowed_to_edit(null, true)) {
 	$table->set_header(4, get_lang('Actions'), false,array('style'=>'text-align:center'));
 	$table->set_form_actions(array ('attendance_delete_select' => get_lang('DeleteAllAttendances')));	
 }
-$table->display();
+
+if ($table->get_total_number_of_items() > 0) {
+	$table->display();
+}

+ 9 - 11
main/attendance/attendance_sheet.php

@@ -70,9 +70,7 @@ if (api_is_allowed_to_edit(null, true)) {
     $form->setDefaults(array('filter'=>$default_filter));
     $param_filter = '&filter='.Security::remove_XSS($default_filter);
     
-    
-    
-    if (count($users_in_course) > 0) { 
+    if (count($users_in_course) > 0) {
         $form->display();  
     ?>
     <script type="text/javascript">
@@ -125,7 +123,7 @@ if (api_is_allowed_to_edit(null, true)) {
         $(window).scroll(UpdateTableHeaders);
         $(window).resize(UpdateTableHeaders);
     });
-</script>
+	</script>
 
     <form method="post" action="index.php?action=attendance_sheet_add&<?php echo api_get_cidreq().$param_gradebook.$param_filter ?>&attendance_id=<?php echo $attendance_id?>" >
     
@@ -208,9 +206,9 @@ if (api_is_allowed_to_edit(null, true)) {
                             $result .= '<span id="attendance_lock" style="cursor:pointer">'.(!$is_locked_attendance || api_is_platform_admin()?$img_lock:'').'</span>';
                             $result .= '<br /><input type="checkbox" class="checkbox_head_'.$calendar['id'].'" id="checkbox_head_'.$calendar['id'].'" '.$disabled_check.' checked="checked" />'.$input_hidden.'</div></center></th>';
                          }                  
-                    } else { 
-                        $result = '<th width="2000px"><span><a href="index.php?'.api_get_cidreq().'&action=calendar_list&attendance_id='.$attendance_id.$param_gradebook.'">';
-                        $result .=Display::return_icon('attendance_calendar.png',get_lang('AttendanceCalendar'),'','32').' '.get_lang('GoToAttendanceCalendar').'</a></span></th>';
+                    } else {
+                        $result  = '<th width="2000px"><span><a href="index.php?'.api_get_cidreq().'&action=calendar_list&attendance_id='.$attendance_id.$param_gradebook.'">';
+                        $result .= Display::return_icon('attendance_calendar.png',get_lang('AttendanceCalendar'),'','32').' '.get_lang('GoToAttendanceCalendar').'</a></span></th>';
                     }
                     ?>
                     
@@ -226,7 +224,7 @@ if (api_is_allowed_to_edit(null, true)) {
                 <tbody>         
                 <?php 
                 $i = 0;
-                foreach ($users_in_course as $user) { 
+                foreach ($users_in_course as $user) {
                         $class = '';
                         if ($i%2==0) {$class = 'row_even';}
                         else {$class = 'row_odd';}
@@ -290,10 +288,10 @@ if (api_is_allowed_to_edit(null, true)) {
     <div class="clear"></div>
     <div style="margin-top:20px;"><?php if (!$is_locked_attendance || api_is_platform_admin()) { ?><button type="submit" class="save"><?php echo get_lang('Save') ?></button><?php } ?></div>
     </form> 
-    <?php } else {  
-        echo '<div><a href="'.api_get_path(WEB_CODE_PATH).'user/user.php?'.api_get_cidreq().'">'.get_lang('ThereAreNoRegisteredLearnersInsidetheCourse').'</a></div>';  
+    <?php 
+    } else {  
+        echo Display::display_warning_message('<a href="'.api_get_path(WEB_CODE_PATH).'user/user.php?'.api_get_cidreq().'">'.get_lang('ThereAreNoRegisteredLearnersInsidetheCourse').'</a>', false);  
     }
-
 } else {
     // View for students
 ?>  

+ 1 - 3
main/attendance/index.php

@@ -270,6 +270,4 @@ switch ($action) {
 		break;
 	default		  		:	
         $attendance_controller->attendance_list();
-}
-
-?>
+}

+ 2 - 2
main/link/link.php

@@ -178,7 +178,7 @@ if (api_is_allowed_to_edit(null, true) && isset($_GET['action'])) {
 		}		
 		echo "<a href=\"../newscorm/lp_controller.php?".api_get_cidreq()."&gradebook=&action=add_item&type=step&lp_id=".$lp_id."#resource_tab-3\">".Display::return_icon('back.png', get_lang("BackTo").' '.get_lang("LearningPaths"),'','32')."</a>";		
 	} else {
-		echo '<a href="link.php?cidReq='.Security::remove_XSS($_GET['cidReq']).'&amp;urlview='.Security::remove_XSS($_GET['urlview']).'">'.Display::return_icon('back.png', get_lang('BackToLinksOverview'),'','32').'</a>';
+		//echo '<a href="link.php?cidReq='.Security::remove_XSS($_GET['cidReq']).'&amp;urlview='.Security::remove_XSS($_GET['urlview']).'">'.Display::return_icon('back.png', get_lang('BackToLinksOverview'),'','32').'</a>';
 	}	
 	
 	echo '</div>';
@@ -432,7 +432,7 @@ if (empty($_GET['action']) || ($_GET['action'] != 'editlink' && $_GET['action']
 	echo '<table class="data_table">';
 	
 	if ($numberofzerocategory !== 0) {	    
-		echo '<tr><th style="font-weight: bold; text-align:left;padding-left: 10px;"><i>'.get_lang('General').'</i></th></tr>';
+		echo '<tr><th style="font-weight: bold; text-align:left;padding-left: 10px;">'.get_lang('General').'</th></tr>';
 		echo '</table>';
 		showlinksofcategory(0);
 	}