diff --git a/phpgwapi/templates/idots/css/idots.css b/phpgwapi/templates/idots/css/idots.css index 96f3d9ea2d..a18bf3ed5c 100755 --- a/phpgwapi/templates/idots/css/idots.css +++ b/phpgwapi/templates/idots/css/idots.css @@ -62,6 +62,12 @@ input[type=submit],input[type=button],button cursor: hand; } +input[type=image] +{ + cursor: pointer; + cursor: hand; + border: 0px #bbbbbb none; +} select { font-size: 11px; @@ -142,6 +148,19 @@ a.textSidebox height:1px; } +#extraIcons +{ + position:absolute; + z-index:13; + right:10px; + top:113px; + visibility:hidden; + background-image:url(../images/alpha-white.png); + border-width:1px; + border-color:#7e7e7e; + border-style:solid; +} + #divMain { background-color:white; diff --git a/phpgwapi/templates/idots/css/kneschke.css b/phpgwapi/templates/idots/css/kneschke.css index e7d8687450..f16f27ac75 100755 --- a/phpgwapi/templates/idots/css/kneschke.css +++ b/phpgwapi/templates/idots/css/kneschke.css @@ -177,6 +177,19 @@ a.textSidebox z-index:51; } +#extraIcons +{ + position:absolute; + z-index:13; + right:10px; + top:113px; + visibility:hidden; + background-image:url(../images/alpha-white.png); + border-width:1px; + border-color:#7e7e7e; + border-style:solid; +} + #divAppIconBar { background-color:white; diff --git a/phpgwapi/templates/idots/head.tpl b/phpgwapi/templates/idots/head.tpl index 6c7f127f63..e306d0a61e 100644 --- a/phpgwapi/templates/idots/head.tpl +++ b/phpgwapi/templates/idots/head.tpl @@ -3,22 +3,18 @@ {website_title} @@ -34,12 +30,99 @@ {css} {java_script} + + + diff --git a/phpgwapi/templates/idots/images/alpha-white.png b/phpgwapi/templates/idots/images/alpha-white.png new file mode 100644 index 0000000000..4d8b4fcb84 Binary files /dev/null and b/phpgwapi/templates/idots/images/alpha-white.png differ diff --git a/phpgwapi/templates/idots/images/close.png b/phpgwapi/templates/idots/images/close.png new file mode 100755 index 0000000000..2415dfc78b Binary files /dev/null and b/phpgwapi/templates/idots/images/close.png differ diff --git a/phpgwapi/templates/idots/navbar.inc.php b/phpgwapi/templates/idots/navbar.inc.php index 5d6a4bb2c8..ae87bb90c5 100644 --- a/phpgwapi/templates/idots/navbar.inc.php +++ b/phpgwapi/templates/idots/navbar.inc.php @@ -32,38 +32,84 @@ $var['table_bg_color'] = $GLOBALS['phpgw_info']['theme']['navbar_bg']; $applications = ''; - // == 'icons_and_text') + + // == 'icons_and_text') + + $max_icons=7; // must be detected with javascript or must be a preference + foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data) { if($app != 'home' && $app != 'preferences' && $app != 'about' && $app != 'logout') { $title = $GLOBALS['phpgw_info']['apps'][$app]['title']; - - $icon = '' . $title - . ''; + $icon = '' . $title . ''; - $app_icons .= ''; + $app_icons .= ''; + + $app_titles .= ''; + - $app_titles .= ''; + else // generate extra icon layer | always shows icons and text + { + $app_extra_icons .= ''; + + $app_extra_icons .= ''; + } unset($icon); unset($title); + $i++; } } $var['app_icons'] = $app_icons; + + if($i>$max_icons) + { + $app_extra_icons_div=' +
+ '.$app_extra_icons.' + +
 
+
'; + + $var['app_extra_icons_div']= $app_extra_icons_div; + $var['app_extra_icons_icon']= ''; + + } + + if($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format']!='icons') { $var['app_titles'] = $app_titles; diff --git a/phpgwapi/templates/idots/navbar.tpl b/phpgwapi/templates/idots/navbar.tpl index 786dd1346a..085ae417a2 100644 --- a/phpgwapi/templates/idots/navbar.tpl +++ b/phpgwapi/templates/idots/navbar.tpl @@ -1,6 +1,8 @@ +{app_extra_icons_div} +
@@ -17,6 +19,9 @@
+ + {app_extra_icons_icon} + spacer