From ea2bd33bfa10564591f2d8ca69bd5cd7d252ee1d Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Thu, 26 Jul 2018 15:00:49 -0400
Subject: [PATCH] fixes #6608, restored template values in widget containers

---
 public/src/admin/extend/widgets.js |  2 +-
 src/views/admin/extend/widgets.tpl | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/src/admin/extend/widgets.js b/public/src/admin/extend/widgets.js
index 15414207c0..1139b8b236 100644
--- a/public/src/admin/extend/widgets.js
+++ b/public/src/admin/extend/widgets.js
@@ -149,7 +149,7 @@ define('admin/extend/widgets', ['jqueryui'], function () {
 				.addClass(btn.attr('data-class'));
 
 			container.attr('data-container-html', container.attr('data-container-html')
-				.replace(/class="[a-zA-Z0-9-\s]+"/, 'class="' + container[0].className.replace(' pointer ui-draggable', '') + '"'));
+				.replace(/class="[a-zA-Z0-9-\s]+"/, 'class="' + container[0].className.replace(' pointer ui-draggable ui-draggable-handle', '') + '"'));
 		});
 	}
 
diff --git a/src/views/admin/extend/widgets.tpl b/src/views/admin/extend/widgets.tpl
index 9d02b2fb81..3d984516c1 100644
--- a/src/views/admin/extend/widgets.tpl
+++ b/src/views/admin/extend/widgets.tpl
@@ -85,18 +85,18 @@
 						<div class="pointer" style="padding: 20px; border: 1px dotted #dedede; margin-bottom: 20px;" data-container-html=" ">
 							[[admin/extend/widgets:containers.none]]
 						</div>
-						<div class="well pointer" data-container-html='<div class="well">\{{body\}}</div>'>
+						<div class="well pointer" data-container-html='<div class="well">\{{body}}</div>'>
 							[[admin/extend/widgets:container.well]]
 						</div>
-						<div class="jumbotron pointer" data-container-html='<div class="jumbotron">\{{body\}}</div>'>
+						<div class="jumbotron pointer" data-container-html='<div class="jumbotron">\{{body}}</div>'>
 							[[admin/extend/widgets:container.jumbotron]]
 						</div>
-						<div class="panel" data-container-html='<div class="panel panel-default"><div class="panel-body">\{{body\}}</div></div>'>
+						<div class="panel" data-container-html='<div class="panel panel-default"><div class="panel-body">\{{body}}</div></div>'>
 							<div class="panel-body pointer">
 								[[admin/extend/widgets:container.panel]]
 							</div>
 						</div>
-						<div class="panel panel-default pointer" data-container-html='<div class="panel panel-default"><div class="panel-heading"><h3 class="panel-title">\{{title\}}</h3></div><div class="panel-body">\{{body\}}</div></div>'>
+						<div class="panel panel-default pointer" data-container-html='<div class="panel panel-default"><div class="panel-heading"><h3 class="panel-title">\{{title}}</h3></div><div class="panel-body">\{{body}}</div></div>'>
 							<div class="panel-heading">
 								[[admin/extend/widgets:container.panel-header]]
 								<div class="pull-right color-selector">
@@ -113,7 +113,7 @@
 							</div>
 						</div>
 
-						<div class="alert alert-info pointer" data-container-html='<div class="alert alert-info">\{{body\}}</div>'>
+						<div class="alert alert-info pointer" data-container-html='<div class="alert alert-info">\{{body}}</div>'>
 							[[admin/extend/widgets:container.alert]]
 							<div class="pull-right color-selector">
 								<button data-class="alert-success" class="btn btn-xs btn-success">&nbsp;&nbsp;</button>