From 0851b8fa6a05bcfc0925400c2270985deba96d1a Mon Sep 17 00:00:00 2001 From: Pim Snel Date: Tue, 14 Oct 2003 11:59:10 +0000 Subject: [PATCH] new favicon --- phpgwapi/templates/idots/login.tpl | 97 ++++++++++++-- .../templates/idots/login_selectdomain.tpl | 121 ++++++++++-------- 2 files changed, 156 insertions(+), 62 deletions(-) diff --git a/phpgwapi/templates/idots/login.tpl b/phpgwapi/templates/idots/login.tpl index d725d61d46..3ceb3767bf 100755 --- a/phpgwapi/templates/idots/login.tpl +++ b/phpgwapi/templates/idots/login.tpl @@ -1,18 +1,54 @@ - - - - - - + + + + + + -{website_title} - Login - - + + +{website_title} - Login + + +
{logo_title} -
{lang_message}
+
+
+
{lang_message}

 

+<<<<<<< login.tpl + + + + + +
{website_title}
+
+ + + + + +
+======= @@ -24,9 +60,25 @@
+ + + + + + + + + + + + +======= @@ -40,7 +92,25 @@ +>>>>>>> 1.8 +<<<<<<< login.tpl + + + + +
+>>>>>>> 1.8 {cd}
+<<<<<<< login.tpl +
 
{lang_username}:  
{lang_password}: 
{lang_password}:   
+ +
+ + +
+ + + +=======
@@ -76,11 +146,14 @@ document.login_form.login.focus(); //--> +>>>>>>> 1.8
-Valid HTML 4.01 -Valid CSS + Valid HTML 4.01 + Valid CSS
+
eGroupWare {version}
+ diff --git a/phpgwapi/templates/idots/login_selectdomain.tpl b/phpgwapi/templates/idots/login_selectdomain.tpl index f1c63ab75e..f02a1fa924 100755 --- a/phpgwapi/templates/idots/login_selectdomain.tpl +++ b/phpgwapi/templates/idots/login_selectdomain.tpl @@ -1,70 +1,91 @@ - - - - - - + + + + + + -{website_title} - Login - - + + +{website_title} - Login + + +
{logo_title} -
{lang_message}
+
+
+
{lang_message}

 

- - - - - - - -
{website_title}
-
+ + + + + + + +
{website_title}
+ - - - + +
+ + + - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + - - -
{cd}
-
{lang_username}: 
{lang_password}: 
{lang_username}: 
{lang_password}:   
+
-
- +
+ + +
+ + -
Valid HTML 4.01 Valid CSS
eGroupWare {version}
+