Prechádzať zdrojové kódy

fix ajax form upload files works CT#7769

aragonc 9 rokov pred
rodič
commit
d18eaca93a

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

@@ -221,20 +221,40 @@ ul#navigation .report a {
 #results .file_upload_highlight {
     background: #F4D364;
 }
+.file_upload{
+    position: relative;
+}
 .work_correction_file_upload .button-load {
-    position: absolute;
-    top: -60px;
-    left: -30px;
+    position: relative;
     font-size: 10px;
-    width: 100px;
-    padding-top: 0px;
+    font-weight: normal;
+    width: 100%;
+    padding-top: 5px;
     background: none;
 }
-
+.file_upload_small{
+    line-height: 15px;
+    border: 1px solid #AFDDE9;
+    background: #D4E6F0;
+    width: 100%;
+}
 .work_correction_file_upload {
-    height: 40px;
+    height: 40px !important;
+    margin-bottom: 5px;
+    margin-top: 5px;
+}
+.file_upload input{
+    position: relative;
+    border: none;
+}
+#results .jqgrid_whitespace .date-time{
+    font-size: 12px;
+    color: #666666;
+    text-align: center;
+}
+.list-work-results{
+    margin-top: 20px;
 }
-
 .impress-content{
     position: relative;
     width: 100%;
@@ -2261,6 +2281,7 @@ div.admin_section h4 {
 
 .ui-jqgrid tr.jqgrow td {
     height:38px !important;
+    white-space: inherit;
 }
 
 .exercise_overview_options {

BIN
main/img/icons/22/check.png


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

@@ -2055,7 +2055,7 @@ function get_work_user_list(
                 $work_date = api_convert_and_format_date($work['sent_date']);
 
                 $work['sent_date_from_db'] = $work['sent_date'];
-                $work['sent_date'] = date_to_str_ago(api_get_local_time($work['sent_date'])) . ' ' . $add_string . '<br />' . $work_date;
+                $work['sent_date'] = '<div class="date-time">' . date_to_str_ago(api_get_local_time($work['sent_date'])) . ' ' . $add_string . ' ' . $work_date . '</div>';
 
                 // Actions.
                 $correction = '';

+ 5 - 2
main/work/work_list_all.php

@@ -389,12 +389,15 @@ $(function() {
 
 echo $documentsAddedInWork;
 echo Display::grid_html('results');
-
-echo '<table style="display:none; width:50%" class="files data_table">
+echo '<div class="list-work-results">';
+echo '<div class="panel panel-default">';
+echo '<div class="panel-body">';
+echo '<table style="display:none; width:100%" class="files data_table">
         <tr>
             <th>'.get_lang('FileName').'</th>
             <th>'.get_lang('Size').'</th>
             <th>'.get_lang('Status').'</th>
         </tr>
     </table>';
+echo '</div></div></div>';
 Display :: display_footer();