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

module/bug/js/create.js

@@ -122,25 +122,17 @@ $(function()
     var adjustBugTypeGroup = function()
     {
         var $group = $('#bugTypeInputGroup');
-        var width = $group.width(), addonWidth = 0;
+        var width = ($group.parent().width() - 10), addonWidth = 0;
         var $controls = $group.find('.chosen-single');
         $group.children('.input-group-addon').each(function()
         {
             addonWidth += $(this).outerWidth();
         });
-        $controls.css('width', Math.floor((width - addonWidth)/$controls.length));
+        var bestWidth = Math.floor((width - addonWidth)/$controls.length);
+        $controls.css('width', bestWidth);
+        var lastWidth = width - addonWidth - bestWidth * ($controls.length - 1);
+        $controls.last().css('width', lastWidth);
     };
     adjustBugTypeGroup();
-
-    // adjust style for file box
-    var ajustFilebox = function()
-    {
-        applyCssStyle('.fileBox > tbody > tr > td:first-child {transition: none; width: ' + ($('#contactListGroup').width() - 2) + 'px}', 'filebox')
-    };
-    ajustFilebox();
-    $(window).resize(function()
-    {
-        ajustFilebox();
-        adjustBugTypeGroup();
-    });
+    $(window).on('resize', adjustBugTypeGroup);
 });

module/bug/view/edit.html.php

@@ -177,10 +177,8 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
                 <tr>
                   <th><?php echo $lang->bug->mailto;?></th>
                   <td>
-                    <div class='input-group'>
                     <?php echo html::select('mailto[]', $users, str_replace(' ', '', $bug->mailto), 'class="form-control chosen" multiple');?>
-                    <div class='input-group-btn'><?php echo $this->fetch('my', 'buildContactLists');?></div>
-                    </div>
+                    <?php echo $this->fetch('my', 'buildContactLists');?>
                   </td>
                 </tr>
               </tbody>

module/common/lang/en.php

@@ -528,7 +528,7 @@ $lang->icons['product']   = 'cube';
 $lang->icons['bug']       = 'bug';
 $lang->icons['task']      = 'check-sign';
 $lang->icons['tasks']     = 'tasks';
-$lang->icons['project']   = 'folder-close-alt';
+$lang->icons['project']   = 'stack';
 $lang->icons['doc']       = 'file-text';
 $lang->icons['doclib']    = 'folder-close';
 $lang->icons['story']     = 'lightbulb';

module/common/lang/zh-cn.php

@@ -528,7 +528,7 @@ $lang->icons['product']   = 'cube';
 $lang->icons['bug']       = 'bug';
 $lang->icons['task']      = 'check-sign';
 $lang->icons['tasks']     = 'tasks';
-$lang->icons['project']   = 'folder-close-alt';
+$lang->icons['project']   = 'stack';
 $lang->icons['doc']       = 'file-text';
 $lang->icons['doclib']    = 'folder-close';
 $lang->icons['story']     = 'lightbulb';

module/product/css/common.css

@@ -0,0 +1 @@
+#whitelistBox .checkbox-primary, #whitelistBox .radio-inline{margin-left: 10px; display: inline-block; padding-left: 0px; padding-right: 10px;}

module/project/css/create.css

@@ -3,12 +3,12 @@
 #copyProjectModal {padding: 0}
 #copyProjectModal {padding: 0 2px}
 #copyProjectModal > div {position: relative;}
-#copyProjectModal a {display: block; min-height: 30px; line-height: 30px; padding: 5px 15px; border: 1px solid #e5e5e5; color: #333; margin: 5px 0}
+#copyProjectModal a {display: block; min-height: 30px; line-height: 30px; padding: 5px 15px; border: 1px solid #e5e5e5; color: #333; margin: 5px 0; border-radius: 3px;}
 #copyProjectModal a > i {display: inline-block; margin-right: 5px;}
-#copyProjectModal a:hover {border:1px solid #39B3D7; background-color: #E5F9FF; text-decoration: none}
-#copyProjectModal a.active {border-color: #229F24; color: #229F24; background-color: #E5FFE6}
-#copyProjectModal a.active:after {position: absolute; content: '\e60d'; font-family: NewZenIcon; font-size: 20px; right: 25px;}
-#copyProjectModal a.cancel {color: #D2322D}
+#copyProjectModal a:hover {border:1px solid #00a9fc; background-color: #E9F2FB; text-decoration: none}
+#copyProjectModal a.active {border-color: #00da88; color: #00da88; background-color: #E5FFE6}
+#copyProjectModal a.active:after {position: absolute; content: '\e92f'; font-family: ZentaoIcon; font-size: 20px; right: 25px;}
+#copyProjectModal a.cancel {color: #ff5d5d}
 
 .modal-dialog {margin-top: 10%!important;}
 

module/project/lang/zh-cn.php

@@ -200,7 +200,7 @@ $lang->project->checkedSummary  = "选中 <strong>%total%</strong> 个任务，
 $lang->project->memberHoursAB   = "<div>%s有 <strong>%s</strong> 工时</div>";
 $lang->project->memberHours     = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s可用工时</div><div class="segment-value">%s</div></div></div></div>';
 $lang->project->countSummary    = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">总任务</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">进行中</div><div class="segment-value"><span class="label label-dot label-primary"></span> %s</div></div><div class="segment"><div class="segment-title">未开始</div><div class="segment-value"><span class="label label-dot label-primary muted"></span> %s</div></div></div></div>';
-$lang->project->timeSummary     = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">总消耗</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">已消耗</div><div class="segment-value text-red">%s</div></div><div class="segment"><div class="segment-title">剩余</div><div class="segment-value">%s</div></div></div></div>';
+$lang->project->timeSummary     = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">总预计</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">已消耗</div><div class="segment-value text-red">%s</div></div><div class="segment"><div class="segment-title">剩余</div><div class="segment-value">%s</div></div></div></div>';
 $lang->project->groupSummaryAB  = "<div>总任务 <strong>%s</strong></div><div><span class='text-muted'>未开始</span> %s &nbsp; <span class='text-muted'>进行中</span> %s</div><div>总预计 <strong>%s</strong></div><div><span class='text-muted'>已消耗</span> %s &nbsp; <span class='text-muted'>剩余</span> %s</div>";
 $lang->project->wbs             = "分解任务";
 $lang->project->batchWBS        = "批量分解";

module/project/lang/zh-tw.php

@@ -200,7 +200,7 @@ $lang->project->checkedSummary  = "選中 <strong>%total%</strong> 個任務，
 $lang->project->memberHoursAB   = "<div>%s有 <strong>%s</strong> 工時</div>";
 $lang->project->memberHours     = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s可用工時</div><div class="segment-value">%s</div></div></div></div>';
 $lang->project->countSummary    = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">總任務</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">進行中</div><div class="segment-value"><span class="label label-dot label-primary"></span> %s</div></div><div class="segment"><div class="segment-title">未開始</div><div class="segment-value"><span class="label label-dot label-primary muted"></span> %s</div></div></div></div>';
-$lang->project->timeSummary     = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">總消耗</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">已消耗</div><div class="segment-value text-red">%s</div></div><div class="segment"><div class="segment-title">剩餘</div><div class="segment-value">%s</div></div></div></div>';
+$lang->project->timeSummary     = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">總預計</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">已消耗</div><div class="segment-value text-red">%s</div></div><div class="segment"><div class="segment-title">剩餘</div><div class="segment-value">%s</div></div></div></div>';
 $lang->project->groupSummaryAB  = "<div>總任務 <strong>%s</strong></div><div><span class='text-muted'>未開始</span> %s &nbsp; <span class='text-muted'>進行中</span> %s</div><div>總預計 <strong>%s</strong></div><div><span class='text-muted'>已消耗</span> %s &nbsp; <span class='text-muted'>剩餘</span> %s</div>";
 $lang->project->wbs             = "分解任務";
 $lang->project->batchWBS        = "批量分解";

module/project/view/create.html.php

@@ -39,7 +39,7 @@
     <div class='main-header'>
       <h2><?php echo $lang->project->create;?></h2>
       <div class="pull-right btn-toolbar">
-        <button type='button' class='btn btn-link' id='cpmBtn'><?php echo html::icon($lang->icons['copy']) . ' ' . $lang->project->copy;?></button>
+        <button type='button' class='btn btn-link' id='cpmBtn'><?php echo html::icon($lang->icons['copy'], 'muted') . ' ' . $lang->project->copy;?></button>
       </div>
     </div>
     <form class='form-indicator main-form' method='post' target='hiddenwin' id='dataform'>
@@ -150,12 +150,12 @@
 <div class='modal fade' id='copyProjectModal'>
   <div class='modal-dialog mw-800px'>
     <div class='modal-header'>
-      <button type='button' class='close' data-dismiss='modal'>&times;</button>
+      <button type='button' class='close' data-dismiss='modal'><i class="icon icon-close"></i></button>
       <h4 class='modal-title' id='myModalLabel'><?php echo $lang->project->copyTitle;?></h4>
     </div>
     <div class='modal-body'>
       <?php if(count($projects) == 1):?>
-      <div class='alert alert-warning with-icon'>
+      <div class='alert with-icon'>
         <i class='icon-exclamation-sign'></i>
         <div class='content'><?php echo $lang->project->copyNoProject;?></div>
       </div>

module/score/css/reset.css

@@ -0,0 +1 @@
+.alert{margin-bottom:0px;}

module/score/view/reset.html.php

@@ -11,7 +11,7 @@
 ?>
 <?php include '../../common/view/header.html.php'; ?>
 <div class="alert with-icon" id="scoreStart">
-  <i class="icon-inbox"></i>
+  <i class="icon-cube"></i>
   <div class="content">
     <p><?php echo $lang->score->resetTips; ?></p>
     <p><button class="btn btn-primary" id="scoreReset"><?php echo $lang->score->resetStart; ?></button></p>

module/story/view/edit.html.php

@@ -146,8 +146,10 @@
               <tr>
                 <th><?php echo $lang->story->mailto;?></th>
                 <td>
-                  <?php echo html::select('mailto[]', $users, str_replace(' ' , '', $story->mailto), "class='form-control' multiple");?>
-                  <?php echo $this->fetch('my', 'buildContactLists')?>
+                  <div class='input-group'>
+                    <?php echo html::select('mailto[]', $users, str_replace(' ' , '', $story->mailto), "class='form-control' multiple");?>
+                    <div class='input-group-btn'><?php echo $this->fetch('my', 'buildContactLists')?></div>
+                  </div>
                 </td>
               </tr>
             </table>

module/task/view/edit.html.php

@@ -126,8 +126,10 @@
               <tr>
                 <th><?php echo $lang->task->mailto;?></th>
                 <td>
-                <?php echo html::select('mailto[]', $project->acl == 'private' ? $members : $users, str_replace(' ' , '', $task->mailto), 'class="form-control" multiple');?>
-                <?php echo $this->fetch('my', 'buildContactLists');?>
+                  <div class='input-group'>
+                    <?php echo html::select('mailto[]', $project->acl == 'private' ? $members : $users, str_replace(' ' , '', $task->mailto), 'class="form-control" multiple');?>
+                    <div class='input-group-btn'><?php echo $this->fetch('my', 'buildContactLists');?></div>
+                  </div>
                 </td>
               </tr>
             </table>

module/testcase/view/batchedit.html.php

@@ -42,7 +42,7 @@
   <form method='post' target='hiddenwin' action="<?php echo inLink('batchEdit');?>" id='batchEditForm'>
     <table class='table table-form table-fixed'>
       <thead>
-        <tr>
+        <tr class='text-center'>
           <th class='w-50px'><?php  echo $lang->idAB;?></th>
           <th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->priAB;?></th>
           <th class='w-100px<?php echo zget($visibleFields, 'status', ' hidden') . zget($requiredFields, 'status', '', ' required');?>'><?php echo $lang->statusAB;?></th>
@@ -51,11 +51,11 @@
           <?php endif;?>
           <th class='w-150px<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->testcase->module;?></th>
           <th class='w-150px<?php echo zget($visibleFields, 'story', ' hidden') . zget($requiredFields, 'story', '', ' required');?>'><?php echo $lang->testcase->story;?></th>
-          <th class='required'><?php echo $lang->testcase->title;?></th>
+          <th class='text-left required'><?php echo $lang->testcase->title;?></th>
           <th class='w-120px required'><?php echo $lang->testcase->type;?></th>
           <th class='<?php echo zget($visibleFields, 'precondition', 'hidden') . zget($requiredFields, 'precondition', '', ' required');?>'><?php echo $lang->testcase->precondition;?></th>
           <th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->testcase->keywords;?></th>
-          <th class='w-300px<?php echo zget($visibleFields, 'stage', ' hidden') . zget($requiredFields, 'stage', '', ' required');?>'><?php echo $lang->testcase->stage;?></th>
+          <th class='w-250px<?php echo zget($visibleFields, 'stage', ' hidden') . zget($requiredFields, 'stage', '', ' required');?>'><?php echo $lang->testcase->stage;?></th>
         </tr>
       </thead>
       <tbody>
@@ -112,7 +112,12 @@
         <?php endforeach;?>
       </tbody>
       <tfoot>
-        <tr><td colspan='<?php echo $branchProduct ? (count($visibleFields) + 3) : (count($visibleFields) + 2);?>' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td></tr>
+        <tr>
+          <td colspan='<?php echo $branchProduct ? (count($visibleFields) + 3) : (count($visibleFields) + 2);?>' class='text-center'>
+            <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
+            <?php echo html::backButton('', '', 'btn btn-wide');?>
+          </td>
+        </tr>
       </tfoot>
     </table>
   </form>

module/webhook/view/browse.html.php

@@ -12,7 +12,7 @@
 ?>
 <?php include 'header.html.php';?>
 <?php js::set('confirmDelete', $lang->webhook->confirmDelete);?>
-<div id='mainContent' class='main-content'>
+<div id='mainContent'>
   <form class='main-table' id='ajaxForm' method='post'>
     <table id='webhookList' class='table has-sort-head table-fixed'>
       <thead>
@@ -34,12 +34,12 @@
           <td class='text' title='<?php echo $webhook->url;?>'><?php echo $webhook->url;?></td>
           <td class='c-actions'>
             <?php
-            common::printIcon('webhook', 'log', "webhookID=$id", '', 'list', 'file-text');
+            common::printIcon('webhook', 'log', "webhookID=$id", '', 'list', 'file-text2');
             common::printIcon('webhook', 'edit', "webhookID=$id", '', 'list');
             if(common::hasPriv('webhook', 'delete'))
             {
                 $deleteURL = $this->createLink('webhook', 'delete', "webhookID=$id&confirm=yes");
-                echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"webhookList\",confirmDelete)", '<i class="icon-trash"></i>', '', "title='{$lang->webhook->delete}' class='btn btn-link'");
+                echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"webhookList\",confirmDelete)", '<i class="icon-trash"></i>', '', "title='{$lang->webhook->delete}' class='btn'");
             }
             ?>
           </td>