git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved requests to management
[myslice.git]
/
portal
/
templates
/
onelab
/
onelab_institution.html
diff --git
a/portal/templates/onelab/onelab_institution.html
b/portal/templates/onelab/onelab_institution.html
index
409c13f
..
7fea635
100644
(file)
--- a/
portal/templates/onelab/onelab_institution.html
+++ b/
portal/templates/onelab/onelab_institution.html
@@
-12,13
+12,14
@@
<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>
<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>
+ <li><a href="#requests">Requests</a></li>
</ul>
</div>
</div>
</div>
<div class="container tab-content">
<div class="tab-pane active row" id="info">
</ul>
</div>
</div>
</div>
<div class="container tab-content">
<div class="tab-pane active row" id="info">
- <div class="col-md-12">
+ <div class="col-md-12
el
">
<div id="authority-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Authority" /></div>
<div id="authority-tab-loaded" style="display:none;">
<div id="authority-data" style="float:left; width:50%;"></div>
<div id="authority-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Authority" /></div>
<div id="authority-tab-loaded" style="display:none;">
<div id="authority-data" style="float:left; width:50%;"></div>
@@
-31,54
+32,59
@@
</div>
<div class="tab-pane row" id="users" data-authority="{{user_details.parent_authority}}">
</div>
<div class="tab-pane row" id="users" data-authority="{{user_details.parent_authority}}">
- <div class="col-md-12">
+ <div class="col-md-12
el
">
<div id="user-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
<div id="user-tab-loaded" style="display:none;">
<div id="user-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
<div id="user-tab-loaded" style="display:none;">
- <table id="user-tab">
+ <table id="user-tab"
class="table"
>
<tr>
<th>+/-</th>
<tr>
<th>+/-</th>
- <th>
e
mail</th>
- <th>
user_
hrn</th>
- <th>
f
irst name</th>
- <th>
l
ast name</th>
- <th>
e
nabled</th>
+ <th>
E
mail</th>
+ <th>
User
hrn</th>
+ <th>
F
irst name</th>
+ <th>
L
ast name</th>
+ <th>
E
nabled</th>
</tr>
</table>
</tr>
</table>
- {%if 'is_pi' in pi %}
- <div>
- <button id="deleteusers" type="button" class="btn btn-default"><span class="glyphicon glyphicon-remove"></span> Delete Users</button>
- </div>
- {%endif%}
+
</div>
</div>
+ {%if 'is_pi' in pi %}
+ <div>
+ <button id="deleteusers" type="button" class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span> Delete selected users</button>
+ </div>
+ {% endif %}
</div>
</div>
<div class="tab-pane row" id="slices">
</div>
</div>
<div class="tab-pane row" id="slices">
- {%if 'is_pi' in pi %}
- <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-default"><span class="glyphicon glyphicon-plus"></span> request slice</button>
- {%endif%}
+ <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>
+ {% else %}
+ <button id="createslice" type="button" class="btn btn-onelab"><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>
<div id="slice-tab-loaded" style="display:none;">
<div id="slice-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
<div id="slice-tab-loaded" style="display:none;">
- <table id="slice-tab">
+ <table id="slice-tab"
class="table"
>
<tr>
<th>+/-</th>
<tr>
<th>+/-</th>
- <th>
slice_
hrn</th>
- <th>
u
sers</th>
- <th>
u
rl</th>
+ <th>
Slice
hrn</th>
+ <th>
U
sers</th>
+ <th>
U
rl</th>
<!-- <th>nodes</th> -->
<!-- <th>nodes</th> -->
- <th>
e
xpiration</th>
+ <th>
E
xpiration</th>
</tr>
</tr>
- </table>
- <br>
- {%if 'is_pi' in pi %}
- <div>
- <button id="renewslices" type="button" class="btn btn-default"><span class="glyphicon glyphicon-refresh"></span> Renew Slices</button>
- <button id="deleteslices" type="button" class="btn btn-default"><span class="glyphicon glyphicon-remove"></span> Delete Slices</button>
- </div>
- {%endif%}
+ </table>
</div>
</div>
+ {% if 'is_pi' in pi %}
+ <div>
+ <button id="renewslices" type="button" class="btn btn-primary"><span class="glyphicon glyphicon-refresh"></span> Renew Slices</button>
+ <button id="deleteslices" type="button" class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span> Delete Slices</button>
+ </div>
+ {% endif %}
+ </div>
+ </div>
+ <div class="tab-pane row" id="requests">
</div>
</div>
<script>
</div>
</div>
<script>
@@
-213,5
+219,15
@@
$(document).ready(function() {
{% endif %}
}); // End document.ready
{% endif %}
}); // End document.ready
+
+$(document).ready(function() {
+ $('.nav-tabs a').click(function (e) {
+ e.preventDefault();
+ $(this).tab('show');
+ var id = $(this).attr('href').substr(1);
+ if (id == 'requests')
+ $("#" + id).load('/management/' + id);
+ });
+});
</script>
{% endblock %}
</script>
{% endblock %}