[Fmsystem-commits] [7905] Login: replace undescore with space in domain name

[Sigurd Nes]

Revision: 7905
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7905
Author:   sigurdne
Date:     2011-10-20 12:08:18 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
Login: replace undescore with space in domain name

Modified Paths:
--------------
    trunk/phpgwapi/inc/sso/include_login.inc.php
    trunk/phpgwapi/templates/base/login.tpl

Modified: trunk/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- trunk/phpgwapi/inc/sso/include_login.inc.php        2011-10-20 08:50:21 UTC 
(rev 7904)
+++ trunk/phpgwapi/inc/sso/include_login.inc.php        2011-10-20 12:08:18 UTC 
(rev 7905)
@@ -284,6 +284,7 @@
                                foreach($GLOBALS['phpgw_domain'] as 
$domain_name => $domain_vars)
                                {
                                        $this->tmpl->set_var('domain_name', 
$domain_name);
+                                       
$this->tmpl->set_var('domain_display_name', str_replace('_', ' ', 
$domain_name));
 
                                        if (isset($_COOKIE['last_domain']) && 
$_COOKIE['last_domain'] == $domain_name)
                                        {

Modified: trunk/phpgwapi/templates/base/login.tpl
===================================================================
--- trunk/phpgwapi/templates/base/login.tpl     2011-10-20 08:50:21 UTC (rev 
7904)
+++ trunk/phpgwapi/templates/base/login.tpl     2011-10-20 12:08:18 UTC (rev 
7905)
@@ -115,7 +115,7 @@
                                                                <label 
for="logindomain">{lang_domain}</label>
                                                                <select 
name="logindomain" id="logindomain" class="inputbox">
                                                                        <!-- 
BEGIN domain_option -->
-                                                                       <option 
value="{domain_name}" {domain_selected}>{domain_name}</option>
+                                                                       <option 
value="{domain_name}" {domain_selected}>{domain_display_name}</option>
                                                                        <!-- 
END domain_option -->
                                                                </select>
                                                                </p>