Changeset 3500

Timestamp:

11/11/10 16:43:49 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #1398 - possibilita a carga do login.css do template e do tema.

Location:

branches/2.2/phpgwapi/templates/default

Files:

• login.tpl (modified) (1 diff)
• login_default.php (modified) (1 diff)

branches/2.2/phpgwapi/templates/default/login.tpl

@@ -8 +8 @@
 <META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">
 <META NAME="keywords" CONTENT="{website_title} login screen, eGroupWare, groupware, groupware suite">
-<link href="{login_css}" rel="stylesheet" type="text/css" />
+{login_css}
 <TITLE>{website_title} - {lang_login}</TITLE>
 <script language="Javascript">

branches/2.2/phpgwapi/templates/default/login_default.php

@@ -367 +367 @@
         $tmpl->set_var('template_set', $template);
 
-        // if there is a login.css for the theme, use it
-        // otherwise use login.css from the template
-        $login_css = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/' . $template
-                                . '/themes/' . $GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '/login.css';
-        if(!file_exists('./'.$login_css))
-        {
-                $login_css = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/' .$template. '/login.css';
+        // loads the template's login.css
+        // and then the theme's login.css (if any)
+        $template_dir = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/' . $template;
+        $login_dir = $template_dir . '/login.css';
+        $login_css = "<link href='" . $login_dir . "' rel='stylesheet' type='text/css' />";
+        $login_dir = $template_dir . '/themes/' . $GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '/login.css';
+        if(file_exists('./'.$login_dir))
+        {
+                $login_css .= "<link href='" . $login_dir . "' rel='stylesheet' type='text/css' />";
         }
         $tmpl->set_var('login_css',$login_css);