fixes: U4-11327 Remove styles for umb-era-button and use umb-button component instead
This commit is contained in:
Mads Rasmussen
+4
-1
@@ -103,7 +103,10 @@ Use this directive to render a button with a dropdown of alternative actions.
|
||||
subButtons: "=",
|
||||
state: "=?",
|
||||
direction: "@?",
|
||||
float: "@?"
|
||||
float: "@?",
|
||||
buttonStyle: "@?",
|
||||
size: "@?",
|
||||
icon: "@?"
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -141,7 +141,6 @@
|
||||
|
||||
@import "components/buttons/umb-button.less";
|
||||
@import "components/buttons/umb-button-group.less";
|
||||
@import "components/buttons/umb-era-button.less";
|
||||
@import "components/buttons/umb-toggle.less";
|
||||
|
||||
@import "components/notifications/umb-notifications.less";
|
||||
|
||||
@@ -68,6 +68,7 @@
|
||||
.btn-group .btn.dropdown-toggle {
|
||||
border-left-width: 1px;
|
||||
border-left-style: solid;
|
||||
border-color: rgba(0,0,0,0.09);
|
||||
}
|
||||
|
||||
// Button Sizes
|
||||
|
||||
@@ -17,31 +17,7 @@
|
||||
|
||||
.umb-button-group__toggle {
|
||||
border-radius: 0px 3px 3px 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// hack for umb-era-button
|
||||
.umb-era-button-group {
|
||||
|
||||
display: flex;
|
||||
|
||||
.umb-era-button:first-child {
|
||||
padding-right: 15px;
|
||||
border-radius: 3px 0 0 3px;
|
||||
}
|
||||
|
||||
.umb-era-button.umb-button-group__toggle {
|
||||
padding-right: 10px;
|
||||
padding-left: 10px;
|
||||
border-radius: 0 3px 3px 0;
|
||||
border-left-style: solid;
|
||||
border-left-width: 1px;
|
||||
border-left-color: rgba(0,0,0,0.1);
|
||||
}
|
||||
|
||||
.umb-era-button.umb-button-group__toggle .caret {
|
||||
margin: 0;
|
||||
border-left: 1px solid rgba(0,0,0,0.09);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -7,10 +7,9 @@
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.umb-button__button {
|
||||
.umb-button__button {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
}
|
||||
}
|
||||
|
||||
.umb-button__content {
|
||||
opacity: 1;
|
||||
|
||||
@@ -1,113 +0,0 @@
|
||||
.umb-era-button {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
font-size: 14px;
|
||||
height: 38px;
|
||||
line-height: 1;
|
||||
max-width: 100%;
|
||||
padding: 0 18px;
|
||||
color: #202129;
|
||||
background-color: #edeeee;
|
||||
text-decoration: none !important;
|
||||
user-select: none;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
border-radius: 3px;
|
||||
border: 0 none;
|
||||
box-sizing: border-box;
|
||||
cursor: pointer;
|
||||
transition: background-color 80ms ease, color 80ms ease;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
|
||||
.umb-era-button:hover,
|
||||
.umb-era-button:active {
|
||||
color: #484848;
|
||||
background-color: #e1e2e2;
|
||||
outline: none;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
|
||||
.umb-era-button:focus {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.umb-era-button.-blue {
|
||||
background: @blue;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.umb-era-button.-blue:hover {
|
||||
background-color: @blueDark;
|
||||
}
|
||||
|
||||
.umb-era-button.-red {
|
||||
background: @btnDangerBackground;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.umb-era-button.-red:hover {
|
||||
background-color: darken(@btnDangerBackground, 5%);
|
||||
}
|
||||
|
||||
.umb-era-button.-green {
|
||||
background: @green;
|
||||
color: @white;
|
||||
}
|
||||
|
||||
.umb-era-button.-green:hover {
|
||||
background-color: @green-d1;
|
||||
}
|
||||
|
||||
.umb-era-button.-link {
|
||||
padding: 0;
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
.umb-era-button.-link:hover {
|
||||
background-color: transparent;
|
||||
opacity: .6;
|
||||
}
|
||||
|
||||
.umb-era-button.-inactive {
|
||||
cursor: not-allowed;
|
||||
color: #BBB;
|
||||
background: #EAE7E7;
|
||||
}
|
||||
|
||||
.umb-era-button.-inactive:hover {
|
||||
color: #BBB;
|
||||
background: #EAE7E7;
|
||||
}
|
||||
|
||||
|
||||
.umb-era-button.-full-width {
|
||||
display: block;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.umb-era-button.umb-button--s {
|
||||
height: 30px;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.umb-era-button.-white {
|
||||
background-color: @white;
|
||||
|
||||
&:hover {
|
||||
opacity: .9;
|
||||
}
|
||||
}
|
||||
|
||||
.umb-era-button.-text-black {
|
||||
color: @black;
|
||||
}
|
||||
|
||||
/* icons */
|
||||
|
||||
.umb-era-button i {
|
||||
margin-right: 5px;
|
||||
}
|
||||
@@ -5,15 +5,17 @@
|
||||
alias="{{defaultButton.alias ? defaultButton.alias : 'groupPrimary' }}"
|
||||
type="button"
|
||||
action="defaultButton.handler()"
|
||||
button-style="success"
|
||||
button-style="{{buttonStyle}}"
|
||||
state="state"
|
||||
label="{{defaultButton.labelKey}}"
|
||||
label-key="{{defaultButton.labelKey}}"
|
||||
shortcut="{{defaultButton.hotKey}}"
|
||||
shortcut-when-hidden="{{defaultButton.hotKeyWhenHidden}}">
|
||||
shortcut-when-hidden="{{defaultButton.hotKeyWhenHidden}}"
|
||||
size="{{size}}"
|
||||
icon="{{icon}}">
|
||||
</umb-button>
|
||||
|
||||
<a data-element="button-group-toggle" class="btn btn-success dropdown-toggle umb-button-group__toggle" data-toggle="dropdown" ng-if="subButtons.length > 0">
|
||||
<a data-element="button-group-toggle" class="btn btn-{{buttonStyle}} dropdown-toggle umb-button-group__toggle umb-button--{{size}}" data-toggle="dropdown" ng-if="subButtons.length > 0">
|
||||
<span class="caret"></span>
|
||||
</a>
|
||||
|
||||
|
||||
@@ -68,6 +68,7 @@
|
||||
|
||||
<umb-button-group
|
||||
ng-if="defaultButton && !content.trashed"
|
||||
button-style="success"
|
||||
default-button="defaultButton"
|
||||
sub-buttons="subButtons"
|
||||
state="page.buttonGroupState"
|
||||
|
||||
@@ -115,14 +115,14 @@
|
||||
<input name="providedValue" type="text" ng-model="action.providedValue" required val-email/>
|
||||
</div>
|
||||
|
||||
<button
|
||||
<umb-button
|
||||
type="button"
|
||||
class="umb-era-button umb-button--s -green"
|
||||
ng-class="{ '-inactive': healthCheckAction.providedValue.$invalid}"
|
||||
ng-click="vm.executeAction(check, $parent.$index, action);"
|
||||
ng-disabled="healthCheckAction.providedValue.$invalid">
|
||||
{{action.name}}
|
||||
</button>
|
||||
button-style="success"
|
||||
size="s"
|
||||
disabled="healthCheckAction.providedValue.$invalid"
|
||||
action="vm.executeAction(check, $parent.$index, action)"
|
||||
label="{{action.name}}">
|
||||
</umb-button>
|
||||
|
||||
</ng-form>
|
||||
|
||||
|
||||
@@ -8,21 +8,22 @@
|
||||
|
||||
<umb-editor-sub-header-section ng-if="vm.dashboard.userIsAdmin === true">
|
||||
|
||||
<button
|
||||
<umb-button
|
||||
ng-if="vm.dashboard.urlTrackerDisabled === false"
|
||||
type="button"
|
||||
class="umb-era-button umb-button--s"
|
||||
ng-click="vm.disableUrlTracker()">
|
||||
<span><localize key="redirectUrls_disableUrlTracker">Disable URL Tracker</localize></span>
|
||||
</button>
|
||||
size="s"
|
||||
action="vm.disableUrlTracker()"
|
||||
label-key="redirectUrls_disableUrlTracker">
|
||||
</umb-button>
|
||||
|
||||
<button
|
||||
<umb-button
|
||||
ng-if="vm.dashboard.urlTrackerDisabled === true"
|
||||
type="button"
|
||||
class="umb-era-button umb-button--s -green"
|
||||
ng-click="vm.enableUrlTracker()">
|
||||
<span><localize key="redirectUrls_enableUrlTracker">Enable URL Tracker</localize></span>
|
||||
</button>
|
||||
size="s"
|
||||
button-style="success"
|
||||
action="vm.enableUrlTracker()"
|
||||
label-key="redirectUrls_enableUrlTracker">
|
||||
</umb-button>
|
||||
|
||||
</umb-editor-sub-header-section>
|
||||
|
||||
@@ -76,8 +77,13 @@
|
||||
<div class="flx-s1 flx-g1 flx-b0" style="margin-right: 20px;">
|
||||
<a class="umb-table-body__link" href="{{redirectUrl.destinationUrl}}" target="_blank" title="{{redirectUrl.destinationUrl}}">{{redirectUrl.destinationUrl}}</a>
|
||||
</div>
|
||||
|
||||
<button type="button" class="umb-era-button umb-button--s -red" ng-click="vm.removeRedirect(redirectUrl)"><localize key="redirectUrls_removeButton">Remove</localize></button>
|
||||
<umb-button
|
||||
type="button"
|
||||
button-style="danger"
|
||||
size="xs"
|
||||
action="vm.removeRedirect(redirectUrl)"
|
||||
label-key="redirectUrls_removeButton">
|
||||
</umb-button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -53,6 +53,7 @@
|
||||
|
||||
<umb-button-group
|
||||
ng-if="vm.page.modelsBuilder"
|
||||
button-style="success"
|
||||
default-button="vm.page.defaultButton"
|
||||
sub-buttons="vm.page.subButtons"
|
||||
state="vm.page.saveButtonState"
|
||||
|
||||
@@ -52,6 +52,7 @@
|
||||
|
||||
<umb-button-group
|
||||
ng-if="vm.page.modelsBuilder"
|
||||
button-style="success"
|
||||
default-button="vm.page.defaultButton"
|
||||
sub-buttons="vm.page.subButtons"
|
||||
state="vm.page.saveButtonState"
|
||||
|
||||
@@ -51,6 +51,7 @@
|
||||
|
||||
<umb-button-group
|
||||
ng-if="vm.page.modelsBuilder"
|
||||
button-style="success"
|
||||
default-button="vm.page.defaultButton"
|
||||
sub-buttons="vm.page.subButtons"
|
||||
state="vm.page.saveButtonState"
|
||||
|
||||
@@ -136,13 +136,15 @@
|
||||
<input type="checkbox" id="license-accepts" ng-model="vm.localPackage.packageLicenseAccept" required no-dirty-check>
|
||||
<strong class="label-text"><localize key="packager_accept">I accept</localize> <a href="{{ vm.localPackage.licenseUrl }}" target="_blank"><localize key="packager_termsOfUse">terms of use</localize></a></strong>
|
||||
</label>
|
||||
<button type="button"
|
||||
ng-class="{'-inactive' : localPackageForm.$invalid}"
|
||||
ng-disabled="localPackageForm.$invalid"
|
||||
class="umb-era-button -green flex-inline mt3"
|
||||
ng-click="vm.installPackage()">
|
||||
<localize key="packager_packageInstall">Install package</localize>
|
||||
</button>
|
||||
<umb-button
|
||||
class="mt3"
|
||||
type="button"
|
||||
disabled="localPackageForm.$invalid"
|
||||
size="m"
|
||||
button-style="success"
|
||||
action="vm.installPackage()"
|
||||
label-key="packager_packageInstall">
|
||||
</umb-button>
|
||||
</div>
|
||||
|
||||
<div class="umb-info-local-item">
|
||||
|
||||
@@ -91,13 +91,15 @@
|
||||
<input type="checkbox" id="confirm-uninstall" ng-model="vm.package.confirmUninstall" required no-dirty-check>
|
||||
<strong class="label-text"><localize key="packager_packageUninstallConfirm">Confirm package uninstall</localize></strong>
|
||||
</label>
|
||||
<button type="button"
|
||||
ng-class="{'-inactive' : uninstallForm.$invalid}"
|
||||
ng-disabled="uninstallForm.$invalid"
|
||||
class="umb-era-button -green flex-inline mt3"
|
||||
ng-click="vm.uninstallPackage(vm.package)">
|
||||
<localize key="packager_packageUninstallHeader">Uninstall package</localize>
|
||||
</button>
|
||||
<umb-button
|
||||
class="mt3"
|
||||
type="button"
|
||||
disabled="uninstallForm.$invalid"
|
||||
button-style="success"
|
||||
size="m"
|
||||
action="vm.uninstallPackage(vm.package)"
|
||||
label-key="packager_packageUninstallHeader">
|
||||
</umb-button>
|
||||
</div>
|
||||
|
||||
<div class="umb-info-local-item">
|
||||
|
||||
@@ -153,13 +153,25 @@
|
||||
<div class="umb-package-details__sidebar">
|
||||
|
||||
<div class="umb-package-details__section">
|
||||
<button class="umb-era-button -green -full-width"
|
||||
ng-if="vm.package.isValid === true"
|
||||
ng-click="vm.downloadPackage(vm.package)"><localize key="packager_packageInstall">Install package</localize></button>
|
||||
|
||||
<button class="umb-era-button -inactive -full-width" ng-if="vm.package.isValid === false" disabled>
|
||||
<localize key="packager_packageAlreadyInstalled">Package is already installed</localize>
|
||||
</button>
|
||||
<umb-button
|
||||
ng-if="vm.package.isValid === true"
|
||||
type="button"
|
||||
button-style="[success,block]"
|
||||
size="m"
|
||||
action="vm.downloadPackage(vm.package)"
|
||||
label-key="packager_packageInstall">
|
||||
</umb-button>
|
||||
|
||||
<umb-button
|
||||
ng-if="vm.package.isValid === false"
|
||||
type="button"
|
||||
button-style="[block]"
|
||||
size="m"
|
||||
disabled="vm.package.isValid === false"
|
||||
label-key="packager_packageAlreadyInstalled">
|
||||
</umb-button>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="umb-package-details__section">
|
||||
@@ -315,14 +327,15 @@
|
||||
<input type="checkbox" id="license-accept" ng-model="vm.localPackage.packageLicenseAccept" required no-dirty-check>
|
||||
<strong class="label-text"><localize key="packager_accept">I accept</localize> <a href="{{ vm.localPackage.licenseUrl }}" target="_blank"><localize key="packager_termsOfUse">terms of use</localize></a></strong>
|
||||
</label>
|
||||
<button type="button"
|
||||
ng-if="vm.installState.type !== 'error'"
|
||||
ng-class="{'-inactive' : localPackageForm.$invalid}"
|
||||
ng-disabled="localPackageForm.$invalid"
|
||||
class="umb-era-button -green flex-inline mt3"
|
||||
ng-click="vm.installPackage(vm.localPackage)">
|
||||
<localize key="packager_packageInstall">Install package</localize>
|
||||
</button>
|
||||
<umb-button
|
||||
ng-if="vm.installState.type !== 'error'"
|
||||
class="mt3"
|
||||
type="button"
|
||||
button-style="success"
|
||||
disabled="localPackageForm.$invalid"
|
||||
action="vm.installPackage(vm.localPackage)"
|
||||
label-key="packager_packageInstall">
|
||||
</umb-button>
|
||||
</div>
|
||||
|
||||
<div class="umb-info-local-item">
|
||||
|
||||
@@ -14,6 +14,34 @@
|
||||
vm.page.menu.currentSection = appState.getSectionState("currentSection");
|
||||
vm.page.menu.currentNode = null;
|
||||
|
||||
// insert buttons
|
||||
vm.page.insertDefaultButton = {
|
||||
labelKey: "general_insert",
|
||||
handler: function() {
|
||||
vm.openInsertOverlay();
|
||||
}
|
||||
};
|
||||
vm.page.insertSubButtons = [
|
||||
{
|
||||
labelKey: "template_insertPageField",
|
||||
handler: function () {
|
||||
vm.openPageFieldOverlay();
|
||||
}
|
||||
},
|
||||
{
|
||||
labelKey: "template_insertMacro",
|
||||
handler: function () {
|
||||
vm.openMacroOverlay()
|
||||
}
|
||||
},
|
||||
{
|
||||
labelKey: "template_insertDictionaryItem",
|
||||
handler: function () {
|
||||
vm.openDictionaryItemOverlay();
|
||||
}
|
||||
}
|
||||
];
|
||||
|
||||
// bind functions to view model
|
||||
vm.save = save;
|
||||
vm.openPageFieldOverlay = openPageFieldOverlay;
|
||||
|
||||
@@ -25,34 +25,22 @@
|
||||
<div class="flex" style="margin-bottom: 30px;">
|
||||
|
||||
<div class="flex" style="margin-left: auto;">
|
||||
<div class="btn-group umb-era-button-group dropdown" style="margin-right: 10px;">
|
||||
|
||||
<button
|
||||
type="button"
|
||||
class="umb-era-button umb-button--s"
|
||||
ng-click="vm.openInsertOverlay()">
|
||||
<i class="icon icon-add"></i> <localize key="template_insert">Insert</localize>
|
||||
</button>
|
||||
|
||||
<a class="umb-era-button umb-button--s dropdown-toggle umb-button-group__toggle" data-toggle="dropdown">
|
||||
<span class="caret"></span>
|
||||
</a>
|
||||
<umb-button-group
|
||||
style="margin-right: 5px;"
|
||||
default-button="vm.page.insertDefaultButton"
|
||||
sub-buttons="vm.page.insertSubButtons"
|
||||
size="xs"
|
||||
icon="icon-add">
|
||||
</umb-button-group>
|
||||
|
||||
<ul aria-labelledby="dLabel" class="dropdown-menu bottom-up umb-button-group__sub-buttons" role="menu">
|
||||
<li><a href="" ng-click="vm.openPageFieldOverlay()"><localize key="template_insertPageField">Value</localize></a></li>
|
||||
<li><a href="" ng-click="vm.openMacroOverlay()"><localize key="template_insertMacro">Macro</localize></a></li>
|
||||
<li><a href="" ng-click="vm.openDictionaryItemOverlay()"><localize key="template_insertDictionaryItem">Dictionary item</localize></a></li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
||||
<button
|
||||
<umb-button
|
||||
type="button"
|
||||
style="margin-right: 10px;"
|
||||
class="umb-era-button umb-button--s"
|
||||
ng-click="vm.openQueryBuilderOverlay()">
|
||||
<i class="icon icon-wand"></i> <localize key="template_queryBuilder">Query builder</localize>
|
||||
</button>
|
||||
size="xs"
|
||||
action="vm.openQueryBuilderOverlay()"
|
||||
icon="icon-wand"
|
||||
label-key="template_queryBuilder">
|
||||
</umb-button>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
@@ -14,6 +14,34 @@
|
||||
vm.page.menu.currentSection = appState.getSectionState("currentSection");
|
||||
vm.page.menu.currentNode = null;
|
||||
|
||||
// insert buttons
|
||||
vm.page.insertDefaultButton = {
|
||||
labelKey: "general_insert",
|
||||
handler: function() {
|
||||
vm.openInsertOverlay();
|
||||
}
|
||||
};
|
||||
vm.page.insertSubButtons = [
|
||||
{
|
||||
labelKey: "template_insertPageField",
|
||||
handler: function () {
|
||||
vm.openPageFieldOverlay();
|
||||
}
|
||||
},
|
||||
{
|
||||
labelKey: "template_insertMacro",
|
||||
handler: function () {
|
||||
vm.openMacroOverlay()
|
||||
}
|
||||
},
|
||||
{
|
||||
labelKey: "template_insertDictionaryItem",
|
||||
handler: function () {
|
||||
vm.openDictionaryItemOverlay();
|
||||
}
|
||||
}
|
||||
];
|
||||
|
||||
//Used to toggle the keyboard shortcut modal
|
||||
//From a custom keybinding in ace editor - that conflicts with our own to show the dialog
|
||||
vm.showKeyboardShortcut = false;
|
||||
|
||||
@@ -23,47 +23,35 @@
|
||||
<umb-box>
|
||||
<umb-box-content>
|
||||
|
||||
<div class="flex" style="margin-bottom: 30px;">
|
||||
<div class="flex" style="margin-bottom: 30px;">
|
||||
|
||||
<div class="flex" style="margin-left: auto;">
|
||||
<div class="btn-group umb-era-button-group dropdown" style="margin-right: 10px;">
|
||||
|
||||
<button
|
||||
<div class="flex" style="margin-left: auto;">
|
||||
|
||||
<umb-button-group
|
||||
style="margin-right: 5px;"
|
||||
default-button="vm.page.insertDefaultButton"
|
||||
sub-buttons="vm.page.insertSubButtons"
|
||||
size="xs"
|
||||
icon="icon-add">
|
||||
</umb-button-group>
|
||||
|
||||
<umb-button
|
||||
type="button"
|
||||
class="umb-era-button umb-button--s"
|
||||
ng-click="vm.openInsertOverlay()">
|
||||
<i class="icon icon-add"></i> <localize key="template_insert">Insert</localize>
|
||||
</button>
|
||||
|
||||
<a class="umb-era-button umb-button--s dropdown-toggle umb-button-group__toggle" data-toggle="dropdown">
|
||||
<span class="caret"></span>
|
||||
</a>
|
||||
|
||||
<ul aria-labelledby="dLabel" class="dropdown-menu bottom-up umb-button-group__sub-buttons" role="menu">
|
||||
<li><a href="" ng-click="vm.openPageFieldOverlay()"><localize key="template_insertPageField">Value</localize></a></li>
|
||||
<li><a href="" ng-click="vm.openMacroOverlay()"><localize key="template_insertMacro">Macro</localize></a></li>
|
||||
<li><a href="" ng-click="vm.openDictionaryItemOverlay()"><localize key="template_insertDictionaryItem">Dictionary item</localize></a></li>
|
||||
</ul>
|
||||
size="xs"
|
||||
action="vm.openQueryBuilderOverlay()"
|
||||
icon="icon-wand"
|
||||
label-key="template_queryBuilder">
|
||||
</umb-button>
|
||||
|
||||
</div>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
style="margin-right: 10px;"
|
||||
class="umb-era-button umb-button--s"
|
||||
ng-click="vm.openQueryBuilderOverlay()">
|
||||
<i class="icon icon-wand"></i> <localize key="template_queryBuilder">Query builder</localize>
|
||||
</button>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div
|
||||
auto-scale="85"
|
||||
umb-ace-editor="vm.aceOption"
|
||||
model="vm.partialView.content">
|
||||
</div>
|
||||
<div
|
||||
auto-scale="85"
|
||||
umb-ace-editor="vm.aceOption"
|
||||
model="vm.partialView.content">
|
||||
</div>
|
||||
|
||||
</umb-box-content>
|
||||
</umb-box>
|
||||
|
||||
@@ -15,6 +15,40 @@
|
||||
vm.page.menu.currentSection = appState.getSectionState("currentSection");
|
||||
vm.page.menu.currentNode = null;
|
||||
|
||||
// insert buttons
|
||||
vm.page.insertDefaultButton = {
|
||||
labelKey: "general_insert",
|
||||
handler: function() {
|
||||
vm.openInsertOverlay();
|
||||
}
|
||||
};
|
||||
vm.page.insertSubButtons = [
|
||||
{
|
||||
labelKey: "template_insertPageField",
|
||||
handler: function () {
|
||||
vm.openPageFieldOverlay();
|
||||
}
|
||||
},
|
||||
{
|
||||
labelKey: "template_insertPartialView",
|
||||
handler: function () {
|
||||
vm.openPartialOverlay();
|
||||
}
|
||||
},
|
||||
{
|
||||
labelKey: "template_insertDictionaryItem",
|
||||
handler: function () {
|
||||
vm.openDictionaryItemOverlay();
|
||||
}
|
||||
},
|
||||
{
|
||||
labelKey: "template_insertMacro",
|
||||
handler: function () {
|
||||
vm.openMacroOverlay()
|
||||
}
|
||||
}
|
||||
];
|
||||
|
||||
//Used to toggle the keyboard shortcut modal
|
||||
//From a custom keybinding in ace editor - that conflicts with our own to show the dialog
|
||||
vm.showKeyboardShortcut = false;
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
</umb-editor-header>
|
||||
|
||||
<umb-editor-container>
|
||||
|
||||
<umb-box>
|
||||
<umb-box-content>
|
||||
|
||||
@@ -28,14 +27,14 @@
|
||||
|
||||
<div class="flex">
|
||||
|
||||
<div ng-class="{'btn-group umb-era-button-group': vm.template.masterTemplateAlias}" style="margin-right: 10px;">
|
||||
|
||||
<div ng-class="{'btn-group': vm.template.masterTemplateAlias}" style="margin-right: 10px;">
|
||||
|
||||
<button
|
||||
data-element="button-masterTemplate"
|
||||
type="button"
|
||||
class="umb-era-button umb-button--s"
|
||||
ng-click="vm.openMasterTemplateOverlay()">
|
||||
<i class="icon icon-layout"></i>
|
||||
class="btn umb-button--xs"
|
||||
ng-click="vm.openMasterTemplateOverlay()"
|
||||
style="font-size: 14px;">
|
||||
<span class="bold"><localize key="template_mastertemplate">Master template</localize>:</span>
|
||||
<span style="margin-left: 5px;">
|
||||
<span ng-if="vm.template.masterTemplateAlias">{{ vm.getMasterTemplateName(vm.template.masterTemplateAlias, vm.templates) }}</span>
|
||||
@@ -43,7 +42,7 @@
|
||||
</span>
|
||||
</button>
|
||||
|
||||
<a ng-if="vm.template.masterTemplateAlias" ng-click="vm.removeMasterTemplate()" class="umb-era-button umb-button--s dropdown-toggle umb-button-group__toggle">
|
||||
<a ng-if="vm.template.masterTemplateAlias" ng-click="vm.removeMasterTemplate()" class="btn umb-button--xs dropdown-toggle umb-button-group__toggle">
|
||||
<span class="icon icon-wrong"></span>
|
||||
</a>
|
||||
|
||||
@@ -52,57 +51,43 @@
|
||||
</div>
|
||||
|
||||
<div class="flex" style="margin-left: auto;">
|
||||
<div class="btn-group umb-era-button-group dropdown" style="margin-right: 10px;">
|
||||
|
||||
<button
|
||||
data-element="button-insert"
|
||||
type="button"
|
||||
class="umb-era-button umb-button--s"
|
||||
ng-click="vm.openInsertOverlay()">
|
||||
<i class="icon icon-add"></i> <localize key="general_insert">Insert</localize>
|
||||
</button>
|
||||
|
||||
<a class="umb-era-button umb-button--s dropdown-toggle umb-button-group__toggle" data-toggle="dropdown">
|
||||
<span class="caret"></span>
|
||||
</a>
|
||||
<umb-button-group
|
||||
style="margin-right: 5px;"
|
||||
default-button="vm.page.insertDefaultButton"
|
||||
sub-buttons="vm.page.insertSubButtons"
|
||||
size="xs">
|
||||
</umb-button-group>
|
||||
|
||||
<ul aria-labelledby="dLabel" class="dropdown-menu bottom-up umb-button-group__sub-buttons" role="menu">
|
||||
<li><a href="" ng-click="vm.openPageFieldOverlay()"><localize key="template_insertPageField">Value</localize></a></li>
|
||||
<li><a href="" ng-click="vm.openPartialOverlay()"><localize key="template_insertPartialView">Partial view</localize></a></li>
|
||||
<li><a href="" ng-click="vm.openDictionaryItemOverlay()"><localize key="template_insertDictionaryItem">Dictionary</localize></a></li>
|
||||
<li><a href="" ng-click="vm.openMacroOverlay()"><localize key="template_insertMacro">Macro</localize></a></li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
||||
<button
|
||||
data-element="button-queryBuilder"
|
||||
<umb-button
|
||||
style="margin-right: 5px;"
|
||||
alias="queryBuilder"
|
||||
type="button"
|
||||
style="margin-right: 10px;"
|
||||
class="umb-era-button umb-button--s"
|
||||
ng-click="vm.openQueryBuilderOverlay()">
|
||||
<i class="icon icon-wand"></i> <localize key="template_queryBuilder">Query builder</localize>
|
||||
</button>
|
||||
size="xs"
|
||||
action="vm.openQueryBuilderOverlay()"
|
||||
icon="icon-wand"
|
||||
label-key="template_queryBuilder">
|
||||
</umb-button>
|
||||
|
||||
<button
|
||||
data-element="button-sections"
|
||||
<umb-button
|
||||
alias="sections"
|
||||
type="button"
|
||||
class="umb-era-button umb-button--s"
|
||||
ng-click="vm.openSectionsOverlay()">
|
||||
<i class="icon icon-indent"></i> <localize key="template_insertSections">Sections</localize>
|
||||
</button>
|
||||
size="xs"
|
||||
action="vm.openSectionsOverlay()"
|
||||
icon="icon-indent"
|
||||
label-key="template_insertSections">
|
||||
</umb-button>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div
|
||||
data-element="code-editor"
|
||||
auto-scale="85"
|
||||
umb-ace-editor="vm.aceOption"
|
||||
model="vm.template.content">
|
||||
</div>
|
||||
|
||||
</umb-box-content>
|
||||
</umb-box>
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
<umb-editor-sub-header-content-left ng-if="vm.selection.length === 0">
|
||||
<umb-button-group
|
||||
ng-if="vm.defaultButton"
|
||||
button-style="success"
|
||||
default-button="vm.defaultButton"
|
||||
sub-buttons="vm.subButtons">
|
||||
</umb-button-group>
|
||||
|
||||
Reference in New Issue
Block a user