X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fcore%2Fpassword_prompt.tpl;h=8ea84de0024038054e0bdc84a9990b0440a968f4;hb=96b778a679b261235ede8c5c4e7356680f4e5895;hp=f5b7bdc86a38a988c9a1afcfd84938434e7d2998;hpb=9f52839d4a55c6b59ab80af35026a064e007ac72;p=platal.git

diff --git a/templates/core/password_prompt.tpl b/templates/core/password_prompt.tpl
index f5b7bdc..8ea84de 100644
--- 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-2014 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -20,14 +20,18 @@
 {*                                                                        *}
 {**************************************************************************}
 
-{if t($referer) || $platal->pl_self() neq 'login'}
+{if t($external_auth) || $platal->pl_self() neq 'login'}
 <h1>
   Accès restreint
 </h1>
 <p>
   Bonjour,<br />
-  la page que vous avez demandée
-  (<strong>{if $referer}{$smarty.server.HTTP_REFERER}{else}{$globals->baseurl}/{$platal->pl_self()}{/if}</strong>)
+  {if t($group)}
+    le site du groupe {$group}
+  {else}
+    la page que vous avez demandée
+  {/if}
+  (<strong>{if t($external_auth)}{$ext_url|truncate:120:"...":false}{else}{$globals->baseurl}/{$platal->pl_self()}{/if}</strong>)
   nécessite une authentification.
 </p>
 {else}
@@ -47,19 +51,10 @@
     </tr>
     <tr style="white-space: nowrap">
       <td class="titre">
-        Identifiant&nbsp;:
+        Identifiant ou email&nbsp;:
       </td>
       <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}>
-            @ {#globals.mail.alias_dom#} / {#globals.mail.alias_dom2#}
-          </option>
-          <option value="ax" {if t($smarty.cookies.ORGdomain) eq "ax"}selected="selected"{/if}>
-            Identifiant
-          </option>
-        </select>
+        <input type="text" name="username" size="40" maxlength="100" value="{insert name="getUserName"}" />
       </td>
     </tr>
     <tr>
@@ -88,14 +83,13 @@
     </tr>
     <tr>
       <td colspan="2">
-      <table width="100%"><tr>
-      <td>
-        <a href="recovery">Mot de passe perdu&nbsp;?</a>
-      </td>
-      <td class="right">
-        <input type="submit" name="submitbtn" value="Me connecter" />
-      </td>
-      </tr></table>
+        <span style="float: left">
+        Mot de passe perdu&nbsp;:
+        <a href="recovery">Étudiants et diplômés de l'X</a> |
+        <a href="recovery/ext">Extérieurs</a>
+        </span>
+
+        <input type="submit" name="submitbtn" value="Me connecter" style="float: right" />
       </td>
     </tr>
   </table>
@@ -159,7 +153,9 @@
     <input type="hidden" name="xorpass"   value="" />
     <input type="hidden" name="username"  value="" />
     <input type="hidden" name="remember"  value="" />
-    <input type="hidden" name="domain"    value="" />
+    {if t($external_auth)}
+      <input type="hidden" name="external_auth" value="1" />
+    {/if}
   </div>
 </form>
 
@@ -176,4 +172,4 @@
 </script>
 {/literal}
 
-{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}
+{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *}