diff --git a/assets/less/main.less b/assets/less/main.less index f2217863..bf274e4f 100644 --- a/assets/less/main.less +++ b/assets/less/main.less @@ -40,6 +40,7 @@ body { font: 12px/20px @mio-font-regular; color: var(--text-colour); background-attachment: fixed; + background-position: center center; &__wrapper { max-width: var(--site-max-width); diff --git a/public/profile.php b/public/profile.php index b8c2860c..9ae9c470 100644 --- a/public/profile.php +++ b/public/profile.php @@ -190,11 +190,11 @@ switch ($mode) { } if (!empty($_FILES['background'])) { - if (!empty($_POST['background']['delete'])) { + if ((int)($_POST['background']['attach'] ?? -1) === 0) { user_background_delete($userId); user_background_set_settings($userId, MSZ_USER_BACKGROUND_ATTACHMENT_NONE); } else { - if (!$perms['edit_avatar']) { + if (!$perms['edit_background']) { $notices[] = MSZ_TMP_USER_ERROR_STRINGS['background']['not-allowed']; } elseif (!empty($_FILES['background']) && is_array($_FILES['background'])) { @@ -228,8 +228,8 @@ switch ($mode) { } } - $backgroundSettings = in_array($_POST['background']['attach'] ?? '', MSZ_USER_BACKGROUND_ATTACHMENTS_NAMES) - ? array_flip(MSZ_USER_BACKGROUND_ATTACHMENTS_NAMES)[$_POST['background']['attach']] + $backgroundSettings = in_array($_POST['background']['attach'] ?? '', MSZ_USER_BACKGROUND_ATTACHMENTS) + ? (int)($_POST['background']['attach']) : MSZ_USER_BACKGROUND_ATTACHMENTS[0]; if (!empty($_POST['background']['attr']['blend'])) { diff --git a/templates/_layout/input.twig b/templates/_layout/input.twig index a7696ae3..0674c171 100644 --- a/templates/_layout/input.twig +++ b/templates/_layout/input.twig @@ -80,3 +80,28 @@ {% endspaceless %} {% endmacro %} + +{% macro input_select_option(value, key, selected) %} +{% spaceless %} + 0 %} value="{{ key }}"{% endif %}{% if selected %} selected{% endif %}> + {{ value }} + +{% endspaceless %} +{% endmacro %} + +{% macro input_select(name, options, selected, value_name, key_name, only_values, class, attributes) %} +{% from _self import input_select_option %} +{% spaceless %} + +{% endspaceless %} +{% endmacro %} diff --git a/templates/manage/changelog/change_edit.twig b/templates/manage/changelog/change_edit.twig index 5048707d..62ad786c 100644 --- a/templates/manage/changelog/change_edit.twig +++ b/templates/manage/changelog/change_edit.twig @@ -1,6 +1,6 @@ {% extends 'manage/changelog/master.twig' %} {% from 'macros.twig' import container_title %} -{% from '_layout/input.twig' import input_csrf, input_text %} +{% from '_layout/input.twig' import input_csrf, input_text, input_select %} {% if edit_change is defined %} {% set site_link = '/changelog.php?c=' ~ edit_change.change_id %} @@ -30,13 +30,7 @@ @@ -63,23 +57,15 @@ {{ container_title('Tags') }} {% if edit_change_assigned_tags|length > 0 %} -
+ -
- -
+
{% endif %} @@ -88,19 +74,11 @@ -
- -
+ {% endif %} {% endif %} diff --git a/templates/manage/forum/forum.twig b/templates/manage/forum/forum.twig index 4cf9beb7..8faece11 100644 --- a/templates/manage/forum/forum.twig +++ b/templates/manage/forum/forum.twig @@ -1,7 +1,7 @@ {% extends 'manage/users/master.twig' %} {% from 'macros.twig' import container_title %} {% from 'manage/macros.twig' import permissions_table %} -{% from '_layout/input.twig' import input_hidden, input_csrf %} +{% from '_layout/input.twig' import input_hidden, input_csrf, input_select %} {% block manage_content %}
@@ -11,11 +11,7 @@
{{ input_hidden('v', 'forumperms') }} {{ input_hidden('f', forum.forum_id) }} - + {{ input_select('r', roles, '', 'role_name', 'role_id') }}
diff --git a/templates/manage/news/post.twig b/templates/manage/news/post.twig index 62c6d8d5..a81b9e2a 100644 --- a/templates/manage/news/post.twig +++ b/templates/manage/news/post.twig @@ -1,6 +1,6 @@ {% extends 'manage/news/master.twig' %} {% from 'macros.twig' import container_title %} -{% from '_layout/input.twig' import input_hidden, input_csrf, input_text, input_checkbox %} +{% from '_layout/input.twig' import input_hidden, input_csrf, input_text, input_checkbox, input_select %} {% set is_new = post|length < 1 %} @@ -19,13 +19,7 @@ Category - - - + {{ input_select('post[category]', categories, post.category_id|default(0), 'category_name', 'category_id') }} diff --git a/templates/manage/users/view.twig b/templates/manage/users/view.twig index 9d975f1d..6b02d3f8 100644 --- a/templates/manage/users/view.twig +++ b/templates/manage/users/view.twig @@ -1,7 +1,7 @@ {% extends 'manage/users/master.twig' %} {% from 'macros.twig' import container_title %} {% from 'manage/macros.twig' import permissions_table %} -{% from '_layout/input.twig' import input_csrf, input_text, input_checkbox, input_file %} +{% from '_layout/input.twig' import input_csrf, input_text, input_checkbox, input_file, input_select %} {% set site_link = '/profile.php?u=' ~ view_user.user_id %} @@ -155,20 +155,13 @@ {% if has_roles|length > 0 %}
{{ container_title('Manage Roles') }} + {{ input_csrf('users_edit') }}
- {{ input_csrf('users_edit') }} - @@ -181,22 +174,17 @@ {% if available_roles|length > 0 %} {{ container_title('Add role') }} + {{ input_csrf('users_edit') }}
- +
{% endif %} diff --git a/templates/user/listing.twig b/templates/user/listing.twig index a83b6488..1ac78512 100644 --- a/templates/user/listing.twig +++ b/templates/user/listing.twig @@ -1,5 +1,6 @@ {% extends 'user/master.twig' %} {% from 'macros.twig' import pagination, container_title %} +{% from '_layout/input.twig' import input_select %} {% from 'user/macros.twig' import user_card %} {% set canonical_url = '/members.php'|url_construct({ @@ -22,36 +23,9 @@ {{ container_title('Member Listing') }}
- - - - - + {{ input_select('r', roles, role.role_id, 'role_name', 'role_id') }} + {{ input_select('ss', order_fields, order_field, 'title') }} + {{ input_select('sd', order_directions, order_direction) }}