Author: fil@rezo.net
Date: Wed Aug 16 23:38:32 2006
New Revision: 4600
Log:
des modeles capables de distinguer la class, l'align, les params des embed etc
Removed:
_plugins_/_ze_laboratoire_/spiip/modeles/doc_center.html
_plugins_/_ze_laboratoire_/spiip/modeles/doc_left.html
_plugins_/_ze_laboratoire_/spiip/modeles/doc_right.html
_plugins_/_ze_laboratoire_/spiip/modeles/img_center.html
_plugins_/_ze_laboratoire_/spiip/modeles/img_left.html
_plugins_/_ze_laboratoire_/spiip/modeles/img_right.html
Modified:
_plugins_/_ze_laboratoire_/spiip/modeles/doc.html
_plugins_/_ze_laboratoire_/spiip/modeles/emb.html
_plugins_/_ze_laboratoire_/spiip/spiip_pipelines.php
Modified: _plugins_/_ze_laboratoire_/spiip/modeles/doc.html
--- _plugins_/_ze_laboratoire_/spiip/modeles/doc.html (original)
+++ _plugins_/_ze_laboratoire_/spiip/modeles/doc.html Wed Aug 16 23:38:32 2006
@@ -1,3 +1,3 @@
<BOUCLE_doc (DOCUMENTS) {id_document}>
-<div class='spip_document_#ID_DOCUMENT spip_documents[ spip_documents_(#ENV{align})][ (#CLASS)]' style='[(#ENV{align}=={left}|?{float:left; })][(#ENV{align}=={right}|?{float:right; })]width: [(#LOGO_DOCUMENT||largeur)]px;'><a href='#FICHIER' type='#MIME_TYPE'><img src='[(#LOGO_DOCUMENT||extraire_attribut{src})]' width='[(#LOGO_DOCUMENT||largeur)]' heigth='[(#LOGO_DOCUMENT||hauteur)]' alt='#TYPE_DOCUMENT - [(#TAILLE|taille_en_octets)]' title='#TYPE_DOCUMENT - [(#TAILLE|taille_en_octets)]' /></a>[<div class='spip_doc_titre'><strong>(#TITRE)</strong></div>][<div class='spip_doc_descriptif'>(#DESCRIPTIF)</div>]</div>
+<div class='spip_document_#ID_DOCUMENT spip_documents[ spip_documents_(#ENV{align})][ (#ENV{class})]' style='[(#ENV{align}=={left}|?{float:left; })][(#ENV{align}=={right}|?{float:right; })]width: [(#LOGO_DOCUMENT||largeur)]px;'><a href='#FICHIER' type='#MIME_TYPE'><img src='[(#LOGO_DOCUMENT||extraire_attribut{src})]' width='[(#LOGO_DOCUMENT||largeur)]' heigth='[(#LOGO_DOCUMENT||hauteur)]' alt='#TYPE_DOCUMENT - [(#TAILLE|taille_en_octets)]' title='#TYPE_DOCUMENT - [(#TAILLE|taille_en_octets)]' /></a>[<div class='spip_doc_titre'><strong>(#TITRE)</strong></div>][<div class='spip_doc_descriptif'>(#DESCRIPTIF)</div>]</div>
</BOUCLE_doc>
\ No newline at end of file
Removed: _plugins_/_ze_laboratoire_/spiip/modeles/doc_center.html
--- _plugins_/_ze_laboratoire_/spiip/modeles/doc_center.html (original)
+++ _plugins_/_ze_laboratoire_/spiip/modeles/doc_center.html (removed)
@@ -1 +0,0 @@
-[(#INCLURE{fond=modeles/doc}{align=center}{id_document})]
\ No newline at end of file
Removed: _plugins_/_ze_laboratoire_/spiip/modeles/doc_left.html
--- _plugins_/_ze_laboratoire_/spiip/modeles/doc_left.html (original)
+++ _plugins_/_ze_laboratoire_/spiip/modeles/doc_left.html (removed)
@@ -1 +0,0 @@
-[(#INCLURE{fond=modeles/doc}{align=left}{id_document})]
\ No newline at end of file
Removed: _plugins_/_ze_laboratoire_/spiip/modeles/doc_right.html
--- _plugins_/_ze_laboratoire_/spiip/modeles/doc_right.html (original)
+++ _plugins_/_ze_laboratoire_/spiip/modeles/doc_right.html (removed)
@@ -1 +0,0 @@
-[(#INCLURE{fond=modeles/doc}{align=right}{id_document})]
\ No newline at end of file
Modified: _plugins_/_ze_laboratoire_/spiip/modeles/emb.html
--- _plugins_/_ze_laboratoire_/spiip/modeles/emb.html (original)
+++ _plugins_/_ze_laboratoire_/spiip/modeles/emb.html Wed Aug 16 23:38:32 2006
@@ -1,14 +1,15 @@
+Coucou
<BOUCLE_tous (DOCUMENTS) {id_document}>
#SET{hauteur,#ENV{hauteur}|sinon{#HAUTEUR}}
#SET{largeur,#ENV{largeur}|sinon{#LARGEUR}}
</BOUCLE_tous>
-<BOUCLE_svg (DOCUMENTS) {id_document} {extension==svg}>
+<BOUCLE_svg (DOCUMENTS) {id_document} {extension=svg}>
<embed src='#FICHIER' width='#GET{largeur}' height='#GET{hauteur}' />
</BOUCLE_svg>
-<BOUCLE_real (DOCUMENTS) {id_document} {extension==rm}>
+<BOUCLE_real (DOCUMENTS) {id_document} {extension=rm}>
<div><object width='0' height='0'>
<param name='movie' value='#FICHIER' />
<param name='src' value='#FICHIER' />
Removed: _plugins_/_ze_laboratoire_/spiip/modeles/img_center.html
--- _plugins_/_ze_laboratoire_/spiip/modeles/img_center.html (original)
+++ _plugins_/_ze_laboratoire_/spiip/modeles/img_center.html (removed)
@@ -1 +0,0 @@
-[(#INCLURE{fond=modeles/doc}{align=center}{id_document})]
\ No newline at end of file
Removed: _plugins_/_ze_laboratoire_/spiip/modeles/img_left.html
--- _plugins_/_ze_laboratoire_/spiip/modeles/img_left.html (original)
+++ _plugins_/_ze_laboratoire_/spiip/modeles/img_left.html (removed)
@@ -1 +0,0 @@
-[(#INCLURE{fond=modeles/img}{align=left}{id_document})]
\ No newline at end of file
Removed: _plugins_/_ze_laboratoire_/spiip/modeles/img_right.html
--- _plugins_/_ze_laboratoire_/spiip/modeles/img_right.html (original)
+++ _plugins_/_ze_laboratoire_/spiip/modeles/img_right.html (removed)
@@ -1 +0,0 @@
-[(#INCLURE{fond=modeles/img}{align=right}{id_document})]
\ No newline at end of file
Modified: _plugins_/_ze_laboratoire_/spiip/spiip_pipelines.php
--- _plugins_/_ze_laboratoire_/spiip/spiip_pipelines.php (original)
+++ _plugins_/_ze_laboratoire_/spiip/spiip_pipelines.php Wed Aug 16 23:38:32 2006
@@ -39,11 +40,18 @@
$type = strtolower($type);
- if ($squelette) {
- $fond = 'modeles/'.$type.'_'.$squelette;
+ $fond = 'modeles/'.$type;
+ if (preg_match(',^[a-z_0-9-]+,i', $squelette, $sub)) {
+ if (in_array(strtolower($sub[0]),
+ array('left', 'right', 'center')))
+ $align = $sub[0];
+
+ $fond = 'modeles/'.$type.'_'.$sub[0];
+
if (!find_in_path($fond.'.html')) {
- $class = $squelette;
$fond = 'modeles/'.$type;
+ if (!$align)
+ $class = $sub[0];
}
}
@@ -55,13 +63,37 @@
// raccourcis specifiques img, doc, emb
if (in_array($type, array('img', 'doc', 'emb')))
- $type = 'document';
+ $id_type = 'id_document';
+ else
+ $id_type = 'id_'.$type;
+
+ $contexte = array(
+ $id_type => $id,
+ 'fond' => $fond
+ );
+ if ($align)
+ $contexte['align'] = $align;
- $contexte = array('id_'.$type => $id);
if ($class)
$contexte['class'] = $class;
- $page = recuperer_fond($fond, $contexte);
+ // cas particulier des params d'un <embXX|params>
+ if ($type == 'emb') {
+ unset($contexte['class']);
+ foreach (explode('|', $squelette) as $param) {
+ if (!in_array(strtolower($param),
+ array('left', 'right', 'center'))) {
+ $params[] = $param;
+ }
+ if ($params)
+ $contexte['params'] = join('|', $params);
+ }
+ }
+
+# var_dump($type);
+# var_dump($contexte);
+
+ $page = recuperer_fond('', $contexte);
$compteur--;
@@ -71,7 +103,7 @@
/* static public */
function spiip_traiter_modeles($texte) {
- if (preg_match_all(',<([a-z_-]+)([0-9]+)([|]([a-z_0-9]+))?'.'>,iS',
+ if (preg_match_all(',<([a-z_-]+)([0-9]+)([|]([^>]+))?'.'>,iS',
$texte, $matches, PREG_SET_ORDER)) {
foreach ($matches as $regs) {
$modele = spiip_inclure_modele($regs[4], $regs[1], $regs[2]);