From 81389ce435ba638b1bd079335ece874934d76549 Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Fri, 29 Nov 2013 11:56:52 +0100
Subject: [PATCH] Fixes: U4-3685 Richtext Editor - Custom toolbars and
 dimensions ignored

---
 .../src/views/propertyeditors/rte/rte.controller.js         | 1 +
 .../src/views/propertyeditors/rte/rte.prevalues.html        | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 2f2fe06cca..4ddd1ba937 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -79,6 +79,7 @@ angular.module("umbraco")
                             menubar: false,
                             statusbar: false,
                             height: editorConfig.dimensions.height,
+                            width: editorConfig.dimensions.width,
                             toolbar: toolbar,
                             content_css: stylesheets.join(','),
                             relative_urls: false,
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
index 2b79ca134c..a990641150 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
@@ -25,8 +25,8 @@
 		</div>
 	</umb-control-group>
 
-	<umb-control-group label="Dimensions" hide-label="asdasasdas">
-		<input type="number" ng-model="model.value.dimensions.height" 
-		class="umb-editor-tiny" placeholder="Height" /> x <input type="number" ng-model="model.value.dimensions.width" class="umb-editor-tiny" placeholder="Width" /> Pixels   
+	<umb-control-group label="Dimensions" description="Width x Height">
+		<input type="number" ng-model="model.value.dimensions.width" class="umb-editor-tiny" placeholder="Width" /> &times; 
+		<input type="number" ng-model="model.value.dimensions.height" class="umb-editor-tiny" placeholder="Height" /> Pixels   
 	</umb-control-group>
 </div>
\ No newline at end of file