openstack/deb-horizon
Code Issues Proposed changes

Merge "Add ngroute libraries to appropriate paths"

Browse Source
This commit is contained in:
Jenkins 2015-11-19 22:19:50 +00:00 committed by Gerrit Code Review
commit 23ee8bedd7
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
horizon/templates/horizon/jasmine/jasmine.html
View File

@ -16,6 +16,7 @@
<script src='{{ STATIC_URL }}horizon/lib/spin.js'></script> <script src='{{ STATIC_URL }}horizon/lib/spin.js'></script>
<script src='{{ STATIC_URL }}horizon/lib/spin.jquery.js'></script> <script src='{{ STATIC_URL }}horizon/lib/spin.jquery.js'></script>
<script src="{{ STATIC_URL }}horizon/lib/angular/angular.js"></script> <script src="{{ STATIC_URL }}horizon/lib/angular/angular.js"></script>
<script src="{{ STATIC_URL }}horizon/lib/angular/angular-route.js"></script>
<script src="{{ STATIC_URL }}horizon/lib/angular/angular-mocks.js"></script> <script src="{{ STATIC_URL }}horizon/lib/angular/angular-mocks.js"></script>
<script src="{{ STATIC_URL }}horizon/lib/angular/angular-cookies.js"></script> <script src="{{ STATIC_URL }}horizon/lib/angular/angular-cookies.js"></script>
<script src="{{ STATIC_URL }}horizon/lib/angular/angular-bootstrap.js"></script> <script src="{{ STATIC_URL }}horizon/lib/angular/angular-bootstrap.js"></script>

1
openstack_dashboard/karma.conf.js
View File

@ -87,6 +87,7 @@ module.exports = function (config) {
// from jasmine.html // from jasmine.html
xstaticPath + 'jquery/data/jquery.js', xstaticPath + 'jquery/data/jquery.js',
xstaticPath + 'angular/data/angular.js', xstaticPath + 'angular/data/angular.js',
xstaticPath + 'angular/data/angular-route.js',
xstaticPath + 'angular/data/angular-mocks.js', xstaticPath + 'angular/data/angular-mocks.js',
xstaticPath + 'angular/data/angular-cookies.js', xstaticPath + 'angular/data/angular-cookies.js',
xstaticPath + 'angular_bootstrap/data/angular-bootstrap.js', xstaticPath + 'angular_bootstrap/data/angular-bootstrap.js',

1
openstack_dashboard/templates/base.html
View File

@ -15,6 +15,7 @@
{% include "horizon/_conf.html" %} {% include "horizon/_conf.html" %}
{% include "horizon/client_side/_script_loader.html" %} {% include "horizon/client_side/_script_loader.html" %}
{% include "horizon/_custom_head_js.html" %} {% include "horizon/_custom_head_js.html" %}
{% block ng_route_base %} {% endblock %}
</head> </head>
<body id="{% block body_id %}{% endblock %}" ng-app='horizon.app'> <body id="{% block body_id %}{% endblock %}" ng-app='horizon.app'>
<noscript> <noscript>

1
openstack_dashboard/templates/horizon/_conf.html
View File

@ -7,6 +7,7 @@
<script src='{{ STATIC_URL }}horizon/lib/jquery/jquery.js' type='text/javascript' charset="utf-8"></script> <script src='{{ STATIC_URL }}horizon/lib/jquery/jquery.js' type='text/javascript' charset="utf-8"></script>
<script src='{{ STATIC_URL }}horizon/lib/jquery/jquery-migrate.js' type='text/javascript' charset="utf-8"></script> <script src='{{ STATIC_URL }}horizon/lib/jquery/jquery-migrate.js' type='text/javascript' charset="utf-8"></script>
<script src="{{ STATIC_URL }}horizon/lib/angular/angular.js" type="text/javascript" charset="utf-8"></script> <script src="{{ STATIC_URL }}horizon/lib/angular/angular.js" type="text/javascript" charset="utf-8"></script>
<script src="{{ STATIC_URL }}horizon/lib/angular/angular-route.js" type="text/javascript" charset="utf-8"></script>
<script src="{{ STATIC_URL }}horizon/lib/angular/angular-bootstrap.js" type="text/javascript" charset="utf-8"></script> <script src="{{ STATIC_URL }}horizon/lib/angular/angular-bootstrap.js" type="text/javascript" charset="utf-8"></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.js' type='text/javascript' charset='utf-8'></script> <script src='{{ STATIC_URL }}horizon/js/horizon.js' type='text/javascript' charset='utf-8'></script>