From bc4e97be4869589ba0f91dba9e197ba9f4aa4f27 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 21 Mar 2018 13:39:16 +0100 Subject: [PATCH] fixes: U4-11120 Create new Language dashboard to create/remove/set default languages - angular --- .../components/buttons/umbbutton.directive.js | 6 + src/Umbraco.Web.UI.Client/src/less/belle.less | 1 + .../src/less/components/html/umb-alert.less | 11 ++ .../src/less/components/umb-box.less | 2 +- .../less/components/umb-load-indicator.less | 2 +- .../less/components/users/umb-permission.less | 4 + .../src/less/tables.less | 15 ++- .../src/less/variables.less | 4 +- .../views/components/buttons/umb-button.html | 4 +- .../components/editor/umb-editor-header.html | 2 +- .../src/views/languages/edit.controller.js | 122 ++++++++++++++++++ .../src/views/languages/edit.html | 96 ++++++++++++++ .../views/languages/overview.controller.js | 113 ++++++++++++++++ .../src/views/languages/overview.html | 58 +++++++++ src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 1 + .../umbraco/config/lang/en_us.xml | 10 ++ 16 files changed, 437 insertions(+), 14 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/less/components/html/umb-alert.less create mode 100644 src/Umbraco.Web.UI.Client/src/views/languages/edit.controller.js create mode 100644 src/Umbraco.Web.UI.Client/src/views/languages/edit.html create mode 100644 src/Umbraco.Web.UI.Client/src/views/languages/overview.controller.js create mode 100644 src/Umbraco.Web.UI.Client/src/views/languages/overview.html diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js index 4b0bdb6c71..89f244f4d7 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js @@ -125,6 +125,12 @@ Use this directive to render an umbraco button. The directive can be used to gen }); + scope.clickButton = function(event) { + if(scope.action) { + scope.action({$event: event}); + } + }; + scope.$on('$destroy', function() { unbindStateWatcher(); }); diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less index 1834e98529..e71466348e 100644 --- a/src/Umbraco.Web.UI.Client/src/less/belle.less +++ b/src/Umbraco.Web.UI.Client/src/less/belle.less @@ -88,6 +88,7 @@ @import "components/application/umb-language-picker.less"; @import "components/html/umb-expansion-panel.less"; +@import "components/html/umb-alert.less"; @import "components/editor.less"; @import "components/overlays.less"; diff --git a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-alert.less b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-alert.less new file mode 100644 index 0000000000..ef8834f767 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-alert.less @@ -0,0 +1,11 @@ +.umb-alert { + padding: 15px; + box-sizing: border-box; + background-color: @turquoise-washed; + border: 1px solid @turquoise; +} + +.umb-alert--info { + background-color: @turquoise-washed; + border: 1px solid @turquoise; +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-box.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-box.less index b6a8f060f3..f2cacc26b3 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-box.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-box.less @@ -7,6 +7,7 @@ .umb-box-header { padding: 10px 20px; + border-bottom: 1px solid @gray-9; } .umb-box-header-title { @@ -24,5 +25,4 @@ .umb-box-content { padding: 20px; - border-top: 1px solid @gray-9; } \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-load-indicator.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-load-indicator.less index 6d60e969a0..38e0b643a2 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-load-indicator.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-load-indicator.less @@ -48,7 +48,7 @@ } 50% { transform: scale(1); - background: white; + background: transparent; } 100% { transform: scale(0.5); diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less index faed098fc8..54116e9093 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less @@ -4,6 +4,10 @@ padding: 7px 0; } +.umb-permission--disabled { + opacity: 0.8; +} + .umb-permission:last-of-type { border-bottom: none; } diff --git a/src/Umbraco.Web.UI.Client/src/less/tables.less b/src/Umbraco.Web.UI.Client/src/less/tables.less index 3c63785957..abf3af40f6 100644 --- a/src/Umbraco.Web.UI.Client/src/less/tables.less +++ b/src/Umbraco.Web.UI.Client/src/less/tables.less @@ -13,22 +13,20 @@ table { border-spacing: 0; } -table thead { - background-color: @gray-10; -} - - // BASELINE STYLES // --------------- .table { width: 100%; margin-bottom: @baseLineHeight; - border: 1px solid @gray-8; + box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16); + background: @tableBackground; + border-radius: @baseBorderRadius; + font-size: 14px; // Cells th, td { - padding: 10px 8px; + padding: 10px 20px; line-height: @baseLineHeight; text-align: left; border-top: 1px solid @tableBorder; @@ -38,6 +36,9 @@ table thead { } // Bottom align for column headings thead th { + padding-top: 15px; + padding-bottom: 15px; + color: @gray-3; vertical-align: bottom; } // Remove top border from thead by default diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less index 0c93ad027b..6e31587471 100644 --- a/src/Umbraco.Web.UI.Client/src/less/variables.less +++ b/src/Umbraco.Web.UI.Client/src/less/variables.less @@ -154,10 +154,10 @@ // Tables // ------------------------- -@tableBackground: transparent; // overall background-color +@tableBackground: @white; // overall background-color @tableBackgroundAccent: @gray-10; // for striping @tableBackgroundHover: @gray-10; // for hover -@tableBorder: @gray-8; // table and cell border +@tableBorder: @gray-9; // table and cell border // Buttons // ------------------------- diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html index aadba077e8..fdcfc25a46 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html @@ -8,7 +8,7 @@
- + {{label}} @@ -16,7 +16,7 @@ -