diff --git a/index.php b/index.php index 9e99af69eb..caa8967d82 100755 --- a/index.php +++ b/index.php @@ -35,7 +35,6 @@ "frame_body" => "frames_body.tpl", "frame_navbar" => "frames_navbar.tpl" )); - $tpl->set_var("navbar_link",$phpgw->link("index.php","navbarframe=True&cd=yes")); if ($forward) { $tpl->set_var("body_link",$phpgw->link($phpgw_info["server"]["webserver_url"] . $forward)); @@ -157,4 +156,4 @@ common->phpgw_footer(); -?> +?> \ No newline at end of file diff --git a/login.php b/login.php index 496b579db4..f807052b0a 100755 --- a/login.php +++ b/login.php @@ -159,7 +159,7 @@ $tmpl->set_var("version",$phpgw_info["server"]["versions"]["phpgwapi"]); $tmpl->set_var("lang_password","password"); $tmpl->set_var("lang_login","login"); - + $tmpl->set_var("template_set","default"); $tmpl->parse("loginout", "login_form"); $tmpl->p("loginout"); -?> +?> \ No newline at end of file diff --git a/phpGroupWare.jpg b/phpGroupWare.jpg deleted file mode 100644 index 4a3ffbfdba..0000000000 Binary files a/phpGroupWare.jpg and /dev/null differ diff --git a/phpgwapi/templates/default/images/logo.gif b/phpgwapi/templates/default/images/logo.gif new file mode 100644 index 0000000000..6d91eb6af5 Binary files /dev/null and b/phpgwapi/templates/default/images/logo.gif differ diff --git a/phpgwapi/templates/default/login.tpl b/phpgwapi/templates/default/login.tpl index ae57755324..a9f8dfb365 100644 --- a/phpgwapi/templates/default/login.tpl +++ b/phpgwapi/templates/default/login.tpl @@ -5,7 +5,7 @@
- +
diff --git a/phpgwapi/templates/verdilak/images/logo.gif b/phpgwapi/templates/verdilak/images/logo.gif index 3d52af195e..6d91eb6af5 100644 Binary files a/phpgwapi/templates/verdilak/images/logo.gif and b/phpgwapi/templates/verdilak/images/logo.gif differ