You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/09/03 11:06:43 UTC
[1/2] ignite git commit: # IGNITE-843 Added animation.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 1e84e8c41 -> 4b1ff6932
# IGNITE-843 Added animation.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b500eb18
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b500eb18
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b500eb18
Branch: refs/heads/ignite-843
Commit: b500eb18455ad33902c110fc14e23b7baaca93cd
Parents: ec15e0e
Author: Andrey <an...@gridgain.com>
Authored: Thu Sep 3 16:07:03 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Sep 3 16:07:03 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 9 ++++++++-
.../src/main/js/public/stylesheets/style.scss | 17 -----------------
.../src/main/js/views/templates/layout.jade | 6 ++++--
3 files changed, 12 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b500eb18/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index 921cff5..8464e29 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-var controlCenterModule = angular.module('ignite-web-control-center', ['smart-table', 'mgcrea.ngStrap', 'ui.ace', 'ngSanitize']);
+var controlCenterModule = angular.module('ignite-web-control-center', ['ngAnimate', 'smart-table', 'mgcrea.ngStrap', 'ui.ace', 'ngSanitize']);
// Modal popup configuration.
controlCenterModule.config(function ($modalProvider) {
@@ -66,6 +66,13 @@ controlCenterModule.config(function ($alertProvider) {
});
});
+// Alerts configuration.
+controlCenterModule.config(function($modalProvider) {
+ angular.extend($modalProvider.defaults, {
+ animation: 'am-fade-and-scale'
+ });
+});
+
// Common functions to be used in controllers.
controlCenterModule.service('$common', [
'$alert', '$popover', '$timeout', '$focus', function ($alert, $popover, $timeout, $focus) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/b500eb18/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index ed274a5..a5badda 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -48,23 +48,6 @@ a.active {
text-align: center;
}
-.modal-backdrop.am-fade {
- opacity: .5;
- transition: opacity .15s linear;
- &.ng-enter {
- opacity: 0;
- &.ng-enter-active {
- opacity: .5;
- }
- }
- &.ng-leave {
- opacity: .5;
- &.ng-leave-active {
- opacity: 0;
- }
- }
-}
-
.modal.center .modal-dialog {
position: fixed;
top: 50%;
http://git-wip-us.apache.org/repos/asf/ignite/blob/b500eb18/modules/control-center-web/src/main/js/views/templates/layout.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/layout.jade b/modules/control-center-web/src/main/js/views/templates/layout.jade
index c391fe6..b2ef894 100644
--- a/modules/control-center-web/src/main/js/views/templates/layout.jade
+++ b/modules/control-center-web/src/main/js/views/templates/layout.jade
@@ -25,6 +25,7 @@ html(ng-app='ignite-web-control-center' ng-init='user = #{JSON.stringify(user)};
// Font
link(rel='stylesheet', href='//fonts.googleapis.com/css?family=Roboto+Slab:700:serif|Roboto+Slab:400:serif')
+ link(rel='stylesheet', href='//cdnjs.cloudflare.com/ajax/libs/angular-motion/0.4.2/angular-motion.min.css')
link(rel='stylesheet', href='/stylesheets/style.css')
@@ -33,8 +34,9 @@ html(ng-app='ignite-web-control-center' ng-init='user = #{JSON.stringify(user)};
script(src='//cdnjs.cloudflare.com/ajax/libs/lodash.js/3.10.1/lodash.min.js')
- script(src='//ajax.googleapis.com/ajax/libs/angularjs/1.4.3/angular.js')
- script(src='//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.3/angular-sanitize.js')
+ script(src='//ajax.googleapis.com/ajax/libs/angularjs/1.4.3/angular.min.js')
+ script(src='//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.3/angular-sanitize.min.js')
+ script(src='//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.3/angular-animate.min.js')
script(src='//cdnjs.cloudflare.com/ajax/libs/angular-strap/2.3.1/angular-strap.js')
script(src='//cdnjs.cloudflare.com/ajax/libs/angular-strap/2.3.1/angular-strap.tpl.min.js')
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4b1ff693
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4b1ff693
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4b1ff693
Branch: refs/heads/ignite-843
Commit: 4b1ff69322250098348d48d9b70a59ffc5003324
Parents: b500eb1 1e84e8c
Author: Andrey <an...@gridgain.com>
Authored: Thu Sep 3 16:07:22 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Sep 3 16:07:22 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/caches-controller.js | 1 -
.../main/js/controllers/clusters-controller.js | 1 -
.../src/main/js/controllers/common-module.js | 18 ------------------
.../main/js/controllers/metadata-controller.js | 1 -
.../src/main/js/controllers/sql-controller.js | 14 +++++++++-----
.../src/main/js/public/stylesheets/style.scss | 4 ++++
.../src/main/js/views/includes/controls.jade | 10 +++++-----
7 files changed, 18 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b1ff693/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b1ff693/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------