Repository: ambari Updated Branches: refs/heads/trunk 39f4cb806 -> 3e11675be
AMBARI-16201. LogSearch portal: Firefox issue with v.28 and few UI clean-up (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/3e11675b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3e11675b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3e11675b Branch: refs/heads/trunk Commit: 3e11675be515cc6eaac98cfbe8214ecd87caf424 Parents: 39f4cb8 Author: oleewere <[email protected]> Authored: Wed May 4 23:23:59 2016 +0200 Committer: oleewere <[email protected]> Committed: Wed May 4 23:23:59 2016 +0200 ---------------------------------------------------------------------- .../src/main/webapp/index.html | 50 +++++++------------- .../scripts/views/audit/AuditTabLayoutView.js | 2 +- .../dashboard/BubbleGraphTableLayoutView.js | 6 +-- .../views/filter/CreateLogfeederFilterView.js | 4 +- .../webapp/scripts/views/tabs/LogFileView.js | 12 ++--- .../troubleshoot/TroubleShootLayoutView.js | 2 +- .../src/main/webapp/styles/style.css | 19 +++----- .../src/main/webapp/styles/style_v2.css | 5 +- .../webapp/templates/common/Header_tmpl.html | 8 ++-- .../templates/common/TableLayout_tmpl.html | 2 +- 10 files changed, 43 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3e11675b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/index.html ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/index.html b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/index.html index e374895..799b9dd 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/index.html +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/index.html @@ -21,46 +21,28 @@ <title>LogSearch</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> - <script type="text/javascript" src="libs/other/loadCSS.js"></script> + <link href="libs/bower/bootstrap/bootstrap.css" rel="stylesheet"> <link href="libs/other/font-awesome/css/font-awesome.css" rel="stylesheet"> <!-- <link href="libs/other/jquery-ui/css/jquery-ui-1.11.4.min.css" rel="stylesheet"> --> - <script> - // load a file - loadCSS("libs/other/jquery-ui/css/jquery-ui-bootstrap.css"); - loadCSS("styles/visualsearch.css"); - loadCSS("libs/bower/backgrid/css/backgrid.css"); - loadCSS("libs/bower/backgrid-columnmanager/Backgrid.ColumnManager.css"); - loadCSS("libs/bower/backgrid-paginator/css/backgrid-paginator.css"); - loadCSS("libs/bower/backgrid-sizeable/css/backgrid-sizeable-columns.css"); - loadCSS("libs/bower/backgrid-sizeable/backgrid-orderable-columns.css"); - loadCSS("libs/other/daterangepicker/css/daterangepicker.css"); - loadCSS("styles/animate.css"); - loadCSS("libs/bower/select2/select2.css"); - loadCSS("libs/other/nvd3/css/nv.d3.min.css"); - loadCSS("libs/other/timeline/css/timeline.css"); - loadCSS("libs/other/intro/css/introjs.min.css"); - loadCSS("libs/other/gridster/css/jquery.gridster.css"); - - </script> -<!-- <link href="libs/other/jquery-ui/css/jquery-ui-bootstrap.css" rel="stylesheet"> - <link href="styles/visualsearch.css" rel="stylesheet"> - <link rel="stylesheet" type="text/css" media="screen" href="libs/bower/backgrid/css/backgrid.css"> - <link rel="stylesheet" type="text/css" media="screen" href="libs/bower/backgrid-columnmanager/Backgrid.ColumnManager.css"> - <link rel="stylesheet" type="text/css" media="screen" href="libs/bower/backgrid-paginator/css/backgrid-paginator.css"> - <link rel="stylesheet" type="text/css" media="screen" href="libs/bower/backgrid-sizeable/css/backgrid-sizeable-columns.css"> - <link rel="stylesheet" type="text/css" media="screen" href="libs/bower/backgrid-sizeable/backgrid-orderable-columns.css"> - <link rel="stylesheet" type="text/css" media="screen" href="libs/other/daterangepicker/css/daterangepicker.css"> - <link href="libs/bower/select2/select2.css" rel="stylesheet"> - <link rel="stylesheet" type="text/css" media="screen" href="libs/other/nvd3/css/nv.d3.min.css"> - <link rel="stylesheet" type="text/css" media="screen" href="libs/other/timeline/css/timeline.css"> - <link rel="stylesheet" type="text/css" media="screen" href="styles/animate.css"> - <link href="libs/other/intro/css/introjs.min.css" rel="stylesheet"> - <link href="libs/other/gridster/css/jquery.gridster.css" rel="stylesheet"> --> + <link rel="stylesheet" type="text/css" href="libs/other/jquery-ui/css/jquery-ui-bootstrap.css"> + <link rel="stylesheet" type="text/css" href="styles/visualsearch.css"> + <link rel="stylesheet" type="text/css" href="libs/bower/backgrid/css/backgrid.css"> + <link rel="stylesheet" type="text/css" href="libs/bower/backgrid-columnmanager/Backgrid.ColumnManager.css"> + <link rel="stylesheet" type="text/css" href="libs/bower/backgrid-paginator/css/backgrid-paginator.css"> + <link rel="stylesheet" type="text/css" href="libs/bower/backgrid-sizeable/css/backgrid-sizeable-columns.css"> + <link rel="stylesheet" type="text/css" href="libs/bower/backgrid-sizeable/backgrid-orderable-columns.css"> + <link rel="stylesheet" type="text/css" href="libs/other/daterangepicker/css/daterangepicker.css"> + <link rel="stylesheet" type="text/css" href="styles/animate.css"> + <link rel="stylesheet" type="text/css" href="libs/bower/select2/select2.css"> + <link rel="stylesheet" type="text/css" href="libs/other/nvd3/css/nv.d3.min.css"> + <link rel="stylesheet" type="text/css" href="libs/other/timeline/css/timeline.css"> + <link rel="stylesheet" type="text/css" href="libs/other/intro/css/introjs.min.css"> + <link rel="stylesheet" type="text/css" href="libs/other/gridster/css/jquery.gridster.css"> <link href="styles/style_v2.css" rel="stylesheet"> <link href="styles/style.css" rel="stylesheet"> - <!-- <link href="plugins/chartist/chartist.min.css" rel="stylesheet"> --> + <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> <script src="http://getbootstrap.com/docs-assets/js/html5shiv.js";></script> http://git-wip-us.apache.org/repos/asf/ambari/blob/3e11675b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/audit/AuditTabLayoutView.js ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/audit/AuditTabLayoutView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/audit/AuditTabLayoutView.js index f22d2b1..0c3a4be 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/audit/AuditTabLayoutView.js +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/audit/AuditTabLayoutView.js @@ -80,7 +80,7 @@ define(['require', this.collection = new VAuditLogList([],{ state: { firstPage: 0, - pageSize: 50 + pageSize: 25 } }); http://git-wip-us.apache.org/repos/asf/ambari/blob/3e11675b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/BubbleGraphTableLayoutView.js ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/BubbleGraphTableLayoutView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/BubbleGraphTableLayoutView.js index 1dd6bc7..04dbe42 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/BubbleGraphTableLayoutView.js +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/BubbleGraphTableLayoutView.js @@ -314,9 +314,9 @@ define(['require', fromRaw: function(rawValue, model){ var str=""; if(rawValue) - str += "<p>"+moment(rawValue).format("YYYY-MM-DD HH:mm:ss,SSS")+"</p>"; + str += "<div style='position:relative'><p style='margin-left:20px'>"+moment(rawValue).format("YYYY-MM-DD HH:mm:ss,SSS")+"</p>"; if(model.get("type")) - str += "<p style='float:left;width:90%'>"+(model.get("level") ? "<label class='label label-"+model.get("level")+"'>"+model.get("level")+"</label>" : "")+ + str += "<p style='margin-left:20px'>"+(model.get("level") ? "<label class='label label-"+model.get("level")+"'>"+model.get("level")+"</label>" : "")+ "<strong>"+model.get("type")+"</strong>" + "</p><!--a style='width:9%' title='Open logs in new tab' data-type='C' data-host='"+model.get("host")+"' data-node='"+model.get("type")+"' data-id='"+model.get("id")+"' href='javascript:void(0)' class='pull-right hidden'><i class='fa fa-share'></i></a-->"; // if(model.get("level")) @@ -329,7 +329,7 @@ define(['require', "<li data-id='N_T'><a title='Open logs in new tab' data-type='C' data-host='"+model.get("host")+"' data-node='"+model.get("type")+"' data-id='"+model.get("id")+"' href='javascript:void(0)' class=''>Go To Log</a></li>" + //'<li><a href="#">JavaScript</a></li>' + '</ul>' + - '</div>'; + '</div></div>'; return str; } }) http://git-wip-us.apache.org/repos/asf/ambari/blob/3e11675b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/filter/CreateLogfeederFilterView.js ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/filter/CreateLogfeederFilterView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/filter/CreateLogfeederFilterView.js index 2560103..ba07600 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/filter/CreateLogfeederFilterView.js +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/filter/CreateLogfeederFilterView.js @@ -289,16 +289,16 @@ define(['require', singleDatePicker: true, showDropdowns: true, parentEl : this.$el, - minDate :moment().format('MM/DD/YYYY'), + 'startDate':moment().add(1,'hours').format('MM/DD/YYYY HH:mm'), //timeZone: 0, locale: { format: 'MM/DD/YYYY HH:mm' }, //timePickerSeconds: true, "timePicker": true, -// "timePickerIncrement": 1, "timePicker24Hour": true, }); + this.$("[data-date='"+forComponent+"']").val(moment().add(1,'hours').format("MM/DD/YYYY HH:mm")); this.hideExpiry(forComponent); } }, http://git-wip-us.apache.org/repos/asf/ambari/blob/3e11675b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/LogFileView.js ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/LogFileView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/LogFileView.js index e8cbba6..2d19d78 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/LogFileView.js +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/LogFileView.js @@ -114,7 +114,7 @@ define(['require', saveState: false }, gridOpts: { - className: "table table-striped table-condensed backgrid table-quickMenu", + className: "table table-bordered table-striped table-hover table-condensed backgrid table-quickMenu", //header : CustomBackgrid, //row: IdRow, emptyText: 'No records found!' @@ -379,7 +379,7 @@ define(['require', columns: cols, includeColumnManager: false, gridOpts: { - className: "table table-condensed backgrid logFileFont table-quickMenu", + className: "table table-bordered table-striped table-hover table-condensed backgrid logFileFont table-quickMenu", }, }))); }); @@ -451,7 +451,7 @@ define(['require', formatter: _.extend({}, Backgrid.CellFormatter.prototype, { fromRaw: function(rawValue, model) { - return (rawValue) ? ViewUtils.foramtLogMessageAsLogFile(model) + that.getDropdownQuickMenuHtml() : ""; + return (rawValue) ? "<div style='position:relative; padding-left:15px'>"+ViewUtils.foramtLogMessageAsLogFile(model) + that.getDropdownQuickMenuHtml() + "</div>" : ""; } }) } @@ -485,10 +485,10 @@ define(['require', fromRaw: function(rawValue, model) { var str = ""; if (rawValue) - str += "<p>" + moment(rawValue).format("YYYY-MM-DD HH:mm:ss,SSS") + "</p>"; + str += "<div style='position:relative'><p style='margin-left:20px'>" + moment(rawValue).format("YYYY-MM-DD HH:mm:ss,SSS") + "</p>"; if (model.get("level")) - str += "<p><label class='label label-" + model.get("level") + "'>" + model.get("level") + "</label></p>"; - str += that.getDropdownQuickMenuHtml(); + str += "<p style='margin-left:20px'><label class='label label-" + model.get("level") + "'>" + model.get("level") + "</label></p>"; + str += that.getDropdownQuickMenuHtml()+"</div>"; return str; } }) http://git-wip-us.apache.org/repos/asf/ambari/blob/3e11675b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/troubleshoot/TroubleShootLayoutView.js ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/troubleshoot/TroubleShootLayoutView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/troubleshoot/TroubleShootLayoutView.js index 1409df0..e1bc90a 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/troubleshoot/TroubleShootLayoutView.js +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/troubleshoot/TroubleShootLayoutView.js @@ -380,7 +380,7 @@ define(['backbone', var chart = nv.models.discreteBarChart() .x(function(d) { return d.label }) .y(function(d) { return d.value }) - .staggerLabels(true) + .staggerLabels(false) .width(700) .showValues(false) chart.tooltip.enabled(); http://git-wip-us.apache.org/repos/asf/ambari/blob/3e11675b/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 3b01223..495cf98 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 @@ -677,7 +677,7 @@ div.columnmanager-visibilitycontrol { } .VS-search .search_facet input { - padding-top: 6px; + padding-top:3px; font-size: 10px; line-height: 13px; } @@ -1103,7 +1103,7 @@ body { } .logFileFont .quickMenu { margin-top:0px; - top:5px; + top:-2px; } .dropdown .excludeStatus.full i{ color: #6CDA0E @@ -1626,20 +1626,13 @@ div.columnmanager-dropdown-container { font-weight: bold; background: #FFF; } -.backgrid th, -.backgrid td { - position: relative; -} .quickMenu { position: absolute; - left: -1px; + left: -2px; top: 50%; - margin-top:-19px; + margin-top:-12px; transition: all .2s ease; } -.quickMenu:hover { - left: 0px; -} .btn-quickMenu { padding: 0 3px; top: 0px !important; @@ -2083,4 +2076,6 @@ input.filterInput{ .VS-search .search_input input{ margin-top: 0 !important; } - +.nav-tabs > li{ + margin-bottom:-2px; +} http://git-wip-us.apache.org/repos/asf/ambari/blob/3e11675b/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 3d36344..675695f 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 @@ -282,14 +282,13 @@ textarea.searchArea{ } .panel-menu a.account { height: 50px; - padding: 5px 0 5px 10px; + padding: 5px 10px; line-height: 18px; } .panel-menu i { margin-top: 8px; - padding: 5px; font-size: 20px; - color: white; + color: #D8D8D8; line-height: 1em; vertical-align: top; -webkit-transition: 0.05s; http://git-wip-us.apache.org/repos/asf/ambari/blob/3e11675b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/common/Header_tmpl.html ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/common/Header_tmpl.html b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/common/Header_tmpl.html index c0b7ad5..ef09707 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/common/Header_tmpl.html +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/common/Header_tmpl.html @@ -19,7 +19,7 @@ <div class="col-xs-12 col-sm-12"> <ul class="nav navbar-nav pull-right panel-menu"> <li class="dropdown" data-id="timeZoneChange" title="Change timezone"> - <span style="color: white; position: absolute; top: -16px; right: -4px; font-size: 10px;"></span> + <span style="color: white; position: absolute; top: -16px; right: 0px; font-size: 10px;"></span> <a href="#" class="account excludeStatus" data-toggle="modal"> <img src="images/timezone.png" style=" height: 27px; margin-top: 9px;"> </a> @@ -29,9 +29,9 @@ <i class="fa fa-filter pull-right"></i> </a> </li> --> - <li class="dropdown" data-id="createFilters" title="Global Exclusion"> + <li class="dropdown" data-id="createFilters" title="Logfeeder Filters"> <a href="#" class="account excludeStatus" data-toggle="modal"> - <i class="fa fa-filter pull-right"></i> + <i class="fa fa-filter"></i> </a> </li> <li class="dropdown" title="Menu"> @@ -39,7 +39,7 @@ <!-- <div class="avatar"> <img src="http://images.onlinelabels.com/images/clip-art/acspike/acspike_male_user_icon.png"; class="img-circle" alt="avatar"> </div> --> - <i class="fa fa-bars pull-right"></i> + <i class="fa fa-bars"></i> <!-- <div class="user-mini pull-right"> <span class="welcome">Welcome,</span> <span>User Name</span> http://git-wip-us.apache.org/repos/asf/ambari/blob/3e11675b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/common/TableLayout_tmpl.html ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/common/TableLayout_tmpl.html b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/common/TableLayout_tmpl.html index e95fedb..7b0c3eb 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/common/TableLayout_tmpl.html +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/common/TableLayout_tmpl.html @@ -28,7 +28,7 @@ </div> </div> <div class="position-relative thick-border"> - <div data-id="r_tableList" class="table-responsive tableBorder"> </div> + <div data-id="r_tableList" class="table-responsive table-bordered"> </div> <div data-id="r_tableSpinner"></div> </div> <div class="row banded">
![http://images.onlinelabels.com/images/clip-art/acspike/acspike_male_user_icon.png"](http://images.onlinelabels.com/images/clip-art/acspike/acspike_male_user_icon.png"){kind=link}