fergalmoran/dss
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.git synced 2026-03-28 00:16:01 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

Fixed conflicts

Browse Source
This commit is contained in:
Fergal Moran
2012-09-12 12:41:07 +01:00
parent 9c32317402
commit d0fd0a90be
1 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
templates/base.html
View File

@@ -7,6 +7,7 @@
<link href='http://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
{% load compress %}
{% compress css %}
<link rel="stylesheet" href="{{ STATIC_URL }}css/bootstrap/bootstrap.min.css">
<link rel="stylesheet" href="{{ STATIC_URL }}css/bootstrap/bootstrap-datepicker.css">
@@ -19,9 +20,7 @@
<link rel="stylesheet" href="{{ STATIC_URL }}css/uploadifive.css">
<link rel="stylesheet" href="{{ STATIC_URL }}css/com.podnoms.player.css">
{% endcompress %}
<script src="/js/settings/"></script>
<<<<<<< HEAD
<script src="{{ STATIC_URL }}js/libs/jquery.min.js"></script>
<script src="{{ STATIC_URL }}js/libs/jquery.form.js"></script>
<script src="{{ STATIC_URL }}js/libs/ajaxfileupload.js"></script>
@@ -37,8 +36,6 @@
<script src="{{ STATIC_URL }}js/libs/sm/soundmanager2.js"></script>
<script src="{{ STATIC_URL }}js/libs/tiny_mce/jquery.tinymce.js"></script>
=======
>>>>>>> 52d6d33f2e6312f24b4fdb91535f7ed1e2b93efe
<!-- horrible fix for horrible facebook -->
<!-- horrible horrible facebook -->
<script type="text/javascript">
@@ -93,24 +90,7 @@
</div>
</div>
<<<<<<< HEAD
<script src="/js/settings/"></script>
=======
<script src="{{ STATIC_URL }}js/libs/jquery.min.js"></script>
<script src="{{ STATIC_URL }}js/libs/jquery.form.js"></script>
<script src="{{ STATIC_URL }}js/libs/ajaxfileupload.js"></script>
<script src="{{ STATIC_URL }}js/libs/uploadify/jquery.uploadifive.js"></script>
<script src="{{ STATIC_URL }}js/libs/jquery.iphone-switch.js"></script>
<script src="{{ STATIC_URL }}js/libs/bootstrap/bootstrap.min.js"></script>
<script src="{{ STATIC_URL }}js/libs/bootstrap/bootstrap-datepicker.js"></script>
<script src="{{ STATIC_URL }}js/libs/bootstrap/bootstrap-timepicker.js"></script>
<script src="{{ STATIC_URL }}js/libs/jasny/jasny-bootstrap.js"></script>
<script src="{{ STATIC_URL }}js/libs/jasny/bootstrap-fileupload.js"></script>
<script src="{{ STATIC_URL }}js/libs/jasny/bootstrap-rowlink.js"></script>
<script src="{{ STATIC_URL }}js/libs/jquery.tablesorter.js"></script>
<script src="{{ STATIC_URL }}js/libs/sm/soundmanager2.js"></script>
<script src="{{ STATIC_URL }}js/libs/tiny_mce/jquery.tinymce.js"></script>
>>>>>>> 52d6d33f2e6312f24b4fdb91535f7ed1e2b93efe
<script src="{{ STATIC_URL }}js/libs/modernizr.js"></script>
<script src="{{ STATIC_URL }}js/libs/backbone/underscore.js"></script>
@@ -119,17 +99,13 @@
<script src="{{ STATIC_URL }}js/libs/backbone/backbone.mine.js"></script>
<script src="{{ STATIC_URL }}js/libs/jquery.colorbox.js"></script>
<!-- backbone application -->
{% compress js %}
<script src="{{ STATIC_URL }}js/libs/backbone/backbone-tastypie.js"></script>
{% compress js %}
<script src="{{ STATIC_URL }}js/com.podnoms.utils.js"></script>
<script src="{{ STATIC_URL }}js/com.podnoms.storage.js"></script>
<<<<<<< HEAD
<script src="{{ STATIC_URL }}js/com.podnoms.player.js"></script>
<script src="{{ STATIC_URL }}js/app/site.js"></script>
<script src="{{ STATIC_URL }}js/app/social.js"></script>
=======
>>>>>>> 52d6d33f2e6312f24b4fdb91535f7ed1e2b93efe
<script src="{{ STATIC_URL }}js/app/models/mix.js"></script>
<script src="{{ STATIC_URL }}js/app/models/user.js"></script>
<script src="{{ STATIC_URL }}js/app/models/comment.js"></script>