diff --git a/phpgwapi/templates/default/about.tpl b/phpgwapi/templates/default/about.tpl index 5025075b93..f37f061d33 100644 --- a/phpgwapi/templates/default/about.tpl +++ b/phpgwapi/templates/default/about.tpl @@ -1,7 +1,7 @@ diff --git a/phpgwapi/templates/default/config.tpl b/phpgwapi/templates/default/config.tpl index a911360b4d..ad75c0ad72 100644 --- a/phpgwapi/templates/default/config.tpl +++ b/phpgwapi/templates/default/config.tpl @@ -22,7 +22,7 @@ - + diff --git a/phpgwapi/templates/default/login.tpl b/phpgwapi/templates/default/login.tpl index 5031a3542b..19726015e8 100644 --- a/phpgwapi/templates/default/login.tpl +++ b/phpgwapi/templates/default/login.tpl @@ -13,7 +13,7 @@ -{logo_title} +{logo_title}

 

{lang_message}

 

diff --git a/phpgwapi/templates/idots/login.tpl b/phpgwapi/templates/idots/login.tpl index 5cb152591c..9c9c5298d5 100755 --- a/phpgwapi/templates/idots/login.tpl +++ b/phpgwapi/templates/idots/login.tpl @@ -34,7 +34,7 @@ - +
diff --git a/phpgwapi/templates/idots/navbar.inc.php b/phpgwapi/templates/idots/navbar.inc.php index a8a15dcc00..c819b63a75 100644 --- a/phpgwapi/templates/idots/navbar.inc.php +++ b/phpgwapi/templates/idots/navbar.inc.php @@ -180,7 +180,7 @@ } $var['logo_file'] = $GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo'); - $var['logo_url'] = $GLOBALS['phpgw_info']['server']['login_logo_url']?$GLOBALS['phpgw_info']['server']['login_logo_url']:'www.eGroupWare.org'; + $var['logo_url'] = $GLOBALS['phpgw_info']['server']['login_logo_url']?$GLOBALS['phpgw_info']['server']['login_logo_url']:'http://www.eGroupWare.org'; $var['logo_title'] = $GLOBALS['phpgw_info']['server']['login_logo_title']?$GLOBALS['phpgw_info']['server']['login_logo_title']:'www.eGroupWare.org'; $GLOBALS['idots_tpl']->set_var($var); diff --git a/phpgwapi/templates/idots/navbar.tpl b/phpgwapi/templates/idots/navbar.tpl index c0129b617d..239164f29d 100644 --- a/phpgwapi/templates/idots/navbar.tpl +++ b/phpgwapi/templates/idots/navbar.tpl @@ -1,5 +1,5 @@ - + {app_extra_icons_div} diff --git a/phpgwapi/templates/idsociety/about.tpl b/phpgwapi/templates/idsociety/about.tpl index 54d268c5a9..f0b9bbfbe0 100644 --- a/phpgwapi/templates/idsociety/about.tpl +++ b/phpgwapi/templates/idsociety/about.tpl @@ -1,7 +1,7 @@
- logo + logo
{lang_Enter_the_location_of_phpGroupWare's_URL.
Example:_http://www.domain.com/phpgroupware_ _or_ _/phpgroupware
No_trailing_slash}:		{lang_Enter_the_location_of_eGroupWare's_URL.
Example:_http://www.domain.com/egroupware_ _or_ _/egroupware
No_trailing_slash}:
@@ -11,7 +11,7 @@ - + diff --git a/phpgwapi/templates/idsociety/images/logo.gif b/phpgwapi/templates/idsociety/images/logo.gif deleted file mode 100644 index c92ed389ee..0000000000 Binary files a/phpgwapi/templates/idsociety/images/logo.gif and /dev/null differ diff --git a/phpgwapi/templates/idsociety/images/logo.png b/phpgwapi/templates/idsociety/images/logo.png deleted file mode 100644 index a143d6ff1e..0000000000 Binary files a/phpgwapi/templates/idsociety/images/logo.png and /dev/null differ diff --git a/phpgwapi/templates/idsociety/images/logo2.gif b/phpgwapi/templates/idsociety/images/logo2.gif deleted file mode 100644 index 64b06ba154..0000000000 Binary files a/phpgwapi/templates/idsociety/images/logo2.gif and /dev/null differ diff --git a/phpgwapi/templates/idsociety/images/logo2.png b/phpgwapi/templates/idsociety/images/logo2.png deleted file mode 100644 index 949c30d07c..0000000000 Binary files a/phpgwapi/templates/idsociety/images/logo2.png and /dev/null differ diff --git a/phpgwapi/templates/idsociety/images/logo_reversed.gif b/phpgwapi/templates/idsociety/images/logo_reversed.gif deleted file mode 100755 index ff637c4318..0000000000 Binary files a/phpgwapi/templates/idsociety/images/logo_reversed.gif and /dev/null differ diff --git a/phpgwapi/templates/idsociety/images/logo_reversed.png b/phpgwapi/templates/idsociety/images/logo_reversed.png deleted file mode 100644 index 3ccb514899..0000000000 Binary files a/phpgwapi/templates/idsociety/images/logo_reversed.png and /dev/null differ diff --git a/phpgwapi/templates/idsociety/login.tpl b/phpgwapi/templates/idsociety/login.tpl index 833f30adfc..060a1b1eed 100644 --- a/phpgwapi/templates/idsociety/login.tpl +++ b/phpgwapi/templates/idsociety/login.tpl @@ -2,10 +2,10 @@ - - + + - +
- +
{phpgw_version}
phpGroupWare is a multi-user, web-based groupware suite written in PHP.eGroupWare is a multi-user, web-based groupware suite written in PHP.