From 9fe1104b45392ebcb68280d514a1c1bff5c15517 Mon Sep 17 00:00:00 2001 From: lephe <> Date: Sat, 9 Feb 2019 21:18:12 +0100 Subject: [PATCH] admin: more on user and group generation Also more titles and details on other pages of the administration section. --- app/models/privs.py | 3 +- app/routes/admin.py | 62 ++++++++++++++---- app/static/css/global.css | 25 +++++-- app/static/css/header.css | 21 +++--- app/static/css/table.css | 5 +- app/templates/admin/delete_account.html | 12 ++-- app/templates/admin/edit_account.html | 6 +- app/templates/admin/index.html | 86 +++++++++++++++---------- app/templates/base/header.html | 15 +++-- 9 files changed, 153 insertions(+), 82 deletions(-) diff --git a/app/models/privs.py b/app/models/privs.py index f3a6324..71ac0df 100644 --- a/app/models/privs.py +++ b/app/models/privs.py @@ -44,9 +44,10 @@ class Group(db.Model): members = db.relationship('Member', secondary=lambda:GroupMember, back_populates='groups') - def __init__(self, name, css): + def __init__(self, name, css, descr): self.name = name self.css = css + self.description = descr self.members = [] def __repr__(self): diff --git a/app/routes/admin.py b/app/routes/admin.py index 2ae76f7..e6ca11d 100644 --- a/app/routes/admin.py +++ b/app/routes/admin.py @@ -13,7 +13,7 @@ from app import app, db @priv_required('admin-panel') def admin(): class AdminForm(FlaskForm): - submit = SubmitField('Régénérer groupes, privilèges, membres de test') + submit = SubmitField('Régénérer les groupes, privilèges, et comptes communs') form = AdminForm() if form.validate_on_submit(): @@ -23,31 +23,57 @@ def admin(): db.session.commit( ) # Create base groups - g_admins = Group('Administrateur', 'color: red') - g_modos = Group('Modérateur', 'color: green') - g_redacs = Group('Rédacteur', 'color: blue') - g_community = Group('Compte communautaire', 'background: #d8d8d8;' + - 'border-radius: 4px; color: #303030; padding: 1px 2px') - db.session.add(g_admins) - db.session.add(g_modos) - db.session.add(g_redacs) - db.session.add(g_community) + groups = [ + ('Administrateur', 'color: #ee0000', + "Vous voyez Chuck Norris ? Pareil."), + ('Modérateur', 'color: green', + "Maîtres du kick, ils sont là pour faire respecter un semblant " + + "d'ordre."), + ('Développeur', 'color: #4169e1', + "Les développeurs maintiennent et améliorent le code du site."), + ('Rédacteur', 'color: blue', + "Rédigent les meilleurs articles de la page d'accueil, rien " + + "que pour vous <3"), + ('Responsable communauté', 'color: DarkOrange', + "Anime les pages Twitter et Facebook de Planète Casio et " + + "surveille l'évolution du monde autour de nous !"), + ('Partenaire', 'color: purple', + "Membres de l'équipe d'administration des sites partenaires."), + ('Compte communautaire', 'background: #d8d8d8; border-radius: ' + + '4px; color:#303030; padding: 1px 2px', + "Compte à usage général de l'équipe de Planète Casio."), + ('Robot', 'color: #cf25d0', + "♫ Je suis Nono, le petit robot, l'ami d'Ulysse ♫"), + ('Membre de CreativeCalc', 'color: #222222', + "CreativeCalc est l'association qui gère Planète Casio."), + ] + for g in groups: + db.session.add(Group(*g)) # Clean up test members for name in "PlanèteCasio GLaDOS".split(): m = Member.query.filter_by(name=name).first() if m is not None: + # TODO: Do a real member deletion, not just a hack like this + for sp in SpecialPrivilege.query.filter_by(mid=m.id): + db.session.delete(sp) + db.session.commit() db.session.delete(m) - db.session.commit() + db.session.commit() # Create template members + + def addgroup(member, group): + g = Group.query.filter_by(name=group).first() + if g is not None: + member.groups.append(g) + m = Member('PlanèteCasio','contact@planet-casio.com','v5-forever') - m.groups.append(g_community) + addgroup(m, "Compte communautaire") db.session.add(m) m = Member('GLaDOS', 'glados@aperture.science', 'v5-forever') - m.groups.append(g_modos) - m.groups.append(g_redacs) + addgroup(m, "Robot") db.session.add(m) db.session.add(SpecialPrivilege(m, "edit-posts")) db.session.add(SpecialPrivilege(m, "shoutbox-ban")) @@ -94,6 +120,14 @@ def adm_delete_account(user_id): user = Member.query.filter_by(id=user_id).first() if not user: abort(404) + + # Note: A user deleting their own account will be disconnected. + + # TODO: Add an overview of what will be deleted. + # * How many posts will be turned into guest posts + # * Option: purely delete the posts in question + # * How many PMs will be deleted (can't unassign PMs) + # * etc. del_form = AdminDeleteAccountForm() if request.method == "POST": if del_form.validate_on_submit(): diff --git a/app/static/css/global.css b/app/static/css/global.css index f2a1466..cb06579 100644 --- a/app/static/css/global.css +++ b/app/static/css/global.css @@ -41,11 +41,20 @@ a { text-decoration: none; color: #c61a1a; } +a:hover { + text-decoration: underline; +} a:focus { outline: none; } +/* + Lists +*/ +ul { + line-height: 24px; +} /* Inputs @@ -75,6 +84,10 @@ input[type="submit"] { padding: 6px 10px; border-radius: 2px; cursor: pointer; font-family: 'DejaVu Sans', sans-serif; font-weight: 400; + cursor: pointer; +} +.button:hover { + text-decoration: none; } /* Checkbox */ @@ -94,24 +107,24 @@ input[type="checkbox"] { .bg-green, .bg-green { - background-color: #149641; + background: #149641; color: #ffffff; } .bg-green:hover, .bg-green:focus, .bg-green:active { - background-color: #0f7331; + background: #0f7331; } .bg-red, .bg-red { - background-color: #c0341d; + background: #d23a2f; color: #ffffff; } .bg-red:hover, .bg-red:focus, .bg-red:active { - background-color: #aa3421; + background: #b32a20; } .bg-orange { @@ -127,12 +140,12 @@ input[type="checkbox"] { .bg-white, .bg-white { border: 1px solid #e5e5e5; - background-color: #ffffff; + background: #ffffff; color: #000000; } .bg-white:hover, .bg-white:focus, .bg-white:active { - background-color: #f0f0f0; + background: #f0f0f0; border-color: #e3e3e3; } diff --git a/app/static/css/header.css b/app/static/css/header.css index f38c38a..72e5a7e 100644 --- a/app/static/css/header.css +++ b/app/static/css/header.css @@ -18,6 +18,9 @@ header .spacer { flex: auto 1 0; } +header .links { + margin-left: 16px; +} header svg { width: 24px; height: 24px; vertical-align: middle; transition: .15s ease; @@ -31,9 +34,11 @@ header a { } header form { - /* -24px for the search icon, -2px for the spacing between the search icon - and the field, +16px for spacing with the links */ - margin-right: -10px; + /* The search icon is draws inside the input field but its space is allocated + on the right. Apply a negative margin to compensate this: + -24px for the search icon + -2px for the spacing between the search icon and the field */ + margin-right: -26px; } header input[type="search"] { display: inline-block; width: 250px; @@ -58,13 +63,3 @@ header input[type="search"]:focus ~ a > svg > path { #spotlight { margin-left: 16px; } -#spotlight a { - background: #d23a2f; padding: 8px 18px 6px 18px; - color: white; - height: 24px; line-height: 24px; padding: 6px 12px; - border-radius: 2px; border: 1px solid rgba(0, 0, 255, .1); -} -#spotlight a:hover { - background: #b32a20; - border-color: rgba(128, 128, 255, .05); -} diff --git a/app/static/css/table.css b/app/static/css/table.css index 2163080..5deaa26 100644 --- a/app/static/css/table.css +++ b/app/static/css/table.css @@ -4,6 +4,9 @@ table { border-style: solid; border-width: 0 0 1px 0; } +table tr:nth-child(even) { + background: rgba(0, 0, 0, .05); +} table th { background: #e0e0e0; border-color: #d0d0d0; @@ -12,5 +15,5 @@ table th { padding: 2px; } table td { - padding: 4px; + padding: 4px 6px; } diff --git a/app/templates/admin/delete_account.html b/app/templates/admin/delete_account.html index 6dfbd5f..01e1e8f 100644 --- a/app/templates/admin/delete_account.html +++ b/app/templates/admin/delete_account.html @@ -1,16 +1,20 @@ {% extends "base/base.html" %} +{% block title %} +Panneau d'administration »

Suppression du compte '{{ user.name }}'

+{% endblock %} + {% block content %}
-

Suppression du compte

-
+

Suppression du compte de '{{ user.name }}'

+ {{ del_form.hidden_tag() }}
{{ del_form.delete.label }} {{ del_form.delete(checked=False) }} -
{{ del_form.delete.description }}
+
{{ del_form.delete.description }}
{% for error in del_form.delete.errors %} - {{ error }} + {{ error }} {% endfor %}
{{ del_form.submit(class_="bg-red") }}
diff --git a/app/templates/admin/edit_account.html b/app/templates/admin/edit_account.html index b856662..e5def45 100644 --- a/app/templates/admin/edit_account.html +++ b/app/templates/admin/edit_account.html @@ -1,13 +1,15 @@ {% extends "base/base.html" %} +{% block title %} +Panneau d'administration »

Édition du compte de '{{ user.name }}'

+{% endblock %} + {% block content %}
Retour à l'administration
-

Gestion du compte

- {{ form.hidden_tag() }} diff --git a/app/templates/admin/index.html b/app/templates/admin/index.html index ba9a52d..45d3b0d 100644 --- a/app/templates/admin/index.html +++ b/app/templates/admin/index.html @@ -6,46 +6,64 @@ Panneau d'administration »

Utilisateurs et groupes

{% block content %}
-

Listes des membres utiles

+

Cette page présente une vue d'ensemble des utilisateurs et groupes, ainsi + que les privilèges associés. Seuls les utilisateurs appartenant à un + groupe ou possédant au moins un privilège spécial sont affichés.

- - - +

Membres associés à des groupes ou privilèges spéciaux

- {% for user in users %} - - - - - - - - {% endfor %} -
PseudoEmailDate d'inscriptionXPInnovationNewsletterModifier
{{ user.name }}{{ user.email }}{{ user.register_date }}{{ user.xp }}{{ user.innovation }}{{ "Oui" if user.newsletter else "Non" }}Modifier
+ + + -

Groupes et privilèges

+ {% for user in users %} + + + + + + + + {% endfor %} +
PseudoEmailDate d'inscriptionXPInnovationNewsletterModifier
{{ user.name }}{{ user.email }}{{ user.register_date }}{{ user.xp }}{{ user.innovation }}{{ "Oui" if user.newsletter else "Non" }}Modifier
- - +

Liste des groupes

- {% for group in groups %} - - {% endfor %} -
GroupeMembresPrivilèges
{{ group.name }} - {% for user in group.members %} - {{ user.name }} - {% endfor %} - - {% for priv in group.privs %} - {{ priv }} - {% endfor %} -
+ + -

Maintenance et développement

+ {% for group in groups %} + + {% endfor %} +
GroupeMembresPrivilèges
{{ group.name }} + {% for user in group.members %} + {{ user.name }} + {% endfor %} + + {% for priv in group.privs %} + {{ priv }} + {% endfor %} +
- - {{ form.hidden_tag() }} - {{ form.submit(class="bg-orange") }} - +

Restauration des groupes et privilèges

+ +

Cette fonction régénère un ensemble minimal de groupes et membres + permettant de lancer le forum. Elle opère les modifications + suivantes :

+ +
    +
  • Suppression de tous les groupes.
    • +
  • Création des groupes Administrateur, Modérateur, Développeur, + Rédacteur, Responsable communauté, Partenaire, Compte communautaire, + Robot, Membre de CreativeCalc.
    • +
  • Attribution des privilèges associés à ces groupes.
    • +
  • Recréation des comptes communs : PlanèteCasio (compte communautaire), + GLaDOS (robot).
    • +
+ +
+ {{ form.hidden_tag() }} + {{ form.submit(class="bg-orange") }} +
{% endblock %} diff --git a/app/templates/base/header.html b/app/templates/base/header.html index 7da8ce7..3d530f7 100644 --- a/app/templates/base/header.html +++ b/app/templates/base/header.html @@ -9,14 +9,15 @@ {% if current_user.is_authenticated %} - - - - - +
+ + + + + +
{% endif %}