You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by yh...@apache.org on 2016/05/19 17:46:01 UTC
[4/5] incubator-atlas git commit: ATLAS-802 New look UI to show
Business Catalog functionalities (kevalbhatt18 via yhemanth)
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/css/style.css
----------------------------------------------------------------------
diff --git a/dashboardv2/public/css/style.css b/dashboardv2/public/css/style.css
deleted file mode 100644
index 40255ad..0000000
--- a/dashboardv2/public/css/style.css
+++ /dev/null
@@ -1,773 +0,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.
- */
-
-html {
- min-height: 100%;
- position: relative;
-}
-
-body {
- font-family: 'PT Sans', sans-serif;
- background-color: #e8ebf1;
- -webkit-font-smoothing: antialiased;
-}
-
-.initialLoading {
- display: block;
- margin: auto;
- margin-top: 18%;
- height: 60px;
-}
-
-
-/* Bootstrap Extended */
-
-.row-margin-bottom {
- margin-bottom: 15px;
-}
-
-.navbar-brand {
- /* font-family: 'Yeseva One', cursive;*/
- font-size: 30px;
- height: auto;
-}
-
-.navbar-toggle .icon-bar {
- background-color: #fff;
-}
-
-.navbar-fixed-top + .wrapper {
- margin-top: 90px;
- padding-bottom: 90px;
-}
-
-.navbar-form {
- width: 30%;
- padding: 0;
-}
-
-.navbar-form .form-control {
- width: 100%;
- padding: 6px 0px;
- background-color: transparent;
- color: #fff;
- border: none;
- box-shadow: 0px 2px #fff;
-}
-
-.form-control {
- border-radius: 0px;
-}
-
-.form-control:focus {
- border-color: #8FA5B1;
- outline: 0;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 2px rgb(143, 165, 177);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 2px rgb(143, 165, 177);
-}
-
-.input-group-btn .glyphicon {
- top: 2px;
-}
-
-.panel {
- border-radius: 0px;
-}
-
-.panel-primary {
- border-color: #698797;
-}
-
-.panel-primary>.panel-heading {
- color: #fff;
- background-color: #698797;
- border-color: #698797;
- border-radius: 0px;
-}
-
-.list-group-item:first-child,
-.list-group-item:last-child {
- border-radius: 0px;
-}
-
-.pagination>.active>a,
-.pagination>.active>a:focus,
-.pagination>.active>a:hover,
-.pagination>.active>span,
-.pagination>.active>span:focus,
-.pagination>.active>span:hover {
- background-color: #1BA9E2;
- border-color: #1BA9E2;
-}
-
-
-/* Bootstrap Buttons */
-
-.btn {
- border-radius: 0px;
-}
-
-.btn-primary {
- color: #fff;
- background-color: #44697d;
- border-color: #44697d
-}
-
-.btn-primary:hover {
- color: #fff;
- background-color: #334f5e;
- border-color: #334f5e;
-}
-
-.btn-success {
- color: #fff;
- background-color: #359F89;
- border-color: #359F89;
-}
-
-.btn-success:hover {
- color: #fff;
- background-color: #359F89;
- border-color: #359F89
-}
-
-.btn-info {
- color: #fff;
- background-color: #3cb5e6;
- border-color: #3cb5e6
-}
-
-.btn-info:hover {
- color: #fff;
- background-color: #339cc7;
- border-color: #339cc7
-}
-
-.btn-warning {
- color: #fff;
- background-color: #f5a700;
- border-color: #f5a700
-}
-
-.btn-warning:hover {
- color: #fff;
- background-color: #de9800;
- border-color: #de9800
-}
-
-.btn-danger {
- color: #fff;
- background-color: #e14f00;
- border-color: #e14f00
-}
-
-.btn-danger:hover {
- color: #fff;
- background-color: #c74600;
- border-color: #c74600
-}
-
-.tabs {
- position: relative;
- height: 42px;
- background-color: #FFF;
- width: 100%;
- white-space: nowrap;
- padding: 0px;
- border-bottom: 1px solid #e9ecf2;
-}
-
-.tabs li.tab {
- display: block;
- float: left;
- text-align: center;
- background-color: #fff;
- line-height: 42px;
- height: 42px;
- padding: 0 20px;
- margin: 0;
- text-transform: uppercase;
- letter-spacing: 0.8px;
- border-bottom: 1px solid #e9ecf2;
-}
-
-.tabs li.tab a {
- color: #ee6e73;
- display: block;
- text-decoration: none;
- width: 100%;
- height: 100%;
- -webkit-transition: color 0.28s ease;
- -moz-transition: color 0.28s ease;
- -o-transition: color 0.28s ease;
- -ms-transition: color 0.28s ease;
- transition: color 0.28s ease;
- color: #9398a0;
-}
-
-.tabs li.tab a:hover {
- color: #26530c;
-}
-
-.tabs li.tab a.active {
- color: #1BA9E2;
-}
-
-.tabs .indicator {
- position: absolute;
- bottom: 0;
- height: 2px;
- background-color: #1BA9E2;
- will-change: left, right;
-}
-
-ul.tabs li.tab {
- padding: 0;
-}
-
-
-/* Atlas Specific */
-
-.navbar-atlas {
- background-color: #323544;
- box-shadow: inset 0 0 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
- -webkit-box-shadow: inset 0 0 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
- -moz-box-shadow: inset 0 0 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
-}
-
-.navbar-atlas .navbar-brand {
- color: #fff;
-}
-
-.navbar-atlas .nav>li>a {
- color: #fff;
- padding-top: 18px;
- padding-bottom: 18px;
- font-size: 100%;
-}
-
-.navbar-atlas .nav>li>a:focus,
-.navbar-atlas .nav>li>a:hover {
- background-color: transparent;
-}
-
-.graph-bg svg {
- background-image: linear-gradient(to right, #000 -10px, rgba(0, 0, 0, 0) 1px), linear-gradient(#000 -10px, #ECECEC 1px);
- background-size: 10px 10px;
- position: relative;
-}
-
-.card {
- background: #FFF none repeat scroll 0% 0%;
- box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.3);
- margin-bottom: 30px;
-}
-
-
-/*create tags*/
-
-.h160 {
- height: 160px !important;
-}
-
-.inputs button.addAttr {
- background-color: #ff8e00;
-}
-
-.inputs button.addAttr,
-.inputs button.saveAttr {
- height: 40px;
- border-radius: 4px;
- border: 1px solid #FFFFFF;
- color: #fff;
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- font-weight: bold;
-}
-
-.inputs input {
- height: 50px;
- border-radius: 0px;
- border: 1px solid #e3e3e3;
- color: #414141;
- box-shadow: none;
-}
-
-.inputs button.remove {
- position: absolute;
- right: 28px;
- bottom: 12px;
- color: #FFFFFF;
- border: 0;
- border-radius: 4px;
- background-color: #a94442;
-}
-
-.inputs .control-label {
- padding: 15px;
- padding-top: 15px !important;
- color: #333;
-}
-
-
-/*About Atlas*/
-
-.subContent {
- width: 580px;
-}
-
-
-/*add tag model*/
-
-.input-spacing {
- padding-bottom: 10px!important;
-}
-
-.modalHeight {
- height: 50px;
-}
-
-.fa-spin-custom,
-.glyphicon-spin {
- -webkit-animation: spin 1000ms infinite linear;
- animation: spin 1000ms infinite linear;
-}
-
-@-webkit-keyframes spin {
- 0% {
- -webkit-transform: rotate(0deg);
- transform: rotate(0deg);
- }
- 100% {
- -webkit-transform: rotate(359deg);
- transform: rotate(359deg);
- }
-}
-
-@keyframes spin {
- 0% {
- -webkit-transform: rotate(0deg);
- transform: rotate(0deg);
- }
- 100% {
- -webkit-transform: rotate(359deg);
- transform: rotate(359deg);
- }
-}
-
-.loader {
- position: absolute;
- top: 0;
- left: 0;
- bottom: 0;
- right: 0;
- text-align: center;
- z-index: 9;
- background: rgba(255, 255, 255, 0.8) url('../img/loading.gif') no-repeat center center;
-}
-
-.fontLoader {
- text-align: center;
- display: none;
-}
-
-.headerDroupDown {
- border-left: 1px solid #FFF;
- font-size: 11px;
- padding-left: 15px;
- margin-left: 15px;
-}
-
-.circle {
- position: absolute;
- top: -3px;
- right: -2px;
- width: 12px;
- height: 12px;
- background: #4A90E2;
- border: 2px solid #323544;
- border-radius: 16px;
-}
-
-.switch {
- float: left;
- margin-top: 4px;
- position: absolute;
- z-index: 99;
- top: 0;
- left: 20px;
- height: 26px;
- width: 120px;
- background: #DADADA;
- border-radius: 3px;
- -webkit-box-shadow: inset 0 1px 3px #545454, 0 1px #FFF;
- box-shadow: inset 0 1px 3px #545454, 0 1px #FFF;
- /* -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.1);
- box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.1);*/
-}
-
-.switch-label {
- position: relative;
- z-index: 2;
- float: left;
- width: 58px;
- line-height: 26px;
- font-size: 11px;
- /*color: rgba(255, 255, 255, 0.35);*/
- text-align: center;
- /*text-shadow: 0 1px 1px rgba(0, 0, 0, 0.45);*/
- cursor: pointer;
-}
-
-.switch-label:active {
- font-weight: bold;
-}
-
-.switch-label-off {
- padding-left: 2px;
-}
-
-.switch-label-on {
- padding-right: 2px;
-}
-
-.switch-input {
- display: none;
-}
-
-.switch-input:checked + .switch-label {
- font-weight: bold;
- color: rgba(0, 0, 0, 0.65);
- text-shadow: 0 1px rgba(255, 255, 255, 0.25);
- -webkit-transition: 0.15s ease-out;
- -moz-transition: 0.15s ease-out;
- -o-transition: 0.15s ease-out;
- transition: 0.15s ease-out;
-}
-
-.switch-input:checked + .switch-label-on ~ .switch-selection {
- /* Note: left: 50% doesn't transition in WebKit */
- left: 60px;
-}
-
-.switch-selection {
- display: block;
- position: absolute;
- z-index: 1;
- top: 2px;
- left: 2px;
- width: 58px;
- height: 22px;
- background: #65bd63;
- border-radius: 3px;
- background-image: linear-gradient(to bottom, #A7CEC6, #359F89);
- background-image: -moz-linear-gradient(top, #A7CEC6, #359F89);
- background-image: -o-linear-gradient(top, #A7CEC6, #359F89);
- background-image: linear-gradient(to bottom, #A7CEC6, #359F89);
- /* background-image: -webkit-linear-gradient(top, #9dd993, #65bd63);
- background-image: -moz-linear-gradient(top, #9dd993, #65bd63);
- background-image: -o-linear-gradient(top, #9dd993, #65bd63);
- background-image: linear-gradient(to bottom, #9dd993, #65bd63);*/
- -webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 0 2px rgba(0, 0, 0, 0.2);
- box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 0 2px rgba(0, 0, 0, 0.2);
- -webkit-transition: left 0.15s ease-out;
- -moz-transition: left 0.15s ease-out;
- -o-transition: left 0.15s ease-out;
- transition: left 0.15s ease-out;
-}
-
-.switch-blue .switch-selection {
- background: #3aa2d0;
- background-image: -webkit-linear-gradient(top, #4fc9ee, #3aa2d0);
- background-image: -moz-linear-gradient(top, #4fc9ee, #3aa2d0);
- background-image: -o-linear-gradient(top, #4fc9ee, #3aa2d0);
- background-image: linear-gradient(to bottom, #4fc9ee, #3aa2d0);
-}
-
-.switch-yellow .switch-selection {
- background: #c4bb61;
- background-image: -webkit-linear-gradient(top, #e0dd94, #c4bb61);
- background-image: -moz-linear-gradient(top, #e0dd94, #c4bb61);
- background-image: -o-linear-gradient(top, #e0dd94, #c4bb61);
- background-image: linear-gradient(to bottom, #e0dd94, #c4bb61);
-}
-
-.scrollTagList {
- height: 330px;
- overflow-y: auto;
- margin-bottom: 0px;
-}
-
-.scrollTagList i.fa {
- margin-right: 5px;
-}
-
-.tagsList .atlast-tabbable {
- margin: 0px 0px;
-}
-
-.tagsList .atlast-tabbable .tab-content {
- padding: 10px 22px;
-}
-
-.tagsList .atlast-tabbable .nav-tabs>li>a {
- padding: 10px 20px;
-}
-
-.appForm .panel-body {
- padding-bottom: 0;
-}
-
-.appForm .panel-footer {
- margin-bottom: 0;
-}
-
-#new > * {
- color: #686868;
-}
-
-.branchListParent .parentActive {
- background: none;
-}
-
-ul[data-id=branchList] .fa,
-.branchListParent .fa {
- line-height: 40px;
-}
-
-ul[data-id=branchList] li {
- padding-left: 50px;
-}
-
-.node {
- cursor: pointer;
-}
-
-.overlay {
- /* background-color: #EEE;*/
-}
-
-.node circle {
- fill: #fff;
- stroke: steelblue;
- stroke-width: 1.5px;
-}
-
-.node text {
- font-size: 10px;
- font-family: sans-serif;
-}
-
-.link {
- fill: none;
- stroke: #ccc;
- stroke-width: 1.5px;
-}
-
-.templink {
- fill: none;
- stroke: red;
- stroke-width: 3px;
-}
-
-.ghostCircle.show {
- display: block;
-}
-
-.ghostCircle,
-.activeDrag .ghostCircle {
- display: none;
-}
-
-.d3-tip {
- line-height: 1;
- font-weight: bold;
- padding: 12px;
- background: rgba(0, 0, 0, 0.8);
- color: #fff;
- border-radius: 2px;
-}
-
-
-/* Creates a small triangle extender for the tooltip */
-
-.d3-tip:after {
- box-sizing: border-box;
- display: inline;
- font-size: 10px;
- width: 100%;
- line-height: 1;
- color: rgba(0, 0, 0, 0.8);
- content: "\25BC";
- position: absolute;
- text-align: center;
-}
-
-
-/* Style northward tooltips differently */
-
-.d3-tip.n:after {
- margin: -1px 0 0 0;
- top: 100%;
- left: 0;
-}
-
-.noTags {
- font-size: 24px;
- font-weight: bold;
- text-align: center;
-}
-
-.addTag-dropdown {
- display: inline-block;
-}
-
-.addTagBase {
- border-radius: 4px;
- padding: 4px 8px;
- border: solid 1px #4a90e2;
- cursor: pointer
-}
-
-.addTagText {
- font-size: 12px;
- font-weight: 600;
- color: #4a90e2;
-}
-
-.addTagPlus {
- font-size: 12px;
- font-weight: 600;
- color: #4a90e2;
-}
-
-.menuItem {
- padding: 10px;
- color: #4a90e2;
- cursor: pointer;
-}
-
-.input-tag {
- display: inline-block;
- padding: 6px 12px;
- background-color: #4a90e2;
- color: #fff;
- font-size: 12px;
- text-transform: uppercase;
- border-radius: 4px;
- margin-right: 3px;
- margin-bottom: 3px;
-}
-
-.tagging {
- display: inline-block;
-}
-
-.input-tag i.fa {
- position: relative;
- right: -5px;
- cursor: pointer;
-}
-
-.crossClearText {
- line-height: 20px !important;
-}
-
-.inputSearchTag {
- max-width: 140px;
-}
-
-.appendList {
- max-height: 200px;
- overflow: auto;
- max-width: 140px;
- overflow-x: hidden;
-}
-
-.dropdown .fa-ellipsis-h {
- position: relative;
- top: 4px;
-}
-
-g.type-TK > rect {
- fill: #00ffd0;
-}
-
-text {
- font-weight: 300;
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serf;
- font-size: 14px;
-}
-
-.node rect {
- stroke: #999;
- fill: #fff;
- stroke-width: 1.5px;
-}
-
-.edgePath path {
- stroke: #000;
- /* stroke-width: 1.5px;*/
-}
-
-.node .label {
- fill: #868686;
-}
-
-.branchChildDiv {
- padding-left: 15px;
-}
-
-.branchListParentInput .form-control {
- border-right: none;
- box-shadow: none;
- border-radius: 4px;
-}
-
-.branchListParentInput .input-group-addon {
- background-color: #fff;
-}
-
-.branchListParentInput {
- padding-bottom: 18px;
- display: list-item;
-}
-
-.backButton {
- display: block;
- width: 35px;
- height: 35px;
- line-height: 46px;
- text-align: center;
- background-color: #323544;
- color: #fff;
- position: fixed;
- left: 5px;
- top: 90px;
- font-size: 11px;
-}
-
-.backButton:hover,
-.backButton:active {
- color: #fff;
-}
-
-.zoomButtonGroup {
- position: absolute;
- top: 4px;
- right: 5px;
-}
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/index.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/index.html b/dashboardv2/public/index.html
index fc7cfd0..31e177f 100644
--- a/dashboardv2/public/index.html
+++ b/dashboardv2/public/index.html
@@ -37,41 +37,28 @@
<link rel="stylesheet" href="js/libs/backgrid-paginator/css/backgrid-paginator.css">
<link rel="stylesheet" href="js/libs/backgrid-orderable-columns/css/backgrid-orderable-columns.css">
<link rel="stylesheet" href="js/libs/backgrid-sizeable-columns/css/backgrid-sizeable-columns.css">
+ <link rel="stylesheet" href="js/libs/select2/css/select2.min.css">
<link rel="stylesheet" href="js/libs/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="js/libs/jquery-asBreadcrumbs/css/asBreadcrumbs.css">
+ <link href='https://fonts.googleapis.com/css?family=Raleway: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="css/style.css" rel="stylesheet">
- <link href="css/business-catlog.css" rel="stylesheet">
- <link href="css/override.css" rel="stylesheet">
</head>
<body>
- <div id="new">
- <div id="wrapper">
- <div id="sidebar-wrapper">
- <div id="sideNav-wrapper"></div>
- </div>
- <div id="page-content-wrapper">
- <header id="new-header" class="clearfix"></header>
- <div id="new-page-wrapper"> </div>
- </div>
+ <div id="wrapper">
+ <div id="sidebar-wrapper" class="sidebar-wrapper">
+ <div id="sideNav-wrapper"></div>
</div>
- </div>
- <div id='old'>
- <!--Header Begin-->
- <header id="header" class="navbar-fixed-top navbar-top navbar-atlas"> </header>
- <!--Header End-->
- <div class="container wrapper">
- <div class="">
- <div id="page-wrapper">
- <div>
- <img class="initialLoading" src="../img/ring.gif">
- </div>
+ <div id="page-content-wrapper" class="page-content-wrapper">
+ <header id="new-header" class="clearfix"></header>
+ <div id="new-page-wrapper">
+ <div>
+ <img class="initialLoading" src="../img/ring.gif">
</div>
</div>
</div>
- <div id="footer"></div>
</div>
<!-- build:js scripts/main.js -->
<script data-main="js/main" src="js/libs/requirejs/require.js"></script>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/collection/BaseCollection.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/collection/BaseCollection.js b/dashboardv2/public/js/collection/BaseCollection.js
index 909288c..0c148ac 100644
--- a/dashboardv2/public/js/collection/BaseCollection.js
+++ b/dashboardv2/public/js/collection/BaseCollection.js
@@ -35,6 +35,26 @@ define(['require',
initialize: function() {},
bindErrorEvents: function() {
this.bind("error", Utils.defaultErrorHandler);
+
+ },
+ bindLoader: function(element) {
+ this.bind('request', function(model, ajaxObj, collectionObj) {
+ this.ajaxStart(collectionObj.$el);
+ }, this);
+ this.bind('sync', function(model, ajaxObj, collectionObj) {
+ this.ajaxComplete(collectionObj.$el);
+ }, this);
+ },
+ ajaxStart: function(element) {
+ //start spinner
+ if (element) {
+ element.prepend("<div class='loading'></div>");
+ }
+ },
+ ajaxComplete: function(element) {
+ if (element) {
+ element.find('loading').remove();
+ }
},
/**
* state required for the PageableCollection
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/collection/VCatalogList.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/collection/VCatalogList.js b/dashboardv2/public/js/collection/VCatalogList.js
new file mode 100644
index 0000000..410a35a
--- /dev/null
+++ b/dashboardv2/public/js/collection/VCatalogList.js
@@ -0,0 +1,65 @@
+/**
+ * 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.
+ */
+
+define(['require',
+ 'utils/Globals',
+ 'collection/BaseCollection',
+ 'models/VCatalog',
+], function(require, Globals, BaseCollection, VCatalog) {
+ 'use strict';
+ var VCatalogList = BaseCollection.extend(
+ //Prototypal attributes
+ {
+ url: Globals.baseURL + '/api/atlas/v1/taxonomies',
+
+ model: VCatalog,
+
+ initialize: function() {
+ this.modelName = 'VCatalog';
+ this.modelAttrName = '';
+ this.bindErrorEvents();
+ this.bindLoader();
+ },
+ fetch: function(options) {
+ //Call Backbone's fetch
+ return Backbone.Collection.prototype.fetch.call(this, options);
+ },
+ parseRecords: function(resp, options) {
+ try {
+ /* var arr = [];
+ arr.push({
+ taxonomies: resp
+ });*/
+ return resp;
+ } catch (e) {
+ console.log(e);
+ }
+ },
+ },
+ //Static Class Members
+ {
+ /**
+ * Table Cols to be passed to Backgrid
+ * UI has to use this as base and extend this.
+ *
+ */
+ tableCols: {}
+ }
+ );
+ return VCatalogList;
+});
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/collection/VLineageList.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/collection/VLineageList.js b/dashboardv2/public/js/collection/VLineageList.js
index 4f37f87..5383b6d 100644
--- a/dashboardv2/public/js/collection/VLineageList.js
+++ b/dashboardv2/public/js/collection/VLineageList.js
@@ -25,7 +25,7 @@ define(['require',
var VLineageList = BaseCollection.extend(
//Prototypal attributes
{
- url: Globals.baseURL + 'api/atlas/lineage/hive/table/assetName/outputs/graph',
+ url: Globals.baseURL + 'api/atlas/lineage/assetName/outputs/graph',
model: VLineage,
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/collection/VSchemaList.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/collection/VSchemaList.js b/dashboardv2/public/js/collection/VSchemaList.js
index a5bf30c..cf22375 100644
--- a/dashboardv2/public/js/collection/VSchemaList.js
+++ b/dashboardv2/public/js/collection/VSchemaList.js
@@ -25,7 +25,7 @@ define(['require',
var VSchemaList = BaseCollection.extend(
//Prototypal attributes
{
- url: Globals.baseURL + '/api/atlas/lineage/hive/table/log_fact_daily_mv/schema',
+ url: Globals.baseURL,
model: VSchema,
initialize: function() {
this.modelName = 'VSchema';
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/main.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/main.js b/dashboardv2/public/js/main.js
index 94d49b7..c615ce9 100644
--- a/dashboardv2/public/js/main.js
+++ b/dashboardv2/public/js/main.js
@@ -94,6 +94,9 @@ require.config({
dagreD3: {
deps: ['d3'],
exports: 'dagreD3'
+ },
+ tree: {
+ deps: ['jquery']
}
},
@@ -121,7 +124,9 @@ require.config({
'json2': 'require-handlebars-plugin/js/json2',
'hbs': 'require-handlebars-plugin/js/hbs',
'i18nprecompile': 'require-handlebars-plugin/js/i18nprecompile',
- 'dagreD3': 'libs/dagre-d3/dagre-d3.min'
+ 'dagreD3': 'libs/dagre-d3/dagre-d3.min',
+ 'tree': 'libs/jstree/jstree.min',
+ 'select2': 'libs/select2/select2.min',
},
/**
@@ -137,7 +142,8 @@ require(['App',
'router/Router',
'utils/Overrides',
'bootstrap',
- 'd3'
+ 'd3',
+ 'select2'
], function(App, Router) {
App.appRouter = new Router();
App.start();
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/models/VCatalog.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/models/VCatalog.js b/dashboardv2/public/js/models/VCatalog.js
new file mode 100644
index 0000000..10ed835
--- /dev/null
+++ b/dashboardv2/public/js/models/VCatalog.js
@@ -0,0 +1,42 @@
+/**
+ * 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.
+ */
+
+define(['require',
+ 'utils/Globals',
+ 'models/BaseModel'
+], function(require, Globals, VBaseModel) {
+ 'use strict';
+ var VCatalog = VBaseModel.extend({
+ urlRoot: Globals.baseURL + '/api/atlas/v1/taxonomies/taxonomy1',
+
+ defaults: {},
+
+ serverSchema: {},
+
+ idAttribute: 'id',
+
+ initialize: function() {
+ this.modelName = 'VCatalog';
+ this.bindErrorEvents();
+ },
+ toString: function() {
+ return this.get('name');
+ },
+ }, {});
+ return VCatalog;
+});
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/models/VSchema.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/models/VSchema.js b/dashboardv2/public/js/models/VSchema.js
index 24462e6..9d781d7 100644
--- a/dashboardv2/public/js/models/VSchema.js
+++ b/dashboardv2/public/js/models/VSchema.js
@@ -22,7 +22,7 @@ define(['require',
], function(require, Globals, VBaseModel) {
'use strict';
var VSchema = VBaseModel.extend({
- urlRoot: Globals.baseURL + '/api/atlas/lineage/log_fact_daily_mv/schema',
+ urlRoot: Globals.baseURL,
defaults: {},
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/modules/atlasLogin.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/modules/atlasLogin.js b/dashboardv2/public/js/modules/atlasLogin.js
new file mode 100644
index 0000000..5ed2fb7
--- /dev/null
+++ b/dashboardv2/public/js/modules/atlasLogin.js
@@ -0,0 +1,129 @@
+/*
+ * 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.
+ */
+
+
+//Define indexOf for IE
+if (!Array.indexOf) {
+ Array.prototype.indexOf = function(obj, start) {
+ for ( var i = (start || 0); i < this.length; i++) {
+ if (this[i] == obj) {
+ return i;
+ }
+ }
+ return -1;
+ };
+}
+
+
+function doLogin() {
+
+ var userName = $('#username').val().trim();
+ var passwd = $('#password').val().trim();
+
+ if (userName === '' || passwd === '') {
+ $('#errorBox').show();
+ $('#signInLoading').hide();
+ $('#signIn').removeAttr('disabled');
+ $('#errorBox .errorMsg').text("The username or password you entered is blank..");
+ return false;
+ }
+
+ var baseUrl = getBaseUrl();
+ if (baseUrl.lastIndexOf('/') != (baseUrl.length - 1)) {
+ if (baseUrl) {
+ baseUrl = baseUrl + '/';
+ } else {
+ baseUrl = '/';
+ }
+ }
+ var url = baseUrl + 'j_spring_security_check';
+
+ $.ajax({
+ data : {
+ j_username : userName,
+ j_password : passwd
+ },
+ url : url,
+ type : 'POST',
+ headers : {
+ "cache-control" : "no-cache"
+ },
+ success : function() {
+ if(location.hash.length > 2)
+ window.location.replace('index.html'+location.hash);
+ else
+ window.location.replace('index.html');
+ },
+ error : function(jqXHR, textStatus, err ) {
+ $('#signIn').removeAttr('disabled');
+ $('#signInLoading').css("visibility", "hidden");
+
+ if(jqXHR.status && jqXHR.status == 412){
+ $('#errorBox').hide();
+ $('#errorBoxUnsynced').show();
+ } else {
+ var resp = JSON.parse(jqXHR.responseText);
+
+ if(resp.msgDesc.startsWith("Username not found") || resp.msgDesc.startsWith("Wrong password")){
+ $('#errorBox .errorMsg').text("Invalid User credentials. Please try again.");
+ }else if(resp.msgDesc.startsWith("User role credentials is not set properly")){
+ $('#errorBox .errorMsg').text("User role or credentials is not set properly");
+ }else{
+ $('#errorBox .errorMsg').text("Error while authentication");
+ }
+
+ $('#errorBox').show();
+ $('#errorBoxUnsynced').hide();
+ }
+ }
+ });
+}
+function getBaseUrl(){
+ if(!window.location.origin){
+ window.location.origin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port: '');
+ }
+ return window.location.origin
+ + window.location.pathname.substring(window.location.pathname
+ .indexOf('/', 2) + 1, 0);
+}
+$(function() {
+// register handlers
+ $('#signIn').on('click', function() {
+ $('#signIn').attr('disabled',true);
+ $('#signInLoading').css("visibility", "visible");
+ doLogin();
+ return false;
+ });
+ $('#loginForm').each(function() {
+ $('input').keypress(function(e) {
+ // Enter pressed?
+ if (e.which == 10 || e.which == 13) {
+ doLogin();
+ }
+ });
+ });
+
+ $('#loginForm li[class^=control-group] > input').on('change',function(e){
+ if(e.target.value === ''){
+ $(e.target).parent().addClass('error');
+ }else{
+ $(e.target).parent().removeClass('error');
+ }
+ });
+});
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/router/Router.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/router/Router.js b/dashboardv2/public/js/router/Router.js
index d5a2709..b6a2edf 100644
--- a/dashboardv2/public/js/router/Router.js
+++ b/dashboardv2/public/js/router/Router.js
@@ -27,11 +27,18 @@ define([
var AppRouter = Backbone.Router.extend({
routes: {
// Define some URL routes
- '': 'assetPageLoad',
- '!/': 'assetPageLoad',
- "!/dashboard/assetPage": 'assetPageLoad',
- '!/dashboard/detailPage/:id': 'detailPageLoad',
- '!/dashboard/createTags': 'tagPageLoad',
+ '': 'commonAction',
+ '!/': 'tagAttributePageLoad',
+ '!/tag/tagAttribute/(*name)': 'tagAttributePageLoad',
+ '!/taxonomy/detailCatalog/(*url)': 'detailCatalog',
+ '!/search/searchResult': 'searchResult',
+ '!/detailPage/:id': 'detailPage',
+ '!/detailPage/:id': 'detailPage',
+ '!/detailPage/:id': 'detailPage',
+
+ '!/tag': 'commonAction',
+ '!/taxonomy': 'commonAction',
+ '!/search': 'commonAction',
// Default
'*actions': 'defaultAction'
},
@@ -62,10 +69,11 @@ define([
});
var view = new aboutAtlas();
var modal = new Modal({
- title: 'About',
+ title: 'Apache Atlas',
content: view,
okCloses: true,
showFooter: true,
+ allowCancel: false,
}).open();
view.on('closeModal', function() {
@@ -95,75 +103,148 @@ define([
// console.log("Post-Route Change Operations can be performed here !!");
// console.log("Route changed: ", name);
},
- /**
- * Define route handlers here
- */
- assetPageLoad: function() {
+ detailCatalog: function(url) {
var that = this;
- $('#old').show();
- $('#new').hide();
require([
- 'views/asset/AssetPageLayoutView',
- 'collection/VSearchList',
- 'views/site/Header',
- /*'views/site/footer',*/
- ], function(AssetPageLayoutView, VSearchList, HeaderView /*, FooterView*/ ) {
- that.searchCollection = new VSearchList([], {
- state: {
- firstPage: 0,
- pageSize: 10
+ 'views/business_catalog/BusinessCatalogHeader',
+ 'views/business_catalog/BusinessCatalogDetailLayoutView',
+ 'views/business_catalog/SideNavLayoutView',
+ 'collection/VCatalogList'
+ ], function(BusinessCatalogHeader, BusinessCatalogDetailLayoutView, SideNavLayoutView, VCatalogList) {
+ this.collection = new VCatalogList();
+ this.collection.url = url;
+ App.rNHeader.show(new BusinessCatalogHeader({ 'globalVent': that.globalVent, 'url': url, 'collection': this.collection }));
+ // App.rSideNav.show(new SideNavLayoutView({ 'globalVent': that.globalVent, 'url': url }));
+ if (!App.rSideNav.currentView) {
+ App.rSideNav.show(new SideNavLayoutView({ 'globalVent': that.globalVent, 'url': url }));
+ } else {
+ var view = App.rSideNav.currentView.RBusinessCatalogLayoutView.currentView;
+ if (view.dblClick == false && view.singleClick == false && !Globals.saveApplicationState.tabState.stateChanged) {
+ App.rSideNav.currentView.RBusinessCatalogLayoutView.currentView.manualRender(url,true);
+ view.dblClick == false;
+
+ }/* else if (view.firstManualClick) {
+ view.firstManualClick = false;
+ App.rSideNav.currentView.RBusinessCatalogLayoutView.currentView.manualRender(url);
+ }*/ else if (view.singleClick) {
+ view.singleClick = false;
}
- });
- App.rHeader.show(new HeaderView({ 'globalVent': that.globalVent }));
- App.rContent.show(new AssetPageLayoutView({
+ App.rSideNav.currentView.selectTab();
+ }
+ if (Globals.saveApplicationState.tabState.stateChanged) {
+ Globals.saveApplicationState.tabState.stateChanged = false;
+ }
+ App.rNContent.show(new BusinessCatalogDetailLayoutView({
'globalVent': that.globalVent,
- 'collection': that.searchCollection,
- 'vent': that.tagVent
+ 'url': url,
+ 'collection': this.collection
}));
+ this.collection.fetch({ reset: true });
});
},
- detailPageLoad: function(id) {
+ detailPage: function(id) {
var that = this;
- $('#old').show();
- $('#new').hide();
if (id) {
require([
- 'views/detail_page/DetailPageLayoutView',
- 'collection/VEntityList',
'views/site/Header',
- ], function(DetailPageLayoutView, VEntityList, HeaderView) {
+ 'views/detail_page/DetailPageLayoutView',
+ 'views/business_catalog/SideNavLayoutView',
+ 'collection/VEntityList'
+ ], function(Header, DetailPageLayoutView, SideNavLayoutView, VEntityList) {
this.entityCollection = new VEntityList([], {});
- App.rHeader.show(new HeaderView({ 'globalVent': that.globalVent }));
- App.rContent.show(new DetailPageLayoutView({
+ App.rNHeader.show(new Header({ 'globalVent': that.globalVent }));
+ if (!App.rSideNav.currentView) {
+ App.rSideNav.show(new SideNavLayoutView({ 'globalVent': that.globalVent }));
+ } else {
+ App.rSideNav.currentView.selectTab();
+ }
+
+ App.rNContent.show(new DetailPageLayoutView({
'globalVent': that.globalVent,
- 'collection': entityCollection,
+ 'collection': this.entityCollection,
'id': id,
- 'vent': that.tagVent
}));
- entityCollection.url = "/api/atlas/entities/" + id;
- entityCollection.fetch({ reset: true });
+ this.entityCollection.url = "/api/atlas/entities/" + id;
+ this.entityCollection.fetch({ reset: true });
});
}
},
- tagPageLoad: function() {
+ tagAttributePageLoad: function(tagName) {
var that = this;
- $('#old').show();
- $('#new').hide();
require([
- 'views/tag/createTagsLayoutView',
- 'collection/VTagList',
'views/site/Header',
- ], function(CreateTagsLayoutView, VTagList, HeaderView) {
- this.tagsCollection = new VTagList([], {});
- App.rHeader.show(new HeaderView({ 'globalVent': that.globalVent }));
- App.rContent.show(new CreateTagsLayoutView({
+ 'views/business_catalog/BusinessCatalogLayoutView',
+ 'views/business_catalog/SideNavLayoutView',
+ 'views/tag/TagDetailLayoutView',
+ ], function(Header, BusinessCatalogLayoutView, SideNavLayoutView, TagDetailLayoutView) {
+ App.rNHeader.show(new Header({ 'globalVent': that.globalVent, 'vent': that.catalogVent }));
+ if (!App.rSideNav.currentView) {
+ App.rSideNav.show(new SideNavLayoutView({
+ 'globalVent': that.globalVent,
+ 'tag': tagName
+ }));
+ } else {
+ App.rSideNav.currentView.RTagLayoutView.currentView.manualRender(tagName);
+ App.rSideNav.currentView.selectTab();
+ }
+
+ if (tagName) {
+ App.rNContent.show(new TagDetailLayoutView({
+ 'globalVent': that.globalVent,
+ 'tag': tagName
+ }));
+ }
+ });
+ },
+ commonAction: function() {
+ var that = this;
+ require([
+ 'views/site/Header',
+ 'views/business_catalog/BusinessCatalogLayoutView',
+ 'views/business_catalog/SideNavLayoutView',
+ ], function(Header, BusinessCatalogLayoutView, SideNavLayoutView) {
+ App.rNHeader.show(new Header({ 'globalVent': that.globalVent }));
+ if (!App.rSideNav.currentView) {
+ App.rSideNav.show(new SideNavLayoutView({
+ 'globalVent': that.globalVent
+ }));
+ } else {
+ App.rSideNav.currentView.selectTab();
+ if (Utils.getUrlState.isTagTab()) {
+ App.rSideNav.currentView.RTagLayoutView.currentView.manualRender();
+ } else if (Utils.getUrlState.isTaxonomyTab()) {
+ App.rSideNav.currentView.RBusinessCatalogLayoutView.currentView.manualRender(undefined,true);
+ }
+ }
+ App.rNContent.$el.html('');
+ App.rNContent.destroy();
+ });
+ },
+ searchResult: function() {
+ var that = this;
+ require([
+ 'views/site/Header',
+ 'views/business_catalog/BusinessCatalogLayoutView',
+ 'views/business_catalog/SideNavLayoutView',
+ 'views/search/SearchDetailLayoutView'
+ ], function(Header, BusinessCatalogLayoutView, SideNavLayoutView, SearchDetailLayoutView) {
+ var paramObj = Utils.getUrlState.getQueryParams();
+ App.rNHeader.show(new Header({ 'globalVent': that.globalVent, 'vent': that.catalogVent }));
+ if (!App.rSideNav.currentView) {
+ App.rSideNav.show(new SideNavLayoutView({
+ 'globalVent': that.globalVent,
+ 'value': paramObj
+ }));
+ } else {
+ App.rSideNav.currentView.RSearchLayoutView.currentView.manualRender(paramObj);
+ }
+ App.rSideNav.currentView.selectTab();
+ App.rNContent.show(new SearchDetailLayoutView({
'globalVent': that.globalVent,
- 'tagsCollection': tagsCollection,
+ 'value': paramObj
}));
-
});
},
-
defaultAction: function(actions) {
// We have no matching route, lets just log what the URL was
console.log('No route:', actions);
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/templates/asset/AssetPageLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/asset/AssetPageLayoutView_tmpl.html b/dashboardv2/public/js/templates/asset/AssetPageLayoutView_tmpl.html
deleted file mode 100644
index 7a290d9..0000000
--- a/dashboardv2/public/js/templates/asset/AssetPageLayoutView_tmpl.html
+++ /dev/null
@@ -1,32 +0,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.
--->
-<div class="row">
- <div class="col-sm-3">
- <div id="r_tagLayoutView"></div>
- </div>
- <div class="col-sm-9">
- <div class="panel panel-default">
- <div class="panel-body">
- <div id="r_searchLayoutView"></div>
- <div class="fontLoader">
- <i class="fa fa-refresh fa-spin-custom"></i>
- </div>
- <div id="r_entityTableLayoutView" class="entityTable"></div>
- </div>
- </div>
- </div>
-</div>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/templates/audit/AuditTableLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/audit/AuditTableLayoutView_tmpl.html b/dashboardv2/public/js/templates/audit/AuditTableLayoutView_tmpl.html
new file mode 100644
index 0000000..fca11a5
--- /dev/null
+++ b/dashboardv2/public/js/templates/audit/AuditTableLayoutView_tmpl.html
@@ -0,0 +1,17 @@
+<!--
+ * 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.
+-->
+<div id="r_auditTableLayoutView"></div>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/templates/audit/CreateAuditTableLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/audit/CreateAuditTableLayoutView_tmpl.html b/dashboardv2/public/js/templates/audit/CreateAuditTableLayoutView_tmpl.html
new file mode 100644
index 0000000..e193435
--- /dev/null
+++ b/dashboardv2/public/js/templates/audit/CreateAuditTableLayoutView_tmpl.html
@@ -0,0 +1,26 @@
+<!--
+ * 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.
+-->
+<table class="table table-bordered table-striped">
+ <thead>
+ <tr>
+ <th>Key</th>
+ <th>Value</th>
+ </tr>
+ </thead>
+ <tbody data-id="auditValue">
+ </tbody>
+</table>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/templates/business_catalog/AddTermView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/business_catalog/AddTermView_tmpl.html b/dashboardv2/public/js/templates/business_catalog/AddTermView_tmpl.html
new file mode 100644
index 0000000..ddb7eac
--- /dev/null
+++ b/dashboardv2/public/js/templates/business_catalog/AddTermView_tmpl.html
@@ -0,0 +1,25 @@
+<!--
+ * 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 name="tagDefinitionform" class="css-form">
+ <!-- <h4 style="margin-bottom:30px">Add Term</h4> -->
+ <div class="form-group">
+ <input class="form-control" data-id="termName" placeholder="Add subterm">
+ </div>
+ <div class="form-group">
+ <textarea class="form-control" data-id="termDetail" placeholder="Description"></textarea>
+ </div>
+</form>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/templates/business_catalog/BusinessCatalogDetailLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/business_catalog/BusinessCatalogDetailLayoutView_tmpl.html b/dashboardv2/public/js/templates/business_catalog/BusinessCatalogDetailLayoutView_tmpl.html
new file mode 100644
index 0000000..50addf6
--- /dev/null
+++ b/dashboardv2/public/js/templates/business_catalog/BusinessCatalogDetailLayoutView_tmpl.html
@@ -0,0 +1,75 @@
+<!--
+ * 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.
+-->
+<div class="fontLoader">
+ <i class="fa fa-refresh fa-spin-custom"></i>
+</div>
+<div class="hide">
+ <div class="page-title clearfix">
+ <h1><span data-id="title"></span><!-- <button style="display:none" data-id="editButton" class="btn btn-default pull-right editbutton" id="editText"><i class="fa fa-pencil"></i></button> --></h1>
+ <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>
+ <div class="clearfix" align="right">
+ <button class="btn-atlas" data-id="cancelButton">Cancel</button>
+ <button class="btn-atlas" data-id="publishButton">Publish</button>
+ </div>
+ </div>
+ </div>
+ <div class="container-fluid gray-bg">
+ <div class="row">
+ <div class="col-sm-10 col-sm-offset-1">
+ <div class="atlast-tabbable">
+ <ul class="nav nav-tabs" role="tablist">
+ <li role="presentation" class="tab active"><a href="#tab-details" aria-controls="tab-details" role="tab" data-toggle="tab">Properties</a></li>
+ <!-- <li role="presentation"><a href="#profile" aria-controls="profile" role="tab" data-toggle="tab">Acceptable Use</a></li> -->
+ </ul>
+ <div class="tab-content">
+ <div id="tab-details" role="tabpanel" class="tab-pane active">
+ <p data-id="createDate"></p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-10 col-sm-offset-1">
+ <div class="atlast-tabbable">
+ <div class="panel panel-default lineageLayout" style="display:none">
+ <div id="r_lineageLayoutView"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- <div class="row">
+ <div class="col-sm-10 col-sm-offset-1">
+ <h2>Comments</h2>
+ <textarea class="form-control comment-input" rows="5" placeholder="Add a Comment"></textarea>
+ <button class="btn-atlas">Comment</button>
+ <div class="comment-box">
+ <p class="comment">There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable.</p>
+ <p class="author">Micheal Surmac</p>
+ <p class="date">December 16, 2016 11:03:23 AM</p>
+ </div>
+ <div class="comment-box">
+ <p class="comment">Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old.</p>
+ <p class="author">Paula Schmidt</p>
+ <p class="date">May 3, 2015 9:16:12 AM</p>
+ </div>
+ </div>
+</div> -->
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/templates/business_catalog/BusinessCatalogHeader.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/business_catalog/BusinessCatalogHeader.html b/dashboardv2/public/js/templates/business_catalog/BusinessCatalogHeader.html
new file mode 100644
index 0000000..4184e8d
--- /dev/null
+++ b/dashboardv2/public/js/templates/business_catalog/BusinessCatalogHeader.html
@@ -0,0 +1,32 @@
+<!--
+ * 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.
+-->
+
+<ol class="breadcrumb col-md-6">
+</ol>
+<header class="clearfix">
+ <div class="btn-group pull-right">
+ <a href="javascript:void(0);" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="user-dropdown">Hello Micheal <i class="fa fa-user user-circle"></i></a>
+ <ul class="dropdown-menu">
+ <!-- <li><a href="#">Edit Profile</a></li>
+ <li><a href="#">Change Password</a></li> -->
+ <li class="aboutAtlas"><a href="javascript:void(0)">About</a></li>
+ <li><a target="_blank" href="https://cwiki.apache.org/confluence/display/ATLAS/Atlas+Home">Help</a></li>
+ <li role="separator" class="divider"></li>
+ <li><a href="logout.html">Logout</a></li>
+ </ul>
+ </div>
+</header>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/templates/business_catalog/BusinessCatalogLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/business_catalog/BusinessCatalogLayoutView_tmpl.html b/dashboardv2/public/js/templates/business_catalog/BusinessCatalogLayoutView_tmpl.html
new file mode 100644
index 0000000..ab6e234
--- /dev/null
+++ b/dashboardv2/public/js/templates/business_catalog/BusinessCatalogLayoutView_tmpl.html
@@ -0,0 +1,29 @@
+<!--
+ * 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.
+-->
+<div class="row">
+ <button class="btn btn-taxanomyBack btn-atlas" data-id="backTaxanomy"><i class="fa fa-chevron-left"></i> Back</button>
+</div>
+<div class="">
+ <ul class="taxonomyTree">
+ <div class="contentLoading"></div>
+ <li class="children parent" data-id="Parent"></li>
+ <li class="chileds parentChiled">
+ <ul data-id="chiledList">
+ </ul>
+ </li>
+ </ul>
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/templates/business_catalog/MoveTermLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/business_catalog/MoveTermLayoutView_tmpl.html b/dashboardv2/public/js/templates/business_catalog/MoveTermLayoutView_tmpl.html
new file mode 100644
index 0000000..0f9a066
--- /dev/null
+++ b/dashboardv2/public/js/templates/business_catalog/MoveTermLayoutView_tmpl.html
@@ -0,0 +1,19 @@
+<!--
+ * 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.
+-->
+<div class="form-control termMoveDiv">
+ <div id="tree"></div>
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/templates/business_catalog/SideNavLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/business_catalog/SideNavLayoutView_tmpl.html b/dashboardv2/public/js/templates/business_catalog/SideNavLayoutView_tmpl.html
new file mode 100644
index 0000000..a59fb58
--- /dev/null
+++ b/dashboardv2/public/js/templates/business_catalog/SideNavLayoutView_tmpl.html
@@ -0,0 +1,37 @@
+<!--
+ * 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.
+-->
+<ul class="sidebar-nav">
+ <li class="sidebar-brand">
+ <a href="index.html"><i class="fa fa-globe"></i> Apache Atlas</a>
+ </li>
+ <ul class="tabs" style="width: 100%;" role="tablist">
+ <li role="presentation" class="tab col-sm-4 active"><a href="#tab-tag" aria-controls="tab-tag" data-name="tab-tag" role="tab" data-toggle="tab">Tags</a></li>
+ <li role="presentation" class="tab col-sm-4"><a href="#tab-taxonomy" aria-controls="tab-taxonomy" data-name="tab-taxonomy" role="tab" data-toggle="tab" class="">Taxonomy</a></li>
+ <li role="presentation" class="tab col-sm-4"><a href="#tab-search" aria-controls="tab-search" data-name="tab-search" role="tab" data-toggle="tab" class=""><i class="fa fa-search"></i> Search</a></li>
+ </ul>
+</ul>
+<div class="tab-content">
+ <div role="tabpanel" class="tab-pane active" id="tab-tag">
+ <div id="r_tagLayoutView"></div>
+ </div>
+ <div role="tabpanel" class="tab-pane" id="tab-taxonomy">
+ <div id="r_businessCatalogLayoutView"></div>
+ </div>
+ <div role="tabpanel" class="tab-pane" id="tab-search">
+ <div id="r_searchLayoutView"></div>
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/templates/common/aboutAtlas_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/common/aboutAtlas_tmpl.html b/dashboardv2/public/js/templates/common/aboutAtlas_tmpl.html
index 9839458..08089b1 100644
--- a/dashboardv2/public/js/templates/common/aboutAtlas_tmpl.html
+++ b/dashboardv2/public/js/templates/common/aboutAtlas_tmpl.html
@@ -18,10 +18,10 @@
<div class="col-md-4">
<img src="img/ApacheAtlasLogo.png" class="img-responsive">
<div class="col-md-8 subContent">
- <h2 class="title-bold">Apache Atlas</h2>
<p class="ng-binding"><b>Version : </b> 0.7-incubating-SNAPSHOT-ra2cc01c4342ace7f7a3e3e254d7ede781f990318</p>
<br>
<p class="text-info">Get involved!</p>
<p class="text-info"><a href="http://apache.org/licenses/LICENSE-2.0" target="_blank">Licensed under the Apache License Version 2.0</a></p>
</div>
</div>
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/templates/common/modal.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/common/modal.html b/dashboardv2/public/js/templates/common/modal.html
index c9c545f..806e3dd 100644
--- a/dashboardv2/public/js/templates/common/modal.html
+++ b/dashboardv2/public/js/templates/common/modal.html
@@ -20,21 +20,21 @@
<div class="modal-header">
<a class="close">×</a>
<h4 class="modal-title">
- {{#if titleHtml}}
- {{{tt title}}}
- {{else}}
- {{tt title}}
- {{/if}}
- </h4>
+ {{#if titleHtml}}
+ {{{tt title}}}
+ {{else}}
+ {{tt title}}
+ {{/if}}
+ </h4>
</div>
{{/if}} {{#if contentWithFooter}} {{else}}
<div class="modal-body">{{content}}</div>
{{#if showFooter}}
<div class="modal-footer">
- <button class="btn ok btn-success">{{tt okText}}</button>
{{#if allowCancel}} {{#if cancelText}}
- <button class="btn btn-default cancel">{{tt cancelText}}</button>
+ <button class="btn btn-atlas cancel">{{tt cancelText}}</button>
{{/if}} {{/if}}
+ <button class="btn btn-atlas ok">{{tt okText}}</button>
</div>
{{/if}} {{/if}}
</div>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html b/dashboardv2/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html
index 383bc3e..633d497 100644
--- a/dashboardv2/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html
@@ -14,32 +14,81 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-<div class="col-sm-12">
- <a href="javascript:void(0);" class="backButton" data-id="backButton" title="Back To Result"><i class="fa fa-chevron-left fa-2x"></i></a>
- <div class="panel panel-default lineageLayout" style="display:none">
- <div id="r_lineageLayoutView"></div>
+<div class="page-title clearfix">
+ <div class="row">
+ <a href="javascript:void(0);" class="backButton" data-id="backButton"><i class="fa fa-chevron-left"> Back To Result</i></a>
</div>
- <div class="panel panel-default">
- <div class="panel-body">
- <p class="name"></p>
- <p class="description"></p>
- <hr>
- <ul class="nav nav-tabs" role="tablist">
- <li role="presentation" class="tab active"><a href="#tab-details" aria-controls="tab-details" role="tab" data-toggle="tab">Details</a></li>
- <li role="presentation" class="tab schemaTable" style="display:none"><a href="#tab-schema" aria-controls="tab-schema" role="tab" data-toggle="tab">Schema</a></li>
- <li role="presentation" class="tab "><a href="#tab-tags" aria-controls="tab-tags" role="tab" data-toggle="tab">Tags</a></li>
- </ul>
- <div class="tab-content">
- <div id="tab-details" role="tabpanel" class="tab-pane active">
- <div id="r_entityDetailTableLayoutView"></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>
+ <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>
+ </div>
+ </div>
+ <div data-id="inputTagging">
+ <div class="dropdown addTag-dropdown" data-id="addTagListBtn">
+ <div class=" addTagBase dropdown-toggle" data-id="addTagBtn" data-toggle="dropdown">
+ <div class="addTagText" data-id="addTagtext" style="display: block">ADD TAG <i class="fa fa-plus"></i></div>
+ <div class="addTagPlus" data-id="addTagPlus" style="display: none"><i class="fa fa-plus"></i></div>
+ </div>
+ <!-- <div class="dropdown-menu menuItem" data-id="addTagCollection">
+ <div data-id="searchTag" class="searchTag row-margin-bottom">
+ <input placeholder="Search" type=search class="inputSearchTag form-control"></input>
</div>
- <div id="tab-schema" class="tab-pane">
- <div id="r_schemaTableLayoutView"></div>
+ <div class="appendList" data-id="appendList"></div>
+ </div> -->
+ </div>
+ </div>
+</div>
+<div class="container-fluid gray-bg">
+ <div class="row">
+ <div class="col-sm-10 col-sm-offset-1">
+ <div class="atlast-tabbable">
+ <div class="panel panel-default lineageLayout" style="display:none">
+ <div id="r_lineageLayoutView"></div>
</div>
- <div id="tab-tags" class="tab-pane">
- <div id="r_tagTableLayoutView"></div>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-10 col-sm-offset-1">
+ <div class="atlast-tabbable">
+ <ul class="nav nav-tabs" role="tablist">
+ <li role="presentation" class="tab active"><a href="#tab-details" aria-controls="tab-details" role="tab" data-toggle="tab">Properties</a></li>
+ <!-- <li role="presentation"><a href="#profile" aria-controls="profile" role="tab" data-toggle="tab">Acceptable Use</a></li> -->
+ <li role="presentation"><a href="#tab-tagTable" aria-controls="tab-tagTable" role="tab" data-toggle="tab">Tag Attribute</a></li>
+ <li role="presentation" class="tab schemaTable" style="display:none"><a href="#tab-schema" aria-controls="tab-schema" role="tab" data-toggle="tab">Schema</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-details" role="tabpanel" class="tab-pane active">
+ <div id="r_entityDetailTableLayoutView"></div>
+ </div>
+ <div id="tab-tagTable" role="tabpanel" class="tab-pane">
+ <div id="r_tagTableLayoutView"></div>
+ </div>
+ <div id="tab-schema" role="tabpanel" class="tab-pane">
+ <div id="r_schemaTableLayoutView"></div>
+ </div>
</div>
</div>
</div>
</div>
</div>
+<div>
+ <!-- div class="col-sm-10 col-sm-offset-1">
+ <h2>Comments</h2>
+ <textarea class="form-control comment-input" rows="5" placeholder="Add a Comment"></textarea>
+ <button class="btn-atlas">Comment</button>
+ <div class="comment-box">
+ <p class="comment">There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable.</p>
+ <p class="author">Micheal Surmac</p>
+ <p class="date">December 16, 2016 11:03:23 AM</p>
+ </div>
+ <div class="comment-box">
+ <p class="comment">Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old.</p>
+ <p class="author">Paula Schmidt</p>
+ <p class="date">May 3, 2015 9:16:12 AM</p>
+ </div>
+</div> -->
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html b/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html
index f67c77d..bb16651 100644
--- a/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-<div class="panel-heading">
+<!-- <div class="panel-heading">
<h3 class="panel-title">Lineage</h3>
-</div>
+</div> -->
<div class="fontLoader">
<i class="fa fa-refresh fa-spin-custom"></i>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/templates/search/SearchDetailLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/search/SearchDetailLayoutView_tmpl.html b/dashboardv2/public/js/templates/search/SearchDetailLayoutView_tmpl.html
new file mode 100644
index 0000000..49d4fc6
--- /dev/null
+++ b/dashboardv2/public/js/templates/search/SearchDetailLayoutView_tmpl.html
@@ -0,0 +1,25 @@
+<!--
+ * 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.
+-->
+<div class="container-fluid">
+ <div class="row">
+ <div class="col-sm-10 col-sm-offset-1">
+ <div class="atlast-tabbable">
+ <div id="r_searchResultLayoutView"></div>
+ </div>
+ </div>
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/templates/search/SearchLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/search/SearchLayoutView_tmpl.html b/dashboardv2/public/js/templates/search/SearchLayoutView_tmpl.html
index 70cbf37..c6de3ae 100644
--- a/dashboardv2/public/js/templates/search/SearchLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/search/SearchLayoutView_tmpl.html
@@ -15,19 +15,32 @@
* limitations under the License.
-->
<div class="row row-margin-bottom">
- <div class="col-sm-12">
- <div class="switch" style="float: left;">
- <input type="radio" class="switch-input" name="queryType" value="fulltext" id="fulltext_toggle" checked="">
- <label for="fulltext_toggle" class="switch-label switch-label-off">Text</label>
- <input type="radio" class="switch-input" name="queryType" value="dsl" id="dsl_toggle">
- <label for="dsl_toggle" class="switch-label switch-label-on">DSL</label>
- <span class="switch-selection"></span>
+ <div class="col-sm-12" style="margin:15px 0px;">
+ <div class="row">
+ <div class="col-md-12">
+ <span class="pull-left">Text</span>
+ <label class="switch pull-left">
+ <input type="checkbox" name="queryType" value="text">
+ <div class="slider round"></div>
+ </label>
+ <span class="pull-left">DSL</span>
+ </div>
</div>
- <div class="input-group">
- <input style="padding-left: 132px;" type="text" class="form-control" data-id="searchInput" placeholder="Search using a query string: e.g. sales_fact">
- <span class="input-group-btn">
- <button class="btn btn-success" data-id="searchButton" type="button"><i class="fa fa-search"></i></button>
- </span>
+ </div>
+ <div class="col-sm-12">
+ <div class="form-group">
+ <input type="text" class="form-control" data-id="searchInput" placeholder="Search using a query string: e.g. sales_fact">
</div>
+ <!-- <div data-id="advanceSearchContainer">
+ <div class="form-group">
+ <select type="text" class="col-md-12 form-control tagListSelect" data-id="tagListInput" multiple></select>
+ </div>
+ <div class="form-group">
+ <select type="text" class="col-md-12 form-control" data-id="termListInput" multiple></select>
+ </div>
+ </div> -->
+ <div class="clearAdvanceSearch" data-id="clearSearch">Clear</div>
+ <button class="btn btn-atlas advanceSearchBtn" data-id="searchBtn">Search</button>
</div>
</div>
+<div id="searchResult"></div>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html b/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
new file mode 100644
index 0000000..db827a3
--- /dev/null
+++ b/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
@@ -0,0 +1,22 @@
+<!--
+ * 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.
+-->
+<div class="row">
+ <div class="fontLoader">
+ <i class="fa fa-refresh fa-spin-custom"></i>
+ </div>
+ <div id="r_entityTableLayoutView" class=""></div>
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/templates/site/header.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/site/header.html b/dashboardv2/public/js/templates/site/header.html
index fe3803d..8c22e5a 100644
--- a/dashboardv2/public/js/templates/site/header.html
+++ b/dashboardv2/public/js/templates/site/header.html
@@ -14,40 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-<div class="container">
- <div class="row">
- <div class="navbar-header">
- <ul class="sidebar-nav">
- <li class="sidebar-brand clearfix">
- <a class="pull-left" href="#!/"><i class="fa fa-globe"></i><strong> Atlas</strong></a>
- <div class="dropdown headerDroupDown pull-left">
- <a href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown">
- {{#ifCond urlType "==" "assetPage"}}
- Assets
- {{else}}
- {{#ifCond urlType "==" "createTags"}}
- Tag Definition
- {{else}}
- Asset Details
- {{/ifCond}}
- {{/ifCond}}
- <span class="caret"></span></a>
- <ul class="dropdown-menu">
- {{#ifCond urlType "==" "assetPage"}}
- <li><a href="#!/dashboard/createTags">Tag Definition</a></li>
- {{else}} {{#ifCond urlType "==" "createTags"}}
- <li><a href="#!/dashboard/assetPage">Assets</a></li>
- {{else}}
- <li><a href="#!/dashboard/assetPage">Assets</a></li>
- <li><a href="#!/dashboard/createTags">Tag Definition</a></li>
- {{/ifCond}} {{/ifCond}}
- <li><a target="_blank" href="https://cwiki.apache.org/confluence/display/ATLAS/Atlas+Home">Help</a></li>
- <li class="aboutAtlas"><a href="javascript:void(0)">About</a></li>
- <li><a href="logout.html">Logout</a></li>
- </ul>
- </div>
- </li>
- </ul>
- </div>
+<header class="clearfix">
+ <div class="btn-group pull-right">
+ <a href="javascript:void(0);" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="user-dropdown"><i class="fa fa-user user-circle "></i></a>
+ <ul class="dropdown-menu">
+ <!-- <li><a href="#">Edit Profile</a></li>
+ <li><a href="#">Change Password</a></li> -->
+ <li class="aboutAtlas"><a href="javascript:void(0)">About</a></li>
+ <li><a target="_blank" href="https://cwiki.apache.org/confluence/display/ATLAS/Atlas+Home">Help</a></li>
+ <li role="separator" class="divider"></li>
+ <li><a href="logout.html"> <i class="fa fa-sign-out"></i> Logout</a></li>
+ </ul>
</div>
-</div>
+</header>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/templates/tag/AddTagAttributeView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/tag/AddTagAttributeView_tmpl.html b/dashboardv2/public/js/templates/tag/AddTagAttributeView_tmpl.html
new file mode 100644
index 0000000..9bb10b8
--- /dev/null
+++ b/dashboardv2/public/js/templates/tag/AddTagAttributeView_tmpl.html
@@ -0,0 +1,23 @@
+<!--
+ * 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.
+-->
+<div class="row row-margin-bottom">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <input type="text" class="form-control" name="name" data-id="attributeId" placeholder="Attribute name" required="" value={{name}}>
+ </div>
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/templates/tag/TagAttributeDetailLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/tag/TagAttributeDetailLayoutView_tmpl.html b/dashboardv2/public/js/templates/tag/TagAttributeDetailLayoutView_tmpl.html
new file mode 100644
index 0000000..b444bf6
--- /dev/null
+++ b/dashboardv2/public/js/templates/tag/TagAttributeDetailLayoutView_tmpl.html
@@ -0,0 +1,30 @@
+<!--
+ * 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.
+-->
+<div class="page-title clearfix">
+ <h1><span data-id="title"></span>
+ <!-- <small>8 Asset</small><button data-id="editButton" class="hide btn btn-default pull-right editbutton" data-id="editText"><i class="fa fa-pencil"></i></button>--></h1>
+ <div data-id="showAttribute">
+ </div>
+ <div class="dropdown addTag-dropdown" data-id="addTagListBtn">
+ <div class=" addTagBase dropdown-toggle" data-id="addTagBtn" data-toggle="dropdown">
+ <div class="addTagText" data-id="addTagtext" style="display: block">ADD Attribute <i class="fa fa-plus"></i></div>
+ <div class="addTagPlus" data-id="addTagPlus" style="display: none"><i class="fa fa-plus"></i></div>
+ </div>
+ </div>
+ <div data-id="editBox" style="margin-bottom:10px; display:none">
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/templates/tag/TagDetailLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/tag/TagDetailLayoutView_tmpl.html b/dashboardv2/public/js/templates/tag/TagDetailLayoutView_tmpl.html
new file mode 100644
index 0000000..363ce4c
--- /dev/null
+++ b/dashboardv2/public/js/templates/tag/TagDetailLayoutView_tmpl.html
@@ -0,0 +1,27 @@
+<!--
+ * 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.
+-->
+<div id="r_TagAttributeDetailLayoutView">
+</div>
+<div class="container-fluid gray-bg">
+ <div class="row">
+ <div class="col-sm-10 col-sm-offset-1">
+ <div class="atlast-tabbable">
+ <div id="r_searchResultLayoutView"></div>
+ </div>
+ </div>
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/440bd2ae/dashboardv2/public/js/templates/tag/TagDetailTableLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/tag/TagDetailTableLayoutView_tmpl.html b/dashboardv2/public/js/templates/tag/TagDetailTableLayoutView_tmpl.html
index cbfbeff..a4a0928 100644
--- a/dashboardv2/public/js/templates/tag/TagDetailTableLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/tag/TagDetailTableLayoutView_tmpl.html
@@ -15,7 +15,7 @@
* limitations under the License.
-->
<div>
- <button class="add-tag btn btn-success pull-right" data-id="addTag" style="margin-bottom:10px">Add Tag</button>
+<!-- <button class="add-tag btn btn-success pull-right" data-id="addTag" style="margin-bottom:10px">Add Tag</button> -->
</div>
<table class="table table-bordered table-striped">
<thead>