Fixing incorrect formatting of django tags.
Fixes Bug 905020 Change-Id: Ib00ad798b16d0d6ebdcd85b3ba73478e9ad8ea56
This commit is contained in:
jakedahn
@@ -5,7 +5,7 @@
|
||||
{% block form_action %}{% url horizon:syspanel:flavors:create %}{% endblock %}
|
||||
|
||||
{% block modal_id %}create_flavor_modal{% endblock %}
|
||||
{% block modal-header %}{%trans "Create Flavor"%}{% endblock %}
|
||||
{% block modal-header %}{% trans "Create Flavor" %}{% endblock %}
|
||||
|
||||
{% block modal-body %}
|
||||
<div class="left">
|
||||
@@ -14,12 +14,12 @@
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3>{% trans "Description"%}:</h3>
|
||||
<p>{% trans "From here you can define the sizing of a new flavor."%}</p>
|
||||
<h3>{% trans "Description" %}:</h3>
|
||||
<p>{% trans "From here you can define the sizing of a new flavor." %}</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block modal-footer %}
|
||||
<input class="btn primary pull-right" type="submit" value="{%trans "Create Flavor"%}" />
|
||||
<input class="btn primary pull-right" type="submit" value="{% trans "Create Flavor" %}" />
|
||||
<a href="{% url horizon:syspanel:flavors:index" class="btn secondary cancel close">Cancel</a>
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{% load i18n %}
|
||||
<form id="form_delete_{{flavor.id}}" class="form-delete" method="post">
|
||||
<form id="form_delete_{{ flavor.id }}" class="form-delete" method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{hidden}}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input name="flavorid" type="hidden" value="{{flavor.id}}" />
|
||||
<input id="delete_{{flavor.id}}" class="btn small danger delete" title="Flavor: {{flavor.name}}" type="submit" value="{% trans "Delete"%}" />
|
||||
<input name="flavorid" type="hidden" value="{{ flavor.id }}" />
|
||||
<input id="delete_{{ flavor.id }}" class="btn small danger delete" title="Flavor: {{ flavor.name }}" type="submit" value="{% trans "Delete" %}" />
|
||||
</form>
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
{% load i18n %}
|
||||
<table class="zebra-striped">
|
||||
<tr>
|
||||
<th>{% trans "Id"%}</th>
|
||||
<th>{% trans "Name"%}</th>
|
||||
<th>{% trans "VCPUs"%}</th>
|
||||
<th>{% trans "Memory"%}</th>
|
||||
<th>{% trans "Disk"%}</th>
|
||||
<th>{% trans "Actions"%}</th>
|
||||
<th>{% trans "Id" %}</th>
|
||||
<th>{% trans "Name" %}</th>
|
||||
<th>{% trans "VCPUs" %}</th>
|
||||
<th>{% trans "Memory" %}</th>
|
||||
<th>{% trans "Disk" %}</th>
|
||||
<th>{% trans "Actions" %}</th>
|
||||
</tr>
|
||||
{% for flavor in flavors %}
|
||||
<tr id="{{flavor.id}}" class="{% cycle 'odd' 'even' %}">
|
||||
<td>{{flavor.id}}</td>
|
||||
<td>{{flavor.name}}</td>
|
||||
<td>{{flavor.vcpus}}</td>
|
||||
<td>{{flavor.ram}}MB</td>
|
||||
<td>{{flavor.disk}}GB</td>
|
||||
<tr id="{{ flavor.id }}" class="{% cycle 'odd' 'even' %}">
|
||||
<td>{{ flavor.id }}</td>
|
||||
<td>{{ flavor.name }}</td>
|
||||
<td>{{ flavor.vcpus }}</td>
|
||||
<td>{{ flavor.ram }}MB</td>
|
||||
<td>{{ flavor.disk }}GB</td>
|
||||
<td id="actions">
|
||||
<ul>
|
||||
<li class="form">{% include "syspanel/flavors/_delete.html" with form=delete_form %}</li>
|
||||
|
||||
@@ -10,5 +10,5 @@
|
||||
|
||||
{% block syspanel_main %}
|
||||
{% include "syspanel/flavors/_list.html" %}
|
||||
<a id="flavor_create_link" class="btn small" href="{% url horizon:syspanel:flavors:create %}">{% trans "Create New Flavor"%}</a>
|
||||
<a id="flavor_create_link" class="btn small" href="{% url horizon:syspanel:flavors:create %}">{% trans "Create New Flavor" %}</a>
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{% load i18n %}
|
||||
<form id="form_delete_{{image.id}}" class="form-delete" method="post">
|
||||
<form id="form_delete_{{ image.id }}" class="form-delete" method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{hidden}}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input name="image_id" type="hidden" value="{{image.id}}" />
|
||||
<input id="delete_{{image.id}}" class="btn small delete" title="Image: {{image.name}}" type="submit" value="{% trans "Delete"%}" />
|
||||
<input name="image_id" type="hidden" value="{{ image.id }}" />
|
||||
<input id="delete_{{ image.id }}" class="btn small delete" title="Image: {{ image.name }}" type="submit" value="{% trans "Delete" %}" />
|
||||
</form>
|
||||
|
||||
@@ -3,24 +3,24 @@
|
||||
{% csrf_token %}
|
||||
<fieldset>
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{hidden}}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
{% for field in form.visible_fields %}
|
||||
<div class="clearfix{% if field.errors %} error{% endif %}">
|
||||
{{field.label_tag}}
|
||||
{{ field.label_tag }}
|
||||
{% if field.errors %}
|
||||
{% for error in field.errors %}
|
||||
<span class="help-inline">{{error}}</span>
|
||||
<span class="help-inline">{{ error }}</span>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
<span class="help-block">{{field.help_text}}</span>
|
||||
<span class="help-block">{{ field.help_text }}</span>
|
||||
<div class="input">
|
||||
{{field}}
|
||||
{{ field }}
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% block modal-footer %}
|
||||
<input type="submit" value="{%trans "Update Image" %}" />
|
||||
<input type="submit" value="{% trans "Update Image" %}" />
|
||||
{% endblock %}
|
||||
</fieldset>
|
||||
</form>
|
||||
|
||||
@@ -3,42 +3,42 @@
|
||||
|
||||
<table class="zebra-striped">
|
||||
<tr>
|
||||
<th>{% trans "ID"%}</th>
|
||||
<th>{% trans "Name"%}</th>
|
||||
<th>{% trans "Size"%}</th>
|
||||
<th>{% trans "Public"%}</th>
|
||||
<th>{% trans "Created"%}</th>
|
||||
<th>{% trans "Updated"%}</th>
|
||||
<th colspan="2">{% trans "Status"%}</th>
|
||||
<th>{% trans "ID" %}</th>
|
||||
<th>{% trans "Name" %}</th>
|
||||
<th>{% trans "Size" %}</th>
|
||||
<th>{% trans "Public" %}</th>
|
||||
<th>{% trans "Created" %}</th>
|
||||
<th>{% trans "Updated" %}</th>
|
||||
<th colspan="2">{% trans "Status" %}</th>
|
||||
</tr>
|
||||
{% for image in images %}
|
||||
<tr id="images" class="{% cycle 'odd' 'even' %}">
|
||||
<td>{{image.id}}</td>
|
||||
<td>{{image.name}}</td>
|
||||
<td>{{image.size|filesizeformat}}</td>
|
||||
<td>{{image.is_public}}</td>
|
||||
<td>{{image.created_at|parse_date}}</td>
|
||||
<td>{{image.updated_at|parse_date}}</td>
|
||||
<td>{{image.status|capfirst}}</td>
|
||||
<td>{{ image.id }}</td>
|
||||
<td>{{ image.name }}</td>
|
||||
<td>{{ image.size|filesizeformat }}</td>
|
||||
<td>{{ image.is_public }}</td>
|
||||
<td>{{ image.created_at|parse_date }}</td>
|
||||
<td>{{ image.updated_at|parse_date }}</td>
|
||||
<td>{{ image.status|capfirst }}</td>
|
||||
<td id="actions">
|
||||
<ul>
|
||||
<li class="form">{% include "syspanel/images/_delete.html" with form=delete_form %}</li>
|
||||
{# <li class="form">{% include "syspanel/images/_toggle.html" with form=toggle_form %}</li> #}
|
||||
<li><a class="btn small" href="{% url horizon:syspanel:images:update image.id %}">{% trans "Edit"%}</a></li>
|
||||
<li><a class="btn small" href="{% url horizon:syspanel:images:update image.id %}">{% trans "Edit" %}</a></li>
|
||||
</ul>
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="details">
|
||||
<td class="properties" colspan="9">
|
||||
<ul>
|
||||
<li><span>{% trans "Location"%}: </span>{{image.properties.image_location}}</li>
|
||||
<li><span>{% trans "State"%}: </span>{{image.properties.image_state}}</li>
|
||||
<li><span>{% trans "Kernel ID"%}: </span>{{image.properties.kernel_id}}</li>
|
||||
<li><span>{% trans "Ramdisk ID"%}: </span>{{image.properties.ramdisk_id}}</li>
|
||||
<li><span>{% trans "Architecture"%}: </span>{{image.properties.architecture}}</li>
|
||||
<li><span>{% trans "Project ID"%}: </span>{{image.properties.project_id}}</li>
|
||||
<li><span>{% trans "Container Format"%}: </span>{{image.container_format}}</li>
|
||||
<li><span>{% trans "Disk Format"%}: </span>{{image.disk_format}}</li>
|
||||
<li><span>{% trans "Location" %}: </span>{{ image.properties.image_location }}</li>
|
||||
<li><span>{% trans "State" %}: </span>{{ image.properties.image_state }}</li>
|
||||
<li><span>{% trans "Kernel ID" %}: </span>{{ image.properties.kernel_id }}</li>
|
||||
<li><span>{% trans "Ramdisk ID" %}: </span>{{ image.properties.ramdisk_id }}</li>
|
||||
<li><span>{% trans "Architecture" %}: </span>{{ image.properties.architecture }}</li>
|
||||
<li><span>{% trans "Project ID" %}: </span>{{ image.properties.project_id }}</li>
|
||||
<li><span>{% trans "Container Format" %}: </span>{{ image.container_format }}</li>
|
||||
<li><span>{% trans "Disk Format" %}: </span>{{ image.disk_format }}</li>
|
||||
</ul>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{% load i18n %}
|
||||
<form id="form_toggle_{{image.id}}" class="form-toggle" method="post">
|
||||
<form id="form_toggle_{{ image.id }}" class="form-toggle" method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{hidden}}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input name="image_id" type="hidden" value="{{image.id}}" />
|
||||
<input id="toggle_{{image.id}}" class="toggle" type="submit" value="{% trans "Toggle Public"%}" />
|
||||
<input name="image_id" type="hidden" value="{{ image.id }}" />
|
||||
<input id="toggle_{{ image.id }}" class="toggle" type="submit" value="{% trans "Toggle Public" %}" />
|
||||
</form>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
{% block modal-footer %}
|
||||
<div class="modal-footer">
|
||||
<input class="btn primary pull-right" type="submit" value="{%trans "Update Image"%}" />
|
||||
<input class="btn primary pull-right" type="submit" value="{% trans "Update Image" %}" />
|
||||
<a href="#" class="btn secondary cancel close">Cancel</a>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
@@ -16,8 +16,8 @@
|
||||
{% include 'syspanel/images/_update.html' %}
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3>{% trans "Description"%}:</h3>
|
||||
<p>{% trans "From here you can modify different properties of an image."%}</p>
|
||||
<h3>{% trans "Description" %}:</h3>
|
||||
<p>{% trans "From here you can modify different properties of an image." %}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -21,9 +21,9 @@
|
||||
<div class="status">
|
||||
<h4>Status</h4>
|
||||
<ul>
|
||||
<li><span>Status:</span> {{instance.status}}</li>
|
||||
<li><span>Instance Name:</span> {{instance.name}}</li>
|
||||
<li><span>Instance ID:</span> {{instance.id}}</li>
|
||||
<li><span>Status:</span> {{ instance.status }}</li>
|
||||
<li><span>Instance Name:</span> {{ instance.name }}</li>
|
||||
<li><span>Instance ID:</span> {{ instance.id }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
</li>
|
||||
@@ -32,9 +32,9 @@
|
||||
<div class="specs">
|
||||
<h4>Specs</h4>
|
||||
<ul>
|
||||
<li><span>RAM:</span> {{instance.attrs.memory_mb}} MB</li>
|
||||
<li><span>VCPUs:</span> {{instance.attrs.vcpus}} VCPU</li>
|
||||
<li><span>Disk:</span> {{instance.attrs.disk_gb}}GB Disk</li>
|
||||
<li><span>RAM:</span> {{ instance.attrs.memory_mb }} MB</li>
|
||||
<li><span>VCPUs:</span> {{ instance.attrs.vcpus }} VCPU</li>
|
||||
<li><span>Disk:</span> {{ instance.attrs.disk_gb }}GB Disk</li>
|
||||
</ul>
|
||||
</div>
|
||||
</li>
|
||||
@@ -43,9 +43,9 @@
|
||||
<div class="meta">
|
||||
<h4>Meta</h4>
|
||||
<ul>
|
||||
<li><span>Key name:</span> {{instance.attrs.key_name}}</li>
|
||||
<li><span>Security Group(s):</span> {% for group in instance.attrs.security_groups %}{{group}}, {% endfor %}</li>
|
||||
<li><span>Image Name:</span> {{instance.image_name}}</li>
|
||||
<li><span>Key name:</span> {{ instance.attrs.key_name }}</li>
|
||||
<li><span>Security Group(s):</span> {% for group in instance.attrs.security_groups %}{{ group }}, {% endfor %}</li>
|
||||
<li><span>Image Name:</span> {{ instance.image_name }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
</li>
|
||||
@@ -58,7 +58,7 @@
|
||||
</div>
|
||||
|
||||
<div id="vnc" class="tab_wrapper">
|
||||
<iframe src="{{vnc_url}}" width="720" height="420"></iframe>
|
||||
<iframe src="{{ vnc_url }}" width="720" height="420"></iframe>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
{% else %}
|
||||
<div class="alert-message block-message info">
|
||||
{% url horizon:nova:images_and_snapshots:images:index as dash_image_url%}
|
||||
<p><strong>{% trans "Info: "%}</strong>{% blocktrans %}There are currently no instances. You can launch an instance from the <a class="btn small" href='{{dash_image_url}}'>Images Page.</a>{% endblocktrans %}</p>
|
||||
<p><strong>{% trans "Info: " %}</strong>{% blocktrans %}There are currently no instances. You can launch an instance from the <a class="btn small" href='{{dash_image_url}}'>Images Page.</a>{% endblocktrans %}</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<!-- {% csrf_token %} -->
|
||||
<h3> Select a month to query its usage: </h3>
|
||||
<div class="form-row">
|
||||
{{dateform.date}}
|
||||
{{ dateform.date }}
|
||||
<input class="submit" type="submit"/>
|
||||
</div>
|
||||
</form>
|
||||
@@ -21,50 +21,50 @@
|
||||
<div class="usage_block">
|
||||
<h3>CPU</h3>
|
||||
<ul>
|
||||
<li><span class="quantity">{{usage.total_active_vcpus}}</span><span class="unit">Cores</span> Active</li>
|
||||
<li><span class="quantity">{{usage.total_cpu_usage|floatformat}}</span><span class="unit">CPU-HR</span> Used</li>
|
||||
<li><span class="quantity">{{ usage.total_active_vcpus }}</span><span class="unit">Cores</span> Active</li>
|
||||
<li><span class="quantity">{{ usage.total_cpu_usage|floatformat }}</span><span class="unit">CPU-HR</span> Used</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="usage_block">
|
||||
<h3>RAM</h3>
|
||||
<ul>
|
||||
<li><span class="quantity">{{usage.total_active_ram_size}}</span><span class="unit">MB</span> Active</li>
|
||||
<li><span class="quantity">{{ usage.total_active_ram_size }}</span><span class="unit">MB</span> Active</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="usage_block">
|
||||
<h3>Disk</h3>
|
||||
<ul>
|
||||
<li><span class="quantity">{{usage.total_active_disk_size}}</span><span class="unit">GB</span> Active</li>
|
||||
<li><span class="quantity">{{usage.total_disk_usage|floatformat}}</span><span class="unit">GB-HR</span> Used</li>
|
||||
<li><span class="quantity">{{ usage.total_active_disk_size }}</span><span class="unit">GB</span> Active</li>
|
||||
<li><span class="quantity">{{ usage.total_disk_usage|floatformat }}</span><span class="unit">GB-HR</span> Used</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<p id="activity" class="tenant">
|
||||
<span><strong>{% trans "Active Instances"%}:</strong> {{usage.total_active_instances}}</span>
|
||||
<span><strong>{% trans "This month's VCPU-Hours"%}:</strong> {{usage.total_cpu_usage|floatformat}}</span>
|
||||
<span><strong>{% trans "This month's GB-Hours"%}:</strong> {{usage.total_disk_usage|floatformat}}</span>
|
||||
<span><strong>{% trans "Active Instances" %}:</strong> {{ usage.total_active_instances }}</span>
|
||||
<span><strong>{% trans "This month's VCPU-Hours" %}:</strong> {{ usage.total_cpu_usage|floatformat }}</span>
|
||||
<span><strong>{% trans "This month's GB-Hours" %}:</strong> {{ usage.total_disk_usage|floatformat }}</span>
|
||||
</p>
|
||||
|
||||
|
||||
{% if usage.instances %}
|
||||
<div class='table_title wide'>
|
||||
<a class="csv_download_link" href="{{csv_link}}">{% trans "Download CSV"%} »</a>
|
||||
<h3>{% trans "Tenant Usage"%}: {{tenant_id}}</h3>
|
||||
<a class="csv_download_link" href="{{ csv_link }}">{% trans "Download CSV" %} »</a>
|
||||
<h3>{% trans "Tenant Usage" %}: {{ tenant_id }}</h3>
|
||||
</div>
|
||||
|
||||
<table class="zebra-striped">
|
||||
<tr id='headings'>
|
||||
<th>{% trans "ID"%}</th>
|
||||
<th>{% trans "Name"%}</th>
|
||||
<th>{% trans "User"%}</th>
|
||||
<th>{% trans "VCPUs"%}</th>
|
||||
<th>{% trans "Ram Size"%}</th>
|
||||
<th>{% trans "Disk Size"%}</th>
|
||||
<th>{% trans "Flavor"%}</th>
|
||||
<th>{% trans "Uptime"%}</th>
|
||||
<th>{% trans "Status"%}</th>
|
||||
<th>{% trans "ID" %}</th>
|
||||
<th>{% trans "Name" %}</th>
|
||||
<th>{% trans "User" %}</th>
|
||||
<th>{% trans "VCPUs" %}</th>
|
||||
<th>{% trans "Ram Size" %}</th>
|
||||
<th>{% trans "Disk Size" %}</th>
|
||||
<th>{% trans "Flavor" %}</th>
|
||||
<th>{% trans "Uptime" %}</th>
|
||||
<th>{% trans "Status" %}</th>
|
||||
</tr>
|
||||
<tbody class='main'>
|
||||
{% for instance in instances %}
|
||||
@@ -73,15 +73,15 @@
|
||||
{% else %}
|
||||
<tr class="{% cycle 'odd' 'even' %}">
|
||||
{% endif %}
|
||||
<td>{{instance.id}}</td>
|
||||
<td>{{instance.name}}</td>
|
||||
<td>{{instance.user_id}}</td>
|
||||
<td>{{instance.vcpus}}</td>
|
||||
<td>{{instance.ram_size|mbformat}}</td>
|
||||
<td>{{instance.disk_size}}GB</td>
|
||||
<td>{{instance.flavor}}</td>
|
||||
<td>{{instance.uptime_at|timesince}}</td>
|
||||
<td>{{instance.state|capfirst}}</td>
|
||||
<td>{{ instance.id }}</td>
|
||||
<td>{{ instance.name }}</td>
|
||||
<td>{{ instance.user_id }}</td>
|
||||
<td>{{ instance.vcpus }}</td>
|
||||
<td>{{ instance.ram_size|mbformat }}</td>
|
||||
<td>{{ instance.disk_size }}GB</td>
|
||||
<td>{{ instance.flavor }}</td>
|
||||
<td>{{ instance.uptime_at|timesince }}</td>
|
||||
<td>{{ instance.state|capfirst }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
|
||||
@@ -10,10 +10,10 @@
|
||||
{% block syspanel_main %}
|
||||
{% if external_links %}
|
||||
<div id="monitoring">
|
||||
<h3>{% trans "Monitoring"%}: </h3>
|
||||
<h3>{% trans "Monitoring" %}: </h3>
|
||||
<ul id="external_links">
|
||||
{% for link in external_links %}
|
||||
<li><a target="_blank" href="{{ link.1 }}">{{ link.0 }}</a></li>
|
||||
<li><a target="_blank" href="{{ link.1 }}">{{ link.0}}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
<form action="" method="get" id="date_form">
|
||||
<!-- {% csrf_token %} -->
|
||||
<h3>{% trans "Select a month to query its usage"%}: </h3>
|
||||
<h3>{% trans "Select a month to query its usage" %}: </h3>
|
||||
<div class="form-row">
|
||||
{{ dateform.date }}
|
||||
<input class="btn small" type="submit"/>
|
||||
@@ -31,54 +31,54 @@
|
||||
<ul class='status_box good'>
|
||||
<li class='status block'><span>Status:</span> Good</li>
|
||||
<li class='block'>
|
||||
<p class='overview'>{{global_summary.total_vcpus}}<span> Cores</span></p>
|
||||
<p class='used'>{{global_summary.total_active_vcpus}}<span class='labels'> Used</span></p>
|
||||
<p class='avail'>{{global_summary.total_avail_vcpus}}<span class='labels'> Avail</span></p>
|
||||
<p class='overview'>{{ global_summary.total_vcpus }}<span> Cores</span></p>
|
||||
<p class='used'>{{ global_summary.total_active_vcpus }}<span class='labels'> Used</span></p>
|
||||
<p class='avail'>{{ global_summary.total_avail_vcpus }}<span class='labels'> Avail</span></p>
|
||||
</li>
|
||||
<li class='block'>
|
||||
<p class='overview'>{{global_summary.total_ram_size_hr|floatformat}}<span> {{global_summary.unit_ram_size}} Ram</span></p>
|
||||
<p class='used'>{{global_summary.total_active_ram_size_hr|floatformat}}<span class='unit'> {{global_summary.unit_ram_size}}</span><span class='labels'> Used</span></p>
|
||||
<p class='avail'>{{global_summary.total_avail_ram_size_hr|floatformat}}<span class='unit'> {{global_summary.unit_ram_size}}</span><span class='labels'> Avail</span></p>
|
||||
<p class='overview'>{{ global_summary.total_ram_size_hr|floatformat }}<span> {{ global_summary.unit_ram_size }} Ram</span></p>
|
||||
<p class='used'>{{ global_summary.total_active_ram_size_hr|floatformat }}<span class='unit'> {{ global_summary.unit_ram_size }}</span><span class='labels'> Used</span></p>
|
||||
<p class='avail'>{{ global_summary.total_avail_ram_size_hr|floatformat }}<span class='unit'> {{ global_summary.unit_ram_size }}</span><span class='labels'> Avail</span></p>
|
||||
</li>
|
||||
<li class='block last'>
|
||||
<p class='overview'>{{global_summary.total_disk_size_hr|floatformat}}<span> {{global_summary.unit_disk_size}} Disk</span></p>
|
||||
<p class='used'>{{global_summary.total_active_disk_size_hr|floatformat}}<span class='unit'> {{global_summary.unit_disk_size}}</span><span class='labels'> Used</span></p>
|
||||
<p class='avail'>{{global_summary.total_avail_disk_size_hr|floatformat}}<span class='unit'> {{global_summary.unit_disk_size}}</span><span class='labels'> Avail</span></p>
|
||||
<p class='overview'>{{ global_summary.total_disk_size_hr|floatformat }}<span> {{ global_summary.unit_disk_size }} Disk</span></p>
|
||||
<p class='used'>{{ global_summary.total_active_disk_size_hr|floatformat }}<span class='unit'> {{ global_summary.unit_disk_size }}</span><span class='labels'> Used</span></p>
|
||||
<p class='avail'>{{ global_summary.total_avail_disk_size_hr|floatformat }}<span class='unit'> {{ global_summary.unit_disk_size }}</span><span class='labels'> Avail</span></p>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<p id="activity">
|
||||
<span><strong>{% trans "Active Instances"%}:</strong> {{global_summary.total_active_instances|default:'-'}}</span>
|
||||
<span><strong>{% trans "This month's VCPU-Hours"%}:</strong> {{global_summary.total_cpu_usage|floatformat|default:'-'}}</span>
|
||||
<span><strong>{% trans "This month's GB-Hours"%}:</strong> {{global_summary.total_disk_usage|floatformat|default:'-'}}</span>
|
||||
<span><strong>{% trans "Active Instances" %}:</strong> {{ global_summary.total_active_instances|default:'-' }}</span>
|
||||
<span><strong>{% trans "This month's VCPU-Hours" %}:</strong> {{ global_summary.total_cpu_usage|floatformat|default:'-' }}</span>
|
||||
<span><strong>{% trans "This month's GB-Hours" %}:</strong> {{ global_summary.total_disk_usage|floatformat|default:'-' }}</span>
|
||||
</p>
|
||||
|
||||
{% if usage_list %}
|
||||
<div id="usage">
|
||||
<div class='table_title wide'>
|
||||
<a class="csv_download_link pull-right" href="{{csv_link}}">{% trans "Download CSV"%} »</a>
|
||||
<h3>{% trans "Server Usage Summary"%}</h3>
|
||||
<a class="csv_download_link pull-right" href="{{ csv_link }}">{% trans "Download CSV" %} »</a>
|
||||
<h3>{% trans "Server Usage Summary" %}</h3>
|
||||
</div>
|
||||
|
||||
<table class="zebra-striped">
|
||||
<tr id="headings">
|
||||
<th>{% trans "Tenant"%}</th>
|
||||
<th>{% trans "Instances"%}</th>
|
||||
<th>{% trans "VCPUs"%}</th>
|
||||
<th>{% trans "Disk"%}</th>
|
||||
<th>{% trans "RAM"%}</th>
|
||||
<th>{% trans "VCPU CPU-Hours"%}</th>
|
||||
<th>{% trans "Disk GB-Hours"%}</th>
|
||||
<th>{% trans "Tenant" %}</th>
|
||||
<th>{% trans "Instances" %}</th>
|
||||
<th>{% trans "VCPUs" %}</th>
|
||||
<th>{% trans "Disk" %}</th>
|
||||
<th>{% trans "RAM" %}</th>
|
||||
<th>{% trans "VCPU CPU-Hours" %}</th>
|
||||
<th>{% trans "Disk GB-Hours" %}</th>
|
||||
</tr>
|
||||
{% for usage in usage_list %}
|
||||
<tr>
|
||||
<td><a href="{% url horizon:syspanel:instances:tenant_usage usage.tenant_id %}">{{usage.tenant_id}}</a></td>
|
||||
<td>{{usage.total_active_instances}}</td>
|
||||
<td>{{usage.total_active_vcpus}}</td>
|
||||
<td>{{usage.total_active_disk_size|diskgbformat}}</td>
|
||||
<td>{{usage.total_active_ram_size|mbformat}}</td>
|
||||
<td>{{usage.total_cpu_usage|floatformat}}</td>
|
||||
<td>{{usage.total_disk_usage|floatformat}}</td>
|
||||
<td><a href="{% url horizon:syspanel:instances:tenant_usage usage.tenant_id %}">{{ usage.tenant_id }}</a></td>
|
||||
<td>{{ usage.total_active_instances }}</td>
|
||||
<td>{{ usage.total_active_vcpus }}</td>
|
||||
<td>{{ usage.total_active_disk_size|diskgbformat }}</td>
|
||||
<td>{{ usage.total_active_ram_size|mbformat }}</td>
|
||||
<td>{{ usage.total_cpu_usage|floatformat }}</td>
|
||||
<td>{{ usage.total_disk_usage|floatformat }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
{% block syspanel_main %}
|
||||
<table class="zebra-striped">
|
||||
<tr>
|
||||
<th>{% trans "Quota Name"%}</th>
|
||||
<th>{% trans "Limit"%}</th>
|
||||
<th>{% trans "Quota Name" %}</th>
|
||||
<th>{% trans "Limit" %}</th>
|
||||
</tr>
|
||||
{% for name,value in quotas.items %}
|
||||
<tr>
|
||||
|
||||
@@ -2,47 +2,47 @@
|
||||
{% load sizeformat %}
|
||||
<table>
|
||||
<tr>
|
||||
<th>{% trans "Service"%}</th>
|
||||
<th>{% trans "System Stats"%}</th>
|
||||
<th>{% trans "Enabled"%}</th>
|
||||
<th>{% trans "Up"%}</th>
|
||||
<th>{% trans "Actions"%}</th>
|
||||
<th>{% trans "Service" %}</th>
|
||||
<th>{% trans "System Stats" %}</th>
|
||||
<th>{% trans "Enabled" %}</th>
|
||||
<th>{% trans "Up" %}</th>
|
||||
<th>{% trans "Actions" %}</th>
|
||||
</tr>
|
||||
|
||||
{% for service in services %}
|
||||
<tr class='{{service.up|yesno:"good,bad"}} {{service.disabled|yesno:"medium,"}} {% cycle 'odd' 'even' %}'>
|
||||
<tr class='{{ service.up|yesno:"good,bad" }} {{ service.disabled|yesno:"medium," }} {% cycle 'odd' 'even' %}'>
|
||||
<td>
|
||||
{{service.type}} <br/>
|
||||
( {{service.host}} )
|
||||
{{ service.type }} <br/>
|
||||
( {{ service.host }} )
|
||||
</td>
|
||||
{% if service.type == 'nova-compute' %}
|
||||
<td>
|
||||
<ul>
|
||||
<li>
|
||||
{% trans "Hypervisor"%}: {{service.stats.hypervisor_type}}( {{service.stats.cpu_info.features|join:', '}})
|
||||
{% trans "Hypervisor" %}: {{ service.stats.hypervisor_type }}( {{ service.stats.cpu_info.features|join:', ' }})
|
||||
</li>
|
||||
<li>
|
||||
{% trans "Allocable Cores"%}:
|
||||
{{service.stats.max_vcpus}}
|
||||
({{service.stats.vcpus_used}} Used, {{service.stats.vcpus}} Physical/Virtual)
|
||||
{% trans "Allocable Cores" %}:
|
||||
{{ service.stats.max_vcpus }}
|
||||
({{ service.stats.vcpus_used }} Used, {{ service.stats.vcpus }} Physical/Virtual)
|
||||
</li>
|
||||
<li>
|
||||
{% trans "Allocable Storage"%}:
|
||||
{{service.stats.max_gigabytes|diskgbformat}}
|
||||
({{service.stats.local_gb_used|diskgbformat}} Used, {{service.stats.local_gb|diskgbformat}} Physical)
|
||||
{% trans "Allocable Storage" %}:
|
||||
{{ service.stats.max_gigabytes|diskgbformat }}
|
||||
({{ service.stats.local_gb_used|diskgbformat }} Used, {{ service.stats.local_gb|diskgbformat }} Physical)
|
||||
</li>
|
||||
<li>
|
||||
{% trans "System Ram"%}:
|
||||
{{service.stats.memory_mb|mbformat}}
|
||||
({{service.stats.memory_mb_used|mbformat}} Used)
|
||||
{% trans "System Ram" %}:
|
||||
{{ service.stats.memory_mb|mbformat }}
|
||||
({{ service.stats.memory_mb_used|mbformat }} Used)
|
||||
</li>
|
||||
</ul>
|
||||
</td>
|
||||
{% else %}
|
||||
<td> - </td>
|
||||
{% endif %}
|
||||
<td>{{service.disabled|yesno:"Disabled,Enabled"}}</td>
|
||||
<td>{{service.up}}</td>
|
||||
<td>{{ service.disabled|yesno:"Disabled,Enabled" }}</td>
|
||||
<td>{{ service.up }}</td>
|
||||
<td id="actions">
|
||||
<ul>
|
||||
<li class="form">{% include "syspanel/services/_toggle.html" with form=service_toggle_enabled_form %}</li>
|
||||
@@ -51,14 +51,14 @@
|
||||
</tr>
|
||||
{% endfor %}
|
||||
{% for service in other_services %}
|
||||
<tr class='{{service.up|yesno:"good,bad"}} {{service.disabled|yesno:"medium,"}} {% cycle 'odd' 'even' %}'>
|
||||
<tr class='{{ service.up|yesno:"good,bad" }} {{ service.disabled|yesno:"medium," }} {% cycle 'odd' 'even' %}'>
|
||||
<td>
|
||||
{{service.type}} <br/>
|
||||
( {{service.host}} )
|
||||
{{ service.type }} <br/>
|
||||
( {{ service.host }} )
|
||||
</td>
|
||||
<td> - </td>
|
||||
<td>{{service.disabled|yesno:"Disabled,Enabled"}}</td>
|
||||
<td>{{service.up}}</td>
|
||||
<td>{{ service.disabled|yesno:"Disabled,Enabled" }}</td>
|
||||
<td>{{ service.up }}</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
{% load i18n %}
|
||||
{% if service.disabled %}
|
||||
<form id="form_service_enable_{{service.id}}" class="form-service-enable" method="post">
|
||||
<form id="form_service_enable_{{ service.id }}" class="form-service-enable" method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{hidden}}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input name="service" type="hidden" value="{{service.id}}" />
|
||||
<input name="name" type="hidden" value="{{service.type}}" />
|
||||
<input id="enable_{{service.id}}" class="enable" title="Service: {{service.type}}" type="submit" value="{% trans "Enable"%}" />
|
||||
<input name="service" type="hidden" value="{{ service.id }}" />
|
||||
<input name="name" type="hidden" value="{{ service.type }}" />
|
||||
<input id="enable_{{ service.id }}" class="enable" title="Service: {{ service.type }}" type="submit" value="{% trans "Enable" %}" />
|
||||
</form>
|
||||
{% else %}
|
||||
<form id="form_service_disable_{{service.id}}" class="form-service-disable" method="post">
|
||||
<form id="form_service_disable_{{ service.id }}" class="form-service-disable" method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{hidden}}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input name="service" type="hidden" value="{{service.id}}" />
|
||||
<input name="name" type="hidden" value="{{service.type}}" />
|
||||
<input id="disable_{{service.id}}" class="btn small disable" title="Service: {{service.type}}" type="submit" value="{% trans "Disable"%}" />
|
||||
<input name="service" type="hidden" value="{{ service.id }}" />
|
||||
<input name="name" type="hidden" value="{{ service.type }}" />
|
||||
<input id="disable_{{ service.id }}" class="btn small disable" title="Service: {{ service.type }}" type="submit" value="{% trans "Disable" %}" />
|
||||
</form>
|
||||
{% endif %}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{% load i18n %}
|
||||
<form id="form_add_tenant_user{{user}}" method="post">
|
||||
<form id="form_add_tenant_user{{ user }}" method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{hidden}}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input name="user" type="hidden" value="{{user.id}}" />
|
||||
<input name="tenant" type="hidden" value="{{tenant_id}}" />
|
||||
<input id="add_tenant_user_{{user.id}}" class="btn small add" title="User: {{user.id}}" type="submit" value="{% trans "Add"%}" />
|
||||
<input name="user" type="hidden" value="{{ user.id }}" />
|
||||
<input name="tenant" type="hidden" value="{{ tenant_id }}" />
|
||||
<input id="add_tenant_user_{{ user.id }}" class="btn small add" title="User: {{ user.id }}" type="submit" value="{% trans "Add" %}" />
|
||||
</form>
|
||||
|
||||
@@ -14,12 +14,12 @@
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3>{% trans "Description"%}:</h3>
|
||||
<p>{% trans "From here you can create a new tenant (aka project) to organize users."%}</p>
|
||||
<h3>{% trans "Description" %}:</h3>
|
||||
<p>{% trans "From here you can create a new tenant (aka project) to organize users." %}</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block modal-footer %}
|
||||
<input class="btn primary pull-right" type="submit" value="{%trans "Create Tenant" %}" />
|
||||
<input class="btn primary pull-right" type="submit" value="{% trans "Create Tenant" %}" />
|
||||
<a href="{% url horizon:syspanel:tenants:index %}" class="btn secondary cancel close">Cancel</a>
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{% load i18n %}
|
||||
<form id="form_tenant_delete{{tenant.id}}" class="form-tenant-delete" method="post">
|
||||
<form id="form_tenant_delete{{ tenant.id }}" class="form-tenant-delete" method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{hidden}}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input name="tenant_id" type="hidden" value="{{tenant.id}}" />
|
||||
<input id="delete_{{tenant.id}}" class="btn small delete" title="Tenant: {{tenant.id}}" type="submit" value="{% trans "Delete" %}" />
|
||||
<input name="tenant_id" type="hidden" value="{{ tenant.id }}" />
|
||||
<input id="delete_{{ tenant.id }}" class="btn small delete" title="Tenant: {{ tenant.id }}" type="submit" value="{% trans "Delete" %}" />
|
||||
</form>
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
{% load i18n %}
|
||||
<table class="zebra-striped">
|
||||
<tr>
|
||||
<th>{% trans "Id"%}</th>
|
||||
<th>{% trans "Name"%}</th>
|
||||
<th>{% trans "Description"%}</th>
|
||||
<th>{% trans "Enabled"%}</th>
|
||||
<th>{% trans "Options"%}</th>
|
||||
<th>{% trans "Id" %}</th>
|
||||
<th>{% trans "Name" %}</th>
|
||||
<th>{% trans "Description" %}</th>
|
||||
<th>{% trans "Enabled" %}</th>
|
||||
<th>{% trans "Options" %}</th>
|
||||
</tr>
|
||||
{% for tenant in tenants %}
|
||||
<tr class="{% cycle 'odd' 'even' %}">
|
||||
<td>{{tenant.id}}</td>
|
||||
<td>{{tenant.name}}</td>
|
||||
<td>{{tenant.description}}</td>
|
||||
<td>{{tenant.enabled}}</td>
|
||||
<td>{{ tenant.id }}</td>
|
||||
<td>{{ tenant.name }}</td>
|
||||
<td>{{ tenant.description }}</td>
|
||||
<td>{{ tenant.enabled }}</td>
|
||||
<td id="actions">
|
||||
<ul>
|
||||
<li class="form">{% include "syspanel/tenants/_delete.html" with form=tenant_delete_form %}</li>
|
||||
<li><a class="btn small" href="{% url horizon:syspanel:tenants:update tenant.id %}">{% trans "Edit"%}</a></li>
|
||||
<li><a class="btn small" href="{% url horizon:syspanel:tenants:users tenant.id %}">{% trans "View Members"%}</a></li>
|
||||
<li><a class="btn small" href="{% url horizon:syspanel:tenants:quotas tenant.id %}">{% trans "Modify Quotas"%}</a></li>
|
||||
<li><a class="btn small" href="{% url horizon:syspanel:tenants:update tenant.id %}">{% trans "Edit" %}</a></li>
|
||||
<li><a class="btn small" href="{% url horizon:syspanel:tenants:users tenant.id %}">{% trans "View Members" %}</a></li>
|
||||
<li><a class="btn small" href="{% url horizon:syspanel:tenants:quotas tenant.id %}">{% trans "Modify Quotas" %}</a></li>
|
||||
</ul>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
{% block form_id %}quota_update_form{% endblock %}
|
||||
{% block form_action %}{% url horizon:syspanel:tenants:quotas tenant_id %}{% endblock %}
|
||||
|
||||
{% block modal-header %}{%trans "Update Quota"%}{% endblock %}
|
||||
{% block modal-header %}{% trans "Update Quota" %}{% endblock %}
|
||||
|
||||
{% block modal-body %}
|
||||
<div class="left">
|
||||
@@ -13,12 +13,12 @@
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3>{% trans "Description"%}:</h3>
|
||||
<p>{% trans "From here you can edit quotas (max limits) for the tenant {{tenant_id}}."%}</p>
|
||||
<h3>{% trans "Description" %}:</h3>
|
||||
<p>{% trans "From here you can edit quotas (max limits) for the tenant {{ tenant_id }}." %}</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block modal-footer %}
|
||||
<input class="btn primary pull-right" type="submit" value="{%trans "Update Quota"%}" />
|
||||
<input class="btn primary pull-right" type="submit" value="{% trans "Update Quota" %}" />
|
||||
<a href="{% url horizon:syspanel:tenants:index %}" class="btn secondary cancel close">Cancel</a>
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{% load i18n %}
|
||||
<form id="form_remove_tenant_user{{user.id}}" method="post">
|
||||
<form id="form_remove_tenant_user{{ user.id }}" method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{hidden}}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input name="user" type="hidden" value="{{user.id}}" />
|
||||
<input name="tenant" type="hidden" value="{{tenant_id}}" />
|
||||
<input id="remove_tenant_user_{{user.id}}" class="btn small remove" ttle="User: {{user.id}}" type="submit" value="{% trans "Remove"%}" />
|
||||
<input name="user" type="hidden" value="{{ user.id }}" />
|
||||
<input name="tenant" type="hidden" value="{{ tenant_id }}" />
|
||||
<input id="remove_tenant_user_{{ user.id }}" class="btn small remove" ttle="User: {{ user.id }}" type="submit" value="{% trans "Remove" %}" />
|
||||
</form>
|
||||
|
||||
@@ -13,12 +13,12 @@
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3>{% trans "Description"%}:</h3>
|
||||
<p>{% trans "From here you can edit a tenant."%}</p>
|
||||
<h3>{% trans "Description" %}:</h3>
|
||||
<p>{% trans "From here you can edit a tenant." %}</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block modal-footer %}
|
||||
<input class="btn primary pull-right" type="submit" value="{%trans "Update Tenant"%}" />
|
||||
<input class="btn primary pull-right" type="submit" value="{% trans "Update Tenant" %}" />
|
||||
<a href="{% url horizon:syspanel:tenants:index %}" class="btn secondary cancel close">Cancel</a>
|
||||
{% endblock %}
|
||||
|
||||
@@ -10,5 +10,5 @@
|
||||
|
||||
{% block syspanel_main %}
|
||||
{% include "syspanel/tenants/_list.html" %}
|
||||
<a id="tenant_create_link" class="btn small" href="{% url horizon:syspanel:tenants:create %}">{% trans "Create New Tenant"%}</a>
|
||||
<a id="tenant_create_link" class="btn small" href="{% url horizon:syspanel:tenants:create %}">{% trans "Create New Tenant" %}</a>
|
||||
{% endblock %}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
{% block page_header %}
|
||||
<div class='page-header'>
|
||||
<h2>{% trans "Users for Tenant"%}: <span>{{tenant_id}}</span></h2>
|
||||
<h2>{% trans "Users for Tenant" %}: <span>{{ tenant_id }}</span></h2>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
@@ -14,17 +14,17 @@
|
||||
{% if users %}
|
||||
<table class="zebra-striped">
|
||||
<tr id='headings'>
|
||||
<th>{% trans "ID"%}</th>
|
||||
<th>{% trans "Name"%}</th>
|
||||
<th>{% trans "Email"%}</th>
|
||||
<th>{% trans "Actions"%}</th>
|
||||
<th>{% trans "ID" %}</th>
|
||||
<th>{% trans "Name" %}</th>
|
||||
<th>{% trans "Email" %}</th>
|
||||
<th>{% trans "Actions" %}</th>
|
||||
</tr>
|
||||
<tbody class='main'>
|
||||
{% for user in users %}
|
||||
<tr class="{% cycle 'odd' 'even' %}">
|
||||
<td>{{user.id}}</td>
|
||||
<td>{{user.name}}</td>
|
||||
<td>{{user.email}}</td>
|
||||
<td>{{ user.id }}</td>
|
||||
<td>{{ user.name }}</td>
|
||||
<td>{{ user.email }}</td>
|
||||
<td id="actions">
|
||||
<ul>
|
||||
<li class="form">{% include "syspanel/tenants/_remove_user.html" with form=remove_user_form %}</li>
|
||||
@@ -36,23 +36,23 @@
|
||||
</table>
|
||||
{% else %}
|
||||
<div class="message_box info">
|
||||
<h2>{% trans "Info"%}</h2>
|
||||
<p>T{% trans "here are currently no users for this tenant"%}</p>
|
||||
<h2>{% trans "Info" %}</h2>
|
||||
<p>T{% trans "here are currently no users for this tenant" %}</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if new_users %}
|
||||
<h3>{% trans "Add new users"%}</h3>
|
||||
<h3>{% trans "Add new users" %}</h3>
|
||||
<table class="zebra-striped">
|
||||
<tr id='headings'>
|
||||
<th>{% trans "ID"%}</th>
|
||||
<th>{% trans "Name"%}</th>
|
||||
<th>{% trans "Actions"%}</th>
|
||||
<th>{% trans "ID" %}</th>
|
||||
<th>{% trans "Name" %}</th>
|
||||
<th>{% trans "Actions" %}</th>
|
||||
</tr>
|
||||
<tbody class='main'>
|
||||
{% for user in new_users %}
|
||||
<tr class="{% cycle 'odd' 'even' %}">
|
||||
<td>{{user.id}}</td>
|
||||
<td>{{user.name}}</td>
|
||||
<td>{{ user.id }}</td>
|
||||
<td>{{ user.name }}</td>
|
||||
<td id="actions">
|
||||
<ul>
|
||||
<li class="form">{% include "syspanel/tenants/_add_user.html" with form=add_user_form %}</li>
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3>{% trans "Description"%}:</h3>
|
||||
<p>{% trans "From here you can create a new user and assign them to a tenant (aka project)."%}</p>
|
||||
<h3>{% trans "Description" %}:</h3>
|
||||
<p>{% trans "From here you can create a new user and assign them to a tenant (aka project)." %}</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{% load i18n %}
|
||||
<form id="form_user_delete{{user.id}}" class="form-user-delete" method="post">
|
||||
<form id="form_user_delete{{ user.id }}" class="form-user-delete" method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{hidden}}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input name="user" type="hidden" value="{{user.id}}" />
|
||||
<input id="enable_{{user.id}}" class="btn small danger delete" title="User: {{user.id}}" type="submit" value="{% trans "Delete"%}" />
|
||||
<input name="user" type="hidden" value="{{ user.id }}" />
|
||||
<input id="enable_{{ user.id }}" class="btn small danger delete" title="User: {{ user.id }}" type="submit" value="{% trans "Delete" %}" />
|
||||
</form>
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<form id="form_user_enable_disable{{user.id}}" class="form-enable_disable" method="post">
|
||||
<form id="form_user_enable_disable{{ user.id }}" class="form-enable_disable" method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{hidden}}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input name="id" type="hidden" value="{{user.id}}" />
|
||||
<input name="id" type="hidden" value="{{ user.id }}" />
|
||||
<input name="enabled" type="hidden" value="{{ user.enabled|yesno:"disable,enable,None" }}" />
|
||||
<input id="enable_{{user.id}}" class="btn small {{ user.enabled|yesno:"disable,enable,None" }}" title="User: {{user.id}}" type="submit" value="{{ user.enabled|yesno:"Disable,Enable,Error" }}" />
|
||||
<input id="enable_{{ user.id }}" class="btn small {{ user.enabled|yesno:"disable,enable,None" }}" title="User: {{ user.id }}" type="submit" value="{{ user.enabled|yesno:"Disable,Enable,Error" }}" />
|
||||
</form>
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
{% load i18n %}
|
||||
{% if user.enabled %}
|
||||
<form id="form_user_disable_{{user.id}}" class="form-user-disable" method="post">
|
||||
<form id="form_user_disable_{{ user.id }}" class="form-user-disable" method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{hidden}}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input name="user" type="hidden" value="{{user.id}}" />
|
||||
<input id="disable_{{user.id}}" class="disable" title="User: {{user.id}}" type="submit" value="{% trans "Disable"%}" />
|
||||
<input name="user" type="hidden" value="{{ user.id }}" />
|
||||
<input id="disable_{{ user.id }}" class="disable" title="User: {{ user.id }}" type="submit" value="{% trans "Disable" %}" />
|
||||
</form>
|
||||
{% else %}
|
||||
<form id="form_user_enable_{{user.id}}" class="form-user-enable" method="post">
|
||||
<form id="form_user_enable_{{ user.id }}" class="form-user-enable" method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{hidden}}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input name="user" type="hidden" value="{{user.id}}" />
|
||||
<input id="enable_{{user.id}}" class="enable" title="User: {{user.id}}" type="submit" value="{% trans "Enable"%}" />
|
||||
<input name="user" type="hidden" value="{{ user.id }}" />
|
||||
<input id="enable_{{ user.id }}" class="enable" title="User: {{ user.id }}" type="submit" value="{% trans "Enable" %}" />
|
||||
</form>
|
||||
{% endif %}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
{% block form_id %}update_tenant_form{% endblock %}
|
||||
{% block form_action %}{% url horizon:syspanel:users:update user_id %}{% endblock %}
|
||||
|
||||
{% block modal-header %}{% trans "Update User"%}{% endblock %}
|
||||
{% block modal-header %}{% trans "Update User" %}{% endblock %}
|
||||
|
||||
{% block modal-body %}
|
||||
<div class="left">
|
||||
@@ -13,12 +13,12 @@
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3>{% trans "Description"%}:</h3>
|
||||
<p>{% trans "From here you can edit users by changing their usernames, emails, passwords, and tenants."%}</p>
|
||||
<h3>{% trans "Description" %}:</h3>
|
||||
<p>{% trans "From here you can edit users by changing their usernames, emails, passwords, and tenants." %}</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block modal-footer %}
|
||||
<input class="btn primary pull-right" type="submit" value="{% trans "Update User"%}" />
|
||||
<input class="btn primary pull-right" type="submit" value="{% trans "Update User" %}" />
|
||||
<a href="{% url horizon:syspanel:users:index %}" class="btn secondary cancel close">Cancel</a>
|
||||
{% endblock %}
|
||||
|
||||
@@ -12,21 +12,21 @@
|
||||
|
||||
<table class="zebra-striped">
|
||||
<tr>
|
||||
<th>{% trans "ID"%}</th>
|
||||
<th>{% trans "Name"%}</th>
|
||||
<th>{% trans "Email"%}</th>
|
||||
<th>{% trans "Default Tenant"%}</th>
|
||||
<th>{% trans "Options"%}</th>
|
||||
<th>{% trans "ID" %}</th>
|
||||
<th>{% trans "Name" %}</th>
|
||||
<th>{% trans "Email" %}</th>
|
||||
<th>{% trans "Default Tenant" %}</th>
|
||||
<th>{% trans "Options" %}</th>
|
||||
</tr>
|
||||
{% for user in users %}
|
||||
<tr class="{% cycle 'odd' 'even' %}">
|
||||
<td>{{user.id}}{% if not user.enabled %} (disabled){% endif %}</td>
|
||||
<td>{{user.name}}</td>
|
||||
<td>{{user.email}}</td>
|
||||
<td>{{user.tenantId}}</td>
|
||||
<td>{{ user.id }}{% if not user.enabled %} (disabled){% endif %}</td>
|
||||
<td>{{ user.name }}</td>
|
||||
<td>{{ user.email }}</td>
|
||||
<td>{{ user.tenantId }}</td>
|
||||
<td id="actions">
|
||||
<ul>
|
||||
<li><a class="btn small" href="{% url horizon:syspanel:users:update user.id %}">{% trans "Edit"%}</a></li>
|
||||
<li><a class="btn small" href="{% url horizon:syspanel:users:update user.id %}">{% trans "Edit" %}</a></li>
|
||||
<li class="form">{% include "syspanel/users/_enable_disable.html" with form=user_enable_disable_form %}</li>
|
||||
<li class="form">{% include "syspanel/users/_delete.html" with form=user_delete_form %}</li>
|
||||
</ul>
|
||||
@@ -34,7 +34,7 @@
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
<a id="user_create_link" class="btn small" href="{% url horizon:syspanel:users:create %}">{% trans "Create New User"%}</a>
|
||||
<a id="user_create_link" class="btn small" href="{% url horizon:syspanel:users:create %}">{% trans "Create New User" %}</a>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
Reference in New Issue
Block a user