[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/templates/idots navbar.inc.php, 1.1.2.12 nav
|
From: |
skwashd |
|
Subject: |
[Phpgroupware-cvs] phpgwapi/templates/idots navbar.inc.php, 1.1.2.12 navbar.tpl, 1.1.2.4 head.inc.php, 1.1.2.11 css.tpl, 1.1.2.3 footer.tpl, 1.1.2.2 head.tpl, 1.1.2.3 |
|
Date: |
Wed, 27 Apr 2005 06:41:03 -0000 |
Update of phpgwapi/templates/idots
Modified Files:
Branch: Version-0_9_16-branch
navbar.inc.php lines: +27 -19
navbar.tpl lines: +50 -71
head.inc.php lines: +2 -9
css.tpl lines: +0 -3
footer.tpl lines: +12 -10
head.tpl lines: +1 -1
Log Message:
html4+css2 compliance ... better than the EGO crud
====================================================
Index: phpgwapi/templates/idots/navbar.inc.php
diff -u phpgwapi/templates/idots/navbar.inc.php:1.1.2.11
phpgwapi/templates/idots/navbar.inc.php:1.1.2.12
--- phpgwapi/templates/idots/navbar.inc.php:1.1.2.11 Tue Dec 2 14:41:42 2003
+++ phpgwapi/templates/idots/navbar.inc.php Thu Jan 8 21:55:24 2004
@@ -32,7 +32,7 @@
$var['table_bg_color'] =
$GLOBALS['phpgw_info']['theme']['navbar_bg'];
$applications = '';
- // == 'icons_and_text')
+ $items++;
foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data)
{
if ($app != 'home' && $app != 'preferences' && $app !=
'about' && $app != 'logout')
@@ -42,32 +42,39 @@
$icon = '<img src="' . $app_data['icon'] . '"
alt="' . $title .
'" title="'. $title . '"
border="0">';
- $app_icons .= '<TD align="center"><a href="' .
$app_data['url'] . '"';
+ $app_icons .= '<td class="navpanel"><a href="'
. $app_data['url'] . '"';
if
(isset($GLOBALS['phpgw_info']['flags']['navbar_target']) &&
$GLOBALS['phpgw_info']['flags']['navbar_target'])
{
$app_icons .= ' target="' .
$GLOBALS['phpgw_info']['flags']['navbar_target'] . '"';
}
- $app_icons .= '>' . $icon . '</a></TD>';
+ $app_icons .= '>' . $icon . "</a></td>\r\n";
- $app_titles .= '<TD align=center
class="mainnote"><a href="'.$app_data['url'] . '"';
+ $app_titles .= '<td align=center
class="mainnote"><a href="'.$app_data['url'] . '"';
if
(isset($GLOBALS['phpgw_info']['flags']['navbar_target']) &&
$GLOBALS['phpgw_info']['flags']['navbar_target'])
{
$app_titles .= ' target="' .
$GLOBALS['phpgw_info']['flags']['navbar_target'] . '"';
}
- $app_titles .= '>' . $title . '</a></TD>';
+ $app_titles .= '>' . $title . "</a></td>\r\n";
unset($icon);
unset($title);
+ $items++;
}
}
$var['app_icons'] = $app_icons;
+ $var['td_span'] = ($items / 2);
if($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format']!='icons')
{
$var['app_titles'] = $app_titles;
}
+ else
+ {
+ $var['app_titles'] = '<td colspan="' . ($items -1) .
'"> </td>';
+ }
+
if (isset($GLOBALS['phpgw_info']['flags']['app_header']))
{
$var['current_app_title'] =
$GLOBALS['phpgw_info']['flags']['app_header'];
@@ -110,16 +117,16 @@
$menu_title = lang('General Menu');
- $file['Home'] = $GLOBALS['phpgw_info']['navbar']['home']['url'];
+ $file[] = array('text' => 'Home',
+ 'url' =>
$GLOBALS['phpgw_info']['navbar']['home']['url']);
if ($GLOBALS['phpgw_info']['user']['apps']['preferences'])
{
- $file['Preferences'] =
$GLOBALS['phpgw_info']['navbar']['preferences']['url']
- . '#' .
$GLOBALS['phpgw_info']['flags']['currentapp'];
+ $file[] = array ('text' => 'Preferences',
+ 'url' =>
$GLOBALS['phpgw_info']['navbar']['preferences']['url']
+ . '#' .
$GLOBALS['phpgw_info']['flags']['currentapp']);
}
- $file += array(
- 'About
%1'=>$GLOBALS['phpgw_info']['navbar']['about']['url'],
-
'Logout'=>$GLOBALS['phpgw_info']['navbar']['logout']['url']
- );
+ $file[] = array ('text' => 'About %1', 'url' =>
$GLOBALS['phpgw_info']['navbar']['about']['url']);
+ $file[] = array ('text' => 'Logout', 'url' =>
$GLOBALS['phpgw_info']['navbar']['logout']['url']);
display_sidebox('',$menu_title,$file);
@@ -145,30 +152,31 @@
if(!$appname ||
($appname==$GLOBALS['phpgw_info']['flags']['currentapp'] && $file))
{
- $var['lang_title']=$menu_title;//$appname.'
'.lang('Menu');
+ $var['lang_title']=$menu_title;
$GLOBALS['idots_tpl']->set_var($var);
$GLOBALS['idots_tpl']->pfp('out','extra_blocks_header');
- while(list($text,$url) = each($file))
+ foreach($file as $null => $item)
{
- sidebox_menu_item($url,$text);
+ sidebox_menu_item($item['url'], $item['text'],
$item['image']);
}
$GLOBALS['idots_tpl']->pparse('out','extra_blocks_footer');
}
}
- function sidebox_menu_item($item_link='',$item_text='')
+ function sidebox_menu_item($item_link='', $item_text='', $item_image='')
{
- if($item_text=='_NewLine_')
+ if($item_text == '_NewLine_')
{
$GLOBALS['idots_tpl']->pparse('out','extra_block_spacer');
}
else
{
- $var['icon_or_star']='<font color="#ff9933">*</font>';
+ $var['icon_or_star']= ($item_image ? $item_image : '*');
$var['lang_item']=lang($item_text);
$var['item_link']=$item_link;
+
$GLOBALS['idots_tpl']->set_var($var);
$GLOBALS['idots_tpl']->pparse('out','extra_block_row');
}
====================================================
Index: phpgwapi/templates/idots/navbar.tpl
diff -u phpgwapi/templates/idots/navbar.tpl:1.1.2.3
phpgwapi/templates/idots/navbar.tpl:1.1.2.4
--- phpgwapi/templates/idots/navbar.tpl:1.1.2.3 Sat May 3 13:34:39 2003
+++ phpgwapi/templates/idots/navbar.tpl Thu Jan 8 21:55:24 2004
@@ -1,87 +1,66 @@
<!-- BEGIN navbar_header -->
-<TABLE class=box height="90%" cellSpacing=0 cellPadding=1 width="100%"
bgColor=#ffffff border=0>
- <TR>
- <TD vAlign=top>
- <TABLE cellSpacing=0 cellPadding=0 width="100%"
bgColor=#ffffff border=0>
- <TR>
- <TD width=185 rowSpan=2 align="center"
vAlign=top class=toppannel><a href="http://www.phpgroupware.org";
target="_blank"><IMG src="{img_root}/logo.png" border="0"
title="www.phpGroupWare.org"></a></TD>
- <TD colspan="2" valign="top"
background="{img_root}/panel.png" style="background-repeat: repeat-x;">
- <TABLE width="100%" border=0
cellPadding=0 cellSpacing=0 background="{img_root}/panel.png" bgColor="#ffffff">
- <TR valign="center">
- <TD
width="1%"></TD>
-<!-- <TD
align=center width="10%"><a href="{home_link}"><img src="{img_root}/home.jpg"
width="60" height="62" border="0"></TD></a>-->
- {app_icons}
- <TD
width="1%"></TD>
- </TR>
- <TR valign="top"
bgcolor="#ffffff">
- <TD
width="1%"></TD>
-<!-- <TD
align=center class="mainnote"><a href="{home_link}">{lang_home}</a></TD>-->
- {app_titles}
- <TD width="1%"
colspan="100"></TD>
- </TR>
- </TABLE></TD>
- <TD width=15 rowSpan=2 vAlign=top
class=toppannel></TD>
- </TR>
- <TR>
- <TD align=left vAlign=top
class=mainnote>{user_info}</TD>
- <TD align=right vAlign=top
class=mainnote>{current_users}</TD>
- </TR>
- </TABLE>
- <TABLE cellSpacing=0 cellPadding=0 width="100%"
border=0>
- <TR vAlign=top>
- <TD width=15></TD>
- <TD vAlign=top width=1>
-
- <!-- start blocks -->
+<table class="box">
+ <tr>
+ <td class="navpanel">
+ <div id="nav">
+ <table class="navpanel">
+ <tr class="navpanel">
+ <td width="191" rowSpan="3"
class="logo"><a href="http://www.phpgroupware.org"; target="_blank"><img
src="{img_root}/logo.png" border="0" alt="phpGroupWare Logo"
title="www.phpGroupWare.org"></a></td>
+ <td class="spacer"> </td>
+ {app_icons}
+ <td class="spacer"> </td>
+ </tr>
+ <tr valign="top">
+ <td class="spacer"> </td>
+ {app_titles}
+ <td class="spacer"> </td>
+ </tr>
+ <tr class="mainnote">
+ <td align="left"
colspan="{td_span}">{user_info}</td>
+ <td align="right"
colspan="{td_span}">{current_users}</td>
+ </tr>
+ </table>
+ </div>
+ <table style="{width: 100%;}">
+ <tr>
+ <td class="spacer"> </td>
+ <td class="sidecontent">
+ <!-- start blocks -->
<!-- END navbar_header -->
-
<!-- BEGIN navbar_footer -->
-<BR>
-</TD>
-<TD width=15><img src={img_root}/spacer.gif width=15></TD>
-<TD>
-<TABLE cellSpacing=0 cellPadding=0 width="100%" border=0>
-<TR>
- <TD vAlign=top height="100%"> <TABLE align="center"
class=box cellSpacing=1 cellPadding=0 width="100%" border=0>
- <TR>
- <TD height=23 colSpan=2
align="center" class=articletitle>{current_app_title}</TD>
- </TR>
- <TR align="center">
- <TD height=20 colSpan=2
bgColor=#efefef class=mainnote>
+ </td>
+ <td class="spacer"><img
src="{img_root}/spacer.gif" alt="spacer" class="spacer"></td>
+ <td>
+ <table class="box">
+ <tr>
+ <td
class="articletitle">{current_app_title}</td>
+ </tr>
+ <tr>
+ <td
class="articlecontent">
<!-- END navbar_footer -->
-
<!-- BEGIN extra_blocks_header -->
-<TABLE class=sidebox cellSpacing=1 cellPadding=0 width="100%" border=0>
-<TR>
- <TD class=sideboxtitle align=middle height=28>{lang_title}</TD>
-</TR>
-<TR>
- <TD class=sideboxcontent bgColor=#efefef>
- <TABLE class=sideboxtext cellSpacing=0 cellPadding=0
width="100%" border=0 valign="top">
+ <table
class="sidebox">
+
<tr>
+
<td class="sideboxtitle">{lang_title}</td>
+
</tr>
+
<tr>
+
<td class="sideboxcontent">
+
<ul style="{list-style: none inside; margin: 5px; padding: 10px;
text-indent: -10px;}">
<!-- END extra_blocks_header -->
-
-
<!-- BEGIN extra_blocks_footer -->
- </TABLE>
- </TD>
- </TR>
-</TABLE>
-<br>
+
</ul>
+
</td>
+
</tr>
+ </table>
+ <br />
<!-- END extra_blocks_footer -->
-
-
<!-- BEGIN extra_block_row -->
-<TR>
- <TD vAlign=top align=middle>{icon_or_star} </TD>
- <TD width="100%" height="20" align=left vAlign=top><A
href="{item_link}">{lang_item}</A></TD>
-</TR>
+
<li><span class="star">{icon_or_star}</span> <a
href="{item_link}">{lang_item}</a></li>
<!-- END extra_block_row -->
<!-- BEGIN extra_block_spacer -->
-<TR>
- <TD colspan="2" height="8"></TD>
-</TR>
+
<br /> <!-- style="{heigh: 1px; border-width 0px 0px 0px 0px;
border-color: #FF9933; border-style: solid; color: #FF9933; text-align: center;
width: 50%;}" /> -->
<!-- END extra_block_spacer -->
====================================================
Index: phpgwapi/templates/idots/head.inc.php
diff -u phpgwapi/templates/idots/head.inc.php:1.1.2.10
phpgwapi/templates/idots/head.inc.php:1.1.2.11
--- phpgwapi/templates/idots/head.inc.php:1.1.2.10 Sun Nov 30 16:13:06 2003
+++ phpgwapi/templates/idots/head.inc.php Thu Jan 8 21:55:24 2004
@@ -11,14 +11,7 @@
/* $Id$ */
- $bodyheader = ' bgcolor="' .
$GLOBALS['phpgw_info']['theme']['bg_color'] . '" alink="'
- . $GLOBALS['phpgw_info']['theme']['alink'] . '" link="'
. $GLOBALS['phpgw_info']['theme']['link'] . '" vlink="'
- . $GLOBALS['phpgw_info']['theme']['vlink'] . '"';
-
- if (! $GLOBALS['phpgw_info']['server']['htmlcompliant'])
- {
- $bodyheader .= '';
- }
+ $bodyheader = '';
if(file_exists(PHPGW_SERVER_ROOT . '/phpgwapi/templates/idots/css/' .
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '.css'))
{
====================================================
Index: phpgwapi/templates/idots/css.tpl
diff -u phpgwapi/templates/idots/css.tpl:1.1.2.2
phpgwapi/templates/idots/css.tpl:1.1.2.3
--- phpgwapi/templates/idots/css.tpl:1.1.2.2 Fri Jul 18 08:17:16 2003
+++ phpgwapi/templates/idots/css.tpl Thu Jan 8 21:55:24 2004
@@ -1,8 +1,5 @@
<style type="text/css">
<!--
- .row_on { color: {row_text}; background-color: {row_on}; }
- .row_off { color: {row_text}; background-color: {row_off}; }
- .th { color: {th_text}; background-color: {th_bg}; }
{app_css}
-->
</style>
====================================================
Index: phpgwapi/templates/idots/footer.tpl
diff -u phpgwapi/templates/idots/footer.tpl:1.1.2.1
phpgwapi/templates/idots/footer.tpl:1.1.2.2
--- phpgwapi/templates/idots/footer.tpl:1.1.2.1 Fri Apr 18 14:35:29 2003
+++ phpgwapi/templates/idots/footer.tpl Thu Jan 8 21:55:24 2004
@@ -1,11 +1,13 @@
- </TR>
- </TABLE>
-
- <br></TD>
-<TD width=15></TD>
-</TR>
-</TABLE></TR>
-</TABLE></TR>
-</TABLE>
-<p align="center" class="copyright">{powered_by}</p>
+ </td>
+ </tr>
+ </table>
+ <br>
+ </td>
+ <td class="spacer"> </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+<p class="copyright">{powered_by}</p>
<!-- END footer.tpl -->
====================================================
Index: phpgwapi/templates/idots/head.tpl
diff -u phpgwapi/templates/idots/head.tpl:1.1.2.2
phpgwapi/templates/idots/head.tpl:1.1.2.3
--- phpgwapi/templates/idots/head.tpl:1.1.2.2 Fri May 30 02:34:26 2003
+++ phpgwapi/templates/idots/head.tpl Thu Jan 8 21:55:24 2004
@@ -14,5 +14,5 @@
<TITLE>{website_title}</TITLE>
{java_script}
</HEAD>
-<BODY bgColor="#e5e5e5" {body_tags}>
+<BODY {body_tags}>
<!-- END Head -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/templates/idots navbar.inc.php, 1.1.2.12 navbar.tpl, 1.1.2.4 head.inc.php, 1.1.2.11 css.tpl, 1.1.2.3 footer.tpl, 1.1.2.2 head.tpl, 1.1.2.3,
skwashd <=
- Prev by Date:
[Phpgroupware-cvs] bookkeeping/templates/default bill_list.tpl, 1.3 header.tpl, 1.3 preferences.tpl, 1.2 config.tpl, 1.3
- Next by Date:
[Phpgroupware-cvs] phpgwapi/templates/idots/css idots.css,1.1.2.3
- Previous by thread:
[Phpgroupware-cvs] bookkeeping/templates/default bill_list.tpl, 1.3 header.tpl, 1.3 preferences.tpl, 1.2 config.tpl, 1.3
- Next by thread:
[Phpgroupware-cvs] phpgwapi/templates/idots/css idots.css,1.1.2.3
- Index(es):