phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] phpgwapi/templates base/accounts_popup.tpl base...


From: Sigurd Nes
Subject: [Phpgroupware-cvs] phpgwapi/templates base/accounts_popup.tpl base...
Date: Mon, 24 Apr 2006 09:49:26 +0000

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/04/24 09:49:25

Modified files:
        templates/base : accounts_popup.tpl addressbook-js-frameset.tpl 
                         addressbook-js-smaller.tpl addressbook-js.tpl 
                         login.tpl login_denylogin.tpl 
        templates/desktop: head.inc.php head.tpl login.tpl 
                           login_selectdomain.tpl 
        templates/idots: head.inc.php head.tpl 
        templates/idsociety: head.inc.php head.tpl 
        templates/justweb: head.inc.php head.tpl 
        templates/linux-at-work.de: head.inc.php head.tpl 
        templates/probusiness: head.inc.php head.tpl 
        templates/simple: head.inc.php head.tpl 
        templates/verdilak: head.inc.php head.tpl 

Log message:
        hardcoded utf-8 in templates

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/base/accounts_popup.tpl.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/base/addressbook-js-frameset.tpl.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/base/addressbook-js-smaller.tpl.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/base/addressbook-js.tpl.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/base/login.tpl.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/base/login_denylogin.tpl.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/desktop/head.inc.php.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/desktop/head.tpl.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/desktop/login.tpl.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/desktop/login_selectdomain.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.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/idots/head.tpl.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/idsociety/head.inc.php.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/idsociety/head.tpl.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/justweb/head.inc.php.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/justweb/head.tpl.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/linux-at-work.de/head.inc.php.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/linux-at-work.de/head.tpl.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/probusiness/head.inc.php.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/probusiness/head.tpl.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/simple/head.inc.php.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/simple/head.tpl.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/verdilak/head.inc.php.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/verdilak/head.tpl.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: phpgwapi/templates/base/accounts_popup.tpl
diff -u phpgwapi/templates/base/accounts_popup.tpl:1.2 
phpgwapi/templates/base/accounts_popup.tpl:1.3
--- phpgwapi/templates/base/accounts_popup.tpl:1.2      Thu Dec 30 06:47:33 2004
+++ phpgwapi/templates/base/accounts_popup.tpl  Mon Apr 24 09:49:25 2006
@@ -1,9 +1,9 @@
-<!-- $Id: accounts_popup.tpl,v 1.2 2004/12/30 06:47:33 skwashd Exp $ -->
+<!-- $Id: accounts_popup.tpl,v 1.3 2006/04/24 09:49:25 sigurdne Exp $ -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" 
"http://www.w3.org/TR/REC-html40/loose.dtd";>
 <HTML LANG="en">
 <head>
 <title>{title}</title>
-<meta http-equiv="content-type" content="text/html"; charset="{charset}">
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
 
 <script LANGUAGE="JavaScript">
        var userSelectBox = 
opener.document.forms["app_form"].elements['{select_name};
Index: phpgwapi/templates/base/addressbook-js-frameset.tpl
diff -u phpgwapi/templates/base/addressbook-js-frameset.tpl:1.2 
phpgwapi/templates/base/addressbook-js-frameset.tpl:1.3
--- phpgwapi/templates/base/addressbook-js-frameset.tpl:1.2     Thu Dec 30 
06:47:33 2004
+++ phpgwapi/templates/base/addressbook-js-frameset.tpl Mon Apr 24 09:49:25 2006
@@ -2,7 +2,7 @@
 <html>
        <head>
        <meta http-equiv="CONTENT-TYPE"
-       content="text/html; charset={charset}">
+       content="text/html; charset=utf-8">
        <title>{title}</title>
        <STYLE TYPE="text/css">
                SELECT { font-size: {widget_font_size}; }
Index: phpgwapi/templates/base/addressbook-js-smaller.tpl
diff -u phpgwapi/templates/base/addressbook-js-smaller.tpl:1.2 
phpgwapi/templates/base/addressbook-js-smaller.tpl:1.3
--- phpgwapi/templates/base/addressbook-js-smaller.tpl:1.2      Thu Dec 30 
06:47:34 2004
+++ phpgwapi/templates/base/addressbook-js-smaller.tpl  Mon Apr 24 09:49:25 2006
@@ -2,7 +2,7 @@
 <html>
 <head>
          
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset={charset}">
+  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
   <title>{title}</title>
                   
   <script src="%7Binclude_link%7D"> </script>
Index: phpgwapi/templates/base/addressbook-js.tpl
diff -u phpgwapi/templates/base/addressbook-js.tpl:1.2 
phpgwapi/templates/base/addressbook-js.tpl:1.3
--- phpgwapi/templates/base/addressbook-js.tpl:1.2      Thu Dec 30 06:47:34 2004
+++ phpgwapi/templates/base/addressbook-js.tpl  Mon Apr 24 09:49:25 2006
@@ -3,7 +3,7 @@
 <head>
      
   <meta http-equiv="CONTENT-TYPE"
-        content="text/html; charset={charset}">
+        content="text/html; charset=utf-8">
   <STYLE TYPE="text/css">
        SELECT { font-size: {widget_font_size};}
        INPUT{ font-size: {widget_font_size};}
Index: phpgwapi/templates/base/login.tpl
diff -u phpgwapi/templates/base/login.tpl:1.7 
phpgwapi/templates/base/login.tpl:1.8
--- phpgwapi/templates/base/login.tpl:1.7       Sun Mar 19 20:27:11 2006
+++ phpgwapi/templates/base/login.tpl   Mon Apr 24 09:49:25 2006
@@ -3,7 +3,7 @@
 <html>
 <!-- BEGIN login_form -->
 <head>
-       <meta http-equiv="Content-Type" content="text/html; charset={charset}" 
/>
+       <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
        <meta name="author" content="phpGroupWare http://www.phpgroupware.org"; 
/>
        <meta name="description" content="{website_title} login screen, working 
environment powered by phpGroupWare" />
        <meta name="keywords" content="{website_title} login screen, 
phpgroupware, groupware, groupware suite" />
Index: phpgwapi/templates/base/login_denylogin.tpl
diff -u phpgwapi/templates/base/login_denylogin.tpl:1.4 
phpgwapi/templates/base/login_denylogin.tpl:1.5
--- phpgwapi/templates/base/login_denylogin.tpl:1.4     Fri Jan 21 08:33:17 2005
+++ phpgwapi/templates/base/login_denylogin.tpl Mon Apr 24 09:49:25 2006
@@ -3,7 +3,7 @@
 <html>
 <!-- BEGIN login_form -->
 <head>
-       <meta http-equiv="Content-Type" content="text/html; charset={charset}" 
/>
+       <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
        <meta name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org"; 
/>
        <meta name="description" content="{website_title} login screen, working 
environment powered by phpGroupWare" />
        <meta name="keywords" content="{website_title} login screen, 
phpgroupware, groupware, groupware suite" />
Index: phpgwapi/templates/desktop/head.inc.php
diff -u phpgwapi/templates/desktop/head.inc.php:1.6 
phpgwapi/templates/desktop/head.inc.php:1.7
--- phpgwapi/templates/desktop/head.inc.php:1.6 Tue Feb 14 10:01:05 2006
+++ phpgwapi/templates/desktop/head.inc.php     Mon Apr 24 09:49:25 2006
@@ -9,7 +9,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id: head.inc.php,v 1.6 2006/02/14 10:01:05 skwashd Exp $ */
+  /* $Id: head.inc.php,v 1.7 2006/04/24 09:49:25 sigurdne Exp $ */
 
        $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
        $tpl->set_unknowns('remove');
@@ -41,7 +41,6 @@
        $var = Array (
                'img_icon'      => PHPGW_IMAGES_DIR . '/favicon.ico',
                'img_shortcut'  => PHPGW_IMAGES_DIR . '/favicon.ico',
-               'charset'       => lang('charset'),
                'font_family'   => $GLOBALS['phpgw_info']['theme']['font'],
                'website_title' => 
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
                'body_tags'     => 
$GLOBALS['phpgw']->common->get_body_attribs(),
Index: phpgwapi/templates/desktop/head.tpl
diff -u phpgwapi/templates/desktop/head.tpl:1.4 
phpgwapi/templates/desktop/head.tpl:1.5
--- phpgwapi/templates/desktop/head.tpl:1.4     Sun May 15 02:10:56 2005
+++ phpgwapi/templates/desktop/head.tpl Mon Apr 24 09:49:25 2006
@@ -3,7 +3,7 @@
 <!-- BEGIN head -->
 <html>
        <head>
-               <meta http-equiv="Content-Type" content="text/html; 
charset={charset}" />
+               <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" />
Index: phpgwapi/templates/desktop/login.tpl
diff -u phpgwapi/templates/desktop/login.tpl:1.4 
phpgwapi/templates/desktop/login.tpl:1.5
--- phpgwapi/templates/desktop/login.tpl:1.4    Sun May 15 02:10:56 2005
+++ phpgwapi/templates/desktop/login.tpl        Mon Apr 24 09:49:25 2006
@@ -3,7 +3,7 @@
 <!-- BEGIN login_form -->
 <head>
 
-<meta http-equiv="Content-Type" content="text/html; charset={charset}" />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org"; />
 <meta name="description" content="{website_title} login screen, working 
environment powered by phpGroupWare" />
 <meta name="keywords" content="{website_title} login screen, phpgroupware, 
groupware, groupware suite" />
Index: phpgwapi/templates/desktop/login_selectdomain.tpl
diff -u phpgwapi/templates/desktop/login_selectdomain.tpl:1.4 
phpgwapi/templates/desktop/login_selectdomain.tpl:1.5
--- phpgwapi/templates/desktop/login_selectdomain.tpl:1.4       Sun May 15 
02:10:56 2005
+++ phpgwapi/templates/desktop/login_selectdomain.tpl   Mon Apr 24 09:49:25 2006
@@ -3,7 +3,7 @@
 <!-- BEGIN login_form -->
 <head>
 
-<meta http-equiv="Content-Type" content="text/html; charset={charset}" />
+<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 login screen" />
 <meta name="keywords" content="phpGroupWare login screen" />
Index: phpgwapi/templates/idots/head.inc.php
diff -u phpgwapi/templates/idots/head.inc.php:1.9 
phpgwapi/templates/idots/head.inc.php:1.10
--- phpgwapi/templates/idots/head.inc.php:1.9   Sun Apr 23 09:54:34 2006
+++ phpgwapi/templates/idots/head.inc.php       Mon Apr 24 09:49:25 2006
@@ -52,7 +52,6 @@
                '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.8 
phpgwapi/templates/idots/head.tpl:1.9
--- phpgwapi/templates/idots/head.tpl:1.8       Sun Apr 23 09:54:34 2006
+++ phpgwapi/templates/idots/head.tpl   Mon Apr 24 09:49:25 2006
@@ -2,7 +2,7 @@
 <!-- BEGIN head -->
 <html>
        <head>
-               <meta http-equiv="Content-Type" content="text/html; 
charset={charset}" />
+               <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" />
Index: phpgwapi/templates/idsociety/head.inc.php
diff -u phpgwapi/templates/idsociety/head.inc.php:1.18 
phpgwapi/templates/idsociety/head.inc.php:1.19
--- phpgwapi/templates/idsociety/head.inc.php:1.18      Mon Mar 27 13:38:10 2006
+++ phpgwapi/templates/idsociety/head.inc.php   Mon Apr 24 09:49:25 2006
@@ -19,7 +19,6 @@
        $var = Array (
                'img_icon'      => PHPGW_IMAGES_DIR . '/favicon.ico',
                'img_shortcut'  => PHPGW_IMAGES_DIR . '/favicon.ico',
-               'charset'       => lang('charset'),
                'font_family'   => $GLOBALS['phpgw_info']['theme']['font'],
                'website_title' => 
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
                'body_tags'     => $bodyheader,
Index: phpgwapi/templates/idsociety/head.tpl
diff -u phpgwapi/templates/idsociety/head.tpl:1.15 
phpgwapi/templates/idsociety/head.tpl:1.16
--- phpgwapi/templates/idsociety/head.tpl:1.15  Thu Dec 30 07:22:20 2004
+++ phpgwapi/templates/idsociety/head.tpl       Mon Apr 24 09:49:25 2006
@@ -2,7 +2,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <HTML>
 <HEAD>
-<META http-equiv="Content-Type" content="text/html; charset={charset}">
+<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">
Index: phpgwapi/templates/justweb/head.inc.php
diff -u phpgwapi/templates/justweb/head.inc.php:1.20 
phpgwapi/templates/justweb/head.inc.php:1.21
--- phpgwapi/templates/justweb/head.inc.php:1.20        Sun Apr 23 09:54:34 2006
+++ phpgwapi/templates/justweb/head.inc.php     Mon Apr 24 09:49:25 2006
@@ -24,7 +24,6 @@
        $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.14 
phpgwapi/templates/justweb/head.tpl:1.15
--- phpgwapi/templates/justweb/head.tpl:1.14    Sun Apr 23 09:54:34 2006
+++ phpgwapi/templates/justweb/head.tpl Mon Apr 24 09:49:25 2006
@@ -3,7 +3,7 @@
 <!-- BEGIN head -->
 <html>
        <head>
-               <meta http-equiv="Content-Type" content="text/html; 
charset={charset}" />
+               <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" />
Index: phpgwapi/templates/linux-at-work.de/head.inc.php
diff -u phpgwapi/templates/linux-at-work.de/head.inc.php:1.9 
phpgwapi/templates/linux-at-work.de/head.inc.php:1.10
--- phpgwapi/templates/linux-at-work.de/head.inc.php:1.9        Sun Apr 23 
09:54:34 2006
+++ phpgwapi/templates/linux-at-work.de/head.inc.php    Mon Apr 24 09:49:25 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.9 2006/04/23 09:54:34 sigurdne Exp $
+* @version $Id: head.inc.php,v 1.10 2006/04/24 09:49:25 sigurdne Exp $
 */
        $p = createobject('phpgwapi.preferences');
        $preferences = $p->read_repository();
@@ -29,7 +29,6 @@
                        (
                                '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.10 
phpgwapi/templates/linux-at-work.de/head.tpl:1.11
--- phpgwapi/templates/linux-at-work.de/head.tpl:1.10   Sun Apr 23 09:54:34 2006
+++ phpgwapi/templates/linux-at-work.de/head.tpl        Mon Apr 24 09:49:25 2006
@@ -3,7 +3,7 @@
 <!-- BEGIN head -->
 <html>
        <head>
-               <meta http-equiv="Content-Type" content="text/html; 
charset={charset}" />
+               <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" />
Index: phpgwapi/templates/probusiness/head.inc.php
diff -u phpgwapi/templates/probusiness/head.inc.php:1.4 
phpgwapi/templates/probusiness/head.inc.php:1.5
--- phpgwapi/templates/probusiness/head.inc.php:1.4     Mon Mar 27 13:38:10 2006
+++ phpgwapi/templates/probusiness/head.inc.php Mon Apr 24 09:49:25 2006
@@ -7,7 +7,7 @@
  * @license http://www.fsf.org/licenses/gpl.html GNU General Public License
  * @package phpgwapi
  * @subpackage gui
- * @version $Id: head.inc.php,v 1.4 2006/03/27 13:38:10 skwashd Exp $
+ * @version $Id: head.inc.php,v 1.5 2006/04/24 09:49:25 sigurdne Exp $
  */
        
        $app_css = $java_script = '';
@@ -35,7 +35,6 @@
        $var = Array (
                                'img_icon'      => PHPGW_IMAGES_DIR . 
'/favicon.ico',
                                'img_shortcut'  => PHPGW_IMAGES_DIR . 
'/favicon.ico',
-                               'charset'       => lang('charset'),
                                'font_family'   => 
$GLOBALS['phpgw_info']['theme']['font'],
                                'website_title' => 
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
                                'theme_css'     => $css_ref,
Index: phpgwapi/templates/probusiness/head.tpl
diff -u phpgwapi/templates/probusiness/head.tpl:1.3 
phpgwapi/templates/probusiness/head.tpl:1.4
--- phpgwapi/templates/probusiness/head.tpl:1.3 Mon Mar 27 13:38:10 2006
+++ phpgwapi/templates/probusiness/head.tpl     Mon Apr 24 09:49:25 2006
@@ -2,7 +2,7 @@
 <!-- BEGIN head -->
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml";>
        <head>
-               <meta http-equiv="Content-Type" content="text/html; 
charset={charset}" />
+               <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" />
Index: phpgwapi/templates/simple/head.inc.php
diff -u phpgwapi/templates/simple/head.inc.php:1.3 
phpgwapi/templates/simple/head.inc.php:1.4
--- phpgwapi/templates/simple/head.inc.php:1.3  Thu Apr 28 08:11:59 2005
+++ phpgwapi/templates/simple/head.inc.php      Mon Apr 24 09:49:25 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.3 2005/04/28 08:11:59 powerstat Exp $
+       * @version $Id: head.inc.php,v 1.4 2006/04/24 09:49:25 sigurdne Exp $
        */
 
        $bodyheader = 
'BGCOLOR="'.$GLOBALS['phpgw_info']['theme']['bg_color'].'"';
@@ -24,7 +24,6 @@
        $var = Array (
                'img_icon'      => PHPGW_IMAGES_DIR . '/favicon.ico',
                'img_shortcut'  => PHPGW_IMAGES_DIR . '/favicon.ico',
-               'charset'       => lang('charset'),
                'font_family'   => $GLOBALS['phpgw_info']['theme']['font'],
                'website_title' => 
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
                'body_tags'     => $bodyheader . 
$GLOBALS['phpgw']->common->get_body_attribs(),
Index: phpgwapi/templates/simple/head.tpl
diff -u phpgwapi/templates/simple/head.tpl:1.2 
phpgwapi/templates/simple/head.tpl:1.3
--- phpgwapi/templates/simple/head.tpl:1.2      Thu Dec 30 06:47:35 2004
+++ phpgwapi/templates/simple/head.tpl  Mon Apr 24 09:49:25 2006
@@ -2,7 +2,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <HTML>
 <HEAD>
-<META http-equiv="Content-Type" content="text/html; charset={charset}">
+<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">
Index: phpgwapi/templates/verdilak/head.inc.php
diff -u phpgwapi/templates/verdilak/head.inc.php:1.18 
phpgwapi/templates/verdilak/head.inc.php:1.19
--- phpgwapi/templates/verdilak/head.inc.php:1.18       Sun Apr 23 09:54:34 2006
+++ phpgwapi/templates/verdilak/head.inc.php    Mon Apr 24 09:49:25 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.18 2006/04/23 09:54:34 sigurdne Exp $
+       * @version $Id: head.inc.php,v 1.19 2006/04/24 09:49:25 sigurdne Exp $
        */
 
        $bodyheader = ' bgcolor="' . 
$GLOBALS['phpgw_info']['theme']['bg_color'] . '" alink="'
@@ -35,7 +35,6 @@
                '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,
Index: phpgwapi/templates/verdilak/head.tpl
diff -u phpgwapi/templates/verdilak/head.tpl:1.11 
phpgwapi/templates/verdilak/head.tpl:1.12
--- phpgwapi/templates/verdilak/head.tpl:1.11   Mon Mar 27 13:38:10 2006
+++ phpgwapi/templates/verdilak/head.tpl        Mon Apr 24 09:49:25 2006
@@ -3,7 +3,7 @@
 <!-- BEGIN head -->
 <html>
        <head>
-               <meta http-equiv="Content-Type" content="text/html; 
charset={charset}" />
+               <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" />




reply via email to

[Prev in Thread] Current Thread [Next in Thread]