Merge branch 'master' of https://github.com/designcreateplay/NodeBB

public/src/forum/admin/categories.js

@@ -190,6 +190,20 @@ define(['uploader'], function(uploader) {
 					modified(inputEl);
 				});
 			});
+
+			$('.admin-categories').delegate('.delete-image', 'click', function() {
+				var parent = $(this).parents('li[data-cid]'),
+					inputEl = parent.find('.upload-button'),
+					preview = parent.find('.preview-box'),
+					bgColor = parent.find('.category_bgColor').val();
+
+				inputEl.value = '';
+				modified(inputEl);
+
+				preview.css('background', bgColor);
+
+				$(this).hide();
+			});
 		});
 	};
 

public/templates/admin/categories.tpl

@@ -14,12 +14,15 @@
 		<!-- BEGIN categories -->
 			<li data-cid="{categories.cid}" class="entry-row">
 				<div class="row">
-					<div class="col-sm-2 hidden-xs">
+					<div class="col-sm-2 hidden-xs text-center">
 						<div class="preview-box" style="background: {categories.background}; color: {categories.color};">
 							<div class="icon">
 								<i data-name="icon" value="{categories.icon}" class="fa {categories.icon} fa-2x"></i>
 							</div>
-						</div>
+						</div><br />
+						<!-- IF categories.image -->
+						<small class="pointer delete-image"><i data-name="icon" value="fa-times" class="fa fa-times"></i> Delete Image</small>
+						<!-- ENDIF categories.image -->
 					</div>
 					<div class="col-sm-10">
 						<form class="form">