Forum ubuntu-fr

Merge lp:~mcpeter/ubuntu-fr-forum/fix715133 into lp:ubuntu-fr-forum

  1. fix715133
  2. Merge into trunk
Proposed by McPeter
Status: Merged
Merged at revision: 120
Proposed branch: lp:~mcpeter/ubuntu-fr-forum/fix715133
Merge into: lp:ubuntu-fr-forum
Diff against target: 248 lines (+69/-86)
6 files modified
.bzrignore (+5/-0)
BDD_update2.sql (+1/-1)
header.php (+1/-3)
include/template/main.tpl (+48/-68)
index.php (+13/-13)
lang/Francais/common.php (+1/-1)
To merge this branch: bzr merge lp:~mcpeter/ubuntu-fr-forum/fix715133
Reviewer Review Type Date Requested Status
YoBoY (community) Needs Fixing
Review via email: mp+50503@code.launchpad.net

Description of the change

* Modification de fichiers
  - header.php
      * Modification du nom d'insertion css principal
      * Nettoyage du code

  - index.php
      * Nettoyage du code

  - lang/Francais/common.php
      * Modification du formulaire de login :
      * Retrait du code JS en dur (géré par common.js de static)
      * Ajout du code accessibilité
      * Ajout d'identifiant pour le JS (effets effacements au focus et
        input_focused)

  - include/templates/main.tpl
      * Ajout de l'accessibar
      * Nettoyage du code
      * Ajout du code accessibilité
      * Retrait du code JS en dur dans l'HTML (géré par common.js de static)

* Retrait du dossier STATIC (obsolète)

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

Je suis en // entrain de "nettoyer" une partie du code dans le forum aussi ...
plein de portions de code commentées devenues inutiles et obsolètes.
Ainsi qu'une première simplification du code de reconnaissance du domaine (pas au point sur le forum :\ ) ... ça fait très "brouillon"

Revision history for this message
YoBoY (yoboy-leguesh) wrote :

Hum...
Vu que t'es lancé pourquoi tu n'as pas viré toutes les références à UFR_STATIC_DEV_TPL, d'ailleurs en enlevant le Define ça marche toujours ? il est dans le header.php je suppose ...

Je préfère pas savoir ce que fait ce pun_include site_domain.php... mais pourquoi ne pas avoir remplacer toutes les occurrences de ubuntu-fr.org comme dans l'entête ou le pied de page ?

review: Needs Fixing
Revision history for this message
McPeter (mcpeter) wrote :

c'est ce que je suis entrain de faire ... pour ça que j'en ai parlé dans mon commentaire suivant ... mais y'a des trucs de partout :\ .. .c'est l'horreur ... (et quand je pense que c'est en prod ça :'( )
je vois à appliquer la même formule que la tienne pour la doc.

Revision history for this message
YoBoY (yoboy-leguesh) wrote :

Me manque toujours la correction de quelques éléments pour que je merge, les liens qui renvoient vers ubuntu-fr.org uniquement au lien de renvoyer sur le domaine où on se trouve.

review: Needs Fixing
Revision history for this message
McPeter (mcpeter) wrote :

je suis dessus

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2009-06-03 19:43:27 +0000
+++ .bzrignore 2011-02-20 13:31:40 +0000
@@ -1,2 +1,7 @@
1config.php1config.php
2xcache-admin2xcache-admin
3cache/cache*
4forum.dev.*
5templates
6toolbars
7
38
=== modified file 'BDD_update2.sql'
--- BDD_update2.sql 2010-10-08 13:18:35 +0000
+++ BDD_update2.sql 2011-02-20 13:31:40 +0000
@@ -1,4 +1,4 @@
1USE ubuntu_fr;1USE ubuntu_devforum;
22
3-- phpMyAdmin SQL Dump3-- phpMyAdmin SQL Dump
4-- version 3.3.2deb14-- version 3.3.2deb1
55
=== removed directory 'STATIC'
=== modified file 'header.php'
--- header.php 2010-10-21 22:17:41 +0000
+++ header.php 2011-02-20 13:31:40 +0000
@@ -99,8 +99,6 @@
99?>99?>
100<title><?php echo generate_page_title($page_title, $p) ?></title>100<title><?php echo generate_page_title($page_title, $p) ?></title>
101<?php101<?php
102 /* Ajout en dur pour la dev - McPeter - */
103 define('UFR_STATIC_DEV_TPL', 'http://www-static.ubuntu-fr.org/theme2010');
104if(($pun_user['style'] == "Ubuntu")||($pun_user['style'] == "Ubuntu_menu-fixe")||(preg_match("/buntu_darker/",$pun_user['style'])))102if(($pun_user['style'] == "Ubuntu")||($pun_user['style'] == "Ubuntu_menu-fixe")||(preg_match("/buntu_darker/",$pun_user['style'])))
105{103{
106 $is_ubuntu = 0;104 $is_ubuntu = 0;
@@ -161,7 +159,7 @@
161// END ADD AlternativeSites159// END ADD AlternativeSites
162160
163?>161?>
164 <link rel="stylesheet" media="screen" type="text/css" title="Design Ubuntu" href="<?=UFR_STATIC_DEV_TPL?>/css/forum-general.css" />162 <link rel="stylesheet" media="screen" type="text/css" title="Design Ubuntu" href="<?=UFR_STATIC_DEV_TPL?>/css/forum.css" />
165 <link rel="stylesheet" media="screen" type="text/css" title="Design Ubuntu" href="<?=UFR_STATIC_DEV_TPL?>/css/forum-<?=strtolower($distrib_name)?>.css" />163 <link rel="stylesheet" media="screen" type="text/css" title="Design Ubuntu" href="<?=UFR_STATIC_DEV_TPL?>/css/forum-<?=strtolower($distrib_name)?>.css" />
166164
167<?php }165<?php }
168166
=== modified file 'include/template/main.tpl'
--- include/template/main.tpl 2010-10-22 12:03:43 +0000
+++ include/template/main.tpl 2011-02-20 13:31:40 +0000
@@ -6,101 +6,81 @@
6<pun_head>6<pun_head>
7</head>7</head>
8<body>8<body>
9<div id="accessibar">9 <div id="accessibar">
10</div>10 <a href="#main" tabindex="1">Contenu</a> | <a href="#qsearch__in" tabindex="2">Rechercher</a> | <a href="#navigation" tabindex="3">Menus</a>
11<div id="pun<pun_page>">11 </div>
12<div id="page">12 <div id="pun<pun_page>">
13 <!--<div id="header">13 <div id="page">
14 <div id="logo">14
15 <pun_title>15 <div id="header">
16 <br /><a href="http://www.ubuntu-fr.org"><pun_desc></a>16 &nbsp;
17 </div>
18 <pun_status>
19 </div>-->
20 <div id="header">
21&nbsp;
22 <div id="logo">17 <div id="logo">
23 <h1>Ubuntu-fr</h1>18 <h1>Ubuntu-fr</h1>
24 <a href="http://www.ubuntu-fr.org" title="Accueil">Communauté francophone d'utilisateurs <pun_include "site_de.php"><pun_include "site_nom.php"></a>19 <a href="http://www.ubuntu-fr.org" title="Accueil">Communauté francophone d'utilisateurs <pun_include "site_de.php"><pun_include "site_nom.php"></a>
25
26 </div>20 </div>
2721
28 <form action="search_ubuntufr.php" id="search">22 <form action="search_ubuntufr.php" id="search">
29 <fieldset>23 <fieldset>
30 <!--24 <input type="text" value="Recherche rapide...." id="qsearch__in" accesskey="f" name="q" title="[F]" size="34" />
31 Modification McPeter - 27/06/2010 03:06
32
33 <input type="text" value="Recherche rapide" name="search" size="34" /><select name="tsearch">
34 <option>Site</option>
35 <option>Documentation</option>
36 <option selected="selected" >Forum</option>
37 <option>Planet</option>
38
39 </select>
40 -->
41 <!-- Copie de la doc -->
42 <input type="text" value="Recherche rapide..." onfocus="if(this.value == 'Recherche rapide...'){this.value='';} this.className='input_focused'" id="qsearch__in" accesskey="f" name="q" title="[F]" size="34" />
43 <select name="tsearch">25 <select name="tsearch">
44 <option value="wiki">Documentation</option>26 <option value="wiki">Documentation</option>
45 <option value="forum" selected="selected">Forum</option>27 <option value="forum" selected="selected">Forum</option>
46 <option value="planet" >Planet</option>28 <option value="planet" >Planet</option>
47 </select>29 </select>
48 <input type="submit" value="ok" class="button" title="Chercher" />30 <input type="submit" value="ok" class="button" title="Chercher" />
49 <!-- Fin modification -->
50 </fieldset>31 </fieldset>
51 </form>32 </form>
5233
53<pun_status>34 <pun_status>
54 35
55<div class="clearer"></div>36 <div class="clearer"></div>
56 </div>37 </div>
5738
5839 <div id="navigation">
59
60 <div id="navigation">
61 <ul>40 <ul>
62 <li class="menu"><a id="menu-accueil" class="title" href="http://www.<pun_include "site_domaine.php">.org"><span>Accueil</span></a></li>41 <li class="menu"><a id="menu-accueil" class="title" href="http://www.<pun_include "site_domaine.php">.org"><span>Accueil</span></a></li>
63 <li class="menu"><a id="menu-doc" class="title" href="http://doc.<pun_include "site_domaine.php">.org" title="Documentation Ubuntu francophone"><span>Documentation</span></a></li>42 <li class="menu"><a id="menu-doc" class="title" href="http://doc.<pun_include "site_domaine.php">.org" title="Documentation Ubuntu francophone"><span>Documentation</span></a></li>
64 <li class="menu" id="active" >43 <li class="menu" id="active" >
65 <a id="menu-forum" class="title" href="index.php" title="Index du forum"><span>Forum</span></a>44 <a id="menu-forum" class="title" href="index.php" title="Index du forum"><span>Forum</span></a>
66 <ul>45 <ul>
67 <li class="cat"><h2>Navigation</h2>46 <li class="cat">
68 <pun_navlinks></li>47 <h2>Navigation</h2>
69 <pun_searchlinks>48 <pun_navlinks>
70 </ul>49 </li>
71 </li>50 <pun_searchlinks>
72 <li class="menu"><a id="menu-planet" class="title" href="http://planet.<pun_include "site_domaine.php">.org"><span>Planet</span></a></li>51 </ul>
52 </li>
53 <li class="menu"><a id="menu-planet" class="title" href="http://planet.<pun_include "site_domaine.php">.org"><span>Planet</span></a></li>
73 </ul>54 </ul>
74 <div class="clearer"></div>55 <div class="clearer"></div>
75 </div>56 </div>
76 57
77<div id="wrapper">58 <div id="wrapper">
78 <pun_announcement>59 <pun_announcement>
79 <div id="main">60 <div id="main">
80 <div id="hidemenu"><a accesskey="z" title="Masquer le menu - AccessKey Z" href="javascript:switchMenuVisible()"><span>&nbsp;</span></a></div>61 <div id="hidemenu" title="Masquer le menu"></div><!--
81 <pun_main>62 <div id="hidemenu"><a accesskey="z" title="Masquer le menu - AccessKey Z" href="javascript:switchMenuVisible()"><span>&nbsp;</span></a></div>-->
63 <pun_main>
82 </div>64 </div>
83 65
84 <div id="footer">66 <div id="footer">
85 67 <pun_footer>
86 <pun_footer>68 <div class="end-box"><div><!-- Bottom corners --></div></div>
8769 </div>
88 <div class="end-box"><div><!-- Bottom corners --></div></div>70 </div>
89 </div>71
72 <div class="block-inner">
73
74 <div class="content">
75 <ul class="menu"><li class="leaf first contact"><a href="http://www.ubuntu-fr.org/contacts">Contact</a></li>
76 <li class="leaf active-trail ressources"><a class="barreverticale active" href="http://www.ubuntu-fr.org//">Ressources</a></li>
77 <li class="leaf last licences"><a class="barreverticale" href="http://www.ubuntu-fr.org/licences">Licences</a></li>
78 </ul>
79 </div>
80
81 <div class="clearer"></div>
82 </div>
90 </div>83 </div>
91 84 </div>
92 <div class="block-inner">
93
94
95 <div class="content">
96 <ul class="menu"><li class="leaf first contact"><a href="http://www.ubuntu-fr.org/contacts">Contact</a></li>
97<li class="leaf active-trail ressources"><a class="barreverticale active" href="http://www.ubuntu-fr.org//">Ressources</a></li>
98<li class="leaf last licences"><a class="barreverticale" href="http://www.ubuntu-fr.org/licences">Licences</a></li>
99</ul> </div>
100
101 <div class="clearer"></div>
102
103 </div> </div>
104</div>
105</body>85</body>
106</html>86</html>
10787
=== modified file 'index.php'
--- index.php 2010-11-16 09:51:12 +0000
+++ index.php 2011-02-20 13:31:40 +0000
@@ -40,19 +40,19 @@
40require PUN_ROOT.'header.php';40require PUN_ROOT.'header.php';
4141
42?>42?>
43 <div id="navbar">43<div id="navbar">
44<div class="postlinkst">44 <div class="postlinkst">
45 <div class="inbox crumbsplus">45 <div class="inbox crumbsplus">
46 <ul class="crumbs">46 <ul class="crumbs">
47 <li><a href="http://www.ubuntu-fr.org">Accueil</a></li>47 <li><a href="http://www.ubuntu-fr.org">Accueil</a></li>
48 <li><span>&raquo;&#160;</span><strong><?php echo $lang_common['Index'] ?></strong></li>48 <li><span>&raquo;&#160;</span><strong><?php echo $lang_common['Index'] ?></strong></li>
49 </ul>49 </ul>
50 <p class="pagelink conl"><?php echo $paging_links ?></p>50 <p class="pagelink conl"><?php echo $paging_links ?></p>
51<?php echo $post_link ?>51 <?php echo $post_link ?>
52<?php echo $subscraction ?>52 <?php echo $subscraction ?>
53 <div class="clearer"></div>53 <div class="clearer"></div>
54 </div>54 </div>
55</div>55 </div>
56</div> <!-- fin du block navbar, voir le template-->56</div> <!-- fin du block navbar, voir le template-->
5757
58<!-- Begin Forum accueil + gagnant du mois-->58<!-- Begin Forum accueil + gagnant du mois-->
5959
=== modified file 'lang/Francais/common.php'
--- lang/Francais/common.php 2010-10-21 22:17:41 +0000
+++ lang/Francais/common.php 2011-02-20 13:31:40 +0000
@@ -99,7 +99,7 @@
99 <fieldset>99 <fieldset>
100 <input type="hidden" name="form_sent" value="1" />100 <input type="hidden" name="form_sent" value="1" />
101 <input type="hidden" name="redirect_url" value="index.php" />101 <input type="hidden" name="redirect_url" value="index.php" />
102 <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>102 <label for="u_field">Identifiant : </label><input type="text" value="Identifiant" name="req_username" id="u_field" size="9" /><label for="p_field">Mot de passe : </label><input type="password" value="Mot de passe" name="req_password" id="p_field" size="9" alt="Mot de passe" /><input type="submit" value="connexion" id="connect" /> / <a href="register.php">inscription</a>
103 </fieldset>103 </fieldset>
104 </form>',104 </form>',
105'Profile' => 'Profil',105'Profile' => 'Profil',

Subscribers

People subscribed via source and target branches

to all changes: