[Rt-commit] rt branch, master, updated. rt-4.1.19-36-g4f133c4

[Alex Vandiver]

The branch, master has been updated
       via  4f133c4bfdd149573a8c8f7302380543e2238312 (commit)
       via  43fdd6e87f7dd5fa7febdf0775b2ae1c781cf8d0 (commit)
      from  2a1738e2069430b170908fec660cdf50e753a81b (commit)

Summary of changes:
 share/html/Elements/AddLinks                       |  7 ----
 share/html/Elements/BulkLinks                      |  6 ---
 share/html/Search/Bulk.html                        |  4 ++
 .../html/Ticket/Elements/{ShowQueue => EditMerge}  | 44 +++++++++++++++-------
 share/html/Ticket/ModifyAll.html                   |  8 +++-
 share/html/Ticket/ModifyLinks.html                 |  7 +++-
 share/static/css/base/ticket.css                   |  1 +
 7 files changed, 48 insertions(+), 29 deletions(-)
 copy share/html/Ticket/Elements/{ShowQueue => EditMerge} (75%)

- Log -----------------------------------------------------------------
commit 4f133c4bfdd149573a8c8f7302380543e2238312
Merge: 2a1738e 43fdd6e
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Aug 26 16:04:48 2013 -0400

    Merge branch '4.2/seperate-merge-box'
    
    Conflicts:
    	share/html/Elements/BulkLinks

diff --cc share/html/Elements/BulkLinks
index 30d3a08,ac87bf0..7fbe9a5
--- a/share/html/Elements/BulkLinks
+++ b/share/html/Elements/BulkLinks
@@@ -120,18 -120,12 +120,12 @@@
  </td>
  <td valign="top">
  <h3><&|/l&>New Links</&></h3>
 -<i><&|/l&>Enter tickets or URIs to link tickets to. Separate multiple entries with spaces.</&>
 -</i><br />
 +<em><&|/l&>Enter Enter tickets or URIs to link to. Separate multiple entries with spaces.</&>
 +</em><br />
  <table>
- % if ($Collection->isa('RT::Tickets') || $ShowMerge ) {
-   <tr>
-     <td class="label"><&|/l&>Merge into</&>:</td>
-     <td class="entry"><input name="<% $record_type %>-MergeInto" value="<% $ARGS{ $record_type .'-MergeInto' } || '' %>" /> <i><&|/l&>(only one ticket)</&></i></td>
-   </tr>
- % }
    <tr>
      <td class="label"><&|/l&>Depends on</&>:</td>
 -    <td class="entry"><input name="Ticket-DependsOn" value="<% $ARGS{'Ticket-DependsOn'} || '' %>" /></td>
 +    <td class="entry"><input name="<% $record_type %>-DependsOn" value="<% $ARGS{ $record_type .'-DependsOn' } || '' %>" /></td>
    </tr>
    <tr>
      <td class="label"><&|/l&>Depended on by</&>:</td>
diff --cc share/html/Search/Bulk.html
index fdc99b0,fab337f..fb4d816
--- a/share/html/Search/Bulk.html
+++ b/share/html/Search/Bulk.html
@@@ -168,9 -203,13 +168,13 @@@ $cfs->LimitToQueue($_) for keys %$seen_
  
  <&|/Widgets/TitleBox, title => loc('Edit Links'), color => "#336633"&>
  <em><&|/l&>Enter tickets or URIs to link tickets to. Separate multiple entries with spaces.</&></em><br />
 -<& /Ticket/Elements/BulkLinks, Tickets => $Tickets, $ARGS{'AddMoreAttach'} ? %ARGS : () &>
 +<& /Elements/BulkLinks, Collection => $Tickets, $ARGS{'AddMoreAttach'} ? %ARGS : () &>
  </&>
  
+ <&| /Widgets/TitleBox, title => loc('Merge'), color => '#336633' &>
+ <& /Ticket/Elements/EditMerge, Tickets => $Tickets, %ARGS &>
+ </&>
+ 
  <& /Elements/Submit, Label => loc('Update') &>
  
  

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