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

diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css
index 6e272d9..458e5ac 100644 (file)
--- a/portal/static/css/onelab.css
+++ b/portal/static/css/onelab.css
@@ -32,6 +32,20 @@ h3 {
     font-size:13pt;
     color:#201E62;
 }
+input[type=text], input[type=password], input[type=email],input[type=number], select, option {
+    min-width:260px;
+    padding:6px;
+    border:1pt solid #22606D;
+    vertical-align:bottom;
+    border-radius:0;
+}
+
+textarea {
+    padding:6px;
+    border:1pt solid #22606D !important;
+    border-radius:0 !important;
+}
+
 span.label {
     font-size:11pt;
     color:gray;
@@ -42,7 +56,7 @@ div.el {
     padding-bottom:15px;
 }
 /* buttons */
-button.btn {
+button.btn, input.btn {
     padding:6px 10px;
     border-radius:5px;
     font-size:10pt;
@@ -70,38 +84,45 @@ button.btn-primary {
     border-bottom:3px solid #3071A9;
 }
 button.btn-primary:hover {
+    box-shadow:none;
+    background-color:#428bca;
+    border:1px solid #357ebd;
     border-bottom:3px solid #3071A9;
 }
 button.btn-primary:active {
     box-shadow:none;
+    border-bottom:1px solid #3071A9;
     margin-top:2px;
 }
 button.btn-danger {
-    border-bottom:2px solid #FF7394;
+    border-bottom:3px solid #A13F3A;
 }
 button.btn-danger:hover {
-    border-bottom:2px solid #D2322D;
+    box-shadow:none;
+    background-color:#d9534f;
+    border:1px solid #d43f3a;
+    border-bottom:3px solid #A13F3A;
 }
 button.btn-danger:active {
-    border:1px solid #D2322D;
+    border:1px solid #d43f3a;
     box-shadow:none;
     margin-top:2px;
 }
-button.btn-onelab {
+button.btn-onelab, input.btn-onelab {
     border:0;
-    border-bottom:3px solid #540086;
+    border-bottom:3px solid #760073;
     background-color:#302562;
     color:white;
 }
-button.btn-onelab:hover {
+button.btn-onelab:hover, input.btn-onelab:hover {
     border:0;
-    border-bottom:3px solid #540086;
+    border-bottom:3px solid #760073;
     background-color:#302562;
     color:white;
 }
-button.btn-onelab:active {
+button.btn-onelab:active, input.btn-onelab:active {
     box-shadow:none;
-    border-bottom:1px solid #540086;
+    border-bottom:1px solid #760073;
     margin-top:2px;
 }
 /***** Notifications *****/
@@ -580,25 +601,12 @@ div.registration-form {
     padding-top:150px;
     text-align:center;
 }
-div.login-form input[type=text] {
-    
-    
 
-}
 .login-form input {
-    font-size:12pt;
     width:320px;
-    padding:8px;
-    border:1pt solid #22606D;
 }
 .login-form input[type=submit] {
-    border:0;
-    border-bottom:2px solid #540086;
-    background-color:#302562;
-    color:white;
-    width:100px;
-    border-radius:5px;
-    font-size:12pt;
+    width:108px;
 }
 
 .login-submit {

diff --git a/portal/templates/onelab/onelab_home-view.html b/portal/templates/onelab/onelab_home-view.html
index 4afaf5d..f5d6cf1 100644 (file)
--- a/portal/templates/onelab/onelab_home-view.html
+++ b/portal/templates/onelab/onelab_home-view.html
@@ -159,7 +159,7 @@
                        $('div#'+$(this).data('panel')).show();
                });
                $('button#validaterequestbtn').click(function() {
-                       window.location="/portal/validate/";
+                       window.location="/portal/institution#requests";
                });
                $('button#ticketbtn').click(function() {
                        window.location="/portal/contact/";

diff --git a/portal/templates/onelab/onelab_institution.html b/portal/templates/onelab/onelab_institution.html
index 7fea635..4b429c9 100644 (file)
--- a/portal/templates/onelab/onelab_institution.html
+++ b/portal/templates/onelab/onelab_institution.html
@@ -58,9 +58,9 @@
        <div class="tab-pane row" id="slices">
                <div class="col-md-12 el">
                {% if 'is_pi'  in pi %}
-               <button id="createslice" type="button" class="btn btn-onelab"><span class="glyphicon glyphicon-plus"></span> Create slice</button>
+               <button id="createslice" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Create slice</button>
                {% else %}
-               <button id="createslice" type="button" class="btn btn-onelab"><span class="glyphicon glyphicon-plus"></span> Request slice</button>
+               <button id="createslice" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Request slice</button>
                {% endif %}
                <br /><br />
            <div id="slice-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
@@ -228,6 +228,10 @@ $(document).ready(function() {
        if (id == 'requests') 
                $("#" + id).load('/management/' + id);
        });
+       var hash = window.location.hash;
+       if (hash) {
+               $('.nav-tabs a[href='+hash+']').click();
+       }
 });
 </script>
 {% endblock %}

diff --git a/portal/templates/onelab/onelab_management-tab-requests.html b/portal/templates/onelab/onelab_management-tab-requests.html
index 8db652f..1356ef5 100644 (file)
--- a/portal/templates/onelab/onelab_management-tab-requests.html
+++ b/portal/templates/onelab/onelab_management-tab-requests.html
@@ -224,5 +224,5 @@
 </div>
 {% endif %}
 <div class="col-md-12">
-       <button class="btn btn-onelab" type="button" id="portal__validate" onclick="on_click_event();">Validate</button>
+       <button class="btn btn-primary" type="button" id="portal__validate" onclick="on_click_event();"><span class="glyphicon glyphicon-ok"></span> Validate</button>
 </div>

diff --git a/portal/templates/onelab/onelab_widget-login-user.html b/portal/templates/onelab/onelab_widget-login-user.html
index fad0c26..d7342f8 100644 (file)
--- a/portal/templates/onelab/onelab_widget-login-user.html
+++ b/portal/templates/onelab/onelab_widget-login-user.html
@@ -14,7 +14,7 @@
        <input type="password" name="password" placeholder="Password">
        </div>
        <div class="login-submit">
-               <input type="submit" value="Sign In" />
+               <input type="submit" class="btn btn-onelab" value="Sign In" />
                <span class="lost-password">&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href="/portal/pass_reset/">Can't access your account?</a></span>
        </div>
        <div class="login-signup">

diff --git a/portal/templates/password_reset_confirm.html b/portal/templates/password_reset_confirm.html
index 955193b..dde2181 100644 (file)
--- a/portal/templates/password_reset_confirm.html
+++ b/portal/templates/password_reset_confirm.html
@@ -19,7 +19,7 @@
        <p class="aligned wide"><label for="id_new_password1">{% trans 'New password:' %}</label>{{ form.new_password1 }}</p>
        {{ form.new_password2.errors }}
        <p class="aligned wide"><label for="id_new_password2">{% trans 'Confirm password:' %}</label>{{ form.new_password2 }}</p>
-       <p><input type="submit" value="{% trans 'Change my password' %}" /></p>
+       <p><input type="submit" class="btn btn-onelab" value="{% trans 'Change my password' %}" /></p>
        </form>
 
 {% else %}

diff --git a/portal/templates/password_reset_form.html b/portal/templates/password_reset_form.html
index 6198523..0e0de7e 100644 (file)
--- a/portal/templates/password_reset_form.html
+++ b/portal/templates/password_reset_form.html
@@ -13,7 +13,7 @@
        
        <form action="/portal/pass_reset/" method="post">{% csrf_token %}
        {{ form.email.errors }}
-       <p><label for="id_email">Email address:</label> {{ form.email }} <input type="submit" value="Reset my password" /></p>
+       <p><label for="id_email">Email address:</label> {{ form.email }} <input type="submit" class="btn btn-onelab" value="Reset my password" /></p>
        </form>
        </div>
 </div>

diff --git a/portal/templates/slice-request-view.html b/portal/templates/slice-request-view.html
index 2b92f46..830c7ee 100644 (file)
--- a/portal/templates/slice-request-view.html
+++ b/portal/templates/slice-request-view.html
@@ -24,7 +24,7 @@
       <div class="col-xs-6"> <p class="form-hint">{{ field.help_text }}</p> </div>
     </div>
     {% endfor %}
-    <button class="submit btn btn-default col-xs-12" type="submit">Request Slice</button>
+    <button class="submit btn btn-default" type="submit"><span class="glyphicon glyphicon-plus"></span> Request Slice</button>
   </fieldset>
   </form>
 </div>

diff --git a/portal/templates/slicerequest_view.html b/portal/templates/slicerequest_view.html
index 07a0543..880521b 100644 (file)
--- a/portal/templates/slicerequest_view.html
+++ b/portal/templates/slicerequest_view.html
@@ -48,7 +48,7 @@
                                <textarea id="purpose" name="purpose" class="form-control" rows="6" placeholder="Experiment purpose" style="width:300px" 
                                title="Purpose of your experiment (informative)" required="required">{{ purpose }}</textarea>
                          </div>
-                         <button type="submit" class="btn btn-default btn-onelab">Request Slice</button>
+                         <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Request Slice</button>
                        </form>
        
                </div>