Repository: incubator-atlas Updated Branches: refs/heads/master 82b6f727c -> c2c05d673
ATLAS-1823 - UI - Change in base path URL for few api/images to make it relative from path it is accessed. Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/894a91f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/894a91f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/894a91f6 Branch: refs/heads/master Commit: 894a91f6097969073c8356fd6aac6490b6b619d9 Parents: 82b6f72 Author: nixonrodrigues <[email protected]> Authored: Mon May 22 13:43:50 2017 +0530 Committer: nixonrodrigues <[email protected]> Committed: Tue Jun 13 12:04:13 2017 +0530 ---------------------------------------------------------------------- dashboardv2/public/css/scss/main.scss | 2 +- dashboardv2/public/index.html | 2 +- dashboardv2/public/js/utils/UrlLinks.js | 4 ++-- dashboardv2/public/js/views/graph/LineageLayoutView.js | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/894a91f6/dashboardv2/public/css/scss/main.scss ---------------------------------------------------------------------- diff --git a/dashboardv2/public/css/scss/main.scss b/dashboardv2/public/css/scss/main.scss index 4b73577..a608c95 100644 --- a/dashboardv2/public/css/scss/main.scss +++ b/dashboardv2/public/css/scss/main.scss @@ -104,7 +104,7 @@ $color_suva_gray_approx: #868686; $tag_color:#4A90E2; $delete_link:#BB5838; //urls -$url_0: url(../img/loading.gif); +$url_0: url(img/loading.gif); .card { background: $white none repeat scroll 0 0; //Instead of the line below you could use @include box-shadow($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10) http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/894a91f6/dashboardv2/public/index.html ---------------------------------------------------------------------- diff --git a/dashboardv2/public/index.html b/dashboardv2/public/index.html index 72e11fb..5fff304 100644 --- a/dashboardv2/public/index.html +++ b/dashboardv2/public/index.html @@ -63,7 +63,7 @@ <header id="new-header" class="clearfix"></header> <div id="new-page-wrapper"> <div> - <img class="initialLoading" src="../img/ring.gif"> + <img class="initialLoading" src="img/ring.gif"> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/894a91f6/dashboardv2/public/js/utils/UrlLinks.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/utils/UrlLinks.js b/dashboardv2/public/js/utils/UrlLinks.js index 82bd082..c692d8d 100644 --- a/dashboardv2/public/js/utils/UrlLinks.js +++ b/dashboardv2/public/js/utils/UrlLinks.js @@ -20,8 +20,8 @@ define(['require', 'utils/Enums'], function(require, Enums) { 'use strict'; var UrlLinks = { - baseUrl: '/api/atlas', - baseUrlV2: '/api/atlas/v2', + baseUrl: 'api/atlas', + baseUrlV2: 'api/atlas/v2', typedefsUrl: function() { return { defs: this.baseUrlV2 + '/types/typedefs', http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/894a91f6/dashboardv2/public/js/views/graph/LineageLayoutView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/graph/LineageLayoutView.js b/dashboardv2/public/js/views/graph/LineageLayoutView.js index f98672b..46f7117 100644 --- a/dashboardv2/public/js/views/graph/LineageLayoutView.js +++ b/dashboardv2/public/js/views/graph/LineageLayoutView.js @@ -254,19 +254,19 @@ define(['require', if (node) { if (node.isProcess) { if (Enums.entityStateReadOnly[node.status]) { - return '../img/icon-gear-delete.png'; + return 'img/icon-gear-delete.png'; } else if (node.id == that.guid) { - return '../img/icon-gear-active.png'; + return 'img/icon-gear-active.png'; } else { - return '../img/icon-gear.png'; + return 'img/icon-gear.png'; } } else { if (Enums.entityStateReadOnly[node.status]) { - return '../img/icon-table-delete.png'; + return 'img/icon-table-delete.png'; } else if (node.id == that.guid) { - return '../img/icon-table-active.png'; + return 'img/icon-table-active.png'; } else { - return '../img/icon-table.png'; + return 'img/icon-table.png'; } } }
