Browse Source

fix tables css jquery-ui

aragonc 9 years ago
parent
commit
9141f20478

+ 16 - 8
app/Resources/public/css/base.css

@@ -376,11 +376,6 @@ ul#navigation .report a {
 .actions .btn-toolbar {
     margin : 0px;
 }
-.actions span {
-    display: inline-block;
-    margin-right: 10px;
-    vertical-align:middle;
-}
 .actions form {
     margin-right: 10px;
     vertical-align:middle;
@@ -2829,6 +2824,7 @@ form .formw .freeze {
   padding-top: 10px;
   padding-bottom: 10px;
   padding-left: 10px;
+  padding-right: 10px;
 }
 
 .data_table th {
@@ -6011,7 +6007,9 @@ div#chat-remote-video video {
 .ui-jqgrid .ui-pg-table td{
   font-size: 12px;
 }
-
+.ui-jqgrid .ui-widget-content .ui-state-default{
+  background: #EEEEEE;
+}
 .ui-tabs .ui-widget-header{
     background: none;
     border-top: none;
@@ -6024,7 +6022,7 @@ div#chat-remote-video video {
     border: none;
 }
 
-.ui-tabs .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default{
+.ui-tabs .ui-state-default, .ui-tabs .ui-widget-content .ui-state-default, .ui-tabs .ui-widget-header .ui-state-default{
     background: #fff;
 }
 .ui-tabs .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active{
@@ -6054,6 +6052,12 @@ div#chat-remote-video video {
 .ui-jqgrid .ui-jqgrid-htable th div{
   height: 25px;
 }
+.ui-jqgrid .ui-state-highlight, .ui-jqgrid .ui-widget-content .ui-state-highlight,.ui-jqgrid .ui-widget-header .ui-state-highlight{
+  background: #F7F7F7;
+}
+.ui-jqgrid .ui-state-hover, .ui-jqgrid .ui-widget-content .ui-state-hover,.ui-jqgrid .ui-widget-header .ui-state-hover{
+  background: #F7F7F7;
+}
 /* ui diglog */
 .ui-dialog .ui-widget-header{
   border:none;
@@ -6096,6 +6100,10 @@ div#chat-remote-video video {
   font-weight:normal;
   color:#333333;
 }*/
+.select2-container .select2-selection--single{
+  height: 32px !important;
+  border-color: #CCCCCC !important;
+}
 #dialog-form .dialog-form-content{
   font-size: 12px;
 }
@@ -6443,7 +6451,7 @@ a.sessionView {
   padding-left: 10px;
 }
 #course-list.data_table .title{
-    width: 360px;
+    width: 390px;
     padding-left: 0;
 }
 .actions label{

+ 23 - 14
main/admin/course_list.php

@@ -359,7 +359,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
     $form = new FormValidator('search_simple', 'get', '', '', array(), FormValidator::LAYOUT_INLINE);
     $form->addElement('text', 'keyword', null, array('id' => 'course-search-keyword'));
     $form->addButtonSearch(get_lang('SearchCourse'));
-    $form->addElement('static', 'search_advanced_link', null, '<a href="course_list.php?search=advanced">'.get_lang('AdvancedSearch').'</a>');
+    $advanced .= '<a class="btn btn-default" href="'.  api_get_path(WEB_CODE_PATH).'admin/course_list.php?search=advanced"><i class="fa fa-search"></i> '.get_lang('AdvancedSearch').'</a>';
 
     // Create a filter by session
     $sessionFilter = new FormValidator('course_filter', 'get', '', '', array(), FormValidator::LAYOUT_INLINE);
@@ -381,7 +381,25 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
         )
     );
     $courseListUrl = api_get_self();
-    $actions = '
+    $actions .= '<div class="row">';
+    $actions .= '<div class="col-md-4">';
+    $actions .= $form->return_form();
+    $actions .= '</div>';
+    $actions .= '<div class="col-md-4">';
+    $actions .= $sessionFilter->return_form();
+    $actions .= '</div>';
+    $actions .= '<div class="col-md-4">';
+        
+        $actions .= $advanced;
+        $actions .= '<div class="pull-right">';
+        $actions .= '<a href="course_add.php">'.Display::return_icon('new_course.png', get_lang('AddCourse'),'',ICON_SIZE_MEDIUM).'</a> ';
+        if (api_get_setting('course_validation') == 'true') {
+            $actions .= '<a href="course_request_review.php">'.Display::return_icon('course_request_pending.png', get_lang('ReviewCourseRequests'),'',ICON_SIZE_MEDIUM).'</a>';
+        }
+        $actions .= '</div>';
+    $actions .= '</div>';
+    $actions .= '</div>';
+    $actions .= '
     <script>
     $(function() {
         $("#session_name").on("change", function() {
@@ -390,18 +408,9 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
         });
     });
     </script>';
-    $actions .= '<div class="pull-right">';
-    $actions .= '<a href="course_add.php">'.Display::return_icon('new_course.png', get_lang('AddCourse'),'',ICON_SIZE_MEDIUM).'</a> ';
-    if (api_get_setting('course_validation') == 'true') {
-        $actions .= '<a href="course_request_review.php">'.Display::return_icon('course_request_pending.png', get_lang('ReviewCourseRequests'),'',ICON_SIZE_MEDIUM).'</a>';
-    }
-    $actions .= '</div>';
-
-    $actions .= '<div class="pull-right">';
-    $actions .= $sessionFilter->return_form();
-    $actions .= '</div>';
-
-    $actions .= $form->return_form();
+    
+   
+    
 
     if (isset($_GET['session_id']) && !empty($_GET['session_id'])) {
         // Create a sortable table with the course data filtered by session

+ 1 - 1
main/inc/lib/formvalidator/Element/SelectAjax.php

@@ -46,7 +46,7 @@ class SelectAjax extends HTML_QuickForm_select
         $defaultValues = empty($defaultValues) ? [] : $defaultValues;
 
         $width = 'element';
-        $givenWidth = $this->getAttribute('width');
+        $givenWidth = '300';
         if (!empty($givenWidth)) {
             $width = $givenWidth;
         }