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

module/bug/view/edit.html.php

@@ -65,10 +65,13 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
               <?php echo html::textarea('comment', '', "rows='5' class='form-control kindeditor' hidefocus='true'");?>
             </div>
           </div>
-          <div class='form-group'><?php echo $this->fetch('file', 'buildform');?></div>
+          <div class="detail">
+            <div class="detail-title"><?php echo $lang->files;?></div>
+            <div class='detail-content'><?php echo $this->fetch('file', 'buildform');?></div>
+          </div>
 
           <div class='actions actions-form text-center'>
-            <?php 
+            <?php
             echo html::hidden('lastEditedDate', $bug->lastEditedDate);
             echo html::submitButton('', '', 'btn btn-wide btn-primary');
             $browseLink = $app->session->bugList != false ? $app->session->bugList : inlink('browse', "productID=$bug->product");
@@ -98,7 +101,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
                   <th><?php echo $lang->bug->module;?></th>
                   <td>
                     <div class='input-group' id='moduleIdBox'>
-                    <?php 
+                    <?php
                     echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated()' class='form-control chosen'");
                     if(count($moduleOptionMenu) == 1)
                     {
@@ -125,7 +128,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
                   <td>
                     <?php
                     /**
-                     * Remove designchange, newfeature, trackings from the typeList, because should be tracked in story or task. 
+                     * Remove designchange, newfeature, trackings from the typeList, because should be tracked in story or task.
                      * These thress types if upgrade from bugfree2.x.
                      */
                     if($bug->type != 'designchange') unset($lang->bug->typeList['designchange']);

module/company/view/browse.html.php

@@ -114,7 +114,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
       <div class='table-footer'>
         <?php if($canBatchEdit):?>
         <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
-        <div class="table-actions btn-toolbar"><?php echo html::submitButton($lang->edit);?></div>
+        <div class="table-actions btn-toolbar"><?php echo html::submitButton($lang->edit, '', 'btn');?></div>
         <?php endif;?>
         <?php $pager->show('right', 'pagerjs');?>
       </div>

module/task/css/create.css

@@ -0,0 +1 @@
+#copyButton {width: 56px; background-color: #f1f1f1; opacity: 1;} /*Adjust for task #4151;*/

module/task/js/create.js

@@ -75,6 +75,7 @@ function setPreview()
     {
         $('#preview').addClass('hidden');
         $('#copyButton').addClass('hidden');
+        $('div.colorpicker').css('right', '1px');//Adjust for task #4151;
     }
     else
     {
@@ -84,6 +85,7 @@ function setPreview()
         $('#preview').removeClass('hidden');
         $('#preview a').attr('href', storyLink);
         $('#copyButton').removeClass('hidden');
+        $('div.colorpicker').css('right', '57px');//Adjust for task #4151;
     }
 
     setAfter();

module/task/view/create.html.php

@@ -66,13 +66,13 @@
         <tr>
           <th><?php echo $lang->task->name;?></th>
           <td colspan='3'>
-            <div class="input-control has-icon-right">
+            <div class="input-control has-icon-left has-icon-right">
               <div class="colorpicker">
                 <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
                 <ul class="dropdown-menu clearfix">
                   <li class="heading"><?php echo $lang->task->colorTag;?><i class="icon icon-close"></i></li>
                 </ul>
-                <input type="hidden" class="colorpicker" id="color" name="color" value="" data-icon="color" data-wrapper="input-control-icon-right" data-update-color="#name"  data-provide="colorpicker">
+                <input type="hidden" class="colorpicker" id="color" name="color" value="" data-icon="color" data-wrapper="input-control-icon-left" data-update-color="#name"  data-provide="colorpicker">
               </div>
               <?php echo html::input('name', $task->name, "class='form-control' autocomplete='off' required");?>
               <?php if($this->config->global->flow != 'onlyTask'):?>

module/task/view/edit.html.php

@@ -30,26 +30,31 @@
     <div class='main-row'>
       <div class='main-col col-8'>
         <div class='cell'>
-          <div class='form-group'>
-            <div class='input-group'>
-              <div class="input-control has-icon-right">
-                <div class="colorpicker">
-                  <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown" title="<?php echo $lang->task->colorTag ?>"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
-                  <ul class="dropdown-menu clearfix">
-                    <li class="heading"><?php echo $lang->task->colorTag;?><i class="icon icon-close"></i></li>
-                  </ul>
-                  <input type="hidden" class="colorpicker" id="color" name="color" value="<?php echo $task->color ?>" data-icon="color" data-wrapper="input-control-icon-right" data-update-color=".task-name"  data-provide="colorpicker">
+          <div class='detail'>
+            <div class='detail-title'><?php echo $lang->task->name;?></div>
+            <div class='detail-content'>
+              <div class='form-group'>
+                <div class='<?php if(empty($task->children) and empty($task->parent) and $task->type != 'affair') echo 'input-group';?>'>
+                  <div class="input-control has-icon-right">
+                    <div class="colorpicker">
+                      <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown" title="<?php echo $lang->task->colorTag ?>"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
+                      <ul class="dropdown-menu clearfix">
+                        <li class="heading"><?php echo $lang->task->colorTag;?><i class="icon icon-close"></i></li>
+                      </ul>
+                      <input type="hidden" class="colorpicker" id="color" name="color" value="<?php echo $task->color ?>" data-icon="color" data-wrapper="input-control-icon-right" data-update-color=".task-name"  data-provide="colorpicker">
+                    </div>
+                    <?php echo html::input('name', $task->name, 'class="form-control task-name" autocomplete="off" placeholder="' . $lang->task->name . '"');?>
+                  </div>
+                  <?php if(empty($task->children) and empty($task->parent) and $task->type != 'affair'):?>
+                  <span class='input-group-addon'>
+                    <div class='checkbox-primary'>
+                      <input type='checkBox' name='multiple' id='multiple' value='1' <?php echo empty($task->team) ? '' : 'checked';?> />
+                      <label for='multiple'><?php echo $lang->task->multipleAB;?></label>
+                    </div>
+                  </span>
+                  <?php endif;?>
                 </div>
-                <?php echo html::input('name', $task->name, 'class="form-control task-name" autocomplete="off" placeholder="' . $lang->task->name . '"');?>
               </div>
-              <?php if(empty($task->children) and empty($task->parent) and $task->type != 'affair'):?>
-              <span class='input-group-addon'>
-                <div class='checkbox-primary'>
-                  <input type='checkBox' name='multiple' id='multiple' value='1' <?php echo empty($task->team) ? '' : 'checked';?> />
-                  <label for='multiple'><?php echo $lang->task->multipleAB;?></label>
-                </div>
-              </span>
-              <?php endif;?>
             </div>
           </div>
           <div class='detail'>

module/testcase/view/edit.html.php

@@ -117,8 +117,9 @@
             <div class='detail-title'><?php echo $lang->testcase->legendComment;?></div>
             <div class='detail-content'><?php echo html::textarea('comment', '',  "rows='5' class='form-control'");?></div>
           </div>
-          <div class='detail'>
-            <?php echo $this->fetch('file', 'buildform');?>
+          <div class="detail">
+            <div class="detail-title"><?php echo $lang->files;?></div>
+            <div class='detail-content'><?php echo $this->fetch('file', 'buildform');?></div>
           </div>
           <div class='text-center detail'>
             <?php echo html::hidden('lastEditedDate', $case->lastEditedDate);?>