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

Permet de comparer la version courante avec la bêta ou la version publique #4206

Merged
merged 2 commits into from Feb 13, 2017
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

@@ -329,6 +329,22 @@ <h2 class="subtitle">
</li>
{% endif %}

{% if content.sha_public %}
<li>
<a href="{% url "content:diff" content.pk content.slug_repository %}?from={{ content.sha_public }}&amp;to={% if version %}{{ version }}{% else %}{{ content.sha_draft }}{% endif %}" class="ico-after history blue">
{% trans "Comparer avec la version publique" %}

This comment has been minimized.

Copy link
@Karnaj

Karnaj Feb 12, 2017

Contributor

« version en ligne » serait mieux je pense.

This comment has been minimized.

Copy link
@gcodeur

gcodeur Feb 12, 2017

Author Member

Perso, je préfère publique mais par souci de cohérence avec le reste de l'interface, autant mettre en ligne en effet.

</a>
</li>
{% endif %}

{% if content.sha_beta %}
<li>
<a href="{% url "content:diff" content.pk content.slug_repository %}?from={{ content.sha_beta }}&amp;to={% if version %}{{ version }}{% else %}{{ content.sha_draft }}{% endif %}" class="ico-after history blue">
{% trans "Comparer avec la bêta" %}
</a>
</li>
{% endif %}


<li>
<a href="{% url "content:history" content.pk content.slug_repository %}" class="ico-after history blue">
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.