Standardize user image + minor bugs
This commit is contained in:
parent
5147980d43
commit
208a4e4ef7
23 changed files with 608 additions and 540 deletions
|
@ -179,7 +179,7 @@
|
|||
</span>
|
||||
{% if request.user.is_authenticated %}
|
||||
<span id="user-links">
|
||||
<img src="{{ gravatar(request.profile, 32) }}" height="24" width="24">
|
||||
<img class="user-img" src="{{ gravatar(request.profile, 32) }}" height="24" width="24">
|
||||
<i class="fa fa-angle-down" style="font-size: 18px; padding-top: 8px;"></i>
|
||||
</span>
|
||||
<div class="dropdown" id="userlink_dropdown" role="tooptip">
|
||||
|
@ -277,9 +277,9 @@
|
|||
<div id="announcement">{{ i18n_config.announcement|safe }}</div>
|
||||
{% endif %}
|
||||
|
||||
<script src="https://unpkg.com/@popperjs/core@2"></script>
|
||||
{% compress js %}
|
||||
<script>{{ inlinei18n(LANGUAGE_CODE)|safe }}</script>
|
||||
<script src="{{ static('libs/popper.min.js') }}"></script>
|
||||
<script src="{{ static('libs/jquery-cookie.js') }}"></script>
|
||||
<script src="{{ static('libs/jquery-taphold.js') }}"></script>
|
||||
<script src="{{ static('libs/jquery.unveil.js') }}"></script>
|
||||
|
|
|
@ -1,10 +1,12 @@
|
|||
{% for post in posts%}
|
||||
<section class="{% if post.sticky %}sticky {% endif %}blog-box">
|
||||
<div style="margin-bottom: 0.5em">
|
||||
<span class="time">
|
||||
<span class="item-header time">
|
||||
{% with authors=post.authors.all() %}
|
||||
{%- if authors -%}
|
||||
<img src="{{gravatar(authors[0])}}" style="width: 1.5em; border-radius: 50%; margin-bottom: -0.3em">
|
||||
<span class="user-img" style="width: 1.5em; height: 1.5em">
|
||||
<img src="{{gravatar(authors[0])}}">
|
||||
</span>
|
||||
<span class="post-authors">{{ link_users(authors) }}</span>
|
||||
{%- endif -%}
|
||||
{% endwith %}
|
||||
|
|
|
@ -7,8 +7,11 @@
|
|||
clear: both;
|
||||
}
|
||||
}
|
||||
.time {
|
||||
.item-header {
|
||||
margin-left: 0;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.2em;
|
||||
}
|
||||
|
||||
.no-clarifications-message {
|
||||
|
|
|
@ -66,7 +66,6 @@
|
|||
.profile-pic {
|
||||
height: 2.6em;
|
||||
width: 2.6em;
|
||||
border-radius: 50%;
|
||||
margin-top: 0.1em;
|
||||
float: left;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<li class="message" id="message-{{ message.id }}" message-id="{{ message.id }}">
|
||||
<a href="{{ url('user_page', message.author.username) }}">
|
||||
<img src="{{ gravatar(message.author, 135) }}" class="profile-pic">
|
||||
<img src="{{ gravatar(message.author, 135) }}" class="profile-pic user-img">
|
||||
</a>
|
||||
<div class="body-message">
|
||||
<div class="user-time">
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<li class="status-row" id="lobby_row">
|
||||
<div class="status-container">
|
||||
<img src="{{ static('icons/logo.svg') }}" style="height:1.3em">
|
||||
<img src="{{ static('icons/icon.svg') }}" style="height:32px">
|
||||
</div>
|
||||
<span style="padding-left:0.5em">
|
||||
<b>{{_('Lobby')}}</b>
|
||||
|
@ -23,7 +23,7 @@
|
|||
{% for user in section.user_list %}
|
||||
<li class="click_space status-row" id="click_space_{{user.user.id}}" value="{{user.url}}">
|
||||
<div class="status-container">
|
||||
<img src="{{ gravatar(user.user, 135) }}" class="status-pic">
|
||||
<img src="{{ gravatar(user.user, 135) }}" class="status-pic user-img">
|
||||
<svg style="position:absolute;" height="32" width="32">
|
||||
<circle class="status-circle" fill="{{'green' if user.is_online else 'red'}}"/>
|
||||
</svg>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
</div>
|
||||
{% if other_user %}
|
||||
<div class="status-container" style="height: 3em; width: 3em;">
|
||||
<img src="{{ gravatar(other_user, 135) }}" class="info-pic">
|
||||
<img src="{{ gravatar(other_user, 135) }}" class="info-pic user-img">
|
||||
<svg style="position:absolute; height:100%; width: 100%; transform: rotate(180deg);" >
|
||||
<circle class="info-circle"
|
||||
fill="{{'green' if other_online else 'red'}}"/>
|
||||
|
@ -11,7 +11,7 @@
|
|||
</div>
|
||||
{% else %}
|
||||
<div class="status-container" style="height: 3em;">
|
||||
<img src="{{ static('icons/logo.svg') }}" class="info-pic" style="border-radius: 0px;">
|
||||
<img src="{{ static('icons/icon.svg') }}" class="info-pic" style="border-radius: 0px;">
|
||||
</div>
|
||||
{% endif %}
|
||||
<span class="info-name username">
|
||||
|
|
|
@ -25,8 +25,8 @@
|
|||
<div class="detail">
|
||||
<div class="header">
|
||||
{% with author=node.author, user=node.author.user %}
|
||||
<a href="{{ url('user_page', user.username) }}" class="user comment-img">
|
||||
<img src="{{ gravatar(author, 135) }}" class="gravatar">
|
||||
<a href="{{ url('user_page', user.username) }}" class="user comment-img user-img">
|
||||
<img src="{{ gravatar(author, 135) }}">
|
||||
</a>
|
||||
{% endwith %}
|
||||
{{ link_user(node.author) }},
|
||||
|
|
|
@ -5,12 +5,9 @@
|
|||
.organization-container .organization-row:last-child {
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
.org-logo {
|
||||
vertical-align: middle;
|
||||
height: 2em;
|
||||
width: 2em;
|
||||
display: inline-block;
|
||||
margin-right: 1em;
|
||||
margin-left: 0.5em;
|
||||
}
|
||||
|
@ -31,8 +28,12 @@
|
|||
<h3 style="padding-bottom: 1em" class="toggle open"><i class="fa fa-chevron-right fa-fw"></i> {{title}} ({{queryset.count()}})</h3>
|
||||
<div class="organization-container toggled">
|
||||
{% for org in queryset %}
|
||||
<a href="{{ org.get_absolute_url() }}" class="organization-row" title="{{org.about}}">
|
||||
<img class="org-logo" loading="lazy" src="{{ org.logo_override_image or static('icons/icon.svg') }}" onerror="{{static('icons/logo.svg')}}">
|
||||
<a href="{{ org.get_absolute_url() }}" class="organization-row">
|
||||
{% if org.logo_override_image %}
|
||||
<img class="user-img org-logo" loading="lazy" src="{{ org.logo_override_image }}">
|
||||
{% else %}
|
||||
<img class="org-logo" loading="lazy" src="{{ static('icons/icon.svg') }}" onerror="{{static('icons/logo.svg')}}">
|
||||
{% endif %}
|
||||
<span style="margin-right: auto">{{ org.name }}</span>
|
||||
<span style="font-weight: normal"><i>{{ org.member_count }} {{_('members')}}</i></span>
|
||||
</a>
|
||||
|
|
|
@ -10,32 +10,35 @@
|
|||
<script type="text/javascript" src="{{ static('fine-uploader/jquery.fine-uploader.js') }}"></script>
|
||||
<script type="text/javascript">
|
||||
$(function () {
|
||||
$("#problem-data-zipfile_fine_uploader").fineUploader({
|
||||
request: {
|
||||
endpoint: "{{url('problem_zip_upload', problem.code)}}",
|
||||
params: {
|
||||
'csrfmiddlewaretoken': '{{ csrf_token }}'
|
||||
if (!window.PAGE_FROM_BACK_BUTTON_CACHE) {
|
||||
$("#problem-data-zipfile_fine_uploader").fineUploader({
|
||||
request: {
|
||||
endpoint: "{{url('problem_zip_upload', problem.code)}}",
|
||||
params: {
|
||||
'csrfmiddlewaretoken': '{{ csrf_token }}'
|
||||
}
|
||||
},
|
||||
chunking: {
|
||||
enabled: true,
|
||||
partSize: 40000000,
|
||||
},
|
||||
resume: {
|
||||
enabled: true
|
||||
},
|
||||
validation: {
|
||||
allowedExtensions: ['zip'],
|
||||
},
|
||||
}).on('complete', function (event, id, name, responseJSON) {
|
||||
console.log(responseJSON);
|
||||
if (!responseJSON.success) {
|
||||
alert('Fail to upload: ' + responseJSON.error);
|
||||
}
|
||||
},
|
||||
chunking: {
|
||||
enabled: true,
|
||||
partSize: 40000000,
|
||||
},
|
||||
resume: {
|
||||
enabled: true
|
||||
},
|
||||
validation: {
|
||||
allowedExtensions: ['zip'],
|
||||
},
|
||||
}).on('complete', function (event, id, name, responseJSON) {
|
||||
console.log(responseJSON);
|
||||
if (!responseJSON.success) {
|
||||
alert('Fail to upload: ' + responseJSON.error);
|
||||
}
|
||||
else {
|
||||
$('#submit-button').click();
|
||||
}
|
||||
});;
|
||||
else {
|
||||
$('#submit-button').click();
|
||||
}
|
||||
});
|
||||
toggle_custom();
|
||||
}
|
||||
|
||||
function update_select2() {
|
||||
$('tbody:not(.extra-row-body) .type-column select').select2({
|
||||
|
@ -133,7 +136,7 @@
|
|||
}).change();
|
||||
}
|
||||
|
||||
(function toggle_custom() {
|
||||
function toggle_custom() {
|
||||
let $checker = $('#id_problem-data-checker')
|
||||
|
||||
let $custom_checker = $('#id_problem-data-custom_checker');
|
||||
|
@ -175,7 +178,7 @@
|
|||
$tr_sig_header.toggle($ioi_signature.is(':checked')).change();
|
||||
$tr_sig_handler.toggle($ioi_signature.is(':checked')).change();
|
||||
}).change();
|
||||
})();
|
||||
};
|
||||
|
||||
checker_precision($('#id_problem-data-checker'));
|
||||
|
||||
|
|
|
@ -1,10 +1,8 @@
|
|||
{% block two_col_media %}
|
||||
<style>
|
||||
.org-logo {
|
||||
vertical-align: middle;
|
||||
height: 2em;
|
||||
width: 2em;
|
||||
display: inline-block;
|
||||
margin-right: 0.5em;
|
||||
}
|
||||
.toggle {
|
||||
|
@ -21,9 +19,13 @@
|
|||
<h3 class="bold-text colored-text"><i class="fa fa-users"></i>{{ _('Recent groups') }}</h3>
|
||||
<div class="toggled sidebox-content">
|
||||
{% for organization in recent_organizations %}
|
||||
<a href="{{ url('organization_home', organization.organization.pk, organization.organization.slug) }}" class="organization-row" title="{{organization.organization.about}}">
|
||||
<img class="org-logo" loading="lazy" src="{{ organization.organization.logo_override_image or static('icons/icon.svg') }}">
|
||||
<span style="word-break: break-word;">{{ organization.organization }}</span>
|
||||
<a href="{{ url('organization_home', organization.pk, organization.slug) }}" class="organization-row">
|
||||
{% if organization.logo_override_image %}
|
||||
<img class="org-logo user-img" loading="lazy" src="{{ organization.logo_override_image }}">
|
||||
{% else %}
|
||||
<img class="org-logo" loading="lazy" src="{{ static('icons/icon.svg') }}" onerror="{{static('icons/logo.svg')}}">
|
||||
{% endif %}
|
||||
<span style="word-break: break-word;">{{ organization.name }}</span>
|
||||
</a>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{% set can_view = submission.is_accessible_by(profile) %}
|
||||
<div class="sub-user-img">
|
||||
<div class="sub-user-img user-img">
|
||||
<img src="{{gravatar(submission.user)}}">
|
||||
</div>
|
||||
<div class="sub-details">
|
||||
|
|
|
@ -4,19 +4,10 @@
|
|||
{% block user_media %}{% endblock %}
|
||||
|
||||
<style>
|
||||
.user-gravatar {
|
||||
display: block;
|
||||
padding-right: 15px;
|
||||
width: 145px;
|
||||
.user-profile-img {
|
||||
width: 150px;
|
||||
height: 150px;
|
||||
}
|
||||
|
||||
.user-gravatar img {
|
||||
width: 145px;
|
||||
height: 145px;
|
||||
display: block;
|
||||
border-radius: 6px;
|
||||
}
|
||||
|
||||
.page-title {
|
||||
display: -webkit-box;
|
||||
display: -webkit-flex;
|
||||
|
@ -100,14 +91,14 @@
|
|||
{% block body %}
|
||||
<div class="user-info-page">
|
||||
<div class="user-sidebar">
|
||||
<div class="user-gravatar">
|
||||
<img src="{{ gravatar(user, 145) }}" width="145px" height="145px">
|
||||
<div class="user-img user-profile-img">
|
||||
<img src="{{ gravatar(user, 145) }}">
|
||||
</div>
|
||||
<br>
|
||||
{% if request.user.is_authenticated and request.profile != user %}
|
||||
<form method="post" action="{{ url('user_toggle_follow', user.username) }}">
|
||||
{% csrf_token %}
|
||||
<button class="small {{ 'unfollow' if followed else 'follow' }}" style="width:145px">
|
||||
<button class="small {{ 'unfollow' if followed else 'follow' }}" style="width:100%">
|
||||
{% if followed %}
|
||||
<i class="fa fa-remove"></i>
|
||||
{{ _('Unfollow') }}
|
||||
|
@ -118,16 +109,16 @@
|
|||
</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
{% if request.user.is_authenticated %}
|
||||
{% if request.user.is_authenticated and request.profile != user %}
|
||||
<br>
|
||||
<button class="small btn-midnightblue" style="width:145px" id="message-button">
|
||||
<button class="small btn-midnightblue" style="width:100%" id="message-button">
|
||||
{{ _('Send message') }}
|
||||
</button>
|
||||
{% endif %}
|
||||
|
||||
{% if ratings %}
|
||||
<br>
|
||||
<div style="border: 3px dashed darkgray; padding: 0.3em; margin-right: 15px; border-radius: 6px;">
|
||||
<div style="border: 3px dashed darkgray; padding: 0.3em; border-radius: 6px;">
|
||||
<div class="user-stat-container">
|
||||
<div class="user-stat-header">{{_('Contests written')}}:</div>
|
||||
<div class="user-stat">{{ratings|length}}</div>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
{% endblock %}
|
||||
|
||||
{% block after_rank %}
|
||||
<td><img style="border: 2px solid lightblue; max-width: none; border-radius: 50%" src="{{ gravatar(user, 45) }}" height="45px" width="45px"></td>
|
||||
<td><img style="border: 2px solid lightblue; max-width: none;" class="user-img" src="{{ gravatar(user, 45) }}" height="45px" width="45px"></td>
|
||||
{% endblock %}
|
||||
|
||||
{% block user_footer %}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue