You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by pi...@apache.org on 2021/10/26 06:23:50 UTC
[atlas] branch master updated (fc60a07 -> f08003d)
This is an automated email from the ASF dual-hosted git repository.
pinal pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git.
from fc60a07 ATLAS-4458: Commons logging reference fix.
new 80b3c11 ATLAS-4450:#2: [UI] Misalignment when the logged in user's name is greater than a certain length, fixed
new f08003d ATLAS-4455: UI:#1 (New UI) Dropdown and pop-over menus overlap,fixed
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dashboardv2/public/css/scss/override.scss | 4 ++++
dashboardv3/public/css/scss/override.scss | 4 ++++
dashboardv3/public/js/templates/site/Header.html | 18 ++++--------------
dashboardv3/public/js/utils/Helper.js | 6 +++---
4 files changed, 15 insertions(+), 17 deletions(-)
[atlas] 01/02: ATLAS-4450:#2: [UI] Misalignment when the logged in
user's name is greater than a certain length, fixed
Posted by pi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pinal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 80b3c11d1f8b7deb4e35427635b15c1252fc40c7
Author: prasad pawar <pr...@freestoneinfotech.com>
AuthorDate: Mon Oct 18 19:03:25 2021 +0530
ATLAS-4450:#2: [UI] Misalignment when the logged in user's name is greater than a certain length, fixed
Signed-off-by: Pinal Shah <pi...@freestoneinfotech.com>
---
dashboardv2/public/css/scss/override.scss | 4 ++++
dashboardv3/public/css/scss/override.scss | 4 ++++
dashboardv3/public/js/templates/site/Header.html | 18 ++++--------------
3 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/dashboardv2/public/css/scss/override.scss b/dashboardv2/public/css/scss/override.scss
index 549ae3b..07b522e 100644
--- a/dashboardv2/public/css/scss/override.scss
+++ b/dashboardv2/public/css/scss/override.scss
@@ -581,4 +581,8 @@ div.columnmanager-dropdown-container {
.modal-content {
border-radius: 0px !important;
}
+}
+
+.user-circle {
+ display: inline;
}
\ No newline at end of file
diff --git a/dashboardv3/public/css/scss/override.scss b/dashboardv3/public/css/scss/override.scss
index 0960f43..439bd1b 100644
--- a/dashboardv3/public/css/scss/override.scss
+++ b/dashboardv3/public/css/scss/override.scss
@@ -594,4 +594,8 @@ div.columnmanager-dropdown-container {
margin: 0px !important;
font-size: 15px;
}
+}
+
+.user-circle {
+ display: inline;
}
\ No newline at end of file
diff --git a/dashboardv3/public/js/templates/site/Header.html b/dashboardv3/public/js/templates/site/Header.html
index a8ff7f9..afbbbf0 100644
--- a/dashboardv3/public/js/templates/site/Header.html
+++ b/dashboardv3/public/js/templates/site/Header.html
@@ -30,17 +30,7 @@
<table class="header-menu">
<tr>
<td><a class="show-stat" href="javascript:void(0);" title="Statistics"><i class="fa fa-bar-chart"></i></a></td>
- <td class="user-dropdown">
- <table data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
- <tr>
- <td style="padding: 0;"><a style="padding-right: 0;" href="javascript:void(0);"><i class="fa fa-user user-circle "></i>
- </a>
- </td>
- <td style="padding-left: 0;">
- <span class="userName"></span>
- </td>
- </tr>
- </table>
+ <td class="user-dropdown"><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><span class="userName"></span></a>
<ul class="dropdown-menu pull-right multi-level" role="menu" aria-labelledby="dropdownMenu">
<li><a href="javascript:void(0)" data-id='administrator'>Administration</a></li>
<li class="dropdown-submenu">
@@ -50,8 +40,8 @@
<li><a target="_blank" href="{{apiDocUrl}}">API Documentation</a></li>
<li class="aboutAtlas"><a href="javascript:void(0)">About</a></li>
{{#if isDebugMetricsEnabled}}
- <li class="show-debug"><a href="javascript:void(0)" data-id="showDebug">Debug</a></li>
- {{/if}}
+ <li class="show-debug"><a href="javascript:void(0)" data-id="showDebug">Debug</a></li>
+ {{/if}}
</ul>
</li>
<li class="divider"></li>
@@ -65,4 +55,4 @@
</tr>
</table>
</header>
-<div id="r_filterBrowserLayoutView"></div>
+<div id="r_filterBrowserLayoutView"></div>
\ No newline at end of file
[atlas] 02/02: ATLAS-4455: UI:#1 (New UI) Dropdown and pop-over
menus overlap, fixed
Posted by pi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pinal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit f08003d136562f47ca93fe5b645cab2e235bb208
Author: prasad pawar <pr...@freestoneinfotech.com>
AuthorDate: Tue Oct 19 13:43:50 2021 +0530
ATLAS-4455: UI:#1 (New UI) Dropdown and pop-over menus overlap,fixed
Signed-off-by: Pinal Shah <pi...@freestoneinfotech.com>
---
dashboardv3/public/js/utils/Helper.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dashboardv3/public/js/utils/Helper.js b/dashboardv3/public/js/utils/Helper.js
index 04d3882..a242098 100644
--- a/dashboardv3/public/js/utils/Helper.js
+++ b/dashboardv3/public/js/utils/Helper.js
@@ -82,8 +82,8 @@ define(['require',
var getPopoverEl = function(e) {
return $(e.target).parent().data("bs.popover") || $(e.target).data("bs.popover") || $(e.target).parents('.popover').length;
}
- $(document).on('click DOMMouseScroll mousewheel', function(e) {
- if (e.originalEvent) {
+ $('body').on('click DOMMouseScroll mousewheel', function(e) {
+ if (e.target) {
// Do action if it is triggered by a human.
//e.isImmediatePropagationStopped();
var isPopOverEl = getPopoverEl(e)
@@ -391,7 +391,7 @@ define(['require',
});
}
//For closing the modal on browsers navigation
- $(window).on('popstate', function(){
+ $(window).on('popstate', function() {
$('body').find('.modal-dialog .close').click();
});
})
\ No newline at end of file