From 49a11bb0274be89a074507b211bda90b297f10bb Mon Sep 17 00:00:00 2001 From: Lukas Brabec Date: Thu, 16 Mar 2017 12:36:16 +0000 Subject: taskotron landing page: Add drop down menu --- inventory/group_vars/taskotron-dev | 4 ++++ inventory/group_vars/taskotron-prod | 6 +++++- inventory/group_vars/taskotron-stg | 4 ++++ .../taskotron-frontend/files/static/css/style.css | 19 +++++++++++++++++++ .../taskotron-frontend/templates/landingpage.html.j2 | 14 +++++++++++--- 5 files changed, 43 insertions(+), 4 deletions(-) diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev index 88dd3af1f..f8e0734e8 100644 --- a/inventory/group_vars/taskotron-dev +++ b/inventory/group_vars/taskotron-dev @@ -53,6 +53,10 @@ resultsdb_frontend_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb/ resultsdb_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v2.0 taskotron_docs_url: https://qa.fedoraproject.org/docs/libtaskotron/latest/ trigger_distgit_repo_url: http://pkgs.stg.fedoraproject.org/ +instances: + - { name: "Production", url: "taskotron.fedoraproject.org"} + - { name: "Staging", url: "taskotron.stg.fedoraproject.org"} + - { name: "Development", url: "taskotron-dev.fedoraproject.org"} ############################################################ diff --git a/inventory/group_vars/taskotron-prod b/inventory/group_vars/taskotron-prod index cd56d1124..4fb81e249 100644 --- a/inventory/group_vars/taskotron-prod +++ b/inventory/group_vars/taskotron-prod @@ -40,6 +40,10 @@ resultsdb_frontend_url: http://resultsdb01.qa.fedoraproject.org/resultsdb resultsdb_url: http://resultsdb01.qa.fedoraproject.org/resultsdb_api/api/v2.0 taskotron_docs_url: https://qa.fedoraproject.org/docs/libtaskotron/latest/ trigger_distgit_repo_url: http://pkgs.fedoraproject.org/git +instances: + - { name: "Production", url: "taskotron.fedoraproject.org"} + - { name: "Staging", url: "taskotron.stg.fedoraproject.org"} + - { name: "Development", url: "taskotron-dev.fedoraproject.org"} ############################################################ # taskotron details @@ -47,7 +51,7 @@ trigger_distgit_repo_url: http://pkgs.fedoraproject.org/git public_artifacts_dir: /srv/taskotron/artifacts cgit_root_title: "Taskotron Git Mirror" -landingpage_title: "" +landingpage_title: "Production" landingpage_instance: "prod" settings_dir: /etc/taskotron diff --git a/inventory/group_vars/taskotron-stg b/inventory/group_vars/taskotron-stg index 53628403f..db084d109 100644 --- a/inventory/group_vars/taskotron-stg +++ b/inventory/group_vars/taskotron-stg @@ -51,6 +51,10 @@ taskotron_docs_url: https://qa.fedoraproject.org/docs/libtaskotron/latest/ trigger_distgit_repo_url: http://pkgs.stg.fedoraproject.org trigger_critpath_url: https://admin.stg.fedoraproject.org/pkgdb/api/critpath?format=json +instances: + - { name: "Production", url: "taskotron.fedoraproject.org"} + - { name: "Staging", url: "taskotron.stg.fedoraproject.org"} + - { name: "Development", url: "taskotron-dev.fedoraproject.org"} ############################################################ # taskotron details diff --git a/roles/taskotron/taskotron-frontend/files/static/css/style.css b/roles/taskotron/taskotron-frontend/files/static/css/style.css index f5b1c3e42..0a2a488b8 100644 --- a/roles/taskotron/taskotron-frontend/files/static/css/style.css +++ b/roles/taskotron/taskotron-frontend/files/static/css/style.css @@ -64,6 +64,25 @@ body { color: #639a81 !important; } +.dropdown-menu { + background-color: #535452; + text-transform: uppercase; +} + +.dropdown-menu a { + color: #e8e8e8 !important; +} + +.dropdown-menu a:hover { + color: #535452 !important; +} + +.production { + text-transform: uppercase; + color: #639a81 !important; + font-size: 10pt; +} + .development { text-transform: uppercase; color: #cc6168 !important; diff --git a/roles/taskotron/taskotron-frontend/templates/landingpage.html.j2 b/roles/taskotron/taskotron-frontend/templates/landingpage.html.j2 index 73574372f..469e892f7 100644 --- a/roles/taskotron/taskotron-frontend/templates/landingpage.html.j2 +++ b/roles/taskotron/taskotron-frontend/templates/landingpage.html.j2 @@ -30,9 +30,17 @@ - {% if landingpage_title %} - {{landingpage_title}} Instance - {% endif %} +