Skip to content

Commit b0786db

Browse files
committed
mv all JS tools to bower system
1 parent f244d4e commit b0786db

2 files changed

Lines changed: 14 additions & 7 deletions

File tree

app/sandbox/settings.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,16 @@
198198
BOWER_PATH = '/usr/local/bin/bower'
199199
BOWER_INSTALLED_APPS = (
200200
'jquery',
201-
'jquery-migrate',
201+
'jquery-migrate#~1.2.1',
202202
'underscore',
203+
'bootstrap',
203204
'bootstrap-select#1.5.4',
205+
'font-awesome#~4.4.0',
206+
'angular#1.2.26',
204207
'angular-bootstrap-select',
205-
'font-awesome',
208+
'angular-resource#1.2.26',
209+
'raphael',
210+
'soundmanager',
211+
'https://github.com/Parisson/loaders.git',
212+
'https://github.com/Parisson/ui.git',
206213
)

timeside/server/templates/timeside/base.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<title></title>
1111

1212
{% block stylesheets %}
13-
{% bootstrap_css %}
13+
<link href="{{ STATIC_URL }}bootstrap/dist/css/bootstrap.min.css" type="text/css" media="all" rel="stylesheet" />
1414
<link href="{{ STATIC_URL }}bootstrap-select/bootstrap-select.css" type="text/css" media="all" rel="stylesheet" />
1515
<link href="{{ STATIC_URL }}timeside/css/timeside.css" type="text/css" media="all" rel="stylesheet" />
1616
{% endblock %}
@@ -21,16 +21,16 @@
2121
<script src="{{ STATIC_URL }}jquery/dist/jquery.min.js"></script>
2222
<script src="{{ STATIC_URL }}jquery-migrate/jquery-migrate.min.js"></script>
2323

24-
{% bootstrap_javascript %}
24+
<script src="{{ STATIC_URL }}bootstrap/dist/js/bootstrap.min.js"></script>
2525
<script src="{{ STATIC_URL }}bootstrap-select/bootstrap-select.min.js"></script>
2626

2727
<script src="{{ STATIC_URL }}angular/angular.min.js"></script>
2828
<script src="{{ STATIC_URL }}angular-bootstrap-select/build/angular-bootstrap-select.min.js"></script>
29-
<script src="{{ STATIC_URL }}timeside/lib/angular-resource.min.js"></script>
29+
<script src="{{ STATIC_URL }}angular-resource/angular-resource.min.js"></script>
3030
<script src="{{ STATIC_URL }}djangular/js/django-angular.js"></script>
3131

32-
<script src="{{ STATIC_URL }}timeside/lib/waves/ui/waves-ui.umd.js"></script>
33-
<script src="{{ STATIC_URL }}timeside/lib/waves/loaders/loaders.min.js"></script>
32+
<script src="{{ STATIC_URL }}ui/waves-ui.umd.js"></script>
33+
<script src="{{ STATIC_URL }}loaders/loaders.min.js"></script>
3434

3535
<script src="{{ STATIC_URL }}timeside/js/timeside.js"></script>
3636
<script src="{{ STATIC_URL }}timeside/js/timeside-waves.js"></script>

0 commit comments

Comments
 (0)