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

Proposed by Kanor
Status: Needs review
Proposed branch: lp:~rdubreil/ubuntu-fr-forum/connection-forum
Merge into: lp:ubuntu-fr-forum
Diff against target: 181 lines (+38/-23)
3 files modified
header.php (+13/-13)
lang/Francais/common.php (+3/-10)
widget/connection.php (+22/-0)
To merge this branch: bzr merge lp:~rdubreil/ubuntu-fr-forum/connection-forum
Reviewer Review Type Date Requested Status
xapantu (community) Needs Fixing
Ubuntu-fr-webteam Pending
Review via email: mp+53067@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
xapantu (xapantu) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'header.php'
2--- header.php 2010-10-21 22:17:41 +0000
3+++ header.php 2011-03-11 19:08:08 +0000
4@@ -100,7 +100,7 @@
5 <title><?php echo generate_page_title($page_title, $p) ?></title>
6 <?php
7 /* Ajout en dur pour la dev - McPeter - */
8- define('UFR_STATIC_DEV_TPL', 'http://www-static.ubuntu-fr.org/theme2010');
9+ define('UFR_STATIC_DEV_TPL', 'http://www.static.ubuntu-fr.org/theme2010');
10 if(($pun_user['style'] == "Ubuntu")||($pun_user['style'] == "Ubuntu_menu-fixe")||(preg_match("/buntu_darker/",$pun_user['style'])))
11 {
12 $is_ubuntu = 0;
13@@ -123,7 +123,7 @@
14 $distrib_comp = 'de ';
15 $is_kubuntu = 1;
16 ?>
17-
18+
19 <link rel="shortcut icon" href="<?=UFR_STATIC_DEV_TPL?>/images/commun/kubuntu/icone.png"/>
20 <?php
21 elseif (preg_match('/xubuntu-fr/i', $pun_config["o_base_url"])):
22@@ -132,7 +132,7 @@
23 $distrib_comp = 'de ';
24 $is_xubuntu = 1;
25 ?>
26-
27+
28 <link rel="shortcut icon" href="<?=UFR_STATIC_DEV_TPL?>/images/commun/xubuntu/icone.png"/>
29 <?php
30 elseif (preg_match('/edubuntu-fr/i', $pun_config["o_base_url"])):
31@@ -141,7 +141,7 @@
32 $distrib_comp = 'd\'';
33 $is_edubuntu = 1;
34 ?>
35-
36+
37 <link rel="shortcut icon" href="<?=UFR_STATIC_DEV_TPL?>/images/commun/edubuntu/icone.png"/>
38 <?php
39 else:
40@@ -150,7 +150,7 @@
41 $distrib_comp = 'd\'';
42 $is_ubuntu = 1;
43 ?>
44-
45+
46 <link rel="shortcut icon" href="<?=UFR_STATIC_DEV_TPL?>/images/commun/ubuntu/icone.png"/>
47 <?php
48 endif;
49@@ -161,12 +161,12 @@
50 // END ADD AlternativeSites
51
52 ?>
53- <link rel="stylesheet" media="screen" type="text/css" title="Design Ubuntu" href="<?=UFR_STATIC_DEV_TPL?>/css/forum-general.css" />
54+ <link rel="stylesheet" media="screen" type="text/css" title="Design Ubuntu" href="<?=UFR_STATIC_DEV_TPL?>/css/forum.css" />
55 <link rel="stylesheet" media="screen" type="text/css" title="Design Ubuntu" href="<?=UFR_STATIC_DEV_TPL?>/css/forum-<?=strtolower($distrib_name)?>.css" />
56
57 <?php }
58 /*IE*/
59- if ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) !== FALSE )
60+ if ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) !== FALSE )
61 {
62 ?>
63 <link rel="stylesheet" media="screen" type="text/css" title="Design Ubuntu" href="<?=UFR_STATIC_DEV_TPL?>/css/forum-ie.css" />
64@@ -174,7 +174,7 @@
65 } ?>
66 <?php
67 /*IE*/
68- if ( strpos($_SERVER['HTTP_USER_AGENT'], 'KHTML' ) !== FALSE && strpos($_SERVER['HTTP_USER_AGENT'], 'WebKit' ) == false)
69+ if ( strpos($_SERVER['HTTP_USER_AGENT'], 'KHTML' ) !== FALSE && strpos($_SERVER['HTTP_USER_AGENT'], 'WebKit' ) == false)
70 {
71 ?>
72 <link rel="stylesheet" media="screen" type="text/css" title="Design Ubuntu" href="<?=UFR_STATIC_DEV_TPL?>/css/forum-khtml.css" />
73@@ -182,7 +182,7 @@
74 } ?>
75
76 <link rel="stylesheet" type="text/css" href="style/<?php echo $pun_user['style'].'.css' ?>" />
77- <script type="text/javascript" src="<?=UFR_STATIC_DEV_TPL?>/js/common.js"></script>
78+ <script type="text/javascript" src="<?=UFR_STATIC_DEV_TPL?>/js/common.js"></script>
79 <script type="text/javascript">
80 var menu_hidden=<?php $menu_hidden = ((isset ($_COOKIE['menuForum']) && $_COOKIE['menuForum'] == 'hidden')?'1':'0'); echo $menu_hidden; ?>;
81 </script>
82@@ -194,9 +194,9 @@
83 #announce, #main, #footer {margin-left: 0}
84 #hidemenu {background-position: 0 28px;}
85 --></style>';
86- }
87+ }
88 ?>
89-
90+
91 <?php
92
93 if (defined('PUN_ADMIN_CONSOLE'))
94@@ -282,7 +282,7 @@
95
96
97 // START SUBST - <pun_desc>
98-$tpl_main = str_replace('<pun_desc>', '<div id="brddesc">'.$pun_config['o_board_desc'].'</div>', $tpl_main);
99+ $tpl_main = str_replace('<pun_desc>', '<div id="brddesc">'.$pun_config['o_board_desc'].'</div>', $tpl_main);
100 // END SUBST - <pun_desc>
101
102
103@@ -293,7 +293,7 @@
104
105 // START SUBST - <pun_status>
106 if ($pun_user['is_guest'])
107- $tpl_temp = '<div id="brdwelcome" class="inbox">'."\n\t\t\t".$lang_common['Not logged in']."\n\t\t".'</div>';
108+ $tpl_temp = '<div id="brdwelcome" class="inbox">'.(include 'widget/connection.php').'</div>';
109 else
110 {
111 $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>';
112
113=== modified file 'lang/Francais/common.php'
114--- lang/Francais/common.php 2010-10-21 22:17:41 +0000
115+++ lang/Francais/common.php 2011-03-11 19:08:08 +0000
116@@ -78,7 +78,7 @@
117 'Administrator' => 'Administrateur',
118 'Banned' => 'Banni(e)',
119 'Guest' => 'Invité',
120-
121+
122 // Stuff for include/parser.php
123 'BBCode error no opening tag' => 'La balise [/%1$s] a été trouvée sans balise [%1$s] correspondante',
124 'BBCode error invalid nesting' => 'La balise [%1$s] a été ouverte dans la balise [%2$s], ceci n\'est pas autorisé',
125@@ -95,13 +95,6 @@
126 'Search' => 'Recherche',
127 'Register' => 'Inscription',
128 'Login' => 'Identification',
129-'Not logged in' => '<form action="login.php?action=in" accept-charset="utf-8" id="login_top" method="post">
130- <fieldset>
131- <input type="hidden" name="form_sent" value="1" />
132- <input type="hidden" name="redirect_url" value="index.php" />
133- <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>
134- </fieldset>
135- </form>',
136 'Profile' => 'Profil',
137 'Logout' => 'Déconnexion',
138 'Logged in as' => '',
139@@ -129,7 +122,7 @@
140 'Stick topic' => 'Épingler la discussion',
141 'Moderate forum' => 'Modérer le forum',
142 'Powered by' => 'Propulsé par %s',
143-
144+
145 // Debug information
146 'Debug table' => 'Informations de débogage',
147 'Querytime' => 'Générées en %1$s secondes, %2$s requêtes exécutées',
148@@ -172,4 +165,4 @@
149 'New reports' => 'De nouveaux signalements ont été envoyés',
150 'Maintenance mode enabled' => 'Le mode maintenance est activé&#160;!'
151
152-);
153+);
154
155=== added directory 'widget'
156=== added file 'widget/connection.php'
157--- widget/connection.php 1970-01-01 00:00:00 +0000
158+++ widget/connection.php 2011-03-11 19:08:08 +0000
159@@ -0,0 +1,22 @@
160+<?php
161+$widget = '<form action="login.php?action=in" accept-charset="utf-8" id="login_top" method="post">
162+ <fieldset>
163+ <input type="hidden" name="form_sent" value="1" />
164+ <input type="hidden" name="redirect_url" value="index.php" />
165+ <input type="text" value="Identifiant"
166+ onfocus="if(this.value == \'Identifiant\'){this.value=\'\';} this.className=\'input_focused\'"
167+ name="req_username" size="25" maxlength="25" tabindex="1" />
168+ <input type="password" value="Mot de passe"
169+ onfocus="if(this.value == \'Mot de passe\'){this.value=\'\';} this.className=\'input_focused\'"
170+ name="req_password" size="25" tabindex="2" />
171+ <input type="submit" value="connexion" /> / <a href="register.php">inscription</a>
172+ <br/>
173+ <label>
174+ <input type="checkbox" tabindex="3" value="1" name="save_pass">
175+ Se souvenir de moi
176+ </label>
177+ <a href="login.php?action=forget">Mot de passe oublié&nbsp;?</a>
178+ </fieldset>
179+ </form>';
180+return $widget;
181+?>

Subscribers

People subscribed via source and target branches

to all changes: