new jerryr template set from Jerry Ruhe

phpgwapi/templates/jerryr/css.tpl

@@ -1,12 +1,23 @@
 <style type="text/css">
-<!--
-	.row_on { color: {row_text}; background-color: {row_on}; }
-	.row_off { color: {row_text}; background-color: {row_off}; }
+
+	.row_on { color: {row_text}; background-color: #F1F1F1; }
+	.row_off { color: {row_text}; background-color: #ffffff; }
 	.th { color: {th_text}; background-color: {th_bg}; }
 	.narrow_column { width: 1%; white-space: nowrap; }
 	@media screen {	.onlyPrint { display: none; } }
 	@media print {	.noPrint { display: none; } }
 	{app_css}
--->
+
+#dhtmltooltip
+{
+	position: absolute;
+	width: 150px;
+	border: 1px solid #ff7a0a;
+	padding: 2px;
+    background-color:#f9f400;
+	visibility: hidden;
+	z-index: 100;
+}
+
 </style>
 {css_file}

phpgwapi/templates/jerryr/css/jerryr.css

@@ -1,172 +1,291 @@
 /*
-StyleSheet coding standards:
-
-1. use lowercase if possible
-
-2. format styles like this:
-
-body
-{
-	font-size: 12px;
-	font-family: Verdana, Arial, Helvetica, sans-serif
-}
-
-3. existing html elements on top of the document, then all self defined .classes and at last all self defined #id's.
-
-4. close every property with ; also the last one.
+	font styling
+	allowed attributes: font-family,font-size,color,font-weight
 */
 
-body 
+.tdJrTopLt
+{
+	background-image: url(../images/coinsupg.png);
+	height: 15px;
+}
+
+.tdJrTopMid
+{
+	background-image: url(../images/sup.png);
+	height: 15px;
+}
+
+.tdJrTopRt
+{
+	background-image: url(../images/coinsupd.png);
+	height: 15px;
+}
+
+.tdJrLt
+{
+	background-image: url(../images/g.png);
+	width:15px;
+}
+
+.tdJrFill
+{
+	background-image: url(../images/fond.png);
+}	
+
+.tdJrRt
+{
+	background-image: url(../images/d.png);
+	width:15px;
+}
+
+.tdJrBotLt
+{
+	background-image: url(../images/coininfg.png);
+	height: 15px;
+	width: 15px;
+}
+
+.tdJrBotMid
+{
+	background-image: url(../images/inf.png);
+	height: 15px;
+}
+
+.tdJrBotRt
+{
+	background-image: url(../images/coininfd.png);
+	height: 15px;
+}
+
+
+
+
+
+
+
+
+
+body,td
 {
-	background-image:url(../images/body-background.png);
-	font-size: 11px; 
 	font-family: Verdana, Arial, Helvetica, sans-serif;
-	padding:0px;
-	margin-top: 5px;
+	font-size: 11px; 
 }
 
-img
+select,input,button
 {
-	border-width:0px;
-	border-style:none;
-	/*filter:progid:DXImageTransform.Microsoft.AlphaImageLoader;
-*/
+	color: #006699; 
+	font-family: Arial, Helvetica, sans-serif;
+	font-size:110%;
+}
+
+select
+{
+	font-size:100%;
 }
 
 a:link,a:visited
 {
 	cursor:pointer;
-	color: #006699; 
+	color: #17202b; 
 	text-decoration: none;
 }
 
-/*
-a:visited 
-{
-	color: #006699; 
-	text-decoration: none;
-}
-*/
 a:hover,a:active
 {
 	cursor:pointer;
-	color: #ff9933;
-}
-/*
-a:active 
-{
-	color: #006699; 
+	color: #ff0000;
 	text-decoration: underline;
 }
-*/
-input,button
+.divLoginboxHeader,.divSideboxHeader,a.appTitles,.appTitles,a.textSidebox,.textSidebox,#fmStatusBar
 {
-	font-size: 12px; 
-	color: #006699; 
-	font-family: Arial, Helvetica, sans-serif;
-	border: 1px #bbbbbb solid;
+	font-size:90%;
 }
 
-input[type=submit],input[type=button],button
+.textSideboxStar
 {
-	margin:1px;
+	font-size:90%;
+	background-color: #a7c4db;
+	border-right: 1px solid #17202b;
+}
+
+.prefSection
+{
+	font-weight:bold;
+	font-size:145%;
+	line-height:40px;
+}
+
+#divAppboxHeader
+{
+	line-height:20px;
+	font-size:12px;
+	font-weight:bold;
+	color:#ffffff;
+}
+
+#divGenTime,#divPoweredBy
+{
+	font-size: 80%;
+	color: #ff0000;
+}
+
+#divPoweredBy 
+{
+	color: #000000;
+}
+
+/* 
+	other styling
+*/
+
+body 
+{
+	/*background-image:url(../images/body-background.png);*/
+	background-color:#9f9f9f;
+	padding:9px;
+	margin:9px;
+}
+
+form
+{
+	margin:0px;
 	padding:0px;
-	cursor: pointer; 
-	cursor: hand;
+}
+
+img
+{
+	border:0;
+}
+
+
+input,button,select
+{
+	border: solid 1px #bbbbbb;
+	color: black;
+}
+
+input[type=submit],input[type=button],input[type=reset],button,.egwbutton
+
+{
+/*	color:white;*/
+	background-color:#c5c5c5;
+	border:  outset 1px #dcdad5;
+	/*background-color:#b9d5e3;*/
+	background-color:#f6efe0;
+	/*border:  outset 1px #b9d5e3;*/
+	border: solid 1px #e2d4b2;
+	margin:  1px;
+	padding: 1px;
+	cursor:  pointer; 
+	/*color:  #004e7d;*/
+	color: #17202b;
+/*	cursor:  hand; */
+}
+
+input[type=submit]:hover,input[type=button]:hover,input[type=reset]:hover,button:hover,.egwbutton:hover
+{
+	background-color:#88b4e1;
+	border:  outset 1px #b9d5e3;
+	color:  #006699;
+	color:  #ffffff;
+}
+
+input[type=submit]:active,input[type=button]:active,input[type=reset]:active,button:active,.egwbutton:active
+
+{
+	border:  inset 1px #bbbbbb;
+}
+
+input.egwbutton
+{
+	background-color:#c5c5c5;
+	border:  outset 1px #dcdad5;
+	background-color:#b9d5e3;
+	border:  outset 1px #b9d5e3;
+	margin:  1px;
+	padding: 1px;
+	cursor:  pointer; 
+	color:  #004e7d;
+/*	cursor:  hand; */
+}
+
+input.egwbutton:hover
+{
+   background-color:#94bfd4;
+   border:  outset 1px #b9d5e3;
+   color:  #006699;
+   color:  #004e7d;
+
+}
+input.egwbutton:active
+{
+   border:  inset 1px #bbbbbb;
 }
 
 input[type=image]
 {
 	cursor: pointer; 
-	cursor: hand;
-	border: 0px #bbbbbb none;
-}
-select 
-{
-	font-size: 11px; 
-	color: #006699; 
-	font-family: Arial, Helvetica, sans-serif;
-	border: 1px #bbbbbb solid;
+/*	cursor: hand; */
+	border: 0;
 }
 
-td
-{
-	font-size: 11px;
-	/*	padding-top:1px;
-	padding-bottom:0px;*/
-}
+.divLoginbox,.divSidebox 
 
-.divLoginbox 
 {
 	position:relative;
-	width: 300px; 
-	border-right: #9c9c9c 1px solid; 
-	border-top: #9c9c9c 1px solid; 
-	border-left: #9c9c9c 1px solid; 
-	border-bottom: #9c9c9c 1px solid
+	width: 370px; 
+	border: #17202b 1px solid; 
 }
 
-.divLoginboxHeader 
-{
-	text-align:center;
-	background-color:#dddddd;
-	padding-top:2px;
-	font-size:10px;
-	color:#666666;
-}
 .divSidebox 
 {
-	position:relative;
-	width: 147px; 
-	border-right: #9c9c9c 1px solid; 
-	border-top: #9c9c9c 1px solid; 
-	border-left: #9c9c9c 1px solid; 
-	border-bottom: #9c9c9c 1px solid
+	width: 177px; 
 }
 
-.divSideboxHeader 
+.divSideboxHeader,.divLoginboxHeader 
 {
 	text-align:center;
-	background-image:url(../images/divSideboxHeader-background.png);
-	height:18px;
-	background-color:#ffffff;
-	padding-top:1px;
-	border-bottom: #9c9c9c 1px solid
-	font-size:10px;
-	font-weight:bold;
+	background-image:url(../images/appbox-header2-background.png);
+	/*background-color:#6798cb;*/
+	/*padding-top:2px;*/
 	color:#ffffff;
+	height: 20px;
+	font-weight:bold;
+	font-size:12px;
 }
 
 a.divSideboxEntry, .divSideboxEntry
 {
 	text-align:left;
-	height:16px;
-	background-color:#fafcff;
+	height:18px;
+	background-color:#fbf8f1;
 }
 
 a.appTitles,.appTitles
 {
-	font-size: 10px; 
-	height:16px;
-	padding-top:0px;
-	padding-bottom:0px;
+	height:25px;
+	/*padding-top:2px;*/
+	/*padding-bottom:2px;*/
 }
 
 a.textSidebox
 {
-	
-	font-size: 10px; 
-	border-top: #aaaaaa 1px none;
+	border-top: 0;
 }
 
 .textSidebox
 {
-	
-	font-size: 10px; 
-	height:16px;
-	padding-top:1px;
-	padding-bottom:1px;
-	
+	height:18px;
+	padding-left: 2px;
+	/*padding-top:2px;*/
+	/*padding-bottom:2px;*/
+	border-top: solid #e2d4b2 1px;
+}
+/* 
+ ** make the sidebox entries consistently start with a capital letter 
+ */
+.textSidebox:first-letter {
+	text-transform:uppercase;
 }
 
 .sideboxSpace
@@ -177,195 +296,175 @@ a.textSidebox
 .greyLine
 {
 	margin:1px;
-	border-top-color:#7e7e7e;
-	border-top-width:1px;
-	border-top-style:solid;
+	border-top:solid 1px #7e7e7e;
 	height:1px;
 }
 
-.prefSection
-{
-	font-weight:bold;
-	font-size:16px;
-	line-height:40px;
-}
-
 #extraIcons
 {
-/*	position:absolute;
-	z-index:13;
-	right:10px;
-	top:113px;
-	visibility:hidden;*/
-/*	background-image:url(../images/alpha-white.png); */
 	background-color:#eeeeee;
-	border-width:1px;
-	border-color:#7e7e7e;
-	border-style:solid;
+	border:solid 1px #7e7e7e;
 }
 
+.extraIconsRow
+{
+	border:solid 1px #dddddd;
+	padding:2px;
+}
 
+body {
+	padding: 0px;
+}
 
 #divMain
 {
+	background-image:url(../images/divmain-background.jpg);
+	background-repeat:no-repeat;
 	background-color:white;
-	margin-top: 5px;
-	padding:5px;
-	border-color:#7e7e7e;
-	border-width:1px;
-	border-style:solid;
+	padding:9px;
+	border:solid 1px #17202b;
 }
 
 #divLogo
 {
 	position:absolute;
-	left:15px;
-	top:13px;
+	left:20px;
+	top:20px;
 	z-index:51;
 }
 
+#divUpperTabs
+{
+	text-align:right;
+	height: 15px;
+	margin-right: 10px;
+}
+
+#divUpperTabs ul
+{
+	display:inline;
+	margin:0;
+	padding:10px 10px 0 1px;
+	list-style:none;
+}
+
+#divUpperTabs li
+{
+	float:right;
+	margin:0 5px 0 0;;
+	padding:0 5px 0 5px;
+	border:solid 1px #9c9c9c;
+	border-bottom: 0px;
+}
+
 #divAppIconBar
 {
-	background-color:white;
-	padding=0px;
-	border-top-color:#9c9c9c;
-	border-top-width:1px;
-	border-top-style:solid;
-	background-image: url(../images/background-icon-bar.png); 
-	background-repeat: repeat-x
+	/*background-color:#fbf8f1;*/
+	border-left: 1px solid #9f9f9f;
+	border-right: 1px solid #9f9f9f;
+	background-image: url(../images/iconBarBack.png); 
+	background-repeat: repeat-x;
+	height: 57px;
+	padding:0px;
 }
 
 #divAppTextBar
 {
-	background-color:white;
+	/*background-color:white;*/
 }
 
 #divStatusBar
 {
-	background-color:white;
-	height:15px;
-	padding-left:10px;
-	margin-top: 1px;
-	/*	margin-bottom: 2px;*/
+	/*background-color:white;*/
+	position: relative;
+	top:0px
+	left:0px;
+	height:18px;
+	border: 0px solid black;
+	padding-left:186px;
+	padding-top:2x;
+	/*margin-top: 18px;*/
 }
 
-/*#divSubContainer
-{
-}
-*/
 #tdSidebox
 {
 	width:170px;
-	background-color:white;
+	/*background-color:white;*/
 	overflow:visible;
 }
 
-
 #tdAppbox
 {
-	background-color:white;
+	/*background-color:white;*/
 	padding-left:5px;
-	padding-right:0px;
-	padding-bottom:2px;
 	width: 100%;
 }
-#divSideboxContainer
-{
-	position:relative;
-	width:150px;
-	top:0px;
-	left:0px;
-	background-color:white;
-	border-width:1px;
-	border-style:solid;
-	z-index:40;
-}
 
 #divAppboxHeader
 {
-	/*width:100%;*/
-	background-image:url(../images/appbox-header-background.png);
-	background-repeat: repeat-x;
+	/*background-image:url(../images/appbox-header-background.png);*/
+	/*background-repeat: repeat-x;*/
+	background-image:url(../images/appbox-header2-background.png);
+	/*background-color:#6798cb;*/
 	height:20px;
-	line-height:22px;
 	text-align:center;
-	/*	padding-top:7px;*/
 	padding-bottom:0px;
-	font-size:14px;
-	font-weight:bold;
-	color:#666666;
-	border-top-color:#9c9c9c;
-	border-top-width:1px;
-	border-top-style:solid;
-	border-left-color:#9c9c9c;
-	border-left-width:1px;
-	border-left-style:solid;
-	border-right-color:#9c9c9c;
-	border-right-width:1px;
-	border-right-style:solid;
-	border-bottom-color:#9c9c9c;
-	border-bottom-width:1px;
-	border-bottom-style:solid;
+	border-top:solid 1px #17202b;
+	border-left:solid 1px #17202b;
+	border-right:solid 1px #17202b;
 }
 
 #divAppbox
 {
-/*	width:100%;*/
-	background-color:#faf8f3;
+	background-color:#fbf8f1;
 	padding:5px;
-	
+	border-bottom:solid 1px #17202b;
+	border-left:solid 1px #17202b;
+	border-right:solid 1px #17202b;
 }
 
+
+
+/*
+	this must move to the filemanager app
+*/
+
 #fmStatusBar
 {
 	margin-left:4px;
 	margin-bottom:3px;
-	font-size: 10px; 
-/*	font-family: Verdana, Arial, Helvetica, sans-serif;*/
-	
-
 }
 
-
 .fmButton
 {
+	background-repeat: no-repeat;
 	background-image:url(../images/buttonbackground.png);
 	width:28px;
 	height:28px;
-	background-repeat: no-repeat;
 }
 
 #fmLocation
 {
 	position:relative;
-	/*background-image:url(../images/buttonbackgroundscaled.png);
-	background-repeat: repeat-x;*/
-	/*margin-left:4px;*/
 	margin-bottom:3px;
 	height:27px;
-
 }
 
 #fmMenu
 {
 	position:relative;
 }
+
 #fmFileWindow
 {
 	background-color:#ffffff;
 	margin-left:4px;
 	padding:5px;
 	position:relative;
-	border-right: #9c9c9c 1px solid; 
+	border-right: #cccccc 1px solid; 
 	border-top: #9c9c9c 2px solid; 
 	border-left: #9c9c9c 2px solid; 
-	border-bottom: #9c9c9c 1px solid
-}
-
-#user_info
-{
-
-
+	border-bottom: #cccccc 1px solid
 }
 
 #admin_info
@@ -374,282 +473,10 @@ a.textSidebox
 	text-align:right;
 }
 
-#divGenTime
+#divGenTime,#divPoweredBy 
+
 {
-	bottom:14px;
-	font-size: 9px;
-	color: #ff0000;
+	bottom:4px;
 	text-align:center;
 	width:99%;
 }
-
-#divPoweredBy 
-{
-	bottom:14px;
-	font-size: 9px;
-	color: #000000;
-	text-align:center;
-	width:99%;
-}
-
-.calRowBottomShadow
-{
-	background: url(../images/mid-foot.png); 
-	background-repeat: repeat-x;
-}
-
-
-.titleBarBackGround
-{
-	background-image: url(../images/appbox-header-background.png); 
-	height:22px;
-	background-repeat: repeat-x;
-	text-align:center;
-	border-top-color:#9c9c9c;
-	border-top-width:1px;
-	border-top-style:solid;
-	border-left-color:#9c9c9c;
-	border-left-width:1px;
-	border-left-style:solid;
-	border-right-color:#9c9c9c;
-	border-right-width:1px;
-	border-right-style:solid;
-	border-bottom-color:#9c9c9c;
-	border-bottom-width:1px;
-	border-bottom-style:solid;
-}
-
-.calDayTitleBeige
-{
-	background: url(../images/mid-title-beige.png); 
-	background-repeat: repeat-x;
-	height:28px;
-	text-align:center;
-	padding-bottom:0px;
-	font-size:14px;
-	font-weight:bold;
-	color:#666666;
-}
-
-.calDayTitleBlue
-{
-	background: url(../images/mid-title.png); 
-	background-repeat: repeat-x;
-	height:28px;
-	text-align:center;
-	padding-bottom:0px;
-	font-size:14px;
-	font-weight:bold;
-	color:#ffffff;
-}
-
-.calDayTitleRed
-{
-	background-image: url(../images/mid-title-red.png); 
-	background-repeat: repeat-x;
-	height:28px;
-	text-align:center;
-	padding-bottom:0px;
-	font-size:14px;
-	font-weight:bold;
-	color:#ffffff;
-}
-
-.calLeftShadow
-{
-	background: url(../images/lt-body.png); 
-	padding-bottom:0px;
-}
-
-.calRightShadow
-{
-	background: url(../images/rt-body.png); 
-	padding-bottom:0px;
-}
-
-.calLtLtTitleBlue
-{
-	background: url(../images/lt-lt-title.png); 
-	padding-bottom:0px;
-	height:28px;
-}
-
-.calLtMidTitleBlue
-{
-	background: url(../images/lt-mid-title.png); 
-	padding-bottom:0px;
-	height:28px;
-}
-
-.calRtMidTitleBlue
-{
-	background: url(../images/rt-mid-title.png); 
-	padding-bottom:0px;
-	height:28px;
-}
-
-.calRtMidTitleBeige
-{
-	background: url(../images/rt-mid-title-beige.png); 
-	padding-bottom:0px;
-	height:28px;
-}
-
-.calRtRtTitleBeige
-{
-	background: url(../images/rt-rt-title-beige.png); 
-	padding-bottom:0px;
-	height:28px;
-}
-
-.calRtRtTitleBlue
-{
-	background: url(../images/rt-rt-title.png); 
-	padding-bottom:0px;
-	height:28px;
-}
-
-.calLtLtTitleBeige
-{
-	background: url(../images/lt-lt-title-beige.png); 
-	padding-bottom:0px;
-	height:28px;
-}
-
-.calLtLtTitleRed
-{
-	background: url(../images/lt-lt-title-red.png); 
-	padding-bottom:0px;
-	height:28px;
-}
-
-.calLtMidTitleBeige
-{
-	background: url(../images/lt-mid-title-beige.png); 
-	padding-bottom:0px;
-	height:28px;
-}
-
-.calLtMidTitleRed
-{
-	background: url(../images/lt-mid-title-red.png); 
-	padding-bottom:0px;
-	height:28px;
-}
-
-.calRtMidTitleRed
-{
-	background: url(../images/rt-mid-title-red.png); 
-	padding-bottom:0px;
-	height:28px;
-}
-
-.calRtRtTitleRed
-{
-	background: url(../images/rt-rt-title-red.png); 
-	padding-bottom:0px;
-	height:28px;
-}
-
-.calLtLtFoot
-{
-	background: url(../images/lt-lt-foot.png); 
-	padding-bottom:0px;
-	height:17px;
-}
-
-.calLtMidFoot
-{
-	background: url(../images/lt-mid-foot.png); 
-	padding-bottom:0px;
-	height:17px;
-}
-
-.calRtMidFoot
-{
-	background: url(../images/rt-mid-foot.png); 
-	padding-bottom:0px;
-	height:17px;
-}
-
-.calRtRtFoot
-{
-	background: url(../images/rt-rt-foot.png); 
-	padding-bottom:0px;
-	height:17px;
-}
-
-.calDayView
-{
-	background-image: url(../images/appbox-header-background.png); 
-	height:22px;
-	background-repeat: repeat-x;
-	text-align:center;
-	padding-bottom:0px;
-	font-size:14px;
-	font-weight:bold;
-	color:#666666;
-	border-top-color:#9c9c9c;
-	border-top-width:1px;
-	border-top-style:solid;
-	border-left-color:#9c9c9c;
-	border-left-width:1px;
-	border-left-style:solid;
-	border-right-color:#9c9c9c;
-	border-right-width:1px;
-	border-right-style:solid;
-	border-bottom-color:#9c9c9c;
-	border-bottom-width:1px;
-	border-bottom-style:solid;
-}
-
-.calDayViewSideBoxes
-{
-	border-top-color:#9c9c9c;
-	border-top-width:1px;
-	border-top-style:solid;
-	border-left-color:#9c9c9c;
-	border-left-width:1px;
-	border-left-style:solid;
-	border-right-color:#9c9c9c;
-	border-right-width:1px;
-	border-right-style:solid;
-	border-bottom-color:#9c9c9c;
-	border-bottom-width:1px;
-	border-bottom-style:solid;
-	background-color:#faf8f3;
-}
-
-.calDayViewShadowBox
-{
-	border-top-color:#9c9c9c;
-	border-top-width:2px;
-	border-top-style:solid;
-	border-left-color:#9c9c9c;
-	border-left-width:2px;
-	border-left-style:solid;
-	border-right-color:#9c9c9c;
-	border-right-width:2px;
-	border-right-style:solid;
-	border-bottom-color:#9c9c9c;
-	border-bottom-width:1px;
-	border-bottom-style:solid;
-	background-color:#ffffff;
-	padding:2px;
-}
-
-.addBookAlphaLinks
-{
-	border-top-color:#9c9c9c;
-	border-top-width:1px;
-	border-top-style:solid;
-	border-left-color:#9c9c9c;
-	border-left-width:1px;
-	border-left-style:solid;
-	border-right-color:#9c9c9c;
-	border-right-width:1px;
-	border-right-style:solid;
-	border-bottom-color:#9c9c9c;
-	border-bottom-width:1px;
-	border-bottom-style:solid;
-}

phpgwapi/templates/jerryr/doc/CHANGELOG

@@ -1,16 +0,0 @@
-Fri Apr 18 01:51:00 CEST 2003
-- resize icons to 32x32
-- renamed css file for better compatibility
-- removed unneccesary files in calender and email template directory
-- merged changed from Ralf Becker
-- remade the logo
-- changed gif to png where possible (create_tabs in class.common.inc.php only uses gifs!!!)
-- moved tree to 0.9.16 branch
-
-Wed Apr 16 23:07:54 CEST 2003
-- Get app titles from new array without using the lang() call
-- Moved 'Homelink' from navbar to sidebox
-- Use preference setting 'icons', 'icons and text'
-- sidebox menu's can be hooked now (see template hook-files in phpgwapi/templates/idots/doc/hook_templates/
-- replaces correct gimpsource file for navbar icons: phpgwapi/templates/idots/source/navbar.xcf
-- additional information in the README

phpgwapi/templates/jerryr/doc/README

@@ -1,41 +0,0 @@
-+++++++++++++++++++++++++++++++++++++++++++++++++++
-
-   IDOTS TEMPLATE SET FOR eGroupWare
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++
-
-The template set idots, formaly known as MYiDOTS is 
-havely based on the Crystal Icon theme from 
-Everaldo. 
-
-   APPLICATION ICONS 
-===================================================
-Because of a bug in Internet Explorer which causes 
-it to display transpancy in PNG's as black I gave 
-all icons a background.
-
-Everybody is encouraged to make more icons for the 
-idots template set. Please don't use gif as Image
-type because this filetype in not an open standard
-
-The source Gimp-files can be found in 
-phpgwapi/templates/idots/source/
-
-The logo source file can also be found in the above
-directory.
-
-   APPLICATION HOOKS
-===================================================
-In the hook_file, hook_sidebox_menu.inc.php, 
-developers can define the sidebox menu's for their 
-applications template hook files can be found in 
-phpgwapi/templates/idots/hook_templates/
-
-
-Hope you enjoy this template set,
-Pim Snel
-
-
-
-
-

phpgwapi/templates/jerryr/doc/TODO

@@ -1,5 +0,0 @@
-- validate css and make valid CSS
-- validate html and make valid html 4.01
-- remove phpBB.org code etc...
-- a lot of icons
-- some sort of template-set configuration (maybe create a fake app???)

phpgwapi/templates/jerryr/footer.tpl

@@ -1,27 +1,9 @@
-		 							</td>
-								</tr>
-							</table>
-							</div>
-		  	<!-- Applicationbox Column -->
-		  	</td>
-			<td width=8 class="calRightShadow"></td>
-		 </tr>
-	</table>
-	<table border=0 width=100% cellpadding=0 cellspacing=0>
-		<tr>
-			<td>
-				<table width=100% cellpadding=0 cellspacing=0>
-					<tr class="calRowBottomShadow">
-						<td width=8 class="calLtLtFoot"></td>
-						<td width=8 class="calLtMidFoot"></td>
-						<td>&nbsp;</td>
-						<td width=8 class="calRtMidFoot"></td>
-						<td width=8 class="calRtRtFoot"></td>
-					</tr>	
-				</table>
-			</td>
-		</tr>
-	</table>
+		 							</td></tr></table>
+									</div>
+		  <!-- Applicationbox Column -->
+		  </td>
+		  </tr>
+  </table>
 </div>
 </div>
 {page_generation_time}	

phpgwapi/templates/jerryr/head.inc.php

@@ -24,16 +24,18 @@
 	}
 
 	#_debug_array($GLOBALS['egw_info']['user']['preferences']['common']);
-	$theme_css = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/jerryr/css/'.$GLOBALS['egw_info']['user']['preferences']['common']['theme'].'.css';
-	if(!file_exists($theme_css))
+	$theme_css = '/phpgwapi/templates/jerryr/css/'.$GLOBALS['egw_info']['user']['preferences']['common']['theme'].'.css';
+	if(!file_exists(EGW_SERVER_ROOT.$theme_css))
 	{
-		$theme_css = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/jerryr/css/jerryr.css';
+		$theme_css = '/phpgwapi/templates/jerryr/css/jerryr.css';
 	}
+	$theme_css = $GLOBALS['egw_info']['server']['webserver_url'] . $theme_css;
+	$print_css = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/jerryr/print.css';
 
 	//pngfix defaults to yes
 	if(!$GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix'])
 	{
-		$pngfix_src = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/jerryr/js/pngfix.js';
+		$pngfix_src = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/js/pngfix.js';
 		$pngfix ='<!-- This solves the Internet Explorer PNG-transparency bug, but only for IE 5.5 and higher --> 
 		<!--[if gte IE 5.5000]>
 		<script src="'.$pngfix_src.'" type="text/javascript">
@@ -43,22 +45,17 @@
 
 	if(!$GLOBALS['egw_info']['user']['preferences']['common']['disable_slider_effects'])
 	{
-		$slider_effects_src = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/jerryr/js/slidereffects.js';
+		$slider_effects_src = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/js/slidereffects.js';
 		$slider_effects = '<script src="'.$slider_effects_src.'" type="text/javascript">
 		</script>';
 	}
 	else
 	{
-		$simple_show_hide_src = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/jerryr/js/simple_show_hide.js';
+		$simple_show_hide_src = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/js/simple_show_hide.js';
 		$simple_show_hide = '<script src="'.$simple_show_hide_src.'" type="text/javascript">
 		</script>';
 	}
 
-// 030204 ndee for calling foldertree
-
-	$foldertree_src = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/js/foldertree/foldertree.js';
-	$js_foldertree = '<script src="'.$foldertree_src.'" type="text/javascript"></script>';
-
 	$tpl = CreateObject('phpgwapi.Template',EGW_TEMPLATE_DIR);
 	$tpl->set_unknowns('remove');
 	$tpl->set_file(array('_head' => 'head.tpl'));
@@ -73,23 +70,28 @@
 		$app = $GLOBALS['egw_info']['flags']['currentapp'];
 		$app = isset($GLOBALS['egw_info']['apps'][$app]) ? $GLOBALS['egw_info']['apps'][$app]['title'] : lang($app);
 	}
+
+	
+	if($app!='wiki') $robots ='<meta name="robots" content="none" />';
+	
 	$var = Array(
-		'img_icon'      => EGW_IMAGES_DIR . '/favicon.ico',
-		'img_shortcut'  => EGW_IMAGES_DIR . '/favicon.ico',
-		'pngfix'        => $pngfix,
-		'slider_effects'=> $slider_effects,
-		'simple_show_hide'=> $simple_show_hide,
-		'lang_code'=> $lang_code,
-		'charset'       => $GLOBALS['egw']->translation->charset(),
-		'font_family'   => $GLOBALS['egw_info']['theme']['font'],
-		'website_title' => $GLOBALS['egw_info']['server']['site_title'] . ($app ? " [$app]" : ''),
-		'body_tags'     => $bodyheader .' '. $GLOBALS['egw']->common->get_body_attribs(),
-		'theme_css'     => $theme_css,
-		'css'           => $GLOBALS['egw']->common->get_css(),
-		'java_script'   => $GLOBALS['egw']->common->get_java_script(),
-		'js_foldertree'	=> $js_foldertree,
-		'dir_code'		=> lang('language_direction_rtl') != 'rtl' ? '' : ' dir="rtl"',
-	);
+		'img_icon'      	=> EGW_IMAGES_DIR . '/favicon.ico',
+		'img_shortcut'  	=> EGW_IMAGES_DIR . '/favicon.ico',
+		'pngfix'        	=> $pngfix,
+		'slider_effects'	=> $slider_effects,
+		'simple_show_hide'	=> $simple_show_hide,
+		'lang_code'			=> $lang_code,
+		'charset'       	=> $GLOBALS['egw']->translation->charset(),
+		'font_family'   	=> $GLOBALS['egw_info']['theme']['font'],
+		'website_title' 	=> strip_tags($GLOBALS['egw_info']['server']['site_title']. ($app ? " [$app]" : '')),
+		'body_tags'     	=> $bodyheader .' '. $GLOBALS['egw']->common->get_body_attribs(),
+		'theme_css'     	=> $theme_css,
+		'print_css'     	=> $print_css,
+		'css'           	=> $GLOBALS['egw']->common->get_css(),
+		'java_script'   	=> $GLOBALS['egw']->common->get_java_script(),
+		'meta_robots'		=> $robots,
+		'dir_code'			=> lang('language_direction_rtl') != 'rtl' ? '' : ' dir="rtl"',
+	 );
 	$tpl->set_var($var);
 	$tpl->pfp('out','head');
 	unset($tpl);

phpgwapi/templates/jerryr/js/pngfix.js

@@ -1,33 +0,0 @@
-function correctPNG() // correctly handle PNG transparency in Win IE 5.5 or higher.
-   {
-   for(var i=0; i<document.images.length; i++)
-      {
-	  var img = document.images[i]
-	  var imgName = img.src.toUpperCase()
-	  if (imgName.substring(imgName.length-3, imgName.length) == "PNG")
-	     {
-		 var imgID = (img.id) ? "id='" + img.id + "' " : ""
-		 var imgClass = (img.className) ? "class='" + img.className + "' " : ""
-		 var imgTitle = (img.title) ? "title='" + img.title + "' " : "title='" + img.alt + "' "
-		 var imgStyle = "display:inline-block;" + img.style.cssText 
-		 var imgAttribs = img.attributes;
-		 for (var j=0; j<imgAttribs.length; j++)
-			{
-			var imgAttrib = imgAttribs[j];
-			if (imgAttrib.nodeName == "align")
-			   {		  
-			   if (imgAttrib.nodeValue == "left") imgStyle = "float:left;" + imgStyle
-			   if (imgAttrib.nodeValue == "right") imgStyle = "float:right;" + imgStyle
-			   break
-			   }
-            }
-		 var strNewHTML = "<span " + imgID + imgClass + imgTitle
-		 strNewHTML += " style=\"" + "width:" + img.width + "px; height:" + img.height + "px;" + imgStyle + ";"
-	     strNewHTML += "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader"
-		 strNewHTML += "(src=\'" + img.src + "\', sizingMethod='scale');\"></span>" 
-		 img.outerHTML = strNewHTML
-		 i = i-1
-	     }
-      }
-   }
-window.attachEvent("onload", correctPNG);

phpgwapi/templates/jerryr/js/simple_show_hide.js

@@ -1,183 +0,0 @@
-/*****************************************************
- * ypSlideOutMenu
- * 3/04/2001
- * 
- * a nice little script to create exclusive, slide-out
- * menus for ns4, ns6, mozilla, opera, ie4, ie5 on 
- * mac and win32. I've got no linux or unix to test on but 
- * it should(?) work... 
- *
- * --youngpup--
- *****************************************************/
-
-//var isIE = false;
-//var isOther = false;
-//var isNS4 = false;
-//var isNS6 = false;
-// constructor
-function ypSlideOutMenu(id, dir, left, top, width, height,pos)
-{
-
-	this.ie  = document.all ? 1 : 0
-		this.ns4 = document.layers ? 1 : 0
-		this.dom = document.getElementById ? 1 : 0
-
-		if (this.ie || this.ns4 || this.dom) {
-			this.id			 = id
-				this.dir		 = dir
-				this.orientation = dir == "left" || dir == "right" ? "h" : "v"
-				this.dirType	 = dir == "right" || dir == "down" ? "-" : "+"
-				this.dim		 = this.orientation == "h" ? width : height
-				//this.hideTimer	 = false
-				//this.aniTimer	 = false
-				this.open		 = false
-				this.over		 = false
-				//this.startTime	 = 0
-
-				// global reference to this object
-				//this.gRef = "ypSlideOutMenu_"+id
-				//eval(this.gRef+"=this")
-
-				// add this menu object to an internal list of all menus
-				//ypSlideOutMenu.Registry[id] = this
-
-				var d = document
-
-				var strCSS = '<style type="text/css">';
-			strCSS += '#' + this.id + 'Container { visibility:hidden; '
-				if(pos)
-				{
-					strCSS += pos+':' + left + 'px; '
-				}
-				else
-				{
-					strCSS += 'left:' + left + 'px; '
-				}
-				strCSS += 'top:' + top + 'px; '
-					strCSS += 'overflow:visible; z-index:10000; }'
-					strCSS += '#' + this.id + 'Container, #' + this.id + 'Content { position:absolute; '
-						strCSS += 'width:' + width + 'px; '
-							//		strCSS += 'height:' + height + 'px; '
-							//		strCSS += 'clip:rect(0 ' + width + ' ' + height + ' 0); '
-							strCSS += '}'
-							strCSS += '</style>';
-
-						d.write(strCSS);
-						//	alert(strCSS);
-//						this.load()
-
-					}
-		}
-
-	ypSlideOutMenu.aLs = function(layerID)
-	{
-
-		this.isIE = false;
-		this.isOther = false;
-		this.isNS4 = false;
-		this.isNS6 = false;
-		if(document.getElementById)
-		{
-			if(!document.all)
-			{
-				this.isNS6=true;
-			}
-			if(document.all)
-			{
-				this.isIE=true;
-			}
-		}
-		else
-		{
-			if(document.layers)
-			{
-				this.isNS4=true;
-			}
-			else
-			{
-				this.isOther=true;
-			}
-		}
-
-		var returnLayer;
-		if(this.isIE)
-		{
-			returnLayer = eval("document.all." + layerID + ".style");
-		}
-		if(this.isNS6)
-		{
-			returnLayer = eval("document.getElementById('" + layerID + "').style");
-		}
-		if(this.isNS4)
-		{
-			returnLayer = eval("document." + layerID);
-		}
-		if(this.isOther)
-		{
-			returnLayer = "null";
-			alert("Error:\nDue to your browser you will probably not\nbe able to view all of the following page\nas it was designed to be viewed. We regret\nthis error sincerely.");
-		}
-		return returnLayer;
-	}
-	// HideShow 1.0	Jim Cummins - http://www.conxiondesigns.com
-
-	ypSlideOutMenu.ShowL = function(ID)
-	{
-		ypSlideOutMenu.aLs(ID).visibility = "visible";
-	}
-
-	ypSlideOutMenu.HideL =function(ID)
-	{
-		ypSlideOutMenu.aLs(ID).visibility = "hidden";
-	}
-
-	ypSlideOutMenu.HideShow = function(ID)
-	{
-
-		if((ypSlideOutMenu.aLs(ID).visibility == "visible") || (ypSlideOutMenu.aLs(ID).visibility == ""))
-		{
-			ypSlideOutMenu.aLs(ID).visibility = "hidden";
-		}
-		else if(ypSlideOutMenu.aLs(ID).visibility == "hidden")
-		{
-			ypSlideOutMenu.aLs(ID).visibility = "visible";
-		}
-	}
-
-
-	ypSlideOutMenu.showMenu = function(id)
-	{
-		//temporarly hide all selectboxes to fix IE bug with z-index  
-		if(document.all)
-		{
-			for (var i=0; i<document.all.length; i++) {
-				o = document.all(i)
-					if (o.type == 'select-one' || o.type == 'select-multiple') {
-						// todo: add check for select in div?
-						if (o.style) o.style.display = 'none';
-					}
-			}
-		}
-		ypSlideOutMenu.ShowL(id+'Container');
-
-	}
-
-	ypSlideOutMenu.hide = function(id)
-	{
-		ypSlideOutMenu.HideL(id+'Container');
-		//show all selectboxes again to fix IE bug with z-index  
-		if(document.all)
-		{
-			for (var i=0; i<document.all.length; i++) {
-				o = document.all(i)
-					if (o.type == 'select-one' || o.type == 'select-multiple') {
-						// todo: add check for select in div?
-						if (o.style) o.style.display = 'inline';
-					}
-			}
-		}
-
-	}
-
-
-

phpgwapi/templates/jerryr/js/slidereffects.js

@@ -1,217 +0,0 @@
-/*****************************************************
- * ypSlideOutMenu
- * 3/04/2001
- * 
- * a nice little script to create exclusive, slide-out
- * menus for ns4, ns6, mozilla, opera, ie4, ie5 on 
- * mac and win32. I've got no linux or unix to test on but 
- * it should(?) work... 
- *
- * --youngpup--
- *****************************************************/
-
-ypSlideOutMenu.Registry = []
-ypSlideOutMenu.aniLen = 250
-ypSlideOutMenu.hideDelay = 1000
-ypSlideOutMenu.minCPUResolution = 10
-
-// constructor
-function ypSlideOutMenu(id, dir, left, top, width, height,pos)
-{
-	this.ie  = document.all ? 1 : 0
-		this.ns4 = document.layers ? 1 : 0
-		this.dom = document.getElementById ? 1 : 0
-
-		if (this.ie || this.ns4 || this.dom) {
-			this.id			 = id
-				this.dir		 = dir
-				this.orientation = dir == "left" || dir == "right" ? "h" : "v"
-				this.dirType	 = dir == "right" || dir == "down" ? "-" : "+"
-				this.dim		 = this.orientation == "h" ? width : height
-				this.hideTimer	 = false
-				this.aniTimer	 = false
-				this.open		 = false
-				this.over		 = false
-				this.startTime	 = 0
-
-				// global reference to this object
-				this.gRef = "ypSlideOutMenu_"+id
-				eval(this.gRef+"=this")
-
-				// add this menu object to an internal list of all menus
-				ypSlideOutMenu.Registry[id] = this
-
-				var d = document
-
-				var strCSS = '<style type="text/css">';
-			strCSS += '#' + this.id + 'Container { visibility:hidden; '
-				if(pos)
-				{
-					strCSS += pos+':' + left + 'px; '
-				}
-				else
-				{
-					strCSS += 'left:' + left + 'px; '
-				}
-				strCSS += 'top:' + top + 'px; '
-					strCSS += 'overflow:visible; z-index:10000; }'
-					strCSS += '#' + this.id + 'Container, #' + this.id + 'Content { position:absolute; '
-						strCSS += 'width:' + width + 'px; '
-							//		strCSS += 'height:' + height + 'px; '
-							//		strCSS += 'clip:rect(0 ' + width + ' ' + height + ' 0); '
-							strCSS += '}'
-							strCSS += '</style>';
-
-						d.write(strCSS)
-
-							this.load()
-					}
-		}
-
-	ypSlideOutMenu.prototype.load = function() {
-		var d = document
-			var lyrId1 = this.id + "Container"
-			var lyrId2 = this.id + "Content"
-			var obj1 = this.dom ? d.getElementById(lyrId1) : this.ie ? d.all[lyrId1] : d.layers[lyrId1]
-			if (obj1) var obj2 = this.ns4 ? obj1.layers[lyrId2] : this.ie ? d.all[lyrId2] : d.getElementById(lyrId2)
-				var temp
-
-					if (!obj1 || !obj2) window.setTimeout(this.gRef + ".load()", 100)
-					else {
-						this.container	= obj1
-							this.menu		= obj2
-							this.style		= this.ns4 ? this.menu : this.menu.style
-							this.homePos	= eval("0" + this.dirType + this.dim)
-							this.outPos		= 0
-							this.accelConst	= (this.outPos - this.homePos) / ypSlideOutMenu.aniLen / ypSlideOutMenu.aniLen 
-
-							// set event handlers.
-							if (this.ns4) this.menu.captureEvents(Event.MOUSEOVER | Event.MOUSEOUT);
-						this.menu.onmouseover = new Function("ypSlideOutMenu.showMenu('" + this.id + "')")
-							this.menu.onmouseout = new Function("ypSlideOutMenu.hideMenu('" + this.id + "')")
-
-							//set initial state
-							this.endSlide()
-					}
-	}
-
-	ypSlideOutMenu.showMenu = function(id)
-	{
-		var reg = ypSlideOutMenu.Registry
-			var obj = ypSlideOutMenu.Registry[id]
-
-			//document.all.select.style="visibily:hidden";
-
-
-			//temporarly hide all selectboxes to fix IE bug with z-index  
-			if(document.all)
-			{
-				for (var i=0; i<document.all.length; i++) {
-					o = document.all(i)
-						if (o.type == 'select-one' || o.type == 'select-multiple') {
-							// todo: add check for select in div?
-							if (o.style) o.style.display = 'none';
-						}
-				}
-			}
-
-
-		if (obj.container) {
-			obj.over = true
-
-				// close other menus.
-				for (menu in reg) if (id != menu) ypSlideOutMenu.hide(menu)
-
-					// if this menu is scheduled to close, cancel it.
-					if (obj.hideTimer) { reg[id].hideTimer = window.clearTimeout(reg[id].hideTimer) }
-
-			// if this menu is closed, open it.
-			if (!obj.open && !obj.aniTimer) reg[id].startSlide(true)
-		}
-	}
-
-	ypSlideOutMenu.hideMenu = function(id)
-	{
-		// schedules the menu to close after <hideDelay> ms, which
-		// gives the user time to cancel the action if they accidentally moused out
-		var obj = ypSlideOutMenu.Registry[id]
-			if (obj.container) {
-				if (obj.hideTimer) window.clearTimeout(obj.hideTimer)
-					obj.hideTimer = window.setTimeout("ypSlideOutMenu.hide('" + id + "')", ypSlideOutMenu.hideDelay);
-			}
-	}
-
-	ypSlideOutMenu.hide = function(id)
-	{
-		var obj = ypSlideOutMenu.Registry[id]
-			obj.over = false
-
-			if (obj.hideTimer) window.clearTimeout(obj.hideTimer)
-
-				// flag that this scheduled event has occured.
-				obj.hideTimer = 0
-
-					// if this menu is open, close it.
-					if (obj.open && !obj.aniTimer) obj.startSlide(false)
-
-						//show all selectboxes again to fix IE bug with z-index  
-						if(document.all)
-						{
-							for (var i=0; i<document.all.length; i++) {
-								o = document.all(i)
-									if (o.type == 'select-one' || o.type == 'select-multiple') {
-										// todo: add check for select in div?
-										if (o.style) o.style.display = 'inline';
-									}
-							}
-						}
-
-
-
-	}
-
-ypSlideOutMenu.prototype.startSlide = function(open) {
-	this[open ? "onactivate" : "ondeactivate"]()
-	this.open = open
-	if (open) this.setVisibility(true)
-	this.startTime = (new Date()).getTime()	
-	this.aniTimer = window.setInterval(this.gRef + ".slide()", ypSlideOutMenu.minCPUResolution)
-}
-
-ypSlideOutMenu.prototype.slide = function() {
-	var elapsed = (new Date()).getTime() - this.startTime
-	if (elapsed > ypSlideOutMenu.aniLen) this.endSlide()
-	else {
-		var d = Math.round(Math.pow(ypSlideOutMenu.aniLen-elapsed, 2) * this.accelConst)
-		if (this.open && this.dirType == "-")		d = -d
-		else if (this.open && this.dirType == "+")	d = -d
-		else if (!this.open && this.dirType == "-")	d = -this.dim + d
-		else										d = this.dim + d
-
-		this.moveTo(d)
-	}
-}
-
-ypSlideOutMenu.prototype.endSlide = function() {
-	this.aniTimer = window.clearTimeout(this.aniTimer)
-	this.moveTo(this.open ? this.outPos : this.homePos)
-	if (!this.open) this.setVisibility(false)
-	if ((this.open && !this.over) || (!this.open && this.over)) {
-		this.startSlide(this.over)
-	}
-}
-
-ypSlideOutMenu.prototype.setVisibility = function(bShow) { 
-	var s = this.ns4 ? this.container : this.container.style
-	s.visibility = bShow ? "visible" : "hidden"
-}
-ypSlideOutMenu.prototype.moveTo = function(p) { 
-	this.style[this.orientation == "h" ? "left" : "top"] = this.ns4 ? p : p + "px"
-}
-ypSlideOutMenu.prototype.getPos = function(c) {
-	return parseInt(this.style[c])
-}
-
-// events
-ypSlideOutMenu.prototype.onactivate		= function() { }
-ypSlideOutMenu.prototype.ondeactivate	= function() { }

phpgwapi/templates/jerryr/navbar.inc.php

@@ -20,7 +20,7 @@
 				'navbar' => 'navbar.tpl'
 			)
 		);
-
+			
 		$GLOBALS['jerryr_tpl']->set_block('navbar','navbar_header','navbar_header');
 		$GLOBALS['jerryr_tpl']->set_block('navbar','extra_blocks_header','extra_block_header');
 		$GLOBALS['jerryr_tpl']->set_block('navbar','extra_block_row','extra_block_row');
@@ -35,7 +35,7 @@
 
 		$var['img_root'] = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/jerryr/images';
 		$var['table_bg_color'] = $GLOBALS['egw_info']['theme']['navbar_bg'];
-
+		
 		if($GLOBALS['egw_info']['user']['preferences']['common']['click_or_onmouseover']=='onmouseover')
 		{
 			$show_menu_event = 'onMouseOver';
@@ -45,7 +45,20 @@
 			$show_menu_event = 'onClick';
 		}
 
-
+		if($GLOBALS['egw_info']['user']['userid'] == 'anonymous')
+		{
+			$cnf_reg =& CreateObject('phpgwapi.config','registration');
+			$cnf_reg->read_repository();
+			$config_reg = $cnf_reg->config_data;
+		
+			$GLOBALS['jerryr_tpl']->set_var('upper_tabs','
+				<ul>
+					<li><a href="'.$GLOBALS['egw']->link('/logout.php').'">'.lang('Login').'</a></li>'.
+					( ($config_reg[enable_registration]=='True' && $config_reg[register_link]=='True') ? '<li><a href="'.$GLOBALS['egw']->link('/registration/index.php').'">'.lang('Register').'</a></li>' : '').'
+				</ul>
+			');
+		}
+		
 		$applications = '';
 
 		//	== 'icons_and_text')
@@ -82,7 +95,7 @@
 					}
 					$tdwidth=round($tdwidth);
 
-					$app_icons .= '<td width="'.$tdwidth.'%" height="40" valign="bottom" align="center" style="text-align:center"><a href="' . $app_data['url'] . '"';
+					$app_icons .= '<td width="'.$tdwidth.'%" align="center" style="text-align:center; border-right: 1px solid #9f9f9f;border-left: 1px solid #cfcfcf; border-bottom: 1px solid #9f9f9f; border-top: 1px solid #9f9f9f" onMouseOver="style.backgroundColor=\'#a7c4db\'; " onMouseOut="style.backgroundColor=\'\';"><a href="' . $app_data['url'] . '"';
 
 					if(isset($GLOBALS['egw_info']['flags']['navbar_target']) && $GLOBALS['egw_info']['flags']['navbar_target'])
 					{
@@ -91,7 +104,7 @@
 
 					$app_icons .= $app_data['target'].'>' . $icon . '</a></td>';
 
-					$app_titles .= '<td align="center" valign="top" class="appTitles" style="text-align:center"><a href="'.$app_data['url'] . '"';
+					$app_titles .= '<td align="center" valign="top" class="appTitles" style="text-align:center; "><a href="'.$app_data['url'] . '"';
 
 					if(isset($GLOBALS['egw_info']['flags']['navbar_target']) && $GLOBALS['egw_info']['flags']['navbar_target'])
 					{
@@ -147,7 +160,7 @@
 				}
 			}
 
-			if($GLOBALS['egw_info']['user']['preferences']['common']['start_and_logout_icons']!='no')
+			if($GLOBALS['egw_info']['user']['preferences']['common']['start_and_logout_icons']!='no' && $GLOBALS['egw_info']['user']['userid'] != 'anonymous')
 			{
 				$app_icons .= '<td width="'.$tdwidth.'%" height="32" valign="bottom" align="center" style="text-align:center"><a href="'.$GLOBALS['egw_info']['navbar']['logout']['url'].'"><img src="'.$GLOBALS['egw_info']['navbar']['logout']['icon'].'" title="'.$GLOBALS['egw_info']['navbar']['logout']['title'].'" alt="'.$GLOBALS['egw_info']['navbar']['logout']['title'].'"></a></td>';
 				$app_titles .= '<td align="center" valign="top" class="appTitles" style="text-align:center"><a href="'.$GLOBALS['egw_info']['navbar']['logout']['url'].'">'.$GLOBALS['egw_info']['navbar']['logout']['title'].'</a></td>';
@@ -164,7 +177,7 @@
 // table width=100% fixed layout bug (ndee130204)
 				$app_extra_icons_div = '
 				<script language="javascript">
-				new ypSlideOutMenu("menu1", "down", 10, 114, 160, 200,\'right\')
+				new ypSlideOutMenu("menu1", "left",19, 109, 160, 300,\'right\')
 				</script>
 				<div id="menu1Container">
 				<div id="menu1Content" style="position: relative; left: 0; text-align: left;">
@@ -267,7 +280,7 @@
 					'no_lang' => True,
 					'link'    => $GLOBALS['egw_info']['navbar']['about']['url']
 				),
-				'Logout'=>$GLOBALS['egw_info']['navbar']['logout']['url']
+				$GLOBALS['egw_info']['user']['userid'] != 'anonymous' ? 'Logout' : 'Login' =>$GLOBALS['egw_info']['navbar']['logout']['url']
 			);
 
 			if($GLOBALS['egw_info']['user']['preferences']['common']['auto_hide_sidebox']==1)

phpgwapi/templates/jerryr/navbar.tpl

@@ -5,27 +5,29 @@
 
 
 <div id="divMain">
-	<div id="divAppIconBar">
-		<table width="100%" border="0" cellspacing="0" cellpadding="0">
-			<tr>
-				<td width="180" valign="top" align="left"><img src="{img_root}/grey-pixel.png" width="1" height="40" alt="spacer" /></td>
-				<td>
-					<table width="100%" border="0" cellspacing="0" cellpadding="0">
-						<tr>
-							{app_icons}
-						</tr>
-						<tr>
-							{app_titles}
-						</tr>
-					</table>
+	<div id="divUpperTabs">
+	{upper_tabs}
+	</div>
 
-				</td>
+ <div id="divAppIconBar">
+                <table width="100%" border="0" cellspacing="0" cellpadding="0" style="padding-top: 0px">
+                        <tr>
+                                <td width="180"></td>
+                                <td valign="bottom">
+                                        <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                                <tr>
+                                                        {app_icons}
+                                                </tr>
+                                                <tr>
+                                                        {app_titles}
+                                                </tr>
+                                        </table>
+                                </td>
+
+			{app_extra_icons_icon}
 
-				{app_extra_icons_icon}
-	
-				<td width="1" valign="top" align="right"><img src="{img_root}/grey-pixel.png" width="1" height="40" alt="spacer" /></td>
 			</tr>
-		</table>
+                </table>
 	</div>
 	<div id="divStatusBar"><table width="100%" cellspacing="0" cellpadding="0" border="0"><tr><td align="left" id="user_info">{user_info}</td><td align="right" id="admin_info">{current_users}</td></tr></table></div>
 
@@ -47,10 +49,10 @@
 <!-- BEGIN sidebox_hide_header -->
 	<!--<script language="javascript" src="SlideOut.js"></script>-->
 	<script language="javascript">
-		new ypSlideOutMenu("menu2", "right", 0, 45, 160, 200)
+		new ypSlideOutMenu("menu2", "right", 0, 103, 160, 200)
 	</script>
 
-	<div id="sideboxdragarea" style="position:absolute;left:0px;top:55px">
+	<div id="sideboxdragarea" style="position:absolute;left:0px;top:113px">
 	<a href="#" {show_menu_event}="ypSlideOutMenu.showMenu('menu2')" onmouseover="//ypSlideOutMenu.showMenu('menu2')" title="{lang_show_menu}"><img src="{img_root}/dragarea_right.png" /></a>
 	</div>
 
@@ -59,7 +61,7 @@
 		<table cellspacing="0" cellpadding="0">
 		 <tr><td>
 		  
-		<div style="background-color:#ffffff;border: #9c9c9c 1px solid;padding:5px;">
+		<div style="background-color:#ffffff;border: #17202b 1px solid;padding:5px;">
 <!-- END sidebox_hide_header -->
 
 
@@ -84,57 +86,51 @@
 
 		<!-- Applicationbox Column -->
 		<td id="tdAppbox" valign="top" {remove_padding}>
-			<table width=100% cellpadding=0 cellspacing=0>
-				<tr>
-					<td width=8 class="calLtLtTitleBeige"></td>
-					<td width=8 class="calLtMidTitleBeige"></td>
-					<td class="calDayTitleBeige">{current_app_title}</td>
-					<td width=8 class="calRtMidTitleBeige" ></td>
-					<td width=8 class="calRtRtTitleBeige" ></td>
-				</tr>
-			</table>
-			<table border=0 width=100% cellpadding=0 cellspacing=0>
-				<tr>
-					<td width=8 class="calLeftShadow"></td>
-					<td>
-						<div id="divAppbox">
-						<table border=0 width="100%" cellpadding="0" cellspacing="0">
-							<tr>
-								<td>
-									<!-- END navbar_footer -->
-									<!-- BEGIN extra_blocks_header -->
-									<div class="divSidebox">
-									<div class="divSideboxHeader"><span>{lang_title}</span></div>
-									<div>
-									<table width="100%" cellspacing="0" cellpadding="0">
-									<!-- END extra_blocks_header -->
-									<!-- BEGIN extra_blocks_footer -->
-									</table>	
-									</div>
-									</div>
-									<div class="sideboxSpace"></div>
-									<!-- END extra_blocks_footer -->
-									<!-- BEGIN extra_block_row -->
-							<tr class="divSideboxEntry">
-								<td width="20" align="center" valign="middle" class="textSidebox">{icon_or_star}</td>
-								<td class="textSidebox"><a class="textSidebox" href="{item_link}"{target}>{lang_item}</a></td>
-							</tr>
-							<!-- END extra_block_row -->
+		<div id="divAppboxHeader">{current_app_title}</div>
+		<div id="divAppbox">
+		<table width="100%" cellpadding="0" cellspacing="0">
+		<tr><td>
+<!-- END navbar_footer -->
+
+
+<!-- BEGIN extra_blocks_header -->
+<div class="divSidebox">
+	<div class="divSideboxHeader"><span>{lang_title}</span></div>
+	<div>
+		<table width="100%" cellspacing="0" cellpadding="0">
+<!-- END extra_blocks_header -->
+
+
+<!-- BEGIN extra_blocks_footer -->
+	</table>	
+		</div>
+		</div>
+
+		<div class="sideboxSpace"></div>
+<!-- END extra_blocks_footer -->
+
+
+
+<!-- BEGIN extra_block_row -->
+		<tr class="divSideboxEntry">
+<td width="20" align="center" valign="middle" class="textSideboxStar">{icon_or_star}</td><td class="textSidebox"><a class="textSidebox" href="{item_link}"{target}>{lang_item}</a></td>
+</tr>
+<!-- END extra_block_row -->
+
 <!-- BEGIN extra_block_row_raw -->
-                <tr class="divSideboxEntry">
+		<tr class="divSideboxEntry">
 <td colspan="2" class="textSidebox">{lang_item}</td>
 </tr>
 <!-- END extra_block_row_raw -->
 
 <!-- BEGIN extra_block_row_no_link -->
-                <tr class="divSideboxEntry">
+		<tr class="divSideboxEntry">
 <td width="20" align="center" valign="middle" class="textSidebox">{icon_or_star}</td><td class="textSidebox">{lang_item}</td>
 </tr>
 <!-- END extra_block_row_no_link -->
 
-							<!-- BEGIN extra_block_spacer -->
-							<tr class="divSideboxEntry"> 
-								<td colspan="2" height="8" class="textSidebox"></td>
-							</tr>
-							
+<!-- BEGIN extra_block_spacer -->
+<tr class="divSideboxEntry">
+	<td colspan="2" height="8" class="textSidebox">&nbsp;</td>
+</tr>
 <!-- END extra_block_spacer -->