Commit 95f4f2f0 by Shwetha GS

ATLAS-958 Add licenses for dashboard dependencies (kevalbhatt18 via shwethags)

parent 7403ebff
The MIT License (MIT)
Copyright (c) 2016 Daniel Eden
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
The MIT License (MIT)
Copyright (c) 2013-2016 Blackrock Digital LLC.
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
The MIT License (MIT)
Copyright (C) 2011-2016 by Yehuda Katz
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
The MIT License (MIT)
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
Copyright © 2011-2014 by Yehuda Katz.
Full License information is available at http://www.wtfpl.net/about/
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
Version 2, December 2004
Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
Everyone is permitted to copy and distribute verbatim or modified
copies of this license document, and changing it is allowed as long
as the name is changed.
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. You just DO WHAT THE FUCK YOU WANT TO.
\ No newline at end of file
......@@ -214,3 +214,22 @@ This product bundles titan 0.5.4, which is available under
This product bundles mock(for python tests) 1.0.1, which is available under
"BSD License". For details, see 3party-licenses/mock-LICENSE
This product bundles animate, which is available under
"MIT License". For details, see 3party-licenses/animate-LICENSE
This product bundles Handlebars.js, which is available under
"MIT License". For details, see 3party-licenses/handlebars-LICENSE
This product bundles bootstrap-sidebar 0.4.0, which is available under
"MIT License". For details, see 3party-licenses/bootstrap-sidebar-LICENSE
This product bundles hbs 0.4.0, which is available under
"MIT License". For details, see 3party-licenses/hbs-LICENSE
This product bundles require-handlebars-plugin 0.4.0, which is available under
"WTFPL License". For details, see 3party-licenses/require-handlebars-plugin-LICENSE
This product bundles json2.js, which is available under
"Public Domain license". By Douglas Crockford.
=======================================================================
\ No newline at end of file
......@@ -127,7 +127,6 @@ module.exports = function(grunt) {
'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',
'jstree': 'jstree/dist/jstree.min.js',
'select2': 'select2/dist/js/select2.min.js',
'backgrid-select-all': 'backgrid-select-all/backgrid-select-all.min.js'
}
......@@ -138,7 +137,6 @@ module.exports = function(grunt) {
},
files: {
'bootstrap/css': 'bootstrap/dist/css/bootstrap.min.css',
'bootstrap/fonts': 'bootstrap/dist/fonts',
'backgrid/css': 'backgrid/lib/backgrid.css',
'backgrid-filter/css': 'backgrid-filter/backgrid-filter.min.css',
'backgrid-orderable-columns/css': 'backgrid-orderable-columns/backgrid-orderable-columns.css',
......@@ -146,9 +144,37 @@ module.exports = function(grunt) {
'backgrid-sizeable-columns/css': 'backgrid-sizeable-columns/backgrid-sizeable-columns.css',
'jquery-asBreadcrumbs/css': 'jquery-asBreadcrumbs/css/asBreadcrumbs.css',
'select2/css': 'select2/dist/css/select2.min.css',
'backgrid-select-all': 'backgrid-select-all/backgrid-select-all.min.css'
'backgrid-select-all': 'backgrid-select-all/backgrid-select-all.min.css',
'font-awesome/css': 'font-awesome/css/font-awesome.min.css',
'font-awesome/fonts': 'font-awesome/fonts'
}
},
license: {
options: {
destPrefix: libPath
},
files: {
'jquery': 'jquery/LICENSE.txt',
'requirejs-text': 'requirejs-text/LICENSE',
'underscore': 'underscore/LICENSE',
'bootstrap': 'bootstrap/LICENSE',
'backbone-babysitter': 'backbone.babysitter/LICENSE.md',
'backbone-marionette': 'backbone.marionette/license.txt',
'backbone-paginator': 'backbone.paginator/LICENSE-MIT',
'backbone-wreqr': 'backbone.wreqr/LICENSE.md',
'backgrid': 'backgrid/LICENSE-MIT',
'backgrid-filter': 'backgrid-filter/LICENSE-MIT',
'backgrid-orderable-columns': 'backgrid-orderable-columns/LICENSE-MIT',
'backgrid-paginator': 'backgrid-paginator/LICENSE-MIT',
'backgrid-sizeable-columns': 'backgrid-sizeable-columns/LICENSE-MIT',
'jquery-asBreadcrumbs': 'jquery-asBreadcrumbs/LICENSE-GPL',
'd3': 'd3/LICENSE',
'd3/': 'd3-tip/LICENSE',
'noty': 'noty/LICENSE.txt',
'dagre-d3': 'dagre-d3/LICENSE',
'backgrid-select-all': 'backgrid-select-all/LICENSE-MIT'
}
}
},
sass: {
......@@ -194,6 +220,7 @@ module.exports = function(grunt) {
'clean',
'npmcopy:js',
'npmcopy:css',
'npmcopy:license',
'copy:dist',
'sass',
'configureProxies:server',
......@@ -206,6 +233,7 @@ module.exports = function(grunt) {
grunt.registerTask('build', [
'npmcopy:js',
'npmcopy:css',
'npmcopy:license',
'copy:dist',
'sass'
]);
......
......@@ -32,6 +32,7 @@
"d3": "^3.5.16",
"d3-tip": "^0.6.7",
"dagre-d3": "^0.4.17",
"font-awesome": "^4.6.3",
"jquery": "^2.2.2",
"jquery-asBreadcrumbs": "git+https://github.com/amazingSurge/jquery-asBreadcrumbs.git",
"jquery-ui": "^1.10.4",
......
/*!
* Start Bootstrap - Simple Sidebar HTML Template (http://startbootstrap.com)
* Code licensed under the Apache License v2.0.
* For details, see http://www.apache.org/licenses/LICENSE-2.0.
* Start Bootstrap - Simple Sidebar (http://startbootstrap.com/)
* Copyright 2013-2016 Start Bootstrap
* Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap/blob/gh-pages/LICENSE)
*/
/* Toggle Styles */
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
/*
* 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.
*/
/* breadcrumb.scss */
.breadcrumb {
......
/*
* 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.
*/
/* business-catlog.scss */
.main-search {
......
/*
* 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.
*/
/* form.scss */
.form-control {
......
/*
* 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.
*/
/* graph.scss */
/* .graph-bg svg {
background-image: linear-gradient(to right, $black -10px, rgba(0, 0, 0, 0) 1px), linear-gradient($black -10px, $color_cararra_approx 1px);
background-size: 10px 10px;
......
/*
* 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.
*/
/* loader.scss */
.fa-spin-custom {
......
/*
* 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.
*/
/* login.scss */
//colors
......@@ -12,10 +31,12 @@
box-shadow: 4px 3px 8px -2px $gray;
}
}
.close {
padding: 6px;
font-size: 15px;
}
.login-pane {
margin-top: 50px;
margin-top: 35%;
......@@ -61,11 +82,12 @@
transition: all .3s ease;
}
}
button:focus {
outline: none !important;
}
.form-control:focus {
//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: none;
}
/*
* 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.
*/
/* main.scss */
//common color
......
/*
* 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.
*/
/* nav.scss */
.navbar-atlas {
......
/*
* 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.
*/
/* old-style.scss */
//@extend-elements
......
/*
* 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.
*/
/* override.scss */
.tabs li.tab.active {
......
/*
* 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.
*/
/* panel.scss */
.panel {
//Instead of the line below you could use @include border-radius($radius, $vertical-radius)
border-radius: 0;
......
/*
* 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.
*/
//colors
$color_celeste_approx: #1D1F2B;
.switch {
......@@ -67,6 +85,7 @@ input {
.advanceSearchTermInput {
margin-bottom: 20px;
}
.clearAdvanceSearch {
display: inline-block;
float: left;
......
/*
* 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.
*/
/* tab.scss */
.atlast-tabbable {
margin: 50px 0;
.nav-tabs {
......
/*
* 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.
*/
//tag.scss
.tag-tree {
padding: 0;
......
/*
* 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.
*/
/* theme.scss */
.user-dropdown {
......
/* tree.scss */
/*
* 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.
*/
.jstree-container-ul {
/* tree.scss */
.jstree-container-ul {
padding-left: 0px;
position: relative;
list-style: none;
......@@ -22,9 +41,9 @@
// color: $white;
display: block;
}
}
}
.taxonomyTree {
.taxonomyTree {
padding: 0;
position: relative;
li {
......@@ -83,9 +102,9 @@
padding: 5px;
}
}
}
}
.termPopoverList {
.termPopoverList {
color: #666;
padding: 0px 5px;
margin-bottom: 0px;
......@@ -93,19 +112,19 @@
color: #666;
padding: 5px;
}
}
}
.termPopover {
.termPopover {
cursor: pointer;
}
}
.termMoveDiv {
.termMoveDiv {
width: 550px;
height: 200px;
margin: 10px;
}
}
.tagPopoverList {
.tagPopoverList {
color: #666;
padding: 0px 5px;
margin-bottom: 0px;
......@@ -113,25 +132,27 @@
color: #666;
padding: 5px;
}
}
}
.toggleArrow {
.toggleArrow {
position: absolute;
left: 0px;
padding: 8px;
cursor: pointer;
}
}
.addTermDiable {
.addTermDiable {
border-color: #FF0000 !important;
}
}
.alertTerm {
.alertTerm {
color: #FF0000 !important;
}
/**Css changes**/
}
.modal-body {
/**Css changes**/
.modal-body {
.add-seperator {
border: none;
}
......@@ -173,4 +194,4 @@
background: none;
}
}
}
}
......@@ -42,7 +42,7 @@
<link rel="stylesheet" href="js/libs/jquery-asBreadcrumbs/css/asBreadcrumbs.css">
<link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400italic,600,600italic,700,700italic' rel='stylesheet' type='text/css'>
<link href="css/bootstrap-sidebar.css" rel="stylesheet">
<link href="css/font-awesome.min.css" rel="stylesheet">
<link href="js/libs/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="css/style.css" rel="stylesheet">
</head>
......
......@@ -97,9 +97,6 @@ require.config({
dagreD3: {
deps: ['d3'],
exports: 'dagreD3'
},
tree: {
deps: ['jquery']
}
},
......@@ -128,7 +125,6 @@ require.config({
'hbs': 'require-handlebars-plugin/js/hbs',
'i18nprecompile': 'require-handlebars-plugin/js/i18nprecompile',
'dagreD3': 'libs/dagre-d3/dagre-d3.min',
'tree': 'libs/jstree/jstree.min',
'select2': 'libs/select2/select2.min',
'backgrid-select-all': 'libs/backgrid-select-all/backgrid-select-all.min'
},
......
/*
/**
* 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
......@@ -9,12 +9,11 @@
*
* 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.
* 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.
*/
......
......@@ -19,13 +19,12 @@
define(['require',
'backbone',
'hbs!tmpl/business_catalog/MoveTermLayoutView_tmpl',
'utils/Utils',
'tree'
'utils/Utils'
], function(require, Backbone, MoveTermLayoutViewTmpl, Utils) {
'use strict';
var MoveTermLayoutView = Backbone.Marionette.LayoutView.extend(
/** @lends BusinessCatalogLayoutView */
/** @lends MoveTermLayoutView */
{
_viewName: 'MoveTermLayoutView',
......@@ -42,34 +41,14 @@ define(['require',
return events;
},
/**
* intialize a new BusinessCatalogLayoutView Layout
* intialize a new MoveTermLayoutView Layout
* @constructs
*/
initialize: function(options) {
_.extend(this, _.pick(options, 'taxanomyCollection'));
// $('#using_json_2').jstree({
// });
},
bindEvents: function() {},
onRender: function() {
this.taxanomyCollectionList();
},
taxanomyCollectionList: function() {
// var data = [];
// _.each(this.taxanomyCollection.models, function(val, obj) {
// var obj = {};
// obj['text'] = val.get('name');
// //obj['a_attr'] = { 'href': '#!/detailPage/' + val.get('$id$').id }
// obj['children'] = [];
// data.push(obj)
// });
// this.$('#tree').jstree({
// 'core': {
// 'data': data
// }
// });
}
onRender: function() {}
});
return MoveTermLayoutView;
});
......@@ -21,8 +21,7 @@ define(['require',
'hbs!tmpl/search/SearchLayoutView_tmpl',
'collection/VSearchList',
'utils/Utils',
'collection/VTagList',
'tree',
'collection/VTagList'
], function(require, Backbone, SearchLayoutViewTmpl, VSearchList, Utils, VTagList) {
'use strict';
......@@ -42,7 +41,6 @@ define(['require',
searchInput: '[data-id="searchInput"]',
searchType: 'input[name="queryType"]',
advanceSearch: '[data-id="advanceSearch"]',
//advanceSearchContainer: '[data-id="advanceSearchContainer"]',
tagList: '[data-id="tagList"]',
tagListInput: '[data-id="tagListInput"]',
termListInput: '[data-id="termListInput"]',
......@@ -91,18 +89,11 @@ define(['require',
this.listenTo(this.searchCollection, "reset", function(value) {
this.renderTree();
}, this);
// this.listenTo(this.tagCollection, 'reset', function() {
// this.tagsAndTypeGenerator('tagCollection', this.ui.tagListInput, 'listTag', param);
// }, this);
// this.listenTo(this.typeCollection, 'reset', function() {
// this.tagsAndTypeGenerator('typeCollection', this.ui.termListInput, 'listType', param);
// }, this);
},
onRender: function() {
// array of tags which is coming from url
this.ui.searchBtn.attr("disabled", "true");
this.setValues();
this.fetchCollections();
},
manualRender: function(paramObj) {
this.setValues(paramObj);
......@@ -117,18 +108,6 @@ define(['require',
// get only search value and append it to input box
this.ui.searchInput.val(this.value.query);
this.ui.searchBtn.removeAttr("disabled");
/* if (this.value.query.split(" where ").length > 1) {
this.ui.searchInput.val(this.value.query.split(" where ")[0]);
} else if (this.value.query.split(" isa ").length > 1) {
this.ui.searchInput.val(this.value.query.split(" isa ")[0]);
} else {
this.ui.searchInput.val(this.value.query);
}
_.each(this.value.query.split(' isa '), function(val, key) {
if (key > 0) {
arr.push(val.split(" ")[0])
}
});*/
}
if (this.value.dslChecked == "true") {
this.ui.searchType.prop("checked", true).trigger("change");
......@@ -138,23 +117,11 @@ define(['require',
}
this.bindEvents(arr);
},
fetchCollections: function() {
// this.tagCollection.fetch({ reset: true });
// this.typeCollection.fetch({ reset: true });
},
findSearchResult: function() {
this.triggerSearch(this.ui.searchInput.val());
},
triggerSearch: function(value) {
// this.ui.searchType.is(':checked') == true;
// var advancedSearchValue = value;
if (!this.ui.searchType.is(':checked')) {
// if (this.ui.tagListInput.select2('data').length > 1) {
// advancedSearchValue = value + " where " + value + " isa " + this.ui.tagListInput.val().join(" and " + value + " isa ");
// } else {
// advancedSearchValue = value + " isa " + this.ui.tagListInput.val();
// advancedSearchValue = value;
// }
this.type = "dsl";
} else if (!this.ui.searchType.is(':checked')) {
this.type = "fulltext";
......@@ -183,37 +150,11 @@ define(['require',
}
this.searchCollection.fetch({ reset: true });
},
// tagsAndTypeGenerator: function(collection, element, searchString, params) {
// var str = '';
// _.each(this[collection].fullCollection.models, function(model) {
// var tagName = model.get("tags");
// if (searchString) {
// str += '<option data-id="tags">' + tagName + '</option>';
// }
// });
// element.html(str);
// if (searchString == 'listTag') {
// var placeholderText = "Containing tag(S)";
// if (params) {
// element.val(params);
// }
// } else {
// var placeholderText = "Select type";
// }
// element.select2({
// placeholder: placeholderText,
// allowClear: true
// });
// },
dslFulltextToggle: function(e) {
if (e.currentTarget.checked) {
this.type = "dsl";
//this.dslSearch = true;
//this.ui.advanceSearchContainer.hide();
} else {
this.type = "fulltext";
// this.dslSearch = false;
//this.ui.advanceSearchContainer.show();
}
if (this.ui.searchInput.val() !== "") {
Utils.setUrl({
......@@ -235,8 +176,6 @@ define(['require',
},
clearSearchData: function() {
this.ui.searchInput.val("");
//this.ui.tagListInput.select2('val', '');
//this.ui.termListInput.select2('val', '');
this.ui.searchBtn.attr("disabled", "true");
Utils.setUrl({
url: '#!/search',
......
......@@ -1695,11 +1695,9 @@
<exclude>dev-support/**</exclude>
<exclude>**/users-credentials.properties</exclude>
<exclude>**/public/css/animate.min.css</exclude>
<exclude>**/public/css/fonts/**</exclude>
<exclude>**/public/css/font-awesome.min.css</exclude>
<exclude>**/public/css/bootstrap-sidebar.css</exclude>
<exclude>**/public/js/require-handlebars-plugin/**</exclude>
<exclude>**/node_modules/**</exclude>
<exclude>**/public/css/scss/**</exclude>
<!-- All the npm plugins are copied here, so exclude it -->
<exclude>**/public/js/libs/**</exclude>
......
......@@ -35,6 +35,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset
ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags)
ALL CHANGES:
ATLAS-958 Add licenses for dashboard dependencies (kevalbhatt18 via shwethags)
ATLAS-474 Server does not start if the type is updated with same super type class information (dkantor via shwethags)
ATLAS-621 Introduce entity state in Id object (shwethags)
ATLAS-619 Canonicalize hive queries (sumasai)
......
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