Skip to content

Commit

Permalink
Merge branch 'anna'
Browse files Browse the repository at this point in the history
  • Loading branch information
retspen committed Dec 25, 2013
2 parents 71c8de1 + 7ceb640 commit ce5f21e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions templates/create.html
Original file line number Diff line number Diff line change
Expand Up @@ -158,12 +158,12 @@ <h4 class="modal-title">{% trans "Create Virtual Machine" %} ({{ flavor.label }}
</div>
</div>
</div>
<a data-toggle="modal" href="#addVMflavor{{ forloop.counter }}" class="btn btn-success">{% trans "Create" %}</a>
<a data-toggle="modal" href="#addVMflavor{{ forloop.counter }}" class="btn btn-sm btn-success">{% trans "Create" %}</a>
</td>
<td style="width:5px;">
<form class="form-horizontal" action="" method="post">{% csrf_token %}
<input type="hidden" name="flavor" value="{{ flavor.id }}">
<input type="submit" class="btn btn-danger" name="delete_flavor" value="{% trans "Delete" %}" onclick="return confirm('{% trans "Are you sure?" %}')">
<input type="submit" class="btn btn-sm btn-danger" name="delete_flavor" value="{% trans "Delete" %}" onclick="return confirm('{% trans "Are you sure?" %}')">
</form>
</td>
</tr>
Expand Down
6 changes: 3 additions & 3 deletions templates/snapshot.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,16 @@ <h4>{% trans "You do not have any snapshots for" %} - <a href="{% url 'instance'
<form action="" method="post" style="height:10px;">{% csrf_token %}
<input type="hidden" name="name" value="{{ name }}">
{% ifnotequal time.1 3 %}
<button type="submit" class="btn btn-primary" name="revert" value="revert" onclick="return confirm('Are you sure?')">{% trans "Revert" %}</button>
<button type="submit" class="btn btn-sm btn-primary" name="revert" value="revert" onclick="return confirm('Are you sure?')">{% trans "Revert" %}</button>
{% else %}
<button type="button" class="btn btn-primary disabled" name="revert" value="Revert">{% trans "Revert" %}</button>
<button type="button" class="btn btn-sm btn-primary disabled" name="revert" value="Revert">{% trans "Revert" %}</button>
{% endifnotequal %}
</form>
</td>
<td style="width:30px;">
<form action="" method="post">{% csrf_token %}
<input type="hidden" name="name" value="{{ name }}">
<button type="submit" class="btn btn-danger" name="delete" value="delete" onclick="return confirm('{% trans "Are you sure?" %}')">{% trans "Delete" %}</button>
<button type="submit" class="btn btn-sm btn-danger" name="delete" value="delete" onclick="return confirm('{% trans "Are you sure?" %}')">{% trans "Delete" %}</button>
</form>
</td>
</tr>
Expand Down
8 changes: 4 additions & 4 deletions templates/storage.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ <h3>{% trans "Images" %}</h3>
<td style="width:30px;">
<form action="" method="post">{% csrf_token %}
<input type="hidden" name="volname" value="{{ volume.name }}">
<input type="submit" class="btn btn-danger" name="del_volume" value="{% trans "Delete" %}" onclick="return confirm('{% trans "Are you sure?" %}')">
<input type="submit" class="btn btn-sm btn-danger" name="del_volume" value="{% trans "Delete" %}" onclick="return confirm('{% trans "Are you sure?" %}')">
</form>
</td>
</tr>
Expand Down Expand Up @@ -175,15 +175,15 @@ <h4 class="modal-title">{% trans "Clone image" %} <span class="text-danger">{{ v
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
{% ifnotequal volume.type "iso" %}
<a data-toggle="modal" href="#Clone{{ forloop.counter }}" class="btn btn-primary">{% trans "Clone" %}</a>
<a data-toggle="modal" href="#Clone{{ forloop.counter }}" class="btn btn-sm btn-primary">{% trans "Clone" %}</a>
{% else %}
<a class="btn btn-primary disabled">{% trans "Clone" %}</a>
<a class="btn btn-sm btn-primary disabled">{% trans "Clone" %}</a>
{% endifnotequal %}
</td>
<td style="width:30px;">
<form action="" method="post" style="height:10px;">{% csrf_token %}
<input type="hidden" name="volname" value="{{ volume.name }}">
<input type="submit" class="btn btn-danger" name="del_volume" value="{% trans "Delete" %}" onclick="return confirm('{% trans "Are you sure?" %}')">
<input type="submit" class="btn btn-sm btn-danger" name="del_volume" value="{% trans "Delete" %}" onclick="return confirm('{% trans "Are you sure?" %}')">
</form>
</td>
</tr>
Expand Down

0 comments on commit ce5f21e

Please sign in to comment.