From 98afc277a36b7c9f9226fd4133e37293ab378bdd Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Mon, 31 Mar 2014 11:38:43 +0800
Subject: [PATCH]  * ajusted views of module 'bug'.

---
 module/bug/css/create.css               |   9 +-
 module/bug/css/edit.css                 |   2 -
 module/bug/view/buildtemplates.html.php |   8 +-
 module/bug/view/create.html.php         | 211 +++++++++++++-----------
 module/bug/view/edit.html.php           | 155 ++++++++---------
 module/task/view/create.html.php        |   2 +-
 module/task/view/edit.html.php          |  10 +-
 www/theme/default/style.css             |   1 +
 8 files changed, 207 insertions(+), 191 deletions(-)

diff --git a/module/bug/css/create.css b/module/bug/css/create.css
index 35240045b6..b826dd7d6e 100644
--- a/module/bug/css/create.css
+++ b/module/bug/css/create.css
@@ -1,9 +1,2 @@
-#steps {width:99.6%}
-.text-1 {width: 85%}
-#task, #story{width: 85.4%;}
-#mailto{width: 85.5%}
-#keywords{width: 85.1%;}
-.w-p100 {margin:0}
-/* The build template setting. */
-.button-c {padding:2px}
 .ke-outline .ke-icon-savetemplate {background-image: url(theme/default/images/kindeditor/save.gif); background-position: center; width: 56px; height: 20px;} 
+#tplBox {padding: 0}
diff --git a/module/bug/css/edit.css b/module/bug/css/edit.css
index b627c8cbcd..e69de29bb2 100644
--- a/module/bug/css/edit.css
+++ b/module/bug/css/edit.css
@@ -1,2 +0,0 @@
-select.select-3,#mailto,#module,#story-chzn {width:230px}
-.text-1   {width:220px}
diff --git a/module/bug/view/buildtemplates.html.php b/module/bug/view/buildtemplates.html.php
index 6e083196a4..f7fbf29b05 100644
--- a/module/bug/view/buildtemplates.html.php
+++ b/module/bug/view/buildtemplates.html.php
@@ -5,9 +5,9 @@ KindEditor.lang({'savetemplate' : '<?php echo $lang->bug->saveTemplate;?>'});
 <?php 
 foreach($templates as $key => $template)
 {
-    echo "<span id='tplBox$template->id'>";
-    echo '<nobr>' . $lang->arrow. " <span id='tplTitleBox$template->id' onclick='setTemplate($template->id)' style='text-decoration:underline; color:blue' class='hand'>$template->title</span>";
-    echo "&nbsp; <a href='javascript:void();' onclick='deleteTemplate($template->id)' class='link-icon'><i class='icon-remove icon-sm'></i></a></nobr>";
+    echo "<li id='tplBox$template->id' class='nobr'>";
+    echo $lang->arrow. " <a id='tplTitleBox$template->id' href='javascript:setTemplate($template->id)'>$template->title</a>";
+    echo "&nbsp; <a href='javascript:void();' onclick='deleteTemplate($template->id)'><i class='icon-remove'></i></a>";
     echo "<span id='template$template->id' class='hidden'>$template->content</span>";
-    echo '<br /></span>';
+    echo '</li>';
 }
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 28b6f3831d..98f2dec61c 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -22,101 +22,120 @@ js::set('createRelease', $lang->release->create);
 js::set('createBuild', $lang->build->create);
 js::set('refresh', $lang->refresh);
 ?>
+<div class='container'>
+  <div id='titlebar'>
+    <div class='heading'>
+      <span class='prefix'><?php echo html::icon($lang->icons['bug']);?></span>
+      <strong><small class='text-muted'><?php echo html::icon($lang->icons['create']);?></small> <?php echo $lang->bug->create;?></strong>
+    </div>
+  </div>
+  <form class='form-condensed' method='post' enctype='multipart/form-data' id='dataform' class='ajaxForm'>
+    <table class='table table-form'> 
+      <tr>
+        <th class='w-110px'><?php echo $lang->bug->lblProductAndModule;?></th>
+        <td class='w-400px'>
+          <?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value) class='form-control' autocomplete='off'");?>
 
-<form method='post' enctype='multipart/form-data' id='dataform' class='ajaxForm'>
-  <table class='table-1'> 
-    <caption><?php echo $lang->bug->create;?></caption>
-    <tr>
-      <th><?php echo $lang->bug->lblProductAndModule;?></th>
-      <td>
-        <?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()'");
-        if(count($moduleOptionMenu) == 1)
-        {
-            echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=bug"), $lang->tree->manage, '_blank');
-            echo html::a("javascript:loadProductModules($productID)", $lang->refresh);
-        }
-        ?>
-        </span>
-      </td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->bug->project;?></th>
-      <td><span id='projectIdBox'><?php echo html::select('project', $projects, $projectID, 'class=form-control onchange=loadProjectRelated(this.value) autocomplete="off"');?></span></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->bug->openedBuild;?></th>
-      <td>
-        <span id='buildBox'>
-        <?php echo html::select('openedBuild[]', $builds, $buildID, 'size=4 multiple=multiple class=select-3');?>
-        </span>
-      </td>
-    </tr>
-    <tr>
-      <th><nobr><?php echo $lang->bug->lblAssignedTo;?></nobr></th>
-      <td><span id='assignedToBox'><?php echo html::select('assignedTo', $users, $assignedTo, "class='form-control chosen'");?></span></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->bug->title;?></th>
-      <td><?php echo html::input('title', $bugTitle, "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <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>
-          <div class='bd-none' id='tplBox' style='position:absolute;top:0px;left:86%'><?php echo $this->fetch('bug', 'buildTemplates');?></div>
-        </div>
-      </td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->bug->lblStory;?></th>
-      <td>
-        <span id='storyIdBox'><?php echo html::select('story', $stories, $storyID);?></span>
-      </td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->bug->task;?></th>
-      <td><span id='taskIdBox'><?php echo html::select('task', $tasks, $taskID);?></span></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->bug->lblTypeAndSeverity;?></th>
-      <td> 
-        <?php echo html::select('type', $lang->bug->typeList, $type, 'class=form-control');?> 
-        <?php echo html::select('severity', $lang->bug->severityList, $severity, 'class=form-control');?>
-      </td>
-    </tr>
-    <tr>
-      <th><nobr><?php echo $lang->bug->lblSystemBrowserAndHardware;?></nobr></th>
-      <td>
-        <?php echo html::select('os', $lang->bug->osList, $os, 'class=form-control');?>
-        <?php echo html::select('browser', $lang->bug->browserList, $browser, 'class=form-control');?>
-      </td>
-    </tr>
-    <tr>
-      <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='text-right' onchange=\"setMailto('mailto', this.value)\"");
-        ?>
-      </td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->bug->keywords;?></th>
-      <td><?php echo html::input('keywords', $keywords, "class='form-control'");?></td>
-    </tr>
-    <tr>
-      <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='text-center'>
-        <?php echo html::submitButton() . html::backButton() . html::hidden('case', $caseID);?>
-      </td>
-    </tr>
-  </table>
-</form>
+        </td>
+        <td>
+          <div class='input-group' id='moduleIdBox'>
+          <?php
+          echo html::select('module', $moduleOptionMenu, $moduleID, "onchange='loadModuleRelated()' class='form-control'");
+          if(count($moduleOptionMenu) == 1)
+          {
+              echo "<span class='input-group-addon'>";
+              echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=bug"), $lang->tree->manage, '_blank');
+              echo '&nbsp; ';
+              echo html::a("javascript:loadProductModules($productID)", $lang->refresh);
+              echo '</span>';
+          }
+          ?>
+          </div>
+        </td><td class='w-150px'></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->bug->project;?></th>
+        <td><span id='projectIdBox'><?php echo html::select('project', $projects, $projectID, 'class=form-control onchange=loadProjectRelated(this.value) autocomplete="off"');?></span></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->bug->openedBuild;?></th>
+        <td>
+          <span id='buildBox'>
+          <?php echo html::select('openedBuild[]', $builds, $buildID, "size=4 multiple=multiple class='chosen form-control'");?>
+          </span>
+        </td>
+      </tr>
+      <tr>
+        <th><nobr><?php echo $lang->bug->lblAssignedTo;?></nobr></th>
+        <td><span id='assignedToBox'><?php echo html::select('assignedTo', $users, $assignedTo, "class='form-control chosen'");?></span></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->bug->title;?></th>
+        <td colspan='2'><?php echo html::input('title', $bugTitle, "class='form-control'");?></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->bug->steps;?></th>
+        <td colspan='2'><?php echo html::textarea('steps', $steps, "rows='10' class='form-control'");?></td>
+        <td style='vertical-align: top;'>
+          <ul id='tplBox' style='list-unstyled'><?php echo $this->fetch('bug', 'buildTemplates');?></ul>
+        </td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->bug->lblStory;?></th>
+        <td colspan='2'>
+          <span id='storyIdBox'><?php echo html::select('story', $stories, $storyID, "class='form-control'");?></span>
+        </td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->bug->task;?></th>
+        <td colspan='2'><span id='taskIdBox'><?php echo html::select('task', $tasks, $taskID, "class='form-control'");?></span></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->bug->lblTypeAndSeverity;?></th>
+        <td>
+          <div class='input-group'>
+            <?php echo html::select('type', $lang->bug->typeList, $type, "class='form-control' style='width: 50%'");?> 
+            <?php echo html::select('severity', $lang->bug->severityList, $severity, "class='form-control' style='width: 50%'");?>
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <th><nobr><?php echo $lang->bug->lblSystemBrowserAndHardware;?></nobr></th>
+        <td>
+          <div class='input-group'>
+          <?php echo html::select('os', $lang->bug->osList, $os, "class='form-control' style='width: 50%'");?>
+          <?php echo html::select('browser', $lang->bug->browserList, $browser, "class='form-control' style='width: 50%'");?>
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <th><nobr><?php echo $lang->bug->lblMailto;?></nobr></th>
+        <td colspan='2'>
+          <?php 
+          echo html::select('mailto[]', $users, str_replace(' ', '', $mailto), "class='form-control chosen' multiple");
+          ?>
+        </td>
+        <td>
+          <?php
+          if($contactLists) echo html::select('', $contactLists, '', "class='form-control' onchange=\"setMailto('mailto', this.value)\"");
+          ?>
+        </td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->bug->keywords;?></th>
+        <td colspan='2'><?php echo html::input('keywords', $keywords, "class='form-control'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->bug->files;?></th>
+        <td colspan='2'><?php echo $this->fetch('file', 'buildform', 'fileCount=2&percent=0.85');?></td>
+      </tr>  
+      <tr>
+        <td></td>
+        <td colspan='2'>
+          <?php echo html::submitButton() . html::backButton() . html::hidden('case', $caseID);?>
+        </td>
+      </tr>
+    </table>
+  </form>
+</div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 9482da67f9..2466298bac 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -28,121 +28,123 @@ js::set('oldOpenedBuild'         , $bug->openedBuild);
 js::set('oldResolvedBuild'       , $bug->resolvedBuild);
 ?>
 
-<form method='post' target='hiddenwin' enctype='multipart/form-data' id='dataform'>
+<form class='form-condensed' method='post' target='hiddenwin' enctype='multipart/form-data' id='dataform'>
 <div id='titlebar'>
-  <div id='main'>
-  BUG #<?php echo $bug->id . $lang->colon;?>
-  <?php echo html::input('title', str_replace("'","&#039;",$bug->title), 'class=form-control');?>
- </div>
-  <div><?php echo html::submitButton()?></div>
+  <div class='heading'>
+    <span class='prefix'><?php echo html::icon($lang->icons['bug']) . ' #' . $bug->id;?></span>
+    <strong><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></strong>
+    <small><?php echo html::icon($lang->icons['edit']) . ' ' . $lang->bug->edit;?></small>
+  </div>
+  <div class='actions'>
+    <?php echo html::submitButton(html::icon('save') . ' ' . $lang->save)?>
+  </div>
 </div>
-
-<table class='cont-rt5'>
-  <tr valign='top'>
-    <td>
-      <table class='table-1 bd-none'>
-        <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='form-control'");?>
-          </fieldset>
-          <fieldset>
-          <legend><?php echo $lang->bug->legendComment;?></legend>
-            <?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='text-center'>
-            <?php 
-            echo html::submitButton();
-            $browseLink = $app->session->bugList != false ? $app->session->bugList : inlink('browse', "productID=$bug->product");
-            echo html::linkButton($lang->goback, $browseLink);
-            ?>
-          </div>
-        </td></tr>
-      </table>
+<div class='row'>
+  <div class='col-md-8'>
+    <div class='main'>
+      <div class='form-group'>
+        <?php echo html::input('title', str_replace("'","&#039;",$bug->title), 'class="form-control" placeholder="' . $lang->bug->title . '"');?>
+      </div>
+      <fieldset>
+        <legend><?php echo $lang->bug->legendSteps;?></legend>
+        <div class='form-group'><?php echo html::textarea('steps', htmlspecialchars($bug->steps), "rows='12' class='form-control'");?></div>
+      </fieldset>
+      <fieldset>
+        <legend><?php echo $lang->bug->legendComment;?></legend>
+        <div class='form-group'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></div>
+      </fieldset>
+      <fieldset>
+        <legend><?php echo $lang->bug->legendAttatch;?></legend>
+        <div class='form-group'><?php echo $this->fetch('file', 'buildform', 'filecount=2');?></div>
+      </fieldset>
+      <div class='actions'>
+        <?php 
+        echo html::submitButton();
+        $browseLink = $app->session->bugList != false ? $app->session->bugList : inlink('browse', "productID=$bug->product");
+        echo html::linkButton($lang->goback, $browseLink);
+        ?>
+      </div>
       <?php include '../../common/view/action.html.php';?>
-    </td>
-    <td class='divider'></td>
-    <td class='side'>
+    </div>
+  </div>
+  <div class='col-md-4'>
+    <div class='main main-side'>
       <fieldset>
         <legend><?php echo $lang->bug->legendBasicInfo;?></legend>
-        <table class='table-1 a-left' cellpadding='0' cellspacing='0'>
+        <table class='table table-form'>
           <tr>
-            <td><?php echo $lang->bug->product;?></td>
+            <th class='w-60px'><?php echo $lang->bug->product;?></th>
             <td><?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value); class='form-control'");?></td>
           </tr>
           <tr>
-            <td><?php echo $lang->bug->module;?></td>
+            <th><?php echo $lang->bug->module;?></th>
             <td>
               <span id='moduleIdBox'><?php echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated()' class='form-control'");?></span>
             </td>
           </tr>
           <tr>
-            <td><?php echo $lang->bug->productplan;?></td>
+            <th><?php echo $lang->bug->productplan;?></th>
             <td>
               <span id="planIdBox"><?php echo html::select('plan', $plans, $bug->plan, "class='form-control'");?></span>
             </td>
           </tr>
           <tr>
-            <td><?php echo $lang->bug->type;?></td>
-            <td><?php echo html::select('type', $lang->bug->typeList, $bug->type, "class='form-control'");?>
+            <th><?php echo $lang->bug->type;?></th>
+            <td><?php echo html::select('type', $lang->bug->typeList, $bug->type, "class='form-control'");?></td>
           </tr>
           <tr>
-            <td><?php echo $lang->bug->severity;?></td>
-            <td><?php echo html::select('severity', $lang->bug->severityList, $bug->severity, "class='form-control'");?>
+            <th><?php echo $lang->bug->severity;?></th>
+            <td><?php echo html::select('severity', $lang->bug->severityList, $bug->severity, "class='form-control'");?></td>
           </tr>
           <tr>
-            <td><?php echo $lang->bug->pri;?></td>
-            <td><?php echo html::select('pri', $lang->bug->priList, $bug->pri, "class='form-control'");?>
+            <th><?php echo $lang->bug->pri;?></th>
+            <td><?php echo html::select('pri', $lang->bug->priList, $bug->pri, "class='form-control'");?></td>
           </tr>
           <tr>
-            <td><?php echo $lang->bug->status;?></td>
+            <th><?php echo $lang->bug->status;?></th>
             <td><?php echo html::select('status', $lang->bug->statusList, $bug->status, "class='form-control'");?></td>
           </tr>
           <tr>
-            <td><?php echo $lang->bug->confirmed;?></td>
+            <th><?php echo $lang->bug->confirmed;?></th>
             <td><?php echo $lang->bug->confirmedList[$bug->confirmed];?></td>
           </tr>
           <tr>
-            <td><?php echo $lang->bug->assignedTo;?></td>
+            <th><?php echo $lang->bug->assignedTo;?></th>
             <td><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='form-control chosen'");?></td>
           </tr>
           <tr>
-            <td><?php echo $lang->bug->os;?></td>
+            <th><?php echo $lang->bug->os;?></th>
             <td><?php echo html::select('os', $lang->bug->osList, $bug->os, "class='form-control'");?></td>
           </tr>
           <tr>
-            <td><?php echo $lang->bug->browser;?></td>
+            <th><?php echo $lang->bug->browser;?></th>
             <td><?php echo html::select('browser', $lang->bug->browserList, $bug->browser, "class='form-control'");?></td>
           </tr>
           <tr>
-            <td><?php echo $lang->bug->keywords;?></td>
+            <th><?php echo $lang->bug->keywords;?></th>
             <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="form-control" multiple');?></td>
+            <th><?php echo $lang->bug->mailto;?></th>
+            <td><?php echo html::select('mailto[]', $users, str_replace(' ', '', $bug->mailto), 'class="form-control chosen" multiple');?></td>
           </tr>
         </table>
       </fieldset>
 
       <fieldset>
         <legend><?php echo $lang->bug->legendPrjStoryTask;?></legend>
-        <table class='table-1 a-left'>
+        <table class='table table-form'>
           <tr>
-            <td class='rowhead w-p20'><?php echo $lang->bug->project;?></td>
+            <th class='w-60px'><?php echo $lang->bug->project;?></th>
             <td><span id='projectIdBox'><?php echo html::select('project', $projects, $bug->project, 'class=form-control onchange=loadProjectRelated(this.value)');?></span></td>
           </tr>
           <tr>
-            <td><?php echo $lang->bug->story;?></td>
-            <td><div id='storyIdBox'><?php echo html::select('story', $stories, $bug->story, "class=select-3");?></div>
+            <th><?php echo $lang->bug->story;?></th>
+            <td><div id='storyIdBox'><?php echo html::select('story', $stories, $bug->story, "class='form-control'");?></div>
             </td>
           </tr>
           <tr>
-            <td><?php echo $lang->bug->task;?></td>
+            <th><?php echo $lang->bug->task;?></th>
             <td><div id='taskIdBox'><?php echo html::select('task', $tasks, $bug->task, "class='form-control'");?></div></td>
           </tr>
         </table>
@@ -150,59 +152,60 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
 
       <fieldset>
         <legend><?php echo $lang->bug->legendLife;?></legend>
-        <table class='table-1 a-left'>
+        <table class='table table-form'>
           <tr>
-            <td class='rowhead w-p20'><?php echo $lang->bug->openedBy;?></td>
+            <th class='w-60px'><?php echo $lang->bug->openedBy;?></th>
             <td><?php echo $users[$bug->openedBy];?></td>
           </tr>
           <tr>
-            <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>
+            <th><?php echo $lang->bug->openedBuild;?></th>
+            <td><span id='openedBuildBox'><?php echo html::select('openedBuild[]', $openedBuilds, $bug->openedBuild, 'size=4 multiple=multiple class="chosen form-control"');?></span></td>
           </tr>
           <tr>
-            <td><?php echo $lang->bug->resolvedBy;?></td>
+            <th><?php echo $lang->bug->resolvedBy;?></th>
             <td><?php echo html::select('resolvedBy', $users, $bug->resolvedBy, "class='form-control'");?></td>
           </tr>
           <tr>
-            <td><?php echo $lang->bug->resolvedDate;?></td>
+            <th><?php echo $lang->bug->resolvedDate;?></th>
             <td><?php echo html::input('resolvedDate', $bug->resolvedDate, 'class=form-control');?></td>
           </tr>
           <tr>
-            <td><?php echo $lang->bug->resolvedBuild;?></td>
+            <th><?php echo $lang->bug->resolvedBuild;?></th>
             <td><span id='resolvedBuildBox'><?php echo html::select('resolvedBuild', $resolvedBuilds, $bug->resolvedBuild, "class='form-control'");?></span></td>
           </tr>
           <tr>
-            <td><?php echo $lang->bug->resolution;?></td>
+            <th><?php echo $lang->bug->resolution;?></th>
             <td><?php echo html::select('resolution', $lang->bug->resolutionList, $bug->resolution, 'class=form-control onchange=setDuplicate(this.value)');?></td>
           </tr>
           <tr id='duplicateBugBox' <?php if($bug->resolution != 'duplicate') echo "style='display:none'";?>>
-            <td><?php echo $lang->bug->duplicateBug;?></td>
+            <th><?php echo $lang->bug->duplicateBug;?></th>
             <td><?php echo html::input('duplicateBug', $bug->duplicateBug, 'class=form-control');?></td>
           </tr>
           <tr>
-            <td><?php echo $lang->bug->closedBy;?></td>
+            <th><?php echo $lang->bug->closedBy;?></th>
             <td><?php echo html::select('closedBy', $users, $bug->closedBy, "class='form-control'");?></td>
           </tr>
           <tr>
-            <td><?php echo $lang->bug->closedDate;?></td>
+            <th><?php echo $lang->bug->closedDate;?></th>
             <td><?php echo html::input('closedDate', $bug->closedDate, 'class=form-control');?></td>
           </tr>
         </table>
       </fieldset>
       <fieldset>
         <legend><?php echo $lang->bug->legendMisc;?></legend>
-        <table class='table-1 a-left'>
+        <table class='table table-form'>
           <tr>
-            <td><?php echo $lang->bug->linkBug;?></td>
+            <th><?php echo $lang->bug->linkBug;?></th>
             <td><?php echo html::input('linkBug', $bug->linkBug, 'class="form-control"');?></td>
           </tr>
           <tr>
-            <td><?php echo $lang->bug->case;?></td>
+            <th><?php echo $lang->bug->case;?></th>
             <td><?php echo html::input('case', $bug->case, 'class="form-control"');?></td>
           </tr>
         </table>
       </fieldset>
-    </td>
-  </tr>
-</table>
+    </div>
+  </div>
+</div>
+</form>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 80d7969716..d1216c9fb8 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -19,7 +19,7 @@
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['task']);?></span>
-      <strong><small class='text-muted'><i class='icon icon-plus'></i></small> <?php echo $lang->task->create;?></strong>
+      <strong><small class='text-muted'><?php echo html::icon($lang->icons['create']);?></small> <?php echo $lang->task->create;?></strong>
     </div>
   </div>
   <form class='form-condensed' method='post' enctype='multipart/form-data' id='dataform' class='ajaxForm'>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index e9eac11b6e..a70f23d407 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -32,19 +32,21 @@
   <div class='col-md-8'>
     <div class='main'>
       <div class='form-group'>
-        <?php echo html::input('name', $task->name, 'class="form-control"');?>
+        <?php echo html::input('name', $task->name, 'class="form-control" placeholder="' . $lang->task->name . '"');?>
       </div>
       <fieldset>
         <legend><?php echo $lang->task->desc;?></legend>
-        <?php echo html::textarea('desc', htmlspecialchars($task->desc), "rows='8' class='form-control'");?>
+        <div class='form-group'>
+          <?php echo html::textarea('desc', htmlspecialchars($task->desc), "rows='8' class='form-control'");?>
+        </div>
       </fieldset>
       <fieldset>
         <legend><?php echo $lang->comment;?></legend>
-        <?php echo html::textarea('comment', '',  "rows='5' class='form-control'");?>
+        <div class='form-group'><?php echo html::textarea('comment', '',  "rows='5' class='form-control'");?></div>
       </fieldset>
       <fieldset>
         <legend><?php echo $lang->files;?></legend>
-        <?php echo $this->fetch('file', 'buildform');?>
+        <div class='form-group'><?php echo $this->fetch('file', 'buildform');?></div>
       </fieldset>
       <div class='actions'>
         <?php echo html::submitButton(html::icon('save') . ' ' . $lang->save) . html::linkButton($lang->goback, $this->inlink('view', "taskID=$task->id")) .html::hidden('consumed', $task->consumed);?>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 15b0cb1f6c..4d497413d0 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -239,6 +239,7 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable
 .form-condensed .chosen-container {font-size: 12px}
 .form-condensed .chosen-container-single .chosen-single {padding: 5px 10px}
 .form-condensed .chosen-container-single .chosen-single abbr {top: 5px; right: 18px}
+.form-condensed fieldset > .form-group {margin-bottom: 0;}
 
 /* help in form */
 .help-block {margin-bottom: 5px;}