# HG changeset patch
# User Franck Deroche <webmaster@defr.org>
# Date 1195058533 -3600
# Node ID 0efb116b1e31b053db8c20ddcec2d9dd628fd4b2
# Parent  f6552a610bfd6714cf901b6623237291b83cc3b9# Parent  17d9188755b0a354e410740d54a202f8a8ea9cbe
Merge

diff -r 17d9188755b0 -r 0efb116b1e31 .htaccess
--- a/.htaccess	Mon Nov 12 01:44:55 2007 -0800
+++ b/.htaccess	Wed Nov 14 17:42:13 2007 +0100
@@ -1,8 +1,8 @@
 Options +FollowSymlinks
 RewriteEngine on
 # Kill the RSS version, re-direct to the atom feed
-RewriteRule ^dualblog.rss$ index.php?outputType=atom [L,QSA]
-RewriteRule ^dualblog.atom$ index.php?outputType=atom [L,QSA]
+RewriteRule ^dualblog.rss$ index.php?atom [L,QSA]
+RewriteRule ^dualblog.atom$ index.php?atom [L,QSA]
 RewriteRule ^posts/$ index.php [L]
 RewriteRule ^posts/([0-9]+)/([0-9]{1,2})$ index.php?mode=cal&year=$1&month=$2 [L,QSA]
 RewriteRule ^posts/([0-9]+)-(.*)$ comment.php?id=$1 [L,QSA]
diff -r 17d9188755b0 -r 0efb116b1e31 css/Somatic.css
--- a/css/Somatic.css	Mon Nov 12 01:44:55 2007 -0800
+++ b/css/Somatic.css	Wed Nov 14 17:42:13 2007 +0100
@@ -5,6 +5,7 @@
 	padding:0;
 	background:#EEE; 
 	font-family:"Bitstream Vera Sans", "Lucida Grande", Tahoma, Verdana, Arial, sans serif;
+	font-size:small;
 }
 
 #Link, #Link li, dl, dt, dd {display:block; margin:0;list-style-type:none;}
diff -r 17d9188755b0 -r 0efb116b1e31 includes/class.requete.php
--- a/includes/class.requete.php	Mon Nov 12 01:44:55 2007 -0800
+++ b/includes/class.requete.php	Wed Nov 14 17:42:13 2007 +0100
@@ -23,6 +23,7 @@
 		    if(empty($name)) $name = md5(serialize(microtime()));
 		    foreach($array as $key => $value)
 		    {
+		    	if(empty($value)) $value = $key;
 			$this->arData[$key][$name] = ($magic_quotes) ? $value : addslashes($value);
 		    }
 		}
@@ -56,4 +57,4 @@
 			return (isset($this->arData[$varName][$orig]));
 		}
 	}
-?>
\ No newline at end of file
+?>
diff -r 17d9188755b0 -r 0efb116b1e31 includes/class.skeleton.php
--- a/includes/class.skeleton.php	Mon Nov 12 01:44:55 2007 -0800
+++ b/includes/class.skeleton.php	Wed Nov 14 17:42:13 2007 +0100
@@ -249,11 +249,22 @@
       // Construction du tableau des différents templates
       // permettant de répondre au "type" de sortie demandé
       $iniFile = parse_ini_file('templates.conf', true);
-     
-      $format = Factory::getRequete()
-                       ->get('outputType', null, Skeleton::OUTPUT_XHTML);
 
-      if(array_key_exists($format, $iniFile)) {
+      // Récupération de la requete
+      $requete = Factory::getRequete();
+    
+      // On essaie de trouver le format en Query-String
+      // On recherche tout d'abord un paramètre correspondant
+      // au nom d'un des formats. On prend le premier mentionné,
+      // par ordre d'apparition dans le fichier templates.conf
+      $format = null;
+      while(is_null($format) && list($key, ) = each($iniFile)) {
+         $format = $requete->get($key, null, null);
+      }
+      
+      // Si on a trouvé un format, on l'applique. 
+      // Sinon, on prend le template nommé 'xhtml'
+      if(!is_null($format)) {
         Skeleton::$templates = $iniFile[$format];
         Skeleton::$outputType = $format;
       } else {
diff -r 17d9188755b0 -r 0efb116b1e31 index.php
--- a/index.php	Mon Nov 12 01:44:55 2007 -0800
+++ b/index.php	Wed Nov 14 17:42:13 2007 +0100
@@ -1,7 +1,6 @@
 <?php
     require_once("classes.php");
     $sk = Factory::getSkeleton();
-    $sk->setTitle('Dual { v10 : OS Edition } Blog');
     // Détermination de la requête à exécuter
     if(!array_key_exists('mode', $_GET)) {
         $query = "
@@ -11,11 +10,13 @@
         ORDER BY num_mess DESC
         LIMIT 10
         ";
+    	$sk->setTitle('Dual { v10 : OS Edition } Blog');
     } elseif($_GET['mode'] == 'cal') {
         $sk->showCalendar(true);
         $year = intval($_GET['year']);
         $month = intval($_GET['month']);
         $sk->setCalendarMonth($month, $year);
+        $sk->setTitle(TextUtils::getMonthName($month) . " $year - Dual Blog");
         $query = "
         SELECT * 
     	FROM Mess 
@@ -27,6 +28,7 @@
         ";
     } elseif($_GET['mode'] == 'tag') {
         $tag = $_GET['tag'];
+        $sk->setTitle("Tag: $tag - Dual Blog"); 
         $query = "
         SELECT * 
         FROM Mess m