diff --git a/static/css/base.css b/static/css/base.css index dcb88db8..a13c596f 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -79,19 +79,6 @@ a > i.fa { vertical-align: middle; } -/* Pull sidebars to the bottom */ -@media (min-width: 767px) { - .row { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - } - .row > [class*='col-'] { - flex-direction: column; - } -} - /* On small screens, set height to 'auto' for sidenav and grid */ @media screen and (max-width: 767px) { .sidenav { @@ -145,3 +132,14 @@ th.long_text{ .dashboard{ text-align: center; } + +/* Detailed information on profile page */ +dl.profile-info { + margin-top: -16px; + margin-bottom: 0; +} + +dl.profile-info > div { + padding: 8px; + border-top: 1px solid #ddd; +} diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html index cdc9a9d1..741ecac0 100644 --- a/users/templates/users/profil.html +++ b/users/templates/users/profil.html @@ -117,147 +117,189 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% trans "Mailing" %} | - {% if users.club.mailing %} -{{ users.pseudo }}(-admin) | - {% else %} -{% trans "Mailing disabled" %} | - {% endif %} - {% else %} -{% trans "Firt name" %} | -{{ users.name }} | - {% endif %} -{% trans "Surname" %} | -{{ users.surname }} | -|
---|---|---|---|---|---|---|---|
{% trans "Username" %} | -{{ users.pseudo }} | -{% trans "Email address" %} | -{{users.email}} | -||||
{% trans "Room" %} | -{{ users.room }} {% can_view_all Port %}{% if users.room.port_set.all %} / {{ users.room.port_set.all|join:", " }} {% endif %}{% acl_end %} | -{% trans "Telephone number" %} | -{{ users.telephone }} | -||||
{% trans "School" %} | -{{ users.school }} | -{% trans "Comment" %} | -{{ users.comment }} | -||||
{% trans "Registration date" %} | -{{ users.registered }} | -{% trans "Last login" %} | -{{ users.last_login }} | -||||
{% trans "End of membership" %} | - {% if users.end_adhesion != None %} -{{ users.end_adhesion }} | +{% trans "Not a member" %} | +{% trans "Whitelist" %} | - {% if users.end_whitelist != None %} -{{ users.end_whitelist }} | - {% else %} -{% trans "None" %} | - {% endif %} -||
{% trans "Ban" %} | - {% if users.end_ban != None %} -{{ users.end_ban }} | - {% else %} -{% trans "Not banned" %} | - {% endif %} -{% trans "State" %} | - {% if users.state == 0 %} -{% trans "Active" %} | - {% elif users.state == 1 %} -{% trans "Disabled" %} | - {% elif users.state == 2 %} -{% trans "Archived" %} | - {% elif users.state == 3 %} -{% trans "Not yet Member" %} | + +
{% trans "Internet access" %} | + + +{% blocktrans with end_access=users.end_access %}Active (until {{ end_access }}){% endblocktrans %} | +{% trans "Disabled" %} | +{% trans "Groups of rights" %} | +{{ users.groups.all|join:", "}} | +{% trans "None" %} | +||
{% trans "Balance" %} | -{{ users.solde }} € - {% if user_solde %} - - - {% trans "Refill" %} - - {% endif %} - | - {% if users.adherent.gpg_fingerprint %} -{% trans "GPG fingerprint" %} | -{{ users.adherent.gpg_fingerprint }} | - {% endif %} -||||
{% trans "Shell" %} | -{{ users.shell }} | - {% endif %} -