diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less index db0b64daa4..9458b11f46 100644 --- a/src/Umbraco.Web.UI.Client/src/less/belle.less +++ b/src/Umbraco.Web.UI.Client/src/less/belle.less @@ -76,7 +76,6 @@ @import "listview.less"; @import "gridview.less"; @import "footer.less"; -@import "dashboards.less"; @import "forms/umb-validation-label.less"; @@ -138,6 +137,7 @@ @import "components/umb-insert-code-box.less"; @import "components/umb-packages.less"; @import "components/umb-package-local-install.less"; +@import "components/umb-panel-group.less"; @import "components/umb-lightbox.less"; @import "components/umb-avatar.less"; @import "components/umb-progress-bar.less"; @@ -192,18 +192,20 @@ @import "pages/welcome-dashboard.less"; -//used for property editors +// Used for property editors @import "property-editors.less"; -//used for prevalue editors +// Used for prevalue editors @import "components/prevalues/multivalues.less"; +// Dashboards +@import "dashboards/getstarted.less"; +@import "dashboards/umbraco-forms.less"; +@import "dashboards/examine-management.less"; +@import "dashboards/healthcheck.less"; @import "typeahead.less"; @import "hacks.less"; -@import "healthcheck.less"; -@import "getstarted.less"; - // cleanup properties.less when it is done @import "properties.less"; diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-panel-group.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-panel-group.less new file mode 100644 index 0000000000..487c1881b1 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-panel-group.less @@ -0,0 +1,111 @@ +.umb-panel-group__details { + border-radius: 3px; + margin-bottom: 40px; +} + +.umb-panel-group__details-group { + background: @white; + box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16); + border-radius: @baseBorderRadius; +} + +.umb-panel-group__details-group-title { + background-color: @blueExtraDark; + padding: 10px 20px; + display: flex; + align-items: center; + justify-content: space-between; + border-radius: 3px 3px 0 0; +} + +.umb-panel-group__details-group-name { + font-size: 16px; + color: @white; + font-weight: bold; +} + +.umb-panel-group__details-checks { + border-top: none; + border-radius: 0 0 3px 3px; + background: @white; +} + +.umb-panel-group__details-check { + position: relative; +} + +.umb-panel-group__details-check-title { + padding: 15px 20px; +} + +.umb-panel-group__details-check-name { + font-size: 15px; + color: @black; + font-weight: bold; + margin-bottom: 3px; +} + +.umb-panel-group__details-check-description { + font-size: 13px; + color: @gray-3; + line-height: 1.6em; +} + +.umb-panel-group__details-status { + padding: 15px 0; + display: flex; + border-top: 2px solid @gray-10; +} + +.umb-panel-group__details-status-overlay { + background: @white; + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + opacity: 0.9; +} + +.umb-panel-group__details-status:last-child { + border-bottom: none; +} + +.umb-panel-group__details-status-icon-container { + flex: 0 0 50px; + display: flex; + justify-content: center; + padding: 0 20px; +} + +.umb-panel-group__details-status-content { + padding: 0 20px; + flex: 1 1 auto; +} + +.umb-panel-group__details-status-text { + line-height: 1.6em; +} + +.umb-panel-group__details-status-actions { + display: flex; + flex-direction: column; + margin-top: 10px; +} + +.umb-panel-group__details-status-action { + background-color: @gray-10; + padding: 10px; + margin-bottom: 10px; + border-radius: 3px; +} + +.umb-panel-group__details-status-action:last-child { + margin-bottom: 0; +} + +.umb-panel-group__details-status-action-description { + margin-top: 5px; + font-size: 12px; + padding-left: 165px; +} diff --git a/src/Umbraco.Web.UI.Client/src/less/dashboards/examine-management.less b/src/Umbraco.Web.UI.Client/src/less/dashboards/examine-management.less new file mode 100644 index 0000000000..0c219af1e4 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/less/dashboards/examine-management.less @@ -0,0 +1,15 @@ +.examine-management { + + .form-search { + + .search-query { + flex: 1 1 auto; + width: auto; + } + + button.btn { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + } + } +} diff --git a/src/Umbraco.Web.UI.Client/src/less/getstarted.less b/src/Umbraco.Web.UI.Client/src/less/dashboards/getstarted.less similarity index 100% rename from src/Umbraco.Web.UI.Client/src/less/getstarted.less rename to src/Umbraco.Web.UI.Client/src/less/dashboards/getstarted.less diff --git a/src/Umbraco.Web.UI.Client/src/less/dashboards/healthcheck.less b/src/Umbraco.Web.UI.Client/src/less/dashboards/healthcheck.less new file mode 100644 index 0000000000..449cc4066b --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/less/dashboards/healthcheck.less @@ -0,0 +1,134 @@ + +.umb-healthcheck { + display: flex; + flex-wrap: wrap; + margin-left: -10px; + margin-right: -10px; +} + +.umb-healthcheck-help-text { + line-height: 1.6em; + max-width: 750px; +} + +.umb-healthcheck-action-bar { + display: flex; + justify-content: flex-end; + margin-bottom: 20px; +} + + +/* Group and states */ +.umb-healthcheck-group { + display: flex; + flex-wrap: wrap; + flex-direction: column; + background: @white; + border-radius: 3px; + padding: 20px; + box-sizing: border-box; + text-align: center; + box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16); + height: 100%; + box-sizing: border-box; +} + +.umb-healthcheck-group:hover { + box-shadow: 0 3px 6px 0 rgba(0,0,0,0.16); + cursor: pointer; + transition: box-shadow 150ms ease-in-out; +} + +.umb-healthcheck-group__load-container { + position: relative; + height: 30px; + margin-top: 15px; + margin-bottom: 16px; +} + + +/* Title */ +.umb-healthcheck-title { + font-size: 14px; + font-weight: bold; +} + + +/* Messages */ +.umb-healthcheck-messages { + margin-top: 15px; +} + +.umb-healthcheck-message { + position: relative; + background: @gray-10; + border-radius: 50px; + display: inline-flex; + align-items: center; + padding-left: 8px; + padding-right: 8px; + margin-bottom: 5px; + color: @black; + font-weight: bold; + font-size: 13px; +} + +.umb-healthcheck-message i { + font-size: 15px; + margin-right: 3px; +} + +.umb-healthcheck-details-link { + color: @turquoise-d1; +} + +.umb-healthcheck-details-link:hover { + text-decoration: none; + color: @turquoise-d1; +} + + +/* Helpers */ +.align-self-center { + align-self: center; +} + + +/* Spacing for boxes */ +.umb-air { + flex: 0 0 auto; + flex-basis: 100%; + max-width: 100%; + padding: 10px; + box-sizing: border-box; + + @media (min-width: 500px) { + flex-basis: 50%; + max-width: 50%; + } + + @media (min-width: 768px) { + flex-basis: 20%; + max-width: 20%; + } +} + + +/* DETAILS */ + +.umb-healthcheck-back-link { + font-weight: bold; + color: @black; +} + +.umb-healthcheck-status-icon { + font-size: 20px; + margin-top: 2px; +} + +.umb-healthcheck-status-icon.-large { + width: 70px; + height: 70px; + font-size: 30px; + background-color: @white; +} diff --git a/src/Umbraco.Web.UI.Client/src/less/dashboards.less b/src/Umbraco.Web.UI.Client/src/less/dashboards/umbraco-forms.less similarity index 100% rename from src/Umbraco.Web.UI.Client/src/less/dashboards.less rename to src/Umbraco.Web.UI.Client/src/less/dashboards/umbraco-forms.less diff --git a/src/Umbraco.Web.UI.Client/src/less/healthcheck.less b/src/Umbraco.Web.UI.Client/src/less/healthcheck.less deleted file mode 100644 index 23bbbf4931..0000000000 --- a/src/Umbraco.Web.UI.Client/src/less/healthcheck.less +++ /dev/null @@ -1,246 +0,0 @@ - -.umb-healthcheck { - display: flex; - flex-wrap: wrap; - margin-left: -10px; - margin-right: -10px; -} - -.umb-healthcheck-help-text { - line-height: 1.6em; - max-width: 750px; -} - -.umb-healthcheck-action-bar { - display: flex; - justify-content: flex-end; - margin-bottom: 20px; -} - - -/* Group and states */ -.umb-healthcheck-group { - display: flex; - flex-wrap: wrap; - flex-direction: column; - background: @white; - border-radius: 3px; - padding: 20px; - box-sizing: border-box; - text-align: center; - box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16); - height: 100%; - box-sizing: border-box; -} - -.umb-healthcheck-group:hover { - box-shadow: 0 3px 6px 0 rgba(0,0,0,0.16); - cursor: pointer; - transition: box-shadow 150ms ease-in-out; -} - -.umb-healthcheck-group__load-container { - position: relative; - height: 30px; - margin-top: 15px; - margin-bottom: 16px; -} - - -/* Title */ -.umb-healthcheck-title { - font-size: 14px; - font-weight: bold; -} - - -/* Messages */ -.umb-healthcheck-messages { - margin-top: 15px; -} - -.umb-healthcheck-message { - position: relative; - background: @gray-10; - border-radius: 50px; - display: inline-flex; - align-items: center; - padding-left: 8px; - padding-right: 8px; - margin-bottom: 5px; - color: @black; - font-weight: bold; - font-size: 13px; -} - -.umb-healthcheck-message i { - font-size: 15px; - margin-right: 3px; -} - -.umb-healthcheck-details-link { - color: @turquoise-d1; -} - -.umb-healthcheck-details-link:hover { - text-decoration: none; - color: @turquoise-d1; -} - - -/* Helpers */ -.align-self-center { - align-self: center; -} - - -/* Spacing for boxes */ -.umb-air { - flex: 0 0 auto; - flex-basis: 100%; - max-width: 100%; - padding: 10px; - box-sizing: border-box; - - @media (min-width: 500px) { - flex-basis: 50%; - max-width: 50%; - } - - @media (min-width: 768px) { - flex-basis: 20%; - max-width: 20%; - } -} - - -/* DETAILS */ - -.umb-healthcheck-back-link { - font-weight: bold; - color: @black; -} - -.umb-healthcheck-group__details { - border-radius: 3px; - margin-bottom: 40px; -} - -.umb-healthcheck-group__details-group { - background: @white; - box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16); - border-radius: @baseBorderRadius; -} - -.umb-healthcheck-group__details-group-title { - background-color: @blueExtraDark; - padding: 10px 20px; - display: flex; - align-items: center; - justify-content: space-between; - border-radius: 3px 3px 0 0; -} - -.umb-healthcheck-group__details-group-name { - font-size: 16px; - color: @white; - font-weight: bold; -} - -.umb-healthcheck-group__details-checks { - border-top: none; - border-radius: 0 0 3px 3px; - background: @white; -} - -.umb-healthcheck-group__details-check { - position: relative; -} - -.umb-healthcheck-group__details-check-title { - padding: 15px 20px; -} - -.umb-healthcheck-group__details-check-name { - font-size: 15px; - color: @black; - font-weight: bold; - margin-bottom: 3px; -} - -.umb-healthcheck-group__details-check-description { - font-size: 13px; - color: @gray-3; - line-height: 1.6em; -} - -.umb-healthcheck-group__details-status { - padding: 15px 0; - display: flex; - border-top: 2px solid @gray-10; -} - -.umb-healthcheck-group__details-status-overlay { - background: @white; - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - opacity: 0.9; -} - -.umb-healthcheck-group__details-status:last-child { - border-bottom: none; -} - -.umb-healthcheck-group__details-status-icon-container { - flex: 0 0 50px; - display: flex; - justify-content: center; - padding: 0 20px; -} - -.umb-healthcheck-status-icon { - font-size: 20px; - margin-top: 2px; -} - -.umb-healthcheck-status-icon.-large { - width: 70px; - height: 70px; - font-size: 30px; - background-color: @white; -} - -.umb-healthcheck-group__details-status-content { - padding: 0 20px; - flex: 1 1 auto; -} - -.umb-healthcheck-group__details-status-text { - line-height: 1.6em; -} - -.umb-healthcheck-group__details-status-actions { - display: flex; - flex-direction: column; - margin-top: 10px; -} - -.umb-healthcheck-group__details-status-action { - background-color: @gray-10; - padding: 10px; - margin-bottom: 10px; - border-radius: 3px; -} - -.umb-healthcheck-group__details-status-action:last-child { - margin-bottom: 0; -} - -.umb-healthcheck-group__details-status-action-description { - margin-top: 5px; - font-size: 12px; - padding-left: 165px; -} diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.controller.js index 10037db166..7ad87b9e78 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.controller.js @@ -1,4 +1,4 @@ -function ExamineManagementController($scope, umbRequestHelper, $http, $q, $timeout) { +function ExamineManagementController($scope, $http, $q, $timeout, umbRequestHelper, localizationService, overlayService) { var vm = this; @@ -25,14 +25,18 @@ function ExamineManagementController($scope, umbRequestHelper, $http, $q, $timeo function showSearchResultDialog(values) { if (vm.searchResults) { - vm.searchResults.overlay = { - title: "Field values", - searchResultValues: values, - view: "views/dashboard/settings/examinemanagementresults.html", - close: function () { - vm.searchResults.overlay = null; - } - }; + + localizationService.localize("examineManagement_fieldValues").then(function (value) { + + vm.searchResults.overlay = { + title: value, + searchResultValues: values, + view: "views/dashboard/settings/examinemanagementresults.html", + close: function () { + vm.searchResults.overlay = null; + } + }; + }); } } @@ -132,28 +136,46 @@ function ExamineManagementController($scope, umbRequestHelper, $http, $q, $timeo } } - function rebuildIndex(index) { - if (confirm("This will cause the index to be rebuilt. " + - "Depending on how much content there is in your site this could take a while. " + - "It is not recommended to rebuild an index during times of high website traffic " + - "or when editors are editing content.")) { + function rebuildIndex(index, event) { - index.isProcessing = true; - index.processingAttempts = 0; + const dialog = { + view: "views/dashboard/settings/overlays/examinemanagement.rebuild.html", + index: index, + submitButtonLabelKey: "general_ok", + submit: function (model) { + performRebuild(model.index); + overlayService.close(); + }, + close: function () { + overlayService.close(); + } + }; - umbRequestHelper.resourcePromise( - $http.post(umbRequestHelper.getApiUrl("examineMgmtBaseUrl", - "PostRebuildIndex", - { indexName: index.name })), - 'Failed to rebuild index') - .then(function() { + localizationService.localize("examineManagement_rebuildIndex").then(value => { + dialog.title = value; + overlayService.open(dialog); + }); - // rebuilding has started, nothing is returned accept a 200 status code. - // lets poll to see if it is done. - $timeout(() => { checkProcessing(index, "PostCheckRebuildIndex"), 1000 }); + event.preventDefault() + event.stopPropagation(); + } - }); - } + function performRebuild(index) { + index.isProcessing = true; + index.processingAttempts = 0; + + umbRequestHelper.resourcePromise( + $http.post(umbRequestHelper.getApiUrl("examineMgmtBaseUrl", + "PostRebuildIndex", + { indexName: index.name })), + 'Failed to rebuild index') + .then(function () { + + // rebuilding has started, nothing is returned accept a 200 status code. + // lets poll to see if it is done. + $timeout(() => { checkProcessing(index, "PostCheckRebuildIndex"), 1000 }); + + }); } function init() { diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html index 5f226771e9..6a7e65f7ae 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html @@ -1,4 +1,4 @@ -
+
@@ -13,30 +13,30 @@
-
+
-
+
-
-
Indexers
+
+
Indexers
-
-
-
-
Manage Examine's indexes
-
Allows you to view the details of each index and provides some tools for managing the indexes
+
+
+
+
Manage Examine's indexes
+
Allows you to view the details of each index and provides some tools for managing the indexes
-
+
-
- +
-
-
+
+
{{indexer.name}} @@ -51,27 +51,27 @@
-
+
-
-
Searchers
+
+
Searchers
-
-
-
-
Configured Searchers
-
Shows properties and tools for any configured Searcher (i.e. such as a multi-index searcher)
+
+
+
+
Configured Searchers
+
Shows properties and tools for any configured Searcher (i.e. such as a multi-index searcher)
-
+
-
- +
+
-
-
+
+
{{searcher.name}} @@ -89,40 +89,44 @@ - ← Back to overview + ← Back to overview -
+
-
+
-
-
{{ vm.selectedSearcher.name }}
+
+
{{ vm.selectedSearcher.name }}
-
+
-
+
-
-
Search
-
Search the index and view the results
+
+
Search
+
Search the index and view the results
-
+
-
+
-
-
+
+