Merge branch 'xorg/master' into xorg/f/xnet-accounts

[platal.git] / templates / core / password_prompt.tpl

diff --git a/templates/core/password_prompt.tpl b/templates/core/password_prompt.tpl
index f5b7bdc..420fd2a 100644 (file)
--- a/templates/core/password_prompt.tpl
+++ b/templates/core/password_prompt.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2011 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -52,11 +52,11 @@
       <td>
         <input type="text" name="username" size="20" maxlength="50" value="{insert name="getUserName"}" />
         <select name="domain">
-          <option value="login">@ {#globals.mail.domain#} / {#globals.mail.domain2#}</option>
-          <option value="alias" {if t($smarty.cookies.ORGdomain) eq "alias"}selected="selected"{/if}>
+          <option value="login">@alumni. {#globals.mail.domain#} / {#globals.mail.domain2#}</option>
+          <option value="alias" {if t($smarty.cookies.ORGdomain) && $smarty.cookies.ORGdomain eq "alias"}selected="selected"{/if}>
             @ {#globals.mail.alias_dom#} / {#globals.mail.alias_dom2#}
           </option>
-          <option value="ax" {if t($smarty.cookies.ORGdomain) eq "ax"}selected="selected"{/if}>
+          <option value="ax" {if t($smarty.cookies.ORGdomain) && $smarty.cookies.ORGdomain eq "ax"}selected="selected"{/if}>
             Identifiant
           </option>
         </select>