From 5fc390a75c375ef76c0ea4131bbaa6fa66e2c455 Mon Sep 17 00:00:00 2001 From: seek3r Date: Tue, 9 Jan 2001 18:58:34 +0000 Subject: [PATCH] moved tags to templates, Im making the core html compliant, and added a greybar on the rightside --- phpgwapi/inc/phpgw_common.inc.php | 28 +---- phpgwapi/templates/default/head.inc.php | 25 ++++ phpgwapi/templates/default/head.tpl | 23 ++++ phpgwapi/templates/default/login.tpl | 103 +++++++++-------- .../templates/default/login_denylogin.tpl | 16 +-- .../templates/default/login_selectdomain.tpl | 107 ++++++++++-------- phpgwapi/templates/verdilak/head.inc.php | 25 ++++ phpgwapi/templates/verdilak/head.tpl | 23 ++++ phpgwapi/templates/verdilak/images/endbar.gif | Bin 0 -> 105 bytes phpgwapi/templates/verdilak/login.tpl | 104 +++++++++-------- .../templates/verdilak/login_denylogin.tpl | 16 +-- .../templates/verdilak/login_selectdomain.tpl | 107 ++++++++++-------- 12 files changed, 339 insertions(+), 238 deletions(-) create mode 100644 phpgwapi/templates/default/head.inc.php create mode 100644 phpgwapi/templates/default/head.tpl create mode 100644 phpgwapi/templates/verdilak/head.inc.php create mode 100644 phpgwapi/templates/verdilak/head.tpl create mode 100644 phpgwapi/templates/verdilak/images/endbar.gif diff --git a/phpgwapi/inc/phpgw_common.inc.php b/phpgwapi/inc/phpgw_common.inc.php index e6da129505..565f13b5c6 100644 --- a/phpgwapi/inc/phpgw_common.inc.php +++ b/phpgwapi/inc/phpgw_common.inc.php @@ -454,32 +454,10 @@ } function phpgw_header() { - global $phpgw, $phpgw_info, $HTMLCOMPLAINT; + global $phpgw, $phpgw_info; - echo " "; - echo ""; - echo ""; - echo "".$phpgw_info["server"]["site_title"].""; - echo "translation->translate("charset")."\">"; - echo ""; - echo ""; - if ($phpgw_info["server"]["htmlcompliant"]) { - echo ("\n"); - } else { - echo ("\n"); - } + include($phpgw_info["server"]["include_root"] . "/phpgwapi/templates/" + . $phpgw_info["server"]["template_set"] . "/head.inc.php"); $this->navbar(False); include($phpgw_info["server"]["include_root"] . "/phpgwapi/templates/" . $phpgw_info["server"]["template_set"] . "/navbar.inc.php"); diff --git a/phpgwapi/templates/default/head.inc.php b/phpgwapi/templates/default/head.inc.php new file mode 100644 index 0000000000..239819cb4e --- /dev/null +++ b/phpgwapi/templates/default/head.inc.php @@ -0,0 +1,25 @@ +set_unknowns("remove"); + $tpl->set_file(array("head" => "head.tpl")); + $tpl->set_var("website_title", $phpgw_info["server"]["site_title"]); + $tpl->set_var("body_tags",$bodyheader); + echo $tpl->finish($tpl->parse("out","head")); diff --git a/phpgwapi/templates/default/head.tpl b/phpgwapi/templates/default/head.tpl new file mode 100644 index 0000000000..e40f8953ce --- /dev/null +++ b/phpgwapi/templates/default/head.tpl @@ -0,0 +1,23 @@ + + + + + + + + + + +{website_title} + + + diff --git a/phpgwapi/templates/default/login.tpl b/phpgwapi/templates/default/login.tpl index 3d5159ba37..675bba910e 100644 --- a/phpgwapi/templates/default/login.tpl +++ b/phpgwapi/templates/default/login.tpl @@ -1,60 +1,67 @@ + + - - - {website_title} - Login - + - + + + + + +{website_title} - Login + + +

 

-
{lang_message}
+
{lang_message}

 

- - - + +
- - - - - - + +
- phpGroupWare -
+ + + - -
+ + + + + + - -
+ phpGroupWare +
-
- - - + +
+ + + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - -
{cd} -
{lang_username}: 
{lang_password}: 
+
{lang_username}: 
{lang_password}: 
-
+
{version} -
- +
+ -
-
+
+
- + diff --git a/phpgwapi/templates/default/login_denylogin.tpl b/phpgwapi/templates/default/login_denylogin.tpl index 378f3338c2..d678da7e46 100644 --- a/phpgwapi/templates/default/login_denylogin.tpl +++ b/phpgwapi/templates/default/login_denylogin.tpl @@ -1,14 +1,14 @@ - -phpGroupWare + +phpGroupWare - - - + +
+ + + - -
Opps! You caught us in the middle of a system upgrade.
Please, check back with us shortly. -
+
diff --git a/phpgwapi/templates/default/login_selectdomain.tpl b/phpgwapi/templates/default/login_selectdomain.tpl index 166fb2698c..044a799723 100644 --- a/phpgwapi/templates/default/login_selectdomain.tpl +++ b/phpgwapi/templates/default/login_selectdomain.tpl @@ -1,63 +1,70 @@ + + - - - {website_title} - Login - + - - phpGroupWare + + + + + +{website_title} - Login + + + + phpGroupWare

 

-
{lang_message}
+
{lang_message}

 

- - - + +
- - - + +
+ + + - -
+ + + - - - + + + - -
 {lang_phpgw_login} -
+
-
- - - + +
+ + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - -
{cd} -
{lang_username}: @ 
{lang_password}: 
+
{lang_username}: @ 
{lang_password}: 
-
+
{version} -
- +
+ -
-
+
+
- + diff --git a/phpgwapi/templates/verdilak/head.inc.php b/phpgwapi/templates/verdilak/head.inc.php new file mode 100644 index 0000000000..239819cb4e --- /dev/null +++ b/phpgwapi/templates/verdilak/head.inc.php @@ -0,0 +1,25 @@ +set_unknowns("remove"); + $tpl->set_file(array("head" => "head.tpl")); + $tpl->set_var("website_title", $phpgw_info["server"]["site_title"]); + $tpl->set_var("body_tags",$bodyheader); + echo $tpl->finish($tpl->parse("out","head")); diff --git a/phpgwapi/templates/verdilak/head.tpl b/phpgwapi/templates/verdilak/head.tpl new file mode 100644 index 0000000000..e40f8953ce --- /dev/null +++ b/phpgwapi/templates/verdilak/head.tpl @@ -0,0 +1,23 @@ + + + + + + + + + + +{website_title} + + + diff --git a/phpgwapi/templates/verdilak/images/endbar.gif b/phpgwapi/templates/verdilak/images/endbar.gif new file mode 100644 index 0000000000000000000000000000000000000000..7212e84ed94d28797d3df627f11cbdada82120fd GIT binary patch literal 105 zcmZ?wbhEHb1rzY1)w>A{*z1QY@#5^dCW0Iz( H8-q0fh{!CE literal 0 HcmV?d00001 diff --git a/phpgwapi/templates/verdilak/login.tpl b/phpgwapi/templates/verdilak/login.tpl index ae57755324..675bba910e 100644 --- a/phpgwapi/templates/verdilak/login.tpl +++ b/phpgwapi/templates/verdilak/login.tpl @@ -1,61 +1,67 @@ + + - - - {website_title} - Login - + - - phpGroupWare + + + + + +{website_title} - Login + + +

 

-
{lang_message}
+
{lang_message}

 

- - - + +
- - - - - - + +
-  {lang_phpgw_login} -
+ + + - -
+ + + + + + - -
+ phpGroupWare +
-
- - - + +
+ + + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - -
{cd} -
{lang_username}: 
{lang_password}: 
+
{lang_username}: 
{lang_password}: 
-
+
{version} -
- +
+ -
-
+
+
- + diff --git a/phpgwapi/templates/verdilak/login_denylogin.tpl b/phpgwapi/templates/verdilak/login_denylogin.tpl index 378f3338c2..d678da7e46 100644 --- a/phpgwapi/templates/verdilak/login_denylogin.tpl +++ b/phpgwapi/templates/verdilak/login_denylogin.tpl @@ -1,14 +1,14 @@ - -phpGroupWare + +phpGroupWare - - - + +
+ + + - -
Opps! You caught us in the middle of a system upgrade.
Please, check back with us shortly. -
+
diff --git a/phpgwapi/templates/verdilak/login_selectdomain.tpl b/phpgwapi/templates/verdilak/login_selectdomain.tpl index 166fb2698c..044a799723 100644 --- a/phpgwapi/templates/verdilak/login_selectdomain.tpl +++ b/phpgwapi/templates/verdilak/login_selectdomain.tpl @@ -1,63 +1,70 @@ + + - - - {website_title} - Login - + - - phpGroupWare + + + + + +{website_title} - Login + + + + phpGroupWare

 

-
{lang_message}
+
{lang_message}

 

- - - + +
- - - + +
+ + + - -
+ + + - - - + + + - -
 {lang_phpgw_login} -
+
-
- - - + +
+ + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - -
{cd} -
{lang_username}: @ 
{lang_password}: 
+
{lang_username}: @ 
{lang_password}: 
-
+
{version} -
- +
+ -
-
+
+
- +