From e48dbc9d62e075a53bb74598a4b72313a2b8358f Mon Sep 17 00:00:00 2001 From: Shwetha GS <sshivalingamurthy@hortonworks.com> Date: Mon, 9 Nov 2015 11:08:20 +0530 Subject: [PATCH] ATLAS-293 UI Requires Internet Access For UI Facelift (darshankumar89 via shwethags) --- dashboard/public/index.html | 28 ++++++++++++++-------------- dashboard/public/modules/details/detailsController.js | 2 +- dashboard/public/modules/tags/instance/instanceTagsController.js | 4 ++-- release-log.txt | 1 + 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dashboard/public/index.html b/dashboard/public/index.html index d9b09f9..1b9b22a 100644 --- a/dashboard/public/index.html +++ b/dashboard/public/index.html @@ -27,7 +27,7 @@ <meta http-equiv="Content-type" content="text/html;charset=UTF-8"> - <link href="img/favicon.ico" rel="shortcut icon" type="image/x-icon"> + <link href="/img/favicon.ico" rel="shortcut icon" type="image/x-icon"> <link rel="stylesheet" href="/lib/font-awesome/css/font-awesome.min.css"> <link rel="stylesheet" href="/css/sticky-footer-navbar.css"> @@ -35,7 +35,7 @@ <link rel="stylesheet" href="/css/details.css"> <link rel="stylesheet" href="/css/lineage.css"> <link rel="stylesheet" href="/css/tags.css"> - <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css"> + <link rel="stylesheet" href="/lib/bootstrap/dist/css/bootstrap.css"> </head> @@ -54,20 +54,20 @@ </div> </footer> -<script src="lib/jquery/dist/jquery.js"></script> -<script src="lib/angular/angular.js"></script> -<script src="lib/bootstrap/dist/js/bootstrap.js"></script> -<script src="lib/angular-bootstrap/ui-bootstrap-tpls.js"></script> -<script src="lib/angular-cookies/angular-cookies.js"></script> -<script src="lib/angular-resource/angular-resource.js"></script> -<script src="lib/angular-route/angular-route.js"></script> -<script src="lib/angular-sanitize/angular-sanitize.js"></script> -<script src="lib/angular-ui-router/release/angular-ui-router.js"></script> -<script src="lib/angular-ui-utils/ui-utils.js"></script> -<script src="lib/lodash/lodash.js"></script> +<script src="/lib/jquery/dist/jquery.js"></script> +<script src="/lib/angular/angular.js"></script> +<script src="/lib/bootstrap/dist/js/bootstrap.js"></script> +<script src="/lib/angular-bootstrap/ui-bootstrap-tpls.js"></script> +<script src="/lib/angular-cookies/angular-cookies.js"></script> +<script src="/lib/angular-resource/angular-resource.js"></script> +<script src="/lib/angular-route/angular-route.js"></script> +<script src="/lib/angular-sanitize/angular-sanitize.js"></script> +<script src="/lib/angular-ui-router/release/angular-ui-router.js"></script> +<script src="/lib/angular-ui-utils/ui-utils.js"></script> +<script src="/lib/lodash/lodash.js"></script> <script src="/lib/d3/d3.js"></script> <script src="/lib/d3-tip/index.js"></script> -<script src="js/app.min.js"></script> +<script src="/js/app.min.js"></script> </body> </html> \ No newline at end of file diff --git a/dashboard/public/modules/details/detailsController.js b/dashboard/public/modules/details/detailsController.js index ddd2a11..d56b58e 100644 --- a/dashboard/public/modules/details/detailsController.js +++ b/dashboard/public/modules/details/detailsController.js @@ -30,7 +30,7 @@ angular.module('dgc.details').controller('DetailsController', ['$window', '$scop console.log(data); $scope.schemas = data; $scope.tableName = data.values.name; - $scope.isTable = (typeof data.typeName != 'undefined' && data.typeName.toLowerCase().indexOf('table') != -1) ? true : false; + $scope.isTable = (typeof data.typeName !== 'undefined' && data.typeName.toLowerCase().indexOf('table') !== -1) ? true : false; $scope.onActivate('io'); }); diff --git a/dashboard/public/modules/tags/instance/instanceTagsController.js b/dashboard/public/modules/tags/instance/instanceTagsController.js index 81b8299..d1f3506 100644 --- a/dashboard/public/modules/tags/instance/instanceTagsController.js +++ b/dashboard/public/modules/tags/instance/instanceTagsController.js @@ -51,7 +51,7 @@ angular.module('dgc.tags.instance').controller('InstanceTagController', ['$scope $scope.detachTag = function($event, name) { var r = confirm("Please confirm delete."); - if (r == true) { + if (r === true) { DetailsResource.detachTag({ id: $stateParams.id, tagName: name @@ -59,7 +59,7 @@ angular.module('dgc.tags.instance').controller('InstanceTagController', ['$scope console.log("Detached Tag"); console.log(data); - if (data.requestId != undefined && data.GUID == $stateParams.id && data.traitName == name) { + if (data.requestId !== undefined && data.GUID === $stateParams.id && data.traitName === name) { var curent = $event.currentTarget; curent.parentElement.remove(); $(".popover").remove(); diff --git a/release-log.txt b/release-log.txt index 75494f0..050e455 100644 --- a/release-log.txt +++ b/release-log.txt @@ -9,6 +9,7 @@ ATLAS-54 Rename configs in hive hook (shwethags) ATLAS-3 Mixed Index creation fails with Date types (sumasai via shwethags) ALL CHANGES: +ATLAS-293 UI Requires Internet Access For UI Facelift (darshankumar89 via shwethags) ATLAS-292 The artifactId 'dashboard' should be 'atlas-dashboard' in the webapp/pom.xml (ltfxyz via shwethags) ATLAS-208 Remove "\n" characters in the REST API json response (patel_satya via shwethags) ATLAS-211 UI: UI Facelift(anilsg via sumasai) -- libgit2 0.27.1