* ajusted views of module 'test'.

module/bug/js/view.js

@@ -1,4 +1,3 @@
 function setModal4List(colorboxClass, replaceID)
 {
-    if(onlybody != 'yes') $('.iframe').colorbox({width:900, height:500, iframe:true, transition:'none', onCleanup:function(){parent.location.href=parent.location.href;}})
 }

module/bug/lang/zh-cn.php

@@ -87,6 +87,7 @@ $lang->bug->activate           = '激活';
 $lang->bug->reportChart        = '报表统计';
 $lang->bug->export             = '导出数据';
 $lang->bug->delete             = '删除';
+$lang->bug->deleted            = '已删除';
 $lang->bug->saveTemplate       = '保存模板';
 $lang->bug->deleteTemplate     = '删除模板';
 $lang->bug->customFields       = '自定义字段';

module/bug/view/browse.html.php

@@ -21,47 +21,49 @@ js::set('customed', $customed);
 ?>
 
 <div id='featurebar'>
-  <div class='f-left'>
+  <div class='heading'><?php echo html::icon($lang->icons['bug']);?></div>
+  <div class='actions'>
+    <div class='btn-group'>
+      <div class='btn-group'>
+        <button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown'>
+          <i class='icon-download-alt'></i> <?php echo $lang->export ?>
+          <span class='caret'></span>
+        </button>
+        <ul class='dropdown-menu' id='exportActionMenu'>
+          <?php 
+          $misc = common::hasPriv('bug', 'export') ? "class='export'" : "class=disabled";
+          $link = common::hasPriv('bug', 'export') ?  $this->createLink('bug', 'export', "productID=$productID&orderBy=$orderBy") : '#';
+          echo "<li>" . html::a($link, $lang->bug->export, '', $misc) . "</li>";
+          ?>
+        </ul>
+      </div>
     <?php
-    echo "<span id='allTab'>"           . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=all&param=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->bug->allBugs) . "</span>";
-    echo "<span id='assigntomeTab'>"    . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=assignToMe&param=0"),    $lang->bug->assignToMe)    . "</span>";
-    echo "<span id='openedbymeTab'>"    . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=openedByMe&param=0"),    $lang->bug->openedByMe)    . "</span>";
-    echo "<span id='resolvedbymeTab'>"  . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=resolvedByMe&param=0"),  $lang->bug->resolvedByMe)  . "</span>";
-    echo "<span id='assigntonullTab'>"  . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=assignToNull&param=0"),  $lang->bug->assignToNull)  . "</span>";
-    echo "<span id='unresolvedTab'>"    . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=unResolved&param=0"),    $lang->bug->unResolved)    . "</span>";
-    echo "<span id='unclosedTab'>"      . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=unclosed&param=0"),      $lang->bug->unclosed)      . "</span>";
-    echo "<span id='longlifebugsTab'>"  . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=longLifeBugs&param=0"),  $lang->bug->longLifeBugs)  . "</span>";
-    echo "<span id='postponedbugsTab'>" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=postponedBugs&param=0"), $lang->bug->postponedBugs) . "</span>";
-    echo "<span id='needconfirmTab'>"   . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=needconfirm&param=0"), $lang->bug->needConfirm) . "</span>";
-    echo "<span id='bysearchTab'><a href='#' class='link-icon'><i class='icon-search icon'></i>&nbsp;{$lang->bug->byQuery}</a></span> ";
-    ?>
-  </div>
-  <div class='text-right'>
-    <?php
-
-    echo '<span class="link-button dropButton">';
-    echo html::a("#", "<i class='icon-upload-alt'></i> " . $lang->export, '', "id='exportAction' onclick=\"toggleSubMenu(this.id,'bottom',0)\"");
-    echo '</span>';
-
     common::printIcon('bug', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID");
-    common::printIcon('bug', 'customFields', '', '', 'button', 'icon-wrench');
+    common::printIcon('bug', 'customFields', '', '', 'button', '', '', 'iframe', true);
+    echo "</div><div class='btn-group'>";
     common::printIcon('bug', 'batchCreate', "productID=$productID&projectID=0&moduleID=$moduleID");
     common::printIcon('bug', 'create', "productID=$productID&extra=moduleID=$moduleID");
+    echo '</div>';
     ?>
   </div>
-</div>
-<div id='exportActionMenu' class='listMenu hidden'>
-  <ul>
-  <?php 
-  $misc = common::hasPriv('bug', 'export') ? "class='export'" : "class=disabled";
-  $link = common::hasPriv('bug', 'export') ?  $this->createLink('bug', 'export', "productID=$productID&orderBy=$orderBy") : '#';
-  echo "<li>" . html::a($link, $lang->bug->export, '', $misc) . "</li>";
-  ?>
+  <ul class='nav'>
+    <?php
+    echo "<li id='allTab'>"           . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=all&param=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->bug->allBugs) . "</li>";
+    echo "<li id='assigntomeTab'>"    . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=assignToMe&param=0"),    $lang->bug->assignToMe)    . "</li>";
+    echo "<li id='openedbymeTab'>"    . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=openedByMe&param=0"),    $lang->bug->openedByMe)    . "</li>";
+    echo "<li id='resolvedbymeTab'>"  . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=resolvedByMe&param=0"),  $lang->bug->resolvedByMe)  . "</li>";
+    echo "<li id='assigntonullTab'>"  . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=assignToNull&param=0"),  $lang->bug->assignToNull)  . "</li>";
+    echo "<li id='unresolvedTab'>"    . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=unResolved&param=0"),    $lang->bug->unResolved)    . "</li>";
+    echo "<li id='unclosedTab'>"      . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=unclosed&param=0"),      $lang->bug->unclosed)      . "</li>";
+    echo "<li id='longlifebugsTab'>"  . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=longLifeBugs&param=0"),  $lang->bug->longLifeBugs)  . "</li>";
+    echo "<li id='postponedbugsTab'>" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=postponedBugs&param=0"), $lang->bug->postponedBugs) . "</li>";
+    echo "<li id='needconfirmTab'>"   . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=needconfirm&param=0"), $lang->bug->needConfirm) . "</li>";
+    echo "<li id='bysearchTab'><a href='#' class='link-icon'><i class='icon-search icon'></i>&nbsp;{$lang->bug->byQuery}</a></li> ";
+    ?>
   </ul>
+  <div id='querybox' class='<?php if($browseType =='bysearch') echo 'show';?>'></div>
 </div>
 
-<div id='querybox' class='<?php if($browseType !='bysearch') echo 'hidden';?>'></div>
-
 <?php 
 if($customed)
 {
@@ -71,197 +73,177 @@ if($customed)
 }
 ?>
 
-<div class='treeSlider' id='bugTree'><span>&nbsp;</span></div>
-<form method='post'>
-  <table class='cont-lt1'>
-    <tr valign='top'>
-      <td class='side' id='treebox'>
-        <div class='box-title'><?php echo $productName;?></div>
-        <div class='box-content'>
-          <?php echo $moduleTree;?>
-          <div class='text-right'>
-            <?php common::printLink('tree', 'browse', "productID=$productID&view=bug", $lang->tree->manage);?>
-            <?php common::printLink('tree', 'fix',    "root=$productID&type=bug", $lang->tree->fix, 'hiddenwin');?>
-          </div>
-        </div>
-      </td>
-      <td class='divider'></td>
-      <td>
-        <table class='table-1 fixed colored tablesorter datatable' id='bugList'>
-          <?php $vars = "productID=$productID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
-          <thead>
-          <tr class='colhead'>
-            <th class='w-id'>       <?php common::printOrderLink('id',          $orderBy, $vars, $lang->idAB);?></th>
-            <th class='w-severity'> <?php common::printOrderLink('severity',    $orderBy, $vars, $lang->bug->severityAB);?></th>
-            <th class='w-pri'>      <?php common::printOrderLink('pri',         $orderBy, $vars, $lang->priAB);?></th>
+<div class='side' id='treebox'>
+  <button class='side-handle' data-id='storyTree'><i class='icon-caret-left'></i></button>
+  <header class='nobr'><?php echo html::icon($lang->icons['product']);?> <strong><?php echo $productName;?></strong></header>
+  <div class='side-body'>
+    <?php echo $moduleTree;?>
+    <div class='text-right'>
+      <?php common::printLink('tree', 'browse', "productID=$productID&view=bug", $lang->tree->manage);?>
+      <?php common::printLink('tree', 'fix',    "root=$productID&type=bug", $lang->tree->fix, 'hiddenwin');?>
+    </div>
+  </div>
+</div>
+<div class='main'>
+  <form method='post'>
+    <table class='table table-condensed table-hover table-striped table-borderless tablesorter table-fixed' id='bugList'>
+      <?php $vars = "productID=$productID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
+      <thead>
+      <tr>
+        <th class='w-id'>       <?php common::printOrderLink('id',          $orderBy, $vars, $lang->idAB);?></th>
+        <th class='w-severity'> <?php common::printOrderLink('severity',    $orderBy, $vars, $lang->bug->severityAB);?></th>
+        <th class='w-pri'>      <?php common::printOrderLink('pri',         $orderBy, $vars, $lang->priAB);?></th>
 
-            <th>                    <?php common::printOrderLink('title',       $orderBy, $vars, $lang->bug->title);?></th>
+        <th>                    <?php common::printOrderLink('title',       $orderBy, $vars, $lang->bug->title);?></th>
 
-            <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
-            <th class='w-80px'><?php common::printOrderLink('status',           $orderBy, $vars, $lang->bug->statusAB);?></th>
-            <?php endif;?>
+        <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
+        <th class='w-80px'><?php common::printOrderLink('status',           $orderBy, $vars, $lang->bug->statusAB);?></th>
+        <?php endif;?>
 
-            <?php if($browseType == 'needconfirm'):?>
-            <th class='w-200px'><?php common::printOrderLink('story',           $orderBy, $vars, $lang->bug->story);?></th>
-            <th class='w-50px'><?php echo $lang->actions;?></th>
-            <?php else:?>
-            <th class='w-user'><?php common::printOrderLink('openedBy',         $orderBy, $vars, $lang->openedByAB);?></th>
+        <?php if($browseType == 'needconfirm'):?>
+        <th class='w-200px'><?php common::printOrderLink('story',           $orderBy, $vars, $lang->bug->story);?></th>
+        <th class='w-50px'><?php echo $lang->actions;?></th>
+        <?php else:?>
+        <th class='w-user'><?php common::printOrderLink('openedBy',         $orderBy, $vars, $lang->openedByAB);?></th>
 
-            <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
-            <th class='w-date'><?php common::printOrderLink('openedDate',       $orderBy, $vars, $lang->bug->openedDateAB);?></th>
-            <?php endif;?>
+        <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
+        <th class='w-date'><?php common::printOrderLink('openedDate',       $orderBy, $vars, $lang->bug->openedDateAB);?></th>
+        <?php endif;?>
 
-            <th class='w-user'><?php common::printOrderLink('assignedTo',       $orderBy, $vars, $lang->assignedToAB);?></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-user'><?php common::printOrderLink('assignedTo',       $orderBy, $vars, $lang->assignedToAB);?></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>
 
-            <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
-            <th class='w-date'><?php common::printOrderLink('resolvedDate',     $orderBy, $vars, $lang->bug->resolvedDateAB);?></th>
-            <?php endif;?>
+        <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
+        <th class='w-date'><?php common::printOrderLink('resolvedDate',     $orderBy, $vars, $lang->bug->resolvedDateAB);?></th>
+        <?php endif;?>
 
-            <th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
-            <?php endif;?>
-          </tr>
-          </thead>
-          <tbody>
-          <?php foreach($bugs as $bug):?>
-          <?php $bugLink = inlink('view', "bugID=$bug->id");?>
-          <tr class='text-center'>
-            <td class='<?php echo $bug->status;?>' style="font-weight:bold">
-              <input type='checkbox' name='bugIDList[]'  value='<?php echo $bug->id;?>'/> 
-              <?php echo html::a($bugLink, sprintf('%03d', $bug->id));?>
-            </td>
-            <td><span class='<?php echo 'severity' . $bug->severity;?>'><?php echo $bug->severity;?></span></td>
-            <td><span class='<?php echo 'pri' . $lang->bug->priList[$bug->pri];?>'><?php echo $lang->bug->priList[$bug->pri];?></span></td>
+        <th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
+        <?php endif;?>
+      </tr>
+      </thead>
+      <tbody>
+      <?php foreach($bugs as $bug):?>
+      <?php $bugLink = inlink('view', "bugID=$bug->id");?>
+      <tr class='text-center'>
+        <td class='bug-<?php echo $bug->status;?> strong text-left'>
+          <input type='checkbox' name='bugIDList[]'  value='<?php echo $bug->id;?>'/> 
+          <?php echo html::a($bugLink, sprintf('%03d', $bug->id));?>
+        </td>
+        <td><span class='<?php echo 'severity' . $bug->severity;?>'><?php echo $bug->severity;?></span></td>
+        <td><span class='<?php echo 'pri' . $lang->bug->priList[$bug->pri];?>'><?php echo $lang->bug->priList[$bug->pri];?></span></td>
 
-            <?php $class = 'confirm' . $bug->confirmed;?>
-            <td class='text-left' title="<?php echo $bug->title?>"><?php echo "<span class='$class'>[{$lang->bug->confirmedList[$bug->confirmed]}] </span>" . html::a($bugLink, $bug->title);?></td>
+        <?php $class = 'confirm' . $bug->confirmed;?>
+        <td class='text-left' title="<?php echo $bug->title?>"><?php echo "<span class='$class'>[{$lang->bug->confirmedList[$bug->confirmed]}] </span>" . html::a($bugLink, $bug->title);?></td>
 
-            <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
-            <td><?php echo $lang->bug->statusList[$bug->status];?></td>
-            <?php endif;?>
+        <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
+        <td><?php echo $lang->bug->statusList[$bug->status];?></td>
+        <?php endif;?>
 
-            <?php if($browseType == 'needconfirm'):?>
-            <td class='text-left' title="<?php echo $bug->storyTitle?>"><?php echo html::a($this->createLink('story', 'view', "stoyID=$bug->story"), $bug->storyTitle, '_blank');?></td>
-            <td><?php $lang->bug->confirmStoryChange = $lang->confirm; common::printIcon('bug', 'confirmStoryChange', "bugID=$bug->id", '', 'list', '', 'hiddenwin')?></td>
-            <?php else:?>
-            <td><?php echo zget($users, $bug->openedBy, $bug->openedBy);?></td>
+        <?php if($browseType == 'needconfirm'):?>
+        <td class='text-left' title="<?php echo $bug->storyTitle?>"><?php echo html::a($this->createLink('story', 'view', "stoyID=$bug->story"), $bug->storyTitle, '_blank');?></td>
+        <td><?php $lang->bug->confirmStoryChange = $lang->confirm; common::printIcon('bug', 'confirmStoryChange', "bugID=$bug->id", '', 'list', '', 'hiddenwin')?></td>
+        <?php else:?>
+        <td><?php echo zget($users, $bug->openedBy, $bug->openedBy);?></td>
 
-            <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
-            <td><?php echo substr($bug->openedDate, 5, 11)?></td>
-            <?php endif;?>
+        <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
+        <td><?php echo substr($bug->openedDate, 5, 11)?></td>
+        <?php endif;?>
 
-            <td <?php if($bug->assignedTo == $this->app->user->account) echo 'class="red"';?>><?php echo zget($users, $bug->assignedTo, $bug->assignedTo);?></td>
-            <td><?php echo zget($users, $bug->resolvedBy, $bug->resolvedBy)?></td>
-            <td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
+        <td <?php if($bug->assignedTo == $this->app->user->account) echo 'class="red"';?>><?php echo zget($users, $bug->assignedTo, $bug->assignedTo);?></td>
+        <td><?php echo zget($users, $bug->resolvedBy, $bug->resolvedBy)?></td>
+        <td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
 
-            <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
-            <td><?php echo substr($bug->resolvedDate, 5, 11)?></td>
-            <?php endif;?>
+        <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
+        <td><?php echo substr($bug->resolvedDate, 5, 11)?></td>
+        <?php endif;?>
 
-            <td class='text-right'>
-              <?php
-              $params = "bugID=$bug->id";
-              common::printIcon('bug', 'confirmBug', $params, $bug, 'list', '', '', 'iframe', true);
-              common::printIcon('bug', 'assignTo',   $params, '',   'list', '', '', 'iframe', true);
-              common::printIcon('bug', 'resolve',    $params, $bug, 'list', '', '', 'iframe', true);
-              common::printIcon('bug', 'close',      $params, $bug, 'list', '', '', 'iframe', true);
-              common::printIcon('bug', 'edit',       $params, $bug, 'list');
-              common::printIcon('bug', 'create',     "product=$bug->product&extra=bugID=$bug->id", $bug, 'list', 'copy');
-              ?>
-            </td>
-            <?php endif;?>
-          </tr>
-          <?php endforeach;?>
-          </tbody>
-          <tfoot>
-            <tr>
-              <?php
-              $columns = $this->cookie->windowWidth >= $this->config->wideSize ? 12 : 9;
-              if($browseType == 'needconfirm') $columns = $this->cookie->windowWidth >= $this->config->wideSize ? 7 : 6; 
-              ?>
-              <td colspan='<?php echo $columns;?>'>
-                <?php if(!empty($bugs)):?>
-                <div class='f-left'>
+        <td class='text-right'>
+          <?php
+          $params = "bugID=$bug->id";
+          common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'search', '', 'iframe', true);
+          common::printIcon('bug', 'assignTo',   $params, '',   'list', '', '', 'iframe', true);
+          common::printIcon('bug', 'resolve',    $params, $bug, 'list', '', '', 'iframe', true);
+          common::printIcon('bug', 'close',      $params, $bug, 'list', '', '', 'iframe text-danger', true);
+          common::printIcon('bug', 'edit',       $params, $bug, 'list');
+          common::printIcon('bug', 'create',     "product=$bug->product&extra=bugID=$bug->id", $bug, 'list', 'copy');
+          ?>
+        </td>
+        <?php endif;?>
+      </tr>
+      <?php endforeach;?>
+      </tbody>
+      <tfoot>
+        <tr>
+          <?php
+          $columns = $this->cookie->windowWidth >= $this->config->wideSize ? 12 : 9;
+          if($browseType == 'needconfirm') $columns = $this->cookie->windowWidth >= $this->config->wideSize ? 7 : 6; 
+          ?>
+          <td colspan='<?php echo $columns;?>'>
+            <?php if(!empty($bugs)):?>
+            <div class='table-actions clearfix'>
+              <div class='btn-group'>
+              <?php echo html::selectAll() . html::selectReverse();?>
+              </div>
+              <div class='btn-group dropup'>
+                <?php
+                $actionLink = $this->createLink('bug', 'batchEdit', "productID=$productID");
+                $misc       = common::hasPriv('bug', 'batchEdit') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'";
+                echo html::commonButton($lang->edit, $misc);
+                ?>
+                <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
+                <ul class='dropdown-menu'>
                   <?php 
-                  echo "<div class='groupButton'>";
-                  echo html::selectAll() . html::selectReverse();
-                  echo "</div>";
+                  $class = "class='disabled'";
 
-                  $actionLink = $this->createLink('bug', 'batchEdit', "productID=$productID");
-                  $misc       = common::hasPriv('bug', 'batchEdit') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'";
-                  echo "<div class='groupButton dropButton'>";
-                  echo html::commonButton($lang->edit, $misc);
-                  echo "<button id='moreAction' type='button' onclick=\"toggleSubMenu(this.id, 'top', 0)\"><span class='caret'></span></button>";
-                  echo "</div>";
-                 ?>
-                </div>
-                <?php endif?>
-                <div class='text-right'><?php $pager->show();?></div>
-              </td>
-            </tr>
-          </tfoot>
-        </table>
-      </td>
-    </tr>
-  </table>  
-</form>
+                  $actionLink = $this->createLink('bug', 'batchConfirm');
+                  $misc = common::hasPriv('bug', 'batchConfirm') ? "onclick=\"setFormAction('$actionLink','hiddenwin')\"" : "class='disabled'";
+                  echo "<li>" . html::a('#', $lang->bug->confirmBug, '', $misc) . "</li>";
 
-<div id='moreActionMenu' class='listMenu hidden'>
-  <ul>
-  <?php 
-  $class = "class='disabled'";
+                  $actionLink = $this->createLink('bug', 'batchClose');
+                  $misc = common::hasPriv('bug', 'batchClose') ? "onclick=\"setFormAction('$actionLink','hiddenwin')\"" : "class='disabled'";
+                  echo "<li>" . html::a('#', $lang->bug->close, '', $misc) . "</li>";
 
-  $actionLink = $this->createLink('bug', 'batchConfirm');
-  $misc = common::hasPriv('bug', 'batchConfirm') ? "onclick=\"setFormAction('$actionLink','hiddenwin')\"" : "class='disabled'";
-  echo "<li>" . html::a('#', $lang->bug->confirmBug, '', $misc) . "</li>";
-
-  $actionLink = $this->createLink('bug', 'batchClose');
-  $misc = common::hasPriv('bug', 'batchClose') ? "onclick=\"setFormAction('$actionLink','hiddenwin')\"" : "class='disabled'";
-  echo "<li>" . html::a('#', $lang->bug->close, '', $misc) . "</li>";
-
-  $misc = common::hasPriv('bug', 'batchResolve') ? "onmouseover='toggleSubMenu(this.id)' onmouseout='toggleSubMenu(this.id)' id='resolveItem'" : $class;
-  echo "<li>" . html::a('#', $lang->bug->resolve,  '', $misc) . "</li>";
-  ?>
-  </ul>
-</div>
-
-<div id='resolveItemMenu' class='hidden listMenu'>
-  <ul>
-  <?php
-  unset($lang->bug->resolutionList['']);
-  unset($lang->bug->resolutionList['duplicate']);
-  foreach($lang->bug->resolutionList as $key => $resolution)
-  {
-      $actionLink = $this->createLink('bug', 'batchResolve', "resolution=$key");
-      echo "<li>";
-      if($key == 'fixed')
-      {
-          echo html::a('#', $resolution, '', "onmouseover=\"toggleSubMenu(this.id,'right',2)\" id='fixedItem'");
-      }
-      else
-      {
-          echo html::a('#', $resolution, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"");
-      }
-      echo "</li>";
-  }
-  ?>
-  </ul>
-</div>
-
-<div id='fixedItemMenu' class='hidden listMenu'>
-  <ul>
-  <?php
-  unset($builds['']);
-  foreach($builds as $key => $build)
-  {
-      $actionLink = $this->createLink('bug', 'batchResolve', "resolution=fixed&resolvedBuild=$key");
-      echo "<li>";
-      echo html::a('#', $build, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"");
-      echo "</li>";
-  }
-  ?>
-  </ul>
+                  $misc = common::hasPriv('bug', 'batchResolve') ? "id='resolveItem'" : $class;
+                  echo "<li class='dropdown-submenu'>" . html::a('#', $lang->bug->resolve,  '', $misc);
+                  echo "<ul class='dropdown-menu'>";
+                  unset($lang->bug->resolutionList['']);
+                  unset($lang->bug->resolutionList['duplicate']);
+                  foreach($lang->bug->resolutionList as $key => $resolution)
+                  {
+                      $actionLink = $this->createLink('bug', 'batchResolve', "resolution=$key");
+                      if($key == 'fixed')
+                      {
+                          echo "<li class='dropdown-submenu'>";
+                          echo html::a('#', $resolution, '', "id='fixedItem'");
+                          echo "<ul class='dropdown-menu'>";
+                          unset($builds['']);
+                          foreach($builds as $key => $build)
+                          {
+                              $actionLink = $this->createLink('bug', 'batchResolve', "resolution=fixed&resolvedBuild=$key");
+                              echo "<li>";
+                              echo html::a('#', $build, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"");
+                              echo "</li>";
+                          }
+                          echo '</ul></li>';
+                      }
+                      else
+                      {
+                        echo '<li>' . html::a('#', $resolution, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . '</li>';
+                      }
+                  }
+                  echo '</ul></li>';
+                  ?>
+                </ul>
+              </div>
+            </div>
+            <?php endif?>
+            <div class='text-right'><?php $pager->show();?></div>
+          </td>
+        </tr>
+      </tfoot>
+    </table>
+  </form>
 </div>
 
 <?php include '../../common/view/footer.html.php';?>

module/bug/view/close.html.php

@@ -12,17 +12,28 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<div id='titlebar'>
+  <div class='heading'>
+    <span class='prefix'><?php echo html::icon($lang->icons['bug']) . ' #' . $bug->id;;?></span>
+    <strong><?php echo html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title, '_blank');?></strong>
+    <small class='text-danger'> <?php echo $lang->bug->close;?> <?php echo html::icon($lang->icons['close']);?></small>
+  </div>
+</div>
+
 <form class='form-condensed' method='post' target='hiddenwin'>
   <table class='table table-form'>
-    <caption><?php echo $bug->title;?></caption>
     <tr>
-      <th class='rowhead'><?php echo $lang->comment;?></th>
+      <th class='text-left'><?php echo $lang->comment;?></th>
+    </tr>
+    <tr>
       <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
-      <td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
+      <td class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
     </tr>
   </table>
-  <?php include '../../common/view/action.html.php';?>
 </form>
+<div class='main'>
+  <?php include '../../common/view/action.html.php';?>
+</div>
 <?php include '../../common/view/footer.html.php';?>

module/bug/view/confirmbug.html.php

@@ -17,29 +17,39 @@ include '../../common/view/chosen.html.php';
 js::set('holders', $lang->bug->placeholder);
 js::set('page', 'confirmbug');
 ?>
+<div id='titlebar'>
+  <div class='heading'>
+    <span class='prefix'><?php echo html::icon($lang->icons['bug']) . ' #' . $bug->id;;?></span>
+    <strong><?php echo html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title, '_blank');?></strong>
+    <small class='text-muted'> <?php echo $lang->bug->confirmBug;?> <?php echo html::icon($lang->icons['confirm']);?></small>
+  </div>
+</div>
+
 <form class='form-condensed' method='post' target='hiddenwin'>
   <table class='table table-form'>
-    <caption><?php echo $bug->title;?></caption>
     <tr>
-      <th><?php echo $lang->bug->assignedTo;?></th>
-      <td><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='select-2 chosen'");?></td>
+      <th class='w-80px'><?php echo $lang->bug->assignedTo;?></th>
+      <td class='w-p45'><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='select-2 chosen'");?></td>
+      <td></td>
     </tr>  
     <tr>
       <th><?php echo $lang->bug->pri;?></th>
-      <td><?php echo html::select('pri', $lang->bug->priList, $bug->pri, 'class=select-2');?></td>
+      <td><?php echo html::select('pri', $lang->bug->priList, $bug->pri, 'class=form-control');?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->mailto;?></td>
-      <td><?php echo html::select('mailto[]', $users, str_replace(' ' , '', $bug->mailto), 'class="w-p98" multiple');?></td>
+      <th><?php echo $lang->bug->mailto;?></th>
+      <td colspan='2'><?php echo html::select('mailto[]', $users, str_replace(' ' , '', $bug->mailto), 'class="form-control chosen" multiple');?></td>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->comment;?></td>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='w-p94'");?></td>
+      <th><?php echo $lang->comment;?></th>
+      <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='w-p94'");?></td>
     </tr>
     <tr>
-      <td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->server->http_referer);?></td>
+      <td colspan='3' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->server->http_referer);?></td>
     </tr>
   </table>
-  <?php include '../../common/view/action.html.php';?>
 </form>
+<div class='main'>
+  <?php include '../../common/view/action.html.php';?>
+</div>
 <?php include '../../common/view/footer.html.php';?>

module/bug/view/create.html.php

@@ -44,7 +44,7 @@ js::set('refresh', $lang->refresh);
     </tr>  
     <tr>
       <th><?php echo $lang->bug->project;?></th>
-      <td><span id='projectIdBox'><?php echo html::select('project', $projects, $projectID, 'class=select-3 onchange=loadProjectRelated(this.value) autocomplete="off"');?></span></td>
+      <td><span id='projectIdBox'><?php echo html::select('project', $projects, $projectID, 'class=form-control onchange=loadProjectRelated(this.value) autocomplete="off"');?></span></td>
     </tr>
     <tr>
       <th><?php echo $lang->bug->openedBuild;?></th>
@@ -84,15 +84,15 @@ js::set('refresh', $lang->refresh);
     <tr>
       <th><?php echo $lang->bug->lblTypeAndSeverity;?></th>
       <td> 
-        <?php echo html::select('type', $lang->bug->typeList, $type, 'class=select-2');?> 
-        <?php echo html::select('severity', $lang->bug->severityList, $severity, 'class=select-2');?>
+        <?php echo html::select('type', $lang->bug->typeList, $type, 'class=form-control');?> 
+        <?php echo html::select('severity', $lang->bug->severityList, $severity, 'class=form-control');?>
       </td>
     </tr>
     <tr>
       <th><nobr><?php echo $lang->bug->lblSystemBrowserAndHardware;?></nobr></th>
       <td>
-        <?php echo html::select('os', $lang->bug->osList, $os, 'class=select-2');?>
-        <?php echo html::select('browser', $lang->bug->browserList, $browser, 'class=select-2');?>
+        <?php echo html::select('os', $lang->bug->osList, $os, 'class=form-control');?>
+        <?php echo html::select('browser', $lang->bug->browserList, $browser, 'class=form-control');?>
       </td>
     </tr>
     <tr>

module/bug/view/edit.html.php

@@ -134,7 +134,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
         <table class='table-1 a-left'>
           <tr>
             <td class='rowhead w-p20'><?php echo $lang->bug->project;?></td>
-            <td><span id='projectIdBox'><?php echo html::select('project', $projects, $bug->project, 'class=select-3 onchange=loadProjectRelated(this.value)');?></span></td>
+            <td><span id='projectIdBox'><?php echo html::select('project', $projects, $bug->project, 'class=form-control onchange=loadProjectRelated(this.value)');?></span></td>
           </tr>
           <tr>
             <td><?php echo $lang->bug->story;?></td>
@@ -173,7 +173,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
           </tr>
           <tr>
             <td><?php echo $lang->bug->resolution;?></td>
-            <td><?php echo html::select('resolution', $lang->bug->resolutionList, $bug->resolution, 'class=select-3 onchange=setDuplicate(this.value)');?></td>
+            <td><?php echo html::select('resolution', $lang->bug->resolutionList, $bug->resolution, 'class=form-control onchange=setDuplicate(this.value)');?></td>
           </tr>
           <tr id='duplicateBugBox' <?php if($bug->resolution != 'duplicate') echo "style='display:none'";?>>
             <td><?php echo $lang->bug->duplicateBug;?></td>

module/bug/view/m.resolve.html.php

@@ -5,7 +5,7 @@
   <table class='table-1'>
     <tr>
       <td class='w-80px'><?php unset($lang->bug->resolutionList['tostory']); echo $lang->bug->resolution ;?></td>
-      <td><?php echo html::select('resolution', $lang->bug->resolutionList, '', 'class=select-3 onchange=setDuplicate(this.value)');?></div>
+      <td><?php echo html::select('resolution', $lang->bug->resolutionList, '', 'class=form-control onchange=setDuplicate(this.value)');?></div>
     </tr>
     <tr id='duplicateBugBox' style='display:none'>
       <td class='w-80px'><?php echo $lang->bug->duplicateBug;?></td>

module/bug/view/resolve.html.php

@@ -12,37 +12,48 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<?php include '../../common/view/datepicker.html.php';?>
+<div id='titlebar'>
+  <div class='heading'>
+    <span class='prefix'><?php echo html::icon($lang->icons['bug']) . ' #' . $bug->id;;?></span>
+    <strong><?php echo html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title, '_blank');?></strong>
+    <small class='text-success'> <?php echo $lang->bug->resolve;?> <?php echo html::icon($lang->icons['resolve']);?></small>
+  </div>
+</div>
+
 <form class='form-condensed' method='post' target='hiddenwin'>
   <table class='table table-form'>
-    <caption><?php echo $bug->title;?></caption>
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->resolution;?></td>
-      <td><?php unset($lang->bug->resolutionList['tostory']); echo html::select('resolution', $lang->bug->resolutionList, '', 'class=select-3 onchange=setDuplicate(this.value)');?></td>
+      <th class='w-80px'><?php echo $lang->bug->resolution;?></th>
+      <td class='w-p45'><?php unset($lang->bug->resolutionList['tostory']); echo html::select('resolution', $lang->bug->resolutionList, '', 'class=form-control onchange=setDuplicate(this.value)');?></td><td></td>
     </tr>
     <tr id='duplicateBugBox' style='display:none'>
-      <th class='rowhead'><?php echo $lang->bug->duplicateBug;?></td>
+      <th><?php echo $lang->bug->duplicateBug;?></th>
       <td><?php echo html::input('duplicateBug', '', "class='form-control'");?></td>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->resolvedBuild;?></td>
+      <th><?php echo $lang->bug->resolvedBuild;?></th>
       <td><?php echo html::select('resolvedBuild', $builds, '', "class='form-control'");?></td>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->resolvedDate;?></td>
-      <td><?php echo html::input('resolvedDate', helper::now(), "class='form-control'");?></td>
+      <th><?php echo $lang->bug->resolvedDate;?></th>
+      <td><?php echo html::input('resolvedDate', helper::now(), "class='form-control form-date'");?></td>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->assignedTo;?></td>
+      <th><?php echo $lang->bug->assignedTo;?></th>
       <td><?php echo html::select('assignedTo', $users, $bug->openedBy, "class='form-control chosen'");?></td>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->comment;?></td>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
+      <th><?php echo $lang->comment;?></th>
+      <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
     </tr>
     <tr>
-      <td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
+      <td colspan='3' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
     </tr>
   </table>
   <?php include '../../common/view/action.html.php';?>
 </form>
+<div class='main'>
+  <?php include '../../common/view/action.html.php';?>
+</div>
 <?php include '../../common/view/footer.html.php';?>

module/bug/view/view.html.php

@@ -13,8 +13,14 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <div id='titlebar'>
-  <div id='main' <?php if($bug->deleted) echo "class='deleted'";?>>BUG #<?php echo $bug->id . ' ' . $bug->title;?></div>
-  <div>
+  <div class='heading'>
+    <span class='prefix'><?php echo html::icon($lang->icons['bug']) . ' #' . $bug->id;?></span>
+    <strong><?php echo $bug->title;?></strong>
+    <?php if($bug->deleted):?>
+    <span class='label label-danger'><?php echo $lang->bug->deleted;?></span>
+    <?php endif; ?>
+  </div>
+  <div class='actions'>
     <?php
     $browseLink    = $app->session->bugList != false ? $app->session->bugList : inlink('browse', "productID=$bug->product");
     $params        = "bugID=$bug->id";
@@ -23,23 +29,27 @@
     if(!$bug->deleted)
     {
         ob_start();
-        common::printIcon('bug', 'confirmBug', $params, $bug, 'button', '', '', 'iframe', true);
+        echo "<div class='btn-group'>";
+        common::printIcon('bug', 'confirmBug', $params, $bug, 'button', 'search', '', 'iframe', true);
         common::printIcon('bug', 'assignTo',   $params, '',   'button', '', '', 'iframe', true);
         common::printIcon('bug', 'resolve',    $params, $bug, 'button', '', '', 'iframe showinonlybody', true);
-        common::printIcon('bug', 'close',      $params, $bug, 'button', '', '', 'iframe', true);
-        common::printIcon('bug', 'activate',   $params, $bug, 'button', '', '', 'iframe', true);
+        common::printIcon('bug', 'close',      $params, $bug, 'button', '', '', 'text-danger iframe', true);
+        common::printIcon('bug', 'activate',   $params, $bug, 'button', '', '', 'text-success iframe', true);
 
-        common::printIcon('bug', 'toStory', "product=$bug->product&module=0&story=0&project=0&bugID=$bug->id", $bug, 'button', 'toStory');
-        common::printIcon('bug', 'createCase', $convertParams, '', 'button', 'createCase');
+        common::printIcon('bug', 'toStory', "product=$bug->product&module=0&story=0&project=0&bugID=$bug->id", $bug, 'button', $lang->icons['story']);
+        common::printIcon('bug', 'createCase', $convertParams, '', 'button', 'usecase');
+        echo '</div>';
 
-        common::printDivider();
+        echo "<div class='btn-group'>";
         common::printIcon('bug', 'edit', $params);
         common::printCommentIcon('bug');
         common::printIcon('bug', 'create', $copyParams, '', 'button', 'copy');
         common::printIcon('bug', 'delete', $params, '', 'button', '', 'hiddenwin');
+        echo '</div>';
 
-        common::printDivider();
+        echo "<div class='btn-group'>";
         common::printRPN($browseLink, $preAndNext);
+        echo '</div>';
 
         $actionLinks = ob_get_contents();
         ob_end_clean();
@@ -53,239 +63,247 @@
   </div>
 </div>
 
-<table class='cont-rt5'>
-  <tr valign='top'>
-    <td>
+<div class='row'>
+  <div class='col-md-8 col-lg-9'>
+    <div class='main'>
       <fieldset>
         <legend><?php echo $lang->bug->legendSteps;?></legend>
         <div class='content'><?php echo str_replace('<p>[', '<p class="stepTitle">[', $bug->steps);?></div>
       </fieldset>
       <?php echo $this->fetch('file', 'printFiles', array('files' => $bug->files, 'fieldset' => 'true'));?>
       <?php include '../../common/view/action.html.php';?>
-      <div class='a-center actionlink'><?php if(!$bug->deleted) echo $actionLinks;?></div>
-      <div id='commentBox' class='hidden'>
-        <fieldset>
-          <legend><?php echo $lang->comment;?></legend>
-          <form method='post' action='<?php echo inlink('edit', "bugID=$bug->id&comment=true")?>'>
-            <table align='center' class='table-1'>
-            <tr><td><?php echo html::textarea('comment', '',"rows='5' class='w-p100'");?></td></tr>
-            <tr><td><?php echo html::submitButton() . html::backButton();?></td></tr>
-            </table>
-          </form>
-        </fieldset>
-      </div>
-    </td>
-    <td class='divider'></td>
-    <td class='side'>
-      <fieldset>
-        <legend><?php echo $lang->bug->legendBasicInfo;?></legend>
-        <table class='table-1 a-left'>
-          <tr valign='middle'>
-            <th><?php echo $lang->bug->product;?></th>
-            <td><?php if(!common::printLink('bug', 'browse', "productID=$bug->product", $productName)) echo $productName;?>
-          </tr>
-          <tr>
-            <th><?php echo $lang->bug->module;?></th>
-            <td> 
-              <?php
-              if(empty($modulePath))
-              {
-                  echo "/";
-              }
-              else
-              {
-                 foreach($modulePath as $key => $module)
-                 {
-                     if(!common::printLink('bug', 'browse', "productID=$bug->product&browseType=byModule&param=$module->id", $module->name)) echo $module->name;
-                     if(isset($modulePath[$key + 1])) echo $lang->arrow;
-                 }
-              }
-              ?>
-            </td>
-          </tr>
-          <tr valign='middle'>
-            <th><?php echo $lang->bug->productplan;?></th>
-            <td><?php if(!$bug->plan or !common::printLink('productplan', 'linkBug', "planID=$bug->plan", $bug->planName)) echo $bug->planName;?>
-          </tr>
-          <tr>
-            <td><?php echo $lang->bug->type;?></td>
-            <td><?php if(isset($lang->bug->typeList[$bug->type])) echo $lang->bug->typeList[$bug->type]; else echo $bug->type;?></td>
-          </tr>
-          <tr>
-            <td><?php echo $lang->bug->severity;?></td>
-            <td><strong><?php echo $lang->bug->severityList[$bug->severity];?></strong></td>
-          </tr>
-          <tr>
-            <td><?php echo $lang->bug->pri;?></td>
-            <td><strong><?php echo $lang->bug->priList[$bug->pri];?></strong></td>
-          </tr>
-          <tr>
-            <td><?php echo $lang->bug->status;?></td>
-            <td><strong><?php echo $lang->bug->statusList[$bug->status];?></strong></td>
-          </tr>
-          <tr>
-            <td><?php echo $lang->bug->activatedCount;?></td>
-            <td><?php echo $bug->activatedCount;?></td>
-          </tr>
-          <tr>
-            <td><?php echo $lang->bug->confirmed;?></td>
-            <td><?php echo $lang->bug->confirmedList[$bug->confirmed];?></td>
-          </tr>
-          <tr>
-            <td><?php echo $lang->bug->lblAssignedTo;?></td>
-            <td><?php if($bug->assignedTo) echo $users[$bug->assignedTo] . $lang->at . $bug->assignedDate;?></td>
-          </tr>
-          <tr>
-            <td><?php echo $lang->bug->os;?></td>
-            <td><?php echo $lang->bug->osList[$bug->os];?></td>
-          </tr>
-          <tr>
-            <td><?php echo $lang->bug->browser;?></td>
-            <td><?php echo $lang->bug->browserList[$bug->browser];?></td>
-          </tr>
-          <tr>
-            <td><?php echo $lang->bug->keywords;?></td>
-            <td><?php echo $bug->keywords;?></td>
-          </tr>
-        </table>
+      <div class='actions'><?php if(!$bug->deleted) echo $actionLinks;?></div>
+      <fieldset id='commentBox' class='hidden'>
+        <legend><?php echo $lang->comment;?></legend>
+        <form method='post' action='<?php echo inlink('edit', "bugID=$bug->id&comment=true")?>'>
+          <table align='center' class='table-1'>
+          <tr><td><?php echo html::textarea('comment', '',"rows='5' class='w-p100'");?></td></tr>
+          <tr><td><?php echo html::submitButton() . html::backButton();?></td></tr>
+          </table>
+        </form>
       </fieldset>
-
-      <fieldset>
-        <legend><?php echo $lang->bug->case;?></legend>
-        <table class='table-1 a-left'>
-          <tr>
-            <td class='rowhead w-p20'><?php echo $lang->bug->fromCase;?></td>
-            <td><?php if($bug->case) echo html::a($this->createLink('testcase', 'view', "caseID=$bug->case"), $bug->caseTitle);?></td>
-          </tr>
-          <tr>
-            <td valign="top" class='rowhead w-p20'><?php echo $lang->bug->toCase;?></td>
-            <td>
-            <?php 
-            foreach($bug->toCases as $caseID => $case) 
-            {
-                echo '<p style="margin-bottom:0;">' . html::a($this->createLink('testcase', 'view', "caseID=$caseID"), $case) . '</p>';
-            }
-            ?>
-            </td>
-          </tr>
-        </table>
-      </fieldset>
-
-      <fieldset>
-        <legend><?php echo $lang->bug->legendLife;?></legend>
-        <table class='table-1 a-left fixed'>
-          <tr>
-            <th class='rowhead w-p20'><?php echo $lang->bug->openedBy;?></th>
-            <td> <?php echo $users[$bug->openedBy] . $lang->at . $bug->openedDate;?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->bug->openedBuild;?></th>
-            <td>
-              <?php
-              if($bug->openedBuild)
-              {
-                  $openedBuilds = explode(',', $bug->openedBuild);
-                  foreach($openedBuilds as $openedBuild) isset($builds[$openedBuild]) ? print($builds[$openedBuild] . '<br />') : print($openedBuild . '<br />');
-              }
-              else
-              {
-                  echo $bug->openedBuild;
-              }
-              ?>
-            </td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->bug->lblResolved;?></th>
-            <td><?php if($bug->resolvedBy) echo $users[$bug->resolvedBy] . $lang->at . $bug->resolvedDate;?>
-          </tr>
-          <tr>
-            <th><?php echo $lang->bug->resolvedBuild;?></th>
-            <td><?php if(isset($builds[$bug->resolvedBuild])) echo $builds[$bug->resolvedBuild]; else echo $bug->resolvedBuild;?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->bug->resolution;?></th>
-            <td>
-              <?php
-              echo $lang->bug->resolutionList[$bug->resolution];
-              if(isset($bug->duplicateBugTitle)) echo " #$bug->duplicateBug:" . html::a($this->createLink('bug', 'view', "bugID=$bug->duplicateBug"), $bug->duplicateBugTitle);
-              ?>
-            </td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->bug->closedBy;?></th>
-            <td><?php if($bug->closedBy) echo $users[$bug->closedBy] . $lang->at . $bug->closedDate;?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->bug->lblLastEdited;?></th>
-            <td><?php if($bug->lastEditedBy) echo $users[$bug->lastEditedBy] . $lang->at . $bug->lastEditedDate?></td>
-          </tr>
-        </table>
-      </fieldset>
-
-      <fieldset>
-        <legend><?php echo $lang->bug->legendPrjStoryTask;?></legend>
-        <table class='table-1 a-left fixed'>
-          <tr>
-            <td class='rowhead w-p20'><?php echo $lang->bug->project;?></td>
-            <td><?php if($bug->project) echo html::a($this->createLink('project', 'browse', "projectid=$bug->project"), $bug->projectName);?></td>
-          </tr>
-          <tr class='nofixed'>
-            <td><?php echo $lang->bug->story;?></td>
-            <td>
-              <?php
-              if($bug->story) echo html::a($this->createLink('story', 'view', "storyID=$bug->story"), "#$bug->story $bug->storyTitle");
-              if($bug->storyStatus == 'active' and $bug->latestStoryVersion > $bug->storyVersion)
-              {
-                  echo "(<span class='warning'>{$lang->story->changed}</span> ";
-                  echo html::a($this->createLink('bug', 'confirmStoryChange', "bugID=$bug->id"), $lang->confirm, 'hiddenwin');
-                  echo ")";
-              }
-              ?>
-            </td>
-          </tr>
-          <tr>
-            <td><?php echo $lang->bug->task;?></td>
-            <td><?php if($bug->task) echo html::a($this->createLink('task', 'view', "taskID=$bug->task"), $bug->taskName);?></td>
-          </tr>
-        </table>
-      </fieldset>
-      <fieldset>
-        <legend><?php echo $lang->bug->legendMisc;?></legend>
-        <table class='table-1 a-left fixed'>
-          <tr>
-            <td class='rowhead w-p20'><?php echo $lang->bug->mailto;?></td>
-            <td><?php $mailto = explode(',', str_replace(' ', '', $bug->mailto)); foreach($mailto as $account) echo ' ' . $users[$account]; ?></td>
-          </tr>
-          <tr>
-            <td><?php echo $lang->bug->linkBug;?></td>
-            <td>
-              <?php
-              if(isset($bug->linkBugTitles))
-              {
-                  foreach($bug->linkBugTitles as $linkBugID => $linkBugTitle)
+    </div>
+  </div>
+  <div class='col-md-4 col-lg-3'>
+    <div class='main main-side'>
+      <div class='tabs'>
+        <ul class='nav nav-tabs'>
+          <li class='active'><a href='#legendBasicInfo' data-toggle='tab'><?php echo $lang->bug->legendBasicInfo;?></a></li>
+          <li><a href='#legendPrjStoryTask' data-toggle='tab'><?php echo $lang->bug->legendPrjStoryTask;?></a></li>
+        </ul>
+        <div class='tab-content'>
+          <div class='tab-pane active' id='legendBasicInfo'>
+            <table class='table table-data table-condensed table-borderless table-fixed'>
+              <tr valign='middle'>
+                <th class='w-60px'><?php echo $lang->bug->product;?></th>
+                <td><?php if(!common::printLink('bug', 'browse', "productID=$bug->product", $productName)) echo $productName;?></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->module;?></th>
+                <td> 
+                  <?php
+                  if(empty($modulePath))
                   {
-                      echo html::a($this->createLink('bug', 'view', "bugID=$linkBugID"), "#$linkBugID $linkBugTitle", '_blank') . '<br />';
+                      echo "/";
                   }
-              }
-              ?>
-            </td>
-          </tr>
-          <tr>
-            <td><?php echo $lang->bug->case;?></td>
-            <td><?php if(isset($bug->caseTitle)) echo html::a($this->createLink('testcase', 'view', "caseID=$bug->case"), "#$bug->case $bug->caseTitle", '_blank');?></td>
-          </tr>
-          <tr>
-            <td><?php echo $lang->bug->toStory;?></td>
-            <td><?php if($bug->toStory != 0) echo html::a($this->createLink('story', 'view', "storyID=$bug->toStory"), "#$bug->toStory $bug->toStoryTitle", '_blank');?></td>
-          </tr>
-          <tr>
-            <td><?php echo $lang->bug->toTask;?></td>
-            <td><?php if($bug->toTask != 0) echo html::a($this->createLink('task', 'view', "taskID=$bug->toTask"), "#$bug->toTask $bug->toTaskTitle", '_blank');?></td>
-          </tr>
-        </table>
-      </fieldset>
-    </td>
-  </tr>
-</table>
+                  else
+                  {
+                     foreach($modulePath as $key => $module)
+                     {
+                         if(!common::printLink('bug', 'browse', "productID=$bug->product&browseType=byModule&param=$module->id", $module->name)) echo $module->name;
+                         if(isset($modulePath[$key + 1])) echo $lang->arrow;
+                     }
+                  }
+                  ?>
+                </td>
+              </tr>
+              <tr valign='middle'>
+                <th><?php echo $lang->bug->productplan;?></th>
+                <td><?php if(!$bug->plan or !common::printLink('productplan', 'linkBug', "planID=$bug->plan", $bug->planName)) echo $bug->planName;?></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->type;?></th>
+                <td><?php if(isset($lang->bug->typeList[$bug->type])) echo $lang->bug->typeList[$bug->type]; else echo $bug->type;?></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->severity;?></th>
+                <td><strong><?php echo $lang->bug->severityList[$bug->severity];?></strong></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->pri;?></th>
+                <td><strong><?php echo $lang->bug->priList[$bug->pri];?></strong></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->status;?></th>
+                <td><strong><?php echo $lang->bug->statusList[$bug->status];?></strong></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->activatedCount;?></th>
+                <td><?php echo $bug->activatedCount;?></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->confirmed;?></th>
+                <td><?php echo $lang->bug->confirmedList[$bug->confirmed];?></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->lblAssignedTo;?></th>
+                <td><?php if($bug->assignedTo) echo $users[$bug->assignedTo] . $lang->at . $bug->assignedDate;?></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->os;?></th>
+                <td><?php echo $lang->bug->osList[$bug->os];?></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->browser;?></th>
+                <td><?php echo $lang->bug->browserList[$bug->browser];?></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->keywords;?></th>
+                <td><?php echo $bug->keywords;?></td>
+              </tr>
+            </table>
+          </div>
+          <div class='tab-pane' id='legendPrjStoryTask'>
+            <table class='table table-data table-condensed table-borderless table-fixed'>
+              <tr>
+                <th class='w-60px'><?php echo $lang->bug->project;?></th>
+                <td><?php if($bug->project) echo html::a($this->createLink('project', 'browse', "projectid=$bug->project"), $bug->projectName);?></td>
+              </tr>
+              <tr class='nofixed'>
+                <th><?php echo $lang->bug->story;?></th>
+                <td>
+                  <?php
+                  if($bug->story) echo html::a($this->createLink('story', 'view', "storyID=$bug->story"), "#$bug->story $bug->storyTitle");
+                  if($bug->storyStatus == 'active' and $bug->latestStoryVersion > $bug->storyVersion)
+                  {
+                      echo "(<span class='warning'>{$lang->story->changed}</span> ";
+                      echo html::a($this->createLink('bug', 'confirmStoryChange', "bugID=$bug->id"), $lang->confirm, 'hiddenwin');
+                      echo ")";
+                  }
+                  ?>
+                </td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->task;?></th>
+                <td><?php if($bug->task) echo html::a($this->createLink('task', 'view', "taskID=$bug->task"), $bug->taskName);?></td>
+              </tr>
+            </table>
+          </div>
+        </div>
+      </div>
+      <div class='tabs'>
+        <ul class='nav nav-tabs'>
+          <li class='active'><a href='#legendLife' data-toggle='tab'><?php echo $lang->bug->legendLife;?></a></li>
+          <li><a href='#case' data-toggle='tab'><?php echo $lang->bug->case;?></a></li>
+          <li><a href='#legendMisc' data-toggle='tab'><?php echo $lang->bug->legendMisc;?></a></li>
+        </ul>
+        <div class='tab-content'>
+          <div class='tab-pane active' id='legendLife'>
+            <table class='table table-data table-condensed table-borderless table-fixed'>
+              <tr>
+                <th class='w-60px'><?php echo $lang->bug->openedBy;?></th>
+                <td> <?php echo $users[$bug->openedBy] . $lang->at . $bug->openedDate;?></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->openedBuild;?></th>
+                <td>
+                  <?php
+                  if($bug->openedBuild)
+                  {
+                      $openedBuilds = explode(',', $bug->openedBuild);
+                      foreach($openedBuilds as $openedBuild) isset($builds[$openedBuild]) ? print($builds[$openedBuild] . '<br />') : print($openedBuild . '<br />');
+                  }
+                  else
+                  {
+                      echo $bug->openedBuild;
+                  }
+                  ?>
+                </td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->lblResolved;?></th>
+                <td><?php if($bug->resolvedBy) echo $users[$bug->resolvedBy] . $lang->at . $bug->resolvedDate;?></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->resolvedBuild;?></th>
+                <td><?php if(isset($builds[$bug->resolvedBuild])) echo $builds[$bug->resolvedBuild]; else echo $bug->resolvedBuild;?></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->resolution;?></th>
+                <td>
+                  <?php
+                  echo $lang->bug->resolutionList[$bug->resolution];
+                  if(isset($bug->duplicateBugTitle)) echo " #$bug->duplicateBug:" . html::a($this->createLink('bug', 'view', "bugID=$bug->duplicateBug"), $bug->duplicateBugTitle);
+                  ?>
+                </td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->closedBy;?></th>
+                <td><?php if($bug->closedBy) echo $users[$bug->closedBy] . $lang->at . $bug->closedDate;?></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->lblLastEdited;?></th>
+                <td><?php if($bug->lastEditedBy) echo $users[$bug->lastEditedBy] . $lang->at . $bug->lastEditedDate?></td>
+              </tr>
+            </table>
+          </div>
+          <div class='tab-pane active' id='case'>
+            <table class='table table-data table-condensed table-borderless'>
+              <tr>
+                <th class='w-60px'><?php echo $lang->bug->fromCase;?></th>
+                <td><?php if($bug->case) echo html::a($this->createLink('testcase', 'view', "caseID=$bug->case"), $bug->caseTitle);?></td>
+              </tr>
+              <tr>
+                <th valign="top" class='rowhead w-p20'><?php echo $lang->bug->toCase;?></th>
+                <td>
+                <?php 
+                foreach($bug->toCases as $caseID => $case) 
+                {
+                    echo '<p style="margin-bottom:0;">' . html::a($this->createLink('testcase', 'view', "caseID=$caseID"), $case) . '</p>';
+                }
+                ?>
+                </td>
+              </tr>
+            </table>
+          </div>
+          <div class='tab-pane active' id='legendMisc'>
+            <table class='table table-data table-condensed table-borderless table-fixed'>
+              <tr>
+                <th class='w-60px'><?php echo $lang->bug->mailto;?></th>
+                <td><?php $mailto = explode(',', str_replace(' ', '', $bug->mailto)); foreach($mailto as $account) echo ' ' . $users[$account]; ?></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->linkBug;?></th>
+                <td>
+                  <?php
+                  if(isset($bug->linkBugTitles))
+                  {
+                      foreach($bug->linkBugTitles as $linkBugID => $linkBugTitle)
+                      {
+                          echo html::a($this->createLink('bug', 'view', "bugID=$linkBugID"), "#$linkBugID $linkBugTitle", '_blank') . '<br />';
+                      }
+                  }
+                  ?>
+                </td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->case;?></th>
+                <td><?php if(isset($bug->caseTitle)) echo html::a($this->createLink('testcase', 'view', "caseID=$bug->case"), "#$bug->case $bug->caseTitle", '_blank');?></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->toStory;?></th>
+                <td><?php if($bug->toStory != 0) echo html::a($this->createLink('story', 'view', "storyID=$bug->toStory"), "#$bug->toStory $bug->toStoryTitle", '_blank');?></td>
+              </tr>
+              <tr>
+                <th><?php echo $lang->bug->toTask;?></th>
+                <td><?php if($bug->toTask != 0) echo html::a($this->createLink('task', 'view', "taskID=$bug->toTask"), "#$bug->toTask $bug->toTaskTitle", '_blank');?></td>
+              </tr>
+            </table>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
 <?php include '../../common/view/syntaxhighlighter.html.php';?>
 <?php include '../../common/view/footer.html.php';?>

module/common/control.php

@@ -299,7 +299,6 @@ class common extends control
             $icon = $lang->icons[$method] ? $lang->icons[$method] : $method;
         }
         if(strpos(',edit,copy,report,export,delete,', ",$method,") !== false) $module = 'common';
-        $extraClass = strpos(',export,customFields,', ",$method,") !== false ? $method : $extraClass;
         $class = "icon-$module-$method";
         if(!$clickable) $class .= ' disabled';
         if($icon) $class       .= ' icon-' . $icon;

module/common/lang/zh-cn.php

@@ -439,9 +439,11 @@ $lang->icons['link']           = 'link';
 $lang->icons['close']          = 'off';
 $lang->icons['activate']       = 'off';
 $lang->icons['review']         = 'search';
+$lang->icons['confirm']        = 'search';
 $lang->icons['putoff']         = 'calendar';
 $lang->icons['suspend']        = 'pause';
 $lang->icons['cancel']         = 'ban-circle';
 $lang->icons['recordEstimate'] = 'time';
+$lang->icons['customFields']   = 'cogs';
 
 include (dirname(__FILE__) . '/menuOrder.php');

module/product/control.php

@@ -460,7 +460,7 @@ class product extends control
     public function ajaxGetProjects($productID, $projectID = 0)
     {
         $projects = $this->product->getProjectPairs($productID, $params = 'nodeleted');
-        die(html::select('project', $projects, $projectID, 'class=select-3 onchange=loadProjectRelated(this.value)'));
+        die(html::select('project', $projects, $projectID, 'class=form-control onchange=loadProjectRelated(this.value)'));
     }
 
     /**

module/testtask/view/create.html.php

@@ -29,7 +29,7 @@
     <?php endif;?>
     <tr>
       <th><?php echo $lang->testtask->project;?></th>
-      <td><?php echo html::select('project', $projects, '', 'class=select-3 onchange=loadProjectRelated(this.value)');?></td>
+      <td><?php echo html::select('project', $projects, '', 'class=form-control onchange=loadProjectRelated(this.value)');?></td>
     </tr>  
     <tr>
       <th><?php echo $lang->testtask->build;?></th>

module/todo/view/create.html.php

@@ -47,7 +47,7 @@
     <tr>
       <th><?php echo $lang->todo->beginAndEnd;?></th>
       <td>
-        <?php echo html::select('begin', $times, $time, 'onchange=selectNext(); class=select-2') . html::select('end', $times, '', 'class=select-2');?>
+        <?php echo html::select('begin', $times, $time, 'onchange=selectNext(); class=select-2') . html::select('end', $times, '', 'class=form-control');?>
         <input type='checkbox' id='switchDate' onclick='switchDateFeature(this);'><?php echo $lang->todo->lblDisableDate;?>
       </td>
     </tr>  

module/todo/view/edit.html.php

@@ -50,7 +50,7 @@
     <tr>
       <th><?php echo $lang->todo->beginAndEnd;?></th>
       <td>
-        <?php echo html::select('begin', $times, $todo->begin, 'onchange=selectNext(); class=select-2') . html::select('end', $times, $todo->end, 'class=select-2');?>
+        <?php echo html::select('begin', $times, $todo->begin, 'onchange=selectNext(); class=select-2') . html::select('end', $times, $todo->end, 'class=form-control');?>
         <input type='checkbox' id='dateSwitcher' onclick='switchDateFeature(this);' <?php if($todo->begin == 2400) echo 'checked';?> ><?php echo $lang->todo->lblDisableDate;?>
       </td>
     </tr>