[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/templates/idots head.tpl navbar.inc.ph...
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] phpgwapi/templates/idots head.tpl navbar.inc.ph... |
|
Date: |
Sun, 06 Aug 2006 12:49:48 +0000 |
CVSROOT: /cvsroot/phpgwapi
Module name: phpgwapi
Changes by: Dave Hall <skwashd> 06/08/06 12:49:48
Modified files:
templates/idots: head.tpl navbar.inc.php navbar.tpl
templates/idots/doc: CHANGELOG README TODO
Log message:
more fixes and updates
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/idots/head.tpl?cvsroot=phpgwapi&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/idots/navbar.inc.php?cvsroot=phpgwapi&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/idots/navbar.tpl?cvsroot=phpgwapi&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/idots/doc/CHANGELOG?cvsroot=phpgwapi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/idots/doc/README?cvsroot=phpgwapi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/idots/doc/TODO?cvsroot=phpgwapi&r1=1.4&r2=1.5
Patches:
Index: head.tpl
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/idots/head.tpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- head.tpl 6 Aug 2006 04:51:27 -0000 1.11
+++ head.tpl 6 Aug 2006 12:49:48 -0000 1.12
@@ -1,27 +1,26 @@
-<!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 HTML 4.01//EN"
+ "http://www.w3.org/TR/html4/strict.dtd";>
<!-- 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}" />
+ <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" />
+ <link href="{theme_style}" type="text/css" rel="StyleSheet">
<!-- END theme_stylesheet -->
<title>{website_title}</title>
{javascript}
<script type="text/javascript">
- //<!--
-
+ <!--
var strBaseURL = '{str_base_url}';
-
{win_on_events}
- //-->
+ -->
</script>
</head>
<body>
Index: navbar.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/idots/navbar.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- navbar.inc.php 6 Aug 2006 04:51:27 -0000 1.13
+++ navbar.inc.php 6 Aug 2006 12:49:48 -0000 1.14
@@ -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.13 2006/08/06 04:51:27 skwashd Exp $
+ * @version $Id: navbar.inc.php,v 1.14 2006/08/06 12:49:48 skwashd Exp $
*/
@@ -153,16 +153,16 @@
* @param string $file
* @param boolean $use_lang
*/
- function display_sidebox($appname, $menu_title, $file, $use_lang = True)
+ function display_sidebox($appname, $menu_title, $file, $use_lang = true)
{
- if(!$appname || ($appname ==
$GLOBALS['phpgw_info']['flags']['currentapp'] && $file))
+ if(!$appname || ($appname ==
$GLOBALS['phpgw_info']['flags']['currentapp'] && is_array($file) ) )
{
$var['lang_title'] = $menu_title;
$GLOBALS['phpgw']->template->set_var($var);
$GLOBALS['phpgw']->template->pfp('out','extra_blocks_header');
- foreach($file as $item)
+ foreach ( $file as $item )
{
if ( !isset($item['image']) )
{
@@ -171,7 +171,7 @@
sidebox_menu_item($item['url'], $item['text'],
$item['image'], $use_lang);
}
-
$GLOBALS['phpgw']->template->pparse('out','extra_blocks_footer');
+
$GLOBALS['phpgw']->template->pfp('out','extra_blocks_footer');
}
}
@@ -188,17 +188,17 @@
{
if($item_text == '_NewLine_')
{
-
$GLOBALS['phpgw']->template->pparse('out','extra_block_spacer');
+
$GLOBALS['phpgw']->template->pfp('out','extra_block_spacer');
}
else
{
$GLOBALS['phpgw']->template->set_var(array
(
'list_style_image' => ($item_image ?
"url('{$item_image}')" : 'none'),
- 'lang_item' => ($use_lang ?
lang($item_text) : $item_text),
+ 'lang_item' => $use_lang ?
lang($item_text) : $item_text,
'item_link' => $item_link
));
-
$GLOBALS['phpgw']->template->pparse('out','extra_block_row');
+
$GLOBALS['phpgw']->template->pfp('out','extra_block_row');
}
}
@@ -216,7 +216,6 @@
$GLOBALS['phpgw']->template->set_root(PHPGW_TEMPLATE_DIR);
$GLOBALS['phpgw']->template->set_file('footer', 'footer.tpl');
-
$var = array
(
'img_root' =>
$GLOBALS['phpgw_info']['server']['webserver_url'] .
'/phpgwapi/templates/idots/images',
Index: navbar.tpl
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/idots/navbar.tpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- navbar.tpl 12 Apr 2006 10:41:12 -0000 1.10
+++ navbar.tpl 6 Aug 2006 12:49:48 -0000 1.11
@@ -3,12 +3,12 @@
<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>
+ <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}" /><br />
+ <img src="{img_app}"
alt="{alt_img_app}"><br>
{app_name}
</a>
</li>
Index: doc/CHANGELOG
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/idots/doc/CHANGELOG,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- doc/CHANGELOG 30 Dec 2004 06:47:34 -0000 1.4
+++ doc/CHANGELOG 6 Aug 2006 12:49:48 -0000 1.5
@@ -1,3 +1,11 @@
+Jul/Aug 2006
+- Move to pure CSS layout
+- Grab new KDE Crystal SVG theme icons
+- Remove need for background behind icons
+- Make design work with error_reporting(A_ALL)
+- Remove all references to $GLOBALS['phpgw_info']['theme']
+- Fix 0.9.17 API issues
+
Fri Apr 18 01:51:00 CEST 2003
- resize icons to 32x32
- renamed css file for better compatibility
Index: doc/README
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/idots/doc/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- doc/README 30 Dec 2004 06:47:34 -0000 1.4
+++ doc/README 6 Aug 2006 12:49:48 -0000 1.5
@@ -5,24 +5,13 @@
+++++++++++++++++++++++++++++++++++++++++++++++++++
The template set idots, formaly known as MYiDOTS is
-havely based on the Crystal Icon theme from
+havely based on the Crystal SVG icon KDE theme from
Everaldo.
- APPLICATION ICONS
-===================================================
-Because of a bug in Internet Explorer which causes
-it to display transpancy in PNG's as black I gave
-all icons a background.
-
-Everybody is encouraged to make more icons for the
-idots template set. Please don't use gif as Image
-type because this filetype in not an open standard
-
-The source Gimp-files can be found in
-phpgwapi/templates/idots/source/
-
-The logo source file can also be found in the above
-directory.
+The source Gimp files for the phpGW created compoents
+of the template can be found in
+phpgwapi/templates/idots/source/ The logo source
+file can also be found in the same directory.
APPLICATION HOOKS
===================================================
@@ -31,11 +20,10 @@
applications template hook files can be found in
phpgwapi/templates/idots/hook_templates/
+In 0.9.18+ all template sets should support the
+"sidebox" menu.
Hope you enjoy this template set,
-Pim Snel
-
-
-
-
+Template Originally designed by Pim Snel
+Now maintained by Dave Hall
Index: doc/TODO
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/idots/doc/TODO,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- doc/TODO 30 Dec 2004 06:47:34 -0000 1.4
+++ doc/TODO 6 Aug 2006 12:49:48 -0000 1.5
@@ -1,5 +1 @@
-- validate css and make valid CSS
-- validate html and make valid html 4.01
-- remove phpBB.org code etc...
-- a lot of icons
- some sort of template-set configuration (maybe create a fake app???)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/templates/idots head.tpl navbar.inc.ph...,
Dave Hall <=