ATLAS-113 Add an About Dialog to Apache Atlas UI with version number. Contributed by Vishal Kadam
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/15ba43c6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/15ba43c6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/15ba43c6 Branch: refs/heads/master Commit: 15ba43c661029534048d47b8e8a0da7250668a17 Parents: 37db995 Author: Venkatesh Seetharam <[email protected]> Authored: Fri Sep 11 15:11:19 2015 -0700 Committer: Venkatesh Seetharam <[email protected]> Committed: Fri Sep 11 15:11:19 2015 -0700 ---------------------------------------------------------------------- dashboard/public/js/app.js | 1 + .../public/modules/about/aboutController.js | 27 ++++++++++++++ dashboard/public/modules/about/aboutModule.js | 21 +++++++++++ dashboard/public/modules/about/aboutResource.js | 23 ++++++++++++ dashboard/public/modules/about/views/about.html | 39 ++++++++++++++++++++ .../public/modules/home/headerController.js | 11 +++++- dashboard/public/modules/home/views/header.html | 1 + release-log.txt | 2 + 8 files changed, 124 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/15ba43c6/dashboard/public/js/app.js ---------------------------------------------------------------------- diff --git a/dashboard/public/js/app.js b/dashboard/public/js/app.js index 1bdb316..9f3bc39 100644 --- a/dashboard/public/js/app.js +++ b/dashboard/public/js/app.js @@ -24,6 +24,7 @@ angular.module('dgc', ['ngCookies', 'ui.router', 'dgc.system', 'dgc.home', + 'dgc.about', 'dgc.search', 'dgc.navigation' ]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/15ba43c6/dashboard/public/modules/about/aboutController.js ---------------------------------------------------------------------- diff --git a/dashboard/public/modules/about/aboutController.js b/dashboard/public/modules/about/aboutController.js new file mode 100644 index 0000000..238b8a7 --- /dev/null +++ b/dashboard/public/modules/about/aboutController.js @@ -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. + */ + +'use strict'; + +angular.module('dgc.about').controller('AboutController', ['$scope', 'AboutResource', function($scope, AboutResource) { + + AboutResource.get(function(data) { + $scope.versionInfo = data; + }); + +}]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/15ba43c6/dashboard/public/modules/about/aboutModule.js ---------------------------------------------------------------------- diff --git a/dashboard/public/modules/about/aboutModule.js b/dashboard/public/modules/about/aboutModule.js new file mode 100644 index 0000000..690994b --- /dev/null +++ b/dashboard/public/modules/about/aboutModule.js @@ -0,0 +1,21 @@ +/* + * 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. + */ + +'use strict'; + +angular.module('dgc.about', []); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/15ba43c6/dashboard/public/modules/about/aboutResource.js ---------------------------------------------------------------------- diff --git a/dashboard/public/modules/about/aboutResource.js b/dashboard/public/modules/about/aboutResource.js new file mode 100644 index 0000000..44d97fa --- /dev/null +++ b/dashboard/public/modules/about/aboutResource.js @@ -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. + */ + +'use strict'; + +angular.module('dgc.about').factory('AboutResource', ['$resource', function($resource) { + return $resource('/api/atlas/admin/version', {}); +}]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/15ba43c6/dashboard/public/modules/about/views/about.html ---------------------------------------------------------------------- diff --git a/dashboard/public/modules/about/views/about.html b/dashboard/public/modules/about/views/about.html new file mode 100644 index 0000000..2915b35 --- /dev/null +++ b/dashboard/public/modules/about/views/about.html @@ -0,0 +1,39 @@ +<!-- + ~ 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="modal-header"> + <h3 class="modal-title title-bold">About</h3> +</div> +<div class="modal-body"> + <div class="row"> + <div class="col-md-4"> + <img src="../img/ApacheAtlasLogo.png" class="img-responsive"> + </div> + <div class="col-md-8"> + <h2 class="title-bold">Apache Atlas</h2> + <p><b>Version : </b> {{versionInfo.Version}}</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> +<div class="modal-footer"> + <button class="btn btn-success" ng-click="$dismiss()">OK</button> +</div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/15ba43c6/dashboard/public/modules/home/headerController.js ---------------------------------------------------------------------- diff --git a/dashboard/public/modules/home/headerController.js b/dashboard/public/modules/home/headerController.js index a8d1411..43bedb8 100644 --- a/dashboard/public/modules/home/headerController.js +++ b/dashboard/public/modules/home/headerController.js @@ -18,7 +18,7 @@ 'use strict'; -angular.module('dgc.home').controller('HeaderController', ['$scope', function($scope) { +angular.module('dgc.home').controller('HeaderController', ['$scope', '$modal', function($scope, $modal) { $scope.menu = []; @@ -26,4 +26,13 @@ angular.module('dgc.home').controller('HeaderController', ['$scope', function($s $scope.isLoggedIn = function() { return true; }; + + $scope.ShowAbout = function() { + $modal.open({ + animation: true, + templateUrl: '/modules/about/views/about.html', + controller: 'AboutController', + size: 'lg' + }); + }; }]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/15ba43c6/dashboard/public/modules/home/views/header.html ---------------------------------------------------------------------- diff --git a/dashboard/public/modules/home/views/header.html b/dashboard/public/modules/home/views/header.html index 85c5f4d..8d3ad18 100644 --- a/dashboard/public/modules/home/views/header.html +++ b/dashboard/public/modules/home/views/header.html @@ -32,5 +32,6 @@ <a data-ui-sref="{{item.state}}">{{item.title}}</a> </li> </ul> + <a ng-if="!username" class="pull-right" href="javascript:void(0)" ng-click="ShowAbout()">About</a> </nav> </div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/15ba43c6/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 26512ac..47a19da 100644 --- a/release-log.txt +++ b/release-log.txt @@ -8,6 +8,8 @@ ATLAS-54 Rename configs in hive hook (shwethags) ATLAS-3 Mixed Index creation fails with Date types (suma.shivaprasad via shwethags) ALL CHANGES: +ATLAS-113 Add an About Dialog to Apache Atlas UI with version number (Vishal Kadam +via Venkatesh Seetharam) ATLAS-109 Remove v2 Folder (Vishal Kadam via Venkatesh Seetharam) ATLAS-90 Support offline builds (Vishal Kadam via Venkatesh Seetharam) ATLAS-154 Update website for 0.5-incubating release (Venkatesh Seetharam)
