diff options
author | Jacob Hodgdon <jhodgdon@iol.unh.edu> | 2021-05-14 15:42:56 -0400 |
---|---|---|
committer | Jacob Hodgdon <jhodgdon@iol.unh.edu> | 2021-05-25 17:55:19 -0400 |
commit | 17b6c7809771ac8bf3879add033d2169f671591a (patch) | |
tree | 091074c3eda39d4d8899058c7b06e96428cf82d6 /src/templates | |
parent | 8086a7aa9aa95d5af341b67cba85b1377a168b98 (diff) |
Color fixes for rebrandemail-beautification
Signed-off-by: Jacob Hodgdon <jhodgdon@iol.unh.edu>
Change-Id: I5cf4ede598afa377db7ecec17d8dfef085e130ac
Diffstat (limited to 'src/templates')
-rw-r--r-- | src/templates/base/base.html | 56 | ||||
-rw-r--r-- | src/templates/base/booking/booking_table.html | 4 | ||||
-rw-r--r-- | src/templates/base/booking/quick_deploy.html | 2 | ||||
-rw-r--r-- | src/templates/base/dashboard/landing.html | 21 | ||||
-rw-r--r-- | src/templates/base/dashboard/resource_detail.html | 34 | ||||
-rw-r--r-- | src/templates/base/dashboard/searchable_select_multiple.html | 2 | ||||
-rw-r--r-- | src/templates/base/dashboard/server_table.html | 2 | ||||
-rw-r--r-- | src/templates/base/dashboard/table.html | 2 | ||||
-rw-r--r-- | src/templates/base/layout.html | 2 | ||||
-rw-r--r-- | src/templates/laas/base.html | 84 | ||||
-rw-r--r-- | src/templates/laas/dashboard/landing.html | 4 |
11 files changed, 145 insertions, 68 deletions
diff --git a/src/templates/base/base.html b/src/templates/base/base.html index 394ddec..a628ab4 100644 --- a/src/templates/base/base.html +++ b/src/templates/base/base.html @@ -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 %} @@ -49,11 +49,11 @@ <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> @@ -69,23 +69,23 @@ 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 with Jira </a> @@ -104,69 +104,69 @@ <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-configurations' %}" class="list-group-item list-group-item-action list-group-item-secondary"> + <a href="{% url 'account:my-configurations' %}" class="list-group-item list-group-item-action list-group-item-secondary dropDown-bg"> My Configurations </a> - <a href="{% url 'account:my-images' %}" class="list-group-item list-group-item-action list-group-item-secondary"> + <a href="{% url 'account:my-images' %}" class="list-group-item list-group-item-action list-group-item-secondary dropDown-bg"> 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> diff --git a/src/templates/base/booking/booking_table.html b/src/templates/base/booking/booking_table.html index 32a0146..1b95433 100644 --- a/src/templates/base/booking/booking_table.html +++ b/src/templates/base/booking/booking_table.html @@ -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> diff --git a/src/templates/base/booking/quick_deploy.html b/src/templates/base/booking/quick_deploy.html index 8c8b1df..5dc41e2 100644 --- a/src/templates/base/booking/quick_deploy.html +++ b/src/templates/base/booking/quick_deploy.html @@ -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"> 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 %} diff --git a/src/templates/base/layout.html b/src/templates/base/layout.html index 2132dc6..bea84f3 100644 --- a/src/templates/base/layout.html +++ b/src/templates/base/layout.html @@ -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 --> diff --git a/src/templates/laas/base.html b/src/templates/laas/base.html index 5e9e9db..f980268 100644 --- a/src/templates/laas/base.html +++ b/src/templates/laas/base.html @@ -1,12 +1,88 @@ {% extends "base/base.html" %} {% load staticfiles %} {% block logo %} + +<style> + nav ,body{ + background-color:#fff !important; + color:#343a40 !important; + } + + header{ + background-color:#f8f9fa !important; + color:#343a40 !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; + } + + .btnAnuket { + color: #343a40; + background-color: #6BDAD5; + transition-duration:0.2s; + border:0px + } + .btnAnuket:hover{ + color: #f8f9fa; + background-color: #007473; + border:0px + } + + .btnAnuket:focus{ + color: #f8f9fa !important; + background-color: #007473 !important; + border:0px + } + + .alertAnuket{ + background-color: #e6b3c1; + color:#820c2c; + border:0px; + } + .inTextLink{ + text-decoration: underline; + } + + .Anuket-Text{ + color:#343a40 !important; + } + + h1, h2{ + color:#343a40 !important; + } + + p, h3, h4, h5{ + color:#343a40 !important; + } + + ::selection { + background: #BCE194; + color:#343a40; + } + ::-moz-selection { + background: #BCE194; + color:#343a40; + } + </style> + <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" %}" 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 %} diff --git a/src/templates/laas/dashboard/landing.html b/src/templates/laas/dashboard/landing.html index fc6b3e3..12d8924 100644 --- a/src/templates/laas/dashboard/landing.html +++ b/src/templates/laas/dashboard/landing.html @@ -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 |