[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/templates idots/head.inc.php idots/hea...
From: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] phpgwapi/templates idots/head.inc.php idots/hea... |
Date: |
Sun, 23 Apr 2006 09:54:34 +0000 |
CVSROOT: /sources/phpgwapi
Module name: phpgwapi
Branch:
Changes by: Sigurd Nes <address@hidden> 06/04/23 09:54:34
Modified files:
templates/idots: head.inc.php head.tpl
templates/justweb: head.inc.php head.tpl
templates/linux-at-work.de: head.inc.php head.tpl
templates/verdilak: head.inc.php
Log message:
charset from lang
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/idots/head.inc.php.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/idots/head.tpl.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/justweb/head.inc.php.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/justweb/head.tpl.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/linux-at-work.de/head.inc.php.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/linux-at-work.de/head.tpl.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/verdilak/head.inc.php.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
Patches:
Index: phpgwapi/templates/idots/head.inc.php
diff -u phpgwapi/templates/idots/head.inc.php:1.8
phpgwapi/templates/idots/head.inc.php:1.9
--- phpgwapi/templates/idots/head.inc.php:1.8 Wed Apr 12 10:41:12 2006
+++ phpgwapi/templates/idots/head.inc.php Sun Apr 23 09:54:34 2006
@@ -52,6 +52,7 @@
'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
+ 'charset' => lang('charset'),
'font_family' => $GLOBALS['phpgw_info']['theme']['font'],
'str_base_url' => $GLOBALS['phpgw']->link('/'),
'website_title' =>
$GLOBALS['phpgw_info']['server']['site_title'].$app,
Index: phpgwapi/templates/idots/head.tpl
diff -u phpgwapi/templates/idots/head.tpl:1.7
phpgwapi/templates/idots/head.tpl:1.8
--- phpgwapi/templates/idots/head.tpl:1.7 Wed Apr 12 10:41:12 2006
+++ phpgwapi/templates/idots/head.tpl Sun Apr 23 09:54:34 2006
@@ -2,7 +2,7 @@
<!-- BEGIN head -->
<html>
<head>
- <meta http-equiv="Content-Type" content="text/html;
charset=utf-8" />
+ <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" />
Index: phpgwapi/templates/justweb/head.inc.php
diff -u phpgwapi/templates/justweb/head.inc.php:1.19
phpgwapi/templates/justweb/head.inc.php:1.20
--- phpgwapi/templates/justweb/head.inc.php:1.19 Mon Mar 27 13:38:10 2006
+++ phpgwapi/templates/justweb/head.inc.php Sun Apr 23 09:54:34 2006
@@ -24,6 +24,7 @@
$var = Array (
'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
+ 'charset' => lang('charset'),
'webserver_url' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
'home' =>
$GLOBALS['phpgw']->link('/index.php'),
'appt' =>
$GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.uicalendar.day')),
Index: phpgwapi/templates/justweb/head.tpl
diff -u phpgwapi/templates/justweb/head.tpl:1.13
phpgwapi/templates/justweb/head.tpl:1.14
--- phpgwapi/templates/justweb/head.tpl:1.13 Mon Mar 27 13:38:10 2006
+++ phpgwapi/templates/justweb/head.tpl Sun Apr 23 09:54:34 2006
@@ -3,7 +3,7 @@
<!-- BEGIN head -->
<html>
<head>
- <meta http-equiv="Content-Type" content="text/html;
charset={utf-8}" />
+ <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" />
Index: phpgwapi/templates/linux-at-work.de/head.inc.php
diff -u phpgwapi/templates/linux-at-work.de/head.inc.php:1.8
phpgwapi/templates/linux-at-work.de/head.inc.php:1.9
--- phpgwapi/templates/linux-at-work.de/head.inc.php:1.8 Mon Mar 27
13:38:10 2006
+++ phpgwapi/templates/linux-at-work.de/head.inc.php Sun Apr 23 09:54:34 2006
@@ -5,7 +5,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
* @package phpgwapi
* @subpackage gui
-* @version $Id: head.inc.php,v 1.8 2006/03/27 13:38:10 skwashd Exp $
+* @version $Id: head.inc.php,v 1.9 2006/04/23 09:54:34 sigurdne Exp $
*/
$p = createobject('phpgwapi.preferences');
$preferences = $p->read_repository();
@@ -29,6 +29,7 @@
(
'img_icon' => PHPGW_IMAGES_DIR.'/favicon.ico',
'img_shortcut' =>
PHPGW_IMAGES_DIR.'/favicon.ico',
+ 'charset' => lang('charset'),
'website_title' =>
$GLOBALS['phpgw_info']['server']['site_title'],
'app_name' => $app,
'bg_color' =>
$GLOBALS['phpgw_info']['theme']['bg_color'],
Index: phpgwapi/templates/linux-at-work.de/head.tpl
diff -u phpgwapi/templates/linux-at-work.de/head.tpl:1.9
phpgwapi/templates/linux-at-work.de/head.tpl:1.10
--- phpgwapi/templates/linux-at-work.de/head.tpl:1.9 Mon Mar 27 13:38:10 2006
+++ phpgwapi/templates/linux-at-work.de/head.tpl Sun Apr 23 09:54:34 2006
@@ -3,7 +3,7 @@
<!-- BEGIN head -->
<html>
<head>
- <meta http-equiv="Content-Type" content="text/html;
charset={utf-8}" />
+ <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" />
@@ -34,4 +34,4 @@
{java_script}
<title>{website_title} - {app_name}</TITLE>
</head>
- <body>
\ No newline at end of file
+ <body>
Index: phpgwapi/templates/verdilak/head.inc.php
diff -u phpgwapi/templates/verdilak/head.inc.php:1.17
phpgwapi/templates/verdilak/head.inc.php:1.18
--- phpgwapi/templates/verdilak/head.inc.php:1.17 Mon Mar 27 13:38:10 2006
+++ phpgwapi/templates/verdilak/head.inc.php Sun Apr 23 09:54:34 2006
@@ -5,7 +5,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage gui
- * @version $Id: head.inc.php,v 1.17 2006/03/27 13:38:10 skwashd Exp $
+ * @version $Id: head.inc.php,v 1.18 2006/04/23 09:54:34 sigurdne Exp $
*/
$bodyheader = ' bgcolor="' .
$GLOBALS['phpgw_info']['theme']['bg_color'] . '" alink="'
@@ -35,6 +35,7 @@
'css' => $GLOBALS['phpgw']->common->get_css(),
'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
+ 'charset' => lang('charset'),
'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
'str_base_url' => $GLOBALS['phpgw']->link('/'),
'theme_css' => $css_ref,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/templates idots/head.inc.php idots/hea...,
Sigurd Nes <=