[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/templates/justweb footer.tpl,1.2,1.2.4.
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/templates/justweb footer.tpl,1.2,1.2.4.1 head.inc.php,1.13.2.2.2.2,1.13.2.2.2.3 head.tpl,1.9.2.1,1.9.2.1.2.1 navbar.inc.php,1.20.2.3.2.1,1.20.2.3.2.2 navbar.tpl,1.4.4.1,1.4.4.2 |
|
Date: |
Sat, 19 Apr 2003 17:10:08 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/templates/justweb
In directory subversions:/tmp/cvs-serv17853/justweb
Modified Files:
Tag: Version-0_9_16-branch
footer.tpl head.inc.php head.tpl navbar.inc.php navbar.tpl
Log Message:
updated app-header
Index: footer.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/justweb/Attic/footer.tpl,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -r1.2 -r1.2.4.1
*** footer.tpl 4 Jan 2002 17:31:57 -0000 1.2
--- footer.tpl 19 Apr 2003 21:10:05 -0000 1.2.4.1
***************
*** 23,27 ****
</tr>
<tr>
! <td background="{img_root}/blue_filler.gif" height="20"><font
color="ffffff">{user_info}</font></td>
</tr>
</table>
--- 23,31 ----
</tr>
<tr>
! <td><table width="100%" border="0" cellspacing="0"
cellpadding="0"><tr>
! <td background="{img_root}/blue_filler.gif"
height="20"><font color="#ffffff">{user_info}</font></td>
! <td align="center"
background="{img_root}/blue_filler.gif" height="20"><font
color="#ffffff">{current_users}</font></td>
! <td align="right"
background="{img_root}/blue_filler.gif" height="20"><font
color="#ffffff">{powered_by}</font></td>
! </tr></table></td>
</tr>
</table>
Index: head.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/justweb/Attic/head.inc.php,v
retrieving revision 1.13.2.2.2.2
retrieving revision 1.13.2.2.2.3
diff -C2 -r1.13.2.2.2.2 -r1.13.2.2.2.3
*** head.inc.php 28 Mar 2003 15:08:22 -0000 1.13.2.2.2.2
--- head.inc.php 19 Apr 2003 21:10:05 -0000 1.13.2.2.2.3
***************
*** 12,16 ****
/* $Id$ */
! $app_css = '';
if(@isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
{
--- 12,16 ----
/* $Id$ */
! $app_css = $java_script = '';
if(@isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
{
***************
*** 20,23 ****
--- 20,35 ----
$app_css = $GLOBALS[$class]->css();
}
+ if(is_array($GLOBALS[$class]->public_functions) &&
$GLOBALS[$class]->public_functions['java_script'])
+ {
+ $java_script = $GLOBALS[$class]->java_script();
+ }
+ }
+ if (isset($GLOBALS['phpgw_info']['flags']['css']))
+ {
+ $app_css .= $GLOBALS['phpgw_info']['flags']['css'];
+ }
+ if (isset($GLOBALS['phpgw_info']['flags']['java_script']))
+ {
+ $java_script .= $GLOBALS['phpgw_info']['flags']['java_script'];
}
***************
*** 49,53 ****
'website_title' =>
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
'body_tags' => $bodyheader,
! 'app_css' => $app_css
);
$tpl->set_var($var);
--- 61,66 ----
'website_title' =>
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
'body_tags' => $bodyheader,
! 'app_css' => $app_css,
! 'java_script' => $java_script
);
$tpl->set_var($var);
Index: head.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/justweb/Attic/head.tpl,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.1.2.1
diff -C2 -r1.9.2.1 -r1.9.2.1.2.1
*** head.tpl 28 Mar 2002 18:56:56 -0000 1.9.2.1
--- head.tpl 19 Apr 2003 21:10:05 -0000 1.9.2.1.2.1
***************
*** 1,80 ****
! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
! <HTML>
! <HEAD>
! <META http-equiv="Content-Type" content="text/html; charset={charset}">
! <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}">
! <STYLE type="text/css">
! <!--
! a { text-decoration:none; }
! A:link{ text-decoration:none }
! A:visted{ text-decoration:none }
! A:active{ text-decoration:none }
! body { margin-top: 0px; margin-right: 0px; margin-left: 0px; font-family:
{font_family} }
! .tablink { color: #000000; }
! {app_css}
! -->
! </STYLE>
! <TITLE>{website_title}</TITLE>
!
! <script type="text/javascript" language="javascript"
src="{webserver_url}/phpgwapi/templates/justweb/navcond.js"></script>
! <script type="text/javascript" language="javascript">
! var myNavBar1 = new NavBar(0);
! var dhtmlMenu;
!
! //define menu items (first parameter of NavBarMenu specifies main category
width, second specifies sub category width in pixels)
! //add more menus simply by adding more "blocks" of same code below
!
! dhtmlMenu = new NavBarMenu(60, 120);
! dhtmlMenu.addItem(new NavBarMenuItem("Home", "{home}"));
! myNavBar1.addMenu(dhtmlMenu);
!
! dhtmlMenu = new NavBarMenu(60, 140);
! dhtmlMenu.addItem(new NavBarMenuItem("Edit", ""));
! dhtmlMenu.addItem(new NavBarMenuItem("Add new Appointment", "{appt}"));
! dhtmlMenu.addItem(new NavBarMenuItem("Add new Todo", "{todo}"));
! myNavBar1.addMenu(dhtmlMenu);
!
! dhtmlMenu = new NavBarMenu(125, 140);
! dhtmlMenu.addItem(new NavBarMenuItem("Preferences", ""));
! dhtmlMenu.addItem(new NavBarMenuItem("General", "{prefs}"));
! dhtmlMenu.addItem(new NavBarMenuItem("Email", "{email}"));
! dhtmlMenu.addItem(new NavBarMenuItem("Calendar", "{calendar}"));
! dhtmlMenu.addItem(new NavBarMenuItem("Addressbook", "{addressbook}"));
! myNavBar1.addMenu(dhtmlMenu);
!
! dhtmlMenu = new NavBarMenu(62, 120);
! dhtmlMenu.addItem(new NavBarMenuItem("Help", ""));
! dhtmlMenu.addItem(new NavBarMenuItem("General", ""));
! myNavBar1.addMenu(dhtmlMenu);
!
! //set menu colors
! myNavBar1.setColors("#343434", "#eeeeee", "#60707C", "#ffffff", "#888888",
"#eeeeee", "#60707C", "#ffffff", "#777777")
! myNavBar1.setFonts("Verdana", "Normal", "Normal", "10pt", "Verdana",
"Normal", "Normal", "10pt");
!
! //uncomment below line to center the menu (valid values are "left", "center",
and "right"
! //myNavBar1.setAlign("center")
!
! var fullWidth;
!
! function init() {
!
! // Get width of window, need to account for scrollbar width in Netscape.
!
! fullWidth = getWindowWidth()
! - (isMinNS4 && getWindowHeight() < getPageHeight() ? 16 : 0);
!
! myNavBar1.moveTo(10,36);
! myNavBar1.resize(500 /*fullWidth*/);
! myNavBar1.setSizes(0,1,1);
! myNavBar1.create();
! myNavBar1.setzIndex(2);
! }
! </script>
!
! </HEAD>
! <BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0"
onLoad="init();" {body_tags}>
--- 1,81 ----
! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
! <HTML>
! <HEAD>
! <META http-equiv="Content-Type" content="text/html; charset={charset}">
! <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}">
! <STYLE type="text/css">
! <!--
! a { text-decoration:none; }
! A:link{ text-decoration:none }
! A:visted{ text-decoration:none }
! A:active{ text-decoration:none }
! body { margin-top: 0px; margin-right: 0px; margin-left: 0px; font-family:
{font_family} }
! .tablink { color: #000000; }
! {app_css}
! -->
! </STYLE>
! {java_script}
! <TITLE>{website_title}</TITLE>
!
! <script type="text/javascript" language="javascript"
src="{webserver_url}/phpgwapi/templates/justweb/navcond.js"></script>
! <script type="text/javascript" language="javascript">
! var myNavBar1 = new NavBar(0);
! var dhtmlMenu;
!
! //define menu items (first parameter of NavBarMenu specifies main category
width, second specifies sub category width in pixels)
! //add more menus simply by adding more "blocks" of same code below
!
! dhtmlMenu = new NavBarMenu(60, 120);
! dhtmlMenu.addItem(new NavBarMenuItem("Home", "{home}"));
! myNavBar1.addMenu(dhtmlMenu);
!
! dhtmlMenu = new NavBarMenu(60, 140);
! dhtmlMenu.addItem(new NavBarMenuItem("Edit", ""));
! dhtmlMenu.addItem(new NavBarMenuItem("Add new Appointment", "{appt}"));
! dhtmlMenu.addItem(new NavBarMenuItem("Add new Todo", "{todo}"));
! myNavBar1.addMenu(dhtmlMenu);
!
! dhtmlMenu = new NavBarMenu(125, 140);
! dhtmlMenu.addItem(new NavBarMenuItem("Preferences", ""));
! dhtmlMenu.addItem(new NavBarMenuItem("General", "{prefs}"));
! dhtmlMenu.addItem(new NavBarMenuItem("Email", "{email}"));
! dhtmlMenu.addItem(new NavBarMenuItem("Calendar", "{calendar}"));
! dhtmlMenu.addItem(new NavBarMenuItem("Addressbook", "{addressbook}"));
! myNavBar1.addMenu(dhtmlMenu);
!
! dhtmlMenu = new NavBarMenu(62, 120);
! dhtmlMenu.addItem(new NavBarMenuItem("Help", ""));
! dhtmlMenu.addItem(new NavBarMenuItem("General", ""));
! myNavBar1.addMenu(dhtmlMenu);
!
! //set menu colors
! myNavBar1.setColors("#343434", "#eeeeee", "#60707C", "#ffffff", "#888888",
"#eeeeee", "#60707C", "#ffffff", "#777777")
! myNavBar1.setFonts("Verdana", "Normal", "Normal", "10pt", "Verdana",
"Normal", "Normal", "10pt");
!
! //uncomment below line to center the menu (valid values are "left", "center",
and "right"
! //myNavBar1.setAlign("center")
!
! var fullWidth;
!
! function init() {
!
! // Get width of window, need to account for scrollbar width in Netscape.
!
! fullWidth = getWindowWidth()
! - (isMinNS4 && getWindowHeight() < getPageHeight() ? 16 : 0);
!
! myNavBar1.moveTo(10,36);
! myNavBar1.resize(500 /*fullWidth*/);
! myNavBar1.setSizes(0,1,1);
! myNavBar1.create();
! myNavBar1.setzIndex(2);
! }
! </script>
!
! </HEAD>
! <BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0"
onLoad="init();" {body_tags}>
Index: navbar.inc.php
===================================================================
RCS file:
/cvsroot/phpgroupware/phpgwapi/templates/justweb/Attic/navbar.inc.php,v
retrieving revision 1.20.2.3.2.1
retrieving revision 1.20.2.3.2.2
diff -C2 -r1.20.2.3.2.1 -r1.20.2.3.2.2
*** navbar.inc.php 28 Mar 2003 15:08:22 -0000 1.20.2.3.2.1
--- navbar.inc.php 19 Apr 2003 21:10:05 -0000 1.20.2.3.2.2
***************
*** 71,98 ****
$var['logout_img'] = PHPGW_IMAGES_DIR . '/logout-grey.gif';
- /*
- if ($GLOBALS['phpgw_info']['server']['showpoweredbyon'] ==
'top')
- {
- $var['powered_by'] = lang('Powered by phpGroupWare
version %1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
- }
- if (isset($GLOBALS['phpgw_info']['navbar']['admin']) &&
isset($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>';
- }
- */
- $now = time();
- $var['user_info'] =
$GLOBALS['phpgw']->common->display_fullname() . ' - '
- . lang($GLOBALS['phpgw']->common->show_date($now,'l'))
. ' '
- .
$GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
- // .
lang($GLOBALS['phpgw']->common->show_date($now,'F')) . ' '
- // . $GLOBALS['phpgw']->common->show_date($now,'d,
Y');
-
/*
* Maybe we should create a common function in the
phpgw_accounts_shared.inc.php file
* to get rid of duplicate code.
*/
!
! /*
if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0)
{
--- 71,79 ----
$var['logout_img'] = PHPGW_IMAGES_DIR . '/logout-grey.gif';
/*
* Maybe we should create a common function in the
phpgw_accounts_shared.inc.php file
* to get rid of duplicate code.
*/
!
if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0)
{
***************
*** 111,140 ****
$var['messages'] = $api_messages . "<br>" .
checkcode($cd);
}
- */
- if (! function_exists('display_section'))
- {
- //echo 'function was not found<br>';
- /*
- function display_section($appname,$title,$file)
- {
- $GLOBALS['prefs'][$appname]['title'] = $title;
- $GLOBALS['prefs'][$appname]['file'][] = $file;
- }
- $temp_hooks = CreateObject('phpgwapi.hooks');
!
$temp_hooks->process('preferences',array('preferences'));
! */
! //echo 'prefs<pre>';
! //print_r($GLOBALS['prefs']);
! //echo '</pre>';
!
! //echo 'phpgw_info<pre>';
! //print_r($GLOBALS['phpgw_info']);
! //echo '</pre>';
}
- // else {echo 'function was found<br>';}
-
- //$temp_browser = CreateObject('phpgwapi.browser');
- //echo 'agent: '.$temp_browser->get_agent().'<br>';
$tpl->set_var($var);
--- 92,106 ----
$var['messages'] = $api_messages . "<br>" .
checkcode($cd);
}
! 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'];
! }
! else
! {
! $tpl->set_block('navbar','app_header','app_header');
! $var['app_header'] = '';
}
$tpl->set_var($var);
***************
*** 180,183 ****
--- 146,155 ----
.
$GLOBALS['phpgw']->common->show_date(time(),'d, Y')
);
+ $var['powered_by'] = lang('Powered by phpGroupWare version
%1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
+ if (isset($GLOBALS['phpgw_info']['navbar']['admin']) &&
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']))
+ {
+ $var['current_users'] = '<a href="' .
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions')
. '">'
+ . '<font color="#FFFFFF">'.lang('Current
users') . ': ' . $GLOBALS['phpgw']->session->total() . '</font></a>';
+ }
$tpl->set_var($var);
$GLOBALS['phpgw']->hooks->process('navbar_end');
Index: navbar.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/justweb/Attic/navbar.tpl,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -C2 -r1.4.4.1 -r1.4.4.2
*** navbar.tpl 28 Mar 2003 15:08:22 -0000 1.4.4.1
--- navbar.tpl 19 Apr 2003 21:10:05 -0000 1.4.4.2
***************
*** 16,42 ****
</td>
</tr>
- <tr>
- <td>
- <table width="100%" border="0" cellspacing="0"
cellpadding="0">
- <tr>
- <td width="7"><img
src="{img_root}/menu_bar_left.gif" width="7" height="24"></td>
- <td
background="{img_root}/menu_bar_bg.gif" width="100%"> </td>
- <td width="9"><img
src="{img_root}/menu_bar_right.gif" width="9" height="24"></td>
- </tr>
- </table>
- </td>
- </tr>
<tr>
<td height="100%" valign="top">
<table width="100%" border="0" cellspacing="0"
cellpadding="0" height="100%">
<tr>
- <td height="7" width="59"><img
src="{img_root}/side_bar_top.gif" width="59" height="7"></td>
- <td></td>
- </tr>
- <tr>
<td valign="top" align="center"
background="{img_root}/side_bar_bg.gif" height="100%"
width="59">{applications}</td>
<td width="100%" valign="top">
! <table width="100%" border="0"
cellspacing="15" cellpadding="15">
<tr>
<td
valign="top">
--- 16,32 ----
</td>
</tr>
<tr>
<td height="100%" valign="top">
<table width="100%" border="0" cellspacing="0"
cellpadding="0" height="100%">
<tr>
<td valign="top" align="center"
background="{img_root}/side_bar_bg.gif" height="100%"
width="59">{applications}</td>
<td width="100%" valign="top">
! <!-- BEGIN app_header -->
! <div style="text-align: center;
font-weight: bold; background-color: {th_bg};
padding:5px">{current_app_header}</div>
! <!-- END app_header -->
! <div
align="center">{messages}</div>
! <table width="100%" border="0"
cellspacing="10" cellpadding="10">
<tr>
<td
valign="top">
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/templates/justweb footer.tpl,1.2,1.2.4.1 head.inc.php,1.13.2.2.2.2,1.13.2.2.2.3 head.tpl,1.9.2.1,1.9.2.1.2.1 navbar.inc.php,1.20.2.3.2.1,1.20.2.3.2.2 navbar.tpl,1.4.4.1,1.4.4.2,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: phpgwapi/templates/idsociety head.inc.php,1.11.2.2.2.2,1.11.2.2.2.3head.tpl,1.10.2.2,1.10.2.2.2.1 navbar.inc.php,1.30.2.7.2.1,1.30.2.7.2.2navbar.tpl,1.18.4.1,1.18.4.2
- Next by Date:
[Phpgroupware-cvs] CVS: phpgwapi/templates/idots/source navbar32.xcf,1.1.2.2,1.1.2.3
- Previous by thread:
[Phpgroupware-cvs] CVS: phpgwapi/templates/idsociety head.inc.php,1.11.2.2.2.2,1.11.2.2.2.3head.tpl,1.10.2.2,1.10.2.2.2.1 navbar.inc.php,1.30.2.7.2.1,1.30.2.7.2.2navbar.tpl,1.18.4.1,1.18.4.2
- Next by thread:
[Phpgroupware-cvs] CVS: phpgwapi/templates/idots/source navbar32.xcf,1.1.2.2,1.1.2.3
- Index(es):