Sfoglia il codice sorgente

fix tools works chamilo 1.10 BT#10014

aragonc 9 anni fa
parent
commit
7695c832ff

+ 117 - 13
app/Resources/public/css/base.css

@@ -2455,11 +2455,6 @@ div.admin_section h4 {
     padding:3px;
     margin:10px;
 }
-
-.ui-jqgrid tr.jqgrow td {
-    height:38px !important;
-}
-
 .exercise_overview_options {
     background-color: #F9F9F9;
     -webkit-border-radius: 10px;
@@ -6191,12 +6186,121 @@ div#chat-remote-video video {
   text-align: center;
 }
 
-p.bg-primary,
-p.bg-success,
-p.bg-info,
-p.bg-warning,
-p.bg-danger {
-    padding: 10px;
+#work-list{
+  padding: 10px;
+}
+.ui-jqgrid-view .label-success{
+  font-size: 14px;
+}
+.ui-jqgrid-view .ui-widget-content a{
+  color:#666666;
+}
+.ui-jqgrid-view .ui-state-default,
+.ui-jqgrid-view .ui-widget-content .ui-state-default,
+.ui-jqgrid-view .ui-widget-header .ui-state-default{
+  background: #EEEEEE;
+  color: #666666;
+  border: none;
+}
+.ui-jqgrid-view table{
+  border-collapse: inherit;
+}
+.ui-jqgrid.ui-widget-content{
+  border: none;
+}
+.ui-jqgrid-view .ui-jqgrid-sortable{
+  font-size: 14px;
+}
+.ui-jqgrid-view .ui-jqgrid .ui-jqgrid-htable th div{
+  height: auto;
+}
+.ui-jqgrid-view .ui-th-ltr, .ui-jqgrid .ui-jqgrid-htable th.ui-th-ltr{
+  padding-bottom: 5px;
+  padding-top: 5px;
+ }
+.ui-jqgrid tr.ui-row-ltr td{
+  border: none;
+}
+.ui-jqgrid tr.jqgrow td{
+  height: 45px;
+  font-size: 13px;
+}
+.ui-jqgrid .ui-jqgrid-labels .ui-state-hover{
+  background-color: #E7E7E7;
+}
+.ui-jqgrid .ui-pg-selbox{
+  font-size: 12px;
+  height: 25px;
+}
+.ui-jqgrid .ui-pg-input{
+  font-size: 12px;
+  height: 25px;
+}
+.ui-jqgrid .ui-pg-table td{
+  font-size: 12px;
+}
+.ui-state-hover,.ui-widget-content .ui-state-hover,
+.ui-widget-header .ui-state-hover,
+.ui-state-focus,
+.ui-widget-content .ui-state-focus,
+.ui-widget-header .ui-state-focus{
+  border:none;
+  background: #ECF0F1;
+  font-weight:normal;
+  color:#212121
+}
+.ui-state-hover a,
+.ui-state-hover a:hover,
+.ui-state-hover a:link,
+.ui-state-hover a:visited,
+.ui-state-focus a,
+.ui-state-focus a:hover,
+.ui-state-focus a:link,
+.ui-state-focus a:visited {
+  color:#212121;text-decoration:none
+}
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active{
+  border:1px solid #aaa;
+  background: #fff;
+  font-weight:normal;
+  color:#212121
+}
+.ui-priority-secondary,
+.ui-widget-content .ui-priority-secondary,
+.ui-widget-header .ui-priority-secondary{
+  opacity: 1;
+}
+.ui-jqgrid .ui-jqgrid-pager{
+  height: 35px;
+}
+.ui-jqgrid .ui-pg-table{
+  background: #fff;
+  color: #666666;
+  height: 35px;
+}
+.ui-jqgrid .ui-jqgrid-htable th div{
+  height: 25px;
+}
+#student-list-work{
+  padding: 10px;
+  background-color: #ffffff;
+  position: absolute;
+  top:0px;
+  right: 10px;
+  border: 1px solid #ccc;
+  width: auto;
+  z-index: 3;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.05);
+}
+#student-list-work .toolbar{
+  text-align: center;
+  padding-top: 5px;
+  padding-bottom: 5px;
 }
 /* CSS NEW TOP ******************************************************************************/
 /* CSS Responsive */
@@ -6234,7 +6338,7 @@ p.bg-danger {
     padding-right: 15px;
   }
 }
-/* Portrait tablet to landscape and desktop - Escritorio pequeño o Tablet */
+/* Portrait tablet to landscape and desktop */
 @media (min-width: 768px) and (max-width: 979px) {
   #learning_path_right_zone{
     width: 58%;
@@ -6249,7 +6353,7 @@ p.bg-danger {
     visibility: visible;
   }
 }
-/* Landscape phones and down  - Solo Smartphone*/
+/* Landscape phones and down */
 @media only screen and (min-device-width : 320px) and (max-device-width : 480px) {
   #learning_path_breadcrumb_zone {
     display: none;

+ 0 - 6
app/Resources/public/css/themes/chamilo/default.css

@@ -208,12 +208,6 @@ a:focus {
 .ui-accordion .ui-accordion-icons{
   padding-left: 0.2em;
 }
-.ui-state-default,
-.ui-widget-content .ui-state-default,
-.ui-widget-header .ui-state-default{
- background: #ECF0F1;
- border-color: #ECF0F1;
-}
 /* End Jquery UI */
 footer{
   background-color:#2C3E50;

+ 8 - 1
main/template/default/layout/head.tpl

@@ -138,7 +138,14 @@ function get_url_params(q, attribute) {
         }
     }
 }
-
+$(document).ready(function(){
+    $("#open-view-list").click(function(){
+        $("#student-list-work").fadeIn(300);
+    });
+    $("#closed-view-list").click(function(){
+        $("#student-list-work").fadeOut(300);
+    });
+});
 function check_brand() {
     if ($('.subnav').length) {
         if ($(window).width() >= 969) {

+ 11 - 11
main/work/work.lib.php

@@ -544,11 +544,11 @@ function showStudentWorkGrid()
     );
 
     $columnModel = array(
-        array('name'=>'type', 'index'=>'type', 'width'=>'30',   'align'=>'left', 'sortable' => 'false'),
+        array('name'=>'type', 'index'=>'type', 'width'=>'30',   'align'=>'center', 'sortable' => 'false'),
         array('name'=>'title', 'index'=>'title', 'width'=>'250',   'align'=>'left'),
-        array('name'=>'expires_on', 'index'=>'expires_on', 'width'=>'80',  'align'=>'left', 'sortable'=>'false'),
-        array('name'=>'feedback', 'index'=>'feedback', 'width'=>'80',  'align'=>'left'),
-        array('name'=>'last_upload', 'index'=>'feedback', 'width'=>'125',  'align'=>'left'),
+        array('name'=>'expires_on', 'index'=>'expires_on', 'width'=>'80',  'align'=>'center', 'sortable'=>'false'),
+        array('name'=>'feedback', 'index'=>'feedback', 'width'=>'80',  'align'=>'center'),
+        array('name'=>'last_upload', 'index'=>'feedback', 'width'=>'125',  'align'=>'center'),
     );
 
     if ($courseInfo['show_score'] == 0) {
@@ -584,11 +584,11 @@ function showStudentWorkGrid()
 function showTeacherWorkGrid()
 {
     $columnModel = array(
-        array('name'=>'type', 'index'=>'type', 'width'=>'35', 'align'=>'left', 'sortable' => 'false'),
+        array('name'=>'type', 'index'=>'type', 'width'=>'35', 'align'=>'center', 'sortable' => 'false'),
         array('name'=>'title', 'index'=>'title',  'width'=>'300',   'align'=>'left', 'wrap_cell' => "true"),
-        array('name'=>'sent_date', 'index'=>'sent_date', 'width'=>'125',  'align'=>'left'),
-        array('name'=>'expires_on', 'index'=>'expires_on', 'width'=>'125',  'align'=>'left'),
-        array('name'=>'amount', 'index'=>'end_on', 'width'=>'110',  'align'=>'left'),
+        array('name'=>'sent_date', 'index'=>'sent_date', 'width'=>'125',  'align'=>'center'),
+        array('name'=>'expires_on', 'index'=>'expires_on', 'width'=>'125',  'align'=>'center'),
+        array('name'=>'amount', 'index'=>'end_on', 'width'=>'110',  'align'=>'center'),
         array('name'=>'actions', 'index'=>'actions', 'width'=>'110', 'align'=>'left', 'sortable'=>'false')
     );
 
@@ -4304,8 +4304,8 @@ function generateMoveForm($item_id, $path, $courseInfo, $groupId, $sessionId)
 function showStudentList($workId)
 {
     $columnModel = array(
-        array('name'=>'student', 'index'=>'student', 'width'=>'150', 'align'=>'left', 'sortable' => 'false'),
-        array('name'=>'works', 'index'=>'works',  'width'=>'50', 'align'=>'left', 'sortable' => 'false')
+        array('name'=>'student', 'index'=>'student', 'width'=>'350px', 'align'=>'left', 'sortable' => 'false'),
+        array('name'=>'works', 'index'=>'works', 'align'=>'center', 'sortable' => 'false')
     );
     $token = null;
 
@@ -4320,7 +4320,7 @@ function showStudentList($workId)
     $params = array(
         'autowidth' => 'true',
         'height' => 'auto',
-        'rowNum' => 10,
+        'rowNum' => 5,
         'sortname' => $order,
         'sortorder' => 'asc'
     );

+ 6 - 2
main/work/work.php

@@ -321,11 +321,15 @@ switch ($action) {
         }
         if (api_is_allowed_to_edit() || api_is_coach()) {
             // Work list
+            $content .= '<div class="toolbar-works"><a id="open-view-list" class="btn btn-primary" href="#"><i class="fa fa-users"></i> Ver Estudiantes</a></div>';
             $content .= '<div class="row">';
-            $content .= '<div class="col-md-9">';
+            $content .= '<div class="col-md-12">';
+            $content .= '<div id="work-list" class="table-responsive">';
             $content .= showTeacherWorkGrid();
             $content .= '</div>';
-            $content .= '<div class="col-md-3">';
+            $content .= '</div>';
+            $content .= '<div id="student-list-work" style="display: none" class="table-responsive">';
+            $content .= '<div class="toolbar"><a id="closed-view-list" href="#"><i class="fa fa-times-circle"></i> ' .get_lang('Close'). '</a></div>';
             $content .= showStudentList($work_id);
             $content .= '</div>';
         } else {