From 4dcb9b8be10803a403f317b41a4230a786349de0 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Mon, 23 Jul 2012 14:43:57 +0200
Subject: [PATCH] Update templates filepaths

---
 .../Phrasea/Controller/Prod/Bridge.php        | 28 ++++++++---------
 lib/Alchemy/Phrasea/Controller/Prod/Edit.php  |  4 +--
 lib/Alchemy/Phrasea/Controller/Prod/Feed.php  | 10 +++---
 .../Controller/Prod/MoveCollection.php        |  2 +-
 lib/Alchemy/Phrasea/Controller/Prod/Query.php |  6 ++--
 templates/web/common/menubar.html.twig        |  2 +-
 ...ntainer.twig => actioncontainer.html.twig} |  0
 ...ainers.twig => actioncontainers.html.twig} |  0
 ...onelement.twig => actionelement.html.twig} |  0
 ...elements.twig => actionelements.html.twig} |  0
 ...ns.twig => element_informations.html.twig} |  0
 ...wig => playlist_createcontainer.html.twig} |  2 +-
 .../playlist_deleteelement.html.twig}         |  2 +-
 .../{upload.twig => upload.html.twig}         |  4 +--
 .../video_deleteelement.html.twig}            |  2 +-
 ...deo_modify.twig => video_modify.html.twig} |  4 +--
 .../video_moveinto_playlist.html.twig}        |  2 +-
 ...ntainer.twig => actioncontainer.html.twig} |  0
 ...ainers.twig => actioncontainers.html.twig} |  0
 ...onelement.twig => actionelement.html.twig} |  0
 ...elements.twig => actionelements.html.twig} |  0
 ...ns.twig => element_informations.html.twig} |  0
 ...ent.twig => photo_deleteelement.html.twig} |  2 +-
 ...oto_modify.twig => photo_modify.html.twig} |  4 +--
 ...twig => photo_moveinto_photoset.html.twig} |  2 +-
 ...wig => photoset_createcontainer.html.twig} |  2 +-
 ....twig => photoset_deleteelement.html.twig} |  2 +-
 .../Flickr/{upload.twig => upload.html.twig}  |  4 +--
 ...ntainer.twig => actioncontainer.html.twig} |  0
 ...ainers.twig => actioncontainers.html.twig} |  0
 ...onelement.twig => actionelement.html.twig} |  0
 ...elements.twig => actionelements.html.twig} |  0
 ...ns.twig => element_informations.html.twig} |  0
 ...wig => playlist_createcontainer.html.twig} |  2 +-
 .../playlist_deleteelement.html.twig}         |  2 +-
 .../Youtube/{upload.twig => upload.html.twig} |  4 +--
 .../video_deleteelement.html.twig}            |  2 +-
 ...deo_modify.twig => video_modify.html.twig} |  4 +--
 .../video_moveinto_playlist.html.twig}        |  2 +-
 .../{callback.twig => callback.html.twig}     |  0
 ...deactivated.twig => deactivated.html.twig} |  0
 ...sconnected.twig => disconnected.html.twig} |  0
 ...ement_list.twig => element_list.html.twig} | 14 ++++-----
 .../Bridge/{error.twig => error.html.twig}    |  2 +-
 .../Bridge/{index.twig => index.html.twig}    |  0
 ...r_form.twig => macro_error_form.html.twig} |  0
 ...onfigured.twig => notconfigured.html.twig} |  0
 .../{paginator.twig => paginator.html.twig}   |  0
 ...cords_list.twig => records_list.html.twig} |  2 +-
 .../{wrapper.twig => wrapper.html.twig}       |  0
 ...ault.twig => collection_default.html.twig} |  0
 ...it_default.twig => edit_default.html.twig} |  0
 .../{publish.html => publish.html.twig}       |  0
 ...blish_edit.html => publish_edit.html.twig} |  0
 .../feeds/{entry.html => entry.html.twig}     |  2 +-
 ...entry_macro.html => entry_macro.html.twig} |  2 +-
 .../feeds/{feeds.html => feeds.html.twig}     |  2 +-
 templates/web/prod/notifications.html.twig    | 31 +++++++++++++++++++
 .../{order_box.twig => order_box.html.twig}   |  0
 .../{order_item.twig => order_item.html.twig} |  0
 .../{appears_in.html => appears_in.html.twig} |  0
 ...sket_train.html => basket_train.html.twig} |  2 +-
 .../{caption.html => caption.html.twig}       |  0
 .../{feed_train.html => feed_train.html.twig} |  2 +-
 .../{popularity.html => popularity.html.twig} |  0
 .../{reg_train.html => reg_train.html.twig}   |  2 +-
 ...sult_train.html => result_train.html.twig} |  0
 ...ns.html => result_train_options.html.twig} |  2 +-
 ...t_history.html => short_history.html.twig} |  0
 .../preview/{tools.html => tools.html.twig}   |  0
 ...abstract.twig => answerabstract.html.twig} |  2 +-
 .../{answergrid.html => answergrid.html.twig} |  2 +-
 .../{answerlist.html => answerlist.html.twig} |  2 +-
 .../results/{help.twig => help.html.twig}     |  0
 .../results/{record.html => record.html.twig} |  0
 www/client/clientFeedBack.php                 | 16 +++++-----
 www/prod/prodFeedBack.php                     |  8 ++---
 77 files changed, 112 insertions(+), 81 deletions(-)
 rename templates/web/prod/actions/Bridge/Dailymotion/{actioncontainer.twig => actioncontainer.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/Dailymotion/{actioncontainers.twig => actioncontainers.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/Dailymotion/{actionelement.twig => actionelement.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/Dailymotion/{actionelements.twig => actionelements.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/Dailymotion/{element_informations.twig => element_informations.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/Dailymotion/{playlist_createcontainer.twig => playlist_createcontainer.html.twig} (94%)
 rename templates/web/prod/actions/Bridge/{Youtube/playlist_deleteelement.twig => Dailymotion/playlist_deleteelement.html.twig} (94%)
 rename templates/web/prod/actions/Bridge/Dailymotion/{upload.twig => upload.html.twig} (97%)
 rename templates/web/prod/actions/Bridge/{Youtube/video_deleteelement.twig => Dailymotion/video_deleteelement.html.twig} (94%)
 rename templates/web/prod/actions/Bridge/Dailymotion/{video_modify.twig => video_modify.html.twig} (96%)
 rename templates/web/prod/actions/Bridge/{Youtube/video_moveinto_playlist.twig => Dailymotion/video_moveinto_playlist.html.twig} (95%)
 rename templates/web/prod/actions/Bridge/Flickr/{actioncontainer.twig => actioncontainer.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/Flickr/{actioncontainers.twig => actioncontainers.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/Flickr/{actionelement.twig => actionelement.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/Flickr/{actionelements.twig => actionelements.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/Flickr/{element_informations.twig => element_informations.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/Flickr/{photo_deleteelement.twig => photo_deleteelement.html.twig} (94%)
 rename templates/web/prod/actions/Bridge/Flickr/{photo_modify.twig => photo_modify.html.twig} (92%)
 rename templates/web/prod/actions/Bridge/Flickr/{photo_moveinto_photoset.twig => photo_moveinto_photoset.html.twig} (95%)
 rename templates/web/prod/actions/Bridge/Flickr/{photoset_createcontainer.twig => photoset_createcontainer.html.twig} (97%)
 rename templates/web/prod/actions/Bridge/Flickr/{photoset_deleteelement.twig => photoset_deleteelement.html.twig} (94%)
 rename templates/web/prod/actions/Bridge/Flickr/{upload.twig => upload.html.twig} (96%)
 rename templates/web/prod/actions/Bridge/Youtube/{actioncontainer.twig => actioncontainer.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/Youtube/{actioncontainers.twig => actioncontainers.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/Youtube/{actionelement.twig => actionelement.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/Youtube/{actionelements.twig => actionelements.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/Youtube/{element_informations.twig => element_informations.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/Youtube/{playlist_createcontainer.twig => playlist_createcontainer.html.twig} (95%)
 rename templates/web/prod/actions/Bridge/{Dailymotion/playlist_deleteelement.twig => Youtube/playlist_deleteelement.html.twig} (94%)
 rename templates/web/prod/actions/Bridge/Youtube/{upload.twig => upload.html.twig} (97%)
 rename templates/web/prod/actions/Bridge/{Dailymotion/video_deleteelement.twig => Youtube/video_deleteelement.html.twig} (94%)
 rename templates/web/prod/actions/Bridge/Youtube/{video_modify.twig => video_modify.html.twig} (96%)
 rename templates/web/prod/actions/Bridge/{Dailymotion/video_moveinto_playlist.twig => Youtube/video_moveinto_playlist.html.twig} (95%)
 rename templates/web/prod/actions/Bridge/{callback.twig => callback.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/{deactivated.twig => deactivated.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/{disconnected.twig => disconnected.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/{element_list.twig => element_list.html.twig} (93%)
 rename templates/web/prod/actions/Bridge/{error.twig => error.html.twig} (93%)
 rename templates/web/prod/actions/Bridge/{index.twig => index.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/{macro_error_form.twig => macro_error_form.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/{notconfigured.twig => notconfigured.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/{paginator.twig => paginator.html.twig} (100%)
 rename templates/web/prod/actions/Bridge/{records_list.twig => records_list.html.twig} (98%)
 rename templates/web/prod/actions/Bridge/{wrapper.twig => wrapper.html.twig} (100%)
 rename templates/web/prod/actions/{collection_default.twig => collection_default.html.twig} (100%)
 rename templates/web/prod/actions/{edit_default.twig => edit_default.html.twig} (100%)
 rename templates/web/prod/actions/publish/{publish.html => publish.html.twig} (100%)
 rename templates/web/prod/actions/publish/{publish_edit.html => publish_edit.html.twig} (100%)
 rename templates/web/prod/feeds/{entry.html => entry.html.twig} (50%)
 rename templates/web/prod/feeds/{entry_macro.html => entry_macro.html.twig} (97%)
 rename templates/web/prod/feeds/{feeds.html => feeds.html.twig} (98%)
 create mode 100644 templates/web/prod/notifications.html.twig
 rename templates/web/prod/orders/{order_box.twig => order_box.html.twig} (100%)
 rename templates/web/prod/orders/{order_item.twig => order_item.html.twig} (100%)
 rename templates/web/prod/preview/{appears_in.html => appears_in.html.twig} (100%)
 rename templates/web/prod/preview/{basket_train.html => basket_train.html.twig} (97%)
 rename templates/web/prod/preview/{caption.html => caption.html.twig} (100%)
 rename templates/web/prod/preview/{feed_train.html => feed_train.html.twig} (97%)
 rename templates/web/prod/preview/{popularity.html => popularity.html.twig} (100%)
 rename templates/web/prod/preview/{reg_train.html => reg_train.html.twig} (97%)
 rename templates/web/prod/preview/{result_train.html => result_train.html.twig} (100%)
 rename templates/web/prod/preview/{result_train_options.html => result_train_options.html.twig} (91%)
 rename templates/web/prod/preview/{short_history.html => short_history.html.twig} (100%)
 rename templates/web/prod/preview/{tools.html => tools.html.twig} (100%)
 rename templates/web/prod/results/{answerabstract.twig => answerabstract.html.twig} (90%)
 rename templates/web/prod/results/{answergrid.html => answergrid.html.twig} (85%)
 rename templates/web/prod/results/{answerlist.html => answerlist.html.twig} (95%)
 rename templates/web/prod/results/{help.twig => help.html.twig} (100%)
 rename templates/web/prod/results/{record.html => record.html.twig} (100%)

diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Bridge.php b/lib/Alchemy/Phrasea/Controller/Prod/Bridge.php
index f3729a0ca9..ae9cf451ca 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Bridge.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Bridge.php
@@ -56,7 +56,7 @@ class Bridge implements ControllerProviderInterface
                     , 'current_account_id' => ''
                 );
 
-                return new Response($app['twig']->render('prod/actions/Bridge/index.twig', $params)
+                return new Response($app['twig']->render('prod/actions/Bridge/index.html.twig', $params)
                 );
             });
 
@@ -100,7 +100,7 @@ class Bridge implements ControllerProviderInterface
 
                 $params = array('error_message' => $error_message);
 
-                return new Response($app['twig']->render('prod/actions/Bridge/callback.twig', $params));
+                return new Response($app['twig']->render('prod/actions/Bridge/callback.html.twig', $params));
             });
 
         $controllers->get('/adapter/{account_id}/logout/', function(Application $app, $account_id) {
@@ -130,7 +130,7 @@ class Bridge implements ControllerProviderInterface
                         , 'notice_message' => $app['request']->get('notice')
                     );
 
-                    return new Response($app['twig']->render('prod/actions/Bridge/records_list.twig', $params));
+                    return new Response($app['twig']->render('prod/actions/Bridge/records_list.html.twig', $params));
                 })
             ->assert('account_id', '\d+');
 
@@ -155,7 +155,7 @@ class Bridge implements ControllerProviderInterface
                         , 'notice_message' => $app['request']->get('notice')
                     );
 
-                    return new Response($app['twig']->render('prod/actions/Bridge/element_list.twig', $params));
+                    return new Response($app['twig']->render('prod/actions/Bridge/element_list.html.twig', $params));
                 })
             ->assert('account_id', '\d+');
 
@@ -180,7 +180,7 @@ class Bridge implements ControllerProviderInterface
                         , 'notice_message' => $app['request']->get('notice')
                     );
 
-                    return new Response($app['twig']->render('prod/actions/Bridge/element_list.twig', $params));
+                    return new Response($app['twig']->render('prod/actions/Bridge/element_list.html.twig', $params));
                 })
             ->assert('account_id', '\d+');
 
@@ -245,7 +245,7 @@ class Bridge implements ControllerProviderInterface
 
                 $params = array_merge($params, $route_params);
 
-                $template = 'prod/actions/Bridge/' . $account->get_api()->get_connector()->get_name() . '/' . $element_type . '_' . $action . ($destination ? '_' . $destination : '') . '.twig';
+                $template = 'prod/actions/Bridge/' . $account->get_api()->get_connector()->get_name() . '/' . $element_type . '_' . $action . ($destination ? '_' . $destination : '') . '.html.twig';
 
                 return new Response($app['twig']->render($template, $params));
             })->assert('account_id', '\d+');
@@ -290,7 +290,7 @@ class Bridge implements ControllerProviderInterface
                                     , 'notice_message'    => $app['request']->get('notice')
                                 );
 
-                                $template = 'prod/actions/Bridge/' . $account->get_api()->get_connector()->get_name() . '/' . $element_type . '_' . $action . ($destination ? '_' . $destination : '') . '.twig';
+                                $template = 'prod/actions/Bridge/' . $account->get_api()->get_connector()->get_name() . '/' . $element_type . '_' . $action . ($destination ? '_' . $destination : '') . '.html.twig';
 
                                 return new Response($app['twig']->render($template, $params));
                             }
@@ -373,7 +373,7 @@ class Bridge implements ControllerProviderInterface
                 );
 
                 return new Response($app['twig']->render(
-                            'prod/actions/Bridge/' . $account->get_api()->get_connector()->get_name() . '/upload.twig', $params
+                            'prod/actions/Bridge/' . $account->get_api()->get_connector()->get_name() . '/upload.html.twig', $params
                     ));
             });
 
@@ -407,7 +407,7 @@ class Bridge implements ControllerProviderInterface
                         , 'adapter_action'    => 'upload'
                     );
 
-                    return new Response($app['twig']->render('prod/actions/Bridge/' . $account->get_api()->get_connector()->get_name() . '/upload.twig', $params));
+                    return new Response($app['twig']->render('prod/actions/Bridge/' . $account->get_api()->get_connector()->get_name() . '/upload.html.twig', $params));
                 }
 
                 foreach ($route->get_elements() as $record) {
@@ -438,22 +438,22 @@ class Bridge implements ControllerProviderInterface
                     if ($e instanceof \Bridge_Exception_ApiConnectorNotConfigured) {
                         $params = array_merge($params, array('account' => $app['current_account']));
 
-                        return new response($app['twig']->render('/prod/actions/Bridge/notconfigured.twig', $params), 200);
+                        return new response($app['twig']->render('/prod/actions/Bridge/notconfigured.html.twig', $params), 200);
                     } elseif ($e instanceof \Bridge_Exception_ApiConnectorNotConnected) {
                         $params = array_merge($params, array('account' => $app['current_account']));
 
-                        return new response($app['twig']->render('/prod/actions/Bridge/disconnected.twig', $params), 200);
+                        return new response($app['twig']->render('/prod/actions/Bridge/disconnected.html.twig', $params), 200);
                     } elseif ($e instanceof \Bridge_Exception_ApiConnectorAccessTokenFailed) {
                         $params = array_merge($params, array('account' => $app['current_account']));
 
-                        return new response($app['twig']->render('/prod/actions/Bridge/disconnected.twig', $params), 200);
+                        return new response($app['twig']->render('/prod/actions/Bridge/disconnected.html.twig', $params), 200);
                     } elseif ($e instanceof \Bridge_Exception_ApiDisabled) {
                         $params = array_merge($params, array('api' => $e->get_api()));
 
-                        return new response($app['twig']->render('/prod/actions/Bridge/deactivated.twig', $params), 200);
+                        return new response($app['twig']->render('/prod/actions/Bridge/deactivated.html.twig', $params), 200);
                     }
 
-                    return new response($app['twig']->render('/prod/actions/Bridge/error.twig', $params), 200);
+                    return new response($app['twig']->render('/prod/actions/Bridge/error.html.twig', $params), 200);
                 }
             });
 
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Edit.php b/lib/Alchemy/Phrasea/Controller/Prod/Edit.php
index 92c7de01f6..bcc073c7f1 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Edit.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Edit.php
@@ -34,7 +34,7 @@ class Edit implements ControllerProviderInterface
                 $handler = new RecordHelper\Edit($app['phraseanet.core'], $request);
                 $handler->propose_editing();
 
-                return $app['twig']->render('prod/actions/edit_default.twig', array('edit'    => $handler, 'message' => ''));
+                return $app['twig']->render('prod/actions/edit_default.html.twig', array('edit'    => $handler, 'message' => ''));
             }
         );
 
@@ -86,7 +86,7 @@ class Edit implements ControllerProviderInterface
                 $editing = new RecordHelper\Edit($app['phraseanet.core'], $app['request']);
                 $editing->execute($request);
 
-                return $app['twig']->render( 'prod/actions/edit_default.twig', array('edit'    => $editing, 'message' => ''));
+                return $app['twig']->render( 'prod/actions/edit_default.html.twig', array('edit'    => $editing, 'message' => ''));
             }
         );
 
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php
index 9076f93833..dc1b2c272e 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php
@@ -38,7 +38,7 @@ class Feed implements ControllerProviderInterface
                 $feeds = \Feed_Collection::load_all($app['phraseanet.appbox'], $user);
                 $publishing = new RecordHelper\Feed($app['phraseanet.core'], $request);
 
-                return new Response($app['twig']->render('prod/actions/publish/publish.html', array('publishing' => $publishing, 'feeds'      => $feeds)));
+                return new Response($app['twig']->render('prod/actions/publish/publish.html.twig', array('publishing' => $publishing, 'feeds'      => $feeds)));
             });
 
         /**
@@ -88,7 +88,7 @@ class Feed implements ControllerProviderInterface
 
                 $feeds = \Feed_Collection::load_all($app['phraseanet.appbox'], $user);
 
-                $datas = $app['twig']->render('prod/actions/publish/publish_edit.html', array('entry' => $entry, 'feeds' => $feeds));
+                $datas = $app['twig']->render('prod/actions/publish/publish_edit.html.twig', array('entry' => $entry, 'feeds' => $feeds));
 
                 return new Response($datas);
             })->assert('id', '\d+');
@@ -146,7 +146,7 @@ class Feed implements ControllerProviderInterface
                     }
                     $app['phraseanet.appbox']->get_connection()->commit();
 
-                    $entry = $app['twig']->render('prod/feeds/entry.html', array('entry' => $entry));
+                    $entry = $app['twig']->render('prod/feeds/entry.html.twig', array('entry' => $entry));
 
                     $datas = array('error'   => false, 'message' => 'succes', 'datas'   => $entry);
                 } catch (\Exception_Feed_EntryNotFound $e) {
@@ -216,7 +216,7 @@ class Feed implements ControllerProviderInterface
 
                 $feeds = \Feed_Collection::load_all($app['phraseanet.appbox'], $user);
 
-                $datas = $app['twig']->render('prod/feeds/feeds.html'
+                $datas = $app['twig']->render('prod/feeds/feeds.html.twig'
                     , array(
                     'feeds' => $feeds
                     , 'feed'  => $feeds->get_aggregate()
@@ -236,7 +236,7 @@ class Feed implements ControllerProviderInterface
                 $feed = \Feed_Adapter::load_with_user($app['phraseanet.appbox'], $user, $id);
                 $feeds = \Feed_Collection::load_all($app['phraseanet.appbox'], $user);
 
-                $datas = $app['twig']->render('prod/feeds/feeds.html', array('feed'  => $feed, 'feeds' => $feeds, 'page'  => $page));
+                $datas = $app['twig']->render('prod/feeds/feeds.html.twig', array('feed'  => $feed, 'feeds' => $feeds, 'page'  => $page));
 
                 return new Response($datas);
             })->assert('id', '\d+');
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/MoveCollection.php b/lib/Alchemy/Phrasea/Controller/Prod/MoveCollection.php
index 2422c50570..08e40ca13f 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/MoveCollection.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/MoveCollection.php
@@ -35,7 +35,7 @@ class MoveCollection implements ControllerProviderInterface
                 $move = new RecordHelper\MoveCollection($app['phraseanet.core'], $app['request']);
                 $move->propose();
 
-                return $app['twig']->render('prod/actions/collection_default.twig', array('action'  => $move, 'message' => ''));
+                return $app['twig']->render('prod/actions/collection_default.html.twig', array('action'  => $move, 'message' => ''));
             }
         );
 
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Query.php b/lib/Alchemy/Phrasea/Controller/Prod/Query.php
index 635b9c04a0..3d7496e863 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Query.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Query.php
@@ -181,12 +181,12 @@ class Query implements ControllerProviderInterface
                 }
 
                 if ($result->get_count_total_results() === 0) {
-                    $template = 'prod/results/help.twig';
+                    $template = 'prod/results/help.html.twig';
                 } else {
                     if ($mod == 'thumbs') {
-                        $template = 'prod/results/answergrid.html';
+                        $template = 'prod/results/answergrid.html.twig';
                     } else {
-                        $template = 'prod/results/answerlist.html';
+                        $template = 'prod/results/answerlist.html.twig';
                     }
                 }
 
diff --git a/templates/web/common/menubar.html.twig b/templates/web/common/menubar.html.twig
index ac8bc262db..2894fa5983 100644
--- a/templates/web/common/menubar.html.twig
+++ b/templates/web/common/menubar.html.twig
@@ -191,5 +191,5 @@
 
           <div style="display:none;z-index:30000;" id="notification_box">
           {% set notifications = events.get_notifications %}
-          {% include 'prod/notifications.twig' %}
+          {% include 'prod/notifications.html.twig' %}
           </div>
diff --git a/templates/web/prod/actions/Bridge/Dailymotion/actioncontainer.twig b/templates/web/prod/actions/Bridge/Dailymotion/actioncontainer.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/Dailymotion/actioncontainer.twig
rename to templates/web/prod/actions/Bridge/Dailymotion/actioncontainer.html.twig
diff --git a/templates/web/prod/actions/Bridge/Dailymotion/actioncontainers.twig b/templates/web/prod/actions/Bridge/Dailymotion/actioncontainers.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/Dailymotion/actioncontainers.twig
rename to templates/web/prod/actions/Bridge/Dailymotion/actioncontainers.html.twig
diff --git a/templates/web/prod/actions/Bridge/Dailymotion/actionelement.twig b/templates/web/prod/actions/Bridge/Dailymotion/actionelement.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/Dailymotion/actionelement.twig
rename to templates/web/prod/actions/Bridge/Dailymotion/actionelement.html.twig
diff --git a/templates/web/prod/actions/Bridge/Dailymotion/actionelements.twig b/templates/web/prod/actions/Bridge/Dailymotion/actionelements.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/Dailymotion/actionelements.twig
rename to templates/web/prod/actions/Bridge/Dailymotion/actionelements.html.twig
diff --git a/templates/web/prod/actions/Bridge/Dailymotion/element_informations.twig b/templates/web/prod/actions/Bridge/Dailymotion/element_informations.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/Dailymotion/element_informations.twig
rename to templates/web/prod/actions/Bridge/Dailymotion/element_informations.html.twig
diff --git a/templates/web/prod/actions/Bridge/Dailymotion/playlist_createcontainer.twig b/templates/web/prod/actions/Bridge/Dailymotion/playlist_createcontainer.html.twig
similarity index 94%
rename from templates/web/prod/actions/Bridge/Dailymotion/playlist_createcontainer.twig
rename to templates/web/prod/actions/Bridge/Dailymotion/playlist_createcontainer.html.twig
index 0c1d2dd8f7..eb6be7239b 100644
--- a/templates/web/prod/actions/Bridge/Dailymotion/playlist_createcontainer.twig
+++ b/templates/web/prod/actions/Bridge/Dailymotion/playlist_createcontainer.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig"%}
 
 {% block menu %}
   {% trans %}
diff --git a/templates/web/prod/actions/Bridge/Youtube/playlist_deleteelement.twig b/templates/web/prod/actions/Bridge/Dailymotion/playlist_deleteelement.html.twig
similarity index 94%
rename from templates/web/prod/actions/Bridge/Youtube/playlist_deleteelement.twig
rename to templates/web/prod/actions/Bridge/Dailymotion/playlist_deleteelement.html.twig
index 787c2f2868..4035769e77 100644
--- a/templates/web/prod/actions/Bridge/Youtube/playlist_deleteelement.twig
+++ b/templates/web/prod/actions/Bridge/Dailymotion/playlist_deleteelement.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig"%}
 
 {% set n_element = elements|length %}
 
diff --git a/templates/web/prod/actions/Bridge/Dailymotion/upload.twig b/templates/web/prod/actions/Bridge/Dailymotion/upload.html.twig
similarity index 97%
rename from templates/web/prod/actions/Bridge/Dailymotion/upload.twig
rename to templates/web/prod/actions/Bridge/Dailymotion/upload.html.twig
index 15843c2ac8..3977db86e1 100644
--- a/templates/web/prod/actions/Bridge/Dailymotion/upload.twig
+++ b/templates/web/prod/actions/Bridge/Dailymotion/upload.html.twig
@@ -1,5 +1,5 @@
-{% extends "prod/actions/Bridge/wrapper.twig"%}
-{% import "prod/actions/Bridge/macro_error_form.twig" as error_form %}
+{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% import "prod/actions/Bridge/macro_error_form.html.twig" as error_form %}
 
 {% block menu %}
   {% trans %}
diff --git a/templates/web/prod/actions/Bridge/Youtube/video_deleteelement.twig b/templates/web/prod/actions/Bridge/Dailymotion/video_deleteelement.html.twig
similarity index 94%
rename from templates/web/prod/actions/Bridge/Youtube/video_deleteelement.twig
rename to templates/web/prod/actions/Bridge/Dailymotion/video_deleteelement.html.twig
index 252c2e93fd..19063133d0 100644
--- a/templates/web/prod/actions/Bridge/Youtube/video_deleteelement.twig
+++ b/templates/web/prod/actions/Bridge/Dailymotion/video_deleteelement.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig"%}
 
 {% set n_element = elements|length %}
 
diff --git a/templates/web/prod/actions/Bridge/Dailymotion/video_modify.twig b/templates/web/prod/actions/Bridge/Dailymotion/video_modify.html.twig
similarity index 96%
rename from templates/web/prod/actions/Bridge/Dailymotion/video_modify.twig
rename to templates/web/prod/actions/Bridge/Dailymotion/video_modify.html.twig
index 98ebd9f15d..3c5e3f001d 100644
--- a/templates/web/prod/actions/Bridge/Dailymotion/video_modify.twig
+++ b/templates/web/prod/actions/Bridge/Dailymotion/video_modify.html.twig
@@ -1,5 +1,5 @@
-{% extends "prod/actions/Bridge/wrapper.twig"%}
-{% import "prod/actions/Bridge/macro_error_form.twig" as error_form %}
+{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% import "prod/actions/Bridge/macro_error_form.html.twig" as error_form %}
 
 {% block menu %}
 <table style="width:100%;height:30px;">
diff --git a/templates/web/prod/actions/Bridge/Youtube/video_moveinto_playlist.twig b/templates/web/prod/actions/Bridge/Dailymotion/video_moveinto_playlist.html.twig
similarity index 95%
rename from templates/web/prod/actions/Bridge/Youtube/video_moveinto_playlist.twig
rename to templates/web/prod/actions/Bridge/Dailymotion/video_moveinto_playlist.html.twig
index 3c0a51b712..e0ca975658 100644
--- a/templates/web/prod/actions/Bridge/Youtube/video_moveinto_playlist.twig
+++ b/templates/web/prod/actions/Bridge/Dailymotion/video_moveinto_playlist.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig"%}
 
 {% set n_element = elements|length %}
 
diff --git a/templates/web/prod/actions/Bridge/Flickr/actioncontainer.twig b/templates/web/prod/actions/Bridge/Flickr/actioncontainer.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/Flickr/actioncontainer.twig
rename to templates/web/prod/actions/Bridge/Flickr/actioncontainer.html.twig
diff --git a/templates/web/prod/actions/Bridge/Flickr/actioncontainers.twig b/templates/web/prod/actions/Bridge/Flickr/actioncontainers.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/Flickr/actioncontainers.twig
rename to templates/web/prod/actions/Bridge/Flickr/actioncontainers.html.twig
diff --git a/templates/web/prod/actions/Bridge/Flickr/actionelement.twig b/templates/web/prod/actions/Bridge/Flickr/actionelement.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/Flickr/actionelement.twig
rename to templates/web/prod/actions/Bridge/Flickr/actionelement.html.twig
diff --git a/templates/web/prod/actions/Bridge/Flickr/actionelements.twig b/templates/web/prod/actions/Bridge/Flickr/actionelements.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/Flickr/actionelements.twig
rename to templates/web/prod/actions/Bridge/Flickr/actionelements.html.twig
diff --git a/templates/web/prod/actions/Bridge/Flickr/element_informations.twig b/templates/web/prod/actions/Bridge/Flickr/element_informations.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/Flickr/element_informations.twig
rename to templates/web/prod/actions/Bridge/Flickr/element_informations.html.twig
diff --git a/templates/web/prod/actions/Bridge/Flickr/photo_deleteelement.twig b/templates/web/prod/actions/Bridge/Flickr/photo_deleteelement.html.twig
similarity index 94%
rename from templates/web/prod/actions/Bridge/Flickr/photo_deleteelement.twig
rename to templates/web/prod/actions/Bridge/Flickr/photo_deleteelement.html.twig
index f89efbe58d..28e3df311f 100644
--- a/templates/web/prod/actions/Bridge/Flickr/photo_deleteelement.twig
+++ b/templates/web/prod/actions/Bridge/Flickr/photo_deleteelement.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig"%}
 
 {% set n_element = elements|length %}
 
diff --git a/templates/web/prod/actions/Bridge/Flickr/photo_modify.twig b/templates/web/prod/actions/Bridge/Flickr/photo_modify.html.twig
similarity index 92%
rename from templates/web/prod/actions/Bridge/Flickr/photo_modify.twig
rename to templates/web/prod/actions/Bridge/Flickr/photo_modify.html.twig
index e4b8668453..1a65c6ce2c 100644
--- a/templates/web/prod/actions/Bridge/Flickr/photo_modify.twig
+++ b/templates/web/prod/actions/Bridge/Flickr/photo_modify.html.twig
@@ -1,5 +1,5 @@
-{% extends "prod/actions/Bridge/wrapper.twig"%}
-{% import "prod/actions/Bridge/macro_error_form.twig" as error_form %}
+{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% import "prod/actions/Bridge/macro_error_form.html.twig" as error_form %}
 
 {% block menu %}
 <table style="width:100%;height:30px;">
diff --git a/templates/web/prod/actions/Bridge/Flickr/photo_moveinto_photoset.twig b/templates/web/prod/actions/Bridge/Flickr/photo_moveinto_photoset.html.twig
similarity index 95%
rename from templates/web/prod/actions/Bridge/Flickr/photo_moveinto_photoset.twig
rename to templates/web/prod/actions/Bridge/Flickr/photo_moveinto_photoset.html.twig
index bf8bedd0b9..ad058bb226 100644
--- a/templates/web/prod/actions/Bridge/Flickr/photo_moveinto_photoset.twig
+++ b/templates/web/prod/actions/Bridge/Flickr/photo_moveinto_photoset.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig"%}
 
 {% set n_element = elements|length %}
 
diff --git a/templates/web/prod/actions/Bridge/Flickr/photoset_createcontainer.twig b/templates/web/prod/actions/Bridge/Flickr/photoset_createcontainer.html.twig
similarity index 97%
rename from templates/web/prod/actions/Bridge/Flickr/photoset_createcontainer.twig
rename to templates/web/prod/actions/Bridge/Flickr/photoset_createcontainer.html.twig
index 805ac46986..8a1afa80f3 100644
--- a/templates/web/prod/actions/Bridge/Flickr/photoset_createcontainer.twig
+++ b/templates/web/prod/actions/Bridge/Flickr/photoset_createcontainer.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig"%}
 
 {% block menu %}
   {% trans %}
diff --git a/templates/web/prod/actions/Bridge/Flickr/photoset_deleteelement.twig b/templates/web/prod/actions/Bridge/Flickr/photoset_deleteelement.html.twig
similarity index 94%
rename from templates/web/prod/actions/Bridge/Flickr/photoset_deleteelement.twig
rename to templates/web/prod/actions/Bridge/Flickr/photoset_deleteelement.html.twig
index 5353e04e39..2aca85543f 100644
--- a/templates/web/prod/actions/Bridge/Flickr/photoset_deleteelement.twig
+++ b/templates/web/prod/actions/Bridge/Flickr/photoset_deleteelement.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig"%}
 
 {% set n_element = elements|length %}
 
diff --git a/templates/web/prod/actions/Bridge/Flickr/upload.twig b/templates/web/prod/actions/Bridge/Flickr/upload.html.twig
similarity index 96%
rename from templates/web/prod/actions/Bridge/Flickr/upload.twig
rename to templates/web/prod/actions/Bridge/Flickr/upload.html.twig
index 8f966483ff..764287ca91 100644
--- a/templates/web/prod/actions/Bridge/Flickr/upload.twig
+++ b/templates/web/prod/actions/Bridge/Flickr/upload.html.twig
@@ -1,6 +1,6 @@
-{% extends "prod/actions/Bridge/wrapper.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig"%}
 {% import "common/thumbnail.html.twig" as thumb %}
-{% import "prod/actions/Bridge/macro_error_form.twig" as error_form %}
+{% import "prod/actions/Bridge/macro_error_form.html.twig" as error_form %}
 
 {% block menu %}
   {% trans %}
diff --git a/templates/web/prod/actions/Bridge/Youtube/actioncontainer.twig b/templates/web/prod/actions/Bridge/Youtube/actioncontainer.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/Youtube/actioncontainer.twig
rename to templates/web/prod/actions/Bridge/Youtube/actioncontainer.html.twig
diff --git a/templates/web/prod/actions/Bridge/Youtube/actioncontainers.twig b/templates/web/prod/actions/Bridge/Youtube/actioncontainers.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/Youtube/actioncontainers.twig
rename to templates/web/prod/actions/Bridge/Youtube/actioncontainers.html.twig
diff --git a/templates/web/prod/actions/Bridge/Youtube/actionelement.twig b/templates/web/prod/actions/Bridge/Youtube/actionelement.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/Youtube/actionelement.twig
rename to templates/web/prod/actions/Bridge/Youtube/actionelement.html.twig
diff --git a/templates/web/prod/actions/Bridge/Youtube/actionelements.twig b/templates/web/prod/actions/Bridge/Youtube/actionelements.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/Youtube/actionelements.twig
rename to templates/web/prod/actions/Bridge/Youtube/actionelements.html.twig
diff --git a/templates/web/prod/actions/Bridge/Youtube/element_informations.twig b/templates/web/prod/actions/Bridge/Youtube/element_informations.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/Youtube/element_informations.twig
rename to templates/web/prod/actions/Bridge/Youtube/element_informations.html.twig
diff --git a/templates/web/prod/actions/Bridge/Youtube/playlist_createcontainer.twig b/templates/web/prod/actions/Bridge/Youtube/playlist_createcontainer.html.twig
similarity index 95%
rename from templates/web/prod/actions/Bridge/Youtube/playlist_createcontainer.twig
rename to templates/web/prod/actions/Bridge/Youtube/playlist_createcontainer.html.twig
index 3db0173f15..1f95568e4a 100644
--- a/templates/web/prod/actions/Bridge/Youtube/playlist_createcontainer.twig
+++ b/templates/web/prod/actions/Bridge/Youtube/playlist_createcontainer.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig"%}
 
 {% block menu %}
   {% trans %}
diff --git a/templates/web/prod/actions/Bridge/Dailymotion/playlist_deleteelement.twig b/templates/web/prod/actions/Bridge/Youtube/playlist_deleteelement.html.twig
similarity index 94%
rename from templates/web/prod/actions/Bridge/Dailymotion/playlist_deleteelement.twig
rename to templates/web/prod/actions/Bridge/Youtube/playlist_deleteelement.html.twig
index 787c2f2868..4035769e77 100644
--- a/templates/web/prod/actions/Bridge/Dailymotion/playlist_deleteelement.twig
+++ b/templates/web/prod/actions/Bridge/Youtube/playlist_deleteelement.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig"%}
 
 {% set n_element = elements|length %}
 
diff --git a/templates/web/prod/actions/Bridge/Youtube/upload.twig b/templates/web/prod/actions/Bridge/Youtube/upload.html.twig
similarity index 97%
rename from templates/web/prod/actions/Bridge/Youtube/upload.twig
rename to templates/web/prod/actions/Bridge/Youtube/upload.html.twig
index de4a361b44..47cd9376fe 100644
--- a/templates/web/prod/actions/Bridge/Youtube/upload.twig
+++ b/templates/web/prod/actions/Bridge/Youtube/upload.html.twig
@@ -1,5 +1,5 @@
-{% extends "prod/actions/Bridge/wrapper.twig"%}
-{% import "prod/actions/Bridge/macro_error_form.twig" as error_form %}
+{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% import "prod/actions/Bridge/macro_error_form.html.twig" as error_form %}
 
 {% block menu %}
   {% trans %}
diff --git a/templates/web/prod/actions/Bridge/Dailymotion/video_deleteelement.twig b/templates/web/prod/actions/Bridge/Youtube/video_deleteelement.html.twig
similarity index 94%
rename from templates/web/prod/actions/Bridge/Dailymotion/video_deleteelement.twig
rename to templates/web/prod/actions/Bridge/Youtube/video_deleteelement.html.twig
index 252c2e93fd..19063133d0 100644
--- a/templates/web/prod/actions/Bridge/Dailymotion/video_deleteelement.twig
+++ b/templates/web/prod/actions/Bridge/Youtube/video_deleteelement.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig"%}
 
 {% set n_element = elements|length %}
 
diff --git a/templates/web/prod/actions/Bridge/Youtube/video_modify.twig b/templates/web/prod/actions/Bridge/Youtube/video_modify.html.twig
similarity index 96%
rename from templates/web/prod/actions/Bridge/Youtube/video_modify.twig
rename to templates/web/prod/actions/Bridge/Youtube/video_modify.html.twig
index 2a84b8097c..8cfcd4637e 100644
--- a/templates/web/prod/actions/Bridge/Youtube/video_modify.twig
+++ b/templates/web/prod/actions/Bridge/Youtube/video_modify.html.twig
@@ -1,5 +1,5 @@
-{% extends "prod/actions/Bridge/wrapper.twig"%}
-{% import "prod/actions/Bridge/macro_error_form.twig" as error_form %}
+{% extends "prod/actions/Bridge/wrapper.html.twig"%}
+{% import "prod/actions/Bridge/macro_error_form.html.twig" as error_form %}
 
 {% block menu %}
 <table style="width:100%;height:30px;">
diff --git a/templates/web/prod/actions/Bridge/Dailymotion/video_moveinto_playlist.twig b/templates/web/prod/actions/Bridge/Youtube/video_moveinto_playlist.html.twig
similarity index 95%
rename from templates/web/prod/actions/Bridge/Dailymotion/video_moveinto_playlist.twig
rename to templates/web/prod/actions/Bridge/Youtube/video_moveinto_playlist.html.twig
index 3c0a51b712..e0ca975658 100644
--- a/templates/web/prod/actions/Bridge/Dailymotion/video_moveinto_playlist.twig
+++ b/templates/web/prod/actions/Bridge/Youtube/video_moveinto_playlist.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig"%}
 
 {% set n_element = elements|length %}
 
diff --git a/templates/web/prod/actions/Bridge/callback.twig b/templates/web/prod/actions/Bridge/callback.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/callback.twig
rename to templates/web/prod/actions/Bridge/callback.html.twig
diff --git a/templates/web/prod/actions/Bridge/deactivated.twig b/templates/web/prod/actions/Bridge/deactivated.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/deactivated.twig
rename to templates/web/prod/actions/Bridge/deactivated.html.twig
diff --git a/templates/web/prod/actions/Bridge/disconnected.twig b/templates/web/prod/actions/Bridge/disconnected.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/disconnected.twig
rename to templates/web/prod/actions/Bridge/disconnected.html.twig
diff --git a/templates/web/prod/actions/Bridge/element_list.twig b/templates/web/prod/actions/Bridge/element_list.html.twig
similarity index 93%
rename from templates/web/prod/actions/Bridge/element_list.twig
rename to templates/web/prod/actions/Bridge/element_list.html.twig
index a4fc0d8d01..3b2f973906 100644
--- a/templates/web/prod/actions/Bridge/element_list.twig
+++ b/templates/web/prod/actions/Bridge/element_list.html.twig
@@ -1,5 +1,5 @@
-{% extends "prod/actions/Bridge/wrapper.twig" %}
-{% import "prod/actions/Bridge/paginator.twig" as pages %}
+{% extends "prod/actions/Bridge/wrapper.html.twig" %}
+{% import "prod/actions/Bridge/paginator.html.twig" as pages %}
 
 
 {% block menu %}
@@ -12,9 +12,9 @@
             </form>
         </td>
         {% if adapter_action == 'load-elements' %}
-            {% set actiontemplate = 'prod/actions/Bridge/' ~ account.get_api().get_connector().get_name() ~ '/actionelements.twig' %}
+            {% set actiontemplate = 'prod/actions/Bridge/' ~ account.get_api().get_connector().get_name() ~ '/actionelements.html.twig' %}
         {% elseif adapter_action == 'load-containers' %}
-            {% set actiontemplate = 'prod/actions/Bridge/' ~ account.get_api().get_connector().get_name() ~ '/actioncontainers.twig' %}
+            {% set actiontemplate = 'prod/actions/Bridge/' ~ account.get_api().get_connector().get_name() ~ '/actioncontainers.html.twig' %}
         {% endif %}
 
         {% include actiontemplate %}
@@ -103,16 +103,16 @@
               {% endif %}
             </td>
             <td class="special">
-              {% set information_template = 'prod/actions/Bridge/' ~ account.get_api().get_connector().get_name() ~ '/element_informations.twig' %}
+              {% set information_template = 'prod/actions/Bridge/' ~ account.get_api().get_connector().get_name() ~ '/element_informations.html.twig' %}
               {% include information_template %}
             </td>
           </tr>
           <tr>
             <td colspan="4" style="text-align:right;">
               {% if adapter_action == 'load-elements' %}
-                  {% set actiontemplate = 'prod/actions/Bridge/' ~ account.get_api().get_connector().get_name() ~ '/actionelement.twig' %}
+                  {% set actiontemplate = 'prod/actions/Bridge/' ~ account.get_api().get_connector().get_name() ~ '/actionelement.html.twig' %}
               {% elseif adapter_action == 'load-containers' %}
-                  {% set actiontemplate = 'prod/actions/Bridge/' ~ account.get_api().get_connector().get_name() ~ '/actioncontainer.twig' %}
+                  {% set actiontemplate = 'prod/actions/Bridge/' ~ account.get_api().get_connector().get_name() ~ '/actioncontainer.html.twig' %}
               {% endif %}
 
               {% include actiontemplate %}
diff --git a/templates/web/prod/actions/Bridge/error.twig b/templates/web/prod/actions/Bridge/error.html.twig
similarity index 93%
rename from templates/web/prod/actions/Bridge/error.twig
rename to templates/web/prod/actions/Bridge/error.html.twig
index 186ab2ff3e..25693624e7 100644
--- a/templates/web/prod/actions/Bridge/error.twig
+++ b/templates/web/prod/actions/Bridge/error.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.twig"%}
+{% extends "prod/actions/Bridge/wrapper.html.twig"%}
 
 {% set n_element = elements|length %}
 
diff --git a/templates/web/prod/actions/Bridge/index.twig b/templates/web/prod/actions/Bridge/index.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/index.twig
rename to templates/web/prod/actions/Bridge/index.html.twig
diff --git a/templates/web/prod/actions/Bridge/macro_error_form.twig b/templates/web/prod/actions/Bridge/macro_error_form.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/macro_error_form.twig
rename to templates/web/prod/actions/Bridge/macro_error_form.html.twig
diff --git a/templates/web/prod/actions/Bridge/notconfigured.twig b/templates/web/prod/actions/Bridge/notconfigured.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/notconfigured.twig
rename to templates/web/prod/actions/Bridge/notconfigured.html.twig
diff --git a/templates/web/prod/actions/Bridge/paginator.twig b/templates/web/prod/actions/Bridge/paginator.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/paginator.twig
rename to templates/web/prod/actions/Bridge/paginator.html.twig
diff --git a/templates/web/prod/actions/Bridge/records_list.twig b/templates/web/prod/actions/Bridge/records_list.html.twig
similarity index 98%
rename from templates/web/prod/actions/Bridge/records_list.twig
rename to templates/web/prod/actions/Bridge/records_list.html.twig
index 7aabdd7d69..63b721d560 100644
--- a/templates/web/prod/actions/Bridge/records_list.twig
+++ b/templates/web/prod/actions/Bridge/records_list.html.twig
@@ -1,4 +1,4 @@
-{% extends "prod/actions/Bridge/wrapper.twig" %}
+{% extends "prod/actions/Bridge/wrapper.html.twig" %}
 {% import "common/thumbnail.html.twig" as thumb %}
 
 
diff --git a/templates/web/prod/actions/Bridge/wrapper.twig b/templates/web/prod/actions/Bridge/wrapper.html.twig
similarity index 100%
rename from templates/web/prod/actions/Bridge/wrapper.twig
rename to templates/web/prod/actions/Bridge/wrapper.html.twig
diff --git a/templates/web/prod/actions/collection_default.twig b/templates/web/prod/actions/collection_default.html.twig
similarity index 100%
rename from templates/web/prod/actions/collection_default.twig
rename to templates/web/prod/actions/collection_default.html.twig
diff --git a/templates/web/prod/actions/edit_default.twig b/templates/web/prod/actions/edit_default.html.twig
similarity index 100%
rename from templates/web/prod/actions/edit_default.twig
rename to templates/web/prod/actions/edit_default.html.twig
diff --git a/templates/web/prod/actions/publish/publish.html b/templates/web/prod/actions/publish/publish.html.twig
similarity index 100%
rename from templates/web/prod/actions/publish/publish.html
rename to templates/web/prod/actions/publish/publish.html.twig
diff --git a/templates/web/prod/actions/publish/publish_edit.html b/templates/web/prod/actions/publish/publish_edit.html.twig
similarity index 100%
rename from templates/web/prod/actions/publish/publish_edit.html
rename to templates/web/prod/actions/publish/publish_edit.html.twig
diff --git a/templates/web/prod/feeds/entry.html b/templates/web/prod/feeds/entry.html.twig
similarity index 50%
rename from templates/web/prod/feeds/entry.html
rename to templates/web/prod/feeds/entry.html.twig
index e718fdf979..3b1ca28339 100644
--- a/templates/web/prod/feeds/entry.html
+++ b/templates/web/prod/feeds/entry.html.twig
@@ -1,2 +1,2 @@
-{% import 'prod/feeds/entry_macro.html' as _entry %}
+{% import 'prod/feeds/entry_macro.html.twig' as _entry %}
 {{ _entry.format(entry.get_feed(), entry, user, session) }}
\ No newline at end of file
diff --git a/templates/web/prod/feeds/entry_macro.html b/templates/web/prod/feeds/entry_macro.html.twig
similarity index 97%
rename from templates/web/prod/feeds/entry_macro.html
rename to templates/web/prod/feeds/entry_macro.html.twig
index 586878ecb7..84787fe09d 100644
--- a/templates/web/prod/feeds/entry_macro.html
+++ b/templates/web/prod/feeds/entry_macro.html.twig
@@ -1,5 +1,5 @@
 {% macro format(feed, entry, user, session)%}
-  {% import 'prod/results/record.html' as record_format %}
+  {% import 'prod/results/record.html.twig' as record_format %}
 
   <div class="entry ui-corner-all" id="entry_{{ entry.get_id() }}">
     <table class="head">
diff --git a/templates/web/prod/feeds/feeds.html b/templates/web/prod/feeds/feeds.html.twig
similarity index 98%
rename from templates/web/prod/feeds/feeds.html
rename to templates/web/prod/feeds/feeds.html.twig
index 685fdafcf2..216e1b6319 100644
--- a/templates/web/prod/feeds/feeds.html
+++ b/templates/web/prod/feeds/feeds.html.twig
@@ -1,4 +1,4 @@
-{% import 'prod/feeds/entry_macro.html' as _entry %}
+{% import 'prod/feeds/entry_macro.html.twig' as _entry %}
 <div class="feed">
     {% if page == 1 %}
     <div class="headblock">
diff --git a/templates/web/prod/notifications.html.twig b/templates/web/prod/notifications.html.twig
new file mode 100644
index 0000000000..e4aa61501f
--- /dev/null
+++ b/templates/web/prod/notifications.html.twig
@@ -0,0 +1,31 @@
+<div style="margin-right:16px;">
+
+{% if notifications|length == 0%}
+<div class="notification_title">
+  <span>{% trans 'Aucune notification' %}</span>
+</div>
+{% else %}
+<div class="notification_title">
+  <a href="#" onclick="print_notifications(0);return false;">{% trans 'toutes les notifications' %}</a>
+</div>
+{% endif %}
+
+{% for notif in notifications %}
+<div style="position:relative;" id="notification_{{notif['id']}}" class="notification {% if notif['unread'] == '1' %}unread{% endif %}">
+  <table style="width:100%;" cellspacing="0" cellpadding="0" border="0">
+    <tr>
+      <td style="width:25px;">
+        <img src="{{notif['icon']}}" style="vertical-align:middle;width:16px;margin:2px;" />
+      </td>
+      <td>
+        <p style="margin:0;padding:0;" class="{{notif['class']}}">
+          {{notif['text']|raw}}
+          <span class="time">{{notif['created_on']}}</span>
+        </p>
+      </td>
+    </tr>
+  </table>
+</div>
+
+{% endfor %}
+</div>
diff --git a/templates/web/prod/orders/order_box.twig b/templates/web/prod/orders/order_box.html.twig
similarity index 100%
rename from templates/web/prod/orders/order_box.twig
rename to templates/web/prod/orders/order_box.html.twig
diff --git a/templates/web/prod/orders/order_item.twig b/templates/web/prod/orders/order_item.html.twig
similarity index 100%
rename from templates/web/prod/orders/order_item.twig
rename to templates/web/prod/orders/order_item.html.twig
diff --git a/templates/web/prod/preview/appears_in.html b/templates/web/prod/preview/appears_in.html.twig
similarity index 100%
rename from templates/web/prod/preview/appears_in.html
rename to templates/web/prod/preview/appears_in.html.twig
diff --git a/templates/web/prod/preview/basket_train.html b/templates/web/prod/preview/basket_train.html.twig
similarity index 97%
rename from templates/web/prod/preview/basket_train.html
rename to templates/web/prod/preview/basket_train.html.twig
index 563490f9f4..374cef7ee3 100644
--- a/templates/web/prod/preview/basket_train.html
+++ b/templates/web/prod/preview/basket_train.html.twig
@@ -39,5 +39,5 @@
     </div>
   </div>
   <div id="PREVIEWTOOL">
-  {% include 'prod/preview/tools.html' %}
+  {% include 'prod/preview/tools.html.twig' %}
   </div>
\ No newline at end of file
diff --git a/templates/web/prod/preview/caption.html b/templates/web/prod/preview/caption.html.twig
similarity index 100%
rename from templates/web/prod/preview/caption.html
rename to templates/web/prod/preview/caption.html.twig
diff --git a/templates/web/prod/preview/feed_train.html b/templates/web/prod/preview/feed_train.html.twig
similarity index 97%
rename from templates/web/prod/preview/feed_train.html
rename to templates/web/prod/preview/feed_train.html.twig
index 2b133ca213..d621f5199b 100644
--- a/templates/web/prod/preview/feed_train.html
+++ b/templates/web/prod/preview/feed_train.html.twig
@@ -39,5 +39,5 @@
     </div>
   </div>
   <div id="PREVIEWTOOL">
-  {% include 'prod/preview/tools.html' %}
+  {% include 'prod/preview/tools.html.twig' %}
   </div>
\ No newline at end of file
diff --git a/templates/web/prod/preview/popularity.html b/templates/web/prod/preview/popularity.html.twig
similarity index 100%
rename from templates/web/prod/preview/popularity.html
rename to templates/web/prod/preview/popularity.html.twig
diff --git a/templates/web/prod/preview/reg_train.html b/templates/web/prod/preview/reg_train.html.twig
similarity index 97%
rename from templates/web/prod/preview/reg_train.html
rename to templates/web/prod/preview/reg_train.html.twig
index bc5bff0ca0..2cc531c8c4 100644
--- a/templates/web/prod/preview/reg_train.html
+++ b/templates/web/prod/preview/reg_train.html.twig
@@ -58,5 +58,5 @@
           </div>
           </div>
           <div id="PREVIEWTOOL">
-            {% include 'prod/preview/tools.html' %}
+            {% include 'prod/preview/tools.html.twig' %}
           </div>
\ No newline at end of file
diff --git a/templates/web/prod/preview/result_train.html b/templates/web/prod/preview/result_train.html.twig
similarity index 100%
rename from templates/web/prod/preview/result_train.html
rename to templates/web/prod/preview/result_train.html.twig
diff --git a/templates/web/prod/preview/result_train_options.html b/templates/web/prod/preview/result_train_options.html.twig
similarity index 91%
rename from templates/web/prod/preview/result_train_options.html
rename to templates/web/prod/preview/result_train_options.html.twig
index c63337dd78..0050fa29b8 100644
--- a/templates/web/prod/preview/result_train_options.html
+++ b/templates/web/prod/preview/result_train_options.html.twig
@@ -8,5 +8,5 @@
               </div>
             </div>
             <div id="PREVIEWTOOL" style="top:0;bottom:auto;">
-              {% include 'prod/preview/tools.html' %}
+              {% include 'prod/preview/tools.html.twig' %}
             </div>
diff --git a/templates/web/prod/preview/short_history.html b/templates/web/prod/preview/short_history.html.twig
similarity index 100%
rename from templates/web/prod/preview/short_history.html
rename to templates/web/prod/preview/short_history.html.twig
diff --git a/templates/web/prod/preview/tools.html b/templates/web/prod/preview/tools.html.twig
similarity index 100%
rename from templates/web/prod/preview/tools.html
rename to templates/web/prod/preview/tools.html.twig
diff --git a/templates/web/prod/results/answerabstract.twig b/templates/web/prod/results/answerabstract.html.twig
similarity index 90%
rename from templates/web/prod/results/answerabstract.twig
rename to templates/web/prod/results/answerabstract.html.twig
index abdd0e2072..83281ccd9e 100644
--- a/templates/web/prod/results/answerabstract.twig
+++ b/templates/web/prod/results/answerabstract.html.twig
@@ -1,4 +1,4 @@
-{% import 'prod/results/record.html' as record_format %}
+{% import 'prod/results/record.html.twig' as record_format %}
 
 {% if results.get_error() %}
 <div>{{results.get_error()}}</div>
diff --git a/templates/web/prod/results/answergrid.html b/templates/web/prod/results/answergrid.html.twig
similarity index 85%
rename from templates/web/prod/results/answergrid.html
rename to templates/web/prod/results/answergrid.html.twig
index 3c7e9d2f83..ef0fe9a758 100644
--- a/templates/web/prod/results/answergrid.html
+++ b/templates/web/prod/results/answergrid.html.twig
@@ -1,5 +1,5 @@
 
-{% extends "prod/results/answerabstract.twig" %}
+{% extends "prod/results/answerabstract.html.twig" %}
 
 {% block content %}
 
diff --git a/templates/web/prod/results/answerlist.html b/templates/web/prod/results/answerlist.html.twig
similarity index 95%
rename from templates/web/prod/results/answerlist.html
rename to templates/web/prod/results/answerlist.html.twig
index eea6486a8a..8a708485ab 100644
--- a/templates/web/prod/results/answerlist.html
+++ b/templates/web/prod/results/answerlist.html.twig
@@ -1,5 +1,5 @@
 
-{% extends "prod/results/answerabstract.twig" %}
+{% extends "prod/results/answerabstract.html.twig" %}
 {% block content %}
 
 {% import 'common/caption_templates/answer.html.twig' as caption %}
diff --git a/templates/web/prod/results/help.twig b/templates/web/prod/results/help.html.twig
similarity index 100%
rename from templates/web/prod/results/help.twig
rename to templates/web/prod/results/help.html.twig
diff --git a/templates/web/prod/results/record.html b/templates/web/prod/results/record.html.twig
similarity index 100%
rename from templates/web/prod/results/record.html
rename to templates/web/prod/results/record.html.twig
diff --git a/www/client/clientFeedBack.php b/www/client/clientFeedBack.php
index d96b7092b1..614b3fc999 100644
--- a/www/client/clientFeedBack.php
+++ b/www/client/clientFeedBack.php
@@ -50,14 +50,14 @@ switch ($parm['action']) {
         $train = '';
 
         if ($record->is_from_reg()) {
-            $train = $twig->render('prod/preview/reg_train.html', array(
+            $train = $twig->render('prod/preview/reg_train.html.twig', array(
                 'record' => $record
                 )
             );
         }
 
         if ($record->is_from_basket() && $parm['roll']) {
-            $train = $twig->render('prod/preview/basket_train.html', array(
+            $train = $twig->render('prod/preview/basket_train.html.twig', array(
                 'record' => $record
                 )
             );
@@ -65,7 +65,7 @@ switch ($parm['action']) {
 
 
         if ($record->is_from_feed()) {
-            $train = $twig->render('prod/preview/feed_train.html', array(
+            $train = $twig->render('prod/preview/feed_train.html.twig', array(
                 'record' => $record
                 )
             );
@@ -73,7 +73,7 @@ switch ($parm['action']) {
 
         $output = p4string::jsonencode(
                 array(
-                    "desc" => $twig->render('prod/preview/caption.html', array(
+                    "desc" => $twig->render('prod/preview/caption.html.twig', array(
                         'record'       => $record
                         , 'highlight'    => $parm['query']
                         , 'searchEngine' => $search_engine
@@ -81,17 +81,17 @@ switch ($parm['action']) {
                     )
                     , "html_preview" => $twig->render('common/preview.html.twig', array('record' => $record)
                     )
-                    , "others" => $twig->render('prod/preview/appears_in.html', array(
+                    , "others" => $twig->render('prod/preview/appears_in.html.twig', array(
                         'parents' => $record->get_grouping_parents(),
                         'baskets' => $record->get_container_baskets()
                         )
                     )
                     , "current" => $train
-                    , "history" => $twig->render('prod/preview/short_history.html', array('record'     => $record)
+                    , "history" => $twig->render('prod/preview/short_history.html.twig', array('record'     => $record)
                     )
-                    , "popularity" => $twig->render('prod/preview/popularity.html', array('record' => $record)
+                    , "popularity" => $twig->render('prod/preview/popularity.html.twig', array('record' => $record)
                     )
-                    , "tools"  => $twig->render('prod/preview/tools.html', array('record' => $record)
+                    , "tools"  => $twig->render('prod/preview/tools.html.twig', array('record' => $record)
                     )
                     , "pos"    => $record->get_number()
                     , "title"  => $record->get_title($parm['query'], $search_engine)
diff --git a/www/prod/prodFeedBack.php b/www/prod/prodFeedBack.php
index e78cfda20d..1ba6702374 100644
--- a/www/prod/prodFeedBack.php
+++ b/www/prod/prodFeedBack.php
@@ -149,7 +149,7 @@ switch ($action) {
         $output = p4string::jsonencode(
                 array('current' =>
                     $twig->render(
-                        'prod/preview/result_train.html', array(
+                        'prod/preview/result_train.html.twig', array(
                         'records'  => $records
                         , 'selected' => $parm['pos'])
                     )
@@ -161,7 +161,7 @@ switch ($action) {
     case 'REGTRAIN':
         $parm = $request->get_parms('cont', 'pos');
         $record = new record_preview('REG', $parm['pos'], $parm['cont']);
-        $output = $twig->render('prod/preview/reg_train.html', array('container_records' => $record->get_container()->get_children(),
+        $output = $twig->render('prod/preview/reg_train.html.twig', array('container_records' => $record->get_container()->get_children(),
             'record'            => $record));
         break;
 
@@ -173,7 +173,7 @@ switch ($action) {
             $core = \bootstrap::getCore();
             $twig = $core->getTwig();
 
-            $render = $twig->render('prod/orders/order_box.twig', array('ordermanager' => $orders));
+            $render = $twig->render('prod/orders/order_box.html.twig', array('ordermanager' => $orders));
             $ret = array('error' => false, 'datas' => $render);
         } catch (Exception $e) {
             $ret = array('error' => true, 'datas' => $e->getMessage());
@@ -190,7 +190,7 @@ switch ($action) {
             $core = \bootstrap::getCore();
             $twig = $core->getTwig();
 
-            $render = $twig->render('prod/orders/order_item.twig', array('order' => $order));
+            $render = $twig->render('prod/orders/order_item.html.twig', array('order' => $order));
             $ret = array('error' => false, 'datas' => $render);
         } catch (Exception $e) {
             $ret = array('error' => true, 'datas' => $e->getMessage());