From 66278534dc56766dcd8b2fc1c4614cfd4ff6c08d Mon Sep 17 00:00:00 2001
From: cobbspur <cobbspur@hotmail.com>
Date: Tue, 13 Aug 2013 21:04:07 +0100
Subject: [PATCH] fixes extensions bug for image uploader

- extensions set to lowercase
- changed navigation images to hyphenated names and corrected references
---
 .../assets/img/{AddImage.png => add-image.png}      | Bin
 .../img/{returnImage.png => return-image.png}       | Bin
 core/client/assets/lib/uploader.js                  |   4 ++--
 core/server/controllers/admin.js                    |   3 +--
 4 files changed, 3 insertions(+), 4 deletions(-)
 rename core/client/assets/img/{AddImage.png => add-image.png} (100%)
 rename core/client/assets/img/{returnImage.png => return-image.png} (100%)

diff --git a/core/client/assets/img/AddImage.png b/core/client/assets/img/add-image.png
similarity index 100%
rename from core/client/assets/img/AddImage.png
rename to core/client/assets/img/add-image.png
diff --git a/core/client/assets/img/returnImage.png b/core/client/assets/img/return-image.png
similarity index 100%
rename from core/client/assets/img/returnImage.png
rename to core/client/assets/img/return-image.png
diff --git a/core/client/assets/lib/uploader.js b/core/client/assets/lib/uploader.js
index 7ffdd43600..06a81f4986 100644
--- a/core/client/assets/lib/uploader.js
+++ b/core/client/assets/lib/uploader.js
@@ -22,9 +22,9 @@
     UploadUi = function ($dropzone, settings) {
         var source,
             $link = $('<a class="js-edit-image image-edit" href="#" >' +
-                '<img src="/public/assets/img/addImage.png" width="16" height="16" alt="add, edit"></a>'),
+                '<img src="/public/assets/img/add-image.png" width="16" height="16" alt="add, edit"></a>'),
             $back = $('<a class="js-return-image image-edit" href="#" >' +
-                '<img src="/public/assets/img/returnImage.png" width="16" height="16" alt="add, edit"></a>');
+                '<img src="/public/assets/img/return-image.png" width="16" height="16" alt="add, edit"></a>');
 
         $.extend(this, {
             bindFileUpload: function () {
diff --git a/core/server/controllers/admin.js b/core/server/controllers/admin.js
index 3c0db0372c..4fbfc58250 100644
--- a/core/server/controllers/admin.js
+++ b/core/server/controllers/admin.js
@@ -59,10 +59,9 @@ adminControllers = {
             tmp_path = req.files.uploadimage.path,
             dir = path.join('content/images', year, month),
             target_path = path.join(dir, req.files.uploadimage.name),
-            ext = path.extname(req.files.uploadimage.name),
+            ext = path.extname(req.files.uploadimage.name).toLowerCase(),
             src = path.join('/', target_path);
 
-
         function renameFile() {
             // adds directories recursively
             fs.mkdirs(dir, function (err) {