openstack/horizon
Code Issues Proposed changes

Branding: Create Network should inherit from theme

Browse Source 
Create network is different than all other workflows, and it has a
lot of unnecessary style associated with it. This inhibits
themability. It should just use standard nav-pills.

partial-bug: #1551492
Closes-bug: #1553781

Change-Id: I6896df03b86ae0c4388ac15246739aeea5365a95
This commit is contained in:
Diana Whitten 2016-03-06 12:21:00 -07:00 committed by Rob Cresswell
parent 4d0ce35ded
commit 54b9506ed5
7 changed files with 7 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
horizon/static/horizon/js/horizon.forms.js
View File

@ -314,7 +314,7 @@ horizon.addInitFunction(horizon.forms.init = function () {
$switchables.each(function (index, switchable) {
var $switchable = $(switchable),
visible = $switchable.is(':visible'),
visible = $switchable.parent().hasClass('themable-checkbox') ? $switchable.siblings('label').is(':visible') : $switchable.is(':visible'),
slug = $switchable.data('slug'),
checked = $switchable.prop('checked'),
hide_tab = String($switchable.data('hide-tab')).split(','),

2
horizon/templates/horizon/common/_workflow.html
View File

@ -19,7 +19,7 @@
</div>
<div class="modal-body">
{% block modal-body %}
<ul class="nav nav-tabs{% if workflow.wizard %} wizard-tabs{% endif %}" role="tablist">
<ul class="nav nav-pills selenium-nav-region{% if workflow.wizard %} wizard-tabs{% endif %}" role="tablist">
{% for step in workflow.steps %}
<li class="{% if entry_point == step.slug %}active{% endif %}{% if step.has_errors %} error{% endif %}{% if step.has_required_fields %} required{% endif %}">
<a href="#{{ step.get_id }}" data-toggle="tab" data-target="#{{ step.get_id }}">

17
openstack_dashboard/static/dashboard/scss/_variables.scss
View File

@ -11,23 +11,6 @@ $sidebar-width: 220px !default;
$border-color: #dddddd !default;
$table-bg-odd: $table-bg-accent !default;
/* Workflows */
$workflow-color-tab-complete-bg: #007acc;
$workflow-color-tab-incomplete-bg: #dddddd;
$workflow-color-tab-trough-bg: #efefef;
$workflow-color-tab-border: #ffffff;
$workflow-color-tab-link-active: #ffffff;
$workflow-color-tab-link-inactive: #43a4d7;
$workflow-color-label-error: $brand-danger;
$workflow-size-tab-border: 2px;
$workflow-size-tab-arrow: 20px;
$workflow-size-tab-padding: 15px;
/* Resource Browser */
$rbrowser-data-table-border-width: 1px;

4
openstack_dashboard/static/dashboard/scss/components/_modals.scss
View File

@ -33,6 +33,10 @@
& ~ hr {
margin-bottom: 0;
}
& > .nav-pills {
padding-bottom: $padding-base-horizontal;
}
}
.modal-footer {

89
openstack_dashboard/static/dashboard/scss/components/_workflow.scss
View File

@ -1,89 +0,0 @@
.workflow {
fieldset > table {
margin-bottom: 0;
}
&.wizard {
.row {
.btn {
float: none;
margin: 0;
}
.next {
text-align: right;
}
}
.nav-tabs.wizard-tabs {
border-bottom: 0;
background: $workflow-color-tab-trough-bg;
padding: 0;
li {
margin-bottom: 0;
position: relative;
&:before {
position: absolute;
top: 0;
right: -$workflow-size-tab-arrow;
z-index: 2;
display: block;
border: $workflow-size-tab-arrow inset transparent;
border-right: 0;
border-left: $workflow-size-tab-arrow solid $workflow-color-tab-incomplete-bg;
content: '';
}
&:after {
position: absolute;
top: -$workflow-size-tab-border;
right: -($workflow-size-tab-arrow + $workflow-size-tab-border);
z-index: 1;
display: block;
border: ($workflow-size-tab-arrow + $workflow-size-tab-border) inset transparent;
border-right: 0;
border-left: ($workflow-size-tab-arrow + $workflow-size-tab-border) solid $workflow-color-tab-border;
content: '';
}
&.active:before,
&.done:before {
border-left: $workflow-size-tab-arrow solid $workflow-color-tab-complete-bg;
}
a {
border: 0;
border-radius: 0;
background: $workflow-color-tab-incomplete-bg;
color: $workflow-color-tab-link-inactive;
padding: 0 $workflow-size-tab-padding;
padding-left: $workflow-size-tab-arrow + $workflow-size-tab-padding;
line-height: $workflow-size-tab-arrow * 2;
position: relative;
margin: 0;
}
&:first-child a {
padding-left: $workflow-size-tab-padding;
}
&.active a {
background: $workflow-color-tab-complete-bg;
color: $workflow-color-tab-link-active;
}
&.done a {
background: $workflow-color-tab-complete-bg;
}
}
}
label.error {
color: $workflow-color-label-error;
}
}
}

1
openstack_dashboard/static/dashboard/scss/horizon.scss
View File

@ -40,7 +40,6 @@
@import "components/tables";
@import "components/transfer_tables";
@import "components/wizard";
@import "components/workflow";
// Framework
@import "/framework/framework";

2
openstack_dashboard/test/integration_tests/regions/menus.py
View File

@ -239,7 +239,7 @@ class UserDropDownMenuRegion(DropDownMenuRegion):
class TabbedMenuRegion(baseregion.BaseRegion):
_tab_locator = (by.By.CSS_SELECTOR, 'a')
_default_src_locator = (by.By.CSS_SELECTOR, 'ul.nav.nav-tabs')
_default_src_locator = (by.By.CSS_SELECTOR, '.selenium-nav-region')
def switch_to(self, index=0):
self._get_elements(*self._tab_locator)[index].click()