Julio Montoya 13 роки тому
батько
коміт
e35b41445b
2 змінених файлів з 11 додано та 11 видалено
  1. 3 3
      main/attendance/attendance_sheet.php
  2. 8 8
      main/attendance/index.php

+ 3 - 3
main/attendance/attendance_sheet.php

@@ -163,7 +163,7 @@ if (api_is_allowed_to_edit(null, true)) {
                     <td><?php echo $data['lastname'] ?></td>
                     <td><?php echo $data['lastname'] ?></td>
                     <td><?php echo $data['firstname'] ?></td>
                     <td><?php echo $data['firstname'] ?></td>
                     <td>
                     <td>
-                        <div style="height:56px">
+                        <div style="height:28px">
                         <center>
                         <center>
                         <div class="attendance-faults-bar" style="background-color:<?php echo (!empty($data['result_color_bar'])?$data['result_color_bar']:'none') ?>">
                         <div class="attendance-faults-bar" style="background-color:<?php echo (!empty($data['result_color_bar'])?$data['result_color_bar']:'none') ?>">
                         <?php echo $data['attendance_result'] ?></div>
                         <?php echo $data['attendance_result'] ?></div>
@@ -255,7 +255,7 @@ if (api_is_allowed_to_edit(null, true)) {
                                 }
                                 }
                     ?>
                     ?>
                             <td style="<?php echo $style_td ?>" class="checkboxes_col_<?php echo $calendar['id'] ?>">
                             <td style="<?php echo $style_td ?>" class="checkboxes_col_<?php echo $calendar['id'] ?>">
-                                <div style="height:56px">
+                                <div style="height:20px">
                                  <center>
                                  <center>
                                     <?php if (!$is_locked_attendance || api_is_platform_admin()) { ?>
                                     <?php if (!$is_locked_attendance || api_is_platform_admin()) { ?>
                                         <input type="checkbox" name="check_presence[<?php echo $calendar['id'] ?>][]" value="<?php echo $user['user_id'] ?>"  <?php echo $disabled.' '.$checked ?> /><span class="<?php echo 'anchor_'.$calendar['id'] ?>"></span>
                                         <input type="checkbox" name="check_presence[<?php echo $calendar['id'] ?>][]" value="<?php echo $user['user_id'] ?>"  <?php echo $disabled.' '.$checked ?> /><span class="<?php echo 'anchor_'.$calendar['id'] ?>"></span>
@@ -269,7 +269,7 @@ if (api_is_allowed_to_edit(null, true)) {
                     <?php   } 
                     <?php   } 
                         } else { ?>
                         } else { ?>
                             <td class="checkboxes_col_<?php echo $calendar['id'] ?>">
                             <td class="checkboxes_col_<?php echo $calendar['id'] ?>">
-                                <div style="height:56px">
+                                <div style="height:20px">
                                     <center>&nbsp;</center>
                                     <center>&nbsp;</center>
                                </div>
                                </div>
                             </td>
                             </td>

+ 8 - 8
main/attendance/index.php

@@ -73,8 +73,6 @@ if (!empty($attendance_id)) {
 	$attendance_data = $attendance->get_attendance_by_id($attendance_id);
 	$attendance_data = $attendance->get_attendance_by_id($attendance_id);
 }
 }
 
 
-//jquery thickbox already called from main/inc/header.inc.php
-
 $htmlHeadXtra[] = '<script language="javascript">
 $htmlHeadXtra[] = '<script language="javascript">
 		
 		
 			$(function() {										
 			$(function() {										
@@ -85,8 +83,8 @@ $htmlHeadXtra[] = '<script language="javascript">
 					var class_img = $(this).attr("class");					
 					var class_img = $(this).attr("class");					
 					if (class_img == "img_unlock") {
 					if (class_img == "img_unlock") {
 						$("#checkbox_head_"+calendar_id).attr("disabled",true);
 						$("#checkbox_head_"+calendar_id).attr("disabled",true);
-						$(".row_odd td.checkboxes_col_"+calendar_id).css({"background-color":"#F2F2F2"});
-						$(".row_even td.checkboxes_col_"+calendar_id).css({"background-color":"#FFF"});
+						$(".row_odd  td.checkboxes_col_"+calendar_id).css({"background-color":"#F9F9F9", "border-left":"none","border-right":"none"});
+						$(".row_even td.checkboxes_col_"+calendar_id).css({"background-color":"#FFF", "border-left":"none","border-right":"none"});
 						$(".checkboxes_col_"+calendar_id+" input:checkbox").attr("disabled",true);							 						
 						$(".checkboxes_col_"+calendar_id+" input:checkbox").attr("disabled",true);							 						
 						$(this).attr("src","'.api_get_path(WEB_CODE_PATH).'img/lock.gif"); 
 						$(this).attr("src","'.api_get_path(WEB_CODE_PATH).'img/lock.gif"); 
 						$(this).attr("title","'.get_lang('DateUnLock').'");
 						$(this).attr("title","'.get_lang('DateUnLock').'");
@@ -97,7 +95,7 @@ $htmlHeadXtra[] = '<script language="javascript">
 						return false;
 						return false;
 					} else {
 					} else {
 						$("#checkbox_head_"+calendar_id).attr("disabled",false);
 						$("#checkbox_head_"+calendar_id).attr("disabled",false);
-						$(".checkboxes_col_"+calendar_id).css({"background-color":"#e1e1e1"});
+						$(".checkboxes_col_"+calendar_id).css({"background-color":"#e1e1e1", "border-left":"1px #CCC solid", "border-right":"1px #CCC solid" });
 						$(".checkboxes_col_"+calendar_id+" input:checkbox").attr("disabled",false);						
 						$(".checkboxes_col_"+calendar_id+" input:checkbox").attr("disabled",false);						
 						$(this).attr("src","'.api_get_path(WEB_CODE_PATH).'img/unlock.gif");
 						$(this).attr("src","'.api_get_path(WEB_CODE_PATH).'img/unlock.gif");
 						$(this).attr("title","'.get_lang('DateLock').'");
 						$(this).attr("title","'.get_lang('DateLock').'");
@@ -118,14 +116,16 @@ $htmlHeadXtra[] = '<script language="javascript">
 						$(".checkboxes_col_"+calendar_id+" input:checkbox").attr("checked",false);
 						$(".checkboxes_col_"+calendar_id+" input:checkbox").attr("checked",false);
 					}
 					}
 				});					
 				});					
+				
 				$(".attendance-sheet-content .row_odd, .attendance-sheet-content .row_even").mouseover(function() {
 				$(".attendance-sheet-content .row_odd, .attendance-sheet-content .row_even").mouseover(function() {
-					$(".row_odd").css({"background-color":"#F2F2F2"});
+					$(".row_odd").css({"background-color":"#F9F9F9"});
 					$(".row_even").css({"background-color":"#FFF"});
 					$(".row_even").css({"background-color":"#FFF"});
 				});	
 				});	
 				$(".attendance-sheet-content .row_odd, .attendance-sheet-content .row_even").mouseout(function() {
 				$(".attendance-sheet-content .row_odd, .attendance-sheet-content .row_even").mouseout(function() {
-					$(".row_odd").css({"background-color":"#F2F2F2"});
+					$(".row_odd").css({"background-color":"#F9F9F9"});
 					$(".row_even").css({"background-color":"#FFF"});
 					$(".row_even").css({"background-color":"#FFF"});
-				});											
+				});				
+											
 				$(".advanced_parameters").click(function() {				
 				$(".advanced_parameters").click(function() {				
 					if ($("#id_qualify").css("display") == "none") {
 					if ($("#id_qualify").css("display") == "none") {
 						$("#id_qualify").css("display","block");
 						$("#id_qualify").css("display","block");