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

module/project/css/common.css

@@ -20,3 +20,5 @@
 .table td.has-child > .task-toggle.collapsed > .icon {transform: rotate(-90deg);}
 
 .chosen-container-single .chosen-single > span{max-width:200px;}
+
+#whitelistBox .checkbox-inline, #whitelistBox .radio-inline{margin-left: 10px; display: inline-block; padding-left: 0px; padding-right: 10px;}

module/project/css/create.css

@@ -15,5 +15,3 @@
 .checkbox input[type=checkbox], .checkbox-inline input[type=checkbox], .radio input[type=radio], .radio-inline input[type=radio] {margin-top: 1px;}
 
 .type-tips {display: none;}
-
-#whitelistBox .checkbox-inline, #whitelistBox .radio-inline{margin-left: 10px; display: inline-block; padding-left: 0px; padding-right: 10px;}

module/project/view/activate.html.php

@@ -27,7 +27,7 @@
   <form class='load-indicator main-form' method='post' target='hiddenwin'>
     <table class='table table-form'>
       <tr>
-        <th><?php echo $lang->project->beginAndEnd;?></th>
+        <th class='w-70px'><?php echo $lang->project->beginAndEnd;?></th>
         <td class='muted' colspan='2'>
           <div id='sourceTimeBox'><?php echo $project->begin . ' ~ ' . $project->end;?></div>
           <div id='readjustTimeBox' class='hide'>

module/project/view/edit.html.php

@@ -143,7 +143,7 @@
         </tr>
         <tr id='whitelistBox' <?php if($project->acl != 'custom') echo "class='hidden'";?>>
           <th><?php echo $lang->project->whitelist;?></th>
-          <td colspan='2' id='whitelistBox'><?php echo html::checkbox('whitelist', $groups, $project->whitelist, '', '', 'inline');?></td>
+          <td colspan='2'><?php echo html::checkbox('whitelist', $groups, $project->whitelist, '', '', 'inline');?></td>
         </tr>
         <tr><td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide');?></td></tr>
       </table>

module/task/view/create.html.php

@@ -85,26 +85,26 @@
         <?php if(strpos(",$showFields,", ',pri,') !== false):?>
         <tr>
           <th><?php echo $lang->task->pri;?></th>
-          <td colspan='2'>
-            <?php
-            $hasCustomPri = false;
-            foreach($lang->task->priList as $priKey => $priValue)
-            {
-                if(!empty($priKey) and (string)$priKey != (string)$priValue)
-                {
-                    $hasCustomPri = true;
-                    break;
-                }
-            }
-            $priList = $lang->task->priList;
-            if(end($priList))
-            {
-                unset($priList[0]);
-                $priList[0] = '';
-            }
-            ?>
+          <?php
+          $hasCustomPri = false;
+          foreach($lang->task->priList as $priKey => $priValue)
+          {
+              if(!empty($priKey) and (string)$priKey != (string)$priValue)
+              {
+                  $hasCustomPri = true;
+                  break;
+              }
+          }
+          $priList = $lang->task->priList;
+          if(end($priList))
+          {
+              unset($priList[0]);
+              $priList[0] = '';
+          }
+          ?> 
+          <td colspan='<?php echo $hasCustomPri ? 1 : 3 ?>'>
             <?php if($hasCustomPri):?>
-            <?php echo html::select('pri', (array)$priList, $task->pri, "class='form-control chosen'");?> 
+            <?php echo html::select('pri', (array)$priList, $task->pri, "class='form-control chosen chosen-simple'");?> 
             <?php else: ?>
             <?php echo html::select('pri', (array)$priList, $task->pri, "class='form-control' data-provide='labelSelector'");?> 
             <?php endif; ?>

module/todo/js/common.js

@@ -44,12 +44,12 @@ function loadList(type, id)
         {
             if(data != ' ')
             {
-                $(divClass).html(data);
+                $(divClass).html(data).find('select').chosen();
             }
             else
             {
                 $("#type").val("custom");
-                $(divClass).html("<select id='bugs' class='form-control'></select>");
+                $(divClass).html("<select id='bugs' class='form-control'></select>").find('select').chosen();
             }
         });
     }

module/todo/view/create.html.php

@@ -86,11 +86,11 @@
         </tr>
         <tr>
           <th><?php echo $lang->todo->type;?></th>
-          <td><?php echo html::select('type', $lang->todo->typeList, '', 'onchange=loadList(this.value); class=form-control');?></td>
+          <td><?php echo html::select('type', $lang->todo->typeList, '', 'onchange="loadList(this.value);" class="form-control chosen-simple"');?></td>
         </tr>  
         <tr>
           <th><?php echo $lang->todo->pri;?></th>
-          <td><?php echo html::select('pri', $lang->todo->priList, '', "class='form-control chosen'");?></td>
+          <td><?php echo html::select('pri', $lang->todo->priList, '', "class='form-control chosen-simple'");?></td>
         </tr>  
         <tr>
           <th><?php echo $lang->todo->name;?></th>