You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2017/02/22 01:15:41 UTC
[14/14] ambari git commit: Merge Side-Navigation-feature-branch 1
Merge Side-Navigation-feature-branch 1
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4ff93b0a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4ff93b0a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4ff93b0a
Branch: refs/heads/trunk
Commit: 4ff93b0a291745ce18d36a73b1698fdea55539a3
Parents: b986a3c 65d9017
Author: Xi Wang <xi...@apache.org>
Authored: Tue Feb 21 16:55:36 2017 -0800
Committer: Xi Wang <xi...@apache.org>
Committed: Tue Feb 21 16:55:36 2017 -0800
----------------------------------------------------------------------
.../main/resources/ui/admin-web/app/index.html | 2 +-
ambari-web/app/assets/data/clusters/info.json | 11 +
ambari-web/app/assets/img/ambari-Logo.png | Bin 0 -> 2779 bytes
ambari-web/app/assets/img/logo-white.png | Bin 4538 -> 0 bytes
ambari-web/app/config.js | 6 +-
.../main/alert_definitions_controller.js | 14 +-
.../main/alerts/alert_instances_controller.js | 151 -----
ambari-web/app/messages.js | 5 +
ambari-web/app/routes/main.js | 4 +
ambari-web/app/styles/application.less | 14 +-
ambari-web/app/styles/common.less | 7 +-
.../app/styles/theme/bootstrap-ambari.css | 634 ++++++++++++++++++-
ambari-web/app/styles/top-nav.less | 204 ++----
ambari-web/app/templates/application.hbs | 226 ++++---
.../main/alerts/alert_notifications_popup.hbs | 69 ++
ambari-web/app/templates/main/dashboard.hbs | 26 +-
ambari-web/app/templates/main/menu.hbs | 23 -
ambari-web/app/templates/main/menu_item.hbs | 50 --
ambari-web/app/templates/main/service.hbs | 6 +-
.../main/service/all_services_actions.hbs | 100 ++-
.../app/templates/main/service/menu_item.hbs | 4 +-
.../app/templates/main/side-menu-item.hbs | 53 ++
ambari-web/app/views.js | 1 +
ambari-web/app/views/application.js | 125 +++-
.../main/alerts/alert_instances_popup_view.js | 190 ++++++
ambari-web/app/views/main/menu.js | 179 ++++--
.../views/main/service/all_services_actions.js | 2 +
ambari-web/app/views/main/service/menu.js | 104 +--
ambari-web/brunch-config.js | 3 +-
.../alerts/alert_instances_controller_test.js | 33 -
ambari-web/test/views/main/menu_test.js | 2 +-
.../vendor/scripts/theme/bootstrap-ambari.js | 204 ++++++
32 files changed, 1692 insertions(+), 760 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4ff93b0a/ambari-web/app/messages.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4ff93b0a/ambari-web/app/routes/main.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4ff93b0a/ambari-web/app/styles/application.less
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4ff93b0a/ambari-web/app/views.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4ff93b0a/ambari-web/app/views/main/service/menu.js
----------------------------------------------------------------------