merging over a bunch of fixes from contrib for element tags not correctly closed.
This commit is contained in:
Claus
@@ -45,7 +45,9 @@
|
||||
|
||||
<div>
|
||||
<div class="flex">
|
||||
<umb-checkbox model="model.mandatoryRenderSection" text="{{vm.labels.sectionMandatory}}" />
|
||||
<umb-checkbox model="model.mandatoryRenderSection"
|
||||
text="{{vm.labels.sectionMandatory}}">
|
||||
</umb-checkbox>
|
||||
</div>
|
||||
|
||||
<div class="umb-insert-code-box__description">
|
||||
|
||||
@@ -14,8 +14,10 @@
|
||||
|
||||
<ng-form name="changePasswordForm">
|
||||
<umb-control-group alias="resetPassword" label="@user_resetPassword" ng-show="vm.config.enableReset">
|
||||
<umb-checkbox model="vm.passwordValues.reset" server-validation-field="resetPassword"
|
||||
on-change="vm.showReset = !vm.showReset" />
|
||||
<umb-checkbox model="vm.passwordValues.reset"
|
||||
server-validation-field="resetPassword"
|
||||
on-change="vm.showReset = !vm.showReset">
|
||||
</umb-checkbox>
|
||||
<span ng-messages="changePasswordForm.resetPassword.$error" show-validation-on-submit>
|
||||
<span class="help-inline" ng-message="valServerField">{{changePasswordForm.resetPassword.errorMsg}}</span>
|
||||
</span>
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
name="publishVariantSelector"
|
||||
model="variant.publish"
|
||||
on-change="vm.changeSelection(variant)"
|
||||
server-validation-field="{{variant.htmlId}}"
|
||||
>
|
||||
server-validation-field="{{variant.htmlId}}">
|
||||
|
||||
<span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
|
||||
<span ng-bind="variant.displayName"></span>
|
||||
<strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
|
||||
@@ -38,6 +38,7 @@
|
||||
<span class="umb-variant-selector-entry__description" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
|
||||
<span class="text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
|
||||
</span>
|
||||
|
||||
</umb-checkbox>
|
||||
|
||||
<umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
|
||||
|
||||
@@ -5,23 +5,28 @@
|
||||
|
||||
var vm = this;
|
||||
|
||||
vm.includeUnpublished = false;
|
||||
vm.includeUnpublished = $scope.model.includeUnpublished || false;
|
||||
|
||||
vm.changeSelection = changeSelection;
|
||||
vm.toggleIncludeUnpublished = toggleIncludeUnpublished;
|
||||
|
||||
|
||||
function onInit() {
|
||||
|
||||
vm.variants = $scope.model.variants;
|
||||
vm.displayVariants = vm.variants.slice(0);// shallow copy, we dont want to share the array-object(because we will be performing a sort method) but each entry should be shared (because we need validation and notifications).
|
||||
vm.displayVariants = vm.variants.slice(0); // shallow copy, we don't want to share the array-object (because we will be performing a sort method) but each entry should be shared (because we need validation and notifications).
|
||||
vm.labels = {};
|
||||
|
||||
// get localized texts for use in directives
|
||||
if (!$scope.model.title) {
|
||||
localizationService.localize("buttons_publishDescendants").then(function (value) {
|
||||
$scope.model.title = value;
|
||||
});
|
||||
}
|
||||
if (!vm.labels.includeUnpublished) {
|
||||
localizationService.localize("content_includeUnpublished").then(function (value) {
|
||||
vm.labels.includeUnpublished = value;
|
||||
});
|
||||
}
|
||||
|
||||
_.each(vm.variants, function (variant) {
|
||||
variant.isMandatory = isMandatoryFilter(variant);
|
||||
@@ -72,8 +77,9 @@
|
||||
}
|
||||
|
||||
function toggleIncludeUnpublished() {
|
||||
console.log("toggleIncludeUnpublished")
|
||||
vm.includeUnpublished = !vm.includeUnpublished;
|
||||
// make sure this value is pushed back to the scope
|
||||
$scope.model.includeUnpublished = vm.includeUnpublished;
|
||||
}
|
||||
|
||||
/** Returns true if publishing is possible based on if there are un-published mandatory languages */
|
||||
|
||||
@@ -6,15 +6,13 @@
|
||||
</div>
|
||||
|
||||
<div class="flex mb3">
|
||||
<umb-toggle
|
||||
checked="vm.includeUnpublished"
|
||||
input-id="includeUnpublished"
|
||||
on-click="vm.toggleIncludeUnpublished()"
|
||||
class="mr2">
|
||||
</umb-toggle>
|
||||
<label for="includeUnpublished">
|
||||
<localize key="content_includeUnpublished">Include drafts and unpublished content items.</localize>
|
||||
</label>
|
||||
<umb-toggle checked="vm.includeUnpublished"
|
||||
on-click="vm.toggleIncludeUnpublished()"
|
||||
class="mr2"
|
||||
label-on="{{vm.labels.includeUnpublished}}"
|
||||
label-off="{{vm.labels.includeUnpublished}}"
|
||||
label-position="right"
|
||||
show-labels="true"></umb-toggle>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@@ -26,15 +24,13 @@
|
||||
</div>
|
||||
|
||||
<div class="flex mb3">
|
||||
<umb-toggle
|
||||
checked="vm.includeUnpublished"
|
||||
input-id="includeUnpublished"
|
||||
on-click="vm.toggleIncludeUnpublished()"
|
||||
class="mr2">
|
||||
</umb-toggle>
|
||||
<label for="includeUnpublished">
|
||||
<localize key="content_includeUnpublished">Include drafts and unpublished content items.</localize>
|
||||
</label>
|
||||
<umb-toggle checked="vm.includeUnpublished"
|
||||
on-click="vm.toggleIncludeUnpublished()"
|
||||
class="mr2"
|
||||
label-on="{{vm.labels.includeUnpublished}}"
|
||||
label-off="{{vm.labels.includeUnpublished}}"
|
||||
label-position="right"
|
||||
show-labels="true"></umb-toggle>
|
||||
</div>
|
||||
|
||||
<div class="umb-list umb-list--condensed">
|
||||
@@ -44,11 +40,11 @@
|
||||
<div class="umb-variant-selector-entry" ng-class="{'umb-list-item--error': publishVariantSelectorForm.publishVariantSelector.$invalid}">
|
||||
|
||||
<umb-checkbox input-id="{{variant.htmlId}}"
|
||||
name="publishVariantSelector"
|
||||
model="variant.publish"
|
||||
on-change="vm.changeSelection(variant)"
|
||||
server-validation-field="{{variant.htmlId}}"
|
||||
>
|
||||
name="publishVariantSelector"
|
||||
model="variant.publish"
|
||||
on-change="vm.changeSelection(variant)"
|
||||
server-validation-field="{{variant.htmlId}}">
|
||||
|
||||
<span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
|
||||
<span ng-bind="variant.displayName"></span>
|
||||
<strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
|
||||
@@ -66,6 +62,7 @@
|
||||
<span class="umb-variant-selector-entry__description" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
|
||||
<span class="text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
|
||||
</span>
|
||||
|
||||
</umb-checkbox>
|
||||
|
||||
<umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
|
||||
|
||||
@@ -18,13 +18,12 @@
|
||||
<ng-form name="saveVariantSelectorForm">
|
||||
<div class="umb-variant-selector-entry" ng-class="{'umb-list-item--error': saveVariantSelectorForm.saveVariantSelector.$invalid}">
|
||||
|
||||
<umb-checkbox
|
||||
input-id="{{variant.htmlId}}"
|
||||
name="saveVariantSelector"
|
||||
model="variant.save"
|
||||
on-change="vm.changeSelection(variant)"
|
||||
server-validation-field="{{variant.htmlId}}"
|
||||
>
|
||||
<umb-checkbox input-id="{{variant.htmlId}}"
|
||||
name="saveVariantSelector"
|
||||
model="variant.save"
|
||||
on-change="vm.changeSelection(variant)"
|
||||
server-validation-field="{{variant.htmlId}}">
|
||||
|
||||
<span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
|
||||
<span ng-bind="variant.displayName"></span>
|
||||
<strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
|
||||
@@ -42,12 +41,12 @@
|
||||
<span class="umb-variant-selector-entry__description" ng-messages="saveVariantSelectorForm.saveVariantSelector.$error" show-validation-on-submit>
|
||||
<span class="text-error" ng-message="valServerField">{{saveVariantSelectorForm.saveVariantSelector.errorMsg}}</span>
|
||||
</span>
|
||||
|
||||
</umb-checkbox>
|
||||
|
||||
<umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
|
||||
|
||||
</div>
|
||||
|
||||
</ng-form>
|
||||
</div>
|
||||
<br/>
|
||||
|
||||
@@ -88,13 +88,12 @@
|
||||
<ng-form name="scheduleSelectorForm" style="width:100%;">
|
||||
<div class="umb-variant-selector-entry" ng-class="{'umb-list-item--error': scheduleSelectorForm.saveVariantReleaseDate.$invalid}">
|
||||
|
||||
<umb-checkbox
|
||||
input-id="{{variant.htmlId}}"
|
||||
name="saveVariantSelector"
|
||||
model="variant.save"
|
||||
on-change="vm.changeSelection(variant)"
|
||||
server-validation-field="{{variant.htmlId}}"
|
||||
>
|
||||
<umb-checkbox input-id="{{variant.htmlId}}"
|
||||
name="saveVariantSelector"
|
||||
model="variant.save"
|
||||
on-change="vm.changeSelection(variant)"
|
||||
server-validation-field="{{variant.htmlId}}">
|
||||
|
||||
<span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
|
||||
<span ng-bind="variant.displayName"></span>
|
||||
<strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
|
||||
@@ -105,16 +104,14 @@
|
||||
<strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
|
||||
</span>
|
||||
<span class="umb-variant-selector-entry__description"
|
||||
ng-if="!scheduleSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)">
|
||||
ng-if="!scheduleSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)">
|
||||
<umb-variant-state variant="variant"></umb-variant-state>
|
||||
<span ng-show="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
|
||||
</span>
|
||||
|
||||
</umb-checkbox>
|
||||
|
||||
<div>
|
||||
|
||||
|
||||
|
||||
<div class="date-wrapper-mini date-wrapper-mini--checkbox">
|
||||
<div class="date-wrapper-mini__date" ng-if="(variant.releaseDate || variant.save)">
|
||||
|
||||
@@ -183,12 +180,9 @@
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</ng-form>
|
||||
</div>
|
||||
<br />
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
<div class="umb-variant-selector-entry" ng-class="{'umb-list-item--error': publishVariantSelectorForm.publishVariantSelector.$invalid}">
|
||||
|
||||
<umb-checkbox input-id="{{variant.htmlId}}"
|
||||
name="publishVariantSelector"
|
||||
model="variant.publish"
|
||||
on-change="vm.changeSelection(variant)"
|
||||
server-validation-field="{{variant.htmlId}}"
|
||||
>
|
||||
name="publishVariantSelector"
|
||||
model="variant.publish"
|
||||
on-change="vm.changeSelection(variant)"
|
||||
server-validation-field="{{variant.htmlId}}">
|
||||
|
||||
<span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
|
||||
<span ng-bind="variant.displayName"></span>
|
||||
<strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
|
||||
@@ -37,6 +37,7 @@
|
||||
<span class="umb-variant-selector-entry__description" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
|
||||
<span class="text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
|
||||
</span>
|
||||
|
||||
</umb-checkbox>
|
||||
|
||||
<umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
|
||||
|
||||
@@ -17,14 +17,13 @@
|
||||
<ng-form name="unpublishVariantSelectorForm">
|
||||
<div class="umb-variant-selector-entry" ng-class="{'umb-list-item--error': unpublishVariantSelectorForm.unpublishVariantSelector.$invalid}">
|
||||
|
||||
<umb-checkbox
|
||||
input-id="{{variant.htmlId}}"
|
||||
name="unpublishVariantSelector"
|
||||
model="variant.save"
|
||||
on-change="vm.changeSelection(variant)"
|
||||
disabled="variant.disabled"
|
||||
server-validation-field="{{variant.htmlId}}"
|
||||
>
|
||||
<umb-checkbox input-id="{{variant.htmlId}}"
|
||||
name="unpublishVariantSelector"
|
||||
model="variant.save"
|
||||
on-change="vm.changeSelection(variant)"
|
||||
disabled="variant.disabled"
|
||||
server-validation-field="{{variant.htmlId}}">
|
||||
|
||||
<span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
|
||||
<span ng-bind="variant.displayName"></span>
|
||||
<strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
|
||||
@@ -42,17 +41,15 @@
|
||||
<span class="umb-variant-selector-entry__description" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
|
||||
<span class="text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
|
||||
</span>
|
||||
|
||||
</umb-checkbox>
|
||||
|
||||
<umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
|
||||
|
||||
</div>
|
||||
|
||||
</ng-form>
|
||||
</div>
|
||||
<br />
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -19,7 +19,13 @@
|
||||
</p>
|
||||
|
||||
<div class="pa-select-type">
|
||||
<umb-radiobutton input-id="protectionTypeMember" name="protectionType" value="member" model="vm.type" text="" />
|
||||
|
||||
<umb-radiobutton input-id="protectionTypeMember"
|
||||
name="protectionType"
|
||||
value="member"
|
||||
model="vm.type"
|
||||
text="">
|
||||
</umb-radiobutton>
|
||||
|
||||
<label for="protectionTypeMember" class="flex flex-column flex-auto">
|
||||
<strong class="pa-access-header bold"><localize key="publicAccess_paMembers">Specific members protection</localize></strong>
|
||||
@@ -28,7 +34,12 @@
|
||||
</div>
|
||||
|
||||
<div class="pa-select-type">
|
||||
<umb-radiobutton input-id="protectionTypeGroup" name="protectionType" value="group" model="vm.type" />
|
||||
|
||||
<umb-radiobutton input-id="protectionTypeGroup"
|
||||
name="protectionType"
|
||||
value="group"
|
||||
model="vm.type">
|
||||
</umb-radiobutton>
|
||||
|
||||
<label for="protectionTypeGroup" class="flex flex-column flex-auto">
|
||||
<strong class="pa-access-header bold"><localize key="publicAccess_paGroups">Group based protection</localize></strong>
|
||||
|
||||
@@ -106,17 +106,18 @@
|
||||
|
||||
</div>
|
||||
|
||||
<umb-checkbox model="vm.confirmed" text="{{vm.labels.deleteConfirm}}">
|
||||
<umb-checkbox model="vm.confirmed"
|
||||
text="{{vm.labels.deleteConfirm}}">
|
||||
</umb-checkbox>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<umb-confirm ng-if="vm.confirmed || vm.hasReferences === false"
|
||||
on-confirm="vm.performDelete"
|
||||
on-cancel="vm.cancel"
|
||||
confirm-button-style="danger"
|
||||
confirm-label-key="general_delete">
|
||||
on-confirm="vm.performDelete"
|
||||
on-cancel="vm.cancel"
|
||||
confirm-button-style="danger"
|
||||
confirm-label-key="general_delete">
|
||||
</umb-confirm>
|
||||
</div>
|
||||
</ng-switch>
|
||||
|
||||
@@ -86,7 +86,8 @@
|
||||
<umb-checkbox ng-if="model.disableTemplates === false"
|
||||
name="collectionCreateTemplate"
|
||||
model="model.collectionCreateTemplate"
|
||||
text="Create template for the Parent Document Type" />
|
||||
text="Create template for the Parent Document Type">
|
||||
</umb-checkbox>
|
||||
</umb-control-group>
|
||||
|
||||
<umb-control-group>
|
||||
@@ -96,7 +97,8 @@
|
||||
<umb-checkbox ng-if="model.disableTemplates === false"
|
||||
name="collectionItemCreateTemplate"
|
||||
model="model.collectionItemCreateTemplate"
|
||||
text="Create template for the Item Document Type" />
|
||||
text="Create template for the Item Document Type">
|
||||
</umb-checkbox>
|
||||
</umb-control-group>
|
||||
|
||||
<div class="mt3">
|
||||
|
||||
@@ -39,7 +39,11 @@
|
||||
<umb-dropdown class="pull-left" ng-if="vm.page.showLevelFilter" on-close="vm.page.showLevelFilter = false;">
|
||||
<umb-dropdown-item ng-repeat="level in vm.logLevels" class="dropdown-item">
|
||||
<div class="flex items-center">
|
||||
<umb-checkbox input-id="loglevel-{{$index}}" name="loglevel" model="level.selected" on-change="vm.setLogLevelFilter(level)" />
|
||||
<umb-checkbox input-id="loglevel-{{$index}}"
|
||||
name="loglevel"
|
||||
model="level.selected"
|
||||
on-change="vm.setLogLevelFilter(level)">
|
||||
</umb-checkbox>
|
||||
<label for="loglevel-{{$index}}">
|
||||
<umb-badge size="s" color="{{level.logTypeColor}}">{{level.name}}</umb-badge>
|
||||
</label>
|
||||
|
||||
@@ -122,73 +122,81 @@
|
||||
on-remove="vm.removeContentItem()">
|
||||
</umb-node-preview>
|
||||
|
||||
<a href=""
|
||||
ng-if="!vm.package.contentNodeId"
|
||||
style="margin-bottom: 10px;"
|
||||
class="umb-node-preview-add"
|
||||
ng-click="vm.openContentPicker()"
|
||||
prevent-default>
|
||||
<button type="button"
|
||||
ng-if="!vm.package.contentNodeId"
|
||||
style="margin-bottom: 10px;"
|
||||
class="umb-node-preview-add"
|
||||
ng-click="vm.openContentPicker()">
|
||||
<localize key="general_add">Add</localize>
|
||||
</a>
|
||||
</button>
|
||||
|
||||
<umb-checkbox model="vm.package.contentLoadChildNodes"
|
||||
disabled="!vm.package.contentNodeId"
|
||||
text="{{vm.labels.includeAllChildNodes}}">
|
||||
</umb-checkbox>
|
||||
|
||||
<umb-checkbox model="vm.package.contentLoadChildNodes"
|
||||
disabled="!vm.package.contentNodeId"
|
||||
text="{{vm.labels.includeAllChildNodes}}" />
|
||||
</umb-control-group>
|
||||
|
||||
<umb-control-group label="@treeHeaders_documentTypes">
|
||||
<div ng-repeat="doctype in ::vm.documentTypes | orderBy:'name'">
|
||||
<umb-checkbox model="doctype.selected"
|
||||
on-change="vm.selectDocumentType(doctype)"
|
||||
text="{{doctype.name}}" />
|
||||
<umb-checkbox model="doctype.selected"
|
||||
on-change="vm.selectDocumentType(doctype)"
|
||||
text="{{doctype.name}}">
|
||||
</umb-checkbox>
|
||||
</div>
|
||||
</umb-control-group>
|
||||
|
||||
<umb-control-group label="@treeHeaders_templates">
|
||||
<div ng-repeat="template in ::vm.templates | orderBy:'name'">
|
||||
<umb-checkbox model="template.selected"
|
||||
on-change="vm.selectTemplate(template)"
|
||||
text="{{template.name}}" />
|
||||
<umb-checkbox model="template.selected"
|
||||
on-change="vm.selectTemplate(template)"
|
||||
text="{{template.name}}">
|
||||
</umb-checkbox>
|
||||
</div>
|
||||
</umb-control-group>
|
||||
|
||||
<umb-control-group label="@treeHeaders_stylesheets">
|
||||
<div ng-repeat="stylesheet in ::vm.stylesheets | orderBy:'name'">
|
||||
<umb-checkbox model="stylesheet.selected"
|
||||
on-change="vm.selectStyleSheet(stylesheet)"
|
||||
text="{{stylesheet.path}}" />
|
||||
<umb-checkbox model="stylesheet.selected"
|
||||
on-change="vm.selectStyleSheet(stylesheet)"
|
||||
text="{{stylesheet.path}}">
|
||||
</umb-checkbox>
|
||||
</div>
|
||||
</umb-control-group>
|
||||
|
||||
<umb-control-group label="@treeHeaders_macros">
|
||||
<div ng-repeat="macro in ::vm.macros | orderBy:'name'">
|
||||
<umb-checkbox model="macro.selected"
|
||||
on-change="vm.selectMacro(macro)"
|
||||
text="{{macro.name}}" />
|
||||
<umb-checkbox model="macro.selected"
|
||||
on-change="vm.selectMacro(macro)"
|
||||
text="{{macro.name}}">
|
||||
</umb-checkbox>
|
||||
</div>
|
||||
</umb-control-group>
|
||||
|
||||
<umb-control-group label="@treeHeaders_languages">
|
||||
<div ng-repeat="language in ::vm.languages | orderBy:'name'">
|
||||
<umb-checkbox model="language.selected"
|
||||
on-change="vm.selectLanguage(language)"
|
||||
text="{{language.name}}" />
|
||||
<umb-checkbox model="language.selected"
|
||||
on-change="vm.selectLanguage(language)"
|
||||
text="{{language.name}}">
|
||||
</umb-checkbox>
|
||||
</div>
|
||||
</umb-control-group>
|
||||
|
||||
<umb-control-group label="@treeHeaders_dictionary">
|
||||
<div ng-repeat="dictionaryItem in ::vm.dictionaryItems | orderBy:'name'">
|
||||
<umb-checkbox model="dictionaryItem.selected"
|
||||
on-change="vm.selectDictionaryItem(dictionaryItem)"
|
||||
text="{{dictionaryItem.name}}" />
|
||||
<umb-checkbox model="dictionaryItem.selected"
|
||||
on-change="vm.selectDictionaryItem(dictionaryItem)"
|
||||
text="{{dictionaryItem.name}}">
|
||||
</umb-checkbox>
|
||||
</div>
|
||||
</umb-control-group>
|
||||
|
||||
<umb-control-group label="@treeHeaders_dataTypes">
|
||||
<div ng-repeat="dataType in ::vm.dataTypes | orderBy:'name'">
|
||||
<umb-checkbox model="dataType.selected"
|
||||
on-change="vm.selectDataType(dataType)"
|
||||
text="{{dataType.name}}" />
|
||||
<umb-checkbox model="dataType.selected"
|
||||
on-change="vm.selectDataType(dataType)"
|
||||
text="{{dataType.name}}">
|
||||
</umb-checkbox>
|
||||
</div>
|
||||
</umb-control-group>
|
||||
|
||||
|
||||
@@ -1,50 +1,49 @@
|
||||
<div ng-controller="Umbraco.PrevalueEditors.ListViewLayoutsPreValsController as vm">
|
||||
|
||||
<div class="list-view-layouts" ui-sortable="vm.layoutsSortableOptions" ng-model="model.value">
|
||||
<div class="list-view-layouts" ui-sortable="vm.layoutsSortableOptions" ng-model="model.value">
|
||||
|
||||
<div class="list-view-layout" ng-repeat="layout in model.value">
|
||||
<div class="list-view-layout" ng-repeat="layout in model.value">
|
||||
|
||||
<i class="icon-navigation list-view-layout__sort-handle" aria-label="Sort"></i>
|
||||
<i class="icon-navigation list-view-layout__sort-handle" aria-label="Sort"></i>
|
||||
|
||||
<div>
|
||||
<div>
|
||||
|
||||
<button ng-if="layout.isSystem !== 1" type="button" ng-click="vm.openIconPicker(layout)" class="list-view-layout__icon" umb-auto-focus>
|
||||
<i class="{{ layout.icon }}"></i>
|
||||
</button>
|
||||
<button ng-if="layout.isSystem !== 1" type="button" ng-click="vm.openIconPicker(layout)" class="list-view-layout__icon" umb-auto-focus>
|
||||
<i class="{{ layout.icon }}"></i>
|
||||
</button>
|
||||
|
||||
<div ng-if="layout.isSystem === 1" class="list-view-layout__icon">
|
||||
<i class="{{ layout.icon }}"></i>
|
||||
</div>
|
||||
|
||||
<div ng-if="layout.isSystem === 1" class="list-view-layout__icon">
|
||||
<i class="{{ layout.icon }}"></i>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="list-view-layout__name">
|
||||
<input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.name" placeholder="Name..." class="-full-width-input" focus-when="{{ vm.focusLayoutName }}" />
|
||||
<span ng-if="layout.isSystem === 1" class="list-view-layout__name-text">{{ layout.name }}</span>
|
||||
<span ng-if="layout.isSystem === 1" class="list-view-layout__system">(system layout)</span>
|
||||
</div>
|
||||
|
||||
<div class="list-view-layout__path">
|
||||
<input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.path" placeholder="Layout path..." class="-full-width-input" />
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<umb-checkbox ng-if="layout.isSystem === 1" model="layout.selected" />
|
||||
<div class="list-view-layout__remove" ng-if="layout.isSystem !== 1">
|
||||
<i class="icon-trash" ng-click="vm.showPrompt(layout)"></i>
|
||||
<umb-confirm-action
|
||||
ng-if="layout.deletePrompt"
|
||||
direction="left"
|
||||
on-confirm="vm.removeLayout($index, layout)"
|
||||
on-cancel="vm.hidePrompt(layout)">
|
||||
</umb-confirm-action>
|
||||
<div class="list-view-layout__name">
|
||||
<input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.name" placeholder="Name..." class="-full-width-input" focus-when="{{ vm.focusLayoutName }}" />
|
||||
<span ng-if="layout.isSystem === 1" class="list-view-layout__name-text">{{ layout.name }}</span>
|
||||
<span ng-if="layout.isSystem === 1" class="list-view-layout__system">(system layout)</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="list-view-layout__path">
|
||||
<input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.path" placeholder="Layout path..." class="-full-width-input" />
|
||||
</div>
|
||||
|
||||
<button type="button" class="list-view-add-layout" ng-click="vm.addLayout()">Add layout</button>
|
||||
<div>
|
||||
<umb-checkbox ng-if="layout.isSystem === 1" model="layout.selected"></umb-checkbox>
|
||||
<div class="list-view-layout__remove" ng-if="layout.isSystem !== 1">
|
||||
<i class="icon-trash" ng-click="vm.showPrompt(layout)"></i>
|
||||
<umb-confirm-action ng-if="layout.deletePrompt"
|
||||
direction="left"
|
||||
on-confirm="vm.removeLayout($index, layout)"
|
||||
on-cancel="vm.hidePrompt(layout)">
|
||||
</umb-confirm-action>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button type="button" class="list-view-add-layout" ng-click="vm.addLayout()">Add layout</button>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -2,10 +2,20 @@
|
||||
<ng-form name="listViewOrderDirectionForm" class="flex">
|
||||
<ul class="inline">
|
||||
<li class="-no-padding-left">
|
||||
<umb-radiobutton name="orderDirection" value="asc" model="model.value" text="Ascending [a-z]" required></umb-radiobutton>
|
||||
<umb-radiobutton name="orderDirection"
|
||||
value="asc"
|
||||
model="model.value"
|
||||
text="Ascending [a-z]"
|
||||
required="true">
|
||||
</umb-radiobutton>
|
||||
</li>
|
||||
<li>
|
||||
<umb-radiobutton name="orderDirection" value="desc" model="model.value" text="Descending [z-a]" required></umb-radiobutton>
|
||||
<umb-radiobutton name="orderDirection"
|
||||
value="desc"
|
||||
model="model.value"
|
||||
text="Descending [z-a]"
|
||||
required="true">
|
||||
</umb-radiobutton>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
|
||||
@@ -3,7 +3,12 @@
|
||||
|
||||
<ul class="unstyled">
|
||||
<li ng-repeat="item in vm.viewItems track by item.key">
|
||||
<umb-radiobutton name="{{model.alias}}" value="{{item.value}}" model="model.value" text="{{item.value}}" required="model.validation.mandatory && model.value == ''"></umb-radiobutton>
|
||||
<umb-radiobutton name="{{model.alias}}"
|
||||
value="{{item.value}}"
|
||||
model="model.value"
|
||||
text="{{item.value}}"
|
||||
required="model.validation.mandatory && model.value == ''">
|
||||
</umb-radiobutton>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
|
||||
@@ -2,22 +2,22 @@
|
||||
|
||||
<umb-control-group label="Toolbar" description="Pick the toolbar options that should be available when editing">
|
||||
<div ng-repeat="cmd in tinyMceConfig.commands">
|
||||
<umb-checkbox
|
||||
model="cmd.selected"
|
||||
on-change="selectCommand(cmd)"
|
||||
icon-class="mce-ico {{(cmd.isCustom ? ' mce-i-custom ' : ' mce-i-') + cmd.fontIcon}}"
|
||||
text="{{cmd.name}}"
|
||||
class="mce-cmd" />
|
||||
<umb-checkbox model="cmd.selected"
|
||||
on-change="selectCommand(cmd)"
|
||||
icon-class="mce-ico {{(cmd.isCustom ? ' mce-i-custom ' : ' mce-i-') + cmd.fontIcon}}"
|
||||
text="{{cmd.name}}"
|
||||
class="mce-cmd">
|
||||
</umb-checkbox>
|
||||
</div>
|
||||
</umb-control-group>
|
||||
|
||||
<umb-control-group label="Stylesheets" description="Pick the stylesheets whose editor styles should be available when editing">
|
||||
<div ng-repeat="css in stylesheets">
|
||||
|
||||
<umb-checkbox
|
||||
model="css.selected"
|
||||
on-change="selectStylesheet(css)"
|
||||
text="{{css.name}}"/>
|
||||
<umb-checkbox model="css.selected"
|
||||
on-change="selectStylesheet(css)"
|
||||
text="{{css.name}}">
|
||||
</umb-checkbox>
|
||||
</div>
|
||||
</umb-control-group>
|
||||
|
||||
|
||||
@@ -14,13 +14,19 @@
|
||||
<ul class="unstyled">
|
||||
<li>
|
||||
<label class="radio">
|
||||
<umb-radiobutton name="relationType-direction" value="false" model="vm.relationType.isBidirectional" />
|
||||
<umb-radiobutton name="relationType-direction"
|
||||
value="false"
|
||||
model="vm.relationType.isBidirectional">
|
||||
</umb-radiobutton>
|
||||
<localize key="relationType_parentToChild">Parent to child</localize>
|
||||
</label>
|
||||
</li>
|
||||
<li>
|
||||
<label class="radio">
|
||||
<umb-radiobutton name="relationType-direction" value="true" model="vm.relationType.isBidirectional" />
|
||||
<umb-radiobutton name="relationType-direction"
|
||||
value="true"
|
||||
model="vm.relationType.isBidirectional">
|
||||
</umb-radiobutton>
|
||||
<localize key="relationType_bidirectional">Bidirectional</localize>
|
||||
</label>
|
||||
</li>
|
||||
|
||||
@@ -11,10 +11,18 @@
|
||||
<umb-control-group label="@relationType_direction">
|
||||
<ul class="unstyled">
|
||||
<li>
|
||||
<umb-radiobutton name="relationTypeDirection" value="false" model="model.relationType.isBidirectional" text="{{vm.labels.parentToChild}}"></umb-radiobutton>
|
||||
<umb-radiobutton name="relationTypeDirection"
|
||||
value="false"
|
||||
model="model.relationType.isBidirectional"
|
||||
text="{{vm.labels.parentToChild}}">
|
||||
</umb-radiobutton>
|
||||
</li>
|
||||
<li>
|
||||
<umb-radiobutton name="relationTypeDirection" value="true" model="model.relationType.isBidirectional" text="{{vm.labels.bidirectional}}"></umb-radiobutton>
|
||||
<umb-radiobutton name="relationTypeDirection"
|
||||
value="true"
|
||||
model="model.relationType.isBidirectional"
|
||||
text="{{vm.labels.bidirectional}}">
|
||||
</umb-radiobutton>
|
||||
</li>
|
||||
</ul>
|
||||
</umb-control-group>
|
||||
|
||||
Reference in New Issue
Block a user