* adjust the UI.

2009-12-12 04:15:34 +00:00
parent c0e8e00cd3
commit 97ea3adcab
8 changed files with 245 additions and 280 deletions
--- a/trunk/module/common/control.php
+++ b/trunk/module/common/control.php
@@ -97,6 +97,103 @@ EOT;
        return false;
    }

+    /* <20><>ӡ<EFBFBD><D3A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/
+    public static function printTopBar()
+    {
+        global $lang, $app;
+        if(isset($app->user)) echo $app->user->realname . ' ';
+        if(isset($app->user) and $app->user->account != 'guest')
+        {
+            echo html::a(helper::createLink('my', 'index'), $lang->myControl);
+            echo html::a(helper::createLink('user', 'logout'), $lang->logout);
+        }
+        else
+        {
+            echo html::a(helper::createLink('user', 'login'), $lang->login);
+        }
+        echo html::a('http://www.zentao.cn', $lang->zentaoSite, '_blank');
+        echo $lang->sponser;
+    }
+
+    /* <20><>ӡ<EFBFBD><D3A1><EFBFBD>˵<EFBFBD><CBB5><EFBFBD>*/
+    public static function printMainmenu($moduleName)
+    {
+        global $lang;
+        echo "<ul>\n";
+        echo "<li>$lang->zentaoMS</li>\n";
+
+        /* <20>趨<EFBFBD><E8B6A8>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD>˵<EFBFBD><CBB5>Ĭ<EEA1A3><C4AC><EFBFBD><EFBFBD>ȡ<EFBFBD><C8A1>ǰ<EFBFBD><C7B0>ģ<EFBFBD><C4A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>и<EFBFBD>ģ<EFBFBD><C4A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD>Ĳ˵<C4B2><CBB5><EFBFBD><EFBFBD>飬<EFBFBD><E9A3AC>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA><EFBFBD>˵<EFBFBD><CBB5>*/
+        $mainMenu = $moduleName;
+        if(isset($lang->menugroup->$moduleName)) $mainMenu = $lang->menugroup->$moduleName;
+
+        /* ѭ<><D1AD><EFBFBD><EFBFBD>ӡ<EFBFBD><D3A1><EFBFBD>˵<EFBFBD><CBB5><EFBFBD>*/
+        foreach($lang->menu as $menuKey => $menu)
+        {
+            $active = $menuKey == $mainMenu ? 'class=active' : '';
+            list($menuLabel, $module, $method) = explode('|', $menu);
+
+            if(common::hasPriv($module, $method))
+            {
+                $link  = helper::createLink($module, $method);
+                echo "<li $active><nobr><a href='$link'>$menuLabel</a></nobr></li>\n";
+            }
+        }
+        echo "</ul>\n";
+    }
+
+    /* <20><>ӡģ<D3A1><C4A3><EFBFBD>Ĳ˵<C4B2><CBB5><EFBFBD>*/
+    public static function printModuleMenu($moduleName)
+    {
+        global $lang;
+        if(!isset($lang->$moduleName->menu)) {echo "<ul></ul>"; return;}
+        $submenus = $lang->$moduleName->menu;  
+        echo "<ul>\n";
+        foreach($submenus as $submenu)
+        {
+            if(strpos($submenu, '|') === false)
+            {
+                echo "<li>$submenu</li>\n";
+            }
+            else
+            {
+                list($label, $module, $method, $vars) = explode('|', $submenu);
+                if(common::hasPriv($module, $method))
+                {
+                    global $app;
+                    $class = $app->getMethodName() == $method ? " class='active'" : '';
+                    echo "<li $class>" . html::a(helper::createLink($module, $method, $vars), $label) . "</li>\n";
+                }
+            }
+        }
+        echo "</ul>\n";
+    }
+
+    /* <20><>ӡ<EFBFBD><D3A1><EFBFBD><EFBFBD>м<EFBFBD><D0BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/
+    public static function printBreadMenu($moduleName, $position)
+    {
+        global $lang;
+        $mainMenu = $moduleName;
+        if(isset($lang->menugroup->$moduleName)) $mainMenu = $lang->menugroup->$moduleName;
+        list($menuLabel, $module, $method) = explode('|', $lang->menu->index);
+        echo html::a(helper::createLink($module, $method), $lang->zentaoMS) . $lang->arrow;
+        if($moduleName != 'index')
+        {
+            list($menuLabel, $module, $method) = explode('|', $lang->menu->$mainMenu);
+            echo html::a(helper::createLink($module, $method), $menuLabel);
+        }
+        else
+        {
+            echo $lang->index->common;
+        }
+        if(empty($position)) return;
+        echo $lang->arrow;
+        foreach($position as $key => $link)
+        {
+            echo $link;
+            if(isset($position[$key + 1])) echo $lang->arrow;
+        }
+    }
+
    /**
     * <20><><EFBFBD>õ<EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD>ʵĹ<CAB5>˾<EFBFBD><CBBE>Ϣ<EFBFBD><CFA2>
     * 
--- a/trunk/module/common/footer.html.php
+++ b/trunk/module/common/footer.html.php
@@ -1,35 +1,12 @@
 <!--[if lte IE 6]><br /><![endif]-->
-<iframe frameborder='0' name='hiddenwin' id='hiddenwin' style='<?php if($config->debug) echo "display:block; margin:10px; width:90%; height:100px; border:1px solid #fff";?>' src='<?php echo $this->createLink('index', 'ping');?>'></iframe>
+<iframe frameborder='0' name='hiddenwin' id='hiddenwin' class='<?php $config->debug ? print("debugwin") : print('hiddenwin')?>' src='<?php echo $this->createLink('index', 'ping');?>'></iframe>
 <div id='footer' class='yui-d0 yui-t7'>
  <div class='yui-g'>
-    <div class='yui-g first'>
-      <?php
-      list($menuLabel, $module, $method) = explode('|', $lang->menu->index);
-      echo html::a($this->createLink($module, $method), $lang->zentaoMS) . $lang->arrow;
-      if($moduleName != 'index')
-      {
-          list($menuLabel, $module, $method) = explode('|', $lang->menu->$mainMenu);
-          echo html::a($this->createLink($module, $method), $menuLabel);
-      }
-      else
-      {
-          echo $lang->index->common;
-      }
-      if(isset($position))
-      {
-          echo $lang->arrow;
-          foreach($position as $key => $link)
-          {
-              echo $link;
-              if(isset($position[$key + 1])) echo $lang->arrow;
-          }
-      }
-      ?>
-    </div>
+    <div class='yui-g first' id='bread'> <?php common::printBreadMenu($this->moduleName, $position); ?></div>
    <div class='yui-g'>
      <div class='yui-u first'></div>
-      <div class='yui-u a-right' style='padding-right:10px; font-size:8px'>
-        powered by <a href='http://www.zentao.cn' target='_blank'>ZenTaoPMS</a> (<?php echo $config->version;?>)
+      <div class='yui-u a-right' id='footer-right'>
+        <span id='poweredby'>powered by <a href='http://www.zentao.cn' target='_blank'>ZenTaoPMS</a> (<?php echo $config->version;?>)</span>
      </div>
    </div>
  </div>
--- a/trunk/module/common/header.html.php
+++ b/trunk/module/common/header.html.php
@@ -23,71 +23,9 @@ $themeRoot   = $webRoot . "theme/";
 <body>
 <div id='topbar' class='yui-d0 yui-t6'>
  <div class='yui-main'><div class='yui-b'><?php printf($lang->welcome, $app->company->name);?></div></div>
-  <div class='yui-b a-right'>
-    <?php if(isset($app->user)) echo $app->user->realname;?>
-    <?php 
-    if(isset($app->user) and $app->user->account != 'guest')
-    {
-        echo html::a($this->createLink('my', 'index'), $lang->myControl);
-        echo html::a($this->createLink('user', 'logout'), $lang->logout);
-    }
-    else
-    {
-        echo html::a($this->createLink('user', 'login'), $lang->login);
-    }
-    ?>
-    <a href='http://www.zentao.cn' target='_blank'><?php echo $lang->zentaoSite;?></a>
-    <?php echo $lang->sponser;?>
-  </div>
+  <div class='yui-b a-right'><?php common::printTopBar();?></div>
 </div>
 <div id='navbar' class='yui-d0'>
-  <div id='mainmenu'>
-    <ul>
-      <?php 
-      echo "<li>$lang->zentaoMS</li>";
-      /* 设定当前的主菜单项。默认先取当前的模块名，如果有该模块所对应的菜单分组，则取分组名作为主菜单项。*/
-      $moduleName = $this->app->getModuleName();
-      $mainMenu   = $moduleName;
-      if(isset($lang->menugroup->$moduleName)) $mainMenu = $lang->menugroup->$moduleName;
-
-      /* 循环打印主菜单。*/
-      foreach($lang->menu as $menuKey => $menu)
-      {
-          $active = $menuKey == $mainMenu ? 'id=active' : '';
-          list($menuLabel, $module, $method) = explode('|', $menu);
-
-          if(common::hasPriv($module, $method))
-          {
-              $link  = $this->createLink($module, $method);
-              echo "<li $active><nobr><a href='$link'>$menuLabel</a></nobr></li>\n";
-          }
-      }
-      ?>
-    </ul>
-  </div>
-
-  <div id='submenu'>
-    <ul>
-      <?php
-      if(isset($lang->menu->$mainMenu))
-      {
-          $submenus = $lang->submenu->$mainMenu;
-          foreach($submenus as $submenu)
-          {
-              if($submenu == '|')
-              {
-                  echo "<li>$submenu</li>";
-                  continue;
-              }
-              @list($menuLabel, $module, $method, $vars) = explode('|', $submenu);
-              if(common::hasPriv($module, $method))
-              {
-                  $link = $this->createLink($module, $method, $vars);
-                  echo "<li $active><a href='$link'>$menuLabel</a></li>\n";
-              }
-          }
-      }
-      ?>
-    </ul>
-  </div>
+  <div id='mainmenu'><?php common::printMainmenu($this->moduleName);?></div>
+  <div id='modulemenu'><?php common::printModuleMenu($this->moduleName);?></div>
 </div>
--- a/trunk/module/common/lang/zh-cn.php
+++ b/trunk/module/common/lang/zh-cn.php
@@ -48,10 +48,15 @@ $lang->menu->product = '产品视图|product|index';
 $lang->menu->project = '项目视图|project|index';
 $lang->menu->qa      = 'QA视图|qa|index';
 $lang->menu->company = '组织视图|company|index';
-//$lang->menu->misc    = '其他相关|misc|index';
 $lang->menu->admin   = '后台管理|admin|index';

 /*菜单设置：下级菜单。*/
+$lang->my->menu[] = '我的TODO|my|todo|';
+$lang->my->menu[] = '我的任务|my|task|';
+$lang->my->menu[] = '我的项目|my|project|';
+$lang->my->menu[] = '我的Bug|my|bug|';
+$lang->my->menu[] = '我的档案|my|editprofile|';
+
 $lang->submenu->index->item1 = '浏览产品|product|browse';
 $lang->submenu->index->item2 = '浏览项目|project|browse';

@@ -64,12 +69,6 @@ $lang->submenu->project ->item2 = '浏览项目|project|browse';
 $lang->submenu->qa->item1      = '缺陷管理|bug|index';
 $lang->submenu->qa->item2      = '用例管理|testcase|index';

-$lang->submenu->my->item1 = '我的TODO|my|todo';
-$lang->submenu->my->item2 = '我的任务|my|task';
-$lang->submenu->my->item3 = '我的项目|my|project';
-$lang->submenu->my->item4 = '我的Bug|my|bug';
-$lang->submenu->my->item6 = '我的档案|my|editprofile';
-
 $lang->submenu->company->item1 = '组织结构|company|index';

 $lang->submenu->admin->item1 = '浏览公司|admin|browsecompany';
--- a/trunk/module/my/view/header.html.php
+++ b/trunk/module/my/view/header.html.php
@@ -31,78 +31,3 @@ function changeDate(date)
    location.href=link;
 }
 </script>
-<div class="yui-d0 yui-t3">                 
-  <div class="yui-b">
-    <table class='table-1'>
-      <caption><?php echo $lang->my->profile;?></caption>
-      <tr>
-        <th class='rowhead'><?php echo $lang->user->account;?></th>
-        <td><?php echo $app->user->account;?></td>
-      </tr>
-      <tr>
-        <th class='rowhead'><?php echo $lang->user->realname;?></th>
-        <td><?php echo $app->user->realname;?></td>
-      </tr>
-      <tr>
-        <th class='rowhead'><?php echo $lang->user->nickname;?></th>
-        <td><?php echo $app->user->nickname;?></td>
-      </tr>
-      <tr>
-        <th class='rowhead'><?php echo $lang->user->join;?></th>
-        <td><?php echo $app->user->join;?></td>
-      </tr>
-      <tr>
-        <th class='rowhead'><?php echo $lang->user->visits;?></th>
-        <td><?php echo $app->user->visits;?></td>
-      </tr>
-      <tr>
-        <th class='rowhead'><?php echo $lang->user->ip;?></th>
-        <td><?php echo $app->user->ip;?></td>
-      </tr>
-      <tr>
-        <th class='rowhead'><?php echo $lang->user->last;?></th>
-        <td><?php echo $app->user->last;?></td>
-      </tr>
-    </table>
-    <div class='a-right'>
-      <?php 
-      echo html::a($this->createLink('my', 'editprofile'), $lang->user->editProfile);
-      //echo html::a($this->createLink('user', 'editpassword'), $lang->user->editPassword);
-      echo html::a($this->createLink('user', 'logout'), $lang->logout);
-      ?>
-    </div>
-  </div>
-  <div class="yui-main">
-    <div class="yui-b">
-      <div id='tabbar' class='yui-d0' style='clear:right'>
-        <ul>
-          <?php
-          echo "<li><nobr>{$app->user->realname}</nobr></li>";
-          echo "<li id='todotab'><nobr>"   . html::a($this->createLink('my', 'todo'),    $lang->my->todo)    . "</nobr></li>";
-          echo "<li id='tasktab'><nobr>"   . html::a($this->createLink('my', 'task'),    $lang->my->task)    . "</nobr></li>";
-          echo "<li id='projecttab'><nobr>". html::a($this->createLink('my', 'project'), $lang->my->project) . "</nobr></li>";
-          //echo "<li id='storytab'><nobr>"  . html::a($this->createLink('my', 'story'),   $lang->my->story)   . "</nobr></li>";
-          echo "<li id='bugtab'><nobr>"    . html::a($this->createLink('my', 'bug'),     $lang->my->bug)     . "</nobr></li>";
-          //echo "<li id='teamtab'><nobr>"   . html::a($this->createLink('my', 'team'),    $lang->my->team)    . "</nobr></li>";
-          echo <<<EOT
-<script language="Javascript">
-$("#{$tabID}tab").addClass('active');
-</script>
-EOT;
-        ?>
-        </ul>
-      </div>
-      <?php if($tabID == 'todo'):?>
-      <div id = 'subtab'>
-        <?php 
-        echo html::a($this->createLink('my', 'todo', "date=today"),     $lang->todo->todayTodos);
-        echo html::a($this->createLink('my', 'todo', "date=thisweek"),  $lang->todo->thisWeekTodos);
-        echo html::a($this->createLink('my', 'todo', "date=lastweek"),  $lang->todo->lastWeekTodos);
-        echo html::a($this->createLink('my', 'todo', "date=all"),   $lang->todo->allDaysTodos);
-        echo html::a($this->createLink('my', 'todo', "date=before&account={$app->user->account}&status=wait,doing"), $lang->todo->allUndone);
-
-        echo html::select('date', $dates, $date, 'onchange=changeDate(this.value)');
-        echo html::a($this->createLink('todo', 'create', "date=$date"), $lang->todo->create);
-        ?>
-      </div>
-      <?php endif;?>
--- a/trunk/module/my/view/todo.html.php
+++ b/trunk/module/my/view/todo.html.php
@@ -22,62 +22,88 @@
 * @link        http://www.zentao.cn
 */
 ?>
-<?php include './header.html.php';?>
-<form method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'import2Today');?>'>
-<table class='table-1 tablesorter'>
-  <thead>
-  <tr>
-    <th><?php echo $lang->todo->id;?></th>
-    <th><?php echo $lang->todo->date;?></th>
-    <th><?php echo $lang->todo->type;?></th>
-    <th><?php echo $lang->todo->pri;?></th>
-    <th><?php echo $lang->todo->name;?></th>
-    <th><?php echo $lang->todo->begin;?></th>
-    <th><?php echo $lang->todo->end;?></th>
-    <th><?php echo $lang->todo->status;?></th>
-    <th><?php echo $lang->action;?></th>
-  </tr>
-  </thead>
-  <tbody>
-  <?php foreach($todos as $todo):?>
-  <tr class='a-center'>
-	<td>
-      <?php
-      if($importFeature) echo "<input type='checkbox' name='todos[]' value='$todo->id' /> ";
-	  echo $todo->id;
-      ?>
-	</td>
-    <td><?php echo $todo->date;?></td>
-    <td><?php echo $lang->todo->typeList->{$todo->type};?></td>
-    <td><?php echo $todo->pri;?></td>
-    <td class='a-left'>
-	  <?php 
-	  if($todo->type == 'bug')    $link = $this->createLink('bug',  'view', "id={$todo->idvalue}");
-	  if($todo->type == 'task')   $link = $this->createLink('task', 'edit', "id={$todo->idvalue}");
-	  if($todo->type == 'custom') $link = $this->createLink('todo', 'edit', "id={$todo->id}");
-	  echo html::a($link, $todo->name);
-	  ?>
-	</td>
-    <td><?php echo $todo->begin;?></td>
-    <td><?php echo $todo->end;?></td>
-	<td class='<?php echo $todo->status;?>'><?php echo $lang->todo->statusList->{$todo->status};?></td>
-	<td>
-	  <?php 
-	  echo html::a($this->createLink('todo', 'mark',   "id=$todo->id&status=$todo->status"), $lang->todo->{'mark'.ucfirst($todo->status)}, 'hiddenwin');
-	  echo html::a($this->createLink('todo', 'edit',   "id=$todo->id"), $lang->todo->edit);
-	  echo html::a($this->createLink('todo', 'delete', "id=$todo->id"), $lang->todo->delete, 'hiddenwin');
-	  ?>
-	</td>
-  </tr>
-  <?php endforeach;?>
-  <?php if($importFeature):?>
-  <tr>
-    <td colspan='9'>
-	  <input type='submit' value='<?php echo $lang->todo->import2Today;?>' />
-	</td>
-  </tr>
-  <?php endif;?>
-  </tbody>
-</table>
+<?php include '../../common/header.html.php';?>
+<?php include '../../common/tablesorter.html.php';?>
+<script language='Javascript'>
+function changeDate(date)
+{
+    link = createLink('my', 'todo', 'date=' + date);
+    location.href=link;
+}
+</script>
+<div class='yui-d0'>
+<form method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'import2Today');?>' id='todoform'>
+   <div id='featurebar'>
+     <div class='f-left'>
+       <?php 
+       echo html::a($this->createLink('my', 'todo', "date=today"),     $lang->todo->todayTodos);
+       echo html::a($this->createLink('my', 'todo', "date=thisweek"),  $lang->todo->thisWeekTodos);
+       echo html::a($this->createLink('my', 'todo', "date=lastweek"),  $lang->todo->lastWeekTodos);
+       echo html::a($this->createLink('my', 'todo', "date=all"),   $lang->todo->allDaysTodos);
+       echo html::a($this->createLink('my', 'todo', "date=before&account={$app->user->account}&status=wait,doing"), $lang->todo->allUndone);
+       echo html::select('date', $dates, $date, 'onchange=changeDate(this.value)');
+       ?>
+    </div>
+    <div class='f-right'>
+      <?php echo html::a($this->createLink('todo', 'create', "date=$date"), $lang->todo->create);?>
+    </div>
+  </div>
+  <table class='table-1 tablesorter'>
+    <thead>
+    <tr class='colhead'>
+      <th><?php echo $lang->todo->id;?></th>
+      <th><?php echo $lang->todo->date;?></th>
+      <th><?php echo $lang->todo->type;?></th>
+      <th><?php echo $lang->todo->pri;?></th>
+      <th><?php echo $lang->todo->name;?></th>
+      <th><?php echo $lang->todo->begin;?></th>
+      <th><?php echo $lang->todo->end;?></th>
+      <th><?php echo $lang->todo->status;?></th>
+      <th><?php echo $lang->action;?></th>
+    </tr>
+    </thead>
+
+    <tbody>
+    <?php foreach($todos as $todo):?>
+    <tr class='a-center'>
+      <td>
+        <?php
+        if($importFeature) echo "<input type='checkbox' name='todos[]' value='$todo->id' /> ";
+        echo $todo->id;
+        ?>
+      </td>
+      <td><?php echo $todo->date;?></td>
+      <td><?php echo $lang->todo->typeList->{$todo->type};?></td>
+      <td><?php echo $todo->pri;?></td>
+      <td class='a-left'>
+        <?php 
+        if($todo->type == 'bug')    $link = $this->createLink('bug',  'view', "id={$todo->idvalue}");
+        if($todo->type == 'task')   $link = $this->createLink('task', 'edit', "id={$todo->idvalue}");
+        if($todo->type == 'custom') $link = $this->createLink('todo', 'edit', "id={$todo->id}");
+        echo html::a($link, $todo->name);
+        ?>
+      </td>
+      <td><?php echo $todo->begin;?></td>
+      <td><?php echo $todo->end;?></td>
+      <td class='<?php echo $todo->status;?>'><?php echo $lang->todo->statusList->{$todo->status};?></td>
+      <td>
+        <?php 
+        echo html::a($this->createLink('todo', 'mark',   "id=$todo->id&status=$todo->status"), $lang->todo->{'mark'.ucfirst($todo->status)}, 'hiddenwin');
+        echo html::a($this->createLink('todo', 'edit',   "id=$todo->id"), $lang->todo->edit);
+        echo html::a($this->createLink('todo', 'delete', "id=$todo->id"), $lang->todo->delete, 'hiddenwin');
+        ?>
+      </td>
+    </tr>
+    <?php endforeach;?>
+    <?php if($importFeature):?>
+    <tr>
+      <td colspan='9'>
+        <input type='submit' value='<?php echo $lang->todo->import2Today;?>' />
+      </td>
+    </tr>
+    <?php endif;?>
+    </tbody>
+  </table>
 </form>
-<?php include './footer.html.php';?>
+</div>
+<?php include '../../common/footer.html.php';?>
--- a/trunk/www/theme/default/style.css
+++ b/trunk/www/theme/default/style.css
@@ -53,20 +53,20 @@ ins{background:#cfc; text-decoration:none}
 .button-c{padding:3px 20px 3px 20px}

 /*-----------------------TABLE SETTING----------------------------*/
-caption  {border:1px solid #e4e4e4; background:#efefef; margin:0; padding:5px; border-bottom:none; text-align:left; font-weight:bold;}
-table, tr, th, td {border-color:#e4e4e4}
-tr, th, td {padding:3px}
+table, th, td {border-color:#e4e4e4}
+tr, th, td    {padding:3px}
+caption       {border:1px solid #e4e4e4; background:#efefef; margin:0; padding:5px; border-bottom:none; text-align:left; font-weight:bold;}
 .table-1 {width:100%; margin-bottom:10px}
 .table-2 {width:240px;margin-bottom:10px}
 .table-3 {width:360px;margin-bottom:10px}
 .table-4 {width:480px;margin-bottom:10px}
 .table-5 {width:600px;margin-bottom:10px}
-.colhead th  {text-align:center;}
+.colhead th  {text-align:center; background:#efefef}
 .rowhead     {font-weight:bold; text-align:right; width:100px}

 /*-----------------------LAYOUT SETTING----------------------------*/
-.f-left   {float:left;}
-.f-right  {float:right}
+.f-left   {float:left;  padding-left: 5px}
+.f-right  {float:right; padding-right:5px}
 .c-none   {clear:none;}
 .c-left   {clear:left;}
 .c-right  {clear:right;}
@@ -83,11 +83,11 @@ tr, th, td {padding:3px}
 .inline {display:inline}

 /*-----------------------BORDER SETTING--------------------------*/
-.bd-1px    {border:1px solid}
-.bt-1px    {border-top:1px  solid}
-.bl-1px    {border-left:1px solid}
+.bd-1px    {border:1px        solid}
+.bt-1px    {border-top:1px    solid}
+.bl-1px    {border-left:1px   solid}
 .bb-1px    {border-bottom:1px solid}
-.br-1px    {border-right:1px solid}
+.br-1px    {border-right:1px  solid}
 .bd-none   {border:none}
 .bd-green  {border-color:#58CB64}
 .bd-yellow {border-color:#F4BF20}
@@ -95,45 +95,43 @@ tr, th, td {padding:3px}
 .bd-gray   {border-color:#CCC;}

 /*-----------------------BACKGROUND SETTING----------------------------*/
-.bg-green    {background-color:#DDF1D8;}
-.bg-blue     {background-color:#DEEEF4}
-.bg-yellow   {background-color:#FBF5C6;}
-.bg-gray     {background-color:#efefef;}
+.bg-green  {background-color:#DDF1D8;}
+.bg-blue   {background-color:#DEEEF4}
+.bg-yellow {background-color:#FBF5C6;}
+.bg-gray   {background-color:#efefef;}

 /*-----------------------SPECIAL PART SETTING--------------------*/
-#navbar    {font-weight:bold; font-size:108%; margin:5px 10px 0px 10px; padding:0;}
-#navbar ul {margin:0; padding:0; line-height: 2; border:none} 
+
+/* <20><EFBFBD><EEB6A5><EFBFBD>ĵ<EFBFBD><C4B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/
+#topbar {margin-bottom:5px}
+
+/* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͨ<EFBFBD><CDA8><EFBFBD><EFBFBD><EFBFBD>á<EFBFBD>*/
+#navbar    {font-weight:bold; font-size:108%;}
+#navbar ul {margin:0; padding:0; height:28px; line-height:28px} 
 #navbar li {margin:0; padding:0; float:left; text-align:center; list-style-type:none}
+#navbar a  {text-decoration:none}
+#navbar a:hover {color:red;}

-#mainmenu ul {background-color:#D6E7FF; height:28px} /* <20><><EFBFBD><EFBFBD><EFBFBD>趨<EFBFBD>߶ȣ<DFB6><C8A3><EFBFBD>֧<EFBFBD><D6A7>opera<EFBFBD><EFBFBD>*/
-#mainmenu li {border-right:4px solid #73A2EF; padding:0 15px 0 15px}
-#mainmenu a         {text-decoration:none; color:black;}
-#mainmenu a:hover   {color:red; font-weight:bold}
-#mainmenu #active   {color:#FFF; background-color:#00008B;}
-#mainmenu #active a       {color:white}
-#mainmenu #active a:hover {color:red}
+/* һ<><D2BB><EFBFBD>˵<EFBFBD><EFBFBD><EFBFBD>*/
+#mainmenu ul {background-color:#D6E7FF;}
+#mainmenu li {padding:0 15px 0 15px;border-right:4px solid #73A2EF}
+#mainmenu a  {color:black;}
+#mainmenu .active   {color:#FFF; background-color:#00008B;}
+#mainmenu .active a {color:white}

-#submenu    {color:white; clear:both; margin-bottom:10px}
-#submenu ul {background-color:#000888;height:28px} 
-#submenu li {padding:0 10px 0 10px}
-#submenu a  {text-decoration:none; color:yellow;}
-#submenu li a:hover {color:red;}
+/* ģ<><C4A3><EFBFBD>Ĳ˵<C4B2><CBB5><EFBFBD>*/
+#modulemenu    {color:white; margin-bottom:10px; font-weight:normal; font-size:normal}
+#modulemenu ul {background-color:#000888; height:26px; line-height:26px} 
+#modulemenu li {padding:0 5px 0 5px}
+#modulemenu a  {color:white;}
+#modulemenu .active a {color:yellow; font-weight:bold}

-#posbar    {margin:5px 0 5px 10px; text-align:left}
-#footer    {width:100%; position:fixed; bottom:0; left:0; margin:10px 0 0 0; padding-left:10px;  border-top:2px solid #F4BF20; text-align:left; background-color:#FBF5C6; font-size:108%;}
-#hiddenwin {display:none}
-
-#tabbar    {font-weight:bold; font-size:108%; margin:0; padding:0; height:28px; background-color:#e4e4e4}
-#tabbar ul {margin:0; padding:0; float:left; line-height: 2; border:none; background-color:#e4e4e4; height:28px;; clear:left} 
-#tabbar li {margin:0; padding:0; float:left; text-align:center; list-style-type:none; border-right:4px solid #efefef; padding:0 10px 0 10px}
-#tabbar a         {text-decoration:none; color:black;}
-#tabbar a:hover   {color:red; font-weight:bold}
-#tabbar .active   {color:black; background-color:#FFCF9C;}
-#tabbar .active a:hover {color:red}
-#tabbar div{float:right; padding:5px 10px 4px 10px; background:#FFCF9C}
-#tabbar div select{font-size:11px; height:19px; margin:0; padding:0}
-#subtab  {clear:both; text-align:left; background-color:#FFCF9C; font-weight:bold; font-size:108%; padding-left:10px}
-#subtab a{text-decoration:none; color:black;}
+/* <20><><EFBFBD>ܲ˵<DCB2><CBB5><EFBFBD>*/
+#featurebar {margin-bottom:5px; background-color:#efefef; height:22px; line-height:22px;}
+#featurebar a         {text-decoration:none; color:black;}
+#featurebar a:hover   {color:red;}
+#featurebar .active   {color:red; font-weight:bold;}
+#featurebar select    {font-size:12px; height:22px}

 #titlebar{font-size:16px; font-weight:bold; background:#e4e4e4; padding:5px; margin:10px 0 10px 0; height:22px}
 #titlebar #main {float:left;  width:80%; clear:none; text-align:left}
@@ -141,8 +139,16 @@ tr, th, td {padding:3px}
 #titlebar #main input {font-size:14px}
 #titlebar .button-s   {font-size:12px; padding-top:0; padding-bottom:0}

-.history {border:1px solid gray; background:#efefef; padding:10px; margin-top:10px; margin-bottom:10px}
+#poweredby    {font-size:10.5px}
+#footer       {width:100%; position:fixed; bottom:0; left:0; margin:10px 0 0 0; padding-left:10px;  border-top:2px solid #F4BF20; text-align:left; background-color:#FBF5C6; font-size:108%;}
+#footer-right {padding-right:10px}
+
 .yui-doc3, #doc3 {margin-left:10px; margin-right:10px}
+
+.hiddenwin {display:none}
+.debugwin  {display:block; margin:10px; width:90%; height:100px; border:1px solid #fff}
+
+.history {border:1px solid gray; background:#efefef; padding:10px; margin-top:10px; margin-bottom:10px}
 /*-----------------------STATUS COLORS--------------------*/
 .done  {color:darkgreen}
 .wait  {color:#9F9F5F}
--- a/trunk/www/theme/firefox.css
+++ b/trunk/www/theme/firefox.css
@@ -1,4 +1 @@
-caption {margin-left:-1px}
-#prjbar {margin-left:-1px}
-#tabbar {margin-left:-1px}
-#subtab {margin-left:-1px}
+caption, #prjbar, #tabbar, #subtab, #featurebar {margin-left:-1px}