Merge branch 'master' of https://github.com/easysoft/zentaopms

module/file/view/uploadimages.html.php

@@ -19,28 +19,32 @@ js::set('params', $params);
 js::set('uid', $uid);
 ?>
 <style>
-#uploader{padding: 20px;}
-#uploader > span{display:block; margin-bottom:10px; color: #29a8cd;}
+#uploader .uploader-files {border-bottom: 1px solid #e5e5e5; margin: 0 0 10px 0; min-height: 164px;}
+.file-list .file[data-status=queue] .file-status>.icon:before {content: '\e92b'}
+.uploader-files .file-status > .icon:before, .file-list .file-status > .icon:before {content: '\e92f'}
 </style>
-<div class='main-content'>
-  <div class='main-header'>
-    <h2><?php echo $lang->file->uploadImages;?></h2>
-  </div>
-  <div class='uploader' id='uploader' data-url='<?php echo inlink('uploadImages', "module=$module&params=$params&uid=$uid");?>'>
-    <div class='uploader-message text-center'>
-      <div class='content'></div>
-      <button type='button' class='close'>×</button>
-    </div>
-    <div class='uploader-files file-list file-list-grid' data-drag-placeholder="<?php echo $lang->file->dragFile;?>"></div>
-    <hr/>
-    <span><?php echo $this->lang->file->uploadImagesExplain?></span>
-    <div class='uploader-footer'>
-      <div class='uploader-status pull-right text-muted'></div>
-      <button type='button' class='btn btn-primary uploader-btn-browse'><i class='icon icon-plus'></i><?php echo $lang->file->addFile;?></button>
-      <button type='button' class='btn btn-success uploader-btn-start'><i class='icon icon-cloud-upload'></i><?php echo $lang->file->beginUpload;?></button>
+<main id='main'>
+  <div class='container'>
+    <div id='mainContent'>
+      <div class='main-header'>
+        <h2><?php echo $lang->file->uploadImages;?></h2>
+      </div>
+      <div class='uploader' id='uploader' data-url='<?php echo inlink('uploadImages', "module=$module&params=$params&uid=$uid");?>'>
+        <div class='uploader-message text-center'>
+          <div class='content'></div>
+          <button type='button' class='close'>×</button>
+        </div>
+        <div class='uploader-files file-list file-list-grid' data-drag-placeholder="<?php echo $lang->file->dragFile;?>"></div>
+        <div class='text-info space-sm'><?php echo $this->lang->file->uploadImagesExplain?></div>
+        <div class='uploader-footer'>
+          <div class='uploader-status pull-right text-muted'></div>
+          <button type='button' class='btn btn-secondary uploader-btn-browse btn-wide'><i class='icon icon-plus'></i><?php echo $lang->file->addFile;?></button> &nbsp; 
+          <button type='button' class='btn btn-primary uploader-btn-start btn-wide'><i class='icon icon-arrow-up'></i><?php echo $lang->file->beginUpload;?></button>
+        </div>
+      </div>
     </div>
   </div>
-</div>
+</main>
 <script>
 $('#uploader').uploader({
     onUploadComplete:function()

module/project/view/grouptask.html.php

@@ -70,7 +70,7 @@
     ?>
   </div>
 </div>
-<div class="main-table" data-ride="table" data-checkable="false" data-group="true">
+<div id='tasksTable' class='main-table' data-ride='table' data-checkable='false' data-group='true' data-hot='true'>
   <table class="table table-grouped text-center">
     <thead>
       <tr class="<?php if($allCount) echo 'divider';?>">
@@ -96,7 +96,7 @@
         <th class="c-pri"><?php echo $lang->priAB;?></th>
         <th class="c-name"><?php echo $lang->task->name;?></th>
         <th class="c-status"><?php echo $lang->task->status;?></th>
-        <th class="c-assign"><?php echo $lang->task->assignedTo;?></th>
+        <th class="c-assign text-left"><?php echo $lang->task->assignedTo;?></th>
         <th class="c-user"><?php echo $lang->task->finishedBy;?></th>
         <th class="c-hours"><?php echo $lang->task->estimateAB;?></th>
         <th class="c-hours"><?php echo $lang->task->consumedAB;?></th>

module/story/view/batchcreate.html.php

@@ -105,8 +105,12 @@
 <script>
 $(function()
 {
+    var imageTitles = <?php echo json_encode($titles);?>;
+    var storyTitles = <?php echo json_encode(array_keys($titles));?>;
+
     $('#batchCreateForm').batchActionForm(
     {
+        idEnd: <?php echo max(count($titles), 9)?>,
         rowCreator: function($row, index)
         {
             $row.find('select').each(function()
@@ -119,7 +123,12 @@ $(function()
                 {
                     $select.next('.chosen-container').find('.chosen-drop').width($select.closest('td').width() + 50);
                 }, 200);
-            });
+              });
+              var storyTitle = storyTitles && storyTitles[index];
+              if (storyTitle && storyTitle.length)
+              {
+                  $row.find('.input-story-title').val(storyTitle).after('<input type="hidden" name="uploadImage[' + index + ']" id="uploadImage[' + index + ']" value="' + imageTitles[storyTitle] + '">');
+              }
         }
     });
 });

module/task/view/assignto.html.php

@@ -48,7 +48,7 @@
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control w-p98'");?></td>
         </tr>
         <tr>
-          <td colspan='3' class='text-center'>
+          <td colspan='3' class='text-center form-actions'>
             <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
             <?php echo html::linkButton($lang->goback, $this->session->taskList);?>
           </td>
@@ -56,7 +56,7 @@
       </table>
     </form>
     <hr class='small' />
-    <div class='main'><?php include '../../common/view/action.html.php';?></div>
+    <?php include '../../common/view/action.html.php';?>
     <?php endif;?>
   </div>
 </div>