summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Brabec <lbrabec@redhat.com>2017-03-16 12:36:16 +0000
committerMartin Krizek <mkrizek@redhat.com>2017-03-16 12:36:48 +0000
commit49a11bb0274be89a074507b211bda90b297f10bb (patch)
treebdf83e8ebeafc5e9febb3c6fdd6ee3013283feb3
parent894e27b9205d880ff1132d1f62902317ec5c4681 (diff)
downloadansible-49a11bb0274be89a074507b211bda90b297f10bb.tar.gz
ansible-49a11bb0274be89a074507b211bda90b297f10bb.tar.xz
ansible-49a11bb0274be89a074507b211bda90b297f10bb.zip
taskotron landing page: Add drop down menu
-rw-r--r--inventory/group_vars/taskotron-dev4
-rw-r--r--inventory/group_vars/taskotron-prod6
-rw-r--r--inventory/group_vars/taskotron-stg4
-rw-r--r--roles/taskotron/taskotron-frontend/files/static/css/style.css19
-rw-r--r--roles/taskotron/taskotron-frontend/templates/landingpage.html.j214
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 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- {% if landingpage_title %}
- <a class="navbar-brand {{landingpage_title|lower}}">{{landingpage_title}} Instance</a>
- {% endif %}
+ <div class="dropdown">
+ <a class="navbar-brand {{landingpage_title|lower}} dropdown-toggle" id="dropdownMenu1" data-toggle="dropdown">
+ {{landingpage_title}} Instance
+ <span class="caret"></span>
+ </a>
+ <ul class="dropdown-menu" style="top: 30px;">
+ {% for instance in instances %}
+ <li><a href="{{instance.url}}">{{instance.name}} Instance</a></li>
+ {% endfor %}
+ </ul>
+ </div>
</div>
<div id="navbar" class="navbar-collapse collapse navbar-dark">