* ajusted views.

module/my/view/bug.html.php

@@ -13,14 +13,14 @@
 <?php include '../../common/view/header.html.php';?>
 <div id='featurebar'>
   <div class='heading'><i class='icon-bug'></i> <?php echo $lang->my->bug;?></div>
-  <nav class='nav'>
+  <ul class='nav'>
     <?php
     echo "<li id='assignedToTab'>"  . html::a(inlink('bug', "type=assignedTo"),  $lang->bug->assignToMe)    . "</li>";
     echo "<li id='openedByTab'>"    . html::a(inlink('bug', "type=openedBy"),    $lang->bug->openedByMe)    . "</li>";
     echo "<li id='resolvedByTab'>"  . html::a(inlink('bug', "type=resolvedBy"),  $lang->bug->resolvedByMe)  . "</li>";
     echo "<li id='closedByTab'>"    . html::a(inlink('bug', "type=closedBy"),    $lang->bug->closedByMe)    . "</li>";
     ?>
-  </nav>
+  </ul>
 </div>
 <form method='post' action='<?php echo $this->createLink('bug', 'batchEdit', "productID=0");?>'>
   <table class='table table-condensed table-hover table-striped table-borderless tablesorter' id='bugList'>

module/project/control.php

@@ -50,6 +50,7 @@ class project extends control
         $this->view->projectStats  = $this->project->getProjectStats($status);
         $this->view->projectID     = $projectID;
         $this->view->users         = $this->loadModel('user')->getPairs('noletter');
+        $this->view->status        = $status;
 
         $this->display();
     }

module/project/css/common.css

@@ -1,3 +0,0 @@
-#productsBox  span{display:block; float:left; width:250px; overflow:hidden; word-break:keep-all; white-space:nowrap}
-#whitelistBox span{display:block; float:left; width:150px; overflow:hidden; word-break:keep-all; white-space:nowrap}
-caption a{padding:5px}

module/project/css/create.css

@@ -1 +1,10 @@
-#goal,#desc{width: 89.3%}
+#tipsModal {margin-top: 10%;}
+#copyProjects {padding: 0}
+#copyProjects {padding: 0 2px}
+#copyProjects > div {position: relative;}
+#copyProjects a {display: block; min-height: 30px; line-height: 30px; padding: 5px 15px; border: 1px solid #e5e5e5; color: #333; margin: 5px 0}
+#copyProjects a > i {display: inline-block; margin-right: 5px;}
+#copyProjects a:hover {border:1px solid #39B3D7; background-color: #E5F9FF; text-decoration: none}
+#copyProjects a.active {border-color: #229F24; color: #229F24; background-color: #E5FFE6}
+#copyProjects a.active:after {position: absolute; content: '\e60d'; font-family: ZenIcon; font-size: 20px; right: 25px;}
+#copyProjects a.cancel {color: #D2322D}

module/project/js/create.js

@@ -1,16 +1,10 @@
-function switchCopyProject(switcher)
-{
-    if($(switcher).attr('checked'))
-    {
-        $('#copyProjectBox').removeClass('hidden');
-    }
-    else
-    {
-        $('#copyProjectBox').addClass('hidden');
-    }
-}
-
 function setCopyProject(projectID)
 {
     location.href = createLink('project', 'create', 'projectID=0&copyProjectID=' + projectID);
 }
+
+$(function()
+{
+    $('#cpmBtn').click(function(){$('#copyProjectModal').modal('show')});
+    $('#copyProjects a').click(function(){setCopyProject($(this).data('id')); $('#copyProjectModal').modal('hide')});
+});

module/project/lang/zh-cn.php

@@ -21,6 +21,8 @@ $lang->project->name          = '项目名称';
 $lang->project->code          = '项目代号';
 $lang->project->begin         = '开始日期';
 $lang->project->end           = '结束日期';
+$lang->project->dateRange     = '起始日期';
+$lang->project->to            = '至';
 $lang->project->days          = '可用工作日';
 $lang->project->day           = '天';
 $lang->project->status        = '项目状态';
@@ -181,6 +183,12 @@ $lang->project->doneProjects    = '已结束';
 $lang->project->unDoneProjects  = '未结束';
 $lang->project->copyTeam        = '复制团队';
 $lang->project->noMatched       = '找不到包含"%s"的项目';
+$lang->project->copyTitle       = '请选择一个项目来复制';
+$lang->project->copyNoProject   = '没有可用的项目来复制';
+$lang->project->copyFromProject = '复制自项目： <strong>%s</strong>';
+$lang->project->reCopyProject   = '重新复制';
+$lang->project->cancelCopy      = '取消复制';
+$lang->project->byPeriod        = '按时间段';
 
 /* 交互提示。*/
 $lang->project->confirmDelete         = '您确定删除项目[%s]吗？';

module/project/view/batchedit.html.php

@@ -10,20 +10,27 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/colorize.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
-<form method='post' action='<?php echo inLink('batchEdit');?>'>
-<table class='table-1 fixed colored'>
-  <tr class='colhead'>
-    <th class='w-30px'>     <?php echo $lang->idAB;?></th>
-    <th class='red'>        <?php echo $lang->project->name;?></th>
-    <th class='w-150px red'><?php echo $lang->project->code;?></th>
-    <th class='w-100px'>    <?php echo $lang->project->PM;?></th>
-    <th class='w-100px'>    <?php echo $lang->project->status;?></th>
-    <th class='w-150px red'><?php echo $lang->project->begin;?></th>
-    <th class='w-150px red'><?php echo $lang->project->end;?></th>
-    <th class='w-150px'>    <?php echo $lang->project->days;?></th>
-  </tr>
+<div id='titlebar'>
+  <div class='heading'>
+    <span class='prefix'><?php echo html::icon($lang->icons['project']);?></span>
+    <strong><small class='text-muted'><?php echo html::icon($lang->icons['batchEdit']);?></small> <?php echo $lang->project->common . $lang->colon . $lang->project->batchEdit;?></strong>
+  </div>
+</div>
+<form class='form-condensed' method='post' action='<?php echo inLink('batchEdit');?>'>
+<table class='table table-fixed table-form'>
+  <thead>
+    <tr class='text-center'>
+      <th class='w-30px'>     <?php echo $lang->idAB;?></th>
+      <th class='required'>        <?php echo $lang->project->name;?></th>
+      <th class='w-150px required'><?php echo $lang->project->code;?></th>
+      <th class='w-110px'>    <?php echo $lang->project->PM;?></th>
+      <th class='w-100px'>    <?php echo $lang->project->status;?></th>
+      <th class='w-110px required'><?php echo $lang->project->begin;?></th>
+      <th class='w-110px required'><?php echo $lang->project->end;?></th>
+      <th class='w-150px'>    <?php echo $lang->project->days;?></th>
+    </tr>
+  </thead>
   <?php foreach($projectIDList as $projectID):?>
   <tr class='text-center'>
     <td><?php echo sprintf('%03d', $projectID) . html::hidden("projectIDList[$projectID]", $projectID);?></td>
@@ -31,12 +38,17 @@
     <td><?php echo html::input("codes[$projectID]",     $projects[$projectID]->code, "class='form-control'");?></td>
     <td><?php echo html::select("PMs[$projectID]",      $pmUsers, $projects[$projectID]->PM, 'class=form-control');?></td>
     <td><?php echo html::select("statuses[$projectID]", $lang->project->statusList, $projects[$projectID]->status, 'class=form-control');?></td>
-    <td><?php echo html::input("begins[$projectID]",    $projects[$projectID]->begin, "class='text-1 w-date date' onchange='computeWorkDays(this.id)'");?></td>
-    <td><?php echo html::input("ends[$projectID]",      $projects[$projectID]->end, "class='text-1 w-date date' onchange='computeWorkDays(this.id)'");?></td>
-    <td><?php echo html::input("dayses[$projectID]",    $projects[$projectID]->days, "class='w-100px'") . $lang->project->day;?></td>
+    <td><?php echo html::input("begins[$projectID]",    $projects[$projectID]->begin, "class='form-control form-date' onchange='computeWorkDays(this.id)'");?></td>
+    <td><?php echo html::input("ends[$projectID]",      $projects[$projectID]->end, "class='form-control form-date' onchange='computeWorkDays(this.id)'");?></td>
+    <td>
+      <div class='input-group'>
+        <?php echo html::input("dayses[$projectID]",    $projects[$projectID]->days, "class='form-control'");?>
+        <span class='input-group-addon'><?php echo $lang->project->day;?></span>
+      </div>
+    </td>
   </tr>
   <?php endforeach;?>
-  <tfoot><tr><td colspan='8' class='text-center'><?php echo html::submitButton();?></td></tr></tfoot>
+  <tr><td colspan='8' class='text-center'><?php echo html::submitButton();?></td></tr>
 </table>
 </form>
 <?php include '../../common/view/footer.html.php';?>

module/project/view/create.html.php

@@ -11,18 +11,26 @@
  */
 ?>
 <?php if(isset($tips)):?>
+<?php $defaultURL = $this-> createLink('project', 'task', 'projectID=' . $projectID);?>
 <?php include '../../common/view/header.lite.html.php';?>
-<?php include '../../common/view/colorbox.html.php';?>
-<body style='background:white'>
-<script language='Javascript'>
-var tips      = <?php echo json_encode($tips);?>;
-var projectID = <?php echo $projectID;?>;
-defaultURL    = createLink('project', 'task', 'projectID=' + projectID);
-$(document).ready(function() 
-{
-    $.fn.colorbox({html:tips, open:true, transition:'none', width:450, height:250, onCleanup:function(){parent.location.href=defaultURL;}});
-});
+<body>
+<script>
+$(document).ready(function() {$('#tipsModal').modal('show');});
 </script>
+<div class='modal fade' id='tipsModal'>
+  <div class='modal-dialog mw-500px'>
+    <div class='modal-header'>
+      <a href='<?php echo $defaultURL;?>' class='close'>&times;</a>
+      <h4 class='modal-title' id='myModalLabel'><i class='icon-info-sign'></i></h4>
+    </div>
+    <div class='modal-body'>
+      <?php echo $tips;?>
+    </div>
+    <div class='modal-footer'>
+      <div class='text-center'><a href='<?php echo $defaultURL;?>' class='btn btn-primary'><?php echo $lang->project->task;?> <i class='icon-arrow-right'></i></div></a>
+    </div>
+  </div>
+</div>
 </body>
 </html>
 <?php exit;?>
@@ -32,68 +40,124 @@ $(document).ready(function()
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::import($jsRoot . 'misc/date.js');?>
 <?php js::set('holders', $lang->project->placeholder);?>
-<form method='post' target='hiddenwin' id='dataform'>
-  <table align='center' class='table-1 a-left'> 
-    <caption>
-      <div class='f-left'><?php echo $lang->project->create;?></div>
-      <div class='text-right'><?php echo html::checkbox('', $lang->project->copy . '?', '', 'onclick=switchCopyProject(this);');?></div>
-    </caption>
-    <?php if($projects):?>
-    <tr id='copyProjectBox' <?php if($copyProjectID == 0) echo "class='hidden'";?>>
-      <th class='rowhead'><?php echo $lang->project->copy;?></th>
-      <td><?php echo html::select('', $projects, $copyProjectID, "class='form-control' onchange=setCopyProject(this.value)");?></td>
-    </tr>  
-    <?php endif;?>
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->name;?></th>
-      <td><?php echo html::input('name', $name, "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->code;?></th>
-      <td><?php echo html::input('code', $code, "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->begin;?></th>
-      <td><?php echo html::input('begin',date('Y-m-d'), "class='text-3 date' onchange='computeWorkDays()'");?></td>
-    </tr>  
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->end;?></th>
-      <td>
-         <?php echo html::input('end', '', "class='text-3 date' onchange='computeWorkDays()'");?>
-         <span><?php echo html::radio('delta', $lang->project->endList , '', "onclick='computeEndDate(this.value)'");?></span>
-      </td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->days;?></th>
-      <td><?php echo html::input('days', '', "class='form-control'") . $lang->project->day;?></td>
-    </tr>  
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->teamname;?></th>
-      <td><?php echo html::input('team', $team, "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->type;?></th>
-      <td><?php echo html::select('type', $lang->project->typeList, '', "class='form-control'") . $lang->project->typeDesc;?></td>
-    </tr>  
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->manageProducts;?></th>
-      <td class='text-left' id='productsBox'><?php echo html::select("products[]", $allProducts, $products, "class='select-1 chosen' data-placeholder='{$lang->project->linkProduct}' multiple");?></td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->desc;?></th>
-      <td><?php echo html::textarea('desc', '', "rows='6' class='area-1'");?></td>
-    </tr>  
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->acl;?></th>
-      <td><?php echo nl2br(html::radio('acl', $lang->project->aclList, $acl, "onclick='setWhite(this.value);'"));?></td>
-    </tr>  
-    <tr id='whitelistBox' <?php if($acl != 'custom') echo "class='hidden'";?>>
-      <th class='rowhead'><?php echo $lang->project->whitelist;?></th>
-      <td><?php echo html::checkbox('whitelist', $groups, $whitelist);?></td>
-    </tr>  
-    <tr>
-      <td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?></td>
-    </tr>
-  </table>
-</form>
+<div class='container mw-900px'>
+  <div id='titlebar'>
+    <div class='heading'>
+      <span class='prefix'><?php echo html::icon($lang->icons['project']);?></span>
+      <strong><small class='text-muted'><i class='icon icon-plus'></i></small> <?php echo $lang->project->create;?></strong>
+    </div>
+    <div class='actions'>
+      <?php if($copyProjectID != 0):?>
+      <div class='text text-success'>
+        <i class='icon-ok-sign'></i> <?php printf($lang->project->copyFromProject, html::icon($lang->icons['project']) . ' ' . $projects[$copyProjectID]);?>
+      </div>
+      <div class='btn-group'>
+        <a class='btn text-danger' href='javascript:setCopyProject("");'><?php echo html::icon($lang->icons['cancel']) . ' ' . $lang->project->cancelCopy;?> ?</a>
+        <button class='btn btn-primary' id='cpmBtn'><?php echo html::icon($lang->icons['copy']) . ' ' . $lang->project->reCopyProject;?> ?</button>
+      </div>
+      <?php else:?>
+      <button class='btn btn-primary' id='cpmBtn'><?php echo html::icon($lang->icons['copy']) . ' ' . $lang->project->copy;?> ?</button>
+      <?php endif; ?>
+    </div>
+  </div>
+  <form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
+    <table class='table table-form'> 
+      <tr>
+        <th class='w-90px'><?php echo $lang->project->name;?></th>
+        <td class='w-p50'><?php echo html::input('name', $name, "class='form-control'");?></td><td></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->project->code;?></th>
+        <td><?php echo html::input('code', $code, "class='form-control'");?></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->project->dateRange;?></th>
+        <td>
+          <div class='input-group'>
+            <?php echo html::input('begin',date('Y-m-d'), "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->begin . "'");?>
+            <span class='input-group-addon'><?php echo $lang->project->to;?></span>
+            <?php echo html::input('end', '', "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->end . "'");?>
+            <div class='input-group-btn'>
+              <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><?php echo $lang->project->byPeriod;?> <span class='caret'></span></button>
+              <ul class='dropdown-menu'>
+              <?php foreach ($lang->project->endList as $key => $name):?>
+                <li><a href='javascript:computeEndDate("<?php echo $key;?>")'><?php echo $name;?></a></li>
+              <?php endforeach;?>
+              </ul>
+            </div>
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->project->days;?></th>
+        <td>
+          <div class='input-group'>
+          <?php echo html::input('days', '', "class='form-control'");?>
+            <span class='input-group-addon'><?php echo $lang->project->day;?></span>
+          </div>
+        </td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->project->teamname;?></th>
+        <td><?php echo html::input('team', $team, "class='form-control'");?></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->project->type;?></th>
+        <td>
+          <?php echo html::select('type', $lang->project->typeList, '', "class='form-control'");?>
+          <div class='help-block'><i class='icon-question-sign'></i> <?php echo $lang->project->typeDesc;?></div>
+        </td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->project->manageProducts;?></th>
+        <td class='text-left' id='productsBox' colspan="2"><?php echo html::select("products[]", $allProducts, $products, "class='form-control chosen' data-placeholder='{$lang->project->linkProduct}' multiple");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->project->desc;?></th>
+        <td colspan='2'><?php echo html::textarea('desc', '', "rows='6' class='area-1'");?></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->project->acl;?></th>
+        <td colspan='2'><?php echo nl2br(html::radio('acl', $lang->project->aclList, $acl, "onclick='setWhite(this.value);'", 'block'));?></td>
+      </tr>  
+      <tr id='whitelistBox' <?php if($acl != 'custom') echo "class='hidden'";?>>
+        <th><?php echo $lang->project->whitelist;?></th>
+        <td colspan='2'><?php echo html::checkbox('whitelist', $groups, $whitelist);?></td>
+      </tr>  
+      <tr>
+        <td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?></td>
+      </tr>
+    </table>
+  </form>
+</div>
+<div class='modal fade' id='copyProjectModal'>
+  <div class='modal-dialog mw-800px'>
+    <div class='modal-header'>
+      <button type='button' class='close' data-dismiss='modal'>&times;</button>
+      <h4 class='modal-title' id='myModalLabel'><i class='icon-copy'></i> <?php echo $lang->project->copy;?> <small><?php echo $lang->project->copyTitle;?></small></h4>
+    </div>
+    <div class='modal-body'>
+      <?php if(count($projects) == 1):?>
+      <div class='alert alert-warning'>
+        <i class='icon-info-sign'></i>
+        <div class='content'>
+          <p><?php echo $lang->project->copyNoProject;?></p>
+        </div>
+      </div>
+      <?php else:?>
+      <div id='copyProjects' class='row'>
+      <?php foreach ($projects as $id => $name):?>
+        <div class='col-md-4 col-sm-6'>
+        <?php if(empty($id)):?>
+          <a href='javascript:;' data-id='' class='cancel'><?php echo html::icon($lang->icons['cancel']) . ' ' . $lang->project->cancelCopy;?></a>
+        <?php else: ?>
+          <a href='javascript:;' data-id='<?php echo $id;?>' class='nobr <?php echo ($copyProjectID == $id) ? ' active' : '';?>'><?php echo html::icon($lang->icons['project'], 'text-muted') . ' ' . $name;?></a>
+        <?php endif; ?>
+        </div>
+      <?php endforeach;?>
+      </div>
+      <?php endif;?>
+    </div>
+  </div>
+</div>
 <?php include '../../common/view/footer.html.php';?>

module/project/view/index.html.php

@@ -11,29 +11,36 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/sparkline.html.php';?>
-<?php include '../../common/view/colorize.html.php';?>
-<h3>
-  <?php echo html::a(inlink("index", "locate=no&status=all&projectID=$project->id"), $lang->project->all);?>
-  <?php echo html::a(inlink("index", "locate=no&status=wait&projectID=$project->id"), $lang->project->statusList['wait']);?>
-  <?php echo html::a(inlink("index", "locate=no&status=doing&projectID=$project->id"), $lang->project->statusList['doing']);?>
-  <?php echo html::a(inlink("index", "locate=no&status=suspended&projectID=$project->id"), $lang->project->statusList['suspended']);?>
-  <?php echo html::a(inlink("index", "locate=no&status=done&projectID=$project->id"), $lang->project->statusList['done']);?>
-</h3>
-<form method='post' action='<?php echo inLink('batchEdit', "projectID=$projectID");?>'>
-<table class='table-1 fixed colored'>
-  <tr class='colhead'>
-    <th class='w-id'>   <?php echo $lang->idAB;?></th>
-    <th class='w-150px'><?php echo $lang->project->name;?></th>
-    <th><?php echo $lang->project->code;?></th>
-    <th><?php echo $lang->project->PM;?></th>
-    <th><?php echo $lang->project->end;?></th>
-    <th><?php echo $lang->project->status;?></th>
-    <th><?php echo $lang->project->totalEstimate;?></th>
-    <th><?php echo $lang->project->totalConsumed;?></th>
-    <th><?php echo $lang->project->totalLeft;?></th>
-    <th class='w-150px'><?php echo $lang->project->progess;?></th>
-    <th class='w-100px'><?php echo $lang->project->burn;?></th>
-  </tr>
+<div id='featurebar'>
+  <div class='heading'><?php echo html::icon($lang->icons['project']) . ' ' . $lang->project->allProject;?>  </div>
+  <div class='btn-group pull-right'>
+    <?php echo html::a($this->createLink('project', 'create'), "<i class='icon-plus'></i> " . $lang->project->create,'', "class='btn'") ?>
+  </div>
+  <ul class='nav'>
+  <?php echo "<li id='allTab'>" . html::a(inlink("index", "locate=no&status=all&projectID=$project->id"), $lang->project->all) . '</li>';?>
+    <?php echo "<li id='waitTab'>" . html::a(inlink("index", "locate=no&status=wait&projectID=$project->id"), $lang->project->statusList['wait']) . '</li>';?>
+    <?php echo "<li id='doingTab'>" . html::a(inlink("index", "locate=no&status=doing&projectID=$project->id"), $lang->project->statusList['doing']) . '</li>';?>
+    <?php echo "<li id='suspendedTab'>" . html::a(inlink("index", "locate=no&status=suspended&projectID=$project->id"), $lang->project->statusList['suspended']) . '</li>';?>
+    <?php echo "<li id='doneTab'>" . html::a(inlink("index", "locate=no&status=done&projectID=$project->id"), $lang->project->statusList['done']) . '</li>';?>
+  </ul>
+</div>
+<form class='form-condensed' method='post' action='<?php echo inLink('batchEdit', "projectID=$projectID");?>'>
+<table class='table table-fixed'>
+  <thead>
+    <tr>
+      <th class='w-id'>   <?php echo $lang->idAB;?></th>
+      <th class='w-150px'><?php echo $lang->project->name;?></th>
+      <th><?php echo $lang->project->code;?></th>
+      <th><?php echo $lang->project->PM;?></th>
+      <th><?php echo $lang->project->end;?></th>
+      <th><?php echo $lang->project->status;?></th>
+      <th><?php echo $lang->project->totalEstimate;?></th>
+      <th><?php echo $lang->project->totalConsumed;?></th>
+      <th><?php echo $lang->project->totalLeft;?></th>
+      <th class='w-150px'><?php echo $lang->project->progess;?></th>
+      <th class='w-100px'><?php echo $lang->project->burn;?></th>
+    </tr>
+  </thead>
   <?php $canBatchEdit = common::hasPriv('project', 'batchEdit'); ?>
   <?php foreach($projectStats as $project):?>
   <tr class='text-center'>
@@ -51,20 +58,20 @@
     <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'>
       <img src='<?php echo $defaultTheme;?>images/main/green.png' width=<?php echo $project->hours->progress;?> height='13' text-align: />
       <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;?>
   <?php if($canBatchEdit):?>
   <tfoot>
     <tr>
-      <td colspan='10' class='text-right'>
-        <div class='f-left'>
-        <?php echo html::selectAll() . html::selectReverse();?>
-        <?php echo html::submitButton($lang->project->batchEdit);?>
+      <td colspan='10'>
+        <div class='table-actions clearfix'>
+        <?php echo "<div class='btn-group'>" . html::selectAll() . html::selectReverse() . '</div>';?>
+        <?php echo html::submitButton(html::icon($lang->icons['edit']) . ' ' . $lang->project->batchEdit);?>
         </div>
       </td>
     </tr>
@@ -72,4 +79,5 @@
   <?php endif;?>
 </table>
 </form>
+<script>$("#<?php echo $status;?>Tab").addClass('active');</script>
 <?php include '../../common/view/footer.html.php';?>

module/task/js/create.js

@@ -97,7 +97,7 @@ function setStories(moduleID, projectID)
 
 $(document).ready(function()
 {
-    var options = {no_results_text: noResultsMatch, allow_single_deselect: true, disable_search_threshold: 10, width: '100%', placeholder_text_single: selectAnOption, placeholder_text_multiple: selectSoomeOptions};
+    var options = {no_results_text: noResultsMatch, allow_single_deselect: true, disable_search_threshold: 10, width: '100%', placeholder_text_single: selectAnOption, placeholder_text_multiple: selectSomeOptions};
     setPreview();
     $("#story").chosen(options);
     $("#mailto").chosen(options);

www/theme/default/style.css

@@ -387,6 +387,7 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
 #titlebar > .heading > small > i {position: relative; top: 1px;}
 #titlebar .actions {position: absolute; right: 20px; top: 13px;}
 #titlebar .actions > .btn, #titlebar .actions > .btn-group {margin-left: 8px;}
+#titlebar .actions > .text {display: inline-block; margin-left: 8px;}
 
 /* table in outer */
 .outer .table {margin-bottom: 0;}
@@ -654,6 +655,3 @@ td>select{padding-left: 0;padding-right: 0}
 .link-button a{ color:#036; font-weight:normal; font-size:14px;padding: 3px 4px;}
 .link-button a i{font-size: 18px;}
 .link-button a:hover {color:#000;}
-
-.alert{padding: 15px; margin-bottom: 20px; border: 1px solid transparent; border-radius: 3px; background-color: #f1f1f1; border-color: #e4e4e4; color: #333;}
-.alert-danger{background-color: #ffe6e5; border-color: #ffccd3; color: #d2322d;}