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

lib/pager/pager.class.php

@@ -39,7 +39,7 @@ class pager extends basePager
                 if(strtolower($key) == 'recperpage') $params[$key] = '{recPerPage}';
                 if(strtolower($key) == 'pageid')     $params[$key] = '{page}';
             }
-            echo "<ul class='pager' data-ride='pager' data-rec-total='{$this->recTotal}' data-rec-per-page='{$this->recPerPage}' data-page='{$this->pageID}' data-link-creator='" . helper::createLink($this->moduleName, $this->methodName, $params) . "'></ul>";
+            echo "<ul class='pager' data-page-cookie='{$this->pageCookie}' data-ride='pager' data-rec-total='{$this->recTotal}' data-rec-per-page='{$this->recPerPage}' data-page='{$this->pageID}' data-link-creator='" . helper::createLink($this->moduleName, $this->methodName, $params) . "'></ul>";
         }
         else
         {

module/action/lang/zh-cn.php

@@ -206,7 +206,7 @@ $lang->action->label->bug         = 'Bug|bug|view|bugID=%s';
 $lang->action->label->case        = '用例|testcase|view|caseID=%s';
 $lang->action->label->testtask    = '测试单|testtask|view|caseID=%s';
 $lang->action->label->testsuite   = '测试套件|testsuite|view|suiteID=%s';
-$lang->action->label->caselib     = '测试库|testsuite|libview|libID=%s';
+$lang->action->label->caselib     = '用例库|testsuite|libview|libID=%s';
 $lang->action->label->todo        = '待办|todo|view|todoID=%s';
 $lang->action->label->doclib      = '文档库|doc|browse|libID=%s';
 $lang->action->label->doc         = '文档|doc|view|docID=%s';
@@ -217,17 +217,17 @@ $lang->action->label->webhook     = 'Webhook|webhook|browse|';
 $lang->action->label->space       = ' ';
 
 /* Object type. */
-$lang->action->search->objectTypeList['']            = '';    
+$lang->action->search->objectTypeList['']            = '';
 $lang->action->search->objectTypeList['product']     = $lang->productCommon;
 $lang->action->search->objectTypeList['project']     = $lang->projectCommon;
 $lang->action->search->objectTypeList['bug']         = 'Bug';
-$lang->action->search->objectTypeList['case']        = '用例'; 
+$lang->action->search->objectTypeList['case']        = '用例';
 $lang->action->search->objectTypeList['caseresult']  = '用例结果';
 $lang->action->search->objectTypeList['stepresult']  = '用例步骤';
-$lang->action->search->objectTypeList['story']       = '需求';  
-$lang->action->search->objectTypeList['task']        = '任务'; 
-$lang->action->search->objectTypeList['testtask']    = '测试单';     
-$lang->action->search->objectTypeList['user']        = '用户'; 
+$lang->action->search->objectTypeList['story']       = '需求';
+$lang->action->search->objectTypeList['task']        = '任务';
+$lang->action->search->objectTypeList['testtask']    = '测试单';
+$lang->action->search->objectTypeList['user']        = '用户';
 $lang->action->search->objectTypeList['doc']         = '文档';
 $lang->action->search->objectTypeList['doclib']      = '文档库';
 $lang->action->search->objectTypeList['todo']        = '待办';

module/admin/view/checkweak.html.php

@@ -21,18 +21,18 @@
   <div class='main-table pd-0'>
     <table class='table table-condensed table-hover table-striped table-fixed'>
       <thead>
-        <th class='w-id'><?php echo $lang->idAB;?></th>
+        <th class='c-id-sm text-center'><?php echo $lang->idAB;?></th>
         <th class='w-150px'><?php echo $lang->user->realname;?></th>
         <th><?php echo $lang->user->account;?></th>
         <th class='w-150px'><?php echo $lang->user->phone;?></th>
         <th class='w-150px'><?php echo $lang->user->mobile;?></th>
         <th class='w-150px'><?php echo $lang->admin->safe->reason;?></th>
-        <th class='w-50px'><?php echo $lang->actions;?></th>
+        <th class='c-actions-1'><?php echo $lang->actions;?></th>
       </thead>
       <tbody>
         <?php foreach($weakUsers as $user):?>
         <tr>
-          <td class='text-right'><?php echo $user->id?></td>
+          <td class='text-center'><?php echo $user->id?></td>
           <td class='text-left'><?php echo $user->realname?></td>
           <td class='text-left'><?php echo $user->account?></td>
           <td><?php echo $user->phone?></td>

module/bug/lang/en.php

@@ -171,9 +171,9 @@ $lang->bug->hasSubmittedTest      = 'Development has submitted test application,
 $lang->bug->nowToTest             = 'Now to test';
 
 /* 模板。*/
-$lang->bug->tplStep   = "<p>[Steps]</p>\n";
-$lang->bug->tplResult = "<p>[Results]</p>\n";
-$lang->bug->tplExpect = "<p>[Expectations]</p>";
+$lang->bug->tplStep   = "<p>[Steps]</p><br/>";
+$lang->bug->tplResult = "<p>[Results]</p><br/>";
+$lang->bug->tplExpect = "<p>[Expectations]</p><br/>";
 
 /* 各个字段取值列表。*/
 $lang->bug->severityList[3] = '3';

module/bug/lang/zh-cn.php

@@ -171,9 +171,9 @@ $lang->bug->hasSubmittedTest      = '开发已提交测试申请，';
 $lang->bug->nowToTest             = '现在去测试';
 
 /* 模板。*/
-$lang->bug->tplStep   = "<p>[步骤]</p>";
-$lang->bug->tplResult = "<p>[结果]</p>";
-$lang->bug->tplExpect = "<p>[期望]</p>";
+$lang->bug->tplStep   = "<p>[步骤]</p><br/>";
+$lang->bug->tplResult = "<p>[结果]</p><br/>";
+$lang->bug->tplExpect = "<p>[期望]</p><br/>";
 
 /* 各个字段取值列表。*/
 $lang->bug->severityList[3] = '3';

module/bug/view/browse.html.php

@@ -214,7 +214,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
     </div>
   </div>
   <div class="main-col">
-    <div class="cell" id="queryBox"></div>
+    <div class="cell<?php if($browseType == 'bysearch') echo ' show';?>" id="queryBox"></div>
     <form class='main-table table-bug' data-ride='table' method='post' id='bugForm'>
       <div class="table-header fixed-right">
         <nav class="btn-toolbar pull-right"></nav>

module/bug/view/create.html.php

@@ -112,9 +112,9 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
               }
               ?>
               <?php if($hasCustomSeverity):?>
-              <?php echo html::select('severity', (array)$lang->bug->severityList, $severity, "class='form-control chosen'");?> 
+              <?php echo html::select('severity', (array)$lang->bug->severityList, $severity, "class='form-control chosen'");?>
               <?php else: ?>
-              <?php echo html::select('severity', (array)$lang->bug->severityList, $severity, "class='form-control' data-provide='labelSelector' data-label-class='label-severity'");?> 
+              <?php echo html::select('severity', (array)$lang->bug->severityList, $severity, "class='form-control' data-provide='labelSelector' data-label-class='label-severity'");?>
               <?php endif; ?>
             </td>
           </tr>
@@ -141,9 +141,9 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
               }
               ?>
               <?php if($hasCustomPri):?>
-              <?php echo html::select('pri', (array)$priList, $pri, "class='form-control chosen'");?> 
+              <?php echo html::select('pri', (array)$priList, $pri, "class='form-control chosen'");?>
               <?php else: ?>
-              <?php echo html::select('pri', (array)$priList, $pri, "class='form-control' data-provide='labelSelector'");?> 
+              <?php echo html::select('pri', (array)$priList, $pri, "class='form-control' data-provide='labelSelector'");?>
               <?php endif; ?>
             </td>
           </tr>

module/bug/view/linkbugs.html.php

@@ -70,7 +70,4 @@
   </form>
   <?php endif;?>
 </div>
-<script>
-$(function(){ajaxGetSearchForm();});
-</script>
 <?php include '../../common/view/footer.html.php';?>

module/build/view/view.html.php

@@ -106,7 +106,7 @@ tbody tr td:first-child input{display:none;}
                 <th class='w-70px'>   <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
                 <th class='w-70px'>   <?php common::printOrderLink('status',   $orderBy, $vars, $lang->statusAB);?></th>
                 <th class='w-100px'>  <?php common::printOrderLink('stage',    $orderBy, $vars, $lang->story->stageAB);?></th>
-                <th class='w-60px'>   <?php echo $lang->actions?></th>
+                <th class='c-actions-1'>   <?php echo $lang->actions?></th>
               </tr>
             </thead>
             <tbody class='text-center'>

module/common/model.php

@@ -27,7 +27,7 @@ class commonModel extends model
             $this->setCompany();
             $this->setUser();
             $this->loadConfigFromDB();
-            $this->loadCustomFromDB();
+            if(version_compare($this->config->global->version, '4.3.beta') > 0) $this->loadCustomFromDB();
             if(!$this->checkIP()) die($this->lang->ipLimited);
             $this->app->loadLang('company');
         }

module/common/view/header.lite.html.php

@@ -21,15 +21,16 @@ $onlybody     = zget($_GET, 'onlybody', 'no');
   echo '<script>config.onlybody = "' . $onlybody . '";</script>';
   if($config->debug)
   {
+      $timestamp = time();
       js::import($jsRoot . 'jquery/lib.js');
-      js::import($jsRoot . 'zui/min.js');
-      js::import($jsRoot . 'my.full.js');
+      js::import($jsRoot . 'zui/min.js?t=' . $timestamp);
+      js::import($jsRoot . 'my.full.js?t=' . $timestamp);
 
-      css::import($themeRoot . 'zui/css/min.css');
-      css::import($defaultTheme . 'style.css');
+      css::import($themeRoot . 'zui/css/min.css?t=' . $timestamp);
+      css::import($defaultTheme . 'style.css?t=' . $timestamp);
 
       css::import($langTheme);
-      if(strpos($clientTheme, 'default') === false) css::import($clientTheme . 'style.css');
+      if(strpos($clientTheme, 'default') === false) css::import($clientTheme . 'style.css?t=' . $timestamp);
   }
   else
   {

module/company/view/browse.html.php

@@ -65,8 +65,8 @@ js::set('confirmDelete', $lang->user->confirmDelete);
           <th><?php common::printOrderLink('phone', $orderBy, $vars, $lang->user->phone);?></th>
           <th><?php common::printOrderLink('qq', $orderBy, $vars, $lang->user->qq);?></th>
           <th class="c-date"><?php common::printOrderLink('last', $orderBy, $vars, $lang->user->last);?></th>
-          <th class="c-num"><?php common::printOrderLink('visits', $orderBy, $vars, $lang->user->visits);?></th>
-          <th class='c-actions-2'><?php echo $lang->actions;?></th>
+          <th class="w-90px"><?php common::printOrderLink('visits', $orderBy, $vars, $lang->user->visits);?></th>
+          <th class='c-actions'><?php echo $lang->actions;?></th>
         </tr>
         </thead>
         <tbody>
@@ -89,16 +89,12 @@ js::set('confirmDelete', $lang->user->confirmDelete);
           <td class='c-date'><?php if($user->last) echo date('Y-m-d', $user->last);?></td>
           <td class='c-num text-center'><?php echo $user->visits;?></td>
           <td class='c-actions'>
-            <div class='more'>
-              <?php
-              if(true or $user->ranzhi) common::printIcon('user', 'unbind', "userID=$user->account", '', 'list', 'unlink', "hiddenwin");
-              if(true or (strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60)
-              {
-                  common::printIcon('user', 'unlock', "userID=$user->account", '', 'list', 'unlock', "hiddenwin");
-              }
-              ?>
-            </div>
             <?php
+            if(true or $user->ranzhi) common::printIcon('user', 'unbind', "userID=$user->account", '', 'list', 'unlink', "hiddenwin");
+            if(true or (strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60)
+            {
+                common::printIcon('user', 'unlock', "userID=$user->account", '', 'list', 'unlock', "hiddenwin");
+            }
             common::printIcon('user', 'edit', "userID=$user->id&from=company", '', 'list');
             if(strpos($this->app->company->admins, ",{$user->account},") === false and common::hasPriv('user', 'delete'))
             {

module/doc/model.php

@@ -66,7 +66,7 @@ class docModel extends model
                 if($type == 'custom')  $currentLib = $libID;
                 if($type == 'product') $currentLib = $productID;
                 if($type == 'project') $currentLib = $projectID;
-                if($currentLib) 
+                if($currentLib)
                 {
                     $allLibGroups = $this->getAllLibGroups();
                     $currentGroups = $allLibGroups[$type];
@@ -283,7 +283,13 @@ class docModel extends model
      */
     public function getDocsByBrowseType($libID, $browseType, $queryID, $moduleID, $sort, $pager)
     {
-        $allLibs = array_keys($this->getLibs('all'));
+        $allLibs   = array_keys($this->getLibs('all'));
+        $docIdList = $this->getPrivDocs($libID, $moduleID);
+
+        $files = $this->dao->select('*')->from(TABLE_FILE)
+            ->where('objectType')->eq('doc')
+            ->andWhere('objectID')->in($docIdList)
+            ->fetchGroup('objectID');
         if($browseType == "all")
         {
             $docs = $this->getDocs($libID, 0, $sort, $pager);
@@ -301,12 +307,6 @@ class docModel extends model
         }
         elseif($browseType == 'byediteddate')
         {
-            $docIdList = $this->getPrivDocs($libID, $moduleID);
-            $files = $this->dao->select('*')->from(TABLE_FILE)
-                ->where('objectType')->eq('doc')
-                ->andWhere('objectID')->in($docIdList)
-                ->fetchGroup('objectID');
-
             $docs = $this->dao->select('*')->from(TABLE_DOC)
                 ->where('deleted')->eq(0)
                 ->andWhere('id')->in($docIdList)
@@ -314,34 +314,6 @@ class docModel extends model
                 ->orderBy('editedDate_desc')
                 ->page($pager)
                 ->fetchAll('id');
-
-            foreach($docs as $doc)
-            {
-                $docs[$doc->id]->fileSize = 0;
-                if(isset($files[$doc->id]))
-                {
-                    $fileSize = 0;
-                    foreach($files[$doc->id] as $file) $fileSize += $file->size;
-                    if($fileSize < 1024)
-                    {
-                        $fileSize .= 'B';
-                    }
-                    elseif($fileSize < 1024 * 1024)
-                    {
-                        $fileSize = round($fileSize / 1024, 2) . 'KB';
-                    }
-                    elseif($fileSize < 1024 * 1024 * 1024)
-                    {
-                        $fileSize = round($fileSize / 1024 / 1024, 2) . 'MB';
-                    }
-                    else
-                    {
-                        $fileSize = round($fileSize / 1024 / 1024 /1024, 2) . 'G';
-                    }
-
-                    $docs[$doc->id]->fileSize = $fileSize;
-                }
-            }
         }
         elseif($browseType == "collectedbyme")
         {
@@ -420,9 +392,37 @@ class docModel extends model
         }
 
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'doc');
-        if($docs) return $docs;
+        if(!$docs) return array();
 
-        return array();
+        foreach($docs as $index => $doc)
+        {
+            $docs[$index]->fileSize = 0;
+            if(isset($files[$index]))
+            {
+                $fileSize = 0;
+                foreach($files[$index] as $file) $fileSize += $file->size;
+                if($fileSize < 1024)
+                {
+                    $fileSize .= 'B';
+                }
+                elseif($fileSize < 1024 * 1024)
+                {
+                    $fileSize = round($fileSize / 1024, 2) . 'KB';
+                }
+                elseif($fileSize < 1024 * 1024 * 1024)
+                {
+                    $fileSize = round($fileSize / 1024 / 1024, 2) . 'MB';
+                }
+                else
+                {
+                    $fileSize = round($fileSize / 1024 / 1024 /1024, 2) . 'G';
+                }
+
+                $docs[$index]->fileSize = $fileSize;
+            }
+        }
+
+        return $docs;
     }
 
     /**
@@ -1110,8 +1110,8 @@ class docModel extends model
 
     /**
      * Stat module and document counts of lib.
-     * 
-     * @param  array    $idList 
+     *
+     * @param  array    $idList
      * @access public
      * @return array
      */
@@ -1398,7 +1398,7 @@ class docModel extends model
 
     /**
      * Get statistic information.
-     * 
+     *
      * @access public
      * @return object
      */

module/doc/view/browse.html.php

@@ -59,7 +59,7 @@ var browseType = '<?php echo $browseType;?>';
               <th class="c-user"><?php echo $lang->doc->addedBy;?></th>
               <th class="c-datetime"><?php echo $lang->doc->addedDate;?></th>
               <th class="c-datetime"><?php echo $lang->doc->editedDate;?></th>
-              <th class="c-actions"><?php echo $lang->actions;?></th>
+              <th class="c-actions-3"><?php echo $lang->actions;?></th>
             </tr>
           </thead>
           <tbody>
@@ -85,7 +85,7 @@ var browseType = '<?php echo $browseType;?>';
             <?php $collectTitle = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
             <tr>
               <td class="c-name"><?php echo html::a(inlink('view', "docID=$doc->id"), "<i class='icon icon-file-text text-muted'></i> &nbsp;" . $doc->title);?></td>
-              <td class="c-num"></td>
+              <td class="c-num"><?php echo $doc->fileSize ? $doc->fileSize : '-';?></td>
               <td class="c-user"><?php echo zget($users, $doc->addedBy);?></td>
               <td class="c-datetime"><?php echo formatTime($doc->addedDate, 'm-d h:i');?></td>
               <td class="c-datetime"><?php echo formatTime($doc->editedDate, 'm-d h:i');?></td>

module/entry/view/browse.html.php

@@ -12,7 +12,7 @@
 ?>
 <?php include 'header.html.php';?>
 <?php js::set('confirmDelete', $lang->entry->confirmDelete);?>
-<div id='mainContent' class='main-content'>
+<div id='mainContent'>
   <form id='ajaxForm' class='main-table' method='post'>
     <table id='entryList' class='table has-sort-head table-fix'>
       <thead>
@@ -24,7 +24,7 @@
           <th class='w-200px'><?php common::printOrderLink('key',  $orderBy, $vars, $lang->entry->key);?></th>
           <th class='w-200px'><?php common::printOrderLink('ip',   $orderBy, $vars, $lang->entry->ip);?></th>
           <th><?php echo common::printOrderLink('desc', $orderBy, $vars, $lang->entry->desc);?></th>
-          <th class='w-130px'><?php echo $lang->actions;?></th>
+          <th class='c-actions-3'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>

module/entry/view/create.html.php

@@ -13,14 +13,14 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/form.html.php';?>
 <div id='mainContent' class='main-content'>
-  <div class='center-block mw-800px'>
+  <div class='center-block mw-800px center-block-sm'>
     <div class="main-header">
       <h2>
         <?php echo $lang->entry->api;?>
-        <small class="text-muted"> <?php echo $lang->entry->create;?></small>
+        <small><?php echo $lang->arrow . ' ' . $lang->entry->create;?></small>
       </h2>
     </div>
-    <form id='entryForm' method='post' class='ajaxForm'>
+    <form class='main-form' id='entryForm' method='post' class='ajaxForm'>
       <table class='table table-form'>
         <tr>
           <th class='w-80px'><?php echo $lang->entry->name;?></th>

module/entry/view/edit.html.php

@@ -13,14 +13,14 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/form.html.php';?>
 <div id='mainContent' class='main-content'>
-<div class='center-block mw-800px'>
+<div class='center-block mw-800px center-block-sm'>
   <div class="main-header">
     <h2>
       <?php echo $lang->entry->api;?>
-      <small class="text-muted"> <?php echo $lang->entry->edit;?></small>
+      <small><?php echo $lang->arrow . ' ' . $lang->entry->edit;?></small>
     </h2>
   </div>
-  <form id='entryForm' method='post' class='ajaxForm'>
+  <form class='main-form' id='entryForm' method='post' class='ajaxForm'>
     <table class='table table-form'>
       <tr>
         <th class='w-80px'><?php echo $lang->entry->name;?></th>

module/entry/view/header.html.php

@@ -16,6 +16,6 @@
     <?php common::printLink('entry', 'browse', '', "<span class='text'>{$lang->entry->common}</span>", '', "class='btn btn-link btn-active-text'");?>
   </div>
   <div class='btn-toolbar pull-right'>
-    <?php common::printIcon('entry', 'create', '', '', 'button', '', '', 'btn-primary');?>
+    <?php echo html::a($this->createLink('entry', 'create'), "<i class='icon icon-plus'></i> {$lang->entry->create}", '', "class='btn btn-primary'"); ?>
   </div>
 </div>

module/group/css/browse.css

@@ -1,2 +1 @@
-.user{display:block; width:80px; float:left; overflow:hidden}
-.c-actions{width: 220px;}
+.user {display:block; width:80px; float:left; overflow:hidden}

module/group/view/browse.html.php

@@ -31,7 +31,7 @@
         <th class='w-130px'><?php echo $lang->group->name;?></th>
         <th class='w-300px'><?php echo $lang->group->desc;?></th>
         <th><?php echo $lang->group->users;?></th>
-        <th class='c-actions text-center'><?php echo $lang->actions;?></th>
+        <th class='c-actions-6 text-center'><?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody>

module/mail/view/browse.html.php

@@ -35,7 +35,7 @@
           <th class='w-150px'> <?php common::printOrderLink('sendTime',    $orderBy, $vars, $lang->mail->sendTime);?></th>
           <th class='w-80px'>  <?php common::printOrderLink('status',      $orderBy, $vars, $lang->mail->status);?></th>
           <th>                 <?php echo $lang->mail->failReason;?></th>
-          <th class='w-80px'>  <?php echo $lang->actions;?></th>
+          <th class='c-actions-2'>  <?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>

module/my/control.php

@@ -415,7 +415,7 @@ class my extends control
             {
                 $listID = $this->user->createContactList($this->post->newList, $this->post->users);
                 $this->user->setGlobalContacts($listID, isset($_POST['share']));
-                if(isonlybody()) die(js::closeModal('parent.parent', '', 'function(){parent.parent.ajaxGetContacts(\'#mailtoGroup\')}'));
+                if(isonlybody()) die(js::closeModal('parent.parent', '', ' function(){parent.parent.ajaxGetContacts(\'#mailto\')}'));
                 die(js::locate(inlink('manageContacts', "listID=$listID"), 'parent'));
             }
             elseif($this->post->mode == 'edit')

module/my/css/managecontacts.css

@@ -1 +1,3 @@
 body.body-modal {padding-bottom: 20px; min-height: 400px}
+
+.side-col {padding-right: 40px; padding-top: 25px;}

module/my/css/todo.css

@@ -1,3 +1,2 @@
 .datepicker-wrapper{width: 110px!important;}
-.datepicker-wrapper .form-control {max-width: 110px; line-height: 25px; height: 26px!important}
-th.c-actions{width:160px !important;}
+.datepicker-wrapper .form-control {max-width: 110px; line-height: 25px; height: 26px!important}

module/my/view/bug.html.php

@@ -44,7 +44,7 @@
           <th class='w-user'>      <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->bug->assignedTo);?></th>
           <th class='w-user'>      <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
           <th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
-          <th class='w-180px'> <?php echo $lang->actions;?></th>
+          <th class='c-actions-5'> <?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>

module/my/view/buildcontactlists.html.php

@@ -19,6 +19,8 @@ else
 {
     echo '<span class="input-group-btn">';
     echo '<a title="' . $lang->user->contacts->manage . '" href="' . $this->createLink('my', 'managecontacts', "listID=0&mode=new", '', true) . "\" target='_blank' data-icon='cog' data-title='{$lang->user->contacts->manage}' class='btn btn-icon iframe'><i class='icon icon-cog'></i></a>";
+    echo '</span>';
+    echo '<span class="input-group-btn">';
     echo '<button type="button" title="' . $lang->refresh . '" class="btn btn-icon" onclick="ajaxGetContacts(this)"><i class="icon icon-refresh"></i></button>';
     echo '</span>';
 }

module/my/view/changepassword.html.php

@@ -11,6 +11,11 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php if(!isonlybody()):?>
+<style>
+.main-content{width: 500px; margin: 0 auto;}
+</style>
+<?php endif;?>
 <div id='mainContent' class='main-content'>
   <div class='main-header'>
     <h2><i class='icon-key'></i> <?php echo $lang->my->changePassword;?></h2>
@@ -18,7 +23,7 @@
   <form method='post' target='hiddenwin'>
     <table align='center' class='table table-form w-320px'>
       <tr>
-        <th class='rowhead w-120px'><?php echo $lang->user->account;?></th>
+        <th class='rowhead w-90px'><?php echo $lang->user->account;?></th>
         <td><?php echo $user->account . html::hidden('account',$user->account);?></td>
       </tr>  
       <tr>

module/my/view/managecontacts.html.php

@@ -11,9 +11,9 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div class="modal-content">
+<div id='mainContent' class='main-row main-content'>
   <?php if($mode == 'edit'):?>
-  <div class='col-sm-3 col-lg-2'>
+  <div class='side-col'>
     <?php
     foreach($lists as $id => $listName)
     {
@@ -25,76 +25,75 @@
     <?php echo html::a(inlink('managecontacts', "listID=0&mode=new"), '<i class="icon icon-plus"></i> ' . $lang->user->contacts->createList, '', "class='btn btn-block'"); ?>
   </div>
   <?php endif;?>
-  <?php $class = $mode == 'edit' ? 'col-sm-9 col-lg-10' : 'col-sm-12 col-lg-12';?>
-    <div class='<?php echo $class?>'>
+  <?php $class = $mode == 'edit' ? 'main-col' : '';?>
+  <div class='<?php echo $class?>'>
+    <div class='main-header'>
+      <h2>
+        <?php if($mode == 'new'):?>
+        <i class='icon-plus'></i> <strong><?php echo $lang->user->contacts->createList;?></strong>
+        <?php else:?>
+        <i class='icon-cogs'></i> <strong><?php echo $lang->user->contacts->manage;?></strong>
+        <?php endif;?>
+      </h2>
+    </div>
+
     <form method='post' target='hiddenwin' id='dataform'>
-      <div class='panel panel-sm'>
-        <div class='panel-heading'>
-          <?php if($mode == 'new'):?>
-          <i class='icon-plus'></i> <strong><?php echo $lang->user->contacts->createList;?></strong>
-          <?php else:?>
-          <i class='icon-cogs'></i> <strong><?php echo $lang->user->contacts->manage;?></strong>
-          <?php endif;?>
-        </div>
-        <div class='panel-body'>
-          <table class='table table-form'> 
-            <tr>
-              <th class='w-80px'><?php echo $lang->user->contacts->listName;?></th>
-              <td class='w-300px'>
-              <div class='required required-wrapper'></div>
-              <?php
-              if($mode == 'edit') $readonly = in_array($list->id, $disabled) ? ' readonly' : '';
-              if($mode == 'new')
-              {
-                  echo html::input('newList', '', "class='form-control'");
-              }
-              else
-              {
-                  echo html::input('listName', $list->listName, "$readonly class='form-control'");
-                  echo html::hidden('listID',  $list->id);
-              }
-              ?>
-              </td>
-              <td></td>
-            </tr>
-            <tr>
-              <th><?php echo $lang->user->contacts->selectedUsers;?></th>
-              <td colspan='2'>
-              <?php
-              if($mode == 'new')
-              {
-                  echo html::select('users[]', $users, '', "multiple class='form-control chosen'");
-              }
-              else
-              {
-                  echo html::select('users[]', $users, $list->userList, "multiple $readonly class='form-control chosen'");
-              }
-              ?>
-              </td>
-            </tr>
-            <?php if(common::hasPriv('datatable', 'setGlobal')):?>
-            <tr>
-              <th></th>
-              <td colspan="2">
-                <label class="checkbox-primary">
-                  <input type="checkbox" name="share" value="1" id="shareCheckbox" <?php if($mode != 'new' && in_array($list->id, $globalContacts)) echo 'checked';?>/>
-                  <label for="shareCheckbox"><?php echo $lang->my->shareContacts;?></label>
-                </label>
-              </td>
-            </tr>
-            <?php endif;?>
-            <?php if($mode == 'new' || !in_array($list->id, $disabled)):?>
-            <tr>
-              <td></td>
-              <td class="form-actions">
-              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::hidden('mode', $mode);?>
-              <?php if($mode == 'edit') echo html::a(inlink('deleteContacts', "listID=$listID"), $lang->delete, 'hiddenwin', "class='btn btn-danger btn-wide'");?>
-              </td>
-            </tr>
-            <?php endif;?>
-          </table>
-        </div>
-      </div>
+      <table class='table table-form'> 
+        <tr>
+          <th class='w-80px'><?php echo $lang->user->contacts->listName;?></th>
+          <td class='w-300px'>
+          <div class='required required-wrapper'></div>
+          <?php
+          if($mode == 'edit') $readonly = in_array($list->id, $disabled) ? ' readonly' : '';
+          if($mode == 'new')
+          {
+              echo html::input('newList', '', "class='form-control'");
+          }
+          else
+          {
+              echo html::input('listName', $list->listName, "$readonly class='form-control'");
+              echo html::hidden('listID',  $list->id);
+          }
+          ?>
+          </td>
+          <td></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->user->contacts->selectedUsers;?></th>
+          <td colspan='2'>
+          <?php
+          if($mode == 'new')
+          {
+              echo html::select('users[]', $users, '', "multiple class='form-control chosen'");
+          }
+          else
+          {
+              echo html::select('users[]', $users, $list->userList, "multiple $readonly class='form-control chosen'");
+          }
+          ?>
+          </td>
+        </tr>
+        <?php if(common::hasPriv('datatable', 'setGlobal')):?>
+        <tr>
+          <th></th>
+          <td colspan="2">
+            <label class="checkbox-primary">
+              <input type="checkbox" name="share" value="1" id="shareCheckbox" <?php if($mode != 'new' && in_array($list->id, $globalContacts)) echo 'checked';?>/>
+              <label for="shareCheckbox"><?php echo $lang->my->shareContacts;?></label>
+            </label>
+          </td>
+        </tr>
+        <?php endif;?>
+        <?php if($mode == 'new' || !in_array($list->id, $disabled)):?>
+        <tr>
+          <td></td>
+          <td class="form-actions">
+          <?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::hidden('mode', $mode);?>
+          <?php if($mode == 'edit') echo html::a(inlink('deleteContacts', "listID=$listID"), $lang->delete, 'hiddenwin', "class='btn btn-danger btn-wide'");?>
+          </td>
+        </tr>
+        <?php endif;?>
+      </table>
     </form>
   </div>
 </div>

module/my/view/profile.html.php

@@ -11,10 +11,15 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php if(!isonlybody()):?>
+<style>
+.main-content{width: 600px; margin: 0 auto;}
+</style>
+<?php endif;?>
 <div id='mainContent' class='main-content'>
   <div class='main-header'>
     <h2><?php echo html::icon($lang->icons['user']);?> <?php echo $lang->my->profile;?></h2>
-    <div class='actions'>
+    <div class='actions pull-right'>
       <?php echo html::a($this->createLink('my', 'editprofile'), $lang->user->editProfile, '', "class='btn btn-primary'");?>
     </div>
   </div>

module/my/view/story.html.php

@@ -47,7 +47,7 @@
           <th class='c-hours'>    <?php common::printOrderLink('estimate',     $orderBy, $vars, $lang->story->estimateAB);?></th>
           <th class='c-status'>   <?php common::printOrderLink('status',       $orderBy, $vars, $lang->statusAB);?></th>
           <th class='c-stage'>    <?php common::printOrderLink('stage',        $orderBy, $vars, $lang->story->stageAB);?></th>
-          <th class='c-actions-4'><?php echo $lang->actions;?></th>
+          <th class='c-actions-5'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>

module/my/view/task.html.php

@@ -49,7 +49,7 @@
           <th class='c-hours'>   <?php common::printOrderLink('left',        $orderBy, $vars, $lang->task->leftAB);?></th>
           <th class='c-date'>    <?php common::printOrderLink('deadline',    $orderBy, $vars, $lang->task->deadlineAB);?></th>
           <th class='c-status'>  <?php common::printOrderLink('status',      $orderBy, $vars, $lang->statusAB);?></th>
-          <th class='c-actions-4'><?php echo $lang->actions;?></th>
+          <th class='c-actions-5'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>

module/my/view/testcase.html.php

@@ -52,7 +52,7 @@
           <th class='w-120px'> <?php common::printOrderLink('lastRunDate',   $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
           <th class='w-80px'>  <?php common::printOrderLink('lastRunResult', $orderBy, $vars, $lang->testtask->lastRunResult);?></th>
           <th class='w-status'><?php common::printOrderLink('status',        $orderBy, $vars, $lang->statusAB);?></th>
-          <th class='w-130px'> <?php echo $lang->actions;?></th>
+          <th class='c-actions-5'> <?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>
@@ -80,19 +80,9 @@
           <td class='<?php echo $case->lastRunResult;?>'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
           <td class='<?php if(isset($run)) echo $run->status;?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
           <td class='c-actions'>
-            <div class='more'>
-              <?php
-              common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID", $case, 'list', 'bug');
-              common::printIcon('testcase', 'create',  "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$caseID", $case, 'list', 'copy');
-
-              if(common::hasPriv('testcase', 'delete'))
-              {
-                  $deleteURL = $this->createLink('testcase', 'delete', "caseID=$caseID&confirm=yes");
-                  echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '<i class="icon-trash"></i>', '', "class='btn' title='{$lang->testcase->delete}'");
-              }
-              ?>
-            </div>
             <?php
+            common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID", $case, 'list', 'bug');
+            common::printIcon('testcase', 'create',  "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$caseID", $case, 'list', 'copy');
             common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$caseID&version=$case->version", '', 'list', 'play', '', 'iframe', '', "data-width='95%'");
             common::printIcon('testtask', 'results', "runID=$runID&caseID=$caseID", '', 'list', 'list-alt', '', 'iframe', '', "data-width='95%'");
             common::printIcon('testcase', 'edit',    "caseID=$caseID", $case, 'list', 'edit');

module/my/view/testtask.html.php

@@ -34,7 +34,7 @@
         <th class='w-90px'> <?php common::printOrderLink('begin',   $orderBy, $vars, $lang->testtask->begin);?></th>
         <th class='w-90px'> <?php common::printOrderLink('end',     $orderBy, $vars, $lang->testtask->end);?></th>
         <th class='w-80px'> <?php common::printOrderLink('status',  $orderBy, $vars, $lang->statusAB);?></th>
-        <th class='w-150px'><?php echo $lang->actions;?></th>
+        <th class='c-actions-3'><?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody>
@@ -52,12 +52,6 @@
           common::printIcon('testtask', 'cases',    "taskID=$task->id", 'play', 'list', 'sitemap');
           common::printIcon('testtask', 'linkCase', "taskID=$task->id", '', 'list', 'link');
           common::printIcon('testtask', 'edit',     "taskID=$task->id", '', 'list');
-
-          if(common::hasPriv('testtask', 'delete'))
-          {
-              $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes");
-              echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '<i class="icon-trash"></i>', '', "title='{$lang->testtask->delete}' class='btn'");
-          }
           ?>
         </td>
       </tr>

module/my/view/todo.html.php

@@ -79,11 +79,11 @@
           </td>
           <td class="c-date"><?php echo $todo->date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?></td>
           <td class="c-type"><?php echo $lang->todo->typeList[$todo->type];?></td>
-          <td class="c-pri"> <span title="<?php echo zget($lang->todo->priList, $todo->pri);?>" class='label-pri <?php echo 'label-pri-' . $todo->pri;?>' title='<?php echo zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri)?></span></td>
+          <td class="c-pri"><span title="<?php echo zget($lang->todo->priList, $todo->pri);?>" class='label-pri <?php echo 'label-pri-' . $todo->pri;?>' title='<?php echo zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri)?></span></td>
           <td class="c-name" title="<?php echo $todo->name;?>"><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id&from=my", '', true), $todo->name, '', "data-toggle='modal' data-type='iframe' data-title='" . $lang->todo->view . "' data-icon='check'");?></td>
           <td class="c-begin"><?php echo $todo->begin;?></td>
           <td class="c-end"><?php echo $todo->end;?></td>
-          <td class="c-status"><?php echo $lang->todo->statusList[$todo->status];?></td>
+          <td class="c-status"><span class="status-<?php echo $todo->status;?>"><span class="label label-dot"></span> <?php echo $lang->todo->statusList[$todo->status];?></span></td>
           <td class="c-actions">
             <?php
             if($todo->status != 'done') common::printIcon('todo', 'assignto', "todoID=$todo->id", $todo, 'list', 'hand-right', '', "btn-icon", '', "data-toggle='assigntoModal' data-width='500'", $lang->todo->assignTo);

module/product/view/build.html.php

@@ -28,7 +28,7 @@
         <th><?php echo $lang->build->filePath;?></th>
         <th class='c-date'><?php echo $lang->build->date;?></th>
         <th class='c-user'><?php echo $lang->build->builder;?></th>
-        <th class='w-130px'><?php echo $lang->actions;?></th>
+        <th class='c-actions-3'><?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody>

module/productplan/view/browse.html.php

@@ -52,7 +52,7 @@
         <th class='w-60px'> <?php echo $lang->productplan->hour;?></th>
         <th class='w-60px'> <?php echo $lang->productplan->project;?></th>
         <th>                <?php echo $lang->productplan->desc;?></th>
-        <th class='c-actions-4'><?php echo $lang->actions;?></th>
+        <th class='c-actions-5'><?php echo $lang->actions;?></th>
       </tr>
       </thead>
       <tbody>

module/productplan/view/view.html.php

@@ -111,7 +111,7 @@
                 <th class='w-70px'> <?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->story->estimateAB);?></th>
                 <th class='w-70px'> <?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
                 <th class='w-80px'> <?php common::printOrderLink('stage',      $orderBy, $vars, $lang->story->stageAB);?></th>
-                <th class='w-50px'> <?php echo $lang->actions?></th>
+                <th class='c-actions-1'> <?php echo $lang->actions?></th>
               </tr>
             </thead>
             <tbody class='text-center'>

module/project/js/story.js

@@ -20,8 +20,6 @@ $(function()
     $(document).on('click', "#storyList tbody tr, .table-footer .check-all, #storyList thead .check-all", function(){showCheckedSummary();});
     $(document).on('change', "#storyList :checkbox", function(){showCheckedSummary();});
 
-    $("a[data-toggle='linkStoryByPlan']").click(function(){$('#linkStoryByPlan').modal('show')})
-
     $('#toTaskButton').on('click', function ()
     {
         var planID = $('#plan').val();

module/project/view/bug.html.php

@@ -48,7 +48,7 @@
           <th class='w-110px'>   <?php common::printOrderLink('assignedTo',   $orderBy, $vars, $lang->assignedToAB);?></th>
           <th class='w-user'>    <?php common::printOrderLink('resolvedBy',   $orderBy, $vars, $lang->bug->resolvedBy);?></th>
           <th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
-          <th class='w-130px text-center'><?php echo $lang->actions;?></th>
+          <th class='c-actions text-center'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>
@@ -78,10 +78,8 @@
         <td><?php echo zget($users, $bug->resolvedBy, $bug->resolvedBy);?></td>
         <td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
         <td class='c-actions'>
-          <div class='more'>
-            <?php if($bug->status == 'active') common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'search', '', 'iframe', true);?>
-          </div>
           <?php
+          if($bug->status == 'active') common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'search', '', 'iframe', true);
           if($bug->status == 'active') common::printIcon('bug', 'resolve', $params, $bug, 'list', 'check', '', 'iframe', true);
           if($bug->status != 'active') common::printIcon('bug', 'close',   $params, $bug, 'list', '', '', 'iframe', true);
           common::printIcon('bug', 'create', "product=$bug->product&branch=$bug->branch&extra=$params", $bug, 'list', 'copy');

module/project/view/build.html.php

@@ -39,7 +39,7 @@
           <th class="c-url"><?php echo $lang->build->filePath;?></th>
           <th class="c-date"><?php echo $lang->build->date;?></th>
           <th class="c-user"><?php echo $lang->build->builder;?></th>
-          <th class="c-actions-3"><?php echo $lang->actions;?></th>
+          <th class="c-actions-4"><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>

module/project/view/grouptask.html.php

@@ -14,8 +14,8 @@
 <div id="mainMenu" class="clearfix table-row">
   <div class="btn-toolbar pull-left">
     <div class="pull-left table-group-btns">
-      <button type="button" class="btn btn-link group-collapse-all"><?php echo $lang->project->treeLevel['root'];?> <i class="icon-caret-up"></i></button>
-      <button type="button" class="btn btn-link group-expand-all"><?php echo $lang->project->treeLevel['all'];?> <i class="icon-caret-down"></i></button>
+      <button type="button" class="btn btn-link group-collapse-all"><?php echo $lang->project->treeLevel['root'];?> <i class="icon-fold-all"></i></button>
+      <button type="button" class="btn btn-link group-expand-all"><?php echo $lang->project->treeLevel['all'];?> <i class="icon-unfold-all"></i></button>
     </div>
     <?php if(isset($lang->project->groupFilter[$groupBy])):?>
     <?php foreach($lang->project->groupFilter[$groupBy] as $filterKey => $name):?>

module/project/view/linkstory.html.php

@@ -11,6 +11,9 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<style>
+#searchForm .form-actions {padding-bottom: 10px!important;}
+</style>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->project->linkStory;?></span></span>
@@ -19,8 +22,10 @@
     <?php common::printBack($this->server->http_referer, 'btn btn-link');?>
   </div>
 </div>
-<div id="mainContent" class="main-content">
-  <div id='queryBox' class='show'></div>
+<div id="mainContent">
+  <div class="cell space-sm">
+    <div id='queryBox' class='show no-margin'></div>
+  </div>
   <form class='main-table table-story' method='post' data-ride='table' id='linkStoryForm'>
     <table class='table table-fixed' id='linkStoryList'> 
       <thead>
@@ -72,22 +77,18 @@
       <?php endforeach;?>
       </tbody>
     </table>
+    <?php if($storyCount):?>
     <div class='table-footer'>
-      <?php if($storyCount):?>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
       <div class='table-actions btn-toolbar'>
         <?php echo html::submitButton('', '', 'btn');?>
       </div>
-      <?php else:?>
-      <div class='text'><?php echo $lang->project->whyNoStories;?></div>
-      <?php endif;?>
     </div>
+    <?php else:?>
+    <div class="table-empty-tip">
+      <p><span class="text-muted"><?php echo $lang->project->whyNoStories;?></p>
+    </div>
+    <?php endif;?>
   </form>
 </div>
-<script type='text/javascript'>
-$(function()
-{
-    ajaxGetSearchForm();
-});
-</script>
 <?php include '../../common/view/footer.html.php';?>

module/project/view/story.html.php

@@ -36,7 +36,7 @@
   </div>
   <div class="btn-toolbar pull-right">
     <?php
-    common::printLink('story', 'export', "productID=$productID&orderBy=id_desc", "<i class='icon icon-export'> </i>" . $lang->story->export, '', "class='btn btn-link export'");
+    common::printLink('story', 'export', "productID=$productID&orderBy=id_desc", "<i class='icon icon-export muted'></i> " . $lang->story->export, '', "class='btn btn-link export'");
 
     if(commonModel::isTutorialMode())
     {
@@ -45,15 +45,15 @@
     }
     else
     {
-        echo "<div class='btn-group' id='createActionMenu'>";
-        common::printIcon('project', 'linkStory', "project=$project->id", '', 'button', 'link', '', 'link-story-btn');
+        echo "<div class='btn-group dropdown-hover' id='createActionMenu'>";
         if(common::hasPriv('project', 'importPlanStories'))
         {
-            echo "<button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown'>";
-            echo "<span class='caret'></span>";
+            echo "<button type='button' class='btn btn-link dropdown-toggle btn-icon'>";
+            echo "<i class='icon-link muted'></i> {$lang->project->linkStory} <span class='caret'></span>";
             echo '</button>';
             echo "<ul class='dropdown-menu pull-right'>";
-            echo "<li>" . html::a('###', $lang->project->linkStoryByPlan, '', 'data-toggle="linkStoryByPlan"') . "</li>";
+            echo "<li>" . html::a($this->createLink('project', 'linkStory', "project=$project->id"), $lang->project->linkStory). "</li>";
+            echo "<li>" . html::a('#linkStoryByPlan', $lang->project->linkStoryByPlan, '', 'data-toggle="modal"') . "</li>";
             echo '</ul>';
         }
         echo '</div>';
@@ -112,7 +112,7 @@
             <th title='<?php echo $lang->story->taskCount?>' class='w-30px'><?php echo $lang->story->taskCountAB;?></th>
             <th title='<?php echo $lang->story->bugCount?>'  class='w-30px'><?php echo $lang->story->bugCountAB;?></th>
             <th title='<?php echo $lang->story->caseCount?>' class='w-30px'><?php echo $lang->story->caseCountAB;?></th>
-            <th class='c-actions-3 text-center'><?php echo $lang->actions;?></th>
+            <th class='c-actions-4 text-center'><?php echo $lang->actions;?></th>
           </tr>
         </thead>
         <tbody id='storyTableList' class='sortable'>
@@ -197,7 +197,11 @@
           <?php endforeach;?>
         </tbody>
       </table>
-      <?php if($stories):?>
+      <?php if(!$stories):?>
+      <div class="table-empty-tip">
+        <p><span class="text-muted"><?php echo $lang->product->noStory;?></span> <?php common::printLink('project', 'linkStory', "project=$project->id", "<i class='icon icon-link'></i> " . $lang->project->linkStory, '', "class='btn btn-info'");?></p>
+      </div>
+      <?php else:?>
       <div class='table-footer'>
         <?php if($canBatchEdit or $canBatchClose):?>
         <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
@@ -230,7 +234,7 @@
             ?>
           </div>
           <?php endif;?>
-          <?php 
+          <?php
           if(common::hasPriv('project', 'batchUnlinkStory'))
           {
               $actionLink = $this->createLink('project', 'batchUnlinkStory', "projectID=$project->id");
@@ -247,16 +251,16 @@
 </div>
 
 <div class="modal fade" id="linkStoryByPlan">
-  <div class="modal-dialog">
+  <div class="modal-dialog mw-500px">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h4 class="modal-title"><i class="icon-file-text"></i> <?php echo $lang->project->linkStoryByPlan;?></h4>
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="icon icon-close"></i></button>
+        <h4 class="modal-title"><?php echo $lang->project->linkStoryByPlan;?></h4>
       </div>
       <div class="modal-body">
         <div class='input-group'>
           <?php echo html::select('plan', $allPlans, '', "class='form-control chosen' id='plan'");?>
-          <span class='input-group-btn'><?php echo html::commonButton($lang->project->linkStory, "id='toTaskButton'");?></span>
+          <span class='input-group-btn'><?php echo html::commonButton($lang->project->linkStory, "id='toTaskButton'", 'btn btn-primary');?></span>
         </div>
       </div>
     </div>
@@ -293,6 +297,9 @@ $(function()
                   .replace('%rate%', rate);
         }
     });
+    <?php if(!$stories):?>
+    $("#main").addClass('hide-sidebar');
+    <?php endif;?>
 });
 </script>
 <?php include '../../common/view/footer.html.php';?>

module/project/view/testtask.html.php

@@ -52,7 +52,7 @@
           <th class='w-100px'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->testtask->begin);?></th>
           <th class='w-100px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->testtask->end);?></th>
           <th class='w-80px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
-          <th class='c-actions-3 text-center'><?php echo $lang->actions;?></th>
+          <th class='c-actions-4 text-center'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>

module/release/view/browse.html.php

@@ -35,7 +35,7 @@
         <?php endif;?>
         <th class='c-date text-center'><?php echo $lang->release->date;?></th>
         <th class='text-center w-90px'><?php echo $lang->release->status;?></th>
-        <th class='c-actions-4 text-center'><?php echo $lang->actions;?></th>
+        <th class='c-actions-5 text-center'><?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody>

module/release/view/view.html.php

@@ -86,7 +86,7 @@
                     <th class='w-80px'>   <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
                     <th class='w-90px'>   <?php common::printOrderLink('status',   $orderBy, $vars, $lang->statusAB);?></th>
                     <th class='w-100px'>  <?php common::printOrderLink('stage',    $orderBy, $vars, $lang->story->stageAB);?></th>
-                    <th class='w-50px'>   <?php echo $lang->actions?></th>
+                    <th class='c-actions-1'>   <?php echo $lang->actions?></th>
                   </tr>
                 </thead>
                 <tbody class='text-center'>

module/story/view/create.html.php

@@ -64,9 +64,10 @@
                 if(count($plans) != 1)
                 {
                     echo "<div class='input-group-btn'>";
-                    echo html::a($this->createLink('productplan', 'create', "productID=$productID&branch=$branch"), "<i class='icon icon-plus'></i>", '_blank', "class='btn' data-toggle='tooltip' title='{$lang->productplan->create}'");
-                    echo '&nbsp; ';
-                    echo html::a("javascript:loadProductPlans($productID)", "<i class='icon icon-refresh'></i>", '', "class='btn' data-toggle='tooltip' title='{$lang->refresh}'");
+                    echo html::a($this->createLink('productplan', 'create', "productID=$productID&branch=$branch"), "<i class='icon icon-plus'></i>", '_blank', "class='btn btn-icon' data-toggle='tooltip' title='{$lang->productplan->create}'");
+                    echo '</div>';
+                    echo "<div class='input-group-btn'>";
+                    echo html::a("javascript:loadProductPlans($productID)", "<i class='icon icon-refresh'></i>", '', "class='btn btn-icon' data-toggle='tooltip' title='{$lang->refresh}'");
                     echo '</div>';
                 }
                 ?>

module/story/view/view.html.php

@@ -30,7 +30,7 @@
         for($i = $story->version; $i >= 1; $i --)
         {
       	  $class = $i == $version ? " class='active'" : '';
-      	  echo '<li' . $class .'>' . html::a(inlink('view', "storyID=$story->id&version=$i"), '#' . $i) . '</li>'; 
+      	  echo '<li' . $class .'>' . html::a(inlink('view', "storyID=$story->id&version=$i"), '#' . $i) . '</li>';
         }
         ?>
         </ul>
@@ -325,11 +325,11 @@
   <?php common::printPreAndNext($preAndNext);?>
   <div class="btn-toolbar">
     <?php common::printBack($browseLink);?>
+    <?php if(!isonlybody()) echo "<div class='divider'></div>";?>
     <?php if(!$story->deleted):?>
-    <div class='divider'></div>
     <?php
-    common::printIcon('story', 'change', "storyID=$story->id", $story);
-    common::printIcon('story', 'review', "storyID=$story->id", $story);
+    common::printIcon('story', 'change', "storyID=$story->id", $story, '', '', '', 'showinonlybody');
+    common::printIcon('story', 'review', "storyID=$story->id", $story, '', '', '', 'showinonlybody');
     if($story->status != 'closed' and !isonlybody())
     {
         $misc = "class='btn' data-toggle='modal' data-type='iframe' data-width='95%'";
@@ -337,8 +337,8 @@
         if(common::hasPriv('story', 'batchCreate')) echo html::a($link, "<i class='icon icon-sitemap'></i> " . $lang->story->subdivide, '', $misc);
     }
 
-    common::printIcon('story', 'close',    "storyID=$story->id", $story, 'button', '', '', 'iframe', true);
-    common::printIcon('story', 'activate', "storyID=$story->id", $story, 'button', '', '', 'iframe', true);
+    common::printIcon('story', 'close',    "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true);
+    common::printIcon('story', 'activate', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true);
 
     if($this->config->global->flow != 'onlyStory' and !isonlybody() and (common::hasPriv('testcase', 'create') or common::hasPriv('testcase', 'batchCreate')))
     {
@@ -359,11 +359,11 @@
         echo "</div>";
     }
 
-    if($from == 'project') common::printIcon('task', 'create', "project=$param&storyID=$story->id&moduleID=$story->module", $story, 'button', 'smile');
+    if($from == 'project') common::printIcon('task', 'create', "project=$param&storyID=$story->id&moduleID=$story->module", $story, 'button', 'smile', '', 'showinonlybody');
 
     echo "<div class='divider'></div>";
-    common::printIcon('story', 'edit', "storyID=$story->id", $story);
-    common::printIcon('story', 'create', "productID=$story->product&branch=$story->branch&moduleID=$story->module&storyID=$story->id", $story, 'button', 'copy');
+    common::printIcon('story', 'edit', "storyID=$story->id", $story, '', '', '', 'iframe showinonlybody');
+    common::printIcon('story', 'create', "productID=$story->product&branch=$story->branch&moduleID=$story->module&storyID=$story->id", $story, 'button', 'copy', '', 'iframe showinonlybody');
     common::printIcon('story', 'delete', "storyID=$story->id", $story, 'button', '', 'hiddenwin');
     ?>
     <?php endif;?>

module/story/view/zerocase.html.php

@@ -33,7 +33,7 @@
         <th class='w-hour'><?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->story->estimateAB);?></th>
         <th>               <?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
         <th>               <?php common::printOrderLink('stage',      $orderBy, $vars, $lang->story->stageAB);?></th>
-        <th class='w-180px'><?php echo $lang->actions;?></th>
+        <th class='c-actions-5'><?php echo $lang->actions;?></th>
       </tr>
       </thead>
       <tbody>

module/task/view/recordestimate.html.php

@@ -45,7 +45,7 @@
             <th class="w-60px"><?php echo $lang->task->consumedThisTime;?></th>
             <th class="w-60px"><?php echo $lang->task->leftThisTime;?></th>
             <th><?php echo $lang->comment;?></th>
-            <th class='c-actions'><?php echo $lang->actions;?></th>
+            <th class='c-actions-2'><?php echo $lang->actions;?></th>
           </tr>
         </thead>
         <tbody>

module/testcase/view/create.html.php

@@ -73,7 +73,7 @@
               <?php if($storyID == 0): ?>
                 <a href='' id='preview' class='btn iframe hidden'><?php echo $lang->preview;?></a>
               <?php else:?>
-                <?php echo html::a($this->createLink('story', 'view', "storyID=$storyID", '', true), $lang->preview, '', "class='btn iframe' id='preview'");?>
+                <?php echo html::a($this->createLink('story', 'view', "storyID=$storyID", '', true), $lang->preview, '', "class='btn' id='preview'");?>
               <?php endif;?>
               </span>
             </div>

module/testcase/view/groupcase.html.php

@@ -35,7 +35,7 @@
         <th class='w-30px' title='<?php echo $lang->testcase->bugs?>'><?php echo $lang->testcase->bugsAB;?></th>
         <th class='w-30px' title='<?php echo $lang->testcase->results?>'><?php echo $lang->testcase->resultsAB;?></th>
         <th class='w-30px' title='<?php echo $lang->testcase->stepNumber?>'><?php echo $lang->testcase->stepNumberAB;?></th>
-        <th class='w-100px'> <?php echo $lang->actions;?></th>
+        <th class='c-actions-2'> <?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody>
@@ -89,7 +89,9 @@
       <?php endforeach;?>
       <tr data-id='<?php echo $groupIndex;?>' class='group-toggle group-summary hidden divider-top'>
         <td class='c-side text-left'><?php echo html::a('###', "<i class='icon-caret-right'></i> $groupName");?></td>
-        <td colspan='12'></td>
+        <td colspan='12' class="text-left">
+          <div class="small with-padding"><span class="text-muted"><?php echo $lang->testcase->allTestcases;?></span> <?php echo $i;?></div>
+        </td>
       </tr>
       <?php $groupIndex++;?>
       <?php endforeach;?>

module/testreport/view/browse.html.php

@@ -30,7 +30,7 @@
         <th class='w-150px'><?php common::printOrderLink('createdDate', $orderBy, $vars, $lang->testreport->createdDate);?></th>
         <th class='w-250px text-left'><?php common::printOrderLink('project', $orderBy, $vars, $lang->testreport->project);?></th>
         <th class='w-250px text-left'><?php echo $lang->testreport->testtask;?></th>
-        <th class='w-80px'> <?php echo $lang->actions;?></th>
+        <th class='c-actions-2'> <?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <?php if($reports):?>

module/testsuite/view/browse.html.php

@@ -36,7 +36,7 @@
         <th><?php echo $lang->testsuite->desc;?></th>
         <th class='w-90px'><?php common::printOrderLink('addedBy',   $orderBy, $vars, $lang->testsuite->addedBy);?></th>
         <th class='w-150px'><?php common::printOrderLink('addedDate', $orderBy, $vars, $lang->testsuite->addedDate);?></th>
-        <th class='w-130px text-center'><?php echo $lang->actions;?></th>
+        <th class='c-actions-3 text-center'><?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody>
@@ -44,8 +44,8 @@
     <tr class='text-left'>
       <td><?php echo sprintf('%03d', $suite->id);?></td>
       <td class='text-left' title="<?php echo $suite->name?>">
-        <?php if($suite->type == 'public') echo "<span class='label label-info'>{$lang->testsuite->authorList['public']}</span> ";?>
-        <?php if($suite->type == 'private') echo "<span class='label label-warning'>{$lang->testsuite->authorList['private']}</span> ";?>
+        <?php if($suite->type == 'public') echo "<span class='label label-success label-badge'>{$lang->testsuite->authorList['public']}</span> ";?>
+        <?php if($suite->type == 'private') echo "<span class='label label-info label-badge'>{$lang->testsuite->authorList['private']}</span> ";?>
         <?php echo html::a(inlink('view', "suiteID=$suite->id"), $suite->name);?>
       </td>
       <td><?php echo $suite->desc;?></td>

module/testsuite/view/library.html.php

@@ -41,7 +41,7 @@ js::set('flow',   $this->config->global->flow);
           <span class='caret'></span>
         </button>
         <ul class='dropdown-menu pull-right'>
-        <?php 
+        <?php
         $misc = common::hasPriv('testsuite', 'batchCreateCase') ? '' : "class=disabled";
         $link = common::hasPriv('testsuite', 'batchCreateCase') ?  $this->createLink('testsuite', 'batchCreateCase', "libID=$libID&moduleID=" . (isset($moduleID) ? $moduleID : 0)) : '#';
         echo "<li>" . html::a($link, $lang->testcase->batchCreate, '', $misc) . "</li>";
@@ -150,7 +150,7 @@ js::set('flow',   $this->config->global->flow);
             <th class='c-type'>  <?php common::printOrderLink('type',     $orderBy, $vars, $lang->typeAB);?></th>
             <th class='c-user'>  <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
             <th class='c-status'><?php common::printOrderLink('status',   $orderBy, $vars, $lang->statusAB);?></th>
-            <th class='c-actions-2 text-center'><?php echo $lang->actions;?></th>
+            <th class='c-actions-3 text-center'><?php echo $lang->actions;?></th>
           </tr>
         </thead>
         <tbody>
@@ -250,7 +250,7 @@ js::set('flow',   $this->config->global->flow);
   </div>
 </div>
 <script>
-$('#module' + moduleID).addClass('active'); 
+$('#module' + moduleID).addClass('active');
 $('#<?php echo $this->session->libBrowseType?>Tab').addClass('btn-active-text').append("<span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>");
 if(flow == 'onlyTest')
 {

module/testsuite/view/view.html.php

@@ -67,7 +67,7 @@
               <th class='w-30px' title='<?php echo $lang->testcase->bugs?>'><?php echo $lang->testcase->bugsAB;?></th>
               <th class='w-30px' title='<?php echo $lang->testcase->results?>'><?php echo $lang->testcase->resultsAB;?></th>
               <th class='w-30px' title='<?php echo $lang->testcase->stepNumber?>'><?php echo $lang->testcase->stepNumberAB;?></th>
-              <th class='w-130px text-center'><?php echo $lang->actions;?></th>
+              <th class='c-actions-3 text-center'><?php echo $lang->actions;?></th>
             </tr>
           </thead>
           <?php if($cases):?>

module/testtask/view/browse.html.php

@@ -69,7 +69,7 @@ $status = $this->session->testTaskVersionStatus;
         <th class='w-100px text-left'><?php common::printOrderLink('begin',   $orderBy, $vars, $lang->testtask->begin);?></th>
         <th class='w-100px text-left'><?php common::printOrderLink('end',     $orderBy, $vars, $lang->testtask->end);?></th>
         <th class='w-80px text-left'> <?php common::printOrderLink('status',  $orderBy, $vars, $lang->statusAB);?></th>
-        <th class='c-actions-4 text-center'><?php echo $lang->actions;?></th>
+        <th class='c-actions-6 text-center'><?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody>
@@ -93,19 +93,16 @@ $status = $this->session->testTaskVersionStatus;
       </td>
       <td class='c-actions'>
         <?php
-        if(common::hasPriv('testtask', 'delete', $task))
-        {
-            echo "<div class='more'>";
-            $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes");
-            echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '<i class="icon-common-delete icon-trash"></i>', '', "title='{$lang->testtask->delete}' class='btn'");
-            echo "</div>";
-        }
-
         common::printIcon('testtask',   'cases',    "taskID=$task->id", $task, 'list', 'sitemap');
         common::printIcon('testtask',   'view',     "taskID=$task->id", '', 'list', 'list-alt','','iframe',true, 'data-width=800px');
         common::printIcon('testtask',   'linkCase', "taskID=$task->id", $task, 'list', 'link');
         common::printIcon('testreport', 'browse',   "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list','flag');
         common::printIcon('testtask',   'edit',     "taskID=$task->id", $task, 'list','','','',true);
+        if(common::hasPriv('testtask', 'delete', $task))
+        {
+            $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes");
+            echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '<i class="icon-common-delete icon-trash"></i>', '', "title='{$lang->testtask->delete}' class='btn'");
+        }
         ?>
       </td>
     </tr>

module/testtask/view/cases.html.php

@@ -129,6 +129,10 @@
         <?php endif;?>
         <?php $pager->show('right', 'pagerjs');?>
       </div>
+      <?php else:?>
+      <div class="table-empty-tip">
+        <p><span class="text-muted"><?php echo $lang->testcase->noCase;?></span> <?php common::printLink('testtask', 'linkCase', "taskID={$taskID}", "<i class='icon icon-plus'></i> " . $lang->testtask->linkCase, '', "class='btn btn-info'");?></p>
+      </div>
       <?php endif;?>
     </form>
   </div>

module/testtask/view/groupcase.html.php

@@ -36,7 +36,7 @@
         <th class='w-30px' title='<?php echo $lang->testcase->bugs?>'><?php echo $lang->testcase->bugsAB;?></th>
         <th class='w-30px' title='<?php echo $lang->testcase->results?>'><?php echo $lang->testcase->resultsAB;?></th>
         <th class='w-30px' title='<?php echo $lang->testcase->stepNumber?>'><?php echo $lang->testcase->stepNumberAB;?></th>
-        <th class='w-130px'> <?php echo $lang->actions;?></th>
+        <th class='c-actions-3'> <?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody>

module/todo/view/view.html.php

@@ -48,11 +48,11 @@
           <table class='table table-data'>
             <tr>
               <th><?php echo $lang->todo->pri;?></th>
-              <td><?php echo $lang->todo->priList[$todo->pri];?></td>
+              <td><span title="<?php echo zget($lang->todo->priList, $todo->pri);?>" class='label-pri <?php echo 'label-pri-' . $todo->pri;?>' title='<?php echo zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri)?></span></td>
             </tr>
             <tr>
               <th><?php echo $lang->todo->status;?></th>
-              <td class='todo-<?php echo $todo->status?>'><?php echo $lang->todo->statusList[$todo->status];?></td>
+              <td><span class="status-<?php echo $todo->status;?>"><span class="label label-dot"></span> <?php echo $lang->todo->statusList[$todo->status];?></span></td>
             </tr>
             <tr>
               <th><?php echo $lang->todo->type;?></th>

module/tree/lang/zh-cn.php

@@ -22,7 +22,7 @@ $lang->tree->manageProject      = "维护{$lang->projectCommon}视图模块";
 $lang->tree->manageLine         = '维护产品线';
 $lang->tree->manageBug          = '维护测试视图模块';
 $lang->tree->manageCase         = '维护用例视图模块';
-$lang->tree->manageCaseLib      = '维护测试库模块';
+$lang->tree->manageCaseLib      = '维护用例库模块';
 $lang->tree->manageCustomDoc    = '维护文档库分类';
 $lang->tree->updateOrder        = '更新排序';
 $lang->tree->manageChild        = '维护子模块';
@@ -30,7 +30,7 @@ $lang->tree->manageStoryChild   = '维护子模块';
 $lang->tree->manageLineChild    = '维护产品线';
 $lang->tree->manageBugChild     = '维护Bug子模块';
 $lang->tree->manageCaseChild    = '维护用例子模块';
-$lang->tree->manageCaselibChild = '维护测试库子模块';
+$lang->tree->manageCaselibChild = '维护用例库子模块';
 $lang->tree->manageTaskChild    = "维护{$lang->projectCommon}子模块";
 $lang->tree->syncFromProduct    = '复制模块';
 $lang->tree->dragAndSort        = "拖放排序";

module/user/css/edit.css

@@ -1 +1 @@
-.table caption {border: none; border-bottom: 1px solid #ddd}
+.main-form .table + .table {margin-top: 10px;}

module/user/view/edit.html.php

@@ -17,9 +17,9 @@
   <div class="center-block">
     <div class="main-header">
       <h2>
-      <span class='prefix' title='USER'><?php echo $user->id;?></span>
-      <strong><?php if(!common::printLink('user', 'view', "account=$user->account", $user->realname)) echo $user->realname;?> (<small><?php echo $user->account;?></small>)</strong>
-      <small><?php echo $lang->arrow . $lang->user->edit;?></small>
+        <span class="label label-id"><?php echo $user->id;?></span>
+        <strong><?php if(!common::printLink('user', 'view', "account=$user->account", $user->realname)) echo $user->realname;?> <small>(<?php echo $user->account;?>)</small></strong>
+        <small><?php echo $lang->arrow . $lang->user->edit;?></small>
       </h2>
     </div>
     <form class="load-indicator main-form form-ajax" id="createForm" method="post" target='hiddenwin'>
@@ -94,7 +94,7 @@
           <th><?php echo $lang->user->mobile;?></th>
           <td><?php echo html::input('mobile', $user->mobile, "class='form-control' autocomplete='off'");?></td>
         </tr>
-         <tr>
+        <tr>
           <th><?php echo $lang->user->phone;?></th>
           <td><?php echo html::input('phone', $user->phone, "class='form-control' autocomplete='off'");?></td>
           <th><?php echo $lang->user->address;?></th>

module/user/view/login.html.php

@@ -34,7 +34,7 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
             <table class='table table-form'>
               <tbody>
                 <tr>
-                  <th><?php echo $lang->user->account;?></th>
+                  <th class='w-70px'><?php echo $lang->user->account;?></th>
                   <td><input class='form-control' type='text' name='account' id='account' autofocus /></td>
                 </tr>
                 <tr>

module/webhook/view/browse.html.php

@@ -22,7 +22,7 @@
           <th class='w-60px'><?php common::printOrderLink('type', $orderBy, $vars, $lang->webhook->type);?></th>
           <th class='w-200px text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->webhook->name);?></th>
           <th><?php common::printOrderLink('url', $orderBy, $vars, $lang->webhook->url);?></th>
-          <th class='w-110px'><?php echo $lang->actions;?></th>
+          <th class='c-actions-3'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>

www/js/my.full.js

@@ -504,7 +504,7 @@ function ajaxGetContacts(obj)
       $inputgroup = $(obj).closest('.input-group');
       $inputgroup.find('.input-group-btn').remove();
       $inputgroup.append(contacts);
-      $inputgroup.find('select:last').chosen(defaultChosenOptions);
+      $inputgroup.find('select:last').chosen(defaultChosenOptions).fixInputGroup();
     });
 }