[Rt-commit] rt branch, 4.6/align-merge-box, created. rt-4.4.4-715-g570c847ccb

Michel Rodriguez michel at bestpractical.com
Mon Jan 27 12:12:35 EST 2020


The branch, 4.6/align-merge-box has been created
        at  570c847ccb512755d1ee3306471beba014e02639 (commit)

- Log -----------------------------------------------------------------
commit 570c847ccb512755d1ee3306471beba014e02639
Author: michel <michel at bestpractical.com>
Date:   Wed Jan 22 21:44:32 2020 +0100

    Make widget EditMerge more flexible to align it properly.
    
    Classes for the first and second column can be passed to the
    widget so it can be displayed as full (default) or half width.

diff --git a/share/html/Ticket/Elements/EditMerge b/share/html/Ticket/Elements/EditMerge
index 99290bd9fa..16f9aab51e 100644
--- a/share/html/Ticket/Elements/EditMerge
+++ b/share/html/Ticket/Elements/EditMerge
@@ -51,8 +51,8 @@
 
 <div>
   <div class="form-row">
-    <div class="label col-md-3"><&|/l&>Merge into</&>:</div>
-    <div class="value col-md-9"><input type="text" class="form-control" name="<% $Name %>" value="<% $Default || '' %>" data-autocomplete="Tickets" data-autocomplete-exclude="<% join( ' ', @excludes) || '' %>" /></div>
+    <div class="<% $FirstColumnClasses %>"><&|/l&>Merge into</&>:</div>
+    <div class="<% $SecondColumnClasses %>"><input type="text" class="form-control" name="<% $Name %>" value="<% $Default || '' %>" data-autocomplete="Tickets" data-autocomplete-exclude="<% join( ' ', @excludes) || '' %>" /></div>
   </div>
 </div>
 
@@ -76,4 +76,8 @@ $Ticket => undef
 $Tickets => undef
 $Name => ''
 $Default => ''
+# by default the widget displays full width 
+# alternate values for half-width (aligned with other links): 'label col-md-3', 'value col-md-9'
+$FirstColumnClasses => 'col-md-1'
+$SecondColumnClasses => 'value col-md-11'
 </%ARGS>
diff --git a/share/html/Ticket/Elements/ShowSummary b/share/html/Ticket/Elements/ShowSummary
index 388a6200a7..ef8a6e7897 100644
--- a/share/html/Ticket/Elements/ShowSummary
+++ b/share/html/Ticket/Elements/ShowSummary
@@ -204,7 +204,7 @@ push @extra, (titleright_raw => $links_titleright) if $links_titleright;
                 <& /Elements/EditLinks, Object => $Ticket, TwoColumn => 0 &>
 
                 <h3><&|/l&>Merge</&></h3>
-                <& /Ticket/Elements/EditMerge, Ticket => $Ticket, %ARGS &>
+                <& /Ticket/Elements/EditMerge, Ticket => $Ticket, FirstColumnClasses => 'label col-md-3', SecondColumnClasses => 'value col-md-9', %ARGS &>
 
                 <div class="form-row">
                   <div class="col-md-12 text-right">

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


More information about the rt-commit mailing list