openstack
/
octavia-dashboard
Code Issues Proposed changes

Merge "Make breadcrumb same as other pages"

This commit is contained in:
Zuul 2018-01-22 05:03:59 +00:00 committed by Gerrit Code Review
parent 9759b7ff07 8560d91457
commit 09040555ff
8 changed files with 48 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
octavia_dashboard/dashboards/project/load_balancer/templates/load_balancer/index.html
View File

@ -2,6 +2,7 @@
{% load i18n %}
{% block title %}{% trans "Load Balancers" %}{% endblock %}
{% block page_header %}{% endblock %}
{% block breadcrumb_nav %}{% endblock %}
{% block ng_route_base %}
<base href="{{ WEBROOT }}">

12
octavia_dashboard/static/dashboard/project/lbaasv2/healthmonitors/details/detail.html
View File

@ -1,10 +1,12 @@
<div class="page-header">
<ol class="breadcrumb">
<li><a href="project/load_balancer/"><translate>Load Balancers</translate></a></li>
<li><a href="project/load_balancer/{$ ::ctrl.loadbalancer.id $}">{$ ::(ctrl.loadbalancer.name || ctrl.loadbalancer.id) $}</a></li>
<li><a href="project/load_balancer/{$ ::ctrl.loadbalancer.id $}/listeners/{$ ::ctrl.listener.id $}">{$ ::(ctrl.listener.name || ctrl.listener.id) $}</a></li>
<li><a href="project/load_balancer/{$ ::ctrl.loadbalancer.id $}/listeners/{$ ::ctrl.listener.id $}/pools/{$ ::ctrl.pool.id $}">{$ ::(ctrl.pool.name || ctrl.pool.id) $}</a></li>
<li class="active">{$ ::(ctrl.healthmonitor.name || ctrl.healthmonitor.id) $}</li>
<li class="breadcrumb-item-truncate"><translate>Project</translate></li>
<li class="breadcrumb-item-truncate"><translate>Network</translate></li>
<li class="breadcrumb-item-truncate"><a href="project/load_balancer/"><translate>Load Balancers</translate></a></li>
<li class="breadcrumb-item-truncate"><a href="project/load_balancer/{$ ::ctrl.loadbalancer.id $}">{$ ::(ctrl.loadbalancer.name || ctrl.loadbalancer.id) $}</a></li>
<li class="breadcrumb-item-truncate"><a href="project/load_balancer/{$ ::ctrl.loadbalancer.id $}/listeners/{$ ::ctrl.listener.id $}">{$ ::(ctrl.listener.name || ctrl.listener.id) $}</a></li>
<li class="breadcrumb-item-truncate"><a href="project/load_balancer/{$ ::ctrl.loadbalancer.id $}/listeners/{$ ::ctrl.listener.id $}/pools/{$ ::ctrl.pool.id $}">{$ ::(ctrl.pool.name || ctrl.pool.id) $}</a></li>
<li class="breadcrumb-item-truncate active">{$ ::(ctrl.healthmonitor.name || ctrl.healthmonitor.id) $}</li>
</ol>
<div class="row">
<div class="col-xs-12 col-sm-9 text-left">

15
octavia_dashboard/static/dashboard/project/lbaasv2/healthmonitors/healthmonitors.module.js
View File

@ -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'),

8
octavia_dashboard/static/dashboard/project/lbaasv2/listeners/details/detail.html
View File

@ -1,8 +1,10 @@
<div class="page-header">
<ol class="breadcrumb">
<li><a href="project/load_balancer/"><translate>Load Balancers</translate></a></li>
<li><a href="project/load_balancer/{$ ::ctrl.loadbalancer.id $}">{$ ::(ctrl.loadbalancer.name || ctrl.loadbalancer.id) $}</a></li>
<li class="active">{$ ::(ctrl.listener.name || ctrl.listener.id) $}</li>
<li class="breadcrumb-item-truncate"><translate>Project</translate></li>
<li class="breadcrumb-item-truncate"><translate>Network</translate></li>
<li class="breadcrumb-item-truncate"><a href="project/load_balancer/"><translate>Load Balancers</translate></a></li>
<li class="breadcrumb-item-truncate"><a href="project/load_balancer/{$ ::ctrl.loadbalancer.id $}">{$ ::(ctrl.loadbalancer.name || ctrl.loadbalancer.id) $}</a></li>
<li class="breadcrumb-item-truncate active">{$ ::(ctrl.listener.name || ctrl.listener.id) $}</li>
</ol>
<div class="row">
<div class="col-xs-12 col-sm-9 text-left">

6
octavia_dashboard/static/dashboard/project/lbaasv2/loadbalancers/details/detail.html
View File

@ -1,7 +1,9 @@
<div class="page-header">
<ol class="breadcrumb">
<li><a href="project/load_balancer/"><translate>Load Balancers</translate></a></li>
<li class="active">{$ ctrl.loadbalancer.name || ctrl.loadbalancer.id $}</li>
<li class="breadcrumb-item-truncate"><translate>Project</translate></li>
<li class="breadcrumb-item-truncate"><translate>Network</translate></li>
<li class="breadcrumb-item-truncate"><a href="project/load_balancer/"><translate>Load Balancers</translate></a></li>
<li class="breadcrumb-item-truncate active">{$ ctrl.loadbalancer.name || ctrl.loadbalancer.id $}</li>
</ol>
<div class="row">
<div class="col-xs-12 col-sm-9 text-left">

5
octavia_dashboard/static/dashboard/project/lbaasv2/loadbalancers/panel.html
View File

@ -1,3 +1,8 @@
<ol class="breadcrumb">
<li class="breadcrumb-item-truncate"><translate>Project</translate></li>
<li class="breadcrumb-item-truncate"><translate>Network</translate></li>
<li class="breadcrumb-item-truncate active"><translate>Load Balancers</translate></li>
</ol>
<hz-resource-panel resource-type-name="OS::Octavia::LoadBalancer">
<hz-resource-table resource-type-name="OS::Octavia::LoadBalancer"
track-by="trackBy"></hz-resource-table>

14
octavia_dashboard/static/dashboard/project/lbaasv2/members/details/detail.html
View File

@ -1,10 +1,12 @@
<div class="page-header">
<ol class="breadcrumb">
<li><a href="project/load_balancer/"><translate>Load Balancers</translate></a></li>
<li><a href="project/load_balancer/{$ ::ctrl.loadbalancer.id $}">{$ ::(ctrl.loadbalancer.name || ctrl.loadbalancer.id) $}</a></li>
<li><a href="project/load_balancer/{$ ::ctrl.loadbalancer.id $}/listeners/{$ ::ctrl.listener.id $}">{$ ::(ctrl.listener.name || ctrl.listener.id) $}</a></li>
<li><a href="project/load_balancer/{$ ::ctrl.loadbalancer.id $}/listeners/{$ ::ctrl.listener.id $}/pools/{$ ::ctrl.pool.id $}">{$ ::(ctrl.pool.name || ctrl.pool.id) $}</a></li>
<li class="active">{$ ::(ctrl.member.name || ctrl.member.id) $}</li>
<li class="breadcrumb-item-truncate"><translate>Project</translate></li>
<li class="breadcrumb-item-truncate"><translate>Network</translate></li>
<li class="breadcrumb-item-truncate"><a href="project/load_balancer/"><translate>Load Balancers</translate></a></li>
<li class="breadcrumb-item-truncate"><a href="project/load_balancer/{$ ::ctrl.loadbalancer.id $}">{$ ::(ctrl.loadbalancer.name || ctrl.loadbalancer.id) $}</a></li>
<li class="breadcrumb-item-truncate"><a href="project/load_balancer/{$ ::ctrl.loadbalancer.id $}/listeners/{$ ::ctrl.listener.id $}">{$ ::(ctrl.listener.name || ctrl.listener.id) $}</a></li>
<li class="breadcrumb-item-truncate"><a href="project/load_balancer/{$ ::ctrl.loadbalancer.id $}/listeners/{$ ::ctrl.listener.id $}/pools/{$ ::ctrl.pool.id $}">{$ ::(ctrl.pool.name || ctrl.pool.id) $}</a></li>
<li class="breadcrumb-item-truncate active">{$ ::(ctrl.member.name || ctrl.member.id) $}</li>
</ol>
<div class="row">
<div class="col-xs-12 col-sm-9 text-left">
@ -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']]">
</hz-resource-property-list>
</div>
</div>

10
octavia_dashboard/static/dashboard/project/lbaasv2/pools/details/detail.html
View File

@ -1,9 +1,11 @@
<div class="page-header">
<ol class="breadcrumb">
<li><a href="project/load_balancer/"><translate>Load Balancers</translate></a></li>
<li><a href="project/load_balancer/{$ ::ctrl.loadbalancer.id $}">{$ ::(ctrl.loadbalancer.name || ctrl.loadbalancer.id) $}</a></li>
<li><a href="project/load_balancer/{$ ::ctrl.loadbalancer.id $}/listeners/{$ ::ctrl.listener.id $}">{$ ::(ctrl.listener.name || ctrl.listener.id) $}</a></li>
<li class="active">{$ ::(ctrl.pool.name || ctrl.pool.id) $}</li>
<li class="breadcrumb-item-truncate"><translate>Project</translate></li>
<li class="breadcrumb-item-truncate"><translate>Network</translate></li>
<li class="breadcrumb-item-truncate"><a href="project/load_balancer/"><translate>Load Balancers</translate></a></li>
<li class="breadcrumb-item-truncate"><a href="project/load_balancer/{$ ::ctrl.loadbalancer.id $}">{$ ::(ctrl.loadbalancer.name || ctrl.loadbalancer.id) $}</a></li>
<li class="breadcrumb-item-truncate"><a href="project/load_balancer/{$ ::ctrl.loadbalancer.id $}/listeners/{$ ::ctrl.listener.id $}">{$ ::(ctrl.listener.name || ctrl.listener.id) $}</a></li>
<li class="breadcrumb-item-truncate active">{$ ::(ctrl.pool.name || ctrl.pool.id) $}</li>
</ol>
<div class="row">
<div class="col-xs-12 col-sm-9 text-left">