diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbuttongroup.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbuttongroup.directive.js index 292f0cc786..bce81c1ffd 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbuttongroup.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbuttongroup.directive.js @@ -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: "@?" } }; diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less index b523e507bc..44f7f8b691 100644 --- a/src/Umbraco.Web.UI.Client/src/less/belle.less +++ b/src/Umbraco.Web.UI.Client/src/less/belle.less @@ -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"; diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less index 1eaf285119..6a402c7946 100644 --- a/src/Umbraco.Web.UI.Client/src/less/buttons.less +++ b/src/Umbraco.Web.UI.Client/src/less/buttons.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 diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less index 9762eaf058..388d3587c1 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less @@ -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); } } diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less index ab8b6b0671..4b670ab781 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less @@ -7,10 +7,9 @@ outline: none; } - .umb-button__button { +.umb-button__button { position: relative; - z-index: 1; - } +} .umb-button__content { opacity: 1; diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-era-button.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-era-button.less deleted file mode 100644 index 138383ce32..0000000000 --- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-era-button.less +++ /dev/null @@ -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; -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html index 8117952b59..d46c80ddc5 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html @@ -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}}"> - + diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html index de13b1206d..3b20234ba0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html @@ -68,6 +68,7 @@ - + button-style="success" + size="s" + disabled="healthCheckAction.providedValue.$invalid" + action="vm.executeAction(check, $parent.$index, action)" + label="{{action.name}}"> + diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html index 0ecaeb80df..24b32815e5 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html @@ -8,21 +8,22 @@ - + size="s" + action="vm.disableUrlTracker()" + label-key="redirectUrls_disableUrlTracker"> + - + size="s" + button-style="success" + action="vm.enableUrlTracker()" + label-key="redirectUrls_enableUrlTracker"> + @@ -76,8 +77,13 @@
{{redirectUrl.destinationUrl}}
- - + + diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html index 5ebebae426..4495ffc8a2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html @@ -53,6 +53,7 @@ I accept terms of use - + +
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html index ca4f129398..a015748078 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html @@ -91,13 +91,15 @@ Confirm package uninstall - + +
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html index 7e352f27b0..00634c7922 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html @@ -153,13 +153,25 @@
- - + + + + + +
@@ -315,14 +327,15 @@ I accept terms of use - + +
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js index f21f78b8eb..35da2e8ea4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js @@ -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; diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html index d692c6fd9e..c3877aa8d1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html @@ -25,34 +25,22 @@
-
- - - - - + + - - -
- - + size="xs" + action="vm.openQueryBuilderOverlay()" + icon="icon-wand" + label-key="template_queryBuilder"> +
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js index f0af6fc640..cb56fecbad 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js @@ -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; diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html index 3bbf735199..3a7b025597 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html @@ -23,47 +23,35 @@ -
+
-
-
- - - - - - - - + size="xs" + action="vm.openQueryBuilderOverlay()" + icon="icon-wand" + label-key="template_queryBuilder"> +
- -
-
- -
-
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js index 709299a927..92076ff605 100644 --- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js @@ -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; diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html index 25cfb7ea61..6cddc552e2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html @@ -20,7 +20,6 @@ - @@ -28,14 +27,14 @@
-
- +
+ - + @@ -52,57 +51,43 @@
-
- - - - - + + - - -
- - + size="xs" + action="vm.openQueryBuilderOverlay()" + icon="icon-wand" + label-key="template_queryBuilder"> + - + size="xs" + action="vm.openSectionsOverlay()" + icon="icon-indent" + label-key="template_insertSections"> +
- +
- diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html index 28103ea3f0..e75c376801 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html +++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html @@ -11,6 +11,7 @@