From a3985d73d7a1a6e7048394a70ba6e2c06004b9e5 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Fri, 25 Apr 2014 18:10:59 +0800
Subject: [PATCH]  * ajusted style.

---
 module/common/view/chosen.html.php           |  2 +-
 module/doc/view/createlib.html.php           |  9 +++--
 module/productplan/view/create.html.php      |  2 +-
 module/project/css/burn.css                  |  2 +-
 module/project/css/create.css                | 13 +++++++
 module/project/css/importtask.css            |  2 ++
 module/project/css/managemembers.css         |  4 +++
 module/project/lang/zh-cn.php                |  2 +-
 module/project/view/build.html.php           |  4 +--
 module/project/view/burn.html.php            |  2 ++
 module/project/view/create.html.php          | 38 +++++++-------------
 module/project/view/importtask.html.php      | 18 ++++------
 module/project/view/managemembers.html.php   | 14 ++------
 module/project/view/story.html.php           |  2 +-
 module/project/view/team.html.php            |  2 +-
 module/report/css/common.css                 |  7 ++--
 module/report/view/blockreportlist.html.php  |  3 +-
 module/report/view/bugassign.html.php        |  9 +++--
 module/report/view/bugsummary.html.php       | 10 +++---
 module/report/view/productinfo.html.php      |  9 +++--
 module/report/view/projectdeviation.html.php |  9 +++--
 module/report/view/workload.html.php         |  9 +++--
 module/task/css/create.css                   |  2 +-
 module/task/js/create.js                     |  6 ++--
 module/task/view/create.html.php             | 17 +++++----
 www/theme/default/style.css                  | 11 +++---
 26 files changed, 101 insertions(+), 107 deletions(-)
 create mode 100644 module/project/css/importtask.css

diff --git a/module/common/view/chosen.html.php b/module/common/view/chosen.html.php
index 8cc40298e8..7043ac27d8 100755
--- a/module/common/view/chosen.html.php
+++ b/module/common/view/chosen.html.php
@@ -9,7 +9,7 @@ if($config->debug)
 <script> 
 noResultsMatch       = '<?php echo $lang->noResultsMatch;?>';
 chooseUsersToMail    = '<?php echo $lang->chooseUsersToMail;?>';
-defaultChosenOptions = {no_results_text: noResultsMatch, allow_single_deselect: true, disable_search_threshold: 10, width: '100%', placeholder_text_single: ' ', placeholder_text_multiple: ' ', search_contains: true};
+defaultChosenOptions = {no_results_text: noResultsMatch, allow_single_deselect: true, disable_search_threshold: 1, width: '100%', placeholder_text_single: ' ', placeholder_text_multiple: ' ', search_contains: true};
 $(document).ready(function()
 {
     $("#mailto").attr('data-placeholder', chooseUsersToMail);
diff --git a/module/doc/view/createlib.html.php b/module/doc/view/createlib.html.php
index a8e3595bef..9c95971fab 100644
--- a/module/doc/view/createlib.html.php
+++ b/module/doc/view/createlib.html.php
@@ -18,12 +18,11 @@
   </div>
 </div>
 <div class='main'>
-  <form method='post' class='form-condensed'>
-    <div class='form-group'>
-      <label for="name"><?php echo $lang->doc->libName;?></label>
-      <?php echo html::input('name', '', "class='form-control'");?>
+  <form method='post' class='form-condensed' style='margin: 30px 50px'>
+    <div class='input-group'>
+      <?php echo html::input('name', '', "class='form-control' placeholder='{$lang->doc->libName}'");?>
+      <span class='input-group-btn'><?php echo html::submitButton();?></span>
     </div>
-    <?php echo html::submitButton();?>
   </form>
 </div>
 <?php include '../../common/view/footer.lite.html.php';?>
diff --git a/module/productplan/view/create.html.php b/module/productplan/view/create.html.php
index d87b1dca29..8cd3babdea 100644
--- a/module/productplan/view/create.html.php
+++ b/module/productplan/view/create.html.php
@@ -14,7 +14,7 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::import($jsRoot . 'misc/date.js');?>
-<div class='container mw-900px'>
+<div class='container'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['plan']);?></span>
diff --git a/module/project/css/burn.css b/module/project/css/burn.css
index b8b48a23ec..e379fba8e6 100644
--- a/module/project/css/burn.css
+++ b/module/project/css/burn.css
@@ -2,5 +2,5 @@
 .container .actions {margin-bottom: 10px; padding: 0 25px}
 .container .actions > .text {padding: 5px 5px 5px 15px; line-height: 20px}
 .mw-220px {max-width: 220px!important}
-#burn h1{font-size:14px;}
+#wrap h1{font-size:14px;}
 #interval{margin-right:10px;}
diff --git a/module/project/css/create.css b/module/project/css/create.css
index 3dfeaea03d..1871e373e8 100644
--- a/module/project/css/create.css
+++ b/module/project/css/create.css
@@ -1 +1,14 @@
 #tipsModal {margin-top: 10%;}
+#begin + .input-group-addon {border-left: none; border-right: none;}
+
+#copyProjectModal {padding: 0}
+#copyProjectModal {padding: 0 2px}
+#copyProjectModal > div {position: relative;}
+#copyProjectModal a {display: block; min-height: 30px; line-height: 30px; padding: 5px 15px; border: 1px solid #e5e5e5; color: #333; margin: 5px 0}
+#copyProjectModal a > i {display: inline-block; margin-right: 5px;}
+#copyProjectModal a:hover {border:1px solid #39B3D7; background-color: #E5F9FF; text-decoration: none}
+#copyProjectModal a.active {border-color: #229F24; color: #229F24; background-color: #E5FFE6}
+#copyProjectModal a.active:after {position: absolute; content: '\e60d'; font-family: ZenIcon; font-size: 20px; right: 25px;}
+#copyProjectModal a.cancel {color: #D2322D}
+
+.modal-dialog {margin-top: 10%;}
diff --git a/module/project/css/importtask.css b/module/project/css/importtask.css
new file mode 100644
index 0000000000..52d9648e69
--- /dev/null
+++ b/module/project/css/importtask.css
@@ -0,0 +1,2 @@
+#titlebar .input-group {position: relative; top: -6px; margin-left: 10px; width: 250px;}
+#titlebar .input-group-addon, #titlebar .form-control {font-size: 12px; padding: 5px 10px; line-height: 18px; height: 30px}
diff --git a/module/project/css/managemembers.css b/module/project/css/managemembers.css
index 07e5232c91..9f2f166590 100644
--- a/module/project/css/managemembers.css
+++ b/module/project/css/managemembers.css
@@ -10,3 +10,7 @@
 
 .outer .container .table-form {margin-top: 0;}
 .outer .table tr > th:first-child, .outer .table tr > td:first-child {padding-left: 5px;}
+
+.modal-dialog {margin-top: 10%;}
+
+.table-form thead > tr > th {background: none; border: none}
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 4f79f03b41..e07c9a0600 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -185,7 +185,7 @@ $lang->project->copyTeam        = '复制团队';
 $lang->project->copyFromTeam    = '复制自项目团队： <strong>%s</strong>';
 $lang->project->noMatched       = '找不到包含"%s"的项目';
 $lang->project->copyTitle       = '请选择一个项目来复制';
-$lang->project->copyTeamTitle   = '请选择一个已有的项目团队';
+$lang->project->copyTeamTitle   = '请选择一个项目团队来复制';
 $lang->project->copyNoProject   = '没有可用的项目来复制';
 $lang->project->copyFromProject = '复制自项目： <strong>%s</strong>';
 $lang->project->reCopy          = '重新复制';
diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php
index bb136635a9..dd3a6dc4fd 100644
--- a/module/project/view/build.html.php
+++ b/module/project/view/build.html.php
@@ -32,7 +32,7 @@
       <th><?php echo $lang->build->filePath;?></th>
       <th class='w-date'><?php echo $lang->build->date;?></th>
       <th class='w-user'><?php echo $lang->build->builder;?></th>
-      <th class='w-80px'><?php echo $lang->actions;?></th>
+      <th class='w-90px'><?php echo $lang->actions;?></th>
     </tr>
   </thead>
   <tbody>
@@ -47,7 +47,7 @@
     <td><?php echo $users[$build->builder]?></td>
     <td class='text-right'>
       <?php 
-      common::printIcon('testtask', 'create', "product=0&project=$project->id&build=$build->id", '', 'list');
+      common::printIcon('testtask', 'create', "product=0&project=$project->id&build=$build->id", '', 'list', 'check');
       $lang->project->bug = $lang->project->viewBug;
       common::printIcon('project', 'bug',  "project=$project->id&orderBy=status&build=$build->id", '', 'list');
       common::printIcon('build', 'edit',   "buildID=$build->id", '', 'list');
diff --git a/module/project/view/burn.html.php b/module/project/view/burn.html.php
index 7444a4ad4e..cfb60a02cd 100644
--- a/module/project/view/burn.html.php
+++ b/module/project/view/burn.html.php
@@ -12,6 +12,8 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include './taskheader.html.php';?>
+<?php js::set('projectID', $projectID);?>
+<?php js::set('type', $type);?>
 <div class='container text-center bd-0'>
   <div class='clearfix'>
     <div class='actions pull-right'>
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index dd4600b635..d90ae9ccce 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -32,31 +32,21 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::import($jsRoot . 'misc/date.js');?>
 <?php js::set('holders', $lang->project->placeholder);?>
-<div class='container mw-900px'>
+<div class='container'>
   <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->reCopy;?> ?</button>
-      </div>
-      <?php else:?>
-      <button class='btn btn-primary' id='cpmBtn'><?php echo html::icon($lang->icons['copy']) . ' ' . $lang->project->copy;?> ?</button>
-      <?php endif; ?>
+      <button class='btn' id='cpmBtn'><?php echo html::icon($lang->icons['copy']) . ' ' . $lang->project->copy;?></button>
     </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-p35-f'><?php echo html::input('name', $name, "class='form-control'");?></td><td></td>
+        <td class='w-p25-f'><?php echo html::input('name', $name, "class='form-control'");?></td><td></td>
       </tr>
       <tr>
         <th><?php echo $lang->project->code;?></th>
@@ -69,16 +59,11 @@
             <?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>
+        <td>
+          &nbsp; &nbsp; <?php echo html::radio('delta', $lang->project->endList , '', "onclick='computeEndDate(this.value)'");?>
+        </td>
       </tr>
       <tr>
         <th><?php echo $lang->project->days;?></th>
@@ -97,7 +82,9 @@
         <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>
+        <td>
+          <div class='help-block'><?php echo $lang->project->typeDesc;?></div>
         </td>
       </tr>
       <tr>
@@ -115,10 +102,9 @@
       <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>
       <tr>
-        <td></td>
-        <td colspan='2'><?php echo html::submitButton() . html::backButton();?></td>
+        <td></td><td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?></td>
       </tr>
     </table>
   </form>
@@ -127,7 +113,7 @@
   <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>
+      <h4 class='modal-title' id='myModalLabel'><?php echo $lang->project->copyTitle;?></h4>
     </div>
     <div class='modal-body'>
       <?php if(count($projects) == 1):?>
diff --git a/module/project/view/importtask.html.php b/module/project/view/importtask.html.php
index 28fbf0ac7e..48199c5e12 100644
--- a/module/project/view/importtask.html.php
+++ b/module/project/view/importtask.html.php
@@ -14,21 +14,17 @@
 <?php include '../../common/view/tablesorter.html.php';?>
 <div id='titlebar'>
   <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['task']);?></span>
-    <strong><small class='text-muted'><?php echo html::icon($lang->icons['import']);?></small> <?php echo $lang->project->importTask;?></strong>
+    <span class='prefix pull-left'><?php echo html::icon($lang->icons['task']);?></span>
+    <strong class='pull-left'><small class='text-muted'><?php echo html::icon($lang->icons['import']);?></small> <?php echo $lang->project->importTask;?></strong>
+    <div class='input-group pull-left'>
+      <?php $projects = array(0 => $lang->project->fromproject) + $projects;?>
+      <span class='input-group-addon'><?php echo $lang->project->selectProject;?></span>
+      <?php  echo html::select('fromproject', $projects, $fromProject, "onchange='reload($projectID, this.value)' class='form-control'");?>
+    </div>
   </div>
 </div>
 <form class='form-condensed' method='post' target='hiddenwin'>
   <table class='table tablesorter table-fixed'>
-    <caption class='text-left'>
-      <div class='form-group mg-0'>
-        <div class='input-group'>
-          <?php $projects = array(0 => $lang->project->fromproject) + $projects;?>
-          <span class='input-group-addon'><?php echo $lang->project->selectProject;?></span>
-          <?php  echo html::select('fromproject', $projects, $fromProject, "onchange='reload($projectID, this.value)' class='form-control' style='width: 200px'");?>
-        </div>
-      </div>
-    </caption>
     <thead>
     <tr class='colhead'>
       <th class='w-id'><?php echo $lang->idAB;?></th>
diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php
index f8d8484435..eb6e886f26 100644
--- a/module/project/view/managemembers.html.php
+++ b/module/project/view/managemembers.html.php
@@ -21,17 +21,7 @@
       <small class='text-muted'><i class='icon icon-cogs'></i></small>
     </div>
     <div class='actions'>
-      <?php if($team2Import != 0):?>
-      <div class='text text-success'>
-        <i class='icon-ok-sign'></i> <?php printf($lang->project->copyFromTeam, html::icon($lang->icons['group']) . ' ' . $teams2Import[$team2Import]);?>
-      </div>
-      <div class='btn-group'>
-        <a class='btn text-danger' href='javascript:importTeam(0);'><?php echo html::icon($lang->icons['cancel']) . ' ' . $lang->project->cancelCopy;?> ?</a>
-        <button class='btn btn-primary' id='itBtn'><?php echo html::icon($lang->icons['copy']) . ' ' . $lang->project->reCopy;?> ?</button>
-      </div>
-      <?php else:?>
-      <button class='btn btn-primary' id='itBtn'><?php echo html::icon($lang->icons['copy']) . ' ' . $lang->project->copyTeam;?> ?</button>
-      <?php endif; ?>
+      <button class='btn' id='itBtn'><?php echo html::icon($lang->icons['copy']) . ' ' . $lang->project->copyTeam;?></button>
     </div>
   </div>
   <form class='form-condensed' method='post'>
@@ -103,7 +93,7 @@
   <div class='modal-dialog mw-700px'>
     <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->copyTeam;?> <small><?php echo $lang->project->copyTeamTitle;?></small></h4>
+      <h4 class='modal-title' id='myModalLabel'><?php echo $lang->project->copyTeamTitle;?></h4>
     </div>
     <div class='modal-body'>
       <?php if(count($teams2Import) == 1):?>
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index 6689177341..3ca97922e1 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -92,7 +92,7 @@
           if(common::hasPriv('project', 'unlinkStory'))
           {
               $unlinkURL = $this->createLink('project', 'unlinkStory', "projectID=$project->id&storyID=$story->id&confirm=yes");
-              echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '<i class="icon-remove"></i>', '', "class='btn-icon' title='{$lang->project->unlinkStory}'");
+              echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '<i class="icon-unlink"></i>', '', "class='btn-icon' title='{$lang->project->unlinkStory}'");
           }
           ?>
         </td>
diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php
index 9ecc1ca4fe..9ecfa4858c 100644
--- a/module/project/view/team.html.php
+++ b/module/project/view/team.html.php
@@ -19,7 +19,7 @@
       <?php echo html::icon($lang->icons['team']);?> <?php echo $lang->project->team;?>
     </div>
     <div class='actions'>
-      <?php common::printLink('project', 'managemembers', "projectID=$project->id", "<i class='icon-cogs'></i> " . $lang->project->manageMembers, '', "class='btn btn-primary'");?>
+      <?php common::printLink('project', 'managemembers', "projectID=$project->id", $lang->project->manageMembers, '', "class='btn btn-primary'");?>
     </div>
   </div>
   <table class='table tablesorter' id='memberList'>
diff --git a/module/report/css/common.css b/module/report/css/common.css
index ea267d4e62..a5a8bff3ce 100644
--- a/module/report/css/common.css
+++ b/module/report/css/common.css
@@ -3,9 +3,7 @@
 .choose-date span{line-height:20px;}
 .date{width:80px;}
 ul li{list-style:none;}
-/*#product td, tr, th{ border:1px solid #E4E4E4;}*/
-/*#workload td, tr, th{ border:1px solid #E4E4E4;}*/
-/*#bug td, tr, th{ border:1px solid #E4E4E4;}*/
+
 #product p{margin:2px 0;}
 .table-bordered, .outer.with-side .main, .outer.with-side > form > .table, .outer.with-side > .table{border: none}
 
@@ -19,6 +17,7 @@ ul li{list-style:none;}
 .main > .input-group > .datepicker-wrapper {display: table-cell;}
 .main > .input-group > .datepicker-wrapper > .form-control {padding: 5px 10px; height: 30px}
 .main > .input-group > .datepicker-wrapper:before {top: 4px}
+.main > .input-group > .datepicker-wrapper + .input-group-addon {border-left: none;border-right: none;}
 
 td .deviation{padding-left:20px; text-align:left;}
 .up{color:red; padding-right:2px;}
@@ -30,3 +29,5 @@ td .deviation{padding-left:20px; text-align:left;}
 .u0{color:#FFCB05;}
 .d0{color:#76B043;}
 .d20{color:#33A52E;}
+
+#titlebar {display: none}
diff --git a/module/report/view/blockreportlist.html.php b/module/report/view/blockreportlist.html.php
index 317f0540dd..9d0bf2919d 100644
--- a/module/report/view/blockreportlist.html.php
+++ b/module/report/view/blockreportlist.html.php
@@ -7,7 +7,8 @@
         foreach($lang->reportList->$submenu->lists as $list)
         {
             list($label, $module, $method) = explode('|', $list);
-            echo html::a($this->createLink($module, $method), "<i class='icon-file-powerpoint'></i> " . $label, '', "class='list-group-item'");
+            $class = $label == $title ? ' active' : '';
+            echo html::a($this->createLink($module, $method), "<i class='icon-bar-chart'></i> " . $label, '', "class='list-group-item $class'");
         }
     ?>
     </ul>
diff --git a/module/report/view/bugassign.html.php b/module/report/view/bugassign.html.php
index cd250be7fe..a362d56122 100644
--- a/module/report/view/bugassign.html.php
+++ b/module/report/view/bugassign.html.php
@@ -4,16 +4,15 @@
     <span class='prefix'><?php echo html::icon($lang->icons['report-file']);?></span>
     <strong> <?php echo $title;?></strong>
   </div>
-  <div class='actions'>
+</div>
+<div class='side'>
+  <?php include 'blockreportlist.html.php';?>
+  <div class='panel panel-body' style='padding: 10px 6px'>
     <div class='text proversion'>
       <strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo $lang->report->proVersion;?></span>
     </div>
   </div>
 </div>
-<div class='side'>
-  <a class='side-handle' data-id='bugAssignTree'><i class='icon-caret-left'></i></a>
-  <?php include 'blockreportlist.html.php';?>
-</div>
 <div class='main'>
   <table class='table table-condensed table-striped table-bordered tablesorter table-fixed active-disabled' id='bugAssign'>
     <thead>
diff --git a/module/report/view/bugsummary.html.php b/module/report/view/bugsummary.html.php
index 64d31aeac6..a960d16711 100644
--- a/module/report/view/bugsummary.html.php
+++ b/module/report/view/bugsummary.html.php
@@ -5,17 +5,15 @@
     <span class='prefix'><?php echo html::icon($lang->icons['report-file']);?></span>
     <strong> <?php echo $title;?></strong>
   </div>
-  <div class='actions'>
+</div>
+<div class='side'>
+  <?php include 'blockreportlist.html.php';?>
+  <div class='panel panel-body' style='padding: 10px 6px'>
     <div class='text proversion'>
       <strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo $lang->report->proVersion;?></span>
     </div>
   </div>
 </div>
-<div class='side'>
-  <a class='side-handle' data-id='bugSummaryTree'><i class='icon-caret-left'></i></a>
-  <?php include 'blockreportlist.html.php';?>
-</div>
-
 <div class='main'>
   <div class='input-group w-300px input-group-sm'>
     <div class='datepicker-wrapper datepicker-date'><?php echo html::input('date', $begin, "class='w-100px form-control form-date' onchange='changeDate(this.value, \"$end\")'");?></div>
diff --git a/module/report/view/productinfo.html.php b/module/report/view/productinfo.html.php
index 475246d0fc..5edddba129 100644
--- a/module/report/view/productinfo.html.php
+++ b/module/report/view/productinfo.html.php
@@ -4,16 +4,15 @@
     <span class='prefix'><?php echo html::icon($lang->icons['report-file']);?></span>
     <strong> <?php echo $title;?></strong>
   </div>
-  <div class='actions'>
+</div>
+<div class='side'>
+  <?php include 'blockreportlist.html.php';?>
+  <div class='panel panel-body' style='padding: 10px 6px'>
     <div class='text proversion'>
       <strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo $lang->report->proVersion;?></span>
     </div>
   </div>
 </div>
-<div class='side'>
-  <a class='side-handle' data-id='productinfoTree'><i class='icon-caret-left'></i></a>
-  <?php include 'blockreportlist.html.php';?>
-</div>
 
 <div class='main'>
   <table class='table table-condensed table-striped table-bordered tablesorter table-fixed active-disabled' id='product'>
diff --git a/module/report/view/projectdeviation.html.php b/module/report/view/projectdeviation.html.php
index 1ac6d72073..816aad5ca7 100644
--- a/module/report/view/projectdeviation.html.php
+++ b/module/report/view/projectdeviation.html.php
@@ -4,16 +4,15 @@
     <span class='prefix'><?php echo html::icon($lang->icons['report-file']);?></span>
     <strong> <?php echo $title;?></strong>
   </div>
-  <div class='actions'>
+</div>
+<div class='side'>
+  <?php include 'blockreportlist.html.php';?>
+  <div class='panel panel-body' style='padding: 10px 6px'>
     <div class='text proversion'>
       <strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo $lang->report->proVersion;?></span>
     </div>
   </div>
 </div>
-<div class='side'>
-  <a class='side-handle' data-id='projectDeviationTree'><i class='icon-caret-left'></i></a>
-  <?php include 'blockreportlist.html.php';?>
-</div>
 <div class='main'>
   <table class='table table-condensed table-striped table-bordered tablesorter table-fixed active-disabled'>
     <thead>
diff --git a/module/report/view/workload.html.php b/module/report/view/workload.html.php
index d782f0d728..ac53591d44 100644
--- a/module/report/view/workload.html.php
+++ b/module/report/view/workload.html.php
@@ -4,16 +4,15 @@
     <span class='prefix'><?php echo html::icon($lang->icons['report-file']);?></span>
     <strong> <?php echo $title;?></strong>
   </div>
-  <div class='actions'>
+</div>
+<div class='side'>
+  <?php include 'blockreportlist.html.php';?>
+  <div class='panel panel-body' style='padding: 10px 6px'>
     <div class='text proversion'>
       <strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo $lang->report->proVersion;?></span>
     </div>
   </div>
 </div>
-<div class='side'>
-  <a class='side-handle' data-id='workloadTree'><i class='icon-caret-left'></i></a>
-  <?php include 'blockreportlist.html.php';?>
-</div>
 <div class='main'>
   <table class='table table-condensed table-striped table-bordered tablesorter table-fixed active-disabled' id="workload">
     <thead>
diff --git a/module/task/css/create.css b/module/task/css/create.css
index 10010701ab..9d64549f55 100644
--- a/module/task/css/create.css
+++ b/module/task/css/create.css
@@ -1 +1 @@
-#preview, #copyButton{line-height: 30px; position: relative; left: 10px}
+.input-group-btn {width: 0.01%}
diff --git a/module/task/js/create.js b/module/task/js/create.js
index 3011032b92..c9887597c8 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -60,7 +60,7 @@ function setPreview()
         var concat = config.requestType == 'PATH_INFO' ? '?'  : '&';
         storyLink  = storyLink + concat + 'onlybody=yes';
         $('#preview').removeClass('hidden');
-        $('#preview').attr('href', storyLink);
+        $('#preview a').attr('href', storyLink);
         $('#copyButton').removeClass('hidden');
     }
 
@@ -121,8 +121,6 @@ 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: selectSomeOptions};
     setPreview();
-    $("#story").chosen(options);
-    $("#mailto").chosen(options);
+    $("#story, #mailto").chosen(defaultChosenOptions);
 });
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 1aa7070d46..24057a0a6c 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -30,7 +30,7 @@
       </tr>  
       <tr>
         <th><?php echo $lang->task->module;?></th>
-        <td id='moduleIdBox' class='w-p35'><?php echo html::select('module', $moduleOptionMenu, $task->module, "class='form-control' onchange='setStories(this.value,$project->id)'");?></td><td class='w-p40'></td><td></td>
+        <td id='moduleIdBox' class='w-p25-f'><?php echo html::select('module', $moduleOptionMenu, $task->module, "class='form-control' onchange='setStories(this.value,$project->id)'");?></td><td class='w-p40'></td><td></td>
       </tr>
       <tr>
         <th><?php echo $lang->task->assignedTo;?></th>
@@ -43,16 +43,21 @@
       <tr>
         <th><?php echo $lang->task->story;?></th>
         <td colspan='2'>
-          <?php echo html::select('story', $stories, $task->story, 'class=form-control onchange=setStoryRelated();');?>
-        </td><td><a href='#' id='preview' class='iframe'><i class='icon-eye-open'></i> <?php echo $lang->preview;?></a></td>
+          <div class='input-group'>
+            <?php echo html::select('story', $stories, $task->story, "class=form-control onchange='setStoryRelated();'");?>
+            <span class='input-group-btn' id='preview'><a href='#' class='btn iframe'><i class='icon-eye-open'></i> <?php echo $lang->preview;?></a></span>
+          </div>
+        </td>
       </tr>  
       <tr>
         <th><?php echo $lang->task->name;?></th>
         <td colspan='2'>
-          <?php echo html::input('name', $task->name, "class='form-control'");?>
+          <div class='input-group'>
+            <?php echo html::input('name', $task->name, "class='form-control'");?>
+            <span class='input-group-btn'><a href='javascript:copyStoryTitle();' id='copyButton' class='btn'><i class='icon-copy'></i> <?php echo $lang->task->copyStoryTitle;?></a></span>
+          </div>
         </td>
-        <td><a href='#' id='copyButton' onclick='copyStoryTitle()'><i class='icon-copy'></i> <?php echo $lang->task->copyStoryTitle;?></a></td>
-      </tr>  
+      </tr>
       <tr>
         <th><?php echo $lang->task->desc;?></th>
         <td colspan='2'><?php echo html::textarea('desc', $task->desc, "rows='7' class='form-control'");?></td><td></td>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 6e54c24de4..f987a418ca 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -161,7 +161,7 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable
 .fail, [class$="-fail"]  {color:red}
 
 /* tabs */
-.nav-tabs > li > a {padding: 5px 10px; color: #333}
+.nav-tabs > li > a {padding: 5px 10px; color: #333; line-height: 20px;}
 .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {color: #333; font-weight: bold; line-height: 20px}
 .tab-content {border: 1px solid #ddd; border-top: 0; padding: 10px 10px}
 .tab-pane > h6 {margin-top: 0; margin-bottom: 3px;}
@@ -186,6 +186,8 @@ fieldset > .form-group {margin-bottom: 0;}
 .table-form > tbody > tr > td > .row {margin-right: 0;}
 .table-form > tbody > tr > td > .row > [class*="col-"] {padding-right: 0;line-height: 34px}
 .table-form > tbody > tr > td .checkbox {margin: 0}
+.table-form > tbody > tr > td > .radio:first-child {margin-top: 0;}
+.table-form > tbody > tr > td > .radio:last-child {margin-bottom: 0;}
 .table-form > tbody > tr > td .btn + .btn {margin-left: 8px;}
 .table-form > tbody > tr > td .btn-group .btn + .btn {margin-left: -1px;}
 .table-form  tr > td > .input-group {width: 100%}
@@ -446,7 +448,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
 .outer .table tfoot .pager {margin: 0;}
 
 /* color of a when visited */
-.outer .table tbody td a:visited, #crumbs a:visited, .side > a:visited {color: #551A8B}
+.outer .table tbody td > a:visited, #crumbs > a:visited, .side > a:visited {color: #551A8B}
 
 /* Querybox */
 #querybox {margin: 35px -10px -7px; background-color: #fff; height: 0; transition: all 1s; border-top: 1px solid #ddd; position: relative; z-index: 199; overflow: hidden; display: none; padding: 10px}
@@ -513,17 +515,18 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
 .pager .dropdown-menu > li {display: block; float: left; width: 70px; border-right: 1px dotted #ddd; border-bottom: 1px dotted #ddd}
 #_pageID, #goto {display: none}
 
-/* modal with iframe */
+/* modal */
+.modal-dialog {border: 8px solid #666; border-color: rgba(0,0,0,.25)}
 .modal-title {font-size: 14px;}
 
 /* modal with iframe */
-.modal-iframe {border: 8px solid #666; border-color: rgba(0,0,0,.25)}
 .modal-iframe .modal-body {padding: 0;}
 .modal.with-titlebar .modal-header, .modal-dialog.hide-header .modal-header{position: relative; height: 0; padding: 0; border: none; z-index: 999; min-height: 0}
 .modal.with-titlebar .modal-header .modal-body,  .modal-dialog.hide-header .modal-header .modal-body {z-index: 990}
 .modal.with-titlebar .modal-header .modal-title, .modal-dialog.hide-header .modal-header .modal-title {display: none}
 .modal.with-titlebar .modal-header .close, .modal-dialog.hide-header .modal-header .close {position: absolute; right: 15px; top: 15px}
 .body-modal {padding-bottom: 0; overflow: hidden;}
+.body-modal .outer > .row {margin: 10px 0 0}
 .body-modal .outer > form, .body-modal .outer > .container > form {margin: 10px 20px 10px; padding: 5px 20px 10px 10px;}
 .body-modal .outer > form > .table-form, .body-modal .outer > .container > form > .table-form {border:none;}
 .body-modal .outer > .main, .body-modal .outer > .container > .main, .body-modal > .main {padding: 10px 20px; margin: 0}