diff --git a/phpgwapi/templates/idots/about.tpl b/phpgwapi/templates/idots/about.tpl new file mode 100755 index 0000000000..38cc72ac2c --- /dev/null +++ b/phpgwapi/templates/idots/about.tpl @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ eGroupWare +
 
{phpgw_version}
{phpgw_message}
spacer
spacer
+ +{phpgw_app_about} + +
diff --git a/phpgwapi/templates/idots/css.tpl b/phpgwapi/templates/idots/css.tpl index 526d17dd12..50b1baaf0e 100755 --- a/phpgwapi/templates/idots/css.tpl +++ b/phpgwapi/templates/idots/css.tpl @@ -6,4 +6,4 @@ {app_css} --> -{css_file} \ No newline at end of file +{css_file} diff --git a/phpgwapi/templates/idots/css/idots.css b/phpgwapi/templates/idots/css/idots.css index a67e826dfc..8e4c28c8b5 100755 --- a/phpgwapi/templates/idots/css/idots.css +++ b/phpgwapi/templates/idots/css/idots.css @@ -1,162 +1,256 @@ -A:link +/* + 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. +*/ + +body { - COLOR: #006699; - TEXT-DECORATION: none + background-image:url(../images/body-background.png); + font-size: 12px; + font-family: Verdana, Arial, Helvetica, sans-serif; + padding:14px; +/* margin:14px;*/ } -A:visited +a:link { - COLOR: #006699; - TEXT-DECORATION: none + color: #006699; + text-decoration: none; } -A:hover +a:visited { - COLOR: #ff9933; TEXT-DECORATION: underline + color: #006699; + text-decoration: none; } -A:active +a:hover { - COLOR: #006699; - TEXT-DECORATION: underline + color: #ff9933; text-decoration: underline; } -INPUT +a:active { - FONT-SIZE: 12px; - COLOR: #006699; - FONT-FAMILY: Arial, Helvetica, sans-serif + color: #006699; + text-decoration: underline; } -SELECT +input { - FONT-SIZE: 12px; - COLOR: #006699; - FONT-FAMILY: Arial, Helvetica, sans-serif + font-size: 12px; + color: #006699; + font-family: Arial, Helvetica, sans-serif } -BODY +select { - FONT-SIZE: 12px; - FONT-FAMILY: Verdana, Arial, Helvetica, sans-serif + font-size: 12px; + color: #006699; + font-family: Arial, Helvetica, sans-serif } -FORM + +.divSidebox { - FONT-SIZE: 12px; - FONT-FAMILY: Verdana, Arial, Helvetica, sans-serif + position:relative; + width: 160px; + border-right: #9c9c9c 1px solid; + border-top: #9c9c9c 1px solid; + border-left: #9c9c9c 1px solid; + border-bottom: #9c9c9c 1px solid } -TABLE +.divSideboxHeader { - FONT-SIZE: 12px; - FONT-FAMILY: Verdana, Arial, Helvetica, sans-serif + text-align:center; + background-image:url(../images/sidebox-header-background.png); + background-repeat: repeat-x; + height:12px; + padding-top:2px; + padding-bottom:0px; + font-size:10px; + color:#666666; } -.sideboxcontent +.divSideboxEntry { - PADDING-RIGHT: 5px; - PADDING-LEFT: 5px; - FONT-SIZE: 12px; - PADDING-BOTTOM: 5px; - WIDTH: 160px; - COLOR: #000000; - BACKGROUND-COLOR: #efefef; - LINE-HEIGHT: 20px; - PADDING-TOP: 5px; - FONT-FAMILY: Verdana, Arial, Helvetica, sans-serif + text-align:left; + height:16px; + background-color:#d6d6d6; +} +a.appTitles,.appTitles +{ + font-size: 10px; + height:18px; + padding-top:2px; + padding-bottom:2px; } -.mainnote +a.textSidebox,.textSidebox { - FONT-SIZE: 12px; - COLOR: #006699; - BACKGROUND-COLOR: #efefef; - FONT-FAMILY: Arial, Helvetica, sans-serif + font-size: 10px; + height:18px; + padding-top:2px; + padding-bottom:2px; + border-top: #ffffff 1px solid } -.articlecontent +.sideboxSpace { - PADDING-RIGHT: 10px; - PADDING-LEFT: 10px; - FONT-SIZE: 12px; - PADDING-BOTTOM: 10px; - COLOR: #000000; - LINE-HEIGHT: 20px; - PADDING-TOP: 10px; - FONT-FAMILY: Verdana, Arial, Helvetica, sans-serif + height:9px; } -.sideboxtext +.greyLine { - FONT-SIZE: 12px; - LINE-HEIGHT: 18px; - FONT-FAMILY: Verdana, Arial, Helvetica, sans-serif + margin:1px; + border-top-color:#7e7e7e; + border-top-width:1px; + border-top-style:solid; + height:1px; } -.toppannel +#divMain { - BACKGROUND-IMAGE: url(../images/panel.png); - BACKGROUND-REPEAT: repeat-x + background-color:white; + margin-top: 9px; +/* margin-left: 14px; + margin-right: 14px;*/ + padding:4px; + border-color:#7e7e7e; + border-width:1px; + border-style:solid; } -.copyright +#divLogo { + position:absolute; + left:20px; + top:14px; + z-index:51; +} + +#divAppIconBar +{ + background-color:white; + border-top-color:#9c9c9c; + border-top-width:1px; + border-top-style:solid; + background-image: url(../images/background-icon-bar.png); + background-repeat: repeat-x +} + +#divAppTextBar +{ + background-color:white; +} + +#divStatusBar +{ + background-color:white; + height:15px; + padding-left:170px; + margin-top: 13px; + margin-bottom: 2px; +} + +#divSubContainer +{ + margin-top: 2px; + margin-bottom: 4px; +} + +#tdSidebox +{ + width:170px; + background-color:white; +} + +#tdAppbox +{ + background-color:white; + padding:10px; +} +#divSideboxContainer +{ + position:relative; + width:150px; + top:0px; + left:0px; + background-color:white; + border-color:red; + border-width:1px; + border-style:solid; + z-index:40; +} + +#divAppboxHeader +{ + background-image:url(../images/appbox-header-background.png); + background-repeat: repeat-x; + height:30px; + text-align:center; + font-size:22px; + color:#666666; + padding-top:5px; + 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; +} + +#divAppbox +{ + width:100%; + background-color:#f7f7f7; + padding:5px; +/* height:200px;*/ + border-bottom-color:#9c9c9c; + border-bottom-width:1px; + border-bottom-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; +} + +#user_info +{ + + +} + +#admin_info +{ + position:relative; + text-align:right; +} + +#divPoweredBy +{ + bottom:14px; font-size: 9px; color: #000000; + text-align:center; + width:99%; } -.title -{ - PADDING-LEFT: 5px; - FONT-WEIGHT: bold; - FONT-SIZE: 12px; - COLOR: #000000; - FONT-FAMILY: Verdana, Arial, Helvetica, sans-serif -} - -.box -{ - BORDER-RIGHT: #98aab1 1px solid; - BORDER-TOP: #98aab1 1px solid; - BORDER-LEFT: #98aab1 1px solid; - BORDER-BOTTOM: #98aab1 1px solid -} - -.content -{ - FONT-SIZE: 12px; - COLOR: #000000; - FONT-FAMILY: Verdana, Arial, Helvetica, sans-serif -} - -.sideboxtitle -{ - BACKGROUND-POSITION: center 50%; - FONT-WEIGHT: bold; - FONT-SIZE: 12px; - BACKGROUND-IMAGE: url(../images/boxbg.gif); - COLOR: #000000; - FONT-FAMILY: Verdana, Arial, Helvetica, sans-serif -} - -.sidebox -{ - BORDER-RIGHT: #98aab1 1px solid; - BORDER-TOP: #98aab1 1px solid; - BORDER-LEFT: #98aab1 1px solid; - WIDTH: 160px; - BORDER-BOTTOM: #98aab1 1px solid -} - -.articletitle -{ - FONT-WEIGHT: bold; - FONT-SIZE: 12px; - BACKGROUND-IMAGE: url(../images/greypanel.gif); - COLOR: #000000; - TEXT-INDENT: 5pt; - BACKGROUND-REPEAT: repeat-x; - FONT-FAMILY: Verdana, Arial, Helvetica, sans-serif; - HEIGHT: 20px -} diff --git a/phpgwapi/templates/idots/footer.tpl b/phpgwapi/templates/idots/footer.tpl index f6db143f8b..5c35e3d060 100755 --- a/phpgwapi/templates/idots/footer.tpl +++ b/phpgwapi/templates/idots/footer.tpl @@ -1,11 +1,12 @@ - - + + + + + + + -
- - - - - -

{powered_by}

+

{powered_by}
+ + diff --git a/phpgwapi/templates/idots/head.tpl b/phpgwapi/templates/idots/head.tpl index 2916b6556c..fbaaa8a359 100644 --- a/phpgwapi/templates/idots/head.tpl +++ b/phpgwapi/templates/idots/head.tpl @@ -1,18 +1,48 @@ - - - - - - - - - - - -{css} -{website_title} -{java_script} - - + + + + + + + {website_title} + + + + + + + + + + + + {css} + {java_script} + + + + + + + diff --git a/phpgwapi/templates/idots/images/appbox-header-background.png b/phpgwapi/templates/idots/images/appbox-header-background.png new file mode 100644 index 0000000000..7bd5d16294 Binary files /dev/null and b/phpgwapi/templates/idots/images/appbox-header-background.png differ diff --git a/phpgwapi/templates/idots/images/background-icon-bar.png b/phpgwapi/templates/idots/images/background-icon-bar.png new file mode 100644 index 0000000000..b601e56b39 Binary files /dev/null and b/phpgwapi/templates/idots/images/background-icon-bar.png differ diff --git a/phpgwapi/templates/idots/images/body-background.png b/phpgwapi/templates/idots/images/body-background.png new file mode 100644 index 0000000000..02db2b402c Binary files /dev/null and b/phpgwapi/templates/idots/images/body-background.png differ diff --git a/phpgwapi/templates/idots/images/grey-pixel.png b/phpgwapi/templates/idots/images/grey-pixel.png new file mode 100644 index 0000000000..7a56a8ccb5 Binary files /dev/null and b/phpgwapi/templates/idots/images/grey-pixel.png differ diff --git a/phpgwapi/templates/idots/images/logo.png b/phpgwapi/templates/idots/images/logo.png index 766038932d..c17f5d9906 100644 Binary files a/phpgwapi/templates/idots/images/logo.png and b/phpgwapi/templates/idots/images/logo.png differ diff --git a/phpgwapi/templates/idots/images/nonav.png b/phpgwapi/templates/idots/images/nonav.png index 0f87fb3006..5602de8617 100644 Binary files a/phpgwapi/templates/idots/images/nonav.png and b/phpgwapi/templates/idots/images/nonav.png differ diff --git a/phpgwapi/templates/idots/images/orange-ball.png b/phpgwapi/templates/idots/images/orange-ball.png new file mode 100644 index 0000000000..f9a35d1d89 Binary files /dev/null and b/phpgwapi/templates/idots/images/orange-ball.png differ diff --git a/phpgwapi/templates/idots/images/sidebox-header-background.png b/phpgwapi/templates/idots/images/sidebox-header-background.png new file mode 100644 index 0000000000..b9d5eafbae Binary files /dev/null and b/phpgwapi/templates/idots/images/sidebox-header-background.png differ diff --git a/phpgwapi/templates/idots/images/valid-xhtml11.png b/phpgwapi/templates/idots/images/valid-xhtml11.png new file mode 100644 index 0000000000..2c63d93f88 Binary files /dev/null and b/phpgwapi/templates/idots/images/valid-xhtml11.png differ diff --git a/phpgwapi/templates/idots/js/pngfix.js b/phpgwapi/templates/idots/js/pngfix.js new file mode 100644 index 0000000000..a38d8353e6 --- /dev/null +++ b/phpgwapi/templates/idots/js/pngfix.js @@ -0,0 +1,33 @@ +function correctPNG() // correctly handle PNG transparency in Win IE 5.5 or higher. + { + for(var i=0; i" + img.outerHTML = strNewHTML + i = i-1 + } + } + } +window.attachEvent("onload", correctPNG); \ No newline at end of file diff --git a/phpgwapi/templates/idots/navbar.inc.php b/phpgwapi/templates/idots/navbar.inc.php index f0e294126b..e9831e15ed 100644 --- a/phpgwapi/templates/idots/navbar.inc.php +++ b/phpgwapi/templates/idots/navbar.inc.php @@ -40,23 +40,23 @@ $title = $GLOBALS['phpgw_info']['apps'][$app]['title']; $icon = '' . $title . - ''; + '" title="'. $title . '" border="0" />'; - $app_icons .= ''; + $app_icons .= '>' . $icon . ''; - $app_titles .= ''; + $app_titles .= '>' . $title . ''; unset($icon); unset($title); diff --git a/phpgwapi/templates/idots/navbar.tpl b/phpgwapi/templates/idots/navbar.tpl index 85894fee93..2471901dab 100644 --- a/phpgwapi/templates/idots/navbar.tpl +++ b/phpgwapi/templates/idots/navbar.tpl @@ -1,87 +1,75 @@ - - -
- - - - - - - - - - -
{logo_title} - - - - - {app_icons} - - - - - - {app_titles} - - -
{user_info}{current_users}
- - - - {output} + + + + + + + + + {link_field_data}
+ + +
+
+ + + + + + +
spacer + + + {app_icons} + + + {app_titles} + +
+ + 		spacer
+
+
{user_info}{current_users}
+
+ + + + - - diff --git a/phpgwapi/templates/idots/portal.tpl b/phpgwapi/templates/idots/portal.tpl index 70ff77ca41..bb99c18393 100755 --- a/phpgwapi/templates/idots/portal.tpl +++ b/phpgwapi/templates/idots/portal.tpl @@ -14,26 +14,44 @@
-
-		 - - - - - - + + + + - - - + + + diff --git a/phpgwapi/templates/idots/navbar_app.tpl b/phpgwapi/templates/idots/navbar_app.tpl index 940d3e2edd..d6169e4fa7 100755 --- a/phpgwapi/templates/idots/navbar_app.tpl +++ b/phpgwapi/templates/idots/navbar_app.tpl @@ -1,3 +1,3 @@ - + diff --git a/phpgwapi/templates/idots/nextmatchs.tpl b/phpgwapi/templates/idots/nextmatchs.tpl index 302b33e2e8..76eda1c385 100755 --- a/phpgwapi/templates/idots/nextmatchs.tpl +++ b/phpgwapi/templates/idots/nextmatchs.tpl @@ -1,11 +1,10 @@
- - - - - + + + +
{current_app_title}
+ +
{current_app_title}
+
- - - - - - - -
{lang_title}
- +
+
{lang_title}
+
+
-
-
-
+
+ + + +
-
{icon_or_star} {lang_item}
{icon_or_star}{lang_item}
{left} - {right} + {right}
{cats_search_filter_data}{cats_search_filter_data}
- -
+
@@ -45,9 +44,7 @@ 		- +
- {label} - {label}

+ + +
{control_link}