[#2375] Move all vendor libs into the vendor directory

Originally vendor libraries were split into file types, images, CSS
and JavaScript etc. However this adds a maintenance overhead and it's
simpler to just keep them in a separate folder as packaged by the
original developer.

ckan/public/base/less/main.less

@@ -1,61 +1,60 @@
 // Bootstrap imports
 
 // CSS Reset
-@import "vendor/bootstrap/reset.less";
+@import "../vendor/bootstrap/less/reset.less";
 
 // Core variables and mixins
-@import "vendor/bootstrap/variables.less"; // Modify this for custom colors, font-sizes, etc
-@import "vendor/bootstrap/mixins.less";
+@import "../vendor/bootstrap/less/variables.less"; // Modify this for custom colors, font-sizes, etc
+@import "../vendor/bootstrap/less/mixins.less";
 
 // Grid system and page structure
-@import "vendor/bootstrap/scaffolding.less";
-@import "vendor/bootstrap/grid.less";
-@import "vendor/bootstrap/layouts.less";
+@import "../vendor/bootstrap/less/scaffolding.less";
+@import "../vendor/bootstrap/less/grid.less";
+@import "../vendor/bootstrap/less/layouts.less";
 
 // Base CSS
-@import "vendor/bootstrap/type.less";
-@import "vendor/bootstrap/code.less";
-@import "vendor/bootstrap/forms.less";
-@import "vendor/bootstrap/tables.less";
+@import "../vendor/bootstrap/less/type.less";
+@import "../vendor/bootstrap/less/code.less";
+@import "../vendor/bootstrap/less/forms.less";
+@import "../vendor/bootstrap/less/tables.less";
 
 // Components: common
-// @import "vendor/bootstrap/sprites.less"; // Replaced by font-awesome.less
-@import "vendor/bootstrap/dropdowns.less";
-@import "vendor/bootstrap/wells.less";
-@import "vendor/bootstrap/component-animations.less";
-@import "vendor/bootstrap/close.less";
+// @import "../vendor/bootstrap/less/sprites.less"; // Replaced by font-awesome.less
+@import "../vendor/bootstrap/less/dropdowns.less";
+@import "../vendor/bootstrap/less/wells.less";
+@import "../vendor/bootstrap/less/component-animations.less";
+@import "../vendor/bootstrap/less/close.less";
 
 // Components: Buttons & Alerts
-@import "vendor/bootstrap/buttons.less";
-@import "vendor/bootstrap/button-groups.less";
-@import "vendor/bootstrap/alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
+@import "../vendor/bootstrap/less/buttons.less";
+@import "../vendor/bootstrap/less/button-groups.less";
+@import "../vendor/bootstrap/less/alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
 
 // Components: Nav
-@import "vendor/bootstrap/navs.less";
-@import "vendor/bootstrap/navbar.less";
-@import "vendor/bootstrap/breadcrumbs.less";
-@import "vendor/bootstrap/pagination.less";
-@import "vendor/bootstrap/pager.less";
+@import "../vendor/bootstrap/less/navs.less";
+@import "../vendor/bootstrap/less/navbar.less";
+@import "../vendor/bootstrap/less/breadcrumbs.less";
+@import "../vendor/bootstrap/less/pagination.less";
+@import "../vendor/bootstrap/less/pager.less";
 
 // Components: Popovers
-@import "vendor/bootstrap/modals.less";
-@import "vendor/bootstrap/tooltip.less";
-@import "vendor/bootstrap/popovers.less";
+@import "../vendor/bootstrap/less/modals.less";
+@import "../vendor/bootstrap/less/tooltip.less";
+@import "../vendor/bootstrap/less/popovers.less";
 
 // Components: Misc
-@import "vendor/bootstrap/thumbnails.less";
-@import "vendor/bootstrap/labels-badges.less";
-@import "vendor/bootstrap/progress-bars.less";
-@import "vendor/bootstrap/accordion.less";
-@import "vendor/bootstrap/carousel.less";
-@import "vendor/bootstrap/hero-unit.less";
+@import "../vendor/bootstrap/less/thumbnails.less";
+@import "../vendor/bootstrap/less/labels-badges.less";
+@import "../vendor/bootstrap/less/progress-bars.less";
+@import "../vendor/bootstrap/less/accordion.less";
+@import "../vendor/bootstrap/less/carousel.less";
+@import "../vendor/bootstrap/less/hero-unit.less";
 
 // Utility classes
-@import "vendor/bootstrap/utilities.less"; // Has to be last to override when necessary
+@import "../vendor/bootstrap/less/utilities.less"; // Has to be last to override when necessary
 
 // Font Icons
-@import "vendor/font-awesome/font-awesome.less";
-@import "vendor/font-awesome/font-awesome.less";
+@import "../vendor/font-awesome/less/font-awesome.less";
 
 // CKAN
 @import "ckan.less";

ckan/public/base/less/variables.less

@@ -1,7 +1,7 @@
 // Base variables
 @imagePath: "../images";
 @spritePath: "@{imagePath}/sprite-ckan-icons.png";
-@fontAwesomePath: "../fonts";
+@fontAwesomePath: "../vendor/font-awesome/fonts";
 
 // Layout Variables
 @layoutFontFamily: Arial, sans-serif;
@@ -47,5 +47,5 @@
 @baseFontFamily: @layoutFontFamily;
 @textColor: @layoutTextColor;
 @linkColor: @layoutLinkColor;
-@iconSpritePath: "../../@{imagePath}/bootstrap-glyphicons-halflings.png";
-@iconWhiteSpritePath: "../../@{imagePath}/bootstrap-glyphicons-halflings-white.png";
+@iconSpritePath: "../images/bootstrap-glyphicons-halflings.png";
+@iconWhiteSpritePath: "../images/bootstrap-glyphicons-halflings-white.png";

ckan/templates/base.html

@@ -48,7 +48,7 @@
     #}
     {%- block html5shim -%}
       {# Temporary link until we get resource helper working #}
-      <!--[if lte IE 8]><script src="{% url_for_static '/base/javascript/vendor/html5.js' %}"></script><![endif]-->
+      <!--[if lte IE 8]><script src="{% url_for_static '/base/vendor/html5.js' %}"></script><![endif]-->
     {%- endblock -%}
 
     {#
@@ -72,7 +72,7 @@
       {% endblock %}
     #}
     {%- block styles %}
-      <!--[if IE 7]> <link rel="stylesheet" href="{% url_for_static '/base/css/vendor/font-awesome-ie7.css' %}" /> <![endif]-->
+      <!--[if IE 7]> <link rel="stylesheet" href="{% url_for_static '/base/vendor/font-awesome/css/font-awesome-ie7.css' %}" /> <![endif]-->
       <link rel="stylesheet" href="{% url_for_static ('/base/css/main.debug.css' if config.debug else '/base/css/main.css') %}" />
     {% endblock %}
   </head>

ckan/templates/snippets/scripts.html

@@ -1,4 +1,4 @@
-<script src="{% url_for_static "/base/javascript/vendor/jquery.js" %}"></script>
+<script src="{% url_for_static "/base/vendor/jquery.js" %}"></script>
 <script src="{% url_for_static "/base/vendor/bootstrap/js/bootstrap-transition.js" %}"></script>
 <script src="{% url_for_static "/base/vendor/bootstrap/js/bootstrap-modal.js" %}"></script>
 <script src="{% url_for_static "/base/vendor/bootstrap/js/bootstrap-alert.js" %}"></script>