Align create buttons styling (#11352)

* Added button for cancelling dictionary create action

* Use hideMenu

* Align dictionary create with the other creates

* Align import documenttype

* Align for data type folder create

* Align document type create buttons

* Forgot small ng-show

* Align create media folder buttons

* Align create macro buttons

* Align create relation buttons

* Align create partial view macro folder buttons

* Align partial view folder create buttons

* Align create scripts folder buttons

* Align create scripts folder buttons

* Use primary instead of success
This commit is contained in:
patrickdemooij9
2021-10-13 01:03:19 +02:00
committed by GitHub
parent 93720c9897
commit 03b2aed91e
15 changed files with 617 additions and 484 deletions

View File

@@ -1,54 +1,66 @@
<div ng-controller="Umbraco.Editors.DataType.CreateController">
<div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
<div class="umb-pane" ng-show="!model.creatingFolder">
<h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
<div ng-show="!model.creatingFolder">
<div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
<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 data-element="action-data-type" class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createDataType()" umb-auto-focus>
<umb-icon icon="icon-autofill" class="icon large"></umb-icon>
<span class="menu-label">
<localize key="create_newDataType">New data type</localize>
</span>
</button>
</li>
<li data-element="action-folder" class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
<umb-icon icon="icon-folder" class="icon large"></umb-icon>
<span class="menu-label">
<localize key="create_newFolder">New folder</localize>...
</span>
</button>
</li>
</ul>
</div>
<ul class="umb-actions umb-actions-child">
<li data-element="action-data-type" class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createDataType()" umb-auto-focus>
<umb-icon icon="icon-autofill" class="icon large"></umb-icon>
<span class="menu-label">
<localize key="create_newDataType">New data type</localize>
</span>
</button>
</li>
<li data-element="action-folder" class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
<umb-icon icon="icon-folder" class="icon large"></umb-icon>
<span class="menu-label">
<localize key="create_newFolder">New folder</localize>...
</span>
</button>
</li>
</ul>
</div>
<div class="umb-pane" ng-show="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"
focus-when="{{model.creatingFolder}}"
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">
<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" ng-if="!model.creatingFolder">
<button type="button" class="btn btn-info" ng-click="close()">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
<div ng-show="model.creatingFolder">
<form novalidate name="createFolderForm"
ng-submit="createContainer()"
val-form-manager>
<div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
<div class="umb-pane" ng-show="model.creatingFolder">
<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"
focus-when="{{model.creatingFolder}}"
required />
</umb-control-group>
</div>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<umb-button type="button"
button-style="link"
action="close()"
label-key="general_close">
</umb-button>
<umb-button type="submit"
button-style="primary"
label-key="general_create">
</umb-button>
</div>
</form>
</div>
</div>

View File

@@ -1,21 +1,31 @@
<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.Dictionary.CreateController as vm">
<div class="umb-pane">
<h5 tabindex="0"><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
</div>
<div class="umb-pane">
<form novalidate name="createDictionaryForm"
ng-submit="vm.createItem()"
val-form-manager>
<div class="umbracoDialog" ng-controller="Umbraco.Editors.Dictionary.CreateController as vm">
<umb-control-group label="@general_name" hide-label="false" alias="itemKey">
<input type="text" name="itemKey" id="itemKey" ng-model="vm.itemKey" class="umb-textstring textstring input-block-level"
umb-auto-focus required
maxlength="1000"/>
</umb-control-group>
<form novalidate name="createDictionaryForm"
ng-submit="vm.createItem()"
val-form-manager>
<div class="umb-dialog-body with-footer">
<div class="umb-pane">
<h5 tabindex="0"><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
</div>
<button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
</form>
</div>
<div class="umb-pane">
<umb-control-group label="@general_name" hide-label="false" alias="itemKey">
<input type="text" name="itemKey" id="itemKey" ng-model="vm.itemKey" class="umb-textstring textstring input-block-level"
umb-auto-focus required
maxlength="1000" />
</umb-control-group>
</div>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<umb-button type="button"
button-style="link"
action="vm.close()"
label-key="general_close">
</umb-button>
<umb-button type="submit"
button-style="primary"
label-key="general_create">
</umb-button>
</div>
</form>
</div>

View File

@@ -12,7 +12,13 @@ function DictionaryCreateController($scope, $location, dictionaryResource, navig
vm.itemKey = "";
vm.createItem = createItem;
vm.close = close;
$scope.$emit("$changeTitle", "");
function close() {
navigationService.hideDialog();
}
function createItem() {
if (formHelper.submitForm({ scope: $scope, formCtrl: $scope.createDictionaryForm })) {

View File

@@ -1,7 +1,9 @@
<div ng-controller="Umbraco.Editors.DocumentTypes.CreateController">
<div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
<div class="umb-pane" ng-show="!model.creatingFolder">
<h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
<div ng-show="!model.creatingFolder" ng-cloak>
<div class="umbracoDialog umb-dialog-body with-footer">
<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 data-element="action-documentType" class="umb-action" ng-hide="model.disableTemplates">
@@ -54,38 +56,52 @@
</ul>
</div>
<div class="umb-pane" ng-show="model.creatingFolder">
<form novalidate name="createFolderForm"
ng-submit="createContainer()"
val-form-manager>
</div>
<div ng-show="error">
<div class="alert alert-error">
<div><strong>{{error.errorMsg}}</strong></div>
<div>{{error.data.message}}</div>
</div>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<button type="button" class="btn btn-info" ng-click="close(true)">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
<umb-control-group label="Enter a folder name" hide-label="false">
<input
type="text"
name="folderName"
maxlength="255"
ng-model="model.folderName"
class="umb-textstring textstring input-block-level"
focus-when="{{model.creatingFolder}}"
required />
</umb-control-group>
<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 type="button" class="btn btn-info" ng-click="close(true)">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
<div ng-show="model.creatingFolder" ng-cloak>
<form novalidate name="createFolderForm"
ng-submit="createContainer()"
val-form-manager>
<div class="umbracoDialog umb-dialog-body with-footer">
<div class="umb-pane">
<div ng-show="error">
<div class="alert alert-error">
<div><strong>{{error.errorMsg}}</strong></div>
<div>{{error.data.message}}</div>
</div>
</div>
<umb-control-group label="Enter a folder name" hide-label="false">
<input type="text"
name="folderName"
maxlength="255"
ng-model="model.folderName"
class="umb-textstring textstring input-block-level"
focus-when="{{model.creatingFolder}}"
required />
</umb-control-group>
</div>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<umb-button type="button"
button-style="link"
action="close(true)"
label-key="general_close">
</umb-button>
<umb-button type="submit"
button-style="primary"
label-key="general_create">
</umb-button>
</div>
</form>
</div>
</div>

View File

@@ -1,12 +1,14 @@
angular.module("umbraco")
.controller("Umbraco.Editors.DocumentTypes.ImportController",
function ($scope, contentTypeResource, navigationService, Upload, umbRequestHelper) {
function ($scope, contentTypeResource, navigationService, Upload, umbRequestHelper) {
var vm = this;
vm.serverErrorMessage = "";
vm.state = "upload";
vm.model = {};
vm.uploadStatus = "";
vm.cancelButtonLabel = "cancel";
$scope.handleFiles = function (files, event) {
if (files && files.length > 0) {
$scope.upload(files[0]);
@@ -67,10 +69,12 @@ angular.module("umbraco")
$scope.import = function () {
contentTypeResource.import(vm.model.tempFileName);
vm.state = "done";
vm.cancelButtonLabel = "general_close";
}
$scope.close = function() {
$scope.close = function () {
navigationService.hideDialog();
};
});

View File

@@ -1,51 +1,58 @@
<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.DocumentTypes.ImportController as vm">
<div ng-if="vm.state === 'upload'">
<p>
<localize key="settings_importDocumentTypeHelp">
To import a document type, find the '.udt' file on your computer by clicking the 'Browse' button and click 'Import' (you'll be asked for confirmation on the next screen)
</localize>
</p>
<div class="umb-dialog" ng-controller="Umbraco.Editors.DocumentTypes.ImportController as vm">
<form name="importDoctype">
<div class="umb-dialog-body with-footer">
<div class="umb-pane">
<div ng-if="vm.state === 'upload'">
<p>
<localize key="settings_importDocumentTypeHelp">
To import a document type, find the '.udt' file on your computer by clicking the 'Browse' button and click 'Import' (you'll be asked for confirmation on the next screen)
</localize>
</p>
<!-- Select files -->
<button class="btn btn-action"
name="file"
ngf-select
ng-model="filesHolder"
ngf-change="handleFiles($files, $event)"
ngf-multiple="true"
ngf-pattern="*.udt">
<localize key="general_import">Import</localize>
</button>
<form name="importDoctype">
<localize key="general_or">or</localize>
<!-- Select files -->
<button class="btn btn-action"
name="file"
ngf-select
ng-model="filesHolder"
ngf-change="handleFiles($files, $event)"
ngf-multiple="true"
ngf-pattern="*.udt">
<localize key="general_import">Import</localize>
</button>
</form>
<button type="button" class="btn-link" ng-click="close()">
<localize key="cancel">Cancel</localize>
</button>
</form>
<div ng-if="importDoctype.file.$error.pattern">Please choose a .udt file to import</div>
<div ng-if="importDoctype.file.$error.pattern">Please choose a .udt file to import</div>
</div>
<div ng-if="vm.state === 'confirm'">
<strong>
<localize key="name">Name</localize>:
</strong>
{{vm.model.name}}
<br />
<strong>
<localize key="alias">Alias</localize>:
</strong>
{{vm.model.alias}}
<br />
<br />
<button class="btn btn-primary" ng-click="import()">
<localize key="actions_importDocumentType">Import</localize>
</button>
</div>
<div ng-if="vm.state === 'done'">
{{vm.model.name}} has been imported!
</div>
</div>
</div>
<div ng-if="vm.state === 'confirm'">
<strong>
<localize key="name">Name</localize>:
</strong>
{{vm.model.name}}
<br />
<strong>
<localize key="alias">Alias</localize>:
</strong>
{{vm.model.alias}}
<br />
<br />
<button class="btn btn-primary" ng-click="import()">
<localize key="actions_importDocumentType">Import</localize>
</button>
</div>
<div ng-if="vm.state === 'done'">
{{vm.model.name}} has been imported!
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<umb-button type="button"
button-style="link"
action="close()"
label-key="{{vm.cancelButtonLabel}}">
</umb-button>
</div>
</div>

View File

@@ -1,16 +1,15 @@
<div ng-controller="Umbraco.Editors.Macros.CreateController as vm">
<div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
<div class="umb-pane">
<h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
</div>
<div class="umb-pane">
<form novalidate name="createMacroForm"
ng-submit="vm.createItem()"
val-form-manager>
<form novalidate name="createMacroForm"
ng-submit="vm.createItem()"
val-form-manager>
<div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
<div class="umb-pane">
<h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
</div>
<div class="umb-pane">
<div ng-show="error">
<div class="alert alert-error">
<div><strong>{{error.errorMsg}}</strong></div>
@@ -22,10 +21,19 @@
<input type="text" name="itemKey" ng-model="vm.itemKey" class="umb-textstring textstring input-block-level"
umb-auto-focus required maxlength="255" />
</umb-control-group>
</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">
<umb-button type="button"
button-style="link"
action="close()"
label-key="general_close">
</umb-button>
<umb-button type="submit"
button-style="primary"
label-key="general_create">
</umb-button>
</div>
</form>
</div>

View File

@@ -42,6 +42,10 @@ function MacrosCreateController($scope, $location, macroResource, navigationServ
}
}
$scope.close = function () {
navigationService.hideDialog(true);
};
vm.createItem = createItem;
}

View File

@@ -1,61 +1,72 @@
<div ng-controller="Umbraco.Editors.MediaTypes.CreateController">
<div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
<div ng-show="!model.creatingFolder" ng-cloak>
<div class="umbracoDialog umb-dialog-body with-footer">
<div class="umb-pane" ng-show="!model.creatingFolder">
<h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
<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">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createMediaType()" umb-auto-focus>
<umb-icon icon="icon-item-arrangement" class="icon large"></umb-icon>
<span class="menu-label">
<localize key="general_new">New</localize>
<localize key="content_mediatype">Media type</localize>
</span>
</button>
</li>
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
<umb-icon icon="icon-folder" class="icon large"></umb-icon>
<span class="menu-label"><localize key="general_folder"></localize>...</span>
</button>
</li>
</ul>
<ul class="umb-actions umb-actions-child">
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createMediaType()" umb-auto-focus>
<umb-icon icon="icon-item-arrangement" class="icon large"></umb-icon>
<span class="menu-label">
<localize key="general_new">New</localize>
<localize key="content_mediatype">Media type</localize>
</span>
</button>
</li>
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
<umb-icon icon="icon-folder" class="icon large"></umb-icon>
<span class="menu-label"><localize key="general_folder"></localize>...</span>
</button>
</li>
</ul>
</div>
</div>
<div class="umb-pane" ng-show="model.creatingFolder">
<form novalidate name="createFolderForm"
ng-submit="createContainer()"
val-form-manager>
<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 ng-show="error">
<div class="alert alert-error">
<div><strong>{{error.errorMsg}}</strong></div>
<div>{{error.data.message}}</div>
<div ng-show="model.creatingFolder" ng-cloak>
<form novalidate name="createFolderForm"
ng-submit="createContainer()"
val-form-manager>
<div class="umbracoDialog umb-dialog-body with-footer">
<div class="umb-pane" ng-show="model.creatingFolder">
<div ng-show="error">
<div class="alert alert-error">
<div><strong>{{error.errorMsg}}</strong></div>
<div>{{error.data.message}}</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"
focus-when="{{model.creatingFolder}}"
required />
</umb-control-group>
</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"
focus-when="{{model.creatingFolder}}"
required />
</umb-control-group>
<button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
</form>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<umb-button type="button"
button-style="link"
action="close()"
label-key="general_close">
</umb-button>
<umb-button type="submit"
button-style="primary"
label-key="general_create">
</umb-button>
</div>
</form>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
<button type="button" class="btn btn-info" ng-click="close()">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
</div>

View File

@@ -1,86 +1,97 @@
<div ng-controller="Umbraco.Editors.PartialViewMacros.CreateController as vm" ng-cloak>
<div class="umbracoDialog umb-dialog-body with-footer">
<div ng-if="!vm.creatingFolder">
<div class="umbracoDialog umb-dialog-body with-footer">
<div class="umb-pane" ng-if="!vm.creatingFolder">
<div class="umb-pane">
<!-- Main options -->
<div ng-if="!vm.showSnippets">
<!-- Main options -->
<div ng-if="!vm.showSnippets">
<h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
<h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
<ul class="umb-actions umb-actions-child">
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.createFile()" umb-auto-focus>
<umb-icon icon="icon-article" class="icon large"></umb-icon>
<span class="menu-label"><localize key="create_newPartialViewMacro">New partial view macro</localize></span>
</button>
</li>
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.createFileWithoutMacro()">
<umb-icon icon="icon-article" class="icon large"></umb-icon>
<span class="menu-label"><localize key="create_newPartialViewMacroNoMacro">New partial view macro (without macro)</localize></span>
</button>
</li>
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFromSnippet()">
<umb-icon icon="icon-article" class="icon large"></umb-icon>
<span class="menu-label"><localize key="create_newPartialViewMacroFromSnippet">>New partial view macro from snippet</localize>...</span>
</button>
</li>
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
<umb-icon icon="icon-folder" class="icon large"></umb-icon>
<span class="menu-label"><localize key="general_folder"></localize>...</span>
</button>
</li>
</ul>
</div>
<!-- Snippets list -->
<div ng-if="vm.showSnippets">
<h5><localize key="defaultdialogs_selectSnippet">Select snippet</localize></h5>
<ul class="umb-actions umb-actions-child">
<li class="umb-action" ng-repeat="snippet in vm.snippets">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.createFileFromSnippet(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
<umb-icon icon="icon-article" class="icon large"></umb-icon>
<span class="menu-label" style="margin-left: 0; padding-left: 5px;">{{ snippet.name }}</span>
</button>
</li>
</ul>
</div>
</div>
<!-- Create folder -->
<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>{{vm.createFolderError.data.message}}</div>
</div>
<ul class="umb-actions umb-actions-child">
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.createFile()" umb-auto-focus>
<umb-icon icon="icon-article" class="icon large"></umb-icon>
<span class="menu-label"><localize key="create_newPartialViewMacro">New partial view macro</localize></span>
</button>
</li>
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.createFileWithoutMacro()">
<umb-icon icon="icon-article" class="icon large"></umb-icon>
<span class="menu-label"><localize key="create_newPartialViewMacroNoMacro">New partial view macro (without macro)</localize></span>
</button>
</li>
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFromSnippet()">
<umb-icon icon="icon-article" class="icon large"></umb-icon>
<span class="menu-label"><localize key="create_newPartialViewMacroFromSnippet">>New partial view macro from snippet</localize>...</span>
</button>
</li>
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
<umb-icon icon="icon-folder" class="icon large"></umb-icon>
<span class="menu-label"><localize key="general_folder"></localize>...</span>
</button>
</li>
</ul>
</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 no-dirty-check />
</umb-control-group>
<!-- Snippets list -->
<div ng-if="vm.showSnippets">
<button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
</form>
<h5><localize key="defaultdialogs_selectSnippet">Select snippet</localize></h5>
<ul class="umb-actions umb-actions-child">
<li class="umb-action" ng-repeat="snippet in vm.snippets">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.createFileFromSnippet(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
<umb-icon icon="icon-article" class="icon large"></umb-icon>
<span class="menu-label" style="margin-left: 0; padding-left: 5px;">{{ snippet.name }}</span>
</button>
</li>
</ul>
</div>
</div>
</div>
<!-- Dialog footer -->
<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>
<!-- Dialog footer -->
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="vm.creatingFolder">
<button class="btn btn-info" ng-click="vm.close()">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
<div ng-if="vm.creatingFolder">
<form novalidate name="createFolderForm"
ng-submit="vm.createFolder(createFolderForm)"
val-form-manager>
<div class="umbracoDialog umb-dialog-body with-footer">
<!-- Create folder -->
<div class="umb-pane">
<div ng-show="vm.createFolderError">
<div class="alert alert-error">
<div>{{vm.createFolderError.data.message}}</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 no-dirty-check />
</umb-control-group>
</div>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<umb-button type="button"
button-style="link"
action="vm.close()"
label-key="general_close">
</umb-button>
<umb-button type="submit"
button-style="primary"
label-key="general_create">
</umb-button>
</div>
</form>
</div>
</div>

View File

@@ -1,76 +1,87 @@
<div ng-controller="Umbraco.Editors.PartialViews.CreateController as vm" ng-cloak>
<div class="umbracoDialog umb-dialog-body with-footer">
<div ng-if="!vm.creatingFolder">
<div class="umbracoDialog umb-dialog-body with-footer">
<div class="umb-pane" ng-if="!vm.creatingFolder">
<h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
<div class="umb-pane">
<!-- Main options -->
<div ng-if="!vm.showSnippets">
<ul class="umb-actions umb-actions-child">
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.createPartialView()" umb-auto-focus>
<umb-icon icon="icon-article" class="icon large"></umb-icon>
<span class="menu-label"><localize key="create_newEmptyPartialView">New empty partial view</localize></span>
</button>
</li>
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFromSnippet()">
<umb-icon icon="icon-article" class="icon large"></umb-icon>
<span class="menu-label"><localize key="create_newPartialViewFromSnippet">New partial view from snippet</localize>...</span>
</button>
</li>
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
<umb-icon icon="icon-folder" class="icon large"></umb-icon>
<span class="menu-label"><localize key="general_folder"></localize>...</span>
</button>
</li>
</ul>
</div>
<h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
<!-- Snippets list -->
<div ng-if="vm.showSnippets">
<ul class="umb-actions umb-actions-child">
<li class="umb-action" ng-repeat="snippet in vm.snippets">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.createPartialView(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
<umb-icon icon="icon-article" class="icon large"></umb-icon>
<span class="menu-label" style="margin-left: 0; padding-left: 5px;">{{ snippet.name }}</span>
</button>
</li>
</ul>
</div>
</div>
<!-- Create folder -->
<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>{{vm.createFolderError.data.message}}</div>
</div>
<!-- Main options -->
<div ng-if="!vm.showSnippets">
<ul class="umb-actions umb-actions-child">
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.createPartialView()" umb-auto-focus>
<umb-icon icon="icon-article" class="icon large"></umb-icon>
<span class="menu-label"><localize key="create_newEmptyPartialView">New empty partial view</localize></span>
</button>
</li>
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFromSnippet()">
<umb-icon icon="icon-article" class="icon large"></umb-icon>
<span class="menu-label"><localize key="create_newPartialViewFromSnippet">New partial view from snippet</localize>...</span>
</button>
</li>
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
<umb-icon icon="icon-folder" class="icon large"></umb-icon>
<span class="menu-label"><localize key="general_folder"></localize>...</span>
</button>
</li>
</ul>
</div>
<umb-control-group label="@create_enterFolderName" localize="label" 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>
<!-- Snippets list -->
<div ng-if="vm.showSnippets">
<ul class="umb-actions umb-actions-child">
<li class="umb-action" ng-repeat="snippet in vm.snippets">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.createPartialView(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
<umb-icon icon="icon-article" class="icon large"></umb-icon>
<span class="menu-label" style="margin-left: 0; padding-left: 5px;">{{ snippet.name }}</span>
</button>
</li>
</ul>
</div>
</div>
</div>
<!-- Dialog footer -->
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<button type="button" class="btn btn-info" ng-click="vm.close()">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
</div>
<!-- Dialog footer -->
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="vm.creatingFolder">
<button type="button" class="btn btn-info" ng-click="vm.close()">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
<div ng-if="vm.creatingFolder">
<form novalidate name="createFolderForm"
ng-submit="vm.createFolder(createFolderForm)"
val-form-manager>
<div class="umbracoDialog umb-dialog-body with-footer">
<!-- Create folder -->
<div class="umb-pane">
<div ng-show="vm.createFolderError">
<div class="alert alert-error">
<div>{{vm.createFolderError.data.message}}</div>
</div>
</div>
<umb-control-group label="@create_enterFolderName" localize="label" 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>
</div>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<umb-button type="button"
button-style="link"
action="vm.close()"
label-key="general_close">
</umb-button>
<umb-button type="submit"
button-style="primary"
label-key="general_create">
</umb-button>
</div>
</form>
</div>
</div>

View File

@@ -49,6 +49,10 @@ function RelationTypeCreateController($scope, $location, relationTypeResource, n
});
}
}
$scope.close = function () {
navigationService.hideDialog(true);
};
}
angular.module("umbraco").controller("Umbraco.Editors.RelationTypes.CreateController", RelationTypeCreateController);

View File

@@ -1,60 +1,69 @@
<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.RelationTypes.CreateController as vm" ng-cloak>
<div class="umb-pane">
<form novalidate name="createRelationTypeForm"
val-form-manager
ng-submit="vm.createRelationType()">
<div ng-controller="Umbraco.Editors.RelationTypes.CreateController as vm" ng-cloak>
<!-- Name -->
<umb-control-group label="@relationType_name" alias="relationTypeName">
<input type="text" name="relationTypeName" id="relationTypeName" ng-model="vm.relationType.name" class="umb-textstring textstring input-block-level" umb-auto-focus required />
</umb-control-group>
<form novalidate name="createRelationTypeForm"
val-form-manager
ng-submit="vm.createRelationType()">
<div class="umbracoDialog umb-dialog-body with-footer">
<div class="umb-pane">
<!-- Name -->
<umb-control-group label="@relationType_name" alias="relationTypeName">
<input type="text" name="relationTypeName" id="relationTypeName" ng-model="vm.relationType.name" class="umb-textstring textstring input-block-level" umb-auto-focus required />
</umb-control-group>
<!-- Direction -->
<umb-control-group label="@relationType_direction">
<p tabindex="0" class="sr-only"><localize key="relationType_direction"></localize></p>
<ul class="unstyled">
<li>
<label class="radio" for="parentToChild">
<umb-radiobutton name="relationType-direction"
value="false"
model="vm.relationType.isBidirectional" required="true" input-id="parentToChild"
label-key="relationType_parentToChild">
</umb-radiobutton>
</label>
</li>
<li>
<label class="radio" for="bidirectional">
<umb-radiobutton name="relationType-direction"
value="true"
model="vm.relationType.isBidirectional" required="true" input-id="bidirectional"
label-key="relationType_bidirectional">
</umb-radiobutton>
</label>
</li>
</ul>
</umb-control-group>
<!-- Direction -->
<umb-control-group label="@relationType_direction">
<p tabindex="0" class="sr-only"><localize key="relationType_direction"></localize></p>
<ul class="unstyled">
<li>
<label class="radio" for="parentToChild">
<umb-radiobutton name="relationType-direction"
value="false"
model="vm.relationType.isBidirectional" required="true" input-id="parentToChild"
label-key="relationType_parentToChild">
</umb-radiobutton>
</label>
</li>
<li>
<label class="radio" for="bidirectional">
<umb-radiobutton name="relationType-direction"
value="true"
model="vm.relationType.isBidirectional" required="true" input-id="bidirectional"
label-key="relationType_bidirectional">
</umb-radiobutton>
</label>
</li>
</ul>
</umb-control-group>
<!-- Parent -->
<umb-control-group label="@relationType_parent" alias="relationType-parent">
<select name="relationType-parent" id="relationType-parent"
ng-model="vm.relationType.parentObjectType"
class="umb-property-editor umb-dropdown" required>
<option ng-repeat="objectType in vm.objectTypes" value="{{objectType.id}}">{{objectType.name}}</option>
</select>
</umb-control-group>
<!-- Parent -->
<umb-control-group label="@relationType_parent" alias="relationType-parent">
<select name="relationType-parent" id="relationType-parent"
ng-model="vm.relationType.parentObjectType"
class="umb-property-editor umb-dropdown" required>
<option ng-repeat="objectType in vm.objectTypes" value="{{objectType.id}}">{{objectType.name}}</option>
</select>
</umb-control-group>
<!-- Child -->
<umb-control-group label="@relationType_child" alias="relationType-child">
<select name="relationType-child" id="relationType-child"
ng-model="vm.relationType.childObjectType"
class="umb-property-editor umb-dropdown" required>
<option ng-repeat="objectType in vm.objectTypes" value="{{objectType.id}}">{{objectType.name}}</option>
</select>
</umb-control-group>
<button type="submit" class="btn btn-primary">
<localize key="general_create">Create</localize>
</button>
</form>
</div>
<!-- Child -->
<umb-control-group label="@relationType_child" alias="relationType-child">
<select name="relationType-child" id="relationType-child"
ng-model="vm.relationType.childObjectType"
class="umb-property-editor umb-dropdown" required>
<option ng-repeat="objectType in vm.objectTypes" value="{{objectType.id}}">{{objectType.name}}</option>
</select>
</umb-control-group>
</div>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<umb-button type="button"
button-style="link"
action="close()"
label-key="general_close">
</umb-button>
<umb-button type="submit"
button-style="primary"
label-key="general_create">
</umb-button>
</div>
</form>
</div>

View File

@@ -1,52 +1,62 @@
<div ng-controller="Umbraco.Editors.Scripts.CreateController as vm">
<div ng-controller="Umbraco.Editors.Scripts.CreateController as vm" ng-cloak>
<div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
<div ng-if="!vm.creatingFolder">
<div class="umbracoDialog umb-dialog-body with-footer">
<div class="umb-pane" ng-if="!vm.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">
<button type="button" class="umb-action-link umb-outline btn-reset" umb-auto-focus ng-click="vm.createFile()">
<umb-icon icon="icon-script" class="icon large"></umb-icon>
<span class="menu-label"><localize key="create_newJavascriptFile">New javascript file</localize></span>
</button>
</li>
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
<umb-icon icon="icon-folder" class="icon large"></umb-icon>
<span class="menu-label"><localize key="general_folder"></localize>...</span>
</button>
</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">
<button type="button" class="umb-action-link umb-outline btn-reset" umb-auto-focus ng-click="vm.createFile()">
<umb-icon icon="icon-script" class="icon large"></umb-icon>
<span class="menu-label"><localize key="create_newJavascriptFile">New javascript file</localize></span>
</button>
</li>
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
<umb-icon icon="icon-folder" class="icon large"></umb-icon>
<span class="menu-label"><localize key="general_folder"></localize>...</span>
</button>
</li>
</ul>
</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>{{vm.createFolderError.data.message}}</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>
<div ng-if="vm.creatingFolder">
<form novalidate name="createFolderForm"
ng-submit="vm.createFolder(createFolderForm)"
val-form-manager>
<div class="umbracoDialog umb-dialog-body with-footer">
<div class="umb-pane">
<div ng-show="vm.createFolderError">
<div class="alert alert-error">
<div>{{vm.createFolderError.data.message}}</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>
</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>
<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">
<umb-button type="button"
button-style="link"
action="vm.close()"
label-key="general_close">
</umb-button>
<umb-button type="submit"
button-style="primary"
label-key="general_create">
</umb-button>
</div>
</form>
</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>

View File

@@ -1,58 +1,68 @@
<div ng-controller="Umbraco.Editors.StyleSheets.CreateController as vm">
<div ng-controller="Umbraco.Editors.StyleSheets.CreateController as vm" ng-cloak>
<div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
<div ng-if="!vm.creatingFolder">
<div class="umbracoDialog umb-dialog-body with-footer">
<div class="umb-pane" ng-if="!vm.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">
<button type="button" class="umb-action-link umb-outline btn-reset" umb-auto-focus ng-click="vm.createFile()">
<umb-icon icon="icon-script" class="icon large"></umb-icon>
<span class="menu-label"><localize key="create_newStyleSheetFile">New style sheet file</localize></span>
</button>
</li>
<li class="umb-action">
<button type="button" ng-click="vm.createRichtextStyle()" class="umb-action-link umb-outline btn-reset">
<umb-icon icon="icon-script" class="icon large"></umb-icon>
<span class="menu-label"><localize key="create_newRteStyleSheetFile">New richtext style sheet file</localize></span>
</button>
</li>
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
<umb-icon icon="icon-folder" class="icon large"></umb-icon>
<span class="menu-label"><localize key="general_folder"></localize>...</span>
</button>
</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">
<button type="button" class="umb-action-link umb-outline btn-reset" umb-auto-focus ng-click="vm.createFile()">
<umb-icon icon="icon-script" class="icon large"></umb-icon>
<span class="menu-label"><localize key="create_newStyleSheetFile">New style sheet file</localize></span>
</button>
</li>
<li class="umb-action">
<button type="button" ng-click="vm.createRichtextStyle()" class="umb-action-link umb-outline btn-reset">
<umb-icon icon="icon-script" class="icon large"></umb-icon>
<span class="menu-label"><localize key="create_newRteStyleSheetFile">New richtext style sheet file</localize></span>
</button>
</li>
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
<umb-icon icon="icon-folder" class="icon large"></umb-icon>
<span class="menu-label"><localize key="general_folder"></localize>...</span>
</button>
</li>
</ul>
</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>{{vm.createFolderError.data.message}}</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="vm.creatingFolder">
<button type="button" class="btn btn-info" ng-click="vm.close()">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
</div>
<div ng-if="vm.creatingFolder">
<form novalidate name="createFolderForm"
ng-submit="vm.createFolder(createFolderForm)"
val-form-manager>
<div class="umbracoDialog umb-dialog-body with-footer">
<div class="umb-pane">
<div ng-show="vm.createFolderError">
<div class="alert alert-error">
<div>{{vm.createFolderError.data.message}}</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>
</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>
<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">
<umb-button type="button"
button-style="link"
action="vm.close()"
label-key="general_close">
</umb-button>
<umb-button type="submit"
button-style="primary"
label-key="general_create">
</umb-button>
</div>
</form>
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="vm.creatingFolder">
<button type="button" class="btn btn-info" ng-click="vm.close()">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>
</div>