Merge branch '3.8'

Conflicts:
	templates/web/report/report_layout_child.html.twig
This commit is contained in:
Nicolas Le Goff
2014-02-13 11:12:26 +01:00
2 changed files with 10 additions and 2 deletions

View File

@@ -168,8 +168,8 @@
<label for="NOBESTOF-input">{{ "report:: questions sans reponses" | trans }}</label>
</div>
<div>
<input name="tbl" type="radio" value="SITEACTIVITY" data-action="{{ path('report_activity_questions_nobestof') }}" id="SITEACTIVITY-input" class="formsubmiter" />
<label for="SITEACTIVITY-input">{{ "report:: activite du site" | trans }}</label>
<input name="tbl" type="radio" value="SITEACTIVITY" data-action="{{ path('report_activity_instance_hours') }}" id="SITEACTIVITY-input" class="formsubmiter" />
<label for="SITEACTIVITY-input">{{{ "report:: activite du site" | trans }}</label>
</div>
<div>
<input name="tbl" type="radio" value="WDOC" data-action="{{ path('report_activity_documents_pushed') }}" id="WDOC" class="formsubmiter" />