Skip to content

Commit

Permalink
Fix #800 File Chooser not displaying on Text Input field
Browse files Browse the repository at this point in the history 
EECORE-966
  • Loading branch information
@intoeetive
intoeetive committed Feb 9, 2021
1 parent d9a50a3 commit 853e927
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 41 deletions.
29 changes: 16 additions & 13 deletions system/ee/ExpressionEngine/Addons/text/views/publish.php
View file
Expand Up @@ -6,20 +6,23 @@

if ($show_fmt or $show_file_selector): ?>
<div class="format-options">
<div class="d-flex align-items-center">

<?php if ($show_file_selector): ?>
<ul class="toolbar">
<li class="upload"><a class="m-link textarea-field-filepicker" href="<?=$fp_url?>" rel="modal-file" title="<?=lang('upload_file')?>" rel="modal-file" data-input-value="<?=$name?>"></a></li>
<?php if ($show_fmt): ?>
<li class="form-element">
<?=form_dropdown('field_ft_' . $settings['field_id'], $format_options, $settings['field_fmt'])?>
</li>
<?php endif; ?>
</ul>
<?php endif; ?>
<?php if ($show_file_selector): ?>
<div class="button-toolbar toolbar">
<div class="button-group button-group-xsmall">
<a class="m-link textarea-field-filepicker html-upload button button--default" href="<?=$fp_url?>" rel="modal-file" title="<?=lang('upload_file')?>" rel="modal-file" data-input-value="<?=$name?>"></a>
<?php if ($show_fmt): ?>
<?=form_dropdown('field_ft_' . $settings['field_id'], $format_options, $settings['field_fmt'])?>
<span class="mr-s"></span>
<?php endif; ?>
</div>
</div>
<?php endif; ?>

<?php if (! $show_file_selector && $show_fmt): ?>
<?=form_dropdown('field_ft_' . $settings['field_id'], $format_options, $settings['field_fmt'])?>
<?php endif; ?>
<?php if (! $show_file_selector && $show_fmt): ?>
<?=form_dropdown('field_ft_' . $settings['field_id'], $format_options, $settings['field_fmt'])?>
<?php endif; ?>
</div>
</div>
<?php endif; ?>
56 changes: 28 additions & 28 deletions system/ee/ExpressionEngine/Addons/textarea/views/publish.php
View file
Expand Up @@ -22,35 +22,35 @@
?>
<?=form_textarea($attributes);?>
<?php if ($toolbar || (! $toolbar && isset($settings['field_show_fmt']) && $settings['field_show_fmt'] == 'y')): ?>
<div class="format-options">
<?php if ($toolbar): ?>
<div class="d-flex align-items-center">
<?php if (isset($settings['field_show_fmt']) && $settings['field_show_fmt'] == 'y'): ?>
<?=form_dropdown($format_name, $format_options, $settings['field_fmt'])?>
<span class="mr-s"></span>
<?php endif; ?>
<div class="format-options">
<?php if ($toolbar): ?>
<div class="d-flex align-items-center">
<?php if (isset($settings['field_show_fmt']) && $settings['field_show_fmt'] == 'y'): ?>
<?=form_dropdown($format_name, $format_options, $settings['field_fmt'])?>
<span class="mr-s"></span>
<?php endif; ?>

<div class="button-toolbar toolbar">
<div class="button-group button-group-xsmall">
<?php if (isset($settings['field_show_file_selector']) && $settings['field_show_file_selector'] == 'y'): ?>
<a class="m-link textarea-field-filepicker html-upload button button--default" href="<?=$fp_url?>" rel="modal-file" title="<?=lang('upload_file')?>" rel="modal-file" data-input-value="<?=$name?>"></a>
<?php endif; ?>
<?php if ($smileys_enabled && isset($settings['field_show_smileys']) && $settings['field_show_smileys'] == 'y'): ?>
<a href="" title="<?=lang('open_emoji')?>" class="emoji button button--default"></a>
<?php endif; ?>
</div>
</div>
</div>
<?php endif ?>
<div class="button-toolbar toolbar">
<div class="button-group button-group-xsmall">
<?php if (isset($settings['field_show_file_selector']) && $settings['field_show_file_selector'] == 'y'): ?>
<a class="m-link textarea-field-filepicker html-upload button button--default" href="<?=$fp_url?>" rel="modal-file" title="<?=lang('upload_file')?>" rel="modal-file" data-input-value="<?=$name?>"></a>
<?php endif; ?>
<?php if ($smileys_enabled && isset($settings['field_show_smileys']) && $settings['field_show_smileys'] == 'y'): ?>
<a href="" title="<?=lang('open_emoji')?>" class="emoji button button--default"></a>
<?php endif; ?>
</div>
</div>
</div>
<?php endif ?>

<?php if (isset($settings['field_show_fmt']) && $settings['field_show_fmt'] == 'y' && ! $toolbar): ?>
<?=form_dropdown($format_name, $format_options, $settings['field_fmt'])?>
<?php endif ?>
<?php if (isset($settings['field_show_fmt']) && $settings['field_show_fmt'] == 'y' && ! $toolbar): ?>
<?=form_dropdown($format_name, $format_options, $settings['field_fmt'])?>
<?php endif ?>

<?php if ($smileys_enabled && isset($settings['field_show_smileys']) && $settings['field_show_smileys'] == 'y'): ?>
<div class="emoji-wrap hidden">
<?=$smileys?>
</div>
<?php endif; ?>
</div>
<?php if ($smileys_enabled && isset($settings['field_show_smileys']) && $settings['field_show_smileys'] == 'y'): ?>
<div class="emoji-wrap hidden">
<?=$smileys?>
</div>
<?php endif; ?>
</div>
<?php endif; ?>

0 comments on commit 853e927

Please sign in to comment.