external/proxstar
1
0
Fork 0
mirror of https://github.com/ComputerScienceHouse/proxstar.git synced 2025-03-09 15:40:09 +00:00
Code Issues Releases Wiki Activity

moved limits to main page, remove restriction for rtp creation, allow rtp to create vm for another user

Browse source
This commit is contained in:
Jordan Rodgers 2017-12-13 23:08:45 -05:00
parent 2b69443930
commit 125fd58b27
8 changed files with 51 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

8
templates/base.html
View file

@ -39,14 +39,6 @@
Create VM
</a>
</li>
{% if rtp %}
<li>
<a href="/limits">
<span class="glyphicon glyphicon-pencil"></span>
Usage Limits
</a>
</li>
{% endif %}
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="dropdown navbar-user">

10
templates/create.html
View file

@ -46,6 +46,16 @@
{% endfor %}
</select>
</div>
{% if rtp %}
<div class="form-group">
<label for="user">User</label>
<select name="user" id="user" class="form-control">
{% for pool in pools %}
<option value="{{ pool }}">{{ pool }}</option>
{% endfor %}
</select>
</div>
{% endif %}
<button class="btn btn-success" id="create-vm" name="create" data-max_disk="{{ limits['disk'] - usage['disk'] }}">CREATE</button>
{% endif %}
</div>

43
templates/limits.html
View file

@ -1,43 +0,0 @@
{% extends "base.html" %}
{% block body %}
<div class="container">
<div class="row">
<div class="col-md-12 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Usage Limits</h3>
</div>
<div class="panel-body">
<table class="table table-bordered table-striped usage-limit">
<thead>
<tr role="row">
<th>Username</th>
<th>CPU</th>
<th>Memory</th>
<th>Disk</th>
<th>Edit</th>
</tr>
</thead>
<tbody>
{% for user_limit in user_limits %}
<tr role="row">
<td>{{ user_limit[0] }}</td>
<td>{{ user_limit[1] }}</td>
<td>{{ user_limit[2] }}</td>
<td>{{ user_limit[3] }}</td>
<td>
<button class="btn btn-info proxstar-limitbtn edit-limit" data-user="{{ user_limit[0] }}" data-cpu="{{ user_limit[1] }}" data-mem="{{ user_limit[2] }}" data-disk="{{ user_limit[3] }}">EDIT</button>
<button class="btn btn-danger proxstar-limitbtn reset-limit" data-user="{{ user_limit[0] }}">RESET</button>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

24
templates/list_vms.html
View file

@ -35,22 +35,20 @@
{% endfor %}
{% else %}
{% for pool in vms %}
<div class="col-md-3 col-sm-4 col-xs-6">
<div class="col-md-3 col-sm-4 col-xs-12">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
<img class="user-img pull-left" src="https://profiles.csh.rit.edu/image/{{ pool['user'] }}" title="{{ pool['user'] }}">
<h3 class="panel-title user-title">
<a href="/user/{{ pool['user'] }}">
<p>{{ pool['user'] }}</p>
{{ pool['user'] }}
</a>
</h3>
</div>
<div class="panel-body">
<div class="profile">
<img class="profile-img" src="https://profiles.csh.rit.edu/image/{{ pool['user'] }}" title="{{ pool['user'] }}">
</div>
<div class="resource-bar">
<span class="glyphicon glyphicon-cog pull-left"></span>
<div class="progress">
<span class="pull-left">CPU</span>
<div class="progress" data-toggle="tooltip" title="{{ pool['usage']['cpu'] }}/{{ pool['limits']['cpu'] }}">
{% if pool['percents']['cpu'] <= 50 %}
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{{ pool['percents']['cpu'] }}" aria-valuemin="0" aria-valuemax="100" style="width:{{ pool['percents']['cpu'] }}%"></div>
{% elif pool['percents']['cpu'] <= 75 %}
@ -61,8 +59,8 @@
</div>
</div>
<div class="resource-bar">
<span class="glyphicon glyphicon-tasks pull-left"></span>
<div class="progress">
<span class="pull-left">MEM</span>
<div class="progress" data-toggle="tooltip" title="{{ pool['usage']['mem'] }}GB/{{ pool['limits']['mem'] }}.0GB">
{% if pool['percents']['mem'] <= 50 %}
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{{ pool['percents']['mem'] }}" aria-valuemin="0" aria-valuemax="100" style="width:{{ pool['percents']['mem'] }}%"></div>
{% elif pool['percents']['mem'] <= 75 %}
@ -73,8 +71,8 @@
</div>
</div>
<div class="resource-bar">
<span class="glyphicon glyphicon-hdd pull-left"></span>
<div class="progress">
<span class="pull-left">DISK</span>
<div class="progress" data-toggle="tooltip" title="{{ pool['usage']['disk'] }}GB/{{ pool['limits']['disk'] }}GB">
{% if pool['percents']['disk'] <= 50 %}
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{{ pool['percents']['disk'] }}" aria-valuemin="0" aria-valuemax="100" style="width:{{ pool['percents']['disk'] }}%"></div>
{% elif pool['percents']['disk'] <= 75 %}
@ -84,6 +82,8 @@
{% endif %}
</div>
</div>
<button class="btn btn-info proxstar-limitbtn edit-limit" data-user="{{ pool['user'] }}" data-cpu="{{ pool['limits']['cpu'] }}" data-mem="{{ pool['limits']['mem'] }}" data-disk="{{ pool['limits']['disk'] }}">EDIT</button>
<button class="btn btn-danger proxstar-limitbtn reset-limit" data-user="{{ pool['user'] }}">RESET</button>
</div>
</div>
</div>

15
templates/vm_details.html
View file

@ -122,21 +122,6 @@
</div>
</div>
</div>
<div class="col-md-12 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">RRD Graphs</h3>
</div>
<div class="panel-body">
<img class="rrd-graph" src="/vm/{{ vm['vmid'] }}/rrd/cpu.png">
<img class="rrd-graph" src="/vm/{{ vm['vmid'] }}/rrd/mem.png">
<img class="rrd-graph" src="/vm/{{ vm['vmid'] }}/rrd/netin.png">
<img class="rrd-graph" src="/vm/{{ vm['vmid'] }}/rrd/netout.png">
<img class="rrd-graph" src="/vm/{{ vm['vmid'] }}/rrd/diskread.png">
<img class="rrd-graph" src="/vm/{{ vm['vmid'] }}/rrd/diskwrite.png">
</div>
</div>
</div>
</div>
</div>