From 8560d9145787fde7ebf2ecb88120659b6d065ab1 Mon Sep 17 00:00:00 2001 From: Jacky Hu Date: Mon, 11 Dec 2017 13:58:32 +0800 Subject: [PATCH] Make breadcrumb same as other pages Use a single breadcrumb, which looks and feels the same as other openstack dashboard pages. Change-Id: I14a9a367c03d697e4d1db7c5d80a6c6e5e78dd67 --- .../templates/load_balancer/index.html | 1 + .../lbaasv2/healthmonitors/details/detail.html | 12 +++++++----- .../healthmonitors/healthmonitors.module.js | 15 ++++++++++++--- .../project/lbaasv2/listeners/details/detail.html | 8 +++++--- .../lbaasv2/loadbalancers/details/detail.html | 6 ++++-- .../project/lbaasv2/loadbalancers/panel.html | 5 +++++ .../project/lbaasv2/members/details/detail.html | 14 ++++++++------ .../project/lbaasv2/pools/details/detail.html | 10 ++++++---- 8 files changed, 48 insertions(+), 23 deletions(-) diff --git a/octavia_dashboard/dashboards/project/load_balancer/templates/load_balancer/index.html b/octavia_dashboard/dashboards/project/load_balancer/templates/load_balancer/index.html index bed22e27..dcf96e08 100644 --- a/octavia_dashboard/dashboards/project/load_balancer/templates/load_balancer/index.html +++ b/octavia_dashboard/dashboards/project/load_balancer/templates/load_balancer/index.html @@ -2,6 +2,7 @@ {% load i18n %} {% block title %}{% trans "Load Balancers" %}{% endblock %} {% block page_header %}{% endblock %} +{% block breadcrumb_nav %}{% endblock %} {% block ng_route_base %} diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/healthmonitors/details/detail.html b/octavia_dashboard/static/dashboard/project/lbaasv2/healthmonitors/details/detail.html index 81df2083..126018bd 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/healthmonitors/details/detail.html +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/healthmonitors/details/detail.html @@ -1,10 +1,12 @@
    -
  1. Load Balancers
    2. -
  2. {$ ::(ctrl.loadbalancer.name || ctrl.loadbalancer.id) $}
    3. -
  3. {$ ::(ctrl.listener.name || ctrl.listener.id) $}
    4. -
  4. {$ ::(ctrl.pool.name || ctrl.pool.id) $}
    5. -
  5. {$ ::(ctrl.healthmonitor.name || ctrl.healthmonitor.id) $}
    6. +
  6. Project
    7. +
  7. Network
    8. +
  8. Load Balancers
    9. +
  9. {$ ::(ctrl.loadbalancer.name || ctrl.loadbalancer.id) $}
    10. +
  10. {$ ::(ctrl.listener.name || ctrl.listener.id) $}
    11. +
  11. {$ ::(ctrl.pool.name || ctrl.pool.id) $}
    12. +
  12. {$ ::(ctrl.healthmonitor.name || ctrl.healthmonitor.id) $}
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/healthmonitors/healthmonitors.module.js b/octavia_dashboard/static/dashboard/project/lbaasv2/healthmonitors/healthmonitors.module.js index eb44d023..2c08d528 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/healthmonitors/healthmonitors.module.js +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/healthmonitors/healthmonitors.module.js @@ -145,9 +145,18 @@ timeout: gettext('Timeout'), max_retries: gettext('Max Retries'), max_retries_down: gettext('Max Retries Down'), - http_method: gettext('HTTP Method'), - url_path: gettext('URL Path'), - expected_codes: gettext('Expected Codes'), + http_method: { + label: gettext('HTTP Method'), + filters: ['noValue'] + }, + url_path: { + label: gettext('URL Path'), + filters: ['noValue'] + }, + expected_codes: { + label: gettext('Expected Codes'), + filters: ['noValue'] + }, project_id: gettext('Project ID'), created_at: { label: gettext('Created At'), diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/listeners/details/detail.html b/octavia_dashboard/static/dashboard/project/lbaasv2/listeners/details/detail.html index 82c3acba..7a4a2ce7 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/listeners/details/detail.html +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/listeners/details/detail.html @@ -1,8 +1,10 @@
    -
  1. Load Balancers
    2. -
  2. {$ ::(ctrl.loadbalancer.name || ctrl.loadbalancer.id) $}
    3. -
  3. {$ ::(ctrl.listener.name || ctrl.listener.id) $}
    4. +
  4. Project
    5. +
  5. Network
    6. +
  6. Load Balancers
    7. +
  7. {$ ::(ctrl.loadbalancer.name || ctrl.loadbalancer.id) $}
    8. +
  8. {$ ::(ctrl.listener.name || ctrl.listener.id) $}
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/loadbalancers/details/detail.html b/octavia_dashboard/static/dashboard/project/lbaasv2/loadbalancers/details/detail.html index c7bf4449..ac48cfb6 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/loadbalancers/details/detail.html +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/loadbalancers/details/detail.html @@ -1,7 +1,9 @@
    -
  1. Load Balancers
    2. -
  2. {$ ctrl.loadbalancer.name || ctrl.loadbalancer.id $}
    3. +
  3. Project
    4. +
  4. Network
    5. +
  5. Load Balancers
    6. +
  6. {$ ctrl.loadbalancer.name || ctrl.loadbalancer.id $}
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/loadbalancers/panel.html b/octavia_dashboard/static/dashboard/project/lbaasv2/loadbalancers/panel.html index d8eb16a6..aef6fa49 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/loadbalancers/panel.html +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/loadbalancers/panel.html @@ -1,3 +1,8 @@ +
    +
  1. Project
    2. +
  2. Network
    3. +
  3. Load Balancers
    4. +
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/members/details/detail.html b/octavia_dashboard/static/dashboard/project/lbaasv2/members/details/detail.html index d21b4ada..c7f546b6 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/members/details/detail.html +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/members/details/detail.html @@ -1,10 +1,12 @@
    -
  1. Load Balancers
    2. -
  2. {$ ::(ctrl.loadbalancer.name || ctrl.loadbalancer.id) $}
    3. -
  3. {$ ::(ctrl.listener.name || ctrl.listener.id) $}
    4. -
  4. {$ ::(ctrl.pool.name || ctrl.pool.id) $}
    5. -
  5. {$ ::(ctrl.member.name || ctrl.member.id) $}
    6. +
  6. Project
    7. +
  7. Network
    8. +
  8. Load Balancers
    9. +
  9. {$ ::(ctrl.loadbalancer.name || ctrl.loadbalancer.id) $}
    10. +
  10. {$ ::(ctrl.listener.name || ctrl.listener.id) $}
    11. +
  11. {$ ::(ctrl.pool.name || ctrl.pool.id) $}
    12. +
  12. {$ ::(ctrl.member.name || ctrl.member.id) $}
@@ -49,7 +51,7 @@ item="ctrl.member" property-groups="[[ 'id', 'name', 'project_id', 'created_at', 'updated_at', - 'weight', 'monitor_address', 'monitor_port']]"> + 'weight', 'subnet_id', 'monitor_address', 'monitor_port']]">
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/pools/details/detail.html b/octavia_dashboard/static/dashboard/project/lbaasv2/pools/details/detail.html index eaf0544e..51778f85 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/pools/details/detail.html +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/pools/details/detail.html @@ -1,9 +1,11 @@
    -
  1. Load Balancers
    2. -
  2. {$ ::(ctrl.loadbalancer.name || ctrl.loadbalancer.id) $}
    3. -
  3. {$ ::(ctrl.listener.name || ctrl.listener.id) $}
    4. -
  4. {$ ::(ctrl.pool.name || ctrl.pool.id) $}
    5. +
  5. Project
    6. +
  6. Network
    7. +
  7. Load Balancers
    8. +
  8. {$ ::(ctrl.loadbalancer.name || ctrl.loadbalancer.id) $}
    9. +
  9. {$ ::(ctrl.listener.name || ctrl.listener.id) $}
    10. +
  10. {$ ::(ctrl.pool.name || ctrl.pool.id) $}