Fixing incorrect formatting of django tags.
Fixes Bug 905020 Change-Id: Ib00ad798b16d0d6ebdcd85b3ba73478e9ad8ea56
This commit is contained in:
parent
00fcb42559
commit
509164cbe3
horizon/horizon
dashboards
nova/templates/nova
access_and_security
containers
images_and_snapshots
instances_and_volumes
networks
_delete.html_delete_port.html_detach_port.html_detail.html_list.html_rename.html_toggle_port.htmldetail.html
objects
ports
settings/templates/settings
syspanel/templates/syspanel
flavors
images
instances
quotas
services
tenants
_add_user.html_create.html_delete.html_list.html_quotas.html_remove_user.html_update.htmlindex.htmlusers.html
users
templates/horizon
tests/templates
openstack-dashboard/dashboard/templates
@ -2,7 +2,7 @@
|
||||
<form id="form_allocate" action="." method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{hidden}}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input class="btn small primary" type="submit" value="{%trans "Allocate IP"%}" />
|
||||
<input class="btn small primary" type="submit" value="{% trans "Allocate IP" %}" />
|
||||
</form>
|
||||
|
@ -13,12 +13,12 @@
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3>{% trans "Description:"%}</h3>
|
||||
<p>{% trans "Associate a floating ip with an instance."%}</p>
|
||||
<h3>{% trans "Description:" %}</h3>
|
||||
<p>{% trans "Associate a floating ip with an instance." %}</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block modal-footer %}
|
||||
<input class="btn primary pull-right" type="submit" value="{%trans "Associate IP"%}" />
|
||||
<input class="btn primary pull-right" type="submit" value="{% trans "Associate IP" %}" />
|
||||
<a href="{% url horizon:nova:access_and_security:index %}" class="btn secondary cancel close">Cancel</a>
|
||||
{% endblock %}
|
||||
|
8
horizon/horizon/dashboards/nova/templates/nova/access_and_security/floating_ips/_disassociate.html
8
horizon/horizon/dashboards/nova/templates/nova/access_and_security/floating_ips/_disassociate.html
@ -1,9 +1,9 @@
|
||||
{% load i18n %}
|
||||
<form id="form_release_{{ip.id}}" class="form-delete" method="post">
|
||||
<form id="form_release_{{ ip.id }}" class="form-delete" method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{hidden}}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input name="floating_ip_id" type="hidden" value="{{ip.id}}" />
|
||||
<input id="delete_{{ip.id}}" class="btn small delete" title="Floating IP: {{ip.id}} ({{ip.ip}})" type="submit" value="{% trans "Disassociate with instance."%}" />
|
||||
<input name="floating_ip_id" type="hidden" value="{{ ip.id }}" />
|
||||
<input id="delete_{{ ip.id }}" class="btn small delete" title="Floating IP: {{ ip.id }} ({{ ip.ip }})" type="submit" value="{% trans "Disassociate with instance." %}" />
|
||||
</form>
|
||||
|
@ -25,14 +25,14 @@
|
||||
{% for ip in floating_ips %}
|
||||
<tr class="{% cycle 'odd' 'even' %}">
|
||||
<td class="select">
|
||||
<input type="checkbox" name="ip_{{ip.id}}" value="ip_{{ip.id}}" id="ip_select_{{ip.id}}" />
|
||||
<input type="checkbox" name="ip_{{ ip.id }}" value="ip_{{ ip.id }}" id="ip_select_{{ ip.id }}" />
|
||||
</td>
|
||||
<td>{{ip.ip }}</td>
|
||||
<td>
|
||||
{% if ip.fixed_ip %}
|
||||
<ul>
|
||||
<li><span>{% trans "Instance ID:" %}</span> {{ip.instance_id }}</li>
|
||||
<li><span>{% trans "Fixed IP:" %}</span> {{ip.fixed_ip }}</li>
|
||||
<li><span>{% trans "Instance ID:" %}</span> {{ ip.instance_id }}</li>
|
||||
<li><span>{% trans "Fixed IP:" %}</span> {{ ip.fixed_ip }}</li>
|
||||
</ul>
|
||||
{% else %}
|
||||
None
|
||||
@ -45,7 +45,7 @@
|
||||
<a class="btn primary small ajax-modal" href="{% url horizon:nova:access_and_security:floating_ips:associate ip.id %}">{% trans "Associate to instance" %}</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td id="name_{{ip.name}}" class="actions">
|
||||
<td id="name_{{ ip.name }}" class="actions">
|
||||
<a class="more-actions" href="#">More</a>
|
||||
<ul>
|
||||
<li class="form">{% include "nova/access_and_security/floating_ips/_release.html" with form=release_form %}</li>
|
||||
|
@ -1,9 +1,9 @@
|
||||
{% load i18n %}
|
||||
<form id="form_release_{{ip.id}}" class="form-delete" method="post">
|
||||
<form id="form_release_{{ ip.id }}" class="form-delete" method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{hidden}}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input name="floating_ip_id" type="hidden" value="{{ip.id}}" />
|
||||
<input id="delete_{{ip.id}}" class="btn small delete" title="Floating IP: {{ip.id}} ({{ip.ip}})" type="submit" value="{% trans "Release"%}" />
|
||||
<input name="floating_ip_id" type="hidden" value="{{ ip.id }}" />
|
||||
<input id="delete_{{ ip.id }}" class="btn small delete" title="Floating IP: {{ ip.id }} ({{ ip.ip }})" type="submit" value="{% trans "Release" %}" />
|
||||
</form>
|
||||
|
@ -13,7 +13,7 @@
|
||||
{% include 'nova/access_and_security/floating_ips/_list.html' %}
|
||||
{% else %}
|
||||
<div class="alert-message block-message info">
|
||||
<p><strong>{% trans "Info: "%}</strong>{% trans "There are currently no floating ips assigned to your tenant."%}</p>
|
||||
<p><strong>{% trans "Info: " %}</strong>{% trans "There are currently no floating ips assigned to your tenant." %}</p>
|
||||
<div class="alert-actions">
|
||||
{% include "nova/access_and_security/floating_ips/_allocate.html" with form=allocate_form %}
|
||||
</div>
|
||||
|
@ -13,7 +13,7 @@
|
||||
{% include 'nova/access_and_security/floating_ips/_list.html' %}
|
||||
{% else %}
|
||||
<div class="alert-message block-message info">
|
||||
<p><strong>{% trans "Info: "%}</strong>{% trans "There are currently no floating ips assigned to your tenant."%}</p>
|
||||
<p><strong>{% trans "Info: " %}</strong>{% trans "There are currently no floating ips assigned to your tenant." %}</p>
|
||||
<div class="alert-actions">
|
||||
{% include "nova/access_and_security/floating_ips/_allocate.html" with form=allocate_form %}
|
||||
</div>
|
||||
@ -27,7 +27,7 @@
|
||||
{% include 'nova/access_and_security/security_groups/_list.html' %}
|
||||
{% else %}
|
||||
<div class="message_box info">
|
||||
<h2>{% trans "Info"%}</h2>
|
||||
<h2>{% trans "Info" %}</h2>
|
||||
<p>{% blocktrans %}There are currently no security groups. <a href='{{ create_sec_url }}'>Create A Security Group</a>{% endblocktrans %}</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
@ -38,10 +38,10 @@
|
||||
{% include 'nova/access_and_security/keypairs/_list.html' %}
|
||||
{% else %}
|
||||
<div class="alert-message block-message info">
|
||||
<p><strong>{% trans "Info: "%}</strong>{% trans "There are currently no keypairs."%}</p>
|
||||
<p><strong>{% trans "Info: " %}</strong>{% trans "There are currently no keypairs." %}</p>
|
||||
<div class="alert-actions">
|
||||
<a id="keypairs_create_link" class="btn primary small" href="{% url horizon:nova:access_and_security:keypairs:create %}">{% trans "Create New Keypair"%}</a>
|
||||
<a id="keypairs_import_link" class="btn small" href="{% url horizon:nova:access_and_security:keypairs:import %}">{% trans "Import Keypair"%}</a>
|
||||
<a id="keypairs_create_link" class="btn primary small" href="{% url horizon:nova:access_and_security:keypairs:create %}">{% trans "Create New Keypair" %}</a>
|
||||
<a id="keypairs_import_link" class="btn small" href="{% url horizon:nova:access_and_security:keypairs:import %}">{% trans "Import Keypair" %}</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
@ -13,9 +13,9 @@
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3>{% trans "Description"%}:</h3>
|
||||
<p>{% trans "Keypairs are ssh credentials which are injected into images when they are launched. Creating a new key pair registers the public key and downloads the private key (a .pem file)."%}</p>
|
||||
<p>{% trans "Protect and use the key as you would any normal ssh private key."%}</p>
|
||||
<h3>{% trans "Description" %}:</h3>
|
||||
<p>{% trans "Keypairs are ssh credentials which are injected into images when they are launched. Creating a new key pair registers the public key and downloads the private key (a .pem file)." %}</p>
|
||||
<p>{% trans "Protect and use the key as you would any normal ssh private key." %}</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
{% load i18n %}
|
||||
<form id="form_delete_{{keypair.name}}" class="form-delete" method="post">
|
||||
<form id="form_delete_{{ keypair.name }}" class="form-delete" method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{hidden}}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input name="keypair_id" type="hidden" value="{{keypair.name}}" />
|
||||
<input id="delete_{{keypair.name}}" class="btn small danger delete" title="Keypair: {{keypair.name}}" type="submit" value="{% trans "Delete"%}" />
|
||||
<input name="keypair_id" type="hidden" value="{{ keypair.name }}" />
|
||||
<input id="delete_{{ keypair.name }}" class="btn small danger delete" title="Keypair: {{ keypair.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 "Add Keypair" %}" />
|
||||
<input type="submit" value="{% trans "Add Keypair" %}" />
|
||||
{% endblock %}
|
||||
</fieldset>
|
||||
</form>
|
||||
|
@ -13,9 +13,9 @@
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3>{% trans "Description"%}:</h3>
|
||||
<p>{% trans "Keypairs are ssh credentials which are injected into images when they are launched. Creating a new key pair registers the public key and downloads the private key (a .pem file)."%}</p>
|
||||
<p>{% trans "Protect and use the key as you would any normal ssh private key."%}</p>
|
||||
<h3>{% trans "Description" %}:</h3>
|
||||
<p>{% trans "Keypairs are ssh credentials which are injected into images when they are launched. Creating a new key pair registers the public key and downloads the private key (a .pem file)." %}</p>
|
||||
<p>{% trans "Protect and use the key as you would any normal ssh private key." %}</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
|
@ -4,8 +4,8 @@
|
||||
<h3>{% trans "Keypairs" %}</h3>
|
||||
|
||||
<div class="table_actions">
|
||||
<a id="keypairs_import_link" class="btn primary small ajax-modal" data-controls-modal="import_keypair_modal" data-backdrop="static" href="{% url horizon:nova:access_and_security:keypairs:import %}">{% trans "Import Keypair"%}</a>
|
||||
<a id="keypairs_create_link" class="btn small ajax-modal" data-controls-modal="create_keypair_modal" data-backdrop="static" href="{% url horizon:nova:access_and_security:keypairs:create %}">{% trans "Create New Keypair"%}</a>
|
||||
<a id="keypairs_import_link" class="btn primary small ajax-modal" data-controls-modal="import_keypair_modal" data-backdrop="static" href="{% url horizon:nova:access_and_security:keypairs:import %}">{% trans "Import Keypair" %}</a>
|
||||
<a id="keypairs_create_link" class="btn small ajax-modal" data-controls-modal="create_keypair_modal" data-backdrop="static" href="{% url horizon:nova:access_and_security:keypairs:create %}">{% trans "Create New Keypair" %}</a>
|
||||
|
||||
<div class="keypairs table_search">
|
||||
<form action="#">
|
||||
@ -19,9 +19,9 @@
|
||||
<table id="keypairs" class="zebra-striped sortable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{% trans "Name"%}</th>
|
||||
<th>{% trans "Fingerprint"%}</th>
|
||||
<th>{% trans "Actions"%}</th>
|
||||
<th>{% trans "Name" %}</th>
|
||||
<th>{% trans "Fingerprint" %}</th>
|
||||
<th>{% trans "Actions" %}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
@ -11,10 +11,10 @@
|
||||
{% include 'nova/access_and_security/keypairs/_list.html' %}
|
||||
{% else %}
|
||||
<div class="alert-message block-message info">
|
||||
<p><strong>{% trans "Info: "%}</strong>{% trans "There are currently no keypairs."%}</p>
|
||||
<p><strong>{% trans "Info: " %}</strong>{% trans "There are currently no keypairs." %}</p>
|
||||
<div class="alert-actions">
|
||||
<a id="keypairs_create_link" class="btn primary small ajax-modal" href="{% url horizon:nova:access_and_security:keypairs:create %}">{% trans "Create New Keypair"%}</a>
|
||||
<a id="keypairs_import_link" class="btn small ajax-modal" href="{% url horizon:nova:access_and_security:keypairs:import %}">{% trans "Import Keypair"%}</a>
|
||||
<a id="keypairs_create_link" class="btn primary small ajax-modal" href="{% url horizon:nova:access_and_security:keypairs:create %}">{% trans "Create New Keypair" %}</a>
|
||||
<a id="keypairs_import_link" class="btn small ajax-modal" href="{% url horizon:nova:access_and_security:keypairs:import %}">{% trans "Import Keypair" %}</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
@ -14,8 +14,8 @@
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3>{% trans "Description"%}:</h3>
|
||||
<p>{% trans "From here you can create a new security group"%}</p>
|
||||
<h3>{% trans "Description" %}:</h3>
|
||||
<p>{% trans "From here you can create a new security group" %}</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
{% load i18n %}
|
||||
<form id="form_delete_{{security_group.id}}" class="form-delete" method="post">
|
||||
<form id="form_delete_{{ security_group.id }}" class="form-delete" method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{hidden}}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input name="security_group_id" type="hidden" value="{{security_group.id}}" />
|
||||
<input id="delete_{{security_group.id}}" class="btn small danger delete" title="Security Group: {{security_group.id}}" type="submit" value="{% trans "Delete"%}" />
|
||||
<input name="security_group_id" type="hidden" value="{{ security_group.id }}" />
|
||||
<input id="delete_{{ security_group.id }}" class="btn small danger delete" title="Security Group: {{ security_group.id }}" type="submit" value="{% trans "Delete" %}" />
|
||||
</form>
|
||||
|
8
horizon/horizon/dashboards/nova/templates/nova/access_and_security/security_groups/_delete_rule.html
8
horizon/horizon/dashboards/nova/templates/nova/access_and_security/security_groups/_delete_rule.html
@ -1,9 +1,9 @@
|
||||
{% load i18n %}
|
||||
<form id="form_delete_{{rule.id}}" class="form-delete" method="post">
|
||||
<form id="form_delete_{{ rule.id }}" class="form-delete" method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{hidden}}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input name="security_group_rule_id" type="hidden" value="{{rule.id}}" />
|
||||
<input id="delete_{{rule.id}}" class="btn small danger delete" title="Security Group: {{rule.id}}" type="submit" value="{% trans "Delete"%}" />
|
||||
<input name="security_group_rule_id" type="hidden" value="{{ rule.id }}" />
|
||||
<input id="delete_{{ rule.id }}" class="btn small danger delete" title="Security Group: {{ rule.id }}" type="submit" value="{% trans "Delete" %}" />
|
||||
</form>
|
||||
|
@ -19,21 +19,21 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th></th>
|
||||
<th>{% trans "Name"%}</th>
|
||||
<th>{% trans "Description"%}</th>
|
||||
<th colspan="2">{% trans "Actions"%}</th>
|
||||
<th>{% trans "Name" %}</th>
|
||||
<th>{% trans "Description" %}</th>
|
||||
<th colspan="2">{% trans "Actions" %}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for security_group in security_groups %}
|
||||
<tr class="{% cycle 'odd' 'even' %}">
|
||||
<td class="select">
|
||||
<input type="checkbox" name="security_group_{{security_group.id}}" value="security_group_{{security_group.id}}" id="security_group_select_{{security_group.id}}" />
|
||||
<input type="checkbox" name="security_group_{{ security_group.id }}" value="security_group_{{ security_group.id }}" id="security_group_select_{{ security_group.id }}" />
|
||||
</td>
|
||||
<td><a href="{% url horizon:nova:access_and_security:security_groups:edit_rules security_group.id %}">{{ security_group.name }}</a></td>
|
||||
<td>{{ security_group.description }}</td>
|
||||
<td>
|
||||
<a class="btn primary small" href="{% url horizon:nova:access_and_security:security_groups:edit_rules security_group.id %}">{% trans "Edit Rules"%}</a>
|
||||
<a class="btn primary small" href="{% url horizon:nova:access_and_security:security_groups:edit_rules security_group.id %}">{% trans "Edit Rules" %}</a>
|
||||
</td>
|
||||
<td id="name_{{security_group.name}}" class="actions">
|
||||
{% if security_group.name != 'default' %}
|
||||
|
@ -13,7 +13,7 @@
|
||||
{% else %}
|
||||
<div class="message_box info">
|
||||
{% url horizon:nova:access_and_security:security_groups:create as dash_sec_url %}
|
||||
<h2>{% trans "Info"%}</h2>
|
||||
<h2>{% trans "Info" %}</h2>
|
||||
<p>{% blocktrans %}There are currently no security groups. <a href='{{ dash_sec_url }}' data-controls-modal="create_security_group_modal" data-backdrop="static">Create A Security Group</a>{% endblocktrans %}</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
@ -13,8 +13,8 @@
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3>{% trans "Description"%}:</h3>
|
||||
<p>{% trans "A container is a storage compartment for your data and provides a way for you to organize your data. You can think of a container as a folder in Windows® or a directory in UNIX®. The primary difference between a container and these other file system concepts is that containers cannot be nested. You can, however, create an unlimited number of containers within your account. Data must be stored in a container so you must have at least one container defined in your account prior to uploading data."%}</p>
|
||||
<h3>{% trans "Description" %}:</h3>
|
||||
<p>{% trans "A container is a storage compartment for your data and provides a way for you to organize your data. You can think of a container as a folder in Windows ® or a directory in UNIX ®. The primary difference between a container and these other file system concepts is that containers cannot be nested. You can, however, create an unlimited number of containers within your account. Data must be stored in a container so you must have at least one container defined in your account prior to uploading data." %}</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
|
@ -14,7 +14,7 @@
|
||||
<td id="actions">
|
||||
<ul>
|
||||
<li><a class="btn small" href="{% url horizon:nova:containers:object_index container.name %}">{% trans "List Objects" %}</a></li>
|
||||
<li><a class="btn small primary" href="{% url horizon:nova:containers:object_upload container.name %}">{% trans "Upload Object"%}</a></li>
|
||||
<li><a class="btn small primary" href="{% url horizon:nova:containers:object_upload container.name %}">{% trans "Upload Object" %}</a></li>
|
||||
<li class="form">{% include "nova/containers/_delete.html" with form=delete_form %}</li>
|
||||
</ul>
|
||||
</td>
|
||||
|
@ -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 }}
|
||||
{% endfor %}
|
||||
<input name="image_id" type="hidden" value="{{image.id}}" />
|
||||
<input id="delete_{{image.id}}" class="btn small delete danger" 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 danger" title="Image: {{image.name}}" type="submit" value="{% trans "Delete" %}" />
|
||||
</form>
|
||||
|
@ -1,6 +1,5 @@
|
||||
{% load i18n parse_date launch_form %}
|
||||
|
||||
|
||||
<div class="table_title">
|
||||
<h3>Images</h3>
|
||||
<div class="table_actions">
|
||||
@ -26,15 +25,15 @@
|
||||
{% for image in images %}
|
||||
<tr class="{% cycle 'odd' 'even' %}">
|
||||
<td class="select">
|
||||
<input type="checkbox" name="image_{{image.id}}" value="image_{{image.id}}" id="image_select_{{image.id}}" />
|
||||
<input type="checkbox" name="image_{{ image.id }}" value="image_{{ image.id }}" id="image_select_{{ image.id }}" />
|
||||
</td>
|
||||
<td>{{image.name}}</td>
|
||||
<td>{{image.properties.image_type|default:"Image"}}</td>
|
||||
<td>{{image.status|capfirst}}</td>
|
||||
<td>{{ image.name }}</td>
|
||||
<td>{{ image.properties.image_type|default:"Image" }}</td>
|
||||
<td>{{ image.status|capfirst }}</td>
|
||||
<td>
|
||||
<a class="btn small primary" data-controls-modal="launch_image_{{image.id}}" data-backdrop="static" href="{% url horizon:nova:images_and_snapshots:images:launch image.id %}">{% trans "Launch" %}</a>
|
||||
<a class="btn small primary" data-controls-modal="launch_image_{{ image.id }}" data-backdrop="static" href="{% url horizon:nova:images_and_snapshots:images:launch image.id %}">{% trans "Launch" %}</a>
|
||||
</td>
|
||||
<td id="name_{{image.name}}" class="actions">
|
||||
<td id="name_{{ image.name}}" class="actions">
|
||||
{% if image.owner == request.user.tenant_id %}
|
||||
<a class="more-actions" href="#">More</a>
|
||||
<ul>
|
||||
|
@ -13,12 +13,12 @@
|
||||
</fieldset>
|
||||
</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>
|
||||
{% endblock %}
|
||||
|
||||
{% block 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="{% url horizon:nova:images_and_snapshots:images:index %}" class="btn secondary cancel close">Cancel</a>
|
||||
{% endblock %}
|
||||
|
@ -13,7 +13,7 @@
|
||||
{% include 'nova/images_and_snapshots/images/_list.html' %}
|
||||
{% else %}
|
||||
<div class="alert-message block-message info">
|
||||
<p><strong>{% trans "Info: "%}</strong>{% trans "There are currently no images."%}</p>
|
||||
<p><strong>{% trans "Info: " %}</strong>{% trans "There are currently no images." %}</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
@ -11,7 +11,7 @@
|
||||
{% include 'nova/images_and_snapshots/images/_list.html' %}
|
||||
{% else %}
|
||||
<div class="alert-message block-message info">
|
||||
<p><strong>{% trans "Info: "%}</strong>{% trans "There are currently no images."%}</p>
|
||||
<p><strong>{% trans "Info: " %}</strong>{% trans "There are currently no images." %}</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
{% include 'nova/images_and_snapshots/snapshots/_list.html' %}
|
||||
{% else %}
|
||||
<div class="alert-message block-message info">
|
||||
<p><strong>{% trans "Info: "%}</strong>{% trans "There are currently no snapshots. You can create snapshots from running instances."%}</p>
|
||||
<p><strong>{% trans "Info: " %}</strong>{% trans "There are currently no snapshots. You can create snapshots from running instances." %}</p>
|
||||
<div class="alert-actions">
|
||||
<a class="btn small primary" href='{% url horizon:nova:instances_and_volumes:instances:index %}'>{% trans "View Running Instances" %}</a>
|
||||
</div>
|
||||
|
@ -5,7 +5,7 @@
|
||||
{% block form_action %}{% url horizon:nova:images_and_snapshots:snapshots:create instance.id %}{% endblock %}
|
||||
|
||||
{% block modal_id %}create_snapshot_modal{% endblock %}
|
||||
{% block modal-header %}{%trans "Create Snapshot"%}{% endblock %}
|
||||
{% block modal-header %}{% trans "Create Snapshot" %}{% endblock %}
|
||||
|
||||
{% block modal-body %}
|
||||
<div class="left">
|
||||
@ -14,12 +14,12 @@
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3>{% trans "Description:"%}</h3>
|
||||
<p>{% trans "Snapshots preserve the disk state of a running instance."%}</p>
|
||||
<h3>{% trans "Description:" %}</h3>
|
||||
<p>{% trans "Snapshots preserve the disk state of a running instance." %}</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block modal-footer %}
|
||||
<input class="btn primary pull-right" type="submit" value="{%trans "Create Snapshot"%}" />
|
||||
<input class="btn primary pull-right" type="submit" value="{% trans "Create Snapshot" %}" />
|
||||
<a href="{% url horizon:nova:images_and_snapshots:snapshots:index %}" class="btn secondary cancel close">Cancel</a>
|
||||
{% endblock %}
|
||||
|
@ -26,15 +26,15 @@
|
||||
{% for image in snapshots %}
|
||||
<tr class="{% cycle 'odd' 'even' %}">
|
||||
<td class="select">
|
||||
<input type="checkbox" name="image_{{image.id}}" value="image_{{image.id}}" id="image_select_{{image.id}}" />
|
||||
<input type="checkbox" name="image_{{ image.id }}" value="image_{{ image.id }}" id="image_select_{{ image.id }}" />
|
||||
</td>
|
||||
<td>{{image.name}}</td>
|
||||
<td>{{image.properties.image_type|default:"Image"}}</td>
|
||||
<td>{{image.status|capfirst}}</td>
|
||||
<td>{{ image.name }}</td>
|
||||
<td>{{ image.properties.image_type|default:"Image" }}</td>
|
||||
<td>{{ image.status|capfirst }}</td>
|
||||
<td>
|
||||
<a class="btn small primary" data-controls-modal="launch_image_{{image.id}}" data-backdrop="static" href="{% url horizon:nova:images_and_snapshots:images:launch image.id %}">{% trans "Launch" %}</a>
|
||||
<a class="btn small primary" data-controls-modal="launch_image_{{ image.id }}" data-backdrop="static" href="{% url horizon:nova:images_and_snapshots:images:launch image.id %}">{% trans "Launch" %}</a>
|
||||
</td>
|
||||
<td id="name_{{image.name}}" class="actions">
|
||||
<td id="name_{{ image.name }}" class="actions">
|
||||
{% if image.owner == request.user.tenant_id %}
|
||||
<a class="more-actions" href="#">View</a>
|
||||
<ul>
|
||||
|
@ -13,7 +13,7 @@
|
||||
{% include 'nova/images_and_snapshots/images/_list.html' %}
|
||||
{% else %}
|
||||
<div class="alert-message block-message info">
|
||||
<p><strong>{% trans "Info: "%}</strong>{% trans "There are currently no snapshots. You can create snapshots from running instances."%}</p>
|
||||
<p><strong>{% trans "Info: " %}</strong>{% trans "There are currently no snapshots. You can create snapshots from running instances." %}</p>
|
||||
<div class="alert-actions">
|
||||
<a class="btn small primary" href='{% url horizon:nova:instances_and_volumes:instances:index %}'>{% trans "View Running Instances" %}</a>
|
||||
</div>
|
||||
|
@ -17,9 +17,9 @@
|
||||
{% include 'nova/instances_and_volumes/volumes/_list.html' %}
|
||||
{% else %}
|
||||
<div class="alert-message block-message info">
|
||||
<p><strong>{% trans "Info: "%}</strong>{% trans "There are currently no volumes."%}</p>
|
||||
<p><strong>{% trans "Info: " %}</strong>{% trans "There are currently no volumes." %}</p>
|
||||
<div class="alert-actions">
|
||||
<a id="volume_create_link" class="btn primary small" data-controls-modal="create_volume_modal" data-backdrop="static" href="{% url horizon:nova:instances_and_volumes:volumes:create %}">{% trans "Create New Volume"%}</a>
|
||||
<a id="volume_create_link" class="btn primary small" data-controls-modal="create_volume_modal" data-backdrop="static" href="{% url horizon:nova:instances_and_volumes:volumes:create %}">{% trans "Create New Volume" %}</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
@ -5,7 +5,7 @@
|
||||
|
||||
{% block modal-footer %}
|
||||
<div class="modal-footer">
|
||||
<input class="btn primary pull-right" type="submit" value="{%trans "Create Snapshot"%}" />
|
||||
<input class="btn primary pull-right" type="submit" value="{% trans "Create Snapshot" %}" />
|
||||
<a href="#" class="btn secondary cancel close">Cancel</a>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
@ -13,12 +13,12 @@
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3>{% trans "Description:"%}</h3>
|
||||
<p>{% trans "Update the name of your instance"%}</p>
|
||||
<h3>{% trans "Description:" %}</h3>
|
||||
<p>{% trans "Update the name of your instance" %}</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block modal-footer %}
|
||||
<input class="btn primary pull-right" type="submit" value="{%trans "Update Instance"%}" />
|
||||
<input class="btn primary pull-right" type="submit" value="{% trans "Update Instance" %}" />
|
||||
<a href="{% url horizon:nova:instances_and_volumes:instances:index %}" class="btn secondary cancel close">Cancel</a>
|
||||
{% endblock %}
|
||||
|
@ -5,7 +5,7 @@
|
||||
{% block form_action %}{% url horizon:nova:instances_and_volumes:volumes:attach volume_id %}{% endblock %}
|
||||
|
||||
{% block modal_id %}attach_volume_modal{% endblock %}
|
||||
{% block modal-header %}{%trans "Attach Volume"%}{% endblock %}
|
||||
{% block modal-header %}{% trans "Attach Volume" %}{% endblock %}
|
||||
|
||||
{% block modal-body %}
|
||||
<div class="left">
|
||||
@ -20,6 +20,6 @@
|
||||
{% endblock %}
|
||||
|
||||
{% block modal-footer %}
|
||||
<input class="btn primary pull-right" type="submit" value="{%trans "Attach Volume"%}" />
|
||||
<input class="btn primary pull-right" type="submit" value="{% trans "Attach Volume" %}" />
|
||||
<a href="{% url horizon:nova:instances_and_volumes:volumes:index %}" class="btn secondary cancel close">Cancel</a>
|
||||
{% endblock %}
|
||||
|
@ -20,6 +20,6 @@
|
||||
{% endblock %}
|
||||
|
||||
{% block modal-footer %}
|
||||
<input class="btn primary pull-right" type="submit" value="{%trans "Create Volume"%}" />
|
||||
<input class="btn primary pull-right" type="submit" value="{% trans "Create Volume" %}" />
|
||||
<a href="{% url horizon:nova:instances_and_volumes:volumes:index %}" class="btn secondary cancel close">Cancel</a>
|
||||
{% endblock %}
|
||||
|
@ -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 "Create Security Group" %}" />
|
||||
<input type="submit" value="{% trans "Create Security Group" %}" />
|
||||
{% endblock %}
|
||||
</fieldset>
|
||||
</form>
|
||||
|
@ -28,7 +28,7 @@
|
||||
{% for volume in volumes %}
|
||||
<tr class="{% cycle 'odd' 'even' %}">
|
||||
<td></t<td class="select">
|
||||
<input type="checkbox" name="volume_{{volume.id}}" value="volume_{{volume.id}}" id="volume_select_{{volume.id}}" />
|
||||
<input type="checkbox" name="volume_{{ volume.id }}" value="volume_{{ volume.id }}" id="volume_select_{{ volume.id }}" />
|
||||
</td>
|
||||
<td>{{ volume.displayName }}</td>
|
||||
<td>{{ volume.size }} {% trans "GB" %}</td>
|
||||
|
@ -1,9 +1,9 @@
|
||||
{% load i18n %}
|
||||
<form id="form_delete_{{network.id}}" class="form-delete" method="post">
|
||||
<form id="form_delete_{{ network.id }}" class="form-delete" method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input name="network" type="hidden" value="{{ network.id }}" />
|
||||
<input id="delete_{{ network.id }}" class="btn small danger delete" title="Network: {{ network.name }}" type="submit" value="{% trans "Delete"%}" />
|
||||
<input id="delete_{{ network.id }}" class="btn small danger delete" title="Network: {{ network.name }}" type="submit" value="{% trans "Delete" %}" />
|
||||
</form>
|
||||
|
@ -6,5 +6,5 @@
|
||||
{% endfor %}
|
||||
<input name="network" type="hidden" value="{{ network.id }}" />
|
||||
<input name="port" type="hidden" value="{{ port.id }}" />
|
||||
<input title="Delete this port" id="delete_{{ port.id }}" class="btn small danger delete" type="submit" value="{% trans "Delete"%}" />
|
||||
<input title="Delete this port" id="delete_{{ port.id }}" class="btn small danger delete" type="submit" value="{% trans "Delete" %}" />
|
||||
</form>
|
||||
|
@ -2,9 +2,9 @@
|
||||
<form id="detach_port_form" class="form-detach" method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{hidden}}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input name="network" type="hidden" value="{{ network.id }}" />
|
||||
<input name="port" type="hidden" value="{{ port.id }}" />
|
||||
<input title="Detach port from instance" id="detach_{{ port.id }}" class="btn pull-right small detach" type="submit" value="{% trans "Detach"%}" />
|
||||
<input title="Detach port from instance" id="detach_{{ port.id }}" class="btn pull-right small detach" type="submit" value="{% trans "Detach" %}" />
|
||||
</form>
|
||||
|
@ -1,23 +1,23 @@
|
||||
{% load i18n %}
|
||||
<table id='Ports' class="zebra-striped">
|
||||
<tr id='headings'>
|
||||
<th>{% trans "ID"%}</th>
|
||||
<th>{% trans "State"%}</th>
|
||||
<th>{% trans "Attachment"%}</th>
|
||||
<th>{% trans "Actions"%}</th>
|
||||
<th>{% trans "Extensions"%}</th>
|
||||
<th>{% trans "ID" %}</th>
|
||||
<th>{% trans "State" %}</th>
|
||||
<th>{% trans "Attachment" %}</th>
|
||||
<th>{% trans "Actions" %}</th>
|
||||
<th>{% trans "Extensions" %}</th>
|
||||
</tr>
|
||||
<tbody class='main'>
|
||||
{% for port in network.ports %}
|
||||
<tr class="{% cycle 'odd' 'even' %}">
|
||||
<td>{{port.id}}</td>
|
||||
<td>{{ port.id }}</td>
|
||||
<td class="{{port.state}}">{{port.state}}</td>
|
||||
<td>
|
||||
{% if port.attachment %}
|
||||
<table class="attachmend_details">
|
||||
<tr>
|
||||
<td>{% trans "Instance"%}</td>
|
||||
<td>{% trans "VIF Id"%}</td>
|
||||
<td>{% trans "Instance" %}</td>
|
||||
<td>{% trans "VIF Id" %}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td> {{port.instance}} </td>
|
||||
@ -33,7 +33,7 @@
|
||||
{% if port.attachment %}
|
||||
<li class="form">{% include "nova/networks/_detach_port.html" with form=detach_port_form %}</li>
|
||||
{% else %}
|
||||
<li><a class='btn small' href='{% url horizon:nova:networks:port_attach network.id port.id %}'>{% trans "Attach"%}</a></li>
|
||||
<li><a class='btn small' href='{% url horizon:nova:networks:port_attach network.id port.id %}'>{% trans "Attach" %}</a></li>
|
||||
{% endif %}
|
||||
<li class="form">{% include "nova/networks/_toggle_port.html" with form=toggle_port_form %}</li>
|
||||
<li class="form">{% include "nova/networks/_delete_port.html" with form=delete_port_form %}</li>
|
||||
|
@ -1,12 +1,12 @@
|
||||
{% load i18n %}
|
||||
<table id='networks' class="zebra-striped">
|
||||
<tr id='headings'>
|
||||
<th>{% trans "ID"%}</th>
|
||||
<th>{% trans "Name"%}</th>
|
||||
<th>{% trans "Ports"%}</th>
|
||||
<th>{% trans "Available"%}</th>
|
||||
<th>{% trans "Used"%}</th>
|
||||
<th>{% trans "Action"%}</th>
|
||||
<th>{% trans "ID" %}</th>
|
||||
<th>{% trans "Name" %}</th>
|
||||
<th>{% trans "Ports" %}</th>
|
||||
<th>{% trans "Available" %}</th>
|
||||
<th>{% trans "Used" %}</th>
|
||||
<th>{% trans "Action" %}</th>
|
||||
</tr>
|
||||
<tbody class='main'>
|
||||
{% for network in networks %}
|
||||
@ -18,7 +18,7 @@
|
||||
<td>{{ network.used }}</td>
|
||||
<td id="actions" class="single">
|
||||
<ul>
|
||||
<li><a class='btn small' href='{% url horizon:nova:networks:rename network.id %}'>{% trans "Rename"%}</a></li>
|
||||
<li><a class='btn small' href='{% url horizon:nova:networks:rename network.id %}'>{% trans "Rename" %}</a></li>
|
||||
<li class="form">{% include "nova/networks/_delete.html" with form=delete_form %}</li>
|
||||
</ul>
|
||||
</td>
|
||||
|
@ -1,7 +1,7 @@
|
||||
{% extends "horizon/common/_modal_form.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block form_id %}form_rename_{{network.id}}{% endblock %}
|
||||
{% block form_id %}form_rename_{{ network.id }}{% endblock %}
|
||||
{% block form_action %}{% url horizon:nova:networks:rename network.id %}{% endblock %}
|
||||
|
||||
{% block modal-header %}Rename Network{% endblock %}
|
||||
@ -13,12 +13,12 @@
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3>{% trans "Rename"%}:</h3>
|
||||
<p>{% trans "Enter a new name for your network."%}</p>
|
||||
<h3>{% trans "Rename" %}:</h3>
|
||||
<p>{% trans "Enter a new name for your network." %}</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block modal-footer %}
|
||||
<input class="btn primary pull-right" type="submit" value="{%trans "Rename Network"%}" />
|
||||
<input class="btn primary pull-right" type="submit" value="{% trans "Rename Network" %}" />
|
||||
<a href="{% url horizon:nova:networks:index %}" class="btn secondary cancel close">Cancel</a>
|
||||
{% endblock %}
|
||||
|
@ -2,15 +2,15 @@
|
||||
<form id="port_toggle_form" class="form-toggle" method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}
|
||||
{{hidden}}
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input name="network" type="hidden" value="{{network.id}}" />
|
||||
<input name="port" type="hidden" value="{{port.id}}" />
|
||||
<input name="network" type="hidden" value="{{ network.id }}" />
|
||||
<input name="port" type="hidden" value="{{ port.id }}" />
|
||||
{% if port.state == 'DOWN' %}
|
||||
<input name="state" type="hidden" value="ACTIVE" />
|
||||
<input title="Turn port UP" id="port_up_{{port.id}}" class="btn small port_up" type="submit" value="{% trans "Port UP"%}" />
|
||||
<input title="Turn port UP" id="port_up_{{ port.id }}" class="btn small port_up" type="submit" value="{% trans "Port UP" %}" />
|
||||
{% else %}
|
||||
<input name="state" type="hidden" value="DOWN" />
|
||||
<input title="Turn port DOWN" id="port_up_{{port.id}}" class="btn small port_down" type="submit" value="{% trans "Port DOWN"%}" />
|
||||
<input title="Turn port DOWN" id="port_up_{{ port.id }}" class="btn small port_down" type="submit" value="{% trans "Port DOWN" %}" />
|
||||
{% endif %}
|
||||
</form>
|
||||
|
@ -11,11 +11,11 @@
|
||||
{% block dash_main %}
|
||||
{% if network.ports %}
|
||||
{% include 'nova/networks/_detail.html' %}
|
||||
<a id="network_create_link" class="btn small" href="{% url horizon:nova:networks:port_create network.id %}">{% trans "Create Ports"%}</a>
|
||||
<a id="network_create_link" class="btn small" href="{% url horizon:nova:networks:port_create network.id %}">{% trans "Create Ports" %}</a>
|
||||
{% else %}
|
||||
<div class="alert-message block-message info">
|
||||
<h2>{% trans "Info"%}</h2>
|
||||
<p>{% trans "There are currently no ports in this network."%} <a class='btn small' href="{% url horizon:nova:networks:port_create network.id %}">{% trans "Create Ports"%}</a></p>
|
||||
<h2>{% trans "Info" %}</h2>
|
||||
<p>{% trans "There are currently no ports in this network." %} <a class='btn small' href="{% url horizon:nova:networks:port_create network.id %}">{% trans "Create Ports" %}</a></p>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
@ -13,8 +13,8 @@
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3>{% trans "Description"%}:</h3>
|
||||
<p>{% trans "You may make a new copy of an existing object to store in this or another container."%}</p>
|
||||
<h3>{% trans "Description" %}:</h3>
|
||||
<p>{% trans "You may make a new copy of an existing object to store in this or another container." %}</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
|
@ -5,5 +5,5 @@
|
||||
{{ hidden }}
|
||||
{% endfor %}
|
||||
<input name="object_name" type="hidden" value="{{ object.name }}" />
|
||||
<input id="delete_{{ object.name }}" class="btn small danger delete" title="Object: {{ object.name }}" type="submit" value="{% trans "Delete"%}" />
|
||||
<input id="delete_{{ object.name }}" class="btn small danger delete" title="Object: {{ object.name }}" type="submit" value="{% trans "Delete" %}" />
|
||||
</form>
|
||||
|
@ -1,8 +1,8 @@
|
||||
{% load i18n %}
|
||||
<form id="form_filter_{{ container_name }}" class="form-filter" method="post">
|
||||
{% csrf_token %}
|
||||
{% for hidden in form.hidden_fields %}{{hidden}}{% endfor %}
|
||||
{% for field in form.visible_fields %}{{field}}{% endfor %}
|
||||
{% for hidden in form.hidden_fields %}{{ hidden }}{% endfor %}
|
||||
{% for field in form.visible_fields %}{{ field }}{% endfor %}
|
||||
<label for="table_search">Search</label>
|
||||
<input id="table_search" class="filter" type="submit" value="{% trans "Filter"%}" style="font-size:11px;"/>
|
||||
<input id="table_search" class="filter" type="submit" value="{% trans "Filter" %}" style="font-size:11px;"/>
|
||||
</form>
|
||||
|
@ -3,14 +3,14 @@
|
||||
<div class="table_title">
|
||||
<h3>Objects</h3>
|
||||
<div class="table_actions">
|
||||
<a class="btn small primary pull-right" href="{% url horizon:nova:containers:object_upload container_name %}">{% trans "Upload Object"%}</a>
|
||||
<a class="btn small primary pull-right" href="{% url horizon:nova:containers:object_upload container_name %}">{% trans "Upload Object" %}</a>
|
||||
</div>
|
||||
|
||||
<table id="objects" class="zebra-striped sortable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{% trans "Name"%}</th>
|
||||
<th style="width: 100px;">{% trans "Actions"%}</th>
|
||||
<th>{% trans "Name" %}</th>
|
||||
<th style="width: 100px;">{% trans "Actions" %}</th>
|
||||
</tr>
|
||||
</theaad>
|
||||
<tbody>
|
||||
@ -19,8 +19,8 @@
|
||||
<td>{{ object.name }}</td>
|
||||
<td id="actions">
|
||||
<ul>
|
||||
<li><a class="btn small primary" href="{% url horizon:nova:containers:object_download container_name object.name %}">{% trans "Download"%}</a>
|
||||
<li><a class="btn small" href="{% url horizon:nova:containers:object_copy container_name object.name %}">{% trans "Copy"%}</a></li>
|
||||
<li><a class="btn small primary" href="{% url horizon:nova:containers:object_download container_name object.name %}">{% trans "Download" %}</a>
|
||||
<li><a class="btn small" href="{% url horizon:nova:containers:object_copy container_name object.name %}">{% trans "Copy" %}</a></li>
|
||||
<li class="form">{% include "nova/objects/_delete.html" with form=delete_form %}</li>
|
||||
</ul>
|
||||
</td>
|
||||
|
@ -14,8 +14,8 @@
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3>{% trans "Description"%}:</h3>
|
||||
<p>{% trans "An object is the basic storage entity and any optional metadata that represents the files you store in the OpenStack Object Storage system. When you upload data to OpenStack Object Storage, the data is stored as-is (no compression or encryption) and consists of a location (container), the object's name, and any metadata consisting of key/value pairs."%}</p>
|
||||
<h3>{% trans "Description" %}:</h3>
|
||||
<p>{% trans "An object is the basic storage entity and any optional metadata that represents the files you store in the OpenStack Object Storage system. When you upload data to OpenStack Object Storage, the data is stored as-is (no compression or encryption) and consists of a location (container), the object's name, and any metadata consisting of key/value pairs." %}</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
|
@ -20,6 +20,6 @@
|
||||
{% endblock %}
|
||||
|
||||
{% block modal-footer %}
|
||||
<input type="submit" class='btn small primary create' value="{%trans "Attach Port" %}" />
|
||||
<input type="submit" class='btn small primary create' value="{% trans "Attach Port" %}" />
|
||||
<a href="{% url horizon:nova:networks:detail network %}" class="btn secondary cancel close">Cancel</a>
|
||||
{% endblock %}
|
||||
|
@ -13,12 +13,12 @@
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3>{% trans "Description:"%}</h3>
|
||||
<p>{% trans "Networks provide layer 2 connectivity to your instances."%}</p>
|
||||
<h3>{% trans "Description:" %}</h3>
|
||||
<p>{% trans "Networks provide layer 2 connectivity to your instances." %}</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block modal-footer %}
|
||||
<input type="submit" class='btn small primary create' value="{%trans "Create Port" %}" />
|
||||
<input type="submit" class='btn small primary create' value="{% trans "Create Port" %}" />
|
||||
<a href="{% url horizon:nova:networks:detail network_id %}" class="btn secondary cancel close">Cancel</a>
|
||||
{% endblock %}
|
||||
|
@ -14,7 +14,7 @@
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3>{% trans "Description:"%}</h3>
|
||||
<h3>{% trans "Description:" %}</h3>
|
||||
<p>{% trans 'Download the RC file for the selected tenant, then type "source openrc" in the terminal to configure your environment to communicate with OpenStack.' %}</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
@ -9,9 +9,9 @@
|
||||
|
||||
{% block modal-body %}
|
||||
<div class="left">
|
||||
<h3>{% trans "Dashboard User Interface Language"%}</h3>
|
||||
<h3>{% trans "Dashboard User Interface Language" %}</h3>
|
||||
<fieldset>
|
||||
<label for="language_select">{% trans "Language Settings"%}</label>
|
||||
<label for="language_select">{% trans "Language Settings" %}</label>
|
||||
<div class="input">
|
||||
<p><select name="language">
|
||||
{% get_language_info_list for LANGUAGES as languages %}
|
||||
@ -27,8 +27,8 @@
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3>{% trans "Description:"%}</h3>
|
||||
<p>{% trans "From here you can modify different settings for your dashboard."%}</p>
|
||||
<h3>{% trans "Description:" %}</h3>
|
||||
<p>{% trans "From here you can modify different settings for your dashboard." %}</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
|
@ -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 %}
|
||||
|
@ -7,20 +7,20 @@
|
||||
{% endfor %}
|
||||
{% for field in form.visible_fields %}
|
||||
<div class="clearfix{% if field.errors %} error{% endif %}">
|
||||
{{field.label_tag}}
|
||||
{{ field.label_tag }}
|
||||
<div class="input">
|
||||
{{field}}
|
||||
{{ field }}
|
||||
{% 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>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% block modal-footer %}
|
||||
<input class="btn primary" type="submit" value="{%trans "Login"%}" />
|
||||
<input class="btn primary" type="submit" value="{% trans "Login" %}" />
|
||||
{% endblock %}
|
||||
</fieldset>
|
||||
</form>
|
||||
|
@ -3,15 +3,15 @@
|
||||
{% 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 %}
|
||||
|
@ -1,6 +1,6 @@
|
||||
{% load i18n %}
|
||||
{% block page_header %}
|
||||
<div class='page-header'>
|
||||
<h2>{{title}}</h2>
|
||||
<h2>{{ title }}</h2>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
@ -1,7 +1,7 @@
|
||||
{% load horizon i18n %}
|
||||
|
||||
<div class='sidebar'>
|
||||
<h1 class="brand clearfix"><a href="{% url horizon:user_home %}">{% trans "OpenStack Dashboard"%}</a></h1>
|
||||
<h1 class="brand clearfix"><a href="{% url horizon:user_home %}">{% trans "OpenStack Dashboard" %}</a></h1>
|
||||
<div class='clearfix'>
|
||||
<ul class="tabs">
|
||||
{% horizon_main_nav %}
|
||||
|
@ -12,8 +12,8 @@
|
||||
<div id="user_info" class="pull-right">
|
||||
<p>
|
||||
Logged in as: {{ request.user.username }}.
|
||||
<a href="{% url horizon:settings:user:index %}">{% trans "Settings"%}</a>
|
||||
<a href="{% url horizon:auth_logout %}">{% trans "Sign Out"%}</a>
|
||||
<a href="{% url horizon:settings:user:index %}">{% trans "Settings" %}</a>
|
||||
<a href="{% url horizon:auth_logout %}">{% trans "Sign Out" %}</a>
|
||||
</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
@ -6,8 +6,8 @@
|
||||
{% block content %}
|
||||
<div id="right_content">
|
||||
<div id="page_head">
|
||||
<h2 id="page_heading">{% trans "The page you were looking for doesn't exist"%}</h2>
|
||||
<p id="page_description">{% trans "You may have mistyped the address or the page may have moved."%}</p>
|
||||
<h2 id="page_heading">{% trans "The page you were looking for doesn't exist" %}</h2>
|
||||
<p id="page_description">{% trans "You may have mistyped the address or the page may have moved." %}</p>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@ -16,11 +16,11 @@
|
||||
<div id="sidebar">
|
||||
<ul id="navigation">
|
||||
{% block nav_home %}
|
||||
<li><h3><a href="{% url index %}">{% trans "Home"%}</a></h3></li>
|
||||
<li><h3><a href="{% url index %}">{% trans "Home" %}</a></h3></li>
|
||||
{% endblock %}
|
||||
|
||||
{% block nav_projects %}
|
||||
<li><h3><a href="{% url index %}">{% trans "Projects"%}</a></h3></li>
|
||||
<li><h3><a href="{% url index %}">{% trans "Projects" %}</a></h3></li>
|
||||
{% endblock %}
|
||||
</ul>
|
||||
</div> <!-- end sidebar -->
|
||||
|
@ -1,13 +1,13 @@
|
||||
{% extends "base.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block title %} - {% trans "Internal Server Error"%}{% endblock %}
|
||||
{% block title %} - {% trans "Internal Server Error" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div id="right_content">
|
||||
<div id="page_head">
|
||||
<h2 id="page_heading">{% trans "Internal Server Error"%}</h2>
|
||||
<p id="page_description">{% trans "An unexpected error occurred while processing your request. Please try your request again."%}</p>
|
||||
<h2 id="page_heading">{% trans "Internal Server Error" %}</h2>
|
||||
<p id="page_description">{% trans "An unexpected error occurred while processing your request. Please try your request again." %}</p>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@ -16,11 +16,11 @@
|
||||
<div id="sidebar">
|
||||
<ul id="navigation">
|
||||
{% block nav_home %}
|
||||
<li><h3><a href="{% url index %}">{% trans "Home"%}</a></h3></li>
|
||||
<li><h3><a href="{% url index %}">{% trans "Home" %}</a></h3></li>
|
||||
{% endblock %}
|
||||
|
||||
{% block nav_projects %}
|
||||
<li><h3><a href="{% url index %}">{% trans "Projects"%}</a></h3></li>
|
||||
<li><h3><a href="{% url index %}">{% trans "Projects" %}</a></h3></li>
|
||||
{% endblock %}
|
||||
</ul>
|
||||
</div> <!-- end sidebar -->
|
||||
|
@ -2,5 +2,5 @@
|
||||
{% load i18n %}
|
||||
|
||||
{% block modal-footer %}
|
||||
<input id="home_login_btn" class="btn primary pull-right" type="submit" value="{% trans "Sign In"%}">
|
||||
<input id="home_login_btn" class="btn primary pull-right" type="submit" value="{% trans "Sign In" %}">
|
||||
{% endblock %}
|
||||
|
@ -3,6 +3,6 @@
|
||||
{% block submit %}
|
||||
<input type="hidden" name="next" value="/" />
|
||||
<div class="button">
|
||||
<input id="home_login_btn" type="submit" value="{% trans "Sign In"%}">
|
||||
<input id="home_login_btn" type="submit" value="{% trans "Sign In" %}">
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
@ -30,9 +30,9 @@
|
||||
{% block topbar %}
|
||||
<div id="user_info" class="pull-right">
|
||||
<p>
|
||||
Logged in as: {{request.user.username}}.
|
||||
<a href="{% url horizon:settings:user:index %}">{% trans "Settings"%}</a>
|
||||
<a href="{% url horizon:auth_logout %}">{% trans "Sign Out"%}</a>
|
||||
Logged in as: {{ request.user.username }}.
|
||||
<a href="{% url horizon:settings:user:index %}">{% trans "Settings" %}</a>
|
||||
<a href="{% url horizon:auth_logout %}">{% trans "Sign Out" %}</a>
|
||||
</p>
|
||||
|
||||
</div>
|
||||
|
Loading…
x
Reference in New Issue
Block a user