From 1bf81d7a7d24721cfb8ef204b6ae70e9ed0f73c8 Mon Sep 17 00:00:00 2001 From: flashwave Date: Wed, 15 Aug 2018 04:25:42 +0200 Subject: [PATCH] First steps to merging manage with the main site. --- assets/less/manage/classes/avatar.less | 11 -- assets/less/manage/classes/button.less | 20 ---- assets/less/manage/classes/container.less | 20 ---- assets/less/manage/classes/footer.less | 13 --- assets/less/manage/classes/form.less | 6 +- assets/less/manage/classes/header.less | 7 +- assets/less/manage/classes/input.less | 9 -- assets/less/manage/classes/pagination.less | 55 --------- assets/less/manage/main.less | 27 ----- assets/less/mio/classes/header.less | 4 + public/manage/users.php | 2 +- templates/_layout/header.twig | 2 +- templates/forum/macros.twig | 2 +- templates/manage/changelog/action_edit.twig | 6 +- templates/manage/changelog/actions.twig | 2 +- templates/manage/changelog/change_edit.twig | 14 +-- templates/manage/changelog/changes.twig | 2 +- templates/manage/changelog/tag_edit.twig | 12 +- templates/manage/changelog/tags.twig | 2 +- templates/manage/general/overview.twig | 5 +- templates/manage/master.twig | 118 +++++++------------- templates/manage/users/listing.twig | 6 +- templates/manage/users/roles.twig | 2 +- templates/manage/users/roles_create.twig | 8 +- templates/manage/users/view.twig | 102 ++++++++--------- templates/master.twig | 4 + templates/settings/account.twig | 6 +- templates/user/listing.twig | 2 +- 28 files changed, 148 insertions(+), 321 deletions(-) delete mode 100644 assets/less/manage/classes/avatar.less delete mode 100644 assets/less/manage/classes/button.less delete mode 100644 assets/less/manage/classes/container.less delete mode 100644 assets/less/manage/classes/footer.less delete mode 100644 assets/less/manage/classes/input.less delete mode 100644 assets/less/manage/classes/pagination.less diff --git a/assets/less/manage/classes/avatar.less b/assets/less/manage/classes/avatar.less deleted file mode 100644 index e39d6be8..00000000 --- a/assets/less/manage/classes/avatar.less +++ /dev/null @@ -1,11 +0,0 @@ -.avatar { - flex-shrink: 0; - background-color: #333; - background-size: cover; - background-repeat: no-repeat; - background-position: center; - display: block; - border: 1px solid #444; - max-height: 200px; - max-width: 200px; -} diff --git a/assets/less/manage/classes/button.less b/assets/less/manage/classes/button.less deleted file mode 100644 index cf7b6206..00000000 --- a/assets/less/manage/classes/button.less +++ /dev/null @@ -1,20 +0,0 @@ -.button { - display: inline-block; - font: 12px/20px @manage-font; - background-color: #666; - border: 1px solid #555; - border-radius: 2px; - text-decoration: none; - color: #111; - padding: 2px 5px; - cursor: pointer; - transition: background-color .2s; - - &:hover { - background-color: #777; - } - - &:active { - background-color: #666; - } -} diff --git a/assets/less/manage/classes/container.less b/assets/less/manage/classes/container.less deleted file mode 100644 index 6276c85b..00000000 --- a/assets/less/manage/classes/container.less +++ /dev/null @@ -1,20 +0,0 @@ -.container { - max-width: 1200px; - margin: 2px auto; - - &--center { - text-align: center; - } - - &__title { - font-size: 2em; - line-height: 1.7em; - padding: 4px; - } - - &__subtitle { - font-size: 1.5em; - line-height: 1.5em; - padding: 4px; - } -} diff --git a/assets/less/manage/classes/footer.less b/assets/less/manage/classes/footer.less deleted file mode 100644 index f431c872..00000000 --- a/assets/less/manage/classes/footer.less +++ /dev/null @@ -1,13 +0,0 @@ -.footer { - text-align: center; - padding: 2px 0; - - &__link { - text-decoration: none; - color: inherit; - - &:hover { - text-decoration: underline; - } - } -} diff --git a/assets/less/manage/classes/form.less b/assets/less/manage/classes/form.less index 77403787..e89540e5 100644 --- a/assets/less/manage/classes/form.less +++ b/assets/less/manage/classes/form.less @@ -2,13 +2,15 @@ &__label { display: inline-block; - background-color: #222; - border: 1px solid #333; border-radius: 2px; min-width: 250px; margin: 2px; padding: 2px; min-height: 50px; vertical-align: top; + + &__text { + font-size: .9em; + } } } diff --git a/assets/less/manage/classes/header.less b/assets/less/manage/classes/header.less index 643ba2b1..c2f2127a 100644 --- a/assets/less/manage/classes/header.less +++ b/assets/less/manage/classes/header.less @@ -1,7 +1,8 @@ -.header { +.manage-header { background-color: #111; background-image: linear-gradient(0deg, #222, #333); font-size: 1.5em; + color: #fff; &__wrapper { display: flex; @@ -71,12 +72,12 @@ &__state { display: none; - &:checked ~ .header__menu__toggle { + &:checked ~ .manage-header__menu__toggle { background-color: #333; min-width: 150px; } - &:checked ~ .header__menu__options { + &:checked ~ .manage-header__menu__options { max-height: 250px; } } diff --git a/assets/less/manage/classes/input.less b/assets/less/manage/classes/input.less deleted file mode 100644 index 2c06cb79..00000000 --- a/assets/less/manage/classes/input.less +++ /dev/null @@ -1,9 +0,0 @@ -.input { - background: #333; - border: 1px solid #444; - border-radius: 2px; - padding: 2px; - color: #fff; - width: 100%; - vertical-align: top; -} diff --git a/assets/less/manage/classes/pagination.less b/assets/less/manage/classes/pagination.less deleted file mode 100644 index 64f81151..00000000 --- a/assets/less/manage/classes/pagination.less +++ /dev/null @@ -1,55 +0,0 @@ -.pagination { - display: inline-flex; - list-style: none; - justify-content: center; - box-shadow: 0 1px 5px 0 fade(#444, 80%); - background: #333; - color: #fff; - font-size: 1.2em; - margin: 2px; - - &__option { - transition: box-shadow .2s, background-color .2s; - - &:not(&--disabled):hover { - background-color: #444; - box-shadow: 0 1px 5px 0 fade(#555, 80%); - } - - &:not(&--disabled)&--active, - &:not(&--disabled)&:active { - background-color: #444; - } - - &--disabled { - opacity: .5; - } - } - - &__separator { - width: 1px; - background-color: #444; - } - - &__link { - display: flex; - justify-content: center; - align-items: center; - cursor: pointer; - color: inherit; - text-decoration: none; - min-width: 40px; - min-height: 40px; - - &--first, - &--last, - &--prev, - &--next { - font-size: 2em; - } - } - - &__option--disabled &__link { - cursor: default; - } -} diff --git a/assets/less/manage/main.less b/assets/less/manage/main.less index 348b303c..8bcf8437 100644 --- a/assets/less/manage/main.less +++ b/assets/less/manage/main.less @@ -1,33 +1,6 @@ -@manage-font: 'Open Sans', sans-serif; - -* { - margin: 0; - padding: 0; - box-sizing: border-box; - position: relative; -} - -html, -body { - width: 100%; - height: 100%; -} - -.manage { - background-color: #222; - font: 12px/20px @manage-font; - color: #fff; -} - -@import "classes/avatar"; -@import "classes/button"; -@import "classes/container"; -@import "classes/footer"; @import "classes/form"; @import "classes/header"; -@import "classes/input"; @import "classes/listing"; -@import "classes/pagination"; @import "classes/user-listing"; @import "classes/permissions"; diff --git a/assets/less/mio/classes/header.less b/assets/less/mio/classes/header.less index 476fb84d..07b5e0b2 100644 --- a/assets/less/mio/classes/header.less +++ b/assets/less/mio/classes/header.less @@ -51,6 +51,10 @@ height: 60px; font-size: 0; + &--manage { + background-image: url('https://static.flash.moe/images/imouto-broom.png'); + } + @media (max-width: @mio-header-mobile) { width: 40px; height: 40px; diff --git a/public/manage/users.php b/public/manage/users.php index 90408b00..fb7cc880 100644 --- a/public/manage/users.php +++ b/public/manage/users.php @@ -21,7 +21,7 @@ switch ($_GET['v'] ?? null) { break; } - $usersTake = 32; + $usersTake = 33; $manageUsersCount = Database::query(' SELECT COUNT(`user_id`) FROM `msz_users` diff --git a/templates/_layout/header.twig b/templates/_layout/header.twig index 7802ee1a..9912c077 100644 --- a/templates/_layout/header.twig +++ b/templates/_layout/header.twig @@ -3,7 +3,7 @@
- {{ globals.site_name }} diff --git a/templates/forum/macros.twig b/templates/forum/macros.twig index a601e9a2..e9f0c833 100644 --- a/templates/forum/macros.twig +++ b/templates/forum/macros.twig @@ -331,7 +331,7 @@
- +
diff --git a/templates/manage/changelog/action_edit.twig b/templates/manage/changelog/action_edit.twig index 9d499ac8..e941ffae 100644 --- a/templates/manage/changelog/action_edit.twig +++ b/templates/manage/changelog/action_edit.twig @@ -14,14 +14,14 @@ @@ -56,7 +56,7 @@
- +
diff --git a/templates/manage/changelog/actions.twig b/templates/manage/changelog/actions.twig index c78fcc2b..09f3bc1e 100644 --- a/templates/manage/changelog/actions.twig +++ b/templates/manage/changelog/actions.twig @@ -3,7 +3,7 @@ {% block content %}
- Create new action + Create new action
diff --git a/templates/manage/changelog/change_edit.twig b/templates/manage/changelog/change_edit.twig index ef30643a..f7256308 100644 --- a/templates/manage/changelog/change_edit.twig +++ b/templates/manage/changelog/change_edit.twig @@ -14,14 +14,14 @@ @@ -41,19 +41,19 @@
- +
@@ -78,7 +78,7 @@
- +
{% endif %} @@ -99,7 +99,7 @@
- +
{% endif %} diff --git a/templates/manage/changelog/changes.twig b/templates/manage/changelog/changes.twig index 27771d6d..8c47c8c9 100644 --- a/templates/manage/changelog/changes.twig +++ b/templates/manage/changelog/changes.twig @@ -3,7 +3,7 @@ {% block content %}
- Create new change + Create new change
diff --git a/templates/manage/changelog/tag_edit.twig b/templates/manage/changelog/tag_edit.twig index 3dcf399f..ec27ee94 100644 --- a/templates/manage/changelog/tag_edit.twig +++ b/templates/manage/changelog/tag_edit.twig @@ -14,14 +14,14 @@ @@ -36,13 +36,13 @@ {% endif %}
- +
@@ -67,7 +67,7 @@
- +
{% endif %} @@ -88,7 +88,7 @@
- +
{% endif %} diff --git a/templates/manage/changelog/tags.twig b/templates/manage/changelog/tags.twig index 7ed53c3d..5f59c931 100644 --- a/templates/manage/changelog/tags.twig +++ b/templates/manage/changelog/tags.twig @@ -3,7 +3,7 @@ {% block content %}
- Create new tag + Create new tag
diff --git a/templates/manage/general/overview.twig b/templates/manage/general/overview.twig index b60aa541..94ff0cfe 100644 --- a/templates/manage/general/overview.twig +++ b/templates/manage/general/overview.twig @@ -2,6 +2,9 @@ {% block content %}
-

Welcome to Manage, here you can manage things.

+
The Broom Closet
+
+ Welcome to Manage, here you can manage things. +
{% endblock %} diff --git a/templates/manage/master.twig b/templates/manage/master.twig index a2924ddf..c11cde77 100644 --- a/templates/manage/master.twig +++ b/templates/manage/master.twig @@ -1,83 +1,51 @@ - - - - - {{ globals.site_name|default('The') }} Broom Closet - - - - - - -
- +{% endblock %} diff --git a/templates/manage/users/listing.twig b/templates/manage/users/listing.twig index 2a719bd0..45cf40da 100644 --- a/templates/manage/users/listing.twig +++ b/templates/manage/users/listing.twig @@ -2,7 +2,7 @@ {% from 'manage/macros.twig' import pagination %} {% block content %} -
+
{% for user in manage_users %}
@@ -17,7 +17,5 @@ {% endfor %}
-
- {{ pagination(manage_users_count, manage_users_range, manage_users_offset, '?v=listing') }} -
+ {{ pagination(manage_users_count, manage_users_range, manage_users_offset, '?v=listing') }} {% endblock %} diff --git a/templates/manage/users/roles.twig b/templates/manage/users/roles.twig index 3222d529..68427e19 100644 --- a/templates/manage/users/roles.twig +++ b/templates/manage/users/roles.twig @@ -4,7 +4,7 @@ {% block content %} {% if can_manage_roles %}
- Create new Role + Create new Role
{% endif %} diff --git a/templates/manage/users/roles_create.twig b/templates/manage/users/roles_create.twig index 327eb278..8900dff9 100644 --- a/templates/manage/users/roles_create.twig +++ b/templates/manage/users/roles_create.twig @@ -15,7 +15,7 @@ @@ -36,7 +36,7 @@ @@ -75,7 +75,7 @@
@@ -88,7 +88,7 @@ {% endif %}
- +
{% endblock %} diff --git a/templates/manage/users/view.twig b/templates/manage/users/view.twig index 2484f11c..7751b77e 100644 --- a/templates/manage/users/view.twig +++ b/templates/manage/users/view.twig @@ -5,74 +5,74 @@ {% if can_manage_users %}
-

+
Viewing {{ view_user.username }} ({{ view_user.user_id }}) -

+
-

Avatar

+
Avatar
@@ -85,77 +85,79 @@
-

Password

+
Password
-

Profile fields

+
Profile fields
{% for name, props in profile_fields %} {% endfor %}
-

Colour

+
+
Colour
- {% set colour_is_defined = view_user is defined and view_user.user_colour is not null and not view_user.user_colour|colour_get_inherit %} + {% set colour_is_defined = view_user is defined and view_user.user_colour is not null and not view_user.user_colour|colour_get_inherit %} - + - + - + - + +
{% if can_manage_perms %}
-

Permissions

+
Permissions
{{ permissions_table(permissions) }}
{% endif %}
- +
{% endif %} @@ -164,7 +166,7 @@
{% if has_roles|length > 0 %}
-

Manage Roles

+
Manage Roles
@@ -182,15 +184,15 @@
- - + +
{% endif %} {% if available_roles|length > 0 %}
-

Add Role

+
Add Role
- +
{% endif %} diff --git a/templates/master.twig b/templates/master.twig index 97047137..16606879 100644 --- a/templates/master.twig +++ b/templates/master.twig @@ -6,11 +6,15 @@ {% include '_layout/meta.twig' %} + {% if is_manage|default(false) %} + + {% endif %} {% include '_layout/header.twig' %}
+ {% block before_content %}{% endblock %} {% block content %}
Hello!
diff --git a/templates/settings/account.twig b/templates/settings/account.twig index 28e81094..9161f629 100644 --- a/templates/settings/account.twig +++ b/templates/settings/account.twig @@ -30,7 +30,7 @@
@@ -114,8 +114,8 @@ {% if settings_perms.edit_profile or not settings_disable_account_options %} {% endif %} diff --git a/templates/user/listing.twig b/templates/user/listing.twig index 071d4a17..5ae8ee23 100644 --- a/templates/user/listing.twig +++ b/templates/user/listing.twig @@ -50,7 +50,7 @@