Hiding moderation queue, since it was uglifying demos. Also cleaning up text version of both new reply and re-share emails.

This commit is contained in:
Samuel Clay 2012-07-05 22:46:18 -07:00
parent a8c9862385
commit afb102e4e7
4 changed files with 33 additions and 3 deletions

View file

@ -4691,7 +4691,18 @@ form.opml_import_form input {
color: #123B00;
overflow: hidden;
}
.NB-recommended-show-moderation-wrapper {
display: none;
float: left;
margin-right: 12px;
}
.NB-module-recommended .NB-module-header:hover .NB-recommended-show-moderation-wrapper {
display: block;
}
.NB-recommended-unmoderated {
display: none;
}
/* ========= */
/* = Menus = */
/* ========= */

View file

@ -9,4 +9,6 @@
{{ reply.comments }}
{% endfor %}
View this conversation: {{ shared_story.blurblog_permalink }}{% endblock %}
View this conversation: {{ shared_story.blurblog_permalink }}
Don't want any more emails from this story? Mute this conversion: {{ mute_url }}{% endblock %}

View file

@ -1,3 +1,14 @@
{% extends "mail/email_base.txt" %}
{% block body %}{% endblock %}
{% block body %}{{ reshare_user_profile.username }} re-shared "{{ shared_story.story_title }}" from {{ story_feed.feed_title }}:
{{ comment.user.username }} ({{ comment.shared_date }} ago):
{{ comment.comments|linebreaksbr }}
{% for reply in comment.replies %}
{{ reply.user.username }} ({{ reply.publish_date }} ago):
{{ reply.comments }}
{% endfor %}
View this conversation: {{ shared_story.blurblog_permalink }}
Don't want any more emails? Mute everything from this story: {{ mute_url }}{% endblock %}

View file

@ -7,6 +7,12 @@
Recommended Site
{% endif %}
<div class="NB-module-header-right">
{% if user.is_staff and not unmoderated %}
<div class="NB-recommended-show-moderation-wrapper">
<a href="#" class="NB-recommended-show-moderation" class="NB-splash-link" onclick="$('.NB-recommended-unmoderated').show();">Moderate</a>
</div>
{% endif %}
{% if has_next_page or has_previous_page %}
<a href="#" class="NB-module-direction NB-module-next-page NB-javascript {% if not has_next_page %}NB-disabled{% endif %}"></a>
<a href="#" class="NB-module-direction NB-module-previous-page {% if not has_previous_page %}NB-disabled{% endif %}"></a>