jdarwood007 commited on 2020-10-18 16:00:03
Showing 1 changed files, with 30 additions and 7 deletions.
smf21 will continue to follow smf21 development while master will maintain the release ready code. # Conflicts: # sd_template/SimpleDesk-Post.template.php
... | ... |
@@@ -642,25 -612,40 +612,48 @@@ function template_ticket_additional_opt |
612 | 612 |
<ul class="post_options">'; |
613 | 613 |
|
614 | 614 |
foreach ($context['ticket_form']['additional_opts'] as $key => $details) |
615 |
- { |
|
616 | 615 |
if (!empty($details['show'])) |
617 | 616 |
echo ' |
618 |
- <li><label for="', $key, '"><input type="checkbox" name="', $key, '" id="', $key, '"', (!empty($details['checked']) ? ' checked="checked"' : ''), ' value="1" class="input_check" /> ', $details['text'], '</label></li>'; |
|
619 |
- } |
|
617 |
+ <li><label for="', $key, '"><input type="checkbox" name="', $key, '" id="', $key, '"', (!empty($details['checked']) ? ' checked="checked"' : ''), ' value="1"> ', $details['text'], '</label></li>'; |
|
620 | 618 |
|
621 | 619 |
echo ' |
622 |
- </ul> |
|
623 |
- <hr />'; |
|
620 |
+ </ul>'; |
|
621 |
+ |
|
622 |
+ // Attachments handling.. |
|
623 |
+ template_show_attachments(); |
|
624 |
+ template_add_attachments(); |
|
624 | 625 |
|
626 |
++<<<<<<< HEAD |
|
625 | 627 |
+ if (empty($context['current_attachments']) && empty($context['ticket_form']['do_attach'])) |
626 | 628 |
+ { |
627 | 629 |
+ echo ' |
628 | 630 |
+ </div>'; |
629 |
- return; |
|
631 |
++======= |
|
632 |
+ echo ' |
|
633 |
+ </div>'; |
|
634 |
+ |
|
635 |
+ tempalte_shd_js_additional_options(); |
|
636 |
+ template_singleton_email(); |
|
637 |
+ |
|
638 |
+ echo ' |
|
639 |
+ </div>'; |
|
630 | 640 |
} |
631 | 641 |
|
632 |
- if (!empty($context['current_attachments'])) |
|
642 |
+ /** |
|
643 |
+ * Displays existing attachments and allows removing if they have permissions. |
|
644 |
+ * |
|
645 |
+ * @since 2.0 |
|
646 |
+ * @return null Output is directly sent. |
|
647 |
+ */ |
|
648 |
+ function template_show_attachments() |
|
633 | 649 |
{ |
650 |
+ global $context, $txt; |
|
651 |
+ |
|
652 |
+ if (empty($context['current_attachments'])) |
|
653 |
++>>>>>>> smf21 |
|
654 |
+ return; |
|
655 |
++ } |
|
656 |
+ |
|
634 | 657 |
echo ' |
635 | 658 |
<dl id="postAttachment"> |
636 | 659 |
<dt> |
637 | 660 |