From 4b59caf18f6287f0a8652d08e608a7fa85938f37 Mon Sep 17 00:00:00 2001
From: per ploug <pph@umbraco.dk>
Date: Mon, 17 Nov 2014 22:22:29 +0100
Subject: [PATCH] PR from andy butland manually added

Adds Pixes unit to rte config field, close buttons to grid config
dialogs
---
 .../src/views/propertyeditors/grid/dialogs/config.html        | 4 ++++
 .../src/views/propertyeditors/grid/dialogs/editconfig.html    | 4 ++++
 .../src/views/propertyeditors/rte/rte.prevalues.html          | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html
index d54ba2a087..429bd68abd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html
@@ -31,6 +31,10 @@
     <div class="umb-panel-footer">
         <div class="umb-el-wrap umb-panel-buttons">
             <div class="btn-toolbar umb-btn-toolbar pull-right">
+                <a href ng-click="close()" class="btn btn-link">
+                     <localize key="general_cancel">Cancel</localize>
+                </a>
+
                 <a href ng-click="saveAndClose()" class="btn btn-primary">
                     <localize key="buttons_save">Save</localize>
                 </a>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.html
index 5877f7a0af..61465f95ae 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.html
@@ -21,6 +21,10 @@
         <div class="umb-panel-footer">
             <div class="umb-el-wrap umb-panel-buttons">
                 <div class="btn-toolbar umb-btn-toolbar pull-right">
+                    <a href ng-click="close()" class="btn btn-link">
+                         <localize key="general_cancel">Cancel</localize>
+                    </a>
+
                     <a href ng-click="saveAndClose(gridConfigEditor.$valid)" class="btn btn-primary">
                         <localize key="buttons_save">Save</localize>
                     </a>
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 df5e259637..f00dfa06c1 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
@@ -31,6 +31,6 @@
 	</umb-control-group>
 
     <umb-control-group label="Maximum size for inserted images" description="0 to disable resizing">
-        <input type="number" ng-model="model.value.maxImageSize" class="umb-editor-tiny" placeholder="Width/Height" /> 
+        <input type="number" ng-model="model.value.maxImageSize" class="umb-editor-tiny" placeholder="Width/Height" /> Pixels
     </umb-control-group>
 </div>
\ No newline at end of file