From 5aed1208c066c0ee36cea360d5fb045db8a74bf8 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Thu, 20 Feb 2014 21:26:05 -0500 Subject: [PATCH 1/3] lol this was saving to 'uploadPath' --- src/image.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/image.js b/src/image.js index 36e463bb88..97bb237a16 100644 --- a/src/image.js +++ b/src/image.js @@ -11,7 +11,16 @@ image.resizeImage = function(path, extension, width, height, callback) { } if(extension === '.gif') { - imagemagick.convert([path, '-coalesce', '-repage', '0x0', '-crop', width+'x'+height+'+0+0', '+repage', 'uploadPath'], done); + imagemagick.convert([ + path, + '-coalesce', + '-repage', + '0x0', + '-crop', + width+'x'+height+'+0+0', + '+repage', + path + ], done); } else { imagemagick.crop({ srcPath: path, From 86dd01154e7f8e8b822be018b363fc53445b7c6b Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 20 Feb 2014 21:32:24 -0500 Subject: [PATCH 2/3] closes #1079 --- public/src/forum/admin/themes.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/src/forum/admin/themes.js b/public/src/forum/admin/themes.js index a3b22983b1..78328a6027 100644 --- a/public/src/forum/admin/themes.js +++ b/public/src/forum/admin/themes.js @@ -164,7 +164,7 @@ define(['forum/admin/settings'], function(Settings) { hoverClass: "panel-info" }) .children('.panel-heading') - .append('
 
') + .append('
 
') .children('small').html(''); } } @@ -184,6 +184,8 @@ define(['forum/admin/settings'], function(Settings) { panel.remove(); } }); + }).on('dblclick', '.panel-heading', function() { + $(this).parents('.panel').children('.panel-body').toggleClass('hidden'); }); $('#widgets .btn[data-template]').on('click', function() { From 8cfa6e9d83f4ca30dec91adad212459fae6dcbb9 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 20 Feb 2014 21:35:51 -0500 Subject: [PATCH 3/3] added panel container without header, closes #1081 --- public/templates/admin/themes.tpl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/templates/admin/themes.tpl b/public/templates/admin/themes.tpl index 95501268de..3e279c2f5c 100644 --- a/public/templates/admin/themes.tpl +++ b/public/templates/admin/themes.tpl @@ -95,6 +95,11 @@
Jumbotron
+
+
+ Panel +
+
Panel Header