AMBARI-16267. Added top navbar on login page (Dharmesh Makwana via oleewere)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/18218735 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/18218735 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/18218735 Branch: refs/heads/trunk Commit: 1821873562219a960784e6c1177627ce805d89fe Parents: 6c7c63f Author: oleewere <oleew...@gmail.com> Authored: Tue May 10 01:02:22 2016 +0200 Committer: oleewere <oleew...@gmail.com> Committed: Tue May 10 11:34:51 2016 +0200 ---------------------------------------------------------------------- .../META-INF/security-applicationContext.xml | 1 + .../src/main/webapp/login.jsp | 17 +++++++++---- .../main/webapp/scripts/views/common/Header.js | 25 ++++++++++++++++---- .../src/main/webapp/styles/style.css | 2 +- .../src/main/webapp/styles/style_v2.css | 1 - 5 files changed, 34 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/18218735/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/META-INF/security-applicationContext.xml ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/META-INF/security-applicationContext.xml b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/META-INF/security-applicationContext.xml index 468552b..2d64c66 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/META-INF/security-applicationContext.xml +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/META-INF/security-applicationContext.xml @@ -29,6 +29,7 @@ http://www.springframework.org/schema/security/spring-security-4.0.xsd";> <security:http pattern="/**/jquery.*.js" security="none" /> <security:http pattern="/**/*.css.map" security="none" /> <security:http pattern="/service/public/**" security="none" /> + <security:http pattern="/images/**" security="none" /> <security:http disable-url-rewriting="true" use-expressions="true" create-session="always" entry-point-ref="authenticationProcessingFilterEntryPoint"> <csrf disabled="true"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/18218735/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/login.jsp ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/login.jsp b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/login.jsp index 27fd8ec..ff546ef 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/login.jsp +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/login.jsp @@ -64,8 +64,18 @@ <body> <div class="container-fluid"> -<!-- <div id="page-login" class="row"> - <div class="col-xs-12 col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3"> --> + <header class="navbar"> + <div class="container-fluid expanded-panel"> + <div class="row top-panel-right"> + <div id="logo" class="col-xs-12 col-sm-3"> + <div class="row"> + <div class="col-sm-2"><img title="Apache Ambari" alt="Apache Ambari" src="images/logo-white.png" height="32px"></div> + <div class="col-sm-10"><a href="javascript:void(0);">Log Search</a></div> + </div> + </div> + </div> + </div> + </header> <div class="box-wrapper"> <div class="box"> <div class="box-content logBox"> @@ -96,9 +106,6 @@ <div data-id="loader" class="loading"></div> </div> </div> - -<!-- </div> - </div> --> </div> <script type="text/javascript"> http://git-wip-us.apache.org/repos/asf/ambari/blob/18218735/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/common/Header.js ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/common/Header.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/common/Header.js index 3916bff..654b207 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/common/Header.js +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/common/Header.js @@ -28,8 +28,8 @@ define(['require', ], function(require, Backbone, Handlebars, Header_tmpl, Utils, moment, Globals) { 'use strict'; - var Spinner = Backbone.Marionette.Layout.extend( - /** @lends Spinner */ + var Header = Backbone.Marionette.Layout.extend( + /** @lends Header */ { _viewName: 'Header', @@ -56,7 +56,7 @@ define(['require', }, /** - * intialize a new Spinner Layout + * intialize a new Header Layout * @constructs */ initialize: function(options) { @@ -92,7 +92,9 @@ define(['require', } this.ui.timeZoneChange.find('span').text(moment.tz(storeTimezone.value.split(',')[0]).zoneName()); } - + }, + onShow : function(){ + this.triggerAutoTourCheck(); }, loadTimeZone: function() { @@ -411,10 +413,23 @@ define(['require', scrollTop: $(document).height() }, 400); }); + }, + triggerAutoTourCheck : function(){ + var that = this; + var storageVal = Utils.localStorage.checkLocalStorage('autoTour'); + if(! storageVal.found){ + Utils.localStorage.setLocalStorage("autoTour",true); + setTimeout(function(){ + Utils.confirmPopup({ + 'msg':'Do you want to take a Tour with LogSearch App ?', + 'callback':that.takeATour + }); + },3000); + } } }); - return Spinner; + return Header; }); http://git-wip-us.apache.org/repos/asf/ambari/blob/18218735/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style.css ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style.css b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style.css index 495cf98..05fd491 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style.css +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style.css @@ -1948,7 +1948,7 @@ h2.page-header{ width: 420px; height:auto; position: absolute; - top: 30%; + top: 35%; left: 43%; transform : translate(-30%,-43%); -webkit-transform : translate(-30%,-43%); http://git-wip-us.apache.org/repos/asf/ambari/blob/18218735/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style_v2.css ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style_v2.css b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style_v2.css index 675695f..a815fb9 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style_v2.css +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style_v2.css @@ -1757,7 +1757,6 @@ button.btn.btn-xs{ margin-bottom: 5px; } .input-group .form-control { - margin-top: 3px; height: 25px; } #ui-datepicker-div {
