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

fix up "Do something else"-buttons

Browse Source
This commit is contained in:
Mads Rasmussen
2018-11-14 11:17:44 +01:00
parent b38547396b
commit bea074c964
22 changed files with 416 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js
+4
View File
@@ -65,6 +65,10 @@ function contentCreateController($scope,
close();
}
$scope.closeDialog = function(showMenu) {
navigationService.hideDialog(showMenu);
};
$scope.createBlank = createBlank;
$scope.createOrSelectBlueprintIfAny = createOrSelectBlueprintIfAny;
$scope.createFromBlueprint = createFromBlueprint;
src/Umbraco.Web.UI.Client/src/views/content/create.html
+48 -44
View File
@@ -1,55 +1,59 @@
<div class="umb-dialog-body with-footer" ng-controller="Umbraco.Editors.Content.CreateController" ng-cloak>
<div ng-controller="Umbraco.Editors.Content.CreateController">
<div class="umb-dialog-body with-footer" ng-cloak>
<div class="umb-pane">
<h5 ng-show="selectContentType"><localize key="create_createUnder">Create a page under</localize> {{currentNode.name}}</h5>
<h5 ng-show="selectBlueprint"><localize key="blueprints_selectBlueprint">Select a blueprint</localize></h5>
<div class="umb-pane">
<h5 ng-show="selectContentType"><localize key="create_createUnder">Create a page under</localize> {{currentNode.name}}</h5>
<h5 ng-show="selectBlueprint"><localize key="blueprints_selectBlueprint">Select a blueprint</localize></h5>
<p class="abstract" ng-if="allowedTypes && allowedTypes.length === 0">
<localize key="create_noDocumentTypes" />
</p>
<p class="abstract" ng-if="allowedTypes && allowedTypes.length === 0">
<localize key="create_noDocumentTypes" />
</p>
<ul class="umb-actions umb-actions-child" ng-if="selectContentType && allowedTypes.length > 0">
<ul class="umb-actions umb-actions-child" ng-if="selectContentType && allowedTypes.length > 0">
<li class="umb-action" data-element="action-create-{{docType.alias}}" ng-repeat="docType in allowedTypes | orderBy:'name':false">
<a class="umb-action-link" ng-click="createOrSelectBlueprintIfAny(docType)">
<i class="large icon {{docType.icon}}"></i>
<span class="menu-label">
{{docType.name}}
<small>
{{docType.description}}
</small>
</span>
</a>
</li>
<li class="umb-action" data-element="action-create-{{docType.alias}}" ng-repeat="docType in allowedTypes | orderBy:'name':false">
<a class="umb-action-link" ng-click="createOrSelectBlueprintIfAny(docType)">
<i class="large icon {{docType.icon}}"></i>
<span class="menu-label">
{{docType.name}}
<small>
{{docType.description}}
</small>
</span>
</a>
</li>
</ul>
<ul class="umb-actions umb-actions-child" ng-if="selectBlueprint && docType.blueprints.length > 0">
</ul>
<ul class="umb-actions umb-actions-child" ng-if="selectBlueprint && docType.blueprints.length > 0">
<li class="umb-action" ng-repeat="(key, value) in docType.blueprints | orderBy:'name':false">
<a class="umb-action-link" ng-click="createFromBlueprint(key)">
<i class="large icon {{docType.icon}}"></i>
<span class="menu-label">
{{value}}
</span>
</a>
</li>
<li class="umb-action sep" ng-show="allowBlank">
<a class="umb-action-link" ng-click="createBlank(docType)">
<i class="large icon {{docType.icon}}"></i>
<span class="menu-label">
<localize key="blueprints_blankBlueprint">Blank</localize>
</span>
</a>
</li>
<li class="umb-action" ng-repeat="(key, value) in docType.blueprints | orderBy:'name':false">
<a class="umb-action-link" ng-click="createFromBlueprint(key)">
<i class="large icon {{docType.icon}}"></i>
<span class="menu-label">
{{value}}
</span>
</a>
</li>
<li class="umb-action sep" ng-show="allowBlank">
<a class="umb-action-link" ng-click="createBlank(docType)">
<i class="large icon {{docType.icon}}"></i>
<span class="menu-label">
<localize key="blueprints_blankBlueprint">Blank</localize>
</span>
</a>
</li>
</ul>
</ul>
</div>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<button class="btn btn-info" ng-click="closeDialog(true)">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<button class="btn btn-info" ng-click="closeDialog(true)">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.controller.js
+6
View File
@@ -13,6 +13,7 @@ function ContentBlueprintCreateController($scope, $location, contentTypeResource
var section = appState.getSectionState("currentSection");
vm.createBlueprint = createBlueprint;
vm.close = close;
function onInit() {
@@ -30,6 +31,11 @@ function ContentBlueprintCreateController($scope, $location, contentTypeResource
navigationService.hideMenu();
}
function close() {
const showMenu = true;
navigationService.hideDialog(showMenu);
}
onInit();
}
src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html
+1 -1
View File
@@ -31,7 +31,7 @@
<umb-button
label-key="buttons_somethingElse"
action="nav.hideDialog(true)"
action="vm.close()"
type="button"
button-style="info">
</umb-button>
src/Umbraco.Web.UI.Client/src/views/datatypes/create.controller.js
+7 -1
View File
@@ -41,7 +41,13 @@ function DataTypeCreateController($scope, $location, navigationService, dataType
$location.search('create', null);
$location.path("/" + section + "/datatypes/edit/" + node.id).search("create", "true");
navigationService.hideMenu();
}
};
$scope.close = function() {
const showMenu = true;
navigationService.hideDialog(showMenu);
};
}
angular.module('umbraco').controller("Umbraco.Editors.DataType.CreateController", DataTypeCreateController);
src/Umbraco.Web.UI.Client/src/views/datatypes/create.html
+41 -38
View File
@@ -1,45 +1,48 @@
<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.DataType.CreateController" ng-cloak>
<div ng-controller="Umbraco.Editors.DataType.CreateController">
<div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
<div class="umb-pane" ng-if="!model.creatingFolder">
<h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
<div class="umb-pane" ng-if="!model.creatingFolder">
<h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
<ul class="umb-actions umb-actions-child">
<li data-element="action-data-type" class="umb-action">
<a href="" class="umb-action-link" ng-click="createDataType()" umb-auto-focus>
<i class="large icon icon-autofill"></i>
<span class="menu-label">
<localize key="create_newDataType">New data type</localize>
</span>
</a>
</li>
<li data-element="action-folder" class="umb-action">
<a href="" class="umb-action-link" ng-click="showCreateFolder()">
<i class="large icon icon-folder"></i>
<span class="menu-label">
<localize key="create_newFolder">New folder</localize>...
</span>
</a>
</li>
</ul>
</div>
<div class="umb-pane" ng-if="model.creatingFolder">
<form novalidate name="createFolderForm"
ng-submit="createContainer()"
val-form-manager>
<umb-control-group label="Enter a folder name" hide-label="false">
<input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" required autofocus />
</umb-control-group>
<button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
</form>
</div>
<ul class="umb-actions umb-actions-child">
<li data-element="action-data-type" class="umb-action">
<a href="" class="umb-action-link" ng-click="createDataType()" umb-auto-focus>
<i class="large icon icon-autofill"></i>
<span class="menu-label">
<localize key="create_newDataType">New data type</localize>
</span>
</a>
</li>
<li data-element="action-folder" class="umb-action">
<a href="" class="umb-action-link" ng-click="showCreateFolder()">
<i class="large icon icon-folder"></i>
<span class="menu-label">
<localize key="create_newFolder">New folder</localize>...
</span>
</a>
</li>
</ul>
</div>
<div class="umb-pane" ng-if="model.creatingFolder">
<form novalidate name="createFolderForm"
ng-submit="createContainer()"
val-form-manager>
<umb-control-group label="Enter a folder name" hide-label="false">
<input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" required autofocus />
</umb-control-group>
<button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
</form>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
<button class="btn btn-info" ng-click="close()">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
<button class="btn btn-info" ng-click="nav.hideDialog(true)">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js
+5
View File
@@ -123,6 +123,11 @@ function DocumentTypesCreateController($scope, $location, navigationService, con
$location.path("/settings/documenttypes/edit/" + node.id).search("create", "true").search("notemplate", "true");
navigationService.hideMenu();
};
$scope.close = function() {
const showMenu = true;
navigationService.hideDialog(showMenu);
};
}
angular.module('umbraco').controller("Umbraco.Editors.DocumentTypes.CreateController", DocumentTypesCreateController);
src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
+93 -89
View File
@@ -1,105 +1,109 @@
<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.DocumentTypes.CreateController" ng-cloak>
<div ng-controller="Umbraco.Editors.DocumentTypes.CreateController">
<div class="umb-pane" ng-if="!model.creatingFolder && !model.creatingDoctypeCollection">
<h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
<div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
<ul class="umb-actions umb-actions-child">
<li data-element="action-documentType" class="umb-action" ng-hide="model.disableTemplates">
<a href="" ng-click="createDocType()" class="umb-action-link" umb-auto-focus>
<i class="large icon icon-item-arrangement"></i>
<span class="menu-label">
<localize key="content_documentType">Document type</localize>
</span>
</a>
</li>
<li data-element="action-documentTypeWithoutTemplate" class="umb-action">
<a href="" ng-click="createComponent()" class="umb-action-link">
<i class="large icon icon-item-arrangement"></i>
<span class="menu-label">
<localize ng-if="model.disableTemplates === false" key="create_documentTypeWithoutTemplate"></localize>
<localize ng-if="model.disableTemplates === true" key="content_documentType">Document type></localize>
</span>
</a>
</li>
<li data-element="action-documentTypeCollection" class="umb-action">
<a href="" ng-click="showCreateDocTypeCollection()" class="umb-action-link">
<i class="large icon icon-thumbnail-list"></i>
<span class="menu-label">
Document Type Collection...
<!-- <localize key="content_documentType_collection">Document Type Collection</localize>-->
</span>
</a>
</li>
<li data-element="action-folder" ng-if="model.allowCreateFolder" class="umb-action">
<a href="" ng-click="showCreateFolder()" class="umb-action-link">
<i class="large icon icon-folder"></i>
<span class="menu-label"><localize key="general_folder"></localize>...</span>
</a>
</li>
</ul>
</div>
<div class="umb-pane" ng-if="!model.creatingFolder && !model.creatingDoctypeCollection">
<h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
<div class="umb-pane" ng-if="model.creatingFolder">
<form novalidate name="createFolderForm"
ng-submit="createContainer()"
val-form-manager>
<ul class="umb-actions umb-actions-child">
<li data-element="action-documentType" class="umb-action" ng-hide="model.disableTemplates">
<a href="" ng-click="createDocType()" class="umb-action-link" umb-auto-focus>
<i class="large icon icon-item-arrangement"></i>
<span class="menu-label">
<localize key="content_documentType">Document type</localize>
</span>
</a>
</li>
<li data-element="action-documentTypeWithoutTemplate" class="umb-action">
<a href="" ng-click="createComponent()" class="umb-action-link">
<i class="large icon icon-item-arrangement"></i>
<span class="menu-label">
<localize ng-if="model.disableTemplates === false" key="create_documentTypeWithoutTemplate"></localize>
<localize ng-if="model.disableTemplates === true" key="content_documentType">Document type></localize>
</span>
</a>
</li>
<li data-element="action-documentTypeCollection" class="umb-action">
<a href="" ng-click="showCreateDocTypeCollection()" class="umb-action-link">
<i class="large icon icon-thumbnail-list"></i>
<span class="menu-label">
Document Type Collection...
<!-- <localize key="content_documentType_collection">Document Type Collection</localize>-->
</span>
</a>
</li>
<li data-element="action-folder" ng-if="model.allowCreateFolder" class="umb-action">
<a href="" ng-click="showCreateFolder()" class="umb-action-link">
<i class="large icon icon-folder"></i>
<span class="menu-label"><localize key="general_folder"></localize>...</span>
</a>
</li>
</ul>
</div>
<div ng-show="error">
<div class="alert alert-error">
<div><strong>{{error.errorMsg}}</strong></div>
<div>{{error.data.message}}</div>
<div class="umb-pane" ng-if="model.creatingFolder">
<form novalidate name="createFolderForm"
ng-submit="createContainer()"
val-form-manager>
<div ng-show="error">
<div class="alert alert-error">
<div><strong>{{error.errorMsg}}</strong></div>
<div>{{error.data.message}}</div>
</div>
</div>
</div>
<umb-control-group label="Enter a folder name" hide-label="false">
<input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
</umb-control-group>
<umb-control-group label="Enter a folder name" hide-label="false">
<input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
</umb-control-group>
<button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
</form>
</div>
<button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
</form>
</div>
<div class="umb-pane" ng-if="model.creatingDoctypeCollection">
<small>
A Document Type collection is a fast way to create two Document Types in one task.
The Item Document Type will automatically be
allowed under the Parent Document Type.
</small>
<p>&nbsp;</p>
<form novalidate name="createDoctypeCollectionForm"
ng-submit="createCollection()"
val-form-manager>
<div class="umb-pane" ng-if="model.creatingDoctypeCollection">
<small>
A Document Type collection is a fast way to create two Document Types in one task.
The Item Document Type will automatically be
allowed under the Parent Document Type.
</small>
<p>&nbsp;</p>
<form novalidate name="createDoctypeCollectionForm"
ng-submit="createCollection()"
val-form-manager>
<div ng-show="error">
<div class="alert alert-error">
<div><strong>{{error.errorMsg}}</strong></div>
<div>{{error.data.message}}</div>
<div ng-show="error">
<div class="alert alert-error">
<div><strong>{{error.errorMsg}}</strong></div>
<div>{{error.data.message}}</div>
</div>
</div>
</div>
<umb-control-group label="Name of the Parent Document Type" hide-label="false">
<input type="text" name="collectionName" ng-model="model.collectionName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
<span ng-if="model.disableTemplates === false">
<umb-toggle on-click="model.collectionCreateTemplate = !model.collectionCreateTemplate" checked="model.collectionCreateTemplate"></umb-toggle>
<label>Create template for the Parent Document Type</label>
</span>
</umb-control-group>
<umb-control-group label="Name of the Parent Document Type" hide-label="false">
<input type="text" name="collectionName" ng-model="model.collectionName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
<span ng-if="model.disableTemplates === false">
<umb-toggle on-click="model.collectionCreateTemplate = !model.collectionCreateTemplate" checked="model.collectionCreateTemplate"></umb-toggle>
<label>Create template for the Parent Document Type</label>
</span>
</umb-control-group>
<umb-control-group label="Name of the Item Document Type" hide-label="false">
<input type="text" name="collectionItemName" ng-model="model.collectionItemName" class="umb-textstring textstring input-block-level" required />
<span ng-if="model.disableTemplates === false">
<umb-toggle on-click="model.collectionItemCreateTemplate = !model.collectionItemCreateTemplate" checked="model.collectionItemCreateTemplate"></umb-toggle>
<label>Create template for the Item Document Type</label>
</span>
</umb-control-group>
<umb-control-group label="Name of the Item Document Type" hide-label="false">
<input type="text" name="collectionItemName" ng-model="model.collectionItemName" class="umb-textstring textstring input-block-level" required />
<span ng-if="model.disableTemplates === false">
<umb-toggle on-click="model.collectionItemCreateTemplate = !model.collectionItemCreateTemplate" checked="model.collectionItemCreateTemplate"></umb-toggle>
<label>Create template for the Item Document Type</label>
</span>
</umb-control-group>
<button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
</form>
<button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
</form>
</div>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
<button class="btn btn-info" ng-click="close(true)">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
<button class="btn btn-info" ng-click="nav.hideDialog(true)">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
src/Umbraco.Web.UI.Client/src/views/media/create.html
+32 -30
View File
@@ -1,44 +1,46 @@
<div class="umb-dialog-body with-footer" ng-controller="Umbraco.Editors.Media.CreateController">
<div class="umb-pane">
<div ng-controller="Umbraco.Editors.Media.CreateController">
<div class="umb-dialog-body with-footer">
<div class="umb-pane">
<h5><localize key="create_createUnder">Create under</localize> {{currentNode.name}}</h5>
<h5><localize key="create_createUnder">Create under</localize> {{currentNode.name}}</h5>
<p class="abstract" ng-hide="allowedTypes">
<localize key="create_noMediaTypes" />
</p>
<p class="abstract" ng-hide="allowedTypes">
<localize key="create_noMediaTypes" />
</p>
<ul class="umb-actions umb-actions-child">
<ul class="umb-actions umb-actions-child">
<li data-element="action-{{docType.alias}}" class="umb-action" ng-repeat="docType in allowedTypes">
<a ng-href="" ng-click="createMediaItem(docType)" class="umb-action-link" prevent-default>
<i class="large icon {{docType.icon}}"></i>
<span class="menu-label">
{{docType.name}}
<small>{{docType.description}}</small>
</span>
</a>
</li>
<!--
<li class="add">
<a href="#settings/documenttype/create/{{currentNode.id}}?doctype={{docType.alias}}&create=true" ng-click="nav.hideNavigation()">
<i class="icon-large icon-plus"></i>
<li data-element="action-{{docType.alias}}" class="umb-action" ng-repeat="docType in allowedTypes">
<a ng-href="" ng-click="createMediaItem(docType)" class="umb-action-link" prevent-default>
<i class="large icon {{docType.icon}}"></i>
<span class="menu-label">
Create a new media type
<small>
Design and configure a new media type
</small>
{{docType.name}}
<small>{{docType.description}}</small>
</span>
</a>
</li>
-->
</ul>
<!--
<li class="add">
<a href="#settings/documenttype/create/{{currentNode.id}}?doctype={{docType.alias}}&create=true" ng-click="nav.hideNavigation()">
<i class="icon-large icon-plus"></i>
<span class="menu-label">
Create a new media type
<small>
Design and configure a new media type
</small>
</span>
</a>
</li>
-->
</ul>
</div>
</div>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<button class="btn btn-info" ng-click="nav.hideDialog(true)">
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<button class="btn btn-info" ng-click="close()">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
</div>
src/Umbraco.Web.UI.Client/src/views/media/media.create.controller.js
+5
View File
@@ -16,6 +16,11 @@ function mediaCreateController($scope, $routeParams, $location, mediaTypeResourc
$location.path("/media/media/edit/" + $scope.currentNode.id).search("doctype", docType.alias).search("create", "true");
navigationService.hideMenu();
};
$scope.close = function() {
const showMenu = true;
navigationService.hideDialog(showMenu);
};
}
src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js
+6 -1
View File
@@ -45,7 +45,12 @@ function MediaTypesCreateController($scope, $location, navigationService, mediaT
$location.search('create', null);
$location.path("/settings/mediatypes/edit/" + node.id).search("create", "true");
navigationService.hideMenu();
}
};
$scope.close = function() {
const showMenu = true;
navigationService.hideDialog(showMenu);
};
}
angular.module('umbraco').controller("Umbraco.Editors.MediaTypes.CreateController", MediaTypesCreateController);
src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
+41 -37
View File
@@ -1,44 +1,48 @@
<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.MediaTypes.CreateController" ng-cloak>
<div ng-controller="Umbraco.Editors.MediaTypes.CreateController">
<div class="umb-pane" ng-if="!model.creatingFolder">
<h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
<div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
<div class="umb-pane" ng-if="!model.creatingFolder">
<h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
<ul class="umb-actions umb-actions-child">
<li class="umb-action">
<a href="" class="umb-action-link" ng-click="createMediaType()" umb-auto-focus>
<i class="large icon icon-item-arrangement"></i>
<span class="menu-label">
<localize key="general_new">New</localize>
<localize key="content_mediatype">Media type</localize>
</span>
</a>
</li>
<li class="umb-action">
<a href="" class="umb-action-link" ng-click="showCreateFolder()">
<i class="large icon icon-folder"></i>
<span class="menu-label"><localize key="general_folder"></localize>...</span>
</a>
</li>
</ul>
</div>
<div class="umb-pane" ng-if="model.creatingFolder">
<form novalidate name="createFolderForm"
ng-submit="createContainer()"
val-form-manager>
<umb-control-group label="Enter a folder name" hide-label="false">
<input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" required />
</umb-control-group>
<button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
</form>
</div>
<ul class="umb-actions umb-actions-child">
<li class="umb-action">
<a href="" class="umb-action-link" ng-click="createMediaType()" umb-auto-focus>
<i class="large icon icon-item-arrangement"></i>
<span class="menu-label">
<localize key="general_new">New</localize>
<localize key="content_mediatype">Media type</localize>
</span>
</a>
</li>
<li class="umb-action">
<a href="" class="umb-action-link" ng-click="showCreateFolder()">
<i class="large icon icon-folder"></i>
<span class="menu-label"><localize key="general_folder"></localize>...</span>
</a>
</li>
</ul>
</div>
<div class="umb-pane" ng-if="model.creatingFolder">
<form novalidate name="createFolderForm"
ng-submit="createContainer()"
val-form-manager>
<umb-control-group label="Enter a folder name" hide-label="false">
<input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" required />
</umb-control-group>
<button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
</form>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
<button class="btn btn-info" ng-click="close()">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
<button class="btn btn-info" ng-click="nav.hideDialog(true)">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
src/Umbraco.Web.UI.Client/src/views/member/create.html
+22 -19
View File
@@ -1,25 +1,28 @@
<div class="umb-dialog-body with-footer" ng-controller="Umbraco.Editors.Member.CreateController" ng-cloak>
<div class="umb-pane">
<div ng-controller="Umbraco.Editors.Member.CreateController">
<div class="umb-dialog-body with-footer" ng-cloak>
<div class="umb-pane">
<h5><localize key="member_createNewMember">Create a new member</localize></h5>
<ul class="umb-actions umb-actions-child">
<h5><localize key="member_createNewMember">Create a new member</localize></h5>
<ul class="umb-actions umb-actions-child">
<li class="umb-action" ng-repeat="docType in allowedTypes">
<a class="umb-action-link" href="#member/member/edit/{{currentNode.id}}?doctype={{docType.alias}}&create=true" ng-click="nav.hideNavigation()">
<i class="large icon {{docType.icon}}"></i>
<span class="menu-label">
{{docType.name}}
<small>{{docType.description}}</small>
</span>
</a>
</li>
</ul>
<li class="umb-action" ng-repeat="docType in allowedTypes">
<a class="umb-action-link" href="#member/member/edit/{{currentNode.id}}?doctype={{docType.alias}}&create=true" ng-click="nav.hideNavigation()">
<i class="large icon {{docType.icon}}"></i>
<span class="menu-label">
{{docType.name}}
<small>{{docType.description}}</small>
</span>
</a>
</li>
</ul>
</div>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" >
<button type="button" class="btn btn-info" ng-click="close()">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" >
<button type="button" class="btn btn-info" ng-click="nav.hideDialog(true)">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js
+6 -1
View File
@@ -6,11 +6,16 @@
* @description
* The controller for the member creation dialog
*/
function memberCreateController($scope, $routeParams, memberTypeResource, iconHelper) {
function memberCreateController($scope, memberTypeResource, iconHelper, navigationService) {
memberTypeResource.getTypes($scope.currentNode.id).then(function (data) {
$scope.allowedTypes = iconHelper.formatContentTypeIcons(data);
});
$scope.close = function() {
const showMenu = true;
navigationService.hideDialog(showMenu);
};
}
src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js
+7 -1
View File
@@ -1,7 +1,7 @@
(function () {
"use strict";
function PartialViewMacrosCreateController($scope, codefileResource, macroResource, $location, navigationService, formHelper, localizationService, appState) {
function PartialViewMacrosCreateController($scope, codefileResource, $location, navigationService, formHelper, appState) {
var vm = this;
var node = $scope.currentNode;
@@ -19,6 +19,7 @@
vm.createFileWithoutMacro = createFileWithoutMacro;
vm.showCreateFromSnippet = showCreateFromSnippet;
vm.createFileFromSnippet = createFileFromSnippet;
vm.close = close;
function onInit() {
codefileResource.getSnippets('partialViewMacros')
@@ -76,6 +77,11 @@
vm.showSnippets = true;
}
function close() {
const showMenu = true;
navigationService.hideDialog(showMenu);
}
onInit();
}
src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
+1 -1
View File
@@ -79,7 +79,7 @@
<!-- Dialog footer -->
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<button class="btn btn-info" ng-click="nav.hideDialog(true)">
<button class="btn btn-info" ng-click="vm.close()">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js
+7 -1
View File
@@ -1,7 +1,7 @@
(function () {
"use strict";
function PartialViewsCreateController($scope, codefileResource, $location, navigationService, formHelper, localizationService, appState) {
function PartialViewsCreateController($scope, codefileResource, $location, navigationService, formHelper, appState) {
var vm = this;
var node = $scope.currentNode;
@@ -16,6 +16,7 @@
vm.showCreateFolder = showCreateFolder;
vm.createFolder = createFolder;
vm.showCreateFromSnippet = showCreateFromSnippet;
vm.close = close;
function onInit() {
codefileResource.getSnippets('partialViews')
@@ -69,6 +70,11 @@
function showCreateFromSnippet() {
vm.showSnippets = true;
}
function close() {
const showMenu = true;
navigationService.hideDialog(showMenu);
}
onInit();
src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
+1 -1
View File
@@ -69,7 +69,7 @@
<!-- Dialog footer -->
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<button class="btn btn-info" ng-click="nav.hideDialog(true)">
<button class="btn btn-info" ng-click="vm.close()">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
+6
View File
@@ -14,6 +14,7 @@
vm.createFile = createFile;
vm.showCreateFolder = showCreateFolder;
vm.createFolder = createFolder;
vm.close = close;
function createFile() {
$location.path("/settings/scripts/edit/" + node.id).search("create", "true");
@@ -52,6 +53,11 @@
}
function close() {
const showMenu = true;
navigationService.hideDialog(showMenu);
}
}
angular.module("umbraco").controller("Umbraco.Editors.Scripts.CreateController", ScriptsCreateController);
src/Umbraco.Web.UI.Client/src/views/scripts/create.html
+43 -39
View File
@@ -1,49 +1,53 @@
<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.Scripts.CreateController as vm" ng-cloak>
<div ng-controller="Umbraco.Editors.Scripts.CreateController as vm">
<div class="umb-pane" ng-if="!vm.creatingFolder">
<h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
<div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
<ul class="umb-actions umb-actions-child">
<li class="umb-action">
<a href="" class="umb-action-link" umb-auto-focus ng-click="vm.createFile()">
<i class="large icon icon-script"></i>
<span class="menu-label"><localize key="create_newJavascriptFile">New javascript file</localize></span>
</a>
</li>
<li class="umb-action">
<a href="" class="umb-action-link" ng-click="vm.showCreateFolder()">
<i class="large icon icon-folder"></i>
<span class="menu-label"><localize key="general_folder"></localize>...</span>
</a>
</li>
</ul>
<div class="umb-pane" ng-if="!vm.creatingFolder">
<h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
</div>
<ul class="umb-actions umb-actions-child">
<li class="umb-action">
<a href="" class="umb-action-link" umb-auto-focus ng-click="vm.createFile()">
<i class="large icon icon-script"></i>
<span class="menu-label"><localize key="create_newJavascriptFile">New javascript file</localize></span>
</a>
</li>
<li class="umb-action">
<a href="" class="umb-action-link" ng-click="vm.showCreateFolder()">
<i class="large icon icon-folder"></i>
<span class="menu-label"><localize key="general_folder"></localize>...</span>
</a>
</li>
</ul>
<div class="umb-pane" ng-if="vm.creatingFolder">
<form novalidate name="createFolderForm"
ng-submit="vm.createFolder(createFolderForm)"
val-form-manager>
<div ng-show="vm.createFolderError">
<div class="alert alert-error">
<div><strong>{{vm.createFolderError.errorMsg}}</strong></div>
<div>{{vm.createFolderError.data.message}}</div>
</div>
<div class="umb-pane" ng-if="vm.creatingFolder">
<form novalidate name="createFolderForm"
ng-submit="vm.createFolder(createFolderForm)"
val-form-manager>
<div ng-show="vm.createFolderError">
<div class="alert alert-error">
<div><strong>{{vm.createFolderError.errorMsg}}</strong></div>
<div>{{vm.createFolderError.data.message}}</div>
</div>
</div>
</div>
<umb-control-group label="Enter a folder name" hide-label="false">
<input type="text" name="folderName" ng-model="vm.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
</umb-control-group>
<umb-control-group label="Enter a folder name" hide-label="false">
<input type="text" name="folderName" ng-model="vm.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
</umb-control-group>
<button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
</form>
</div>
<button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
</form>
</div>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!vm.creatingFolder">
<button class="btn btn-info" ng-click="vm.close()">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!vm.creatingFolder">
<button class="btn btn-info" ng-click="nav.hideDialog(true)">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
</div>
src/Umbraco.Web.UI.Client/src/views/stylesheets/create.controller.js
+7
View File
@@ -8,6 +8,7 @@
vm.createFile = createFile;
vm.createRichtextStyle = createRichtextStyle;
vm.close = close;
function createFile() {
$location.path("/settings/stylesheets/edit/" + node.id).search("create", "true");
@@ -18,6 +19,12 @@
$location.path("/settings/stylesheets/edit/" + node.id).search("create", "true").search("rtestyle", "true");
navigationService.hideMenu();
}
function close() {
const showMenu = true;
navigationService.hideDialog(showMenu);
}
}
angular.module("umbraco").controller("Umbraco.Editors.StyleSheets.CreateController", StyleSheetsCreateController);
src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
+27 -23
View File
@@ -1,29 +1,33 @@
<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.StyleSheets.CreateController as vm" ng-cloak>
<div ng-controller="Umbraco.Editors.StyleSheets.CreateController as vm">
<div class="umb-pane">
<h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
<div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
<ul class="umb-actions umb-actions-child">
<li class="umb-action">
<a href="" class="umb-action-link" umb-auto-focus ng-click="vm.createFile()">
<i class="large icon icon-script"></i>
<span class="menu-label"><localize key="create_newStyleSheetFile">New style sheet file</localize></span>
</a>
</li>
<li class="umb-action">
<a href="" ng-click="vm.createRichtextStyle()" class="umb-action-link">
<i class="large icon icon-script"></i>
<span class="menu-label"><localize key="create_newRteStyleSheetFile">New richtext style sheet file</localize></span>
</a>
</li>
</ul>
<div class="umb-pane">
<h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
<ul class="umb-actions umb-actions-child">
<li class="umb-action">
<a href="" class="umb-action-link" umb-auto-focus ng-click="vm.createFile()">
<i class="large icon icon-script"></i>
<span class="menu-label"><localize key="create_newStyleSheetFile">New style sheet file</localize></span>
</a>
</li>
<li class="umb-action">
<a href="" ng-click="vm.createRichtextStyle()" class="umb-action-link">
<i class="large icon icon-script"></i>
<span class="menu-label"><localize key="create_newRteStyleSheetFile">New richtext style sheet file</localize></span>
</a>
</li>
</ul>
</div>
</div>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<button class="btn btn-info" ng-click="vm.close()">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<button class="btn btn-info" ng-click="nav.hideDialog(true)">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
</div>