Merge branch 'zui'

Conflicts:
	module/bug/view/activate.html.php
	module/bug/view/assignto.html.php
	module/bug/view/confirmbug.html.php
	module/bug/view/edit.html.php
	module/bug/view/resolve.html.php
	module/build/view/create.html.php
	module/build/view/edit.html.php
	module/common/model.php
	module/common/view/header.lite.html.php
	module/file/view/edit.html.php
	module/my/view/bug.html.php
	module/product/view/browse.html.php
	module/product/view/close.html.php
	module/product/view/edit.html.php
	module/productplan/view/edit.html.php
	module/project/view/activate.html.php
	module/project/view/batchedit.html.php
	module/project/view/burn.html.php
	module/project/view/close.html.php
	module/project/view/edit.html.php
	module/project/view/putoff.html.php
	module/project/view/start.html.php
	module/project/view/story.html.php
	module/project/view/suspend.html.php
	module/project/view/taskheader.html.php
	module/release/view/edit.html.php
	module/search/view/buildform.html.php
	module/story/view/batchclose.html.php
	module/story/view/change.html.php
	module/task/control.php
	module/task/css/batchcreate.css
	module/task/view/activate.html.php
	module/task/view/assignto.html.php
	module/task/view/batchcreate.html.php
	module/task/view/cancel.html.php
	module/task/view/close.html.php
	module/task/view/create.html.php
	module/task/view/edit.html.php
	module/task/view/finish.html.php
	module/task/view/start.html.php
	module/testtask/view/close.html.php
	module/testtask/view/edit.html.php
	module/testtask/view/start.html.php
	www/theme/default/style.css

lib/front/front.class.php

@@ -43,19 +43,33 @@ class html
     }
 
     /**
-     * Create icon tag
+     * Create fav icon tag
      * 
      * @param mixed $url  the url of the icon.
      * @access public
      * @return string          
      */
-    public static function icon($url)
+    public static function favicon($url)
     {
         return "<link rel='icon' href='$url' type='image/x-icon' />\n" . 
                "<link rel='shortcut icon' href='$url' type='image/x-icon' />\n";
 
     }
 
+    /**
+     * Create icon tag
+     * 
+     * @param name $name  the name of the icon.
+     * @param cssClass $class  the extra css class of the icon.
+     * @access public
+     * @return string          
+     */
+    public static function icon($name, $class = '')
+    {
+        $class = empty($class) ? ('icon-' . $name) : ('icon-' . $name . ' ' . $class);
+        return "<i class='$class'></i>";
+    }
+
     /**
      * Create the rss tag.
      * 
@@ -187,20 +201,27 @@ class html
      * @param  array  $options    the array to create radio tag from.
      * @param  string $checked    the value to checked by default.
      * @param  string $attrib     other attribs.
+     * @param  string $type       inline or block
      * @return string
      */
-    static public function radio($name = '', $options = array(), $checked = '', $attrib = '')
+    static public function radio($name = '', $options = array(), $checked = '', $attrib = '', $type = 'inline')
     {
         $options = (array)($options);
         if(!is_array($options) or empty($options)) return false;
+        $isBlock = $type == 'block';
 
         $string  = '';
         foreach($options as $key => $value)
         {
+            if($isBlock) $string .= "<div class='radio'><label>";
+            else $string .= "<label class='radio-inline'>";
             $string .= "<input type='radio' name='$name' value='$key' ";
             $string .= ($key == $checked) ? " checked ='checked'" : "";
             $string .= $attrib;
-            $string .= " id='$name$key' /><label for='$name$key'>$value</label>\n";
+            $string .= " id='$name$key' /> ";
+            $string .= $value;
+            if($isBlock) $string .= '</label></div>';
+            else $string .= '</label>';
         }
         return $string;
     }
@@ -224,10 +245,10 @@ class html
         foreach($options as $key => $value)
         {
             $key     = str_replace('item', '', $key);
-            $string .= "<span><input type='checkbox' name='{$name}[]' value='$key' ";
+            $string .= "<label class='checkbox-inline'><input type='checkbox' name='{$name}[]' value='$key' ";
             $string .= strpos($checked, ",$key,") !== false ? " checked ='checked'" : "";
             $string .= $attrib;
-            $string .= " id='$name$key' /> <label for='$name$key'>$value</label></span>\n";
+            $string .= " id='$name$key' /> $value</label>\n";
         }
         return $string;
     }
@@ -243,7 +264,7 @@ class html
     static public function selectAll($scope = "", $type = "button", $checked = false)
     {
         $string = <<<EOT
-<script type="text/javascript">
+<script>
 function selectAll(checker, scope, type)
 { 
     if(scope)
@@ -297,7 +318,7 @@ EOT;
         }
         elseif($type == 'button')
         {
-            $string .= "<input type='button' name='allchecker' id='allchecker' value='{$lang->selectAll}' onclick='selectAll(this, \"$scope\", \"$type\")' />";
+            $string .= "<input type='button' name='allchecker' id='allchecker' class='btn btn-select-all' value='{$lang->selectAll}' onclick='selectAll(this, \"$scope\", \"$type\")' />";
         }
 
         return  $string;
@@ -312,7 +333,7 @@ EOT;
     static public function selectReverse($scope = "")
     {
         $string = <<<EOT
-<script type="text/javascript">
+<script>
 function selectReverse(scope)
 { 
     if(scope)
@@ -333,7 +354,7 @@ function selectReverse(scope)
 </script>
 EOT;
         global $lang;
-        $string .= "<input type='button' name='reversechecker' id='reversechecker' value='{$lang->selectReverse}' onclick='selectReverse(\"$scope\")'/>";
+        $string .= "<input type='button' name='reversechecker' id='reversechecker' class='btn btn-select-reverse' value='{$lang->selectReverse}' onclick='selectReverse(\"$scope\")'/>";
 
         return  $string;
     }
@@ -411,14 +432,14 @@ EOT;
      * @access public
      * @return string the submit button tag.
      */
-    public static function submitButton($label = '', $misc = '')
+    public static function submitButton($label = '', $misc = '', $class = 'btn-primary')
     {
         if(empty($label))
         {
             global $lang;
             $label = $lang->save;
         }
-        return " <input type='submit' id='submit' value='$label' $misc class='button-s' /> ";
+        return " <button type='submit' id='submit' $misc class='btn btn-submit $class'>$label</button>";
     }
 
     /**
@@ -428,10 +449,14 @@ EOT;
      * @access public
      * @return string the reset button tag.
      */
-    public static function resetButton()
+    public static function resetButton($label = '', $misc = '', $class = '')
     {
-        global $lang;
+        if(empty($label))
-        return " <input type='reset' id='reset' value='{$lang->reset}' class='button-r' /> ";
+        {
+            global $lang;
+            $label = $lang->reset;
+        }
+        return " <button type='reset' id='reset' class='btn btn-reset $class'>$label</button>";
     }
 
     /**
@@ -445,7 +470,7 @@ EOT;
     {
         global $lang;
         if(isonlybody()) return false;
-        return  "<input type='button' onClick='javascript:history.go(-1);' value='{$lang->goback}' class='button-b' $misc/>";
+        return  "<input type='button' onClick='javascript:history.go(-1);' value='{$lang->goback}' class='btn btn-back' $misc/>";
     }
 
     /**
@@ -457,9 +482,11 @@ EOT;
      * @access public
      * @return string the common button tag.
      */
-    public static function commonButton($label = '', $misc = '', $class = '')
+    public static function commonButton($label = '', $misc = '', $class = '', $icon)
     {
-        return " <input type='button' value='$label' $misc class='button-c $class' /> ";
+        if($icon) $label = "<i class='icon-" . $icon . "'></i> " . $label;
+        if($class) $class = 'btn ' . $class; else $class = 'btn';
+        return " <button $misc class='$class'>$label</button>";
     }
 
     /**
@@ -486,7 +513,7 @@ EOT;
             $link .= $onlybody;
         }
 
-        return " <input type='button' value='$label' $misc onclick='{$target}.location=\"$link\"' class='button-c' /> ";
+        return " <input type='button' value='$label' $misc onclick='{$target}.location=\"$link\"' class='btn' /> ";
     }
 
     /**
@@ -531,7 +558,7 @@ class js
     public static function import($url, $version = '')
     {
         if(!$version) $version = filemtime(__FILE__);
-        echo "<script src='$url?v=$version' type='text/javascript'></script>\n";
+        echo "<script src='$url?v=$version'></script>\n";
     }
 
     /**
@@ -543,8 +570,8 @@ class js
      */
     static private function start($full = true)
     {
-        if($full) return "<html><meta http-equiv='Content-Type' content='text/html; charset=utf-8' /><style>body{background:white}</style><script language='Javascript'>";
+        if($full) return "<html><meta charset=utf-8'/><style>body{background:white}</style><script>";
-        return "<script language='Javascript'>";
+        return "<script>";
     }
 
     /**

lib/pager/pager.class.php

@@ -435,7 +435,7 @@ class pager
         $vars = rtrim($vars, '&');
 
         $js  = <<<EOT
-        <script language='Javascript'>
+        <script>
         vars = '$vars';
         pageCookie = '$this->pageCookie';
         function submitPage(mode)
@@ -466,7 +466,7 @@ EOT;
     }
 
     /**
-    /* Create the select list of RecPerPage. 
+     * Create the select list of RecPerPage. 
      * 
      * @access private
      * @return string
@@ -478,7 +478,7 @@ EOT;
         $range[200]  = 200;
         $range[500]  = 500;
         $range[1000] = 1000;
-        return html::select('_recPerPage', $range, $this->recPerPage, "onchange='submitPage(\"changeRecPerPage\");'");
+        return html::select('_recPerPage', $range, $this->recPerPage, "onchange='submitPage(\"changeRecPerPage\");' class='form-control'");
     }
 
     /**
@@ -491,8 +491,8 @@ EOT;
     {
         $goToHtml  = "<input type='hidden' id='_recTotal'  value='$this->recTotal' />\n";
         $goToHtml .= "<input type='hidden' id='_pageTotal' value='$this->pageTotal' />\n";
-        $goToHtml .= "<input type='text'   id='_pageID'    value='$this->pageID' style='text-align:center;width:30px;' /> \n";
+        $goToHtml .= "<input type='text'   id='_pageID' value='$this->pageID' style='text-align:center;width:30px;' class='form-control' /> \n";
-        $goToHtml .= "<input type='button' id='goto'       value='{$this->lang->pager->locate}' onclick='submitPage(\"changePageID\");' />";
+        $goToHtml .= "<input type='button' id='goto' value='{$this->lang->pager->locate}' onclick='submitPage(\"changePageID\");' class='btn'/>";
         return $goToHtml;
     }    
 }

module/action/view/trash.html.php

@@ -31,10 +31,10 @@
   <tbody>
   <?php foreach($trashes as $action):?>
   <?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?>
-  <tr class='a-center'>
+  <tr class='text-center'>
     <td><?php echo $lang->action->objectTypes[$action->objectType];?></td>
     <td><?php echo $action->objectID;?></td>
-    <td class='a-left'><?php echo html::a($this->createLink($module, 'view', "id=$action->objectID"), $action->objectName);?></td>
+    <td class='text-left'><?php echo html::a($this->createLink($module, 'view', "id=$action->objectID"), $action->objectName);?></td>
     <td><?php echo $users[$action->actor];?></td>
     <td><?php echo $action->date;?></td>
     <td>

module/admin/view/bind.html.php

@@ -15,12 +15,12 @@
 <table align='center' class='table-6'>
 <caption><?php echo $lang->admin->bind->caption;?></caption>
   <tr>
-    <th class='rowhead'><?php echo $lang->user->account;?></th>
+    <th><?php echo $lang->user->account;?></th>
-	<td><?php echo html::input('account', '', "class='text-3'");?></td>
+	<td><?php echo html::input('account', '', "class='form-control'");?></td>
   </tr>
   <tr>
     <th class="rowhead"><?php echo $lang->user->password;?></th>
-    <td><?php echo html::password('password', '', "class='text-3'");?></td>
+    <td><?php echo html::password('password', '', "class='form-control'");?></td>
   </tr>  
   <tr>
     <th><td colspan="2" class="a-center"><?php echo html::submitButton() . html::hidden('sn', $sn);?></td></th>

module/admin/view/cleardata.html.php

@@ -16,7 +16,7 @@
     <caption><?php echo $lang->admin->clearData;?></caption>
     <tr><td><?php echo nl2br($lang->admin->clearDataDesc);?></td></tr>
     <tr>
-      <td class='a-center'>
+      <td class='text-center'>
         <span><?php echo $this->lang->admin->pleaseInputYes . html::input('sure', '', "class='text-2' onkeyup='showClearButton()' autocomplete='off'");?></span>
         <?php echo html::submitButton($lang->admin->clearData, "class='hidden btn btn-danger'");?>
       </td>

module/admin/view/register.html.php

@@ -15,32 +15,32 @@
 <table align='center' class='table-6'>
 <caption><?php echo $lang->admin->register->caption;?></caption>
   <tr>
-    <th class='rowhead'><?php echo $lang->user->account;?></th>
+    <th><?php echo $lang->user->account;?></th>
-	<td><?php echo html::input('account', '', "class='text-3'") . '<span class="star">*</span>' . $lang->admin->register->lblAccount;?></td>
+	<td><?php echo html::input('account', '', "class='form-control'") . '<span class="star">*</span>' . $lang->admin->register->lblAccount;?></td>
   </tr>
   <tr>
     <th class="rowhead"><?php echo $lang->user->realname;?></th>
-    <td><?php echo html::input('realname', '', "class='text-3'") . '<span class="star">*</span>';?></td>
+    <td><?php echo html::input('realname', '', "class='form-control'") . '<span class="star">*</span>';?></td>
   </tr>
   <tr>
     <th class="rowhead"><?php echo $lang->user->company;?></th>
-    <td><?php echo html::input('company', $register->company, "class='text-3'");?></td>
+    <td><?php echo html::input('company', $register->company, "class='form-control'");?></td>
   </tr>
   <tr>
     <th class="rowhead"><?php echo $lang->user->phone;?></th>
-    <td><?php echo html::input('phone', '', "class='text-3'");?></td>
+    <td><?php echo html::input('phone', '', "class='form-control'");?></td>
   </tr>  
   <tr>
     <th class="rowhead"><?php echo $lang->user->email;?></td>
-    <td><?php echo html::input('email', $register->email, "class='text-3'") . '<span class="star">*</span>';?></td>
+    <td><?php echo html::input('email', $register->email, "class='form-control'") . '<span class="star">*</span>';?></td>
   </tr>  
   <tr>
     <th class="rowhead"><?php echo $lang->user->password;?></th>
-    <td><?php echo html::password('password1', '', "class='text-3'") . '<span class="star">*</span>' . $lang->admin->register->lblPasswd;?></td>
+    <td><?php echo html::password('password1', '', "class='form-control'") . '<span class="star">*</span>' . $lang->admin->register->lblPasswd;?></td>
   </tr>  
   <tr>
-    <th class='rowhead'><?php echo $lang->user->password2;?></td>
+    <th><?php echo $lang->user->password2;?></td>
-    <td><?php echo html::password('password2', '', "class='text-3'") . '<span class="star">*</span>';?></td>
+    <td><?php echo html::password('password2', '', "class='form-control'") . '<span class="star">*</span>';?></td>
   </tr> 
   <tr>
     <th>

module/bug/control.php

@@ -974,7 +974,7 @@ class bug extends control
         $bugs = $this->bug->getUserBugPairs($account);
 
         if($id) die(html::select("bugs[$id]", $bugs, '', 'class="select-1 f-left"'));
-        die(html::select('bug', $bugs, '', 'class=select-1'));
+        die(html::select('bug', $bugs, '', 'class=form-control'));
     }
 
     /**

module/bug/view/activate.html.php

@@ -16,23 +16,23 @@
   <table class='table-1'>
     <caption><?php echo $bug->title;?></caption>
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->assignedTo;?></th>
+      <th class='rowhead'><?php echo $lang->bug->assignedTo;?></td>
-      <td><?php echo html::select('assignedTo', $users, $bug->resolvedBy, 'class=select-3');?></td>
+      <td><?php echo html::select('assignedTo', $users, $bug->resolvedBy, "class='form-control'");?></td>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->openedBuild;?></th>
+      <th class='rowhead'><?php echo $lang->bug->openedBuild;?></td>
       <td><?php echo html::select('openedBuild[]', $builds, $bug->openedBuild, 'size=4 multiple=multiple class=select-3');?></td>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->comment;?></th>
+      <th class='rowhead'><?php echo $lang->comment;?></td>
       <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->files;?></th>
+      <th><?php echo $lang->bug->files;?></th>
-      <td class='a-left'><?php echo $this->fetch('file', 'buildform');?></td>
+      <td class='text-left'><?php echo $this->fetch('file', 'buildform');?></td>
     </tr>  
     <tr>
-      <td colspan='2' class='a-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
+      <td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
     </tr>
   </table>
   <?php include '../../common/view/action.html.php';?>

module/bug/view/assignto.html.php

@@ -17,23 +17,23 @@ include '../../common/view/chosen.html.php';
 js::set('holders', $lang->bug->placeholder);
 js::set('page', 'assignedto');
 ?>
-<form method='post' target='hiddenwin'>
+<form class='form-condensed' method='post' target='hiddenwin'>
-  <table class='table-1'>
+  <table class='table table-form'>
     <caption><?php echo $bug->title;?></caption>
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->assignedTo;?></th>
+      <th><?php echo $lang->bug->assignedTo;?></th>
-      <td><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='text-3 chosen'");?></td>
+      <td><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='form-control chosen'");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->mailto;?></th>
+      <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>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->comment;?></th>
+      <th class='rowhead'><?php echo $lang->comment;?></td>
       <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
-      <td colspan='2' class='a-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->server->http_referer);?></td>
+      <td colspan='2' 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';?>

module/bug/view/batchcreate.html.php

@@ -12,8 +12,8 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/chosen.html.php';?>
-<form method='post' target='hiddenwin'>
+<form class='form-condensed' method='post' target='hiddenwin'>
-  <table class='table-1 fixed'> 
+  <table class='table table-fixed table-form'> 
     <caption><?php echo $lang->bug->project . $lang->colon . $lang->bug->batchCreate;?></caption>
     <tr>
       <th class='w-20px'>     <?php echo $lang->idAB;?></th> 
@@ -29,12 +29,12 @@
     </tr>
 
    <?php for($i = 0; $i < $config->bug->batchCreate; $i++):?>
-    <tr class='a-center'>
+    <tr class='text-center'>
       <td><?php echo $i+1;?></td>
-      <td class='a-left' style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='select-1'");?></td>
+      <td class='text-left' style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control'");?></td>
       <td><?php echo html::select("projects[$i]", $projects, $projectID, "class='select-1' onchange='loadProjectBuilds($productID, this.value, $i)'");?></td>
-      <td class='a-left' style='overflow:visible' id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, '', "class='select-1 chosen' multiple data-placeholder=' '");?></td>
+      <td class='text-left' style='overflow:visible' id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, '', "class='select-1 chosen' multiple data-placeholder=' '");?></td>
-      <td><?php echo html::input("titles[$i]", '', 'class=select-1');?></td>
+      <td><?php echo html::input("titles[$i]", '', 'class=form-control');?></td>
       <td><?php echo html::textarea("stepses[$i]", '', "rows='1' class=text-1");?></td>
       <td><?php echo html::select("types[$i]", $lang->bug->typeList, '');?></td>
       <td><?php echo html::select("severities[$i]", $lang->bug->severityList, '');?></td>
@@ -42,7 +42,7 @@
       <td><?php echo html::select("browsers[$i]", $lang->bug->browserList, '');?></td>
     </tr>
     <?php endfor;?>
-    <tr><td colspan='8' class='a-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
+    <tr><td colspan='8' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
   </table>
 </form>
 <?php include '../../common/view/footer.html.php';?>

module/bug/view/batchedit.html.php

@@ -35,15 +35,15 @@
     if($bugs[$bugID]->type != 'newfeature')   unset($this->lang->bug->typeList['newfeature']);
     if($bugs[$bugID]->type != 'trackthings')  unset($this->lang->bug->typeList['trackthings']);
     ?>
-    <tr class='a-center'>
+    <tr class='text-center'>
       <td><?php echo $bugID . html::hidden("bugIDList[$bugID]", $bugID);?></td>
-      <td><?php echo html::select("types[$bugID]",         $lang->bug->typeList, $bugs[$bugID]->type, 'class=select-1');?></td>
+      <td><?php echo html::select("types[$bugID]",         $lang->bug->typeList, $bugs[$bugID]->type, 'class=form-control');?></td>
-      <td><?php echo html::select("severities[$bugID]",   (array)$lang->bug->severityList, $bugs[$bugID]->severity, 'class=select-1');?></td>
+      <td><?php echo html::select("severities[$bugID]",   (array)$lang->bug->severityList, $bugs[$bugID]->severity, 'class=form-control');?></td>
-      <td><?php echo html::select("pris[$bugID]",         (array)$lang->bug->priList, $bugs[$bugID]->pri, 'class=select-1');?></td>
+      <td><?php echo html::select("pris[$bugID]",         (array)$lang->bug->priList, $bugs[$bugID]->pri, 'class=form-control');?></td>
-      <td><?php echo html::input("titles[$bugID]",         $bugs[$bugID]->title, 'class=text-1');?></td>
+      <td><?php echo html::input("titles[$bugID]",         $bugs[$bugID]->title, 'class=form-control');?></td>
-      <td><?php echo html::select("assignedTos[$bugID]",   $users, $bugs[$bugID]->assignedTo, 'class=select-1');?></td>
+      <td><?php echo html::select("assignedTos[$bugID]",   $users, $bugs[$bugID]->assignedTo, 'class=form-control');?></td>
-      <td><?php echo html::select("statuses[$bugID]",     (array)$lang->bug->statusList, $bugs[$bugID]->status, 'class=select-1');?></td>
+      <td><?php echo html::select("statuses[$bugID]",     (array)$lang->bug->statusList, $bugs[$bugID]->status, 'class=form-control');?></td>
-      <td><?php echo html::select("resolvedBys[$bugID]",   $users, $bugs[$bugID]->resolvedBy, 'class=select-1');?></td>
+      <td><?php echo html::select("resolvedBys[$bugID]",   $users, $bugs[$bugID]->resolvedBy, 'class=form-control');?></td>
       <td>
         <div class='f-left'><?php echo html::select("resolutions[$bugID]",   $this->lang->bug->resolutionList, $bugs[$bugID]->resolution, "class=w-80px onchange=setDuplicate(this.value,$bugID)");?></div>
         <div class='f-left' id='<?php echo 'duplicateBugBox' . $bugID;?>' <?php if($bugs[$bugID]->resolution != 'duplicate') echo "style='display:none'";?>><?php echo html::input("duplicateBugs[$bugID]", '', "class=w-40px placeholder='{$lang->bug->duplicateBug}'");?></div>
@@ -53,7 +53,7 @@
     <?php if(isset($suhosinInfo)):?>
     <tr><td colspan='<?php echo $this->config->bug->batchEdit->columns;?>'><div class='f-left blue'><?php echo $suhosinInfo;?></div></td></tr>
     <?php endif;?>
-    <tr><td colspan='<?php echo $this->config->bug->batchEdit->columns;?>' class='a-center'><?php echo html::submitButton();?></td></tr>
+    <tr><td colspan='<?php echo $this->config->bug->batchEdit->columns;?>' class='text-center'><?php echo html::submitButton();?></td></tr>
   </table>
 </form>
 <?php include '../../common/view/footer.html.php';?>

module/bug/view/browse.custom.html.php

@@ -5,7 +5,7 @@
       <div class='box-title'><?php echo $productName;?></div>
       <div class='box-content'>
         <?php echo $moduleTree;?>
-        <div class='a-right'><?php common::printLink('tree', 'browse', "productID=$productID&view=bug", $lang->tree->manage);?></div>
+        <div class='text-right'><?php common::printLink('tree', 'browse', "productID=$productID&view=bug", $lang->tree->manage);?></div>
       </div>
       </nobr>
     </td>
@@ -55,7 +55,7 @@
               ?>
             </nobr></td>
             <?php endforeach;?>
-            <td class='a-center'><nobr>
+            <td class='text-center'><nobr>
               <?php
               $params = "bugID=$bug->id";
               common::printIcon('bug', 'resolve', $params, $bug, 'list', '', '', 'iframe', true);
@@ -84,7 +84,7 @@
                ?>
               </div>
               <?php endif?>
-              <div class='f-right'><?php $pager->show();?></div>
+              <div class='text-right'><?php $pager->show();?></div>
             </td>
           </tr>
           </tfoot>

module/bug/view/browse.html.php

@@ -36,7 +36,7 @@ js::set('customed', $customed);
     echo "<span id='bysearchTab'><a href='#' class='link-icon'><i class='icon-search icon'></i>&nbsp;{$lang->bug->byQuery}</a></span> ";
     ?>
   </div>
-  <div class='f-right'>
+  <div class='text-right'>
     <?php
 
     echo '<span class="link-button dropButton">';
@@ -79,7 +79,7 @@ if($customed)
         <div class='box-title'><?php echo $productName;?></div>
         <div class='box-content'>
           <?php echo $moduleTree;?>
-          <div class='a-right'>
+          <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>
@@ -126,7 +126,7 @@ if($customed)
           <tbody>
           <?php foreach($bugs as $bug):?>
           <?php $bugLink = inlink('view', "bugID=$bug->id");?>
-          <tr class='a-center'>
+          <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));?>
@@ -135,14 +135,14 @@ if($customed)
             <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='a-left' title="<?php echo $bug->title?>"><?php echo "<span class='$class'>[{$lang->bug->confirmedList[$bug->confirmed]}] </span>" . html::a($bugLink, $bug->title);?></td>
+            <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($browseType == 'needconfirm'):?>
-            <td class='a-left' title="<?php echo $bug->storyTitle?>"><?php echo html::a($this->createLink('story', 'view', "stoyID=$bug->story"), $bug->storyTitle, '_blank');?></td>
+            <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>
@@ -159,7 +159,7 @@ if($customed)
             <td><?php echo substr($bug->resolvedDate, 5, 11)?></td>
             <?php endif;?>
 
-            <td class='a-right'>
+            <td class='text-right'>
               <?php
               $params = "bugID=$bug->id";
               common::printIcon('bug', 'confirmBug', $params, $bug, 'list', '', '', 'iframe', true);
@@ -197,7 +197,7 @@ if($customed)
                  ?>
                 </div>
                 <?php endif?>
-                <div class='f-right'><?php $pager->show();?></div>
+                <div class='text-right'><?php $pager->show();?></div>
               </td>
             </tr>
           </tfoot>

module/bug/view/close.html.php

@@ -12,15 +12,15 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<form method='post' target='hiddenwin'>
+<form class='form-condensed' method='post' target='hiddenwin'>
-  <table class='table-1'>
+  <table class='table table-form'>
     <caption><?php echo $bug->title;?></caption>
     <tr>
       <th class='rowhead'><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
-      <td colspan='2' class='a-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
+      <td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
     </tr>
   </table>
   <?php include '../../common/view/action.html.php';?>

module/bug/view/confirmbug.html.php

@@ -17,27 +17,27 @@ include '../../common/view/chosen.html.php';
 js::set('holders', $lang->bug->placeholder);
 js::set('page', 'confirmbug');
 ?>
-<form method='post' target='hiddenwin'>
+<form class='form-condensed' method='post' target='hiddenwin'>
-  <table class='table-1'>
+  <table class='table table-form'>
     <caption><?php echo $bug->title;?></caption>
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->assignedTo;?></th>
+      <th><?php echo $lang->bug->assignedTo;?></th>
       <td><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='select-2 chosen'");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->pri;?></th>
+      <th><?php echo $lang->bug->pri;?></th>
       <td><?php echo html::select('pri', $lang->bug->priList, $bug->pri, 'class=select-2');?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->mailto;?></th>
+      <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>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->comment;?></th>
+      <th class='rowhead'><?php echo $lang->comment;?></td>
       <td><?php echo html::textarea('comment', '', "rows='6' class='w-p94'");?></td>
     </tr>
     <tr>
-      <td colspan='2' class='a-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->server->http_referer);?></td>
+      <td colspan='2' 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';?>

module/bug/view/create.html.php

@@ -27,9 +27,9 @@ js::set('refresh', $lang->refresh);
   <table class='table-1'> 
     <caption><?php echo $lang->bug->create;?></caption>
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->lblProductAndModule;?></th>
+      <th><?php echo $lang->bug->lblProductAndModule;?></th>
       <td>
-        <?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value) class='select-3' autocomplete='off'");?>
+        <?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value) class='form-control' autocomplete='off'");?>
         <span id='moduleIdBox'>
         <?php
         echo html::select('module', $moduleOptionMenu, $moduleID, "onchange='loadModuleRelated()'");
@@ -43,11 +43,11 @@ js::set('refresh', $lang->refresh);
       </td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->project;?></th>
+      <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>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->openedBuild;?></th>
+      <th><?php echo $lang->bug->openedBuild;?></th>
       <td>
         <span id='buildBox'>
         <?php echo html::select('openedBuild[]', $builds, $buildID, 'size=4 multiple=multiple class=select-3');?>
@@ -55,15 +55,15 @@ js::set('refresh', $lang->refresh);
       </td>
     </tr>
     <tr>
-      <th class='rowhead'><nobr><?php echo $lang->bug->lblAssignedTo;?></nobr></th>
+      <th><nobr><?php echo $lang->bug->lblAssignedTo;?></nobr></th>
-      <td><span id='assignedToBox'><?php echo html::select('assignedTo', $users, $assignedTo, "class='select-3 chosen'");?></span></td>
+      <td><span id='assignedToBox'><?php echo html::select('assignedTo', $users, $assignedTo, "class='form-control chosen'");?></span></td>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->title;?></th>
+      <th><?php echo $lang->bug->title;?></th>
-      <td><?php echo html::input('title', $bugTitle, "class='text-1'");?></td>
+      <td><?php echo html::input('title', $bugTitle, "class='form-control'");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->steps;?></th>
+      <th><?php echo $lang->bug->steps;?></th>
       <td>
         <div style='position:relative'>
           <div class='w-p85 bd-none padding-zero f-left'><?php echo html::textarea('steps', $steps, "rows='10'");?></div>
@@ -72,48 +72,48 @@ js::set('refresh', $lang->refresh);
       </td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->lblStory;?></th>
+      <th><?php echo $lang->bug->lblStory;?></th>
       <td>
         <span id='storyIdBox'><?php echo html::select('story', $stories, $storyID);?></span>
       </td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->task;?></th>
+      <th><?php echo $lang->bug->task;?></th>
       <td><span id='taskIdBox'><?php echo html::select('task', $tasks, $taskID);?></span></td>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->lblTypeAndSeverity;?></th>
+      <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');?>
       </td>
     </tr>
     <tr>
-      <th class='rowhead'><nobr><?php echo $lang->bug->lblSystemBrowserAndHardware;?></nobr></th>
+      <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');?>
       </td>
     </tr>
     <tr>
-      <th class='rowhead'><nobr><?php echo $lang->bug->lblMailto;?></nobr></th>
+      <th><nobr><?php echo $lang->bug->lblMailto;?></nobr></th>
       <td>
         <?php 
         echo html::select('mailto[]', $users, str_replace(' ', '', $mailto), 'class=text-1 multiple');
-        if($contactLists) echo html::select('', $contactLists, '', "class='f-right' onchange=\"setMailto('mailto', this.value)\"");
+        if($contactLists) echo html::select('', $contactLists, '', "class='text-right' onchange=\"setMailto('mailto', this.value)\"");
         ?>
       </td>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->keywords;?></th>
+      <th><?php echo $lang->bug->keywords;?></th>
-      <td><?php echo html::input('keywords', $keywords, "class='text-1'");?></td>
+      <td><?php echo html::input('keywords', $keywords, "class='form-control'");?></td>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->files;?></th>
+      <th><?php echo $lang->bug->files;?></th>
       <td><?php echo $this->fetch('file', 'buildform', 'fileCount=2&percent=0.85');?></td>
     </tr>  
     <tr>
-      <td colspan='2' class='a-center'>
+      <td colspan='2' class='text-center'>
         <?php echo html::submitButton() . html::backButton() . html::hidden('case', $caseID);?>
       </td>
     </tr>

module/bug/view/customfields.html.php

@@ -39,7 +39,7 @@
         <a class='btn' onclick='restoreDefault()'><?php echo $lang->bug->restoreDefault;?></a>
       </td>
     </tr>  
-    <tr><td colspan='4' class='a-center'><?php echo html::submitButton('', 'onclick=selectItem("customFields")');?></td></tr>
+    <tr><td colspan='4' class='text-center'><?php echo html::submitButton('', 'onclick=selectItem("customFields")');?></td></tr>
   </table>
 </form>
 <?php include '../../common/view/footer.lite.html.php';?>

module/bug/view/edit.html.php

@@ -32,7 +32,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
 <div id='titlebar'>
   <div id='main'>
   BUG #<?php echo $bug->id . $lang->colon;?>
-  <?php echo html::input('title', str_replace("'","&#039;",$bug->title), 'class=text-1');?>
+  <?php echo html::input('title', str_replace("'","&#039;",$bug->title), 'class=form-control');?>
  </div>
   <div><?php echo html::submitButton()?></div>
 </div>
@@ -44,17 +44,17 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
         <tr class='bd-none'><td class='bd-none'>
           <fieldset>
             <legend><?php echo $lang->bug->legendSteps;?></legend>
-            <?php echo html::textarea('steps', htmlspecialchars($bug->steps), "rows='12' class='area-1'");?>
+            <?php echo html::textarea('steps', htmlspecialchars($bug->steps), "rows='12' class='form-control'");?>
           </fieldset>
           <fieldset>
           <legend><?php echo $lang->bug->legendComment;?></legend>
-            <?php echo html::textarea('comment', '', "rows='6' class='area-1'");?>
+            <?php echo html::textarea('comment', '', "rows='6' class='form-control'");?>
           </fieldset>
           <fieldset>
           <legend><?php echo $lang->bug->legendAttatch;?></legend>
           <?php echo $this->fetch('file', 'buildform', 'filecount=2');?>
           </fieldset>
-          <div class='a-center'>
+          <div class='text-center'>
             <?php 
             echo html::submitButton();
             $browseLink = $app->session->bugList != false ? $app->session->bugList : inlink('browse', "productID=$bug->product");
@@ -71,60 +71,60 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
         <legend><?php echo $lang->bug->legendBasicInfo;?></legend>
         <table class='table-1 a-left' cellpadding='0' cellspacing='0'>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->product;?></td>
+            <td><?php echo $lang->bug->product;?></td>
-            <td><?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value); class='select-3'");?></td>
+            <td><?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value); class='form-control'");?></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->module;?></td>
+            <td><?php echo $lang->bug->module;?></td>
             <td>
-              <span id='moduleIdBox'><?php echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated()' class='select-3'");?></span>
+              <span id='moduleIdBox'><?php echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated()' class='form-control'");?></span>
             </td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->productplan;?></td>
+            <td><?php echo $lang->bug->productplan;?></td>
             <td>
-              <span id="planIdBox"><?php echo html::select('plan', $plans, $bug->plan, 'class=select-3');?></span>
+              <span id="planIdBox"><?php echo html::select('plan', $plans, $bug->plan, "class='form-control'");?></span>
             </td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->type;?></td>
+            <td><?php echo $lang->bug->type;?></td>
-            <td><?php echo html::select('type', $lang->bug->typeList, $bug->type, 'class=select-3');?>
+            <td><?php echo html::select('type', $lang->bug->typeList, $bug->type, "class='form-control'");?>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->severity;?></td>
+            <td><?php echo $lang->bug->severity;?></td>
-            <td><?php echo html::select('severity', $lang->bug->severityList, $bug->severity, 'class=select-3');?>
+            <td><?php echo html::select('severity', $lang->bug->severityList, $bug->severity, "class='form-control'");?>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->pri;?></td>
+            <td><?php echo $lang->bug->pri;?></td>
-            <td><?php echo html::select('pri', $lang->bug->priList, $bug->pri, 'class=select-3');?>
+            <td><?php echo html::select('pri', $lang->bug->priList, $bug->pri, "class='form-control'");?>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->status;?></td>
+            <td><?php echo $lang->bug->status;?></td>
-            <td><?php echo html::select('status', $lang->bug->statusList, $bug->status, 'class=select-3');?></td>
+            <td><?php echo html::select('status', $lang->bug->statusList, $bug->status, "class='form-control'");?></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->confirmed;?></td>
+            <td><?php echo $lang->bug->confirmed;?></td>
             <td><?php echo $lang->bug->confirmedList[$bug->confirmed];?></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->assignedTo;?></td>
+            <td><?php echo $lang->bug->assignedTo;?></td>
-            <td><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='select-3 chosen'");?></td>
+            <td><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='form-control chosen'");?></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->os;?></td>
+            <td><?php echo $lang->bug->os;?></td>
-            <td><?php echo html::select('os', $lang->bug->osList, $bug->os, 'class=select-3');?></td>
+            <td><?php echo html::select('os', $lang->bug->osList, $bug->os, "class='form-control'");?></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->browser;?></td>
+            <td><?php echo $lang->bug->browser;?></td>
-            <td><?php echo html::select('browser', $lang->bug->browserList, $bug->browser, 'class=select-3');?></td>
+            <td><?php echo html::select('browser', $lang->bug->browserList, $bug->browser, "class='form-control'");?></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->keywords;?></td>
+            <td><?php echo $lang->bug->keywords;?></td>
-            <td><?php echo html::input('keywords', $bug->keywords, 'class="text-1"');?></td>
+            <td><?php echo html::input('keywords', $bug->keywords, 'class="form-control"');?></td>
           </tr>
           <tr>
             <td class='rowhead w-p20'><?php echo $lang->bug->mailto;?></td>
-            <td><?php echo html::select('mailto[]', $users, str_replace(' ', '', $bug->mailto), 'class="text-1" multiple');?></td>
+            <td><?php echo html::select('mailto[]', $users, str_replace(' ', '', $bug->mailto), 'class="form-control" multiple');?></td>
           </tr>
         </table>
       </fieldset>
@@ -137,13 +137,13 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
             <td><span id='projectIdBox'><?php echo html::select('project', $projects, $bug->project, 'class=select-3 onchange=loadProjectRelated(this.value)');?></span></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->story;?></td>
+            <td><?php echo $lang->bug->story;?></td>
             <td><div id='storyIdBox'><?php echo html::select('story', $stories, $bug->story, "class=select-3");?></div>
             </td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->task;?></td>
+            <td><?php echo $lang->bug->task;?></td>
-            <td><div id='taskIdBox'><?php echo html::select('task', $tasks, $bug->task, 'class=select-3');?></div></td>
+            <td><div id='taskIdBox'><?php echo html::select('task', $tasks, $bug->task, "class='form-control'");?></div></td>
           </tr>
         </table>
       </fieldset>
@@ -156,36 +156,36 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
             <td><?php echo $users[$bug->openedBy];?></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->openedBuild;?></td>
+            <td><?php echo $lang->bug->openedBuild;?></td>
             <td><span id='openedBuildBox'><?php echo html::select('openedBuild[]', $openedBuilds, $bug->openedBuild, 'size=4 multiple=multiple class=select-3');?></span></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->resolvedBy;?></td>
+            <td><?php echo $lang->bug->resolvedBy;?></td>
-            <td><?php echo html::select('resolvedBy', $users, $bug->resolvedBy, 'class=select-3');?></td>
+            <td><?php echo html::select('resolvedBy', $users, $bug->resolvedBy, "class='form-control'");?></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->resolvedDate;?></td>
+            <td><?php echo $lang->bug->resolvedDate;?></td>
-            <td><?php echo html::input('resolvedDate', $bug->resolvedDate, 'class=text-1');?></td>
+            <td><?php echo html::input('resolvedDate', $bug->resolvedDate, 'class=form-control');?></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->resolvedBuild;?></td>
+            <td><?php echo $lang->bug->resolvedBuild;?></td>
-            <td><span id='resolvedBuildBox'><?php echo html::select('resolvedBuild', $resolvedBuilds, $bug->resolvedBuild, 'class=select-3');?></span></td>
+            <td><span id='resolvedBuildBox'><?php echo html::select('resolvedBuild', $resolvedBuilds, $bug->resolvedBuild, "class='form-control'");?></span></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->resolution;?></td>
+            <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>
           </tr>
           <tr id='duplicateBugBox' <?php if($bug->resolution != 'duplicate') echo "style='display:none'";?>>
-            <td class='rowhead'><?php echo $lang->bug->duplicateBug;?></td>
+            <td><?php echo $lang->bug->duplicateBug;?></td>
-            <td><?php echo html::input('duplicateBug', $bug->duplicateBug, 'class=text-1');?></td>
+            <td><?php echo html::input('duplicateBug', $bug->duplicateBug, 'class=form-control');?></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->closedBy;?></td>
+            <td><?php echo $lang->bug->closedBy;?></td>
-            <td><?php echo html::select('closedBy', $users, $bug->closedBy, 'class=select-3');?></td>
+            <td><?php echo html::select('closedBy', $users, $bug->closedBy, "class='form-control'");?></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->closedDate;?></td>
+            <td><?php echo $lang->bug->closedDate;?></td>
-            <td><?php echo html::input('closedDate', $bug->closedDate, 'class=text-1');?></td>
+            <td><?php echo html::input('closedDate', $bug->closedDate, 'class=form-control');?></td>
           </tr>
         </table>
       </fieldset>
@@ -193,12 +193,12 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
         <legend><?php echo $lang->bug->legendMisc;?></legend>
         <table class='table-1 a-left'>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->linkBug;?></td>
+            <td><?php echo $lang->bug->linkBug;?></td>
-            <td><?php echo html::input('linkBug', $bug->linkBug, 'class="text-1"');?></td>
+            <td><?php echo html::input('linkBug', $bug->linkBug, 'class="form-control"');?></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->case;?></td>
+            <td><?php echo $lang->bug->case;?></td>
-            <td><?php echo html::input('case', $bug->case, 'class="text-1"');?></td>
+            <td><?php echo html::input('case', $bug->case, 'class="form-control"');?></td>
           </tr>
         </table>
       </fieldset>

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

@@ -5,7 +5,7 @@
   <table class='table-1'>
     <tr>
       <td class='w-80px'><?php echo $lang->bug->assignedTo?></td>
-      <td><?php echo html::select('assignedTo', $users, $bug->resolvedBy, 'class=select-3');?></td>
+      <td><?php echo html::select('assignedTo', $users, $bug->resolvedBy, "class='form-control'");?></td>
     </tr>
     <tr>
       <td><?php echo $lang->bug->openedBuild;?></td>
@@ -16,7 +16,7 @@
       <td><?php echo html::textarea('comment', '');?></td>
     </tr>
     <tr>
-      <td class='a-center' colspan='2'>
+      <td class='text-center' colspan='2'>
       <?php echo html::submitButton($lang->bug->buttonConfirm, 'data-inline="true" data-theme="b"');?>
       <?php echo html::linkButton($lang->goback, $this->createLink('bug', 'view', "bugID=$bug->id"), 'self', "data-inline='true'");?>
       </td>

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

@@ -1,18 +1,18 @@
 <?php include '../../common/view/m.header.html.php';?>
 </div>
-<form method='post' target='hiddenwin'>
+<form class='form-condensed' method='post' target='hiddenwin'>
   <h3><?php echo "BUG#$bug->id " . $bug->title;?></h3>
   <table class='table-1'>
     <tr>
       <td class='w-60px'><?php echo $lang->bug->assignedTo;?></td>
-      <td><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='text-3'");?></td>
+      <td><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='form-control'");?></td>
     </tr>
     <tr>
       <td class='w-60px'><?php echo $lang->comment;?></td>
       <td><?php echo html::textarea('comment', '', "data-mini='true'");?></td>
     </tr>
     <tr>
-      <td class='a-center' colspan='2'>
+      <td class='text-center' colspan='2'>
       <?php echo html::submitButton('', 'data-inline="true" data-theme="b"'); ?>
       <?php echo html::linkButton($lang->goback, $this->createLink('bug', 'view', "bugID=$bug->id"), 'self', "data-inline='true'");?>
       </td>

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

@@ -1,6 +1,6 @@
 <?php include '../../common/view/m.header.html.php';?>
 </div>
-<form method='post' target='hiddenwin'>
+<form class='form-condensed' method='post' target='hiddenwin'>
   <h3><?php echo "BUG#$bug->id $bug->title";?></h3>
   <table class='table-1'>
     <tr>
@@ -8,7 +8,7 @@
       <td><?php echo html::textarea('comment', '');?></td>
     </tr>
     <tr>
-      <td class='a-center' colspan='2'>
+      <td class='text-center' colspan='2'>
       <?php echo html::submitButton('', 'data-inline="true" data-theme="b"');?>
       <?php echo html::linkButton($lang->goback, $this->createLink('bug', 'view', "bugID=$bug->id"), 'self', "data-inline='true'");?>
       </td>

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

@@ -1,6 +1,6 @@
 <?php include '../../common/view/m.header.html.php';?>
 </div>
-<form method='post' target='hiddenwin'>
+<form class='form-condensed' method='post' target='hiddenwin'>
   <h3><?php echo "BUG#$bug->id $bug->title";?></h3>
   <table class='table-1'>
     <tr>
@@ -12,7 +12,7 @@
       <td><?php echo html::textarea('comment', '');?></td>
     </tr>
     <tr>
-      <td class='a-center' colspan='2'>
+      <td class='text-center' colspan='2'>
       <?php echo html::submitButton($lang->bug->buttonConfirm, 'data-inline="true" data-theme="b"');?>
       <?php echo html::linkButton($lang->goback, $this->createLink('bug', 'view', "bugID=$bug->id"), 'self', "data-inline='true'");?>
      </td>

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

@@ -1,6 +1,6 @@
 <?php include '../../common/view/m.header.html.php';?>
 </div>
-<form method='post' target='hiddenwin'>
+<form class='form-condensed' method='post' target='hiddenwin'>
   <h3><?php echo "BUG#$bug->id $bug->title";?></h3>
   <table class='table-1'>
     <tr>
@@ -28,7 +28,7 @@
       <td><?php echo html::textarea('comment');?></td>
     </tr>
     <tr>
-      <td class='a-center' colspan='2'>
+      <td class='text-center' colspan='2'>
       <?php echo html::submitButton('', 'data-inline="true" data-theme="b"');?>
       <?php echo html::linkButton($lang->goback, $this->createLink('bug', 'view', "bugID=$bug->id"), 'self', "data-inline='true'");?>
       </td>

module/bug/view/report.html.php

@@ -30,7 +30,7 @@
       <table class='table-1'>
         <caption>
           <div class='f-left'><?php echo $lang->bug->report->common;?></div>
-          <div class='f-right'><?php echo html::a($this->createLink('bug', 'browse', "productID=$productID&browseType=$browseType&moduleID=$moduleID"), $lang->goback);?></div>
+          <div class='text-right'><?php echo html::a($this->createLink('bug', 'browse', "productID=$productID&browseType=$browseType&moduleID=$moduleID"), $lang->goback);?></div>
         </caption>
         <?php foreach($charts as $chartType => $chartContent):?>
         <tr valign='top'>
@@ -46,7 +46,7 @@
                   <th><?php echo $lang->report->percent;?></th>
                 </tr>
                 <?php foreach($datas[$chartType] as $key => $data):?>
-                <tr class='a-center'>
+                <tr class='text-center'>
                   <td><?php echo $data->name;?></td>
                   <td><?php echo $data->value;?></td>
                   <td><?php echo ($data->percent * 100) . '%';?></td>

module/bug/view/resolve.html.php

@@ -12,35 +12,35 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<form method='post' target='hiddenwin'>
+<form class='form-condensed' method='post' target='hiddenwin'>
-  <table class='table-1'>
+  <table class='table table-form'>
     <caption><?php echo $bug->title;?></caption>
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->resolution;?></th>
+      <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>
     </tr>
     <tr id='duplicateBugBox' style='display:none'>
-      <th class='rowhead'><?php echo $lang->bug->duplicateBug;?></th>
+      <th class='rowhead'><?php echo $lang->bug->duplicateBug;?></td>
-      <td><?php echo html::input('duplicateBug', '', 'class=text-3');?></td>
+      <td><?php echo html::input('duplicateBug', '', "class='form-control'");?></td>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->resolvedBuild;?></th>
+      <th class='rowhead'><?php echo $lang->bug->resolvedBuild;?></td>
-      <td><?php echo html::select('resolvedBuild', $builds, '', 'class=select-3');?></td>
+      <td><?php echo html::select('resolvedBuild', $builds, '', "class='form-control'");?></td>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->resolvedDate;?></th>
+      <th class='rowhead'><?php echo $lang->bug->resolvedDate;?></td>
-      <td><?php echo html::input('resolvedDate', helper::now(), "class='select-3'");?></td>
+      <td><?php echo html::input('resolvedDate', helper::now(), "class='form-control'");?></td>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->assignedTo;?></th>
+      <th class='rowhead'><?php echo $lang->bug->assignedTo;?></td>
-      <td><?php echo html::select('assignedTo', $users, $bug->openedBy, "class='select-3 chosen'");?></td>
+      <td><?php echo html::select('assignedTo', $users, $bug->openedBy, "class='form-control chosen'");?></td>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->comment;?></th>
+      <th class='rowhead'><?php echo $lang->comment;?></td>
       <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
-      <td colspan='2' class='a-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
+      <td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
     </tr>
   </table>
   <?php include '../../common/view/action.html.php';?>

module/bug/view/view.html.php

@@ -81,11 +81,11 @@
         <legend><?php echo $lang->bug->legendBasicInfo;?></legend>
         <table class='table-1 a-left'>
           <tr valign='middle'>
-            <th class='rowhead'><?php echo $lang->bug->product;?></th>
+            <th><?php echo $lang->bug->product;?></th>
             <td><?php if(!common::printLink('bug', 'browse', "productID=$bug->product", $productName)) echo $productName;?>
           </tr>
           <tr>
-            <th class='rowhead'><?php echo $lang->bug->module;?></th>
+            <th><?php echo $lang->bug->module;?></th>
             <td> 
               <?php
               if(empty($modulePath))
@@ -104,47 +104,47 @@
             </td>
           </tr>
           <tr valign='middle'>
-            <th class='rowhead'><?php echo $lang->bug->productplan;?></th>
+            <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 class='rowhead'><?php echo $lang->bug->type;?></td>
+            <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 class='rowhead'><?php echo $lang->bug->severity;?></td>
+            <td><?php echo $lang->bug->severity;?></td>
             <td><strong><?php echo $lang->bug->severityList[$bug->severity];?></strong></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->pri;?></td>
+            <td><?php echo $lang->bug->pri;?></td>
             <td><strong><?php echo $lang->bug->priList[$bug->pri];?></strong></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->status;?></td>
+            <td><?php echo $lang->bug->status;?></td>
             <td><strong><?php echo $lang->bug->statusList[$bug->status];?></strong></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->activatedCount;?></td>
+            <td><?php echo $lang->bug->activatedCount;?></td>
             <td><?php echo $bug->activatedCount;?></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->confirmed;?></td>
+            <td><?php echo $lang->bug->confirmed;?></td>
             <td><?php echo $lang->bug->confirmedList[$bug->confirmed];?></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->lblAssignedTo;?></td>
+            <td><?php echo $lang->bug->lblAssignedTo;?></td>
             <td><?php if($bug->assignedTo) echo $users[$bug->assignedTo] . $lang->at . $bug->assignedDate;?></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->os;?></td>
+            <td><?php echo $lang->bug->os;?></td>
             <td><?php echo $lang->bug->osList[$bug->os];?></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->browser;?></td>
+            <td><?php echo $lang->bug->browser;?></td>
             <td><?php echo $lang->bug->browserList[$bug->browser];?></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->keywords;?></td>
+            <td><?php echo $lang->bug->keywords;?></td>
             <td><?php echo $bug->keywords;?></td>
           </tr>
         </table>
@@ -179,7 +179,7 @@
             <td> <?php echo $users[$bug->openedBy] . $lang->at . $bug->openedDate;?></td>
           </tr>
           <tr>
-            <th class='rowhead'><?php echo $lang->bug->openedBuild;?></th>
+            <th><?php echo $lang->bug->openedBuild;?></th>
             <td>
               <?php
               if($bug->openedBuild)
@@ -195,15 +195,15 @@
             </td>
           </tr>
           <tr>
-            <th class='rowhead'><?php echo $lang->bug->lblResolved;?></th>
+            <th><?php echo $lang->bug->lblResolved;?></th>
             <td><?php if($bug->resolvedBy) echo $users[$bug->resolvedBy] . $lang->at . $bug->resolvedDate;?>
           </tr>
           <tr>
-            <th class='rowhead'><?php echo $lang->bug->resolvedBuild;?></th>
+            <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 class='rowhead'><?php echo $lang->bug->resolution;?></th>
+            <th><?php echo $lang->bug->resolution;?></th>
             <td>
               <?php
               echo $lang->bug->resolutionList[$bug->resolution];
@@ -212,11 +212,11 @@
             </td>
           </tr>
           <tr>
-            <th class='rowhead'><?php echo $lang->bug->closedBy;?></th>
+            <th><?php echo $lang->bug->closedBy;?></th>
             <td><?php if($bug->closedBy) echo $users[$bug->closedBy] . $lang->at . $bug->closedDate;?></td>
           </tr>
           <tr>
-            <th class='rowhead'><?php echo $lang->bug->lblLastEdited;?></th>
+            <th><?php echo $lang->bug->lblLastEdited;?></th>
             <td><?php if($bug->lastEditedBy) echo $users[$bug->lastEditedBy] . $lang->at . $bug->lastEditedDate?></td>
           </tr>
         </table>
@@ -230,7 +230,7 @@
             <td><?php if($bug->project) echo html::a($this->createLink('project', 'browse', "projectid=$bug->project"), $bug->projectName);?></td>
           </tr>
           <tr class='nofixed'>
-            <td class='rowhead'><?php echo $lang->bug->story;?></td>
+            <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");
@@ -244,7 +244,7 @@
             </td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->task;?></td>
+            <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>
@@ -257,7 +257,7 @@
             <td><?php $mailto = explode(',', str_replace(' ', '', $bug->mailto)); foreach($mailto as $account) echo ' ' . $users[$account]; ?></td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->linkBug;?></td>
+            <td><?php echo $lang->bug->linkBug;?></td>
             <td>
               <?php
               if(isset($bug->linkBugTitles))
@@ -271,15 +271,15 @@
             </td>
           </tr>
           <tr>
-            <td class='rowhead'><?php echo $lang->bug->case;?></td>
+            <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 class='rowhead'><?php echo $lang->bug->toStory;?></td>
+            <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 class='rowhead'><?php echo $lang->bug->toTask;?></td>
+            <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>

module/build/control.php

@@ -214,7 +214,7 @@ class build extends control
     {
         if($varName == 'openedBuild' )  die(html::select($varName . '[]', $this->build->getProductBuildPairs($productID, 'noempty,release'), $build, 'size=4 class=select-3 multiple'));
         if($varName == 'openedBuilds' ) die(html::select($varName . "[$index][]", $this->build->getProductBuildPairs($productID, 'noempty,release'), $build, 'size=4 class=select-3 multiple'));
-        if($varName == 'resolvedBuild') die(html::select($varName, $this->build->getProductBuildPairs($productID, 'noempty,release'), $build, 'class=select-3'));
+        if($varName == 'resolvedBuild') die(html::select($varName, $this->build->getProductBuildPairs($productID, 'noempty,release'), $build, "class='form-control'"));
     }
 
     /**
@@ -242,7 +242,7 @@ class build extends control
             die($output);
         }
         if($varName == 'openedBuilds')  die(html::select($varName . "[$index][]", $this->build->getProjectBuildPairs($projectID, $productID, 'noempty'), $build, 'size=4 class=select-3 multiple'));
-        if($varName == 'resolvedBuild') die(html::select($varName, $this->build->getProjectBuildPairs($projectID, $productID, 'noempty'), $build, 'class=select-3'));
+        if($varName == 'resolvedBuild') die(html::select($varName, $this->build->getProjectBuildPairs($projectID, $productID, 'noempty'), $build, "class='form-control'"));
-        if($varName == 'testTaskBuild') die(html::select('build', $this->build->getProjectBuildPairs($projectID, $productID, 'noempty'), $build, 'class=select-3'));
+        if($varName == 'testTaskBuild') die(html::select('build', $this->build->getProjectBuildPairs($projectID, $productID, 'noempty'), $build, "class='form-control'"));
     }
 }

module/build/view/create.html.php

@@ -17,38 +17,42 @@
   <table class='table-1 fixed'> 
     <caption><?php echo $lang->build->create;?></caption>
     <tr>
-      <th class='rowhead'><?php echo $lang->build->product;?></th>
+      <th><?php echo $lang->build->product;?></th>
-      <td><?php echo html::select('product', $products, '', "class='select-3'");?></td>
+      <td><?php echo html::select('product', $products, '', "class='form-control'");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->build->name;?></th>
+      <th><?php echo $lang->build->name;?></th>
       <td>
-        <?php echo html::input('name', '', "class='text-3'");?>
+        <?php echo html::input('name', '', "class='form-control'");?>
         <?php if($lastBuild) echo '<span class="gray">(' . $lang->build->last . ': ' . $lastBuild->name . ')</span>';?>
       </td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->build->builder;?></th>
+      <th><?php echo $lang->build->builder;?></th>
       <td><?php echo html::select('builder', $users, $app->user->account, 'class="select-3"');?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->build->date;?></th>
+      <th><?php echo $lang->build->date;?></th>
-      <td><?php echo html::input('date', helper::today(), "class='text-3 date'");?></td>
+      <td><?php echo html::input('date', helper::today(), "class='form-control form-date'");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->build->scmPath;?></th>
+      <th><?php echo $lang->build->scmPath;?></th>
-      <td><?php echo html::input('scmPath', '', "class='text-1'");?></td>
+      <td><?php echo html::input('scmPath', '', "class='form-control'");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->build->filePath;?></th>
+      <th><?php echo $lang->build->packageType;?></th>
-      <td><?php echo html::input('filePath', '', "class='text-1'");?></td>
+      <td><?php echo html::radio('packageType', $lang->build->packageTypeList, 'path');?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->build->files;?></th>
+      <th><?php echo $lang->build->filePath;?></th>
+      <td><?php echo html::input('filePath', '', "class='form-control'");?></td>
+    </tr>  
+    <tr>
+      <th><?php echo $lang->build->files;?></th>
       <td><?php echo $this->fetch('file', 'buildForm', array('fileCount' => 1));?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->build->linkStoriesAndBugs;?></th>
+      <th><?php echo $lang->build->linkStoriesAndBugs;?></th>
       <td>
 
         <table class='bd-none' style='margin-bottom:0px;width:91%'>
@@ -62,7 +66,7 @@
                       <table class='table-1 fixed bd-none' id='story'>
                         <?php foreach($stories as $key => $story):?>
                         <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true); ?>
-                        <tr class='a-center'>
+                        <tr class='text-center'>
                           <td class='w-id a-left'>
                             <input type='checkbox' name='stories[]' value="<?php echo $story->id;?>" <?php if($story->stage == 'developed' or $story->status == 'closed') echo 'checked';?>> <?php echo sprintf('%03d', $story->id);?>
                           </td>
@@ -87,7 +91,7 @@
                       <table class='table-1 fixed bd-none' id='bug'>
                         <?php foreach($bugs as $bug):?>
                         <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
-                        <tr class='a-center'>
+                        <tr class='text-center'>
                           <td class='w-id a-left'>
                             <input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" <?php if($bug->status == 'resolved' or $bug->status == 'closed') echo "checked";?>> <?php echo sprintf('%03d', $bug->id);?>
                           </td>
@@ -108,10 +112,10 @@
       </td>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->build->desc;?></th>
+      <th><?php echo $lang->build->desc;?></th>
-      <td><?php echo html::textarea('desc', '', "rows='10' class='area-1'");?></td>
+      <td><?php echo html::textarea('desc', '', "rows='10' class='form-control'");?></td>
     </tr>  
-    <tr><td colspan='2' class='a-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
+    <tr><td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
   </table>
 </form>
 <?php include '../../common/view/footer.html.php';?>

module/build/view/edit.html.php

@@ -17,35 +17,39 @@
   <table class='table-1'> 
     <caption><?php echo $lang->build->edit;?></caption>
     <tr>
-      <th class='rowhead'><?php echo $lang->build->product;?></th>
+      <th><?php echo $lang->build->product;?></th>
-      <td><?php echo html::select('product', $products, $build->product, "class='select-3'");?></td>
+      <td><?php echo html::select('product', $products, $build->product, "class='form-control'");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->build->name;?></th>
+      <th><?php echo $lang->build->name;?></th>
-      <td><?php echo html::input('name', $build->name, "class='text-3'");?></td>
+      <td><?php echo html::input('name', $build->name, "class='form-control'");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->build->builder;?></th>
+      <th><?php echo $lang->build->builder;?></th>
       <td><?php echo html::select('builder', $users, $build->builder, 'class="select-3"');?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->build->date;?></th>
+      <th><?php echo $lang->build->date;?></th>
-      <td><?php echo html::input('date', $build->date, "class='text-3 date'");?></td>
+      <td><?php echo html::input('date', $build->date, "class='form-control form-date'");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->build->scmPath;?></th>
+      <th><?php echo $lang->build->scmPath;?></th>
-      <td><?php echo html::input('scmPath', $build->scmPath, "class='text-1'");?></td>
+      <td><?php echo html::input('scmPath', $build->scmPath, "class='form-control'");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->build->filePath;?></th>
+      <th><?php echo $lang->build->packageType;?></th>
-      <td><?php echo html::input('filePath', $build->filePath, "class='text-1'");?></td>
+      <td><?php echo html::radio('packageType', $lang->build->packageTypeList, $build->packageType);?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->build->files;?></th>
+      <th><?php echo $lang->build->filePath;?></th>
+      <td><?php echo html::input('filePath', $build->filePath, "class='form-control'");?></td>
+    </tr>  
+    <tr>
+      <th><?php echo $lang->build->files;?></th>
       <td><?php echo $this->fetch('file', 'buildForm', array('fileCount' => 1));?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->build->linkStoriesAndBugs;?></th>
+      <th><?php echo $lang->build->linkStoriesAndBugs;?></th>
       <td>
 
         <table class='bd-none' style='margin-bottom:0px;width:91%'>
@@ -71,7 +75,7 @@
                       <table class='f-left table-1 fixed bd-none'>
                         <?php foreach($stories as $key => $story):?>
                         <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true);?>
-                        <tr class='a-center'>
+                        <tr class='text-center'>
                           <td class='w-id a-left' id='story'><input type='checkbox' name='stories[]' value="<?php echo $story->id;?>" <?php if(strpos(',' . $build->stories . ',', ',' . $story->id . ',') !== false) echo 'checked';?>> <?php echo sprintf('%03d', $story->id);?></td>
                           <td class='a-left nobr'><?php echo html::a($storyLink, $story->title, '', "class='preview'");?></td>
                           <td class='<?php echo $story->status;?> w-50px'><?php echo $lang->story->statusList[$story->status];?></td>
@@ -105,7 +109,7 @@
                       <table class='f-left table-1 fixed bd-none'>
                         <?php foreach($bugs as $bug):?>
                         <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
-                        <tr class='a-center'>
+                        <tr class='text-center'>
                           <td class='w-id a-left' id='bug'><input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" <?php if(strpos(',' . $build->bugs . ',', ',' . $bug->id . ',') !== false) echo 'checked';?>> <?php echo sprintf('%03d', $bug->id);?></td>
                           <td class='a-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
                           <td class='w-80px'><?php echo $lang->bug->statusList[$bug->status];?></td>
@@ -124,10 +128,10 @@
       </td>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->build->desc;?></th>
+      <th><?php echo $lang->build->desc;?></th>
-      <td><?php echo html::textarea('desc', htmlspecialchars($build->desc), "rows='10' class='area-1'");?></td>
+      <td><?php echo html::textarea('desc', $build->desc, "rows='10' class='form-control'");?></td>
     </tr>  
-    <tr><td colspan='2' class='a-center'><?php echo html::submitButton() . html::backButton() .html::hidden('project', $build->project);?></td></tr>
+    <tr><td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton() .html::hidden('project', $build->project);?></td></tr>
   </table>
 </form>
 <?php include '../../common/view/footer.html.php';?>

module/build/view/view.html.php

@@ -45,7 +45,7 @@
         </tr>
         <?php foreach($stories as $storyID => $story):?>
         <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true);?>
-        <tr class='a-center'>
+        <tr class='text-center'>
           <td><?php echo sprintf('%03d', $story->id);?></td>
           <td><span class='<?php echo 'pri' . $lang->story->priList[$story->pri]?>'><?php echo $lang->story->priList[$story->pri];?></span></td>
           <td class='a-left nobr'><?php echo html::a($storyLink,$story->title, '', "class='preview'");?></td>
@@ -70,7 +70,7 @@
         </tr>
         <?php foreach($bugs as $bug):?>
         <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
-        <tr class='a-center'>
+        <tr class='text-center'>
           <td><?php echo sprintf('%03d', $bug->id);?></td>
           <td class='a-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
           <td><?php echo $lang->bug->statusList[$bug->status];?></td>
@@ -89,27 +89,27 @@
         <legend><?php echo $lang->build->basicInfo?></legend>
         <table class='table-1 a-left fixed'>
           <tr>
-            <th width='25%' class='a-right'><?php echo $lang->build->product;?></th>
+            <th width='25%' class='text-right'><?php echo $lang->build->product;?></th>
             <td><?php echo $build->productName;?></td>
           </tr>  
           <tr>
-            <th class='rowhead'><?php echo $lang->build->name;?></th>
+            <th><?php echo $lang->build->name;?></th>
             <td><?php echo $build->name;?></td>
           </tr>  
           <tr>
-            <th class='rowhead'><?php echo $lang->build->builder;?></th>
+            <th><?php echo $lang->build->builder;?></th>
             <td><?php echo $users[$build->builder];?></td>
           </tr>  
           <tr>
-            <th class='rowhead'><?php echo $lang->build->date;?></th>
+            <th><?php echo $lang->build->date;?></th>
             <td><?php echo $build->date;?></td>
           </tr>  
           <tr>
-            <th class='rowhead'><?php echo $lang->build->scmPath;?></th>
+            <th><?php echo $lang->build->scmPath;?></th>
             <td><?php strpos($build->scmPath,  'http') === 0 ? printf(html::a($build->scmPath))  : printf($build->scmPath);?></td>
           </tr>  
           <tr>
-            <th class='rowhead'><?php echo $lang->build->filePath;?></th>
+            <th><?php echo $lang->build->filePath;?></th>
             <td><?php strpos($build->filePath, 'http') === 0 ? printf(html::a($build->filePath)) : printf($build->filePath);?></td>
           </tr>
         </table>

module/common/control.php

@@ -239,9 +239,7 @@ class common extends control
         global $lang;
 
         if(!common::hasPriv($module, 'edit')) return false;
-        echo "<span class='link-button'>";
+        echo html::a('#commentBox', '<i class="icon-comment-alt"></i>', '', "title='$lang->comment' onclick='setComment()' class='btn'");
-        echo html::a('#commentBox', '<i class="icon-comment-alt"></i>', '', "title='$lang->comment' onclick='setComment()'");
-        echo "</span>";
     }
 
     /**
@@ -296,11 +294,16 @@ class common extends control
         if($icon == 'createBug') $title  = $lang->testtask->createBug;
 
         /* set the class. */
-        if(!$icon) $icon = $method;
+        if(!$icon)
-        if(strpos(',edit,copy,report,export,delete,', ",$icon,") !== false) $module = 'common';
+        {
-        $color      = $type == 'button' ? 'green' : ($clickable ? 'green' : 'gray');
+            $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      = $extraClass ? "icon-$color-$module-$icon $extraClass" : "icon-$color-$module-$icon";
+        $class = "icon-$module-$method";
+        if(!$clickable) $class .= ' disabled';
+        if($icon) $class       .= ' icon-' . $icon;
+  
  
         /* Create the icon link. */
         if($clickable)
@@ -312,30 +315,25 @@ class common extends control
             }
             if($type == 'button')
             {
-                echo "<span class='link-button'>";
                 if($method != 'edit' and $method != 'copy' and $method != 'delete')
                 {
-                    echo html::a($link, "<i class='$class'></i> " . $title, $target, "class='$extraClass'", true);
+                    echo html::a($link, "<i class='$class'></i> " . $title, $target, "class='btn $extraClass'", true);
                 }
                 else
                 {
-                    $class = "icon-$color-$module-$icon";
+                    echo html::a($link, "<i class='$class'></i>", $target, "class='btn $extraClass' title='$title'", false);
-                    echo html::a($link, "<i class='$class'></i>", $target, "class='link-icon $extraClass' title='$title'", false);
                 }
-                echo "</span>";
             }
             else
             {
-                $class = "icon-$color-$module-$icon";
+                echo html::a($link, "<i class='$class'></i>", $target, "class='btn-icon $extraClass' title='$title'", false);
-                echo html::a($link, "<i class='$class'></i>", $target, "class='link-icon $extraClass' title='$title'", false);
             }
         }
         else
         {
             if($type == 'list')
             {
-                $class = "icon-$color-$module-$icon";
+                echo "<button class='disabled btn-icon $extraClass'><i class='$class' title='$title'></i></button>";
-                echo "<i class='disabled $class' title='$title'></i>";
             }
         }
     }
@@ -353,27 +351,21 @@ class common extends control
         global $lang, $app;
         if(isonlybody()) return false;
 
-        echo "<span class='link-button'>";
+        echo html::a($backLink, '<i class="icon-goback icon-level-up icon-large icon-rotate-270"></i>', '', "class='btn' title={$lang->goback}");
-        echo html::a($backLink, '<i class="icon-goback icon-level-up icon-large icon-rotate-270"></i>', '', "class='link-icon' title={$lang->goback}");
-        echo "</span>";
 
         if(isset($preAndNext->pre) and $preAndNext->pre) 
         {
             $id = (isset($_SESSION['testcaseOnlyCondition']) and !$_SESSION['testcaseOnlyCondition'] and $app->getModuleName() == 'testcase' and isset($preAndNext->pre->case)) ? 'case' : 'id';
             $title = isset($preAndNext->pre->title) ? $preAndNext->pre->title : $preAndNext->pre->name;
             $title = '#' . $preAndNext->pre->$id . ' ' . $title;
-            echo "<span class='link-button'>";
+            echo html::a(inLink('view', "ID={$preAndNext->pre->$id}"), '<i class="icon-pre icon-chevron-left"></i>', '', "id='pre' class='btn' title='{$title}'");
-            echo html::a(inLink('view', "ID={$preAndNext->pre->$id}"), '<i class="icon-pre icon-chevron-sign-left"></i>', '', "id='pre' class='link-icon' title='{$title}'");
-            echo "</span>";
         }
         if(isset($preAndNext->next) and $preAndNext->next) 
         {
             $id = (isset($_SESSION['testcaseOnlyCondition']) and !$_SESSION['testcaseOnlyCondition'] and $app->getModuleName() == 'testcase' and isset($preAndNext->next->case)) ? 'case' : 'id';
             $title = isset($preAndNext->next->title) ? $preAndNext->next->title : $preAndNext->next->name;
             $title = '#' . $preAndNext->next->$id . ' ' . $title;
-            echo "<span class='link-button'>";
+            echo html::a(inLink('view', "ID={$preAndNext->next->$id}"), '<i class="icon-pre icon-chevron-right"></i>', '', "id='next' class='btn' title='$title'");
-            echo html::a(inLink('view', "ID={$preAndNext->next->$id}"), '<i class="icon-pre icon-chevron-sign-right"></i>', '', "id='next' class='link-icon' title='$title'");
-            echo "</span>";
         }
     }
 

module/common/lang/en.php

@@ -365,6 +365,8 @@ $lang->downNotify     = "Down notify";
 $lang->suhosinInfo = "Warming:data is too large! Please enlarge the setting of <font color=red>sohusin.post.max_vars</font> and <font color=red>sohusin.request.max_vars</font> in php.ini. Otherwise partial data can't be saved.";
 
 $lang->noResultsMatch    = "No results match";
+$lang->selectAnOption    = "Select an option";
+$lang->selectSomeOptions = "Select some options";
 $lang->chooseUsersToMail = "Choose users to mail...";
 
 /* Date times. */
@@ -401,4 +403,17 @@ $lang->datepicker->dayNames     = array('Sunday', 'Monday', 'Tuesday', 'Wednesda
 $lang->datepicker->abbrDayNames = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');
 $lang->datepicker->monthNames   = array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December');
 
+/* Common action icons */
+$lang->icons['create'] = 'plus';
+$lang->icons['edit']   = 'pencil';
+$lang->icons['delete'] = 'remove';
+$lang->icons['copy']   = 'copy';
+$lang->icons['report'] = 'bar-chart';
+$lang->icons['export'] = 'download-alt';
+$lang->icons['finish'] = 'ok-sign';
+$lang->icons['start']  = 'play';
+$lang->icons['assign'] = 'hand-right';
+$lang->icons['change'] = 'random';
+$lang->icons['link']   = 'link';
+
 include (dirname(__FILE__) . '/menuOrder.php');

module/common/lang/zh-cn.php

@@ -357,15 +357,17 @@ $lang->pager->locate    = "GO!";
 
 $lang->zentaoSite     = "官方网站";
 $lang->chinaScrum     = "<a href='http://api.zentao.net/goto.php?item=chinascrum' target='_blank'>Scrum社区</a>&nbsp; ";
-$lang->agileTraining  = "<a href='http://api.zentao.net/goto.php?item=agiletrain' target='_blank'>培训</a>&nbsp; ";
+$lang->agileTraining  = "<a href='http://api.zentao.net/goto.php?item=agiletrain' target='_blank'>培训</a> ";
-$lang->donate         = "<a href='http://api.zentao.net/goto.php?item=donate' target='_blank'><i class='icon-heart'></i> 捐赠</a>&nbsp; ";
+$lang->donate         = "<a href='http://api.zentao.net/goto.php?item=donate' target='_blank'>捐赠 </a>";
-$lang->proVersion     = "<a href='http://api.zentao.net/goto.php?item=proversion&from=footer' target='_blank' class='red'>购买专业版(特惠)！</a>&nbsp; ";
+$lang->proVersion     = "<a href='http://api.zentao.net/goto.php?item=proversion&from=footer' target='_blank' class='text-danger'>购买专业版(特惠)！</a>&nbsp; ";
 $lang->downNotify     = "下载桌面提醒";
 
 $lang->suhosinInfo = "警告：数据太多，请在php.ini中修改<font color=red>sohusin.post.max_vars</font>和<font color=red>sohusin.request.max_vars</font>（设置更大的数）。 保存并重新启动apache，否则会造成部分数据无法保存。";
 
-$lang->noResultsMatch    = "没有匹配结果";
+$lang->noResultsMatch     = "没有匹配结果";
-$lang->chooseUsersToMail = "选择要发信通知的用户...";
+$lang->selectAnOption     = "选择一个选项";
+$lang->selectSomeOptions  = "选择一些选项";
+$lang->chooseUsersToMail  = "选择要发信通知的用户...";
 
 /* 时间格式设置。*/
 define('DT_DATETIME1',  'Y-m-d H:i:s');
@@ -401,4 +403,45 @@ $lang->datepicker->dayNames     = array('日', '一', '二', '三', '四', '五'
 $lang->datepicker->abbrDayNames = array('日', '一', '二', '三', '四', '五', '六');
 $lang->datepicker->monthNames   = array('一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月');
 
+/* Common action icons 通用动作图标 */
+$lang->icons['todo']    = 'checked';
+$lang->icons['product'] = 'cube';
+$lang->icons['bug']     = 'bug';
+$lang->icons['task']    = 'check-sign';
+$lang->icons['tasks']   = 'tasks';
+$lang->icons['project'] = 'folder-close-alt';
+$lang->icons['doc']     = 'file-text';
+$lang->icons['story']   = 'lightbulb';
+$lang->icons['release'] = 'tags';
+$lang->icons['roadmap'] = 'code-fork';
+$lang->icons['plan']    = 'flag';
+$lang->icons['dynamic'] = 'volume-up';
+$lang->icons['build']   = 'tag';
+$lang->icons['test']    = 'check';
+$lang->icons['team']    = 'group';
+
+$lang->icons['create']         = 'plus';
+$lang->icons['batchCreate']    = 'plus-sign';
+$lang->icons['batchEdit']      = 'edit-sign';
+$lang->icons['batchClose']     = 'off';
+$lang->icons['edit']           = 'pencil';
+$lang->icons['delete']         = 'remove';
+$lang->icons['copy']           = 'copy';
+$lang->icons['report']         = 'bar-chart';
+$lang->icons['export']         = 'download-alt';
+$lang->icons['finish']         = 'ok-sign';
+$lang->icons['resolve']        = 'ok-sign';
+$lang->icons['start']          = 'play';
+$lang->icons['assign']         = 'hand-right';
+$lang->icons['assignTo']       = 'hand-right';
+$lang->icons['change']         = 'random';
+$lang->icons['link']           = 'link';
+$lang->icons['close']          = 'off';
+$lang->icons['activate']       = 'off';
+$lang->icons['review']         = 'search';
+$lang->icons['putoff']         = 'calendar';
+$lang->icons['suspend']        = 'pause';
+$lang->icons['cancel']         = 'ban-circle';
+$lang->icons['recordEstimate'] = 'time';
+
 include (dirname(__FILE__) . '/menuOrder.php');

module/common/model.php

@@ -229,15 +229,20 @@ class commonModel extends model
         {
             echo html::a(helper::createLink('user', 'login'), $lang->login);
         }
-
-        echo ' |  ';
         echo html::a(helper::createLink('misc', 'about'), $lang->aboutZenTao, '', "class='about'");
         echo $lang->agileTraining;
-        echo $lang->donate;
+        echo "<div class='dropdown' id='langSelection'><a href='javascript:;' data-toggle='dropdown'>" . $app->config->langs[$app->cookie->lang] . " <span class='caret'></span></a><ul class='dropdown-menu pull-right'>";
-
+        foreach ($app->config->langs as $key => $value)
-        echo '&nbsp;|&nbsp;';
+        {
-        echo html::select('', $app->config->langs, $app->cookie->lang,  'onchange="selectLang(this.value)"');
+            echo "<li" . ($app->cookie->lang == $key ? " class='active'" : '') . "><a href='javascript:;' data-value='" . $key . "'>" . $value . "</a></li>";
-        echo html::select('', $app->lang->themes,  $app->cookie->theme, 'onchange="selectTheme(this.value)"');
+        }
+        echo '</ul></div>';
+        echo "<div class='dropdown' id='themeSelection'><a href='javascript:;' data-toggle='dropdown'>" . $app->lang->themes[$app->cookie->theme] . " <span class='caret'></span></a><ul class='dropdown-menu pull-right'>";
+        foreach ($app->lang->themes as $key => $value)
+        {
+            echo "<li" . ($app->cookie->theme == $key ? " class='active'" : '') . "><a href='javascript:;' data-value='" . $key . "'>" . $value . "</a></li>";
+        }
+        echo '</ul></div>';
     }
 
     /**
@@ -306,7 +311,7 @@ class commonModel extends model
     public static function printMainmenu($moduleName, $methodName = '')
     {
         global $app, $lang;
-        echo "<ul>\n";
+        echo "<ul class='nav'>\n";
  
         /* Set the main main menu. */
         $mainMenu = $moduleName;
@@ -354,7 +359,7 @@ class commonModel extends model
                 echo "<li $active><a href='$link' $active id='menu$menuKey'>$menuLabel</a></li>\n";
             }
         }
-
+        echo "</ul>\n";
     }
 
     /**
@@ -384,12 +389,11 @@ class commonModel extends model
             $searchObject = $methodName;
         }
 
-        echo "<li id='searchbox'>"; 
+        echo "<div class='input-group input-group-sm' id='searchbox'>"; 
-        echo html::select('searchType', $lang->searchObjects, $searchObject);
+        echo html::select('searchType', $lang->searchObjects, $searchObject, "class='form-control'");
-        echo html::input('searchQuery', $lang->searchTips, "onclick='this.value=\"\"' onkeydown='if(event.keyCode==13) shortcut()' class='w-80px'");
+        echo html::input('searchQuery', '', "onclick='this.value=\"\"' onkeydown='if(event.keyCode==13) shortcut()' class='form-control' placeholder='" . $lang->searchTips . "'");
-		echo "<a href='javascript:shortcut()' id='objectSwitcher' class='icon-circle-arrow-right'></a>";
+        echo "<div id='objectSwitcher' class='input-group-btn'><a href='javascript:shortcut();return false;' class='btn'><i class='icon-circle-arrow-right'></i></a></div>";
-        echo "</li>";
+        echo "</div>\n";
-        echo "</ul>\n";
     }
 
     /**
@@ -442,7 +446,7 @@ class commonModel extends model
         }
 
         /* The beginning of the menu. */
-        echo "<ul>\n";
+        echo "<ul class='nav'>\n";
 
         /* Cycling to print every sub menus. */
         foreach($submenus as $subMenuKey => $submenu)

module/common/view/action.html.php

@@ -101,8 +101,7 @@ $(function(){
 
 <?php if(!isset($actionTheme)) $actionTheme = 'fieldset';?>
 <?php if($actionTheme == 'fieldset'):?>
-<div id='actionbox'>
+<fieldset id='actionbox'>
-<fieldset>
   <legend>
   <?php echo $lang->history?>
     <span onclick='toggleOrder(this)' class='hand'> <?php echo "<span title='$lang->reverse' class='log-asc'></span>";?></span>
@@ -117,7 +116,6 @@ $(function(){
   </caption>
   <tr><td>
 <?php endif;?>
-
   <ol id='historyItem'>
     <?php $i = 1; ?>
     <?php foreach($actions as $action):?>
@@ -170,4 +168,3 @@ $(function(){
 <?php else:?>
 </td></tr></table>
 <?php endif;?>
-</div>

module/common/view/chosen.html.php

@@ -2,21 +2,24 @@
 <?php
 if($config->debug)
 {
-    css::import($defaultTheme . 'chosen.css');
+    css::import($jsRoot . 'jquery/chosen/min.css');
-    js::import($jsRoot . 'jquery/chosen/chosen.min.js');
+    js::import($jsRoot . 'jquery/chosen/min.js');
 }
 ?>
 <style>
 #colorbox, #cboxOverlay, #cboxWrapper{z-index:9999;}
 </style>
 <script> 
-noResultsMatch    = '<?php echo $lang->noResultsMatch;?>';
+noResultsMatch       = '<?php echo $lang->noResultsMatch;?>';
-chooseUsersToMail = '<?php echo $lang->chooseUsersToMail;?>';
+chooseUsersToMail    = '<?php echo $lang->chooseUsersToMail;?>';
+selectAnOption       = '<?php echo $lang->selectAnOption;?>';
+selectSomeOptions    = '<?php echo $lang->selectSomeOptions;?>';
+defaultChosenOptions = {no_results_text: noResultsMatch, allow_single_deselect: true, disable_search_threshold: 10, width: '100%', placeholder_text_single: selectAnOption, placeholder_text_multiple: selectSomeOptions};
 $(document).ready(function()
 {
     $("#mailto").attr('data-placeholder', chooseUsersToMail);
-    $("#productID").chosen({no_results_text: noResultsMatch});
+    $("#productID").chosen({no_results_text: noResultsMatch, width: '100%'});
-    $("#projectID").chosen({no_results_text: noResultsMatch});
+    $("#projectID").chosen({no_results_text: noResultsMatch, width: '100%'});
-    $(".chosen").chosen({no_results_text: noResultsMatch, allow_single_deselect: true});
+    $(".chosen").chosen(defaultChosenOptions);
 });
 </script>

module/common/view/datepicker.html.php

@@ -1,35 +1,50 @@
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
 <?php
+$clientLang = $this->app->getClientLang();
 if($config->debug)
 {
-    css::import($defaultTheme . 'datepicker.css');
+    css::import($jsRoot . 'jquery/datetimepicker/min.css');
-    js::import($jsRoot . 'jquery/datepicker/min.js'); 
+    js::import($jsRoot . 'jquery/datetimepicker/min.js'); 
-    js::import($jsRoot . 'jquery/datepicker/date.js');
 }
 ?>
 <script language='javascript'>
-Date.firstDayOfWeek = 1;
+$(function()
-Date.format = 'yyyy-mm-dd';
+{
-$.dpText = <?php echo json_encode($lang->datepicker->dpText)?>
+    $('.form-datetime').datetimepicker(
-
+    {
-Date.dayNames     = <?php echo json_encode($lang->datepicker->dayNames)?>;
+        language: '<?php echo $clientLang; ?>',
-Date.abbrDayNames = <?php echo json_encode($lang->datepicker->abbrDayNames)?>;
+        weekStart: 1,
-Date.monthNames   = <?php echo json_encode($lang->datepicker->monthNames)?>; 
+        todayBtn:  1,
-
+        autoclose: 1,
-$(function() {
+        todayHighlight: 1,
-    $('.date').each(function(){
+        startView: 2,
-        time = $(this).val();
+        forceParse: 0,
-        if(!isNaN(time) && time != ''){
+        showMeridian: 1,
-            var Y = time.substring(0, 4);
+        format: 'yyyy-mm-dd hh:ii'
-            var m = time.substring(4, 6);
+    });
-            var d = time.substring(6, 8);
+    $('.form-date').datetimepicker(
-            time = Y + '-' + m + '-' + d;
+    {
-            $('.date').val(time);
+        language: '<?php echo $clientLang; ?>',
-        }
+        weekStart: 1,
+        todayBtn:  1,
+        autoclose: 1,
+        todayHighlight: 1,
+        startView: 2,
+        minView: 2,
+        forceParse: 0,
+        format: 'yyyy-mm-dd'
+    });
+    $('.form-time').datetimepicker({
+        language: '<?php echo $clientLang; ?>',
+        weekStart: 1,
+        todayBtn:  1,
+        autoclose: 1,
+        todayHighlight: 1,
+        startView: 1,
+        minView: 0,
+        maxView: 1,
+        forceParse: 0,
+        format: 'hh:ii'
     });
-
-    startDate = new Date(1970, 1, 1);
-    $(".date").datePicker({createButton:true, startDate:startDate})
-        .dpSetPosition($.dpConst.POS_TOP, $.dpConst.POS_RIGHT)
 });
 </script>

module/common/view/footer.html.php

@@ -1,10 +1,10 @@
-  </div>
+  </div><?php /* end '.outer' in 'header.html.php'. */ ?>
   <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
   <iframe frameborder='0' name='hiddenwin' id='hiddenwin' scrolling='no' class='<?php print($config->debug ? 'debugwin' : 'hidden');?>'></iframe>
   <div id='divider'></div>
 <?php $onlybody = zget($_GET, 'onlybody', 'no');?>
 <?php if($onlybody != 'yes'):?>
-</div>
+</div><?php /* end '#wrap' in 'header.html.php'. */ ?>
 <div id='footer'>
   <div id="crumbs">
     <?php commonModel::printBreadMenu($this->moduleName, isset($position) ? $position : ''); ?>

module/common/view/header.html.php

@@ -1,31 +1,31 @@
 <?php
 if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}
 include 'header.lite.html.php';
-include 'colorbox.html.php';
 include 'chosen.html.php';
 //include 'validation.html.php';
 ?>
 <?php if(empty($_GET['onlybody']) or $_GET['onlybody'] != 'yes'):?>
-<div id='header'>
+<header id='header'>
-  <table class='cont navbar' id='topbar'>
+  <div id='topbar'>
-    <tr>
+    <div class='pull-right' id='topnav'><?php commonModel::printTopBar();?></div>
-      <td class='w-p50'>
+    <h5 id='companyname'>
+      <?php echo $app->company->name;?>
+      <small class='actions'>
         <?php
-        echo "<span id='companyname'>{$app->company->name}</span> ";
         if($app->company->website)  echo html::a($app->company->website,  $lang->company->website,  '_blank');
-        if($app->company->backyard) echo html::a($app->company->backyard, $lang->company->backyard, '_blank');
+        if($app->company->backyard) echo html::a($app->company->backyard, $lang->company->backyard, '_blank');      
         ?>
-      </td>
+      </small>
-      <td class='a-right'><?php commonModel::printTopBar();?></td>
+    </h5>
-    </tr>
+  </div>
-  </table>
+  <nav id='mainmenu'>
-  <table class='cont navbar' id='navbar'>
+    <?php commonModel::printMainmenu($this->moduleName); commonModel::printSearchBox();?>
-    <tr><td id='mainmenu'><?php commonModel::printMainmenu($this->moduleName); commonModel::printSearchBox();?></td></tr>
+  </nav>
-  </table>
+  <nav id="modulemenu">
-</div>
+    <?php commonModel::printModuleMenu($this->moduleName);?>
-<div class="navbar" id="modulemenu">
+  </nav>
-  <?php commonModel::printModuleMenu($this->moduleName);?>
+</header>
-</div>
+
 <div id='wrap'>
 <?php endif;?>
   <div class='outer'>

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

@@ -10,24 +10,20 @@ $clientTheme  = $this->app->getClientTheme();
 <!DOCTYPE html>
 <html>
 <head>
-  <meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
+  <meta charset='utf-8'>
-  <meta http-equiv='X-UA-Compatible' content='IE=edge' />
+  <meta http-equiv='X-UA-Compatible' content='IE=edge'>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <?php
   echo html::title($title . ' - ' . $lang->zentaoPMS);
 
   js::exportConfigVars();
-  css::import($themeRoot . 'fontawesome/min.css',   $config->version);
-  if(strpos($_SERVER["HTTP_USER_AGENT"],"MSIE 7.0"))
-  {
-      css::import($themeRoot . 'fontawesome/ie7.min.css',   $config->version);
-      css::import($defaultTheme . 'style.ie7.css', $config->version);
-  }
   if($config->debug)
   {
       js::import($jsRoot . 'jquery/lib.js', $config->version);
+      js::import($jsRoot . 'zui/min.js', $config->version);
       js::import($jsRoot . 'my.min.js',     $config->version);
 
-      css::import($defaultTheme . 'yui.css',   $config->version);
+      css::import($themeRoot . 'zui/css/min.css',   $config->version);
       css::import($defaultTheme . 'style.css', $config->version);
 
       css::import($langTheme, $config->version);
@@ -41,7 +37,16 @@ $clientTheme  = $this->app->getClientTheme();
 
   if(isset($pageCss)) css::internal($pageCss);
 
-  echo html::icon($webRoot . 'favicon.ico');
+  echo html::favicon($webRoot . 'favicon.ico');
   ?>
+<!--[if lt IE 9]>
+<?php
+js::import($jsRoot . 'html5shiv/min.js');
+js::import($jsRoot . 'respond/min.js');
+?>
+<![endif]-->
+<!--[if lt IE 10]>
+<?php js::import($jsRoot . 'jquery/placeholder/min.js'); ?>
+<![endif]-->
 </head>
 <body>

module/common/view/kindeditor.html.php

@@ -2,6 +2,7 @@
 <?php
 $module = $this->moduleName;
 $method = $this->methodName;
+js::set('themeRoot', $themeRoot);
 if(!isset($config->$module->editor->$method)) return;
 $editor = $config->$module->editor->$method;
 $editor['id'] = explode(',', $editor['id']);
@@ -34,7 +35,8 @@ var fullTools =
 'table', 'code', '|', 'pagebreak', 'anchor', '|', 
 'fullscreen', 'source', 'preview', 'about'];
 
-$(document).ready(function() 
+$(document).ready(initKindeditor);
+function initKindeditor(afterInit)
 {
     $.each(editor.id, function(key, editorID)
     {
@@ -42,67 +44,72 @@ $(document).ready(function()
         if(editor.tools == 'bugTools')  editorTool = bugTools;
         if(editor.tools == 'fullTools') editorTool = fullTools;
 
-        KindEditor.ready(function(K)
+        var K = KindEditor, $editor = $('#' + editorID);
+        keEditor = K.create('#' + editorID,
         {
-            editor = K.create('#' + editorID,
+            cssPath:[themeRoot + 'zui/css/min.css'],
+            width:'100%',
+            items:editorTool,
+            filterMode: true, 
+            bodyClass:'article-content',
+            cssPath:['<?php echo $jsRoot?>kindeditor/plugins/code/prettify.css'],
+            urlType:'relative', 
+            uploadJson: createLink('file', 'ajaxUpload'),
+            allowFileManager:true,
+            langType:'<?php echo $editorLang?>',
+            afterBlur: function(){this.sync();$editor.prev('.ke-container').removeClass('focus');},
+            afterFocus: function(){$editor.prev('.ke-container').addClass('focus');},
+            afterChange: function(){$editor.change().hide();},
+            afterCreate : function()
             {
-                items:editorTool,
+                var doc = this.edit.doc; 
-                filterMode:true, 
+                var cmd = this.edit.cmd; 
-                cssPath:['<?php echo $jsRoot?>kindeditor/plugins/code/prettify.css'],
+                /* Paste in chrome.*/
-                urlType:'relative', 
+                /* Code reference from http://www.foliotek.com/devblog/copy-images-from-clipboard-in-javascript/. */
-                uploadJson: createLink('file', 'ajaxUpload'),
+                if(K.WEBKIT)
-                allowFileManager:true,
-                langType:'<?php echo $editorLang?>',
-                afterBlur: function(){this.sync();},
-                afterCreate : function()
                 {
-                    var doc = this.edit.doc; 
+                    $(doc.body).bind('paste', function(ev)
-                    var cmd = this.edit.cmd; 
-                    /* Paste in chrome.*/
-                    /* Code reference from http://www.foliotek.com/devblog/copy-images-from-clipboard-in-javascript/. */
-                    if(K.WEBKIT)
                     {
-                        $(doc.body).bind('paste', function(ev)
+                        var $this = $(this);
+                        var original =  ev.originalEvent;
+                        var file =  original.clipboardData.items[0].getAsFile();
+                        var reader = new FileReader();
+                        reader.onload = function (evt) 
                         {
-                            var $this = $(this);
+                            var result = evt.target.result; 
-                            var original =  ev.originalEvent;
+                            var result = evt.target.result;
-                            var file =  original.clipboardData.items[0].getAsFile();
+                            var arr = result.split(",");
-                            var reader = new FileReader();
+                            var data = arr[1]; // raw base64
-                            reader.onload = function (evt) 
+                            var contentType = arr[0].split(";")[0].split(":")[1];
-                            {
-                                var result = evt.target.result; 
-                                var result = evt.target.result;
-                                var arr = result.split(",");
-                                var data = arr[1]; // raw base64
-                                var contentType = arr[0].split(";")[0].split(":")[1];
 
-                                html = '<img src="' + result + '" alt="" />';
+                            html = '<img src="' + result + '" alt="" />';
-                                $.post(createLink('file', 'ajaxPasteImage'), {editor: html}, function(data){cmd.inserthtml(data);});
+                            $.post(createLink('file', 'ajaxPasteImage'), {editor: html}, function(data){cmd.inserthtml(data);});
-                            };
+                        };
 
-                            reader.readAsDataURL(file);
+                        reader.readAsDataURL(file);
-                        });
+                    });
-                    }
-
-                    /* Paste in firfox.*/
-                    if(K.GECKO)
-                    {
-                        K(doc.body).bind('paste', function(ev)
-                        {
-                            setTimeout(function()
-                            {
-                                var html = K(doc.body).html();
-                                if(html.search(/<img src="data:.+;base64,/) > -1)
-                                {
-                                    $.post(createLink('file', 'ajaxPasteImage'), {editor: html}, function(data){K(doc.body).html(data);});
-                                }
-                            }, 80);
-                        });
-                    }
-                    /* End */
                 }
-            });
+
+                /* Paste in firfox.*/
+                if(K.GECKO)
+                {
+                    K(doc.body).bind('paste', function(ev)
+                    {
+                        setTimeout(function()
+                        {
+                            var html = K(doc.body).html();
+                            if(html.search(/<img src="data:.+;base64,/) > -1)
+                            {
+                                $.post(createLink('file', 'ajaxPasteImage'), {editor: html}, function(data){K(doc.body).html(data);});
+                            }
+                        }, 80);
+                    });
+                }
+                /* End */
+            }
         });
     });
-})
+
+    if($.isFunction(afterInit)) afterInit();
+}
 </script>

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

@@ -36,7 +36,7 @@ $clientTheme  = $this->app->getClientTheme();
 
   if(isset($pageCss)) css::internal($pageCss);
 
-  echo html::icon($webRoot . 'favicon.ico');
+  echo html::favicon($webRoot . 'favicon.ico');
   ?>
 </head>
 <body>

module/company/view/browse.html.php

@@ -24,7 +24,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
       <div class='box-title'><?php echo $lang->dept->common;?></div>
       <div class='box-content'>
         <?php echo $deptTree;?>
-        <div class='a-right'><?php common::printLink('dept', 'browse', '', $lang->dept->manage);?></div>
+        <div class='text-right'><?php common::printLink('dept', 'browse', '', $lang->dept->manage);?></div>
       </div>
     </td>
     <td class='divider'></td>
@@ -54,7 +54,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
         $canManageContacts = common::hasPriv('user', 'manageContacts');
         ?>
         <?php foreach($users as $user):?>
-        <tr class='a-center'>
+        <tr class='text-center'>
           <td>
             <?php 
             if($canBatchEdit or $canManageContacts) echo "<input type='checkbox' name='users[]' value='$user->account'> ";
@@ -77,7 +77,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
             if(strpos($this->app->company->admins, ",{$user->account},") === false and common::hasPriv('user', 'delete'))
             {
                 $deleteURL = $this->createLink('user', 'delete', "userID=$user->id&confirm=yes");
-                echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"userList\",confirmDelete)", '<i class="icon-green-common-delete"></i>', '', "class='link-icon' title='{$lang->user->delete}'");
+                echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"userList\",confirmDelete)", '<i class="icon-remove"></i>', '', "class='link-icon' title='{$lang->user->delete}'");
             }
             if((strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60) 
             {

module/company/view/dynamic.html.php

@@ -46,7 +46,7 @@ var browseType = '<?php echo $browseType;?>';
   <tbody>
   <?php foreach($actions as $action):?>
   <?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?>
-  <tr class='a-center'>
+  <tr class='text-center'>
     <td><?php echo $action->date;?></td>
     <td>
       <?php 
@@ -57,7 +57,7 @@ var browseType = '<?php echo $browseType;?>';
     <td><?php echo $action->actionLabel;?></td>
     <td><?php echo $lang->action->objectTypes[$action->objectType];?></td>
     <td><?php echo $action->objectID;?></td>
-    <td class='a-left'><?php echo html::a($action->objectLink, $action->objectName);?></td>
+    <td class='text-left'><?php echo html::a($action->objectLink, $action->objectName);?></td>
   </tr>
   <?php endforeach;?>
   </tbody>

module/company/view/edit.html.php

@@ -11,42 +11,42 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<form method='post' target='hiddenwin'>
+<form class='form-condensed' method='post' target='hiddenwin'>
   <table align='center' class='table-5'> 
     <caption><?php echo $lang->company->edit;?></caption>
     <tr>
-      <th class='rowhead'><?php echo $lang->company->name;?></th>
+      <th><?php echo $lang->company->name;?></th>
-      <td><?php echo html::input('name', $company->name, "class='text-1'");?></td>
+      <td><?php echo html::input('name', $company->name, "class='form-control'");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->company->phone;?></th>
+      <th><?php echo $lang->company->phone;?></th>
-      <td><?php echo html::input('phone', $company->phone, "class='text-1'");?></td>
+      <td><?php echo html::input('phone', $company->phone, "class='form-control'");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->company->fax;?></th>
+      <th><?php echo $lang->company->fax;?></th>
-      <td><?php echo html::input('fax', $company->fax, "class='text-1'");?></td>
+      <td><?php echo html::input('fax', $company->fax, "class='form-control'");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->company->address;?></th>
+      <th><?php echo $lang->company->address;?></th>
-      <td><?php echo html::input('address', $company->address, "class='text-1'");?></td>
+      <td><?php echo html::input('address', $company->address, "class='form-control'");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->company->zipcode;?></th>
+      <th><?php echo $lang->company->zipcode;?></th>
-      <td><?php echo html::input('zipcode', $company->zipcode, "class='text-1'");?></td>
+      <td><?php echo html::input('zipcode', $company->zipcode, "class='form-control'");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->company->website;?></th>
+      <th><?php echo $lang->company->website;?></th>
-      <td><?php echo html::input('website', $company->website ? $company->website : 'http://', "class='text-1'");?></td>
+      <td><?php echo html::input('website', $company->website ? $company->website : 'http://', "class='form-control'");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->company->backyard;?></th>
+      <th><?php echo $lang->company->backyard;?></th>
-      <td><?php echo html::input('backyard', $company->backyard ? $company->backyard : 'http://', "class='text-1'");?></td>
+      <td><?php echo html::input('backyard', $company->backyard ? $company->backyard : 'http://', "class='form-control'");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->company->guest;?></th>
+      <th><?php echo $lang->company->guest;?></th>
       <td><?php echo html::radio('guest', $lang->company->guestList, $company->guest);?></td>
     </tr>  
-    <tr><td colspan='2' class='a-center'><?php echo html::submitButton();?></td></tr>
+    <tr><td colspan='2' class='text-center'><?php echo html::submitButton();?></td></tr>
   </table>
 </form>
 <?php include '../../common/view/footer.html.php';?>

module/company/view/view.html.php

@@ -14,37 +14,37 @@
 <table align='center' class='table-5'> 
   <caption><?php echo $lang->company->view;?></caption>
   <tr>
-    <th class='rowhead'><?php echo $lang->company->name;?></th>
+    <th><?php echo $lang->company->name;?></th>
     <td><?php echo $company->name;?></td>
   </tr>  
   <tr>
-    <th class='rowhead'><?php echo $lang->company->phone;?></th>
+    <th><?php echo $lang->company->phone;?></th>
     <td><?php echo $company->phone;?></td>
   </tr>  
   <tr>
-    <th class='rowhead'><?php echo $lang->company->fax;?></th>
+    <th><?php echo $lang->company->fax;?></th>
     <td><?php echo $company->fax;?></td>
   </tr>  
   <tr>
-    <th class='rowhead'><?php echo $lang->company->address;?></th>
+    <th><?php echo $lang->company->address;?></th>
     <td><?php echo $company->address;?></td>
   </tr>  
   <tr>
-    <th class='rowhead'><?php echo $lang->company->zipcode;?></th>
+    <th><?php echo $lang->company->zipcode;?></th>
     <td><?php echo $company->zipcode;?></td>
   </tr>  
   <tr>
-    <th class='rowhead'><?php echo $lang->company->website;?></th>
+    <th><?php echo $lang->company->website;?></th>
     <td><?php echo $company->website;?></td>
   </tr>  
   <tr>
-    <th class='rowhead'><?php echo $lang->company->backyard;?></th>
+    <th><?php echo $lang->company->backyard;?></th>
     <td><?php echo $company->backyard;?></td>
   </tr>  
   <tr>
-    <th class='rowhead'><?php echo $lang->company->guest;?></th>
+    <th><?php echo $lang->company->guest;?></th>
     <td><?php echo $lang->company->guestList[$company->guest];?></td>
   </tr>  
-  <tr><td colspan='2' class='a-center'><?php common::printLink('company', 'edit', '', '<i class="icon-pencil"></i> ' . $lang->edit, '', 'id="editCompany" class="btn"', true, true);?></td></tr>
+  <tr><td colspan='2' class='text-center'><?php common::printLink('company', 'edit', '', '<i class="icon-pencil"></i> ' . $lang->edit, '', 'id="editCompany" class="btn"', true, true);?></td></tr>
 </table>
 <?php include '../../common/view/footer.html.php';?>

module/convert/view/checkbugfree.html.php

@@ -1,10 +1,10 @@
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->checkDB;?></th>
+  <th><?php echo $lang->convert->checkDB;?></th>
   <td><?php is_object($checkInfo['db']) ? printf($lang->convert->ok) : printf($lang->convert->fail);?></td>
 </tr>
 <!--
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->checkTable;?></th>
+  <th><?php echo $lang->convert->checkTable;?></th>
   <td>
     <?php
     if(is_object($checkInfo['db'])) $checkInfo['table'] === true ? printf($lang->convert->ok) : printf($lang->convert->fail);
@@ -13,11 +13,11 @@
 </tr>
 -->
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->checkPath;?></th>
+  <th><?php echo $lang->convert->checkPath;?></th>
   <td><?php $checkInfo['path'] === true ? printf($lang->convert->ok) : printf($lang->convert->fail);?></td>
 </tr>
 <tr>
-  <td colspan='2' class='a-center'>
+  <td colspan='2' class='text-center'>
     <?php
     if($result == 'pass')
     {

module/convert/view/checkredmine.html.php

@@ -1,9 +1,9 @@
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->checkDB;?></th>
+  <th><?php echo $lang->convert->checkDB;?></th>
   <td><?php is_object($checkInfo['db']) ? printf($lang->convert->ok) : printf($lang->convert->fail);?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->checkPath;?></th>
+  <th><?php echo $lang->convert->checkPath;?></th>
   <td><?php $checkInfo['path'] === true ? printf($lang->convert->ok) : printf($lang->convert->fail);?></td>
 </tr>
 <tr>
@@ -139,7 +139,7 @@
 </td>
 </tr>
 <tr>
-  <td colspan='2' class='a-center'>
+  <td colspan='2' class='text-center'>
     <?php
     if($result == 'pass')
     {

module/convert/view/convertIssue.html.php

@@ -9,12 +9,12 @@
     </tr>
     <?php foreach($trackers as $tracker):?>
     <tr>
-      <th class='rowhead'><?php echo $tracker->name;?></th>
+      <th><?php echo $tracker->name;?></th>
-      <td><?php html::select("$tracker->name", $lang->convert->directionList, '', "class='select-3'");?></td>
+      <td><?php html::select("$tracker->name", $lang->convert->directionList, '', "class='form-control'");?></td>
     </tr>
     <?php endforeach;?>
     <tr>
-      <td colspan='2' class='a-center'><?php echo html::submitButton();?></td>
+      <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
     </tr>
   </table>
 </form>

module/convert/view/convertbugfree.html.php

@@ -1,36 +1,36 @@
-<tr class='a-center'>
+<tr class='text-center'>
   <th><?php echo $lang->convert->item?></th>
   <th><?php echo $lang->convert->count?></th>
   <th><?php echo $lang->convert->info?></th>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->bugfree->users;?></th>
+  <th><?php echo $lang->convert->bugfree->users;?></th>
   <td><?php echo $result['users'];?></td>
   <td class='f-12px'><?php if(isset($info['users'])) echo join('<br />', $info['users']);?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->bugfree->projects;?></th>
+  <th><?php echo $lang->convert->bugfree->projects;?></th>
   <td><?php echo $result['projects'];?></td>
   <td class='f-12px'><?php if(isset($info['projects'])) echo join('<br />', $info['projects']);?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->bugfree->modules;?></th>
+  <th><?php echo $lang->convert->bugfree->modules;?></th>
   <td><?php echo $result['modules'];?></td>
   <td class='f-12px'><?php if(isset($info['modules'])) echo join('<br />', $info['modules']);?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->bugfree->bugs;?></th>
+  <th><?php echo $lang->convert->bugfree->bugs;?></th>
   <td><?php echo $result['bugs'];?></td>
   <td class='f-12px'><?php if(isset($info['bugs'])) echo join('<br />', $info['bugs']);?></td>
 </tr>
 <?php if($version > 1):?>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->bugfree->cases;?></th>
+  <th><?php echo $lang->convert->bugfree->cases;?></th>
   <td><?php echo $result['cases'];?></td>
   <td class='f-12px'><?php if(isset($info['cases'])) echo join('<br />', $info['cases']);?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->bugfree->results;?></th>
+  <th><?php echo $lang->convert->bugfree->results;?></th>
   <td><?php echo $result['results'];?></td>
   <td class='f-12px'><?php if(isset($info['results'])) echo join('<br />', $info['results']);?></td>
 </tr>
@@ -38,12 +38,12 @@
 <?php endif;?>
 
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->bugfree->actions;?></th>
+  <th><?php echo $lang->convert->bugfree->actions;?></th>
   <td><?php echo $result['actions'];?></td>
   <td class='f-12px'><?php if(isset($info['actions'])) echo join('<br />', $info['actions']);?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->bugfree->files;?></th>
+  <th><?php echo $lang->convert->bugfree->files;?></th>
   <td><?php echo $result['files'];?></td>
   <td class='f-12px'><?php if(isset($info['files'])) echo join('<br />', $info['files']);?></td>
 </tr>

module/convert/view/convertredmine.html.php

@@ -1,75 +1,75 @@
-<tr class='a-center'>
+<tr class='text-center'>
   <th><?php echo $lang->convert->item?></th>
   <th><?php echo $lang->convert->count?></th>
   <th><?php echo $lang->convert->info?></th>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->redmine->users;?></th>
+  <th><?php echo $lang->convert->redmine->users;?></th>
   <td><?php echo $result['users'];?></td>
   <td class='f-12px'><?php if(isset($info['users'])) echo join('<br />', $info['users']);?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->redmine->groups;?></th>
+  <th><?php echo $lang->convert->redmine->groups;?></th>
   <td><?php echo $result['groups'];?></td>
   <td class='f-12px'><?php if(isset($info['groups'])) echo join('<br />', $info['groups']);?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->redmine->products;?></th>
+  <th><?php echo $lang->convert->redmine->products;?></th>
   <td><?php echo $result['products'];?></td>
   <td class='f-12px'><?php if(isset($info['products'])) echo join('<br />', $info['products']);?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->redmine->projects;?></th>
+  <th><?php echo $lang->convert->redmine->projects;?></th>
   <td><?php echo $result['projects'];?></td>
   <td class='f-12px'><?php if(isset($info['projects'])) echo join('<br />', $info['projects']);?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->redmine->stories;?></th>
+  <th><?php echo $lang->convert->redmine->stories;?></th>
   <td><?php echo $result['stories'];?></td>
   <td class='f-12px'><?php if(isset($info['stories'])) echo join('<br />', $info['stories']);?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->redmine->tasks;?></th>
+  <th><?php echo $lang->convert->redmine->tasks;?></th>
   <td><?php echo $result['tasks'];?></td>
   <td class='f-12px'><?php if(isset($info['tasks'])) echo join('<br />', $info['tasks']);?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->redmine->bugs;?></th>
+  <th><?php echo $lang->convert->redmine->bugs;?></th>
   <td><?php echo $result['bugs'];?></td>
   <td class='f-12px'><?php if(isset($info['bugs'])) echo join('<br />', $info['bugs']);?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->redmine->productPlans;?></th>
+  <th><?php echo $lang->convert->redmine->productPlans;?></th>
   <td><?php echo $result['productPlans'];?></td>
   <td class='f-12px'><?php if(isset($info['productPlans'])) echo join('<br />', $info['productPlans']);?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->redmine->teams;?></th>
+  <th><?php echo $lang->convert->redmine->teams;?></th>
   <td><?php echo $result['teams'];?></td>
   <td class='f-12px'><?php if(isset($info['teams'])) echo join('<br />', $info['teams']);?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->redmine->releases;?></th>
+  <th><?php echo $lang->convert->redmine->releases;?></th>
   <td><?php echo $result['releases'];?></td>
   <td class='f-12px'><?php if(isset($info['releases'])) echo join('<br />', $info['releases']);?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->redmine->builds;?></th>
+  <th><?php echo $lang->convert->redmine->builds;?></th>
   <td><?php echo $result['builds'];?></td>
   <td class='f-12px'><?php if(isset($info['builds'])) echo join('<br />', $info['builds']);?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->redmine->docLibs;?></th>
+  <th><?php echo $lang->convert->redmine->docLibs;?></th>
   <td><?php echo $result['docLibs'];?></td>
   <td class='f-12px'><?php if(isset($info['docLibs'])) echo join('<br />', $info['docLibs']);?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->redmine->docs;?></th>
+  <th><?php echo $lang->convert->redmine->docs;?></th>
   <td><?php echo $result['docs'];?></td>
   <td class='f-12px'><?php if(isset($info['docs'])) echo join('<br />', $info['docs']);?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->redmine->files;?></th>
+  <th><?php echo $lang->convert->redmine->files;?></th>
   <td><?php echo $result['files'];?></td>
   <td class='f-12px'><?php if(isset($info['files'])) echo join('<br />', $info['files']);?></td>
 </tr>

module/convert/view/index.html.php

@@ -13,6 +13,6 @@
 <table align='center' class='table-5'>
   <caption><?php echo $lang->convert->common;?></caption>
   <tr><td><?php echo nl2br($lang->convert->desc);?></td></tr>
-  <tr><td><h3 class='a-center'><?php echo html::a($this->createLink('convert', 'selectsource'), '<i class="icon-exchange"></i> ' . $lang->convert->start, '', 'class="btn btn-primary"');?></h3></td></tr>
+  <tr><td><h3 class='text-center'><?php echo html::a($this->createLink('convert', 'selectsource'), '<i class="icon-exchange"></i> ' . $lang->convert->start, '', 'class="btn btn-primary"');?></h3></td></tr>
 </table>
 <?php include '../../common/view/footer.html.php';?>

module/convert/view/selectsource.html.php

@@ -19,12 +19,12 @@
     </tr>
     <?php foreach($lang->convert->sourceList as $name => $versions):?>
     <tr>
-      <th class='rowhead'><?php echo $name;?></th>
+      <th><?php echo $name;?></th>
       <td><?php echo html::radio('source', $versions);?></td>
     </tr>
     <?php endforeach;?>
     <tr>
-      <td colspan='2' class='a-center'><?php echo html::submitButton();?></td>
+      <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
     </tr>
   </table>
 </form>

module/convert/view/setbugfree.html.php

@@ -1,34 +1,34 @@
 <tr>
   <th class='rowhead w-200px'><?php echo $lang->convert->dbHost;?></th>
-  <td><?php echo html::input('dbHost', $config->db->host, "class='text-3'");?></td>
+  <td><?php echo html::input('dbHost', $config->db->host, "class='form-control'");?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->dbPort;?></th>
+  <th><?php echo $lang->convert->dbPort;?></th>
-  <td><?php echo html::input('dbPort', $config->db->port, "class='text-3'");?></td>
+  <td><?php echo html::input('dbPort', $config->db->port, "class='form-control'");?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->dbUser;?></th>
+  <th><?php echo $lang->convert->dbUser;?></th>
-  <td><?php echo html::input('dbUser', $config->db->user, "class='text-3'");?></td>
+  <td><?php echo html::input('dbUser', $config->db->user, "class='form-control'");?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->dbPassword;?></th>
+  <th><?php echo $lang->convert->dbPassword;?></th>
-  <td><?php echo html::input('dbPassword', $config->db->password, "class='text-3'");?></td>
+  <td><?php echo html::input('dbPassword', $config->db->password, "class='form-control'");?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php printf($lang->convert->dbName, $source);?></th>
+  <th><?php printf($lang->convert->dbName, $source);?></th>
-  <td><?php echo html::input('dbName', $dbName, "class='text-3'");?></td>
+  <td><?php echo html::input('dbName', $dbName, "class='form-control'");?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php printf($lang->convert->dbCharset, $source);?></th>
+  <th><?php printf($lang->convert->dbCharset, $source);?></th>
-  <td><?php echo html::input('dbCharset', $dbCharset, "class='text-3'");?></td>
+  <td><?php echo html::input('dbCharset', $dbCharset, "class='form-control'");?></td>
 </tr>
 <?php if($version > 1):?>
 <tr>
-  <th class='rowhead'><?php printf($lang->convert->dbPrefix, $source);?></th>
+  <th><?php printf($lang->convert->dbPrefix, $source);?></th>
-  <td><?php echo html::input('dbPrefix', $tablePrefix, "class='text-3'");?></td>
+  <td><?php echo html::input('dbPrefix', $tablePrefix, "class='form-control'");?></td>
 </tr>
 <?php endif;?>
 <tr>
-  <th class='rowhead'><?php printf($lang->convert->installPath, $source);?></th>
+  <th><?php printf($lang->convert->installPath, $source);?></th>
-  <td><?php echo html::input('installPath', '', "class='text-3'");?></td>
+  <td><?php echo html::input('installPath', '', "class='form-control'");?></td>
 </tr>

module/convert/view/setconfig.html.php

@@ -15,7 +15,7 @@
     <caption><?php echo $lang->convert->setting . $lang->colon . strtoupper($source);?></caption>
     <?php echo $setting;?>
     <tr>
-      <td colspan='2' class='a-center'><?php echo html::submitButton();?></td>
+      <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
     </tr>
   </table>
   <?php echo html::hidden('source', $source) . html::hidden('version', $version);?>

module/convert/view/setredmine.html.php

@@ -1,28 +1,28 @@
 <tr>
   <th class='rowhead w-200px'><?php echo $lang->convert->dbHost;?></th>
-  <td><?php echo html::input('dbHost', $config->db->host, "class='text-3'");?></td>
+  <td><?php echo html::input('dbHost', $config->db->host, "class='form-control'");?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->dbPort;?></th>
+  <th><?php echo $lang->convert->dbPort;?></th>
-  <td><?php echo html::input('dbPort', $config->db->port, "class='text-3'");?></td>
+  <td><?php echo html::input('dbPort', $config->db->port, "class='form-control'");?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->dbUser;?></th>
+  <th><?php echo $lang->convert->dbUser;?></th>
-  <td><?php echo html::input('dbUser', $config->db->user, "class='text-3'");?></td>
+  <td><?php echo html::input('dbUser', $config->db->user, "class='form-control'");?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php echo $lang->convert->dbPassword;?></th>
+  <th><?php echo $lang->convert->dbPassword;?></th>
-  <td><?php echo html::input('dbPassword', $config->db->password, "class='text-3'");?></td>
+  <td><?php echo html::input('dbPassword', $config->db->password, "class='form-control'");?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php printf($lang->convert->dbName, $source);?></th>
+  <th><?php printf($lang->convert->dbName, $source);?></th>
-  <td><?php echo html::input('dbName', $dbName, "class='text-3'");?></td>
+  <td><?php echo html::input('dbName', $dbName, "class='form-control'");?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php printf($lang->convert->dbCharset, $source);?></th>
+  <th><?php printf($lang->convert->dbCharset, $source);?></th>
-  <td><?php echo html::input('dbCharset', $dbCharset, "class='text-3'");?></td>
+  <td><?php echo html::input('dbCharset', $dbCharset, "class='form-control'");?></td>
 </tr>
 <tr>
-  <th class='rowhead'><?php printf($lang->convert->installPath, $source);?></th>
+  <th><?php printf($lang->convert->installPath, $source);?></th>
-  <td><?php echo html::input('installPath', '', "class='text-3'");?></td>
+  <td><?php echo html::input('installPath', '', "class='form-control'");?></td>
 </tr>

module/custom/view/set.html.php

@@ -14,15 +14,15 @@
 <?php include '../../common/view/treeview.html.php';?>
 <?php 
 $itemRow = <<<EOT
-  <tr class='a-center'>
+  <tr class='text-center'>
     <td>
-      <input type='text' class="text-1"  value="" name="keys[]">
+      <input type='text' class="form-control"  value="" name="keys[]">
       <input type='hidden' value="0" name="systems[]">
     </td>
     <td>
       <input type='text' class="w-p98" value="" name="values[]">
     </td>
-    <td class='a-left'>
+    <td class='text-left'>
       <a href='javascript:void()' class='link-icon' onclick='addItem(this)'><i class='icon-add'></i></a>
       <a href='javascript:void()' class='link-icon' onclick='delItem(this)'><i class='icon-delete'></i></a>
     </td>
@@ -70,14 +70,14 @@ EOT;
             <?php if($canAdd):?><th class='w-40px'></th><?php endif;?>
           </tr>
           <?php foreach($fieldList as $key => $value):?>
-          <tr class='a-center'>
+          <tr class='text-center'>
             <?php $system = isset($dbFields[$key]) ? $dbFields[$key]->system : 1;?>
             <td><?php echo $key === '' ? 'NULL' : $key; echo html::hidden('keys[]', $key) . html::hidden('systems[]', $system);?></td>
             <td>
               <?php echo html::input("values[]", $value, "class='w-p98'");?>
             </td>
             <?php if($canAdd):?>
-            <td class='a-left'>
+            <td class='text-left'>
               <a href='javascript:void()' class='link-icon' onclick='addItem(this)'><i class='icon-add'></i></a>
               <?php if(!$system):?><a href='javascript:void()' onclick='delItem(this)' class='link-icon'><i class='icon-delete'></i></a><?php endif;?>
             </td>
@@ -86,7 +86,7 @@ EOT;
           <?php endforeach;?>
           <tfoot>
             <tr>
-              <td colspan='<?php $canAdd ? print(3) : print(2);?>' class='a-center'>
+              <td colspan='<?php $canAdd ? print(3) : print(2);?>' class='text-center'>
               <?php 
               $appliedTo = array($currentLang => $lang->custom->currentLang, 'all' => $lang->custom->allLang);
               echo html::radio('lang', $appliedTo, 'all');

module/dept/view/browse.html.php

@@ -21,7 +21,7 @@
           <tr>
             <td>
               <div id='main'><?php echo $depts;?></div>
-              <div class='a-center'><?php echo html::submitButton($lang->dept->updateOrder);?></div>
+              <div class='text-center'><?php echo html::submitButton($lang->dept->updateOrder);?></div>
             </td>
           </tr>
         </table>

module/doc/view/browse.html.php

@@ -23,7 +23,7 @@ var browseType = '<?php echo $browseType;?>';
     <span id='bymoduleTab' onclick='browseByModule()'><a href='#'><?php echo $lang->doc->moduleDoc;?></a></span>
     <span id='bysearchTab'><a href='#' class='link-icon'><i class='icon-search icon icon-large'></i>&nbsp;<?php echo $lang->doc->searchDoc;?></a></span>
   </div>
-  <div class='f-right'>
+  <div class='text-right'>
     <?php common::printIcon('doc', 'create', "libID=$libID&moduleID=$moduleID&productID=$productID&projectID=$projectID&from=doc");?>
   </div>
 </div>
@@ -35,7 +35,7 @@ var browseType = '<?php echo $browseType;?>';
       <div class='box-title'><?php echo $libName;?></div>
       <div class='box-content'>
         <?php echo $moduleTree;?>
-        <div class='a-right'>
+        <div class='text-right'>
           <?php common::printLink('tree', 'browse', "rootID=$libID&view=doc", $lang->doc->manageType);?>
           <?php if(is_numeric($libID)) common::printLink('tree', 'fix', "root=$libID&type=customdoc", $lang->tree->fix, 'hiddenwin');?>
         </div>
@@ -61,9 +61,9 @@ var browseType = '<?php echo $browseType;?>';
           $viewLink = $this->createLink('doc', 'view', "docID=$doc->id");
           $canView  = common::hasPriv('doc', 'view');
           ?>
-          <tr class='a-center'>
+          <tr class='text-center'>
             <td><?php if($canView) echo html::a($viewLink, sprintf('%03d', $doc->id)); else printf('%03d', $doc->id);?></td>
-            <td class='a-left' title="<?php echo $doc->title?>"><nobr><?php echo html::a($viewLink, $doc->title);?></nobr></td>
+            <td class='text-left' title="<?php echo $doc->title?>"><nobr><?php echo html::a($viewLink, $doc->title);?></nobr></td>
             <td><?php echo $lang->doc->types[$doc->type];?></td>
             <td><?php isset($users[$doc->addedBy]) ? print($users[$doc->addedBy]) : print($doc->addedBy);?></td>
             <td><?php echo date("m-d H:i", strtotime($doc->addedDate));?></td>
@@ -73,7 +73,7 @@ var browseType = '<?php echo $browseType;?>';
               if(common::hasPriv('doc', 'delete'))
               {
                   $deleteURL = $this->createLink('doc', 'delete', "docID=$doc->id&confirm=yes");
-                  echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"docList\",confirmDelete)", '<i class="icon-green-common-delete"></i>', '', "class='link-icon' title='{$lang->doc->delete}'");
+                  echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"docList\",confirmDelete)", '<i class="icon-remove"></i>', '', "class='link-icon' title='{$lang->doc->delete}'");
               }
               ?>
             </td>

module/doc/view/create.html.php

@@ -13,59 +13,67 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::set('holders ', $lang->doc->placeholder);?>
-<form method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
+<div class='container mw-900px'>
-  <table class='table-1'> 
+  <div id='titlebar'>
-    <caption><?php echo $lang->doc->create;?></caption>
+    <div class='heading'>
-    <?php if($libID == 'product'):?>
+      <span class='prefix'><?php echo html::icon($lang->icons['doc']);?></span>
-    <tr>
+      <strong><small class='text-muted'><i class='icon icon-plus'></i></small> <?php echo $lang->doc->create;?></strong>
-      <th class='rowhead'><?php echo $lang->doc->product;?></th>
+    </div>
-      <td><?php echo html::select('product', $products, $productID, "class='select-3'");?></td>
+  </div>
-    </tr>  
+  <form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
-    <?php elseif($libID == 'project'):?>
+    <table class='table table-form'> 
-    <tr>
+      <?php if($libID == 'product'):?>
-      <th class='rowhead'><?php echo $lang->doc->project;?></th>
+      <tr>
-      <td><?php echo html::select('project', $projects, $projectID, "class='select-3' onchange=loadProducts(this.value);");?></td>
+        <th class='w-80px'><?php echo $lang->doc->product;?></th>
-    </tr>  
+        <td><?php echo html::select('product', $products, $productID, "class='form-control'");?></td>
-    <tr>
+      </tr>  
-      <th class='rowhead'><?php echo $lang->doc->product;?></th>
+      <?php elseif($libID == 'project'):?>
-      <td><span id='productBox'><?php echo html::select('product', $products, '', "class='select-3'");?></span></td>
+      <tr>
-    </tr>  
+        <th><?php echo $lang->doc->project;?></th>
-    <?php endif;?>
+        <td><?php echo html::select('project', $projects, $projectID, "class='form-control' onchange=loadProducts(this.value);");?></td>
-    <tr>
+      </tr>  
-      <th class='rowhead'><?php echo $lang->doc->module;?></th>
+      <tr>
-      <td><?php echo html::select('module', $moduleOptionMenu, $moduleID, "class='select-3'");?></td>
+        <th><?php echo $lang->doc->product;?></th>
-    </tr>  
+        <td><span id='productBox'><?php echo html::select('product', $products, '', "class='form-control'");?></span></td>
-    <tr>
+      </tr>  
-      <th class='rowhead'><?php echo $lang->doc->type;?></th>
+      <?php endif;?>
-      <td><?php echo html::radio('type', $lang->doc->types, 'file', "onclick=setType(this.value)");?></td>
+      <tr>
-    </tr>  
+        <th><?php echo $lang->doc->module;?></th>
-    <tr>
+        <td><?php echo html::select('module', $moduleOptionMenu, $moduleID, "class='form-control'");?></td>
-      <th class='rowhead'><?php echo $lang->doc->title;?></th>
+      </tr>  
-      <td><?php echo html::input('title', '', "class='text-1'");?></td>
+      <tr>
-    </tr> 
+        <th><?php echo $lang->doc->type;?></th>
-    <tr id='urlBox' class='hidden'>
+        <td><?php echo html::radio('type', $lang->doc->types, 'file', "onclick=setType(this.value)");?></td>
-      <th class='rowhead'><?php echo $lang->doc->url;?></th>
+      </tr>  
-      <td><?php echo html::input('url', '', "class='text-1'");?></td>
+      <tr>
-    </tr>  
+        <th><?php echo $lang->doc->title;?></th>
-    <tr id='contentBox' class='hidden'>
+        <td><?php echo html::input('title', '', "class='form-control'");?></td>
-      <th class='rowhead'><?php echo $lang->doc->content;?></th>
+      </tr> 
-      <td><?php echo html::textarea('content', '', "class='area-1' style='width:90%; height:200px'");?></td>
+      <tr id='urlBox' class='hidden'>
-    </tr>  
+        <th><?php echo $lang->doc->url;?></th>
-    <tr>
+        <td><?php echo html::input('url', '', "class='form-control'");?></td>
-      <th class='rowhead'><?php echo $lang->doc->keywords;?></th>
+      </tr>  
-      <td><?php echo html::input('keywords', '', "class='text-1'");?></td>
+      <tr id='contentBox' class='hidden'>
-    </tr>  
+        <th><?php echo $lang->doc->content;?></th>
-    <tr>
+        <td><?php echo html::textarea('content', '', "class='form-control' style='width:90%; height:200px'");?></td>
-      <th class='rowhead'><?php echo $lang->doc->digest;?></th>
+      </tr>  
-      <td><?php echo html::textarea('digest', '', "class='text-1' rows=3");?></td>
+      <tr>
-    </tr>  
+        <th><?php echo $lang->doc->keywords;?></th>
-    <tr id='fileBox'>
+        <td><?php echo html::input('keywords', '', "class='form-control'");?></td>
-      <th class='rowhead'><?php echo $lang->doc->files;?></th>
+      </tr>  
-      <td><?php echo $this->fetch('file', 'buildform', 'fileCount=2');?></td>
+      <tr>
-    </tr>  
+        <th><?php echo $lang->doc->digest;?></th>
-    <tr>
+        <td><?php echo html::textarea('digest', '', "class='form-control' rows=3");?></td>
-      <td colspan='2' class='a-center'><?php echo html::submitButton() . html::backButton() . html::hidden('lib', $libID);?></td>
+      </tr>  
-    </tr>
+      <tr id='fileBox'>
-  </table>
+        <th><?php echo $lang->doc->files;?></th>
-</form>
+        <td><?php echo $this->fetch('file', 'buildform', 'fileCount=2');?></td>
+      </tr>  
+      <tr>
+        <td></td>
+        <td><?php echo html::submitButton() . html::backButton() . html::hidden('lib', $libID);?></td>
+      </tr>
+    </table>
+  </form>
+</div>
 <?php include '../../common/view/footer.html.php';?>

module/doc/view/createlib.html.php

@@ -15,11 +15,11 @@
   <table class='table-1'> 
     <caption><?php echo $lang->doc->createLib;?></caption>
     <tr>
-      <th class='rowhead'><?php echo $lang->doc->libName;?></th>
+      <th><?php echo $lang->doc->libName;?></th>
-      <td><?php echo html::input('name', '', "class='text-1'");?></td>
+      <td><?php echo html::input('name', '', "class='form-control'");?></td>
     </tr>  
     <tr>
-      <td colspan='2' class='a-center'><?php echo html::submitButton();?></td>
+      <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
     </tr>
   </table>
 </form>

module/doc/view/edit.html.php

@@ -19,50 +19,60 @@ $(document).ready(function()
     setType(type);
 });
 </script>
-<form method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
+<div class='container mw-900px'>
-  <table class='table-1'> 
+  <div id='titlebar'>
-    <caption><?php echo $lang->doc->edit;?></caption>
+    <div class='heading'>
-    <tr>
+      <span class='prefix'><?php echo html::icon($lang->icons['doc']) . ' #' . $doc->id;?></span>
-      <th class='rowhead'><?php echo $lang->doc->module;?></th>
+      <strong><?php echo html::a($this->createLink('doc', 'view', "docID=$doc->id"), $doc->title);?></strong>
-      <td><?php echo html::select('module', $moduleOptionMenu, $doc->module, "class='select-3'");?></td>
+      <small class='text-muted'> <?php echo html::icon($lang->icons['edit']) . ' ' . $lang->doc->edit;?></small>
-    </tr>  
+    </div>
-    <tr>
+  </div>
-      <th class='rowhead'><?php echo $lang->doc->type;?></th>
+  <form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
-      <td><?php echo $lang->doc->types[$doc->type];?></td>
+    <table class='table table-form'> 
-    </tr>  
+      <tr>
-      <th class='rowhead'><?php echo $lang->doc->title;?></th>
+        <th class='w-80px'><?php echo $lang->doc->module;?></th>
-      <td><?php echo html::input('title', $doc->title, "class='text-1'");?></td>
+        <td><?php echo html::select('module', $moduleOptionMenu, $doc->module, "class='form-control'");?></td>
-    </tr> 
+      </tr>  
-    <tr>
+      <tr>
-      <th class='rowhead'><?php echo $lang->doc->keywords;?></th>
+        <th><?php echo $lang->doc->type;?></th>
-      <td><?php echo html::input('keywords', $doc->keywords, "class='text-1'");?></td>
+        <td><?php echo $lang->doc->types[$doc->type];?></td>
-    </tr>  
+      </tr>
-    <tr id='urlBox' class='hidden'>
+      <tr>
-      <th class='rowhead'><?php echo $lang->doc->url;?></th>
+        <th><?php echo $lang->doc->title;?></th>
-      <td><?php echo html::input('url', urldecode($doc->url), "class='text-1'");?></td>
+        <td><?php echo html::input('title', $doc->title, "class='form-control'");?></td>
-    </tr>  
+      </tr> 
-    <tr id='contentBox' class='hidden'>
+      <tr>
-      <th class='rowhead'><?php echo $lang->doc->content;?></th>
+        <th><?php echo $lang->doc->keywords;?></th>
-      <td><?php echo html::textarea('content', $doc->content, "class='text-1' rows='8' style='width:90%; height:200px'");?></td>
+        <td><?php echo html::input('keywords', $doc->keywords, "class='form-control'");?></td>
-    </tr>  
+      </tr>  
-    <tr>
+      <tr id='urlBox' class='hidden'>
-      <th class='rowhead'><?php echo $lang->doc->digest;?></th>
+        <th><?php echo $lang->doc->url;?></th>
-      <td><?php echo html::textarea('digest', $doc->digest, "class='text-1' rows=3");?></td>
+        <td><?php echo html::input('url', urldecode($doc->url), "class='form-control'");?></td>
-    </tr>  
+      </tr>  
-    <tr>
+      <tr id='contentBox' class='hidden'>
-      <th class='rowhead'><?php echo $lang->doc->comment;?></th>
+        <th><?php echo $lang->doc->content;?></th>
-      <td><?php echo html::textarea('comment','', "class='text-1' rows=3");?></td>
+        <td><?php echo html::textarea('content', $doc->content, "class='form-control' rows='8' style='width:90%; height:200px'");?></td>
-    </tr> 
+      </tr>  
-    <tr id='fileBox' class='hidden'>
+      <tr>
-      <th class='rowhead'><?php echo $lang->doc->files;?></th>
+        <th><?php echo $lang->doc->digest;?></th>
-      <td><?php echo $this->fetch('file', 'buildform', 'fileCount=2');?></td>
+        <td><?php echo html::textarea('digest', $doc->digest, "class='form-control' rows=3");?></td>
-    </tr>  
+      </tr>  
-    <tr>
+      <tr>
-      <td colspan='2' class='a-center'>
+        <th><?php echo $lang->doc->comment;?></th>
-        <?php echo html::submitButton() . html::backButton() . html::hidden('lib', $libID);?>
+        <td><?php echo html::textarea('comment','', "class='form-control' rows=3");?></td>
-        <?php echo html::hidden('product', $doc->product) . html::hidden('project', $doc->project);?>
+      </tr> 
-      </td>
+      <tr id='fileBox' class='hidden'>
-    </tr>
+        <th><?php echo $lang->doc->files;?></th>
-  </table>
+        <td><?php echo $this->fetch('file', 'buildform', 'fileCount=2');?></td>
-</form>
+      </tr>
+      <tr>
+        <td></td>
+        <td>
+          <?php echo html::submitButton() . html::backButton() . html::hidden('lib', $libID);?>
+          <?php echo html::hidden('product', $doc->product) . html::hidden('project', $doc->project);?>
+        </td>
+      </tr>
+    </table>
+  </form>
+</div>
 <?php include '../../common/view/footer.html.php';?>

module/doc/view/editlib.html.php

@@ -18,10 +18,10 @@
   <table class='table-1'> 
     <caption><?php echo $lang->doc->editLib;?></caption>
     <tr>
-      <th class='rowhead'><?php echo $lang->doc->libName;?></th>
+      <th><?php echo $lang->doc->libName;?></th>
-      <td><?php echo html::input('name', $libName, "class='text-1'");?></td>
+      <td><?php echo html::input('name', $libName, "class='form-control'");?></td>
     </tr>  
-    <tr><td colspan='2' class='a-center'><?php echo html::submitButton();?></td></tr>
+    <tr><td colspan='2' class='text-center'><?php echo html::submitButton();?></td></tr>
   </table>
 </form>
 <?php endif;?>

module/doc/view/view.html.php

@@ -79,29 +79,29 @@
           <td><?php echo $lib;?></td>
         </tr>
         <tr>
-          <th class='rowhead'><?php echo $lang->doc->module;?></th>
+          <th><?php echo $lang->doc->module;?></th>
           <td><?php echo $doc->moduleName ? $doc->moduleName : '/';?></td>
         </tr>
         <tr>
-          <th class='rowhead'><?php echo $lang->doc->type;?></th>
+          <th><?php echo $lang->doc->type;?></th>
           <td><?php echo $lang->doc->types[$doc->type];?></td>
-        </tr>  
+        </tr>
         <tr>
-          <th class='rowhead'><?php echo $lang->doc->addedBy;?></th>
+          <th><?php echo $lang->doc->addedBy;?></th>
           <td><?php echo $users[$doc->addedBy];?></td>
-        </tr>  
+        </tr>
         <tr>
-          <th class='rowhead'><?php echo $lang->doc->addedDate;?></th>
+          <th><?php echo $lang->doc->addedDate;?></th>
           <td><?php echo $doc->addedDate;?></td>
-        </tr>  
+        </tr>
         <tr>
-          <th class='rowhead'><?php echo $lang->doc->editedBy;?></th>
+          <th><?php echo $lang->doc->editedBy;?></th>
           <td><?php echo $users[$doc->editedBy];?></td>
-        </tr>  
+        </tr>
         <tr>
-          <th class='rowhead'><?php echo $lang->doc->editedDate;?></th>
+          <th><?php echo $lang->doc->editedDate;?></th>
           <td><?php echo $doc->editedDate;?></td>
-        </tr>  
+        </tr>
       </table>
     </td>
   </tr>

module/editor/view/newpage.html.php

@@ -11,7 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
-<form method='post' target='hiddenwin'>
+<form class='form-condensed' method='post' target='hiddenwin'>
 <table class='table-1'>
   <caption><?php echo $lang->editor->newPage?></caption>
   <tr>

module/extension/view/activate.html.php

@@ -23,7 +23,7 @@
     else
     {
         echo "<h3 class='a-center success'>{$title}</h3>";
-        echo "<p class='a-center'>" . html::commonButton($lang->extension->viewInstalled, 'onclick=parent.location.href="' . inlink('browse', 'type=installed') . '"') . '</p>';
+        echo "<p class='text-center'>" . html::commonButton($lang->extension->viewInstalled, 'onclick=parent.location.href="' . inlink('browse', 'type=installed') . '"') . '</p>';
     }
     ?>
     </td>

module/extension/view/deactivate.html.php

@@ -22,7 +22,7 @@
         echo "<p class='strong'>{$lang->extension->unremovedFiles}</p>";
         echo join($removeCommands, '<br />');
     }
-    echo "<p class='a-center'>" . html::commonButton($lang->extension->viewDeactivated, 'onclick=parent.location.href="' . inlink('browse', 'type=deactivated') . '"') . '</p>';
+    echo "<p class='text-center'>" . html::commonButton($lang->extension->viewDeactivated, 'onclick=parent.location.href="' . inlink('browse', 'type=deactivated') . '"') . '</p>';
     ?>
     </td>
   </tr>

module/extension/view/erase.html.php

@@ -22,7 +22,7 @@
           echo "<p class='strong'>{$lang->extension->unremovedFiles}</p>";
           echo join($removeCommands, '<br />');
       }
-      echo "<p class='a-center'>" . html::commonButton($lang->extension->viewAvailable, 'onclick=parent.location.href="' . inlink('browse', 'type=available') . '"') . '</p>';
+      echo "<p class='text-center'>" . html::commonButton($lang->extension->viewAvailable, 'onclick=parent.location.href="' . inlink('browse', 'type=available') . '"') . '</p>';
       ?>
     </td>
   </tr>

module/extension/view/install.html.php

@@ -28,15 +28,15 @@ if(isset($license) and $upgrade == 'yes') printf($lang->extension->upgradeVersio
       ?>
     <?php elseif(isset($license)):?>
       <?php
-      echo "<h3 class='a-center'>{$lang->extension->license}</h3>"; 
+      echo "<h3 class='text-center'>{$lang->extension->license}</h3>"; 
       echo html::textarea('license', $license) . '<br />';
       echo '<h3>' . html::a($agreeLink, $lang->extension->agreeLicense) . '</h3>';
       ?>
     <?php else:?>
       <?php
       if($downloadedPackage) echo  "<h3 class='success'>{$lang->extension->successDownloadedPackage}</h3>";
-      echo "<h1 class='a-center'>" . sprintf($lang->extension->installFinished, $installType) . "</h1>";
+      echo "<h1 class='text-center'>" . sprintf($lang->extension->installFinished, $installType) . "</h1>";
-      echo "<p class='a-center'>" . html::commonButton($lang->extension->viewInstalled, 'onclick=parent.location.href="' . inlink('browse') . '"') . '</p>';
+      echo "<p class='text-center'>" . html::commonButton($lang->extension->viewInstalled, 'onclick=parent.location.href="' . inlink('browse') . '"') . '</p>';
       echo "<h3 class='success'>{$lang->extension->successCopiedFiles}</h3>";
       echo '<ul>';
       foreach($files as $fileName => $md5)

module/extension/view/obtain.html.php

@@ -26,7 +26,7 @@
       <div class='box-title'><?php echo $lang->extension->bySearch;?></div>
       <div class='box-content a-center'>
         <form class='side-search' method='post' action='<?php echo inlink('obtain', 'type=bySearch');?>'>
-        <?php echo html::input('key', $this->post->key, "class='text-1'") . html::submitButton($lang->extension->bySearch);?>
+        <?php echo html::input('key', $this->post->key, "class='form-control'") . html::submitButton($lang->extension->bySearch);?>
         </form>
       </div>
       <div class='box-title'><?php echo $lang->extension->byCategory;?></div>
@@ -45,7 +45,7 @@
         <table class='table-1 exttable'>
           <caption>
             <div class='f-left'><?php echo $extension->name . "($currentRelease->releaseVersion)";?></div>
-            <div class='f-right'>
+            <div class='text-right'>
               <?php 
               if($latestRelease and $latestRelease->releaseVersion != $currentRelease->releaseVersion) 
               {

module/extension/view/uninstall.html.php

@@ -36,7 +36,7 @@
         echo "<p class='strong'>{$lang->extension->unremovedFiles}</p>";
         echo join($removeCommands, '<br />');
     }
-    echo "<p class='a-center'>" . html::commonButton($lang->extension->viewAvailable, 'onclick=parent.location.href="' . inlink('browse', 'type=available') . '"') . '</p>';
+    echo "<p class='text-center'>" . html::commonButton($lang->extension->viewAvailable, 'onclick=parent.location.href="' . inlink('browse', 'type=available') . '"') . '</p>';
     ?>
     <?php endif;?>
     </td>

module/extension/view/upload.html.php

@@ -11,7 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
-<form method='post' enctype='multipart/form-data' class='a-center'>
+<form method='post' enctype='multipart/form-data' class='text-center'>
   <input type='file' name='file' class='text-5' />
   <?php echo html::submitButton($lang->extension->install);?>
 </form>

module/file/view/buildform.html.php

@@ -2,17 +2,36 @@
   <?php 
   /* Define the html code of a file row. */
   $fileRow = <<<EOT
-  <div class='fileBox' id='fileBox\$i'>
+  <div class='fileBox input-group' id='fileBox\$i'>
-    <input type='file' name='files[]' class='fileControl'  tabindex='-1' />
+    <span class='input-control w-p45'><input type='file' name='files[]' class='fileControl'  tabindex='-1' /></span>
-    <label tabindex='-1' class='fileLabel'>{$lang->file->label}</label>
+    <span class="input-group-addon">{$lang->file->label}</span>
-    <input type='text' name='labels[]' class='text-3' tabindex='-1' /> 
+    <input type='text' name='labels[]' class='form-control' placeholder='{$lang->file->label}' tabindex='-1' />
-    <a href='javascript:void();' onclick='addFile(this)' class='link-icon'><i class='icon-add'></i></a>
+    <span class='input-group-btn'>
-    <a href='javascript:void();' onclick='delFile(this)' class='link-icon'><i class='icon-delete'></i></a>
+      <a href='javascript:void();' onclick='addFile(this)' class='btn'><i class='icon-plus'></i></a>
+    </span>
+    <span class='input-group-btn'>
+      <a href='javascript:void();' onclick='delFile(this)' class='btn'><i class='icon-remove'></i></a>
+    </span>
   </div>
 EOT;
   for($i = 1; $i <= $fileCount; $i ++) echo str_replace('$i', $i, $fileRow);
 ?>
 </div>
+
+<?php if(!$writeable):?>
+<h5 class='text-danger a-left'> <?php echo $this->lang->file->errorUnwritable;?> </h5>
+<?php else:?>
+<div class="file-form">
+  <?php for($i = 0; $i < $fileCount; $i ++):?>
+  <div class='form-group clearfix'>
+    <div class='col-sm-5' style='padding-left:0px'><input type='file' class='form-control' name='files[]' id="file<?php echo $i;?>"  tabindex='-1' /></div>
+    <div class='col-sm-7' style='padding-right:0px'><input type='text' id='label<?php echo $i;?>' name='labels[]' class='form-control' tabindex='-1' placeholder='<?php echo $lang->file->label;?>'/></div>
+  </div>
+  <?php endfor;?>
+</div>
+<?php endif;?>
+
+
 <script language='javascript'>
 $(function()
 {
@@ -54,7 +73,7 @@ function addFile(clickedButton)
 {
     fileRow = <?php echo json_encode($fileRow);?>;
     fileRow = fileRow.replace('$i', $('.fileID').size() + 1);
-    $(clickedButton).parent().after(fileRow);
+    $(clickedButton).closest('.fileBox').after(fileRow);
 
     setFileFormWidth(<?php echo $percent;?>);
     updateID();
@@ -70,7 +89,7 @@ function addFile(clickedButton)
 function delFile(clickedButton)
 {
     if($('.fileBox').size() == 1) return;
-    $(clickedButton).parent().remove();
+    $(clickedButton).closest('.fileBox').remove();
     updateID();
 }
 

module/file/view/edit.html.php

@@ -34,7 +34,7 @@ function closeWindow()
   <table class='table-1'>
     <caption><?php echo $lang->file->inputFileName;?></caption>
     <tr>
-      <td class='a-center v-middle' height='50'>
+      <td class='text-center' style='padding-top:30px;'>
         <?php echo html::input('fileName', $file->title) . "<strong>.{$file->extension}</strong>";?>
         <?php echo html::submitButton();?>
       </td>

module/file/view/export.html.php

@@ -47,7 +47,7 @@ function switchEncode(fileType)
   <table class='table-1'>
     <caption><?php echo $lang->export;?></caption>
     <tr>
-      <td class='a-center' style='padding:30px'>
+      <td class='text-center' style='padding:30px'>
         <?php
         echo $lang->setFileName . ' ';
         echo html::input('fileName', '', 'class=text-2');

module/group/view/browse.html.php

@@ -16,7 +16,7 @@
 <table align='center' class='table-1 tablesorter fixed' id='groupList'>
   <caption class='caption-tl pb-10px'>
     <div class='f-left'><?php echo $lang->group->browse;?></div>
-    <div class='f-right'><?php common::printIcon('group', 'create');?></div>
+    <div class='text-right'><?php common::printIcon('group', 'create');?></div>
   </caption>
   <thead>
   <tr class='colhead'>
@@ -30,12 +30,12 @@
   <tbody>
   <?php foreach($groups as $group):?>
   <?php $users = implode(' ', $groupUsers[$group->id]);?>
-  <tr class='a-center'>
+  <tr class='text-center'>
     <td class='strong'><?php echo $group->id;?></td>
-    <td class='a-left'><?php echo $group->name;?></td>
+    <td class='text-left'><?php echo $group->name;?></td>
-    <td class='a-left'><?php echo $group->desc;?></td>
+    <td class='text-left'><?php echo $group->desc;?></td>
-    <td class='a-left' title='<?php echo $users;?>'><?php echo $users;?></td>
+    <td class='text-left' title='<?php echo $users;?>'><?php echo $users;?></td>
-    <td class='a-center'>
+    <td class='text-center'>
       <?php $lang->group->managepriv = $lang->group->managePrivByGroup;?>
       <?php common::printIcon('group', 'managepriv',   "type=byGroup&param=$group->id", '', 'list');?>
       <?php $lang->group->managemember = $lang->group->manageMember;?>
@@ -46,7 +46,7 @@
       if(common::hasPriv('group', 'delete'))
       {
           $deleteURL = $this->createLink('group', 'delete', "groupID=$group->id&confirm=yes");
-          echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"groupList\",confirmDelete)", '<i class="icon-green-common-delete"></i>', '', "class='link-icon' title='{$lang->group->delete}'");
+          echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"groupList\",confirmDelete)", '<i class="icon-remove"></i>', '', "class='link-icon' title='{$lang->group->delete}'");
       }
       ?>
     </td>
@@ -55,7 +55,7 @@
   </tbody>
   <?php if(common::hasPriv('group', 'managePriv')):?>
   <tfoot>
-    <tr><td colspan='5' class='a-center'><?php echo html::linkButton($lang->group->managePrivByModule, inlink('managePriv', 'type=byModule'));?></td></tr>
+    <tr><td colspan='5' class='text-center'><?php echo html::linkButton($lang->group->managePrivByModule, inlink('managePriv', 'type=byModule'));?></td></tr>
   </tfoot>
   <?php endif;?>
 </table>

module/group/view/copy.html.php

@@ -11,22 +11,22 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<form method='post' target='hiddenwin'>
+<form class='form-condensed' method='post' target='hiddenwin'>
   <table align='center' class='table-4'> 
     <caption><?php echo $lang->group->copy;?></caption>
     <tr>
-      <th class='rowhead'><?php echo $lang->group->name;?></th>
+      <th><?php echo $lang->group->name;?></th>
-      <td><?php echo html::input('name', $group->name, "class='text-1'");?></td>
+      <td><?php echo html::input('name', $group->name, "class='form-control'");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->group->desc;?></th>
+      <th><?php echo $lang->group->desc;?></th>
-      <td><?php echo html::textarea('desc', $group->desc, "rows='5' class='area-1'");?></td>
+      <td><?php echo html::textarea('desc', $group->desc, "rows='5' class='form-control'");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->group->option;?></th>
+      <th><?php echo $lang->group->option;?></th>
       <td><?php echo html::checkbox('options', $lang->group->copyOptions);?></td>
     </tr>  
-    <tr><td colspan='2' class='a-center'><?php echo html::submitButton();?></td></tr>
+    <tr><td colspan='2' class='text-center'><?php echo html::submitButton();?></td></tr>
   </table>
 </form>
 <?php include '../../common/view/footer.html.php';?>

module/group/view/create.html.php

@@ -11,18 +11,18 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<form method='post' target='hiddenwin' id='dataform'>
+<form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
   <table align='center' class='table-4 a-left'> 
     <caption><?php echo $lang->group->create;?></caption>
     <tr>
-      <th class='rowhead'><?php echo $lang->group->name;?></th>
+      <th><?php echo $lang->group->name;?></th>
       <td><?php echo html::input('name', '', "class=text-1");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->group->desc;?></th>
+      <th><?php echo $lang->group->desc;?></th>
       <td><?php echo html::textarea('desc', '', "rows=5 class=area-1");?></textarea></td>
     </tr>  
-    <tr><td colspan='2' class='a-center'><?php echo html::submitButton();?></td></tr>
+    <tr><td colspan='2' class='text-center'><?php echo html::submitButton();?></td></tr>
   </table>
 </form>
 <?php include '../../common/view/footer.html.php';?>

module/group/view/edit.html.php

@@ -11,18 +11,18 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<form method='post' target='hiddenwin' id='dataform'>
+<form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
   <table align='center' class='table-4'> 
     <caption><?php echo $lang->group->edit;?></caption>
     <tr>
-      <th class='rowhead'><?php echo $lang->group->name;?></th>
+      <th><?php echo $lang->group->name;?></th>
-      <td><?php echo html::input('name', $group->name, "class='text-1'");?></td>
+      <td><?php echo html::input('name', $group->name, "class='form-control'");?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->group->desc;?></th>
+      <th><?php echo $lang->group->desc;?></th>
-      <td><?php echo html::textarea('desc', $group->desc, "rows='5' class='area-1'");?></td>
+      <td><?php echo html::textarea('desc', $group->desc, "rows='5' class='form-control'");?></td>
     </tr>  
-    <tr><td colspan='2' class='a-center'><?php echo html::submitButton();?></td></tr>
+    <tr><td colspan='2' class='text-center'><?php echo html::submitButton();?></td></tr>
   </table>
 </form>
 <?php include '../../common/view/footer.html.php';?>

module/group/view/managemember.html.php

@@ -11,12 +11,12 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<form method='post' target='hiddenwin'>
+<form class='form-condensed' method='post' target='hiddenwin'>
   <table align='center' class='table-1 a-left'> 
     <caption><?php echo $group->name . $lang->colon . $lang->group->manageMember;?></caption>
     <?php if($groupUsers):?>
     <tr>
-      <th class='rowhead'><?php echo $lang->group->inside;?><?php echo html::selectAll('group', 'checkbox', true);?> </th>
+      <th><?php echo $lang->group->inside;?><?php echo html::selectAll('group', 'checkbox', true);?> </th>
       <td id='group' class='f-14px pv-10px'><?php $i = 1;?>
         <?php foreach($groupUsers as $account => $realname):?>
         <div class='w-p10 f-left'><?php echo '<span>' . html::checkbox('members', array($account => $realname), $account) . '</span>';?></div>
@@ -26,7 +26,7 @@
     </tr>
     <?php endif;?>
     <tr>
-      <th class='rowhead'><?php echo $lang->group->outside;?><?php echo html::selectAll('other','checkbox');?> </th>
+      <th><?php echo $lang->group->outside;?><?php echo html::selectAll('other','checkbox');?> </th>
       <td id='other' class='f-14px pv-10px'><?php $i = 1;?>
         <?php foreach($otherUsers as $account => $realname):?>
         <div class='w-p10 f-left'><?php echo '<span>' . html::checkbox('members', array($account => $realname), '') . '</span>';?></div>
@@ -35,8 +35,8 @@
       </td>
     </tr>
     <tr>
-      <th class='rowhead'></th>
+      <th></th>
-      <td class='a-center'>
+      <td class='text-center'>
         <?php 
         echo html::submitButton();
         echo html::linkButton($lang->goback, $this->createLink('group', 'browse'));

module/group/view/privbygroup.html.php

@@ -10,7 +10,7 @@
  * @link        http://www.zentao.net
  */
 ?>
-<form method='post' target='hiddenwin'>
+<form class='form-condensed' method='post' target='hiddenwin'>
   <div id='featurebar'>
     <?php $params = "type=byGroup&param=$groupID&menu=%s&version=$version";?>
     <span <?php echo empty($menu) ? "class='active'" : ""?>>
@@ -69,7 +69,7 @@
     </tr>
     <?php endforeach;?>
     <tr>
-      <th class='rowhead'><?php echo $lang->selectAll . html::selectAll('', 'checkbox')?></th>
+      <th><?php echo $lang->selectAll . html::selectAll('', 'checkbox')?></th>
       <td>
         <?php 
         echo html::submitButton($lang->save, "onclick='setNoChecked()'");

module/group/view/privbymodule.html.php

@@ -10,7 +10,7 @@
  * @link        http://www.zentao.net
  */
 ?>
-<form method='post' target='hiddenwin'>
+<form class='form-condensed' method='post' target='hiddenwin'>
   <table class='table-6 a-center' align='center'> 
     <caption class='caption-tl'><?php echo $lang->group->managePriv . $lang->group->byModuleTips;?></caption>
     <tr class='colhead'>
@@ -33,7 +33,7 @@
       <td><?php echo html::select('groups[]', $groups, '', "multiple='multiple'");?></td>
     </tr>
     <tr>
-      <td class='a-center' colspan='3'>
+      <td class='text-center' colspan='3'>
         <?php 
         echo html::submitButton($lang->save);
         echo html::linkButton($lang->goback, $this->createLink('group', 'browse'));

module/install/view/index.html.php

@@ -17,7 +17,7 @@
     <td>
     <?php if(isset($latestRelease) and (version_compare($latestRelease->version, $config->version) > 0)):?>
     <?php vprintf($lang->install->newReleased, $latestRelease);?>
-    <h3 class='a-center'>
+    <h3 class='text-center'>
       <?php 
       echo $lang->install->choice;
       echo html::a($latestRelease->url, $lang->install->seeLatestRelease, '_blank');
@@ -25,7 +25,7 @@
       ?>
     </h3>
 	<?php else:?>
-      <h3 class='a-center'>
+      <h3 class='text-center'>
         <?php echo html::select('', $app->config->langs, $app->cookie->lang,  'onchange="selectLang(this.value)"');?>
         <?php echo html::a($this->createLink('install', 'step1'), $lang->install->start);?>
       </h3>

module/install/view/step2.html.php

@@ -16,43 +16,43 @@
     <caption><?php echo $lang->install->setConfig;?></caption>
     <tr>
       <th class='w-p20'><?php echo $lang->install->key;?></th>
-      <th class='a-left'><?php echo $lang->install->value?></th>
+      <th class='text-left'><?php echo $lang->install->value?></th>
     </tr>
     <tr>
       <th><?php echo $lang->install->defaultLang;?></th>
-      <td><?php echo html::select('defaultLang', $config->langs, $app->getClientLang(), 'class=select-3');?></td>
+      <td><?php echo html::select('defaultLang', $config->langs, $app->getClientLang(), "class='form-control'");?></td>
     </tr>
     <tr>
       <th><?php echo $lang->install->dbHost;?></th>
-      <td><?php echo html::input('dbHost', '127.0.0.1', 'class=text-3');?><?php echo $lang->install->dbHostNote;?></td>
+      <td><?php echo html::input('dbHost', '127.0.0.1', "class='form-control'");?><?php echo $lang->install->dbHostNote;?></td>
     </tr>
     <tr>
       <th><?php echo $lang->install->dbPort;?></th>
-      <td><?php echo html::input('dbPort', '3306', 'class=text-3');?></td>
+      <td><?php echo html::input('dbPort', '3306', "class='form-control'");?></td>
     </tr>
     <tr>
       <th><?php echo $lang->install->dbUser;?></th>
-      <td><?php echo html::input('dbUser', 'root', 'class=text-3');?></td>
+      <td><?php echo html::input('dbUser', 'root', "class='form-control'");?></td>
     </tr>
     <tr>
       <th><?php echo $lang->install->dbPassword;?></th>
-      <td><?php echo html::input('dbPassword', '', 'class=text-3');?></td>
+      <td><?php echo html::input('dbPassword', '', "class='form-control'");?></td>
     </tr>
     <tr>
       <th><?php echo $lang->install->dbName;?></th>
-      <td><?php echo html::input('dbName', 'zentao', 'class=text-3');?></td>
+      <td><?php echo html::input('dbName', 'zentao', "class='form-control'");?></td>
     </tr>
     <tr>
       <th><?php echo $lang->install->dbPrefix;?></th>
       <td>
       <?php 
-      echo html::input('dbPrefix', 'zt_', 'class=text-3');
+      echo html::input('dbPrefix', 'zt_', "class='form-control'");
       echo html::checkBox('clearDB', $lang->install->clearDB);
       ?>
       </td>
     </tr>
     <tr>
-      <td colspan='2' class='a-center'><?php echo html::submitButton() . html::hidden('requestType', 'GET');?></td>
+      <td colspan='2' class='text-center'><?php echo html::submitButton() . html::hidden('requestType', 'GET');?></td>
     </tr>
   </table>
 </form>

module/install/view/step3.html.php

@@ -40,7 +40,7 @@ EOT;
 <table class='table-6' align='center'>
   <caption><?php echo $lang->install->saveConfig;?></caption>
   <tr>
-    <td class='a-center'><?php echo html::textArea('config', $configContent, "rows='15' class='area-1 f-12px'");?></td>
+    <td class='text-center'><?php echo html::textArea('config', $configContent, "rows='15' class='area-1 f-12px'");?></td>
   </tr>
   <tr>
     <td>
@@ -63,7 +63,7 @@ EOT;
         printf($lang->install->save2File, $this->app->getConfigRoot() . 'my.php');
     }
     echo "<br />";
-    echo "<div class='a-center'>" . html::a($this->createLink('install', 'step4'), $lang->install->next) . '</div>';
+    echo "<div class='text-center'>" . html::a($this->createLink('install', 'step4'), $lang->install->next) . '</div>';
     ?>
     </td>
   </tr>

module/install/view/step4.html.php

@@ -24,22 +24,22 @@
   <tr><td><?php echo html::commonButton($lang->install->pre, "onclick='javascript:history.back(-1)'");?></td></tr>
 </table>
 <?php else:?>
-<form method='post' target='hiddenwin'>
+<form class='form-condensed' method='post' target='hiddenwin'>
 <table class='table-6' align='center'>
   <caption><?php echo $lang->install->getPriv;?></caption>
   <tr>
-    <th class='rowhead'><?php echo $lang->install->company;?></th>
+    <th><?php echo $lang->install->company;?></th>
     <td><?php echo html::input('company');?></td>
   </tr>
   <tr>
-    <th class='rowhead'><?php echo $lang->install->account;?></th>
+    <th><?php echo $lang->install->account;?></th>
     <td><?php echo html::input('account');?></td>
   </tr>
   <tr>
-    <th class='rowhead'><?php echo $lang->install->password;?></th>
+    <th><?php echo $lang->install->password;?></th>
     <td><?php echo html::input('password') .  html::checkBox('importDemoData', $lang->install->importDemoData);?></td>
   </tr>
-  <tr class='a-center'>
+  <tr class='text-center'>
     <td colspan='2'><?php echo html::submitButton();?></td>
   </tr>
 </table>

module/mail/view/detect.html.php

@@ -11,10 +11,10 @@
  */
 include '../../common/view/header.html.php';
 ?>
-<form method='post' target='hiddenwin'>
+<form class='form-condensed' method='post' target='hiddenwin'>
 <table class='table-4' align='center'>
   <caption><?php echo $lang->mail->inputFromEmail; ?></caption>
-  <tr><td class='a-center'><?php echo html::input('fromAddress', $fromAddress, 'class=text-3') . html::submitButton($lang->mail->nextStep);?></td></tr>
+  <tr><td class='text-center'><?php echo html::input('fromAddress', $fromAddress, "class='form-control'") . html::submitButton($lang->mail->nextStep);?></td></tr>
 </table>
 </form>
 <?php include '../../common/view/footer.html.php';?>

module/mail/view/edit.html.php

@@ -19,48 +19,48 @@ include '../../common/view/header.html.php';
     <td><?php echo html::radio('turnon', $lang->mail->turnonList, 1);?></td>
   </tr>
   <tr>
-    <th class='rowhead'><?php echo $lang->mail->fromAddress; ?></th>
+    <th><?php echo $lang->mail->fromAddress; ?></th>
-    <td><?php echo html::input('fromAddress', $mailConfig->fromAddress, 'class=text-3');?></td>
+    <td><?php echo html::input('fromAddress', $mailConfig->fromAddress, "class='form-control'");?></td>
   </tr>
   <tr>
-    <th class='rowhead'><?php echo $lang->mail->fromName; ?></th>
+    <th><?php echo $lang->mail->fromName; ?></th>
-    <td><?php echo html::input('fromName', $mailConfig->fromName, 'class=text-3');?></td>
+    <td><?php echo html::input('fromName', $mailConfig->fromName, "class='form-control'");?></td>
   </tr>
   <tr>
-    <th class='rowhead'><?php echo $lang->mail->host; ?></th>
+    <th><?php echo $lang->mail->host; ?></th>
-    <td><?php echo html::input('host', $mailConfig->host, 'class=text-3');?></td>
+    <td><?php echo html::input('host', $mailConfig->host, "class='form-control'");?></td>
   </tr>
   <tr>
-    <th class='rowhead'><?php echo $lang->mail->port; ?></th>
+    <th><?php echo $lang->mail->port; ?></th>
-    <td><?php echo html::input('port', $mailConfig->port, 'class=text-3');?></td>
+    <td><?php echo html::input('port', $mailConfig->port, "class='form-control'");?></td>
   </tr>
   <tr>
-    <th class='rowhead'><?php echo $lang->mail->auth; ?></th>
+    <th><?php echo $lang->mail->auth; ?></th>
     <td><?php echo html::radio('auth', $lang->mail->authList, $mailConfig->auth, 'onchange=setAuth(this.value)'); ?></td>
   </tr>
   <tr>
-    <th class='rowhead'><?php echo $lang->mail->username; ?></th>
+    <th><?php echo $lang->mail->username; ?></th>
-    <td><?php echo html::input('username', $mailConfig->username, 'class=text-3') ?></td>
+    <td><?php echo html::input('username', $mailConfig->username, "class='form-control'") ?></td>
   </tr>
   <tr>
-    <th class='rowhead'><?php echo $lang->mail->password; ?></th>
+    <th><?php echo $lang->mail->password; ?></th>
-    <td><?php echo html::password('password', $mailConfig->password, 'class="text-3" autocomplete="off"') ?></td>
+    <td><?php echo html::password('password', $mailConfig->password, 'class="form-control" autocomplete="off"') ?></td>
   </tr>
   <tr>
-    <th class='rowhead'><?php echo $lang->mail->secure; ?></th>
+    <th><?php echo $lang->mail->secure; ?></th>
     <td><?php echo html::radio('secure', $lang->mail->secureList, $mailConfig->secure); ?></td>
   </tr>
   <tr>
-    <th class='rowhead'><?php echo $lang->mail->debug; ?></th>
+    <th><?php echo $lang->mail->debug; ?></th>
     <td><?php echo html::radio('debug', $lang->mail->debugList, $mailConfig->debug);?></td>
   </tr>
   <tr>
-    <th class='rowhead'><?php echo $lang->mail->charset; ?></th>
+    <th><?php echo $lang->mail->charset; ?></th>
     <td><?php echo html::radio('charset', $config->charsets[$this->cookie->lang], $mailConfig->charset);?></td>
   </tr>
 
   <tr>
-     <td colspan='2' class='a-center'>
+     <td colspan='2' class='text-center'>
        <?php 
        echo html::submitButton();
        if($this->config->mail->turnon and $mailExist) echo html::linkButton($lang->mail->test, inlink('test'));

module/mail/view/test.html.php

@@ -21,10 +21,10 @@ if(isset($error))
 <table class='table-4' align='center'>
   <caption>
     <div class='f-left'> <?php echo $lang->mail->test;?></div>
-    <div class='f-right'><?php echo $lang->mail->sendmailTips;?></div>
+    <div class='text-right'><?php echo $lang->mail->sendmailTips;?></div>
   </caption>
   <tr>
-    <td class='a-center'>
+    <td class='text-center'>
       <?php 
       echo html::select('to', $users, $app->user->account);
       echo html::submitButton($lang->mail->test);

module/misc/view/about.html.php

@@ -7,7 +7,7 @@
     </td>
     <td> 
 	  <?php include './links.html.php';?>
-      <div class='a-right'><?php echo $lang->misc->copyright;?></div>
+      <div class='text-right'><?php echo $lang->misc->copyright;?></div>
     </td>
   </tr>
 </table>

module/misc/view/links.html.php

@@ -4,7 +4,7 @@
   unset($lang->misc->zentao->version);
   unset($lang->misc->zentao->labels);
   ?>
-  <tr class='a-left' valign='top'>
+  <tr class='text-left' valign='top'>
     <?php foreach($lang->misc->zentao as $groupItems):?>
     <td>
       <ul>

module/my/css/index.css

@@ -1,16 +1,13 @@
-.block {border:1px solid #efefef; height:225px;}
+.panel-block {height: 208px;overflow: auto; padding: 0}
-.dynamic{border:1px solid #efefef;height: 434px;overflow: hidden;}
+.panel-block.dynamic {height: 435px;}
-.dynamic td{padding: 5px 5px;}
+.panel-block .panel-heading {padding: 6px 10px; margin: 0;}
-.linkbox1{height:205px; overflow-y:auto}
+.panel-block .panel-actions {line-height: 36px; margin-right: -5px;}
-.linkbox2{height:225px; overflow-y:auto}
+.panel > .table > thead > tr > th, .panel > form > .table > thead > tr > th {background: #f1f1f1}
-#projectbox{margin-bottom: 23px;}
+.panel-block td, .panel-block th {padding: 6px;}
-
+.panel-block.dynamic td {padding: 6px 6px 5px}
-#row1{margin-bottom:20px}
+.panel-block tr > td:first-child, .panel-block tr > th:first-child, .outer .table tr > th:first-child, .outer .table tr > td:first-child {padding-left: 10px;}
-#row2{margin-bottom:10px}
+.panel-block td .progressbar {display: inline-block; height: 16px; background: #229F24;}
-#row1 .table-1, #row1 caption{border:none}
+.panel-block .icon {color: #666; display: inline-block; margin-right: 2px;}
-#row2 .table-1, #row2 caption{border:none}
+#wrap .outer {padding: 20px 20px 0}
-
+.outer .panel-block .table tbody > tr:last-child td {border-bottom: none}
-caption{line-height: 20px;padding-bottom: 8px;}
+.outer .row {padding: 0}
-caption .f-left {padding-left:0px}
-
-.outer th i[class^="icon-"], .outer th i[class*=" icon-"]{font-size: 16px;}

module/my/js/common.js

@@ -1,4 +1,3 @@
 $(function() 
 { 
-    if(typeof(listName) != 'undefined') setModal4List('iframe', listName, function(){$(".colorbox").colorbox({width:960, height:550, iframe:true, transition:'none'});});
 });

module/my/js/todo.js

@@ -4,5 +4,3 @@ function changeDate(date)
     link = createLink('my', 'todo', 'type=' + date);
     location.href=link;
 }
-
-$(".colorbox").colorbox({width:960, height:550, iframe:true, transition:'none'});

module/my/lang/en.php

@@ -39,3 +39,6 @@ $lang->my->home->productHome   = 'Product home';
 $lang->my->home->createProject = "create a project?";
 $lang->my->home->createProduct = "create a product?";
 $lang->my->home->help          = "<a href='http://www.zentao.net/help-read-79236.html' target='_blank'>Help Book</a>";
+
+$lang->my->form->lblBasic   = 'Basic info';
+$lang->my->form->lblContact = 'Contact info';

module/my/lang/zh-cn.php

@@ -39,3 +39,7 @@ $lang->my->home->productHome   = '访问产品主页';
 $lang->my->home->createProject = "创建一个项目？";
 $lang->my->home->createProduct = "创建一个产品？";
 $lang->my->home->help          = "<a href='http://www.zentao.net/help-read-79236.html' target='_blank'>帮助文档</a>";
+$lang->my->home->noProductsTip = "这里还没有产品。";
+
+$lang->my->form->lblBasic   = '基本信息';
+$lang->my->form->lblContact = '联系信息';

module/my/view/blockbugs.html.php

@@ -1,14 +1,16 @@
-<div class='block linkbox2'>
+<div class='panel panel-block'>
-<table class='table-1 fixed colored'>
+  <div class='panel-heading'>
-  <caption>
+    <i class='icon icon-bug'></i> <strong><?php echo $lang->my->bug;?></strong>
-    <div class='f-left'><i class='icon icon-bug'></i>&nbsp; <?php echo $lang->my->bug;?></div>
+    <div class='panel-actions pull-right'>
-    <div class='f-right'><?php echo html::a($this->createLink('my', 'bug'), $lang->more . "&nbsp;<i class='icon-th icon icon-double-angle-right'></i>");?></div>
+      <?php echo html::a($this->createLink('my', 'bug'), $lang->more . "&nbsp;<i class='icon icon-double-angle-right'></i>");?>
-  </caption>
+    </div>
-  <?php 
+  </div>
+  <table class='table table-condensed table-hover table-striped table-borderless'>
+  <?php
   foreach($bugs as $bugID => $bugTitle)
   {
       echo "<tr><td class='nobr'>" . "#$bugID " . html::a($this->createLink('bug', 'view', "id=$bugID"), $bugTitle, '', "title=$bugTitle") . "</td><td width='5'></td></tr>";
   }
   ?>
-</table>
+  </table>
 </div>

module/my/view/blockdynamic.html.php

@@ -1,24 +1,24 @@
-<div class='dynamic'>
+<div class='panel panel-block dynamic'>
-<table class='table-1 colored fixed'>
+  <div class='panel-heading'>
-  <caption>
+    <i class='icon-quote-right icon'></i> <strong><?php echo $lang->my->home->latest;?></strong>
-    <div class='f-left'><i class="icon icon-quote-right"></i>&nbsp; <?php echo $lang->my->home->latest;?></div>
+    <div class="panel-actions pull-right"><?php common::printLink('company', 'dynamic', '', $lang->more . "&nbsp;<i class='icon-th icon icon-double-angle-right'></i>");?></div>
-    <div class='f-right'><?php common::printLink('company', 'dynamic', '', $lang->more . "&nbsp;<i class='icon-th icon icon-double-angle-right'></i>");?></div>
+  </div>
-  </caption>
+  <table class='table table-condensed table-hover table-striped table-borderless'>
-  <?php 
+    <?php 
-  foreach($actions as $action)
+    foreach($actions as $action)
-  {
+    {
-      $canView = false;
+        $canView = false;
-      if(common::hasPriv('company', 'dynamic')) $canView = true;
+        if(common::hasPriv('company', 'dynamic')) $canView = true;
-      if($action->product == 0 and $action->project == 0) $canView = true;
+        if($action->product == 0 and $action->project == 0) $canView = true;
-      if(isset($productStats['products'][$action->product]) or isset($projectStats['projects'][$action->project])) $canView = true;
+        if(isset($productStats['products'][$action->product]) or isset($projectStats['projects'][$action->project])) $canView = true;
 
-      if(!$canView) continue;
+        if(!$canView) continue;
-      $user = isset($users[$action->actor]) ? $users[$action->actor] : $action->actor;
+        $user = isset($users[$action->actor]) ? $users[$action->actor] : $action->actor;
-      if($action->action == 'login' or $action->action == 'logout') $action->objectName = $action->objectLabel = '';
+        if($action->action == 'login' or $action->action == 'logout') $action->objectName = $action->objectLabel = '';
-      echo "<tr><td class='nobr' width='95%'>";
+        echo "<tr><td class='nobr' width='95%'>";
-      printf($lang->my->home->action, $action->date, $user, $action->actionLabel, $action->objectLabel, $action->objectLink, $action->objectName);
+        printf($lang->my->home->action, $action->date, $user, $action->actionLabel, $action->objectLabel, $action->objectLink, $action->objectName);
-      echo "</td><td class='divider'></td></tr>";
+        echo "</td><td class='divider'></td></tr>";
-  }
+    }
- ?>
+   ?>
-</table>
+  </table>
 </div>

module/my/view/blockproducts.html.php

@@ -1,22 +1,16 @@
-<div class='block linkbox1' id='productbox'>
+<div class='panel panel-block' id='productbox'>
 <?php if(empty($productStats)):?>
-<table class='table-1 a-center' height='138px'>
+<div class='panel-heading'>
-  <caption><i class="icon icon-th"></i>&nbsp; <?php echo $lang->my->home->products;?></caption>
+  <i class='icon-cube icon'></i> <strong><?php echo $lang->my->home->products;?></strong>
-  <tr>
+</div>
-    <td valign='middle'>
+<div class='panel-body text-center'><br><br>
-      <table class='a-left bd-none' align='center'>
+  <?php echo html::a($this->createLink('product', 'create'), "<i class='icon-plus'></i> " . $lang->my->home->createProject,'', "class='btn btn-success'");?> &nbsp; &nbsp; <?php echo " <i class='icon-question-sign text-muted'></i> " . $lang->my->home->help; ?>
-        <tr>
+</div>
-          <td><?php echo html::a($this->createLink('product', 'create'), $lang->my->home->createProduct);?></td>
-          <td><?php echo $lang->my->home->help;?></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
 <?php else:?>
-  <table class='table-1 colored fixed'>
+<table class='table table-condensed table-hover table-striped table-borderless'>
-    <tr class='colhead'>
+  <thead>
-      <th class='w-150px'><div class='f-left'><i class="icon icon-th"></i>&nbsp; <?php echo $lang->product->name;?></div></th>
+    <tr class='text-center'>
+      <th class='w-150px text-left'><i class="icon icon-cube"></i> <?php echo $lang->product->name;?></th>
       <th title='<?php echo $lang->story->common;?>'><?php echo $lang->story->statusList['active'];?></th>
       <th title='<?php echo $lang->story->common;?>'><?php echo $lang->story->statusList['changed'];?></th>
       <th title='<?php echo $lang->story->common;?>'><?php echo $lang->story->statusList['draft'];?></th>
@@ -26,9 +20,11 @@
       <th><?php echo $lang->product->bugs;?></th>
       <th title='<?php echo $lang->bug->common;?>'><?php echo $lang->bug->unResolved;?></th>
     </tr>
+  </thead>
+  <tbody>
     <?php foreach($productStats as $product):?>
-    <tr class='a-center' style='height:30px'>
+    <tr class='text-center'>
-      <td class='a-left'><?php echo html::a($this->createLink('product', 'view', 'product=' . $product->id), $product->name, '', "title=$product->name");?></td>
+      <td class='text-left'><?php echo html::a($this->createLink('product', 'view', 'product=' . $product->id), $product->name, '', "title=$product->name");?></td>
       <td><?php echo $product->stories['active']?></td>
       <td><?php echo $product->stories['changed']?></td>
       <td><?php echo $product->stories['draft']?></td>
@@ -39,6 +35,7 @@
       <td><?php echo $product->unResolved?></td>
     </tr>
     <?php endforeach;?>
-  </table>
+  </tbody>
+</table>
 <?php endif;?>
 </div>

module/my/view/blockprojects.html.php

@@ -1,22 +1,16 @@
-<div class='block linkbox1' id='projectbox'>
+<div class='panel panel-block' id='projectbox'>
 <?php if(count($projectStats) == 0):?>
-<table class='table-1 a-center' height='138px'>
+<div class='panel-heading'>
-  <caption><i class="icon icon-th-large"></i>&nbsp;<?php echo $lang->my->home->projects;?></caption>
+  <i class='icon-folder-close-alt icon'></i> <strong><?php echo $lang->my->home->projects;?></strong>
-  <tr>
+</div>
-    <td valign='middle'>
+<div class='panel-body text-center'><br><br>
-      <table class='a-left bd-none' align='center'>
+  <?php echo html::a($this->createLink('project', 'create'), "<i class='icon-plus'></i> " . $lang->my->home->createProject,'', "class='btn btn-success'");?> &nbsp; &nbsp; <?php echo " <i class='icon-question-sign text-muted'></i> " . $lang->my->home->help; ?>
-        <tr>
+</div>
-          <td><?php echo html::a($this->createLink('project', 'create'), $lang->my->home->createProject);?></td>
-          <td><?php echo $lang->my->home->help; ?></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
 <?php else:?>
-  <table class='table-1 fixed colored'>
+<table class='table table-condensed table-hover table-striped table-borderless'>
-    <tr class='colhead'>
+  <thead>
-      <th class='w-150px'><div class='f-left'><i class="icon icon-th-large"></i>&nbsp; <?php echo $lang->project->name;?></div></th>
+    <tr class='text-center'>
+      <th class='w-150px'><div class='text-left'><i class="icon-folder-close-alt icon"></i> <?php echo $lang->project->name;?></div></th>
       <th><?php echo $lang->project->end;?></th>
       <th><?php echo $lang->statusAB;?></th>
       <th><?php echo $lang->project->totalEstimate;?></th>
@@ -25,21 +19,24 @@
       <th class='w-120px'><?php echo $lang->project->progess;?></th>
       <th class='w-100px'><?php echo $lang->project->burn;?></th>
     </tr>
+  </thead>
+  <tbody>
     <?php foreach($projectStats as $project):?>
-    <tr class='a-center'>
+    <tr class='text-center'>
-      <td class='a-left'><?php echo html::a($this->createLink('project', 'task', 'project=' . $project->id), $project->name, '', "title=$project->name");?></td>
+      <td class='text-left'><?php echo html::a($this->createLink('project', 'task', 'project=' . $project->id), $project->name, '', "title=$project->name");?></td>
       <td><?php echo $project->end;?></td>
       <td><?php echo $lang->project->statusList[$project->status];?></td>
       <td><?php echo $project->hours->totalEstimate;?></td>
       <td><?php echo $project->hours->totalConsumed;?></td>
       <td><?php echo $project->hours->totalLeft;?></td>
-      <td class='a-left w-150px'>
+      <td class='text-left w-150px'>
-        <?php if($project->hours->progress):?><img src='<?php echo $defaultTheme;?>images/main/green.png' width=<?php echo $project->hours->progress;?> height='13' text-align: /><?php endif;?>
+        <div class="progressbar" style='width:<?php echo $project->hours->progress;?>px'>&nbsp;</div>
         <small><?php echo $project->hours->progress;?>%</small>
       </td>
-      <td class='projectline a-left' values='<?php echo join(',', $project->burns);?>'></td>
+      <td class='projectline text-left' values='<?php echo join(',', $project->burns);?>'></td>
    </tr>
    <?php endforeach;?>
-  </table>
+  </tbody>
+</table>
 <?php endif;?>
 </div>