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

module/task/css/create.css

@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+#copyButton{width: 50px;}
+=======
+#copyButton {width: 56px; background-color: #f1f1f1; opacity: 1;} /*Adjust for task #4151;*/
+>>>>>>> 9ebca72c8626aefa35f2f966d11a3989fb2d6503

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'):?>