From 5dd0340605f55194660e5d88e707cf1865d2598f Mon Sep 17 00:00:00 2001 From: Lluis Gifre <lluis.gifre@cttc.es> Date: Fri, 4 Mar 2022 11:31:17 +0100 Subject: [PATCH] WebUI: - Corrected Grafana port - Populated/Removed text placeholders - Corrected labels in "Service" page --- src/webui/service/templates/base.html | 2 +- src/webui/service/templates/main/home.html | 3 +-- src/webui/service/templates/service/detail.html | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/webui/service/templates/base.html b/src/webui/service/templates/base.html index a32c575c7..d5f748eae 100644 --- a/src/webui/service/templates/base.html +++ b/src/webui/service/templates/base.html @@ -144,7 +144,7 @@ <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-kQtW33rZJAHjgefvhyyzcGF3C5TFyBQBA13V1RKPf4uH+bwyzQxZ6CmMZHmNBEfJ" crossorigin="anonymous"></script> <!-- <script src="{{ url_for('static', filename='site.js') }}"/> --> <script> - document.getElementById("grafana_link").href = window.location.protocol + "//" + window.location.hostname + ":3000" + document.getElementById("grafana_link").href = window.location.protocol + "//" + window.location.hostname + ":30300" </script> <!-- Option 2: Separate Popper and Bootstrap JS --> <!-- diff --git a/src/webui/service/templates/main/home.html b/src/webui/service/templates/main/home.html index aa76559c5..2134a3a87 100644 --- a/src/webui/service/templates/main/home.html +++ b/src/webui/service/templates/main/home.html @@ -17,8 +17,7 @@ {% extends 'base.html' %} {% block content %} - <h1>This is the home page</h1> - <p>Here we have have several things.</p> + <h1>TeraFlow OS SDN Controller</h1> {% for field, message in context_form.errors.items() %} <div class="alert alert-dismissible fade show" role="alert"> diff --git a/src/webui/service/templates/service/detail.html b/src/webui/service/templates/service/detail.html index e8253ddd8..77988c74c 100644 --- a/src/webui/service/templates/service/detail.html +++ b/src/webui/service/templates/service/detail.html @@ -23,7 +23,7 @@ <div class="col-sm-3"> <button type="button" class="btn btn-success" onclick="window.location.href = '/service/'"> <i class="bi bi-box-arrow-in-left"></i> - Back to device list + Back to service list </button> </div> <div class="col-sm-3"> @@ -33,7 +33,7 @@ </a> </div> <div class="col-sm-3"> - <!-- <button type="button" class="btn btn-danger"><i class="bi bi-x-square"></i>Delete device</button> --> + <!-- <button type="button" class="btn btn-danger"><i class="bi bi-x-square"></i>Delete service</button> --> <button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#deleteModal"> <i class="bi bi-x-square"></i>Delete service </button> @@ -82,7 +82,7 @@ <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <h5 class="modal-title" id="staticBackdropLabel">Delete device?</h5> + <h5 class="modal-title" id="staticBackdropLabel">Delete service?</h5> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> </div> <div class="modal-body"> -- GitLab