From fe5d715785f37db8c5b5c61dd9a9780757e5b23f Mon Sep 17 00:00:00 2001
From: David Quartey <42542676+DavidQuartz@users.noreply.github.com>
Date: Fri, 19 Nov 2021 16:22:06 +0000
Subject: [PATCH] Improve the owner label inside share panel (#604)
---
.../js/components/Permissions/Permissions.jsx | 28 ++++++++-----
.../client/themes/geonode/less/_share.less | 40 ++++++++++++++++++-
2 files changed, 57 insertions(+), 11 deletions(-)
diff --git a/geonode_mapstore_client/client/js/components/Permissions/Permissions.jsx b/geonode_mapstore_client/client/js/components/Permissions/Permissions.jsx
index 435a754e19..4361df0db5 100644
--- a/geonode_mapstore_client/client/js/components/Permissions/Permissions.jsx
+++ b/geonode_mapstore_client/client/js/components/Permissions/Permissions.jsx
@@ -170,15 +170,25 @@ function Permissions({
{filteredEntries
.filter((item) => item.permissions === 'owner' && !item.is_superuser)
.map((item) => {
- return (
- : {' '}
-
- {(item?.first_name !== "" && item?.last_name !== "") ?
- (item?.first_name + ' ' + item?.last_name) :
- item?.username
- }
-
-
);
+ return (
+ );
})}
{permissionsGroups
.map((group) => {
diff --git a/geonode_mapstore_client/client/themes/geonode/less/_share.less b/geonode_mapstore_client/client/themes/geonode/less/_share.less
index b4aec90382..578dd3366b 100644
--- a/geonode_mapstore_client/client/themes/geonode/less/_share.less
+++ b/geonode_mapstore_client/client/themes/geonode/less/_share.less
@@ -6,12 +6,14 @@
.gn-share-panel {
.color-var(@theme-vars[main-color]);
.background-color-var(@theme-vars[main-bg]);
- .gn-share-permissions-list-head {
+ .gn-share-permissions-list-head,
+ .gn-share-permission-tag {
.background-color-var(@theme-vars[main-bg]);
}
}
.gn-share-permissions-head,
- .gn-share-permissions-container {
+ .gn-share-permissions-container,
+ .gn-share-permission-tag {
.border-color-var(@theme-vars[main-border-color]);
}
.gn-share-permissions-pinned {
@@ -157,6 +159,40 @@
}
}
+.gn-share-permissions-label {
+ font-weight: bold;
+ margin: 0;
+}
+
+.gn-share-permissions-owner {
+ min-width: 200px;
+ padding: 0 0.25rem;
+
+
+}
+
+.gn-share-permission-tag {
+ display: flex;
+ align-items: center;
+ max-width: calc(200px - 0.5rem);
+ border-radius: 20px;
+ border-width: 1px;
+ border-style: solid;
+ white-space: nowrap;
+ padding: .25rem;
+}
+
+.gn-share-permission-tag a {
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ margin-left: 0.25rem;
+}
+
+.gn-share-permission-tag .gn-share-permissions-icon img {
+ width: unset;
+}
+
.gn-geo-limits {
position: relative;
width: 300px;