From: x2000habouzit <x2000habouzit>
Date: Tue, 24 Aug 2004 20:38:35 +0000 (+0000)
Subject: correction skins
X-Git-Tag: xorg/old~1714
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=7f497ba2cf0f79bfa51a442758270bc8be53548d;p=platal.git

correction skins
---

diff --git a/htdocs/images/skins/Defaut.png b/htdocs/images/skins/Defaut.png
new file mode 100644
index 0000000..6443e80
Binary files /dev/null and b/htdocs/images/skins/Defaut.png differ
diff --git a/htdocs/skins.php b/htdocs/skins.php
index 1ae6ec1..9541043 100644
--- a/htdocs/skins.php
+++ b/htdocs/skins.php
@@ -9,10 +9,11 @@ if (isset($_REQUEST['submit']))  {  // formulaire soumis, traitons les donn
     set_skin();
 }
 
-$sql = "SELECT id,skin_tpl,skin_popup,snapshot,name,s.date,comment,auteur,count(*) AS nb FROM skins AS s
-        LEFT JOIN auth_user_md5 AS a ON s.id=a.skin
-        WHERE !FIND_IN_SET('cachee',type) AND skin_tpl != ''
-        GROUP BY id ORDER BY s.date DESC";
+$sql = "SELECT s.*,auteur,count(*) AS nb
+          FROM skins AS s
+     LEFT JOIN auth_user_md5 AS a ON s.id=a.skin
+         WHERE skin_tpl != '' AND ext != ''
+      GROUP BY id ORDER BY s.date DESC";
 $page->mysql_assign($sql, 'skins');
 $page->assign('stochaskin',SKIN_STOCHASKIN_ID);
 
diff --git a/scripts/migration.sql b/scripts/migration.sql
index 51a7c16..adcf8b3 100644
--- a/scripts/migration.sql
+++ b/scripts/migration.sql
@@ -30,3 +30,23 @@ ALTER TABLE x4dat.auth_user_md5 DROP COLUMN nom_soundex;
 ALTER TABLE x4dat.auth_user_md5 DROP COLUMN prenom_soundex;
 ALTER TABLE x4dat.auth_user_md5 DROP COLUMN epouse_soundex;
 INSERT INTO logger.actions SET text="connexion_auth_ext",description="connection via l'auth des groupes X";
+--------------------------------------------------------------------------------
+
+--------------------------------------------------------------------------------
+-- SKINS v2
+--------------------------------------------------------------------------------
+DROP TABLE IF EXISTS skins;
+CREATE TABLE skins (
+  id tinyint(1) unsigned NOT NULL default '0',
+  name varchar(32) NOT NULL default '',
+  date varchar(10) NOT NULL default '',
+  comment varchar(255) NOT NULL default '',
+  auteur varchar(30) NOT NULL default '',
+  skin_tpl varchar(32) NOT NULL default '',
+  ext char(3) NOT NULL default '',
+  PRIMARY KEY  (id)
+) TYPE=MyISAM PACK_KEYS=1 COMMENT='liste des skins';
+
+INSERT INTO skins VALUES (1,'Defaut','2000-03-07','Skin par défaut','Equipe X.org','default.tpl','png');
+--------------------------------------------------------------------------------
+
diff --git a/templates/skins.tpl b/templates/skins.tpl
index 32374dc..6b09ed1 100644
--- a/templates/skins.tpl
+++ b/templates/skins.tpl
@@ -1,4 +1,4 @@
-{* $Id: skins.tpl,v 1.4 2004-02-04 19:47:47 x2000habouzit Exp $ *}
+{* $Id: skins.tpl,v 1.5 2004-08-24 20:38:36 x2000habouzit Exp $ *}
 
 <div class="rubrique">
   Skins Polytechnique.org
@@ -42,7 +42,7 @@ Pour toute information compl
         Utilisée par <strong>{$skin.nb}</strong> inscrit{if $skin.nb>1}s{/if}
       </td>
       <td class="skidroite">
-        <img src="images/{$skin.snapshot}" style="width:171px; height:162px;" alt=" [ CAPTURE D'ECRAN ] ">
+        <img src="images/skins/{$skin.name}.{$skin.ext}" style="width:160px; height:160px;" alt=" [ CAPTURE D'ECRAN ] ">
       </td>
     </tr>
 {/foreach}