Merge branch 'master' of git://git.onelab.eu/myslice

[unfold.git] / portal / templates / registration_view.html

diff --git a/portal/templates/registration_view.html b/portal/templates/registration_view.html
index cc5e86d..039a07a 100644 (file)
--- a/portal/templates/registration_view.html
+++ b/portal/templates/registration_view.html
@@ -1,13 +1,5 @@
 {% extends "layout-unfold1.html" %}
 
-{% block head %}
-<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/onelab.css" />
-<!-- xxx ideally only onelab.css but ... xxx -->
-<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/registration.css" />
-<script type="text/javascript" src="{{STATIC_URL}}/js/jquery.validate.js"></script> 
-<script type="text/javascript" src="{{STATIC_URL}}/js/my_account.register.js"></script>
-{% endblock %}                              
-                                    
 {% block unfold1_main %}        
 
 <div class="onelab-title well well-lg">
@@ -24,7 +16,7 @@
 {% endif %}
    
 <div class="well">
-  <form class="cmxform form-horizontal" id="registrationForm" method="post" action="" enctype="multipart/form-data" role="form">
+ <form class="cmxform form-horizontal" id="registrationForm" method="post" action="" enctype="multipart/form-data" role="form">
     <fieldset>
     {% csrf_token %}
     <div class="form-group">
@@ -47,7 +39,8 @@
        <select id="auth_list" name="authority_hrn" size="1" class="form-control" required>
          {% if authorities %}
          {% for authority in authorities %}
-         <option value="{{ authority.authority_hrn }}">{{authority.name}} ({{authority.authority_hrn}})</option>
+      <option value="{{ authority.authority_hrn }}"/>{{authority.authority_hrn}}</option>
+         <!-- <option value="{{ authority.authority_hrn }}">{{authority.name}} ({{authority.authority_hrn}})</option> -->
          {% endfor %}
          {% else %} <!-- should not happen -->
          <option value="test">No authority found !!! </option>
@@ -92,7 +85,7 @@
     <div class="form-group" style="display:none;" id="upload_key">
       <label for="file" class="col-md-4 control-label">Upload public key</label>
       <div class="col-md-4">
-       <input type="file" name="user_public_key" class="form-control" id="user_public_key"/>
+       <input type="file" name="user_public_key" class="form-control" id="user_public_key" required/>
        <p class="warning" id="pkey_del_msg">Once your account is validated, you will have to delegate your credentials manually using SFA [Advanced users only]</p>
       </div>
       <div class="col-md-4"><p class="form-hint">Account Delegation: Manual (Advanced Users)</p></div>
@@ -104,6 +97,7 @@
     </div>
   </fieldset>
   </form>  
+>>>>>>> abb43f86edd5a2888cb96ca92a58350db9e32fcf
 </div>
 
 {% endblock %}