- {% if not object.authorization_method == object.BUNDLE %}
- {% if object.is_waitlisted %}
-
- {% else %} - - {% endif %} - {% endif %} - {% elif user_open_apps %} - {% if multiple_open_apps %} - - {% else %} - - {% endif %} - {% else %} - - {% if user|restricted %} -
- {% else %} -
- {% endif %} - {% endif %} - - {% if user|coordinators_only %} - - {% endif %} - {% endif %} - {% if object.logos.logo.url %} - - {% endif %} - {% if not object.authorization_method == object.BUNDLE %} - - {% if object.coordinator == user or user.is_staff %} - {% comment %} Translators: This text labels a button coordinators can click to view a list of users who have applied for access for a particular partner {% endcomment %} - - {% endif %} - {% endif %} -
-
- {% trans "Waitlisted" %}
-
- {% endif %}
- {% if user_sent_apps %}
- {% if object.renewals_available %}
- {% if user|restricted %}
- - {% comment %} Translators: If we have no available accounts for a partner, the coordinator can change the application system to a waiting list. {% endcomment %} - {% blocktrans trimmed %} - There are no access grants available for this partner - at this time. You can still apply for access; applications will - be processed when access is available. - {% endblocktrans %} -
-- {% else %} - - {% endif %} - {% endif %} - {% elif user_open_apps %} - {% if multiple_open_apps %} - - {% else %} - - {% endif %} - {% else %} - - {% if user|restricted %} -
- {% else %} -
- {% endif %} - {% endif %} - - {% if user|coordinators_only %} - - {% endif %} - {% endif %} - {% if object.logos.logo.url %} - - {% endif %} - {% if not object.authorization_method == object.BUNDLE %} - - {% if object.coordinator == user or user.is_staff %} - {% comment %} Translators: This text labels a button coordinators can click to view a list of users who have applied for access for a particular partner {% endcomment %} - - {% endif %} - {% endif %} -
-
-
-
- {% if object.short_description %}
-
- {% comment %} - Cache lifetime should be None, which would be forever since we're - invalidating on update. However, as 2017-04-06 a bug in django - doesn't allow for None to be passed from here into cache. The - fix is in master, but not release. - https://code.djangoproject.com/ticket/27882 - {% endcomment %} - {% cache 31536000 partner_short_description LANGUAGE_CODE object.pk %} - {{ object.short_description | twlight_wikicode2html | safe }} - {% endcache %} -
- {% else %} - {% comment %} Translators: If a partner has no description written, this message is shown in the Description field on the partner page. {% endcomment %} - {% trans "Description not available." %} - {% endif %} - {% if object.tags.count > 0 %} -
- {% for tag in object.tags.all %}
- {{ tag }}
- {% if not forloop.last %} | {% endif %}
- {% endfor %}
+
+ -
-
- {% endif %}
- -
-
+
{% comment %}
other stuff to do:
diff --git a/TWLight/static/css/local.css b/TWLight/static/css/local.css
index 825aa77102..b348d567c6 100644
--- a/TWLight/static/css/local.css
+++ b/TWLight/static/css/local.css
@@ -229,6 +229,7 @@ TIMELINE
.half-timeline > li.timeline-inverted > .timeline-panel {
float: left;
margin-left: 50px;
+ width: 70%;
}
.full-width {
+
-
- {% if object.videos.all %}
-
+
- -
+
-
+ - {% endif %} - {% if object.description %} -
- {% comment %} - Cache lifetime should be None, which would be forever since we're - invalidating on update. However, as 2017-04-06 a bug in django - doesn't allow for None to be passed from here into cache. The - fix is in master, but not release. - https://code.djangoproject.com/ticket/27882 - {% endcomment %} - {% cache 31536000 partner_description LANGUAGE_CODE object.pk %} - {{ object.description | twlight_wikicode2html | safe }} - {% endcache %} -
- {% endif %} -
-
-
-
-
-
- - {% comment %} Translators: If a partner has video tutorials, this text shows as the title for that information field.{% endcomment %} - {% trans "Video tutorials" %} -
--
- {% comment %} Translators: If a partner has video tutorials, this text links to the video(s).{% endcomment %}
- {% for each_tutorial in object.videos.all %}
-
- {% trans 'Video' %} {{ forloop.counter }} - {% endfor %} -
-
-
- -
-
- {% endif %}
- {% endwith %}
- {% endwith %}
- {% if object.agreement_with_terms_of_use or object.real_name or object.country_of_residence or object.occupation or object.affiliation or object.specific_title or object.account_email %}
- -
-
+
- {% if object.get_languages %}
-
-
- {% with object.excerpt_limit as excerpt_limit %}
- {% with object.excerpt_limit_percentage as excerpt_limit_percentage %}
- {% if excerpt_limit or excerpt_limit_percentage %}
- - {% comment %} Translators: If a partner has content languages specified, this message precedes the list of those languages on the partner page. {% endcomment %} - {% trans 'Language(s)' %}: -
- {% for language in partner.get_languages %}
- {{ language }}
+ -
+
{% endif %}
-
-
+
+
+ {% if object.videos.all %}
+
+ {% if object.short_description %}
+
+ + {% comment %} + Cache lifetime should be None, which would be forever since we're + invalidating on update. However, as 2017-04-06 a bug in django + doesn't allow for None to be passed from here into cache. The + fix is in master, but not release. + https://code.djangoproject.com/ticket/27882 + {% endcomment %} + {% cache 31536000 partner_short_description LANGUAGE_CODE object.pk %} + {{ object.short_description | twlight_wikicode2html | safe }} + {% endcache %} +
+ {% else %} + {% comment %} Translators: If a partner has no description written, this message is shown in the Description field on the partner page. {% endcomment %} + {% trans "Description not available." %} + {% endif %} + {% if object.tags.count > 0 %} +
+ {% for tag in object.tags.all %}
+ {{ tag }}
{% if not forloop.last %} | {% endif %}
- {% endfor %}
+ {% endfor %}
+
+ {% endif %}
+ {% if object.description %}
+ + {% comment %} + Cache lifetime should be None, which would be forever since we're + invalidating on update. However, as 2017-04-06 a bug in django + doesn't allow for None to be passed from here into cache. The + fix is in master, but not release. + https://code.djangoproject.com/ticket/27882 + {% endcomment %} + {% cache 31536000 partner_description LANGUAGE_CODE object.pk %} + {{ object.description | twlight_wikicode2html | safe }} + {% endcache %} +
+ {% endif %} +
+
+
+
+
+
-
- {% else %}
- {% comment %} Translators: If a partner has no content languages specified, this message is shown in the Languages field on the partner page. {% endcomment %}
- + {% comment %} Translators: If a partner has video tutorials, this text shows as the title for that information field.{% endcomment %} + {% trans "Video tutorials" %} +
+-
+ {% comment %} Translators: If a partner has video tutorials, this text links to the video(s).{% endcomment %}
+ {% for each_tutorial in object.videos.all %}
+
- {% trans 'Video' %} {{ forloop.counter }} + {% endfor %} +
{% trans "Languages not available." %}
+
-
-
-
-
- {% comment %} Translators: If a partner has specified the excerpt limit, this text shows as the title for that information field. {% endcomment %}
-
- {% trans "Excerpt limit" %}
-
-
- -
- {% if excerpt_limit_percentage and excerpt_limit %}
-
- - {% comment %} Translators: If a partner has specified the excerpt limit both in words and percentage, this message will display the percentage of words and the number of words on the partner page. {% endcomment %} - {% blocktrans trimmed %} - {{ object }} allows a maximum of {{ excerpt_limit }} words or {{ excerpt_limit_percentage }}% of an article be excerpted into a Wikipedia article. - {% endblocktrans %} - - {% elif excerpt_limit %} -
- - {% comment %} Translators: If a partner has specified the excerpt limit in words, this message will display the number of words on the partner page. {% endcomment %} - {% blocktrans trimmed %} - {{ object }} allows a maximum of {{ excerpt_limit }} words be excerpted into a Wikipedia article. - {% endblocktrans %} - - {% elif excerpt_limit_percentage %} -
- - {% comment %} Translators: If a partner has specified the excerpt limit in percentage, this message will display the percentage of words on the partner page. {% endcomment %} - {% blocktrans trimmed %} - {{ object }} allows a maximum of {{ excerpt_limit_percentage }}% of an article be excerpted into a Wikipedia article. - {% endblocktrans %} - - {% endif %} -
-
-
- -
+
+ {% endif %}
+ -
+
+
-
- {% comment %} Translators: If a partner has other requirements for access, this text shows as the title for that information field. (e.g. https://wikipedialibrary.wmflabs.org/partners/10/). {% endcomment %}
-
- {% trans "Special requirements for applicants" %}
-
+ -
+
+ {% with object.excerpt_limit as excerpt_limit %}
+ {% with object.excerpt_limit_percentage as excerpt_limit_percentage %}
+ {% if excerpt_limit or excerpt_limit_percentage %}
+ -
+
+ {% endif %}
+ {% endwith %}
+ {% endwith %}
+ {% if object.agreement_with_terms_of_use or object.real_name or object.country_of_residence or object.occupation or object.affiliation or object.specific_title or object.account_email %}
+ -
+
- {% endif %}
- {% if object.streams.all %}
- -
-
- {% endif %}
- -
-
+
+ {% endif %}
+ {% if object.streams.all %}
+
+
+
+
+
+ {% if object.get_languages %}
+
+ + {% comment %} Translators: If a partner has content languages specified, this message precedes the list of those languages on the partner page. {% endcomment %} + {% trans 'Language(s)' %}: +
+ {% for language in partner.get_languages %}
+ {{ language }}
+ {% if not forloop.last %} | {% endif %}
+ {% endfor %}
+
+
+ {% else %}
+ {% comment %} Translators: If a partner has no content languages specified, this message is shown in the Languages field on the partner page. {% endcomment %}
+ {% trans "Languages not available." %}
+ {% endif %} +
+
+
+
+
+ {% comment %} Translators: If a partner has specified the excerpt limit, this text shows as the title for that information field. {% endcomment %}
+
+ {% trans "Excerpt limit" %}
+
+
+ -
+ {% if excerpt_limit_percentage and excerpt_limit %}
+
- + {% comment %} Translators: If a partner has specified the excerpt limit both in words and percentage, this message will display the percentage of words and the number of words on the partner page. {% endcomment %} + {% blocktrans trimmed %} + {{ object }} allows a maximum of {{ excerpt_limit }} words or {{ excerpt_limit_percentage }}% of an article be excerpted into a Wikipedia article. + {% endblocktrans %} + + {% elif excerpt_limit %} +
- + {% comment %} Translators: If a partner has specified the excerpt limit in words, this message will display the number of words on the partner page. {% endcomment %} + {% blocktrans trimmed %} + {{ object }} allows a maximum of {{ excerpt_limit }} words be excerpted into a Wikipedia article. + {% endblocktrans %} + + {% elif excerpt_limit_percentage %} +
- + {% comment %} Translators: If a partner has specified the excerpt limit in percentage, this message will display the percentage of words on the partner page. {% endcomment %} + {% blocktrans trimmed %} + {{ object }} allows a maximum of {{ excerpt_limit_percentage }}% of an article be excerpted into a Wikipedia article. + {% endblocktrans %} + + {% endif %} +
+
+
+
-
+ {% comment %} Translators: If a partner has other requirements for access, this text shows as the title for that information field. (e.g. https://wikipedialibrary.wmflabs.org/partners/10/). {% endcomment %}
+
+ {% trans "Special requirements for applicants" %}
+
-
- -
- {% if object.agreement_with_terms_of_use %}
-
- - {% comment %} Translators: If a user must agree to a Terms of Use document, they see this message, and must enter the name of the resource. Don't translate {{ publisher }} or {{ url }}. {% endcomment %} - {% blocktrans trimmed with publisher=object.company_name url=object.terms_of_use %} - {{ publisher }} requires that you agree with its terms - of use. - {% endblocktrans %} - - {% endif %} +
- + {% comment %} Translators: If a user must agree to a Terms of Use document, they see this message, and must enter the name of the resource. Don't translate {{ publisher }} or {{ url }}. {% endcomment %} + {% blocktrans trimmed with publisher=object.company_name url=object.terms_of_use %} + {{ publisher }} requires that you agree with its terms + of use. + {% endblocktrans %} + + {% endif %} - {% if object.real_name %} -
- - {% comment %} Translators: If a user must provide their real name to apply to a partner, they see this message, and must enter the name of the resource. Don't translate {{ publisher }}. {% endcomment %} - {% blocktrans trimmed with publisher=object.company_name %} - {{ publisher }} requires that you provide your real name. - {% endblocktrans %} - - {% endif %} + {% if object.real_name %} +
- + {% comment %} Translators: If a user must provide their real name to apply to a partner, they see this message, and must enter the name of the resource. Don't translate {{ publisher }}. {% endcomment %} + {% blocktrans trimmed with publisher=object.company_name %} + {{ publisher }} requires that you provide your real name. + {% endblocktrans %} + + {% endif %} - {% if object.country_of_residence %} -
- - {% comment %} Translators: If a user must provide the name of the country where they currently live to apply to a partner, they see this message, and must enter the name of the resource. Don't translate {{ publisher }}. {% endcomment %} - {% blocktrans trimmed with publisher=object.company_name %} - {{ publisher }} requires that you provide your country of residence. - {% endblocktrans %} - - {% endif %} + {% if object.country_of_residence %} +
- + {% comment %} Translators: If a user must provide the name of the country where they currently live to apply to a partner, they see this message, and must enter the name of the resource. Don't translate {{ publisher }}. {% endcomment %} + {% blocktrans trimmed with publisher=object.company_name %} + {{ publisher }} requires that you provide your country of residence. + {% endblocktrans %} + + {% endif %} - {% if object.occupation %} -
- - {% comment %} Translators: If a user must provide their occupation to apply to a partner, they see this message, and must enter the name of the resource. Don't translate {{ publisher }}. {% endcomment %} - {% blocktrans trimmed with publisher=object.company_name %} - {{ publisher }} requires that you provide your occupation. - {% endblocktrans %} - - {% endif %} + {% if object.occupation %} +
- + {% comment %} Translators: If a user must provide their occupation to apply to a partner, they see this message, and must enter the name of the resource. Don't translate {{ publisher }}. {% endcomment %} + {% blocktrans trimmed with publisher=object.company_name %} + {{ publisher }} requires that you provide your occupation. + {% endblocktrans %} + + {% endif %} - {% if object.affiliation %} -
- - {% comment %} Translators: If a user must provide their institutional affiliation (e.g. university) to apply to a partner, they see this message, and must enter the name of the resource. Don't translate {{ publisher }}. {% endcomment %} - {% blocktrans trimmed with publisher=object.company_name %} - {{ publisher }} requires that you provide your institutional affiliation. - {% endblocktrans %} - - {% endif %} + {% if object.affiliation %} +
- + {% comment %} Translators: If a user must provide their institutional affiliation (e.g. university) to apply to a partner, they see this message, and must enter the name of the resource. Don't translate {{ publisher }}. {% endcomment %} + {% blocktrans trimmed with publisher=object.company_name %} + {{ publisher }} requires that you provide your institutional affiliation. + {% endblocktrans %} + + {% endif %} - {% if object.specific_title %} -
- - {% comment %} Translators: If a user must select a specific resource to apply for, they see this message, and must enter the name of the resource. Don't translate {{ publisher }}. {% endcomment %} - {% blocktrans trimmed with publisher=object.company_name %} - {{ publisher }} requires that you specify a particular title that you want - to access. - {% endblocktrans %} - - {% endif %} + {% if object.specific_title %} +
- + {% comment %} Translators: If a user must select a specific resource to apply for, they see this message, and must enter the name of the resource. Don't translate {{ publisher }}. {% endcomment %} + {% blocktrans trimmed with publisher=object.company_name %} + {{ publisher }} requires that you specify a particular title that you want + to access. + {% endblocktrans %} + + {% endif %} - {% if object.account_email %} -
- - {% comment %} Translators: If a user must register on the partner website before applying, they see this message. Don't translate {{ partner }}. {% endcomment %} - {% blocktrans trimmed with publisher=object.company_name %} - {{ publisher }} requires that you sign up for an account before applying - for access. - {% endblocktrans %} - - {% endif %} -
- + {% comment %} Translators: If a user must register on the partner website before applying, they see this message. Don't translate {{ partner }}. {% endcomment %} + {% blocktrans trimmed with publisher=object.company_name %} + {{ publisher }} requires that you sign up for an account before applying + for access. + {% endblocktrans %} + + {% endif %} +
-
+ {% if object.agreement_with_terms_of_use %}
+
-
-
-
-
- {% comment %} Translators: If a partner has multiple collections which can be selected, this text shows as the title for that information field. (e.g. https://wikipedialibrary.wmflabs.org/partners/10/). {% endcomment %}
-
- {% trans "Collections" %}
-
-
- -
- {% for stream in object.streams.all %}
- {% comment %}
- Cache lifetime should be None, which would be forever since we're
- invalidating on update. However, as 2017-04-06 a bug in django
- doesn't allow for None to be passed from here into cache. The
- fix is in master, but not release.
- https://code.djangoproject.com/ticket/27882
- We filter out details and summary tags so that we always see
- the full content on the details page.
- {% endcomment %}
-
- {{ stream }} - {% if stream.description %}— - {% filter twlight_removetags:"details summary" %} - {% cache 31536000 stream_description LANGUAGE_CODE stream.pk %} - {{ stream.description | twlight_wikicode2html | safe }} - {% endcache %} - {% endfilter %} - {% endif %} - - {% endfor %} -
+
+
+
+
+
+
+ {% comment %} Translators: If a partner has multiple collections which can be selected, this text shows as the title for that information field. (e.g. https://wikipedialibrary.wmflabs.org/partners/10/). {% endcomment %}
+
+ {% trans "Collections" %}
+
+
+ -
+ {% for stream in object.streams.all %}
+ {% comment %}
+ Cache lifetime should be None, which would be forever since we're
+ invalidating on update. However, as 2017-04-06 a bug in django
+ doesn't allow for None to be passed from here into cache. The
+ fix is in master, but not release.
+ https://code.djangoproject.com/ticket/27882
+ We filter out details and summary tags so that we always see
+ the full content on the details page.
+ {% endcomment %}
+
- {{ stream }} + {% if stream.description %}— + {% filter twlight_removetags:"details summary" %} + {% cache 31536000 stream_description LANGUAGE_CODE stream.pk %} + {{ stream.description | twlight_wikicode2html | safe }} + {% endcache %} + {% endfilter %} + {% endif %} + + {% endfor %} +
+
+
+
+
+ {% if object.company_location %}
+ {% comment %} Translators: If a partner has their location listed, this message is a label for that location {% endcomment %}
+
+ {% trans "Location" %}: {{ object.company_location.name }}
+ {% endif %} + {% if object.terms_of_use %} + {% comment %} Translators: If a partner has a Terms of Use listed, this message is shown in the Terms of Use field (e.g. https://wikipedialibrary.wmflabs.org/partners/8/). {% endcomment %} + + {% else %} + {% comment %} Translators: If a partner has no Terms of Use listed, this message is shown in the Terms of Use field (e.g. https://wikipedialibrary.wmflabs.org/partners/12/). {% endcomment %} +{% trans "Terms of use not available." %}
+ {% endif %} +
-
+ {% else %} +
+ {% endif %} + {% endif %} + + {% if user|coordinators_only %} + + {% endif %} + {% endif %} + {% if object.logos.logo.url %} + + {% endif %} + {% if not object.authorization_method == object.BUNDLE %} + + {% if object.coordinator == user or user.is_staff %} + {% comment %} Translators: This text labels a button coordinators can click to view a list of users who have applied for access for a particular partner {% endcomment %} + + {% endif %} + {% endif %} +
+
- {% if object.company_location %}
- {% comment %} Translators: If a partner has their location listed, this message is a label for that location {% endcomment %}
-
-
-
+ {% else %}
+
+ {% if user|restricted %}
+ {% trans "Location" %}: {{ object.company_location.name }}
+ +
+ {% if not object.authorization_method == object.BUNDLE %}
+ {% if object.is_waitlisted %}
+
+ {% else %} + + {% endif %} + {% endif %} + {% elif user_open_apps %} + {% if multiple_open_apps %} + {% else %} - {% comment %} Translators: If a partner has no Terms of Use listed, this message is shown in the Terms of Use field (e.g. https://wikipedialibrary.wmflabs.org/partners/12/). {% endcomment %} -
-
+ {% trans "Waitlisted" %}
+
{% endif %}
- {% if object.terms_of_use %}
- {% comment %} Translators: If a partner has a Terms of Use listed, this message is shown in the Terms of Use field (e.g. https://wikipedialibrary.wmflabs.org/partners/8/). {% endcomment %}
-
+ {% if user_sent_apps %}
+ {% if object.renewals_available %}
+ {% if user|restricted %}
+ + {% comment %} Translators: If we have no available accounts for a partner, the coordinator can change the application system to a waiting list. {% endcomment %} + {% blocktrans trimmed %} + There are no access grants available for this partner + at this time. You can still apply for access; applications will + be processed when access is available. + {% endblocktrans %} +
++ {% else %} + + {% endif %} + {% endif %} + {% elif user_open_apps %} + {% if multiple_open_apps %} + {% else %} - {% comment %} Translators: If a partner has no Terms of Use listed, this message is shown in the Terms of Use field (e.g. https://wikipedialibrary.wmflabs.org/partners/12/). {% endcomment %} -
{% trans "Terms of use not available." %}
+ {% endif %} -+ {% else %} +
+ {% endif %} + {% endif %} + + {% if user|coordinators_only %} + + {% endif %} + {% endif %} + {% if object.logos.logo.url %} + + {% endif %} + {% if not object.authorization_method == object.BUNDLE %} + + {% if object.coordinator == user or user.is_staff %} + {% comment %} Translators: This text labels a button coordinators can click to view a list of users who have applied for access for a particular partner {% endcomment %} + + {% endif %} + {% endif %} +