X-Git-Url: https://scm.cri.ensmp.fr/git/Plinn.git/blobdiff_plain/8e173562277498c20ff8f0c92ba9cef3ec0273f7..2701c45ef3dd3b77599ced2495ba3955e354a17e:/Products/Plinn/skins/custom_generic/join_template.pt

diff --git a/Products/Plinn/skins/custom_generic/join_template.pt b/Products/Plinn/skins/custom_generic/join_template.pt
index f681d76..d5deaca 100644
--- a/Products/Plinn/skins/custom_generic/join_template.pt
+++ b/Products/Plinn/skins/custom_generic/join_template.pt
@@ -9,32 +9,34 @@
     <metal:slot metal:fill-slot="main_no_tabs"
                 i18n:domain="plinn"
                 tal:define="form options/form">
-      <h1 tal:content="options/title" i18n:translate="">Become a member</h1>
+      <h1 i18n:translate="">Become a member</h1>
       <div class="Desktop">
-        <tal:case tal:condition="options/isOrdinaryMember">
-          <p i18n:translate="">
-            You are already a member. You may use the <a
-            href="personalize_form">personalization form</a> to change your
-            membership information.
-         </p>
-        </tal:case>
-        <tal:case tal:condition="python:options['isNewMember'] and options['isAnonRegistration']">
+        <p tal:condition="options/isOrdinaryMember" i18n:translate="">
+            You are already authenticated. You may use the
+            <a tal:attributes="href string:$portal_url/personalize_form"
+               i18n:name="personalize_form"
+               i18n:translate="">personalization form</a>
+            to change your personal informations.
+        </p>
+        
+        <div tal:condition="python:options['isNewMember'] and options['isAnonRegistration']">
           <p i18n:translate="">You have been registered as a member.</p>
           <p tal:condition="options/validate_email" i18n:translate="">
-            You will receive an email shortly containing your password and
-            instructions on how to activate your membership.
+            You will receive an email shortly. Please follow sent instructions
+            to complete your registration.
           </p>
           <tal:case tal:condition="not: options/validate_email">
             <p i18n:translate="">Click the button to log in immediately.</p>
-            <form tal:attributes="action form/action">
+            <form tal:attributes="action form/action" method="post">
               <input type="hidden" name="__ac_name" tal:attributes="value options/member_id"/>
               <input type="hidden" name="__ac_password" tal:attributes="value options/password"/>
               <input type="hidden" name="noAjax" value="1"/>
               <metal:macro metal:use-macro="context/form_widgets/macros/buttons"/>
             </form>
           </tal:case>
-        </tal:case>
-        <tal:case tal:condition="python:options['isNewMember'] and options['isReviewedRegistration']">
+        </div>
+        
+        <div tal:condition="python:options['isNewMember'] and options['isReviewedRegistration']">
           <p i18n:translate="">Your registration request has been taken into account.</p>
           <p tal:condition="options/validate_email" i18n:translate="">
             Your request will be reviewed soon by a portal administrator. You
@@ -49,85 +51,82 @@
           <p>
             <a href="" tal:attributes="href options/portal_url" i18n:translate="">Return to homepage</a>
           </p>
-        </tal:case>
-        <tal:case tal:condition="options/isAnon">
-          <p i18n:translate="">
-            Becoming a member gives you the ability to personalize the site and
-            participate in the community.
-          </p>
-          <p i18n:translate="">
-            It does not cost any money to become a member and your email and
-            other personal information will remain private.
-          </p>
-          <p tal:condition="options/validate_email" i18n:translate="">
-            You must submit a valid email address. This address will be used to
-            send you a randomly-generated password. Once you have logged in
-            with this password, you may change it to anything you like.
-          </p>
-        </tal:case>
-        <tal:case tal:condition="options/isAnonOrUserManager">
-          <form action="." method="post" tal:attributes="action form/action">
-            <table class="FormLayout">
+        </div>
+        
+        <div tal:condition="options/isAnon">
+          <form method="post" tal:attributes="action form/action" id="registration-form">
+            <table>
               <tr>
-                <th i18n:translate="">Member ID</th>
                 <td>
-                  <input type="text" name="member_id" size="30" tal:attributes="value options/member_id"/>
+                  <input type="text" name="given_name" size="30"
+                         placeholder="First name" i18n:attributes="placeholder"
+                         tal:attributes="value options/given_name|nothing"/>
                 </td>
-              </tr>
-              <tr>
-                <th i18n:translate="">First name</th>
                 <td>
-                  <input type="text" name="given_name" size="30" tal:attributes="value options/given_name|nothing"/>
+                  <input type="text" name="name" size="30"
+                         placeholder="Last name" i18n:attributes="placeholder"
+                         tal:attributes="value options/name|nothing"/>
                 </td>
               </tr>
               <tr>
-                <th i18n:translate="">Last name</th>
-                <td>
-                  <input type="text" name="name" size="30" tal:attributes="value options/name|nothing"/>
+                <td colspan="2">
+                  <input type="text" name="member_email" size="30"
+                         placeholder="Email address" i18n:attributes="placeholder"
+                         tal:attributes="value options/member_email|nothing"/>
+                  <label>
+                    <input type="checkbox" name="email_as_login" value="email_as_login"
+                           tal:attributes="checked python:options['email_as_login']"/>
+                    <span tal:omit-tag="" i18n:translate="">use as login</span>
+                  </label>
                 </td>
               </tr>
-              <tr>
-                <th i18n:translate="">Email Address</th>
-                <td>
-                  <input type="text" name="member_email" size="30" tal:attributes="value options/member_email"/>
+              <tr id="login-row"
+                  tal:attributes="class python:'hidden' if options['email_as_login'] else nothing">
+                <td colspan="2">
+                  <input type="text" name="member_id"
+                         placeholder="login" i18n:attributes="placeholder"
+                         tal:attributes="value options/member_id|nothing"/>
                 </td>
               </tr>
-              <tal:case tal:condition="not: options/validate_email">
-                <tr>
-                  <th i18n:translate="">Password</th>
-                  <td>
-                    <input type="password" name="password" size="30"/>
-                  </td>
-                </tr>
+              <tbody tal:condition="not: options/validate_email" tal:omit-tag="">
                 <tr>
-                  <th i18n:translate="">Password (confirm)</th>
-                  <td>
-                    <input type="password" name="confirm" size="30"/>
+                  <td colspan="2">
+                    <input type="password" name="password" size="25"
+                           placeholder="Password" i18n:attributes="placeholder"/>
                   </td>
                 </tr>
                 <tr>
-                  <th i18n:translate="">Mail Password?</th>
-                  <td>
-                    <input type="checkbox" name="send_password" id="cb_send_password" tal:attributes="checked options/send_password"/>
-                    <em>
-                      <label for="cb_send_password" i18n:translate="">
-                        Check this box to have the password mailed.
-                      </label>
-                    </em>
+                  <td colspan="2">
+                    <input type="password" name="confirm" size="25"
+                           placeholder="Password (confirm)" i18n:attributes="placeholder"/>
                   </td>
                 </tr>
-              </tal:case>
+              </tbody>
               <tr>
-                <td>
-                  <br/>
-                </td>
-                <td>
+                <td colspan="2">
                   <metal:macro metal:use-macro="context/form_widgets/macros/buttons"/>
                 </td>
               </tr>
             </table>
           </form>
-        </tal:case>
+          <script type="text/javascript">
+            (function(){
+              var login_row = document.getElementById('login-row');
+              var form = document.getElementById('registration-form');
+              var cb = form.elements.namedItem('email_as_login');
+              addListener(cb,
+                          'change',
+                          function(){
+                            if (cb.checked)
+                              login_row.className = 'hidden';
+                            else
+                              login_row.className = null;
+                          }
+                          );
+            }());
+          </script>
+        </div>
+        
       </div>
     </metal:slot>
   </body>