Skip to content

fixes somethings #464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
catborise merged 2 commits into from
Oct 5, 2021
Merged

fixes somethings #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1488ee
navbars position is changed to stick-top
catborise Oct 1, 2021
4d21a31
fix: please wait dialog.
catborise Oct 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion console/templates/console-base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<body>
<div id='main_container' class="container">
<nav class="navbar navbar-expand-md navbar-dark bg-primary" arial-label="console navbar">
<nav class="navbar sticky-top navbar-expand-md navbar-dark bg-primary" arial-label="console navbar">
<div class="container">
<a class="navbar-brand">{{ instance.name }}</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse"
Expand Down
2 changes: 1 addition & 1 deletion instances/templates/instances/settings_tab.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ <h5 class="modal-title">{% trans "Edit Instance Network" %}</h5>
</div>
</div>
{% if computes_count != 1 %}
<button type="submit" class="btn btn-lg btn-success float-end" name="migrate" onclick="showPleaseWaitDialog();">{% trans "Migrate" %}</button>
<button type="submit" class="btn btn-lg btn-success float-end" onclick="showPleaseWaitDialog()" name="migrate" >{% trans "Migrate" %}</button>
{% else %}
<button class="btn btn-lg btn-success float-end disabled">{% trans "Migrate" %}</button>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion static/js/novnc/app/styles/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ select:active {
width: 100%;
height: 100%;
background-color: #313131;
border-bottom-right-radius: 800px 600px;
border-bottom-right-radius: 800px 660px;
/*border-top-left-radius: 800px 600px;*/
}

Expand Down
3 changes: 2 additions & 1 deletion static/js/novnc/app/styles/lite.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
body {
margin:0;
background-color:#313131;
border-bottom-right-radius: 800px 600px;
border-bottom-right-radius: 800px 660px;
height: 100%;
display: flex;
flex-direction: column;
Expand All @@ -23,6 +23,7 @@ html {
#noVNC_status_bar {
width: 100%;
display: flex;
position: sticky; top: 60;
}

#noVNC_status {
Expand Down
4 changes: 2 additions & 2 deletions storages/templates/storage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
{% block page_heading_extra %}{% include 'create_stg_vol_block.html' %}{% endblock page_heading_extra %}

{% block content %}
{% include 'pleasewaitdialog.html' %}
<div class="row">
<div class="col-lg-12">

Expand Down Expand Up @@ -152,7 +153,7 @@ <h5 class="modal-title">{% trans "Clone image" %} <span class="text-danger">{{ v
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans "Close" %}</button>
<button type="submit" class="btn btn-primary" name="cln_volume" onclick="showPleaseWaitDialog();">{% trans "Clone" %}</button>
<button type="submit" class="btn btn-primary" name="cln_volume" onclick="showPleaseWaitDialog()">{% trans "Clone" %}</button>
</div>
</form>
</div> <!-- /.modal-content -->
Expand Down Expand Up @@ -190,7 +191,6 @@ <h5 class="modal-title">{% trans "Clone image" %} <span class="text-danger">{{ v
{% endif %}
</div>

{% include 'pleasewaitdialog.html' %}
{% endblock %}
{% block script %}
<script src="{% static 'js/sortable.min.js' %}"></script>
Expand Down
2 changes: 1 addition & 1 deletion storages/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def handle_uploaded_file(path, f_name):
name = conn.clone_volume(data["image"], data["name"], format, meta_prealloc)
messages.success(
request,
_("%(image)s image cloned as %(clone)s successfully") % {"image": data["image"], "name": name},
_("%(image)s image cloned as %(name)s successfully") % {"image": data["image"], "name": name},
)
return HttpResponseRedirect(request.get_full_path())
except libvirtError as lib_err:
Expand Down
2 changes: 1 addition & 1 deletion templates/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% load icons %}
{% load common_tags %}
<!-- Fixed navbar -->
<nav class="navbar navbar-expand-md navbar-dark bg-primary mb-3" aria-label="Main top navbar">
<nav class="navbar sticky-top navbar-expand-md navbar-dark bg-primary mb-3" aria-label="Main top navbar">
<div class="container">
<a class="navbar-brand" href="{% url 'index' %}">WebVirtCloud</a>
<button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#navbar" aria-expanded="false" aria-label="Toggle navigation">
Expand Down
12 changes: 9 additions & 3 deletions templates/pleasewaitdialog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% load i18n %}
<!-- Please wait dialog -->
<div class="modal fade" id="pleaseWaitDialog" tabindex="-1" role="dialog" aria-labelledby="pleaseWaitDialogLabel" data-backdrop="static" data-keyboard="false">
<div class="modal fade" id="pleaseWaitDialog" tabindex="-1" aria-labelledby="pleaseWaitDialogLabel" data-bs-backdrop="static" data-bs-keyboard="false">
<div class="modal-dialog modal-sm">
<div class="modal-content">
<div class="modal-header">
Expand All @@ -17,11 +17,17 @@ <h5 class="modal-title">{% trans "Processing" %}...</h5>
</div>
<script>
function showPleaseWaitDialog() {
$('#pleaseWaitDialog').modal();
var pleaseModal = new bootstrap.Modal(document.getElementById('pleaseWaitDialog'), {
keyboard: false
});
pleaseModal.show();
backgroundJobRunning = true;
}
function hidePleaseWaitDialog() {
$('#pleaseWaitDialog').modal('hide');
var pleaseModal = new bootstrap.Modal(document.getElementById('pleaseWaitDialog'), {
keyboard: false
})
pleaseModal.hide();
backgroundJobRunning = false;
}
</script>