[Rt-commit] rt branch, 5.0-trunk, updated. rt-5.0.1-335-gd2816b2809

[? sunnavy]

The branch, 5.0-trunk has been updated
       via  d2816b280948ded331d7f55f3e0e5846f30238b6 (commit)
       via  126a6ad4b11cb8cf06036abdd40f0c088011f15b (commit)
       via  7408e00931d2b498e9fa8a0f2826d41c40972a65 (commit)
      from  881f360149e85bd06cd159af54ad0ade7a36e185 (commit)

Summary of changes:
 share/html/Ticket/Elements/AddAttachments | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit 7408e00931d2b498e9fa8a0f2826d41c40972a65
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Fri Feb 12 19:28:46 2021 -0600

    Fix AddAttachment inputs for old-attach layout
    
    This commit fixes the old-attach form by fixing the html structure,
    adding bootstrap divs.
    
    Fixes: I#37056

diff --git a/share/html/Ticket/Elements/AddAttachments b/share/html/Ticket/Elements/AddAttachments
index 352ca15ec3..f91e455602 100644
--- a/share/html/Ticket/Elements/AddAttachments
+++ b/share/html/Ticket/Elements/AddAttachments
@@ -162,11 +162,18 @@ jQuery( function() {
 });
 </script>
         <div class="hidden old-attach">
-          <div class="custom-file">
-            <input type="file" id="Attach" name="Attach" class="custom-file-input" />
-            <label class="custom-file-label" for="Attach">
-              <input type="submit" class="button" name="AddMoreAttach" value="<&|/l&>Add More Files</&>" />
-            </label>
+          <div class="form-row">
+            <div class="col-12">
+              <div class="custom-file">
+                <input type="file" id="Attach" name="Attach" class="custom-file-input" />
+                <label class="custom-file-label" for="Attach"></label>
+              </div>
+            </div>
+          </div>
+          <div class="form-row">
+            <div class="col-12">
+              <& /Elements/Submit, Name => "AddMoreAttach", Label => loc('Add More Files') &>
+            </div>
           </div>
         </div>
 </div>

commit 126a6ad4b11cb8cf06036abdd40f0c088011f15b
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Thu Feb 18 17:24:04 2021 -0600

    Add label text to old-attach form for accessiblity

diff --git a/share/html/Ticket/Elements/AddAttachments b/share/html/Ticket/Elements/AddAttachments
index f91e455602..750bd923b4 100644
--- a/share/html/Ticket/Elements/AddAttachments
+++ b/share/html/Ticket/Elements/AddAttachments
@@ -166,7 +166,7 @@ jQuery( function() {
             <div class="col-12">
               <div class="custom-file">
                 <input type="file" id="Attach" name="Attach" class="custom-file-input" />
-                <label class="custom-file-label" for="Attach"></label>
+                <label class="custom-file-label" for="Attach"><&|/l&>Choose file</&></label>
               </div>
             </div>
           </div>

commit d2816b280948ded331d7f55f3e0e5846f30238b6
Merge: 881f360149 126a6ad4b1
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Sat May 29 02:00:37 2021 +0800

    Merge branch '5.0/fix-old-attach-layout' into 5.0-trunk


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