Merge pull request #75 from claroline/5.x-stable

5.x stable
claroline · Oct 2, 2015 · cecb5a2 · cecb5a2
2 parents 94827c2 + 0b5653c
commit cecb5a2
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/Resources/views/Forum/editCategoryForm.html.twig b/Resources/views/Forum/editCategoryForm.html.twig
@@ -18,13 +18,13 @@
         <h3 class="panel-title">{{ 'forum_category_edit'|trans({}, 'forum') }}</h3>
     </div>
     {% form_theme form 'ClarolineCoreBundle::form_theme.html.twig' %}
-    <form novalidate="novalidate" action="{{ _path('claro_forum_edit_category', {'category': category.getId()}) }}" method="post" {{ form_enctype(form) }} id="subject_form">
+    <form novalidate="novalidate" action="{{ path('claro_forum_edit_category', {'category': category.getId()}) }}" method="post" {{ form_enctype(form) }} id="subject_form">
         <div class="panel-body">
             {{ form_widget(form) }}
         </div>
         <div class="panel-footer">
             <button type="submit" class="btn btn-primary">{{ 'ok'|trans({}, 'platform') }}</button>
-            <a class="btn btn-default" href="{{ _path('claro_forum_categories', { 'forum':  _resource.getId()}) }}">{{ 'cancel' | trans({}, 'platform') }}</a>
+            <a class="btn btn-default" href="{{ path('claro_forum_categories', { 'forum':  _resource.getId()}) }}">{{ 'cancel' | trans({}, 'platform') }}</a>
         </div>
     </form>
 {% endblock %}

diff --git a/Resources/views/Forum/editSubjectForm.html.twig b/Resources/views/Forum/editSubjectForm.html.twig
@@ -18,13 +18,13 @@
         <h3 class="panel-title">{{ 'forum_subject_edit'|trans({}, 'forum') }}</h3>
     </div>
     {% form_theme form 'ClarolineCoreBundle::form_theme.html.twig' %}
-    <form novalidate="novalidate" action="{{ _path('claro_forum_edit_subject', {'subjectId': subject.getId()}) }}" method="post" {{ form_enctype(form) }} id="subject_form">
+    <form novalidate="novalidate" action="{{ path('claro_forum_edit_subject', {'subjectId': subject.getId()}) }}" method="post" {{ form_enctype(form) }} id="subject_form">
         <div class="panel-body">
             {{ form_widget(form) }}
         </div>
         <div class="panel-footer">
             <button type="submit" class="btn btn-primary">{{ 'ok'|trans({}, 'platform') }}</button>
-            <a class="btn btn-default" href="{{ _path('claro_forum_subjects', { 'category': subject.getCategory().getId()}) }}">{{ 'cancel' | trans({}, 'platform') }}</a>
+            <a class="btn btn-default" href="{{ path('claro_forum_subjects', { 'category': subject.getCategory().getId()}) }}">{{ 'cancel' | trans({}, 'platform') }}</a>
         </div>
     </form>
 {% endblock %}

diff --git a/Resources/views/Forum/forumsDesktopWidget.html.twig b/Resources/views/Forum/forumsDesktopWidget.html.twig
@@ -41,7 +41,7 @@
                                 <a 
                                     class="link-subject" 
                                     title="{{ message.getSubject().getTitle() }}" 
-                                    href="{{ _path('claro_forum_messages', {'subject': message.getSubject().getId() }) }}">
+                                    href="{{ path('claro_forum_messages', {'subject': message.getSubject().getId() }) }}">
                                     {{ message.getSubject().getTitle() | truncate(80) }}
                                 </a>
                             </li>

diff --git a/Resources/views/Forum/forumsWorkspaceWidget.html.twig b/Resources/views/Forum/forumsWorkspaceWidget.html.twig
@@ -7,7 +7,7 @@
                 <li class="list-group-item">
                     <div class="list-group-item-text">
                         <a class="link-subject"
-                           href="{{ _path('claro_forum_messages', {'subject': message.getSubject().getId() }) }}"
+                           href="{{ path('claro_forum_messages', {'subject': message.getSubject().getId() }) }}"
                         >
                             {{ message.getSubject().getTitle() }}
                         </a>

diff --git a/Resources/views/Forum/subjectForm.html.twig b/Resources/views/Forum/subjectForm.html.twig
@@ -19,7 +19,7 @@
         <h3 class="panel-title">{{ _resource.getResourceNode().getName() }} ({{ 'new_subject'|trans({}, 'forum') }})</h3>
     </div>
     {% form_theme form 'ClarolineCoreBundle::form_theme.html.twig' %}
-    <form novalidate="novalidate" action="{{ _path('claro_forum_create_subject', {'category': category.getId()}) }}" method="post" {{ form_enctype(form) }} id="subject_form">
+    <form novalidate="novalidate" action="{{ path('claro_forum_create_subject', {'category': category.getId()}) }}" method="post" {{ form_enctype(form) }} id="subject_form">
         <div class="panel-body">
            {{ form_errors(form.title) }}
            {{ form_row(form.title) }}
@@ -29,7 +29,7 @@
         </div>
         <div class="panel-footer">
             <button type="submit" class="btn btn-primary">{{ 'ok'|trans({}, 'platform') }}</button>
-            <a class="btn btn-default" href="{{ _path('claro_forum_subjects', { 'category': category.getId() }) }}">{{ 'cancel' | trans({}, 'platform') }}</a>
+            <a class="btn btn-default" href="{{ path('claro_forum_subjects', { 'category': category.getId() }) }}">{{ 'cancel' | trans({}, 'platform') }}</a>
         </div>
     </form>
 {% endblock %}
diff --git a/Resources/views/Forum/subjects.html.twig b/Resources/views/Forum/subjects.html.twig
@@ -54,7 +54,7 @@
                     <i class="fa fa-chevron-left"></i> {{ 'forum_back_to_categories'|trans({}, 'forum') }}
                 </a>
                 {% if canCreateSubject %}
-                    <a class="btn btn-primary" href="{{ _path('claro_forum_form_subject_creation', {'category': category.getId()}) }}">
+                    <a class="btn btn-primary" href="{{ path('claro_forum_form_subject_creation', {'category': category.getId()}) }}">
                         <i class="fa fa-plus"></i> {{ 'new_subject'|trans({}, 'forum') }}
                     </a>
                 {% endif %}
@@ -113,7 +113,7 @@
                         </td>
                         <td>
                             <a class="link-subject"
-                                href="{{ _path('claro_forum_messages', {'subject': subject['id'] }) }}"
+                                href="{{ path('claro_forum_messages', {'subject': subject['id'] }) }}"
                             >
                                 <b>{{ subject['title'] }}</b>
                             </a>
@@ -173,7 +173,7 @@
                                 {% endif %}
                             </td>
                             <td>
-                                <a id="delete-subject" href="{{ _path('claro_forum_delete_subject', {'subject': subject['id']}) }}">
+                                <a id="delete-subject" href="{{ path('claro_forum_delete_subject', {'subject': subject['id']}) }}">
                                     <i class="fa fa-trash-o"></i> {{ 'delete' | trans({}, 'platform') }}
                                 </a>
                             </td>

diff --git a/Resources/views/index.html.twig b/Resources/views/index.html.twig
@@ -25,11 +25,11 @@
                             </div>
                         {% else %}
                             {% if hasSubscribed %}
-                                <a class="btn btn-primary" href="{{ _path('claro_forum_unsubscribe', {'forum': _resource.getId()}) }}">
+                                <a class="btn btn-primary" href="{{ path('claro_forum_unsubscribe', {'forum': _resource.getId()}) }}">
                                     {{ 'unsubscribe_mail_list'|trans({}, 'forum') }}
                                 </a>
                             {% else %}
-                                <a class="btn btn-primary" href="{{ _path('claro_forum_subscribe', {'forum': _resource.getId()}) }}">
+                                <a class="btn btn-primary" href="{{ path('claro_forum_subscribe', {'forum': _resource.getId()}) }}">
                                     {{ 'subscribe_mail_list'|trans({}, 'forum') }}
                                 </a>
                             {% endif %}
@@ -54,30 +54,30 @@
         </div>
         <div id="bottom-div" class="panel">
             {% if isModerator %}
-                <a class="btn btn-primary" href="{{ _path('claro_forum_form_category_creation', {'forum': _resource.getId()}) }}">
+                <a class="btn btn-primary" href="{{ path('claro_forum_form_category_creation', {'forum': _resource.getId()}) }}">
                     <i class="fa fa-plus"></i> {{ 'new_category'|trans({}, 'forum') }}
                 </a>
 
                 {% if is_mailer_available() %}
 
                     {% if _resource.getActivateNotifications() %}
                         <a class="btn btn-primary"
-                           href="{{ _path('claro_forum_disable_global_notifications', {'forum': _resource.getId()}) }}">
+                           href="{{ path('claro_forum_disable_global_notifications', {'forum': _resource.getId()}) }}">
                             {{ 'disable_global_notifications'|trans({}, 'forum') }}
                         </a>
                     {% else %}
                         <a class="btn btn-primary"
-                           href="{{ _path('claro_forum_activate_global_notifications', {'forum': _resource.getId()}) }}">
+                           href="{{ path('claro_forum_activate_global_notifications', {'forum': _resource.getId()}) }}">
                             {{ 'activate_global_notifications'|trans({}, 'forum') }}
                         </a>
                     {% endif %}
 
                     {% if hasSubscribed %}
-                        <a class="btn btn-primary" href="{{ _path('claro_forum_unsubscribe', {'forum': _resource.getId()}) }}">
+                        <a class="btn btn-primary" href="{{ path('claro_forum_unsubscribe', {'forum': _resource.getId()}) }}">
                             {{ 'unsubscribe_mail_list'|trans({}, 'forum') }}
                         </a>
                     {% else %}
-                        <a class="btn btn-primary" href="{{ _path('claro_forum_subscribe', {'forum': _resource.getId()}) }}">
+                        <a class="btn btn-primary" href="{{ path('claro_forum_subscribe', {'forum': _resource.getId()}) }}">
                             {{ 'subscribe_mail_list'|trans({}, 'forum') }}
                         </a>
                     {% endif %}