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.

Sign up for GitHub

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

Fixes on top of 0.8.0.0 #37

Merged
merged 11 commits into from
Aug 17, 2017
Merged

Fixes on top of 0.8.0.0 #37

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
62b6dd4
Load select2 i18n file inconditionally
OdyX Aug 17, 2017
6521683
Fix missing tag for trans, also test for it
OdyX Aug 17, 2017
9de4652
Typo fixes
OdyX Aug 17, 2017
b6a7ca7
Remplacer le mot « Disponibilités » par « Planning »
OdyX Aug 17, 2017
609a8b2
Orga fixes
OdyX Aug 17, 2017
049f89e
Update messages
OdyX Aug 17, 2017
bf0c8de
Dans les sessions et les Qualifs, changer le mot « besoin » pour « vé…
OdyX Aug 17, 2017
e79ca43
Flake8
OdyX Aug 17, 2017
9d01c73
Refactor tel_link
OdyX Aug 17, 2017
e928b00
Disable tel links
OdyX Aug 17, 2017
d194683
Fix Address_zip in orga factories, 10% error rate
OdyX Aug 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remplacer le mot « Disponibilités » par « Planning »
  • Loading branch information
@OdyX
OdyX committed Aug 13, 2017
commit b6a7ca70ec5b22a9cc3eefea4deb7450692499f5
2 changes: 1 addition & 1 deletion apps/challenge/templates/challenge/season_availability.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<h1>{{ season.begin|date:"F Y"|title }} - {{ season.end|date:"F Y" }}</h1>
<h3>{{ season.cantons_verb|join:", " }}</h3>

<h4>{% trans "Disponibilités" %}</h4>
<h4>{% trans "Planning" %}</h4>
<table class="table text-center">
{% include "challenge/season_availability_thead.html" with sessions=season.sessions_with_qualifs season=season user=request.user preamble_columns=2 chosen_stats=1 only %}
<tbody>
Expand Down
2 changes: 1 addition & 1 deletion apps/challenge/templates/challenge/session_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ <h1>
{% endif %}
</table>
<div class="hidden-print">
<a class="btn btn-primary pull-right" href="{% url 'season-availabilities' pk=season.pk %}#sess{{session.pk}}">{% trans "Disponibilités" %}</a>
<a class="btn btn-primary pull-right" href="{% url 'season-availabilities' pk=season.pk %}#sess{{session.pk}}">{% trans "Planning" %}</a>
</div>
<h2 class="hidden-print">{% trans "Qualifs" %}</h2>
<table class="table">
Expand Down
2 changes: 1 addition & 1 deletion apps/challenge/templates/challenge/session_list_links.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="hidden-print">
<a class="btn btn-default" href="{% url 'season-list' year=now.year %}">{% trans "Retour à la liste des saisons" %}</a>
<a class="btn btn-default" href="{% url 'season-update' season.pk %}"><span class="glyphicon glyphicon-pencil"></span> {% trans "Éditer la saison" %}</a>
<a class="btn btn-primary" href="{% url 'season-availabilities' season.pk %}"><span class="glyphicon glyphicon-th"></span> {% trans "Disponibilités" %}</a>
<a class="btn btn-primary" href="{% url 'season-availabilities' season.pk %}"><span class="glyphicon glyphicon-th"></span> {% trans "Planning" %}</a>

<div class="btn-group" role="group" aria-label="exports">
{% include 'export_buttons.html' with exporturl='season-export' exportargs=season.pk filter_querystring=filter_querystring only %}
Expand Down
2 changes: 1 addition & 1 deletion defivelo/templates/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</a>
<ul class="dropdown-menu">
<li{% if 'season-detail' in submenu_category %} class="active"{% endif %}><a href="{% url 'season-detail' season.pk %}">{% trans "Toutes les sessions" %}</a></li>
<li{% if 'season-availability' in submenu_category %} class="active"{% endif %}><a href="{% url 'season-availabilities' season.pk %}">{% trans "Disponibilités" %}</a></li>
<li{% if 'season-availability' in submenu_category %} class="active"{% endif %}><a href="{% url 'season-availabilities' season.pk %}">{% trans "Planning" %}</a></li>
<li role="separator" class="divider"></li>
<li{% if 'season-helperlist' in submenu_category %} class="active"{% endif %}><a href="{% url 'season-helperlist' season.pk %}">{% trans "Liste des moniteurs" %}</a></li>
<li{% if 'season-actorlist' in submenu_category %} class="active"{% endif %}><a href="{% url 'season-actorlist' season.pk %}">{% trans "Liste des intervenants" %}</a></li>
Expand Down