Skip to content

A
atlas
Commit 7fca22ff by kevalbhatt
Options

ATLAS-1192 : Atlas IE support

parent c3bf72cd
Showing with 477 additions and 204 deletions
3party-licenses/Respond-LICENSE 0 → 100644
Copyright (c) 2012 Scott Jehl
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
3party-licenses/es5-shim-LICENSE 0 → 100644
The MIT License (MIT)
Copyright (C) 2009-2016 Kristopher Michael Kowal and contributors
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
3party-licenses/jquery-placeholder-LICENSE 0 → 100644
Copyright Mathias Bynens <http://mathiasbynens.be/>
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
3party-licenses/platform-LICENSE 0 → 100644
Copyright 2014-2016 Benjamin Tan <https://d10.github.io/>
Copyright 2011-2013 John-David Dalton <http://allyoucanleet.com/>
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
LICENSE
......@@ -212,6 +212,9 @@ licenses.
This product bundles titan 0.5.4, which is available under
Apache License. For details, see 3party-licenses/titan-LICENSE
This product bundles pnotify, which is available under
Apache License. For details, see 3party-licenses/pnotify-LICENSE
This product bundles mock(for python tests) 1.0.1, which is available under
BSD License. For details, see 3party-licenses/mock-LICENSE
......@@ -235,4 +238,16 @@ Public Domain license) by Douglas Crockford
This product bundles jQuery-ui.js, which is available under
MIT License. For details, see 3party-licenses/jQuery-ui-LICENSE
This product bundles platform.js, which is available under
MIT License. For details, see 3party-licenses/platform-LICENSE
This product bundles jquery-placeholder, which is available under
MIT License. For details, see 3party-licenses/jquery-placeholder-LICENSE
This product bundles es5-shim, which is available under
MIT License. For details, see 3party-licenses/es5-shim-LICENSE
This product bundles Respond, which is available under
MIT License. For details, see 3party-licenses/Respond-LICENSE
=======================================================================
\ No newline at end of file
dashboardv2/gruntfile.js
......@@ -125,10 +125,12 @@ module.exports = function(grunt) {
'jquery-asBreadcrumbs/js': 'jquery-asBreadcrumbs/dist/jquery-asBreadcrumbs.min.js',
'd3': 'd3/d3.min.js',
'd3/': 'd3-tip/index.js',
'noty/js': 'noty/js/noty/packaged/jquery.noty.packaged.min.js',
'dagre-d3': 'dagre-d3/dist/dagre-d3.min.js',
'select2': 'select2/dist/js/select2.min.js',
'backgrid-select-all': 'backgrid-select-all/backgrid-select-all.min.js'
'backgrid-select-all': 'backgrid-select-all/backgrid-select-all.min.js',
'moment/js': 'moment/min/moment.min.js',
'jquery-placeholder/js': 'jquery-placeholder/jquery.placeholder.js',
'platform': 'platform/platform.js'
}
},
css: {
......@@ -171,9 +173,10 @@ module.exports = function(grunt) {
'jquery-asBreadcrumbs': 'jquery-asBreadcrumbs/LICENSE',
'd3': 'd3/LICENSE',
'd3/': 'd3-tip/LICENSE',
'noty': 'noty/LICENSE.txt',
'dagre-d3': 'dagre-d3/LICENSE',
'backgrid-select-all': 'backgrid-select-all/LICENSE-MIT'
'backgrid-select-all': 'backgrid-select-all/LICENSE-MIT',
'jquery-placeholder': 'jquery-placeholder/LICENSE.txt',
'platform/': 'platform/LICENSE'
}
}
},
......
dashboardv2/package.json
......@@ -34,9 +34,11 @@
"font-awesome": "^4.6.3",
"jquery": "^2.2.2",
"jquery-asBreadcrumbs": "^0.2.1",
"jquery-placeholder": "^2.3.1",
"jquery-ui": "^1.10.4",
"jstree": "^3.3.0",
"noty": "^2.3.8",
"moment": "^2.15.0",
"platform": "^1.3.1",
"pnotify": "^3.0.0",
"requirejs": "^2.1.16",
"requirejs-text": "^2.0.12",
"select2": "^4.0.3",
......
dashboardv2/public/css/login.css
......@@ -58,7 +58,7 @@ button:focus {
/* Login Page */
.login-pane {
margin-top: 50px;
/*margin-top: 50px;*/
background: #323544;
color: #eee;
padding: 15px;
......@@ -106,7 +106,10 @@ button:focus {
/* Login Page */
.login-pane {
margin-top: 35%;
top: 25%;
width: 40%;
left: 30%;
position: fixed;
background: #323544;
color: #eee;
padding: 15px;
......
dashboardv2/public/css/scss/graph.scss
......@@ -87,7 +87,7 @@ g.type-TK > rect {
}
.edgePath path {
stroke: #cccccc;
stroke: #cccccc !important;
}
.zoomButtonGroup {
......
dashboardv2/public/css/scss/login.scss
......@@ -38,8 +38,11 @@
}
.login-pane {
margin-top: 50px;
margin-top: 35%;
top: 25%;
width: 40%;
left: 30%;
position: fixed;
padding: 15px;
background: $color_tuna_approx;
color: $color_gallery_approx;
padding: 15px;
......
dashboardv2/public/css/scss/search.scss
......@@ -18,59 +18,69 @@
//colors
$color_celeste_approx: #1D1F2B;
$switchTransition: .4s ease-out;
@mixin transition($transition...) {
-webkit-transition: $transition;
-moz-transition: $transition;
-o-transition: $transition;
transition: $transition;
}
@mixin transition-property($properties...) {
-webkit-transition-property: $properties;
-moz-transition-property: $properties;
-o-transition-property: $properties;
transition-property: $properties;
}
.switch {
position: relative;
display: inline-block;
width: 50px;
height: 22px;
margin-left: 8px;
input {
display: none;
}
padding: 3px;
vertical-align: top;
background-color: $color_celeste_approx;
border-radius: 18px;
cursor: pointer;
}
.slider {
.switch-input {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: $color_celeste_approx;
//Instead of the line below you could use @include transition($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10)
transition: .4s;
&:before {
opacity: 0;
}
.switch-slider {
position: absolute;
content: "";
top: 1px;
left: 3px;
width: 16px;
height: 16px;
border-radius: 10px;
box-shadow: 1px 1px 5px rgba(black, .2);
@include transition(left #{$switchTransition});
&:before {
content: '';
position: absolute;
top: 50%;
left: 50%;
margin: -6px 0 0 -8px;
width: 16px;
left: 4px;
bottom: 3px;
height: 16px;
background-color: $color_jungle_green_approx;
//Instead of the line below you could use @include transition($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10)
transition: .4s;
}
&.round {
//Instead of the line below you could use @include border-radius($radius, $vertical-radius)
border-radius: 34px;
&:before {
//Instead of the line below you could use @include border-radius($radius, $vertical-radius)
border-radius: 50%;
border-radius: 10px;
box-shadow: inset 0 1px rgba(black, .02);
@include transition(inherit)
}
}
}
input {
&:checked + .slider {
background-color: $color_celeste_approx;
&:before {
//Instead of the line below you could use @include transform($scale, $rotate, $transx, $transy, $skewx, $skewy, $originx, $originy)
transform: translateX(26px);
}
}
&:focus + .slider {
//Instead of the line below you could use @include box-shadow($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10)
box-shadow: 0 0 1px $color_celeste_approx;
.switch-input:checked ~ & {
left: 30px;
box-shadow: -1px 1px 5px rgba(black, .2);
}
}
......
dashboardv2/public/ieerror.html 0 → 100644
<!doctype html>
<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
-->
<!--[if gt IE 8]>
<script type="text/javascript">
function Redirect() {
window.location.assign("login.jsp");
}
Redirect();
</script>
<![endif]-->
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if gt IE 7]>
<script src="js/external_lib/es5-shim.min.js"></script>
<script src="js/external_lib/respond.min.js"></script>
<![endif]-->
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Atlas</title>
<link href='https://fonts.googleapis.com/css?family=Raleway:400,400italic,700,700italic' rel='stylesheet' type='text/css'>
<link href="js/libs/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link rel="stylesheet" href="js/libs/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="css/bootstrap-sidebar.css" />
<link rel="stylesheet" type="text/css" href="css/style.css">
</head>
<body>
<div id="wrapper">
<!-- Sidebar Begin -->
<div id="sidebar-wrapper">
<ul class="sidebar-nav">
<li class="sidebar-brand">
<a href="#"><i class="fa fa-globe"></i> Apache <strong>Atlas</strong></a>
<!-- <a href="#menu-toggle" class="pull-right" id="menu-toggle"><i class="fa fa-bars"></i></a> -->
</li>
</ul>
</div>
<!-- Sidebar End -->
<!-- Page Content Begin -->
<div id="page-content-wrapper">
<header class="clearfix">
<div style="visibility: hidden;" class="input-group col-sm-4 pull-right main-search">
<input type="text" class="form-control" placeholder="Search...">
</div>
</header>
<div class="page-title clearfix">
<h3>Please note that Atlas does not supports old version of Internet Explorer.</h3>
<p>We recommend upgrading to the latest <a href='https://www.microsoft.com/en-gb/download/internet-explorer.aspx'>Internet Explorer</a>, <a href='https://www.google.co.in/chrome/browser/desktop/'>Google Chrome</a>, or <a href='https://www.mozilla.org/en-US/firefox/new/'>Firefox</a>.</p>
</div>
</div>
<!-- Page Content End -->
</div>
</body>
</html>
dashboardv2/public/index.html
......@@ -15,10 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
<!--[if gt IE 7]>
<script src="js/external_lib/es5-shim.min.js"></script>
<script src="js/external_lib/respond.min.js"></script>
<![endif]-->
<!--[if gt IE 8]><!-->
<html class="no-js">
<!--<![endif]-->
......@@ -26,6 +29,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8; Cache-Control: no-cache" />
<title>Atlas</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width">
......@@ -45,6 +49,7 @@
<link rel="stylesheet" type="text/css" href="js/external_lib/jquery-ui/jquery-ui.min.css">
<link href="css/bootstrap-sidebar.css" rel="stylesheet">
<link href="js/libs/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="js/external_lib/pnotify.custom.min.css" rel="stylesheet">
<link href="css/style.css" rel="stylesheet">
</head>
......
dashboardv2/public/js/external_lib/pnotify.custom.min.css 0 → 100644
.ui-pnotify{top:36px;right:36px;position:absolute;height:auto;z-index:2}body>.ui-pnotify{position:fixed;z-index:100040}.ui-pnotify-modal-overlay{background-color:rgba(0,0,0,.4);top:0;left:0;position:absolute;height:100%;width:100%;z-index:1}body>.ui-pnotify-modal-overlay{position:fixed;z-index:100039}.ui-pnotify.ui-pnotify-in{display:block!important}.ui-pnotify.ui-pnotify-move{transition:left .5s ease,top .5s ease,right .5s ease,bottom .5s ease}.ui-pnotify.ui-pnotify-fade-slow{transition:opacity .6s linear;opacity:0}.ui-pnotify.ui-pnotify-fade-slow.ui-pnotify.ui-pnotify-move{transition:opacity .6s linear,left .5s ease,top .5s ease,right .5s ease,bottom .5s ease}.ui-pnotify.ui-pnotify-fade-normal{transition:opacity .4s linear;opacity:0}.ui-pnotify.ui-pnotify-fade-normal.ui-pnotify.ui-pnotify-move{transition:opacity .4s linear,left .5s ease,top .5s ease,right .5s ease,bottom .5s ease}.ui-pnotify.ui-pnotify-fade-fast{transition:opacity .2s linear;opacity:0}.ui-pnotify.ui-pnotify-fade-fast.ui-pnotify.ui-pnotify-move{transition:opacity .2s linear,left .5s ease,top .5s ease,right .5s ease,bottom .5s ease}.ui-pnotify.ui-pnotify-fade-in{opacity:1}.ui-pnotify .ui-pnotify-shadow{-webkit-box-shadow:0 6px 28px 0 rgba(0,0,0,.1);-moz-box-shadow:0 6px 28px 0 rgba(0,0,0,.1);box-shadow:0 6px 28px 0 rgba(0,0,0,.1)}.ui-pnotify-container{background-position:0 0;padding:.8em;height:100%;margin:0}.ui-pnotify-container:after{content:" ";visibility:hidden;display:block;height:0;clear:both}.ui-pnotify-container.ui-pnotify-sharp{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.ui-pnotify-title{display:block;margin-bottom:.4em;margin-top:0}.ui-pnotify-text{display:block}.ui-pnotify-icon,.ui-pnotify-icon span{display:block;float:left;margin-right:.2em}.ui-pnotify.stack-bottomleft,.ui-pnotify.stack-topleft{left:25px;right:auto}.ui-pnotify.stack-bottomleft,.ui-pnotify.stack-bottomright{bottom:25px;top:auto}.ui-pnotify.stack-modal{left:50%;right:auto;margin-left:-150px}.brighttheme{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.brighttheme.ui-pnotify-container{padding:18px}.brighttheme .ui-pnotify-title{margin-bottom:12px}.brighttheme-notice{background-color:#FFFFA2;border:0 solid #FF0;color:#4F4F00}.brighttheme-info{background-color:#8FCEDD;border:0 solid #0286A5;color:#012831}.brighttheme-success{background-color:#AFF29A;border:0 solid #35DB00;color:#104300}.brighttheme-error{background-color:#FFABA2;background-image:repeating-linear-gradient(135deg,transparent,transparent 35px,rgba(255,255,255,.3) 35px,rgba(255,255,255,.3) 70px);border:0 solid #FF1800;color:#4F0800}.brighttheme-icon-closer,.brighttheme-icon-info,.brighttheme-icon-notice,.brighttheme-icon-sticker,.brighttheme-icon-success{position:relative;width:16px;height:16px;font-size:12px;font-weight:700;line-height:16px;font-family:"Courier New",Courier,monospace;border-radius:50%}.brighttheme-icon-closer:after,.brighttheme-icon-info:after,.brighttheme-icon-notice:after,.brighttheme-icon-sticker:after,.brighttheme-icon-success:after{position:absolute;top:0;left:4px}.brighttheme-icon-notice{background-color:#2E2E00;color:#FFFFA2;margin-top:2px}.brighttheme-icon-notice:after{content:"!"}.brighttheme-icon-info{background-color:#012831;color:#8FCEDD;margin-top:2px}.brighttheme-icon-info:after{content:"i"}.brighttheme-icon-success{background-color:#104300;color:#AFF29A;margin-top:2px}.brighttheme-icon-success:after{content:"\002713"}.brighttheme-icon-error{position:relative;width:0;height:0;border-left:8px solid transparent;border-right:8px solid transparent;border-bottom:16px solid #2E0400;font-size:0;line-height:0;color:#FFABA2;margin-top:1px}.brighttheme-icon-error:after{position:absolute;top:1px;left:-4px;font-size:12px;font-weight:700;line-height:16px;font-family:"Courier New",Courier,monospace;content:"!"}.brighttheme-icon-closer,.brighttheme-icon-sticker{display:inline-block}.brighttheme-icon-closer:after{top:-4px;content:"\002715"}.brighttheme-icon-sticker:after{top:-5px;content:"\01D1BC";-moz-transform:rotate(-90deg);-webkit-transform:rotate(-90deg);-o-transform:rotate(-90deg);-ms-transform:rotate(-90deg);transform:rotate(-90deg)}.brighttheme-icon-sticker.brighttheme-icon-stuck:after{-moz-transform:rotate(180deg);-webkit-transform:rotate(180deg);-o-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.brighttheme .ui-pnotify-action-bar{padding-top:12px}.brighttheme .ui-pnotify-action-bar input,.brighttheme .ui-pnotify-action-bar textarea{display:block;width:100%;margin-bottom:12px!important}.brighttheme .ui-pnotify-action-button{text-transform:uppercase;font-weight:700;padding:4px 8px;border:none;background:0 0}.brighttheme .ui-pnotify-action-button.btn-primary{border:none;border-radius:0}.brighttheme-notice .ui-pnotify-action-button.btn-primary{background-color:#FF0;color:#4F4F00}.brighttheme-info .ui-pnotify-action-button.btn-primary{background-color:#0286A5;color:#012831}.brighttheme-success .ui-pnotify-action-button.btn-primary{background-color:#35DB00;color:#104300}.brighttheme-error .ui-pnotify-action-button.btn-primary{background-color:#FF1800;color:#4F0800}.ui-pnotify-closer,.ui-pnotify-sticker{float:right;margin-left:.2em}
\ No newline at end of file
dashboardv2/public/js/external_lib/respond.min.js 0 → 100644
/*! Respond.js v1.4.2: min/max-width media query polyfill * Copyright 2013 Scott Jehl
* Licensed under https://github.com/scottjehl/Respond/blob/master/LICENSE-MIT
* */
!function(a){"use strict";a.matchMedia=a.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='&shy;<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),function(a){"use strict";function b(){u(!0)}var c={};a.respond=c,c.update=function(){};var d=[],e=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}(),f=function(a,b){var c=e();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))};if(c.ajax=f,c.queue=d,c.regex={media:/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi,keyframes:/@(?:\-(?:o|moz|webkit)\-)?keyframes[^\{]+\{(?:[^\{\}]*\{[^\}\{]*\})+[^\}]*\}/gi,urls:/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,findStyles:/@media *([^\{]+)\{([\S\s]+?)$/,only:/(only\s+)?([a-zA-Z]+)\s?/,minw:/\([\s]*min\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/,maxw:/\([\s]*max\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/},c.mediaQueriesSupported=a.matchMedia&&null!==a.matchMedia("only all")&&a.matchMedia("only all").matches,!c.mediaQueriesSupported){var g,h,i,j=a.document,k=j.documentElement,l=[],m=[],n=[],o={},p=30,q=j.getElementsByTagName("head")[0]||k,r=j.getElementsByTagName("base")[0],s=q.getElementsByTagName("link"),t=function(){var a,b=j.createElement("div"),c=j.body,d=k.style.fontSize,e=c&&c.style.fontSize,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",c||(c=f=j.createElement("body"),c.style.background="none"),k.style.fontSize="100%",c.style.fontSize="100%",c.appendChild(b),f&&k.insertBefore(c,k.firstChild),a=b.offsetWidth,f?k.removeChild(c):c.removeChild(b),k.style.fontSize=d,e&&(c.style.fontSize=e),a=i=parseFloat(a)},u=function(b){var c="clientWidth",d=k[c],e="CSS1Compat"===j.compatMode&&d||j.body[c]||d,f={},o=s[s.length-1],r=(new Date).getTime();if(b&&g&&p>r-g)return a.clearTimeout(h),h=a.setTimeout(u,p),void 0;g=r;for(var v in l)if(l.hasOwnProperty(v)){var w=l[v],x=w.minw,y=w.maxw,z=null===x,A=null===y,B="em";x&&(x=parseFloat(x)*(x.indexOf(B)>-1?i||t():1)),y&&(y=parseFloat(y)*(y.indexOf(B)>-1?i||t():1)),w.hasquery&&(z&&A||!(z||e>=x)||!(A||y>=e))||(f[w.media]||(f[w.media]=[]),f[w.media].push(m[w.rules]))}for(var C in n)n.hasOwnProperty(C)&&n[C]&&n[C].parentNode===q&&q.removeChild(n[C]);n.length=0;for(var D in f)if(f.hasOwnProperty(D)){var E=j.createElement("style"),F=f[D].join("\n");E.type="text/css",E.media=D,q.insertBefore(E,o.nextSibling),E.styleSheet?E.styleSheet.cssText=F:E.appendChild(j.createTextNode(F)),n.push(E)}},v=function(a,b,d){var e=a.replace(c.regex.keyframes,"").match(c.regex.media),f=e&&e.length||0;b=b.substring(0,b.lastIndexOf("/"));var g=function(a){return a.replace(c.regex.urls,"$1"+b+"$2$3")},h=!f&&d;b.length&&(b+="/"),h&&(f=1);for(var i=0;f>i;i++){var j,k,n,o;h?(j=d,m.push(g(a))):(j=e[i].match(c.regex.findStyles)&&RegExp.$1,m.push(RegExp.$2&&g(RegExp.$2))),n=j.split(","),o=n.length;for(var p=0;o>p;p++)k=n[p],l.push({media:k.split("(")[0].match(c.regex.only)&&RegExp.$2||"all",rules:m.length-1,hasquery:k.indexOf("(")>-1,minw:k.match(c.regex.minw)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:k.match(c.regex.maxw)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},w=function(){if(d.length){var b=d.shift();f(b.href,function(c){v(c,b.href,b.media),o[b.href]=!0,a.setTimeout(function(){w()},0)})}},x=function(){for(var b=0;b<s.length;b++){var c=s[b],e=c.href,f=c.media,g=c.rel&&"stylesheet"===c.rel.toLowerCase();e&&g&&!o[e]&&(c.styleSheet&&c.styleSheet.rawCssText?(v(c.styleSheet.rawCssText,e,f),o[e]=!0):(!/^([a-zA-Z:]*\/\/)/.test(e)&&!r||e.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&("//"===e.substring(0,2)&&(e=a.location.protocol+e),d.push({href:e,media:f})))}w()};x(),c.update=x,c.getEmValue=t,a.addEventListener?a.addEventListener("resize",b,!1):a.attachEvent&&a.attachEvent("onresize",b)}}(this);
\ No newline at end of file
dashboardv2/public/js/main.js
......@@ -18,14 +18,14 @@
require.config({
/* starting point for application */
hbs: {
disableI18n: true, // This disables the i18n helper and doesn't require the json i18n files (e.g. en_us.json)
helperPathCallback: // Callback to determine the path to look for helpers
'hbs': {
'disableI18n': true, // This disables the i18n helper and doesn't require the json i18n files (e.g. en_us.json)
'helperPathCallback': // Callback to determine the path to look for helpers
function(name) { // ('/template/helpers/'+name by default)
return 'modules/Helpers';
},
templateExtension: 'html', // Set the extension automatically appended to templates
compileOptions: {} // options object which is passed to Handlebars compiler
'templateExtension': 'html', // Set the extension automatically appended to templates
'compileOptions': {} // options object which is passed to Handlebars compiler
},
/**
* Requested as soon as the loader has processed the configuration. It does
......@@ -34,72 +34,75 @@ require.config({
* as part of a config block.
* @type {Array} An array of dependencies to load.
*/
deps: ['marionette'],
'deps': ['marionette'],
/**
* The number of seconds to wait before giving up on loading a script.
* @default 7 seconds
* @type {Number}
*/
waitSeconds: 30,
'waitSeconds': 30,
shim: {
backbone: {
deps: ['underscore', 'jquery'],
exports: 'Backbone'
'shim': {
'backbone': {
'deps': ['underscore', 'jquery'],
'exports': 'Backbone'
},
'jquery-ui': {
deps: ['jquery'],
'deps': ['jquery']
},
asBreadcrumbs: {
deps: ['jquery'],
exports: 'asBreadcrumbs'
'asBreadcrumbs': {
'deps': ['jquery'],
'exports': 'asBreadcrumbs'
},
bootstrap: {
deps: ['jquery'],
exports: 'jquery'
'bootstrap': {
'deps': ['jquery'],
'exports': 'jquery'
},
underscore: {
exports: '_'
'underscore': {
'exports': '_'
},
marionette: {
deps: ['backbone']
'marionette': {
'deps': ['backbone']
},
backgrid: {
deps: ['backbone'],
exports: 'Backgrid'
'backgrid': {
'deps': ['backbone'],
'exports': 'Backgrid'
},
'backgrid-paginator': {
deps: ['backbone', 'backgrid']
'deps': ['backbone', 'backgrid']
},
'backgrid-filter': {
deps: ['backbone', 'backgrid']
'deps': ['backbone', 'backgrid']
},
'backgrid-orderable': {
deps: ['backbone', 'backgrid'],
'deps': ['backbone', 'backgrid'],
},
'backgrid-sizeable': {
deps: ['backbone', 'backgrid'],
'deps': ['backbone', 'backgrid'],
},
'backgrid-select-all': {
deps: ['backbone', 'backgrid']
'deps': ['backbone', 'backgrid']
},
hbs: {
deps: ['underscore', 'handlebars']
'hbs': {
'deps': ['underscore', 'handlebars']
},
d3: {
exports: 'd3'
'd3': {
'exports': ['d3']
},
'd3-tip': {
deps: ['d3'],
exports: 'd3-tip'
'deps': ['d3'],
'exports': ['d3-tip']
},
noty: {
deps: ['jquery'],
'dagreD3': {
'deps': ['d3'],
'exports': ['dagreD3']
},
dagreD3: {
deps: ['d3'],
exports: 'dagreD3'
'pnotify': {
'exports': ['pnotify']
},
'jquery-placeholder': {
'deps': ['jquery']
}
},
......@@ -121,7 +124,6 @@ require.config({
'd3': 'libs/d3/d3.min',
'd3-tip': 'libs/d3/index',
'tmpl': 'templates',
'noty': 'libs/noty/js/jquery.noty.packaged.min',
'requirejs.text': 'libs/requirejs-text/text',
'handlebars': 'external_lib/require-handlebars-plugin/js/handlebars',
'json2': 'external_lib/require-handlebars-plugin/js/json2',
......@@ -130,7 +132,11 @@ require.config({
'dagreD3': 'libs/dagre-d3/dagre-d3.min',
'select2': 'libs/select2/select2.min',
'backgrid-select-all': 'libs/backgrid-select-all/backgrid-select-all.min',
'moment': 'libs/moment/js/moment.min',
'jquery-ui': 'external_lib/jquery-ui/jquery-ui.min',
'pnotify': 'external_lib/pnotify.custom.min',
'jquery-placeholder': 'libs/jquery-placeholder/js/jquery.placeholder',
'platform': 'libs/platform/platform'
},
/**
......@@ -139,7 +145,7 @@ require.config({
* To get timely, correct error triggers in IE, force a define/shim export.
* @type {Boolean}
*/
enforceDefine: false
'enforceDefine': false
});
require(['App',
......
dashboardv2/public/js/templates/audit/AuditTableLayoutView_tmpl.html
......@@ -23,10 +23,10 @@
<span class="labelShowRecord pull-left" data-id="pageRecordText"></span>
<ul class="pager pull-right">
<li>
<button class="btn" data-id="previousAuditData">Previous</button>
<button type="button" class="btn" data-id="previousAuditData">Previous</button>
</li>
<li>
<button class="btn" data-id="nextAuditData">Next</button>
<button type="button" class="btn" data-id="nextAuditData">Next</button>
</li>
</ul>
<div id="r_auditTableLayoutView"></div>
......
dashboardv2/public/js/templates/business_catalog/AddTermView_tmpl.html
......@@ -17,8 +17,13 @@
<form name="tagDefinitionform" class="css-form" onsubmit="return false;">
<!-- <h4 style="margin-bottom:30px">Add Term</h4> -->
<div class="form-group">
{{#if defaultTerm}}
<input class="form-control" data-id="termName" placeholder="Enter Taxonomy Name" autofocus>
<p class='alertTerm' style='display:none'>Taxonomy name should not have spaces</p>
{{else}}
<input class="form-control" data-id="termName" placeholder="Name(Required)" autofocus>
<p class='alertTerm' style='display:none'>Term name should not have spaces</p>
{{/if}}
</div>
<div class="form-group">
<textarea class="form-control" data-id="termDetail" placeholder="Description"></textarea>
......
dashboardv2/public/js/templates/business_catalog/BusinessCatalogDetailLayoutView_tmpl.html
......@@ -20,7 +20,7 @@
<div class="hide">
<div class="page-title clearfix">
<h1><span data-id="title"></span></h1>
<button data-id="editButton" class="btn btn-default pull-right editbutton" id="editText"><i class="fa fa-pencil"></i></button>
<button type="button" data-id="editButton" class="btn btn-default pull-right editbutton" id="editText"><i class="fa fa-pencil"></i></button>
<p class="sub-title" data-id="description">Description</p>
<!-- <div data-id="editBox" style="margin-bottom:10px;">
<textarea class="well well-sm col-sm-12" data-id="descriptionTextArea"></textarea>
......
dashboardv2/public/js/templates/business_catalog/TreeLayoutView_tmpl.html
......@@ -16,8 +16,8 @@
-->
<div class="clearfix add-seperator">
<p data-id="descriptionAssign" style="display:none">Assign a term to this asset</p>
<button class="btn btn-atlasAction btn-atlas pull-left" data-id="backTaxanomy"><i class="fa fa-chevron-left"></i> Back</button>
<button class="btn btn-atlasAction btn-atlas pull-right" onclick="this.blur();" title="Refresh" data-id="refreshTaxanomy"><i class="fa fa-refresh"></i></button>
<button type="button" class="btn btn-atlasAction btn-atlas pull-left" data-id="backTaxanomy"><i class="fa fa-chevron-left"></i> Back</button>
<button type="button" class="btn btn-atlasAction btn-atlas pull-right" onclick="this.blur();" title="Refresh" data-id="refreshTaxanomy"><i class="fa fa-refresh"></i></button>
</div>
<div>
<select type="text" class="form-control" data-id="searchTermInput"></select>
......
dashboardv2/public/js/templates/common/modal.html
......@@ -32,9 +32,9 @@
{{#if showFooter}}
<div class="modal-footer">
{{#if allowCancel}} {{#if cancelText}}
<button class="btn btn-atlas cancel">{{tt cancelText}}</button>
<button type="button" class="btn btn-atlas cancel">{{tt cancelText}}</button>
{{/if}} {{/if}}
<button class="btn btn-atlas ok">{{tt okText}}</button>
<button type="button" class="btn btn-atlas ok">{{tt okText}}</button>
</div>
{{/if}} {{/if}}
</div>
......
dashboardv2/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html
......@@ -18,12 +18,12 @@
<div class="row">
<a href="javascript:void(0);" class="backButton" data-id="backButton"><i class="fa fa-chevron-left"></i> Back To Results</a>
</div>
<h1><span data-id="title"></span><!-- <small>Bookmark</small> <button data-id="editButton" class="btn btn-default pull-right editbutton" id="editText"><i class="fa fa-pencil"></i></button> --></h1>
<h1><span data-id="title"></span></h1>
<div data-id="editBox" style="margin-bottom:10px;">
<textarea class="well well-sm col-sm-12" data-id="descriptionTextArea"></textarea>
<div class="clearfix" align="right">
<button class="btn-atlas" data-id="cancelButton">Cancel</button>
<button class="btn-atlas" data-id="publishButton">Publish</button>
<button type="button" class="btn-atlas" data-id="cancelButton">Cancel</button>
<button type="button" class="btn-atlas" data-id="publishButton">Publish</button>
</div>
</div>
<div class="tagTerm">
......
dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html
......@@ -26,8 +26,8 @@
</div>
<svg width=100% height=350></svg>
<div class="zoomButtonGroup">
<button class="zoomButton" id="zoom_in">+</button>
<button class="zoomButton" id="zoom_out">-</button>
<button type="button" class="zoomButton" id="zoom_in">+</button>
<button type="button" class="zoomButton" id="zoom_out">-</button>
</div>
</div>
</div>
dashboardv2/public/js/templates/search/SearchLayoutView_tmpl.html
......@@ -20,13 +20,13 @@
<div class="col-md-6">
<span class="pull-left">Text</span>
<label class="switch pull-left">
<input type="checkbox" name="queryType" value="text">
<div class="slider round"></div>
<input type="checkbox" class="switch-input" name="queryType" value="text"/>
<span class="switch-slider"></span>
</label>
<span class="pull-left">DSL</span>
</div>
<div class="col-md-6">
<button class="btn btn-atlasAction btn-atlas pull-right typeLOV" title="Refresh" data-id="refreshBtn"><i class="fa fa-refresh"></i></button>
<button type="button" class="btn btn-atlasAction btn-atlas pull-right typeLOV" title="Refresh" data-id="refreshBtn"><i class="fa fa-refresh"></i></button>
</div>
</div>
</div>
......@@ -40,6 +40,6 @@
</div>
</div>
<div class="clearAdvanceSearch" data-id="clearSearch">Clear</div>
<button class="btn btn-atlas advanceSearchBtn" data-id="searchBtn" disabled="disabled">Search</button>
<button type="button" class="btn btn-atlas advanceSearchBtn" data-id="searchBtn" disabled="disabled">Search</button>
</div>
<div id="searchResult"></div>
dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
......@@ -24,10 +24,10 @@
<div data-id="paginationDiv" style="display:none">
<ul class="pager pull-right">
<li>
<button class="btn" data-id="previousData" disabled=true>Previous</button>
<button type="button" class="btn" data-id="previousData" disabled=true>Previous</button>
</li>
<li>
<button class="btn" data-id="nextData">Next</button>
<button type="button" class="btn" data-id="nextData">Next</button>
</li>
</ul>
</div>
......
dashboardv2/public/js/templates/tag/TagAttributeDetailLayoutView_tmpl.html
......@@ -16,7 +16,7 @@
-->
<div class="page-title clearfix">
<h1><span data-id="title"></span></h1>
<button data-id="editButton" class="btn btn-default pull-right editbutton" id="editText"><i class="fa fa-pencil"></i></button>
<button type="button" data-id="editButton" class="btn btn-default pull-right editbutton" id="editText"><i class="fa fa-pencil"></i></button>
<p class="sub-title" data-id="description"></p>
<span class="attrLabel">Attributes:</span>
<div data-id="showAttribute">
......
dashboardv2/public/js/templates/tag/TagLayoutView_tmpl.html
......@@ -15,8 +15,8 @@
* limitations under the License.
-->
<div class="clearfix add-seperator">
<button class="btn btn-atlasAction btn-atlas pull-left" data-id="createTag"><i class="fa fa-plus"></i> Create Tag</button>
<button class="btn btn-atlasAction btn-atlas pull-right" title="Refresh" data-id="refreshTag" onclick="this.blur();"><i class="fa fa-refresh"></i></button>
<button type="button" class="btn btn-atlasAction btn-atlas pull-left" data-id="createTag" type="button"><i class="fa fa-plus"></i> Create Tag</button>
<button type="button" class="btn btn-atlasAction btn-atlas pull-right" title="Refresh" data-id="refreshTag" onclick="this.blur();" type="button"><i class="fa fa-refresh"></i></button>
</div>
<input type="text" class="form-control" data-id="offlineSearchTag" placeholder="Search Tags">
<ul class="tag-tree" data-id="tagsParent">
......
dashboardv2/public/js/utils/CommonViewFunction.js
......@@ -373,14 +373,14 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
dropdownMenuClass += ' dropdown-menu-right';
}
return `<li class="${dropdownClass} ${classes.dropdownClass}">
<a href="javascript:void(0);" class="${classes.toggleClass}" data-toggle="dropdown">
<i class="${classes.toggleIconClass}"></i>
</a>
<ul class="${dropdownMenuClass} ${classes.dropdownMenuClass}">
<div class="arrow"></div>
</ul>
</li>`;
return '<li class="' + dropdownClass + ' ' + classes.dropdownClass + '">' +
'<a href="javascript:void(0);" class="' + classes.toggleClass + '" data-toggle="dropdown">' +
'<i class="' + classes.toggleIconClass + '"></i>' +
'</a>' +
'<ul class="' + dropdownMenuClass + ' ' + classes.dropdownMenuClass + '">' +
'<div class="arrow"></div>' +
'</ul>' +
'</li>';
}
});
}
......
dashboardv2/public/js/utils/Messages.js
......@@ -33,6 +33,7 @@ define(['require'], function(require) {
addAttributeSuccessMessage: "Tag attribute is added successfully",
updateTagDescriptionMessage: "Tag description is updated successfully",
updateTermDescriptionMessage: "Term description is updated successfully",
editSuccessMessage: " has been updated successfully"
};
return Messages;
});
dashboardv2/public/js/utils/Overrides.js
......@@ -16,9 +16,22 @@
* limitations under the License.
*/
define(['require', 'backgrid', 'asBreadcrumbs'], function(require) {
define(['require', 'marionette', 'backgrid', 'asBreadcrumbs', 'jquery-placeholder'], function(require) {
'use strict';
Backbone.$.ajaxSetup({
cache: false
});
// For placeholder support
if (!('placeholder' in HTMLInputElement.prototype)) {
var originalRender = Backbone.Marionette.LayoutView.prototype.render;
Backbone.Marionette.LayoutView.prototype.render = function() {
originalRender.apply(this, arguments);
this.$('input, textarea').placeholder();
}
}
String.prototype.trunc = String.prototype.trunc ||
function(n) {
return (this.length > n) ? this.substr(0, n - 1) + '...' : this;
......
dashboardv2/public/js/utils/Utils.js
......@@ -16,25 +16,25 @@
* limitations under the License.
*/
define(['require', 'utils/Globals'], function(require, Globals) {
define(['require', 'utils/Globals', 'pnotify'], function(require, Globals, pnotify) {
'use strict';
var Utils = {};
var prevNetworkErrorTime = 0;
require(['noty'], function() {
$.extend($.noty.defaults, {
timeout: 5000,
layout: "topRight",
theme: "relax",
closeWith: ['click', 'button'],
animation: {
open: 'animated flipInX',
close: 'animated flipOutX',
easing: 'swing',
speed: 500
}
});
Utils.escapeHtml = function(string) {
var entityMap = {
"&": "&amp;",
"<": "&lt;",
">": "&gt;",
'"': '&quot;',
"'": '&#39;',
"/": '&#x2F;'
};
return String(string).replace(/[&<>"'\/]/g, function(s) {
return entityMap[s];
});
}
Utils.generateUUID = function() {
var d = new Date().getTime();
if (window.performance && typeof window.performance.now === "function") {
......@@ -48,30 +48,34 @@ define(['require', 'utils/Globals'], function(require, Globals) {
return uuid;
};
var notify = function(options) {
new pnotify(_.extend({ icon: true, hide: true, delay: 3000,remove:true }, options));
}
Utils.notifyInfo = function(options) {
noty({
type: "information",
text: "<i class='fa fa-exclamation-circle'></i> " + (options.content || "Info message.")
notify({
type: "info",
text: options.content || "Info message."
});
};
Utils.notifyWarn = function(options) {
noty({
type: "warning",
text: "<i class='fa fa-times-circle'></i> " + (options.content || "Info message.")
notify({
type: "notice",
text: options.content || "Info message."
});
};
Utils.notifyError = function(options) {
noty({
notify({
type: "error",
text: "<i class='fa fa-times-circle'></i> " + (options.content || "Error occurred.")
text: options.content || "Error occurred."
});
};
Utils.notifySuccess = function(options) {
noty({
notify({
type: "success",
text: "<i class='fa fa-check-circle-o'></i> " + (options.content || "Error occurred.")
text: options.content || "Error occurred."
});
};
Utils.defaultErrorHandler = function(model, error) {
......
dashboardv2/public/js/views/audit/AuditTableLayoutView.js
......@@ -61,7 +61,7 @@ define(['require',
this.entityCollection = new VEntityList();
this.count = 26;
this.entityCollection.url = "/api/atlas/entities/" + this.guid + "/audit";
this.entityCollection.modelAttrName = "events"
this.entityCollection.modelAttrName = "events";
this.entityModel = new this.entityCollection.model();
this.pervOld = [];
this.commonTableOptions = {
......@@ -162,7 +162,7 @@ define(['require',
columns: cols
})));
if (!(that.entityCollection.models.length < that.count)) {
that.RAuditTableLayoutView.$el.find('table tr').last().hide()
that.RAuditTableLayoutView.$el.find('table tr').last().hide();
}
});
},
......@@ -193,7 +193,6 @@ define(['require',
sortable: false,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
that.detailBtnDisable = false;
if (Globals.auditAction[rawValue]) {
return Globals.auditAction[rawValue];
} else {
......@@ -209,7 +208,7 @@ define(['require',
sortable: false,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
return '<div class="label label-success auditDetailBtn" data-id="auditCreate" data-action="' + Globals.auditAction[model.attributes.action] + '" disabled="' + that.detailBtnDisable + '" data-modalId="' + model.get('eventKey') + '">Detail</div>';
return '<div class="label label-success auditDetailBtn" data-id="auditCreate" data-action="' + Globals.auditAction[model.attributes.action] + '" data-modalId="' + model.get('eventKey') + '">Detail</div>';
}
})
},
......@@ -238,7 +237,7 @@ define(['require',
});
view.$el.on('click', 'td a', function() {
modal.trigger('cancel');
})
});
});
},
onClickNextAuditData: function() {
......@@ -246,7 +245,7 @@ define(['require',
this.ui.previousAuditData.removeAttr("disabled");
$.extend(this.entityCollection.queryParams, {
startKey: function() {
return that.next
return that.next;
}
});
this.fetchCollection({
......@@ -260,7 +259,7 @@ define(['require',
this.ui.nextAuditData.removeAttr("disabled");
$.extend(this.entityCollection.queryParams, {
startKey: function() {
return that.pervOld.pop()
return that.pervOld.pop();
}
});
this.fetchCollection({
......
dashboardv2/public/js/views/business_catalog/AddTermLayoutView.js
......@@ -31,6 +31,12 @@ define(['require',
template: AddTermViewTmpl,
templateHelpers: function() {
return {
defaultTerm: this.defaultTerm
};
},
/** Layout sub regions */
regions: {},
/** ui selector cache */
......@@ -48,7 +54,7 @@ define(['require',
* @constructs
*/
initialize: function(options) {
_.extend(this, _.pick(options, 'url', 'model'));
_.extend(this, _.pick(options, 'url', 'model','defaultTerm'));
},
bindEvents: function() {},
onRender: function() {}
......
dashboardv2/public/js/views/business_catalog/AddTermToEntityLayoutView.js
......@@ -70,7 +70,7 @@ define(['require',
var obj = {
termName: this.modal.$el.find('.taxonomyTree li.active a').data('name').split("`").join(""),
guid: that.multiple[i].id.id
}
};
CommonViewFunction.saveTermToAsset(obj, that);
}
} else {
......
dashboardv2/public/js/views/business_catalog/TreeLayoutView.js
......@@ -258,7 +258,7 @@ define(['require',
if (isParent) {
this.parentCollection.url = this.url;
this.parentCollection.fullCollection.reset(undefined, { silent: true });
this.parentCollection.fetch({ reset: true });
this.parentCollection.fetch({ reset: true,cache:true });
} else {
this.childCollection.url = this.url + "?hierarchy/path:.";
this.childCollection.fullCollection.reset(undefined, { silent: true });
......@@ -614,7 +614,8 @@ define(['require',
], function(AddTermLayoutView, Modal) {
var view = new AddTermLayoutView({
url: "/api/atlas/v1/taxonomies",
model: new that.parentCollection.model()
model: new that.parentCollection.model(),
defaultTerm:true
});
var modal = new Modal({
title: 'Taxonomy',
......@@ -628,7 +629,6 @@ define(['require',
modal.on('ok', function() {
that.saveDefaultTaxonomy(view);
});
view.ui.termName.attr("placeholder", "Enter Taxonomy Name");
view.ui.termName.on('keyup', function() {
if (this.value.indexOf(' ') >= 0) {
modal.$el.find('button.ok').prop('disabled', true);
......
dashboardv2/public/js/views/schema/SchemaLayoutView.js
......@@ -253,7 +253,7 @@ define(['require',
nameHtml = '<a>' + rawValue + '</a>';
}
if (model.get('$id$') && model.get('$id$').state && Globals.entityStateReadOnly[model.get('$id$').state]) {
nameHtml += '<button title="Deleted" class="btn btn-atlasAction btn-atlas deleteBtn"><i class="fa fa-trash"></i></button>';
nameHtml += '<button type="button" title="Deleted" class="btn btn-atlasAction btn-atlas deleteBtn"><i class="fa fa-trash"></i></button>';
return '<div class="readOnly readOnlyLink">' + nameHtml + '</div>';
} else {
return nameHtml;
......
dashboardv2/public/js/views/tag/CreateTagLayoutView.js
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
......@@ -19,8 +20,9 @@
define(['require',
'backbone',
'hbs!tmpl/tag/createTagLayoutView_tmpl',
'utils/Utils'
], function(require, Backbone, CreateTagLayoutViewTmpl, Utils) {
'utils/Utils',
'platform'
], function(require, Backbone, CreateTagLayoutViewTmpl, Utils, platform) {
var CreateTagLayoutView = Backbone.Marionette.LayoutView.extend(
/** @lends CreateTagLayoutView */
......@@ -81,6 +83,15 @@ define(['require',
str += '<option>' + val.get("tags") + '</option>';
});
that.ui.parentTag.html(str);
console.log(platform);
// IE9 support
if (platform.name === "IE") {
that.ui.parentTag.select2({
multiple: true,
placeholder: "Search Tags",
allowClear: true
});
}
}
});
return CreateTagLayoutView;
......
release-log.txt
......@@ -9,8 +9,12 @@ ATLAS-1060 Add composite indexes for exact match performance improvements for al
ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai)
ALL CHANGES:
ATLAS-1192 Atlas IE support (kevalbhatt)
ATLAS-1273 Test testOnChangeRefresh in DefaultMetadataServiceTest is failing (ayubkhan via shwethags)
ATLAS-1272 updated types bootstrap to load from new format typedef JSON files (mneethiraj)
Atlas web server allows user to browse webapp directory (vrathor-hw via shwethags)
ATLAS-1266 fixed typedef APIs to update type-registry only on successful graph commit (mneethiraj)
ATLAS-1268 added methods to retrieve attributeDefs in a type and all its superTypes (mneethiraj)
ATLAS-1241 New Instance APIs and POJOs (sumasai)
ATLAS-1259 Fix Test and compilation failure caused bt ATLAS-1233 changes (apoorvnaik via sumasai)
ATLAS-1248 /bin/atlas_stop.py not killing the process and process is found alive even after 30 secs (zhangqiang2 via sumasai)
......
webapp/src/main/resources/spring-security.xml
......@@ -33,6 +33,7 @@
<security:http pattern="/img/**" security="none" />
<security:http pattern="/libs/**" security="none" />
<security:http pattern="/js/**" security="none" />
<security:http pattern="/ieerror.html" security="none" />
<security:http pattern="/api/atlas/admin/status" security="none" />
<security:http disable-url-rewriting="true"
......
webapp/src/main/webapp/login.jsp
<!doctype html>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
-->
<!DOCTYPE html>
<!--[if lt IE 7]><html class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
<!--[if IE 7]><html class="no-js lt-ie9 lt-ie8"><![endif]-->
<!--[if IE 8]><html class="no-js lt-ie9"><![endif]-->
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
<!--[if lt IE 9]>
<script type="text/javascript">
function Redirect() {
window.location.assign("ieerror.html");
}
Redirect();
</script>
<![endif]-->
<!--[if gt IE 7]>
<script src="js/external_lib/es5-shim.min.js"></script>
<script src="js/external_lib/respond.min.js"></script>
<![endif]-->
<!--[if gt IE 8]><!-->
<html class="no-js">
<!--<![endif]-->
<!--<![endif]-->
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
......@@ -58,6 +70,5 @@
</div>
</div>
</div>
</body>
</body>
</html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment