From 648e4e2123d207024b544398de3852466e2c04b7 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 18 Jan 2016 15:33:31 +0300 Subject: [PATCH 01/22] change copied code to custom --- src/app/pages/ui/alerts/alerts.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/pages/ui/alerts/alerts.html b/src/app/pages/ui/alerts/alerts.html index c07c945bf..c47c1a120 100644 --- a/src/app/pages/ui/alerts/alerts.html +++ b/src/app/pages/ui/alerts/alerts.html @@ -70,11 +70,11 @@ ba-panel-title="Composite alerts" ba-panel-class="with-scroll">
-
-
Unhandled error!
- Oh snap! Change a few things up and try submitting again. +
+

Warning!

+ Pay attention. Change a few things up and try submitting again.
- +
From fe8f8fd70459ed4487536d9b75810acb9258ac78 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 18 Jan 2016 18:57:56 +0300 Subject: [PATCH 02/22] refactor&fix(modals): use bootstrap ui instead simple bootstrap --- src/app/pages/ui/modals/ModalsPageCtrl.js | 28 ++++ src/app/pages/ui/modals/message-modals.html | 6 - .../ui/modals/modalTemplates/basicModal.html | 16 ++ .../ui/modals/modalTemplates/dangerModal.html | 9 + .../ui/modals/modalTemplates/infoModal.html | 9 + .../ui/modals/modalTemplates/largeModal.html | 16 ++ .../ui/modals/modalTemplates/smallModal.html | 17 ++ .../modals/modalTemplates/successModal.html | 10 ++ .../modals/modalTemplates/warningModal.html | 9 + src/app/pages/ui/modals/modals.html | 158 +++--------------- src/app/pages/ui/modals/modals.module.js | 1 + src/app/pages/ui/modals/modalsPanel.html | 5 - src/sass/app/_form.scss | 1 + 13 files changed, 137 insertions(+), 148 deletions(-) create mode 100644 src/app/pages/ui/modals/ModalsPageCtrl.js delete mode 100644 src/app/pages/ui/modals/message-modals.html create mode 100644 src/app/pages/ui/modals/modalTemplates/basicModal.html create mode 100644 src/app/pages/ui/modals/modalTemplates/dangerModal.html create mode 100644 src/app/pages/ui/modals/modalTemplates/infoModal.html create mode 100644 src/app/pages/ui/modals/modalTemplates/largeModal.html create mode 100644 src/app/pages/ui/modals/modalTemplates/smallModal.html create mode 100644 src/app/pages/ui/modals/modalTemplates/successModal.html create mode 100644 src/app/pages/ui/modals/modalTemplates/warningModal.html delete mode 100644 src/app/pages/ui/modals/modalsPanel.html diff --git a/src/app/pages/ui/modals/ModalsPageCtrl.js b/src/app/pages/ui/modals/ModalsPageCtrl.js new file mode 100644 index 000000000..159a2523b --- /dev/null +++ b/src/app/pages/ui/modals/ModalsPageCtrl.js @@ -0,0 +1,28 @@ +/** + * @author a.demeshko + * created on 18.01.2016 + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.pages.ui.notifications') + .controller('ModalsPageCtrl', ModalsPageCtrl); + + /** @ngInject */ + function ModalsPageCtrl($scope, $uibModal) { + $scope.open = function (page, size) { + $uibModal.open({ + animation: true, + templateUrl: page, + size: size, + resolve: { + items: function () { + return $scope.items; + } + } + }); + }; + } + + +})(); diff --git a/src/app/pages/ui/modals/message-modals.html b/src/app/pages/ui/modals/message-modals.html deleted file mode 100644 index 153dc60d9..000000000 --- a/src/app/pages/ui/modals/message-modals.html +++ /dev/null @@ -1,6 +0,0 @@ -
- - - - -
\ No newline at end of file diff --git a/src/app/pages/ui/modals/modalTemplates/basicModal.html b/src/app/pages/ui/modals/modalTemplates/basicModal.html new file mode 100644 index 000000000..b5ce996ce --- /dev/null +++ b/src/app/pages/ui/modals/modalTemplates/basicModal.html @@ -0,0 +1,16 @@ +
+
+ + +
+
+ Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet + dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper + suscipit lobortis nisl ut aliquip ex ea commodo consequat. +
+
+ +
+
diff --git a/src/app/pages/ui/modals/modalTemplates/dangerModal.html b/src/app/pages/ui/modals/modalTemplates/dangerModal.html new file mode 100644 index 000000000..53a40cc3e --- /dev/null +++ b/src/app/pages/ui/modals/modalTemplates/dangerModal.html @@ -0,0 +1,9 @@ +
+
+ Error +
+
Your information hasn't been saved!
+
+ +
+
diff --git a/src/app/pages/ui/modals/modalTemplates/infoModal.html b/src/app/pages/ui/modals/modalTemplates/infoModal.html new file mode 100644 index 000000000..37ba5ff8f --- /dev/null +++ b/src/app/pages/ui/modals/modalTemplates/infoModal.html @@ -0,0 +1,9 @@ +
+
+ Information +
+
You've got a new email!
+
+ +
+
diff --git a/src/app/pages/ui/modals/modalTemplates/largeModal.html b/src/app/pages/ui/modals/modalTemplates/largeModal.html new file mode 100644 index 000000000..ba3b6e7d8 --- /dev/null +++ b/src/app/pages/ui/modals/modalTemplates/largeModal.html @@ -0,0 +1,16 @@ +
+
+ +

Modal title

+
+
+ Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet + dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper + suscipit lobortis nisl ut aliquip ex ea commodo consequat. +
+
+ +
+
diff --git a/src/app/pages/ui/modals/modalTemplates/smallModal.html b/src/app/pages/ui/modals/modalTemplates/smallModal.html new file mode 100644 index 000000000..17d7b64ca --- /dev/null +++ b/src/app/pages/ui/modals/modalTemplates/smallModal.html @@ -0,0 +1,17 @@ +
+
+ +

Modal title

+
+
+ Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet + dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper + suscipit lobortis nisl ut aliquip ex ea commodo consequat. +
+
+ +
+
+ diff --git a/src/app/pages/ui/modals/modalTemplates/successModal.html b/src/app/pages/ui/modals/modalTemplates/successModal.html new file mode 100644 index 000000000..862be47e6 --- /dev/null +++ b/src/app/pages/ui/modals/modalTemplates/successModal.html @@ -0,0 +1,10 @@ +
+
+ Success +
+
Your information has been saved successfully
+
+ +
+
+ diff --git a/src/app/pages/ui/modals/modalTemplates/warningModal.html b/src/app/pages/ui/modals/modalTemplates/warningModal.html new file mode 100644 index 000000000..e087d83f3 --- /dev/null +++ b/src/app/pages/ui/modals/modalTemplates/warningModal.html @@ -0,0 +1,9 @@ +
+
+ Warning +
+
Your computer is about to explode!
+
+ +
+
diff --git a/src/app/pages/ui/modals/modals.html b/src/app/pages/ui/modals/modals.html index 89549146e..2eff3b31e 100644 --- a/src/app/pages/ui/modals/modals.html +++ b/src/app/pages/ui/modals/modals.html @@ -5,7 +5,15 @@ ba-panel ba-panel-title="Modals" ba-panel-class="with-scroll"> -
+
+ + + +
@@ -14,7 +22,18 @@ ba-panel ba-panel-title="Message Modals" ba-panel-class="with-scroll"> -
+
+ + + + +
- - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/app/pages/ui/modals/modals.module.js b/src/app/pages/ui/modals/modals.module.js index 67112196f..bf92754d2 100644 --- a/src/app/pages/ui/modals/modals.module.js +++ b/src/app/pages/ui/modals/modals.module.js @@ -14,6 +14,7 @@ .state('ui.modals', { url: '/modals', templateUrl: 'app/pages/ui/modals/modals.html', + controller: 'ModalsPageCtrl', title: 'Modals', sidebarMeta: { order: 300, diff --git a/src/app/pages/ui/modals/modalsPanel.html b/src/app/pages/ui/modals/modalsPanel.html deleted file mode 100644 index 6e0a1f736..000000000 --- a/src/app/pages/ui/modals/modalsPanel.html +++ /dev/null @@ -1,5 +0,0 @@ -
- - - -
\ No newline at end of file diff --git a/src/sass/app/_form.scss b/src/sass/app/_form.scss index 237edebc8..34488a790 100644 --- a/src/sass/app/_form.scss +++ b/src/sass/app/_form.scss @@ -85,6 +85,7 @@ textarea.form-control { .modal-content { border-radius: 0; + color: $default-text; } @mixin setSwitchBorder($color) { From 9f2b12c5fe9150eaf52b1b7e57fdd6737d4c9c00 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 18 Jan 2016 19:40:13 +0300 Subject: [PATCH 03/22] refactor&fix(dropdown buttons): use bootstrap ui instead simple bootstrap --- .../pages/ui/buttons/widgets/dropdowns.html | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/src/app/pages/ui/buttons/widgets/dropdowns.html b/src/app/pages/ui/buttons/widgets/dropdowns.html index 0d39511dd..c2f1143fd 100644 --- a/src/app/pages/ui/buttons/widgets/dropdowns.html +++ b/src/app/pages/ui/buttons/widgets/dropdowns.html @@ -1,10 +1,10 @@
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -