Merge commit 'origin/master' into fusionax

Conflicts:

	htdocs/xorg.php
	templates/profile/general.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --cc htdocs/xorg.php
index b5e0726,1fbce45..7d65d99
--- 1/htdocs/xorg.php
--- 2/htdocs/xorg.php
+++ b/htdocs/xorg.php
@@@ -21,13 -21,13 +21,14 @@@
  
  require_once dirname(__FILE__).'/../include/xorg.inc.php';
  
+ $platal = new Platal('auth', 'carnet', 'email', 'events', 'forums',
+                      'geoloc', 'lists', 'marketing', 'payment', 'platal',
+                      'profile', 'register', 'search', 'stats', 'admin',
+                      'newsletter', 'axletter', 'bandeau', 'survey',
++                     'fusionax',
+                      'gadgets', 'googleapps');
+ 
  if (!($path = Env::v('n')) || ($path{0} < 'A' || $path{0} > 'Z')) {
-     $platal = new Platal('auth', 'carnet', 'email', 'events', 'forums',
-                          'geoloc', 'lists', 'marketing', 'payment', 'platal',
-                          'profile', 'register', 'search', 'stats', 'admin',
-                          'newsletter', 'axletter', 'bandeau', 'survey',
-                          'fusionax',
-                          'gadgets', 'googleapps');
      $platal->run();
      exit;
  }

diff --cc modules/email.php
Simple merge

diff --cc modules/geoloc.php
Simple merge

diff --cc modules/marketing.php
Simple merge

diff --cc modules/profile.php
index 894578a,5e1a3cf..62a0ce7
--- 1/modules/profile.php
--- 2/modules/profile.php
+++ b/modules/profile.php
@@@ -832,18 -809,8 +833,18 @@@ class ProfileModule extends PLModul
          $table_editor->describe('label', 'intitulé', true);
          $table_editor->apply($page, $action, $id);
      }
 +    function handler_admin_networking(&$page, $action = 'list', $id = null) {
 +        $page->assign('xorg_title', 'Polytechnique.org - Administration - Networking');
 +        $page->assign('title', 'Gestion des types de networking');
 +        $table_editor = new PLTableEditor('admin/networking', 'profile_networking_enum', 'network_type');
 +        $table_editor->describe('name', 'intitulé', true);
 +        $table_editor->describe('icon', 'nom de l\'icône', false);
 +        $table_editor->describe('filter', 'filtre', true);
 +        $table_editor->describe('link', 'lien web', true);
 +        $table_editor->apply($page, $action, $id);
 +    }
      function handler_admin_medals(&$page, $action = 'list', $id = null) {
-         $page->setTitle('Polytechnique.org - Administration - Distinctions');
+         $page->setTitle('Administration - Distinctions');
          $page->assign('title', 'Gestion des Distinctions');
          $table_editor = new PLTableEditor('admin/medals','profile_medals','id');
          $table_editor->describe('text', 'intitulé',  true);

diff --cc modules/search.php
Simple merge

diff --cc modules/search/classes.inc.php
Simple merge

diff --cc modules/search/search.inc.php
Simple merge

diff --cc templates/emails/redirect.tpl
index 35b32d2,8c7d3aa..7b858e3
--- 1/templates/emails/redirect.tpl
--- 2/templates/emails/redirect.tpl
+++ b/templates/emails/redirect.tpl
@@@ -27,9 -27,8 +27,9 @@@
    </p>
  {/if}
  {if $retour == $smarty.const.ERROR_INVALID_EMAIL}
 +  {assign var='error_email' value='1'}
    <p class="erreur">
-   Erreur: l'email n'est pas valide.
+   Erreur&nbsp;: l'email n'est pas valide.
    </p>
  {/if}
  {if $retour == $smarty.const.ERROR_LOOP_EMAIL}

diff --cc templates/gadgets/ig-minifiche.tpl
Simple merge

diff --cc templates/include/plview.trombi.tpl
Simple merge

diff --cc templates/marketing/private.tpl
Simple merge

diff --cc templates/profile/general.tpl
index 8833356,0203991..90c9356
--- 1/templates/profile/general.tpl
--- 2/templates/profile/general.tpl
+++ b/templates/profile/general.tpl
@@@ -359,10 -247,11 +359,10 @@@
      <td>
        <div>
          <span class="flags">
-           <input type="checkbox" name="freetext_pub" {if $freetext_pub eq 'public'}checked="checked"{/if} />
-           {icon name="flag_green" title="site public"}
+           <label><input type="checkbox" name="freetext_pub" {if $freetext_pub eq 'public'}checked="checked"{/if} />
+           {icon name="flag_green" title="site public"}</label>
          </span>&nbsp;
 -        <span class="titre">Complément libre</span><br />
 -        <span class="comm">Commentaire ? ICQ ? etc...</span>
 +        <span class="titre">Commentaire</span>
        </div>
        <div class="smaller" style="margin-top: 30px">
          <a href="wiki_help/notitle" class="popup3">

diff --cc templates/search/adv.form.tpl
Simple merge