style changes

diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css
index 0d97f92..c49c550 100644 (file)
--- a/portal/static/css/onelab.css
+++ b/portal/static/css/onelab.css
@@ -16,7 +16,7 @@ a, a:active, a:focus {
 h1 {
     border-bottom:1px solid #DDDDDD;
     padding:0 0 0 0;
-    margin:0 0 0 0;
+    margin:15px 0 15px 0;
     font-size:14pt;
 }
 h1 img {
@@ -86,18 +86,19 @@ button.btn-danger:active {
 }
 button.btn-onelab {
     border:0;
-    border-bottom:2px solid #540086;
+    border-bottom:3px solid #540086;
     background-color:#302562;
     color:white;
 }
 button.btn-onelab:hover {
     border:0;
-    border-bottom:2px solid #540086;
+    border-bottom:3px solid #540086;
     background-color:#302562;
-    color:#FFFFCC;
+    color:white;
 }
-button.btn-primary:active {
+button.btn-onelab:active {
     box-shadow:none;
+    border-bottom:1px solid #540086;
 }
 /***** Notifications *****/
 .warning {
@@ -237,7 +238,9 @@ div#ticket-request p {
     margin:20px 0;
 }
 
-ul.nav-tabs {}
+ul.nav-tabs {
+    margin:15px 0;
+}
 ul.nav-tabs ul {}
 ul.nav-tabs li {}
 
@@ -408,9 +411,9 @@ div.dataTables_filter label{
   -webkit-box-shadow: 0 0 1px rgba(82,82,82,0.6);
   box-shadow:         0 0 1px rgba(82,82,82,0.6);
   height:61px;
-  margin-bottom:15px;
   background-color:white;
 }
+
 div.navigation {
     
 }

diff --git a/portal/templates/institution.html b/portal/templates/institution.html
index a127595..c627e5b 100644 (file)
--- a/portal/templates/institution.html
+++ b/portal/templates/institution.html
@@ -1,22 +1,20 @@
-{% extends "layout_wide.html" %}
+{% extends "layout.html" %}
 
 {% block head %} 
 <script type="text/javascript" src="{{STATIC_URL}}/js/institution.js"></script>
 {% endblock head %}
 
 {% block content %}
-<div class="container">
-       <div class="row">
-               <div class="col-md-12">
-                       <ul class="nav nav-tabs nav-section">
-                               <li class="active"><a href="#info"><img src="{{ STATIC_URL }}icons/authority-xs.png" alt="Institution" /> Institution {{user_details.parent_authority}}</a></li>
-                               <li><a href="#users">Users</a></li>
-                               <li><a href="#slices">Slices</a></li>
-                       </ul>
-           </div>
-       </div>
+<div class="row">
+       <div class="col-md-12">
+               <ul class="nav nav-tabs nav-section">
+                       <li class="active"><a href="#info"><img src="{{ STATIC_URL }}icons/authority-xs.png" alt="Institution" /> Institution {{user_details.parent_authority}}</a></li>
+                       <li><a href="#users">Users</a></li>
+                       <li><a href="#slices">Slices</a></li>
+               </ul>
+    </div>
 </div>
-<div class="container tab-content">
+<div class="tab-content">
        <div class="tab-pane active row" id="info">
                <div class="col-md-12">
                        <div id="authority-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Authority" /></div>

diff --git a/portal/templates/registration_view.html b/portal/templates/registration_view.html
index 654f79d..ab6776c 100644 (file)
--- a/portal/templates/registration_view.html
+++ b/portal/templates/registration_view.html
@@ -3,11 +3,14 @@
 {% block content %}        
 
 <div class="row">
+       <div class="col-md-12">
        <h1><img src="{{ STATIC_URL }}icons/user-xs.png" alt="User Registration" />User sign-up</h1>
+       </div>
 </div>
 <div class="row">
-               <p></p>
+       <div class="col-md-12">
                <p><strong>Questions? <a href="/portal/contact" >Contact us.</a></strong></p>
+  </div>
 </div>
 {% if errors %}
 <ul>
@@ -16,34 +19,38 @@
   {% endfor %}
 </ul>
 {% endif %}
-<div class="row"><div class="col-sm-12">
-<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>
-               <p></p>
-               <input id="authority_hrn" name="org_name" class="form-control" style="width:590px" value="{{ organization }}" 
-               title="Choose your organization (company/university) from the list that apears when you click in the field and start to type.
-                Use the arrow keys to scroll through the list; type part of the name to narrow down the list. If it is not in the list, 
-               please request its addition by clicking the link below. We will send an email to the managers that we have on record for 
-               your organization, asking them to validate your sign-up request." required/>
-               <p></p>
-               <p>Organization not listed? <a href="/portal/join">Request its addition now.</a></p>
+<div class="row">
+       <div class="col-md-12">
+               
+                       <div class="form-group">
+                               <form class="cmxform form-horizontal" id="registrationForm" method="post" enctype="multipart/form-data" role="form">
+                       {% csrf_token %}
+                               <label for="authority_hrn" class="control-label">Organization</label>
+                               <p></p>
+                               <input id="authority_hrn" name="org_name" class="form-control" style="width:590px" value="{{ organization }}" 
+                               title="Choose your organization (company/university) from the list that apears when you click in the field and start to type.
+                                Use the arrow keys to scroll through the list; type part of the name to narrow down the list. If it is not in the list, 
+                               please request its addition by clicking the link below. We will send an email to the managers that we have on record for 
+                               your organization, asking them to validate your sign-up request." required/>
+                               <p></p>
+                               <p>Organization not listed? <a href="/portal/join">Request its addition now.</a></p>
+                       </div>
        </div>
+</div>
 
-       <div class="row">
-       <div class="col-md-4">
+<div class="row">
+       <div class="col-md-6">
        
            <div class="form-group">
                        <label for="firstname" class="control-label">Personal information</label>
                        <p></p>
-                       <input type="text" name="firstname" class="form-control" style="width:200px" minlength="2" value="{{ first_name }}" placeholder="First name" required />
+                       <input type="text" name="firstname" class="form-control" style="width:350px" minlength="2" value="{{ first_name }}" placeholder="First name" required />
            </div>
            <div class="form-group">
-                       <input type="text" name="lastname" size="25" class="form-control" style="width:200px" minlength="2" value="{{ last_name }}" placeholder="Last name" required />
+                       <input type="text" name="lastname" size="25" class="form-control" style="width:350px" minlength="2" value="{{ last_name }}" placeholder="Last name" required />
            </div>
                <div class="form-group">
-               <input type="email" name="email" size="25"  class="form-control" style="width:200px" value="{{ email }}" 
+               <input type="email" name="email" size="25"  class="form-control" style="width:350px" 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>
@@ -61,21 +68,21 @@
       <div class="col-xs-6"><p class="form-hint">Enter your login</p></div>
     </div>
        -->
-       <div class="col-md-4">
+       <div class="col-md-6">
            <div class="form-group">
              <label for="password" class="control-label">Authentication</label>
                  <p></p>       
-             <input type="password"  id="password" name="password"   class="form-control" style="width:200px" minlength="4" value="{{ password }}" 
+             <input type="password"  id="password" name="password"   class="form-control" style="width:250px" 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="" 
+                       <input type="password"  id="confirmpassword" name="confirmpassword" style="width:250px"  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" 
+                       <select name="question" class="form-control" style="width:350px" 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>
@@ -91,13 +98,27 @@
                        </div>
            </div>
        </div>
+</div>
+<div class="row">
+       <div class="col-md-12">
+               <div class="form-group">
+                       <p></p>
+                       <input type="checkbox" name="agreement" value="agreement" required/>&nbsp;&nbsp; I agree to the 
+                       <a href="#" data-toggle="modal" data-target="#myModal">terms and conditions.</a> 
+               </div>
        </div>
-
-       <div class="form-group">
-               <p></p>
-               <input type="checkbox" name="agreement" value="agreement" required/> I agree to the 
-               <button class="btn btn-default btn-xs" data-toggle="modal" data-target="#myModal">terms and conditions.</button> 
+</div>
+<div class="row">
+       <div class="col-md-12">
+               <div class="form-group" id="register">
+                       <p></p> 
+               <button class="submit btn btn-onelab" type="submit">Sign up</button>
+           </div>
+       </form> 
        </div>
+</div>
+       
+       
        <!-- Modal - columns selector -->
                <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
                        <div class="modal-dialog">
@@ -465,12 +486,7 @@
                        </div>
                </div>
 
-    <div class="form-group" id="register">
-               <p></p> 
-       <button class="submit btn btn-primary" type="submit">Sign up</button>
-    </div>
-</form>  
-</div>
+    
 <script>
 jQuery(document).ready(function(){
     var availableTags = [

diff --git a/portal/templates/slice-request-view.html b/portal/templates/slice-request-view.html
index 838b9b4..2b92f46 100644 (file)
--- a/portal/templates/slice-request-view.html
+++ b/portal/templates/slice-request-view.html
@@ -3,13 +3,12 @@
 
 {% block head %}
 {{ wizard.form.media }}
+<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/registration.css" />
 {% endblock %}
 
 {% block content %}
 
-<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" />
+
 
 <div class="onelab-title well-lg">
   <h2>Request a Slice</h2>

diff --git a/portal/templates/slicerequest_view.html b/portal/templates/slicerequest_view.html
index 7ef30cd..d898b06 100644 (file)
--- a/portal/templates/slicerequest_view.html
+++ b/portal/templates/slicerequest_view.html
@@ -3,14 +3,14 @@
 
 {% block content %}
        <div class="row">
-               <div class="col-md-12 el">
+               <div class="col-md-12">
                        <h1><img src="{{ STATIC_URL }}icons/slices-xs.png" alt="Request a Slice" /> Request a new Slice</h1>
                </div>
        </div>
 
        {% if errors %}
        <div class="row">
-               <div class="col-md-12 el">
+               <div class="col-md-12">
                <ul>
                  {% for error in errors %}
                  <li>{{ error }}</li>
@@ -21,7 +21,7 @@
        {% endif %}
        
        <div class="row">
-               <div class="col-md-8 col-md-offset-2 el">
+               <div class="col-md-8 el">
                        <form role="form" method="post">
                        {% csrf_token %}
                          <div class="form-group" style="display:none">
@@ -58,7 +58,7 @@
 jQuery(document).ready(function(){
        
        $("#authority_hrn").load("/rest/user/", {"fields" : ["parent_authority"], "filters": {"user_hrn": "{{ user_hrn }}"}}, function(data) {
-               var jsonData = JSON.parse(data)
+               var jsonData = JSON.parse(data);
         $(this).attr("value", jsonData[0]['parent_authority']);
     });
     var availableTags = [
@@ -77,7 +77,7 @@ jQuery(document).ready(function(){
     $( "#authority_hrn" ).autocomplete({
       source: availableTags,
       minLength: 0,
-      select: function( event, ui ) {console.log(jQuery(this))}
+      select: function( event, ui ) {console.log(jQuery(this));}
     });
 });
 </script>