From 92146772b677e9fce57cc11b4a4a1542a05c23b2 Mon Sep 17 00:00:00 2001 From: Jiri Tomasek Date: Wed, 2 Jul 2014 14:05:54 +0200 Subject: [PATCH] Update Twitter Bootstrap to version 3 Updated to bootstrap 3.2.0 back to v3.1.1 fix base-line-height variable Revamped grid system Replaced help-inline with help-block Change .control-group to .form-group Add column widths to horizontal form labels and .controls, remove .controls class Datepicker form fix Add btn-default to btn elements with no other color Topbar switcher fix Rename button sizes Replace alert-error with alert-danger Removed alert-block Alerts fixing Updated LinkAction and Action table actions to define icon, replaced btn-default icon with glyphicon Replaced icons with glyphicons, removed btn-icon styling from horizon.scss change Button Icons text in customizing docs Fixed table header Fix page_header h2 margin Nav accordion fix Tables fix Modal fixes added form-control class to input and selects Forms fixes Workflow modal fix Fix quota bar updated customizing docs removed unused styling from horizon.scss make datepicker form inline fix table filter styling added btn-danger to terminate instances button fixed loading spinner form fields and validations Created bootstrap_form_field filter and template to render bootstrap forms properly Style up the datepicker Fixed failing test cases Implements: blueprint bootstrap-update Change-Id: Ic826849be1af7fc6bf06f97dd7a60fc54b862148 --- doc/source/topics/customizing.rst | 45 +- doc/source/topics/tutorial.rst | 4 +- horizon/static/bootstrap/js/bootstrap.js | 2949 +++++++++-------- .../static/horizon/js/horizon.d3linechart.js | 16 +- .../static/horizon/js/horizon.firewalls.js | 4 +- horizon/static/horizon/js/horizon.forms.js | 16 +- .../horizon/js/horizon.formset_table.js | 2 +- .../static/horizon/js/horizon.instances.js | 16 +- horizon/static/horizon/js/horizon.messages.js | 2 +- horizon/static/horizon/js/horizon.modals.js | 24 +- horizon/static/horizon/js/horizon.tables.js | 2 +- horizon/static/horizon/js/horizon.users.js | 2 +- horizon/static/horizon/lib/angular/angular.js | 102 +- horizon/static/horizon/tests/messages.js | 4 +- horizon/tables/actions.py | 15 +- horizon/tables/formset.py | 2 +- horizon/templates/auth/_login.html | 8 +- horizon/templates/horizon/_messages.html | 8 +- .../horizon/client_side/_alert_message.html | 2 +- .../horizon/client_side/_loading.html | 10 +- .../templates/horizon/client_side/_modal.html | 26 +- .../horizon/common/_bootstrap_form_field.html | 59 + .../horizon/common/_data_table_cell.html | 4 +- .../common/_data_table_row_actions.html | 2 +- .../common/_data_table_table_action.html | 10 +- .../common/_data_table_table_actions.html | 11 +- .../horizon/common/_form_fields.html | 14 +- .../horizon/common/_formset_table.html | 2 +- .../horizon/common/_formset_table_row.html | 4 +- horizon/templates/horizon/common/_modal.html | 20 +- .../templates/horizon/common/_modal_form.html | 60 +- .../horizon/common/_usage_summary.html | 15 +- .../templates/horizon/common/_workflow.html | 86 +- .../common/_workflow_step_update_members.html | 4 +- horizon/templatetags/bootstrap_form_field.py | 47 + horizon/workflows/views.py | 2 +- .../dashboards/admin/aggregates/tables.py | 9 +- .../templates/aggregates/_update.html | 4 +- .../dashboards/admin/domains/tables.py | 9 +- .../dashboards/admin/flavors/extras/tables.py | 6 +- .../dashboards/admin/flavors/tables.py | 13 +- .../templates/flavors/extras/_create.html | 2 +- .../templates/flavors/extras/_edit.html | 2 +- .../templates/flavors/extras/_index.html | 2 +- .../dashboards/admin/groups/tables.py | 13 +- .../templates/groups/_add_non_member.html | 2 +- .../groups/templates/groups/_create.html | 2 +- .../groups/templates/groups/_update.html | 2 +- .../images/templates/images/_create.html | 2 +- .../images/templates/images/_update.html | 2 +- .../admin/info/templates/info/index.html | 4 +- .../templates/instances/_live_migrate.html | 2 +- .../metering/templates/metering/daily.html | 40 +- .../metering/templates/metering/index.html | 4 +- .../metering/templates/metering/report.html | 4 +- .../metering/templates/metering/stats.html | 60 +- .../dashboards/admin/networks/ports/tables.py | 6 +- .../admin/networks/subnets/tables.py | 6 +- .../dashboards/admin/networks/tables.py | 6 +- .../networks/templates/networks/_create.html | 2 +- .../networks/templates/networks/_update.html | 2 +- .../templates/networks/ports/_create.html | 2 +- .../templates/networks/ports/_update.html | 2 +- .../dashboards/admin/projects/tables.py | 14 +- .../dashboards/admin/projects/tests.py | 15 +- .../dashboards/admin/roles/tables.py | 6 +- .../admin/roles/templates/roles/_create.html | 2 +- .../admin/roles/templates/roles/_update.html | 2 +- .../routers/templates/routers/detail.html | 4 +- .../dashboards/admin/users/tables.py | 6 +- .../admin/users/templates/users/_create.html | 2 +- .../admin/users/templates/users/_update.html | 2 +- .../dashboards/admin/volumes/tables.py | 3 +- .../volumes/_create_volume_type.html | 2 +- .../volumes/templates/volumes/detail.html | 4 +- .../access_and_security/api_access/tables.py | 4 +- .../floating_ips/tables.py | 9 +- .../access_and_security/keypairs/tables.py | 6 +- .../security_groups/tables.py | 11 +- .../floating_ips/_allocate.html | 2 +- .../templates/access_and_security/index.html | 4 +- .../access_and_security/keypairs/_create.html | 2 +- .../access_and_security/keypairs/_import.html | 2 +- .../security_groups/_add_rule.html | 2 +- .../security_groups/_create.html | 2 +- .../security_groups/_update.html | 2 +- .../dashboards/project/containers/tables.py | 23 +- .../containers/_container_detail.html | 6 +- .../templates/containers/_copy.html | 2 +- .../templates/containers/_create.html | 2 +- .../containers/_create_pseudo_folder.html | 2 +- .../templates/containers/_object_detail.html | 6 +- .../templates/containers/_update.html | 2 +- .../templates/containers/_upload.html | 2 +- .../_details.html | 4 +- .../data_processing.data_plugins/details.html | 6 +- .../project/database_backups/tables.py | 9 +- .../templates/database_backups/details.html | 8 +- .../dashboards/project/databases/tables.py | 9 +- .../templates/databases/_detail_overview.html | 17 +- .../databases/templates/databases/detail.html | 4 +- .../dashboards/project/firewalls/tables.py | 6 +- .../firewalls/_firewall_details.html | 2 +- .../firewalls/_insert_rule_to_policy.html | 2 +- .../templates/firewalls/_policy_details.html | 2 +- .../firewalls/_remove_rule_from_policy.html | 2 +- .../templates/firewalls/_rule_details.html | 2 +- .../templates/firewalls/_updatefirewall.html | 2 +- .../templates/firewalls/_updatepolicy.html | 2 +- .../templates/firewalls/_updaterule.html | 2 +- .../templates/firewalls/details_tabs.html | 4 +- .../project/images/images/tables.py | 12 +- .../templates/images/images/_create.html | 2 +- .../images/images/_detail_overview.html | 6 +- .../templates/images/images/_update.html | 2 +- .../templates/images/images/detail.html | 4 +- .../templates/images/snapshots/_create.html | 2 +- .../dashboards/project/instances/tables.py | 21 +- .../templates/instances/_decryptpassword.html | 2 +- .../templates/instances/_detail_console.html | 4 +- .../templates/instances/_detail_log.html | 4 +- .../templates/instances/_detail_overview.html | 14 +- .../templates/instances/_rebuild.html | 2 +- .../instances/templates/instances/detail.html | 4 +- .../dashboards/project/instances/tests.py | 9 +- .../project/loadbalancers/tables.py | 18 +- .../loadbalancers/_member_details.html | 2 +- .../loadbalancers/_monitor_details.html | 2 +- .../loadbalancers/_pool_details.html | 2 +- .../loadbalancers/_updatemember.html | 4 +- .../loadbalancers/_updatemonitor.html | 2 +- .../templates/loadbalancers/_updatepool.html | 2 +- .../templates/loadbalancers/_updatevip.html | 2 +- .../templates/loadbalancers/_vip_details.html | 2 +- .../templates/loadbalancers/details_tabs.html | 4 +- .../network_topology/_create_router.html | 2 +- .../network_topology/_post_massage.html | 4 +- .../client_side/_balloon_container.html | 4 +- .../client_side/_balloon_port.html | 2 +- .../templates/network_topology/index.html | 8 +- .../project/networks/ports/tables.py | 3 +- .../project/networks/subnets/tables.py | 6 +- .../dashboards/project/networks/tables.py | 9 +- .../networks/templates/networks/_create.html | 2 +- .../networks/templates/networks/_update.html | 2 +- .../networks/ports/_detail_overview.html | 2 +- .../templates/networks/ports/_update.html | 2 +- .../templates/networks/ports/detail.html | 4 +- .../networks/subnets/_detail_overview.html | 2 +- .../templates/networks/subnets/detail.html | 4 +- .../dashboards/project/overview/tests.py | 8 +- .../routers/extensions/routerrules/tables.py | 3 +- .../project/routers/ports/tables.py | 3 +- .../dashboards/project/routers/tables.py | 6 +- .../routers/templates/routers/_create.html | 2 +- .../routers/templates/routers/detail.html | 4 +- .../extensions/routerrules/_create.html | 2 +- .../routers/extensions/routerrules/grid.html | 10 +- .../templates/routers/ports/_create.html | 2 +- .../templates/routers/ports/_setgateway.html | 2 +- .../dashboards/project/stacks/tables.py | 9 +- .../templates/stacks/_change_template.html | 2 +- .../stacks/templates/stacks/_create.html | 2 +- .../templates/stacks/_detail_overview.html | 10 +- .../templates/stacks/_resource_overview.html | 6 +- .../templates/stacks/_select_template.html | 2 +- .../stacks/templates/stacks/_update.html | 2 +- .../stacks/templates/stacks/detail.html | 4 +- .../stacks/templates/stacks/resource.html | 4 +- .../project/volumes/snapshots/tables.py | 6 +- .../volumes/templates/volumes/index.html | 4 +- .../volumes/snapshots/_detail_overview.html | 4 +- .../templates/volumes/snapshots/_update.html | 2 +- .../templates/volumes/snapshots/detail.html | 4 +- .../templates/volumes/volumes/_attach.html | 2 +- .../templates/volumes/volumes/_create.html | 2 +- .../volumes/volumes/_create_snapshot.html | 2 +- .../volumes/volumes/_detail_overview.html | 10 +- .../templates/volumes/volumes/_extend.html | 2 +- .../templates/volumes/volumes/_update.html | 2 +- .../templates/volumes/volumes/detail.html | 4 +- .../project/volumes/volumes/tables.py | 15 +- .../project/volumes/volumes/tests.py | 3 +- .../vpn/templates/vpn/_ikepolicy_details.html | 2 +- .../templates/vpn/_ipsecpolicy_details.html | 2 +- .../vpn/_ipsecsiteconnection_details.html | 2 +- .../vpn/templates/vpn/_update_ikepolicy.html | 4 +- .../templates/vpn/_update_ipsecpolicy.html | 4 +- .../vpn/_update_ipsecsiteconnection.html | 4 +- .../vpn/templates/vpn/_update_vpnservice.html | 4 +- .../templates/vpn/_vpnservice_details.html | 2 +- .../vpn/templates/vpn/details_tabs.html | 4 +- .../project/vpn/templates/vpn/index.html | 4 +- .../dashboards/router/nexus1000v/tables.py | 6 +- .../nexus1000v/_create_network_profile.html | 2 +- .../nexus1000v/_update_network_profile.html | 2 +- .../templates/nexus1000v/index.html | 4 +- .../password/templates/password/_change.html | 2 +- .../user/templates/user/_settings.html | 2 +- .../glyphicons-halflings-regular.eot | Bin 0 -> 20335 bytes .../glyphicons-halflings-regular.svg | 229 ++ .../glyphicons-halflings-regular.ttf | Bin 0 -> 41280 bytes .../glyphicons-halflings-regular.woff | Bin 0 -> 23320 bytes .../img/glyphicons-halflings-white.png | Bin 4352 -> 0 bytes .../bootstrap/img/glyphicons-halflings.png | Bin 4352 -> 0 bytes .../bootstrap/scss/_bootstrap-mincer.scss | 17 + .../bootstrap/scss/_bootstrap-responsive.scss | 318 -- .../static/bootstrap/scss/_bootstrap.scss | 63 - .../static/bootstrap/scss/bootstrap.scss | 50 + .../bootstrap/scss/bootstrap/_accordion.scss | 28 - .../bootstrap/scss/bootstrap/_alerts.scss | 101 +- .../bootstrap/scss/bootstrap/_badges.scss | 57 + .../scss/bootstrap/_breadcrumbs.scss | 38 +- .../scss/bootstrap/_button-groups.scss | 282 +- .../bootstrap/scss/bootstrap/_buttons.scss | 246 +- .../bootstrap/scss/bootstrap/_carousel.scss | 243 +- .../bootstrap/scss/bootstrap/_close.scss | 39 +- .../bootstrap/scss/bootstrap/_code.scss | 68 +- .../scss/bootstrap/_component-animations.scss | 33 +- .../bootstrap/scss/bootstrap/_dropdowns.scss | 262 +- .../bootstrap/scss/bootstrap/_forms.scss | 775 ++--- .../bootstrap/scss/bootstrap/_glyphicons.scss | 237 ++ .../bootstrap/scss/bootstrap/_grid.scss | 88 +- .../bootstrap/scss/bootstrap/_hero-unit.scss | 20 - .../scss/bootstrap/_input-groups.scss | 162 + .../bootstrap/scss/bootstrap/_jumbotron.scss | 48 + .../bootstrap/scss/bootstrap/_labels.scss | 76 +- .../bootstrap/scss/bootstrap/_layouts.scss | 17 - .../bootstrap/scss/bootstrap/_list-group.scss | 129 + .../bootstrap/scss/bootstrap/_media.scss | 56 + .../bootstrap/scss/bootstrap/_mixins.scss | 559 +--- .../bootstrap/scss/bootstrap/_modals.scss | 180 +- .../bootstrap/scss/bootstrap/_navbar.scss | 856 +++-- .../bootstrap/scss/bootstrap/_navs.scss | 507 ++- .../bootstrap/scss/bootstrap/_normalize.scss | 425 +++ .../bootstrap/scss/bootstrap/_pager.scss | 73 +- .../bootstrap/scss/bootstrap/_pagination.scss | 131 +- .../bootstrap/scss/bootstrap/_panels.scss | 240 ++ .../bootstrap/scss/bootstrap/_popovers.scss | 154 +- .../bootstrap/scss/bootstrap/_print.scss | 101 + .../scss/bootstrap/_progress-bars.scss | 112 +- .../bootstrap/scss/bootstrap/_reset.scss | 105 - .../scss/bootstrap/_responsive-embed.scss | 34 + .../scss/bootstrap/_responsive-utilities.scss | 173 + .../scss/bootstrap/_scaffolding.scss | 155 +- .../bootstrap/scss/bootstrap/_sprites.scss | 157 - .../bootstrap/scss/bootstrap/_tables.scss | 285 +- .../bootstrap/scss/bootstrap/_theme.scss | 247 ++ .../bootstrap/scss/bootstrap/_thumbnails.scss | 61 +- .../bootstrap/scss/bootstrap/_tooltip.scss | 96 +- .../bootstrap/scss/bootstrap/_type.scss | 379 ++- .../bootstrap/scss/bootstrap/_utilities.scss | 53 +- .../bootstrap/scss/bootstrap/_variables.scss | 928 +++++- .../bootstrap/scss/bootstrap/_wells.scss | 26 +- .../bootstrap/scss/bootstrap/bootstrap.scss | 50 + .../scss/bootstrap/mixins/_alerts.scss | 14 + .../bootstrap/mixins/_background-variant.scss | 11 + .../scss/bootstrap/mixins/_border-radius.scss | 18 + .../scss/bootstrap/mixins/_buttons.scss | 50 + .../scss/bootstrap/mixins/_center-block.scss | 7 + .../scss/bootstrap/mixins/_clearfix.scss | 22 + .../scss/bootstrap/mixins/_forms.scss | 84 + .../scss/bootstrap/mixins/_gradients.scss | 58 + .../bootstrap/mixins/_grid-framework.scss | 87 + .../scss/bootstrap/mixins/_grid.scss | 122 + .../scss/bootstrap/mixins/_hide-text.scss | 21 + .../scss/bootstrap/mixins/_image.scss | 33 + .../scss/bootstrap/mixins/_labels.scss | 12 + .../scss/bootstrap/mixins/_list-group.scss | 31 + .../scss/bootstrap/mixins/_nav-divider.scss | 10 + .../bootstrap/mixins/_nav-vertical-align.scss | 9 + .../scss/bootstrap/mixins/_opacity.scss | 8 + .../scss/bootstrap/mixins/_pagination.scss | 23 + .../scss/bootstrap/mixins/_panels.scss | 20 + .../scss/bootstrap/mixins/_progress-bar.scss | 8 + .../scss/bootstrap/mixins/_reset-filter.scss | 8 + .../scss/bootstrap/mixins/_resize.scss | 6 + .../mixins/_responsive-visibility.scss | 21 + .../scss/bootstrap/mixins/_size.scss | 10 + .../scss/bootstrap/mixins/_tab-focus.scss | 9 + .../scss/bootstrap/mixins/_table-row.scss | 28 + .../scss/bootstrap/mixins/_text-emphasis.scss | 11 + .../scss/bootstrap/mixins/_text-overflow.scss | 8 + .../bootstrap/mixins/_vendor-prefixes.scss | 224 ++ .../static/dashboard/scss/_accordion_nav.scss | 9 +- .../static/dashboard/scss/horizon.scss | 242 +- .../dashboard/scss/horizon_workflow.scss | 2 +- openstack_dashboard/templates/_header.html | 4 +- .../templates/plugin_panel/index.html | 4 +- openstack_dashboard/usage/tables.py | 2 +- 290 files changed, 9965 insertions(+), 5464 deletions(-) create mode 100644 horizon/templates/horizon/common/_bootstrap_form_field.html create mode 100644 horizon/templatetags/bootstrap_form_field.py create mode 100644 openstack_dashboard/static/bootstrap/fonts/bootstrap/glyphicons-halflings-regular.eot create mode 100644 openstack_dashboard/static/bootstrap/fonts/bootstrap/glyphicons-halflings-regular.svg create mode 100644 openstack_dashboard/static/bootstrap/fonts/bootstrap/glyphicons-halflings-regular.ttf create mode 100644 openstack_dashboard/static/bootstrap/fonts/bootstrap/glyphicons-halflings-regular.woff delete mode 100644 openstack_dashboard/static/bootstrap/img/glyphicons-halflings-white.png delete mode 100644 openstack_dashboard/static/bootstrap/img/glyphicons-halflings.png create mode 100644 openstack_dashboard/static/bootstrap/scss/_bootstrap-mincer.scss delete mode 100644 openstack_dashboard/static/bootstrap/scss/_bootstrap-responsive.scss delete mode 100644 openstack_dashboard/static/bootstrap/scss/_bootstrap.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap.scss delete mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/_accordion.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/_badges.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/_glyphicons.scss delete mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/_hero-unit.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/_input-groups.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/_jumbotron.scss delete mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/_layouts.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/_list-group.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/_media.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/_normalize.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/_panels.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/_print.scss delete mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/_reset.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/_responsive-embed.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/_responsive-utilities.scss delete mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/_sprites.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/_theme.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/bootstrap.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_alerts.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_background-variant.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_border-radius.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_buttons.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_center-block.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_clearfix.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_forms.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_gradients.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_grid-framework.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_grid.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_hide-text.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_image.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_labels.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_list-group.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_nav-divider.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_nav-vertical-align.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_opacity.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_pagination.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_panels.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_progress-bar.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_reset-filter.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_resize.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_responsive-visibility.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_size.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_tab-focus.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_table-row.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_text-emphasis.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_text-overflow.scss create mode 100644 openstack_dashboard/static/bootstrap/scss/bootstrap/mixins/_vendor-prefixes.scss diff --git a/doc/source/topics/customizing.rst b/doc/source/topics/customizing.rst index 0a2ab7cb02..dbf39e9a07 100644 --- a/doc/source/topics/customizing.rst +++ b/doc/source/topics/customizing.rst @@ -15,7 +15,7 @@ The file ``local_settings.py`` can be found at the Horizon directory path of Changing the Logo ================= -There are currently two places where the OpenStack logo is pulled in +There are currently two places where the OpenStack logo is pulled in through ``horizon.less``. The first is shown at the login screen and the other on top of the menu bar:: @@ -52,7 +52,7 @@ This allows for common site-customization requirements such as: To specify the python module containing your modifications, add the key ``customization_module`` to your ``HORIZON_CONFIG`` dictionary in -``local_settings.py``. The value should be a string containing the path to your +``local_settings.py``. The value should be a string containing the path to your module in dotted python path notation. Example:: HORIZON_CONFIG = { @@ -148,41 +148,16 @@ similar way, add the new column definition and then use the ``Meta`` Button Icons ============ -Horizon provides hooks for customizing the look and feel of each class of -button on the site. The following classes are used to identify each type of -button: +Horizon uses font icons (glyphicons) from Twitter Bootstrap to add icons to buttons. +Please see http://bootstrapdocs.com/v3.1.1/docs/components/#glyphicons for instructions +how to use icons in the code. -* Generic Classes - * btn-search - * btn-delete - * btn-upload - * btn-download - * btn-create - * btn-edit - * btn-list - * btn-copy - * btn-camera - * btn-stats - * btn-enable - * btn-disable +To add icon to Table Action, use icon property. Example: -* Floating IP-specific Classes - * btn-allocate - * btn-release - * btn-associate - * btn-disassociate - -* Instance-specific Classes - * btn-launch - * btn-terminate - * btn-reboot - * btn-pause - * btn-suspend - * btn-console - * btn-log - -* Volume-specific classes - * btn-detach + class CreateSnapshot(tables.LinkAction): + name = "snapshot" + verbose_name = _("Create Snapshot") + icon = "camera" Additionally, the site-wide default button classes can be configured by setting ``ACTION_CSS_CLASSES`` to a tuple of the classes you wish to appear diff --git a/doc/source/topics/tutorial.rst b/doc/source/topics/tutorial.rst index a466795471..5abe02aad2 100644 --- a/doc/source/topics/tutorial.rst +++ b/doc/source/topics/tutorial.rst @@ -411,8 +411,8 @@ dashboards:: {% endblock page_header %} {% block main %} -
-
+
+
{{ tab_group.render }}
diff --git a/horizon/static/bootstrap/js/bootstrap.js b/horizon/static/bootstrap/js/bootstrap.js index 4412304ebf..8ae571b6da 100644 --- a/horizon/static/bootstrap/js/bootstrap.js +++ b/horizon/static/bootstrap/js/bootstrap.js @@ -1,132 +1,126 @@ -/* =================================================== - * bootstrap-transition.js v2.0.1 - * http://twitter.github.com/bootstrap/javascript.html#transitions - * =================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ +/*! + * Bootstrap v3.1.1 (http://getbootstrap.com) + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ -!function( $ ) { +if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript requires jQuery') } - $(function () { - - "use strict" - - /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) - * ======================================================= */ - - $.support.transition = (function () { - var thisBody = document.body || document.documentElement - , thisStyle = thisBody.style - , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined - - return support && { - end: (function () { - var transitionEnd = "TransitionEnd" - if ( $.browser.webkit ) { - transitionEnd = "webkitTransitionEnd" - } else if ( $.browser.mozilla ) { - transitionEnd = "transitionend" - } else if ( $.browser.opera ) { - transitionEnd = "oTransitionEnd" - } - return transitionEnd - }()) - } - })() - - }) - -}( window.jQuery );/* ========================================================== - * bootstrap-alert.js v2.0.1 - * http://twitter.github.com/bootstrap/javascript.html#alerts - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ +/* ======================================================================== + * Bootstrap: transition.js v3.1.1 + * http://getbootstrap.com/javascript/#transitions + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ -!function( $ ){ ++function ($) { + 'use strict'; - "use strict" + // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/) + // ============================================================ - /* ALERT CLASS DEFINITION - * ====================== */ + function transitionEnd() { + var el = document.createElement('bootstrap') - var dismiss = '[data-dismiss="alert"]' - , Alert = function ( el ) { - $(el).on('click', dismiss, this.close) - } - - Alert.prototype = { - - constructor: Alert - - , close: function ( e ) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - $parent.trigger('close') - - e && e.preventDefault() - - $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - - $parent - .trigger('close') - .removeClass('in') - - function removeElement() { - $parent - .trigger('closed') - .remove() - } - - $.support.transition && $parent.hasClass('fade') ? - $parent.on($.support.transition.end, removeElement) : - removeElement() + var transEndEventNames = { + 'WebkitTransition' : 'webkitTransitionEnd', + 'MozTransition' : 'transitionend', + 'OTransition' : 'oTransitionEnd otransitionend', + 'transition' : 'transitionend' } + for (var name in transEndEventNames) { + if (el.style[name] !== undefined) { + return { end: transEndEventNames[name] } + } + } + + return false // explicit for ie8 ( ._.) + } + + // http://blog.alexmaccaw.com/css-transitions + $.fn.emulateTransitionEnd = function (duration) { + var called = false, $el = this + $(this).one($.support.transition.end, function () { called = true }) + var callback = function () { if (!called) $($el).trigger($.support.transition.end) } + setTimeout(callback, duration) + return this + } + + $(function () { + $.support.transition = transitionEnd() + }) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: alert.js v3.1.1 + * http://getbootstrap.com/javascript/#alerts + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // ALERT CLASS DEFINITION + // ====================== + + var dismiss = '[data-dismiss="alert"]' + var Alert = function (el) { + $(el).on('click', dismiss, this.close) + } + + Alert.prototype.close = function (e) { + var $this = $(this) + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 + } + + var $parent = $(selector) + + if (e) e.preventDefault() + + if (!$parent.length) { + $parent = $this.hasClass('alert') ? $this : $this.parent() + } + + $parent.trigger(e = $.Event('close.bs.alert')) + + if (e.isDefaultPrevented()) return + + $parent.removeClass('in') + + function removeElement() { + $parent.trigger('closed.bs.alert').remove() + } + + $.support.transition && $parent.hasClass('fade') ? + $parent + .one($.support.transition.end, removeElement) + .emulateTransitionEnd(150) : + removeElement() } - /* ALERT PLUGIN DEFINITION - * ======================= */ + // ALERT PLUGIN DEFINITION + // ======================= - $.fn.alert = function ( option ) { + var old = $.fn.alert + + $.fn.alert = function (option) { return this.each(function () { var $this = $(this) - , data = $this.data('alert') - if (!data) $this.data('alert', (data = new Alert(this))) + var data = $this.data('bs.alert') + + if (!data) $this.data('bs.alert', (data = new Alert(this))) if (typeof option == 'string') data[option].call($this) }) } @@ -134,479 +128,628 @@ $.fn.alert.Constructor = Alert - /* ALERT DATA-API - * ============== */ - - $(function () { - $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) - }) - -}( window.jQuery );/* ============================================================ - * bootstrap-button.js v2.0.1 - * http://twitter.github.com/bootstrap/javascript.html#buttons - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - -!function( $ ){ - - "use strict" - - /* BUTTON PUBLIC CLASS DEFINITION - * ============================== */ - - var Button = function ( element, options ) { - this.$element = $(element) - this.options = $.extend({}, $.fn.button.defaults, options) - } - - Button.prototype = { - - constructor: Button - - , setState: function ( state ) { - var d = 'disabled' - , $el = this.$element - , data = $el.data() - , val = $el.is('input') ? 'val' : 'html' - - state = state + 'Text' - data.resetText || $el.data('resetText', $el[val]()) - - $el[val](data[state] || this.options[state]) - - // push to event loop to allow forms to submit - setTimeout(function () { - state == 'loadingText' ? - $el.addClass(d).attr(d, d) : - $el.removeClass(d).removeAttr(d) - }, 0) - } - - , toggle: function () { - var $parent = this.$element.parent('[data-toggle="buttons-radio"]') - - $parent && $parent - .find('.active') - .removeClass('active') - - this.$element.toggleClass('active') - } + // ALERT NO CONFLICT + // ================= + $.fn.alert.noConflict = function () { + $.fn.alert = old + return this } - /* BUTTON PLUGIN DEFINITION - * ======================== */ + // ALERT DATA-API + // ============== - $.fn.button = function ( option ) { + $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: button.js v3.1.1 + * http://getbootstrap.com/javascript/#buttons + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // BUTTON PUBLIC CLASS DEFINITION + // ============================== + + var Button = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, Button.DEFAULTS, options) + this.isLoading = false + } + + Button.DEFAULTS = { + loadingText: 'loading...' + } + + Button.prototype.setState = function (state) { + var d = 'disabled' + var $el = this.$element + var val = $el.is('input') ? 'val' : 'html' + var data = $el.data() + + state = state + 'Text' + + if (!data.resetText) $el.data('resetText', $el[val]()) + + $el[val](data[state] || this.options[state]) + + // push to event loop to allow forms to submit + setTimeout($.proxy(function () { + if (state == 'loadingText') { + this.isLoading = true + $el.addClass(d).attr(d, d) + } else if (this.isLoading) { + this.isLoading = false + $el.removeClass(d).removeAttr(d) + } + }, this), 0) + } + + Button.prototype.toggle = function () { + var changed = true + var $parent = this.$element.closest('[data-toggle="buttons"]') + + if ($parent.length) { + var $input = this.$element.find('input') + if ($input.prop('type') == 'radio') { + if ($input.prop('checked') && this.$element.hasClass('active')) changed = false + else $parent.find('.active').removeClass('active') + } + if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change') + } + + if (changed) this.$element.toggleClass('active') + } + + + // BUTTON PLUGIN DEFINITION + // ======================== + + var old = $.fn.button + + $.fn.button = function (option) { return this.each(function () { - var $this = $(this) - , data = $this.data('button') - , options = typeof option == 'object' && option - if (!data) $this.data('button', (data = new Button(this, options))) + var $this = $(this) + var data = $this.data('bs.button') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.button', (data = new Button(this, options))) + if (option == 'toggle') data.toggle() else if (option) data.setState(option) }) } - $.fn.button.defaults = { - loadingText: 'loading...' - } - $.fn.button.Constructor = Button - /* BUTTON DATA-API - * =============== */ + // BUTTON NO CONFLICT + // ================== - $(function () { - $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) { - var $btn = $(e.target) - if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') - $btn.button('toggle') - }) - }) - -}( window.jQuery );/* ========================================================== - * bootstrap-carousel.js v2.0.1 - * http://twitter.github.com/bootstrap/javascript.html#carousel - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function( $ ){ - - "use strict" - - /* CAROUSEL CLASS DEFINITION - * ========================= */ - - var Carousel = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.carousel.defaults, options) - this.options.slide && this.slide(this.options.slide) + $.fn.button.noConflict = function () { + $.fn.button = old + return this } - Carousel.prototype = { - cycle: function () { - this.interval = setInterval($.proxy(this.next, this), this.options.interval) - return this + // BUTTON DATA-API + // =============== + + $(document).on('click.bs.button.data-api', '[data-toggle^=button]', function (e) { + var $btn = $(e.target) + if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') + $btn.button('toggle') + e.preventDefault() + }) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: carousel.js v3.1.1 + * http://getbootstrap.com/javascript/#carousel + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // CAROUSEL CLASS DEFINITION + // ========================= + + var Carousel = function (element, options) { + this.$element = $(element) + this.$indicators = this.$element.find('.carousel-indicators') + this.options = options + this.paused = + this.sliding = + this.interval = + this.$active = + this.$items = null + + this.options.pause == 'hover' && this.$element + .on('mouseenter', $.proxy(this.pause, this)) + .on('mouseleave', $.proxy(this.cycle, this)) + } + + Carousel.DEFAULTS = { + interval: 5000, + pause: 'hover', + wrap: true + } + + Carousel.prototype.cycle = function (e) { + e || (this.paused = false) + + this.interval && clearInterval(this.interval) + + this.options.interval + && !this.paused + && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) + + return this + } + + Carousel.prototype.getActiveIndex = function () { + this.$active = this.$element.find('.item.active') + this.$items = this.$active.parent().children() + + return this.$items.index(this.$active) + } + + Carousel.prototype.to = function (pos) { + var that = this + var activeIndex = this.getActiveIndex() + + if (pos > (this.$items.length - 1) || pos < 0) return + + if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) + if (activeIndex == pos) return this.pause().cycle() + + return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) + } + + Carousel.prototype.pause = function (e) { + e || (this.paused = true) + + if (this.$element.find('.next, .prev').length && $.support.transition) { + this.$element.trigger($.support.transition.end) + this.cycle(true) } - , to: function (pos) { - var $active = this.$element.find('.active') - , children = $active.parent().children() - , activePos = children.index($active) - , that = this + this.interval = clearInterval(this.interval) - if (pos > (children.length - 1) || pos < 0) return + return this + } - if (this.sliding) { - return this.$element.one('slid', function () { - that.to(pos) - }) - } + Carousel.prototype.next = function () { + if (this.sliding) return + return this.slide('next') + } - if (activePos == pos) { - return this.pause().cycle() - } + Carousel.prototype.prev = function () { + if (this.sliding) return + return this.slide('prev') + } - return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) + Carousel.prototype.slide = function (type, next) { + var $active = this.$element.find('.item.active') + var $next = next || $active[type]() + var isCycling = this.interval + var direction = type == 'next' ? 'left' : 'right' + var fallback = type == 'next' ? 'first' : 'last' + var that = this + + if (!$next.length) { + if (!this.options.wrap) return + $next = this.$element.find('.item')[fallback]() } - , pause: function () { - clearInterval(this.interval) - this.interval = null - return this + if ($next.hasClass('active')) return this.sliding = false + + var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction }) + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + + this.sliding = true + + isCycling && this.pause() + + if (this.$indicators.length) { + this.$indicators.find('.active').removeClass('active') + this.$element.one('slid.bs.carousel', function () { + var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()]) + $nextIndicator && $nextIndicator.addClass('active') + }) } - , next: function () { - if (this.sliding) return - return this.slide('next') - } - - , prev: function () { - if (this.sliding) return - return this.slide('prev') - } - - , slide: function (type, next) { - var $active = this.$element.find('.active') - , $next = next || $active[type]() - , isCycling = this.interval - , direction = type == 'next' ? 'left' : 'right' - , fallback = type == 'next' ? 'first' : 'last' - , that = this - - if (!$next.length) return - - this.sliding = true - - isCycling && this.pause() - - $next = $next.length ? $next : this.$element.find('.item')[fallback]() - - if (!$.support.transition && this.$element.hasClass('slide')) { - this.$element.trigger('slide') - $active.removeClass('active') - $next.addClass('active') - this.sliding = false - this.$element.trigger('slid') - } else { - $next.addClass(type) - $next[0].offsetWidth // force reflow - $active.addClass(direction) - $next.addClass(direction) - this.$element.trigger('slide') - this.$element.one($.support.transition.end, function () { + if ($.support.transition && this.$element.hasClass('slide')) { + $next.addClass(type) + $next[0].offsetWidth // force reflow + $active.addClass(direction) + $next.addClass(direction) + $active + .one($.support.transition.end, function () { $next.removeClass([type, direction].join(' ')).addClass('active') $active.removeClass(['active', direction].join(' ')) that.sliding = false - setTimeout(function () { that.$element.trigger('slid') }, 0) + setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0) }) - } - - isCycling && this.cycle() - - return this + .emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000) + } else { + $active.removeClass('active') + $next.addClass('active') + this.sliding = false + this.$element.trigger('slid.bs.carousel') } + isCycling && this.cycle() + + return this } - /* CAROUSEL PLUGIN DEFINITION - * ========================== */ + // CAROUSEL PLUGIN DEFINITION + // ========================== - $.fn.carousel = function ( option ) { + var old = $.fn.carousel + + $.fn.carousel = function (option) { return this.each(function () { - var $this = $(this) - , data = $this.data('carousel') - , options = typeof option == 'object' && option - if (!data) $this.data('carousel', (data = new Carousel(this, options))) - if (typeof option == 'number') data.to(option) - else if (typeof option == 'string' || (option = options.slide)) data[option]() - else data.cycle() - }) - } + var $this = $(this) + var data = $this.data('bs.carousel') + var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option) + var action = typeof option == 'string' ? option : options.slide - $.fn.carousel.defaults = { - interval: 5000 + if (!data) $this.data('bs.carousel', (data = new Carousel(this, options))) + if (typeof option == 'number') data.to(option) + else if (action) data[action]() + else if (options.interval) data.pause().cycle() + }) } $.fn.carousel.Constructor = Carousel - /* CAROUSEL DATA-API - * ================= */ + // CAROUSEL NO CONFLICT + // ==================== - $(function () { - $('body').on('click.carousel.data-api', '[data-slide]', function ( e ) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data()) - $target.carousel(options) - e.preventDefault() + $.fn.carousel.noConflict = function () { + $.fn.carousel = old + return this + } + + + // CAROUSEL DATA-API + // ================= + + $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { + var $this = $(this), href + var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + var options = $.extend({}, $target.data(), $this.data()) + var slideIndex = $this.attr('data-slide-to') + if (slideIndex) options.interval = false + + $target.carousel(options) + + if (slideIndex = $this.attr('data-slide-to')) { + $target.data('bs.carousel').to(slideIndex) + } + + e.preventDefault() + }) + + $(window).on('load', function () { + $('[data-ride="carousel"]').each(function () { + var $carousel = $(this) + $carousel.carousel($carousel.data()) }) }) -}( window.jQuery );/* ============================================================= - * bootstrap-collapse.js v2.0.1 - * http://twitter.github.com/bootstrap/javascript.html#collapse - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ +}(jQuery); -!function( $ ){ +/* ======================================================================== + * Bootstrap: collapse.js v3.1.1 + * http://getbootstrap.com/javascript/#collapse + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ - "use strict" - var Collapse = function ( element, options ) { - this.$element = $(element) - this.options = $.extend({}, $.fn.collapse.defaults, options) ++function ($) { + 'use strict'; - if (this.options["parent"]) { - this.$parent = $(this.options["parent"]) - } + // COLLAPSE PUBLIC CLASS DEFINITION + // ================================ - this.options.toggle && this.toggle() + var Collapse = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, Collapse.DEFAULTS, options) + this.transitioning = null + + if (this.options.parent) this.$parent = $(this.options.parent) + if (this.options.toggle) this.toggle() } - Collapse.prototype = { - - constructor: Collapse - - , dimension: function () { - var hasWidth = this.$element.hasClass('width') - return hasWidth ? 'width' : 'height' - } - - , show: function () { - var dimension = this.dimension() - , scroll = $.camelCase(['scroll', dimension].join('-')) - , actives = this.$parent && this.$parent.find('.in') - , hasData - - if (actives && actives.length) { - hasData = actives.data('collapse') - actives.collapse('hide') - hasData || actives.data('collapse', null) - } - - this.$element[dimension](0) - this.transition('addClass', 'show', 'shown') - this.$element[dimension](this.$element[0][scroll]) - - } - - , hide: function () { - var dimension = this.dimension() - this.reset(this.$element[dimension]()) - this.transition('removeClass', 'hide', 'hidden') - this.$element[dimension](0) - } - - , reset: function ( size ) { - var dimension = this.dimension() - - this.$element - .removeClass('collapse') - [dimension](size || 'auto') - [0].offsetWidth - - this.$element.addClass('collapse') - } - - , transition: function ( method, startEvent, completeEvent ) { - var that = this - , complete = function () { - if (startEvent == 'show') that.reset() - that.$element.trigger(completeEvent) - } - - this.$element - .trigger(startEvent) - [method]('in') - - $.support.transition && this.$element.hasClass('collapse') ? - this.$element.one($.support.transition.end, complete) : - complete() - } - - , toggle: function () { - this[this.$element.hasClass('in') ? 'hide' : 'show']() - } - + Collapse.DEFAULTS = { + toggle: true } - /* COLLAPSIBLE PLUGIN DEFINITION - * ============================== */ + Collapse.prototype.dimension = function () { + var hasWidth = this.$element.hasClass('width') + return hasWidth ? 'width' : 'height' + } - $.fn.collapse = function ( option ) { + Collapse.prototype.show = function () { + if (this.transitioning || this.$element.hasClass('in')) return + + var startEvent = $.Event('show.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + + var actives = this.$parent && this.$parent.find('> .panel > .in') + + if (actives && actives.length) { + var hasData = actives.data('bs.collapse') + if (hasData && hasData.transitioning) return + actives.collapse('hide') + hasData || actives.data('bs.collapse', null) + } + + var dimension = this.dimension() + + this.$element + .removeClass('collapse') + .addClass('collapsing') + [dimension](0) + + this.transitioning = 1 + + var complete = function () { + this.$element + .removeClass('collapsing') + .addClass('collapse in') + [dimension]('auto') + this.transitioning = 0 + this.$element.trigger('shown.bs.collapse') + } + + if (!$.support.transition) return complete.call(this) + + var scrollSize = $.camelCase(['scroll', dimension].join('-')) + + this.$element + .one($.support.transition.end, $.proxy(complete, this)) + .emulateTransitionEnd(350) + [dimension](this.$element[0][scrollSize]) + } + + Collapse.prototype.hide = function () { + if (this.transitioning || !this.$element.hasClass('in')) return + + var startEvent = $.Event('hide.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + + var dimension = this.dimension() + + this.$element + [dimension](this.$element[dimension]()) + [0].offsetHeight + + this.$element + .addClass('collapsing') + .removeClass('collapse') + .removeClass('in') + + this.transitioning = 1 + + var complete = function () { + this.transitioning = 0 + this.$element + .trigger('hidden.bs.collapse') + .removeClass('collapsing') + .addClass('collapse') + } + + if (!$.support.transition) return complete.call(this) + + this.$element + [dimension](0) + .one($.support.transition.end, $.proxy(complete, this)) + .emulateTransitionEnd(350) + } + + Collapse.prototype.toggle = function () { + this[this.$element.hasClass('in') ? 'hide' : 'show']() + } + + + // COLLAPSE PLUGIN DEFINITION + // ========================== + + var old = $.fn.collapse + + $.fn.collapse = function (option) { return this.each(function () { - var $this = $(this) - , data = $this.data('collapse') - , options = typeof option == 'object' && option - if (!data) $this.data('collapse', (data = new Collapse(this, options))) + var $this = $(this) + var data = $this.data('bs.collapse') + var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) + + if (!data && options.toggle && option == 'show') option = !option + if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) if (typeof option == 'string') data[option]() }) } - $.fn.collapse.defaults = { - toggle: true - } - $.fn.collapse.Constructor = Collapse - /* COLLAPSIBLE DATA-API - * ==================== */ + // COLLAPSE NO CONFLICT + // ==================== - $(function () { - $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) { - var $this = $(this), href - , target = $this.attr('data-target') - || e.preventDefault() - || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 - , option = $(target).data('collapse') ? 'toggle' : $this.data() - $(target).collapse(option) - }) - }) - -}( window.jQuery );/* ============================================================ - * bootstrap-dropdown.js v2.0.1 - * http://twitter.github.com/bootstrap/javascript.html#dropdowns - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ + $.fn.collapse.noConflict = function () { + $.fn.collapse = old + return this + } -!function( $ ){ + // COLLAPSE DATA-API + // ================= - "use strict" + $(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) { + var $this = $(this), href + var target = $this.attr('data-target') + || e.preventDefault() + || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 + var $target = $(target) + var data = $target.data('bs.collapse') + var option = data ? 'toggle' : $this.data() + var parent = $this.attr('data-parent') + var $parent = parent && $(parent) - /* DROPDOWN CLASS DEFINITION - * ========================= */ - - var toggle = '[data-toggle="dropdown"]' - , Dropdown = function ( element ) { - var $el = $(element).on('click.dropdown.data-api', this.toggle) - $('html').on('click.dropdown.data-api', function () { - $el.parent().removeClass('open') - }) - } - - Dropdown.prototype = { - - constructor: Dropdown - - , toggle: function ( e ) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent - , isActive - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - $parent.length || ($parent = $this.parent()) - - isActive = $parent.hasClass('open') - - clearMenus() - !isActive && $parent.toggleClass('open') - - return false + if (!data || !data.transitioning) { + if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed') + $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed') } + $target.collapse(option) + }) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: dropdown.js v3.1.1 + * http://getbootstrap.com/javascript/#dropdowns + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // DROPDOWN CLASS DEFINITION + // ========================= + + var backdrop = '.dropdown-backdrop' + var toggle = '[data-toggle=dropdown]' + var Dropdown = function (element) { + $(element).on('click.bs.dropdown', this.toggle) } - function clearMenus() { - $(toggle).parent().removeClass('open') + Dropdown.prototype.toggle = function (e) { + var $this = $(this) + + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + clearMenus() + + if (!isActive) { + if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) { + // if mobile we use a backdrop because click events don't delegate + $('
').insertAfter($(this)).on('click', clearMenus) + } + + var relatedTarget = { relatedTarget: this } + $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget)) + + if (e.isDefaultPrevented()) return + + $parent + .toggleClass('open') + .trigger('shown.bs.dropdown', relatedTarget) + + $this.focus() + } + + return false + } + + Dropdown.prototype.keydown = function (e) { + if (!/(38|40|27)/.test(e.keyCode)) return + + var $this = $(this) + + e.preventDefault() + e.stopPropagation() + + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + if (!isActive || (isActive && e.keyCode == 27)) { + if (e.which == 27) $parent.find(toggle).focus() + return $this.click() + } + + var desc = ' li:not(.divider):visible a' + var $items = $parent.find('[role=menu]' + desc + ', [role=listbox]' + desc) + + if (!$items.length) return + + var index = $items.index($items.filter(':focus')) + + if (e.keyCode == 38 && index > 0) index-- // up + if (e.keyCode == 40 && index < $items.length - 1) index++ // down + if (!~index) index = 0 + + $items.eq(index).focus() + } + + function clearMenus(e) { + $(backdrop).remove() + $(toggle).each(function () { + var $parent = getParent($(this)) + var relatedTarget = { relatedTarget: this } + if (!$parent.hasClass('open')) return + $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget)) + if (e.isDefaultPrevented()) return + $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget) + }) + } + + function getParent($this) { + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + var $parent = selector && $(selector) + + return $parent && $parent.length ? $parent : $this.parent() } - /* DROPDOWN PLUGIN DEFINITION - * ========================== */ + // DROPDOWN PLUGIN DEFINITION + // ========================== - $.fn.dropdown = function ( option ) { + var old = $.fn.dropdown + + $.fn.dropdown = function (option) { return this.each(function () { var $this = $(this) - , data = $this.data('dropdown') - if (!data) $this.data('dropdown', (data = new Dropdown(this))) + var data = $this.data('bs.dropdown') + + if (!data) $this.data('bs.dropdown', (data = new Dropdown(this))) if (typeof option == 'string') data[option].call($this) }) } @@ -614,138 +757,176 @@ $.fn.dropdown.Constructor = Dropdown - /* APPLY TO STANDARD DROPDOWN ELEMENTS - * =================================== */ - - $(function () { - $('html').on('click.dropdown.data-api', clearMenus) - $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) - }) - -}( window.jQuery );/* ========================================================= - * bootstrap-modal.js v2.0.1 - * http://twitter.github.com/bootstrap/javascript.html#modals - * ========================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================= */ - - -!function( $ ){ - - "use strict" - - /* MODAL CLASS DEFINITION - * ====================== */ - - var Modal = function ( content, options ) { - this.options = options - this.$element = $(content) - .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) - } - - Modal.prototype = { - - constructor: Modal - - , toggle: function () { - return this[!this.isShown ? 'show' : 'hide']() - } - - , show: function () { - var that = this - - if (this.isShown) return - - $('body').addClass('modal-open') - - this.isShown = true - this.$element.trigger('show') - - escape.call(this) - backdrop.call(this, function () { - var transition = $.support.transition && that.$element.hasClass('fade') - - !that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position - - that.$element - .show() - - if (transition) { - that.$element[0].offsetWidth // force reflow - } - - that.$element.addClass('in') - - transition ? - that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) : - that.$element.trigger('shown') - - }) - } - - , hide: function ( e ) { - e && e.preventDefault() - - if (!this.isShown) return - - var that = this - this.isShown = false - - $('body').removeClass('modal-open') - - escape.call(this) - - this.$element - .trigger('hide') - .removeClass('in') - - $.support.transition && this.$element.hasClass('fade') ? - hideWithTransition.call(this) : - hideModal.call(this) - } + // DROPDOWN NO CONFLICT + // ==================== + $.fn.dropdown.noConflict = function () { + $.fn.dropdown = old + return this } - /* MODAL PRIVATE METHODS - * ===================== */ + // APPLY TO STANDARD DROPDOWN ELEMENTS + // =================================== - function hideWithTransition() { + $(document) + .on('click.bs.dropdown.data-api', clearMenus) + .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) + .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle) + .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu], [role=listbox]', Dropdown.prototype.keydown) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: modal.js v3.1.1 + * http://getbootstrap.com/javascript/#modals + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // MODAL CLASS DEFINITION + // ====================== + + var Modal = function (element, options) { + this.options = options + this.$element = $(element) + this.$backdrop = + this.isShown = null + + if (this.options.remote) { + this.$element + .find('.modal-content') + .load(this.options.remote, $.proxy(function () { + this.$element.trigger('loaded.bs.modal') + }, this)) + } + } + + Modal.DEFAULTS = { + backdrop: true, + keyboard: true, + show: true + } + + Modal.prototype.toggle = function (_relatedTarget) { + return this[!this.isShown ? 'show' : 'hide'](_relatedTarget) + } + + Modal.prototype.show = function (_relatedTarget) { var that = this - , timeout = setTimeout(function () { - that.$element.off($.support.transition.end) - hideModal.call(that) - }, 500) + var e = $.Event('show.bs.modal', { relatedTarget: _relatedTarget }) - this.$element.one($.support.transition.end, function () { - clearTimeout(timeout) - hideModal.call(that) + this.$element.trigger(e) + + if (this.isShown || e.isDefaultPrevented()) return + + this.isShown = true + + this.escape() + + this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this)) + + this.backdrop(function () { + var transition = $.support.transition && that.$element.hasClass('fade') + + if (!that.$element.parent().length) { + that.$element.appendTo(document.body) // don't move modals dom position + } + + that.$element + .show() + .scrollTop(0) + + if (transition) { + that.$element[0].offsetWidth // force reflow + } + + that.$element + .addClass('in') + .attr('aria-hidden', false) + + that.enforceFocus() + + var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget }) + + transition ? + that.$element.find('.modal-dialog') // wait for modal to slide in + .one($.support.transition.end, function () { + that.$element.focus().trigger(e) + }) + .emulateTransitionEnd(300) : + that.$element.focus().trigger(e) }) } - function hideModal( that ) { - this.$element - .hide() - .trigger('hidden') + Modal.prototype.hide = function (e) { + if (e) e.preventDefault() - backdrop.call(this) + e = $.Event('hide.bs.modal') + + this.$element.trigger(e) + + if (!this.isShown || e.isDefaultPrevented()) return + + this.isShown = false + + this.escape() + + $(document).off('focusin.bs.modal') + + this.$element + .removeClass('in') + .attr('aria-hidden', true) + .off('click.dismiss.bs.modal') + + $.support.transition && this.$element.hasClass('fade') ? + this.$element + .one($.support.transition.end, $.proxy(this.hideModal, this)) + .emulateTransitionEnd(300) : + this.hideModal() } - function backdrop( callback ) { + Modal.prototype.enforceFocus = function () { + $(document) + .off('focusin.bs.modal') // guard against infinite focus loop + .on('focusin.bs.modal', $.proxy(function (e) { + if (this.$element[0] !== e.target && !this.$element.has(e.target).length) { + this.$element.focus() + } + }, this)) + } + + Modal.prototype.escape = function () { + if (this.isShown && this.options.keyboard) { + this.$element.on('keyup.dismiss.bs.modal', $.proxy(function (e) { + e.which == 27 && this.hide() + }, this)) + } else if (!this.isShown) { + this.$element.off('keyup.dismiss.bs.modal') + } + } + + Modal.prototype.hideModal = function () { var that = this - , animate = this.$element.hasClass('fade') ? 'fade' : '' + this.$element.hide() + this.backdrop(function () { + that.removeBackdrop() + that.$element.trigger('hidden.bs.modal') + }) + } + + Modal.prototype.removeBackdrop = function () { + this.$backdrop && this.$backdrop.remove() + this.$backdrop = null + } + + Modal.prototype.backdrop = function (callback) { + var animate = this.$element.hasClass('fade') ? 'fade' : '' if (this.isShown && this.options.backdrop) { var doAnimate = $.support.transition && animate @@ -753,683 +934,858 @@ this.$backdrop = $('
') .appendTo(document.body) - if (this.options.backdrop != 'static') { - this.$backdrop.click($.proxy(this.hide, this)) - } + this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) { + if (e.target !== e.currentTarget) return + this.options.backdrop == 'static' + ? this.$element[0].focus.call(this.$element[0]) + : this.hide.call(this) + }, this)) if (doAnimate) this.$backdrop[0].offsetWidth // force reflow this.$backdrop.addClass('in') + if (!callback) return + doAnimate ? - this.$backdrop.one($.support.transition.end, callback) : + this.$backdrop + .one($.support.transition.end, callback) + .emulateTransitionEnd(150) : callback() } else if (!this.isShown && this.$backdrop) { this.$backdrop.removeClass('in') - $.support.transition && this.$element.hasClass('fade')? - this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop, this)) : - removeBackdrop.call(this) + $.support.transition && this.$element.hasClass('fade') ? + this.$backdrop + .one($.support.transition.end, callback) + .emulateTransitionEnd(150) : + callback() } else if (callback) { callback() } } - function removeBackdrop() { - this.$backdrop.remove() - this.$backdrop = null - } - function escape() { - var that = this - if (this.isShown && this.options.keyboard) { - $(document).on('keyup.dismiss.modal', function ( e ) { - e.which == 27 && that.hide() - }) - } else if (!this.isShown) { - $(document).off('keyup.dismiss.modal') - } - } + // MODAL PLUGIN DEFINITION + // ======================= + var old = $.fn.modal - /* MODAL PLUGIN DEFINITION - * ======================= */ - - $.fn.modal = function ( option ) { + $.fn.modal = function (option, _relatedTarget) { return this.each(function () { - var $this = $(this) - , data = $this.data('modal') - , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option) - if (!data) $this.data('modal', (data = new Modal(this, options))) - if (typeof option == 'string') data[option]() - else if (options.show) data.show() - }) - } + var $this = $(this) + var data = $this.data('bs.modal') + var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option) - $.fn.modal.defaults = { - backdrop: true - , keyboard: true - , show: true + if (!data) $this.data('bs.modal', (data = new Modal(this, options))) + if (typeof option == 'string') data[option](_relatedTarget) + else if (options.show) data.show(_relatedTarget) + }) } $.fn.modal.Constructor = Modal - /* MODAL DATA-API - * ============== */ + // MODAL NO CONFLICT + // ================= - $(function () { - $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data()) + $.fn.modal.noConflict = function () { + $.fn.modal = old + return this + } - e.preventDefault() - $target.modal(option) - }) + + // MODAL DATA-API + // ============== + + $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) { + var $this = $(this) + var href = $this.attr('href') + var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 + var option = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()) + + if ($this.is('a')) e.preventDefault() + + $target + .modal(option, this) + .one('hide', function () { + $this.is(':visible') && $this.focus() + }) }) -}( window.jQuery );/* =========================================================== - * bootstrap-tooltip.js v2.0.1 - * http://twitter.github.com/bootstrap/javascript.html#tooltips + $(document) + .on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') }) + .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') }) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: tooltip.js v3.1.1 + * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ -!function( $ ) { - "use strict" ++function ($) { + 'use strict'; - /* TOOLTIP PUBLIC CLASS DEFINITION - * =============================== */ + // TOOLTIP PUBLIC CLASS DEFINITION + // =============================== + + var Tooltip = function (element, options) { + this.type = + this.options = + this.enabled = + this.timeout = + this.hoverState = + this.$element = null - var Tooltip = function ( element, options ) { this.init('tooltip', element, options) } - Tooltip.prototype = { + Tooltip.DEFAULTS = { + animation: true, + placement: 'top', + selector: false, + template: '
', + trigger: 'hover focus', + title: '', + delay: 0, + html: false, + container: false + } - constructor: Tooltip + Tooltip.prototype.init = function (type, element, options) { + this.enabled = true + this.type = type + this.$element = $(element) + this.options = this.getOptions(options) - , init: function ( type, element, options ) { - var eventIn - , eventOut + var triggers = this.options.trigger.split(' ') - this.type = type - this.$element = $(element) - this.options = this.getOptions(options) - this.enabled = true + for (var i = triggers.length; i--;) { + var trigger = triggers[i] - if (this.options.trigger != 'manual') { - eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus' - eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur' - this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this)) - } + if (trigger == 'click') { + this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) + } else if (trigger != 'manual') { + var eventIn = trigger == 'hover' ? 'mouseenter' : 'focusin' + var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout' - this.options.selector ? - (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : - this.fixTitle() - } - - , getOptions: function ( options ) { - options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data()) - - if (options.delay && typeof options.delay == 'number') { - options.delay = { - show: options.delay - , hide: options.delay - } - } - - return options - } - - , enter: function ( e ) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (!self.options.delay || !self.options.delay.show) { - self.show() - } else { - self.hoverState = 'in' - setTimeout(function() { - if (self.hoverState == 'in') { - self.show() - } - }, self.options.delay.show) + this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) + this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) } } - , leave: function ( e ) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) + this.options.selector ? + (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : + this.fixTitle() + } - if (!self.options.delay || !self.options.delay.hide) { - self.hide() - } else { - self.hoverState = 'out' - setTimeout(function() { - if (self.hoverState == 'out') { - self.hide() - } - }, self.options.delay.hide) + Tooltip.prototype.getDefaults = function () { + return Tooltip.DEFAULTS + } + + Tooltip.prototype.getOptions = function (options) { + options = $.extend({}, this.getDefaults(), this.$element.data(), options) + + if (options.delay && typeof options.delay == 'number') { + options.delay = { + show: options.delay, + hide: options.delay } } - , show: function () { - var $tip - , inside - , pos - , actualWidth - , actualHeight - , placement - , tp + return options + } - if (this.hasContent() && this.enabled) { - $tip = this.tip() - this.setContent() + Tooltip.prototype.getDelegateOptions = function () { + var options = {} + var defaults = this.getDefaults() - if (this.options.animation) { - $tip.addClass('fade') - } + this._options && $.each(this._options, function (key, value) { + if (defaults[key] != value) options[key] = value + }) - placement = typeof this.options.placement == 'function' ? - this.options.placement.call(this, $tip[0], this.$element[0]) : - this.options.placement + return options + } - inside = /in/.test(placement) + Tooltip.prototype.enter = function (obj) { + var self = obj instanceof this.constructor ? + obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) - $tip - .remove() - .css({ top: 0, left: 0, display: 'block' }) - .appendTo(inside ? this.$element : document.body) + clearTimeout(self.timeout) - pos = this.getPosition(inside) + self.hoverState = 'in' - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight + if (!self.options.delay || !self.options.delay.show) return self.show() - switch (inside ? placement.split(' ')[1] : placement) { - case 'bottom': - tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'top': - tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'left': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} - break - case 'right': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} - break - } + self.timeout = setTimeout(function () { + if (self.hoverState == 'in') self.show() + }, self.options.delay.show) + } - $tip - .css(tp) - .addClass(placement) - .addClass('in') - } - } + Tooltip.prototype.leave = function (obj) { + var self = obj instanceof this.constructor ? + obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) + + clearTimeout(self.timeout) + + self.hoverState = 'out' + + if (!self.options.delay || !self.options.delay.hide) return self.hide() + + self.timeout = setTimeout(function () { + if (self.hoverState == 'out') self.hide() + }, self.options.delay.hide) + } + + Tooltip.prototype.show = function () { + var e = $.Event('show.bs.' + this.type) + + if (this.hasContent() && this.enabled) { + this.$element.trigger(e) + + if (e.isDefaultPrevented()) return + var that = this; - , setContent: function () { var $tip = this.tip() - $tip.find('.tooltip-inner').html(this.getTitle()) - $tip.removeClass('fade in top bottom left right') - } - , hide: function () { - var that = this - , $tip = this.tip() + this.setContent() - $tip.removeClass('in') + if (this.options.animation) $tip.addClass('fade') - function removeWithAnimation() { - var timeout = setTimeout(function () { - $tip.off($.support.transition.end).remove() - }, 500) + var placement = typeof this.options.placement == 'function' ? + this.options.placement.call(this, $tip[0], this.$element[0]) : + this.options.placement - $tip.one($.support.transition.end, function () { - clearTimeout(timeout) - $tip.remove() - }) + var autoToken = /\s?auto?\s?/i + var autoPlace = autoToken.test(placement) + if (autoPlace) placement = placement.replace(autoToken, '') || 'top' + + $tip + .detach() + .css({ top: 0, left: 0, display: 'block' }) + .addClass(placement) + + this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) + + var pos = this.getPosition() + var actualWidth = $tip[0].offsetWidth + var actualHeight = $tip[0].offsetHeight + + if (autoPlace) { + var $parent = this.$element.parent() + + var orgPlacement = placement + var docScroll = document.documentElement.scrollTop || document.body.scrollTop + var parentWidth = this.options.container == 'body' ? window.innerWidth : $parent.outerWidth() + var parentHeight = this.options.container == 'body' ? window.innerHeight : $parent.outerHeight() + var parentLeft = this.options.container == 'body' ? 0 : $parent.offset().left + + placement = placement == 'bottom' && pos.top + pos.height + actualHeight - docScroll > parentHeight ? 'top' : + placement == 'top' && pos.top - docScroll - actualHeight < 0 ? 'bottom' : + placement == 'right' && pos.right + actualWidth > parentWidth ? 'left' : + placement == 'left' && pos.left - actualWidth < parentLeft ? 'right' : + placement + + $tip + .removeClass(orgPlacement) + .addClass(placement) + } + + var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) + + this.applyPlacement(calculatedOffset, placement) + this.hoverState = null + + var complete = function() { + that.$element.trigger('shown.bs.' + that.type) } $.support.transition && this.$tip.hasClass('fade') ? - removeWithAnimation() : - $tip.remove() + $tip + .one($.support.transition.end, complete) + .emulateTransitionEnd(150) : + complete() } + } - , fixTitle: function () { - var $e = this.$element - if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { - $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title') + Tooltip.prototype.applyPlacement = function (offset, placement) { + var replace + var $tip = this.tip() + var width = $tip[0].offsetWidth + var height = $tip[0].offsetHeight + + // manually read margins because getBoundingClientRect includes difference + var marginTop = parseInt($tip.css('margin-top'), 10) + var marginLeft = parseInt($tip.css('margin-left'), 10) + + // we must check for NaN for ie 8/9 + if (isNaN(marginTop)) marginTop = 0 + if (isNaN(marginLeft)) marginLeft = 0 + + offset.top = offset.top + marginTop + offset.left = offset.left + marginLeft + + // $.fn.offset doesn't round pixel values + // so we use setOffset directly with our own function B-0 + $.offset.setOffset($tip[0], $.extend({ + using: function (props) { + $tip.css({ + top: Math.round(props.top), + left: Math.round(props.left) + }) } + }, offset), 0) + + $tip.addClass('in') + + // check to see if placing tip in new offset caused the tip to resize itself + var actualWidth = $tip[0].offsetWidth + var actualHeight = $tip[0].offsetHeight + + if (placement == 'top' && actualHeight != height) { + replace = true + offset.top = offset.top + height - actualHeight } - , hasContent: function () { - return this.getTitle() - } + if (/bottom|top/.test(placement)) { + var delta = 0 - , getPosition: function (inside) { - return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { - width: this.$element[0].offsetWidth - , height: this.$element[0].offsetHeight - }) - } + if (offset.left < 0) { + delta = offset.left * -2 + offset.left = 0 - , getTitle: function () { - var title - , $e = this.$element - , o = this.options + $tip.offset(offset) - title = $e.attr('data-original-title') - || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - - title = title.toString().replace(/(^\s*|\s*$)/, "") - - return title - } - - , tip: function () { - return this.$tip = this.$tip || $(this.options.template) - } - - , validate: function () { - if (!this.$element[0].parentNode) { - this.hide() - this.$element = null - this.options = null + actualWidth = $tip[0].offsetWidth + actualHeight = $tip[0].offsetHeight } + + this.replaceArrow(delta - width + actualWidth, actualWidth, 'left') + } else { + this.replaceArrow(actualHeight - height, actualHeight, 'top') } - , enable: function () { - this.enabled = true + if (replace) $tip.offset(offset) + } + + Tooltip.prototype.replaceArrow = function (delta, dimension, position) { + this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + '%') : '') + } + + Tooltip.prototype.setContent = function () { + var $tip = this.tip() + var title = this.getTitle() + + $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) + $tip.removeClass('fade in top bottom left right') + } + + Tooltip.prototype.hide = function () { + var that = this + var $tip = this.tip() + var e = $.Event('hide.bs.' + this.type) + + function complete() { + if (that.hoverState != 'in') $tip.detach() + that.$element.trigger('hidden.bs.' + that.type) } - , disable: function () { - this.enabled = false - } + this.$element.trigger(e) - , toggleEnabled: function () { - this.enabled = !this.enabled - } + if (e.isDefaultPrevented()) return - , toggle: function () { - this[this.tip().hasClass('in') ? 'hide' : 'show']() - } + $tip.removeClass('in') + $.support.transition && this.$tip.hasClass('fade') ? + $tip + .one($.support.transition.end, complete) + .emulateTransitionEnd(150) : + complete() + + this.hoverState = null + + return this + } + + Tooltip.prototype.fixTitle = function () { + var $e = this.$element + if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { + $e.attr('data-original-title', $e.attr('title') || '').attr('title', '') + } + } + + Tooltip.prototype.hasContent = function () { + return this.getTitle() + } + + Tooltip.prototype.getPosition = function () { + var el = this.$element[0] + return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : { + width: el.offsetWidth, + height: el.offsetHeight + }, this.$element.offset()) + } + + Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) { + return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : + placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : + placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } : + /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } + } + + Tooltip.prototype.getTitle = function () { + var title + var $e = this.$element + var o = this.options + + title = $e.attr('data-original-title') + || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) + + return title + } + + Tooltip.prototype.tip = function () { + return this.$tip = this.$tip || $(this.options.template) + } + + Tooltip.prototype.arrow = function () { + return this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow') + } + + Tooltip.prototype.validate = function () { + if (!this.$element[0].parentNode) { + this.hide() + this.$element = null + this.options = null + } + } + + Tooltip.prototype.enable = function () { + this.enabled = true + } + + Tooltip.prototype.disable = function () { + this.enabled = false + } + + Tooltip.prototype.toggleEnabled = function () { + this.enabled = !this.enabled + } + + Tooltip.prototype.toggle = function (e) { + var self = e ? $(e.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) : this + self.tip().hasClass('in') ? self.leave(self) : self.enter(self) + } + + Tooltip.prototype.destroy = function () { + clearTimeout(this.timeout) + this.hide().$element.off('.' + this.type).removeData('bs.' + this.type) } - /* TOOLTIP PLUGIN DEFINITION - * ========================= */ + // TOOLTIP PLUGIN DEFINITION + // ========================= - $.fn.tooltip = function ( option ) { + var old = $.fn.tooltip + + $.fn.tooltip = function (option) { return this.each(function () { - var $this = $(this) - , data = $this.data('tooltip') - , options = typeof option == 'object' && option - if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) + var $this = $(this) + var data = $this.data('bs.tooltip') + var options = typeof option == 'object' && option + + if (!data && option == 'destroy') return + if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) if (typeof option == 'string') data[option]() }) } $.fn.tooltip.Constructor = Tooltip - $.fn.tooltip.defaults = { - animation: true - , delay: 0 - , selector: false - , placement: 'top' - , trigger: 'hover' - , title: '' - , template: '
' + + // TOOLTIP NO CONFLICT + // =================== + + $.fn.tooltip.noConflict = function () { + $.fn.tooltip = old + return this } -}( window.jQuery );/* =========================================================== - * bootstrap-popover.js v2.0.1 - * http://twitter.github.com/bootstrap/javascript.html#popovers - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * =========================================================== */ +}(jQuery); + +/* ======================================================================== + * Bootstrap: popover.js v3.1.1 + * http://getbootstrap.com/javascript/#popovers + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ -!function( $ ) { ++function ($) { + 'use strict'; - "use strict" + // POPOVER PUBLIC CLASS DEFINITION + // =============================== - var Popover = function ( element, options ) { + var Popover = function (element, options) { this.init('popover', element, options) } - /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js - ========================================== */ - - Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, { - - constructor: Popover - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - , content = this.getContent() - - $tip.find('.popover-title')[ $.type(title) == 'object' ? 'append' : 'html' ](title) - $tip.find('.popover-content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content) - - $tip.removeClass('fade top bottom left right in') - } - - , hasContent: function () { - return this.getTitle() || this.getContent() - } - - , getContent: function () { - var content - , $e = this.$element - , o = this.options - - content = $e.attr('data-content') - || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) - - content = content.toString().replace(/(^\s*|\s*$)/, "") - - return content - } - - , tip: function() { - if (!this.$tip) { - this.$tip = $(this.options.template) - } - return this.$tip - } + if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') + Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, { + placement: 'right', + trigger: 'click', + content: '', + template: '

' }) - /* POPOVER PLUGIN DEFINITION - * ======================= */ + // NOTE: POPOVER EXTENDS tooltip.js + // ================================ - $.fn.popover = function ( option ) { + Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype) + + Popover.prototype.constructor = Popover + + Popover.prototype.getDefaults = function () { + return Popover.DEFAULTS + } + + Popover.prototype.setContent = function () { + var $tip = this.tip() + var title = this.getTitle() + var content = this.getContent() + + $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) + $tip.find('.popover-content')[ // we use append for html objects to maintain js events + this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text' + ](content) + + $tip.removeClass('fade top bottom left right in') + + // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do + // this manually by checking the contents. + if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide() + } + + Popover.prototype.hasContent = function () { + return this.getTitle() || this.getContent() + } + + Popover.prototype.getContent = function () { + var $e = this.$element + var o = this.options + + return $e.attr('data-content') + || (typeof o.content == 'function' ? + o.content.call($e[0]) : + o.content) + } + + Popover.prototype.arrow = function () { + return this.$arrow = this.$arrow || this.tip().find('.arrow') + } + + Popover.prototype.tip = function () { + if (!this.$tip) this.$tip = $(this.options.template) + return this.$tip + } + + + // POPOVER PLUGIN DEFINITION + // ========================= + + var old = $.fn.popover + + $.fn.popover = function (option) { return this.each(function () { - var $this = $(this) - , data = $this.data('popover') - , options = typeof option == 'object' && option - if (!data) $this.data('popover', (data = new Popover(this, options))) + var $this = $(this) + var data = $this.data('bs.popover') + var options = typeof option == 'object' && option + + if (!data && option == 'destroy') return + if (!data) $this.data('bs.popover', (data = new Popover(this, options))) if (typeof option == 'string') data[option]() }) } $.fn.popover.Constructor = Popover - $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { - placement: 'right' - , content: '' - , template: '

' - }) -}( window.jQuery );/* ============================================================= - * bootstrap-scrollspy.js v2.0.1 - * http://twitter.github.com/bootstrap/javascript.html#scrollspy - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================== */ + // POPOVER NO CONFLICT + // =================== -!function ( $ ) { + $.fn.popover.noConflict = function () { + $.fn.popover = old + return this + } - "use strict" +}(jQuery); - /* SCROLLSPY CLASS DEFINITION - * ========================== */ +/* ======================================================================== + * Bootstrap: scrollspy.js v3.1.1 + * http://getbootstrap.com/javascript/#scrollspy + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ - function ScrollSpy( element, options) { - var process = $.proxy(this.process, this) - , $element = $(element).is('body') ? $(window) : $(element) - , href - this.options = $.extend({}, $.fn.scrollspy.defaults, options) - this.$scrollElement = $element.on('scroll.scroll.data-api', process) - this.selector = (this.options.target + ++function ($) { + 'use strict'; + + // SCROLLSPY CLASS DEFINITION + // ========================== + + function ScrollSpy(element, options) { + var href + var process = $.proxy(this.process, this) + + this.$element = $(element).is('body') ? $(window) : $(element) + this.$body = $('body') + this.$scrollElement = this.$element.on('scroll.bs.scroll-spy.data-api', process) + this.options = $.extend({}, ScrollSpy.DEFAULTS, options) + this.selector = (this.options.target || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 || '') + ' .nav li > a' - this.$body = $('body').on('click.scroll.data-api', this.selector, process) + this.offsets = $([]) + this.targets = $([]) + this.activeTarget = null + this.refresh() this.process() } - ScrollSpy.prototype = { + ScrollSpy.DEFAULTS = { + offset: 10 + } - constructor: ScrollSpy + ScrollSpy.prototype.refresh = function () { + var offsetMethod = this.$element[0] == window ? 'offset' : 'position' - , refresh: function () { - this.targets = this.$body - .find(this.selector) - .map(function () { - var href = $(this).attr('href') - return /^#\w/.test(href) && $(href).length ? href : null - }) + this.offsets = $([]) + this.targets = $([]) - this.offsets = $.map(this.targets, function (id) { - return $(id).position().top - }) - } + var self = this + var $targets = this.$body + .find(this.selector) + .map(function () { + var $el = $(this) + var href = $el.data('target') || $el.attr('href') + var $href = /^#./.test(href) && $(href) - , process: function () { - var scrollTop = this.$scrollElement.scrollTop() + this.options.offset - , offsets = this.offsets - , targets = this.targets - , activeTarget = this.activeTarget - , i + return ($href + && $href.length + && $href.is(':visible') + && [[ $href[offsetMethod]().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null + }) + .sort(function (a, b) { return a[0] - b[0] }) + .each(function () { + self.offsets.push(this[0]) + self.targets.push(this[1]) + }) + } - for (i = offsets.length; i--;) { - activeTarget != targets[i] - && scrollTop >= offsets[i] - && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) - && this.activate( targets[i] ) - } - } + ScrollSpy.prototype.process = function () { + var scrollTop = this.$scrollElement.scrollTop() + this.options.offset + var scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight + var maxScroll = scrollHeight - this.$scrollElement.height() + var offsets = this.offsets + var targets = this.targets + var activeTarget = this.activeTarget + var i - , activate: function (target) { - var active + if (scrollTop >= maxScroll) { + return activeTarget != (i = targets.last()[0]) && this.activate(i) + } - this.activeTarget = target + if (activeTarget && scrollTop <= offsets[0]) { + return activeTarget != (i = targets[0]) && this.activate(i) + } - this.$body - .find(this.selector).parent('.active') - .removeClass('active') + for (i = offsets.length; i--;) { + activeTarget != targets[i] + && scrollTop >= offsets[i] + && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) + && this.activate( targets[i] ) + } + } - active = this.$body - .find(this.selector + '[href="' + target + '"]') - .parent('li') - .addClass('active') + ScrollSpy.prototype.activate = function (target) { + this.activeTarget = target - if ( active.parent('.dropdown-menu') ) { - active.closest('li.dropdown').addClass('active') - } - } + $(this.selector) + .parentsUntil(this.options.target, '.active') + .removeClass('active') + var selector = this.selector + + '[data-target="' + target + '"],' + + this.selector + '[href="' + target + '"]' + + var active = $(selector) + .parents('li') + .addClass('active') + + if (active.parent('.dropdown-menu').length) { + active = active + .closest('li.dropdown') + .addClass('active') + } + + active.trigger('activate.bs.scrollspy') } - /* SCROLLSPY PLUGIN DEFINITION - * =========================== */ + // SCROLLSPY PLUGIN DEFINITION + // =========================== - $.fn.scrollspy = function ( option ) { + var old = $.fn.scrollspy + + $.fn.scrollspy = function (option) { return this.each(function () { - var $this = $(this) - , data = $this.data('scrollspy') - , options = typeof option == 'object' && option - if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options))) + var $this = $(this) + var data = $this.data('bs.scrollspy') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options))) if (typeof option == 'string') data[option]() }) } $.fn.scrollspy.Constructor = ScrollSpy - $.fn.scrollspy.defaults = { - offset: 10 + + // SCROLLSPY NO CONFLICT + // ===================== + + $.fn.scrollspy.noConflict = function () { + $.fn.scrollspy = old + return this } - /* SCROLLSPY DATA-API - * ================== */ + // SCROLLSPY DATA-API + // ================== - $(function () { + $(window).on('load', function () { $('[data-spy="scroll"]').each(function () { var $spy = $(this) $spy.scrollspy($spy.data()) }) }) -}( window.jQuery );/* ======================================================== - * bootstrap-tab.js v2.0.1 - * http://twitter.github.com/bootstrap/javascript.html#tabs - * ======================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ======================================================== */ +}(jQuery); + +/* ======================================================================== + * Bootstrap: tab.js v3.1.1 + * http://getbootstrap.com/javascript/#tabs + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ -!function( $ ){ ++function ($) { + 'use strict'; - "use strict" + // TAB CLASS DEFINITION + // ==================== - /* TAB CLASS DEFINITION - * ==================== */ - - var Tab = function ( element ) { + var Tab = function (element) { this.element = $(element) } - Tab.prototype = { + Tab.prototype.show = function () { + var $this = this.element + var $ul = $this.closest('ul:not(.dropdown-menu)') + var selector = $this.data('target') - constructor: Tab + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } - , show: function () { - var $this = this.element - , $ul = $this.closest('ul:not(.dropdown-menu)') - , selector = $this.attr('data-target') - , previous - , $target + if ($this.parent('li').hasClass('active')) return - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } + var previous = $ul.find('.active:last a')[0] + var e = $.Event('show.bs.tab', { + relatedTarget: previous + }) - if ( $this.parent('li').hasClass('active') ) return + $this.trigger(e) - previous = $ul.find('.active a').last()[0] + if (e.isDefaultPrevented()) return + var $target = $(selector) + + this.activate($this.parent('li'), $ul) + this.activate($target, $target.parent(), function () { $this.trigger({ - type: 'show' - , relatedTarget: previous + type: 'shown.bs.tab', + relatedTarget: previous }) + }) + } - $target = $(selector) + Tab.prototype.activate = function (element, container, callback) { + var $active = container.find('> .active') + var transition = callback + && $.support.transition + && $active.hasClass('fade') - this.activate($this.parent('li'), $ul) - this.activate($target, $target.parent(), function () { - $this.trigger({ - type: 'shown' - , relatedTarget: previous - }) - }) - } + function next() { + $active + .removeClass('active') + .find('> .dropdown-menu > .active') + .removeClass('active') - , activate: function ( element, container, callback) { - var $active = container.find('> .active') - , transition = callback - && $.support.transition - && $active.hasClass('fade') + element.addClass('active') - function next() { - $active - .removeClass('active') - .find('> .dropdown-menu > .active') - .removeClass('active') - - element.addClass('active') - - if (transition) { - element[0].offsetWidth // reflow for transition - element.addClass('in') - } else { - element.removeClass('fade') - } - - if ( element.parent('.dropdown-menu') ) { - element.closest('li.dropdown').addClass('active') - } - - callback && callback() + if (transition) { + element[0].offsetWidth // reflow for transition + element.addClass('in') + } else { + element.removeClass('fade') } - transition ? - $active.one($.support.transition.end, next) : - next() + if (element.parent('.dropdown-menu')) { + element.closest('li.dropdown').addClass('active') + } - $active.removeClass('in') + callback && callback() } + + transition ? + $active + .one($.support.transition.end, next) + .emulateTransitionEnd(150) : + next() + + $active.removeClass('in') } - /* TAB PLUGIN DEFINITION - * ===================== */ + // TAB PLUGIN DEFINITION + // ===================== + + var old = $.fn.tab $.fn.tab = function ( option ) { return this.each(function () { var $this = $(this) - , data = $this.data('tab') - if (!data) $this.data('tab', (data = new Tab(this))) + var data = $this.data('bs.tab') + + if (!data) $this.data('bs.tab', (data = new Tab(this))) if (typeof option == 'string') data[option]() }) } @@ -1437,284 +1793,159 @@ $.fn.tab.Constructor = Tab - /* TAB DATA-API - * ============ */ + // TAB NO CONFLICT + // =============== - $(function () { - $('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { - e.preventDefault() - $(this).tab('show') - }) + $.fn.tab.noConflict = function () { + $.fn.tab = old + return this + } + + + // TAB DATA-API + // ============ + + $(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { + e.preventDefault() + $(this).tab('show') }) -}( window.jQuery );/* ============================================================= - * bootstrap-typeahead.js v2.0.1 - * http://twitter.github.com/bootstrap/javascript.html#typeahead - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ +}(jQuery); -!function( $ ){ +/* ======================================================================== + * Bootstrap: affix.js v3.1.1 + * http://getbootstrap.com/javascript/#affix + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ - "use strict" - var Typeahead = function ( element, options ) { - this.$element = $(element) - this.options = $.extend({}, $.fn.typeahead.defaults, options) - this.matcher = this.options.matcher || this.matcher - this.sorter = this.options.sorter || this.sorter - this.highlighter = this.options.highlighter || this.highlighter - this.$menu = $(this.options.menu).appendTo('body') - this.source = this.options.source - this.shown = false - this.listen() ++function ($) { + 'use strict'; + + // AFFIX CLASS DEFINITION + // ====================== + + var Affix = function (element, options) { + this.options = $.extend({}, Affix.DEFAULTS, options) + this.$window = $(window) + .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this)) + .on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this)) + + this.$element = $(element) + this.affixed = + this.unpin = + this.pinnedOffset = null + + this.checkPosition() } - Typeahead.prototype = { - - constructor: Typeahead - - , select: function () { - var val = this.$menu.find('.active').attr('data-value') - this.$element.val(val) - return this.hide() - } - - , show: function () { - var pos = $.extend({}, this.$element.offset(), { - height: this.$element[0].offsetHeight - }) - - this.$menu.css({ - top: pos.top + pos.height - , left: pos.left - }) - - this.$menu.show() - this.shown = true - return this - } - - , hide: function () { - this.$menu.hide() - this.shown = false - return this - } - - , lookup: function (event) { - var that = this - , items - , q - - this.query = this.$element.val() - - if (!this.query) { - return this.shown ? this.hide() : this - } - - items = $.grep(this.source, function (item) { - if (that.matcher(item)) return item - }) - - items = this.sorter(items) - - if (!items.length) { - return this.shown ? this.hide() : this - } - - return this.render(items.slice(0, this.options.items)).show() - } - - , matcher: function (item) { - return ~item.toLowerCase().indexOf(this.query.toLowerCase()) - } - - , sorter: function (items) { - var beginswith = [] - , caseSensitive = [] - , caseInsensitive = [] - , item - - while (item = items.shift()) { - if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item) - else if (~item.indexOf(this.query)) caseSensitive.push(item) - else caseInsensitive.push(item) - } - - return beginswith.concat(caseSensitive, caseInsensitive) - } - - , highlighter: function (item) { - return item.replace(new RegExp('(' + this.query + ')', 'ig'), function ($1, match) { - return '' + match + '' - }) - } - - , render: function (items) { - var that = this - - items = $(items).map(function (i, item) { - i = $(that.options.item).attr('data-value', item) - i.find('a').html(that.highlighter(item)) - return i[0] - }) - - items.first().addClass('active') - this.$menu.html(items) - return this - } - - , next: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , next = active.next() - - if (!next.length) { - next = $(this.$menu.find('li')[0]) - } - - next.addClass('active') - } - - , prev: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , prev = active.prev() - - if (!prev.length) { - prev = this.$menu.find('li').last() - } - - prev.addClass('active') - } - - , listen: function () { - this.$element - .on('blur', $.proxy(this.blur, this)) - .on('keypress', $.proxy(this.keypress, this)) - .on('keyup', $.proxy(this.keyup, this)) - - if ($.browser.webkit || $.browser.msie) { - this.$element.on('keydown', $.proxy(this.keypress, this)) - } - - this.$menu - .on('click', $.proxy(this.click, this)) - .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) - } - - , keyup: function (e) { - e.stopPropagation() - e.preventDefault() - - switch(e.keyCode) { - case 40: // down arrow - case 38: // up arrow - break - - case 9: // tab - case 13: // enter - if (!this.shown) return - this.select() - break - - case 27: // escape - this.hide() - break - - default: - this.lookup() - } + Affix.RESET = 'affix affix-top affix-bottom' + Affix.DEFAULTS = { + offset: 0 } - , keypress: function (e) { - e.stopPropagation() - if (!this.shown) return + Affix.prototype.getPinnedOffset = function () { + if (this.pinnedOffset) return this.pinnedOffset + this.$element.removeClass(Affix.RESET).addClass('affix') + var scrollTop = this.$window.scrollTop() + var position = this.$element.offset() + return (this.pinnedOffset = position.top - scrollTop) + } - switch(e.keyCode) { - case 9: // tab - case 13: // enter - case 27: // escape - e.preventDefault() - break + Affix.prototype.checkPositionWithEventLoop = function () { + setTimeout($.proxy(this.checkPosition, this), 1) + } - case 38: // up arrow - e.preventDefault() - this.prev() - break + Affix.prototype.checkPosition = function () { + if (!this.$element.is(':visible')) return - case 40: // down arrow - e.preventDefault() - this.next() - break - } + var scrollHeight = $(document).height() + var scrollTop = this.$window.scrollTop() + var position = this.$element.offset() + var offset = this.options.offset + var offsetTop = offset.top + var offsetBottom = offset.bottom + + if (this.affixed == 'top') position.top += scrollTop + + if (typeof offset != 'object') offsetBottom = offsetTop = offset + if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element) + if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element) + + var affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? false : + offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' : + offsetTop != null && (scrollTop <= offsetTop) ? 'top' : false + + if (this.affixed === affix) return + if (this.unpin) this.$element.css('top', '') + + var affixType = 'affix' + (affix ? '-' + affix : '') + var e = $.Event(affixType + '.bs.affix') + + this.$element.trigger(e) + + if (e.isDefaultPrevented()) return + + this.affixed = affix + this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null + + this.$element + .removeClass(Affix.RESET) + .addClass(affixType) + .trigger($.Event(affixType.replace('affix', 'affixed'))) + + if (affix == 'bottom') { + this.$element.offset({ top: scrollHeight - offsetBottom - this.$element.height() }) } - - , blur: function (e) { - var that = this - e.stopPropagation() - e.preventDefault() - setTimeout(function () { that.hide() }, 150) - } - - , click: function (e) { - e.stopPropagation() - e.preventDefault() - this.select() - } - - , mouseenter: function (e) { - this.$menu.find('.active').removeClass('active') - $(e.currentTarget).addClass('active') - } - } - /* TYPEAHEAD PLUGIN DEFINITION - * =========================== */ + // AFFIX PLUGIN DEFINITION + // ======================= - $.fn.typeahead = function ( option ) { + var old = $.fn.affix + + $.fn.affix = function (option) { return this.each(function () { - var $this = $(this) - , data = $this.data('typeahead') - , options = typeof option == 'object' && option - if (!data) $this.data('typeahead', (data = new Typeahead(this, options))) + var $this = $(this) + var data = $this.data('bs.affix') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.affix', (data = new Affix(this, options))) if (typeof option == 'string') data[option]() }) } - $.fn.typeahead.defaults = { - source: [] - , items: 8 - , menu: '
    ' - , item: '
    • ' + $.fn.affix.Constructor = Affix + + + // AFFIX NO CONFLICT + // ================= + + $.fn.affix.noConflict = function () { + $.fn.affix = old + return this } - $.fn.typeahead.Constructor = Typeahead + // AFFIX DATA-API + // ============== - /* TYPEAHEAD DATA-API - * ================== */ + $(window).on('load', function () { + $('[data-spy="affix"]').each(function () { + var $spy = $(this) + var data = $spy.data() - $(function () { - $('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { - var $this = $(this) - if ($this.data('typeahead')) return - e.preventDefault() - $this.typeahead($this.data()) + data.offset = data.offset || {} + + if (data.offsetBottom) data.offset.bottom = data.offsetBottom + if (data.offsetTop) data.offset.top = data.offsetTop + + $spy.affix(data) }) }) -}( window.jQuery ); \ No newline at end of file +}(jQuery); diff --git a/horizon/static/horizon/js/horizon.d3linechart.js b/horizon/static/horizon/js/horizon.d3linechart.js index 3527bd3f56..907d9745ef 100644 --- a/horizon/static/horizon/js/horizon.d3linechart.js +++ b/horizon/static/horizon/js/horizon.d3linechart.js @@ -127,11 +127,11 @@
    -
    - -
    +
    + +
    + type="text" id="date_from" name="date_from" class="form-control example"/>
    diff --git a/horizon/static/horizon/js/horizon.firewalls.js b/horizon/static/horizon/js/horizon.firewalls.js index 80b9a7d912..07269167d3 100644 --- a/horizon/static/horizon/js/horizon.firewalls.js +++ b/horizon/static/horizon/js/horizon.firewalls.js @@ -122,8 +122,8 @@ horizon.firewalls = { } updateForm(); }); - if ($("#ruleListId > div.control-group.error").length > 0) { - var errortext = $("#ruleListId > div.control-group.error").find("span.help-inline").text(); + if ($("#ruleListId > div.form-group.error").length > 0) { + var errortext = $("#ruleListId > div.form-group.error").find("span.help-block").text(); $("#selected_rule_h4").before($('
    ').html(errortext)); } $(".rulelist").sortable({ diff --git a/horizon/static/horizon/js/horizon.forms.js b/horizon/static/horizon/js/horizon.forms.js index bc3c0af650..ad6454cd32 100644 --- a/horizon/static/horizon/js/horizon.forms.js +++ b/horizon/static/horizon/js/horizon.forms.js @@ -197,10 +197,10 @@ horizon.addInitFunction(function () { data = $input.data(slug + "-" + val); if (typeof data === "undefined" || !visible) { - $input.closest('.form-field').hide(); + $input.closest('.form-group').hide(); } else { $('label[for=' + $input.attr('id') + ']').html(data); - $input.closest('.form-field').show(); + $input.closest('.form-group').show(); } }); }); @@ -220,9 +220,9 @@ horizon.addInitFunction(function () { $this.find("option").each(function () { if (this.value !== base_type) { - $("#id_" + this.value).closest(".control-group").hide(); + $("#id_" + this.value).closest(".form-group").hide(); } else { - $("#id_" + this.value).closest(".control-group").show(); + $("#id_" + this.value).closest(".form-group").show(); } }); } @@ -240,19 +240,19 @@ horizon.addInitFunction(function () { // Apply standard handler for everything but checkboxes. $(document).tooltip({ - selector: "div.form-field .help-icon", + selector: "div.form-group .help-icon", placement: function (tip, input) { // Position to the right unless this is a "split" for in which case put // the tooltip below so it doesn't block the next field. return $(input).closest("form[class*='split']").length ? "bottom" : 'right'; }, title: function () { - return $(this).closest('div.form-field').children('.help-block').text(); + return $(this).closest('div.form-group').children('.help-block').text(); } }); // Hide the tooltip upon interaction with the field for select boxes. // We use mousedown and keydown since those "open" the select dropdown. - $(document).on('mousedown keydown', '.form-field select', function (evt) { + $(document).on('mousedown keydown', '.form-group select', function (evt) { $(this).tooltip('hide'); }); // Hide the tooltip after escape button pressed @@ -263,5 +263,5 @@ horizon.addInitFunction(function () { }); // Hide the help text for js-capable browsers - $('span.help-block').hide(); + $('p.help-block').hide(); }); diff --git a/horizon/static/horizon/js/horizon.formset_table.js b/horizon/static/horizon/js/horizon.formset_table.js index 5365248825..239d9d2fc4 100644 --- a/horizon/static/horizon/js/horizon.formset_table.js +++ b/horizon/static/horizon/js/horizon.formset_table.js @@ -53,7 +53,7 @@ horizon.formset_table = (function () { // if there are extra empty rows, add the button for new rows if (add_label) { - var button = $('' + + var button = $('' + add_label + ''); table.find('tfoot td').append(button); button.click(function () { diff --git a/horizon/static/horizon/js/horizon.instances.js b/horizon/static/horizon/js/horizon.instances.js index 017d8023d5..907aa2dae5 100644 --- a/horizon/static/horizon/js/horizon.instances.js +++ b/horizon/static/horizon/js/horizon.instances.js @@ -126,8 +126,8 @@ horizon.instances = { } updateForm(); }); - if ($("#networkListId > div.control-group.error").length > 0) { - var errortext = $("#networkListId > div.control-group.error").find("span.help-inline").text(); + if ($("#networkListId > div.form-group.error").length > 0) { + var errortext = $("#networkListId > div.form-group.error").find("span.help-block").text(); $("#selected_network_label").before($('
    ').html(errortext)); } $(".networklist").sortable({ @@ -164,29 +164,29 @@ horizon.addInitFunction(function () { var $this = $(field), base_type = $this.val(); - $this.closest(".control-group").nextAll().hide(); + $this.closest(".form-group").nextAll().hide(); switch(base_type) { case "image_id": - $("#id_image_id").closest(".control-group").show(); + $("#id_image_id").closest(".form-group").show(); break; case "instance_snapshot_id": - $("#id_instance_snapshot_id").closest(".control-group").show(); + $("#id_instance_snapshot_id").closest(".form-group").show(); break; case "volume_id": - $("#id_volume_id, #id_delete_on_terminate").closest(".control-group").show(); + $("#id_volume_id, #id_delete_on_terminate").closest(".form-group").show(); break; case "volume_image_id": $("#id_image_id, #id_volume_size, #id_device_name, #id_delete_on_terminate") - .closest(".control-group").show(); + .closest(".form-group").show(); break; case "volume_snapshot_id": $("#id_volume_snapshot_id, #id_device_name, #id_delete_on_terminate") - .closest(".control-group").show(); + .closest(".form-group").show(); break; } } diff --git a/horizon/static/horizon/js/horizon.messages.js b/horizon/static/horizon/js/horizon.messages.js index fdf6ab9a0d..a97790b9b2 100644 --- a/horizon/static/horizon/js/horizon.messages.js +++ b/horizon/static/horizon/js/horizon.messages.js @@ -21,7 +21,7 @@ horizon.alert = function (type, message, extra_tags) { }; horizon.clearErrorMessages = function() { - $('#main_content .messages .alert.alert-error').remove(); + $('#main_content .messages .alert.alert-danger').remove(); }; horizon.clearSuccessMessages = function() { diff --git a/horizon/static/horizon/js/horizon.modals.js b/horizon/static/horizon/js/horizon.modals.js index e018e6363e..1bdd8f667d 100644 --- a/horizon/static/horizon/js/horizon.modals.js +++ b/horizon/static/horizon/js/horizon.modals.js @@ -54,7 +54,7 @@ horizon.modals.modal_spinner = function (text) { horizon.modals.spinner = $(template.render({text: text})); horizon.modals.spinner.appendTo("#modal_wrapper"); horizon.modals.spinner.modal({backdrop: 'static'}); - horizon.modals.spinner.spin(horizon.conf.spinner_options.modal); + horizon.modals.spinner.find(".modal-body").spin(horizon.conf.spinner_options.modal); }; horizon.modals.init_wizard = function () { @@ -69,11 +69,11 @@ horizon.modals.init_wizard = function () { } // Clear old errors. - $form.find('td.actions div.alert-error').remove(); - $form.find('.control-group.error').each(function () { + $form.find('td.actions div.alert-danger').remove(); + $form.find('.form-group.error').each(function () { var $group = $(this); $group.removeClass('error'); - $group.find('span.help-inline.error').remove(); + $group.find('span.help-block.error').remove(); }); // Send the data for validation. @@ -103,7 +103,7 @@ horizon.modals.init_wizard = function () { // Add global errors. $.each(errors, function (index, error) { $fieldset.find('td.actions').prepend( - '
    ' + + '
    ' + error + '
    '); }); $fieldset.find('input, select, textarea').first().focus(); @@ -111,10 +111,10 @@ horizon.modals.init_wizard = function () { } // Add field errors. $field = $fieldset.find('[name="' + field + '"]'); - $field.closest('.control-group').addClass('error'); + $field.closest('.form-group').addClass('error'); $.each(errors, function (index, error) { $field.before( - '' + + '' + error + ''); }); // Focus the first invalid field. @@ -235,14 +235,14 @@ horizon.addInitFunction(function() { location.href = jqXHR.getResponseHeader("X-Horizon-Location"); } else { $form.closest(".modal").modal("hide"); - horizon.alert("error", gettext("There was an error submitting the form. Please try again.")); + horizon.alert("danger", gettext("There was an error submitting the form. Please try again.")); } } }); }); // Position modal so it's in-view even when scrolled down. - $(document).on('show', '.modal', function (evt) { + $(document).on('show.bs.modal', '.modal', function (evt) { // Filter out indirect triggers of "show" from (for example) tabs. if ($(evt.target).hasClass("modal")) { var scrollShift = $('body').scrollTop() || $('html').scrollTop(), @@ -297,7 +297,7 @@ horizon.addInitFunction(function() { else { if (!horizon.ajax.get_messages(jqXHR)) { // Generic error handler. Really generic. - horizon.alert("error", gettext("An error occurred. Please try again later.")); + horizon.alert("danger", gettext("An error occurred. Please try again later.")); } } }, @@ -321,7 +321,7 @@ horizon.addInitFunction(function() { /* Manage the modal "stack" */ // When a new modal is opened, hide any that are already in the stack. - $(document).on("show", ".modal", function () { + $(document).on("show.bs.modal", ".modal", function () { var container = $("#modal_wrapper"), modal_stack = container.find(".modal"), $this = $(this); @@ -334,7 +334,7 @@ horizon.addInitFunction(function() { // Note: the modal should only be removed if it is the "top" of the stack of // modals, e.g. it's the one currently being interacted with and isn't just // temporarily being hidden. - $(document).on('hidden', '.modal', function () { + $(document).on('hidden.bs.modal', '.modal', function () { var $this = $(this), modal_stack = $("#modal_wrapper .modal"); if ($this[0] === modal_stack.last()[0] || $this.hasClass("loading")) { diff --git a/horizon/static/horizon/js/horizon.tables.js b/horizon/static/horizon/js/horizon.tables.js index 0adfd24a2a..884ab26aa3 100644 --- a/horizon/static/horizon/js/horizon.tables.js +++ b/horizon/static/horizon/js/horizon.tables.js @@ -392,7 +392,7 @@ horizon.datatables.set_table_query_filter = function (parent) { return false; } }); - input.next('button.btn-search').on('click keypress', function (evt) { + input.next('button.btn span.glyphicon-search').on('click keypress', function (evt) { return false; }); diff --git a/horizon/static/horizon/js/horizon.users.js b/horizon/static/horizon/js/horizon.users.js index 06cf379d32..3cd85f5f35 100644 --- a/horizon/static/horizon/js/horizon.users.js +++ b/horizon/static/horizon/js/horizon.users.js @@ -15,7 +15,7 @@ horizon.user = { check_passwords_match: function() { var row = $("label[for='id_confirm_password']"); var error_id = "id_confirm_password_error"; - var msg = "" + gettext("Passwords do not match.") + ""; + var msg = "" + gettext("Passwords do not match.") + ""; var password = $("#id_password").val(); var confirm_password = $("#id_confirm_password").val(); diff --git a/horizon/static/horizon/lib/angular/angular.js b/horizon/static/horizon/lib/angular/angular.js index d93e85858b..589ddb327c 100644 --- a/horizon/static/horizon/lib/angular/angular.js +++ b/horizon/static/horizon/lib/angular/angular.js @@ -1723,10 +1723,10 @@ function setupModuleLoader(window) { /* global angularModule: true, version: true, - + $LocaleProvider, $CompileProvider, - + htmlAnchorDirective, inputDirective, inputDirective, @@ -3664,7 +3664,7 @@ function createInjector(modulesToLoad) { * * It also watches the `$location.hash()` and scrolls whenever it changes to match any anchor. * This can be disabled by calling `$anchorScrollProvider.disableAutoScrolling()`. - * + * * @example @@ -3679,7 +3679,7 @@ function createInjector(modulesToLoad) { // set the location.hash to the id of // the element you wish to scroll to. $location.hash('bottom'); - + // call $anchorScroll() $anchorScroll(); } @@ -3767,7 +3767,7 @@ var $animateMinErr = minErr('$animate'); */ var $AnimateProvider = ['$provide', function($provide) { - + this.$$selectors = {}; @@ -3885,7 +3885,7 @@ var $AnimateProvider = ['$provide', function($provide) { * @description Moves the position of the provided element within the DOM to be placed * either after the `after` element or inside of the `parent` element. Once complete, the * done() callback will be fired (if provided). - * + * * @param {jQuery/jqLite element} element the element which will be moved around within the * DOM * @param {jQuery/jqLite element} parent the parent element where the element will be @@ -4197,7 +4197,7 @@ function Browser(window, document, $log, $sniffer) { /** * @name ng.$browser#baseHref * @methodOf ng.$browser - * + * * @description * Returns current * (always relative - without domain) @@ -4228,13 +4228,13 @@ function Browser(window, document, $log, $sniffer) { * It is not meant to be used directly, use the $cookie service instead. * * The return values vary depending on the arguments that the method was called with as follows: - * + * * - cookies() -> hash of all cookies, this is NOT a copy of the internal state, so do not modify * it * - cookies(name, value) -> set name to value, if value is undefined delete the cookie * - cookies(name) -> the same as (name, undefined) == DELETES (no one calls it right now that * way) - * + * * @returns {Object} Hash of all cookies (if called without any parameter) */ self.cookies = function(name, value) { @@ -4349,9 +4349,9 @@ function $BrowserProvider(){ * * @description * Factory that constructs cache objects and gives access to them. - * + * * 
    - * 
+ *
  *  var cache = $cacheFactory('cacheId');
  *  expect($cacheFactory.get('cacheId')).toBe(cache);
  *  expect($cacheFactory.get('noSuchCacheId')).not.toBeDefined();
@@ -4360,8 +4360,8 @@ function $BrowserProvider(){
  *  cache.put("another key", "another value");
  *
  *  // We've specified no options on creation
- *  expect(cache.info()).toEqual({id: 'cacheId', size: 2}); 
- * 
+ *  expect(cache.info()).toEqual({id: 'cacheId', size: 2});
+ *
  *
    * * @@ -4544,7 +4544,7 @@ function $CacheFactoryProvider() { * The first time a template is used, it is loaded in the template cache for quick retrieval. You * can load templates directly into the cache in a `script` tag, or by consuming the * `$templateCache` service directly. - * + * * Adding via the `script` tag: * 
      * 
@@ -4556,29 +4556,29 @@ function $CacheFactoryProvider() {
  *   ...
  * 
  *
    - * + * * **Note:** the `script` tag containing the template does not need to be included in the `head` of * the document, but it must be below the `ng-app` definition. - * + * * Adding via the $templateCache service: - * + * * 
      * var myApp = angular.module('myApp', []);
  * myApp.run(function($templateCache) {
  *   $templateCache.put('templateId.html', 'This is the content of the template');
  * });
  *
    - * + * * To retrieve the template later, simply use it in your HTML: * 
      * 
    
  *
    - * + * * or get it via Javascript: * 
      * $templateCache.get('templateId.html')
  *
    - * + * * See {@link ng.$cacheFactory $cacheFactory}. * */ @@ -4870,7 +4870,7 @@ function $TemplateCacheProvider() { * should be done in a linking function rather than in a compile function. *
    * - *
    + *
    * **Note:** The `transclude` function that is passed to the compile function is deperecated, as it * e.g. does not know about the right outer scope. Please use the transclude function that is passed * to the link function instead. @@ -6677,12 +6677,12 @@ function $DocumentProvider(){ * Any uncaught exception in angular expressions is delegated to this service. * The default implementation simply delegates to `$log.error` which logs it into * the browser console. - * + * * In unit tests, if `angular-mocks.js` is loaded, this service is overridden by * {@link ngMock.$exceptionHandler mock $exceptionHandler} which aids in testing. * * ## Example: - * + * * 
      *   angular.module('exceptionOverride', []).factory('$exceptionHandler', function () {
  *     return function (exception, cause) {
@@ -6691,7 +6691,7 @@ function $DocumentProvider(){
  *     };
  *   });
  *
    - * + * * This example will override the normal action of `$exceptionHandler`, to make angular * exceptions fail hard when they happen, instead of just logging to the console. * @@ -6930,7 +6930,7 @@ function $HttpProvider() { * will result in the success callback being called. Note that if the response is a redirect, * XMLHttpRequest will transparently follow it, meaning that the error callback will not be * called for such responses. - * + * * # Calling $http from outside AngularJS * The `$http` service will not actually send the request until the next `$digest()` is * executed. Normally this is not an issue, since almost all the time your call to `$http` will @@ -8172,7 +8172,7 @@ function $IntervalProvider() { promise = deferred.promise, iteration = 0, skipApply = (isDefined(invokeApply) && !invokeApply); - + count = isDefined(count) ? count : 0, promise.then(null, null, fn); @@ -8959,7 +8959,7 @@ function $LocationProvider(){ * @description * Simple service for logging. Default implementation safely writes the message * into the browser's console (if present). - * + * * The main purpose of this service is to simplify debugging and troubleshooting. * * The default is not to log `debug` messages. You can use @@ -8996,7 +8996,7 @@ function $LocationProvider(){ function $LogProvider(){ var debug = true, self = this; - + /** * @ngdoc property * @name ng.$logProvider#debugEnabled @@ -9013,7 +9013,7 @@ function $LogProvider(){ return debug; } }; - + this.$get = ['$window', function($window){ return { /** @@ -9055,12 +9055,12 @@ function $LogProvider(){ * Write an error message */ error: consoleLog('error'), - + /** * @ngdoc method * @name ng.$log#debug * @methodOf ng.$log - * + * * @description * Write a debug message */ @@ -11124,7 +11124,7 @@ function $RootScopeProvider(){ - // Using a listener function + // Using a listener function var food; scope.foodCounter = 0; expect(scope.foodCounter).toEqual(0); @@ -11149,7 +11149,7 @@ function $RootScopeProvider(){ // Update food and run digest. Now the counter will increment food = 'cheeseburger'; scope.$digest(); - expect(scope.foodCounter).toEqual(1); + expect(scope.foodCounter).toEqual(1); * * @@ -11568,7 +11568,7 @@ function $RootScopeProvider(){ * * - `string`: execute using the rules as defined in {@link guide/expression expression}. * - `function(scope)`: execute the function with the current `scope` parameter. - * + * * @param {(object)=} locals Local variables object, useful for overriding values in scope. * @returns {*} The result of evaluating the expression. */ @@ -12351,7 +12351,7 @@ function $SceDelegateProvider() { * allowing only the files in a specific directory to do this. Ensuring that the internal API * exposed by that code doesn't markup arbitrary values as safe then becomes a more manageable task. * - * In the case of AngularJS' SCE service, one uses {@link ng.$sce#methods_trustAs $sce.trustAs} + * In the case of AngularJS' SCE service, one uses {@link ng.$sce#methods_trustAs $sce.trustAs} * (and shorthand methods such as {@link ng.$sce#methods_trustAsHtml $sce.trustAsHtml}, etc.) to * obtain values that will be accepted by SCE / privileged contexts. * @@ -13100,7 +13100,7 @@ function $TimeoutProvider() { * will invoke `fn` within the {@link ng.$rootScope.Scope#methods_$apply $apply} block. * @returns {Promise} Promise that will be resolved when the timeout is reached. The value this * promise will be resolved with is the return value of the `fn` function. - * + * * @example @@ -13459,7 +13459,7 @@ function $WindowProvider(){ * * The filter function is registered with the `$injector` under the filter name suffix with * `Filter`. - * + * * 
      *   it('should be the same instance', inject(
  *     function($filterProvider) {
@@ -13535,7 +13535,7 @@ function $FilterProvider($provide) {
   }];
 
   ////////////////////////////////////////
-  
+
   /* global
     currencyFilter: false,
     dateFilter: false,
@@ -14254,9 +14254,9 @@ var uppercaseFilter = valueFn(uppercase);
  * the value and sign (positive or negative) of `limit`.
  *
  * @param {Array|string} input Source array or string to be limited.
- * @param {string|number} limit The length of the returned array or string. If the `limit` number 
+ * @param {string|number} limit The length of the returned array or string. If the `limit` number
  *     is positive, `limit` number of items from the beginning of the source array/string are copied.
- *     If the number is negative, `limit` number  of items from the end of the source array/string 
+ *     If the number is negative, `limit` number  of items from the end of the source array/string
  *     are copied. The `limit` will be trimmed if it exceeds `array.length`
  * @returns {Array|string} A new sub-array or substring of length `limit` or less if input array
  *     had less than `limit` elements.
@@ -14306,7 +14306,7 @@ var uppercaseFilter = valueFn(uppercase);
 function limitToFilter(){
   return function(input, limit) {
     if (!isArray(input) && !isString(input)) return input;
-    
+
     limit = int(limit);
 
     if (isString(input)) {
@@ -14699,7 +14699,7 @@ var htmlAnchorDirective = valueFn({
     
  *
  * @element INPUT
- * @param {expression} ngDisabled If the {@link guide/expression expression} is truthy, 
+ * @param {expression} ngDisabled If the {@link guide/expression expression} is truthy,
  *     then special attribute "disabled" will be set on the element
  */
 
@@ -14730,7 +14730,7 @@ var htmlAnchorDirective = valueFn({
     
  *
  * @element INPUT
- * @param {expression} ngChecked If the {@link guide/expression expression} is truthy, 
+ * @param {expression} ngChecked If the {@link guide/expression expression} is truthy,
  *     then special attribute "checked" will be set on the element
  */
 
@@ -14761,7 +14761,7 @@ var htmlAnchorDirective = valueFn({
     
  *
  * @element INPUT
- * @param {expression} ngReadonly If the {@link guide/expression expression} is truthy, 
+ * @param {expression} ngReadonly If the {@link guide/expression expression} is truthy,
  *     then special attribute "readonly" will be set on the element
  */
 
@@ -14795,7 +14795,7 @@ var htmlAnchorDirective = valueFn({
     
  *
  * @element OPTION
- * @param {expression} ngSelected If the {@link guide/expression expression} is truthy, 
+ * @param {expression} ngSelected If the {@link guide/expression expression} is truthy,
  *     then special attribute "selected" will be set on the element
  */
 
@@ -14828,7 +14828,7 @@ var htmlAnchorDirective = valueFn({
      
  *
  * @element DETAILS
- * @param {expression} ngOpen If the {@link guide/expression expression} is truthy, 
+ * @param {expression} ngOpen If the {@link guide/expression expression} is truthy,
  *     then special attribute "open" will be set on the element
  */
 
@@ -16363,7 +16363,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
    * It will update the $viewValue, then pass this value through each of the functions in `$parsers`,
    * which includes any validators. The value that comes out of this `$parsers` pipeline, be applied to
    * `$modelValue` and the **expression** specified in the `ng-model` attribute.
-   * 
+   *
    * Lastly, all the registered change listeners, in the `$viewChangeListeners` list, are called.
    *
    * Note that calling this function does not trigger a `$digest`.
@@ -16869,14 +16869,14 @@ var ngBindTemplateDirective = ['$interpolate', function($interpolate) {
  *
  * @example
    Try it here: enter text in text box and watch the greeting change.
- 
+
    
      
        
    
         
    
        
    
          
-     
+
      
        angular.module('ngBindHtmlExample', ['ngSanitize'])
 
@@ -18166,7 +18166,7 @@ var ngIncludeDirective = ['$http', '$templateCache', '$anchorScroll', '$compile'
  * The `ngInit` directive allows you to evaluate an expression in the
  * current scope.
  *
- * 
    
+ * 
    
  * The only appropriate use of `ngInit` for aliasing special properties of
  * {@link api/ng.directive:ngRepeat `ngRepeat`}, as seen in the demo below. Besides this case, you
  * should use {@link guide/controller controllers} rather than `ngInit`
@@ -19920,7 +19920,7 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
 
           // We now build up the list of options we need (we merge later)
           for (index = 0; length = keys.length, index < length; index++) {
-            
+
             key = index;
             if (keyName) {
               key = keys[index];
diff --git a/horizon/static/horizon/tests/messages.js b/horizon/static/horizon/tests/messages.js
index c84541b750..97984ce9d1 100644
--- a/horizon/static/horizon/tests/messages.js
+++ b/horizon/static/horizon/tests/messages.js
@@ -13,13 +13,13 @@ horizon.addInitFunction(function () {
 
   test("Multiple Alerts", function () {
     message = horizon.alert("error", "An error!");
-    ok(message.hasClass("alert-error"), 'Verify the first message has the "alert-error" class.');
+    ok(message.hasClass("alert-danger"), 'Verify the first message has the "alert-danger" class.');
 
     message2 = horizon.alert("success", "Another message");
     equal($('#main_content .messages .alert').length, 2, "Verify two messages have been added to the DOM.");
 
     horizon.clearErrorMessages();
-    equal($('#main_content .messages .alert-error').length, 0, "Verify our error message was removed.");
+    equal($('#main_content .messages .alert-danger').length, 0, "Verify our error message was removed.");
     equal($('#main_content .messages .alert').length, 1, "Verify one message remains.");
     horizon.clearSuccessMessages();
     equal($('#main_content .messages .alert-success').length, 0, "Verify our success message was removed.");
diff --git a/horizon/tables/actions.py b/horizon/tables/actions.py
index 5736fe5d08..9e54850904 100644
--- a/horizon/tables/actions.py
+++ b/horizon/tables/actions.py
@@ -36,7 +36,7 @@ from horizon.utils import html
 LOG = logging.getLogger(__name__)
 
 # For Bootstrap integration; can be overridden in settings.
-ACTION_CSS_CLASSES = ("btn", "btn-small")
+ACTION_CSS_CLASSES = ("btn", "btn-default", "btn-sm")
 STRING_SEPARATOR = "__"
 
 
@@ -147,7 +147,7 @@ class BaseAction(html.HTMLElement):
 
     def get_default_classes(self):
         """Returns a list of the default classes for the action. Defaults to
-        ``["btn", "btn-small"]``.
+        ``["btn", "btn-default", "btn-sm"]``.
         """
         return getattr(settings, "ACTION_CSS_CLASSES", ACTION_CSS_CLASSES)
 
@@ -263,6 +263,7 @@ class Action(BaseAction):
         self.verbose_name_plural = kwargs.get('verbose_name_plural',
             "%ss" % self.verbose_name)
         self.allowed_data_types = kwargs.get('allowed_data_types', [])
+        self.icon = kwargs.get('icon', None)
 
         if attrs:
             self.attrs.update(attrs)
@@ -347,6 +348,7 @@ class LinkAction(BaseAction):
         self.verbose_name = kwargs.get('verbose_name', self.name.title())
         self.url = kwargs.get('url', None)
         self.allowed_data_types = kwargs.get('allowed_data_types', [])
+        self.icon = kwargs.get('icon', None)
 
         if not kwargs.get('verbose_name', None):
             raise NotImplementedError('A LinkAction object must have a '
@@ -443,6 +445,7 @@ class FilterAction(BaseAction):
         self.filter_type = kwargs.get('filter_type', "query")
         self.needs_preloading = kwargs.get('needs_preloading', False)
         self.param_name = kwargs.get('param_name', 'q')
+        self.icon = "search"
 
     def get_param_name(self):
         """Returns the full query parameter name for this action.
@@ -452,11 +455,6 @@ class FilterAction(BaseAction):
         """
         return "__".join([self.table.name, self.name, self.param_name])
 
-    def get_default_classes(self):
-        classes = super(FilterAction, self).get_default_classes()
-        classes += ("btn-search",)
-        return classes
-
     def assign_type_string(self, table, data, type_string):
         for datum in data:
             setattr(datum, table._meta.data_type_name, type_string)
@@ -722,6 +720,7 @@ class DeleteAction(BatchAction):
         self.name = kwargs.get('name', self.name)
         self.action_present = kwargs.get('action_present', _("Delete"))
         self.action_past = kwargs.get('action_past', _("Deleted"))
+        self.icon = "remove"
 
     def action(self, request, obj_id):
         return self.delete(request, obj_id)
@@ -731,7 +730,7 @@ class DeleteAction(BatchAction):
 
     def get_default_classes(self):
         classes = super(DeleteAction, self).get_default_classes()
-        classes += ("btn-danger", "btn-delete")
+        classes += ("btn-danger",)
         return classes
 
 
diff --git a/horizon/tables/formset.py b/horizon/tables/formset.py
index 3f01f30998..7c6afe631c 100644
--- a/horizon/tables/formset.py
+++ b/horizon/tables/formset.py
@@ -36,7 +36,7 @@ class FormsetCell(horizon_tables.Cell):
         else:
             if self.field.errors:
                 self.attrs['class'] = (self.attrs.get('class', '') +
-                    ' error control-group')
+                    ' error form-group')
                 self.attrs['title'] = ' '.join(
                     unicode(error) for error in self.field.errors)
 
diff --git a/horizon/templates/auth/_login.html b/horizon/templates/auth/_login.html
index 9c4bf59672..5418ed6ada 100644
--- a/horizon/templates/auth/_login.html
+++ b/horizon/templates/auth/_login.html
@@ -11,16 +11,16 @@
 {% block modal-body %}
   
    
     {% if request.user.is_authenticated and 'next' in request.GET %}
-    
    
-      
    {% trans "You do not have permission to access the resource:" %}
    
+    
    
+      
    {% trans "You do not have permission to access the resource:" %}
    
         
    {{ request.GET.next }}
    
         
    {% url 'horizon:user_home' as home_url %}{% blocktrans %}Login as different user or go back to  home page{% endblocktrans %}
    
           
     
    
     {% endif  %}
     {% if request.COOKIES.logout_reason %}
-    
    
-      
    {{ request.COOKIES.logout_reason }}
    
+    
    
+      
    {{ request.COOKIES.logout_reason }}
    
     
    
     {% endif %}
     {% if next %}{% endif %}
diff --git a/horizon/templates/horizon/_messages.html b/horizon/templates/horizon/_messages.html
index b8a80b53ef..328bb8785b 100644
--- a/horizon/templates/horizon/_messages.html
+++ b/horizon/templates/horizon/_messages.html
@@ -2,25 +2,25 @@
 
    
 {% for message in messages %}
   {% if "info" in message.tags %}
-    
    
+    
    
       ×
       
    {% trans "Info: " %}{{ message }}
    
     
    
   {% endif %}
   {% if "warning" in message.tags %}
-    
    
+    
    
       ×
       
    {% trans "Warning: " %}{{ message }}
    
     
    
   {% endif %}
   {% if "success" in message.tags %}
-    
    
+    
    
       ×
       
    {% trans "Success: " %}{{ message }}
    
     
    
   {% endif %}
   {% if "error" in message.tags %}
-    
    
+    
    
       ×
       
    {% trans "Error: " %}{{ message }}
    
     
    
diff --git a/horizon/templates/horizon/client_side/_alert_message.html b/horizon/templates/horizon/client_side/_alert_message.html
index b8a2e5331d..7391989bf6 100644
--- a/horizon/templates/horizon/client_side/_alert_message.html
+++ b/horizon/templates/horizon/client_side/_alert_message.html
@@ -4,7 +4,7 @@
 {% block id %}alert_message_template{% endblock %}
 
 {% block template %}{% spaceless %}{% jstemplate %}
-
    
+
    
   ×
   
    
     [[type_display]]
diff --git a/horizon/templates/horizon/client_side/_loading.html b/horizon/templates/horizon/client_side/_loading.html
index ecb27966c1..7deae3bb7e 100644
--- a/horizon/templates/horizon/client_side/_loading.html
+++ b/horizon/templates/horizon/client_side/_loading.html
@@ -4,7 +4,13 @@
 {% block id %}spinner-modal{% endblock %}
 
 {% block template %}{% spaceless %}{% jstemplate %}
-
    
-  
    [[text]]…
    
+
    
+  
    
+    
    
+      
    
+        
    [[text]]…
    
+      
    
+    
    
+  
    
 
    
 {% endjstemplate %}{% endspaceless %}{% endblock %}
diff --git a/horizon/templates/horizon/client_side/_modal.html b/horizon/templates/horizon/client_side/_modal.html
index 30e0a909a7..cc08451748 100644
--- a/horizon/templates/horizon/client_side/_modal.html
+++ b/horizon/templates/horizon/client_side/_modal.html
@@ -4,17 +4,21 @@
 {% block id %}modal_template{% endblock %}
 
 {% block template %}{% spaceless %}{% jstemplate %}
-
    
-  
    
-    ×
-    
    [[title]]
    
-  
    
-  
    
-    [[body]]
-  
    
-  
    
-    [[confirm]]
-    [[cancel]]
+
    
+  
    
+    
    
+      
    
+        ×
+        
    [[title]]
    
+      
    
+      
    
+        [[body]]
+      
    
+      
    
+        [[confirm]]
+        [[cancel]]
+      
    
+    
    
   
    
 
    
 {% endjstemplate %}{% endspaceless %}{% endblock %}
diff --git a/horizon/templates/horizon/common/_bootstrap_form_field.html b/horizon/templates/horizon/common/_bootstrap_form_field.html
new file mode 100644
index 0000000000..203027e609
--- /dev/null
+++ b/horizon/templates/horizon/common/_bootstrap_form_field.html
@@ -0,0 +1,59 @@
+{% load bootstrap_form_field %}
+
+
    
+  {% if field|is_checkbox %}
+    
    
+      
    
+        {% if field.auto_id %}
+          
+          {% if field.help_text %}
+            
+          {% endif %}
+        {% endif %}
+        {% for error in field.errors %}
+          {{ error }}
+        {% endfor %}
+
+      
    
+    
    
+  {% elif field|is_radio %}
+    {% if field.auto_id %}
+      
+      {% if field.help_text %}
+        
+      {% endif %}
+    {% endif %}
+    
    
+      {% for choice in field %}
+        
    
+          
+        
    
+      {% endfor %}
+
+      {% for error in field.errors %}
+        {{ error }}
+      {% endfor %}
+
+    
    
+  {% else %}
+    {% if field.auto_id %}
+      
+      {% if field.help_text %}
+        
+      {% endif %}
+    {% endif %}
+
+    
    
+      {{ field }}
+
+      {% for error in field.errors %}
+        {{ error }}
+      {% endfor %}
+    
    
+  {% endif %}
+
    
diff --git a/horizon/templates/horizon/common/_data_table_cell.html b/horizon/templates/horizon/common/_data_table_cell.html
index cb04e7e6ce..1c3ffa34f0 100644
--- a/horizon/templates/horizon/common/_data_table_cell.html
+++ b/horizon/templates/horizon/common/_data_table_cell.html
@@ -13,7 +13,7 @@
                      name="action"
                      value="" type="submit">
                 
-                
+                
             
    
             
    
         
    
@@ -26,7 +26,7 @@
                     {%if cell.wrap_list %}
      {% endif %}{{ cell.value }}{%if cell.wrap_list %}
    {% endif %}
                 
    
                 
    
-                    
+                    
                 
    
                 
    
             
    
diff --git a/horizon/templates/horizon/common/_data_table_row_actions.html b/horizon/templates/horizon/common/_data_table_row_actions.html
index 8619da17f1..a9b5c7c1e9 100644
--- a/horizon/templates/horizon/common/_data_table_row_actions.html
+++ b/horizon/templates/horizon/common/_data_table_row_actions.html
@@ -6,7 +6,7 @@
     {% for action in row_actions %}
         {% if forloop.first %}
           {% include "horizon/common/_data_table_row_action.html" %}
-          
+          
             {% trans "More" %}
             
           
diff --git a/horizon/templates/horizon/common/_data_table_table_action.html b/horizon/templates/horizon/common/_data_table_table_action.html
index 96cb409735..83d0c4a627 100644
--- a/horizon/templates/horizon/common/_data_table_table_action.html
+++ b/horizon/templates/horizon/common/_data_table_table_action.html
@@ -1,5 +1,11 @@
 {% if action.method != "GET" %}
-  
+  
 {% else %}
-  {{ action.verbose_name }}
+  
+    {% if action.icon != None %} {% endif %}
+    {{ action.verbose_name }}
+  
 {% endif %}
diff --git a/horizon/templates/horizon/common/_data_table_table_actions.html b/horizon/templates/horizon/common/_data_table_table_actions.html
index 5152bb5ab8..501a32cb96 100644
--- a/horizon/templates/horizon/common/_data_table_table_actions.html
+++ b/horizon/templates/horizon/common/_data_table_table_actions.html
@@ -4,22 +4,25 @@
     {% if filter.filter_type == 'fixed' %}
     
    
         {% for button in filter.fixed_buttons %}
-        
+        
         {% endfor %}
     
    
     {% elif filter.filter_type == 'query' %}
     
    
-        
+        
    
+            
+            
+        
    
         
     
    
     {% elif filter.filter_type == 'server' %}
     
    
-            
                 {% for choice in filter.filter_choices %}
                 
                 {% endfor %}
             
-        
+        
         
     
    
     {% endif %}
diff --git a/horizon/templates/horizon/common/_form_fields.html b/horizon/templates/horizon/common/_form_fields.html
index 34727c96f1..c97329c657 100644
--- a/horizon/templates/horizon/common/_form_fields.html
+++ b/horizon/templates/horizon/common/_form_fields.html
@@ -1,3 +1,5 @@
+{% load bootstrap_form_field %}
+
 {% for hidden in form.hidden_fields %}
   {{ hidden }}
 {% endfor %}
@@ -7,19 +9,19 @@
   
    
 {% endif %}
 {% if form.non_field_errors %}
-  
    
+  
    
     {{ form.non_field_errors }}
   
    
 {% endif %}
 {% for field in form.visible_fields %}
-  
    
+  
+  {{ field|bootstrap_form_field }}
 {% endfor %}
diff --git a/horizon/templates/horizon/common/_formset_table.html b/horizon/templates/horizon/common/_formset_table.html
index fa7dc1d452..21d0524745 100644
--- a/horizon/templates/horizon/common/_formset_table.html
+++ b/horizon/templates/horizon/common/_formset_table.html
@@ -19,7 +19,7 @@
     {% with table.get_formset as formset %}
         {{ formset.management_form }}
         {% if formset.non_field_errors %}
-            
    
+            
    
                 {{ formset.non_field_errors }}
             
    
         {% endif %}
diff --git a/horizon/templates/horizon/common/_formset_table_row.html b/horizon/templates/horizon/common/_formset_table_row.html
index 5409a0b516..b89a1627d3 100644
--- a/horizon/templates/horizon/common/_formset_table_row.html
+++ b/horizon/templates/horizon/common/_formset_table_row.html
@@ -10,11 +10,11 @@
       {% for field in row.form.hidden_fields %}
         {{ field }}
         {% for error in field.errors %}
-          {{ field.name }}: {{ error }}
+          {{ field.name }}: {{ error }}
         {% endfor %}
       {% endfor %}
       {% if row.form.non_field_errors %}
-        
    
+        
    
           {{ row.form.non_field_errors }}
         
    
       {% endif %}
diff --git a/horizon/templates/horizon/common/_modal.html b/horizon/templates/horizon/common/_modal.html
index 34863bf59f..788ab953b1 100644
--- a/horizon/templates/horizon/common/_modal.html
+++ b/horizon/templates/horizon/common/_modal.html
@@ -1,10 +1,14 @@
-