Browse Source

Minor - Attendance checkbox UI changes

Julio Montoya 12 years ago
parent
commit
dc0d8fd5e9
2 changed files with 67 additions and 64 deletions
  1. 1 1
      main/attendance/attendance_sheet.php
  2. 66 63
      main/css/base.css

+ 1 - 1
main/attendance/attendance_sheet.php

@@ -322,7 +322,7 @@ if (api_is_allowed_to_edit(null, true) || api_is_coach(api_get_session_id(), api
                                 if ($key == $presence) {
                                     $input_checked = " checked=checked";
                                 }
-                                echo '&nbsp;&nbsp;<input type="checkbox" name="check_presence['.$calendar['id'].'][]" value = "state_'.$key.'_'.$user['user_id'].'" '.$disabled.' '.$input_checked.' />&nbsp;'.$state;
+                                echo Display::tag('label', '<input type="checkbox" name="check_presence['.$calendar['id'].'][]" value = "state_'.$key.'_'.$user['user_id'].'" '.$disabled.' '.$input_checked.' />&nbsp;'.$state, array('class'=> 'checkbox'));
                             }
 
                             echo '<span class="anchor_'.$calendar['id'].'"></span>';

+ 66 - 63
main/css/base.css

@@ -62,7 +62,7 @@ header #logo {
 }
 
 .subnav .btn-navbar .icon-bar {
-    background-color: #888;    
+    background-color: #888;
 }
 
 .subnav-fixed {
@@ -106,7 +106,7 @@ header #logo {
     margin-bottom: 0px;
     padding-left:4px;
     padding-right:4px;
-    
+
     /* end default subnav background colors */
 }
 
@@ -116,7 +116,7 @@ header #logo {
 }
 
 .subnav .nav > li > a {
-    margin: 0;    
+    margin: 0;
     border-left: 1px solid #f5f5f5;
     border-right: 1px solid #e5e5e5;
     -webkit-border-radius: 0;
@@ -272,7 +272,7 @@ form .formw input {
     padding: 3px 15px;
 }
 
-.nav-list > .active > a, 
+.nav-list > .active > a,
 .nav-list > .active > a:hover {
     background-color: #999999;
 }
@@ -386,7 +386,7 @@ footer .container .row {
     margin-bottom: 11px;
     height:32px;
     padding: 2px 2px 2px 8px;
-    vertical-align:middle;    
+    vertical-align:middle;
 }
 
 .actions form {
@@ -894,10 +894,10 @@ a.personal_agenda:hover, a.personal_agenda:hover {
 
 .social-home-users-online {
     width: 200px;
-    margin: -28px 0 0 -50px;    
+    margin: -28px 0 0 -50px;
 }
 .social-home-anonymous-online {
-    width: 200px;    
+    width: 200px;
 }
 
 .menulist {
@@ -1093,8 +1093,8 @@ button.next.disabled {
 }
 
 .confirmation-message .right_link,
-.error-message .right_link, 
-.normal-message .right_link, 
+.error-message .right_link,
+.normal-message .right_link,
 .warning-message .right_link {
     position: relative;
     right: 0;
@@ -1244,6 +1244,9 @@ div.attendance-calendar-add div.row div.formw,div.attendance-calendar-edit div.r
     height:66px;
 }
 
+.attendance-calendar-table .checkbox {
+    font-size : 12px;
+}
 
 
 /**********************************************
@@ -2539,7 +2542,7 @@ div.admin_section h4 {
     padding-top:10px;
 }
 
-#question_score {    
+#question_score {
     padding-top:10px;
     padding-bottom:10px;
     font-weight:bold;
@@ -2547,18 +2550,18 @@ div.admin_section h4 {
 }
 
 .question_row {
-    margin-bottom: 40px;    
+    margin-bottom: 40px;
 }
 
 .ribbon {
     float:left;
     width:100%;
-    margin-bottom: 20px;        
+    margin-bottom: 20px;
     border: 1px solid #d2d2d2;
     border-radius: 3px;
-    box-shadow: 0 1px 3px rgba(0,0,0,0.1);   
+    box-shadow: 0 1px 3px rgba(0,0,0,0.1);
     position: relative;
-    
+
     background-image: -ms-linear-gradient(top, #FDFDFD, #F3F5F7);
     background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#FDFDFD), to(#F3F5F7));
     background-image: -webkit-linear-gradient(top, #FDFDFD, #F3F5F7);
@@ -2567,34 +2570,34 @@ div.admin_section h4 {
     background-image: linear-gradient(top, #FDFDFD, #F3F5F7);
 }
 
-.ribbon .rib {    
+.ribbon .rib {
     height: 30px;
     width: 120px;
-    display: block;    
+    display: block;
     line-height: 1.3;
     left: -2px;
     top: 0px;
     color: #cfcfcf;
     margin: 0;
     padding: 5px 10px;
-    position: relative;   
+    position: relative;
     text-shadow: 0 1px 1px #111;
     border-top: 1px solid #363636;
     border-bottom: 1px solid #202020;
     background: #333;
-    
+
     background-image: -ms-linear-gradient(top, #414B57, #2F3741);
     background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#414B57), to(#2F3741));
     background-image: -webkit-linear-gradient(top, #414B57, #2F3741);
     background-image: -o-linear-gradient(top, #414B57, #2F3741);
     background-image: -moz-linear-gradient(top, #414B57, #2F3741);
     background-image: linear-gradient(top, #414B57, #2F3741);
-    
+
     border-radius: 5px 2px 0 0;
     box-shadow: 0 1px 2px rgba(0,0,0,0.3);
 }
 
-.ribbon .rib h3 {    
+.ribbon .rib h3 {
     color: white;
     font-size: 16px;
 }
@@ -2605,35 +2608,35 @@ div.admin_section h4 {
 
 .ribbon .rib-error, .ribbon .ribbon-total-error {
     background:#C83F25;
-    
+
     background-image: -ms-linear-gradient(top, #992800, #C83F25);
     background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#992800), to(#C83F25));
     background-image: -webkit-linear-gradient(top, #992800, #C83F25);
     background-image: -o-linear-gradient(top, #992800, #C83F25);
     background-image: -moz-linear-gradient(top, #992800, #C83F25);
-    background-image: linear-gradient(top, #992800, #C83F25);    
-    
+    background-image: linear-gradient(top, #992800, #C83F25);
+
     border-top: 1px solid #C56E5B;
     border-bottom: 1px solid #7A290F;
 }
 
 .ribbon .rib-gray {
     background: #cccccc;
-    
+
     background-image: -ms-linear-gradient(top, #bbbbbb, #cccccc);
     background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#bbbbbb), to(#cccccc));
     background-image: -webkit-linear-gradient(top, #bbbbbb, #cccccc);
     background-image: -o-linear-gradient(top, #bbbbbb, #cccccc);
     background-image: -moz-linear-gradient(top, #bbbbbb, #cccccc);
-    background-image: linear-gradient(top, #bbbbbb, #cccccc);    
-    
+    background-image: linear-gradient(top, #bbbbbb, #cccccc);
+
     border-top: 1px solid #bbbbbb;
     border-bottom: 1px solid #bbbbbb;
 }
 
 
-.ribbon .rib-success, .ribbon .ribbon-total-success{    
-    background-color: #768E00;    
+.ribbon .rib-success, .ribbon .ribbon-total-success{
+    background-color: #768E00;
     background-image: -ms-linear-gradient(top, #9CB80A, #768E00);
     background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#9CB80A), to(#768E00));
     background-image: -webkit-linear-gradient(top, #9CB80A, #768E00);
@@ -2649,10 +2652,10 @@ div.admin_section h4 {
     display: block;
     left: 140px;
     height: 30px;
-    line-height: 1.3;    
+    line-height: 1.3;
     margin: 0;
     padding: 5px 10px;
-    position: absolute;    
+    position: absolute;
     top: 8px;
     color: #444;
 }
@@ -2663,13 +2666,13 @@ div.admin_section h4 {
 
 .ribbon h5 {
     display: block;
-    height: 30px;    
+    height: 30px;
     width: 150px;
     margin: 0;
     padding: 15px 0px;
     position: absolute;
     right: 0px;
-    top: 0px;    
+    top: 0px;
 }
 
 .ribbon .rib::before {
@@ -2681,19 +2684,19 @@ div.admin_section h4 {
     bottom: -11px;
     z-index: -10;
     border: 5px solid;
-    border-color: #242424 transparent transparent transparent;    
+    border-color: #242424 transparent transparent transparent;
 }
 
 .ribbon .rib-error::before {
-    border-color: #610801 transparent transparent transparent;        
+    border-color: #610801 transparent transparent transparent;
 }
 
 .ribbon .rib-success::before {
-    border-color: #66751B transparent transparent transparent; 
+    border-color: #66751B transparent transparent transparent;
 }
 
 .ribbon .rib-gray::before {
-    border-color: #ccc transparent transparent transparent; 
+    border-color: #ccc transparent transparent transparent;
 }
 
 
@@ -2703,7 +2706,7 @@ div.admin_section h4 {
 
 
 .ribbon .success {
-    
+
 }
 
 .ribbon .error {
@@ -2748,7 +2751,7 @@ div.admin_section h4 {
 
 .red_alert {
     color:red;
-    font-weight: bold;    
+    font-weight: bold;
 }
 
 #question_feedback {
@@ -2961,16 +2964,16 @@ form .formw .freeze {
     line-height: 18px;
     padding: 6px;
     text-align: left;
-    vertical-align: top;    
+    vertical-align: top;
 }
 
-.data_table th {    
-    padding: 8px 10px;    
+.data_table th {
+    padding: 8px 10px;
     font-weight: bold;
     background-color: #F2F2F2;
     border-bottom: 1px solid #DDDDDD;
 }
-.data_table td {    
+.data_table td {
 }
 
 .data_table_no_border {
@@ -3006,7 +3009,7 @@ form .formw .freeze {
 
 .data_table_pagination {
     width:100%;
-    margin-top: 8px;    
+    margin-top: 8px;
 }
 
 .form-stacked .label {
@@ -3047,7 +3050,7 @@ form .formw .freeze {
     padding: 5px 5px 0px 5px;
 }
 .tableFloatingHeaderOriginal th, .tableWithFloatingHeader th{
-    height:80px;    
+    height:80px;
 }
 
 /* jsPlumb */
@@ -3893,7 +3896,7 @@ a.forum_group_link {
 }
 
 .subnav .nav > li > .logout {
-    padding-top:8px; 
+    padding-top:8px;
 }
 
 footer {
@@ -3955,7 +3958,7 @@ footer {
 #lp_media_file {
     float: left;
     text-align:center;
-    width: 94%;    
+    width: 94%;
 }
 
 #learning_path_toc {
@@ -4124,7 +4127,7 @@ footer {
 .handle{
     background-image: url('../img/div_show.gif');
     background-repeat: no-repeat;
-    background-position:left center; 
+    background-position:left center;
     padding-left: 25px;
     box-shadow:none;
 }
@@ -4132,7 +4135,7 @@ footer {
 .handle.collapsed{
     background-image:  url('../img/div_show.gif');
     background-repeat: no-repeat;
-    background-position:left center; 
+    background-position:left center;
     padding-left: 25px;
     box-shadow:none;
 }
@@ -4140,7 +4143,7 @@ footer {
 .handle.expanded{
     background-image:  url('../img/div_hide.gif');
     background-repeat: no-repeat;
-    background-position:left center; 
+    background-position:left center;
     padding-left: 25px;
     box-shadow:none;
 }
@@ -4148,7 +4151,7 @@ footer {
 .collapsible .handle{
     background-image: url('../img/div_hide.gif');
     background-repeat: no-repeat;
-    background-position:left center; 
+    background-position:left center;
     padding-left: 25px;
     box-shadow:none;
 }
@@ -4156,7 +4159,7 @@ footer {
 .collapsible .handle.collapsed{
     background-image:  url('../img/div_show.gif');
     background-repeat: no-repeat;
-    background-position:left center; 
+    background-position:left center;
     padding-left: 25px;
     box-shadow:none;
 }
@@ -4164,7 +4167,7 @@ footer {
 .collapsible.expanded .handle{
     background-image:  url('../img/div_hide.gif');
     background-repeat: no-repeat;
-    background-position:left center; 
+    background-position:left center;
     padding-left: 25px;
     box-shadow:none;
 }
@@ -4180,7 +4183,7 @@ footer {
     display:inline-block;
     background-image:  url('../img/icons/22/invisible.png');
     background-repeat: no-repeat;
-    background-position:center center; 
+    background-position:center center;
     box-shadow:none;
 }
 
@@ -4195,7 +4198,7 @@ footer {
     display:inline-block;
     background-image:  url('../img/icons/22/visible.png');
     background-repeat: no-repeat;
-    background-position:center center; 
+    background-position:center center;
     box-shadow:none;
 }
 
@@ -4210,7 +4213,7 @@ footer {
     display:inline-block;
     background-image:  url('../img/loading1.gif') !important;
     background-repeat: no-repeat;
-    background-position:center center; 
+    background-position:center center;
     box-shadow:none;
 }
 
@@ -4223,7 +4226,7 @@ i.size-32{
     border:none;
     border-radius: 0;
     background-repeat: no-repeat;
-    background-position:center center; 
+    background-position:center center;
     box-shadow:none;
     background-color: transparent;
     display:inline-block;
@@ -4290,7 +4293,7 @@ i.size-22{
     border:none;
     border-radius: 0;
     background-repeat: no-repeat;
-    background-position:center center; 
+    background-position:center center;
     box-shadow:none;
     background-color: transparent;
     display:inline-block;
@@ -4324,7 +4327,7 @@ i.icon-expand{
     text-align: left;
     width: 100%;
 }
-.announcement .title{  
+.announcement .title{
     background: none repeat scroll 0 0 #F2F2F2;
     color:black;
 }
@@ -4346,7 +4349,7 @@ i.icon-expand{
     display:inline-block;
     background-image:  url('../img/attachment.gif');
     background-repeat: no-repeat;
-    background-position:center center; 
+    background-position:center center;
     box-shadow:none;
 }
 
@@ -4455,7 +4458,7 @@ li.annoucement{
     padding:0;
     display:inline-block;
     background-repeat: no-repeat;
-    background-position:center center; 
+    background-position:center center;
     box-shadow:none;
 }
 
@@ -4478,7 +4481,7 @@ li.annoucement{
     display:inline-block;
     background-image:  url('../img/icons/22/preview_view.png');
     background-repeat: no-repeat;
-    background-position:center center; 
+    background-position:center center;
     box-shadow:none;
 }
 
@@ -4533,7 +4536,7 @@ i.size-32.icon-new-note{
 }
 
 #learning_path_main #control {
-    text-align: center;    
+    text-align: center;
     background-image:-webkit-gradient(linear,left top,left bottom,from(#ececec),to(#fff));
     background-image:-webkit-linear-gradient(top,#ececec,#fff);
     background-image:-moz-linear-gradient(top,#ececec,#fff);
@@ -4674,7 +4677,7 @@ i.size-32.icon-new-work{
 }
 
 #filepaths input{
-    margin-bottom:5px;    
+    margin-bottom:5px;
 }
 
 /* Fixing z-index */