Index: /trunk/FACT++/www/shift/calendar.css
===================================================================
--- /trunk/FACT++/www/shift/calendar.css	(revision 13700)
+++ /trunk/FACT++/www/shift/calendar.css	(revision 13701)
@@ -55,5 +55,5 @@
 				font-size: 0.66em;
 				line-height: 1.5em;
-				width: 2.0em;
+				/*width: 2.0em;*/
 				padding-left: 0.6em; 
 				padding-right: 0.6em; 
@@ -70,6 +70,10 @@
 			}
 			
-			#calendar table tfoot td.calendar_week {
+			#calendar table tfoot td.clock {
 				text-align: left;
+			}
+
+			#calendar table tfoot td.logout {
+				text-align: right;
 			}
 			
Index: /trunk/FACT++/www/shift/calendar.js
===================================================================
--- /trunk/FACT++/www/shift/calendar.js	(revision 13700)
+++ /trunk/FACT++/www/shift/calendar.js	(revision 13701)
@@ -191,28 +191,48 @@
 
         tr = document.createElement("tr");
-        td = this.getCell( "td", "logout", "calendar_week");
-        td.onclick = function(e) { logout(); }
-        td.height="1%";
-        td.colSpan = 1;
-        tr.appendChild( td );
 
         var td = document.createElement("td");
         td.height="1%";
-        td.colSpan = 5;
+        td.colSpan=7;
+        tr.appendChild(td);
+
+        var tab = document.createElement("table");
+        var tr2 = document.createElement("tr");
+        tab.width="100%";
+        tab.cellSpacing=0;
+        tab.cellPadding=0;
+        tab.style.borderWidth = 0;
+        tab.style.fontSize = "1.5em";
+        tab.style.marginBottom = "2px";
+        td.appendChild(tab);
+        tab.appendChild(tr2);
+
+        var tm = this.getCell( "td", this.timeTrigger(), "clock" );
+        tm.style.whiteSpace="nowrap";
+        tm.style.paddingLeft = "0px";
+        tm.style.width="33%";
+        tr2.appendChild( tm );
+
+        var self = this;
+        window.setInterval(function() { tm.firstChild.nodeValue = self.timeTrigger(); }, 500);
+
+        var td = document.createElement("td");
+        td.style.width="33%";
         td.style.textAlign="center";
         var a = document.createElement("a");
         a.href = "overview.png";
+        a.style.whiteSpace="nowrap";
         a.appendChild(document.createTextNode("click here for help"));
         td.appendChild(a);
-        tr.appendChild( td );
-
-        td = this.getCell( "td", this.timeTrigger(), "clock" );
-        td.colSpan = 1;
-        td.height="1%";
-        tr.appendChild( td );
+        tr2.appendChild( td );
+
+        td = this.getCell( "td", "logout", "logout");
+        td.style.width="33%";
+        td.onclick = function(e) { logout(); }
+        td.style.paddingRight = "0px";
+        tr2.appendChild( td );
+
         tfoot.appendChild( tr );
 
-        var self = this;
-        window.setInterval(function() { td.firstChild.nodeValue = self.timeTrigger(); }, 500);
         return tfoot;
     }
@@ -709,5 +729,5 @@
         var hh  = (now.getHours()  <10)?"0"+now.getHours()  :now.getHours();
 
-        var kw = "KW\u00a0" + this.getCalendarWeek(this.year, this.month, this.date);
+        var kw = "KW" + this.getCalendarWeek(this.year, this.month, this.date);
         var str = hh+":"+mm+":"+ss+"\u00a0["+kw+"]";
         return str;