[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/templates/simple head.inc.php head.tpl...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] phpgwapi/templates/simple head.inc.php head.tpl... |
|
Date: |
Tue, 28 Nov 2006 09:12:33 +0000 |
CVSROOT: /sources/phpgwapi
Module name: phpgwapi
Changes by: Sigurd Nes <sigurdne> 06/11/28 09:12:33
Modified files:
templates/simple: head.inc.php head.tpl navbar.inc.php
navbar.tpl
Added files:
templates/simple/css: base.css
Log message:
Notices and fixes
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/simple/head.inc.php?cvsroot=phpgwapi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/simple/head.tpl?cvsroot=phpgwapi&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/simple/navbar.inc.php?cvsroot=phpgwapi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/simple/navbar.tpl?cvsroot=phpgwapi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/simple/css/base.css?cvsroot=phpgwapi&rev=1.1
Patches:
Index: head.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/templates/simple/head.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- head.inc.php 24 Apr 2006 09:49:25 -0000 1.4
+++ head.inc.php 28 Nov 2006 09:12:33 -0000 1.5
@@ -5,32 +5,36 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage gui
- * @version $Id: head.inc.php,v 1.4 2006/04/24 09:49:25 sigurdne Exp $
+ * @version $Id: head.inc.php,v 1.5 2006/11/28 09:12:33 sigurdne Exp $
*/
- $bodyheader =
'BGCOLOR="'.$GLOBALS['phpgw_info']['theme']['bg_color'].'"';
- if ($GLOBALS['phpgw_info']['server']['htmlcompliant'])
+ if ( !isset($GLOBALS['phpgw_info']['server']['site_title']) )
{
- $bodyheader .= '
ALINK="'.$GLOBALS['phpgw_info']['theme']['alink'].'"
LINK="'.$GLOBALS['phpgw_info']['theme']['link'].'"
VLINK="'.$GLOBALS['phpgw_info']['theme']['vlink'].'"';
+ $GLOBALS['phpgw_info']['server']['site_title'] = lang('please
set a site name in admin > siteconfig');
}
$tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
$tpl->set_unknowns('remove');
$tpl->set_file(array('head' => 'head.tpl'));
+ $tpl->set_block('head', 'theme_stylesheet', 'theme_stylesheets');
+ $style =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/simple/css/base.css";
+ $tpl->set_var('theme_style', $style);
+ $tpl->parse('theme_stylesheets', 'theme_stylesheet', true);
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
$app = $app ? ' ['.(isset($GLOBALS['phpgw_info']['apps'][$app]) ?
$GLOBALS['phpgw_info']['apps'][$app]['title'] : lang($app)).']':'';
- $var = Array (
+ $tpl->set_var(array
+ (
+ 'css' => $GLOBALS['phpgw']->common->get_css(),
+ 'javascript' => $GLOBALS['phpgw']->common->get_javascript(),
'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
- 'font_family' => $GLOBALS['phpgw_info']['theme']['font'],
+ 'str_base_url' => $GLOBALS['phpgw']->link('/', array(), true),
'website_title' =>
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
- 'body_tags' => $bodyheader .
$GLOBALS['phpgw']->common->get_body_attribs(),
- 'css' => $GLOBALS['phpgw']->common->get_css(),
- 'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
- );
- $tpl->set_var($var);
+ 'win_on_events' => $GLOBALS['phpgw']->common->get_on_events(),
+ ));
+
$tpl->pfp('out','head');
unset($tpl);
?>
Index: head.tpl
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/templates/simple/head.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- head.tpl 24 Apr 2006 09:49:25 -0000 1.3
+++ head.tpl 28 Nov 2006 09:12:33 -0000 1.4
@@ -1,17 +1,28 @@
-<!-- BEGIN head -->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!-- BEGIN head -->
<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=utf-8">
-<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org";>
-<META NAME="description" CONTENT="phpGroupWare">
-<META NAME="keywords" CONTENT="phpGroupWare">
-<meta name="robots" content="none">
-<LINK REL="ICON" href="{img_icon}" type="image/x-ico">
-<LINK REL="SHORTCUT ICON" href="{img_shortcut}">
-{css}
-<TITLE>{website_title}</TITLE>
-{java_script}
-</HEAD>
+ <HEAD>
+ <META http-equiv="Content-Type" content="text/html;
charset=utf-8">
+ <META name="AUTHOR" content="phpGroupWare
http://www.phpgroupware.org";>
+ <META NAME="description" CONTENT="phpGroupWare">
+ <META NAME="keywords" CONTENT="phpGroupWare">
+ <meta name="robots" content="none">
+ <LINK REL="ICON" href="{img_icon}" type="image/x-ico">
+ <LINK REL="SHORTCUT ICON" href="{img_shortcut}">
+ {css}
+ <!-- BEGIN theme_stylesheet -->
+ <link href="{theme_style}" type="text/css" rel="StyleSheet">
+ <!-- END theme_stylesheet -->
+ {java_script}
+ <script type="text/javascript">
+ <!--
+ var strBaseURL = '{str_base_url}';
+ {win_on_events}
+ -->
+ </script>
+
+ <TITLE>{website_title}</TITLE>
+
+ </HEAD>
<BODY {body_tags}>
<!-- END Head -->
Index: navbar.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/templates/simple/navbar.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- navbar.inc.php 28 Apr 2005 08:11:59 -0000 1.4
+++ navbar.inc.php 28 Nov 2006 09:12:33 -0000 1.5
@@ -5,7 +5,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage gui
- * @version $Id: navbar.inc.php,v 1.4 2005/04/28 08:11:59 powerstat Exp $
+ * @version $Id: navbar.inc.php,v 1.5 2006/11/28 09:12:33 sigurdne Exp $
*/
@@ -26,12 +26,7 @@
)
);
- $var['navbar_color'] =
$GLOBALS['phpgw_info']['theme']['navbar_bg'];
-
- if ($GLOBALS['phpgw_info']['flags']['navbar_target'])
- {
- $target = ' target="' .
$GLOBALS['phpgw_info']['flags']['navbar_target'] . '"';
- }
+ $var['navbar_color'] =
(isset($GLOBALS['phpgw_info']['theme']['navbar_bg'])?$GLOBALS['phpgw_info']['theme']['navbar_bg']:'#9999FF');
$i = 1;
foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data)
@@ -60,7 +55,7 @@
$var['width'] = '3%';
}
- $var['value'] = '<a href="' . $app_data['url']
. '"' . $target . '>' . $title . '</a>';
+ $var['value'] = '<a href="' . $app_data['url']
. '">' . $title . '</a>';
$var['align'] = 'center';
$tpl->set_var($var);
$tpl->parse('applications','navbar_app',True);
@@ -79,7 +74,9 @@
{
$var['powered_by'] = lang('Powered by phpGroupWare
version %1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
}
- if (isset($GLOBALS['phpgw_info']['navbar']['admin']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
+ if (isset($GLOBALS['phpgw_info']['navbar']['admin'])
+ &&
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
+ &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
{
$var['current_users'] = '<a href="' .
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions')
. '"> ' . lang('Current users') . ': ' .
$GLOBALS['phpgw']->session->total() . '</a>';
@@ -113,7 +110,7 @@
if (isset($GLOBALS['phpgw_info']['flags']['app_header']))
{
$var['current_app_header'] =
$GLOBALS['phpgw_info']['flags']['app_header'];
- $var['th_bg'] =
$GLOBALS['phpgw_info']['theme']['th_bg'];
+ $var['th_bg'] =
isset($GLOBALS['phpgw_info']['theme']['th_bg'])?$GLOBALS['phpgw_info']['theme']['th_bg']:'#D3DCE3';
}
else
{
@@ -124,16 +121,19 @@
$tpl->set_var($var);
$tpl->pfp('out','navbar');
// If the application has a header include, we now include it
- if (address@hidden'phpgw_info']['flags']['noappheader'] &&
@isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
+ if ( (!isset($GLOBALS['phpgw_info']['flags']['noappheader'])
+ || !$GLOBALS['phpgw_info']['flags']['noappheader'] )
+ && isset($_GET['menuaction']) )
{
- list($app,$class,$method) =
explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
- if (is_array($GLOBALS[$class]->public_functions) &&
$GLOBALS[$class]->public_functions['header'])
+ list($app,$class,$method) =
explode('.',$_GET['menuaction']);
+ if (is_array($GLOBALS[$class]->public_functions) &&
isset($GLOBALS[$class]->public_functions['header']) )
{
$GLOBALS[$class]->header();
}
}
+ $GLOBALS['phpgw']->template->set_root(PHPGW_APP_TPL);
$GLOBALS['phpgw']->hooks->process('after_navbar');
- return;
+ unset($GLOBALS['phpgw_info']['navbar']);
}
@@ -153,10 +153,12 @@
)
);
$var = Array(
- 'table_bg_color' =>
$GLOBALS['phpgw_info']['theme']['navbar_bg'],
+ 'table_bg_color' =>
(isset($GLOBALS['phpgw_info']['theme']['navbar_bg'])?$GLOBALS['phpgw_info']['theme']['navbar_bg']:'#9999FF'),
);
$var['powered_by'] = lang('Powered by phpGroupWare
version %1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
- if (isset($GLOBALS['phpgw_info']['navbar']['admin']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
+ if (isset($GLOBALS['phpgw_info']['navbar']['admin'])
+ &&
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
+ &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
{
$var['current_users'] = '<a href="' .
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions')
. '"> ' . lang('Current users') .
': ' . $GLOBALS['phpgw']->session->total() . '</a>';
Index: navbar.tpl
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/templates/simple/navbar.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- navbar.tpl 30 Dec 2004 06:47:35 -0000 1.2
+++ navbar.tpl 28 Nov 2006 09:12:33 -0000 1.3
@@ -22,7 +22,8 @@
</table>
<table width="100%" cellspacing="5"><tr><td>
<!-- BEGIN app_header -->
-<b>{current_app_header}</b><hr>
+<div style="text-align: center; font-weight: bold; background-color: {th_bg};
padding:5px">{current_app_header}</div>
+<hr>
<!-- END app_header -->
{messages}<br>
<!-- END navbar -->
Index: css/base.css
===================================================================
RCS file: css/base.css
diff -N css/base.css
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ css/base.css 28 Nov 2006 09:12:33 -0000 1.1
@@ -0,0 +1,9 @@
+ a { text-decoration:none; color: blue; }
+ a:active{ text-decoration:none; color: red; }
+ a:hover{ text-decoration:underline; color: red; }
+ a:visited{ text-decoration:none; color: blue; }
+ body { margin-top: 0px; margin-right: 0px; margin-left: 0px;
font-family: Arial, Helvetica, san-serif; }
+ .row_on { color: #000000; background-color: #DDDDDD; }
+ .row_off { color: #000000; background-color: #EEEEEE; }
+ .th { color: #000000; background-color: #D3DCE3; }
+ .tablink { color: #000000; }
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/templates/simple head.inc.php head.tpl...,
Sigurd Nes <=