From e172d00b751d55cd8630efc7c5530a8bbfb97c97 Mon Sep 17 00:00:00 2001
From: Sawyer Bergeron <sbergeron@iol.unh.edu>
Date: Fri, 15 Oct 2021 14:07:11 -0400
Subject: Pull master (fake rebase)

Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
Change-Id: I12450c4bd70050c0bbf555b140aa3243c2837a9a
---
 src/templates/base/dashboard/landing.html          | 21 ++++++-------
 src/templates/base/dashboard/resource_detail.html  | 34 +++++++++++-----------
 .../base/dashboard/searchable_select_multiple.html |  2 +-
 src/templates/base/dashboard/server_table.html     |  2 +-
 src/templates/base/dashboard/table.html            |  2 +-
 5 files changed, 31 insertions(+), 30 deletions(-)

(limited to 'src/templates/base/dashboard')

diff --git a/src/templates/base/dashboard/landing.html b/src/templates/base/dashboard/landing.html
index 4ed2ec1..8d6a8f7 100644
--- a/src/templates/base/dashboard/landing.html
+++ b/src/templates/base/dashboard/landing.html
@@ -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 %}
@@ -45,25 +46,25 @@
         {% 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 %}
diff --git a/src/templates/base/dashboard/resource_detail.html b/src/templates/base/dashboard/resource_detail.html
index 0a443d9..cd85354 100644
--- a/src/templates/base/dashboard/resource_detail.html
+++ b/src/templates/base/dashboard/resource_detail.html
@@ -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">
@@ -20,12 +20,12 @@
     </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" %}
@@ -38,22 +38,22 @@
 <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>
@@ -70,14 +70,14 @@
     </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>
@@ -88,10 +88,10 @@
 <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 }}
@@ -101,11 +101,11 @@
                     {{ 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>
@@ -113,12 +113,12 @@
     </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>
diff --git a/src/templates/base/dashboard/searchable_select_multiple.html b/src/templates/base/dashboard/searchable_select_multiple.html
index f7fd189..4d996e5 100644
--- a/src/templates/base/dashboard/searchable_select_multiple.html
+++ b/src/templates/base/dashboard/searchable_select_multiple.html
@@ -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>
diff --git a/src/templates/base/dashboard/server_table.html b/src/templates/base/dashboard/server_table.html
index f01bd60..efe531f 100644
--- a/src/templates/base/dashboard/server_table.html
+++ b/src/templates/base/dashboard/server_table.html
@@ -1,5 +1,5 @@
 <thead>
-<tr>
+<tr class="Anuket-Text">
     <th>Server</th>
     <th>Model</th>
     <th>CPU</th>
diff --git a/src/templates/base/dashboard/table.html b/src/templates/base/dashboard/table.html
index c55a011..bdc350e 100644
--- a/src/templates/base/dashboard/table.html
+++ b/src/templates/base/dashboard/table.html
@@ -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 %}
-- 
cgit 1.2.3-korg