From 9d012617b7f96b876b565561f37048e172f24d70 Mon Sep 17 00:00:00 2001
From: Nick Sergeant <nick@nicksergeant.com>
Date: Sun, 23 Oct 2011 23:57:20 -0400
Subject: [PATCH] Moving some stuff around

---
 snipt/fabfile.py                                              | 4 ++--
 snipt/media/{js => css}/less.js                               | 0
 snipt/media/js/{coffee-script.js => coffee-script.javascript} | 0
 snipt/templates/base.html                                     | 4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename snipt/media/{js => css}/less.js (100%)
 rename snipt/media/js/{coffee-script.js => coffee-script.javascript} (100%)

diff --git a/snipt/fabfile.py b/snipt/fabfile.py
index 9c0c1fb..fde9503 100644
--- a/snipt/fabfile.py
+++ b/snipt/fabfile.py
@@ -8,8 +8,8 @@ def staticfiles():
     local('coffee -c %s/media/js/script.coffee' % BASE_PATH)
     local('sed -i -e \'s/\/media\//https:\/\/dn2p0mzo970os.cloudfront.net\//g\' %s/media/css/style.css' % BASE_PATH)
     local('rm %s/media/css/style.css-e' % BASE_PATH)
-    local('cat %s/media/css/* > %s/media/cache/snipt.css' % (BASE_PATH, BASE_PATH))
-    local('cat %s/media/js/* > %s/media/cache/snipt.js' % (BASE_PATH, BASE_PATH))
+    local('cat %s/media/css/*.css > %s/media/cache/snipt.css' % (BASE_PATH, BASE_PATH))
+    local('cat %s/media/js/*.js > %s/media/cache/snipt.js' % (BASE_PATH, BASE_PATH))
     try:
         local('hg commit -m "Autocommit by [fab staticfiles]"')
         local('hg push')
diff --git a/snipt/media/js/less.js b/snipt/media/css/less.js
similarity index 100%
rename from snipt/media/js/less.js
rename to snipt/media/css/less.js
diff --git a/snipt/media/js/coffee-script.js b/snipt/media/js/coffee-script.javascript
similarity index 100%
rename from snipt/media/js/coffee-script.js
rename to snipt/media/js/coffee-script.javascript
diff --git a/snipt/templates/base.html b/snipt/templates/base.html
index df078cb..0fef513 100644
--- a/snipt/templates/base.html
+++ b/snipt/templates/base.html
@@ -10,8 +10,8 @@
         <link rel="stylesheet/less" href="{{ STATIC_URL }}css/style.less" />
         <link rel="stylesheet" href="{{ STATIC_URL }}css/reset.css" />
         <link rel="stylesheet" href="{{ STATIC_URL }}css/themes.css" />
-        <script type="text/javascript" src="{{ STATIC_URL }}js/less.js"></script>
-        <script type="text/javascript" src="{{ STATIC_URL }}js/coffee-script.js"></script>
+        <script type="text/javascript" src="{{ STATIC_URL }}css/less.js"></script>
+        <script type="text/javascript" src="{{ STATIC_URL }}js/coffee-script.javascript"></script>
         <script type="text/coffeescript" src="{{ STATIC_URL }}js/script.coffee"></script>
         <script type="text/javascript" src="{{ STATIC_URL }}js/jquery.js"></script>
         <script type="text/javascript" src="{{ STATIC_URL }}js/jquery.infieldlabel.js"></script>