From 40fbdf2245434ba66f12d33ae1464c75b2fd9481 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Tue, 28 Feb 2012 09:58:19 +0000
Subject: [PATCH]  * change for index of style.

---
 module/common/lang/en.php               |  4 +--
 module/common/view/footer.html.php      |  2 +-
 module/common/view/header.lite.html.php |  2 +-
 module/my/lang/zh-cn.php                |  6 ++---
 module/my/view/blockbugs.html.php       |  4 +--
 module/my/view/blockdynamic.html.php    |  4 +--
 module/my/view/blockproducts.html.php   | 18 ++++++++-----
 module/my/view/blockprojects.html.php   | 17 ++++++++++---
 module/my/view/blocktasks.html.php      |  4 +--
 module/my/view/blocktodoes.html.php     |  4 +--
 www/js/my.full.js                       | 20 +++++++++++++++
 www/theme/default/style.css             | 34 +++++++++++++------------
 12 files changed, 79 insertions(+), 40 deletions(-)

diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 1442b2ce84..86a7457c8a 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -76,7 +76,7 @@ $lang->typeAB       = 'Type';
 $lang->common->common = 'Common module';
 
 /* The main menu. */
-$lang->menu->my      = 'Dashboard|my|index';
+$lang->menu->my      = '<span id="mainbg"></span>Dashboard|my|index';
 $lang->menu->product = 'Product|product|index';
 $lang->menu->project = 'Project|project|index';
 $lang->menu->qa      = 'Test|qa|index';
@@ -115,7 +115,7 @@ $lang->index->menu->product = 'Products|product|browse';
 $lang->index->menu->project = 'Projects|project|browse';
 
 /* Dashboard menu. */
-$lang->my->menu->account   = '%s' . $lang->arrow;
+$lang->my->menu->account   = '<span id="mybg"></span>%s' . $lang->arrow;
 $lang->my->menu->index     = 'Index|my|index';
 $lang->my->menu->todo      = array('link' => 'Todo|my|todo|', 'subModule' => 'todo');
 $lang->my->menu->task      = 'Task|my|task|';
diff --git a/module/common/view/footer.html.php b/module/common/view/footer.html.php
index c33980b082..a8e5755d7d 100644
--- a/module/common/view/footer.html.php
+++ b/module/common/view/footer.html.php
@@ -7,7 +7,7 @@
     <tr>
       <td class='w-p50 'id='crumbs'><?php commonModel::printBreadMenu($this->moduleName, isset($position) ? $position : ''); ?></td>
       <td class='a-right' id='poweredby'>
-        <span>powered by <a href='http://www.zentao.net' target='_blank'>ZenTaoPMS</a> (<?php echo $config->version;?>)</span>
+        <span>Powered by <a href='http://www.zentao.net' target='_blank'>ZenTaoPMS</a> (<?php echo $config->version;?>)</span>
         <?php echo $lang->donate;?>
       </td>
     </tr>
diff --git a/module/common/view/header.lite.html.php b/module/common/view/header.lite.html.php
index dbe9f26f27..4039ad9f1b 100644
--- a/module/common/view/header.lite.html.php
+++ b/module/common/view/header.lite.html.php
@@ -23,7 +23,7 @@ $clientTheme  = $this->app->getClientTheme();
 
   js::exportConfigVars();
   js::import($jsRoot . 'jquery/lib.js', $config->version);
-  js::import($jsRoot . 'my.min.js',     $config->version);
+  js::import($jsRoot . 'my.full.js',     $config->version);
 
   css::import($defaultTheme . 'yui.css',   $config->version);
   css::import($defaultTheme . 'style.css', $config->version);
diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php
index 41d24676ea..2714e21e4a 100644
--- a/module/my/lang/zh-cn.php
+++ b/module/my/lang/zh-cn.php
@@ -32,6 +32,6 @@ $lang->my->home->projects      =  '项目';
 $lang->my->home->products      =  '产品';
 $lang->my->home->projectHome   = '访问项目主页';
 $lang->my->home->productHome   = '访问产品主页';
-$lang->my->home->noProjectsTip = "目前还没有进行中的项目，<a href='%s'>马上创建一个项目吧</a>，<br />或者修改已有的项目，将其状态改为<i class='strong'>进行中</i>。
-                                 <a href='http://www.zentao.net/help-read-79236.html' target='_blank'>帮助文档</a>";
-$lang->my->home->noProductsTip = "目前还没有产品，<a href='%s'>马上创建一个产品吧</a>，<a href='http://www.zentao.net/help-read-79236.html' target='_blank'>帮助文档</a>";
+$lang->my->home->noProjectsTip = "目前还没有进行中的项目，<a class='button-add' href='%s'>创建一个项目吧</a>，<p style='margin-top:15px'>或者修改已有的项目，将其状态改为'<span class='icon-q'></span><i>进行中</i>'。</p>";
+$lang->my->home->noProductsTip = "目前还没有产品，<a class='button-add' href='%s'>创建一个产品吧</a>。";
+$lang->my->home->help          = "<a href='http://www.zentao.net/help-read-79236.html' target='_blank'>帮助文档</a>";
diff --git a/module/my/view/blockbugs.html.php b/module/my/view/blockbugs.html.php
index ab634a4d5d..112369a2d4 100644
--- a/module/my/view/blockbugs.html.php
+++ b/module/my/view/blockbugs.html.php
@@ -1,8 +1,8 @@
 <div class='block linkbox2'>
 <table class='table-1 fixed colored'>
   <caption>
-    <div class='f-left'> <?php echo $lang->my->bug;?></div>
-    <div class='f-right'><?php echo html::a($this->createLink('my', 'bug'), $lang->more);?></div>
+    <div class='f-left'><span class='icon-bug'></span> <?php echo $lang->my->bug;?></div>
+    <div class='f-right'><?php echo html::a($this->createLink('my', 'bug'), $lang->more . "<span class='icon-g'></span>");?></div>
   </caption>
   <?php 
   foreach($bugs as $bugID => $bugTitle)
diff --git a/module/my/view/blockdynamic.html.php b/module/my/view/blockdynamic.html.php
index 8d6b88a0c5..62b61f116f 100644
--- a/module/my/view/blockdynamic.html.php
+++ b/module/my/view/blockdynamic.html.php
@@ -1,8 +1,8 @@
 <div class='block'>
 <table class='table-1 colored fixed'>
   <caption>
-    <div class='f-left'><?php echo $lang->my->home->latest;?></div>
-    <div class='f-right'><?php common::printLink('company', 'dynamic', '', $lang->more);?></div>
+    <div class='f-left'><span class='icon-z'></span><?php echo $lang->my->home->latest;?></div>
+    <div class='f-right'><?php common::printLink('company', 'dynamic', '', $lang->more . "<span class='icon-g'></span>");?></div>
   </caption>
   <?php 
   foreach($actions as $action)
diff --git a/module/my/view/blockproducts.html.php b/module/my/view/blockproducts.html.php
index 0f0209a8eb..4691c1d608 100644
--- a/module/my/view/blockproducts.html.php
+++ b/module/my/view/blockproducts.html.php
@@ -1,13 +1,19 @@
 <div class='block linkbox1' id='productbox'>
 <?php if(empty($productStats)):?>
-<table class='table-1 a-center' height='145px'>
-  <caption><?php echo $lang->my->home->products;?></caption>
+<table class='table-1 a-center emptybg' height='140px'>
+  <caption><span class='icon-title'></span><?php echo $lang->my->home->products;?></caption>
   <tr>
     <td valign='middle'>
-    <?php 
-    $productLink = $this->createLink('product', 'create');
-    printf($lang->my->home->noProductsTip, $productLink);
-    ?>
+      <table class='a-left bd-none' align='center'>
+        <tr>
+          <td valign='top'><span class='icon-t'></span></td>
+          <td><?php printf($lang->my->home->noProductsTip, $this->createLink('product', 'create'));?></td>
+        </tr>
+        <tr>
+          <td><span class='icon-w'></span></td>
+          <td><?php echo $lang->my->home->help; ?></td>
+        </tr>
+      </table>
     </td>
   </tr>
 </table>
diff --git a/module/my/view/blockprojects.html.php b/module/my/view/blockprojects.html.php
index bed4dec2c7..9eb9587ca5 100644
--- a/module/my/view/blockprojects.html.php
+++ b/module/my/view/blockprojects.html.php
@@ -1,9 +1,20 @@
 <div class='block linkbox1' id='projectbox'>
 <?php if(count($projectStats) == 0):?>
-<table class='table-1 a-center' height='145px'>
-  <caption><?php echo $lang->my->home->projects;?></caption>
+<table class='table-1 a-center emptybg' height='140px'>
+  <caption><span class='icon-title'></span><?php echo $lang->my->home->projects;?></caption>
   <tr>
-    <td valign='middle'><?php printf($lang->my->home->noProjectsTip, $this->createLink('project', 'create'));?></td>
+    <td valign='middle'>
+      <table class='a-left bd-none' align='center'>
+        <tr>
+          <td valign='top'><span class='icon-t'></span></td>
+          <td><?php printf($lang->my->home->noProjectsTip, $this->createLink('project', 'create'));?></td>
+        </tr>
+        <tr>
+          <td><span class='icon-w'></span></td>
+          <td><?php echo $lang->my->home->help; ?></td>
+        </tr>
+      </table>
+    </td>
   </tr>
 </table>
 <?php else:?>
diff --git a/module/my/view/blocktasks.html.php b/module/my/view/blocktasks.html.php
index 08c132c687..4abbecb7b6 100644
--- a/module/my/view/blocktasks.html.php
+++ b/module/my/view/blocktasks.html.php
@@ -1,8 +1,8 @@
 <div class='block linkbox2'>
 <table class='table-1 fixed colored'>
   <caption>
-    <div class='f-left'><?php echo $lang->my->task;?></div>
-    <div class='f-right'><?php echo html::a($this->createLink('my', 'task'), $lang->more);?></div>
+    <div class='f-left'><span class='icon-q'></span><?php echo $lang->my->task;?></div>
+    <div class='f-right'><?php echo html::a($this->createLink('my', 'task'), $lang->more . "<span class='icon-g'></span>");?></div>
   </caption>
   <?php 
   foreach($tasks as $task)
diff --git a/module/my/view/blocktodoes.html.php b/module/my/view/blocktodoes.html.php
index c79320cdc7..41e7b5944f 100644
--- a/module/my/view/blocktodoes.html.php
+++ b/module/my/view/blocktodoes.html.php
@@ -1,8 +1,8 @@
 <div class='block linkbox2'>
 <table class='table-1 fixed colored'>
   <caption>
-    <div class='f-left'><?php echo $lang->my->todo;?></div>
-    <div class='f-right'><?php echo html::a($this->createLink('my', 'todo'), $lang->more);?></div>
+    <div class='f-left'><span class='icon-todo'></span><?php echo $lang->my->todo;?></div>
+    <div class='f-right'><?php echo html::a($this->createLink('my', 'todo'), $lang->more . "<span class='icon-g'></span>");?></div>
   </caption>
   <?php 
   foreach($todos as $todo)
diff --git a/www/js/my.full.js b/www/js/my.full.js
index 1e70c713c0..639a8926d5 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -424,6 +424,25 @@ function saveWindowSize()
     $.cookie('windowHeight', height)
 }
 
+/**
+ * Set content height 
+ * 
+ * @access public
+ * @return void
+ */
+function setContentHeight()
+{
+    var winHeight = $(window).height();
+    var docHeight = $(document.body).height();
+    var headerH   = $('#header').height();
+    var footerH   = $('#footer').height();
+    if(docHeight < winHeight)
+    {
+        var outerH = winHeight - headerH - footerH - 75;
+        $('.outer').height(outerH);
+    } 
+}
+
 /**
  * Set the about link. 
  * 
@@ -770,6 +789,7 @@ $(document).ready(function()
     setProductListLink();
     setProjectListLink();
     setExport();
+    setContentHeight();
     autoCheck();
     togglesearch();
     saveWindowSize();
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 22a471398b..aa4f94026c 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -9,7 +9,7 @@
 * @link        http://www.ZenTaoPMS.com
 */
 /*-----------------------BASE SETTING----------------------------*/
-body     {margin:0; text-align:left; color:#141414; font-family:"����"}
+body     {margin:0; text-align:left; color:#141414; font-family:"����";}
 fieldset {border:1px solid #b3c8dc; padding:8px 10px 8px 10px; margin-bottom:8px; color:#333;}
 legend   {font-weight:bold;}
 del{background:#fcc;}
@@ -17,7 +17,7 @@ ins{background:#cfc; text-decoration:none}
 
 /*-----------------------LAYOUT SETTING ----------------------------*/
 #wrap{ padding:0 15px; background:#e5e5e5;}
-.outer {margin:0 10px; text-align:left; background:#fff;}
+.outer {padding:18px; text-align:left; background:#fff; border:1px solid #ddd;}
 .cont, .cont-lt1, .cont-lt2, .cont-lt3, .cont-lt4, .cont-lt5, .cont-rt1, .cont-rt2, .cont-rt3, .cont-rt4, .cont-rt5 {width:100%; margin:0; border:none; text-align:left}
 .cont tr, .cont td {border:none; padding:0}
 .cont-lt1 tr, .cont-lt2 tr, .cont-lt3 tr, .cont-lt4 tr, .cont-lt5 tr {border:none; padding:0}
@@ -109,7 +109,7 @@ table      {border:1px solid #e4e4e4;}
 td, tr, th {border:none; border-bottom:1px solid #e4e4e4}
 tfoot      {border-top:1px solid #e4e4e4}
 
-caption     {border:1px solid #e4e4e4; background:#efefef; margin:0; padding:2px 2px 2px 10px; border-bottom:none; text-align:left; font-weight:bold; font-size:14px;}
+caption     {border:1px solid #e4e4e4; background:#edf3fe; margin:0; padding:6px 2px 6px 10px; border-bottom:none; text-align:left; font-weight:bold; font-size:13px;}
 .caption-tr {caption-side:top; text-align:right; border:none; background:none;}
 .caption-tl {caption-side:top; text-align:left;  border:none; background:none;}
 
@@ -234,7 +234,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
 
 /*-----------------------SPECIAL PART SETTING--------------------*/
 /* Header. */
-#header{padding:2px 25px 0 25px; background:#003366; border-bottom:1px solid #e4e4e4;}
+#header{padding:2px 15px 0 15px; background:#003366; border-bottom:1px solid #e4e4e4;}
 
 /* Top bar. */
 #topbar, #topbar a {color:#fff}
@@ -249,8 +249,8 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
 #navbar a:hover {color:#ff3600;}
 
 /* Main menu. */
-#mainmenu ul { height:25px; line-height:25px}
-#mainmenu li {padding:0 8px 0 8px; border-right:3px solid #002242; color:white; font-size:14px; background:#1A4F85}
+#mainmenu ul { height:30px; line-height:30px}
+#mainmenu li {padding:0 10px; border-right:3px solid #002242; color:white; font-size:12px; background:#1A4F85}
 #mainmenu a  {color:white; font-weight:normal;}
 #mainmenu .active   {background-color:#e5e5e5;}
 #mainmenu .active a {color:#33a52e; font-weight:bold;}
@@ -264,18 +264,18 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
 #searchbox #objectSwitcher{ border:none; padding:2px;; width:20px; height:100%; background:url(images/main/ui-gray.png); background-position:-110px 52px;}
 
 /* Module menu. */
-#modulemenu    {margin-bottom:0px; font-size:14px;}
-#modulemenu ul {background-color:#E5e5e5; height:28px; line-height:28px; padding-left:25px;}
+#modulemenu    {margin-bottom:0px; font-size:12px; border:2px solid #e5e5e5;}
+#modulemenu ul {background-color:#E5e5e5; height:28px; line-height:28px; padding:5px 10px;}
 #modulemenu li {padding:0 5px; color:#0033cc;}
-#modulemenu a  { font-weight:normal; font-size:14px; color:#0033cc}
-#modulemenu .active a {color:#fff; font-weight:bold; background:#33a52e; padding:2px 4px;}
+#modulemenu a  { font-weight:normal; font-size:12px; color:#0033cc}
+#modulemenu .active a {color:#fff; background:#33a52e; padding:4px 4px 2px 4px;}
 #modulemenu .right    {float:right; font-weight:bold;}
 #modulemenu .right  a {color:red; font-weight:bold}
-#modulemenu #mybg{ padding-left:16px; background:url(images/main/ui-gray.png); background-position:-146px 144px;}
+#modulemenu #mybg{ padding-left:16px; background:url(images/main/ui-gray.png); background-position:-146px 142px;}
 
 /* Product, project and objects switcher. */
-#productID {background:#EDEFF4; border:1px solid #e4e4e4}
-#projectID {background:#EDEFF4; border:1px solid #e4e4e4}
+#productID {background:#EDEFF4; border:1px solid #e5e5e5}
+#projectID {background:#EDEFF4; border:1px solid #e5e5e5}
 #productSwitcher{padding:0; width:35px}
 #projectSwitcher{padding:0; width:35px}
 
@@ -324,7 +324,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
 .tabs a.current {background:green; color:white}
 
 /* Footer. */
-#divider   {margin-bottom:30px}
+#divider   {margin-bottom:30px;width:100%; position:fixed; bottom:34px; left:0; margin:0; color:#333; background:#e5e5e5; height:15px;}
 #footer    {width:100%; position:fixed; bottom:0; left:0; margin:0; color:#333; background:url(images/main/status_x_bg.gif) repeat-x; height:34px; line-height:20px;}
 #crumbs    {padding:5px 0 5px 10px;}
 #poweredby {padding-right:10px} 
@@ -336,7 +336,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
 .pager {margin-bottom:0}
 
 /*-----------------------OTHERS SETTINGS --------------------*/
-.box-title  {border:1px solid #e4e4e4; background-color:#efefef; margin:0; padding:4px; border-bottom:none; text-align:left; font-weight:bold; color:#333;}
+.box-title  {border:1px solid #e4e4e4; background-color:#edf3fe; margin:0; padding:4px; border-bottom:none; text-align:left; font-weight:bold; color:#333;}
 .box-content{border:1px solid #e4e4e4; padding:5px}
 .done      {color:#078F0E;}
 .wait      {color:#888;}
@@ -349,4 +349,6 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
 .strong    {font-weight:bold}
 .deleted   {text-decoration:line-through}
 .linkbox a {display:block}
-.owner     {background:#e4e4e4; font-size:smaller}
\ No newline at end of file
+.owner     {background:#e4e4e4; font-size:smaller}
+.emptybg { background:#efefef;}
+a { text-decoration:none;}
\ No newline at end of file