Regform+joinform: redesigned css

diff --git a/portal/templates/join_view.html b/portal/templates/join_view.html
index a581730..c93c45d 100644 (file)
--- a/portal/templates/join_view.html
+++ b/portal/templates/join_view.html
@@ -38,7 +38,7 @@
 <div class="row">
   
   {% csrf_token %}
-  <div class="col-md-6">
+  <div class="col-md-4">
        <h3>Organization</h3>
        
        <div class="form-group">
@@ -67,14 +67,14 @@
 
        <div class="form-group">  
         <input type="text" id="site_abbreviated_name" name="site_abbreviated_name" value="{{ site_abbreviated_name }}" style="width:200px" 
-               title="Maximum eight characters, joined, all lower case. Example: 'upmc' for Université Pierre et Marie Curie. This will be used by the system as an identifier for the organization." placeholder="Short name" maxlength="40" class="form-control" required>
+               title="Maximum eight characters, joined, all lower case. Example: 'upmc' for Université Pierre et Marie Curie. This will be used by the system as an identifier for the organization." placeholder="Short name" maxlength="8" class="form-control" required>
     </div>
        <div class="form-group">  
         <input type="text" id="site_url" name="site_url" value="{{ site_url }}" style="width:200px" placeholder="http://" maxlength="128" class="form-control" required>
     </div>
   </div>
   
-  <div class="col-md-6">
+  <div class="col-md-4">
        <h3>Manager</h3>
 
        <div class="form-group">
@@ -108,11 +108,9 @@
 
        </div>
 </div>
-<div class="row">
-       <div class="col-md-12" style="text-align:center;">
-               <button type="submit" class="btn btn-default" style="left: 300px; position: absolute;">Submit</button>
+       <div class="form-group" >
+               <button type="submit" class="btn btn-default">Submit</button>
        </div>
-</div>
 </form>
 <script>
 /*

diff --git a/portal/templates/registration_view.html b/portal/templates/registration_view.html
index 179ebf7..6fc4bf5 100644 (file)
--- a/portal/templates/registration_view.html
+++ b/portal/templates/registration_view.html
@@ -20,17 +20,17 @@
 </ul>
 {% endif %}
    
-<div class="row">
-       <div class="col-md-2"></div>
-       <div class="col-md-8">
-       <form class="cmxform form-horizontal" id="registrationForm" method="post" enctype="multipart/form-data" role="form">
-    {% csrf_token %}
+<form class="cmxform form-horizontal" id="registrationForm" method="post" enctype="multipart/form-data" role="form">
+{% csrf_token %}
        <div class="form-group">
                <label for="authority_hrn" class="control-label">Organization</label>
-               <input id="authority_hrn" name="authority_hrn" class="form-control" style="width:200px" value="{{ authority_hrn }}" required>
+               <input id="authority_hrn" name="authority_hrn" class="form-control" style="width:530px" value="{{ authority_hrn }}" required>
                <p class="help-block">Start typing to find the name of your organization (company or university).<br> If it is not in the list, <a href="/portal/join">please add it.</a></p>
        </div>
 
+       <div class="row">
+       <div class="col-md-4">
+
     <div class="form-group">
                <label for="firstname" class="control-label">Personal Information</label>
                <input type="text" name="firstname" class="form-control" style="width:200px" minlength="2" value="{{ firstname }}" placeholder="First Name" required />
@@ -39,10 +39,11 @@
                <input type="text" name="lastname" size="25" class="form-control" style="width:200px" minlength="2" value="{{ lastname }}" placeholder="Last Name" required />
     </div>
        <div class="form-group">
-       <input type="email" name="email" size="25"  class="form-control" style="width:200px" value="{{ email }}" placeholder="Email" required/>
-               <p class="help-block">Your e-mail address will be your identifier for logging in.<br> We contact you to verify your account and then, occasionally, for important issues. </p>
+       <input type="email" name="email" size="25"  class="form-control" style="width:200px" value="{{ email }}" 
+               title="Your e-mail address will be your identifier for logging in. We contact you to verify your account and then, occasionally, for important issues."
+               placeholder="Email" required/>
        </div>
-
+</div> 
 
        <!-- LOGIN
        TODO: Login should be suggested from user email or first/last name, and
@@ -56,22 +57,24 @@
       <div class="col-xs-6"><p class="form-hint">Enter your login</p></div>
     </div>
        -->
-
+<div class="col-md-4">
     <div class="form-group">
       <label for="password" class="control-label">Authentication</label>
-      <input type="password"  id="password" name="password"   class="form-control" style="width:200px" minlength="4" value="{{ password }}" placeholder="Password" required/>
+      <input type="password"  id="password" name="password"   class="form-control" style="width:200px" minlength="4" value="{{ password }}" 
+               title="Your password allows you to log in to this portal."
+               placeholder="Password" required/>
     </div>
     <div class="form-group">
-               <input type="password"  id="confirmpassword" name="confirmpassword" style="width:200px"  minlength="4" class="form-control" value="" placeholder="Confirm Password" required/>
-               <p class="help-block">Your password allows you to log in to this portal.</p>
+               <input type="password"  id="confirmpassword" name="confirmpassword" style="width:200px"  minlength="4" class="form-control" value="" 
+                       placeholder="Confirm Password" required/>
     </div>
     <div class="form-group">
        <!--<label for="question" class="control-label">Keys</label> -->
-               <select name="question" class="form-control" style="width:200px" id="key-policy" required>        
+               <select name="question" class="form-control" style="width:200px" id="key-policy" 
+                       title="Your public/private key pair allows you to access the testbeds." required>        
                        <option value="generate">Generate my keys for me (recommended)</option>
                        <option value="upload">Upload my public key (advanced users only)</option>
                </select>
-               <p class="help-block">Your public/private key pair allows you to access the testbeds.</p>
     </div>
     <div class="form-group" style="display:none;" id="upload_key">
        <label for="file" class="control-label">Upload public key</label>
@@ -82,6 +85,8 @@
                        <a href="http://trac.myslice.info/wiki/InstallSfa" target="_blank">delegate your public key to the portal.</a>
                </div>
     </div>
+       </div>
+       </div>
        <div class="form-group">
                <input type="checkbox" name="agreement" value="agreement" required/> I agree to the 
                <button class="btn btn-primary btn-xs" data-toggle="modal" data-target="#myModal">terms and conditions</button>