git://git.onelab.eu
/
myslice.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
253c554
)
fixe styles, fixed link to requests to be validated from home
author
Ciro Scognamiglio
<ciro.scognamiglio@cslash.net>
Fri, 4 Jul 2014 12:55:21 +0000
(14:55 +0200)
committer
Ciro Scognamiglio
<ciro.scognamiglio@cslash.net>
Fri, 4 Jul 2014 12:55:21 +0000
(14:55 +0200)
portal/static/css/onelab.css
patch
|
blob
|
history
portal/templates/onelab/onelab_home-view.html
patch
|
blob
|
history
portal/templates/onelab/onelab_institution.html
patch
|
blob
|
history
portal/templates/onelab/onelab_management-tab-requests.html
patch
|
blob
|
history
portal/templates/slice-request-view.html
patch
|
blob
|
history
portal/templates/slicerequest_view.html
patch
|
blob
|
history
diff --git
a/portal/static/css/onelab.css
b/portal/static/css/onelab.css
index
17b8c1a
..
458e5ac
100644
(file)
--- a/
portal/static/css/onelab.css
+++ b/
portal/static/css/onelab.css
@@
-32,15
+32,18
@@
h3 {
font-size:13pt;
color:#201E62;
}
font-size:13pt;
color:#201E62;
}
-input[type=text], input[type=password], input[type=email], select, option {
+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;
}
min-width:260px;
padding:6px;
border:1pt solid #22606D;
vertical-align:bottom;
border-radius:0;
}
-input {
-
+
+textarea {
+ padding:6px;
+ border:1pt solid #22606D !important;
+ border-radius:0 !important;
}
span.label {
}
span.label {
@@
-92,13
+95,13
@@
button.btn-primary:active {
margin-top:2px;
}
button.btn-danger {
margin-top:2px;
}
button.btn-danger {
- border-bottom:3px solid #
EEA236
;
+ border-bottom:3px solid #
A13F3A
;
}
button.btn-danger:hover {
box-shadow:none;
background-color:#d9534f;
border:1px solid #d43f3a;
}
button.btn-danger:hover {
box-shadow:none;
background-color:#d9534f;
border:1px solid #d43f3a;
- border-bottom:3px solid #
EEA236
;
+ border-bottom:3px solid #
A13F3A
;
}
button.btn-danger:active {
border:1px solid #d43f3a;
}
button.btn-danger:active {
border:1px solid #d43f3a;
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() {
$('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/";
});
$('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 %}
<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 %}
{% 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>
{% 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);
});
if (id == 'requests')
$("#" + id).load('/management/' + id);
});
+ var hash = window.location.hash;
+ if (hash) {
+ $('.nav-tabs a[href='+hash+']').click();
+ }
});
</script>
{% endblock %}
});
</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">
</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>
</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 %}
<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>
</fieldset>
</form>
</div>
diff --git
a/portal/templates/slicerequest_view.html
b/portal/templates/slicerequest_view.html
index
d898b06
..
3fdf8f7
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>
<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>
</form>
</div>