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

diff --combined portal/templates/registration_view.html
index e92503e,6b41691..8ddf072
--- 1/portal/templates/registration_view.html
--- 2/portal/templates/registration_view.html
+++ b/portal/templates/registration_view.html
@@@ -4,8 -4,8 +4,8 @@@
  <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}}/jquery.validate.js"></script> 
 -<script type="text/javascript" src="{{STATIC_URL}}/my_account.register.js"></script>
 +<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 %}        
@@@ -32,15 -32,15 +32,15 @@@
        <label for="firstname" class="col-md-4 control-label">First Name</label>
        <div class="col-md-4">
        <input type="text" name="firstname" class="required form-control" minlength="2" value="{{ firstname }}" placeholder="First Name" />
-       <p class="hint">Enter your first name</p>
        </div>
+       <div class="col-md-4"> <p class="form-hint">Enter your first name</p> </div>
      </div>
      <div class="form-group">
        <label for="lastname" class="col-md-4 control-label">Last Name</label>
        <div class="col-md-4">
        <input type="text" name="lastname" size="25" class="required form-control" minlength="2" value="{{ lastname }}" placeholder="Last Name" />
-       <p class="hint">Enter your last name</p>
        </div>
+       <div class="col-md-4"><p class="form-hint">Enter your last name</p></div>
      </div>
      <div class="form-group">
        <label for="auth_list" class="col-md-4 control-label">Authority</label>
@@@ -50,31 -50,31 +50,31 @@@
          <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="col-md-4"><p class="form-hint">Please select an authority responsible for vetting your account</p></div>
      </div>
      
      <div class="form-group">
        <label for="email" class="col-md-4 control-label">Email</label>
        <div class="col-md-4">
        <input type="email" name="email" size="25"  class="required form-control" value="{{ email }}"/> 
-       <p class="hint">Enter a valid email address</p>
        </div>
+       <div class="col-md-4"><p class="form-hint">Enter a valid email address</p></div>
      </div>
      <div class="form-group">
        <label for="password" class="col-md-4 control-label">Password</label>
        <div class="col-md-4">
        <input type="password"  id="password" name="password"   class="required form-control" minlength="4" value="{{ password }}"/> 
-       <p class="hint">Enter password</p>
        </div>
+       <div class="col-md-4"><p class="form-hint">Enter password</p></div>
      </div>
      <div class="form-group">
        <label for="password" class="col-md-4 control-label">Confirm Password</label>
        <div class="col-md-4">
        <input type="password"  id="confirmpassword" name="confirmpassword"   minlength="4" class="required form-control" 
               value="" placeholder="Confirm Password"/>
-       <p class="hint">Retype the password</p>
        </div>
+       <div class="col-md-4"><p class="form-hint">Retype the password</p></div>
      </div>
      <div class="form-group">
        <label for="question" class="col-md-4 control-label">My Keys</label>
@@@ -83,16 -83,16 +83,16 @@@
          <option value="generate">Generate key pairs for me </option>
          <option value="upload">Upload my public key </option>
        </select>
-       <p class="hint">Genkey: Account Delegation Automatic (Recommended)</p> 
        </div>
+       <div class="col-md-4"><p class="form-hint">Genkey: Account Delegation Automatic (Recommended)</p> </div>
      </div>
      <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="required" id="user_public_key"/>
-       <p class="hint">Account Delegation: Manual (Advanced Users)</p>
        <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>
      </div>
      <div class="form-group" id="register">
        <div class="col-md-offset-4 col-md-4">