From bf2fdc409bf4d2da01b72c0811f4d40c6e6ef027 Mon Sep 17 00:00:00 2001 From: Zsolt Date: Tue, 15 Aug 2017 16:32:30 +0200 Subject: [PATCH] created umb-box components and changed all html tags for it in the users section --- .../directives/components/umbbox.directive.js | 19 ++++++++++ .../components/umbboxcontent.directive.js | 18 +++++++++ .../components/umbboxheader.directive.js | 23 +++++++++++ .../html/umb-box/umb-box-content.html | 1 + .../html/umb-box/umb-box-header.html | 6 +++ .../components/html/umb-box/umb-box.html | 1 + .../src/views/users/group.html | 38 +++++++++---------- .../src/views/users/user.html | 32 +++++++--------- 8 files changed, 98 insertions(+), 40 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/components/umbbox.directive.js create mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/components/umbboxcontent.directive.js create mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/components/umbboxheader.directive.js create mode 100644 src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box-content.html create mode 100644 src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box-header.html create mode 100644 src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box.html diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbbox.directive.js new file mode 100644 index 0000000000..b3f57e6b5e --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbbox.directive.js @@ -0,0 +1,19 @@ +(function(){ + 'use strict'; + + function BoxDirective() { + + var directive = { + restrict: 'E', + replace: true, + transclude: true, + templateUrl: 'views/components/html/umb-box/umb-box.html' + }; + + return directive; + + } + + angular.module('umbraco.directives').directive('umbBox', BoxDirective); + +})(); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbboxcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbboxcontent.directive.js new file mode 100644 index 0000000000..6b62575bee --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbboxcontent.directive.js @@ -0,0 +1,18 @@ +(function(){ + 'use strict'; + + function BoxContentDirective() { + + var directive = { + restrict: 'E', + replace: true, + transclude: true, + templateUrl: 'views/components/html/umb-box/umb-box-content.html' + }; + + return directive; + } + + angular.module('umbraco.directives').directive('umbBoxContent', BoxContentDirective); + +})(); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbboxheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbboxheader.directive.js new file mode 100644 index 0000000000..d005fa9efc --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbboxheader.directive.js @@ -0,0 +1,23 @@ +(function(){ + 'use strict'; + + function BoxHeaderDirective() { + + var directive = { + restrict: 'E', + replace: true, + transclude: true, + templateUrl: 'views/components/html/umb-box/umb-box-header.html', + scope: { + titleKey: "@?", + title: "@?" + } + }; + + return directive; + + } + + angular.module('umbraco.directives').directive('umbBoxHeader', BoxHeaderDirective); + +})(); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box-content.html b/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box-content.html new file mode 100644 index 0000000000..f3ebfcb505 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box-content.html @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box-header.html b/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box-header.html new file mode 100644 index 0000000000..6feffe9d3d --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box-header.html @@ -0,0 +1,6 @@ +
+
+ + {{title}} +
+
\ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box.html b/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box.html new file mode 100644 index 0000000000..38c4ff58fe --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box.html @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.html b/src/Umbraco.Web.UI.Client/src/views/users/group.html index a9df8afcd3..f1427e3266 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/group.html +++ b/src/Umbraco.Web.UI.Client/src/views/users/group.html @@ -21,11 +21,11 @@
-
-
-
Access
-
-
+ + + + + -
-
+ + -
-
-
Default permissions
-
-
+ + + @@ -111,14 +109,12 @@ selected="permission.checked"> -
-
+ + -
-
-
Granular permissions
-
-
+ + + -
-
+ +
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.html b/src/Umbraco.Web.UI.Client/src/views/users/user.html index 94c8360346..603931d7e3 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/user.html +++ b/src/Umbraco.Web.UI.Client/src/views/users/user.html @@ -20,14 +20,12 @@
- -
-
-
- Profile -
-
-
+ + + + + + Required -
-
+ + -
-
-
- Access -
-
-
+ + + @@ -160,8 +154,8 @@ -
-
+ +