makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15769] Remove template var for cropping available

Browse source 
Avatar cropping should always be available.

PHPBB3-15769
This commit is contained in:
Marc Alexander 2021-08-23 19:35:59 +02:00
parent 30b058d633
commit dd7d1cb521
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 121 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/adm/style/acp_avatar_options_upload.html
View file

@ -3,18 +3,17 @@
<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" accept="{{ AVATAR_ALLOWED_EXTENSIONS }}" /></dd> <dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" accept="{{ AVATAR_ALLOWED_EXTENSIONS }}" /></dd>
</dl> </dl>
{% if S_CROPPING_AVAILABLE %} {% INCLUDECSS T_ASSETS_PATH ~ '/css/cropper.min.css' %}
{% INCLUDECSS T_ASSETS_PATH ~ '/css/cropper.min.css' %} {% INCLUDEJS T_ASSETS_PATH ~ '/javascript/cropper.min.js' %}
{% INCLUDEJS T_ASSETS_PATH ~ '/javascript/cropper.min.js' %} {% INCLUDEJS T_ASSETS_PATH ~ '/javascript/jquery-cropper.js' %}
{% INCLUDEJS T_ASSETS_PATH ~ '/javascript/jquery-cropper.js' %} {% INCLUDEJS T_ASSETS_PATH ~ '/javascript/phpbb-avatars.js' %}
{% INCLUDEJS T_ASSETS_PATH ~ '/javascript/phpbb-avatars.js' %}
<input type="hidden" id="avatar-cropper-data" name="avatar_cropper_data" value="" <input type="hidden" id="avatar-cropper-data" name="avatar_cropper_data" value=""
data-min-width="{{ AVATAR_MIN_WIDTH }}" data-max-width="{{ AVATAR_MAX_WIDTH }}" data-min-width="{{ AVATAR_MIN_WIDTH }}" data-max-width="{{ AVATAR_MAX_WIDTH }}"
data-min-height="{{ AVATAR_MIN_HEIGHT }}" data-max-height="{{ AVATAR_MAX_HEIGHT }}" data-min-height="{{ AVATAR_MIN_HEIGHT }}" data-max-height="{{ AVATAR_MAX_HEIGHT }}"
/> />
{% apply spaceless %} {% apply spaceless %}
<div class="avatar-cropper-buttons" id="avatar-cropper-buttons"> <div class="avatar-cropper-buttons" id="avatar-cropper-buttons">
<div class="button-group"> <div class="button-group">
<button class="button" type="button" title="{{ lang('ZOOM_IN') }}" data-cropper-action="zoom,0.1"> <button class="button" type="button" title="{{ lang('ZOOM_IN') }}" data-cropper-action="zoom,0.1">
@ -67,5 +66,4 @@
</button> </button>
</div> </div>
</div> </div>
{% endapply %} {% endapply %}
{% endif %}

1
phpBB/phpbb/avatar/driver/upload.php
View file

@ -107,7 +107,6 @@ class upload extends \phpbb\avatar\driver\driver
$template->assign_vars([ $template->assign_vars([
'AVATAR_ALLOWED_EXTENSIONS' => implode(',', preg_replace('/^/', '.', $this->allowed_extensions)), 'AVATAR_ALLOWED_EXTENSIONS' => implode(',', preg_replace('/^/', '.', $this->allowed_extensions)),
'AVATAR_UPLOAD_SIZE' => $this->config['avatar_filesize'], 'AVATAR_UPLOAD_SIZE' => $this->config['avatar_filesize'],
'S_CROPPING_AVAILABLE' => true,
'T_ASSETS_PATH' => $web_path . '/assets', 'T_ASSETS_PATH' => $web_path . '/assets',
]); ]);

16
phpBB/styles/prosilver/template/ucp_avatar_options_upload.html
View file

@ -3,17 +3,16 @@
<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" accept="{{ AVATAR_ALLOWED_EXTENSIONS }}" /></dd> <dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" accept="{{ AVATAR_ALLOWED_EXTENSIONS }}" /></dd>
</dl> </dl>
{% if S_CROPPING_AVAILABLE %} {% INCLUDECSS T_ASSETS_PATH ~ '/css/cropper.min.css' %}
{% INCLUDECSS T_ASSETS_PATH ~ '/css/cropper.min.css' %} {% INCLUDEJS T_ASSETS_PATH ~ '/javascript/cropper.min.js' %}
{% INCLUDEJS T_ASSETS_PATH ~ '/javascript/cropper.min.js' %} {% INCLUDEJS T_ASSETS_PATH ~ '/javascript/jquery-cropper.js' %}
{% INCLUDEJS T_ASSETS_PATH ~ '/javascript/jquery-cropper.js' %} {% INCLUDEJS T_ASSETS_PATH ~ '/javascript/phpbb-avatars.js' %}
{% INCLUDEJS T_ASSETS_PATH ~ '/javascript/phpbb-avatars.js' %}
<input type="hidden" id="avatar-cropper-data" name="avatar_cropper_data" value="" <input type="hidden" id="avatar-cropper-data" name="avatar_cropper_data" value=""
data-min-width="{{ AVATAR_MIN_WIDTH }}" data-max-width="{{ AVATAR_MAX_WIDTH }}" data-min-width="{{ AVATAR_MIN_WIDTH }}" data-max-width="{{ AVATAR_MAX_WIDTH }}"
data-min-height="{{ AVATAR_MIN_HEIGHT }}" data-max-height="{{ AVATAR_MAX_HEIGHT }}" /> data-min-height="{{ AVATAR_MIN_HEIGHT }}" data-max-height="{{ AVATAR_MAX_HEIGHT }}" />
{% apply spaceless %} {% apply spaceless %}
<div class="avatar-cropper-buttons" id="avatar-cropper-buttons"> <div class="avatar-cropper-buttons" id="avatar-cropper-buttons">
<div class="button-group"> <div class="button-group">
<button class="button" type="button" title="{{ lang('ZOOM_IN') }}" data-cropper-action="zoom,0.1"> <button class="button" type="button" title="{{ lang('ZOOM_IN') }}" data-cropper-action="zoom,0.1">
@ -66,5 +65,4 @@
</button> </button>
</div> </div>
</div> </div>
{% endapply %} {% endapply %}
{% endif %}