From 1483360a0e61c6c74aff3b586e1374c3160fc43e Mon Sep 17 00:00:00 2001 From: ceb Date: Fri, 15 Nov 2002 22:31:51 +0000 Subject: [PATCH] update --- filemanager/setup/phpgw_en.lang | 1 + phpgwapi/inc/class.applications.inc.php | 6 +- phpgwapi/inc/class.common.inc.php | 85 +++++++++++++++--- phpgwapi/inc/class.xslttemplates.inc.php | 2 +- phpgwapi/templates/funkwerk/css/funkwerk.css | 20 ++++- phpgwapi/templates/funkwerk/phpgw.xsl | 23 +++-- .../idsociety/images/preferences.gif | Bin 397 -> 0 bytes .../idsociety/images/preferences.png | Bin 310 -> 0 bytes .../idsociety/images/preferences2.gif | Bin 361 -> 0 bytes .../idsociety/images/preferences2.png | Bin 296 -> 0 bytes .../idsociety/images/preferences2_over.gif | Bin 361 -> 0 bytes .../idsociety/images/preferences2_over.png | Bin 349 -> 0 bytes .../idsociety/images/preferences_over.gif | Bin 397 -> 0 bytes .../idsociety/images/preferences_over.png | Bin 356 -> 0 bytes phpgwapi/templates/idsociety/phpgw.xsl | 7 +- 15 files changed, 118 insertions(+), 26 deletions(-) delete mode 100755 phpgwapi/templates/idsociety/images/preferences.gif delete mode 100644 phpgwapi/templates/idsociety/images/preferences.png delete mode 100755 phpgwapi/templates/idsociety/images/preferences2.gif delete mode 100644 phpgwapi/templates/idsociety/images/preferences2.png delete mode 100644 phpgwapi/templates/idsociety/images/preferences2_over.gif delete mode 100644 phpgwapi/templates/idsociety/images/preferences2_over.png delete mode 100644 phpgwapi/templates/idsociety/images/preferences_over.gif delete mode 100644 phpgwapi/templates/idsociety/images/preferences_over.png diff --git a/filemanager/setup/phpgw_en.lang b/filemanager/setup/phpgw_en.lang index d366eee205..0b3f7a61ca 100644 --- a/filemanager/setup/phpgw_en.lang +++ b/filemanager/setup/phpgw_en.lang @@ -43,6 +43,7 @@ file names cannot contain \\ or / filemanager en File names cannot contain \\ or file x already exists. please edit it or delete it first. filemanager en File %1 already exists. Please edit it or delete it first. file x could not be created. filemanager en File %1 could not be created. files filemanager en Files +filemanager common en Filemanager folder filemanager en Folder go to filemanager en Go To go to x filemanager en Go to %1 diff --git a/phpgwapi/inc/class.applications.inc.php b/phpgwapi/inc/class.applications.inc.php index 3cf046d161..f78f2534c8 100755 --- a/phpgwapi/inc/class.applications.inc.php +++ b/phpgwapi/inc/class.applications.inc.php @@ -292,8 +292,10 @@ { while ($this->db->next_record()) { - $GLOBALS['phpgw_info']['apps'][$this->db->f('app_name')] = Array( - 'title' => str_replace('- ','-',ucwords(str_replace('_','- ',$this->db->f('app_name')))), + $GLOBALS['phpgw_info']['apps'][$this->db->f('app_name')] = Array + ( + //'title' => str_replace('- ','-',ucwords(str_replace('_','- ',$this->db->f('app_name')))), + 'title' => lang($this->db->f('app_name')), 'name' => $this->db->f('app_name'), 'enabled' => True, 'status' => $this->db->f('app_enabled'), diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php index 524feaa7e1..b701fe8f32 100644 --- a/phpgwapi/inc/class.common.inc.php +++ b/phpgwapi/inc/class.common.inc.php @@ -1077,6 +1077,8 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info' $GLOBALS['phpgw']->xslttpl->add_file($this->get_tpl_dir('phpgwapi') . SEP . 'phpgw'); + $cur_app = $GLOBALS['phpgw_info']['flags']['currentapp']; + switch ($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']) { case 'idsociety': @@ -1117,14 +1119,14 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info' if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'preferences') { $var['prefs_img'] = $this->image('phpgwapi','preferences2'); - $GLOBALS['phpgw_info']['flags']['preload_images'][] = $this->image_on('phpgwapi','preferences2','_over'); + $GLOBALS['phpgw_info']['flags']['preload_images'][] = $this->image_on('preferences','preferences2','_over'); } else { - $var['prefs_img'] = $this->image_on('phpgwapi','preferences2','_over'); - $GLOBALS['phpgw_info']['flags']['preload_images'][] = $this->image('phpgwapi','preferences2'); + $var['prefs_img'] = $this->image_on('preferences','preferences2','_over'); + $GLOBALS['phpgw_info']['flags']['preload_images'][] = $this->image('preferences','preferences2'); } - $var['prefs_img_hover'] = $this->image_on('phpgwapi','preferences2','_over'); + $var['prefs_img_hover'] = $this->image_on('preferences','preferences2','_over'); $var['logout_img'] = $this->image('phpgwapi','log_out2'); $GLOBALS['phpgw_info']['flags']['preload_images'][] = $this->image_on('phpgwapi','log_out2','_over'); @@ -1141,6 +1143,17 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info' $var['about_img_hover'] = $this->image('phpgwapi','question_mark2'); } + if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'manual') + { + $var['manual_img'] = $this->image('manual','manual'); + $var['manual_img_hover'] = $this->image_on('manual','manual','_over'); + } + else + { + $var['manual_img'] = $this->image_on('manual','manual','_over'); + $var['manual_img_hover'] = $this->image('manual','manual'); + } + $var['logo_img'] = $this->image('phpgwapi','logo2'); $var['nav_bar_left_top_bg_img'] = $this->image('phpgwapi','nav_bar_left_top_bg'); break; @@ -1161,11 +1174,39 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info' $var['logout_img'] = $this->image('phpgwapi','tab_logout'); $var['about_img'] = $this->image('phpgwapi','tab_help'); break; + case 'funkwerk': + $var['about_img'] = '!'; + $var['manual_img'] = '?'; + + switch ($cur_app) + { + case 'home': + $var['top_css_home'] = 'top_menu_selected'; + $var['top_css'] = $var['top_css_prefs'] = $var['top_css_about'] = $var['top_css_manual'] = 'top_menu'; + break; + case 'preferences': + $var['top_css_prefs'] = 'top_menu_selected'; + $var['top_css'] = $var['top_css_home'] = $var['top_css_about'] = $var['top_css_manual'] = 'top_menu'; + break; + case 'about': + $var['top_css_about'] = 'top_menu_selected'; + $var['top_css'] = $var['top_css_home'] = $var['top_css_prefs'] = $var['top_css_manual'] = 'top_menu'; + break; + case 'manual': + $var['top_css_manual'] = 'top_menu_selected'; + $var['top_css'] = $var['top_css_home'] = $var['top_css_prefs'] = $var['top_css_about'] = 'top_menu'; + break; + default: + $var['top_css'] = $var['top_css_home'] = $var['top_css_prefs'] = $var['top_css_about'] = $var['top_css_manual'] = 'top_menu'; + break; + } + break; default: $var['home_img'] = $GLOBALS['phpgw_info']['navbar']['home']['icon']; $var['prefs_img'] = $GLOBALS['phpgw_info']['navbar']['preferences']['icon']; $var['logout_img'] = $GLOBALS['phpgw_info']['navbar']['logout']['icon']; - $var['about_img'] = $GLOBALS['phpgw_info']['navbar']['about']['icon']; + $var['about_img'] = $GLOBALS['phpgw_info']['navbar']['about']['icon']; + $var['manual_img'] = $GLOBALS['phpgw_info']['navbar']['manual']['icon']; break; } @@ -1173,16 +1214,19 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info' $var['prefs_link'] = $GLOBALS['phpgw_info']['navbar']['preferences']['url']; $var['logout_link'] = $GLOBALS['phpgw_info']['navbar']['logout']['url']; $var['about_link'] = $GLOBALS['phpgw_info']['navbar']['about']['url']; + $var['manual_link'] = $GLOBALS['phpgw_info']['navbar']['manual']['url']; $var['home_title'] = $GLOBALS['phpgw_info']['navbar']['home']['title']; $var['prefs_title'] = $GLOBALS['phpgw_info']['navbar']['preferences']['title']; $var['logout_title'] = $GLOBALS['phpgw_info']['navbar']['logout']['title']; $var['about_title'] = $GLOBALS['phpgw_info']['navbar']['about']['title']; + $var['manual_title'] = $GLOBALS['phpgw_info']['navbar']['manual']['title']; $var['home_statustext'] = $GLOBALS['phpgw_info']['navbar']['home']['title']; $var['prefs_statustext'] = $GLOBALS['phpgw_info']['navbar']['preferences']['title']; $var['logout_statustext'] = $GLOBALS['phpgw_info']['navbar']['logout']['title']; $var['about_statustext'] = $GLOBALS['phpgw_info']['navbar']['about']['title']; + $var['manual_statustext'] = $GLOBALS['phpgw_info']['navbar']['manual']['title']; if (isset($GLOBALS['phpgw_ifo']['navbar']['admin']) && isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])) { @@ -1200,7 +1244,16 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info' while (list($app,$data) = each($GLOBALS['phpgw_info']['navbar'])) { - if ($app != 'home' && $app != 'preferences' && $app != 'about' && $app != 'logout') + if ($app == $cur_app) + { + $app_css = 'left_selected'; + } + else + { + $app_css = 'left'; + } + + if ($app != 'home' && $app != 'preferences' && $app != 'about' && $app != 'logout' && $app != 'manual') { $var['applications'][] = array ( @@ -1209,7 +1262,8 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info' 'img_src_over' => $data['icon_hover'], 'url' => $data['url'], 'name' => str_replace('-','_',$app), - 'statustext' => $data['title'] + 'statustext' => $data['title'], + 'css' => $app_css ); if($data['icon_hover'] != '') @@ -1231,7 +1285,7 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info' if ($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] == 'text' && $GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] == 'default') { - if ($app == 'home' || $app == 'preferences' || $app == 'about' || $app == 'logout') + if ($app == 'home' || $app == 'preferences' || $app == 'about' || $app == 'logout' || $app == 'manual') { $base_tabs[$app] = array ( @@ -1320,7 +1374,7 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info' unset($value); unset($newarray); - if ($GLOBALS['phpgw_info']['server']['template_set'] == 'idsociety') + if ($GLOBALS['phpgw_info']['server']['template_set'] == 'idsociety' || $GLOBALS['phpgw_info']['server']['template_set'] == 'funkwerk') { $navbar = True; } @@ -1338,7 +1392,7 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info' if ($GLOBALS['phpgw_info']['apps'][$app]['status'] != 2 && $GLOBALS['phpgw_info']['apps'][$app]['status'] != 3) { - $GLOBALS['phpgw_info']['navbar'][$app]['title'] = lang($data['title']); + $GLOBALS['phpgw_info']['navbar'][$app]['title'] = $data['title']; $GLOBALS['phpgw_info']['navbar'][$app]['url'] = $GLOBALS['phpgw']->link('/' . $app . '/index.php'); $GLOBALS['phpgw_info']['navbar'][$app]['name'] = $app; @@ -1355,12 +1409,18 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info' } } + /* apps for the top menu */ $GLOBALS['phpgw_info']['navbar']['preferences']['title'] = lang('preferences'); $GLOBALS['phpgw_info']['navbar']['preferences']['url'] = $GLOBALS['phpgw']->link('/preferences/index.php'); $GLOBALS['phpgw_info']['navbar']['preferences']['icon'] = $this->image('preferences',Array('navbar','nonav')); $GLOBALS['phpgw_info']['navbar']['preferences']['icon_hover'] = $this->image_on('preferences',Array('navbar','nonav'),'-over'); - if ($GLOBALS['phpgw_info']['flags']['currentapp'] == 'home' || $GLOBALS['phpgw_info']['flags']['currentapp'] == 'preferences') + $GLOBALS['phpgw_info']['navbar']['manual']['title'] = lang('manual'); + $GLOBALS['phpgw_info']['navbar']['manual']['url'] = $GLOBALS['phpgw']->link('/manual/index.php'); + $GLOBALS['phpgw_info']['navbar']['manual']['icon'] = $this->image('manual',Array('navbar','nonav')); + $GLOBALS['phpgw_info']['navbar']['manual']['icon_hover'] = $this->image_on('manual',Array('navbar','nonav'),'-over'); + + if ($GLOBALS['phpgw_info']['flags']['currentapp'] == 'home') //|| $GLOBALS['phpgw_info']['flags']['currentapp'] == 'preferences') { $app = 'phpGroupWare'; } @@ -1370,8 +1430,7 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info' } /* We handle this here becuase its special */ - - $GLOBALS['phpgw_info']['navbar']['about']['title'] = lang('about'); + $GLOBALS['phpgw_info']['navbar']['about']['title'] = lang('about x',$app); $GLOBALS['phpgw_info']['navbar']['about']['url'] = $GLOBALS['phpgw']->link('/about.php','app='.$app); $GLOBALS['phpgw_info']['navbar']['about']['icon'] = $this->image('phpgwapi',Array('about','nonav')); $GLOBALS['phpgw_info']['navbar']['about']['icon_hover'] = $this->image_on('phpgwapi',Array('about','nonav'),'-over'); diff --git a/phpgwapi/inc/class.xslttemplates.inc.php b/phpgwapi/inc/class.xslttemplates.inc.php index 1496640bfe..7aa5ea72f4 100644 --- a/phpgwapi/inc/class.xslttemplates.inc.php +++ b/phpgwapi/inc/class.xslttemplates.inc.php @@ -95,7 +95,7 @@ $rootdir=$this->rootdir; } - if (substr($filename, 0, 1) != SEP) + if (substr($filename, 0, 1) != SEP && substr($filename, 1, 1) != ':') { $new_filename = $rootdir . SEP . $filename; } diff --git a/phpgwapi/templates/funkwerk/css/funkwerk.css b/phpgwapi/templates/funkwerk/css/funkwerk.css index 18b2f567b6..d4471b79f8 100644 --- a/phpgwapi/templates/funkwerk/css/funkwerk.css +++ b/phpgwapi/templates/funkwerk/css/funkwerk.css @@ -28,7 +28,7 @@ td.left background-color: #660000; } -.top_link +.top_menu { background-color: #0000A0; } @@ -55,13 +55,20 @@ a:link,a:active,a:visited,a:hover color: #0000A0; } -a:link.top_link,a:active.top_link,a:visited.top_link +a:link.top_menu,a:active.top_menu,a:visited.top_menu { color: #FFFFFF; font-weight: bold; } -a:hover.top_link +a:hover.top_menu +{ + font-weight: bold; + color: #660000; + background-color: #FFE000; +} + +a:link.top_menu_selected,a:active.top_menu_selected,a:visited.top_menu_selected,a:hover.top_menu_selected { font-weight: bold; color: #660000; @@ -81,6 +88,13 @@ a:hover.left background-color: #FFE000; } +a:link.left_selected,a:active.left_selected,a:visited.left_selected,a:hover.left_selected +{ + font-weight: bold; + color: #660000; + background-color: #FFE000; +} + .login,.portal,.about { background-color: #ADADAD; diff --git a/phpgwapi/templates/funkwerk/phpgw.xsl b/phpgwapi/templates/funkwerk/phpgw.xsl index 0539b149fd..77b658fc9c 100644 --- a/phpgwapi/templates/funkwerk/phpgw.xsl +++ b/phpgwapi/templates/funkwerk/phpgw.xsl @@ -10,10 +10,19 @@ + + + + + + + + + @@ -32,7 +41,7 @@ - + @@ -49,10 +58,11 @@ @@ -127,12 +137,13 @@ + - + +
[phpGroupWare][phpGroupWare] - - - - + + + + +
[][][][][][][][][]
- [] + []
diff --git a/phpgwapi/templates/idsociety/images/preferences.gif b/phpgwapi/templates/idsociety/images/preferences.gif deleted file mode 100755 index cf5b771e475dd4d5e514d23cd1623b24f436f0ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 397 zcmV;80doFFNk%w1VP^mj0K@U2~s;a%cy|uNqnwpxZsHm8jn2?Z=prD|Uk&&C5o4dQa z000000000000000A^8LV00000EC2ui0A~OX000I5Ad&!NX`X1Ru59bRYLXy;VBdJI z?|kq7z#tFcpa~$5f^x}hI-k&}bV{u%B@qE&VBAa$;IMd1E}PHjw0aG$P_*1yLlLOk z@A$i^zUPwydnJH^egJ@WhJ%TUg^PK43k+~ZbB~sKh=+Wdo1LD9j(>-XpqQ7Jk&|+C zrMSB0000MbVXQnQ*UN; zcVTj60B31tGH`BZATlmAE;6HDM-Bi00NY7KK~#9!y_CBR!axv2pQS5-9*AiHi4MrN z6vvb@85KCA0&+S)2nm4@*nCXjJNv*ONRA0ctFgRqZ*5&x3`Qi^631wko|6|27;{Sr zskSQ?4mehql$`S(a6ow~`%ev!cMN1SrZ^Lrur>%U#JW_T^IlC0fyvYbp=e5zHy@Zj zbo$E$n9PR9 zYs&xaS|0M;0lT!Ed)V7L{e?jGm-{WBx?R1TC+AEzSU2~s;a%cy|uNqnwpxZsHm8jn2?Z=prD|Uk&&C5o4dQa z|NsC0|NsC0|NsC0EC2ui0A~OV000H-XpqQ7Jk&|+CrPtOcH9%f5kkN}`Phi3ZBW#GHZ9M0F^d$r)(`baGPfcFDVfs+* zGbd^i3t}&xLSb*nCdc{4k=J1o8k2E4GT)VWKJ?F=foB@J3`yk4yc^%$G_q=0&d*)S u_tw>?qHw?=E$1HQwoCsZkp1OKb0000M$vTN_djOL_J<)KTes;cR)XXKkd-XpqQ7Jk&|+CrM$vTN_d zjOL_J<)KRe008N)XXKkdta>^b6000(rMObuGZ)S9NVRB^v zXK7|KaBgQHGA=YOGNWEc4gdfEpGibPRCwCGlNd598IYyJ2`A?+vXA@MWk=}%4=07wr-%?C?< vs%K%TdoP^Zu(wpx2xo));LF+Ke#_klt|SfUmt$we00000NkvXXu0mjfzJsFH diff --git a/phpgwapi/templates/idsociety/images/preferences_over.gif b/phpgwapi/templates/idsociety/images/preferences_over.gif deleted file mode 100644 index e24b69f0084aec5cbe358da69e7894b589b92f27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 397 zcmV;80doFFNk%w1VP^mj0K@M$vTN_djOL_J<)KTes;cR)XXKkdf0000000000A^8LV00000EC2ui0A~OX000I5Ad&!NX`X1Ru59bRYLXy;VBdJI z?|kq7z#tFcpa~w2f^x}hI-k&}bV{u%B@qE&VBByH;IMd1E}PHjw0aG;WVGB`LlLOk z@A$i^zUPwydnJH^egJ@WhJ%TUg^PK43=42ZbB~sKh=+Wdo1LD9j(>-XpqQ7Jk&|+C zrM$vTN_d zjOL_J<)KTes;cR)XXKkdh6r%(H000(rMObuGZ)S9NVRB^v zXK7|KaBgQHGA=YOGNWEc4gdfErb$FWRCwCGllCOhlX<8v4-f9FULZ9F8flV zEXM42vpV1R7sEFx>0x3MEz^m9Zwy&a9-_q5Qa}DsDEAZfkocMM^ruc304N_yHXqFS zX&x(0PFK+xZW~RyPIL;~2Opgh_nTpyEgN;%q7ZM|*$+`zy{$R`0000 CDWoX? diff --git a/phpgwapi/templates/idsociety/phpgw.xsl b/phpgwapi/templates/idsociety/phpgw.xsl index 49aa77b2ce..33925447a2 100644 --- a/phpgwapi/templates/idsociety/phpgw.xsl +++ b/phpgwapi/templates/idsociety/phpgw.xsl @@ -12,18 +12,22 @@ + + + + @@ -77,7 +81,8 @@ 		{$home_title} {$prefs_title} {$logout_title}{$about_title}{$about_title}{$manual_title}