[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/templates/idots footer.tpl head.inc.ph...
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] phpgwapi/templates/idots footer.tpl head.inc.ph... |
|
Date: |
Sat, 08 Apr 2006 13:30:14 +0000 |
CVSROOT: /cvsroot/phpgwapi
Module name: phpgwapi
Branch:
Changes by: Dave Hall <address@hidden> 06/04/08 13:30:14
Modified files:
templates/idots: footer.tpl head.inc.php head.tpl navbar.inc.php
navbar.tpl
templates/idots/css: idots.css
Log message:
removed tables, fixed xhtml 1/trans compliance. got opacity working,
reduced the clutter, images are next
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/idots/footer.tpl.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/idots/head.inc.php.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/idots/head.tpl.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/idots/navbar.inc.php.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/idots/navbar.tpl.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/idots/css/idots.css.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
Patches:
Index: phpgwapi/templates/idots/css/idots.css
diff -u phpgwapi/templates/idots/css/idots.css:1.5
phpgwapi/templates/idots/css/idots.css:1.6
--- phpgwapi/templates/idots/css/idots.css:1.5 Sat Jan 15 09:56:11 2005
+++ phpgwapi/templates/idots/css/idots.css Sat Apr 8 13:30:14 2006
@@ -3,40 +3,38 @@
Originally written by Pim Snel
Currently Maintained by Dave Hall
- $Id: idots.css,v 1.5 2005/01/15 09:56:11 skwashd Exp $
+ $Id: idots.css,v 1.6 2006/04/08 13:30:14 skwashd Exp $
*/
-
-/* Classes */
-.articlecontent
+
+#articlecontent
{
- background-color: #EFEFEF;
- color: #006699;
+ background-color: #efefef;
+ color: #069;
font-size: 12px;
- font-family: "Verdana", "Arial", "Helvetica", "sans-serif";
- line-height: 20px;
- text-align: center;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ height: 600px;
+ min-height: 600px;
padding: 10px;
}
-.articletitle
+h1.articletitle
{
- font-weight: bold;
- font-size: 12px;
background-image: url(../images/greypanel.png);
- color: #000000;
- text-align: center;
- text-indent: 5pt;
background-repeat: repeat-x;
- font-family: "Verdana", "Arial", "Helvetica", "sans-serif";
+ color: #000;
height: 21px;
- vertical-align: middle;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-weight: bold;
+ font-size: 12px;
+ margin: 0px;
+ padding: 0px;
+ text-align: center;
}
.box
{
- background-color: #ffffff;
+ background-color: #fff;
border: 1px solid #98aab1;
- border-collapse: collapse;
height: 90%;
margin: 0px;
padding: 0px;
@@ -44,18 +42,21 @@
width: 100%;
}
-/* not needed afaik - skwashd
-.content
+#content
{
- color: #000000;
- font-family: "Verdana", "Arial", "Helvetica", "sans-serif";
- font-size: 12px;
-}*/
+ background-color: #fff;
+ border: 1px solid #98aab1;
+ color: #000;
+ margin: 0px 10px 20px 200px;
+ padding: 0px;
+}
-.copyright
+#copyright
{
- color: #000000;
+ clear: both;
+ color: #000;
font-size: 9px;
+ padding: 10px;
text-align: center;
}
@@ -71,25 +72,64 @@
.mainnote
{
- background-color: #FFFFFF; /* */
- color: #006699;
- font-family: "Arial", "Helvetica", "sans-serif";
+ background-color: #fff;
+ color: #069;
+ font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
height: 20px;
+ margin: 5px;
+ text-align: right;
vertical-align: top;
}
-.navpanel
+.mainnote #user_info
+{
+ float: left;
+ text-align: left;
+ width: 300px;
+}
+
+#navpanel
{
- background: url("../images/panel.png");
+ background-color: #fff;
+ background-image: url('../images/panel.png');
background-repeat: repeat-x;
- background-color: #FFFFFF;
- border-collapse:collapse;
- height: 60px;
+ height: 120px;
margin: 0px;
padding: 0px;
- text-align: center;
vertical-align: top;
+ width: 100%;
+}
+
+#navpanel ul
+{
+ height: 115px;
+ list-style: none;
+ margin: 0px;
+ padding: 0px;
+ overflow: hidden;
+ width: 100%;
+}
+
+#navpanel li
+{
+ display: block;
+ height: 120px;
+ float: left;
+}
+
+#navpanel a img
+{
+ -moz-opacity: 0.5; /* old mozilla/gecko */
+ filter: alpha(opacity=5); /* IE 5.5+? */
+ opacity: 0.5; /* CSS3 */
+}
+
+#navpanel a:hover img, #navpanel li.phpgw_logo a img
+{
+ -moz-opacity: 1.0;
+ filter: alpha(opacity=10);
+ opacity: 1.0;
}
.popup
@@ -114,70 +154,63 @@
font-size: 12px;
}
-.sidecontent
+#sidecontent
{
- border:0px;
- border-collapse: collapse;
- padding:0px;
- vertical-align: top;
- width: 160px;
+ border: 0px;
+ float: left;
+ margin-left: 10px;
+ padding: 0px;
+ width: 160px;
+}
+
+.box > #sidecontent /* Fix IE Hack */
+{
+ margin-left: 20px;
}
.sideboxcontent
{
- background-color: #EFEFEF;
- font-family: "Verdana", "Arial", "Helvetica", "sans-serif";
- font-size: 9pt;
- /*line-height: 18px;*/
- /*padding: 2px;*/
- width: 160px;
+ background-color: #efefef;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ list-style-position: inside;
+ margin: 0px;
+ padding: 5px;
+ width: 150px;
}
-.sideboxtitle
+h2.sideboxtitle
{
background-image: url(../images/boxbg.png);
background-position: center 50%;
- color: #000000;
+ color: #000;
font-family: "Verdana", "Arial", "Helvetica", "sans-serif";
font-size: 12px;
font-weight: bold;
height: 26px;
+ margin: 0px;
+ padding: 6px 0px 0px 0px;
text-align: center;
}
-spacer
-{
- border: 0px;
- width: 15px;
-}
-
-/* Not used afaik, also a tag name - skwashd
-.title
+.sidebox
{
- color: #000000;
- font-size: 12px;
- font-weight: 12px;
- padding: 5px;
+ border: 1px solid #98aab1;
+ border-collapse: collapse;
+ margin-bottom: 25px;
+ padding: 0px;
+ width: 160px;
}
-*/
-/* not used afaik - skwashd
-.toppannel
+.sidebox li
{
- background-image: url(../images/panel.png);
- background-repeat: repeat-x
+ list-style-type: square;
}
-*/
address@hidden screen
+.sidebox li.emptyitem
{
- .sidebox
- {
- border: 1px solid #98aab1;
- border-collapse: collapse;
- padding: 0px;
- width: 160px;
- }
+ font-size: 6px;
+ height: 8px;
}
/* Save some space when printing */
@@ -187,7 +220,8 @@
{
display: none;
}
- #nav
+
+ #navpanel
{
display: none;
}
@@ -224,22 +258,6 @@
border: 0px;
}
-/* this should work but doesn't - i will come back to it
-td.navpanel > a > img
-{
- -moz-opacity: 0.8; mozilla/gecko
- filter: alpha(opacity=8); IE 5.5+?
- opacity: 0.8; CSS3
-}
-
-td.navpanel > a > img:hover
-{
- -moz-opacity: 1.0;
- filter: alpha(opacity=10);
- opacity: 1.0;
-}
-*/
-
input, select, textarea
{
color: #006699;
@@ -276,16 +294,10 @@
background-color: #DDDDDD;
}
-span.star
-{
- color: #FF9933;
- font-weight: bold;
-}
-
table
{
- FONT-SIZE: 12px;
- FONT-FAMILY: "Verdana", "Arial", "Helvetica", "sans-serif"
+ font-size: 12px;
+ font-family: "Verdana", "Arial", "Helvetica", "sans-serif"
}
/* Used by tabs */
Index: phpgwapi/templates/idots/footer.tpl
diff -u phpgwapi/templates/idots/footer.tpl:1.4
phpgwapi/templates/idots/footer.tpl:1.5
--- phpgwapi/templates/idots/footer.tpl:1.4 Thu Dec 30 06:47:34 2004
+++ phpgwapi/templates/idots/footer.tpl Sat Apr 8 13:30:14 2006
@@ -1,13 +1,7 @@
- </td>
- </tr>
- </table>
- <br>
- </td>
- <td class="spacer"> </td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
-<p class="copyright">{powered_by}</p>
+ </div>
+ </div>
+ <div id="copyright">{powered_by}</div>
+ </div>
+ </body>
+</html>
<!-- END footer.tpl -->
Index: phpgwapi/templates/idots/head.inc.php
diff -u phpgwapi/templates/idots/head.inc.php:1.6
phpgwapi/templates/idots/head.inc.php:1.7
--- phpgwapi/templates/idots/head.inc.php:1.6 Mon Mar 27 13:38:10 2006
+++ phpgwapi/templates/idots/head.inc.php Sat Apr 8 13:30:14 2006
@@ -7,17 +7,41 @@
* @subpackage gui
* @version $Id: head.inc.php,v 1.4 2004/12/30 06:47:34 skwashd Exp
*/
+ $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');
+
if(file_exists(PHPGW_SERVER_ROOT . '/phpgwapi/templates/idots/css/' .
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '.css'))
{
- $theme_css = $GLOBALS['phpgw_info']['server']['webserver_url']
.
'/phpgwapi/templates/idots/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css';
+ $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/idots/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
}
else
{
- $theme_css = $GLOBALS['phpgw_info']['server']['webserver_url']
. '/phpgwapi/templates/idots/css/idots.css';
+ $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/idots/css/idots.css";
+
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] = 'idots';
+ }
+
+ if(file_exists(PHPGW_SERVER_ROOT .
"/{$app}/templates/base/css/base.css"))
+ {
+ $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$app}/templates/base/css/base.css";
+ }
+
+ if(file_exists(PHPGW_SERVER_ROOT .
"/{$app}/templates/idots/css/base.css"))
+ {
+ $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$app}/templates/idots/css/base.css";
+ }
+
+ if(file_exists(PHPGW_SERVER_ROOT .
"/{$app}/templates/idots/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css"))
+ {
+ $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$app}/templates/idots/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
+ }
+
+ foreach ( $theme_styles as $style )
+ {
+ $tpl->set_var('theme_style', $style);
+ $tpl->parse('theme_stylesheets', 'theme_stylesheet', true);
}
- $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
- $tpl->set_unknowns('remove');
- $tpl->set_file(array('head' => 'head.tpl'));
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
$app = $app ? ' ['.(isset($GLOBALS['phpgw_info']['apps'][$app]) ?
$GLOBALS['phpgw_info']['apps'][$app]['title'] : lang($app)).']':'';
@@ -30,7 +54,6 @@
'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
'font_family' => $GLOBALS['phpgw_info']['theme']['font'],
'str_base_url' => $GLOBALS['phpgw']->link('/'),
- 'theme_css' => $theme_css,
'website_title' =>
$GLOBALS['phpgw_info']['server']['site_title'].$app,
'win_on_events' => $GLOBALS['phpgw']->common->get_on_events(),
);
Index: phpgwapi/templates/idots/head.tpl
diff -u phpgwapi/templates/idots/head.tpl:1.5
phpgwapi/templates/idots/head.tpl:1.6
--- phpgwapi/templates/idots/head.tpl:1.5 Mon Mar 27 13:38:10 2006
+++ phpgwapi/templates/idots/head.tpl Sat Apr 8 13:30:14 2006
@@ -1,5 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<!-- BEGIN head -->
<html>
<head>
@@ -11,7 +10,9 @@
<link rel="icon" href="{img_icon}" type="image/x-ico" />
<link rel="shortcut icon" href="{img_shortcut}" />
{css}
- <link href="{theme_css}" type="text/css" rel="StyleSheet">
+ <!-- BEGIN theme_stylesheet -->
+ <link href="{theme_style}" type="text/css" rel="StyleSheet" />
+ <!-- END theme_stylesheet -->
<title>{website_title}</title>
{java_script}
<script type="text/javascript">
Index: phpgwapi/templates/idots/navbar.inc.php
diff -u phpgwapi/templates/idots/navbar.inc.php:1.6
phpgwapi/templates/idots/navbar.inc.php:1.7
--- phpgwapi/templates/idots/navbar.inc.php:1.6 Thu Apr 28 08:11:59 2005
+++ phpgwapi/templates/idots/navbar.inc.php Sat Apr 8 13:30:14 2006
@@ -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.6 2005/04/28 08:11:59 powerstat Exp $
+ * @version $Id: navbar.inc.php,v 1.7 2006/04/08 13:30:14 skwashd Exp $
*/
@@ -17,20 +17,16 @@
*/
function parse_navbar($force = False)
{
- $GLOBALS['idots_tpl'] =
createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
+ $GLOBALS['phpgw']->template->set_root(PHPGW_TEMPLATE_DIR);
- $GLOBALS['idots_tpl']->set_file(
- array(
- 'navbar' => 'navbar.tpl'
- )
- );
-
-
$GLOBALS['idots_tpl']->set_block('navbar','navbar_header','navbar_header');
-
$GLOBALS['idots_tpl']->set_block('navbar','extra_blocks_header','extra_block_header');
-
$GLOBALS['idots_tpl']->set_block('navbar','extra_block_row','extra_block_row');
-
$GLOBALS['idots_tpl']->set_block('navbar','extra_block_spacer','extra_block_spacer');
-
$GLOBALS['idots_tpl']->set_block('navbar','extra_blocks_footer','extra_blocks_footer');
-
$GLOBALS['idots_tpl']->set_block('navbar','navbar_footer','navbar_footer');
+ $GLOBALS['phpgw']->template->set_file('navbar', 'navbar.tpl');
+ $GLOBALS['phpgw']->template->set_block('navbar', 'navbar_item',
'navbar_items');
+
$GLOBALS['phpgw']->template->set_block('navbar','navbar_header','navbar_header');
+
$GLOBALS['phpgw']->template->set_block('navbar','extra_blocks_header','extra_block_header');
+
$GLOBALS['phpgw']->template->set_block('navbar','extra_block_row','extra_block_row');
+
$GLOBALS['phpgw']->template->set_block('navbar','extra_block_spacer','extra_block_spacer');
+
$GLOBALS['phpgw']->template->set_block('navbar','extra_blocks_footer','extra_blocks_footer');
+
$GLOBALS['phpgw']->template->set_block('navbar','navbar_footer','navbar_footer');
$var['img_root'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] .
'/phpgwapi/templates/idots/images';
$var['table_bg_color'] =
$GLOBALS['phpgw_info']['theme']['navbar_bg'];
@@ -45,43 +41,29 @@
{
if ($app != 'home' && $app != 'preferences' && $app !=
'about' && $app != 'logout')
{
- $title =
$GLOBALS['phpgw_info']['apps'][$app]['title'];
-
- $icon = '<img src="' . $app_data['icon'] . '"
alt="' . $title .
- '" title="'. $title . '" />';
-
- $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>\r\n";
+ $item = array
+ (
+ 'app_name' => '',
+ 'alt_image_app' =>
$app_data['title'],
+ 'img_app' =>
"{$var['img_root']}/noimage_nav.png",
+ 'url_app' =>
$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'])
+
switch($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'])
{
- $app_titles .= ' target="' .
$GLOBALS['phpgw_info']['flags']['navbar_target'] . '"';
+ case 'icons':
+ $item['img_app'] =&
$app_data['icon'];
+ break;
+ case 'text':
+ $item['app_name'] =&
$item['alt_img_app'];
+ default:
+ $item['app_name'] =&
$item['alt_img_app'];
+ $item['img_app'] =&
$app_data['icon'];
}
- $app_titles .= '>' . $title . "</a></td>\r\n";
-
- unset($icon);
- unset($title);
- $items++;
+ $GLOBALS['phpgw']->template->set_var($item);
+
$GLOBALS['phpgw']->template->parse('navbar_items', 'navbar_item', true);
}
}
-
- $var['app_icons'] = $app_icons;
- $var['td_span'] = intval($items);
-
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']))
{
@@ -120,8 +102,8 @@
$var['messages'] = $api_messages . '<br>' .
checkcode($cd);
}
- $GLOBALS['idots_tpl']->set_var($var);
- $GLOBALS['idots_tpl']->pfp('out','navbar_header');
+ $GLOBALS['phpgw']->template->set_var($var);
+ $GLOBALS['phpgw']->template->pfp('out','navbar_header');
$menu_title = lang('General Menu');
@@ -140,7 +122,7 @@
$GLOBALS['phpgw']->hooks->single('sidebox_menu',$GLOBALS['phpgw_info']['flags']['currentapp']);
- $GLOBALS['idots_tpl']->pparse('out','navbar_footer');
+ $GLOBALS['phpgw']->template->pparse('out','navbar_footer');
// If the application has a header include, we now include it
if (address@hidden'phpgw_info']['flags']['noappheader'] &&
@isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
@@ -170,15 +152,15 @@
if(!$appname || ($appname ==
$GLOBALS['phpgw_info']['flags']['currentapp'] && $file))
{
$var['lang_title'] = $menu_title;
- $GLOBALS['idots_tpl']->set_var($var);
- $GLOBALS['idots_tpl']->pfp('out','extra_blocks_header');
+ $GLOBALS['phpgw']->template->set_var($var);
+
$GLOBALS['phpgw']->template->pfp('out','extra_blocks_header');
foreach($file as $null => $item)
{
sidebox_menu_item($item['url'], $item['text'],
$item['image'], $use_lang);
}
-
$GLOBALS['idots_tpl']->pparse('out','extra_blocks_footer');
+
$GLOBALS['phpgw']->template->pparse('out','extra_blocks_footer');
}
}
@@ -195,16 +177,17 @@
{
if($item_text == '_NewLine_')
{
-
$GLOBALS['idots_tpl']->pparse('out','extra_block_spacer');
+
$GLOBALS['phpgw']->template->pparse('out','extra_block_spacer');
}
else
{
- $var['icon_or_star']= ($item_image ? $item_image : '*');
- $var['lang_item'] = ($use_lang ? lang($item_text) :
$item_text);
- $var['item_link']=$item_link;
-
- $GLOBALS['idots_tpl']->set_var($var);
- $GLOBALS['idots_tpl']->pparse('out','extra_block_row');
+ $GLOBALS['phpgw']->template->set_var(array
+ (
+ 'list_style_image' => ($item_image ?
$item_image : 'none'),
+ 'lang_item' => ($use_lang ?
lang($item_text) : $item_text),
+ 'item_link' => $item_link
+ ));
+
$GLOBALS['phpgw']->template->pparse('out','extra_block_row');
}
}
@@ -214,21 +197,21 @@
*/
function parse_navbar_end()
{
- $GLOBALS['idots_tpl'] =
createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
+ $GLOBALS['phpgw']->template =
createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
- $GLOBALS['idots_tpl']->set_file(
+ $GLOBALS['phpgw']->template->set_file(
array(
'footer' => 'footer.tpl'
)
);
$var = Array(
- 'img_root' =>
$GLOBALS['phpgw_info']['server']['webserver_url'] .
'/phpgwapi/templates/idots/images',
+ 'img_root' =>
$GLOBALS['phpgw_info']['server']['webserver_url'] .
'/phpgwapi/templates/idots/images',
'table_bg_color' =>
$GLOBALS['phpgw_info']['theme']['navbar_bg'],
- 'version' =>
$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']
+ 'version' =>
$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']
);
$GLOBALS['phpgw']->hooks->process('navbar_end');
$var['powered_by'] = lang('Powered by phpGroupWare version
%1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
- $GLOBALS['idots_tpl']->set_var($var);
- $GLOBALS['idots_tpl']->pfp('out','footer');
+ $GLOBALS['phpgw']->template->set_var($var);
+ $GLOBALS['phpgw']->template->pfp('out','footer');
}
Index: phpgwapi/templates/idots/navbar.tpl
diff -u phpgwapi/templates/idots/navbar.tpl:1.5
phpgwapi/templates/idots/navbar.tpl:1.6
--- phpgwapi/templates/idots/navbar.tpl:1.5 Mon Jan 17 14:04:27 2005
+++ phpgwapi/templates/idots/navbar.tpl Sat Apr 8 13:30:14 2006
@@ -1,66 +1,49 @@
<!-- BEGIN navbar_header -->
-<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 style="{vertical-align: top;}">
- <td class="spacer"> </td>
- <td class="sidecontent">
- <!-- start blocks -->
+<div class="box">
+ <div id="navpanel">
+ <ul id="nav">
+ <li class="phpgw_logo">
+ <a href="http://www.phpgroupware.org";
rel="external"><img src="{img_root}/logo.png" alt="phpGroupWare Logo"
title="www.phpGroupWare.org" /></a>
+ </li>
+ <!-- BEGIN navbar_item -->
+ <li>
+ <a href="{url_app}">
+ <img src="{img_app}"
alt="{alt_img_app}" />
+ {app_name}
+ </a>
+ </li>
+ <!-- END navbar_item -->
+ </ul>
+ </div>
+ <div class="mainnote">
+ <div id="user_info">{user_info}</div>
+ <div>{current_users}</div>
+ </div>
+ <div id="sidecontent">
<!-- END navbar_header -->
-<!-- BEGIN navbar_footer -->
- </td>
- <td class="spacer"><img
src="{img_root}/spacer.png" alt="spacer" class="spacer"></td>
- <td class="box">
- <table style="{width: 100%;}">
- <tr>
- <td
class="articletitle">{current_app_title}</td>
- </tr>
- <tr>
- <td
class="articlecontent">
+<!-- BEGIN navbar_footer -->
+ </div>
+ <div id="content">
+ <h1 class="articletitle">{current_app_title}</h1>
+ <div id="articlecontent">
<!-- END navbar_footer -->
<!-- BEGIN extra_blocks_header -->
- <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;}">
+ <div class="sidebox">
+ <h2 class="sideboxtitle">{lang_title}</h2>
+ <ul class="sideboxcontent"><!-- style="{list-style:
none inside; margin: 5px; padding: 10px; text-indent: -10px;}" -->
<!-- END extra_blocks_header -->
+
<!-- BEGIN extra_blocks_footer -->
-
</ul>
-
</td>
-
</tr>
- </table>
- <br />
+ </ul>
+ </div>
<!-- END extra_blocks_footer -->
<!-- BEGIN extra_block_row -->
-
<li><span class="star">{icon_or_star}</span> <a
href="{item_link}">{lang_item}</a></li>
+ <li style="list-style-image:
url('{list_style_image}');"><a href="{item_link}">{lang_item}</a></li>
<!-- END extra_block_row -->
<!-- BEGIN extra_block_spacer -->
-
<br /> <!-- style="{heigh: 1px; border-width 0px 0px 0px 0px;
border-color: #FF9933; border-style: solid; color: #FF9933; text-align: center;
width: 50%;}" /> -->
+ <li class="empty_item"> </li>
<!-- END extra_block_spacer -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/templates/idots footer.tpl head.inc.ph...,
Dave Hall <=