Application layout refactored.

The project menu is now the main menu.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@747 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 files changed, 318 insertions, 1171 deletions

diff --git a/public/images/contentbg.png b/public/images/contentbg.png
new file mode 100644
index 000000000..eb6d75080
--- /dev/null
+++ b/public/images/contentbg.png
diff --git a/public/images/mainbg.png b/public/images/mainbg.png
new file mode 100644
index 000000000..29713c3c1
--- /dev/null
+++ b/public/images/mainbg.png
diff --git a/public/images/note.png b/public/images/note.png
new file mode 100644
index 000000000..256368397
--- /dev/null
+++ b/public/images/note.png
diff --git a/public/javascripts/menu.js b/public/javascripts/menu.js
deleted file mode 100644
index 63e3fe66e..000000000
--- a/public/javascripts/menu.js
+++ /dev/null
@@ -1,556 +0,0 @@
-//*****************************************************************************
-// Do not remove this notice.
-//
-// Copyright 2000-2004 by Mike Hall.
-// See http://www.brainjar.com for terms of use.
-//*****************************************************************************
-
-//----------------------------------------------------------------------------
-// Emulation de la fonction push pour IE5.0
-//----------------------------------------------------------------------------
-if(!Array.prototype.push){Array.prototype.push=function(){for(var i=0;i<arguments.length;i++)this[this.length]=arguments[i];};};
-
-//----------------------------------------------------------------------------
-// Code to determine the browser and version.
-//----------------------------------------------------------------------------
-
-function Browser() {
-
-  var ua, s, i;
-
-  this.isIE    = false;  // Internet Explorer
-  this.isOP    = false;  // Opera
-  this.isNS    = false;  // Netscape
-  this.version = null;
-  //-- debut ajout ci ----
-  this.isIE5mac    = false;  // Internet Explorer 5 mac
-  //-- fin ajout ci ----    
-
-  ua = navigator.userAgent;
-
-  //-- debut ajout ci ----
-  if (ua.indexOf("Opera")==-1 && ua.indexOf("MSIE 5")>-1 && ua.indexOf("Mac")>-1) {
-    this.isIE5mac = true;
-    this.version = "";
-    return;
-  }
-  //-- fin ajout ci ----    
-  
-  s = "Opera";
-  if ((i = ua.indexOf(s)) >= 0) {
-    this.isOP = true;
-    this.version = parseFloat(ua.substr(i + s.length));
-    return;
-  }
-
-  s = "Netscape6/";
-  if ((i = ua.indexOf(s)) >= 0) {
-    this.isNS = true;
-    this.version = parseFloat(ua.substr(i + s.length));
-    return;
-  }
-
-  // Treat any other "Gecko" browser as Netscape 6.1.
-
-  s = "Gecko";
-  if ((i = ua.indexOf(s)) >= 0) {
-    this.isNS = true;
-    this.version = 6.1;
-    return;
-  }
-  
-  s = "MSIE";
-  if ((i = ua.indexOf(s))) {
-    this.isIE = true;
-    this.version = parseFloat(ua.substr(i + s.length));
-    return;
-  }
-}
-
-var browser = new Browser();
-
-//----------------------------------------------------------------------------
-// Code for handling the menu bar and active button.
-//----------------------------------------------------------------------------
-
-var activeButton = null;
-
-
-function buttonClick(event, menuId) {
-
-  var button;
-
-  // Get the target button element.
-
-  if (browser.isIE)
-    button = window.event.srcElement;
-  else
-    button = event.currentTarget;
-
-  // Blur focus from the link to remove that annoying outline.
-
-  button.blur();
-
-  // Associate the named menu to this button if not already done.
-  // Additionally, initialize menu display.
-
-  if (button.menu == null) {
-    button.menu = document.getElementById(menuId);
-    if (button.menu.isInitialized == null)
-      menuInit(button.menu);
-  }
-
-  // Set mouseout event handler for the button, if not already done.
-
-  if (button.onmouseout == null)
-    button.onmouseout = buttonOrMenuMouseout;
-
-  // Exit if this button is the currently active one.
-
-  if (button == activeButton)
-    return false;
-
-  // Reset the currently active button, if any.
-
-  if (activeButton != null)
-    resetButton(activeButton);
-
-  // Activate this button, unless it was the currently active one.
-
-  if (button != activeButton) {
-    depressButton(button);
-    activeButton = button;
-  }
-  else
-    activeButton = null;
-
-  return false;
-}
-
-function buttonMouseover(event, menuId) {
-
-  var button;
-//-- debut ajout ci ----
-  if (!browser.isIE5mac) { 
-  //-- fin ajout ci ----
-  
-//-- debut ajout ci ----
-	cicacheselect();
-//-- fin ajout ci ----    
-
-  // Activates this button's menu if no other is currently active.
-
-  if (activeButton == null) {
-    buttonClick(event, menuId);
-    return;
-  }
-
-  // Find the target button element.
-
-  if (browser.isIE)
-    button = window.event.srcElement;
-  else
-    button = event.currentTarget;
-
-  // If any other button menu is active, make this one active instead.
-
-  if (activeButton != null && activeButton != button)
-    buttonClick(event, menuId);
- //-- debut ajout ci ----
-  } 
-  //-- fin ajout ci ----
-    
-}
-
-function depressButton(button) {
-
-  var x, y;
-
-  // Update the button's style class to make it look like it's
-  // depressed.
-
-  button.className += " menuButtonActive";
-
-  // Set mouseout event handler for the button, if not already done.
-
-  if (button.onmouseout == null)
-    button.onmouseout = buttonOrMenuMouseout;
-  if (button.menu.onmouseout == null)
-    button.menu.onmouseout = buttonOrMenuMouseout;
-
-  // Position the associated drop down menu under the button and
-  // show it.
-
-  x = getPageOffsetLeft(button);
-  y = getPageOffsetTop(button) + button.offsetHeight - 1;
-
-  // For IE, adjust position.
-
-  if (browser.isIE) {
-    x += button.offsetParent.clientLeft;
-    y += button.offsetParent.clientTop;
-  }
-
-  button.menu.style.left = x + "px";
-  button.menu.style.top  = y + "px";0
-  button.menu.style.visibility = "visible";
-}
-
-function resetButton(button) {
-
-  // Restore the button's style class.
-
-  removeClassName(button, "menuButtonActive");
-
-  // Hide the button's menu, first closing any sub menus.
-
-  if (button.menu != null) {
-    closeSubMenu(button.menu);
-    button.menu.style.visibility = "hidden";
-  }
-}
-
-//----------------------------------------------------------------------------
-// Code to handle the menus and sub menus.
-//----------------------------------------------------------------------------
-
-function menuMouseover(event) {
-
-  var menu;
- //-- debut ajout ci ----
-  if (!browser.isIE5mac) { 
-  //-- fin ajout ci ----
-//-- debut ajout ci ----
-	cicacheselect();
-//-- fin ajout ci ----    
-
-  // Find the target menu element.
-  if (browser.isIE)
-    menu = getContainerWith(window.event.srcElement, "DIV", "menu");
-  else
-    menu = event.currentTarget;
-
-  // Close any active sub menu.
-
-  if (menu.activeItem != null)
-    closeSubMenu(menu);
- //-- debut ajout ci ----
-  } 
-  //-- fin ajout ci ----
-}
-
-function menuItemMouseover(event, menuId) {
-
-  var item, menu, x, y;
-//-- debut ajout ci ----
-	cicacheselect();
-//-- fin ajout ci ----    
-
-  // Find the target item element and its parent menu element.
-
-  if (browser.isIE)
-    item = getContainerWith(window.event.srcElement, "A", "menuItem");
-  else
-    item = event.currentTarget;
-  menu = getContainerWith(item, "DIV", "menu");
-
-  // Close any active sub menu and mark this one as active.
-
-  if (menu.activeItem != null)
-    closeSubMenu(menu);
-  menu.activeItem = item;
-
-  // Highlight the item element.
-
-  item.className += " menuItemHighlight";
-
-  // Initialize the sub menu, if not already done.
-
-  if (item.subMenu == null) {
-    item.subMenu = document.getElementById(menuId);
-    if (item.subMenu.isInitialized == null)
-      menuInit(item.subMenu);
-  }
-
-  // Set mouseout event handler for the sub menu, if not already done.
-
-  if (item.subMenu.onmouseout == null)
-    item.subMenu.onmouseout = buttonOrMenuMouseout;
-
-  // Get position for submenu based on the menu item.
-
-  x = getPageOffsetLeft(item) + item.offsetWidth;
-  y = getPageOffsetTop(item);
-
-  // Adjust position to fit in view.
-
-  var maxX, maxY;
-
-  if (browser.isIE) {
-    maxX = Math.max(document.documentElement.scrollLeft, document.body.scrollLeft) +
-      (document.documentElement.clientWidth != 0 ? document.documentElement.clientWidth : document.body.clientWidth);
-    maxY = Math.max(document.documentElement.scrollTop, document.body.scrollTop) +
-      (document.documentElement.clientHeight != 0 ? document.documentElement.clientHeight : document.body.clientHeight);
-  }
-  if (browser.isOP) {
-    maxX = document.documentElement.scrollLeft + window.innerWidth;
-    maxY = document.documentElement.scrollTop  + window.innerHeight;
-  }
-  if (browser.isNS) {
-    maxX = window.scrollX + window.innerWidth;
-    maxY = window.scrollY + window.innerHeight;
-  }
-  maxX -= item.subMenu.offsetWidth;
-  maxY -= item.subMenu.offsetHeight;
-
-  if (x > maxX)
-    x = Math.max(0, x - item.offsetWidth - item.subMenu.offsetWidth
-      + (menu.offsetWidth - item.offsetWidth));
-  y = Math.max(0, Math.min(y, maxY));
-
-  // Position and show the sub menu.
-
-  item.subMenu.style.left = x + "px";
-  item.subMenu.style.top  = y + "px";
-  item.subMenu.style.visibility = "visible";
-
-  // Stop the event from bubbling.
-
-  if (browser.isIE)
-    window.event.cancelBubble = true;
-  else
-    event.stopPropagation();
-}
-
-function closeSubMenu(menu) {
-
-  if (menu == null || menu.activeItem == null)
-    return;
-
-  // Recursively close any sub menus.
-
-  if (menu.activeItem.subMenu != null) {
-    closeSubMenu(menu.activeItem.subMenu);
-    menu.activeItem.subMenu.style.visibility = "hidden";
-    menu.activeItem.subMenu = null;
-  }
-  removeClassName(menu.activeItem, "menuItemHighlight");
-  menu.activeItem = null;
-}
-
-
-function buttonOrMenuMouseout(event) {
-
-  var el;
-
-  // If there is no active button, exit.
-
-  if (activeButton == null)
-    return;
-
-  // Find the element the mouse is moving to.
-
-  if (browser.isIE)
-    el = window.event.toElement;
-  else if (event.relatedTarget != null)
-      el = (event.relatedTarget.tagName ? event.relatedTarget : event.relatedTarget.parentNode);
-
-  // If the element is not part of a menu, reset the active button.
-
-  if (getContainerWith(el, "DIV", "menu") == null) {
-    resetButton(activeButton);
-    activeButton = null;
-//-- debut ajout ci ----
-	cimontreselect();
-//-- fin ajout ci ----    
-  }
-}
-
-
-//----------------------------------------------------------------------------
-// Code to initialize menus.
-//----------------------------------------------------------------------------
-
-function menuInit(menu) {
-
-  var itemList, spanList;
-  var textEl, arrowEl;
-  var itemWidth;
-  var w, dw;
-  var i, j;
-
-  // For IE, replace arrow characters.
-
-  if (browser.isIE) {
-    menu.style.lineHeight = "2.5ex";
-    spanList = menu.getElementsByTagName("SPAN");
-    for (i = 0; i < spanList.length; i++)
-      if (hasClassName(spanList[i], "menuItemArrow")) {
-        spanList[i].style.fontFamily = "Webdings";
-        spanList[i].firstChild.nodeValue = "4";
-      }
-  }
-
-  // Find the width of a menu item.
-
-  itemList = menu.getElementsByTagName("A");
-  if (itemList.length > 0)
-    itemWidth = itemList[0].offsetWidth;
-  else
-    return;
-
-  // For items with arrows, add padding to item text to make the
-  // arrows flush right.
-
-  for (i = 0; i < itemList.length; i++) {
-    spanList = itemList[i].getElementsByTagName("SPAN");
-    textEl  = null;
-    arrowEl = null;
-    for (j = 0; j < spanList.length; j++) {
-      if (hasClassName(spanList[j], "menuItemText"))
-        textEl = spanList[j];
-      if (hasClassName(spanList[j], "menuItemArrow"))
-        arrowEl = spanList[j];
-    }
-    if (textEl != null && arrowEl != null) {
-      textEl.style.paddingRight = (itemWidth 
-        - (textEl.offsetWidth + arrowEl.offsetWidth)) + "px";
-      // For Opera, remove the negative right margin to fix a display bug.
-      if (browser.isOP)
-        arrowEl.style.marginRight = "0px";
-    }
-  }
-
-  // Fix IE hover problem by setting an explicit width on first item of
-  // the menu.
-
-  if (browser.isIE) {
-    w = itemList[0].offsetWidth;
-    itemList[0].style.width = w + "px";
-    dw = itemList[0].offsetWidth - w;
-    w -= dw;
-    itemList[0].style.width = w + "px";
-  }
-
-  // Mark menu as initialized.
-
-  menu.isInitialized = true;
-}
-
-//----------------------------------------------------------------------------
-// General utility functions.
-//----------------------------------------------------------------------------
-
-function getContainerWith(node, tagName, className) {
-
-  // Starting with the given node, find the nearest containing element
-  // with the specified tag name and style class.
-
-  while (node != null) {
-    if (node.tagName != null && node.tagName == tagName &&
-        hasClassName(node, className))
-      return node;
-    node = node.parentNode;
-  }
-
-  return node;
-}
-
-function hasClassName(el, name) {
-
-  var i, list;
-
-  // Return true if the given element currently has the given class
-  // name.
-
-  list = el.className.split(" ");
-  for (i = 0; i < list.length; i++)
-    if (list[i] == name)
-      return true;
-
-  return false;
-}
-
-function removeClassName(el, name) {
-
-  var i, curList, newList;
-
-  if (el.className == null)
-    return;
-
-  // Remove the given class name from the element's className property.
-
-  newList = new Array();
-  curList = el.className.split(" ");
-  for (i = 0; i < curList.length; i++)
-    if (curList[i] != name)
-      newList.push(curList[i]);
-  el.className = newList.join(" ");
-}
-
-function getPageOffsetLeft(el) {
-
-  var x;
-
-  // Return the x coordinate of an element relative to the page.
-
-  x = el.offsetLeft;
-  if (el.offsetParent != null)
-    x += getPageOffsetLeft(el.offsetParent);
-
-  return x;
-}
-
-function getPageOffsetTop(el) {
-
-  var y;
-
-  // Return the x coordinate of an element relative to the page.
-
-  y = el.offsetTop;
-  if (el.offsetParent != null)
-    y += getPageOffsetTop(el.offsetParent);
-
-  return y;
-}
-
-//-- debut ajout ci ----
-function cicacheselect(){
-  if (browser.isIE && browser.version < 7) {
-	 oSelects = document.getElementsByTagName('SELECT');
-	 if (oSelects.length > 0) {
-	  for (i = 0; i < oSelects.length; i++) {
-	   oSlt = oSelects[i];
-	    if (oSlt.style.visibility != 'hidden') {oSlt.style.visibility = 'hidden';}
-	  }
-	 }  
-	 oSelects = document.getElementsByName('masquable');
-	 if (oSelects.length > 0) {
-	  for (i = 0; i < oSelects.length; i++) {
-	   oSlt = oSelects[i];
-	    if (oSlt.style.visibility != 'hidden') {oSlt.style.visibility = 'hidden';}
-	  }
-	 }  
-  }
-}	
-
-function cimontreselect(){
-  if (browser.isIE && browser.version < 7) {
-	 oSelects = document.getElementsByTagName('SELECT');
-	 if (oSelects.length > 0) {
-	  for (i = 0; i < oSelects.length; i++) {
-	   oSlt = oSelects[i];
-	    if (oSlt.style.visibility != 'visible') {oSlt.style.visibility = 'visible';}
-	  }
-	 }  
-	 oSelects = document.getElementsByName('masquable');
-	 if (oSelects.length > 0) {
-	  for (i = 0; i < oSelects.length; i++) {
-	   oSlt = oSelects[i];
-	    if (oSlt.style.visibility != 'visible') {oSlt.style.visibility = 'visible';}
-	  }
-	 }  
-  }
-}	
-
-//-- fin ajout ci ----    
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index ea16857a3..5cbc89ab0 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1,499 +1,220 @@
-/* andreas08 - an open source xhtml/css website layout by Andreas Viklund - http://andreasviklund.com . Free to use in any way and for any purpose as long as the proper credits are given to the original designer. Version: 1.0, November 28, 2005 */
-/* Edited by Jean-Philippe Lang *>
-/**************** Body and tag styles ****************/
-
-#header * {margin:0; padding:0;}
-p, ul, ol, li {margin:0; padding:0;}
-
-body{
-font:76% Verdana,Tahoma,Arial,sans-serif;
-line-height:1.4em;
-text-align:center;
-color:#303030;
-background:#e8eaec;
-margin:0;
-}
-
-a{color:#467aa7;font-weight:bold;text-decoration:none;background-color:inherit;}
-a:hover{color:#2a5a8a; text-decoration:none; background-color:inherit;}
-a img{border:none;}
-
-p{margin:0 0 1em 0;}
-p form{margin-top:0; margin-bottom:20px;}
-
-img.left,img.center,img.right{padding:4px; border:1px solid #a0a0a0;}
-img.left{float:left; margin:0 12px 5px 0;}
-img.center{display:block; margin:0 auto 5px auto;}
-img.right{float:right; margin:0 0 5px 12px;}
-
-/**************** Header and navigation styles ****************/
-
-#container{
-width:100%;
-min-width: 800px;
-margin:0;
-padding:0;
-text-align:left;
-background:#ffffff;
-color:#303030;
-}
-
-#header{
-height:4.5em;
-margin:0;
-background:#467aa7;
-color:#ffffff;
-margin-bottom:1px;
-}
-
-#header h1{
-padding:10px 0 0 20px;
-font-size:2em;
-background-color:inherit;
-color:#fff;
-letter-spacing:-1px;
-font-weight:bold;
-font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
-}
-
-#header h2{
-margin:3px 0 0 40px;
-font-size:1.5em;
-background-color:inherit;
-color:#f0f2f4;
-letter-spacing:-1px;
-font-weight:normal;
-font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
-}
-
-#header a {color:#fff;}
-
-#navigation{
-height:2.2em;
-line-height:2.2em;
-margin:0;
-background:#578bb8;
-color:#ffffff;
-}
-
-#navigation li{
-float:left;
-list-style-type:none;
-border-right:1px solid #ffffff;
-white-space:nowrap;
-}
-
-#navigation li.right {
- float:right;
-list-style-type:none;
-border-right:0;
-border-left:1px solid #ffffff;
-white-space:nowrap;
-}
-
-#navigation li a{
-display:block;
-padding:0px 10px 0px 22px;
-font-size:0.8em;
-font-weight:normal;
-text-decoration:none;
-background-color:inherit;
-color: #ffffff;
-}
-
-#navigation li.submenu {background:url(../images/arrow_down.png) 96% 80% no-repeat;}
-#navigation li.submenu a {padding:0px 16px 0px 22px;}
-* html #navigation a {width:1%;}
-
-#navigation .selected,#navigation a:hover{
-color:#ffffff;
-text-decoration:none;
-background-color: #80b0da;
-}
-
-/**************** Icons *******************/
-.icon {
-background-position: 0% 40%;
-background-repeat: no-repeat;
-padding-left: 20px;
-padding-top: 2px;
-padding-bottom: 3px;
+body { font-family: Verdana, sans-serif; font-size: 12px; color:#484848; margin: 0; padding: 0; min-width: 900px; }
+
+h1, h2, h3 { font-family: "Trebuchet MS", Verdana, sans-serif;}
+h1 {margin:0; padding:0; font-size: 24px;}
+h2, .wiki h1 {font-size: 20px;padding: 2px 10px 1px 0px;margin: 0 0 10px 0; border-bottom: 1px solid #bbbbbb; color: #444;}
+h3, .wiki h2 {font-size: 16px;padding: 2px 10px 1px 0px;margin: 0 0 10px 0; border-bottom: 1px solid #bbbbbb; color: #444;}
+h4, .wiki h3 {font-size: 11px;padding: 2px 10px 1px 0px;margin-bottom: 5px; border-bottom: 1px dotted #bbbbbb; color: #444;}
+
+/***** Layout *****/
+#top-menu {background: #22344A;color: #fff;height:1.5em; padding: 2px 6px 0px 6px;}
+#top-menu a {color: #fff; padding-right: 4px;}
+#account {float:right;}
+
+#header {height:5.3em;margin:0;background-color:#507AAA;color:#f8f8f8; padding: 4px 6px 0px 6px;}
+#header a {color:#f8f8f8;}
+#quick-search {float:right;}
+
+#main-menu {position: absolute;  top: 5.5em;  left:8px;}
+#main-menu ul {margin: 0;  padding: 0;}
+#main-menu li {
+  float:left;
+  list-style-type:none;
+  margin: 0px 10px 0px 0px;
+  padding: 0px 0px 0px 0px;
+  white-space:nowrap;
+}
+#main-menu li a {
+  display: block;
+  color: #fff;
+  text-decoration: none;
+  margin: 0;
+  padding: 4px 4px 4px 4px;
+  background: #22344A;
 }
+#main-menu li a:hover {background:#759FCF;}
 
-#navigation .icon {
-background-position: 4px 50%;
-}
+#main {background: url(../images/mainbg.png) repeat-x; background-color:#EEEEEE;}
 
-.icon22 {
-background-position: 0% 40%;
-background-repeat: no-repeat;
-padding-left: 26px;
-line-height: 22px;
-vertical-align: middle;
-}
-
-.icon-add { background-image: url(../images/add.png); }
-.icon-edit { background-image: url(../images/edit.png); }
-.icon-del { background-image: url(../images/delete.png); }
-.icon-move { background-image: url(../images/move.png); }
-.icon-save { background-image: url(../images/save.png); }
-.icon-cancel { background-image: url(../images/cancel.png); }
-.icon-pdf { background-image: url(../images/pdf.png); }
-.icon-csv { background-image: url(../images/csv.png); }
-.icon-html { background-image: url(../images/html.png); }
-.icon-image { background-image: url(../images/image.png); }
-.icon-txt { background-image: url(../images/txt.png); }
-.icon-file { background-image: url(../images/file.png); }
-.icon-folder { background-image: url(../images/folder.png); }
-.icon-package { background-image: url(../images/package.png); }
-.icon-home { background-image: url(../images/home.png); }
-.icon-user { background-image: url(../images/user.png); }
-.icon-mypage { background-image: url(../images/user_page.png); }
-.icon-admin { background-image: url(../images/admin.png); }
-.icon-projects { background-image: url(../images/projects.png); }
-.icon-logout { background-image: url(../images/logout.png); }
-.icon-help { background-image: url(../images/help.png); }
-.icon-attachment  { background-image: url(../images/attachment.png); }
-.icon-index  { background-image: url(../images/index.png); }
-.icon-history  { background-image: url(../images/history.png); }
-.icon-feed  { background-image: url(../images/feed.png); }
-.icon-time  { background-image: url(../images/time.png); }
-.icon-stats  { background-image: url(../images/stats.png); }
-.icon-warning  { background-image: url(../images/warning.png); }
-.icon-fav  { background-image: url(../images/fav.png); }
-.icon-fav-off  { background-image: url(../images/fav_off.png); }
-.icon-reload  { background-image: url(../images/reload.png); }
-.icon-lock  { background-image: url(../images/locked.png); }
-.icon-unlock  { background-image: url(../images/unlock.png); }
-
-.icon22-projects { background-image: url(../images/22x22/projects.png); }
-.icon22-users { background-image: url(../images/22x22/users.png); }
-.icon22-tracker { background-image: url(../images/22x22/tracker.png); }
-.icon22-role { background-image: url(../images/22x22/role.png); }
-.icon22-workflow { background-image: url(../images/22x22/workflow.png); }
-.icon22-options { background-image: url(../images/22x22/options.png); }
-.icon22-notifications { background-image: url(../images/22x22/notifications.png); }
-.icon22-authent { background-image: url(../images/22x22/authent.png); }
-.icon22-info { background-image: url(../images/22x22/info.png); }
-.icon22-comment { background-image: url(../images/22x22/comment.png); }
-.icon22-package { background-image: url(../images/22x22/package.png); }
-.icon22-settings { background-image: url(../images/22x22/settings.png); }
-
-/**************** Content styles ****************/
+#sidebar{ float: right; width: 17%; position: relative; z-index: 9; min-height: 600px; padding: 0; margin: 0;}
+* html #sidebar{ width: 17%; }
+#sidebar h3{ font-size: 14px; margin-top:14px; color: #666;  }
+#sidebar hr{ width: 100%; margin: 0 auto; height: 1px; background: #ccc; border: 0; }
+* html #sidebar hr{ width: 95%; position: relative; left: -6px; color: #ccc; }
 
+#content { width: 80%; background: url(../images/contentbg.png) repeat-x; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; position: relative; z-index: 10; height:600px; min-height: 600px;}
+* html #content{ width: 80%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;}
 html>body #content {
 height: auto;
-min-height: 500px;
+min-height: 600px;
 } 
 
-#content{
-width: auto;
-height:500px;
-font-size:0.9em;
-padding:20px 10px 10px 20px;
-margin-left: 120px;
-border-left: 1px dashed #c0c0c0;
-
-}
+#main.nosidebar #sidebar{ display: none; }
+#main.nosidebar #content{ width: auto; border-right: 0; }
 
-#content h2, #content div.wiki h1 {
-display:block;
-margin:0 0 16px 0;
-font-size:1.7em;
-font-weight:normal;
-letter-spacing:-1px;
-color:#606060;
-background-color:inherit;
-font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
-}
-
-#content h2 a{font-weight:normal;}
-#content h3{margin:0 0 12px 0; font-size:1.4em;color:#707070;font-family: Trebuchet MS,Georgia,"Times New Roman",serif;}
-#content h4{font-size: 1em; margin-bottom: 12px; margin-top: 20px; font-weight: normal; border-bottom: dotted 1px #c0c0c0;} 
-#content a:hover,#subcontent a:hover{text-decoration:underline;}
-#content ul,#content ol{margin:0 5px 16px 35px;}
-#content dl{margin:0 5px 10px 25px;}
-#content dt{font-weight:bold; margin-bottom:5px;}
-#content dd{margin:0 0 10px 15px;}
+#footer {clear: both; border-top: 1px solid #bbb; font-size: 11px; padding: 5px; text-align:center; background:#fff;}
 
-#content .tabs{height: 2.6em;}
-#content .tabs ul{margin:0;}
-#content .tabs ul li{
-float:left;
-list-style-type:none;
-white-space:nowrap;
-margin-right:8px;
-background:#fff;
-}
-#content .tabs ul li a{
-display:block;
-font-size: 0.9em;
-text-decoration:none;
-line-height:1em;
-padding:4px;
-border: 1px solid #c0c0c0;
-}
-
-#content .tabs ul li a.selected, #content .tabs ul li a:hover{
-background-color: #80b0da;
-border: 1px solid #80b0da;
-color: #fff;
-text-decoration:none;
-}
+#login-form table {margin-top:5em; padding:1em; margin-left: auto; margin-right: auto; border: 2px solid #FDBF3B; background-color:#FFEBC1; }
+#login-form table td {padding: 6px;}
+#login-form label {font-weight: bold;}
 
-/***********************************************/
+.clear:after{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
 
-form {display: inline;}
-blockquote {padding-left: 6px; border-left: 2px solid #ccc;}
-input, select {vertical-align: middle; margin-top: 1px; margin-bottom: 1px;}
+/***** Links *****/
+a, a:link, a:visited{ color: #2A5685; text-decoration: none; }
+a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
+a img{ border: 0; }
 
-input.button-small {font-size: 0.8em;}
-textarea.wiki-edit { width: 99.5%; }
-.select-small {font-size: 0.8em;}
-label {font-weight: bold; font-size: 1em; color: #505050;}
-fieldset {border:1px solid #c0c0c0; padding: 6px;}
-legend {color: #505050;}
-.required {color: #bb0000;}
+/***** Tables *****/
+table.list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; margin-bottom: 4px; }
+table.list th {  background-color:#EEEEEE; padding: 4px; white-space:nowrap; }
+table.list tbody th { text-align: left; padding: 0px; }
+table.list td { overflow: hidden; text-overflow: ellipsis; vertical-align: top;}
+table.list tbody tr:hover { background-color:#ffffdd; }
+table td {padding:2px;}
+table p {margin:0;}
 .odd {background-color:#f6f7f8;}
 .even {background-color: #fff;}
-hr { border:0; border-top: dotted 1px #fff; border-bottom: dotted 1px #c0c0c0; }
-table p {margin:0; padding:0;}
-acronym {border-bottom:0;}
 
 .highlight { background-color: #FCFD8D;}
 
+.box{
+padding:6px;
+margin-bottom: 10px;
+background-color:#f6f6f6;
+color:#505050;
+line-height:1.5em;
+border: 1px solid #e4e4e4;
+}
+
 div.square {
  border: 1px solid #999;
  float: left;
- margin: .4em .5em 0 0;
+ margin: .3em .4em 0 .4em;
  overflow: hidden;
  width: .6em; height: .6em;
 }
 
-ul.documents {
-list-style-type: none;
-padding: 0;
+.contextual {float:right; white-space: nowrap; line-height:1.4em;margin-top:5px;font-size:0.9em;}
+.splitcontentleft{float:left; width:49%;}
+.splitcontentright{float:right; width:49%;}
+form {display: inline;}
+input, select {vertical-align: middle; margin-top: 1px; margin-bottom: 1px;}
+fieldset {border: 1px solid #e4e4e4; margin:0;}
+hr { width: 100%; height: 1px; background: #ccc; border: 0;}
+textarea.wiki-edit { width: 99%; }
+li p {margin-top: 0;}
+div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
+.autoscroll {overflow-x: auto; padding:1px; width:100%;}
+
+/***** Tabular forms ******/
+.tabular p{
 margin: 0;
+padding: 5px 0 8px 0;
+padding-left: 180px; /*width of left column containing the label elements*/
+height: 1%;
+clear:left;
 }
 
-ul.documents li {
-background-image: url(../images/32x32/file.png);
-background-repeat: no-repeat;
-background-position: 0 1px;
-padding-left: 36px;
-margin-bottom: 10px;
-margin-left: -37px;
-}
-
-/********** Table used to display lists of things ***********/
-
-table.list {
-    width:100%;
-    border-collapse: collapse;
-    border: 1px dotted #d0d0d0;
-    margin-bottom: 6px;
+.tabular label{
+font-weight: bold;
+float: left;
+text-align: right;
+margin-left: -180px; /*width of left column*/
+width: 175px; /*width of labels. Should be smaller than left column to create some right 
+margin*/
 }
 
-table.with-cells td {
-    border: 1px solid #d7d7d7;
-}
+#settings .tabular p{ padding-left: 300px; }
+#settings .tabular label{ margin-left: -300px; width: 295px; }
 
-table.list td {
-    padding:2px;
-}
+.required {color: #bb0000;}
+.summary {font-style: italic;}
 
-table.list thead th {
-    text-align: center;
-    background: #eee;
-    border: 1px solid #d7d7d7;
-    color: #777;
+/***** Flash & error messages ****/
+#flash div, #errorExplanation, .nodata {
+    padding: 4px 4px 4px 30px;
+    margin-bottom: 12px;
+	font-size: 1.1em;
+	border: 2px solid;
 }
 
-table.list tbody th {
-	font-weight: bold;
-    background: #eed;
-    border: 1px solid #d7d7d7;
-    color: #777;
-}
+#flash div {margin-top: 6px;}
 
-/*==========  Drop down menu  ==============*/
-div.menu {
-  background-color: #FFFFFF;
-  border-style: solid;
-  border-width: 1px;
-  border-color: #7F9DB9;
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  padding: 0;
-  visibility: hidden;
-  z-index: 101;
-}
-
-div.menu a.menuItem {
-  font-size: 10px;
-  font-weight: normal;
-  line-height: 2em;
-  color: #000000;
-  background-color: #FFFFFF;
-  cursor: default;
-  display: block;
-  padding: 0 1em;
-  margin: 0;
-  border: 0;
-  text-decoration: none;
-  white-space: nowrap;
+#flash div.error, #errorExplanation {
+    background: url(../images/false.png) 8px 5px no-repeat;
+	background-color: #ffe3e3;
+	border-color: #dd0000;
+	color: #550000;
 }
 
-div.menu a.menuItem:hover, div.menu a.menuItemHighlight {
-  background-color: #80b0da;
-  color: #ffffff;
+#flash div.notice {
+    background: url(../images/true.png) 8px 5px no-repeat;
+	background-color: #dfffdf;
+	border-color: #9fcf9f;
+	color: #005f00;
 }
 
-div.menu a.menuItem span.menuItemText {}
-
-div.menu a.menuItem span.menuItemArrow {
-  margin-right: -.75em;
+.nodata {
+    text-align: center;
+	background-color: #FFEBC1;
+	border-color: #FDBF3B;
+	color: #A6750C;
 }
 
-/**************** Sidebar styles ****************/
-
-#subcontent{
-position: absolute;
-left: 0px;
-width:95px;
-padding:20px 20px 10px 5px;
-overflow: hidden;
-}
+#errorExplanation ul { font-size: 0.9em;}
 
-#subcontent h2{
-display:block;
-margin:0 0 5px 0;
-font-size:1.0em;
+/***** Ajax indicator ******/
+#ajax-indicator {
+position: absolute; /* fixed not supported by IE */
+background-color:#eee;
+border: 1px solid #bbb;
+top:35%;
+left:40%;
+width:20%;
 font-weight:bold;
-text-align:left;
-color:#606060;
-background-color:inherit;
-font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
-}
-
-#subcontent p{margin:0 0 16px 0; font-size:0.9em;}
-
-/**************** Menublock styles ****************/
-
-.menublock{margin:0 0 20px 8px; font-size:0.8em;}
-.menublock li{list-style:none; display:block; padding:1px; margin-bottom:0px;}
-.menublock li a{font-weight:bold; text-decoration:none;}
-.menublock li a:hover{text-decoration:none;}
-.menublock li ul{margin:0; font-size:1em; font-weight:normal;}
-.menublock li ul li{margin-bottom:0;}
-.menublock li ul a{font-weight:normal;}
-
-/**************** Footer styles ****************/
-
-#footer{
-clear:both;
-padding:5px 0;
-margin:0;
-font-size:0.9em;
-color:#f0f0f0;
-background:#467aa7;
+text-align:center;
+padding:0.6em;
+z-index:100;
+filter:alpha(opacity=50);
+-moz-opacity:0.5;
+opacity: 0.5;
+-khtml-opacity: 0.5;
 }
 
-#footer p{padding:0; margin:0; text-align:center;}
-#footer a{color:#f0f0f0; background-color:inherit; font-weight:bold;}
-#footer a:hover{color:#ffffff; background-color:inherit; text-decoration: underline;}
-
-/**************** Misc classes and styles ****************/
-
-.splitcontentleft{float:left; width:49%;}
-.splitcontentright{float:right; width:49%;}
-.clear{clear:both;}
-.small{font-size:0.8em;line-height:1.4em;padding:0 0 0 0;}
-.hide{display:none;}
-.textcenter{text-align:center;}
-.textright{text-align:right;}
-.important{color:#f02025; background-color:inherit; font-weight:bold;}
-
-#content .author {color:#888; font-style:italic;}
-
-.box{
-margin:0 0 20px 0;
-padding:10px;
-border:1px solid #c0c0c0;
-background-color:#fafbfc;
-color:#505050;
-line-height:1.5em;
-}
+html>body #ajax-indicator { position: fixed; }
 
-a.close-icon {
-display:block;
-margin-top:3px;
-overflow:hidden;
-width:12px;
-height:12px;
+#ajax-indicator span {
+background-position: 0% 40%;
 background-repeat: no-repeat;
-cursor:pointer;
-background-image:url('../images/close.png');
-}
-
-a.close-icon:hover {
-background-image:url('../images/close_hl.png');
-}
-
-.rightbox{
-background: #fafbfc;
-border: 1px solid #c0c0c0;
-float: right;
-padding: 8px;
-position: relative;
-margin: 0 5px 5px;
-}
-
-div.attachments {padding-left: 6px; border-left: 2px solid #ccc; margin-bottom: 8px;}
-div.attachments p {margin-bottom:2px;}
-
-.overlay{ 
-position: absolute;
-margin-left:0;
-z-index: 50;
+background-image: url(../images/loading.gif);
+padding-left: 26px;
+vertical-align: bottom;
 }
 
-.layout-active {
-background: #ECF3E1;
-}
+/***** Calendar *****/
+table.cal {border-collapse: collapse; width: 100%; margin: 8px 0 6px 0;border: 1px solid #d7d7d7;}
+table.cal th { background-color:#EEEEEE; padding: 4px; }
+table.cal td {border: 1px solid #d7d7d7;}
+table.cal td.today {background:#ffffdd;}
 
-.block-receiver {
-border:1px dashed #c0c0c0;
-margin-bottom: 20px;
-padding: 15px 0 15px 0;
-}
+/***** Tooltips ******/
+.tooltip{position:relative;z-index:24;}
+.tooltip:hover{z-index:25;color:#000;}
+.tooltip span.tip{display: none; text-align:left;}
 
-.mypage-box {
-margin:0 0 20px 0;
+div.tooltip:hover span.tip{
+display:block;
+position:absolute;
+top:12px; left:24px; width:270px;
+border:1px solid #555;
+background-color:#fff;
+padding: 4px;
+font-size: 0.8em;
 color:#505050;
-line-height:1.5em;
-}
-
-.handle {
-cursor: move;
-}
-
-.login {
-width: 50%;
-text-align: left;
-}
-
-img.calendar-trigger {
-    cursor: pointer;
-    vertical-align: middle;
-    margin-left: 4px;
-}
-
-#history p {
-    margin-left: 34px;
 }
 
+/***** Progress bar *****/
 .progress {
     border: 1px solid #D7D7D7;
     border-collapse: collapse;
@@ -508,105 +229,37 @@ img.calendar-trigger {
 .progress .closed { background: #BAE0BA none repeat scroll 0%; }
 .progress .open { background: #FFF none repeat scroll 0%; }
 
-/***** Contextual links div *****/
-.contextual {
-float: right;
-font-size: 0.8em;
-line-height: 16px;
-padding: 2px;
-}
-
-.contextual select, .contextual input {
-font-size: 1em;
-}
-
-/***** Gantt chart *****/
-.gantt_hdr {
-  position:absolute;
-  top:0;
-  height:16px;
-  border-top: 1px solid #c0c0c0;
-  border-bottom: 1px solid #c0c0c0;
-  border-right: 1px solid #c0c0c0;
-  text-align: center;
-  overflow: hidden;
-}
-
-.task {
-  position: absolute;
-  height:8px;
-  font-size:0.8em;
-  color:#888;
-  padding:0;
-  margin:0;
-  line-height:0.8em;
+/***** Tabs *****/
+#content .tabs{height: 2.6em;}
+#content .tabs ul{margin:0;}
+#content .tabs ul li{
+float:left;
+list-style-type:none;
+white-space:nowrap;
+margin-right:8px;
+background:#fff;
 }
-
-.task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }
-.task_done { background:#66f url(../images/task_done.png); border: 1px solid #66f; }  
-.task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; }
-.milestone { background-image:url(../images/milestone.png); background-repeat: no-repeat; border: 0; }
-
-/***** project list *****/
-dl.projects dt { font-size: 120%; margin-top:1.2em; padding: 2px 2px 4px 2px; background-color:#fafbfc; }
-
-/***** Tooltips ******/
-.tooltip{position:relative;z-index:24;}
-.tooltip:hover{z-index:25;color:#000;}
-.tooltip span.tip{display: none; text-align:left;}
-
-div.tooltip:hover span.tip{
+#content .tabs ul li a{
 display:block;
-position:absolute;
-top:12px; left:24px; width:270px;
-border:1px solid #555;
-background-color:#fff;
-padding: 4px;
-font-size: 0.8em;
-color:#505050;
-}
-
-/***** CSS FORM ******/
-.tabular p{
-margin: 0;
-padding: 5px 0 8px 0;
-padding-left: 180px; /*width of left column containing the label elements*/
-height: 1%;
-clear:both;
-}
-
-.tabular label{
-font-weight: bold;
-float: left;
-margin-left: -180px; /*width of left column*/
-margin-bottom: 10px;
-width: 175px; /*width of labels. Should be smaller than left column to create some right 
-margin*/
-}
-
-.error {
-color: #cc0000;
+font-size: 0.9em;
+text-decoration:none;
+line-height:1em;
+padding:4px;
+border: 1px solid #c0c0c0;
 }
 
-#settings .tabular p{ padding-left: 300px; }
-#settings .tabular label{ margin-left: -300px; width: 295px; }
-
-/*.threepxfix class below:
-Targets IE6- ONLY. Adds 3 pixel indent for multi-line form contents.
-to account for 3 pixel bug: http://www.positioniseverything.net/explorer/threepxtest.html
-*/
-
-* html .threepxfix{
-margin-left: 3px;
+#content .tabs ul li a.selected, #content .tabs ul li a:hover{
+background-color: #507AAA;
+border: 1px solid #507AAA;
+color: #fff;
+text-decoration:none;
 }
 
-/***** Wiki sections ****/
-#content div.wiki { font-size: 110%}
-
-#content div.wiki h2, div.wiki h3 { font-family: Trebuchet MS,Georgia,"Times New Roman",serif; color:#606060; }
-#content div.wiki h2 { font-size: 1.4em;}
-#content div.wiki h3 { font-size: 1.2em;}
+/***** Diff *****/
+.diff_out { background: #fcc; }
+.diff_in { background: #cfc; }
 
+/***** Wiki *****/
 div.wiki table {
     border: 1px solid #505050;
     border-collapse: collapse;
@@ -633,29 +286,23 @@ div.wiki a.new {
     color: #b73535;
 }
 
-div.wiki code {
-    font-size: 1.2em;
-}
-
-div.wiki img {
-    margin: 6px;
-}
-
-div.wiki pre  {
+div.wiki pre {
     margin: 1em 1em 1em 1.6em;
     padding: 2px;
     background-color: #fafafa;
     border: 1px solid #dadada;
+    width:95%;
+    overflow-x: auto;
 }
 
 div.wiki div.toc {
-    background-color: #fdfed0;
-    border: 1px solid #dadada;
+    background-color: #ffffdd;
+    border: 1px solid #e4e4e4;
     padding: 4px;
-    line-height: 1.1em;
+    line-height: 1.2em;
     margin-bottom: 12px;
-    float: left;
     margin-right: 12px;
+    float: left;
 }
 
 div.wiki div.toc.right {
@@ -668,72 +315,134 @@ div.wiki div.toc a {
     display: block;
     font-size: 0.9em;
     font-weight: normal;
+    text-decoration: none;
     color: #606060;
 }
+div.wiki div.toc a:hover { color: #c61a1a; text-decoration: underline;}
 
 div.wiki div.toc a.heading2 { margin-left: 6px; }
 div.wiki div.toc a.heading3 { margin-left: 12px; font-size: 0.8em; }
 
-div.wiki
-
-.diff_out{
-  background: #fcc;
+/***** My page layout *****/
+.block-receiver {
+border:1px dashed #c0c0c0;
+margin-bottom: 20px;
+padding: 15px 0 15px 0;
 }
 
-.diff_in{
-  background: #cfc;
+.mypage-box {
+margin:0 0 20px 0;
+color:#505050;
+line-height:1.5em;
 }
 
-#preview .preview { background: #fafbfc url(../images/draft.png); }
+.handle {
+cursor: move;
+}
 
-#ajax-indicator {
-position: absolute; /* fixed not supported by IE */
-background-color:#eee;
-border: 1px solid #bbb;
-top:35%;
-left:40%;
-width:20%;
-font-weight:bold;
-text-align:center;
-padding:0.6em;
-z-index:100;
-filter:alpha(opacity=50);
--moz-opacity:0.5;
-opacity: 0.5;
--khtml-opacity: 0.5;
+a.close-icon {
+display:block;
+margin-top:3px;
+overflow:hidden;
+width:12px;
+height:12px;
+background-repeat: no-repeat;
+cursor:pointer;
+background-image:url('../images/close.png');
 }
 
-html>body #ajax-indicator { position: fixed; }
+a.close-icon:hover {
+background-image:url('../images/close_hl.png');
+}
 
-#ajax-indicator span {
-background-position: 0% 40%;
-background-repeat: no-repeat;
-background-image: url(../images/loading.gif);
-padding-left: 26px;
-vertical-align: bottom;
+/***** Gantt chart *****/
+.gantt_hdr {
+  position:absolute;
+  top:0;
+  height:16px;
+  border-top: 1px solid #c0c0c0;
+  border-bottom: 1px solid #c0c0c0;
+  border-right: 1px solid #c0c0c0;
+  text-align: center;
+  overflow: hidden;
 }
 
-/***** Flash & error messages ****/
-#flash div, #errorExplanation {
-    padding: 4px 4px 4px 30px;
-    margin-bottom: 16px;
-	font-size: 1.1em;
-	border: 2px solid;
+.task {
+  position: absolute;
+  height:8px;
+  font-size:0.8em;
+  color:#888;
+  padding:0;
+  margin:0;
+  line-height:0.8em;
 }
 
-#flash div.error, #errorExplanation {
-    background: url(../images/false.png) 8px 5px no-repeat;
-	background-color: #ffe3e3;
-	border-color: #dd0000;
-	color: #550000;
+.task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }
+.task_done { background:#66f url(../images/task_done.png); border: 1px solid #66f; }  
+.task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; }
+.milestone { background-image:url(../images/milestone.png); background-repeat: no-repeat; border: 0; }
+
+/***** Icons *****/
+.icon {
+background-position: 0% 40%;
+background-repeat: no-repeat;
+padding-left: 20px;
+padding-top: 2px;
+padding-bottom: 3px;
 }
 
-#flash div.notice {
-    background: url(../images/true.png) 8px 5px no-repeat;
-	background-color: #dfffdf;
-	border-color: #9fcf9f;
-	color: #005f00;
+.icon22 {
+background-position: 0% 40%;
+background-repeat: no-repeat;
+padding-left: 26px;
+line-height: 22px;
+vertical-align: middle;
 }
 
-#errorExplanation ul { margin-bottom: 0px; }
-#errorExplanation ul li { list-style: none; margin-left: -16px;}
+.icon-add { background-image: url(../images/add.png); }
+.icon-edit { background-image: url(../images/edit.png); }
+.icon-del { background-image: url(../images/delete.png); }
+.icon-move { background-image: url(../images/move.png); }
+.icon-save { background-image: url(../images/save.png); }
+.icon-cancel { background-image: url(../images/cancel.png); }
+.icon-pdf { background-image: url(../images/pdf.png); }
+.icon-csv { background-image: url(../images/csv.png); }
+.icon-html { background-image: url(../images/html.png); }
+.icon-image { background-image: url(../images/image.png); }
+.icon-txt { background-image: url(../images/txt.png); }
+.icon-file { background-image: url(../images/file.png); }
+.icon-folder { background-image: url(../images/folder.png); }
+.icon-package { background-image: url(../images/package.png); }
+.icon-home { background-image: url(../images/home.png); }
+.icon-user { background-image: url(../images/user.png); }
+.icon-mypage { background-image: url(../images/user_page.png); }
+.icon-admin { background-image: url(../images/admin.png); }
+.icon-projects { background-image: url(../images/projects.png); }
+.icon-logout { background-image: url(../images/logout.png); }
+.icon-help { background-image: url(../images/help.png); }
+.icon-attachment  { background-image: url(../images/attachment.png); }
+.icon-index  { background-image: url(../images/index.png); }
+.icon-history  { background-image: url(../images/history.png); }
+.icon-feed  { background-image: url(../images/feed.png); }
+.icon-time  { background-image: url(../images/time.png); }
+.icon-stats  { background-image: url(../images/stats.png); }
+.icon-warning  { background-image: url(../images/warning.png); }
+.icon-fav  { background-image: url(../images/fav.png); }
+.icon-fav-off  { background-image: url(../images/fav_off.png); }
+.icon-reload  { background-image: url(../images/reload.png); }
+.icon-lock  { background-image: url(../images/locked.png); }
+.icon-unlock  { background-image: url(../images/unlock.png); }
+.icon-note  { background-image: url(../images/note.png); }
+
+.icon22-projects { background-image: url(../images/22x22/projects.png); }
+.icon22-users { background-image: url(../images/22x22/users.png); }
+.icon22-tracker { background-image: url(../images/22x22/tracker.png); }
+.icon22-role { background-image: url(../images/22x22/role.png); }
+.icon22-workflow { background-image: url(../images/22x22/workflow.png); }
+.icon22-options { background-image: url(../images/22x22/options.png); }
+.icon22-notifications { background-image: url(../images/22x22/notifications.png); }
+.icon22-authent { background-image: url(../images/22x22/authent.png); }
+.icon22-info { background-image: url(../images/22x22/info.png); }
+.icon22-comment { background-image: url(../images/22x22/comment.png); }
+.icon22-package { background-image: url(../images/22x22/package.png); }
+.icon22-settings { background-image: url(../images/22x22/settings.png); }
diff --git a/public/stylesheets/calendar.css b/public/stylesheets/calendar.css
index 7f0b908e5..842dbf71a 100644
--- a/public/stylesheets/calendar.css
+++ b/public/stylesheets/calendar.css
@@ -1,6 +1,12 @@
 /* The main calendar widget.  DIV containing a table. */
 
-div.calendar { position: relative; }
+img.calendar-trigger {
+    cursor: pointer;
+    vertical-align: middle;
+    margin-left: 4px;
+}
+
+div.calendar { position: relative; z-index: 15;}
 
 .calendar, .calendar table {
   border: 1px solid #556;
diff --git a/public/stylesheets/print.css b/public/stylesheets/print.css
index bd5f006f2..52e02ecb6 100644
--- a/public/stylesheets/print.css
+++ b/public/stylesheets/print.css
@@ -1,3 +1,2 @@
-#header, #navigation, #subcontent, #footer { display:none; }
-.menu { display:none; }
-.contextual, .rightbox { display:none; }
\ No newline at end of file
+#top-menu, #header, #main-menu, #sidebar, #footer { display:none; }
+.contextual { display:none; }
diff --git a/public/stylesheets/scm.css b/public/stylesheets/scm.css
index 338229b0b..3794db366 100644
--- a/public/stylesheets/scm.css
+++ b/public/stylesheets/scm.css
@@ -1,14 +1,14 @@
 
+table.filecontent { border: 1px solid #ccc;  border-collapse: collapse; width:98%; }
+table.filecontent th { border: 1px solid #ccc; background-color: #eee; }
+table.filecontent th.filename {	background-color: #ddc;	text-align: left; }
 div.action_M { background: #fd8 }
 div.action_D { background: #f88 }
 div.action_A { background: #bfb }
 
+table.filecontent tr.spacing { border: 1px solid #d7d7d7; }
 
-tr.spacing {
-    border: 1px solid #d7d7d7;
-}
-
-.line-num {
+table.filecontent .line-num {
     border: 1px solid #d7d7d7;
 	font-size: 0.8em;
 	text-align: right;
@@ -16,17 +16,6 @@ tr.spacing {
 	padding-right: 3px;
 }
 
-.line-code {
-	font-size: 1.4em;
-}
-
-table.list thead th.list-filename {
-	background-color: #ddc;
-	font-weight: bolder;
-	text-align: left;
-}
-
-
 /************* Coderay styles *************/
 
 table.CodeRay {
@@ -37,7 +26,7 @@ table.CodeRay {
 span.CodeRay { white-space: pre; border: 0px; padding: 2px }
 
 .CodeRay .no { padding: 0px 4px }
-.CodeRay .code { width: 100% }
+.CodeRay .code {  }
 
 ol.CodeRay { font-size: 10pt }
 ol.CodeRay li { white-space: pre }