Merge branch 'fixed_width_image' into 'beta'

Fix profile picture width

See merge request bde/nk20!119
This commit is contained in:
erdnaxe 2020-09-09 15:18:50 +02:00
commit c34296c923
6 changed files with 89 additions and 76 deletions

View File

@ -10,22 +10,22 @@ SPDX-License-Identifier: GPL-3.0-or-later
{% block content %}
<div class="row mt-4">
<div class="col-sm-5 col-md-4" id="infos_div">
<div class="row">
<div class="row justify-content-center justify-content-md-end">
{# User details column #}
<div class="col">
<div class="card bg-light border-success mb-4 text-center">
<div class="col picture-col">
<div class="card bg-light mb-4 text-center">
<a id="profile_pic_link" href="#">
<img src="{% static "member/img/default_picture.png" %}"
id="profile_pic" alt="" class="card-img-top">
id="profile_pic" alt="" class="card-img-top d-none d-sm-block">
</a>
<div class="card-body text-center text-break">
<span id="user_note"></span>
<div class="card-body text-center text-break p-2">
<span id="user_note"><i class="small">{% trans "Please select a note" %}</i></span>
</div>
</div>
</div>
{# User selection column #}
<div class="col-xl-7" id="user_select_div">
<div class="col-xl" id="user_select_div">
<div class="card bg-light border-success mb-4">
<div class="card-header">
<p class="card-text font-weight-bold">
@ -44,6 +44,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
</div>
</div>
</div>
{# Summary of consumption and consume button #}
<div class="col-xl-5 d-none" id="consos_list_div">
<div class="card bg-light border-info mb-4">
@ -65,7 +66,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
</div>
</div>
{# Show last used buttons #}
<div class="card bg-light mb-4">
<div class="card-header">

View File

@ -34,21 +34,21 @@ SPDX-License-Identifier: GPL-2.0-or-later
</div>
</div>
<hr>
<div class="row">
<div class="row justify-content-center">
{# Preview note profile (picture, username and balance) #}
<div class="col-md-3" id="note_infos_div">
<div class="card bg-light border-success shadow mb-4 pt-4 text-center">
<div class="col-md picture-col" id="note_infos_div">
<div class="card bg-light mb-4 text-center">
<a id="profile_pic_link" href="#"><img src="{% static "member/img/default_picture.png" %}"
id="profile_pic" alt="" class="img-fluid rounded mx-auto"></a>
<div class="card-body text-center">
<span id="user_note"></span>
<div class="card-body text-center p-2">
<span id="user_note"><i class="small">{% trans "Please select a note" %}</i></span>
</div>
</div>
</div>
{# list of emitters #}
<div class="col-md-3" id="emitters_div">
<div class="card bg-light border-success shadow mb-4">
<div class="card bg-light mb-4">
<div class="card-header">
<p class="card-text font-weight-bold">
<label for="source_note" id="source_note_label">{% trans "Select emitters" %}</label>
@ -75,7 +75,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
{# list of receiver #}
<div class="col-md-3" id="dests_div">
<div class="card bg-light border-info shadow mb-4">
<div class="card bg-light mb-4">
<div class="card-header">
<p class="card-text font-weight-bold" id="dest_title">
<label for="dest_note" id="dest_note_label">{% trans "Select receivers" %}</label>
@ -97,8 +97,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
</div>
{# Information on transaction (amount, reason, name,...) #}
<div class="col-md-3" id="external_div">
<div class="card bg-light border-warning shadow mb-4">
<div class="col-md" id="external_div">
<div class="card bg-light mb-4">
<div class="card-header">
<p class="card-text font-weight-bold">
{% trans "Action" %}
@ -153,7 +153,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
</div>
</div>
{# transaction history #}
<div class="card shadow mb-4" id="history">
<div class="card mb-4" id="history">
<div class="card-header">
<p class="card-text font-weight-bold">
{% trans "Recent transactions history" %}

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-09-07 19:43+0200\n"
"POT-Creation-Date: 2020-09-09 14:09+0200\n"
"PO-Revision-Date: 2020-09-03 23:47+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@ -524,7 +524,7 @@ msgid "This image cannot be loaded."
msgstr "Dieses Bild kann nicht geladen werden."
#: apps/member/forms.py:139 apps/member/views.py:98
#: apps/registration/forms.py:33 apps/registration/views.py:237
#: apps/registration/forms.py:33 apps/registration/views.py:241
msgid "An alias with a similar name already exists."
msgstr "Ein ähnliches Alias ist schon benutzt."
@ -1118,8 +1118,8 @@ msgid "The membership must begin before {:%m-%d-%Y}."
msgstr "Die Mitgliedschaft muss vor {:%m-%d-Y} anfängen."
#: apps/member/views.py:644 apps/member/views.py:646 apps/member/views.py:648
#: apps/registration/views.py:287 apps/registration/views.py:289
#: apps/registration/views.py:291 apps/wei/views.py:927 apps/wei/views.py:931
#: apps/registration/views.py:291 apps/registration/views.py:293
#: apps/registration/views.py:295 apps/wei/views.py:927 apps/wei/views.py:931
msgid "This field is required."
msgstr "Dies ist ein Pflichtfeld."
@ -1454,6 +1454,11 @@ msgstr "Löschen"
msgid "Edit"
msgstr "Bearbeiten"
#: apps/note/templates/note/conso_form.html:22
#: apps/note/templates/note/transaction_form.html:44
msgid "Please select a note"
msgstr "Wählen Sie eine Note"
#: apps/note/templates/note/conso_form.html:32
msgid "Consum"
msgstr "Konsumieren"
@ -1464,11 +1469,11 @@ msgstr "Konsumieren"
msgid "Name or alias..."
msgstr "Name oder Alias..."
#: apps/note/templates/note/conso_form.html:52
#: apps/note/templates/note/conso_form.html:53
msgid "Select consumptions"
msgstr "Verbrauchswerte auswählen"
#: apps/note/templates/note/conso_form.html:61
#: apps/note/templates/note/conso_form.html:62
msgid "Consume!"
msgstr "Konsumieren!"
@ -1694,7 +1699,7 @@ msgstr ""
"Sie haben nicht die Berechtigung, das Feld {field} in dieser Instanz von "
"Modell {app_label} zu ändern. {model_name}"
#: apps/permission/signals.py:73 apps/permission/views.py:89
#: apps/permission/signals.py:73 apps/permission/views.py:101
#, python-brace-format
msgid ""
"You don't have the permission to add an instance of model {app_label}."
@ -1752,7 +1757,7 @@ msgstr "Abfrage:"
msgid "No associated permission"
msgstr "Keine zugehörige Berechtigung"
#: apps/permission/views.py:56
#: apps/permission/views.py:68
#, python-brace-format
msgid ""
"You don't have the permission to update this instance of the model "
@ -1762,7 +1767,7 @@ msgstr ""
"diesen Parametern zu aktualisieren. Bitte korrigieren Sie Ihre Daten und "
"versuchen Sie es erneut."
#: apps/permission/views.py:60
#: apps/permission/views.py:72
#, python-brace-format
msgid ""
"You don't have the permission to create an instance of the model \"{model}\" "
@ -1772,11 +1777,11 @@ msgstr ""
"diesen Parametern zu erstellen. Bitte korrigieren Sie Ihre Daten und "
"versuchen Sie es erneut."
#: apps/permission/views.py:96 note_kfet/templates/base.html:106
#: apps/permission/views.py:108 note_kfet/templates/base.html:106
msgid "Rights"
msgstr "Rechten"
#: apps/permission/views.py:101
#: apps/permission/views.py:113
msgid "All rights"
msgstr "Alle Rechten"
@ -1909,54 +1914,54 @@ msgstr "Danke"
msgid "The Note Kfet team."
msgstr "Die NoteKfet Team."
#: apps/registration/views.py:38
#: apps/registration/views.py:39
msgid "Register new user"
msgstr "Neuen User registrieren"
#: apps/registration/views.py:82
#: apps/registration/views.py:83
msgid "Email validation"
msgstr "Email validierung"
#: apps/registration/views.py:84
#: apps/registration/views.py:85
msgid "Validate email"
msgstr "Email validieren"
#: apps/registration/views.py:126
#: apps/registration/views.py:127
msgid "Email validation unsuccessful"
msgstr "Email validierung unerfolgreich"
#: apps/registration/views.py:137
#: apps/registration/views.py:138
msgid "Email validation email sent"
msgstr "Validierungsemail wurde gesendet"
#: apps/registration/views.py:145
#: apps/registration/views.py:146
msgid "Resend email validation link"
msgstr "E-Mail-Validierungslink erneut senden"
#: apps/registration/views.py:163
#: apps/registration/views.py:164
msgid "Pre-registered users list"
msgstr "Vorregistrierte Userliste"
#: apps/registration/views.py:187
#: apps/registration/views.py:188
msgid "Unregistered users"
msgstr "Unregistrierte Users"
#: apps/registration/views.py:200
#: apps/registration/views.py:201
msgid "Registration detail"
msgstr "Registrierung Detailen"
#: apps/registration/views.py:256
#: apps/registration/views.py:260
msgid "You must join the BDE."
msgstr "Sie müssen die BDE beitreten."
#: apps/registration/views.py:280
#: apps/registration/views.py:284
msgid ""
"The entered amount is not enough for the memberships, should be at least {}"
msgstr ""
"Der eingegebene Betrag reicht für die Mitgliedschaft nicht aus, sollte "
"mindestens {} betragen"
#: apps/registration/views.py:355
#: apps/registration/views.py:364
msgid "Invalidate pre-registration"
msgstr "Ungültige Vorregistrierung"
@ -2102,7 +2107,7 @@ msgstr "spezielle Transaktion Proxies"
msgid "credit transaction"
msgstr "Kredit Transaktion"
#: apps/treasury/models.py:352
#: apps/treasury/models.py:360
msgid ""
"This user doesn't have enough money to pay the memberships with its note. "
"Please ask her/him to credit the note before invalidating this credit."
@ -2110,16 +2115,16 @@ msgstr ""
"Dieser Benutzer hat nicht genug Geld, um die Mitgliedschaften mit seiner "
"Note zu bezahlen."
#: apps/treasury/models.py:364
#: apps/treasury/models.py:375
#: apps/treasury/templates/treasury/sogecredit_detail.html:10
msgid "Credit from the Société générale"
msgstr "Kredit von der Société générale"
#: apps/treasury/models.py:365
#: apps/treasury/models.py:376
msgid "Credits from the Société générale"
msgstr "Krediten von der Société générale"
#: apps/treasury/models.py:368
#: apps/treasury/models.py:379
#, python-brace-format
msgid "Soge credit for {user}"
msgstr "Kredit von der Société générale für {user}"
@ -2356,7 +2361,7 @@ msgstr "Fügen Sie einer Überweisung eine Transaktion hinzu"
msgid "List of credits from the Société générale"
msgstr "Kreditliste von Société générale"
#: apps/treasury/views.py:443
#: apps/treasury/views.py:440
msgid "Manage credits from the Société générale"
msgstr "Krediten von der Société générale handeln"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-09-07 19:43+0200\n"
"POT-Creation-Date: 2020-09-09 14:09+0200\n"
"PO-Revision-Date: 2020-09-02 23:18+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@ -526,7 +526,7 @@ msgid "This image cannot be loaded."
msgstr "Cette image ne peut pas être chargée."
#: apps/member/forms.py:139 apps/member/views.py:98
#: apps/registration/forms.py:33 apps/registration/views.py:237
#: apps/registration/forms.py:33 apps/registration/views.py:241
msgid "An alias with a similar name already exists."
msgstr "Un alias avec un nom similaire existe déjà."
@ -1120,8 +1120,8 @@ msgid "The membership must begin before {:%m-%d-%Y}."
msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}."
#: apps/member/views.py:644 apps/member/views.py:646 apps/member/views.py:648
#: apps/registration/views.py:287 apps/registration/views.py:289
#: apps/registration/views.py:291 apps/wei/views.py:927 apps/wei/views.py:931
#: apps/registration/views.py:291 apps/registration/views.py:293
#: apps/registration/views.py:295 apps/wei/views.py:927 apps/wei/views.py:931
msgid "This field is required."
msgstr "Ce champ est requis."
@ -1459,6 +1459,11 @@ msgstr "Supprimer"
msgid "Edit"
msgstr "Éditer"
#: apps/note/templates/note/conso_form.html:22
#: apps/note/templates/note/transaction_form.html:44
msgid "Please select a note"
msgstr "Sélectionnez une note"
#: apps/note/templates/note/conso_form.html:32
msgid "Consum"
msgstr "Consommer"
@ -1469,11 +1474,11 @@ msgstr "Consommer"
msgid "Name or alias..."
msgstr "Pseudo ou alias ..."
#: apps/note/templates/note/conso_form.html:52
#: apps/note/templates/note/conso_form.html:53
msgid "Select consumptions"
msgstr "Sélection des consommations"
#: apps/note/templates/note/conso_form.html:61
#: apps/note/templates/note/conso_form.html:62
msgid "Consume!"
msgstr "Consommer !"
@ -1701,7 +1706,7 @@ msgstr ""
"Vous n'avez pas la permission de modifier le champ {field} sur l'instance du "
"modèle {app_label}.{model_name}."
#: apps/permission/signals.py:73 apps/permission/views.py:89
#: apps/permission/signals.py:73 apps/permission/views.py:101
#, python-brace-format
msgid ""
"You don't have the permission to add an instance of model {app_label}."
@ -1760,7 +1765,7 @@ msgstr "Requête :"
msgid "No associated permission"
msgstr "Pas de permission associée"
#: apps/permission/views.py:56
#: apps/permission/views.py:68
#, python-brace-format
msgid ""
"You don't have the permission to update this instance of the model "
@ -1769,7 +1774,7 @@ msgstr ""
"Vous n'avez pas la permission de modifier cette instance du modèle « {model} "
"» avec ces paramètres. Merci de les corriger et de réessayer."
#: apps/permission/views.py:60
#: apps/permission/views.py:72
#, python-brace-format
msgid ""
"You don't have the permission to create an instance of the model \"{model}\" "
@ -1778,11 +1783,11 @@ msgstr ""
"Vous n'avez pas la permission d'ajouter une instance du modèle « {model} » "
"avec ces paramètres. Merci de les corriger et de réessayer."
#: apps/permission/views.py:96 note_kfet/templates/base.html:106
#: apps/permission/views.py:108 note_kfet/templates/base.html:106
msgid "Rights"
msgstr "Droits"
#: apps/permission/views.py:101
#: apps/permission/views.py:113
msgid "All rights"
msgstr "Tous les droits"
@ -1913,54 +1918,54 @@ msgstr "Merci"
msgid "The Note Kfet team."
msgstr "L'équipe de la Note Kfet."
#: apps/registration/views.py:38
#: apps/registration/views.py:39
msgid "Register new user"
msgstr "Enregistrer un nouvel utilisateur"
#: apps/registration/views.py:82
#: apps/registration/views.py:83
msgid "Email validation"
msgstr "Validation de l'adresse mail"
#: apps/registration/views.py:84
#: apps/registration/views.py:85
msgid "Validate email"
msgstr "Valider l'adresse e-mail"
#: apps/registration/views.py:126
#: apps/registration/views.py:127
msgid "Email validation unsuccessful"
msgstr "La validation de l'adresse mail a échoué"
#: apps/registration/views.py:137
#: apps/registration/views.py:138
msgid "Email validation email sent"
msgstr "L'email de vérification de l'adresse email a bien été envoyé"
#: apps/registration/views.py:145
#: apps/registration/views.py:146
msgid "Resend email validation link"
msgstr "Renvoyer le lien de validation"
#: apps/registration/views.py:163
#: apps/registration/views.py:164
msgid "Pre-registered users list"
msgstr "Liste des utilisateurs en attente d'inscription"
#: apps/registration/views.py:187
#: apps/registration/views.py:188
msgid "Unregistered users"
msgstr "Utilisateurs en attente d'inscription"
#: apps/registration/views.py:200
#: apps/registration/views.py:201
msgid "Registration detail"
msgstr "Détails de l'inscription"
#: apps/registration/views.py:256
#: apps/registration/views.py:260
msgid "You must join the BDE."
msgstr "Vous devez adhérer au BDE."
#: apps/registration/views.py:280
#: apps/registration/views.py:284
msgid ""
"The entered amount is not enough for the memberships, should be at least {}"
msgstr ""
"Le montant crédité est trop faible pour adhérer, il doit être au minimum de "
"{}"
#: apps/registration/views.py:355
#: apps/registration/views.py:364
msgid "Invalidate pre-registration"
msgstr "Invalider l'inscription"
@ -2106,7 +2111,7 @@ msgstr "proxys de transactions spéciales"
msgid "credit transaction"
msgstr "transaction de crédit"
#: apps/treasury/models.py:352
#: apps/treasury/models.py:360
msgid ""
"This user doesn't have enough money to pay the memberships with its note. "
"Please ask her/him to credit the note before invalidating this credit."
@ -2114,16 +2119,16 @@ msgstr ""
"Cet utilisateur n'a pas assez d'argent pour payer les adhésions avec sa "
"note. Merci de lui demander de recharger sa note avant d'invalider ce crédit."
#: apps/treasury/models.py:364
#: apps/treasury/models.py:375
#: apps/treasury/templates/treasury/sogecredit_detail.html:10
msgid "Credit from the Société générale"
msgstr "Crédit de la Société générale"
#: apps/treasury/models.py:365
#: apps/treasury/models.py:376
msgid "Credits from the Société générale"
msgstr "Crédits de la Société générale"
#: apps/treasury/models.py:368
#: apps/treasury/models.py:379
#, python-brace-format
msgid "Soge credit for {user}"
msgstr "Crédit de la société générale pour l'utilisateur {user}"
@ -2358,7 +2363,7 @@ msgstr "Joindre une transaction à une remise"
msgid "List of credits from the Société générale"
msgstr "Liste des crédits de la Société générale"
#: apps/treasury/views.py:443
#: apps/treasury/views.py:440
msgid "Manage credits from the Société générale"
msgstr "Gérer les crédits de la Société générale"

View File

@ -22,6 +22,11 @@
border-bottom-color: rgba(0, 0, 0, .250);
}
/* Fixed width picture column */
.picture-col {
max-width: 202px;
}
/* Limit fluid container to a max size */
.container-fluid {
max-width: 1600px;

View File

@ -29,7 +29,6 @@ $(document).ready(function () {
// Switching in double consumptions mode should update the layout
$('#double_conso').change(function () {
$('#consos_list_div').removeClass('d-none')
$('#user_select_div').attr('class', 'col-xl-4')
$('#infos_div').attr('class', 'col-sm-5 col-xl-6')
const note_list_obj = $('#note_list')
@ -48,7 +47,6 @@ $(document).ready(function () {
$('#single_conso').change(function () {
$('#consos_list_div').addClass('d-none')
$('#user_select_div').attr('class', 'col-xl-7')
$('#infos_div').attr('class', 'col-sm-5 col-md-4')
const consos_list_obj = $('#consos_list')