Skip to content
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.

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

[bug 1079413] Make certain contributor articles collapsible. #2231

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions kitsune/sumo/static/js/wiki.js
Expand Up @@ -770,9 +770,10 @@
$('#doc-content').on('click', 'h1', function() {
$(this).closest('.wiki-section').toggleClass('collapsed');
});
}

// Uncollapse the first visible one
$('#doc-content h1:visible').first().click();
if ($('#doc-content').is('.collapsible')) {
k.makeWikiCollapsable();
}

function initExitSupportFor() {
Expand Down
2 changes: 0 additions & 2 deletions kitsune/wiki/__init__.py
@@ -1,2 +0,0 @@
TEMPLATE_TITLE_PREFIX = 'Template:'
DOCUMENTS_PER_PAGE = 100
16 changes: 16 additions & 0 deletions kitsune/wiki/config.py
@@ -1,5 +1,21 @@
from tower import ugettext_lazy as _lazy

TEMPLATE_TITLE_PREFIX = 'Template:'
DOCUMENTS_PER_PAGE = 100

COLLAPSIBLE_DOCUMENTS = {
u'en-US': [
u'firefox-os-support-forum-contributors-training',
u'firefox-android-support-forum-contributors',
u'firefox-support-forum-contributors',
u'introduction-contributor-quality-training',
u'angry-user-training',
u'evaluating-solution-forum',
u'how-answer-escalated-questions',
u'navigate-support-forum-platform',
]
}

# Wiki configuration.

# Defines products supported, categories, edit significances and
Expand Down
3 changes: 1 addition & 2 deletions kitsune/wiki/models.py
Expand Up @@ -29,12 +29,11 @@
from kitsune.sumo.models import ModelBase, LocaleField
from kitsune.sumo.urlresolvers import reverse, split_path
from kitsune.tags.models import BigVocabTaggableMixin
from kitsune.wiki import TEMPLATE_TITLE_PREFIX
from kitsune.wiki.config import (
CATEGORIES, SIGNIFICANCES, TYPO_SIGNIFICANCE, MEDIUM_SIGNIFICANCE,
MAJOR_SIGNIFICANCE, REDIRECT_HTML, REDIRECT_CONTENT, REDIRECT_TITLE,
REDIRECT_SLUG, CANNED_RESPONSES_CATEGORY, ADMINISTRATION_CATEGORY,
TEMPLATES_CATEGORY, DOC_HTML_CACHE_KEY)
TEMPLATES_CATEGORY, DOC_HTML_CACHE_KEY, TEMPLATE_TITLE_PREFIX)
from kitsune.wiki.permissions import DocumentPermissionMixin


Expand Down
2 changes: 1 addition & 1 deletion kitsune/wiki/templates/wiki/document.html
Expand Up @@ -43,7 +43,7 @@ <h1 class="product-title cf">
<article class="wiki-doc">
{{ document_title(document) }}
{{ document_messages(document, redirected_from) }}
{{ document_content(document, fallback_reason, request, settings) }}
{{ document_content(document, fallback_reason, request, settings, document_css_class) }}

{% set share_link = document.share_link or (document.parent and document.parent.share_link) %}
{% if share_link %}
Expand Down
4 changes: 2 additions & 2 deletions kitsune/wiki/templates/wiki/includes/document_macros.html
Expand Up @@ -41,8 +41,8 @@ <h1 class="title">{{ document.title }}</h1>
{% endif %}
{%- endmacro %}

{% macro document_content(document, fallback_reason, request, settings) -%}
<section id="doc-content">
{% macro document_content(document, fallback_reason, request, settings, css_class='') -%}
<section id="doc-content" class="{{ css_class }}">
{% if not fallback_reason %}
{{ document.html|safe }}
{% elif fallback_reason == 'no_translation' %}
Expand Down
10 changes: 8 additions & 2 deletions kitsune/wiki/views.py
Expand Up @@ -32,9 +32,9 @@
from kitsune.sumo.urlresolvers import reverse
from kitsune.sumo.utils import (paginate, smart_int, get_next_url, user_or_ip,
truncated_json_dumps)
from kitsune.wiki import DOCUMENTS_PER_PAGE
from kitsune.wiki.config import (
CATEGORIES, MAJOR_SIGNIFICANCE, TEMPLATES_CATEGORY)
CATEGORIES, MAJOR_SIGNIFICANCE, TEMPLATES_CATEGORY, DOCUMENTS_PER_PAGE,
COLLAPSIBLE_DOCUMENTS)
from kitsune.wiki.events import (
EditDocumentEvent, ReviewableRevisionInLocaleEvent,
ApproveRevisionInLocaleEvent, ApprovedOrReadyUnion,
Expand Down Expand Up @@ -161,6 +161,11 @@ def document(request, document_slug, template=None, document=None):
ga_push.append(['_trackEvent', 'Incomplete L10n', 'Not Updated',
'%s/%s' % (doc.parent.slug, request.LANGUAGE_CODE)])

if document_slug in COLLAPSIBLE_DOCUMENTS.get(request.LANGUAGE_CODE, []):
document_css_class = 'collapsible'
else:
document_css_class = ''

data = {
'document': doc,
'redirected_from': redirected_from,
Expand All @@ -171,6 +176,7 @@ def document(request, document_slug, template=None, document=None):
'product': product,
'products': products,
'ga_push': ga_push,
'document_css_class': document_css_class,
}

return render(request, template, data)
Expand Down