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

adds cancel buttons to all dialogs

Browse Source
This commit is contained in:
perploug
2013-10-21 14:26:51 +02:00
parent 652f1e52ec
commit 48ef1aab1c
9 changed files with 121 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.html
+13 -2
View File
@@ -46,10 +46,21 @@
</div>
</div>
<div class="umb-panel-footer" ng-show="multipicker">
<div class="umb-panel-footer" >
<div class="umb-el-wrap umb-panel-buttons">
<div class="btn-toolbar umb-btn-toolbar pull-right">
<input type="button" ng-click="submit(dialogData.selection)" class="btn btn-primary" value="select" />
<a href ng-click="close()" class="btn btn-link">
<localize key="general_cancel">Cancel</localize>
</a>
<button
class="btn btn-primary"
ng-show="dialogOptions.multiPicker"
ng-click="submit(dialogData)">
<localize key="buttons_select">Select</localize>({{dialogData.selection.length}})
</button>
</div>
</div>
</div>
src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.html
+8 -4
View File
@@ -3,8 +3,12 @@
<div class="umb-panel-footer">
<div class="btn-toolbar umb-btn-toolbar pull-right">
<button type="button" class="btn btn-link" ng-click="close()">Cancel</button>
<button type="submit" class="btn btn-primary">Ok</button>
<a href class="btn btn-link" ng-click="close()">
<localize key="cancel" />
</a>
<button type="submit" class="btn btn-primary">
<localize key="buttons_select"/>
</button>
</div>
</div>
@@ -12,9 +16,9 @@
<umb-control-group label="Choose a macro" ng-switch-when="macroSelect">
<select class="umb-editor" ng-change="submitForm()" name="selectedMacro" ng-model="$parent.$parent.selectedMacro" ng-options="m as m.name for m in macros" required>
<option value="">Choose macro...</option>
<option value=""><localize key="choose" />...</option>
</select>
<span class="help-inline" val-msg-for="selectedMacro" val-toggle-msg="required">Required</span>
<span class="help-inline" val-msg-for="selectedMacro" val-toggle-msg="required"><localize key="required" /></span>
</umb-control-group>
src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
+9 -1
View File
@@ -33,7 +33,15 @@
<div class="umb-panel-footer">
<div class="umb-el-wrap umb-panel-buttons">
<div class="btn-toolbar umb-btn-toolbar pull-right">
<input type="button" ng-click="submit(target)" class="btn btn-primary" value="select" />
<a href ng-click="close()" class="btn btn-link">
<localize key="general_cancel">Cancel</localize>
</a>
<button
class="btn btn-primary"
ng-click="submit(target)">
<localize key="buttons_select">Select</localize>
</button>
</div>
</div>
</div>
src/Umbraco.Web.UI.Client/src/views/common/dialogs/macropicker.html
+2 -2
View File
@@ -1,6 +1,6 @@
<div class="umb-panel" ng-controller="Umbraco.Dialogs.MacroPickerController">
<div class="umb-panel-body no-header umb-scrollable" ng-switch on="dialogMode">
<div class="umb-panel-body no-header with-footer umb-scrollable" ng-switch on="dialogMode">
<div class="umb-control-group">
<div ng-switch-when="list" ng-swicth-default class="tab-content form-horizontal umb-el-wrap">
<ul class="nav nav-tabs nav-stacked">
@@ -14,7 +14,7 @@
<div ng-switch-when="configure" class="tab-content form umb-el-wrap">
<h5>woot {{dialogData.macro.name}}</h5>
<h5>{{dialogData.macro.name}}</h5>
<div class="umb-pane" ng-repeat="model in dialogData.macro.properties">
<label class="control-label" ng-hide="model.hideLabel" for="{{model.alias}}">{{model.label}}
src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
+17 -7
View File
@@ -61,14 +61,24 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupl
/>
</div>
<div class="umb-panel-footer">
<div class="umb-el-wrap umb-panel-buttons">
<div class="pull-right umb-btn-toolbar">
<button ng-show="dialogData.selection.length > 0" type="button"
ng-click="submit(dialogData)" class="btn btn-primary">Select ({{dialogData.selection.length}})</button>
</div>
<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>
<button
class="btn btn-primary"
ng-show="dialogOptions.multiPicker"
ng-click="submit(dialogData)">
<localize key="buttons_select">Select</localize>({{dialogData.selection.length}})
</button>
</div>
</div>
</div>
</div>
</div>
src/Umbraco.Web.UI.Client/src/views/common/dialogs/memberpicker.html
+17 -6
View File
@@ -47,11 +47,22 @@
</div>
</div>
<div class="umb-panel-footer" ng-show="multipicker">
<div class="umb-el-wrap umb-panel-buttons">
<div class="btn-toolbar umb-btn-toolbar pull-right">
<input type="button" ng-click="submit(dialogData)" class="btn btn-primary" value="select" />
</div>
<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>
<button
class="btn btn-primary"
ng-show="multipicker"
ng-click="submit(dialogData)">
<localize key="buttons_select">Select</localize>({{dialogData.selection.length}})
</button>
</div>
</div>
</div>
</div>
</div>
src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html
+4 -1
View File
@@ -22,7 +22,10 @@
<div class="umb-panel-footer">
<div class="btn-toolbar umb-btn-toolbar pull-right">
<a href class="btn btn-link" ng-click="close()">Cancel</a>
<a href class="btn btn-link" ng-click="close()">
<localize key="cancel" />
</a>
<input type="button" ng-click="insert()" class="btn btn-primary" value="Ok" ng-disabled="!form.success" />
</div>
</div>
src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
+38 -17
View File
@@ -12,32 +12,48 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController",
$scope.entityType ="Document";
$scope.results = [];
if(dialogOptions.treeAlias === "member"){
if(dialogOptions.section === "member"){
$scope.searcher = searchService.searchMembers;
$scope.entityType = "Member";
}else if(dialogOptions.treeAlias === "media"){
}else if(dialogOptions.section === "media"){
$scope.searcher = searchService.searchMedia;
$scope.entityType = "Media";
}
function select(id){
entityResource.getById(id, $scope.entityType).then(function(ent){
if($scope.multiPicker){
$scope.showSearch = false;
$scope.results = [];
$scope.term = "";
$scope.oldTerm = undefined;
function select(text, id){
//if we get the root, we just return a constructed entity, no need for server data
if(id < 0){
var node = {
alias: null,
icon: "icon-folder",
id: id,
name: text};
$scope.select(ent);
if($scope.multiPicker){
$scope.select(node);
}else{
$scope.submit(ent);
$scope.submit(node);
}
});
}else{
entityResource.getById(id, $scope.entityType).then(function(ent){
if($scope.multiPicker){
$scope.showSearch = false;
$scope.results = [];
$scope.term = "";
$scope.oldTerm = undefined;
$scope.select(ent);
}else{
$scope.submit(ent);
}
});
}
}
$scope.selectResult = function(result){
select(result.id);
select(result.title, result.id);
};
$scope.performSearch = function(){
@@ -63,14 +79,19 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController",
eventsService.publish("Umbraco.Dialogs.TreePickerController.Select", args).then(function(args){
select(args.node.id);
select(args.node.name, args.node.id);
if($scope.multiPicker){
var c = $(args.event.target.parentElement);
if(!args.node.selected){
args.node.selected = true;
c.find("i.umb-tree-icon").hide()
.after("<i class='icon umb-tree-icon sprTree icon-check blue temporary'></i>");
var temp = "<i class='icon umb-tree-icon sprTree icon-check blue temporary'></i>";
var icon = c.find("i.umb-tree-icon");
if(icon.length > 0){
icon.hide().after(temp);
}else{
c.prepend(temp);
}
}else{
args.node.selected = false;
c.find(".temporary").remove();
src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html
+13 -2
View File
@@ -49,10 +49,21 @@
</div>
</div>
<div class="umb-panel-footer" ng-show="multiPicker">
<div class="umb-panel-footer" >
<div class="umb-el-wrap umb-panel-buttons">
<div class="btn-toolbar umb-btn-toolbar pull-right">
<input type="button" ng-click="submit(dialogData)" class="btn btn-primary" value="select ({{dialogData.selection.length}})" />
<a href ng-click="close()" class="btn btn-link">
<localize key="general_cancel">Cancel</localize>
</a>
<button
class="btn btn-primary"
ng-show="dialogOptions.multiPicker"
ng-click="submit(dialogData)">
<localize key="buttons_select">Select</localize>({{dialogData.selection.length}})
</button>
</div>
</div>
</div>