Merge lp:~rdubreil/ubuntu-fr-forum/connection-forum into lp:ubuntu-fr-forum

[Kanor]

Ajout de la case à coché "se souvenir de moi"
et suppression du hack pour ajouter ce formulaire.(voir dossier widget)

[xapantu (xapantu)]

Je ne sais pas si c'est une très bonne idée de supprimer notre hack barbare, son but était de toucher le moins possible au code de FluxBB. Là, c'est plus propre, mais ça modifie encore un peu plus le code de FluxBB.

review: Needs Fixing

Unmerged revisions

120. By rdubreil <email address hidden> on 2011-03-11

Ajout de la case à cocher pour la connection

=== modified file 'header.php'
--- header.php	2010-10-21 22:17:41 +0000
+++ header.php	2011-03-11 19:08:08 +0000
@@ -100,7 +100,7 @@
 <title><?php echo generate_page_title($page_title, $p) ?></title>
 <?php
     /* Ajout en dur pour la dev - McPeter - */
-    define('UFR_STATIC_DEV_TPL', 'http://www-static.ubuntu-fr.org/theme2010');
+    define('UFR_STATIC_DEV_TPL', 'http://www.static.ubuntu-fr.org/theme2010');
 if(($pun_user['style'] == "Ubuntu")||($pun_user['style'] == "Ubuntu_menu-fixe")||(preg_match("/buntu_darker/",$pun_user['style'])))
 {
    $is_ubuntu = 0;
@@ -123,7 +123,7 @@
       $distrib_comp = 'de ';
       $is_kubuntu = 1;
       ?>
-      
+
     <link rel="shortcut icon" href="<?=UFR_STATIC_DEV_TPL?>/images/commun/kubuntu/icone.png"/>
       <?php
     elseif (preg_match('/xubuntu-fr/i', $pun_config["o_base_url"])):
@@ -132,7 +132,7 @@
       $distrib_comp = 'de ';
       $is_xubuntu = 1;
       ?>
-      
+
     <link rel="shortcut icon" href="<?=UFR_STATIC_DEV_TPL?>/images/commun/xubuntu/icone.png"/>
       <?php
     elseif (preg_match('/edubuntu-fr/i', $pun_config["o_base_url"])):
@@ -141,7 +141,7 @@
       $distrib_comp = 'd\'';
       $is_edubuntu = 1;
       ?>
-      
+
     <link rel="shortcut icon" href="<?=UFR_STATIC_DEV_TPL?>/images/commun/edubuntu/icone.png"/>
       <?php
     else:
@@ -150,7 +150,7 @@
       $distrib_comp = 'd\'';
       $is_ubuntu = 1;
       ?>
-      
+
     <link rel="shortcut icon" href="<?=UFR_STATIC_DEV_TPL?>/images/commun/ubuntu/icone.png"/>
       <?php
     endif;
@@ -161,12 +161,12 @@
 // END ADD AlternativeSites
 
 ?>
-    <link rel="stylesheet" media="screen" type="text/css" title="Design Ubuntu" href="<?=UFR_STATIC_DEV_TPL?>/css/forum-general.css" />
+    <link rel="stylesheet" media="screen" type="text/css" title="Design Ubuntu" href="<?=UFR_STATIC_DEV_TPL?>/css/forum.css" />
     <link rel="stylesheet" media="screen" type="text/css" title="Design Ubuntu" href="<?=UFR_STATIC_DEV_TPL?>/css/forum-<?=strtolower($distrib_name)?>.css" />
 
 <?php }
 /*IE*/
-    if ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) !== FALSE ) 
+    if ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) !== FALSE )
     {
     ?>
     <link rel="stylesheet" media="screen" type="text/css" title="Design Ubuntu" href="<?=UFR_STATIC_DEV_TPL?>/css/forum-ie.css" />
@@ -174,7 +174,7 @@
     } ?>
 <?php
 /*IE*/
-    if ( strpos($_SERVER['HTTP_USER_AGENT'], 'KHTML' ) !== FALSE && strpos($_SERVER['HTTP_USER_AGENT'], 'WebKit' ) == false) 
+    if ( strpos($_SERVER['HTTP_USER_AGENT'], 'KHTML' ) !== FALSE && strpos($_SERVER['HTTP_USER_AGENT'], 'WebKit' ) == false)
     {
     ?>
     <link rel="stylesheet" media="screen" type="text/css" title="Design Ubuntu" href="<?=UFR_STATIC_DEV_TPL?>/css/forum-khtml.css" />
@@ -182,7 +182,7 @@
     } ?>
 
 <link rel="stylesheet" type="text/css" href="style/<?php echo $pun_user['style'].'.css' ?>" />
-    <script type="text/javascript" src="<?=UFR_STATIC_DEV_TPL?>/js/common.js"></script> 
+    <script type="text/javascript" src="<?=UFR_STATIC_DEV_TPL?>/js/common.js"></script>
     <script type="text/javascript">
     var menu_hidden=<?php $menu_hidden = ((isset ($_COOKIE['menuForum']) && $_COOKIE['menuForum'] == 'hidden')?'1':'0'); echo $menu_hidden; ?>;
     </script>
@@ -194,9 +194,9 @@
          #announce, #main, #footer {margin-left: 0}
          #hidemenu {background-position: 0 28px;}
      --></style>';
-  } 
+  }
 ?>
-  
+
 <?php
 
 if (defined('PUN_ADMIN_CONSOLE'))
@@ -282,7 +282,7 @@
 
 
 // START SUBST - <pun_desc>
-$tpl_main = str_replace('<pun_desc>', '<div id="brddesc">'.$pun_config['o_board_desc'].'</div>', $tpl_main);
+    $tpl_main = str_replace('<pun_desc>', '<div id="brddesc">'.$pun_config['o_board_desc'].'</div>', $tpl_main);
 // END SUBST - <pun_desc>
 
 
@@ -293,7 +293,7 @@
 
 // START SUBST - <pun_status>
 if ($pun_user['is_guest'])
-	$tpl_temp = '<div id="brdwelcome" class="inbox">'."\n\t\t\t".$lang_common['Not logged in']."\n\t\t".'</div>';
+	$tpl_temp = '<div id="brdwelcome" class="inbox">'.(include 'widget/connection.php').'</div>';
 else
 {
 	$tpl_temp = '<div id="brdwelcome" class="inbox">'."\n\t\t\t".'<ul class="conl">'."\n\t\t\t\t".'<li><span>'.$lang_common['Logged in as'].' <strong>'.pun_htmlspecialchars($pun_user['username']).'</strong></span></li>'."\n\t\t\t\t".'<li><span>'.sprintf($lang_common['Last visit'], format_time($pun_user['last_visit'])).'</span></li>';
 
=== modified file 'lang/Francais/common.php'
--- lang/Francais/common.php	2010-10-21 22:17:41 +0000
+++ lang/Francais/common.php	2011-03-11 19:08:08 +0000
@@ -78,7 +78,7 @@
 'Administrator'			=>	'Administrateur',
 'Banned'			=>	'Banni(e)',
 'Guest'				=>	'Invité',
- 
+
 // Stuff for include/parser.php
 'BBCode error no opening tag'		=>	'La balise [/%1$s] a été trouvée sans balise [%1$s] correspondante',
 'BBCode error invalid nesting'		=>	'La balise [%1$s] a été ouverte dans la balise [%2$s], ceci n\'est pas autorisé',
@@ -95,13 +95,6 @@
 'Search'			=>  	'Recherche',
 'Register'			=>  	'Inscription',
 'Login'				=>  	'Identification',
-'Not logged in'			=>  	'<form action="login.php?action=in" accept-charset="utf-8" id="login_top" method="post">
-          <fieldset>
-            <input type="hidden" name="form_sent" value="1" />
-            <input type="hidden" name="redirect_url" value="index.php" />
-            <input type="text" value="Identifiant"  onfocus="if(this.value == \'Identifiant\'){this.value=\'\';} this.className=\'input_focused\'" name="req_username" size="25" maxlength="25" tabindex="1" /><input type="password" value="Mot de passe"  onfocus="if(this.value == \'Mot de passe\'){this.value=\'\';} this.className=\'input_focused\'" name="req_password" size="25" tabindex="2" /><input type="submit" value="connexion" /> / <a href="register.php">inscription</a>
-          </fieldset>
-        </form>',
 'Profile'			=>	'Profil',
 'Logout'			=>	'Déconnexion',
 'Logged in as'			=>	'',
@@ -129,7 +122,7 @@
 'Stick topic'			=>  	'Épingler la discussion',
 'Moderate forum'		=>	'Modérer le forum',
 'Powered by'                    =>      'Propulsé par %s',
- 
+
 // Debug information
 'Debug table'                   =>        'Informations de débogage',
 'Querytime'                     =>        'Générées en %1$s secondes, %2$s requêtes exécutées',
@@ -172,4 +165,4 @@
 'New reports'					  =>	    'De nouveaux signalements ont été envoyés',
 'Maintenance mode enabled'			  =>	    'Le mode maintenance est activé&#160;!'
 
-); 
+);
 
=== added directory 'widget'
=== added file 'widget/connection.php'
--- widget/connection.php	1970-01-01 00:00:00 +0000
+++ widget/connection.php	2011-03-11 19:08:08 +0000
@@ -0,0 +1,22 @@
+<?php
+$widget = '<form action="login.php?action=in" accept-charset="utf-8" id="login_top" method="post">
+          <fieldset>
+            <input type="hidden" name="form_sent" value="1" />
+            <input type="hidden" name="redirect_url" value="index.php" />
+            <input type="text" value="Identifiant"
+                    onfocus="if(this.value == \'Identifiant\'){this.value=\'\';} this.className=\'input_focused\'"
+                    name="req_username" size="25" maxlength="25" tabindex="1" />
+            <input type="password" value="Mot de passe"
+                    onfocus="if(this.value == \'Mot de passe\'){this.value=\'\';} this.className=\'input_focused\'"
+                    name="req_password" size="25" tabindex="2" />
+            <input type="submit" value="connexion" /> / <a href="register.php">inscription</a>
+            <br/>
+            <label>
+                <input type="checkbox" tabindex="3" value="1" name="save_pass">
+                Se souvenir de moi
+            </label>
+            <a href="login.php?action=forget">Mot de passe oublié&nbsp;?</a>
+          </fieldset>
+         </form>';
+return $widget;
+?>