diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 6e99115cc5..73fe5ca954 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -1039,9 +1039,7 @@ button.next.disabled { padding-top: 10px; text-shadow: gray 3px 3px 2px; } - /* ATTENDANCE */ - div.attendance-calendar-add div.row div.formw,div.attendance-calendar-edit div.row div.formw { float: left; display:inline; @@ -1059,23 +1057,26 @@ div.attendance-calendar-add div.row div.formw,div.attendance-calendar-edit div.r .attendance-calendar-row { padding:5px; } -.attendance-faults-bar { - width:90%; - background-color:none; - padding:2px; - font-size:120%; - font-weight: bold; - padding:5px; +.attendance-calendar-table .check{ + text-align: center; } - -.attendance-users-table td { - height:66px; +.date-attendance{ + color: #666; + text-align: center; + font-size: 12px; + width: 150px; + margin: auto; } - -.attendance-calendar-table td { - height:66px; +.date-attendance .blue{ + color: #2E75A3; +} +.date-attendance .grey{ + color: #666; +} +.tableFloatingHeaderOriginal{ + font-size: 12px; + height: 60px; } - /********************************************** * MESSAGE TOOL * **********************************************/ @@ -2924,17 +2925,6 @@ form .formw .freeze { color:#999; font-size: 11px; } - -/* Stick table header */ - -.tableWithFloatingHeader th { - padding: 5px 5px 0px 5px; -} -.tableFloatingHeaderOriginal th, .tableWithFloatingHeader th{ - height:80px; -} - -/* jsPlumb */ /* **************************************************** CSS SKILL **************************************************** */ diff --git a/main/admin/index.php b/main/admin/index.php index 18eb2c7c14..8cb9db6bb5 100644 --- a/main/admin/index.php +++ b/main/admin/index.php @@ -364,7 +364,7 @@ if (api_is_platform_admin()) { // Skills if (api_get_setting('allow_skills_tool') == 'true') { $blocks['skills']['icon'] = Display::return_icon( - 'logo.png', + 'skill-badges.png', get_lang('Skills'), array(), ICON_SIZE_MEDIUM, diff --git a/main/admin/settings.php b/main/admin/settings.php index f816c8ed45..7f710b8085 100755 --- a/main/admin/settings.php +++ b/main/admin/settings.php @@ -398,7 +398,7 @@ $action_images['tools'] = 'tools.png'; $action_images['user'] = 'user.png'; $action_images['gradebook'] = 'gradebook.png'; $action_images['ldap'] = 'ldap.png'; -$action_images['cas'] = 'user_access.png'; +$action_images['cas'] = 'cas.png'; $action_images['security'] = 'security.png'; $action_images['languages'] = 'languages.png'; $action_images['tuning'] = 'tuning.png'; diff --git a/main/attendance/attendance_sheet.php b/main/attendance/attendance_sheet.php index 6cc2e1964a..e54a0cc964 100755 --- a/main/attendance/attendance_sheet.php +++ b/main/attendance/attendance_sheet.php @@ -194,7 +194,7 @@ if (api_is_allowed_to_edit(null, true) || floatingHeaderRow.css("width", $(this).css("width")); floatingHeaderRow.css("visibility", "visible"); floatingHeaderRow.css("z-index", "1000"); - originalHeaderRow.css("height", "80px"); + originalHeaderRow.css("height", "64px"); } else { floatingHeaderRow.css("visibility", "hidden"); floatingHeaderRow.css("top", "0px"); @@ -239,7 +239,7 @@ if (api_is_allowed_to_edit(null, true) || - + @@ -287,23 +287,23 @@ if (api_is_allowed_to_edit(null, true) || foreach ($attendant_calendar as $calendar) { $date = $calendar['date']; $time = $calendar['time']; - $datetime = $date.'
'.$time; + $datetime = '
'. $date . ' - ' . $time . '
'; - $img_lock = Display::return_icon('lock.gif',get_lang('DateUnLock'),array('class'=>'img_lock','id'=>'datetime_column_'.$calendar['id'])); + $img_lock = Display::return_icon('lock-closed.png',get_lang('DateUnLock'),array('class'=>'img_lock','id'=>'datetime_column_'.$calendar['id'])); if (!empty($calendar['done_attendance'])){ - $datetime = ''.$date.'
'.$time.'
'; + $datetime = '
' . $date . ' - ' . $time . '
'; } $disabled_check = 'disabled = "true"'; $input_hidden = ''; if ($next_attendance_calendar_id == $calendar['id']) { $input_hidden = ''; $disabled_check = ''; - $img_lock = Display::return_icon('unlock.gif',get_lang('DateLock'),array('class'=>'img_unlock','id'=>'datetime_column_'.$calendar['id'])); + $img_lock = Display::return_icon('lock-closed.png',get_lang('DateLock'),array('class'=>'img_unlock','id'=>'datetime_column_'.$calendar['id'])); } - $result .= ''; - $result .= '
'.$datetime.' '; + $result .= ''; + $result .= '
'.$datetime.' '; if (api_is_allowed_to_edit(null, true)) { $result .= ''.(!$is_locked_attendance || api_is_platform_admin()?$img_lock:'').''; @@ -311,7 +311,7 @@ if (api_is_allowed_to_edit(null, true) || if ($is_locked_attendance == false) { if (api_is_allowed_to_edit(null, true)) { - $result .= '
'.$input_hidden.'
'; + $result .= ''.$input_hidden.''; } } } @@ -370,8 +370,8 @@ if (api_is_allowed_to_edit(null, true) || } echo ''; - echo '
'; - echo '
'; + echo '
'; + if (api_is_allowed_to_edit(null, true)) { if (!$is_locked_attendance || api_is_platform_admin()) { echo ''; @@ -392,7 +392,7 @@ if (api_is_allowed_to_edit(null, true) || break; } } - echo '
'; + echo '
'; echo ''; } @@ -402,7 +402,7 @@ if (api_is_allowed_to_edit(null, true) || $calendarClass = "checkboxes_col_".$calendar['id']; } echo ''; - echo '
'; + echo '
'; echo '
 
'; @@ -413,15 +413,16 @@ if (api_is_allowed_to_edit(null, true) || echo ''; echo '
'; ?> -
-
+ +
+
+ ?>
+ transform="translate(0,-924.3622)"> + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/main/img/icons/svg/lock-open.svg b/main/img/icons/svg/lock-open.svg new file mode 100644 index 0000000000..d764b00ed6 --- /dev/null +++ b/main/img/icons/svg/lock-open.svg @@ -0,0 +1,114 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/main/img/icons/svg/lock.svg b/main/img/icons/svg/lock.svg index 1c28e3c6d1..ac76107c7e 100644 --- a/main/img/icons/svg/lock.svg +++ b/main/img/icons/svg/lock.svg @@ -19,10 +19,10 @@ sodipodi:version="0.32" sodipodi:docname="lock.svg" version="1.1" - inkscape:version="0.91 r13725">image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + +