This commit is contained in:
ceb 2002-11-15 22:31:51 +00:00
parent c0ba5b69ed
commit 1483360a0e
15 changed files with 118 additions and 26 deletions

View File

@ -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

View File

@ -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'),

View File

@ -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');

View File

@ -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;
}

View File

@ -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;

View File

@ -10,10 +10,19 @@
<xsl:variable name="prefs_link"><xsl:value-of select="prefs_link"/></xsl:variable>
<xsl:variable name="logout_link"><xsl:value-of select="logout_link"/></xsl:variable>
<xsl:variable name="about_link"><xsl:value-of select="about_link"/></xsl:variable>
<xsl:variable name="manual_link"><xsl:value-of select="manual_link"/></xsl:variable>
<xsl:variable name="about_img"><xsl:value-of select="about_img"/></xsl:variable>
<xsl:variable name="manual_img"><xsl:value-of select="manual_img"/></xsl:variable>
<xsl:variable name="home_statustext"><xsl:value-of select="home_statustext"/></xsl:variable>
<xsl:variable name="prefs_statustext"><xsl:value-of select="prefs_statustext"/></xsl:variable>
<xsl:variable name="logout_statustext"><xsl:value-of select="logout_statustext"/></xsl:variable>
<xsl:variable name="about_statustext"><xsl:value-of select="about_statustext"/></xsl:variable>
<xsl:variable name="manual_statustext"><xsl:value-of select="manual_statustext"/></xsl:variable>
<xsl:variable name="top_css_home"><xsl:value-of select="top_css_home"/></xsl:variable>
<xsl:variable name="top_css_prefs"><xsl:value-of select="top_css_prefs"/></xsl:variable>
<xsl:variable name="top_css_about"><xsl:value-of select="top_css_about"/></xsl:variable>
<xsl:variable name="top_css_manual"><xsl:value-of select="top_css_manual"/></xsl:variable>
<xsl:variable name="top_css"><xsl:value-of select="top_css"/></xsl:variable>
<xsl:variable name="app_tpl"><xsl:value-of select="app_tpl"/></xsl:variable>
<html>
<head>
@ -32,7 +41,7 @@
<!-- BEGIN top_part -->
<table width="100%" height="100%" cellspacing="2" cellpadding="2" valign="top">
<tr>
<td width="131" height="30" valign="bottom" class="top_top">[phpGroupWare]</td>
<td width="131" height="30" valign="bottom" class="top_top"><a href="" target="blank" onMouseover="window.status='phpGroupWare --> home'; return true;" onMouseout="window.status=''; return true;" class="left">[phpGroupWare]</a></td>
<td height="30" width="19%" valign="bottom" class="user_info">[<xsl:value-of select="user_info_name"/>]</td>
<xsl:choose>
<xsl:when test="current_users">
@ -49,10 +58,11 @@
<td colspan="4" class="top_bottom">
<table cellpadding="2" cellspacing="2">
<tr class="top_bottom">
<td class="top_link"><a href="{$home_link}" onMouseOver="window.status='{$home_statustext}'; return true;" onMouseOut="window.status='';return true;" class="top_link">[<xsl:value-of select="home_title"/>]</a></td>
<td class="top_link"><a href="{$prefs_link}" onMouseOver="window.status='{$prefs_statustext}'; return true;" onMouseOut="window.status='';return true;" class="top_link">[<xsl:value-of select="prefs_title"/>]</a></td>
<td class="top_link"><a href="{$logout_link}" onMouseOver="window.status='{$logout_statustext}'; return true;" onMouseOut="window.status='';return true;" class="top_link">[<xsl:value-of select="logout_title"/>]</a></td>
<td class="top_link"><a href="{$about_link}" onMouseOver="window.status='{$about_statustext}'; return true;" onMouseOut="window.status='';return true;" class="top_link">[<xsl:value-of select="about_title"/>]</a></td>
<td class="top_menu"><a href="{$home_link}" onMouseOver="window.status='{$home_statustext}'; return true;" onMouseOut="window.status='';return true;" class="{$top_css_home}">[<xsl:value-of select="home_title"/>]</a></td>
<td class="top_menu"><a href="{$prefs_link}" onMouseOver="window.status='{$prefs_statustext}'; return true;" onMouseOut="window.status='';return true;" class="{$top_css_prefs}">[<xsl:value-of select="prefs_title"/>]</a></td>
<td class="top_menu"><a href="{$logout_link}" onMouseOver="window.status='{$logout_statustext}'; return true;" onMouseOut="window.status='';return true;" class="{$top_css}">[<xsl:value-of select="logout_title"/>]</a></td>
<td class="top_menu"><a href="{$about_link}" onMouseOver="window.status='{$about_statustext}'; return true;" onMouseOut="window.status='';return true;" class="{$top_css_about}">[<xsl:value-of select="about_img"/>]</a></td>
<td class="top_menu"><a href="{$manual_link}" onMouseOver="window.status='{$manual_statustext}'; return true;" onMouseOut="window.status='';return true;" class="{$top_css_manual}">[<xsl:value-of select="manual_img"/>]</a></td>
</tr>
</table>
</td>
@ -127,12 +137,13 @@
<xsl:template match="applications">
<xsl:variable name="url"><xsl:value-of select="url"/></xsl:variable>
<xsl:variable name="statustext"><xsl:value-of select="statustext"/></xsl:variable>
<xsl:variable name="css"><xsl:value-of select="css"/></xsl:variable>
<tr>
<td height="30" width="131" valign="bottom" class="left">
<table class="left_app">
<tr>
<td class="left_app">
<a href="{$url}" onMouseOver="window.status='{$statustext}'; return true;" onMouseOut="window.status='';return true;" class="left">[<xsl:value-of select="title"/>]</a>
<a href="{$url}" onMouseOver="window.status='{$statustext}'; return true;" onMouseOut="window.status='';return true;" class="{$css}">[<xsl:value-of select="title"/>]</a>
</td>
</tr>
</table>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 397 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 310 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 296 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 349 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 397 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 356 B

View File

@ -12,18 +12,22 @@
<xsl:variable name="prefs_link"><xsl:value-of select="prefs_link"/></xsl:variable>
<xsl:variable name="logout_link"><xsl:value-of select="logout_link"/></xsl:variable>
<xsl:variable name="about_link"><xsl:value-of select="about_link"/></xsl:variable>
<xsl:variable name="manual_link"><xsl:value-of select="manual_link"/></xsl:variable>
<xsl:variable name="home_img_hover"><xsl:value-of select="home_img_hover"/></xsl:variable>
<xsl:variable name="prefs_img_hover"><xsl:value-of select="prefs_img_hover"/></xsl:variable>
<xsl:variable name="logout_img_hover"><xsl:value-of select="logout_img_hover"/></xsl:variable>
<xsl:variable name="about_img_hover"><xsl:value-of select="about_img_hover"/></xsl:variable>
<xsl:variable name="manual_img_hover"><xsl:value-of select="manual_img_hover"/></xsl:variable>
<xsl:variable name="home_img"><xsl:value-of select="home_img"/></xsl:variable>
<xsl:variable name="prefs_img"><xsl:value-of select="prefs_img"/></xsl:variable>
<xsl:variable name="logout_img"><xsl:value-of select="logout_img"/></xsl:variable>
<xsl:variable name="about_img"><xsl:value-of select="about_img"/></xsl:variable>
<xsl:variable name="manual_img"><xsl:value-of select="manual_img"/></xsl:variable>
<xsl:variable name="home_title"><xsl:value-of select="home_title"/></xsl:variable>
<xsl:variable name="prefs_title"><xsl:value-of select="prefs_title"/></xsl:variable>
<xsl:variable name="logout_title"><xsl:value-of select="logout_title"/></xsl:variable>
<xsl:variable name="about_title"><xsl:value-of select="about_title"/></xsl:variable>
<xsl:variable name="manual_title"><xsl:value-of select="manual_title"/></xsl:variable>
<xsl:variable name="app_tpl"><xsl:value-of select="app_tpl"/></xsl:variable>
<html>
<head>
@ -77,7 +81,8 @@
<td><a href="{$home_link}" onMouseOver="nine.src='{$home_img_hover}'" onMouseOut="nine.src='{$home_img}'"><img src="{$home_img}" border="0" name="nine" alt="{$home_title}" title="{$home_title}"/></a></td>
<td><a href="{$prefs_link}" onMouseOver="ten.src='{$prefs_img_hover}'" onMouseOut="ten.src='{$prefs_img}'"><img src="{$prefs_img}" border="0" name="ten" alt="{$prefs_title}" title="{$prefs_title}"/></a></td>
<td><a href="{$logout_link}" onMouseOver="eleven.src='{$logout_img_hover}'" onMouseOut="eleven.src='{$logout_img}'"><img src="{$logout_img}" border="0" name="eleven" alt="{$logout_title}" title="{$logout_title}"/></a></td>
<td><a href="{$about_link}" onMouseOver="help.src='{$about_img_hover}'" onMouseOut="help.src='{$about_img}'"><img src="{$about_img}" border="0" name="help" alt="{$about_title}" title="{$about_title}"/></a></td>
<td><a href="{$about_link}" onMouseOver="about.src='{$about_img_hover}'" onMouseOut="about.src='{$about_img}'"><img src="{$about_img}" border="0" name="about" alt="{$about_title}" title="{$about_title}"/></a></td>
<td><a href="{$manual_link}" onMouseOver="manual.src='{$manual_img_hover}'" onMouseOut="manual.src='{$manual_img}'"><img src="{$manual_img}" border="0" name="manual" alt="{$manual_title}" title="{$manual_title}"/></a></td>
</tr>
</table>
</td>