Move 3rd-party libs into separate directory

fancypages/templates/fancypages/assets/image_list.html

@@ -9,7 +9,7 @@
 
 {% block extrahead %}
     {{ block.super }}
-    <link rel="stylesheet" type="text/css" href="{% static "fancypages/css/jquery-file-upload/jquery.fileupload-ui.css" %}" />
+    <link rel="stylesheet" type="text/css" href="{% static "fancypages/libs/jquery-file-upload/jquery.fileupload-ui.css" %}" />
 {% endblock %}
 
 {% block column_left %}
@@ -38,9 +38,9 @@ <h3 id="fullscreen-modal-label"><i class="icon-picture"></i> <span>{% trans "Ima
 
 {% block extrascripts %}
     {{ block.super }}
-    <script type="text/javascript" src="{% static "fancypages/js/jquery-file-upload/jquery.ui.widget.js" %}"></script>
-    <script type="text/javascript" src="{% static "fancypages/js/jquery-file-upload/jquery.iframe-transport.js" %}"></script>
-    <script type="text/javascript" src="{% static "fancypages/js/jquery-file-upload/jquery.fileupload.js" %}"></script>
+    <script type="text/javascript" src="{% static "fancypages/libs/jquery-file-upload/jquery.ui.widget.js" %}"></script>
+    <script type="text/javascript" src="{% static "fancypages/libs/jquery-file-upload/jquery.iframe-transport.js" %}"></script>
+    <script type="text/javascript" src="{% static "fancypages/libs/jquery-file-upload/jquery.fileupload.js" %}"></script>
     {% compress js %}
     <script type="text/javascript" src="{% static "fancypages/js/assets.js" %}"></script>
     {% endcompress %}

fancypages/templates/fancypages/base.html

@@ -20,7 +20,7 @@
         <![endif]-->
 
         {% block mainstyles %}
-            <link rel="stylesheet" type="text/css" href="{% static "fancypages/css/bootstrap.min.css" %}" />
+            <link rel="stylesheet" type="text/css" href="{% static "fancypages/libs/bootstrap/bootstrap.min.css" %}" />
             <link rel="stylesheet" type="text/css" href="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
 
             {# Font awesome pulled in through CDN #}
@@ -56,17 +56,14 @@
         {% block cdn_scripts %}
             <!-- jQuery -->
             <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-            <script>window.jQuery || document.write('<script src="{% static "fancypages/js/jquery/jquery-1.9.1.min.js" %}"><\/script>')</script>
-
             <script src="//code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
-            {#<script>window.jQuery || document.write('<script src="{% static "fancypages/js/jquery-ui-1.10.1.custom.min.js" %}"><\/script>')</script>#}
         {% endblock %}
 
         {# Local scripts #}
         {% block scripts %}
             {% compress js %}
                 <!-- Twitter Bootstrap -->
-                <script type="text/javascript" src="{% static "fancypages/js/bootstrap.min.js" %}"></script>
+                <script type="text/javascript" src="{% static "fancypages/libs/bootstrap/bootstrap.min.js" %}"></script>
                 {% include "fancypages/partials/extrascripts.html" %}
             {% endcompress %}
         {% endblock %}

fancypages/templates/fancypages/dashboard/layout.html

@@ -13,10 +13,11 @@
 
 {% block extrascripts %}
     {{ block.super }}
-    <script type="text/javascript" src="{% static "fancypages/js/wysihtml5/advanced.js" %}"></script>
-    <script type="text/javascript" src="{% static "fancypages/js/wysihtml5/wysihtml5-0.3.0.min.js" %}"></script>
+    <script type="text/javascript" src="{% static "fancypages/libs/wysihtml5/advanced.js" %}"></script>
+    <script type="text/javascript" src="{% static "fancypages/libs/wysihtml5/wysihtml5-0.3.0.min.js" %}"></script>
     {% compress js %}
-        <script src="{% static "fancypages/js/elastislide/jquery.elastislide.js" %}" type="text/javascript" charset="utf-8"></script>
+        <script src="{% static "fancypages/libs/elastislide/jquery.elastislide.js" %}" type="text/javascript" charset="utf-8"></script>
+
         <script src="{% static "fancypages/js/fancypages.js" %}" type="text/javascript" charset="utf-8"></script>
         <script src="{% static "fancypages/js/dashboard.js" %}" type="text/javascript" charset="utf-8"></script>
     {% endcompress %}

fancypages/templates/fancypages/dashboard/page_list.html

@@ -42,8 +42,8 @@ <h1>{% trans "Page Management" %}</h1>
 {% block extrascripts %}
     {{ block.super }}
     {% compress js %}
-        <script type="text/javascript" src="{% static "fancypages/js/jquery-ui-1.10.1.custom.min.js" %}"></script>
-        <script type="text/javascript" src="{% static "fancypages/js/jquery.mjs.nestedSortable.js" %}"></script>
+        <script type="text/javascript" src="{% static "fancypages/libs/jquery-ui-1.10.1.custom.min.js" %}"></script>
+        <script type="text/javascript" src="{% static "fancypages/libs/jquery.mjs.nestedSortable.js" %}"></script>
     {% endcompress %}
 {% endblock %}
 

fancypages/templates/fancypages/editor/head.html

@@ -2,6 +2,8 @@
 {% load compress %}
 <link rel="stylesheet" href="http://code.jquery.com/ui/1.9.2/themes/base/jquery-ui.css" />
 {% compress css %}
+<link rel="stylesheet" type="text/css" href="{% static "fancypages/libs/select2/select2.css" %}">
+
 <link rel="stylesheet" type="text/less" href="{% static "fancypages/less/editor.less" %}">
 <link rel="stylesheet" type="text/less" href="{% static "fancypages/less/fancypages.less" %}">
 {% endcompress %}

fancypages/templates/fancypages/editor/partials/extrascripts.html

@@ -1,13 +1,14 @@
 {% load staticfiles %}
 {% load compress %}
-<script type="text/javascript" charset="utf-8" src="{% static "fancypages/js/wysihtml5/advanced.js" %}"></script>
-<script type="text/javascript" charset="utf-8" src="{% static "fancypages/js/wysihtml5/wysihtml5-0.3.0.min.js" %}"></script>
+<script type="text/javascript" charset="utf-8" src="{% static "fancypages/libs/wysihtml5/advanced.js" %}"></script>
+<script type="text/javascript" charset="utf-8" src="{% static "fancypages/libs/wysihtml5/wysihtml5-0.3.0.min.js" %}"></script>
 {% compress js %}
-    <script type="text/javascript" charset="utf-8" src="{% static "fancypages/js/scrollpane/jquery.jscrollpane.js" %}"></script>
-    <script type="text/javascript" charset="utf-8" src="{% static "fancypages/js/mousewheel/jquery.mousewheel.min.js" %}"></script>
-    <script type="text/javascript" charset="utf-8" src="{% static "fancypages/js/elastislide/jquery.elastislide.js" %}"></script>
+    <script type="text/javascript" charset="utf-8" src="{% static "fancypages/libs/scrollpane/jquery.jscrollpane.js" %}"></script>
+    <script type="text/javascript" charset="utf-8" src="{% static "fancypages/libs/mousewheel/jquery.mousewheel.min.js" %}"></script>
+    <script type="text/javascript" charset="utf-8" src="{% static "fancypages/libs/elastislide/jquery.elastislide.js" %}"></script>
+    <script type="text/javascript" charset="utf-8" src="{% static "fancypages/libs/select2/select2.js" %}"></script>
 
     <script type="text/javascript" charset="utf-8" src="{% static "fancypages/js/fancypages.js" %}"></script>
-    <script type="text/javascript" charset="utf-8" src="{% static "fancypages/js/editor.js" %}"></script>
     <script type="text/javascript" charset="utf-8" src="{% static "fancypages/js/event-handlers.js" %}"></script>
+    <script type="text/javascript" charset="utf-8" src="{% static "fancypages/js/editor.js" %}"></script>
 {% endcompress %}