X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fregister_4m_f4f.html;h=46fe09e5f20e31d8a73cf8d3833a0f9058d9bf70;hb=a8a54f34297f76d9379070f0fd2c1bec9f761c47;hp=d23654dcd4e86028a2e3aa957f2eb6e5cb82d13c;hpb=1f92a901985650da63f023930dd069cc671c2c74;p=myslice.git

diff --git a/portal/templates/register_4m_f4f.html b/portal/templates/register_4m_f4f.html
index d23654dc..46fe09e5 100644
--- a/portal/templates/register_4m_f4f.html
+++ b/portal/templates/register_4m_f4f.html
@@ -10,52 +10,67 @@
 
 
 
+{% if errors %}
+        <ul>
+            {% for error in errors %}
+            <li>{{ error }}</li>
+            {% endfor %}
+        </ul>
+    {% endif %}
 
 
-
-
-
-<form class="cmxform" id="commentForm" method="post" action="reg_process" enctype="multipart/form-data" >
+<form class="cmxform" id="commentForm" method="post" action="" enctype="multipart/form-data" >
 {% csrf_token %}
  <fieldset>
-    <div class="fed4fireTitle">
+    <div class="OneLabTitle">
         <h2>OneLab Experimenter Registration</h2>
         <h3>For First Line Support please <a href="/portal/contact" >Contact Support</a></h3>
     </div>
    
    <div class="field">
      <label for="cname">First Name</label>
-     <input type="text" id="firstname" name="firstname" size="25" class="required" minlength="2" value="{{ form.field.value|default_if_none:"" }}" /> 
+     <input type="text" id="firstname" name="firstname" size="25" class="required" minlength="2" value="{{ firstname}}" /> 
      <p class="hint">Enter your first name</p>
      <?php echo $errfName;?>
    </div>
    <div class="field">
      <label for="lname">Last Name</label>
-     <input type="text" id="lastname" name="lastname" size="25" class="required" minlength="2" value="{{ form.field.value|default_if_none:"" }}"/> 
+     <input type="text" id="lastname" name="lastname" size="25" class="required" minlength="2" value="{{ lastname }}"/> 
      <p class="hint">Enter your last name</p>
      <?php echo $errlName;?>
    </div>
    <div class="field">
      <label for="aff_list">Affiliation</label>
-     <input type="text" id="aff_list" name="affiliation" size="25" class="required"  value="{{ form.field.value|default_if_none:"" }}"/> 
+     <input type="text" id="aff_list" name="affiliation" size="25" class="required"  value="{{ affiliation }}"/> 
      <p class="hint">Enter your Institution name</p>
      <?php echo $erraffiliation;?>
    </div>
+
+    <div class="field">
+      <label for="auth_list">Authority</label>
+      <select id="auth_list" name="authority_hrn" size="1" class="required">
+        {% for authority in authorities %}
+        <option value="{{ authority.authority_hrn }}"/>{{authority.name}} ({{authority.authority_hrn}})</option>
+        {% endfor %}
+     </select>
+     <p class="hint">Please select an authority responsible for vetting your account</p>
+   </div>
+
    <div class="field">
      <label for="cemail">Email</label>
-     <input type="text" id="email" name="email" size="25"  class="required email" value="{{ form.field.value|default_if_none:"" }}"/> 
+     <input type="text" id="email" name="email" size="25"  class="required email" value="{{ email }}"/> 
      <p class="hint">Enter a valid email address</p>
      <?php echo $errEmail; ?>
    </div>
    <div class="field">
      <label for="password">Password</label>
-     <input type="password"  id="password" name="password"   class="required" minlength="4" value="{{ form.field.value|default_if_none:"" }}"/> 
+     <input type="password"  id="password" name="password"   class="required" minlength="4" value="{{ password }}"/> 
      <p class="hint">Enter password</p>
      <?php //echo $errPass;?>
    </div>
    <div class="field">
      <label for="password">Confirm Password</label>
-     <input type="password"  id="confirmpassword" name="confirmpassword"   minlength="4" class="required" value='{{ form.field.value|default_if_none:"" }}'/>
+     <input type="password"  id="confirmpassword" name="confirmpassword"   minlength="4" class="required" value=""/>
      <p class="hint">Retype the password</p>
    </div>
    <div class="field">
@@ -68,7 +83,7 @@
    </div>
    <div class="field" style="display:none;" id="upload_key">
       <label for="file">Upload public key</label>
-      <input type="file" name="user_public_key" id="user_public_key"/>
+      <input type="file" name="user_public_key" class="required" id="user_public_key"/>
       <p class="hint">Upload a valid public key</p>
    </div>
    <div class="field">