Add organization private pages
This commit is contained in:
cuom1999
parent
4c3441b197
commit
4502dbf6b9
14 changed files with 369 additions and 156 deletions
52
templates/blog/blog.html
Normal file
52
templates/blog/blog.html
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{% extends "base.html" %}
|
||||
|
||||
{% block js_media %}
|
||||
{% include "comments/media-js.html" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block media %}
|
||||
{% include "comments/media-css.html" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block header %}
|
||||
{% if post.is_editable_by(request.user) %}
|
||||
<div class="title-line-action">[<a href="{{ url('admin:judge_blogpost_change', post.id) }}">{{ _('Edit') }}</a>]</div>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
<div class="post-full">
|
||||
<div class="time">
|
||||
{% with authors=post.authors.all() %}
|
||||
{% if authors %}
|
||||
<span class="post-authors">{{ link_users(authors) }}</span>
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
<span class="post-time">
|
||||
{% trans time=post.publish_on|date(_("N j, Y, g:i a")) %}
|
||||
posted on {{ time }}
|
||||
{% endtrans %}
|
||||
</span>
|
||||
</div>
|
||||
<div class="body content-description">
|
||||
{% cache 86400 'post_content' post.id MATH_ENGINE %}
|
||||
{{ post.content|markdown('blog', MATH_ENGINE)|reference|str|safe}}
|
||||
{% endcache %}
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<span class="social">
|
||||
{{ post_to_gplus(request, post, '<i class="fa fa-google-plus-square"></i>') }}
|
||||
{{ post_to_facebook(request, post, '<i class="fa fa-facebook-official"></i>') }}
|
||||
{{ post_to_twitter(request, SITE_NAME + ':', post, '<i class="fa fa-twitter"></i>') }}
|
||||
</span>
|
||||
{% include "comments/list.html" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block bodyend %}
|
||||
{{ super() }}
|
||||
{% if REQUIRE_JAX %}
|
||||
{% include "mathjax-load.html" %}
|
||||
{% endif %}
|
||||
{% include "comments/math.html" %}
|
||||
{% endblock %}
|
||||
|
|
@ -1,53 +1,40 @@
|
|||
{% extends "base.html" %}
|
||||
|
||||
{% block js_media %}
|
||||
{% include "comments/media-js.html" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block media %}
|
||||
{% include "comments/media-css.html" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block header %}
|
||||
{% if perms.judge.change_blogpost %}
|
||||
<div class="title-line-action">[<a href="{{ url('admin:judge_blogpost_change', post.id) }}">{{ _('Edit') }}</a>]
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
<div class="post-full">
|
||||
<div class="time">
|
||||
<section class="{% if post.sticky %}sticky {% endif %}post">
|
||||
<span style="float:right">
|
||||
<span class="time">
|
||||
{%- if post.sticky %}<i title="Sticky" class="fa fa-star fa-fw"></i>{% endif -%}
|
||||
{% with authors=post.authors.all() %}
|
||||
{% if authors %}
|
||||
{%- if authors -%}
|
||||
<span class="post-authors">{{ link_users(authors) }}</span>
|
||||
{% endif %}
|
||||
{%- endif -%}
|
||||
{% endwith %}
|
||||
<span class="post-time">
|
||||
{% trans time=post.publish_on|date(_("N j, Y, g:i a")) %}
|
||||
posted on {{ time }}
|
||||
{% endtrans %}
|
||||
</span>
|
||||
</div>
|
||||
<div class="body content-description">
|
||||
{% cache 86400 'post_content' post.id MATH_ENGINE %}
|
||||
{{ post.content|markdown('blog', MATH_ENGINE)|reference|str|safe}}
|
||||
{% endcache %}
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<span class="social">
|
||||
{{ post_to_gplus(request, post, '<i class="fa fa-google-plus-square"></i>') }}
|
||||
{{ post_to_facebook(request, post, '<i class="fa fa-facebook-official"></i>') }}
|
||||
{{ post_to_twitter(request, SITE_NAME + ':', post, '<i class="fa fa-twitter"></i>') }}
|
||||
{{ relative_time(post.publish_on, abs=_('posted on {time}'), rel=_('posted {time}')) -}}
|
||||
</span>
|
||||
<span>
|
||||
<a href="{{ url('blog_post', post.id, post.slug) }}#comments" class="blog-comment-count-link">
|
||||
<i class="fa fa-comments blog-comment-icon"></i>
|
||||
<span class="blog-comment-count">
|
||||
{{- post_comment_counts[post.id] or 0 -}}
|
||||
</span>
|
||||
</a>
|
||||
</span>
|
||||
</span>
|
||||
{% include "comments/list.html" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block bodyend %}
|
||||
{{ super() }}
|
||||
{% if REQUIRE_JAX %}
|
||||
{% include "mathjax-load.html" %}
|
||||
<h2 class="title">
|
||||
<a href="{{ url('blog_post', post.id, post.slug) }}">{{ post.title }}</a>
|
||||
</h2>
|
||||
{% if post.is_organization_private and show_organization_private_icon %}
|
||||
<div class="organization-tags">
|
||||
{% for org in post.organizations.all() %}
|
||||
<span class="organization-tag">
|
||||
<a href="{{ org.get_absolute_url() }}">
|
||||
<i class="fa fa-lock"></i> {{ org.name }}
|
||||
</a>
|
||||
</span>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% include "comments/math.html" %}
|
||||
{% endblock %}
|
||||
<div class="summary content-description">
|
||||
{% cache 86400 'post_summary' post.id %}
|
||||
{{ post.summary|default(post.content, true)|markdown('blog', 'svg', lazy_load=True)|reference|str|safe }}
|
||||
{% endcache %}
|
||||
</div>
|
||||
</section>
|
||||
|
|
@ -27,18 +27,6 @@
|
|||
margin-top: 0.6em;
|
||||
}
|
||||
|
||||
.comment-count {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.comment-icon {
|
||||
padding: 0.1em 0.2em 0 0.5em;
|
||||
}
|
||||
|
||||
.comment-count-link {
|
||||
color: #555;
|
||||
}
|
||||
|
||||
.own-open-tickets .title a, .open-tickets .title a {
|
||||
display: block;
|
||||
}
|
||||
|
|
@ -103,35 +91,9 @@
|
|||
<div class="blog-content sidebox">
|
||||
<h3>{{ _('News') }} <i class="fa fa-terminal"></i></h3>
|
||||
<div class="sidebox-content">
|
||||
{% set show_organization_private_icon=True %}
|
||||
{% for post in posts %}
|
||||
<section class="{% if post.sticky %}sticky {% endif %}post">
|
||||
<span style="float:right;">
|
||||
<span class="time">
|
||||
{%- if post.sticky %}<i title="Sticky" class="fa fa-star fa-fw"></i>{% endif -%}
|
||||
{% with authors=post.authors.all() %}
|
||||
{%- if authors -%}
|
||||
<span class="post-authors">{{ link_users(authors) }}</span>
|
||||
{%- endif -%}
|
||||
{% endwith %}
|
||||
{{ relative_time(post.publish_on, abs=_('posted on {time}'), rel=_('posted {time}')) -}}
|
||||
</span><span class="comment-data">
|
||||
<a href="{{ url('blog_post', post.id, post.slug) }}#comments" class="comment-count-link">
|
||||
<i class="fa fa-comments comment-icon"></i><span class="comment-count">
|
||||
{{- post_comment_counts[post.id] or 0 -}}
|
||||
</span>
|
||||
</a>
|
||||
</span>
|
||||
</span>
|
||||
<h2 class="title">
|
||||
<a href="{{ url('blog_post', post.id, post.slug) }}">{{ post.title }}</a>
|
||||
</h2>
|
||||
|
||||
<div class="summary content-description">
|
||||
{% cache 86400 'post_summary' post.id %}
|
||||
{{ post.summary|default(post.content, true)|markdown('blog', 'svg', lazy_load=True)|reference|str|safe }}
|
||||
{% endcache %}
|
||||
</div>
|
||||
</section>
|
||||
{% include "blog/content.html" %}
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% if page_obj.num_pages > 1 %}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,19 @@
|
|||
{% extends "common-content.html" %}
|
||||
{% extends "base.html" %}
|
||||
{% block title_row %}{% endblock %}
|
||||
{% block title_ruler %}{% endblock %}
|
||||
|
||||
{% block content_js_media %}
|
||||
<!-- {% block media %}
|
||||
<style>
|
||||
.post {
|
||||
margin: 0 1.4em;
|
||||
}
|
||||
.post:first-child {
|
||||
margin-top: 0.6em;
|
||||
}
|
||||
</style>
|
||||
{% endblock %} -->
|
||||
|
||||
{% block js_media %}
|
||||
<script type="text/javascript">
|
||||
$(function () {
|
||||
$('.leave-organization').click(function () {
|
||||
|
|
@ -12,52 +25,133 @@
|
|||
{% endif %}
|
||||
);
|
||||
});
|
||||
|
||||
$(document).ready(function () {
|
||||
$('.blog-sidebar').hide();
|
||||
$('#info-tab').find('a').click(function (e) {
|
||||
e.preventDefault();
|
||||
$('#info-tab').addClass('active');
|
||||
$('#detail-tab').removeClass('active');
|
||||
$('.blog-content').show();
|
||||
$('.blog-sidebar').hide();
|
||||
});
|
||||
$('#detail-tab').find('a').click(function (e) {
|
||||
e.preventDefault();
|
||||
$('#detail-tab').addClass('active');
|
||||
$('#info-tab').removeClass('active');
|
||||
$('.blog-content').hide();
|
||||
$('.blog-sidebar').show();
|
||||
});
|
||||
});
|
||||
});
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
||||
{% block info_float %}
|
||||
{% if request.user.is_authenticated %}
|
||||
{% if request.profile in organization %}
|
||||
<form method="post" action="{{ url('leave_organization', organization.id, organization.slug) }}">
|
||||
{% csrf_token %}
|
||||
<input type="submit" class="unselectable button full leave-organization" value="{{ _('Leave organization') }}">
|
||||
</form>
|
||||
{% elif organization.is_open %}
|
||||
<form method="post" action="{{ url('join_organization', organization.id, organization.slug) }}">
|
||||
{% csrf_token %}
|
||||
<input type="submit" class="unselectable button full" value="{{ _('Join organization') }}">
|
||||
</form>
|
||||
{% else %}
|
||||
<a href="{{ url('request_organization', organization.id, organization.slug) }}"
|
||||
class="unselectable button full">{{ _('Request membership') }}</a>
|
||||
{% endif %}
|
||||
<hr>
|
||||
{% endif %}
|
||||
|
||||
{% if can_edit %}
|
||||
<div><a href="{{ url('edit_organization', organization.id, organization.slug) }}">{{ _('Edit organization') }}</a></div>
|
||||
|
||||
{% if not organization.is_open %}
|
||||
<div>
|
||||
<a href="{{ url('organization_requests_pending', organization.id, organization.slug) }}">{{ _('View requests') }}</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% if perms.judge.change_organization %}
|
||||
<div>
|
||||
<a href="{{ url('admin:judge_organization_change', organization.id) }}">{{ _('Admin organization') }}</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div>
|
||||
<a href="{{ organization.get_users_url() }}">{{ _('View members') }}</a>
|
||||
{% block body %}
|
||||
{% block before_posts %}{% endblock %}
|
||||
<div id="mobile" class="tabs">
|
||||
<ul>
|
||||
<li id="info-tab" class="tab active"><a href="#">
|
||||
<i class="tab-icon fa fa-info-circle"></i> {{ _('Info') }}
|
||||
</a></li>
|
||||
<li id="detail-tab" class="tab"><a href="#"><i class="tab-icon fa fa-rss"></i> {{ _('Details') }}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
{% endblock %}
|
||||
<div id="blog-container">
|
||||
<div class="blog-content sidebox">
|
||||
<h3>{{ _('About') }} {{ organization.name }} <i class="fa fa-info-circle"></i></h3>
|
||||
<div class="sidebox-content">
|
||||
<div style="margin: 1.4em;">
|
||||
{% cache 3600 'organization_html' organization.id MATH_ENGINE %}
|
||||
{{ organization.about|markdown('organization-about', MATH_ENGINE)|reference|str|safe }}
|
||||
{% endcache %}
|
||||
</div>
|
||||
</div>
|
||||
{% if is_member or can_edit %}
|
||||
<br>
|
||||
<h3>{{ _('Organization news') }} <i class="fa fa-terminal"></i></h3>
|
||||
<div class="sidebox-content">
|
||||
{% for post in posts %}
|
||||
{% include "blog/content.html" %}
|
||||
{% else %}
|
||||
<div style="margin: 1.4em;">
|
||||
<i>{{ _('There is no news at this time.') }}</i>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
{% block description %}
|
||||
{% cache 3600 'organization_html' organization.id MATH_ENGINE %}
|
||||
{{ organization.about|markdown('organization-about', MATH_ENGINE)|reference|str|safe }}
|
||||
{% endcache %}
|
||||
{% endblock %}
|
||||
<div class="blog-sidebar">
|
||||
<div class="blog-sidebox sidebox">
|
||||
<h3>{{ _('Controls') }} <i class="fa fa-cog"></i></h3>
|
||||
<div class="sidebox-content" style="padding: 1em;">
|
||||
{% if request.user.is_authenticated %}
|
||||
{% if is_member %}
|
||||
<form method="post" action="{{ url('leave_organization', organization.id, organization.slug) }}">
|
||||
{% csrf_token %}
|
||||
<input type="submit" class="unselectable button full leave-organization" value="{{ _('Leave organization') }}">
|
||||
</form>
|
||||
{% elif organization.is_open or can_edit %}
|
||||
<form method="post" action="{{ url('join_organization', organization.id, organization.slug) }}">
|
||||
{% csrf_token %}
|
||||
<input type="submit" class="unselectable button full" value="{{ _('Join organization') }}">
|
||||
</form>
|
||||
{% else %}
|
||||
<a href="{{ url('request_organization', organization.id, organization.slug) }}"
|
||||
class="unselectable button full">{{ _('Request membership') }}</a>
|
||||
{% endif %}
|
||||
<br>
|
||||
{% endif %}
|
||||
{% if can_edit %}
|
||||
<div>
|
||||
<a href="{{ url('edit_organization', organization.id, organization.slug) }}">{{ _('Edit organization') }}</a>
|
||||
</div>
|
||||
{% if not organization.is_open %}
|
||||
<div>
|
||||
<a href="{{ url('organization_requests_pending', organization.id, organization.slug) }}">{{ _('View requests') }}</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if perms.judge.change_organization %}
|
||||
<div>
|
||||
<a href="{{ url('admin:judge_organization_change', organization.id) }}">{{ _('Admin organization') }}</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
<div>
|
||||
<a href="{{ organization.get_users_url() }}">{{ _('View members') }}</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% if (is_member or can_edit) %}
|
||||
{% if new_contests %}
|
||||
<div class="blog-sidebox sidebox">
|
||||
<h3>{{ _('New private contests') }} <i class="fa fa-trophy"></i>
|
||||
</h3>
|
||||
<div class="sidebox-content">
|
||||
<ul class="problem-list">
|
||||
{% for contest in new_contests %}
|
||||
<li><a href="{{ url('contest_view', contest.key) }}">{{ contest.name }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if new_problems %}
|
||||
<div class="blog-sidebox sidebox">
|
||||
<h3>{{ _('New private problems') }} <i class="fa fa-puzzle-piece"></i>
|
||||
</h3>
|
||||
<div class="sidebox-content">
|
||||
<ul class="problem-list">
|
||||
{% for problem in new_problems %}
|
||||
<li><a href="{{ url('problem_detail', problem.code) }}">{{ problem.name }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
{% block after_posts %}{% endblock %}
|
||||
{% endblock %}
|
||||
|
|
@ -4,8 +4,25 @@
|
|||
<script type="text/javascript">
|
||||
$(function () {
|
||||
$("#organization-table").tablesorter();
|
||||
{% if request.user.is_authenticated %}
|
||||
$('#show-my-org-checkbox').click(function() {
|
||||
let checked = $('#show-my-org-checkbox').is(':checked');
|
||||
if (checked) {
|
||||
$('.other-organization').hide();
|
||||
$('.my-organization').last().find('td').css({'border-bottom-width':
|
||||
'1px', 'border-color': '#ccc'});
|
||||
}
|
||||
else {
|
||||
$('.other-organization').show();
|
||||
$('.my-organization').last().find('td').css({'border-bottom-width':
|
||||
'', 'border-color': ''});
|
||||
}
|
||||
})
|
||||
$('#show-my-org-checkbox').click()
|
||||
{% endif %}
|
||||
});
|
||||
</script>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
{% block title_ruler %}{% endblock %}
|
||||
|
|
@ -17,6 +34,13 @@
|
|||
{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
{% if request.user.is_authenticated %}
|
||||
<div style="margin-bottom: 0.5em">
|
||||
<input id="show-my-org-checkbox" type="checkbox" style="vertical-align: bottom;">
|
||||
<label for="show-my-org-checkbox" style="vertical-align: bottom; margin-right: 1em;">{{ _('Show my organizations only') }}</label>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<table id="organization-table" class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
@ -26,7 +50,7 @@
|
|||
</thead>
|
||||
<tbody>
|
||||
{% for org in organizations %}
|
||||
<tr>
|
||||
<tr class="{{ 'my-organization' if org in my_organizations else 'other-organization'}}">
|
||||
<td><a href="{{ org.get_absolute_url() }}">{{ org.name }}</a></td>
|
||||
<td><a href="{{ org.get_users_url() }}">{{ org.member_count }}</a></td>
|
||||
</tr>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue