Pull master (fake rebase) 75/72975/1 api-v1
authorSawyer Bergeron <sbergeron@iol.unh.edu>
Fri, 15 Oct 2021 18:07:11 +0000 (14:07 -0400)
committerSawyer Bergeron <sbergeron@iol.unh.edu>
Fri, 15 Oct 2021 18:07:11 +0000 (14:07 -0400)
Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
Change-Id: I12450c4bd70050c0bbf555b140aa3243c2837a9a

18 files changed:
src/static/css/anuket.css [new file with mode: 0644]
src/static/css/lfedge.css [new file with mode: 0644]
src/static/img/Anuket-logo-reverse.png [new file with mode: 0644]
src/static/img/Anuket-logo.svg [new file with mode: 0644]
src/static/img/opnfv-logo.png [deleted file]
src/static/package-lock.json
src/templates/base/base.html
src/templates/base/booking/booking_table.html
src/templates/base/booking/quick_deploy.html
src/templates/base/dashboard/landing.html
src/templates/base/dashboard/resource_detail.html
src/templates/base/dashboard/searchable_select_multiple.html
src/templates/base/dashboard/server_table.html
src/templates/base/dashboard/table.html
src/templates/base/layout.html
src/templates/laas/base.html
src/templates/laas/dashboard/landing.html
src/templates/lfedge/base.html

diff --git a/src/static/css/anuket.css b/src/static/css/anuket.css
new file mode 100644 (file)
index 0000000..6bbdb3f
--- /dev/null
@@ -0,0 +1,115 @@
+nav ,body{
+    background-color:#fff !important;
+    color:#343a40 !important;
+    }
+
+    header{
+        background-color:#f8f9fa !important;
+        color:#343a40 !important;
+    }
+
+    p, h1, h2, h3, h4, h5{
+        color:#343a40 !important;
+    }
+
+    a, .page-link {
+        color: #007473 !important;
+    }
+
+    .page-item.active .page-link{
+        color: #f8f9fa !important;
+        background-color: #007473 !important;
+    }
+
+    .topcrumb.active > span {
+        background: #007473 !important;
+    }
+
+    .nav-bg{
+        background-color:#fff !important;
+        color:#343a40 !important;
+    }
+
+    .nav-bg:hover{
+        background-color:#f8f9fa !important;
+        transition-duration:0.2s;
+    }
+
+    .dropDown-bg{
+        background-color:#d6d8db !important;
+        color:#343a40 !important;
+    }
+
+    .btn-primary{
+        color: #f8f9fa !important;
+        background-color: #007473 !important;
+        border:0px !important;
+        transition-duration:0.2s !important;
+    }
+
+    .btn-primary:hover{
+        color: #343a40 !important;
+        background-color: #6BDAD5 !important;
+        border:0px !important;
+    }
+
+    .btn-primary:focus{
+        color: #343a40 !important;
+        background-color: #6BDAD5 !important;
+        border:0px !important;
+    }
+
+    .btn-success{
+        color: #f8f9fa;
+        background-color: #008852;
+        border:0px !important; 
+    }
+
+    .btn-success:hover{
+        color: #343a40;
+        background-color: #00CE7C;
+        border:0px !important;
+    }
+
+    .btn-success:focus{
+        color: #343a40;
+        background-color: #00CE7C;
+        border:0px !important;
+    }
+
+    .btn-danger {
+        color: #f8f9fa;
+        background-color: #af2b38;
+        border:0px !important;
+    }
+
+    .btn-danger:hover {
+        color: #f8f9fa;
+        background-color: #dc3545;
+        border:0px !important;
+    }
+
+    .alert-danger{
+        background-color: #e6b3c1 !important;
+        color:#820c2c !important;
+        border:0px !important;
+    }
+
+    .Anuket-Text{
+        color:#343a40 !important;
+    }
+
+    .selected_node {
+        border-color: #008852;
+        box-shadow: 0 1px 1px rgb(0 0 0 / 8%), 0 0 8px rgb(109 243 76 / 60%);
+        transition: border-color ease-in-out .1s,box-shadow ease-in-out .1s;
+    }
+
+    ::selection {
+    background: #BCE194; 
+    color:#343a40;
+    }
+    ::-moz-selection {
+    background: #BCE194;
+    color:#343a40;
+    }
\ No newline at end of file
diff --git a/src/static/css/lfedge.css b/src/static/css/lfedge.css
new file mode 100644 (file)
index 0000000..328d71a
--- /dev/null
@@ -0,0 +1,14 @@
+.LFEdge {
+    background: #0049b0;
+    margin-left: -25px;
+}
+
+.wtext {
+    font-size: 18px;
+    color: #FFFFFF;
+}
+
+.wtext:hover {
+    color: #FFFFFF;
+    text-decoration: none;
+}
\ No newline at end of file
diff --git a/src/static/img/Anuket-logo-reverse.png b/src/static/img/Anuket-logo-reverse.png
new file mode 100644 (file)
index 0000000..fe256a6
Binary files /dev/null and b/src/static/img/Anuket-logo-reverse.png differ
diff --git a/src/static/img/Anuket-logo.svg b/src/static/img/Anuket-logo.svg
new file mode 100644 (file)
index 0000000..6db4c9b
--- /dev/null
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 575.79 214.62"><defs><style>.cls-1{fill:#001e61;}.cls-2{fill:#007473;}.cls-3{fill:#f5b335;}.cls-4{fill:#e36386;}.cls-5{fill:#6bdad5;}</style></defs><path class="cls-1" d="M190.64,348.73h25.05l36.15,89.34H224.2l-6.29-18.27h-30.6l-6.54,18.27H154.49Zm12.09,27.15c-1.72,5.67-3.45,10.86-5.55,16.66l-3.08,8.51h17.27l-3-8.51c-2.1-6.05-3.7-11.11-5.43-16.66Z" transform="translate(-18.6 -289.19)"/><path class="cls-1" d="M258.63,377.36h23.94v4.69l.25.12A29.79,29.79,0,0,1,300.46,376,22.52,22.52,0,0,1,316,381.8c3.95,3.82,5.93,9.25,5.93,18.14v38.13H297.5V403.64c0-2.71-.61-4.69-1.72-5.8a6.36,6.36,0,0,0-4.69-1.73,12.2,12.2,0,0,0-8,3.21v38.75H258.63Z" transform="translate(-18.6 -289.19)"/><path class="cls-1" d="M373.51,433a27.31,27.31,0,0,1-17.27,6.41,23.37,23.37,0,0,1-15.55-5.55c-4.32-3.95-6.29-9.62-6.29-18.75V377.36h24.43v34.55c0,3.21.62,4.69,1.73,5.8a6.23,6.23,0,0,0,4.56,1.72,12.4,12.4,0,0,0,8.15-3.45V377.36H397.7v60.71H373.76v-4.94Z" transform="translate(-18.6 -289.19)"/><path class="cls-1" d="M410.66,343.79h24.43v58.49l.25.13,17-25.05h26.9L459,404.5l21.1,33.57H452.24l-16.9-29.86-.25.12v29.74H410.66Z" transform="translate(-18.6 -289.19)"/><path class="cls-1" d="M538.62,434.74c-6.42,3-15.42,4.68-23.69,4.68-21.47,0-36.16-11.84-36.16-31.09,0-20,15.68-32.33,33-32.33,14.93,0,30.35,9.26,30.35,31.1a48.27,48.27,0,0,1-.37,6.17H503.58c2.34,6.41,8.14,8.63,14.68,8.63a44.37,44.37,0,0,0,20.36-5.67Zm-18.51-34.06c-1.11-5.55-4.94-7.4-8.51-7.4-4.32,0-7.28,2.71-8.39,7.4Z" transform="translate(-18.6 -289.19)"/><path class="cls-1" d="M594.4,436.46a39.34,39.34,0,0,1-15.18,3c-7.53,0-14-2.34-17.89-6.29-3.46-3.45-5.93-8.64-5.93-19.12v-17.4h-9V377.36h9V362.18l24.43-4.2v19.38H594.4v19.25H579.83v15.67c0,4.81,1.49,7.52,6,7.52a25.89,25.89,0,0,0,8.52-2Z" transform="translate(-18.6 -289.19)"/><path class="cls-2" d="M109.6,503.76s-25.39-24.16-8.15-74.86,47.05-99-13.75-138.22c0,0,26.09,21.81,19.8,62.19S51.36,468.1,109.6,503.76Z" transform="translate(-18.6 -289.19)"/><path class="cls-3" d="M109.65,503.81s-16.13-21.22-7.18-49.08,47.77-82.15,29.12-126.24c0,0,22.15,31,5.31,71.12S93.23,470.47,109.65,503.81Z" transform="translate(-18.6 -289.19)"/><path class="cls-4" d="M96.37,343.86a37.21,37.21,0,1,0-74.41,0c0,.74,0,1.48.07,2.21a40.56,40.56,0,1,1,74.28,0C96.35,345.34,96.37,344.6,96.37,343.86Z" transform="translate(-18.6 -289.19)"/><path class="cls-5" d="M117.6,460.73c-5.4,10.4-8,20.81-7.9,29.84-1.9-10.41.38-23.67,7.25-36.91,10.67-20.54,29.55-39.72,28.44-69C150.15,418,129.1,438.58,117.6,460.73Z" transform="translate(-18.6 -289.19)"/></svg>
\ No newline at end of file
diff --git a/src/static/img/opnfv-logo.png b/src/static/img/opnfv-logo.png
deleted file mode 100644 (file)
index 1519503..0000000
Binary files a/src/static/img/opnfv-logo.png and /dev/null differ
index 89a26db..f8eabe4 100644 (file)
@@ -1,97 +1,8 @@
 {
   "name": "laas",
   "version": "1.0.0",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
   "requires": true,
-  "packages": {
-    "": {
-      "name": "laas",
-      "version": "1.0.0",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@fortawesome/fontawesome-free": "^5.12.0",
-        "bootstrap": "^4.4.1",
-        "datatables.net-bs4": "^1.10.20",
-        "datatables.net-responsive-bs4": "^2.2.3",
-        "jquery": "^3.4.1",
-        "mxgraph": "^4.0.6",
-        "plotly.js-dist": "^1.51.3",
-        "popper.js": "^1.16.0"
-      }
-    },
-    "node_modules/@fortawesome/fontawesome-free": {
-      "version": "5.12.0",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.12.0.tgz",
-      "integrity": "sha512-vKDJUuE2GAdBERaQWmmtsciAMzjwNrROXA5KTGSZvayAsmuTGjam5z6QNqNPCwDfVljLWuov1nEC3mEQf/n6fQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/bootstrap": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz",
-      "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/datatables.net": {
-      "version": "1.10.20",
-      "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.10.20.tgz",
-      "integrity": "sha512-4E4S7tTU607N3h0fZPkGmAtr9mwy462u+VJ6gxYZ8MxcRIjZqHy3Dv1GNry7i3zQCktTdWbULVKBbkAJkuHEnQ==",
-      "dependencies": {
-        "jquery": "3.4.1"
-      }
-    },
-    "node_modules/datatables.net-bs4": {
-      "version": "1.10.20",
-      "resolved": "https://registry.npmjs.org/datatables.net-bs4/-/datatables.net-bs4-1.10.20.tgz",
-      "integrity": "sha512-kQmMUMsHMOlAW96ztdoFqjSbLnlGZQ63iIM82kHbmldsfYdzuyhbb4hTx6YNBi481WCO3iPSvI6YodNec46ZAw==",
-      "dependencies": {
-        "datatables.net": "1.10.20",
-        "jquery": "3.4.1"
-      }
-    },
-    "node_modules/datatables.net-responsive": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/datatables.net-responsive/-/datatables.net-responsive-2.2.3.tgz",
-      "integrity": "sha512-8D6VtZcyuH3FG0Hn5A4LPZQEOX3+HrRFM7HjpmsQc/nQDBbdeBLkJX4Sh/o1nzFTSneuT1Wh/lYZHVPpjcN+Sw==",
-      "dependencies": {
-        "datatables.net": "1.10.20",
-        "jquery": "3.4.1"
-      }
-    },
-    "node_modules/datatables.net-responsive-bs4": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/datatables.net-responsive-bs4/-/datatables.net-responsive-bs4-2.2.3.tgz",
-      "integrity": "sha512-SQaWI0uLuPcaiBBin9zX+MuQfTSIkK1bYxbXqUV6NLkHCVa6PMQK7Rvftj0ywG4R7uOtjbzY8nSVqxEKvQI0Vg==",
-      "dependencies": {
-        "datatables.net-bs4": "1.10.20",
-        "datatables.net-responsive": "2.2.3",
-        "jquery": "3.4.1"
-      }
-    },
-    "node_modules/jquery": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
-      "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
-    },
-    "node_modules/mxgraph": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/mxgraph/-/mxgraph-4.0.6.tgz",
-      "integrity": "sha512-5XZXeAkA4k6n4BS05Fxd2cNhMw+3dnlRqAaLtsuXdT0g8BvvEa1VT4jjuGtUW4QTt38Q+I2Dr/3EWiAaGRfAXw=="
-    },
-    "node_modules/plotly.js-dist": {
-      "version": "1.51.3",
-      "resolved": "https://registry.npmjs.org/plotly.js-dist/-/plotly.js-dist-1.51.3.tgz",
-      "integrity": "sha512-Bxz0XBg963gpnbt7FVPEhYvT33JsaKa0hEozXBnQZkiKtsiM2M1lZN6tkEHmq6o1N2K6qJXFtdzCXbZ/hLGV0Q=="
-    },
-    "node_modules/popper.js": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.0.tgz",
-      "integrity": "sha512-+G+EkOPoE5S/zChTpmBSSDYmhXJ5PsW8eMhH8cP/CQHMFPBG/kC9Y5IIw6qNYgdJ+/COf0ddY2li28iHaZRSjw=="
-    }
-  },
   "dependencies": {
     "@fortawesome/fontawesome-free": {
       "version": "5.12.0",
index f334a63..704bc3b 100644 (file)
@@ -20,7 +20,7 @@
             {% block logo %}
             <div class="col-12 col-sm order-1 order-sm-2 text-center text-lg-left">
             <h2>Logo Here</h2>
-                <a class="navbar-brand d-none d-lg-inline" href={% url 'dashboard:index' %}>
+                <a class="navbar-brand d-none d-lg-inline Anuket-Text" href={% url 'dashboard:index' %}>
                     Laas Dashboard
                 </a>
             </div>
@@ -37,7 +37,7 @@
                 <ul class="nav mx-auto mr-sm-0">
                     <li class="dropdown ml-auto">
                        {% block userDropDownText %}
-                        <a class="nav-link p-0 text-dark p-2" data-toggle="dropdown" href="#">
+                        <a class="nav-link p-0 p-2 Anuket-Text" data-toggle="dropdown" href="#">
                             {% if request.user.username %}
                                 {{request.user.username}}
                             {% else %}
                         <div class="dropdown-menu dropdown-menu-right">
                             {% if LFID %}
                                 {% if user.is_authenticated %}
-                                <a href="{% url 'account:settings' %}" class="text-dark dropdown-item">
+                                <a href="{% url 'account:settings' %}" class="dropdown-item Anuket-Text">
                                     <i class="fas fa-cog"></i>
                                         Settings
                                 </a>
-                                <a id="logout_btn" href="#" method="post" class="text-dark dropdown-item">
+                                <a id="logout_btn" href="#" method="post" class="dropdown-item Anuket-Text">
                                     <i class="fas fa-sign-out-alt"></i>
                                         Logout
                                 </a>
                                     logout_btn.onclick = function() { logout_form.submit(); };
                                 </script>
                                 {% else %}
-                                <a href="{% url 'oidc_authentication_init' %}" class="text-dark dropdown-item">
+                                <a href="{% url 'oidc_authentication_init' %}" class="dropdown-item Anuket-Text">
                                     <i class="fas fa-sign-in-alt"></i>
                                         Login with LFID
                                 </a>
                                 {% endif %}
                             {% else %}
                                 {% if user.is_authenticated %}
-                                    <a href="{% url 'account:settings' %}" class="text-dark dropdown-item">
+                                    <a href="{% url 'account:settings' %}" class="dropdown-item Anuket-Text">
                                         <i class="fas fa-cog"></i>
                                         Settings
                                     </a>
-                                    <a href="{% url 'account:logout' %}?next={{ request.path }}" class="text-dark dropdown-item">
+                                    <a href="{% url 'account:logout' %}?next={{ request.path }}" class="dropdown-item Anuket-Text">
                                         <i class="fas fa-sign-out-alt"></i>
                                         Logout
                                     </a>
                                 {% else %}
-                                    <a href="{% url 'account:login' %}" class="text-dark dropdown-item">
+                                    <a href="{% url 'account:login' %}" class="dropdown-item Anuket-Text">
                                         <i class="fas fa-sign-in-alt"></i>
                                         Login
                                     </a>
             <div class="col-12 col-lg-auto px-0 border-right border-left bg-light" role="navigation">
                 <nav class="navbar navbar-expand-lg border-bottom p-0 w-100 sidebar">
                     <div class="collapse navbar-collapse" id="sidebar">
-                        <div class="list-group list-group-flush w-100 bg-light">
-                            <a href="/" class="list-group-item list-group-item-action">
+                        <div class="list-group list-group-flush w-100 ">
+                            <a href="/" class="list-group-item list-group-item-action nav-bg">
                                 Home
                             </a>
                             {% block dropDown %}
-                            <a class="list-group-item list-group-item-action" data-toggle="collapse"
+                            <a class="list-group-item list-group-item-action nav-bg" data-toggle="collapse"
                                 href="#createList" role="button">
                                 Create <i class="fas fa-angle-down rotate"></i>
                             </a>
                             <div class="collapse" id="createList">
-                                <a href="/booking/quick/" class="list-group-item list-group-item-action list-group-item-secondary">
+                                <a href="/booking/quick/" class="list-group-item list-group-item-action list-group-item-secondary dropDown-bg">
                                     Express Booking
                                 </a>
-                                <a href="#" onclick="create_workflow(0)" class="list-group-item list-group-item-action list-group-item-secondary">
+                                <a href="#" onclick="create_workflow(0)" class="list-group-item list-group-item-action list-group-item-secondary dropDown-bg">
                                     Book a Pod
                                 </a>
-                                <a href="#" onclick="create_workflow(1)" class="list-group-item list-group-item-action list-group-item-secondary">
+                                <a href="#" onclick="create_workflow(1)" class="list-group-item list-group-item-action list-group-item-secondary dropDown-bg">
                                     Design a Pod
                                 </a>
-                                <a href="#" onclick="create_workflow(2)" class="list-group-item list-group-item-action list-group-item-secondary">
+                                <a href="#" onclick="create_workflow(2)" class="list-group-item list-group-item-action list-group-item-secondary dropDown-bg">
                                     Create a Snapshot
                                 </a>
-                                <a href="#" onclick="create_workflow(3)" class="list-group-item list-group-item-action list-group-item-secondary">
-                                    Configure OPNFV
+                                <a href="#" onclick="create_workflow(3)" class="list-group-item list-group-item-action list-group-item-secondary dropDown-bg">
+                                    Configure Anuket
                                 </a>
                             </div>
                             {% endblock dropDown %}
-                            <a href="{% url 'resource:hosts' %}" class="list-group-item list-group-item-action">
+                            <a href="{% url 'resource:hosts' %}" class="list-group-item list-group-item-action nav-bg">
                                 Hosts
                             </a>
                             {% if user.is_authenticated %}
-                                <a href="{% url 'account:users' %}" class="list-group-item list-group-item-action">
+                                <a href="{% url 'account:users' %}" class="list-group-item list-group-item-action nav-bg">
                                     User List
                                 </a>
                             {% endif %}
-                            <a href="{% url 'booking:list' %}" class="list-group-item list-group-item-action">
+                            <a href="{% url 'booking:list' %}" class="list-group-item list-group-item-action nav-bg">
                                 Booking List
                             </a>
-                            <a href="{% url 'booking:stats' %}" class="list-group-item list-group-item-action">
+                            <a href="{% url 'booking:stats' %}" class="list-group-item list-group-item-action nav-bg">
                                 Booking Statistics
                             </a>
-                            <a class="list-group-item list-group-item-action" data-toggle="collapse"
+                            <a class="list-group-item list-group-item-action nav-bg" data-toggle="collapse"
                                 href="#accountList" role="button">
                                 Account <i class="fas fa-angle-down rotate"></i>
                             </a>
                             <div class="collapse" id="accountList">
-                                <a href="{% url 'account:my-resources' %}" class="list-group-item list-group-item-action list-group-item-secondary">
+                                <a href="{% url 'account:my-resources' %}" class="list-group-item list-group-item-action list-group-item-secondary dropDown-bg">
                                     My Resources
                                 </a>
-                                <a href="{% url 'account:my-bookings' %}" class="list-group-item list-group-item-action list-group-item-secondary">
+                                <a href="{% url 'account:my-bookings' %}" class="list-group-item list-group-item-action list-group-item-secondary dropDown-bg">
                                     My Bookings
                                 </a>
-                                <a href="{% url 'account:my-images' %}" class="list-group-item list-group-item-action list-group-item-secondary">
-                                    My Snapshots
-                                </a>
                             </div>
-                            <a href="{% url 'dashboard:all_labs' %}" class="list-group-item list-group-item-action">
+                            <a href="{% url 'dashboard:all_labs' %}" class="list-group-item list-group-item-action nav-bg">
                                 Lab Info
                             </a>
-                            <a href="{% url 'notifier:messages' %}" class="list-group-item list-group-item-action">
+                            <a href="{% url 'notifier:messages' %}" class="list-group-item list-group-item-action nav-bg">
                                 Inbox
                             </a>
                         </div>
index 9c8341c..b4a713a 100644 (file)
@@ -2,7 +2,7 @@
 
 
 <thead>
-<tr>
+<tr class="Anuket-Text">
     <th>Owner</th>
     <th>Purpose</th>
     <th>Project</th>
@@ -13,7 +13,7 @@
 </thead>
 <tbody>
 {% for booking in bookings %}
-    <tr>
+    <tr class="Anuket-Text">
         <td>
             {{ booking.owner.username }}
         </td>
index 8c8b1df..5dc41e2 100644 (file)
@@ -4,7 +4,7 @@
 {% block content %}
 
 {% bootstrap_form_errors form type='non_fields' %}
-<form id="quick_booking_form" action="/booking/quick/" method="POST" class="form">
+<form id="quick_booking_form" action="/booking/quick/" method="POST" class="form  class="Anuket-Text"">
     {% csrf_token %}
         <div class="row mx-0 px-0">
             <div class="col-12 mx-0 px-0 mt-2">
index 4ed2ec1..8d6a8f7 100644 (file)
@@ -2,12 +2,13 @@
 {% load staticfiles %}
 
 {% block content %}
+
 <div class="text-center">
     {% if not request.user.is_anonymous %}
     {% if not request.user.userprofile.ssh_public_key %}
-    <div class="alert alert-danger" role="alert">
-        Warning: you need to upload an ssh key under <a href="/accounts/settings">account settings</a> if you wish to
-        log into the servers you book
+    <div class="alert alert-danger alertAnuket" role="alert">
+        <b>Warning: you need to upload an ssh key under <a href="/accounts/settings" class="inTextLink" >account settings</a> if you wish to
+        log into the servers you book</b>
     </div>
     {% endif %}
     {% else %}
         {% if request.user.is_anonymous %}
         {% if LFID %}
         <h4 class="text-center">
-            To get started, please log in with <a href="{% url 'oidc_authentication_init' %}">Linux Foundation ID</a>
+            To get started, please log in with <a href="{% url 'oidc_authentication_init' %}" class="inTextLink">Linux Foundation ID</a>
         </h4>
         {% else %}
         <h4 class="text-center">
-            To get started, please log in with your <a href="/accounts/login">Linux Foundation Jira account</a>
+            To get started, please log in with your <a href="/accounts/login" class="inTextLink">Linux Foundation Jira account</a>
         </h4>
         {% endif %}
         {% else %}
         {% block btnGrp %}
         <p>To get started, book a server below:</p>
-        <a class="btn btn-primary btn-lg d-flex flex-column justify-content-center align-content-center border text-white p-4" href="/booking/quick/">
+        <a class="btn btn-primary btn-lg d-flex flex-column justify-content-center align-content-center border p-4 btnAnuket" href="/booking/quick/" >
             Book a Resource
         </a>
         <p class="mt-4">PTLs can use our advanced options to book multi-node pods. If you are a PTL, you may use the options
             below:
         </p>
         <div class="btn-group-vertical w-100">
-            <button class="btn btn-primary" onclick="create_workflow(0)">Book a Pod</button>
-            <button class="btn btn-primary" onclick="create_workflow(1)">Design a Pod</button>
+            <button class="btn btn-primary btnAnuket" onclick="create_workflow(0)">Book a Pod</button>
+            <button class="btn btn-primary btnAnuket" onclick="create_workflow(1)">Design a Pod</button>
         </div>
         {% endblock btnGrp %}
         {% endif %}
@@ -76,8 +77,8 @@
         <h2 class="ht-4 border-bottom">Returning Users</h2>
         <p>If you're a returning user, some of the following options may be of interest:</p>
         <div class="btn-group-vertical w-100">
-            <button class="btn btn-primary" onclick="create_workflow(3)">Snapshot a Host</button>
-            <a class="btn btn-primary" href="{% url 'account:my-bookings' %}">
+            <button class="btn btn-primary btnAnuket" onclick="create_workflow(3)">Snapshot a Host</button>
+            <a class="btn btn-primary btnAnuket" href="{% url 'account:my-bookings' %}">
                 My Bookings
             </a>
             {% if manager == True %}
index 0a443d9..cd85354 100644 (file)
@@ -1,7 +1,7 @@
 <div class="row">
     <div class="col-lg-9">
         <div class="panel panel-default">
-            <div class="panel-heading">
+            <div class="panel-heading Anuket-Text">
                 Status
             </div>
             <div class="panel-body">
     </div>
     <div class="col-lg-9">
         <div class="panel panel-default">
-            <div class="panel-heading">
+            <div class="panel-heading Anuket-Text">
                 Servers
             </div>
             <div class="panel-body">
                 <div class="dataTables_wrapper">
-                    <table class="table table-striped table-bordered table-hover"
+                    <table class="table table-striped table-bordered table-hover Anuket-Text"
                            id="{{ resource.id }}_server_table" cellspacing="0"
                            width="100%">
                         {% include "dashboard/server_table.html" %}
 <div class="row">
     <div class="col-lg-3">
         <div class="panel panel-default">
-            <div class="panel-heading">
+            <div class="panel-heading Anuket-Text">
                 Booking Utilization
                 <div class="pull-right">
                     <div class="form-group">
                         <select onchange="loadChartData('{{ resource.id }}_booking_utilization', this.value);">
-                            <option value="{% url 'dashboard:booking_utilization' resource_id=resource.id weeks=-4 %}">
+                            <option value="{% url 'dashboard:booking_utilization' resource_id=resource.id weeks=-4 %}" class="Anuket-Text">
                                 Last Month
                             </option>
-                            <option value="{% url 'dashboard:booking_utilization' resource_id=resource.id weeks=-1 %}">
+                            <option value="{% url 'dashboard:booking_utilization' resource_id=resource.id weeks=-1 %}" class="Anuket-Text">
                                 Last Week
                             </option>
-                            <option value="{% url 'dashboard:booking_utilization' resource_id=resource.id weeks=1 %}">
+                            <option value="{% url 'dashboard:booking_utilization' resource_id=resource.id weeks=1 %}" class="Anuket-Text">
                                 Next Week
                             </option>
                             <option selected="selected"
-                                    value="{% url 'dashboard:booking_utilization' resource_id=resource.id weeks=4 %}">
+                                    value="{% url 'dashboard:booking_utilization' resource_id=resource.id weeks=4 %}" class="Anuket-Text">
                                 Next Month
                             </option>
                         </select>
     </div>
     <div class="col-lg-9">
         <div class="panel panel-default">
-            <div class="panel-heading">
+            <div class="panel-heading Anuket-Text">
                 Bookings
             </div>
             <div class="panel-body">
                 <div class="dataTables_wrapper">
                     <table class="table table-striped table-bordered table-hover"
                            id="{{ resource.id }}_bookings_table" cellspacing="0"
-                           width="100%">
+                           width="100%" class="Anuket-Text">
                         {% include "booking/booking_table.html" %}
                     </table>
                 </div>
 <div class="row">
     <div class="col-lg-3">
         <div class="panel panel-default">
-            <div class="panel-heading">
+            <div class="panel-heading Anuket-Text">
                 Contact
             </div>
-            <div class="panel-body">
+            <div class="panel-body Anuket-Text">
                 <p>
                     <b>Lab Owner: </b>
                     {{ resource.owner.username }}
                     {{ resource.owner.email }}
                 </p>
                 <p>
-                    <a href="{% url 'booking:create' resource_id=resource.id %}" class="btn btn-primary">
+                    <a href="{% url 'booking:create' resource_id=resource.id %}" class="btn btn-primary btnAnuket">
                         Booking
                     </a>
-                    <a href="{{ resource.url }}" class="btn btn-primary">
-                        OPNFV Wiki
+                    <a href="{{ resource.url }}" class="btn btn-primary btnAnuket">
+                        Anuket Wiki
                     </a>
                 </p>
             </div>
     </div>
     <div class="col-lg-6">
         <div class="panel panel-default">
-            <div class="panel-heading">
+            <div class="panel-heading Anuket-Text">
                 VPN Users
             </div>
             <div class="panel-body">
                 <div class="dataTables_wrapper">
-                    <table class="table table-striped table-bordered table-hover"
+                    <table class="table table-striped table-bordered table-hover Anuket-Text"
                            id="{{ resource.id }}_vpn_user_table" cellspacing="0"
                            width="100%">
                         <thead>
index f7fd189..4d996e5 100644 (file)
@@ -1,6 +1,6 @@
 <div id="search_select_outer" class="d-flex flex-column">
     {% if incompatible == "true" %}
-        <div class="alert alert-danger" role="alert">
+        <div class="alert alert-danger alertAnuket" role="alert">
             <h3>Warning: Incompatible Configuration</h3>
             <p>Please make a different selection, as the current config conflicts with the selected pod</p>
         </div>
index f01bd60..efe531f 100644 (file)
@@ -1,5 +1,5 @@
 <thead>
-<tr>
+<tr class="Anuket-Text">
     <th>Server</th>
     <th>Model</th>
     <th>CPU</th>
index c55a011..bdc350e 100644 (file)
@@ -16,7 +16,7 @@
     <div class="row">
         <div class="col-lg-12">
             <div class="dataTables_wrapper table-responsive mw-100">
-                <table class="table table-striped table-bordered table-hover" id="table" cellspacing="0"
+                <table class="table table-striped table-bordered table-hover Anuket-Text" id="table" cellspacing="0"
                         width="100%">
                     {% block table %}
                     {% endblock table %}
index 2132dc6..bea84f3 100644 (file)
@@ -11,7 +11,7 @@
     <meta name="author" content="">
 
     {% block head-title %}
-    <title>OPNFV Laas {{ title }}</title>
+    <title>Anuket Laas {{ title }}</title>
     {% endblock head-title %}
 
     <!-- jQuery -->
index 5e9e9db..69e4976 100644 (file)
@@ -1,12 +1,15 @@
 {% extends "base/base.html" %}
 {% load staticfiles %}
 {% block logo %}
+
+<link rel="stylesheet" href="{% static "css/anuket.css" %}">
+
 <div class="col-12 col-sm order-1 order-sm-2 text-center text-lg-left">
-    <a href="https://www.opnfv.org/" class="navbar-brand">
-        <img src="{% static "img/opnfv-logo.png" %}">
+    <a href="https://anuket.io/" class="navbar-brand">
+        <img src="{% static "img/Anuket-logo.svg" %}" alt="Anuket logo" width="134.2" height="50" style="vertical-align:middle; margin:12px 12px 12px -20px;">
     </a>
-    <a class="navbar-brand d-none d-lg-inline" href={% url 'dashboard:index' %}>
-        Laas Dashboard
+    <a class="navbar-brand d-none d-lg-inline Anuket-Text" href={% url 'dashboard:index' %} style="margin-left:10px; font-size:26px; vertical-align:middle;">
+        LaaS Dashboard
     </a>
 </div>
 {% endblock logo %}
index fc6b3e3..12d8924 100644 (file)
@@ -2,11 +2,11 @@
 
 {% block about_us %}
 <p>The Lab as a Service (LaaS) project aims to help in the development and testing of LFN projects such as
-    OPNFV
+    Anuket
     by hosting hardware and providing access to the community. Currently, the only participating lab is the
     University of New Hampshire Interoperability Lab (UNH-IOL).</p>
 <p>To get started, you can request access to a server at the right. PTL's have the ability to design and
     book a
     whole block of servers with customized layer2 networks (e.g. a Pharos Pod). Read more here: 
-    <a href="https://wiki.opnfv.org/x/HAE-Ag" target="_blank">LaaS Wiki</a></p>
+    <a href="https://wiki.anuket.io/display/HOME/Lab+as+a+Service" target="_blank" class="inTextLink">LaaS Wiki</a></p>
 {% endblock %}
\ No newline at end of file
index 64c05a4..4413340 100644 (file)
@@ -1,29 +1,15 @@
 {% extends "base/base.html" %}
 {% load staticfiles %}
 {% block bgColor %}
-<style>
-.LFEdge {
-    background: #0049b0;
-    margin-left: -25px;
-}
+<link rel="stylesheet" href="{% static "css/lfedge.css" %}">
 
-.wtext {
-    font-size: 18px;
-    color: #FFFFFF;
-}
-
-.wtext:hover {
-    color: #FFFFFF;
-    text-decoration: none;
-}
-</style>
 <nav class="navbar navbar-light LFEdge navbar-fixed-top border-bottom py-0 mb-0" role="navigation">
 {% endblock bgColor %}
 
 {% block logo %}
 <div class="barClamp col-12 col-sm order-1 order-sm-2 text-center text-lg-left">
     <a href="https://www.lfedge.org/" class="navbar-brand">
-        <img src="{% static "img/lfedge-logo.png" %}">
+        <img src="{% static "img/lfedge-logo.png" %}" alt="lfedge logo">
     </a>
 
     <a class="wtext d-none d-lg-inline" href={% url 'dashboard:index' %}>