From f3760f62ff224031711b4e3b58cc282fba2c8aaa Mon Sep 17 00:00:00 2001 From: flashwave Date: Wed, 15 Aug 2018 22:29:18 +0200 Subject: [PATCH] More manage stuff. --- assets/less/manage/classes/header.less | 134 ----------------------- assets/less/manage/main.less | 1 - assets/less/mio/classes/usercard.less | 7 +- public/changelog.php | 2 +- public/manage/forums.php | 17 --- public/manage/index.php | 17 ++- public/manage/users.php | 2 +- src/manage.php | 134 ++++++++--------------- templates/_layout/header.twig | 13 ++- templates/manage/changelog/actions.twig | 6 +- templates/manage/changelog/changes.twig | 6 +- templates/manage/changelog/tags.twig | 6 +- templates/manage/general/emoticons.twig | 1 + templates/manage/general/logs.twig | 7 ++ templates/manage/general/settings.twig | 1 + templates/manage/master.twig | 1 - templates/manage/users/roles.twig | 40 +++++-- templates/manage/users/roles_create.twig | 4 +- templates/manage/users/view.twig | 42 +++---- templates/master.twig | 2 +- 20 files changed, 139 insertions(+), 304 deletions(-) delete mode 100644 assets/less/manage/classes/header.less delete mode 100644 public/manage/forums.php create mode 100644 templates/manage/general/emoticons.twig create mode 100644 templates/manage/general/logs.twig create mode 100644 templates/manage/general/settings.twig diff --git a/assets/less/manage/classes/header.less b/assets/less/manage/classes/header.less deleted file mode 100644 index 542c59fe..00000000 --- a/assets/less/manage/classes/header.less +++ /dev/null @@ -1,134 +0,0 @@ -.manage-header { - background-color: #111; - background-image: linear-gradient(0deg, #222, #333); - font-size: 1.5em; - color: #fff; - - &__wrapper { - display: flex; - max-width: var(--site-max-width); - margin: 0 auto; - } - - &__logo { - padding: 8px 10px; - color: #fff; - text-decoration: none; - display: block; - } - - &__navigation { - display: flex; - } - - &__navigation { - flex-grow: 1; - flex-shrink: 1; - } - - &__logo { - flex-grow: 0; - flex-shrink: 0; - } - - &__user { - flex-grow: 0; - flex-shrink: 1; - } - - &__menu { - margin: 0 1px; - - &__toggle { - padding: 8px 10px; - display: block; - cursor: pointer; - min-width: 50px; - transition: background-color .2s, min-width .2s; - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - - &--profile { - background-size: contain; - background-repeat: no-repeat; - background-position: right; - padding-right: 45px; - } - - &:hover { - background-color: #333; - } - - &--active, - &:active { - background-color: #222; - } - } - - &__state { - display: none; - - &:checked ~ .manage-header__menu__toggle { - background-color: #333; - min-width: 150px; - } - - &:checked ~ .manage-header__menu__options { - max-height: 250px; - } - } - - &__options { - overflow: hidden; - max-height: 0px; - width: 100%; - position: absolute; - background-color: #333; - z-index: 1000; - transition: max-height .2s; - box-shadow: 0 5px 5px 0 fade(#444, 80%); - - &--user { - text-align: right; - } - } - - &__link { - padding: 8px 10px; - display: block; - color: inherit; - text-decoration: none; - transition: background-color .2s; - - &:hover { - background-color: #444; - } - - &:active { - background-color: #2a2a2a; - } - } - - &__section { - margin: 1px 2px; - - &:first-child { - margin-top: 2px; - } - - &:last-child { - margin-bottom: 2px; - } - - &:not(:last-child) { - padding-bottom: 1px; - margin-bottom: 1px; - border-bottom: 1px solid #444; - } - } - } -} diff --git a/assets/less/manage/main.less b/assets/less/manage/main.less index 248061d7..5b687827 100644 --- a/assets/less/manage/main.less +++ b/assets/less/manage/main.less @@ -1,5 +1,4 @@ @import "classes/form"; -@import "classes/header"; @import "classes/listing"; @import "classes/changelog-change"; diff --git a/assets/less/mio/classes/usercard.less b/assets/less/mio/classes/usercard.less index 8c595770..3d4b4daf 100644 --- a/assets/less/mio/classes/usercard.less +++ b/assets/less/mio/classes/usercard.less @@ -63,24 +63,19 @@ margin-left: 2px; color: inherit; text-decoration: none; + flex: 0 0 auto; &--active { pointer-events: auto; } - &--title { - flex: 1 1 auto; - } - &--country { - flex: 0 0 auto; align-items: baseline; vertical-align: middle; margin-right: 4px; } &--donator { - flex: 0 0 auto; background-image: url('https://static.flash.moe/images/tenshi.png'); width: 37px; height: 11px; diff --git a/public/changelog.php b/public/changelog.php index 2f75162c..2345c46d 100644 --- a/public/changelog.php +++ b/public/changelog.php @@ -85,7 +85,7 @@ if (!$changes) { http_response_code(404); } -if (!empty($changelogDate)) { +if (!empty($changelogDate) && count($changes) > 0) { tpl_vars([ 'comments_category' => $commentsCategory = comments_category_info("changelog-date-{$changelogDate}", true), 'comments' => comments_category_get($commentsCategory['category_id'], $app->getUserId()), diff --git a/public/manage/forums.php b/public/manage/forums.php deleted file mode 100644 index d08529a2..00000000 --- a/public/manage/forums.php +++ /dev/null @@ -1,17 +0,0 @@ - '/manage/index.php?v=overview', - ]; + $menu['General']['Overview'] = '/manage/index.php?v=overview'; if (perms_check($perms['general'], MSZ_GENERAL_PERM_VIEW_LOGS)) { $menu['General']['Logs'] = '/manage/index.php?v=logs'; } - if (perms_check( - $perms['general'], - MSZ_GENERAL_PERM_MANAGE_EMOTICONS | MSZ_GENERAL_PERM_MANAGE_SETTINGS - )) { - if (perms_check($perms['general'], MSZ_GENERAL_PERM_MANAGE_EMOTICONS)) { - $menu['General']['Emoticons'] = '/manage/index.php?v=emoticons'; - } - - if (perms_check($perms['general'], MSZ_GENERAL_PERM_MANAGE_SETTINGS)) { - $menu['General']['Settings'] = '/manage/index.php?v=settings'; - } + if (perms_check($perms['general'], MSZ_GENERAL_PERM_MANAGE_EMOTICONS)) { + $menu['General']['Emoticons'] = '/manage/index.php?v=emoticons'; } - $canUserManage = MSZ_USER_PERM_MANAGE_USERS | MSZ_USER_PERM_MANAGE_ROLES - | MSZ_USER_PERM_MANAGE_PERMS | MSZ_USER_PERM_MANAGE_REPORTS - | MSZ_USER_PERM_MANAGE_RESTRICTIONS | MSZ_USER_PERM_MANAGE_BLACKLISTS; - - if (perms_check($perms['user'], $canUserManage)) { - $menu['Users'] = []; - - if (perms_check($perms['user'], MSZ_USER_PERM_MANAGE_USERS | MSZ_USER_PERM_MANAGE_PERMS)) { - $menu['Users']['Listing'] = '/manage/users.php?v=listing'; - } - - if (perms_check($perms['user'], MSZ_USER_PERM_MANAGE_ROLES | MSZ_USER_PERM_MANAGE_PERMS)) { - $menu['Users']['Roles'] = '/manage/users.php?v=roles'; - } - - if (perms_check( - $perms['user'], - MSZ_USER_PERM_MANAGE_REPORTS | MSZ_USER_PERM_MANAGE_RESTRICTIONS | MSZ_USER_PERM_MANAGE_BLACKLISTS - )) { - if (perms_check($perms['user'], MSZ_USER_PERM_MANAGE_REPORTS)) { - $menu['Users']['Reports'] = '/manage/users.php?v=reports'; - } - - if (perms_check($perms['user'], MSZ_USER_PERM_MANAGE_RESTRICTIONS)) { - $menu['Users']['Restrictions'] = '/manage/users.php?v=restrictions'; - } - - if (perms_check($perms['user'], MSZ_USER_PERM_MANAGE_BLACKLISTS)) { - $menu['Users']['Blacklisting'] = '/manage/users.php?v=blacklisting'; - } - } + if (perms_check($perms['general'], MSZ_GENERAL_PERM_MANAGE_SETTINGS)) { + $menu['General']['Settings'] = '/manage/index.php?v=settings'; } - $canNewsManage = MSZ_NEWS_PERM_MANAGE_POSTS | MSZ_NEWS_PERM_MANAGE_CATEGORIES; - - if (perms_check($perms['news'], $canNewsManage)) { - $menu['News'] = []; - - if (perms_check($perms['news'], MSZ_NEWS_PERM_MANAGE_POSTS)) { - $menu['News']['Posts'] = '/manage/news.php?v=posts'; - } - - if (perms_check($perms['news'], MSZ_NEWS_PERM_MANAGE_CATEGORIES)) { - $menu['News']['Categories'] = '/manage/news.php?v=categories'; - } + if (perms_check($perms['user'], MSZ_USER_PERM_MANAGE_USERS | MSZ_USER_PERM_MANAGE_PERMS)) { + $menu['Users']['Listing'] = '/manage/users.php?v=listing'; } - $canForumManage = MSZ_FORUM_PERM_MANAGE_FORUMS; - - if (perms_check($perms['forum'], $canForumManage)) { - $menu['Forums'] = []; - - if (perms_check($perms['forum'], MSZ_FORUM_PERM_MANAGE_FORUMS)) { - $menu['Forums']['Listing'] = '/manage/forums.php?v=listing'; - } - - if (perms_check($perms['forum'], 0)) { - $menu['Forums']['Permissions'] = '/manage/forums.php?v=permissions'; - } - - if (perms_check($perms['forum'], 0)) { - $menu['Forums']['Settings'] = '/manage/forums.php?v=settings'; - } + if (perms_check($perms['user'], MSZ_USER_PERM_MANAGE_ROLES | MSZ_USER_PERM_MANAGE_PERMS)) { + $menu['Users']['Roles'] = '/manage/users.php?v=roles'; } - $canChangelogManage = MSZ_CHANGELOG_PERM_MANAGE_CHANGES | MSZ_CHANGELOG_PERM_MANAGE_TAGS - | MSZ_CHANGELOG_PERM_MANAGE_ACTIONS; + if (perms_check($perms['user'], MSZ_USER_PERM_MANAGE_REPORTS)) { + $menu['Users']['Reports'] = '/manage/users.php?v=reports'; + } - if (perms_check($perms['changelog'], $canChangelogManage)) { - $menu['Changelog'] = []; + if (perms_check($perms['user'], MSZ_USER_PERM_MANAGE_RESTRICTIONS)) { + $menu['Users']['Restrictions'] = '/manage/users.php?v=restrictions'; + } - if (perms_check($perms['changelog'], MSZ_CHANGELOG_PERM_MANAGE_CHANGES)) { - $menu['Changelog']['Changes'] = '/manage/changelog.php?v=changes'; - } + if (perms_check($perms['user'], MSZ_USER_PERM_MANAGE_BLACKLISTS)) { + $menu['Users']['Blacklisting'] = '/manage/users.php?v=blacklisting'; + } - if (perms_check($perms['changelog'], MSZ_CHANGELOG_PERM_MANAGE_TAGS)) { - $menu['Changelog']['Tags'] = '/manage/changelog.php?v=tags'; - } + if (perms_check($perms['news'], MSZ_NEWS_PERM_MANAGE_POSTS)) { + $menu['News']['Posts'] = '/manage/news.php?v=posts'; + } - if (perms_check($perms['changelog'], MSZ_CHANGELOG_PERM_MANAGE_ACTIONS)) { - $menu['Changelog']['Actions'] = '/manage/changelog.php?v=actions'; - } + if (perms_check($perms['news'], MSZ_NEWS_PERM_MANAGE_CATEGORIES)) { + $menu['News']['Categories'] = '/manage/news.php?v=categories'; + } + + if (perms_check($perms['forum'], MSZ_FORUM_PERM_MANAGE_FORUMS)) { + $menu['Forums']['Listing'] = '/manage/forums.php?v=listing'; + } + + if (perms_check($perms['forum'], 0)) { + $menu['Forums']['Permissions'] = '/manage/forums.php?v=permissions'; + } + + if (perms_check($perms['forum'], 0)) { + $menu['Forums']['Settings'] = '/manage/forums.php?v=settings'; + } + + if (perms_check($perms['changelog'], MSZ_CHANGELOG_PERM_MANAGE_CHANGES)) { + $menu['Changelog']['Changes'] = '/manage/changelog.php?v=changes'; + } + + if (perms_check($perms['changelog'], MSZ_CHANGELOG_PERM_MANAGE_TAGS)) { + $menu['Changelog']['Tags'] = '/manage/changelog.php?v=tags'; + } + + if (perms_check($perms['changelog'], MSZ_CHANGELOG_PERM_MANAGE_ACTIONS)) { + $menu['Changelog']['Actions'] = '/manage/changelog.php?v=actions'; } return $menu; diff --git a/templates/_layout/header.twig b/templates/_layout/header.twig index 9912c077..76452863 100644 --- a/templates/_layout/header.twig +++ b/templates/_layout/header.twig @@ -3,7 +3,7 @@
- + {{ globals.site_name }} @@ -17,6 +17,7 @@
  • Home
  • News
    • -
  • Forum
    • +
  • + Forum + {##} +
  • Chat
    • -
  • Members
    • diff --git a/templates/manage/changelog/actions.twig b/templates/manage/changelog/actions.twig index 69e958af..ffac2e41 100644 --- a/templates/manage/changelog/actions.twig +++ b/templates/manage/changelog/actions.twig @@ -2,9 +2,7 @@ {% from 'macros.twig' import pagination %} {% block manage_content %} -
    - Create new action -
    + Create new action
    {% for action in changelog_actions %} @@ -19,7 +17,7 @@ {% endfor %}
    -
    +
    {{ pagination(changelog_actions_count, changelog_take, changelog_offset, '?v=actions') }}
    {% endblock %} diff --git a/templates/manage/changelog/changes.twig b/templates/manage/changelog/changes.twig index ac4b2230..1f2831b3 100644 --- a/templates/manage/changelog/changes.twig +++ b/templates/manage/changelog/changes.twig @@ -2,9 +2,7 @@ {% from 'macros.twig' import pagination %} {% block manage_content %} -
    - Create new change -
    + Create new change
    {% for change in changelog_changes %} @@ -48,7 +46,7 @@ {% endfor %}
    -
    +
    {{ pagination(changelog_changes_count, changelog_take, changelog_offset, '?v=changes') }}
    {% endblock %} diff --git a/templates/manage/changelog/tags.twig b/templates/manage/changelog/tags.twig index e3943f45..68a22ac7 100644 --- a/templates/manage/changelog/tags.twig +++ b/templates/manage/changelog/tags.twig @@ -2,9 +2,7 @@ {% from 'macros.twig' import pagination %} {% block manage_content %} -
    - Create new tag -
    + Create new tag
    {% for tag in changelog_tags %} @@ -22,7 +20,7 @@ {% endfor %}
    -
    +
    {{ pagination(changelog_tags_count, changelog_take, changelog_offset, '?v=tags') }}
    {% endblock %} diff --git a/templates/manage/general/emoticons.twig b/templates/manage/general/emoticons.twig new file mode 100644 index 00000000..cc9bba57 --- /dev/null +++ b/templates/manage/general/emoticons.twig @@ -0,0 +1 @@ +{% extends 'manage/general/master.twig' %} diff --git a/templates/manage/general/logs.twig b/templates/manage/general/logs.twig new file mode 100644 index 00000000..98e8f20e --- /dev/null +++ b/templates/manage/general/logs.twig @@ -0,0 +1,7 @@ +{% extends 'manage/general/master.twig' %} + +{% block manage_content %} +
    +    {{ log_dump }}
+
    +{% endblock %} diff --git a/templates/manage/general/settings.twig b/templates/manage/general/settings.twig new file mode 100644 index 00000000..cc9bba57 --- /dev/null +++ b/templates/manage/general/settings.twig @@ -0,0 +1 @@ +{% extends 'manage/general/master.twig' %} diff --git a/templates/manage/master.twig b/templates/manage/master.twig index d0a8a1a6..c75c2cd0 100644 --- a/templates/manage/master.twig +++ b/templates/manage/master.twig @@ -1,7 +1,6 @@ {% extends 'master.twig' %} {% from 'manage/macros.twig' import manage_navigation %} {% set title = 'Broom Closet' %} -{% set is_manage = true %} {% block content %}
    diff --git a/templates/manage/users/roles.twig b/templates/manage/users/roles.twig index 33f9836f..26054ed8 100644 --- a/templates/manage/users/roles.twig +++ b/templates/manage/users/roles.twig @@ -3,23 +3,43 @@ {% block manage_content %} {% if can_manage_roles %} -
    - Create new Role -
    + Create new Role {% endif %} -
    +
    {% for role in manage_roles %} - -
    - {{ role.role_name }} - {{ role.users }} users +
    +
    + + +
    +
    +
    + +
    +
    + {{ role.role_name }} +
    + +
    + + {{ role.role_title }} + + + + {{ role.users|number_format }} users + +
    +
    +
    - +
    {% endfor %}
    -
    +
    {{ pagination(manage_roles_count, manage_roles_range, manage_roles_offset, '?v=roles') }}
    {% endblock %} diff --git a/templates/manage/users/roles_create.twig b/templates/manage/users/roles_create.twig index ba795287..4a20860a 100644 --- a/templates/manage/users/roles_create.twig +++ b/templates/manage/users/roles_create.twig @@ -93,8 +93,6 @@
    {% endif %} -
    - -
    + {% endblock %} diff --git a/templates/manage/users/view.twig b/templates/manage/users/view.twig index ce5bb557..908f7cd1 100644 --- a/templates/manage/users/view.twig +++ b/templates/manage/users/view.twig @@ -156,18 +156,15 @@
    {% endif %} -
    - -
    + {% endif %} {% if can_manage_users %} -
    - {% if has_roles|length > 0 %} -
    -
    Manage Roles
    - + {% if has_roles|length > 0 %} + +
    Manage Roles
    +
    -
    - - -
    -
    - {% endif %} - - {% if available_roles|length > 0 %} -
    -
    Add Role
    + + +
    + + {% endif %} + {% if available_roles|length > 0 %} +
    +
    Add Role
    +
    -
    - -
    - - {% endif %} -
    + +
    + + {% endif %} {% endif %} {% endblock %} diff --git a/templates/master.twig b/templates/master.twig index baf291bf..0b1c8f5d 100644 --- a/templates/master.twig +++ b/templates/master.twig @@ -6,7 +6,7 @@ {% include '_layout/meta.twig' %} - {% if is_manage|default(false) %} + {% if manage_menu is defined %}