Skip to content

Commit

Permalink
bootstrap4.5: fix modal headers, some glitches
Browse files Browse the repository at this point in the history
  • Loading branch information
catborise committed Jun 4, 2020
1 parent 9ab7761 commit 0461df7
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
5 changes: 2 additions & 3 deletions computes/templates/computes.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ <h5 class="modal-title">{% trans "Edit connection" %}</h5>
{% ifequal compute.type 1 %}
<form method="post" role="form">{% csrf_token %}
<div class="modal-body">

<div class="form-group row">
<label class="col-sm-4 col-form-label">{% trans "Label" %}</label>
<div class="col-sm-6">
Expand Down Expand Up @@ -95,13 +94,13 @@ <h5 class="modal-title">{% trans "Edit connection" %}</h5>
</div>
</div></div>
<div class="modal-footer">
<button type="submit" class="btn btn-danger mr-auto" name="host_del">
<button type="submit" class="btn btn-danger mr-auto" name="host_del">
{% trans "Delete" %}
</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">
{% trans "Close" %}
</button>
<button type="submit" class="btn btn-primary" name="host_edit">
<button type="submit" class="btn btn-primary" name="host_edit" autofocus>
{% trans "Change" %}
</button>
</div>
Expand Down
3 changes: 2 additions & 1 deletion instances/templates/instances.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,11 @@ <h2 class="page-header">{{ compute.name }}</h2>
</div>
<!-- /.row -->
{% include 'errors_block.html' %}
{% include 'messages_block.html' %}
<div class="row">
{% if not all_host_vms %}
<div class="col-lg-12">
<div class="alert alert-warning alert-dismissable fade">
<div class="alert alert-warning alert-dismissable fade show">
<i class="fa fa-exclamation-triangle"></i> <strong>{% trans "Warning" %}:</strong> {% trans "Hypervisor doesn't have any Instances" %}
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion storages/templates/create_stg_block.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h5 class="modal-title">{% trans "Create Storage Pool" %}</h5>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div>
<div class="tabbable">
<ul class="nav nav-tabs">
Expand Down
2 changes: 1 addition & 1 deletion storages/templates/create_stg_vol_block.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h5 class="modal-title">{% trans "Upload ISO Image" %}</h5>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div>
<div class="modal-body">
<form enctype="multipart/form-data" method="post" role="form">{% csrf_token %}
Expand Down
8 changes: 4 additions & 4 deletions storages/templates/storage.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ <h5 class="page-header mr-auto">{% trans "Volumes" %}</h5>
</div>
</div>
{% if volumes %}
<div class="table-responsive">
<table class="table table-striped sortable-theme-bootstrap" data-sortable>
<div>
<table class="table table-hover sortable-theme-bootstrap" data-sortable>
<thead>
<tr>
<th>#</th>
Expand Down Expand Up @@ -192,8 +192,8 @@ <h5 class="modal-title">{% trans "Clone image" %} <span class="text-danger">{{ v
</div>
</div>
{% endif %}
{% endif %}
</div>
{% endif %}
</div>

{% include 'pleasewaitdialog.html' %}
{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion templates/pleasewaitdialog.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ <h5 class="modal-title">{% trans "Processing" %}...</h5>
</div>
<div class="modal-body">
<div class="progress">
<div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="10" aria-valuemin="0" aria-valuemax="10" style="width:100%">
<div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width:100%">
</div>
</div>
</div>
Expand Down

0 comments on commit 0461df7

Please sign in to comment.