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

Add photo policy text #189

Merged
merged 5 commits into from
May 10, 2017
Merged

Add photo policy text #189

merged 5 commits into from
May 10, 2017

Conversation

octopusinvitro
Copy link
Collaborator

@octopusinvitro octopusinvitro commented May 9, 2017

Relevant issues

Screenshots

The photo review already had a photo policy:

photo-review

So a partial template was extracted with the text and added to the upload photo page as well:

upload-photo

A dedicated page was made for this policy so that it could be linked from the About page as issue 144 requires:

own-page

A link was added in the About page:

about-page

Copy link
Collaborator

@mhl mhl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've put a couple of small requests for things to change inline.

The policy reads very slightly oddly to me, since the original text was aimed at reviewers rather than submitters, but I think it's fine at the moment, and it's a good idea for people submitting photos to know these guidelines anyway.

@@ -1,3 +1,6 @@
{% load i18n %}

{% blocktrans trimmed %}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is too big a block to have as a single unit for translation - and it would need care to deal with because it contains HTML tags. I'd mark these up separately with trans or blocktrans:

  • "Photo policy"
  • "The photo must be a clear, recent, colour headshot of the candidate."
  • "No text or party logos may be included in the photo, unless an unavoidable part of the background or a small rosette/badge that doesn’t interfere with the rule above. Any photo containing party text or logos should be replaced by a plain photo whenever one is available."

@@ -155,7 +155,8 @@
<p><a href="{% url 'help-api' %}">{% trans "Open data API" %}</a>
&middot; <a href="{% url 'help-about' %}">{% trans "About" %}</a>
&middot; <a href="https://github.com/DemocracyClub/yournextrepresentative/issues">{% trans "Issue tracker" %}</a>
&middot; <a href="{% url 'help-privacy' %}">{% trans "Privacy policy" %}</a></p>
&middot; <a href="{% url 'help-privacy' %}">{% trans "Privacy policy" %}</a>
&middot; <a href="{% url 'help-photo-policy' %}">{% trans "Photo policy" %}</a></p>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't this this is imprant enough to include as a separate item in the footer, actually. Being linked to from the About page is fine.

@octopusinvitro octopusinvitro force-pushed the add-photo-policy-text branch 2 times, most recently from a09dc70 to e327811 Compare May 9, 2017 16:54
@mhl mhl force-pushed the add-photo-policy-text branch from e327811 to 28f1838 Compare May 10, 2017 10:14
@mhl
Copy link
Collaborator

mhl commented May 10, 2017

Looks good to me! 👍 (It made me laugh to see my Lego X-Wing pilot in this pull request...)

@coveralls
Copy link

coveralls commented May 10, 2017

Coverage Status

Coverage increased (+0.05%) to 75.223% when pulling 28f1838 on add-photo-policy-text into 241b8d9 on master.

@octopusinvitro
Copy link
Collaborator Author

octopusinvitro commented May 10, 2017

Haha yeah, I was getting 404s so I just searched for photos and there was a foo, looking at me with its shiny eyes ✨ ... how could you not choose the poor foo as a foo image. How!

@symroe
Copy link
Member

symroe commented May 10, 2017

I like that the photo doesn't pass the photo policy, too :)

@symroe symroe merged commit 0c5e11f into master May 10, 2017
@octopusinvitro octopusinvitro deleted the add-photo-policy-text branch May 10, 2017 15:55
@jf1
Copy link

jf1 commented May 12, 2017

Thanks everyone.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants