[Rt-commit] rt branch, 4.6/align-people-in-assets, created. rt-4.4.4-373-g364be485b

[Michel Rodriguez]

The branch, 4.6/align-people-in-assets has been created
        at  364be485b4953d8ec4d1b707611ed2d349986378 (commit)

- Log -----------------------------------------------------------------
commit 429ef24e01d94fee42cb6f4b37aadf9aeb6a8709
Author: michel <michel at bestpractical.com>
Date:   Tue Sep 10 14:44:15 2019 +0200

    Lines up horizontally the value column in the people box (user/group names)

diff --git a/share/html/Asset/Elements/ShowPeople b/share/html/Asset/Elements/ShowPeople
index 3ffd2a931..e86b3eb07 100644
--- a/share/html/Asset/Elements/ShowPeople
+++ b/share/html/Asset/Elements/ShowPeople
@@ -61,10 +61,12 @@ my $CatalogObj = $AssetObj->CatalogObj;
 %      $users->FindAllRows;
 %      my $user = $users->Next;
     <div class="col-md-9 value">
+      <span class="form-control current-value">
       <& /Elements/ShowUser, User => $user, Link => 1 &>
 %     if ( $user->id != RT->Nobody->id ) {
           <& ShowRoleMembers, Group => $AssetObj->RoleGroup($role), Title => 0 &>
 %     }
+      </span>
     </div>
 % } else {
     <div class="user-accordion col-md-9">

commit 364be485b4953d8ec4d1b707611ed2d349986378
Author: michel <michel at bestpractical.com>
Date:   Tue Sep 10 23:04:34 2019 +0200

    Fixes the Assets/People box in the case where extra user info is not displayed

diff --git a/share/html/Asset/Elements/ShowPeople b/share/html/Asset/Elements/ShowPeople
index e86b3eb07..ffe6a758c 100644
--- a/share/html/Asset/Elements/ShowPeople
+++ b/share/html/Asset/Elements/ShowPeople
@@ -56,24 +56,27 @@ my $CatalogObj = $AssetObj->CatalogObj;
     <div class="col-md-3 label">
       <% loc($role) %>:
     </div>
+    <div class="col-md-9 value">
+      <span class="form-control current-value">
 % if ($AssetObj->Role($role)->{Single}) {
 %      my $users = $AssetObj->RoleGroup($role)->UserMembersObj(Recursively => 0);
 %      $users->FindAllRows;
 %      my $user = $users->Next;
-    <div class="col-md-9 value">
-      <span class="form-control current-value">
       <& /Elements/ShowUser, User => $user, Link => 1 &>
 %     if ( $user->id != RT->Nobody->id ) {
           <& ShowRoleMembers, Group => $AssetObj->RoleGroup($role), Title => 0 &>
 %     }
-      </span>
+% } elsif( RT->Config->Get( 'UserAssetExtraInfo') ) {
+    <div class="user-accordion">
+      <& ShowRoleMembers, Group => $AssetObj->RoleGroup($role) &>
+      <& ShowRoleMembers, Group => $CatalogObj->RoleGroup($role), Skip => $AssetObj->RoleGroup($role), Note => loc("(via this asset's catalog)") &>
     </div>
 % } else {
-    <div class="user-accordion col-md-9">
       <& ShowRoleMembers, Group => $AssetObj->RoleGroup($role) &>
       <& ShowRoleMembers, Group => $CatalogObj->RoleGroup($role), Skip => $AssetObj->RoleGroup($role), Note => loc("(via this asset's catalog)") &>
-    </div>
 % }
+    </span>
+    </div>
   </div>
 % }
 
diff --git a/share/static/css/elevator-light/misc.css b/share/static/css/elevator-light/misc.css
index a6e12b26f..2b8340356 100644
--- a/share/static/css/elevator-light/misc.css
+++ b/share/static/css/elevator-light/misc.css
@@ -44,3 +44,11 @@ table.myday td {
     font-size: 0.8em;
     white-space: normal;
 }
+
+div.asset-people h3 {
+    font-size: 100%;
+    line-height: 1.50em;
+    font-weight: 400;
+}
+
+

-----------------------------------------------------------------------