Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-06 23:48:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into search_hooks

Browse Source
This commit is contained in:
Julian Lam
2014-02-20 21:38:46 -05:00
parent bba3b76108 8cfa6e9d83
commit f10bda49dc
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/src/forum/admin/themes.js
View File

@@ -164,7 +164,7 @@ define(['forum/admin/settings'], function(Settings) {
hoverClass: "panel-info"
})
.children('.panel-heading')
.append('<div class="pull-right pointer"><span class="delete-widget"><i class="fa fa-times-circle"></i></span>&nbsp;<span class="toggle-widget"><i class="fa fa-chevron-down"></i></span></div>')
.append('<div class="pull-right pointer"><span class="delete-widget"><i class="fa fa-times-circle"></i></span></div><div class="pull-left pointer"><span class="toggle-widget"><i class="fa fa-chevron-circle-down"></i></span>&nbsp;</div>')
.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() {

5
public/templates/admin/themes.tpl
View File

@@ -95,6 +95,11 @@
<div class="jumbotron pointer" data-container-html='<div class="jumbotron">{body}</div>'>
Jumbotron
</div>
<div class="panel" data-container-html='<div class="panel"><div class="panel-body">{body}</div></div>'>
<div class="panel-body pointer">
Panel
</div>
</div>
<div class="panel panel-default pointer" data-container-html='<div class="panel panel-default"><div class="panel-heading">{title}</div><div class="panel-body">{body}</div></div>'>
<div class="panel-heading">
Panel Header

11
src/image.js
View File

@@ -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,