[Rt-commit] rt branch, 4.4-trunk, updated. rt-4.4.0-86-g15c9399

[Shawn Moore]

The branch, 4.4-trunk has been updated
       via  15c9399ff3722998fa31cd81b8eab16dee88a7fd (commit)
       via  ef2beb5f8dc097d0280de9137468fc878417fb05 (commit)
      from  6204e5a7b928eedb77f43a1cc736d2498a343599 (commit)

Summary of changes:
 etc/RT_Config.pm.in            | 10 ++++++++++
 lib/RT/Config.pm               |  9 +++++++++
 share/html/Elements/MessageBox |  6 ++++++
 3 files changed, 25 insertions(+)

- Log -----------------------------------------------------------------
commit ef2beb5f8dc097d0280de9137468fc878417fb05
Author: Rachel Kelly <rachel at bestpractical.com>
Date:   Tue May 3 22:30:34 2016 +0000

    Add signature-above-quote option
    
    Fixes: I#31877

diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index 6852ff2..8fc8982 100644
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -2474,6 +2474,16 @@ minutes.  Note that this only effects entry, not display.
 
 Set($DefaultTimeUnitsToHours, 0);
 
+=item C<$SignatureAboveQuote>
+
+By default RT places the signature at the bottom of the quoted text in
+the message box for ticket replies.  Set this to 1 to place the signature
+above the quoted text.
+
+=cut
+
+Set($SignatureAboveQuote, 0);
+
 =item C<$TimeInICal>
 
 By default, events in the iCal feed on the ticket search page
diff --git a/lib/RT/Config.pm b/lib/RT/Config.pm
index 2aad19c..bbc5694 100644
--- a/lib/RT/Config.pm
+++ b/lib/RT/Config.pm
@@ -321,6 +321,15 @@ our %META;
             Hints       => 'Only for entry, not display', #loc
         },
     },
+    SignatureAboveQuote => {
+        Section         => 'Ticket composition', #loc
+        Overridable     => 1,
+        SortOrder       => 10,
+        Widget          => '/Widgets/Form/Boolean',
+        WidgetArguments => {
+            Description => 'Place signature above quote', #loc
+        },
+    },
     SearchResultsRefreshInterval => {
         Section         => 'General',                       #loc
         Overridable     => 1,
diff --git a/share/html/Elements/MessageBox b/share/html/Elements/MessageBox
index b61f1e7..df858b1 100644
--- a/share/html/Elements/MessageBox
+++ b/share/html/Elements/MessageBox
@@ -48,7 +48,13 @@
 <textarea autocomplete="off" class="messagebox <% $Type eq 'text/html' ? 'richtext' : '' %>" <% $width_attr %>="<% $Width %>" rows="<% $Height %>" <% $wrap_type |n %> name="<% $Name %>" id="<% $Name %>">\
 % $m->comp('/Articles/Elements/IncludeArticle', %ARGS) if $IncludeArticle;
 % $m->callback( %ARGS, SignatureRef => \$signature, DefaultRef => \$Default, MessageRef => $message );
+% if (RT->Config->Get("SignatureAboveQuote", $session{'CurrentUser'})) {
+<% $Default || '' %><% $signature %><% $message %></textarea>
+% }
+% else {
 <% $Default || '' %><% $message %><% $signature %></textarea>
+% }
+
 % $m->callback( %ARGS, CallbackName => 'AfterTextArea' );
 
 % if (!$SuppressAttachmentWarning) {

commit 15c9399ff3722998fa31cd81b8eab16dee88a7fd
Merge: 6204e5a ef2beb5
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Thu May 5 17:02:10 2016 -0400

    Merge branch '4.4/sig-move' into 4.4-trunk


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