yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0

Browse Source
This commit is contained in:
Shannon
2013-09-25 21:10:13 +10:00
parent 394915fa05 fb811ce810
commit f976a9b246
2 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html
View File

@@ -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>

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
View File

@@ -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";