From 04275eba634dd3d513f06455d2449532d35c6552 Mon Sep 17 00:00:00 2001
From: Tim Geyssens <tg@umbraco.com>
Date: Wed, 25 Sep 2013 11:51:12 +0200
Subject: [PATCH 1/3] Embed rte plugin: prettify

---
 .../src/views/common/dialogs/rteembed.html    | 58 ++++++++++---------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html
index 751fdfd0a9..19498f5c5e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html
@@ -1,33 +1,39 @@
-<div class="umb-panel" ng-controller="Umbraco.Dialogs.RteEmbedController">
+<form ng-controller="Umbraco.Dialogs.RteEmbedController">
+    
+    <div class="umb-panel" val-show-validation>
  
-    <div class="umb-panel-header">
-        <div class="umb-el-wrap umb-panel-buttons">
-            <div class="btn-toolbar umb-btn-toolbar">
-                <button type="button" class="btn" ng-click="close()">Cancel</button>
-                <input type="button" ng-click="insert()" class="btn btn-primary" value="Insert" ng-disabled="!success" />
+        <div class="umb-panel-header">
+            <div class="umb-el-wrap umb-panel-buttons">
+                <div class="btn-toolbar umb-btn-toolbar">
+                    <button type="button" class="btn" ng-click="close()">Cancel</button>
+                    
+                    <input type="button" ng-click="insert()" class="btn btn-primary" value="Ok" ng-disabled="!success" />
+                </div>
             </div>
         </div>
-    </div>
        
-    <div class="umb-panel-body umb-scrollable" auto-scale="1">
-        <div class="umb-panel">
-            <div class="umb-control-group">
-
-                <label for="url">Url</label> 
-                <input id="url" type="text" ng-model="url" ng-change="showPreview()"/>
-                
-                <div ng-show="supportsDimensions">
-                    <label>Size:</label> 
-                    <input type="text" ng-model="width" on-blur="changeSize('width')"/> x <input type="text" ng-model="height" on-blur="changeSize('height')"/>
-                    <label for="constrain">Constrain:</label> 
-                    <input id="constrain" type="checkbox" ng-model="constrain"/>
+         <div class="umb-panel-body umb-scrollable" auto-scale="1">
+           
+                <div class="umb-control-group">
+                    
+                    <div class="umb-pane">
+                    <label for="url">Url</label> 
+                    <input id="url" type="text" ng-model="url" ng-change="showPreview()" required/>
+                    </div>
+                    <div class="umb-pane" ng-show="supportsDimensions">
+                        <label>Size:</label> 
+                        <input type="text" ng-model="width" on-blur="changeSize('width')" style="width:50px"/> x <input type="text" ng-model="height" on-blur="changeSize('height')" style="width:50px"/>
+                        <label for="constrain" style="display:inline">Constrain:</label> 
+                        <input id="constrain" type="checkbox" ng-model="constrain" style="margin-bottom: 10px;"/>
+                    </div>
+                      <div class="umb-pane">
+                    <p ng-bind="info"></p>
+                          <div ng-bind-html-unsafe="preview">
+                          </div>
+                           </div>
                 </div>
-
-                <p ng-bind="info"></p>
-                <div ng-bind-html-unsafe="preview">
-                </div>
-            </div>
+          
         </div>
-    </div>
 
-</div>
+    </div>
+</form>

From 32ba52f340d45fc58748caeeef54f2cf0cd6bc4c Mon Sep 17 00:00:00 2001
From: Tim Geyssens <tg@umbraco.com>
Date: Wed, 25 Sep 2013 12:07:25 +0200
Subject: [PATCH 2/3] rte: adds iframe as allowed element

---
 .../src/views/propertyeditors/rte/rte.controller.js             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 5dad072c39..338d6adbdf 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
@@ -23,7 +23,7 @@ angular.module("umbraco")
             + "input[accept|alt|checked|disabled|maxlength|name|readonly|size|src|type|value],"
             + "kbd,label[for],legend,noscript,optgroup[label|disabled],option[disabled|label|selected|value],"
             + "q[cite],samp,select[disabled|multiple|name|size],small,"
-            + "textarea[cols|rows|disabled|name|readonly],tt,var,big";
+            + "textarea[cols|rows|disabled|name|readonly],tt,var,big,iframe[*]";
 
         //TODO: This should be configurable (i.e. from the config file we have and/or from pre-values)
         var toolbar = "code | bold italic | styleselect | alignleft aligncenter alignright | bullist numlist | outdent indent | link image umbmediapicker umbiconpicker umbembeddialog umbmacro";

From fb811ce810ef9b5b4a3cfa46bc8306713fe376b5 Mon Sep 17 00:00:00 2001
From: Tim Geyssens <tg@umbraco.com>
Date: Wed, 25 Sep 2013 12:16:11 +0200
Subject: [PATCH 3/3] Embed rte plugin: minor copy update

---
 .../src/views/common/dialogs/rteembed.html                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html
index 19498f5c5e..e752b0685e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html
@@ -17,7 +17,7 @@
                 <div class="umb-control-group">
                     
                     <div class="umb-pane">
-                    <label for="url">Url</label> 
+                    <label for="url">Url:</label> 
                     <input id="url" type="text" ng-model="url" ng-change="showPreview()" required/>
                     </div>
                     <div class="umb-pane" ng-show="supportsDimensions">