[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/templates/idsociety head.inc.php,1.11,1
From: |
Dan Kuykendall <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/templates/idsociety head.inc.php,1.11,1.12 head.tpl,1.10,1.11 navbar.inc.php,1.30,1.31 |
Date: |
Tue, 12 Feb 2002 04:10:44 -0500 |
Update of /cvsroot/phpgroupware/phpgwapi/templates/idsociety
In directory subversions:/tmp/cvs-serv25344/phpgwapi/templates/idsociety
Modified Files:
head.inc.php head.tpl navbar.inc.php
Log Message:
fixed header to use and added my debug constants along with my replacement for
print_debug
Index: head.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/idsociety/head.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** head.inc.php 22 Dec 2001 22:47:56 -0000 1.11
--- head.inc.php 12 Feb 2002 09:10:40 -0000 1.12
***************
*** 38,100 ****
$bodyheader .= ' topmargin="0" marginheight="0" marginwidth="0"
leftmargin="0"';
}
-
- /*
- @capability: page autorefresh
- @discussion: I know of 3 ways to get a page to reload, 2 of those ways
are pretty much the same
- (1) the http header
- Refresh: 5;
- (2) the META http-equiv
- <META HTTP-EQUIV="Refresh" CONTENT="5">
- both 1 and 2 have the same effect as hitting the "reload" button, which
in *many* browsers will
- force a re-download of all the images on the page, i.e. the browser
will NOT use the cached images
- (3) java script combo of "window.setTimeout" with "window.location"
-
window.setTimeout('window.location="http://example.com/phpgw/email/index.php";
',1800000);
- method 3 is the only one I know of that will use the images from the
cache.
- also, 3 takes a reload value in miliseconds, so a value of 180000 is
really 3 minutes
- ALSO, use if..then code to only auto-refresh certain pages, such as
email/index.php
- @author Angles Nov 28, 2001
- */
- $auto_refresh_enabled = True;
- //$auto_refresh_enabled = False;
- // initialize reload location to empty string
- $reload_me = '';
- if ($auto_refresh_enabled)
- {
- if ((stristr($GLOBALS['PHP_SELF'], '/email/index.php'))
- || ( ((isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
- && (stristr($GLOBALS['HTTP_GET_VARS']['menuaction'],
'email.uiindex.index')))
- )
- )
- {
- if
((isset($GLOBALS['phpgw_info']['flags']['email_refresh_uri']))
- &&
($GLOBALS['phpgw_info']['flags']['email_refresh_uri'] != ''))
- {
- $reload_me =
$GLOBALS['phpgw']->link('/index.php',$GLOBALS['phpgw_info']['flags']['email_refresh_uri']);
- }
- else
- {
- $reload_me =
$GLOBALS['phpgw']->link('/email/index.php');
- }
- }
- elseif (eregi("^.*\/home\.php.*$",$GLOBALS['PHP_SELF']))
- {
- $reload_me = $GLOBALS['phpgw']->link('/home.php');
- }
- }
- // make the JS command string if necessary
- if (($auto_refresh_enabled)
- && ($reload_me != ''))
- {
- // set refresh time in miliseconds (1000 = 1 sec) (180000 =
180 sec = 3 minutes)
- // ( 240000 = 240 sec = 4 min) (300000 = 5 min) (600000 =
10 min)
- $refresh_ms = '240000';
- $email_reload_js =
- 'window.setTimeout('."'".'window.location="'
- .$reload_me.'"; '."'".','.$refresh_ms.');';
- }
- else
- {
- $email_reload_js = '';
- }
$tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
--- 38,41 ----
***************
*** 112,116 ****
'css_vlink' =>
$GLOBALS['phpgw_info']['theme']['vlink'],
'css_hovlink' => $csshover,
- 'email_reload_js' => $email_reload_js,
'app_css' => $app_css
);
--- 53,56 ----
Index: head.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/idsociety/head.tpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** head.tpl 22 Dec 2001 22:47:56 -0000 1.10
--- head.tpl 12 Feb 2002 09:10:40 -0000 1.11
***************
*** 23,27 ****
<script language="JavaScript">
<!--
- {email_reload_js}
function MM_preloadImages()
{
--- 23,26 ----
Index: navbar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/idsociety/navbar.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** navbar.inc.php 8 Jan 2002 02:14:47 -0000 1.30
--- navbar.inc.php 12 Feb 2002 09:10:40 -0000 1.31
***************
*** 52,56 ****
{
if ($app[1]['title'] != 'Home' && $app[1]['title'] !=
'preferences' && !ereg('About',$app[1]['title']) && $app[1]['title'] !=
'Logout')
- // if ($app[1]['title'] != 'Home' && $app[1]['title'] !=
'preferences' && $app[1]['title'] != 'About' && $app[1]['title'] != 'Logout')
{
$title = '<img src="' . $app[1]['icon'] . '"
alt="' . $app[1]['title'] . '" title="'
--- 52,55 ----
***************
*** 59,63 ****
$img_src_out = $app[1]['icon'];
- //
onMouseOver="two.src='rollover/admin_over.gif'"
onMouseOut="two.src='images/admin.gif'"><img src="images/admin.gif" border="0"
name="two"
$applications .= '<tr><td><a href="' .
$app[1]['url'] . '"';
if
(isset($GLOBALS['phpgw_info']['flags']['navbar_target']))
--- 58,61 ----
***************
*** 177,182 ****
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');
$var['user_info'] = $var['user_info_name'] .' - '
.$var['user_info_date'];
$var['user_info_size'] = '2';
--- 175,178 ----
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/templates/idsociety head.inc.php,1.11,1.12 head.tpl,1.10,1.11 navbar.inc.php,1.30,1.31,
Dan Kuykendall <address@hidden> <=