From 0b726c8b7da5eee2a9a8716f8c3681d9aa1835f2 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Fri, 2 Mar 2012 02:43:48 +0000
Subject: [PATCH]  * adjust some bugs for style.

---
 module/common/lang/en.php          | 2 +-
 module/common/lang/zh-cn.php       | 2 +-
 module/common/view/footer.html.php | 6 +++---
 module/common/view/header.html.php | 2 +-
 module/my/css/index.css            | 4 ++--
 module/story/view/create.html.php  | 2 +-
 www/js/my.full.js                  | 4 ++--
 www/theme/classblue/style.css      | 7 ++-----
 www/theme/default/style.css        | 6 +++---
 www/theme/green/style.css          | 3 +--
 www/theme/red/style.css            | 4 +---
 11 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 4081eed5b8..a19a862847 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -9,7 +9,7 @@
  * @version     $Id$
  * @link        http://www.zentao.net
  */
-$lang->arrow        = '<span class="icon-arrow"></span>';
+$lang->arrow        = '<span class="icon-arrow">&nbsp;</span>';
 $lang->colon        = '::';
 $lang->comma        = ',';
 $lang->dot          = '.';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index d0211515a3..992e08f762 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -9,7 +9,7 @@
  * @version     $Id$
  * @link        http://www.zentao.net
  */
-$lang->arrow        = '<span class="icon-arrow"></span>';
+$lang->arrow        = '<span class="icon-arrow">&nbsp;</span>';
 $lang->colon        = '::';
 $lang->comma        = '，';
 $lang->dot          = '。';
diff --git a/module/common/view/footer.html.php b/module/common/view/footer.html.php
index a8e5755d7d..da6f8e1354 100644
--- a/module/common/view/footer.html.php
+++ b/module/common/view/footer.html.php
@@ -1,6 +1,7 @@
+  </div>
+  <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
+  <div id='divider'></div>
 </div>
-<?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
-<div id='divider'></div>
 <iframe frameborder='0' name='hiddenwin' id='hiddenwin' scrolling='no' class='<?php $config->debug ? print("debugwin") : print('hidden')?>'></iframe>
 <div id='footer'>
   <table class='cont' >
@@ -13,7 +14,6 @@
     </tr>
   </table>
 </div>
-</div>
 <script laguage='Javascript'>
 $().ready(function(){setDebugWin('white')})
 <?php if(isset($pageJS)) echo $pageJS;?>
diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php
index 781b9e6762..5bdb96e0e6 100644
--- a/module/common/view/header.html.php
+++ b/module/common/view/header.html.php
@@ -27,4 +27,4 @@ include 'colorbox.html.php';
    <tr><td id='modulemenu'><?php commonModel::printModuleMenu($this->moduleName);?></td></tr>
 </table>
 <div id='wrap'>
-<div class='outer'>
+  <div class='outer'>
diff --git a/module/my/css/index.css b/module/my/css/index.css
index 88a0b8f183..25245676d8 100644
--- a/module/my/css/index.css
+++ b/module/my/css/index.css
@@ -10,10 +10,10 @@
 
 .icon-title   {padding-left:16px; padding-bottom:2px; background:url(theme/default/images/main/ui-gray.png); background-position:-0px 142px;}
 .icon-notice  {padding-left:16px; padding-bottom:3px; background:url(theme/default/images/main/ui-gray.png); background-position:-16px 98px;}
-.icon-help    {padding-left:16px; padding-bottom:2px; background:url(theme/default/images/main/ui-gray.png); background-position:-48px 98px;}
+.icon-help    {padding-left:16px; padding-bottom:2px; background:url(theme/default/images/main/ui-gray.png); background-position:-48px 96px;}
 .icon-dynamic {padding-left:16px; padding-bottom:2px; background:url(theme/default/images/main/ui-gray.png); background-position:-80px 126px;}
 .icon-more    {padding-left:16px; padding-bottom:2px; background:url(theme/default/images/main/ui-gray.png); background-position:-32px -18px;}
-.icon-bug     {padding-left:16px; padding-bottom:2px; background:url(theme/default/images/main/ui-gray.png); background-position:-0px 94px;}
+.icon-bug     {padding-left:16px; padding-bottom:2px; background:url(theme/default/images/main/ui-gray.png); background-position:-2px 96px;}
 .icon-todo    {padding-left:16px; padding-bottom:2px; background:url(theme/default/images/main/ui-gray.png); background-position:-64px 94px;}
 .icon-doing   {padding-left:16px; padding-bottom:2px; background:url(theme/default/images/main/ui-gray.png); background-position:-16px 126px;}
 
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index d86a3c73c3..4588f55cc9 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -15,7 +15,7 @@
 <form method='post' enctype='multipart/form-data' target='hiddenwin'>
 <div class='box-title'><span class='icon-add2'></span><?php echo $lang->story->create;?></div>
 <div class='box-content' id='form-content'>
-  <div>
+  <div class='form-item'>
     <p><strong class='a-14px'><?php echo $lang->story->title;?></strong> <span class='gray'><?php echo $lang->story->form->titleNote?></span></p>
     <p><?php echo html::input('title', $title, "class='w-p98'");?></p>
   </div>
diff --git a/www/js/my.full.js b/www/js/my.full.js
index 1d623967ab..add66cbd66 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -433,12 +433,12 @@ function saveWindowSize()
 function setContentHeight()
 {
     var winHeight = $(window).height();
-    var docHeight = $(document).height();
     var headerH   = $('#header').height();
     var footerH   = $('#footer').height();
-    if(docHeight <= winHeight)
+    if(document.documentElement.clientHeight >= document.documentElement.scrollHeight)
     {
         var outerH = winHeight - headerH - footerH - 85;
+        if ($.browser.msie && ($.browser.version == "6.0") && !$.support.style) outerH = winHeight - headerH - footerH - 98;
         $('.outer').height(outerH);
     } 
 }
diff --git a/www/theme/classblue/style.css b/www/theme/classblue/style.css
index e25733e271..0695709cf8 100755
--- a/www/theme/classblue/style.css
+++ b/www/theme/classblue/style.css
@@ -8,16 +8,13 @@
 #topbar .w-p50 {padding-left:8px}
 
 #mainmenu   ul{background:none}
+#mainmenu   ul li{background:none}
 #modulemenu ul{background:none}
-#mainmenu   .active a{color: #324F7C}
-#modulemenu .active a{color: #324F7C} 
 
-#mainmenu li{border:none; height:36px; line-height:36px;}
+#mainmenu li{border:none; height:30px; line-height:35px;}
 #mainmenu .active {background:url(./images/bg.menu.gif) no-repeat center 5px; width:85px;}
 
 #modulemenu select{border:1px solid #e4e4e4; background:#fff}
 
-#searchType  {background:#43618B}
-#searchQuery {background:#43618B}
 #modulemenu #projectID   {background:#EAEAEA}
 #modulemenu #productID   {background:#EAEAEA}
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index c24a85b0dc..d8786b17f9 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -383,9 +383,9 @@ a { text-decoration:none;}
 .icon-all    { padding-left:18px; background:url(images/main/ui-green.png) -176px 112px;}
 .icon-copy   { padding-left:18px; background:url(images/main/ui-green.png) -48px 160px;}
 .icon-add2   { padding-left:18px; background:url(images/main/ui-gray.png) 0px 48px;}
-.icon-notice { padding-left:16px;  background:url(images/main/ui-gray.png); background-position:-18px 96px;}
-.icon-file   { padding-left:16px;  background:url(images/main/ui-gray.png); background-position:-32px 144px;}
-.icon-arrow  { padding-left:16px;  background:url(images/main/ui-gray.png); background-position:-32px 0px;}
+.icon-notice { padding-left:16px;  background:url(images/main/ui-gray.png) -18px 96px;}
+.icon-file   { padding-left:16px;  background:url(images/main/ui-gray.png) -32px 144px;}
+.icon-arrow  { padding-left:8px;  background:url(images/main/ui-gray.png) -32px 0px;}
 
 #form-content { margin:5px 25px; border:none;}
 #form-content .button-s{ background:url(images/main/button_95x36.png) left top; border:none; height:36px; width:95px; color:#f1f1f1;}
diff --git a/www/theme/green/style.css b/www/theme/green/style.css
index f811535995..5db94229fa 100644
--- a/www/theme/green/style.css
+++ b/www/theme/green/style.css
@@ -1,8 +1,7 @@
 #header {background:#195d00}
 #mainmenu ul{background:#217a00}
+#mainmenu ul li {background:#217a00}
 #mainmenu a {color:#d1eeff}
 #mainmenu .active a{color:black}
 #topbar select{background:#195d00}
 
-#searchType  {background:#217a00}
-#searchQuery {background:#217a00}
diff --git a/www/theme/red/style.css b/www/theme/red/style.css
index 68a7de499f..d1507141b0 100644
--- a/www/theme/red/style.css
+++ b/www/theme/red/style.css
@@ -1,9 +1,7 @@
 #header {background:#990000}
 #mainmenu ul{background:#cc0000}
+#mainmenu ul li{background:#cc0000}
 #mainmenu a {color:#fff}
 #mainmenu a:hover {color:yellow;}
 #mainmenu .active a{color:#990000}
 #topbar select{background:#990000}
-
-#searchType  {background:#cc0000}
-#searchQuery {background:#cc0000}