Enable attachments on inline compose #579

- Extracts the attachents list template to a partial
- Enable attachments on reply, reply all and forward

2 files changed, 4 insertions, 26 deletions

diff --git a/web-ui/app/templates/compose/compose_box.hbs b/web-ui/app/templates/compose/compose_box.hbs
index 06cc099a..78447ec2 100644
--- a/web-ui/app/templates/compose/compose_box.hbs
+++ b/web-ui/app/templates/compose/compose_box.hbs
@@ -19,32 +19,7 @@
     <textarea class="floatlabel" name="body" id="text-box" placeholder="{{t 'Body'}}" tabindex="5">{{body}}</textarea>
 </div>
 
-<div id="attachment-list" class="buttons-group columns">
-    <span class="btn btn-success fileinput-button">
-        <!-- The file input field used as target for the file upload widget -->
-        <input id="fileupload" type="file" name="attachment">
-    </span>
-    <!-- The global progress bar -->
-    <div id="progress" class="progress">
-        <div class="progress-bar progress-bar-success"></div>
-    </div>
-
-    <!-- The container for the uploaded files -->
-    <div class="attachmentsAreaWrap {{#unless attachments}}hide{{/unless}}">
-        <div class="attachmentsArea column large-12">
-            <ul id="attachment-list-item">
-                {{#each attachments }}
-                    <li>
-                        <a href="/attachment/{{ this.ident }}?encoding={{ this.encoding }}&filename={{ this.name }}">{{ this.name }} <span class="attachment-size">({{ formatSize this.size}})</span>
-                            <i class="fa fa-arrow-down download-icon"></i></a>
-                    </li>
-                {{/each }}
-            </ul>
-        </div>
-    </div>
-
-    <br>
-</div>
+{{> attachments_list }}
 
 <div class="buttons-group columns">
     <button id="send-button" tabindex="6"><i class="fa fa-send"></i></button>
diff --git a/web-ui/app/templates/compose/inline_box.hbs b/web-ui/app/templates/compose/inline_box.hbs
index 21ab7603..59dc67bc 100644
--- a/web-ui/app/templates/compose/inline_box.hbs
+++ b/web-ui/app/templates/compose/inline_box.hbs
@@ -10,8 +10,11 @@
 
 {{> recipients }}
 
+{{> attachments_list }}
+
 <div class="buttons-group columns">
   <button id="send-button" tabindex=6><i class="fa fa-send"></i></button>
+  <span id="attachment-button" tabindex="6"></span>
   <button id="trash-button" tabindex=7>{{t 'trash-button'}}<i class="fa fa-trash-o"></i></button>
   <div id="draft-save-status"></div>
 </div>