From 9b63112ba206f403f7e475772f0c3a16596fe01d Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Fri, 18 Apr 2014 11:15:05 +0800
Subject: [PATCH]  * removed useless headings from featurebar.  * fixed height
 of editable div in form for ie8.

---
 module/action/view/trash.html.php     | 5 ++---
 module/bug/view/browse.html.php       | 2 --
 module/company/view/dynamic.html.php  | 1 -
 module/doc/view/browse.html.php       | 1 -
 module/extension/view/header.html.php | 1 -
 module/project/view/dynamic.html.php  | 3 ---
 module/testcase/view/browse.html.php  | 1 -
 www/theme/default/style.css           | 2 +-
 8 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index b323371261..63467de4c4 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -11,10 +11,9 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div id='titlebar'>
+<div id='featurebar'>
   <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['trash']);?></span>
-    <strong><?php echo $lang->action->trash;?></strong>
+    <?php echo html::icon($lang->icons['trash']);?> <?php echo $lang->action->trash;?>
   </div>
   <div class='actions'>
     <?php if($type == 'hidden') echo html::a(inLink('trash', "type=all"),    $lang->goback, '', "class='btn'");?>
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index c31a550808..58acc595b8 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -17,9 +17,7 @@ js::set('browseType', $browseType);
 js::set('moduleID', $moduleID);
 js::set('customed', $customed);
 ?>
-
 <div id='featurebar'>
-  <div class='heading'><?php echo html::icon($lang->icons['bug']);?></div>
   <div class='actions'>
     <div class='btn-group'>
       <div class='btn-group'>
diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
index d127ed824e..84dd405a9d 100644
--- a/module/company/view/dynamic.html.php
+++ b/module/company/view/dynamic.html.php
@@ -16,7 +16,6 @@
 var browseType = '<?php echo $browseType;?>';
 </script>
 <div id='featurebar'>
-  <div class='heading'><?php echo html::icon($lang->icons['dynamic']);?></div>
   <ul class='nav'>
     <?php 
     echo '<li id="today">'       . html::a(inlink('dynamic', "browseType=today"),      $lang->action->dynamic->today)      . '</li>';
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index cc21548067..dc928b6085 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -18,7 +18,6 @@
 var browseType = '<?php echo $browseType;?>';
 </script>
 <div id='featurebar'>
-  <div class='heading'><?php echo html::icon($lang->icons['doc']);?></div>
   <ul class='nav'>
     <li id='bymoduleTab' onclick='browseByModule()'><a href='#'><?php echo $lang->doc->moduleDoc;?></a></li>
     <li id='bysearchTab'><a href='#'><i class='icon-search icon'></i>&nbsp;<?php echo $lang->doc->searchDoc;?></a></li>
diff --git a/module/extension/view/header.html.php b/module/extension/view/header.html.php
index eb8939a7cd..e9cd73e368 100644
--- a/module/extension/view/header.html.php
+++ b/module/extension/view/header.html.php
@@ -1,7 +1,6 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <div id='featurebar'>
-  <div class='heading'><?php echo html::icon($lang->icons['extension']) . ' ' . $lang->extension->common;?></div>
   <ul class='nav'>
   <?php 
   echo '<li id="installed">'  . html::a($this->createLink('extension', 'browse', "type=installed"),   $lang->extension->installed)   . '</li>';
diff --git a/module/project/view/dynamic.html.php b/module/project/view/dynamic.html.php
index 587f1eba74..e37a017eb5 100755
--- a/module/project/view/dynamic.html.php
+++ b/module/project/view/dynamic.html.php
@@ -13,9 +13,6 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <div id='featurebar'>
-  <div class='heading'>
-    <?php echo html::icon($lang->icons['dynamic']);?> <?php echo $lang->project->dynamic;?>
-  </div>
   <ul class='nav'>
     <?php 
     echo '<li id="today">'      . html::a(inlink('dynamic', "projectID=$projectID&type=today"),      $lang->action->dynamic->today)      . '</li>';
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 218c3603fb..20a37e7730 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -19,7 +19,6 @@ js::set('moduleID'  , $moduleID);
 js::set('confirmDelete', $lang->testcase->confirmDelete);
 ?>
 <div id='featurebar'>
-  <div class='heading'><?php echo html::icon($lang->icons['usecase']);?></div>
   <ul class='nav'>
     <?php
     echo "<li id='allTab'>"         . html::a($this->createLink('testcase', 'browse', "productid=$productID&browseType=all&param=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->testcase->allCases) . "</li>";
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index d9f32a1f0f..3a8c9fa30c 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -252,7 +252,7 @@ form .star {display: none;}/* hide star */
 .table-form > thead > tr > th.required:after {top: 2px; padding-left: 4px;}
 
 /* Auto Height textarea */
-div.form-control[contenteditable='true'] {height: auto; text-align: left; outline: 0; overflow-x: hidden; overflow-y: auto; min-height: 30px}
+div.form-control[contenteditable='true'] {height: auto; text-align: left; outline: 0; overflow-x: hidden; overflow-y: auto; min-height: 30px; min-height: 18px\0}
 
 /* Panel */
 .panel > .table > thead > tr > th,.panel > form > .table > thead > tr > th {background-color: transparent;}