diff options
Diffstat (limited to 'horizon')
20 files changed, 51 insertions, 51 deletions
diff --git a/horizon/static/framework/widgets/headers/hz-page-header.html b/horizon/static/framework/widgets/headers/hz-page-header.html index 4b586cf9a..0172f7128 100644 --- a/horizon/static/framework/widgets/headers/hz-page-header.html +++ b/horizon/static/framework/widgets/headers/hz-page-header.html @@ -1,5 +1,5 @@ -<div class='page-header'> +<div class="page-header"> <h1>{$ ::header $}</h1> <p>{$ ::description $}</p> <ng-transclude></ng-transclude> -</div>
\ No newline at end of file +</div> diff --git a/horizon/static/framework/widgets/metadata/tree/metadata-tree.html b/horizon/static/framework/widgets/metadata/tree/metadata-tree.html index 185c81346..48263059e 100644 --- a/horizon/static/framework/widgets/metadata/tree/metadata-tree.html +++ b/horizon/static/framework/widgets/metadata/tree/metadata-tree.html @@ -34,7 +34,7 @@ ng-model="ctrl.customItem" validate-unique="ctrl.checkNameUnique"/> <span class="input-group-btn"> - <button type='button' class="btn btn-primary" + <button type="button" class="btn btn-primary" ng-click="ctrl.tree.addCustom(ctrl.customItem); ctrl.customItem=''" ng-disabled="!ctrl.customItem || customItemForm.$invalid"> <span class="fa fa-plus"></span> diff --git a/horizon/static/framework/widgets/property/hz-resource-property.html b/horizon/static/framework/widgets/property/hz-resource-property.html index eac545fe6..45762f154 100644 --- a/horizon/static/framework/widgets/property/hz-resource-property.html +++ b/horizon/static/framework/widgets/property/hz-resource-property.html @@ -1,5 +1,5 @@ <dt>{$ ctrl.config.label $}</dt> <dd> - <hz-field config='ctrl.config' item='ctrl.item'></hz-field> + <hz-field config="ctrl.config" item="ctrl.item"></hz-field> </dd> diff --git a/horizon/templates/horizon/_nav_list.html b/horizon/templates/horizon/_nav_list.html index 2218fc544..95a2f8182 100644 --- a/horizon/templates/horizon/_nav_list.html +++ b/horizon/templates/horizon/_nav_list.html @@ -5,7 +5,7 @@ {% for component in components %} {% if user|has_permissions:component %} <li{% if current.slug == component.slug %} class="active"{% endif %}> - <a href="{{ component.get_absolute_url }}" tabindex='1'>{{ component.name }}</a> + <a href="{{ component.get_absolute_url }}" tabindex="1">{{ component.name }}</a> </li> {% endif %} {% endfor %} diff --git a/horizon/templates/horizon/_subnav_list.html b/horizon/templates/horizon/_subnav_list.html index c4d800150..1dd21fe79 100644 --- a/horizon/templates/horizon/_subnav_list.html +++ b/horizon/templates/horizon/_subnav_list.html @@ -10,7 +10,7 @@ {% for panel in filtered_panels %} {% if panel in accessible_panels or current == panel.slug %} <li> - <a href="{{ panel.get_absolute_url }}" {% if current == panel.slug %}class="active"{% endif %} tabindex='1'>{{ panel.name }}</a> + <a href="{{ panel.get_absolute_url }}" {% if current == panel.slug %}class="active"{% endif %} tabindex="1">{{ panel.name }}</a> </li> {% endif %} {% endfor %} diff --git a/horizon/templates/horizon/client_side/_modal.html b/horizon/templates/horizon/client_side/_modal.html index 8560e076e..47b804718 100644 --- a/horizon/templates/horizon/client_side/_modal.html +++ b/horizon/templates/horizon/client_side/_modal.html @@ -7,18 +7,18 @@ <div class="modal" data-backdrop="[[modal_backdrop]]"> <div class="modal-dialog"> <div class="modal-content"> - <div class='modal-header'> - <a class='close' data-dismiss='modal' href="#"> + <div class="modal-header"> + <a class="close" data-dismiss="modal" href="#"> <span class="fa fa-times"></span> </a> <h3 class="modal-title">[[title]]</h3> </div> - <div class='modal-body'> + <div class="modal-body"> [[[body]]] </div> - <div class='modal-footer'> - <a href='#' class='btn btn-default cancel' data-dismiss='modal'>[[cancel]]</a> - <a href='#' class='btn [[confirmCssClass]]'>[[confirm]]</a> + <div class="modal-footer"> + <a href="#" class="btn btn-default cancel" data-dismiss="modal">[[cancel]]</a> + <a href="#" class="btn [[confirmCssClass]]">[[confirm]]</a> </div> </div> </div> diff --git a/horizon/templates/horizon/common/_data_table.html b/horizon/templates/horizon/common/_data_table.html index d29ff7c65..38db26fb7 100644 --- a/horizon/templates/horizon/common/_data_table.html +++ b/horizon/templates/horizon/common/_data_table.html @@ -8,7 +8,7 @@ {% block table_caption %} <caption> {% if not hidden_title %} - <span class='table-title'>{{ table }}</span> + <span class="table-title">{{ table }}</span> {% endif %} {{ table.render_table_actions }} </caption> diff --git a/horizon/templates/horizon/common/_data_table_row_action_row.html b/horizon/templates/horizon/common/_data_table_row_action_row.html index 2fdbb6ca1..4cdd83418 100644 --- a/horizon/templates/horizon/common/_data_table_row_action_row.html +++ b/horizon/templates/horizon/common/_data_table_row_action_row.html @@ -4,7 +4,7 @@ {{ action.verbose_name }} </button> {% else %} - <a href='{{ action.bound_url }}' title='{{ action.verbose_name }}' {{ action.attr_string|safe }}> + <a href="{{ action.bound_url }}" title="{{ action.verbose_name }}" {{ action.attr_string|safe }}> {% if action.icon != None %}<span class="fa fa-{{ action.icon }}"></span> {% endif %} {{ action.verbose_name }} </a> diff --git a/horizon/templates/horizon/common/_datepicker.html b/horizon/templates/horizon/common/_datepicker.html index efac7fdd9..507376192 100644 --- a/horizon/templates/horizon/common/_datepicker.html +++ b/horizon/templates/horizon/common/_datepicker.html @@ -1,7 +1,7 @@ {% load i18n %} {% block trimmed %} - <div class='input-group date'> + <div class="input-group date"> {{ datepicker_input }} <label class="sr-only">{{ datepicker_label }}</label> <span class="input-group-addon datepicker-addon"> diff --git a/horizon/templates/horizon/common/_detail_header.html b/horizon/templates/horizon/common/_detail_header.html index be12cb65f..db99156f9 100644 --- a/horizon/templates/horizon/common/_detail_header.html +++ b/horizon/templates/horizon/common/_detail_header.html @@ -1,4 +1,4 @@ -<div class='page-header detail-header'> +<div class="page-header detail-header"> <div class="row"> <div class="detail-title col-xs-12 col-sm-9"> <span class="h1 word-wrap">{{ page_title }}</span> @@ -6,7 +6,7 @@ <div class="detail-actions col-xs-12 col-sm-3 text-right"> {% if actions %} - <form class='detail-actions-form actions_column' action='{{ url }}' method="POST"> + <form class="detail-actions-form actions_column" action="{{ url }}" method="POST"> {% csrf_token %} {{ actions }} </form> diff --git a/horizon/templates/horizon/common/_domain_page_header.html b/horizon/templates/horizon/common/_domain_page_header.html index b77ce87c8..149fbf28c 100644 --- a/horizon/templates/horizon/common/_domain_page_header.html +++ b/horizon/templates/horizon/common/_domain_page_header.html @@ -1,6 +1,6 @@ {% load i18n %} {% block page_header %} - <div class='page-header'> + <div class="page-header"> <h1> {% if 'domain_context_name' in request.session %} <em>{% blocktrans with context_name=request.session.domain_context_name %}{{ context_name }}:{% endblocktrans %}</em> diff --git a/horizon/templates/horizon/common/_form_field.html b/horizon/templates/horizon/common/_form_field.html index c521fc0d6..5b3a3b2a8 100644 --- a/horizon/templates/horizon/common/_form_field.html +++ b/horizon/templates/horizon/common/_form_field.html @@ -17,10 +17,10 @@ <div class="{{ classes.value }} {{ field|wrapper_classes }}"> {% with add_item_link=field|add_item_url %} {% if add_item_link %} - <div class='input-group'> + <div class="input-group"> {{ field|add_bootstrap_class }} <span class="input-group-btn"> - <a href="{{ add_item_link }}" data-add-to-field="{{ field.auto_id }}" class='btn btn-default ajax-add ajax-modal'> + <a href="{{ add_item_link }}" data-add-to-field="{{ field.auto_id }}" class="btn btn-default ajax-add ajax-modal"> <span class="fa fa-plus"></span> </a> </span> diff --git a/horizon/templates/horizon/common/_page_header.html b/horizon/templates/horizon/common/_page_header.html index 9491a55ac..ab8585b8b 100644 --- a/horizon/templates/horizon/common/_page_header.html +++ b/horizon/templates/horizon/common/_page_header.html @@ -1,9 +1,9 @@ {% load i18n %} {% block page_header %} - <div class='page-header'> + <div class="page-header"> <h1>{{ title }}</h1> {% if actions %} - <form class='actions_column pull-right' action='{{ url }}' method="POST"> + <form class="actions_column pull-right" action="{{ url }}" method="POST"> {% csrf_token %} {{ actions }} </form> diff --git a/horizon/templates/horizon/common/_sidebar.html b/horizon/templates/horizon/common/_sidebar.html index d55251ab5..73aec7bfd 100644 --- a/horizon/templates/horizon/common/_sidebar.html +++ b/horizon/templates/horizon/common/_sidebar.html @@ -1,5 +1,5 @@ {% load branding horizon i18n %} -<nav id='sidebar'> +<nav id="sidebar"> {% horizon_nav %} </nav> diff --git a/horizon/templates/horizon/common/_tab_group.html b/horizon/templates/horizon/common/_tab_group.html index 8f3aa47fe..05c062f82 100644 --- a/horizon/templates/horizon/common/_tab_group.html +++ b/horizon/templates/horizon/common/_tab_group.html @@ -6,7 +6,7 @@ <ul id="{{ tab_group.get_id }}" {{ tab_group.attr_string|safe }}> {% for tab in tabs %} <li {{ tab.attr_string|safe }}> - <a href="?{{ tab_group.param_name }}={{ tab.get_id }}" data-toggle="tab" data-target="#{{ tab.get_id }}" data-loaded='{{ tab.load|yesno:"true,false" }}'>{{ tab.name }}</a> + <a href="?{{ tab_group.param_name }}={{ tab.get_id }}" data-toggle="tab" data-target="#{{ tab.get_id }}" data-loaded="{{ tab.load|yesno:"true,false" }}">{{ tab.name }}</a> </li> {% endfor %} </ul> diff --git a/horizon/templates/horizon/jasmine/jasmine.html b/horizon/templates/horizon/jasmine/jasmine.html index 76573879a..05ddbe62c 100644 --- a/horizon/templates/horizon/jasmine/jasmine.html +++ b/horizon/templates/horizon/jasmine/jasmine.html @@ -27,7 +27,7 @@ <!-- source files --> {% for file in HORIZON_CONFIG.js_files %} - <script src='{{ STATIC_URL }}{{ file }}'></script> + <script src="{{ STATIC_URL }}{{ file }}"></script> {% endfor %} {% block source %} @@ -36,7 +36,7 @@ <!-- test files - mock and spec --> {% block spec %} {% for file in HORIZON_CONFIG.js_spec_files %} - <script src='{{ STATIC_URL }}{{ file }}'></script> + <script src="{{ STATIC_URL }}{{ file }}"></script> {% endfor %} {% endblock %} diff --git a/horizon/templates/horizon/jasmine/jasmine_legacy.html b/horizon/templates/horizon/jasmine/jasmine_legacy.html index a3a92c601..6d5232656 100644 --- a/horizon/templates/horizon/jasmine/jasmine_legacy.html +++ b/horizon/templates/horizon/jasmine/jasmine_legacy.html @@ -7,17 +7,17 @@ <script src="{{ STATIC_URL }}bootstrap/js/bootstrap.js"></script> <script src="{{ STATIC_URL }}horizon/lib/jquery/jquery.tablesorter.js"></script> <script src="{{ STATIC_URL }}horizon/lib/hogan.js"></script> - <script src='{{ STATIC_URL }}horizon/lib/jsencrypt/jsencrypt.js'></script> + <script src="{{ STATIC_URL }}horizon/lib/jsencrypt/jsencrypt.js"></script> <script src="{{ STATIC_URL }}horizon/js/horizon.templates.js"></script> <script src="{{ STATIC_URL }}horizon/js/horizon.instances.js"></script> - <script src='{{ STATIC_URL }}horizon/js/horizon.tabs.js'></script> - <script src='{{ STATIC_URL }}horizon/js/horizon.forms.js'></script> - <script src='{{ STATIC_URL }}horizon/js/horizon.formset_table.js'></script> - <script src='{{ STATIC_URL }}horizon/js/horizon.messages.js'></script> - <script src='{{ STATIC_URL }}horizon/js/horizon.modals.js'></script> - <script src='{{ STATIC_URL }}horizon/js/horizon.tables.js'></script> - <script src='{{ STATIC_URL }}horizon/js/horizon.quota.js'></script> - <script src='{{ STATIC_URL }}horizon/js/horizon.string.js'></script> + <script src="{{ STATIC_URL }}horizon/js/horizon.tabs.js"></script> + <script src="{{ STATIC_URL }}horizon/js/horizon.forms.js"></script> + <script src="{{ STATIC_URL }}horizon/js/horizon.formset_table.js"></script> + <script src="{{ STATIC_URL }}horizon/js/horizon.messages.js"></script> + <script src="{{ STATIC_URL }}horizon/js/horizon.modals.js"></script> + <script src="{{ STATIC_URL }}horizon/js/horizon.tables.js"></script> + <script src="{{ STATIC_URL }}horizon/js/horizon.quota.js"></script> + <script src="{{ STATIC_URL }}horizon/js/horizon.string.js"></script> {% include "horizon/client_side/templates.html" %} @@ -94,9 +94,9 @@ <table id="flavors" class= "table table-bordered table-striped datatable"> <thead> - <tr class='table_caption'> - <th class='table_header' colspan='8'> - <h3 class='table_title'>Flavors</h3> + <tr class="table_caption"> + <th class="table_header" colspan="8"> + <h3 class="table_title">Flavors</h3> <div class="table_actions clearfix"></div> </th> diff --git a/horizon/test/templates/base.html b/horizon/test/templates/base.html index d3379035e..4b516276b 100644 --- a/horizon/test/templates/base.html +++ b/horizon/test/templates/base.html @@ -8,15 +8,15 @@ window.STATIC_URL = '{{ STATIC_URL }}'; window.WEBROOT = '{{ WEBROOT }}'; </script> - <script src='{{ STATIC_URL }}horizon/lib/jquery/jquery.js' type='text/javascript' charset="utf-8"></script> - <script src='{{ STATIC_URL }}horizon/lib/jquery-ui/ui/jquery-ui.js' type='text/javascript' charset="utf-8"></script> - <script src='{{ STATIC_URL }}horizon/lib/jquery/jquery-migrate.js' type='text/javascript' charset="utf-8"></script> + <script src="{{ STATIC_URL }}horizon/lib/jquery/jquery.js" type="text/javascript" charset="utf-8"></script> + <script src="{{ STATIC_URL }}horizon/lib/jquery-ui/ui/jquery-ui.js" type="text/javascript" charset="utf-8"></script> + <script src="{{ STATIC_URL }}horizon/lib/jquery/jquery-migrate.js' type="text/javascript" charset="utf-8"></script> <script src="{{ STATIC_URL }}horizon/lib/jquery/jquery.tablesorter.js"></script> <script src="{{ STATIC_URL }}horizon/lib/angular/angular.js" type="text/javascript" charset="utf-8"></script> - <script src='{{ STATIC_URL }}horizon/js/horizon.js' type='text/javascript' charset='utf-8'></script> + <script src="{{ STATIC_URL }}horizon/js/horizon.js" type="text/javascript" charset="utf-8"></script> - <script type='text/javascript' charset='utf-8'> + <script type="text/javascript" charset="utf-8"> (function (global) { 'use strict'; @@ -63,9 +63,9 @@ <script src="{{ STATIC_URL }}horizon/lib/spin.js"></script> <script src="{{ STATIC_URL }}horizon/lib/spin.jquery.js"></script> - <script src='{{ STATIC_URL }}horizon/js/horizon.modals.js'></script> - <script src='{{ STATIC_URL }}horizon/js/horizon.tables.js'></script> - <script src='{{ STATIC_URL }}horizon/js/horizon.tabs.js'></script> + <script src="{{ STATIC_URL }}horizon/js/horizon.modals.js"></script> + <script src="{{ STATIC_URL }}horizon/js/horizon.tables.js"></script> + <script src="{{ STATIC_URL }}horizon/js/horizon.tabs.js"></script> <script> angular.module('test_app', []).run(updateHorizon); diff --git a/horizon/test/unit/tables/test_tables.py b/horizon/test/unit/tables/test_tables.py index d6b4581c2..8a82f9e7e 100644 --- a/horizon/test/unit/tables/test_tables.py +++ b/horizon/test/unit/tables/test_tables.py @@ -713,13 +713,13 @@ class DataTableTests(test.TestCase): self.assertContains(resp, update_string, 4) self.assertContains(resp, "data-update-interval", 4) # Verify no table heading - self.assertNotContains(resp, "<h3 class='table_title'") + self.assertNotContains(resp, '<h3 class="table_title"') # Verify our XSS protection self.assertContains(resp, '<strong>evil</strong>', 1) # Hidden Title = False shows the table title self.table._meta.hidden_title = False resp = http.HttpResponse(self.table.render()) - self.assertContains(resp, "<span class='table-title'>", 1) + self.assertContains(resp, '<span class="table-title">', 1) # Filter = False hides the search box self.table._meta.filter = False diff --git a/horizon/test/unit/templatetags/test_templatetags.py b/horizon/test/unit/templatetags/test_templatetags.py index f858e924c..2f3448b81 100644 --- a/horizon/test/unit/templatetags/test_templatetags.py +++ b/horizon/test/unit/templatetags/test_templatetags.py @@ -139,12 +139,12 @@ class TemplateTagTests(test.TestCase): text = "{% horizon_main_nav %}" expected = """ <div> - <ul class=\"nav nav-tabs\" role=\"tablist\"> + <ul class="nav nav-tabs" role="tablist"> <li> - <a href=\"/cats/\" tabindex='1'>Cats</a> + <a href="/cats/" tabindex="1">Cats</a> </li> <li> - <a href=\"/dogs/\" tabindex='1'>Dogs</a> + <a href="/dogs/" tabindex="1">Dogs</a> </li> </ul></div>""" |