[Rt-commit] rt branch, 5.0-trunk, updated. rt-5.0.0-82-g162eaa300c

[Jim Brandt]

The branch, 5.0-trunk has been updated
       via  162eaa300c8c82c6faa49816ae0683377ffc44b1 (commit)
       via  91b1edfcfcd0e993995703bf02aaf4cc26bd4657 (commit)
      from  dca1c29e4a7a9391870837ee9933ec697f569864 (commit)

Summary of changes:
 share/html/Elements/ShowHistoryHeader | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

- Log -----------------------------------------------------------------
commit 162eaa300c8c82c6faa49816ae0683377ffc44b1
Merge: dca1c29e4a 91b1edfcfc
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Thu Nov 5 10:45:38 2020 -0500

    Merge branch '5.0/remove-empty-dropdown-in-history-header' into 5.0-trunk

diff --cc share/html/Elements/ShowHistoryHeader
index b960d80592,600426a5c0..668f0e7782
--- a/share/html/Elements/ShowHistoryHeader
+++ b/share/html/Elements/ShowHistoryHeader
@@@ -114,16 -114,19 +114,19 @@@ if ( $ShowDisplayModes or $ShowTitle o
                           qq{</a>} );
      }
  
-     # build the new link
-     my $alt = loc('Options');
-     my $titleright = qq{<div class="btn-group dropdown"><a id="history-dropdown" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="fas fa-cog icon-bordered fa-2x" alt="$alt" data-toggle="tooltip" data-placement="top" data-original-title="$alt"></span></a><ul class="dropdown-menu dropdown-menu-right">};
+     my $titleright;
+     if ( @elements ) {
+         # build the new link
 -        my $alt = loc('Edit');
++        my $alt = loc('Options');
+         $titleright = qq{<div class="btn-group dropdown"><a id="history-dropdown" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="fas fa-cog icon-bordered fa-2x" alt="$alt" data-toggle="tooltip" data-placement="top" data-original-title="$alt"></span></a><ul class="dropdown-menu dropdown-menu-right">};
  
-     # foreach of the elements, build a new <li>$element</li> and append to the output.
-     foreach my $element ( @elements ) {
-         $titleright .= qq{<li class="dropdown-item">$element</li>};
-     }
+         # foreach of the elements, build a new <li>$element</li> and append to the output.
+         foreach my $element ( @elements ) {
+             $titleright .= qq{<li class="dropdown-item">$element</li>};
+         }
  
-     $titleright .= q{</ul></div>};
+         $titleright .= q{</ul></div>};
+     }
  
  </%perl>
  % $m->callback( CallbackName => 'BeforeTitle', %ARGS, title => \$title, titleright => \$titleright );

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