Skip to content

Tidied this screen #905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wrightmartin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Tidied this screen #905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nuntium/static/sass/manager/_bootstrap.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

@import "../bootstrap/component-animations";
@import "../bootstrap/dropdowns";
// @import "../bootstrap/button-groups";
@import "../bootstrap/button-groups";
@import "../bootstrap/input-groups";
@import "../bootstrap/navs";
@import "../bootstrap/navbar";
Expand Down
7 changes: 7 additions & 0 deletions nuntium/static/sass/manager/_style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ label {
font-weight: normal;
}

caption {
border-bottom:1px solid $gray-lighter;
h3 {
font-size: 1.25em;
}
}

.manager-page {
border-radius: 5px;
margin-bottom: 3em;
Expand Down
65 changes: 28 additions & 37 deletions nuntium/templates/nuntium/profiles/messages_per_instance.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,25 @@ <h2>{% trans "Messages" %}</h2>
</div>
<div class="manager-overview">
{% blocktrans count message_count=writeitinstance.message_set.count %}
There is <strong>1</strong> message
There is <strong>1</strong> message.
{% plural %}
There are <strong>{{ message_count }}</strong> messages
There are <strong>{{ message_count }}</strong> total messages.
{% endblocktrans %}
{% if writeitinstance.config.moderation_needed_in_all_messages %}
5 messages await moderation.
{% endif %}
</div>
{% if writeitinstance.config.moderation_needed_in_all_messages %}
{% autopaginate message_list %}
{% paginate %}
<table class="table table-striped">
<caption><h3>{% trans "Messages awaiting moderation" %}</h3></caption>
<thead>
<tr>
<th>{% trans "Message" %}</th>
<th class="text-center">{% trans "Replies"%}</th>
<th class="text-center">{% trans "Public?" %}</th>
<th class="text-center">{% trans "Confirmed?" %}</th>
{% if writeitinstance.config.moderation_needed_in_all_messages %}
<th class="text-center">{% trans "Moderated?" %}</th>
{% endif %}
<th class="text-center">{% trans "Make private/public"%}</th>
<th class="text-center">{% trans "Public"%}</th>
</tr>
</thead>
<tbody>
Expand All @@ -63,18 +64,6 @@ <h3><a href="{% url 'message_detail_private' subdomain=writeitinstance.slug pk=m
{% endif %}
</td>

<td class="text-center">
{% if message.public %}
<div class="explanation" data-toggle="tooltip" data-placement="left" title="{% trans 'This message can be seen by everyone' %}">
<i class="glyphicon glyphicon-ok"></i>
</div>
{% else %}
<div class="explanation" data-toggle="tooltip" data-placement="left" title="{% trans "This message can't be seen by anyone" %}">
<i class="glyphicon glyphicon-remove"></i>
</div>
{% endif %}
</td>

<td class="text-center">
{% if message.confirmated %}
<div class="explanation" data-toggle="tooltip" data-placement="left" title="{% trans 'The author has confirmed that this was sent from their email' %}">
Expand All @@ -86,33 +75,17 @@ <h3><a href="{% url 'message_detail_private' subdomain=writeitinstance.slug pk=m
</div>
{% endif %}
</td>

{% if writeitinstance.config.moderation_needed_in_all_messages %}
{% if message.moderated %}
<td class="text-center">
<div class="explanation" data-toggle="tooltip" data-placement="left" title="{% trans 'This message has been accepted' %}"><i class="glyphicon glyphicon-ok"></i></div>
</td>
{% else %}
<td class="text-center">
<div class="explanation" data-toggle="tooltip" data-placement="left" title="{% trans 'This message has not yet been moderated — click here to accept it' %}">
<form action="{% url 'accept_message' pk=message.pk %}" method="post">{% csrf_token %} <button class="btn btn-default btn-sm moderate">{% trans "Accept"%}</button>
</form>
</div>
</td>
{% endif %}
{% endif %}

<td class="text-center">
{% if message.public %}
<div class="explanation" data-toggle="tooltip" data-placement="left" title="{% trans 'This message is public, you can make it private by clicking here' %}">
<form action="{% url 'toggle_public' pk=message.pk %}" method="post">{% csrf_token %}
<button class="btn btn-default btn-sm toggle-public"><i class="fa fa-eye"></i></button>
<input type="checkbox" checked="checked"/>
</form>
</div>
{% else %}
<div class="explanation" data-toggle="tooltip" data-placement="left" title="{% trans 'This message is private, you can make it public by clicking here' %}">
<form action="{% url 'toggle_public' pk=message.pk %}" method="post">{% csrf_token %}
<button class="btn btn-default btn-sm toggle-public"><i class="fa fa-eye-slash"></i></button>
<input type="checkbox" />
</form>
</div>
{% endif %}
Expand All @@ -125,6 +98,24 @@ <h3><a href="{% url 'message_detail_private' subdomain=writeitinstance.slug pk=m
</tbody>
</table>
{% paginate %}
{% endif %}
{% autopaginate message_list %}
{% paginate %}
<table class="table table-striped">
<caption><h3>{% trans "All messages" %}</h3></caption>
<thead>
<tr>
<th>{% trans "Message" %}</th>
<th class="text-center">{% trans "Replies"%}</th>
<th class="text-center">{% trans "Confirmed?" %}</th>
<th class="text-center">{% trans "Public"%}</th>
</tr>
</thead>
<tbody>

</tbody>
</table>
{% paginate %}

<div class="modal fade" id="modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
Expand Down