AMBARI-19878 Log Search Portal time zone selection bug (mgergely) Change-Id: I3e1ca2689f1a2ec2a7dfd58ec958bb468b15c236 (cherry picked from commit 776e0dfb19a81998ab5ce05efb611082a002e94b)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e3b9ef3c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e3b9ef3c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e3b9ef3c Branch: refs/heads/branch-feature-BUG-74026 Commit: e3b9ef3c19dae4992b0f9fd539eb02589280394f Parents: 53e6c8d Author: Miklos Gergely <mgerg...@hortonworks.com> Authored: Tue Feb 7 10:12:23 2017 +0100 Committer: Zuul <rel...@hortonworks.com> Committed: Tue Feb 7 05:18:55 2017 -0800 ---------------------------------------------------------------------- .../src/main/webapp/index.html | 211 +- .../daterangepicker/css/daterangepicker.css | 415 +++ .../daterangepicker/js/daterangepicker.js | 1560 ++++++++ .../libs/custom/timezone/WorldMapGenerator.js | 3474 ++++++++++++++++++ .../libs/custom/timezone/jstz-1.0.4.min.js | 2 + .../daterangepicker/css/daterangepicker.css | 415 --- .../other/daterangepicker/js/daterangepicker.js | 1560 -------- .../libs/other/timezone/WorldMapGenerator.js | 3471 ----------------- .../libs/other/timezone/jstz-1.0.4.min.js | 2 - .../webapp/libs/other/timezone/mapdata.json | 3158 ---------------- .../src/main/webapp/scripts/Init.js | 439 ++- 11 files changed, 5775 insertions(+), 8932 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e3b9ef3c/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 2d9ae01..b86e038 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/index.html +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/index.html @@ -16,115 +16,114 @@ --> <!DOCTYPE html> <html lang="en"> - <head> - <meta charset="utf-8"> - <title>LogSearch</title> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> - - <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"> --> - <link rel="stylesheet" type="text/css" href="libs/other/jquery-ui/css/jquery-ui-bootstrap.css"> - <link rel="stylesheet" type="text/css" href="styles/custom/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/gridster/css/jquery.gridster.css"> - <link rel="stylesheet" type="text/css" href="libs/other/bootstrap-tour-0.10.3/css/bootstrap-tour.min.css"> - <link href="styles/style_v2.css" rel="stylesheet"> - <link href="styles/style.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> - <script src="http://getbootstrap.com/docs-assets/js/respond.min.js"></script> - <![endif]--> - </head> -<body> -<!--Start Header--> -<!-- <div id="screensaver"> - <canvas id="canvas"></canvas> - <i class="fa fa-lock" id="screen_unlock"></i> -</div> --> + <head> + <meta charset="utf-8"> + <title>LogSearch</title> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> + + <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"> --> + <link rel="stylesheet" type="text/css" href="libs/other/jquery-ui/css/jquery-ui-bootstrap.css"> + <link rel="stylesheet" type="text/css" href="styles/custom/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/custom/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/gridster/css/jquery.gridster.css"> + <link rel="stylesheet" type="text/css" href="libs/other/bootstrap-tour-0.10.3/css/bootstrap-tour.min.css"> + <link href="styles/style_v2.css" rel="stylesheet"> + <link href="styles/style.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> + <script src="http://getbootstrap.com/docs-assets/js/respond.min.js"></script> + <![endif]--> + </head> + <body> + <!--Start Header--> + <!-- <div id="screensaver"> + <canvas id="canvas"></canvas> + <i class="fa fa-lock" id="screen_unlock"></i> + </div> --> -<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> + <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 id="r_header"></div> + </div> + </div> + </header> + <!--End Header--> + <!--Start Container--> + <div id="main" class="container-fluid"> + <div class="row"> + <!--div id="sidebar-left" class="col-xs-2 col-sm-2"> + <ul class="nav main-menu"> + <li> + <a href="javascript:void(0);" class="ajax-link"> + <i class="fa fa-dashboard"></i> + <span class="hidden-xs">Dashboard</span> + </a> + </li> + </ul> + </div--> + <!--Start Content--> + <div id="content" class="col-xs-12 col-sm-12"> + <div id="r_content" > + <i class="icon-spinner"></i> + </div> + <!-- <div class="preloader"> + <img src="img/devoops_getdata.gif" class="devoops-getdata" alt="preloader"/> + </div> --> + </div> + <!--End Content--> + </div> </div> - </div> - <div id="r_header"></div> - </div> - </div> -</header> -<!--End Header--> -<!--Start Container--> -<div id="main" class="container-fluid"> - <div class="row"> - <!--div id="sidebar-left" class="col-xs-2 col-sm-2"> - <ul class="nav main-menu"> - <li> - <a href="javascript:void(0);" class="ajax-link"> - <i class="fa fa-dashboard"></i> - <span class="hidden-xs">Dashboard</span> - </a> - </li> - </ul> - </div--> - <!--Start Content--> - <div id="content" class="col-xs-12 col-sm-12"> - <div id="r_content" > - <i class="icon-spinner"></i> - </div> - <!-- <div class="preloader"> - <img src="img/devoops_getdata.gif" class="devoops-getdata" alt="preloader"/> - </div> --> - </div> - <!--End Content--> - </div> -</div> -<!--End Container--> -<!-- build:js scripts/main.js --> - <script data-main="scripts/Init.js?ver=build.version" src="libs/bower/requirejs/js/require.js"></script> - <!-- endbuild --> - <script type="text/javascript"> - require.config({ - waitSeconds : 0 - }); - if (!window.console) window.console = {}; + <!--End Container--> + <!-- build:js scripts/main.js --> + <script data-main="scripts/Init.js?ver=build.version" src="libs/bower/requirejs/js/require.js"></script> + <!-- endbuild --> + <script type="text/javascript"> + require.config({ + waitSeconds : 0 + }); + if (!window.console) window.console = {}; if (!window.console.log) window.console.log = function () { }; - </script> -<!-- <script type="text/javascript" src="libs/other/d3/d3.min.js"></script> --> -<div class="btn-group contextMenuBody dropup" style="display:none;position:absolute;z-index:9999;"> - <button type="button" class="btn btn-info btn-circle btn-app-sm btn-context dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <i class="fa fa-info"></i> - </button> - <ul class="dropdown-menu"> - <li><a data-id="I" href="javascript:void(0);">Include</a></li> - <li><a data-id="E" href="javascript:void(0);">Exclude</a></li> - <li><a data-id="IA" href="javascript:void(0);">*Include*</a></li> - <li><a data-id="EA" href="javascript:void(0);">*Exclude*</a></li> - <li role="separator" class="divider"></li> - <li><a data-id="F" href="javascript:void(0);">Find</a></li> - </ul> - </div> - <div class="arrowDiv"> - <div class="bottomToTop" title="Scroll To Top"><i class="fa fa-arrow-circle-up"></i></div> - <div class="topToBottom" title="Scroll To bottom"><i class="fa fa-arrow-circle-down"></i></div> - </div> - + </script> + <!-- <script type="text/javascript" src="libs/other/d3/d3.min.js"></script> --> + <div class="btn-group contextMenuBody dropup" style="display:none;position:absolute;z-index:9999;"> + <button type="button" class="btn btn-info btn-circle btn-app-sm btn-context dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <i class="fa fa-info"></i> + </button> + <ul class="dropdown-menu"> + <li><a data-id="I" href="javascript:void(0);">Include</a></li> + <li><a data-id="E" href="javascript:void(0);">Exclude</a></li> + <li><a data-id="IA" href="javascript:void(0);">*Include*</a></li> + <li><a data-id="EA" href="javascript:void(0);">*Exclude*</a></li> + <li role="separator" class="divider"></li> + <li><a data-id="F" href="javascript:void(0);">Find</a></li> + </ul> + </div> + <div class="arrowDiv"> + <div class="bottomToTop" title="Scroll To Top"><i class="fa fa-arrow-circle-up"></i></div> + <div class="topToBottom" title="Scroll To bottom"><i class="fa fa-arrow-circle-down"></i></div> + </div> -</body> + </body> </html> http://git-wip-us.apache.org/repos/asf/ambari/blob/e3b9ef3c/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/libs/custom/daterangepicker/css/daterangepicker.css ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/libs/custom/daterangepicker/css/daterangepicker.css b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/libs/custom/daterangepicker/css/daterangepicker.css new file mode 100644 index 0000000..7f1ef54 --- /dev/null +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/libs/custom/daterangepicker/css/daterangepicker.css @@ -0,0 +1,415 @@ +.daterangepicker { + position: absolute; + color: inherit; + background: #fff; + border-radius: 4px; + width: 278px; + padding: 4px; + margin-top: 1px; + top: 100px; + left: 20px; + /* Calendars */ +} + +.daterangepicker:before, +.daterangepicker:after { + position: absolute; + display: inline-block; + border-bottom-color: rgba(0, 0, 0, 0.2); + content: ''; +} + +.daterangepicker:before { + top: -7px; + border-right: 7px solid transparent; + border-left: 7px solid transparent; + border-bottom: 7px solid #ccc; +} + +.daterangepicker:after { + top: -6px; + border-right: 6px solid transparent; + border-bottom: 6px solid #fff; + border-left: 6px solid transparent; +} + +.daterangepicker.opensleft:before { + right: 9px; +} + +.daterangepicker.opensleft:after { + right: 10px; +} + +.daterangepicker.openscenter:before { + left: 0; + right: 0; + width: 0; + margin-left: auto; + margin-right: auto; +} + +.daterangepicker.openscenter:after { + left: 0; + right: 0; + width: 0; + margin-left: auto; + margin-right: auto; +} + +.daterangepicker.opensright:before { + left: 9px; +} + +.daterangepicker.opensright:after { + left: 10px; +} + +.daterangepicker.dropup { + margin-top: -5px; +} + +.daterangepicker.dropup:before { + top: initial; + bottom: -7px; + border-bottom: initial; + border-top: 7px solid #ccc; +} + +.daterangepicker.dropup:after { + top: initial; + bottom: -6px; + border-bottom: initial; + border-top: 6px solid #fff; +} + +.daterangepicker.dropdown-menu { + max-width: none; + z-index: 3001; +} + +.daterangepicker.single .ranges, +.daterangepicker.single .calendar { + float: none; +} + +.daterangepicker.show-calendar .calendar { + display: block; +} + +.daterangepicker .calendar { + display: none; + max-width: 270px; + margin: 4px; +} + +.daterangepicker .calendar.single .calendar-table { + border: none; +} + +.daterangepicker .calendar th, +.daterangepicker .calendar td { + white-space: nowrap; + text-align: center; + min-width: 32px; +} + +.daterangepicker .calendar-table { + border: 1px solid #fff; + padding: 4px; + border-radius: 4px; + background: #fff; +} + +.daterangepicker table { + width: 100%; + margin: 0; +} + +.daterangepicker td, +.daterangepicker th { + text-align: center; + width: 20px; + height: 20px; + border-radius: 4px; + border: 1px solid transparent; + white-space: nowrap; + cursor: pointer; +} + +.daterangepicker td.available:hover, +.daterangepicker th.available:hover { + background-color: #eee; + border-color: transparent; + color: inherit; +} + +.daterangepicker td.week, +.daterangepicker th.week { + font-size: 80%; + color: #ccc; +} + +.daterangepicker td.off, +.daterangepicker td.off.in-range, +.daterangepicker td.off.start-date, +.daterangepicker td.off.end-date { + background-color: #fff; + border-color: transparent; + color: #999; +} + +.daterangepicker td.in-range { + background-color: #ebf4f8; + border-color: transparent; + color: #000; + border-radius: 0; +} + +.daterangepicker td.start-date { + border-radius: 4px 0 0 4px; +} + +.daterangepicker td.end-date { + border-radius: 0 4px 4px 0; +} + +.daterangepicker td.start-date.end-date { + border-radius: 4px; +} + +.daterangepicker td.active, +.daterangepicker td.active:hover { + background-color: #357ebd; + border-color: transparent; + color: #fff; +} + +.daterangepicker th.month { + width: auto; +} + +.daterangepicker td.disabled, +.daterangepicker option.disabled { + color: #999; + cursor: not-allowed; + text-decoration: line-through; +} + +.daterangepicker select.monthselect, +.daterangepicker select.yearselect { + font-size: 12px; + padding: 1px; + height: auto; + margin: 0; + cursor: default; +} + +.daterangepicker select.monthselect { + margin-right: 2%; + width: 56%; +} + +.daterangepicker select.yearselect { + width: 40%; +} + +.daterangepicker select.hourselect, +.daterangepicker select.minuteselect, +.daterangepicker select.secondselect, +.daterangepicker select.ampmselect { + width: 50px; + margin-bottom: 0; +} + +.daterangepicker .input-mini { + border: 1px solid #ccc; + border-radius: 4px; + color: #555; + height: 30px; + line-height: 30px; + display: block; + vertical-align: middle; + margin: 0 0 5px 0; + padding: 0 6px 0 28px; + width: 100%; +} + +.daterangepicker .input-mini.active { + border: 1px solid #08c; + border-radius: 4px; +} + +.daterangepicker .daterangepicker_input { + position: relative; +} + +.daterangepicker .daterangepicker_input i { + position: absolute; + left: 8px; + top: 8px; +} + +.daterangepicker.rtl .input-mini { + padding-right: 28px; + padding-left: 6px; +} + +.daterangepicker.rtl .daterangepicker_input i { + left: auto; + right: 8px; +} + +.daterangepicker .calendar-time { + text-align: center; + margin: 5px auto; + line-height: 30px; + position: relative; + padding-left: 28px; +} + +.daterangepicker .calendar-time select.disabled { + color: #ccc; + cursor: not-allowed; +} + +.ranges { + font-size: 11px; + float: none; + margin: 4px; + text-align: left; +} + +.ranges ul { + list-style: none; + margin: 0 auto; + padding: 0; + width: 100%; +} + +.ranges li { + font-size: 13px; + background: #f5f5f5; + border: 1px solid #f5f5f5; + border-radius: 4px; + color: #08c; + padding: 3px 12px; + margin-bottom: 8px; + cursor: pointer; +} + +.ranges li:hover { + background: #08c; + border: 1px solid #08c; + color: #fff; +} + +.ranges li.active { + background: #08c; + border: 1px solid #08c; + color: #fff; +} + + +/* Larger Screen Styling */ + +@media (min-width: 564px) { + .daterangepicker { + width: auto; + } + .daterangepicker .ranges ul { + width: 160px; + } + .daterangepicker.single .ranges ul { + width: 100%; + } + .daterangepicker.single .calendar.left { + clear: none; + } + .daterangepicker.single.ltr .ranges, + .daterangepicker.single.ltr .calendar { + float: left; + } + .daterangepicker.single.rtl .ranges, + .daterangepicker.single.rtl .calendar { + float: right; + } + .daterangepicker.ltr { + direction: ltr; + text-align: left; + } + .daterangepicker.ltr .calendar.left { + clear: left; + margin-right: 0; + } + .daterangepicker.ltr .calendar.left .calendar-table { + border-right: none; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } + .daterangepicker.ltr .calendar.right { + margin-left: 0; + } + .daterangepicker.ltr .calendar.right .calendar-table { + border-left: none; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + } + .daterangepicker.ltr .left .daterangepicker_input { + padding-right: 12px; + } + .daterangepicker.ltr .calendar.left .calendar-table { + padding-right: 12px; + } + .daterangepicker.ltr .ranges, + .daterangepicker.ltr .calendar { + float: left; + } + .daterangepicker.rtl { + direction: rtl; + text-align: right; + } + .daterangepicker.rtl .calendar.left { + clear: right; + margin-left: 0; + } + .daterangepicker.rtl .calendar.left .calendar-table { + border-left: none; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + } + .daterangepicker.rtl .calendar.right { + margin-right: 0; + } + .daterangepicker.rtl .calendar.right .calendar-table { + border-right: none; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } + .daterangepicker.rtl .left .daterangepicker_input { + padding-left: 12px; + } + .daterangepicker.rtl .calendar.left .calendar-table { + padding-left: 12px; + } + .daterangepicker.rtl .ranges, + .daterangepicker.rtl .calendar { + text-align: right; + float: right; + } +} + +@media (min-width: 730px) { + .daterangepicker .ranges { + width: auto; + } + .daterangepicker.ltr .ranges { + float: left; + } + .daterangepicker.rtl .ranges { + float: right; + } + .daterangepicker .calendar.left { + clear: none !important; + } +} \ No newline at end of file