From 60b7f19f71daddd82ecfdaee021a6130810c0517 Mon Sep 17 00:00:00 2001
From: Rufus Pollock <rufus.pollock@okfn.org>
Date: Tue, 17 Apr 2012 12:53:11 +0100
Subject: [PATCH] [vendor,refactor][xs]: lay vendor directory in consistent way
 ({lib}/{version}/{js-file}).

---
 app/index.html                                        |  8 ++++----
 test/index.html                                       | 11 ++++++-----
 .../{backbone-0.5.1.js => backbone/0.5.1/backbone.js} |  0
 .../0.7/jquery.flot.js}                               |  0
 vendor/{jquery-1.7.1.js => jquery/1.7.1/jquery.js}    |  0
 .../1.1.6/underscore.js}                              |  0
 6 files changed, 10 insertions(+), 9 deletions(-)
 rename vendor/{backbone-0.5.1.js => backbone/0.5.1/backbone.js} (100%)
 rename vendor/{jquery.flot-0.7.js => jquery.flot/0.7/jquery.flot.js} (100%)
 rename vendor/{jquery-1.7.1.js => jquery/1.7.1/jquery.js} (100%)
 rename vendor/{underscore-1.1.6.js => underscore/1.1.6/underscore.js} (100%)

diff --git a/app/index.html b/app/index.html
index e6367736..63e1d9ef 100644
--- a/app/index.html
+++ b/app/index.html
@@ -29,11 +29,11 @@
   <link rel="stylesheet" href="../vendor/bootstrap/2.0.2/css/bootstrap-responsive.css">
 
   <!-- 3rd party JS libraries -->
-  <script type="text/javascript" src="../vendor/jquery-1.7.1.js"></script>
-  <script type="text/javascript" src="../vendor/underscore-1.1.6.js"></script>
-  <script type="text/javascript" src="../vendor/backbone-0.5.1.js"></script>
+  <script type="text/javascript" src="../vendor/jquery/1.7.1/jquery.js"></script>
+  <script type="text/javascript" src="../vendor/underscore/1.1.6/underscore.js"></script>
+  <script type="text/javascript" src="../vendor/backbone/0.5.1/backbone.js"></script>
   <script type="text/javascript" src="../vendor/jquery-ui-1.8.14.custom.min.js"></script>
-  <script type="text/javascript" src="../vendor/jquery.flot-0.7.js"></script>
+  <script type="text/javascript" src="../vendor/jquery.flot/0.7/jquery.flot.js"></script>
   <script type="text/javascript" src="../vendor/jquery.mustache.js"></script>
   <script type="text/javascript" src="../vendor/bootstrap/2.0.2/bootstrap.js"></script>
   <script type="text/javascript" src="../vendor/leaflet/0.3.1/leaflet.js"></script>
diff --git a/test/index.html b/test/index.html
index da0e90b8..8bc78f41 100644
--- a/test/index.html
+++ b/test/index.html
@@ -7,13 +7,14 @@
   <!-- need this stylesheet because flot will complain if canvas does not have a height -->
   <link rel="stylesheet" href="../css/graph.css" type="text/css" media="screen" />
 
-  <script type="text/javascript" src="../vendor/jquery-1.7.1.js"></script>
-  <script type="text/javascript" src="../vendor/underscore-1.1.6.js"></script>
-  <script type="text/javascript" src="../vendor/backbone-0.5.1.js"></script>
+  <script type="text/javascript" src="../vendor/jquery/1.7.1/jquery.js"></script>
+  <script type="text/javascript" src="../vendor/underscore/1.1.6/underscore.js"></script>
+  <script type="text/javascript" src="../vendor/backbone/0.5.1/backbone.js"></script>
   <script type="text/javascript" src="../vendor/jquery-ui-1.8.14.custom.min.js"></script>
-  <script type="text/javascript" src="../vendor/jquery.flot-0.7.js"></script>
-  <script type="text/javascript" src="../vendor/leaflet/0.3.1/leaflet.js"></script>
+  <script type="text/javascript" src="../vendor/jquery.flot/0.7/jquery.flot.js"></script>
   <script type="text/javascript" src="../vendor/jquery.mustache.js"></script>
+  <script type="text/javascript" src="../vendor/bootstrap/2.0.2/bootstrap.js"></script>
+  <script type="text/javascript" src="../vendor/leaflet/0.3.1/leaflet.js"></script>
 
   <script type="text/javascript" src="qunit/qunit.js"></script>
   <script src="sinon/1.1.1/sinon.js"></script>
diff --git a/vendor/backbone-0.5.1.js b/vendor/backbone/0.5.1/backbone.js
similarity index 100%
rename from vendor/backbone-0.5.1.js
rename to vendor/backbone/0.5.1/backbone.js
diff --git a/vendor/jquery.flot-0.7.js b/vendor/jquery.flot/0.7/jquery.flot.js
similarity index 100%
rename from vendor/jquery.flot-0.7.js
rename to vendor/jquery.flot/0.7/jquery.flot.js
diff --git a/vendor/jquery-1.7.1.js b/vendor/jquery/1.7.1/jquery.js
similarity index 100%
rename from vendor/jquery-1.7.1.js
rename to vendor/jquery/1.7.1/jquery.js
diff --git a/vendor/underscore-1.1.6.js b/vendor/underscore/1.1.6/underscore.js
similarity index 100%
rename from vendor/underscore-1.1.6.js
rename to vendor/underscore/1.1.6/underscore.js