Replace the random links of the main page by a random short trick

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1209 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/htdocs/css/keynote.css b/htdocs/css/keynote.css
index aed862a..94caa22 100644 (file)
--- a/htdocs/css/keynote.css
+++ b/htdocs/css/keynote.css
@@ -55,8 +55,7 @@ legend {
     background: url('../images/skins/keynote_bg_verylighter.png') #bbbbaa top left repeat-x fixed;
     color: #000;
 
-    padding-left: 4px;
-    padding-right: 4px;
+    padding: 2px 4px;
 }
 
 .center  { text-align: center; }

diff --git a/modules/events.php b/modules/events.php
index 2702756..36451f4 100644 (file)
--- a/modules/events.php
+++ b/modules/events.php
@@ -29,6 +29,9 @@ class EventsModule extends PLModule
             'events/submit'  => $this->make_hook('ev_submit', AUTH_MDP),
             'admin/events'   => $this->make_hook('admin_events',     AUTH_MDP, 'admin'),
 
+            'ajax/tips'      => $this->make_hook('tips',      AUTH_COOKIE, '', NO_AUTH),
+            'admin/tips'     => $this->make_hook('admin_tips', AUTH_MDP, 'admin'),
+
             'nl'             => $this->make_hook('nl',        AUTH_COOKIE),
             'nl/show'        => $this->make_hook('nl_show',   AUTH_COOKIE),
             'nl/submit'      => $this->make_hook('nl_submit', AUTH_COOKIE),
@@ -44,6 +47,29 @@ class EventsModule extends PLModule
         subscribe_nl($uid);
     }
 
+    function get_tips($exclude = null)
+    {
+        $exclude  = is_null($exclude) ? '' : ' AND id != ' . $exclude . ' ';
+        $priority = rand(0, 510);
+        do {
+            $priority = (int)($priority/2);
+            $res = XDB::query("SELECT  *
+                                 FROM  tips
+                                WHERE  (peremption = '0000-00-00' OR peremption > CURDATE())
+                                       AND (promo_min = 0 OR promo_min <= {?})
+                                       AND (promo_max = 0 OR promo_max >= {?})
+                                       AND (priorite >= {?})
+                                       $exclude
+                             ORDER BY  RAND()
+                                LIMIT  1",
+                              S::i('promo'), S::i('promo'), $priority);
+        } while ($priority && !$res->numRows());
+        if (!$res->numRows()) {
+            return null;
+        } 
+        return $res->fetchOneAssoc();
+    }
+
     function handler_bug(&$page)
     {
         $this->handler_ev($page);
@@ -53,7 +79,9 @@ class EventsModule extends PLModule
     function handler_ev(&$page, $action = 'list', $eid = null, $pound = null)
     {
         $page->changeTpl('login.tpl');
-       
+        $page->addJsLink('ajax.js');
+        $page->assign('tips', $this->get_tips());
+
         // donne la derniere date de session
         $page->assign('lastlogin', strftime("%Y%m%d%H%M%S",S::i('lastlogin')));
 
@@ -87,27 +115,6 @@ class EventsModule extends PLModule
         $res = localize_addresses(S::v('uid', -1));
         $page->assign('geoloc_incitation', count($res));
 
-        // affichage de la boîte avec quelques liens
-        /* Bandeau de publicité sur la page de login */
-        $publicite = array(
-            'password'   => 'Changer mon mot de passe' ,
-            'Docs/Dons'  => 'Faire un don à l\'association Polytechnique.org'
-            ) ;
-
-        // Liens apparaissant de façon aléatoire
-        $pub_rnd = array(
-            'nl/show'                      => 'Afficher la dernière newsletter' ,
-            'http://www.polytechnique.net/login' => 'Vers les autres sites polytechniciens' ,
-            "trombi/{$_SESSION["promo"]}"  => "Voir le trombi de ma promo" ,
-            'banana'                       => 'Un petit tour du côté des forums !!'
-            ) ;
-
-        $choix = array_rand($pub_rnd, 2);
-        foreach ($choix as $url) {
-            $publicite[$url] = $pub_rnd[$url] ;
-        }
-        $page->assign('publicite', array_chunk($publicite, 2, true));
-
         // ajout du lien RSS
         if (S::has('core_rss_hash')) {
             $page->setRssLink('Polytechnique.org :: News',
@@ -222,6 +229,26 @@ class EventsModule extends PLModule
         $page->assign('select',$select);
     }
 
+    function handler_tips(&$page, $tips = null)
+    {
+        $page->changeTpl('include/tips.tpl', NO_SKIN);
+        $page->assign('tips', $this->get_tips($tips));
+    }
+
+    function handler_admin_tips(&$page, $action = 'list', $id = null)
+    {
+        $page->assign('xorg_title', 'Polytechnique.org - Administration - Astuces');
+        $page->assign('title', 'Gestion des Astuces');
+        $table_editor = new PLTableEditor('admin/tips', 'tips', 'id');
+        $table_editor->describe('peremption', 'date de péremption', true);
+        $table_editor->describe('promo_min', 'promo. min (0 aucune)', false);
+        $table_editor->describe('promo_max', 'promo. max (0 aucune)', false);
+        $table_editor->describe('titre', 'titre', true);
+        $table_editor->describe('text', 'texte (html) de l\'astuce', false);
+        $table_editor->describe('priorite', 'priorité (0=min, 256=max)', false);
+        $table_editor->apply($page, $action, $id);
+    }
+
     function handler_nl(&$page, $action = null)
     {
         require_once 'newsletter.inc.php';

diff --git a/templates/admin/index.tpl b/templates/admin/index.tpl
index 80286d1..01caec8 100644 (file)
--- a/templates/admin/index.tpl
+++ b/templates/admin/index.tpl
@@ -70,6 +70,8 @@
     <td>
       <strong>Infos dynamiques :</strong>&nbsp;&nbsp;
       <a href="admin/downtime">Coupures</a>
+      &nbsp;&nbsp;|&nbsp;&nbsp;
+      <a href="admin/tips">Astuces</a>
     </td>
   </tr>
   <tr class="impair">

diff --git a/templates/include/tips.tpl b/templates/include/tips.tpl
new file mode 100644 (file)
index 0000000..ce95b22
--- /dev/null
+++ b/templates/include/tips.tpl
@@ -0,0 +1,40 @@
+{**************************************************************************}
+{*                                                                        *}
+{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
+{*  http://opensource.polytechnique.org/                                  *}
+{*                                                                        *}
+{*  This program is free software; you can redistribute it and/or modify  *}
+{*  it under the terms of the GNU General Public License as published by  *}
+{*  the Free Software Foundation; either version 2 of the License, or     *}
+{*  (at your option) any later version.                                   *}
+{*                                                                        *}
+{*  This program is distributed in the hope that it will be useful,       *}
+{*  but WITHOUT ANY WARRANTY; without even the implied warranty of        *}
+{*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *}
+{*  GNU General Public License for more details.                          *}
+{*                                                                        *}
+{*  You should have received a copy of the GNU General Public License     *}
+{*  along with this program; if not, write to the Free Software           *}
+{*  Foundation, Inc.,                                                     *}
+{*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
+{*                                                                        *}
+{**************************************************************************}
+
+{if $tips}
+{if $full}
+<fieldset id="tod">
+{/if}
+  <legend>{icon name=lightbulb}Astuce&nbsp;: {$tips.titre}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+  <a href="" onclick="Ajax.update_html('tod', 'ajax/tips/{$tips.id}'); return false">
+    {icon name=resultset_next title="Astuce suivante"}
+  </a>
+  </legend>
+  {tidy}
+  {$tips.text|nl2br|smarty:nodefaults}
+  {/tidy} 
+{if $full}
+</fieldset>
+{/if}
+{/if}
+
+{* vim:set et sw=2 sts=2 sws=2: *}

diff --git a/templates/login.tpl b/templates/login.tpl
index 9ca58c3..59cdd5d 100644 (file)
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -63,21 +63,8 @@ Bienvenue {$smarty.session.prenom}
     Clique <a href="profile/edit/adresses">ici</a> pour rectifier.
   </p>
 {/if}
-<br />
 
-  <table class="bicol">
-    <tr class="pair">
-{foreach item=links from=$publicite}
-      <td class="half">
-{foreach key=url item=text from=$links}
-        <a href="{$url}">{$text}</a><br />
-{/foreach}
-      </td>
-{/foreach}
-    </tr>
-  </table>
-
-  <br/>
+{include file="include/tips.tpl" full=true}
   
   <table class="bicol">
     <tr>

diff --git a/upgrade/0.9.13/01_tips.sql b/upgrade/0.9.13/01_tips.sql
new file mode 100644 (file)
index 0000000..933bf73
--- /dev/null
+++ b/upgrade/0.9.13/01_tips.sql
@@ -0,0 +1,13 @@
+create table tips (
+    id smallint(4) unsigned not null auto_increment,
+    titre varchar(64) not null,
+    text mediumtext not null,
+    priorite tinyint(2) unsigned not null default 127,
+    peremption date not null default '0000-00-00',
+    promo_min smallint(4) unsigned not null default 0,
+    promo_max smallint(4) unsigned not null default 0,
+
+    primary key (id)
+);
+
+# vim:set syntax=mysql:

diff --git a/upgrade/0.9.13/update.sh b/upgrade/0.9.13/update.sh
new file mode 100755 (executable)
index 0000000..de82fc0
--- /dev/null
+++ b/upgrade/0.9.13/update.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+. ../inc/pervasive.sh
+
+mailman_stop
+mailman_templates
+mailman_start
+
+
+###########################################################
+for sql in *.sql
+do
+    echo -n $sql
+    $MYSQL x4dat < $sql &>/dev/null || echo -n " ERROR"
+    echo .
+done
+
+###########################################################
+
+echo "we will now upgrade the search table (this may be a long operation)
+
+please hit ^D to continue
+"
+
+cat
+
+pushd ../../bin
+./search.rebuild_db.php
+popd
+
+###########################################################
+