Menu
▾
▴
[Easybox-mod-developeurs] SF.net SVN: easybox-mod: [156] trunk
|
From: <ara...@us...> - 2007-05-22 19:34:52
|
Revision: 156
http://svn.sourceforge.net/easybox-mod/?rev=156&view=rev
Author: aragornis
Date: 2007-05-22 12:34:43 -0700 (Tue, 22 May 2007)
Log Message:
-----------
Diverses changement pour finir la v4.1.0 et la skin mediacenter
Modified Paths:
--------------
trunk/_framework/demarrage.php
trunk/_framework/framework.php
trunk/_framework/lib/lib_photo.php
trunk/_utilisateur/modules.db
trunk/http-vlc/lecteur/set_option.html
trunk/module/_explorateur/explorateur.tpl
trunk/module/cinefil/sorties_cine.tpl
trunk/module/clips/play_clip.php
trunk/module/diaporama/explorateur_photo.tpl
trunk/module/diaporama/index1.php
trunk/module/favoris/favoris.tpl
trunk/module/favoris/index1.php
trunk/module/films/films.tpl
trunk/module/films/lecture.php
trunk/module/films/signet_film.tpl
trunk/module/mp3/audio.tpl
trunk/module/signet/playsignet.php
trunk/module/stage6/index1.php
trunk/module/stage6/play_stage6.php
trunk/skin/mediacenter/audio.tpl
trunk/skin/mediacenter/framework_skin.php
trunk/skin/mediacenter/interface.tpl
trunk/skin/mediacenter/menu.tpl
trunk/skin/simple/framework_skin.php
trunk/skin/simplegreen/framework_skin.php
Added Paths:
-----------
trunk/module/telesite/
trunk/module/telesite/index.php
trunk/skin/mediacenter/interface/pagination.gif
Modified: trunk/_framework/demarrage.php
===================================================================
--- trunk/_framework/demarrage.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/_framework/demarrage.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -28,9 +28,12 @@
$etape = $_GET['etape'];
}
+ if(eregi("stop",$contenu_html) and $etape==1){
+ $FORCED = true;
+ }
+
if($vers_fbx<=4){
$META['service'] = 'ts://127.0.0.1?pcr=68&aud=69(en,mp2)&vid=68';
- //$META['display_aspect_ratio_conversion'] = 'letterbox';
}
//-- Chargement des donn\xE9es de configuration
Modified: trunk/_framework/framework.php
===================================================================
--- trunk/_framework/framework.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/_framework/framework.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -20,7 +20,8 @@
//--Chargement de Smarty
require_once($LIBRARIES_REP.'/Smarty.class.php');
$smarty = new Smarty();
-
+
+ $smarty->assign('vers_fbx',$vers_fbx);
$smarty->assign('FRAMEWORK_REP',$FRAMEWORK_REP);
$smarty->assign('RACINE_REP',$RACINE_REP);
$smarty->assign('LIBRARIES_REP',$LIBRARIES_REP);
Modified: trunk/_framework/lib/lib_photo.php
===================================================================
--- trunk/_framework/lib/lib_photo.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/_framework/lib/lib_photo.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -131,7 +131,7 @@
$this->tourner();
// Redimensionner
- if($this->width!=0 AND $this->height!=0){
+ if($this->r_width!=0 AND $this->r_height!=0){
$this->redimensionner();
}
@@ -167,18 +167,20 @@
function redimensionner(){
$pourcent = min(min(($this->r_width/$this->width),1),min(($this->r_height/$this->height),1));
- $redimx = floor($this->width*$pourcent);
- $redimy = floor($this->height*$pourcent);
- $image1 = imagecreatetruecolor($redimx, $redimy);
-
- if($this->quality=='max'){
- ImageCopyresampled($image1,$this->img,0,0,0,0,$redimx,$redimy,$this->width,$this->height);
- }else{
- ImageCopyresized($image1,$this->img,0,0,0,0,$redimx,$redimy,$this->width,$this->height);
+ if($pourcent<1){
+ $redimx = floor($this->width*$pourcent);
+ $redimy = floor($this->height*$pourcent);
+ $image1 = imagecreatetruecolor($redimx, $redimy);
+
+ if($this->quality=='max'){
+ ImageCopyresampled($image1,$this->img,0,0,0,0,$redimx,$redimy,$this->width,$this->height);
+ }else{
+ ImageCopyresized($image1,$this->img,0,0,0,0,$redimx,$redimy,$this->width,$this->height);
+ }
+ $this->img = $image1;
+ $this->width = $redimx;
+ $this->height = $redimy;
}
- $this->img = $image1;
- $this->width = $redimx;
- $this->height = $redimy;
}
function tourner(){
Modified: trunk/_utilisateur/modules.db
===================================================================
(Binary files differ)
Modified: trunk/http-vlc/lecteur/set_option.html
===================================================================
--- trunk/http-vlc/lecteur/set_option.html 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/http-vlc/lecteur/set_option.html 2007-05-22 19:34:43 UTC (rev 156)
@@ -1,5 +1,6 @@
<!-- Modification de la sortie Audio - Type 0 -->
<vlc id="rpn" param1="'' 'sub-language' vlc_config_set"/>
<vlc id="rpn" param1="'' 'audio-language' vlc_config_set"/>
+ <vlc id="rpn" param1="'-1' 'clock-synchro' vlc_config_set"/>
<vlc id="rpn" param1="'2' 'avi-index' vlc_config_set"/>
<vlc id="rpn" param1="vlc_config_save" />
Modified: trunk/module/_explorateur/explorateur.tpl
===================================================================
--- trunk/module/_explorateur/explorateur.tpl 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/_explorateur/explorateur.tpl 2007-05-22 19:34:43 UTC (rev 156)
@@ -141,6 +141,8 @@
</td></tr>
{/if}
+{sectionelse}
+ <td><font size="1">Aucun fichier dans ce dossier</font></td>
{/section}
<tr><td colspan="2"><table width="498" border="0" cellpadding="0" cellspacing="0"><tr><td>{if !$_multipage.is_last_page}{suivant}<font size=1> - <a href="{$PAGE_EXPLO}?start={$_multipage.min_max}&directory={$REP|urlencode}&mode={$MODE}">Fin du r\xE9pertoire</a> - </font>{/if}{pagination}</td>
Modified: trunk/module/cinefil/sorties_cine.tpl
===================================================================
--- trunk/module/cinefil/sorties_cine.tpl 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/cinefil/sorties_cine.tpl 2007-05-22 19:34:43 UTC (rev 156)
@@ -1,7 +1,7 @@
{section name=sorties loop=$SORTIES max=8 start=$MIN}
{cycle name=place assign=place print=false values="3,2,1,0"}
{if $smarty.section.sorties.first}
- {if !$_multipage.is_first_page}{precedent}{/if}
+ {if !$_multipage.is_first_page}{precedent}<br>{/if}
<table border="0" cellpadding="0" cellspacing="0" width="500" height="360" align="center"><tr>
{/if}
Modified: trunk/module/clips/play_clip.php
===================================================================
--- trunk/module/clips/play_clip.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/clips/play_clip.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -22,8 +22,7 @@
$url = 'http://launchtoday.fr.launch.yahoo.com/player/medialog.asp?vid='.$id.'&bw=510&mf=1&pid=505&ps=0&p1=2&p2=21&p3=2&rpid=35&pv=10&bp=Windows%2520NT&csid=791020104&uid=1886812234&pguid=einsJELEt4VkQCKMov00bg&etid=0&uguid=3e5u3891dirro&fcv=&mh='.$mh.'&z=ms.asx';
save_variable('backToURL', dirname($_SERVER['SCRIPT_NAME']).'/index1.php?show='.$_GET['show'].'&start='.$_GET['min'].'&lettre='.$_GET['lettre'].'&string='.$_GET['string']);
- //play_fichier('type=40',$url,0,'backToURL');
- play_fichier('type=40','http://video.stage6.com/1198169/.divx',0,'backToURL');
+ play_fichier('type=40',$url,0,'backToURL');
$LINK['stop']=$MODULE.'films/lecture.php?control=stop';
$LINK['play']=$MODULE.'films/lecture.php?control=play';
Modified: trunk/module/diaporama/explorateur_photo.tpl
===================================================================
--- trunk/module/diaporama/explorateur_photo.tpl 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/diaporama/explorateur_photo.tpl 2007-05-22 19:34:43 UTC (rev 156)
@@ -27,23 +27,21 @@
{if $smarty.section.files.first}
<table border="0" cellpadding="0" cellspacing="0" width="500" height="436" align="center"><tr>
{if $MIN!=0}
- {assign var=temp value=$MIN-$NUM_ROW_AFFICH}
- {attribbouton touche="green" lien="index1.php?start=$temp&rep=$rep_encoded"}
- <td colspan="5" align=center><img src="{$INTERFACE_REP}btn_vert.gif" border="0"> <a href="index1.php?start={$temp}&rep={$rep_encoded}">Pr\xE9c\xE9dent</a> <a href="index1.php?start=0&rep={$rep_encoded}">D\xE9but</a></td></tr><tr>
+ <td colspan="5" align=center>{precedent}<font size="1"> - <a href="index1.php?start=0&rep={$rep_encoded}">D\xE9but du r\xE9pertoire</a></font></td></tr><tr>
{/if}
{/if}
{if $files[files]|in_array:$T_repertoire}
{if $DOS}
- <td width="100" height="130"><a href="index1.php?rep={$files[files].path|urlencode}" onfocus='aide="{$files[files]|strip_delimiters|replace:"'":"`"}";'><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="80"><td width="100" height="80" valign="middle" align="center"><img border=0 width="64" height="64" src="lecteur.gif"></td></tr><tr height="50"><td width="100" height="50" valign="middle" align=center><font size="1">{$files[files].nom} ({$files[files].lettre|strtolower}:)</font></td></tr></table></a></td>
+ <td width="100" height="110"><a href="index1.php?rep={$files[files].path|urlencode}" onfocus='aide="{$files[files]|strip_delimiters|replace:"'":"`"}";'><table border="0" cellpadding="0" cellspacing="0" width="100" height="110" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="70"><td width="100" height="70" valign="middle" align="center"><img border=0 width="64" height="64" src="lecteur.gif"></td></tr><tr height="50"><td width="100" height="40" valign="middle" align=center><font size="1">{$files[files].nom} ({$files[files].lettre|strtolower}:)</font></td></tr></table></a></td>
{else}
- <td width="100" height="130"><a href="index1.php?rep={$REP|cat:'/'|cat:$files[files]|urlencode}" onfocus='aide="{$files[files]|strip_delimiters|replace:"'":"`"}";'><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="80"><td width="100" height="80" valign="middle" align="center"><img border=0 width="64" height="64" src="big_dossier.gif"></td></tr><tr height="50"><td width="100" height="50" valign="middle" align=center><font size="1">{$files[files]|truncate:20:"":true|wordwrap:10:"<br>":true|strip_delimiters}</font></td></tr></table></a></td>
+ <td width="100" height="110"><a href="index1.php?rep={$REP|cat:'/'|cat:$files[files]|urlencode}" onfocus='aide="{$files[files]|strip_delimiters|replace:"'":"`"}";'><table border="0" cellpadding="0" cellspacing="0" width="100" height="110" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="70"><td width="100" height="70" valign="middle" align="center"><img border=0 width="64" height="64" src="big_dossier.gif"></td></tr><tr height="50"><td width="100" height="40" valign="middle" align=center><font size="1">{$files[files]|truncate:20:"":true|wordwrap:10:"<br>":true|strip_delimiters}</font></td></tr></table></a></td>
{/if}
{else}
{assign var="dim" value=$REP|cat:'/'|cat:$files[files]|getimagesize}
{assign var="newdim" value=$dim.0|get_size:$dim.1}
- <td width="100" height="130" valign="middle" align="center"><a href="index1.php?image={$smarty.section.files.index}&rep={$rep_encoded}&start={$MIN}" onfocus='aide="{$files[files]|strip_delimiters|replace:"'":"`"}";'><table border="0" cellpadding="0" cellspacing="0" width="100" height="120" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="80"><td width="100" height="80" valign="middle" align="center" background="fond_cell.gif"><img width="{$newdim.0}" height="{$newdim.1}" border="0" src="{$IMG2FBX}?local=1&width=88&height=68&img={$REP|cat:'/'|cat:$files[files]|urlencode}"></td></tr><tr height="50"><td width="100" height="50" valign="middle" align=center><font size="1">{$files[files]|truncate:20:"":true|wordwrap:10:"<br>":true|strip_delimiters}</font></td></tr></table></a></td>
+ <td width="100" height="110" valign="middle" align="center"><a href="index1.php?image={$smarty.section.files.index}&rep={$rep_encoded}&start={$MIN}" onfocus='aide="{$files[files]|strip_delimiters|replace:"'":"`"}";'><table border="0" cellpadding="0" cellspacing="0" width="100" height="110" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="70"><td width="100" height="70" valign="middle" align="center" background="fond_cell.gif"><img width="{$newdim.0}" height="{$newdim.1}" border="0" src="{$IMG2FBX}?local=1&width=88&height=68&img={$REP|cat:'/'|cat:$files[files]|urlencode}"></td></tr><tr height="40"><td width="100" height="50" valign="middle" align=center><font size="1">{$files[files]|truncate:20:"":true|wordwrap:10:"<br>":true|strip_delimiters}</font></td></tr></table></a></td>
{/if}
@@ -68,7 +66,7 @@
{if $MIN+$NUM_ROW_AFFICH < $rows}
{assign var=temp value=$MIN+$NUM_ROW_AFFICH}
{attribbouton touche="blue" lien="index1.php?start=$temp&rep=$rep_encoded"}
- <tr><td colspan="5" align=center height=25 valign=bottom><img src="{$INTERFACE_REP}btn_bleu.gif" border="0"> <a href="index1.php?start={$temp}&rep={$rep_encoded}">Suivant</a> <a href="index1.php?start={$rows-$NUM_ROW_AFFICH}&rep={$rep_encoded}">Fin</a></td></tr>
+ <tr><td colspan="5" align="center" height="25" valign=bottom>{suivant}<font size="1"> - <a href="index1.php?start={$rows-$NUM_ROW_AFFICH}&rep={$rep_encoded}">Fin du r\xE9pertoire</a> - </font>{pagination}</td></tr>
{/if}
</table>
Modified: trunk/module/diaporama/index1.php
===================================================================
--- trunk/module/diaporama/index1.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/diaporama/index1.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -9,7 +9,7 @@
$ext_ok = explode(",",$extension);
$ext = $ext_ok;
-if (isset($_GET['show_band'])) {
+if (isset($_GET['show_band'])){
$show_band = $_GET['show_band'];
}else{
$show_band = get_variable('lastshowinfo');
@@ -26,12 +26,6 @@
$show_band = true;
}
-if (isset($_GET['start'])) {
- $min = max($_GET['start'],0);
-}else{
- $min = 0;
-}
-
if (isset($_GET['tourne'])) {
$tourne = $_GET['tourne'];
}else{
@@ -39,17 +33,6 @@
}
$smarty->assign('tourne',$tourne);
-//Si on a demand\xE9 \xE0 se placer autour d'une certaine photo, on y va !
-if (isset($_GET['tosee'])) {
-$i=0;
- while($i+15<$_GET['tosee']){
- $i=$i+15;
- }
-$min = $i;
-}
-
-$smarty->assign('MIN',$min);
-
//Fonctions essentielles
function estcachelinux($fichier){
global $afficher_fichier_cache, $hiddenfiles;
@@ -158,11 +141,23 @@
$nn_files = count($files);
}
}elseif($_GET['dos']=='disks'){
-$smarty->assign('DOS',True);
-$files = unserialize(get_variable('disques'));
-$T_repertoire = $files;
+ $smarty->assign('DOS',True);
+ $files = unserialize(get_variable('disques'));
+ $T_repertoire = $files;
}
+// Lancement de la gestion multipage
+start_multi('index1.php?rep='.urlencode($rep),15,count($files));
+
+//Si on a demand\xE9 \xE0 se placer autour d'une certaine photo, on y va !
+if (isset($_GET['tosee'])) {
+$i=0;
+ while($i+15<$_GET['tosee']){
+ $i+=15;
+ }
+$min = $i;
+}
+
$path=PATH();
$smarty->assign('CHEMIN_REP',$path);
$smarty->assign('Nb_rep_path',count($path));
@@ -175,15 +170,13 @@
$aff=$_GET['image'];
}
-if (isset($_GET['delais']) AND $aff+1 < count($files)) {
- $delais = $_GET['delais'];
-} elseif (isset($_GET['delais']) AND ($aff+1 == count($files)))
- {
- $message = 'Redirection vers les photos ...';
- set_refresh(2,'2;url='.page_retour_film(),true);
- }
-else{
- $delais = 0;
+if (isset($_GET['delais']) AND $aff+1 < count($files)){
+ $delais = $_GET['delais'];
+}elseif (isset($_GET['delais']) AND ($aff+1 == count($files))){
+ $message = 'Redirection vers les photos ...';
+ set_refresh(2,'2;url='.page_retour_film(),true);
+}else{
+ $delais = 0;
}
//Ajout dans la base de donn\xE9e pour les retours
@@ -193,82 +186,79 @@
if(isset($aff)){
-
-if ($_GET['start_play']=='oui') {
- save_variable('playing_audio', 'oui');
+ if ($_GET['start_play']=='oui') {
+ save_variable('playing_audio', 'oui');
+
+ if($pisteaudio=='TV'){
+ $play = 'type=1';
+ }elseif($pisteaudio=='PC'){
+ $play = 'type=3';
+ $decallage = $ini['multimedia']['compensation'];
+ $file2 = @readfile('http://127.0.0.1:8081/lecteur/modif-config.html?type=0&var=audio-desync&value='.$decallage);
+ }elseif($pisteaudio=='AC3'){
+ // $META['aud'] = '69(en,ac3)';
+ $play = 'type=5';
+ }
- if($pisteaudio=='TV'){
- $play = 'type=1';
- }elseif($pisteaudio=='PC'){
- $play = 'type=3';
- $decallage = $ini['multimedia']['compensation'];
- $file2 = @readfile('http://127.0.0.1:8081/lecteur/modif-config.html?type=0&var=audio-desync&value='.$decallage);
- }elseif($pisteaudio=='AC3'){
- // $META['aud'] = '69(en,ac3)';
- $play = 'type=5';
+ $db = sqlite_open($USER.'audio.db', 0666);
+ $query = 'SELECT max(id) FROM music';
+ $result=sqlite_query($db, $query);
+ $row = sqlite_fetch_array($result);
+ $rand = rand(1,$row[0]-26);
+ $query = 'SELECT * FROM music WHERE ((id<="'.($rand+50).'") and (id>="'.$rand.'")) limit 25';
+ $result=sqlite_query($db, $query);
+
+ $variable = '';
+ while ($row = sqlite_fetch_array($result)) {
+ $basename = $row[filename];
+ $variable .= "
+ ".utf8_encode(realpath($basename));
+ }
+
+ $fp = fopen($AUDIOTEMP.'audiotemp'.get_variable('num_playlist').'.m3u',"w+");
+ fputs($fp,"#EXTM3U");
+ fputs($fp,$variable);
+ fclose($fp);
+ play_fichier('type=1',realpath($AUDIOTEMP.'audiotemp'.get_variable('num_playlist').'.m3u'),1,'mp3');
+ $BACKGROUND = 'none';
+ save_variable('num_playlist', get_variable('num_playlist')+1);
+ }elseif($_GET['start_play']=='non'){
+ $file1 = file_get_contents("http://127.0.0.1:8081/lecteur/action.html?control=stop");
+ save_variable('playing_audio', 'non');
}
-
- $db = sqlite_open($USER.'audio.db', 0666);
- $query = 'SELECT max(id) FROM music';
- $result=sqlite_query($db, $query);
- $row = sqlite_fetch_array($result);
- $rand = rand(1,$row[0]-26);
- $query = 'SELECT * FROM music WHERE ((id<="'.($rand+50).'") and (id>="'.$rand.'")) limit 25';
- $result=sqlite_query($db, $query);
-
- $variable = '';
- while ($row = sqlite_fetch_array($result)) {
- $basename = $row[filename];
- $variable .= "
- ".utf8_encode(realpath($basename));
+
+ if(get_variable('playing_audio')=='oui'){
+ $smarty->assign('start_play','non');
+ }else{
+ $smarty->assign('start_play','oui');
}
-
- $fp = fopen($AUDIOTEMP.'audiotemp'.get_variable('num_playlist').'.m3u',"w+");
- fputs($fp,"#EXTM3U");
- fputs($fp,$variable);
- fclose($fp);
- play_fichier('type=1',realpath($AUDIOTEMP.'audiotemp'.get_variable('num_playlist').'.m3u'),1,'mp3');
- $BACKGROUND = 'none';
- save_variable('num_playlist', get_variable('num_playlist')+1);
-}elseif($_GET['start_play']=='non'){
- $file1 = file_get_contents("http://127.0.0.1:8081/lecteur/action.html?control=stop");
- save_variable('playing_audio', 'non');
-}
+
+ if($delais){
+ $LINK['stop']='index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.$aff.'&delais=0&tourne='.$tourne;
+ $LINK['pause']='index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.$aff.'&delais=0&tourne='.$tourne;
+ $META['refresh']= $delais.';url=index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.($aff+1).'&delais='.$delais.'&tourne='.$tourne;
+ }else{
+ $LINK['play']='index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.$aff.'&delais=5&tourne='.$tourne;
+ }
+
+ if($show_band){
+ $LINK['info']='index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.$aff.'&delais='.$delais.'&tourne='.$tourne.'&show_band=non';
+ }else{
+ $LINK['info']='index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.$aff.'&delais='.$delais.'&tourne='.$tourne.'&show_band=oui';
+ }
+
+ $smarty->assign('show_band',$show_band);
+ $smarty->assign('delais',$delais);
+ $smarty->assign('aff',$aff);
+ $smarty->display('photo.tpl');
-if(get_variable('playing_audio')=='oui'){
- $smarty->assign('start_play','non');
-}else{
- $smarty->assign('start_play','oui');
-}
-
-if($delais){
-$LINK['stop']='index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.$aff.'&delais=0&tourne='.$tourne;
-$LINK['pause']='index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.$aff.'&delais=0&tourne='.$tourne;
-$META['refresh']= $delais.';url=index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.($aff+1).'&delais='.$delais.'&tourne='.$tourne;
-}else{
-$LINK['play']='index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.$aff.'&delais=5&tourne='.$tourne;
-}
-
-if($show_band){
- $LINK['info']='index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.$aff.'&delais='.$delais.'&tourne='.$tourne.'&show_band=non';
-}else{
- $LINK['info']='index1.php?start='.$min.'&rep='.urlencode($rep).'&image='.$aff.'&delais='.$delais.'&tourne='.$tourne.'&show_band=oui';
-}
-
-$smarty->assign('show_band',$show_band);
-$smarty->assign('delais',$delais);
-$smarty->assign('aff',$aff);
-$smarty->display('photo.tpl');
-
-}elseif(isset($message))
-{
+}elseif(isset($message)){
$smarty->assign('AVERTISSEMENT',$message);
$smarty->display('avertissement.tpl');
-} else
-{
-$LINK['red']= $MODULE.'_menu/menu.php';
-$smarty->assign('CONTENT',$smarty->fetch('explorateur_photo.tpl'));
-$smarty->display('interface.tpl');
+}else{
+ $LINK['red']= $MODULE.'_menu/menu.php';
+ $smarty->assign('CONTENT',$smarty->fetch('explorateur_photo.tpl'));
+ $smarty->display('interface.tpl');
}
?>
Modified: trunk/module/favoris/favoris.tpl
===================================================================
--- trunk/module/favoris/favoris.tpl 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/favoris/favoris.tpl 2007-05-22 19:34:43 UTC (rev 156)
@@ -1,6 +1,6 @@
<a href="index1.php?action=explorateur">Ajouter un favori \xE0 la liste</a><br> <br>
-{section name=table loop=$CONTENT_TABLE}
+{section name=table loop=$CONTENT_TABLE start=$MIN max=15}
{if $smarty.section.table.first}
<table width="450" border="0" cellpadding="0" cellspacing="0">
{/if}
Modified: trunk/module/favoris/index1.php
===================================================================
--- trunk/module/favoris/index1.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/favoris/index1.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -27,7 +27,8 @@
$icone_fichier = "noname.gif";
$extension = ".riendutous";
$afficher_fichier_cache = $ini['explorateur']['afficher_fichier_cache'];
- $smarty->assign('TITRE','Favoris');
+ $LINK['red']= $MODULE.'favoris/index1.php';
+ $smarty->assign('TITRE','Favoris - Cliquez sur l\'\xE9toile pour ajouter ce dossier.');
include($EXPLORATEUR);
}elseif($_GET['action'] == 'suppr') {
@@ -59,6 +60,10 @@
$query = "SELECT * FROM favoris";
$result=sqlite_query($db, $query);
+ // Lancement de la gestion multipage
+ start_multi('index1.php?a=1',15,sqlite_num_rows($result));
+
+
$smarty->assign('TITRE','Favoris');
$smarty->assign('CONTENT_TABLE',sqlite_fetch_all($result));
Modified: trunk/module/films/films.tpl
===================================================================
--- trunk/module/films/films.tpl 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/films/films.tpl 2007-05-22 19:34:43 UTC (rev 156)
@@ -49,24 +49,34 @@
Augmenter la qualit\xE9 du traitement de l'image (de 0 vers 6) demande plus de puissance CPU.
<br>
+<table width="500" align="left">
+<tr><td width="90">Lumi\xE9re</td><td width="5">:</td><td><input bgcolor="{#COULEUR_FOND_RADIO#}" type=hslider name=denc_brightness min=0 max=255 grad=16></td></tr>
+<tr><td width="90">Contraste</td><td width="5">:</td><td><input bgcolor="{#COULEUR_FOND_RADIO#}" type=hslider name=denc_contrast min='-128' max=127 grad=16></td></tr>
+<tr><td width="90">Couleur</td><td width="5">:</td><td><input bgcolor="{#COULEUR_FOND_RADIO#}" type=hslider name=denc_saturation min=0 max=255 grad=16></td></tr>
+<tr><td width="90">Zoom</td><td width="5">:</td><td><input bgcolor="{#COULEUR_FOND_RADIO#}" type=hslider name=video_output_scale min=25 max=175 grad=5> - <a href="none" onSelect='video_output_scale="100";'>R\xE9initialiser</a></td></tr>
+</table>
+
+{if $vers_fbx==5}
<select name=display_scaling>
<option value=letterbox>Letterbox
<option value=panscan>Panscan
<option value=fullscreen>Fullscreen
</select>
-<br>
<select name=display_aspect_ratio_conversion>
<option value=letterbox>Letterbox
<option value=combined>Combined
<option value=panscan>Panscan
<option value=ignore>Ignore
</select>
-<table width="500" align="left">
-<tr><td width="90">Lumi\xE9re</td><td width="5">:</td><td><input bgcolor="{#COULEUR_FOND_RADIO#}" type=hslider name=denc_brightness min=0 max=255 grad=16></td></tr>
-<tr><td width="90">Contraste</td><td width="5">:</td><td><input bgcolor="{#COULEUR_FOND_RADIO#}" type=hslider name=denc_contrast min='-128' max=127 grad=16></td></tr>
-<tr><td width="90">Couleur</td><td width="5">:</td><td><input bgcolor="{#COULEUR_FOND_RADIO#}" type=hslider name=denc_saturation min=0 max=255 grad=16></td></tr>
-<tr><td width="90">Zoom</td><td width="5">:</td><td><input bgcolor="{#COULEUR_FOND_RADIO#}" type=hslider name=video_output_scale min=25 max=175 grad=5> - <a href="none" onSelect='video_output_scale="100";'>R\xE9initialiser</a></td></tr>
+{else}
+<table width="250" align="left">
+<tr><td width="130">4/3 Letterbox</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=display_aspect_ratio_conversion value=letterbox></td></tr>
+<tr><td width="130">4/3 Combined</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=display_aspect_ratio_conversion value=combined></td></tr>
+<tr><td width="130">4/3 Pan Scan</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=display_aspect_ratio_conversion value=panscan></td></tr>
+<tr><td width="130">16/9</td><td><input type=radio bgcolor="{#COULEUR_FOND_RADIO#}" name=display_aspect_ratio_conversion value=ignore></td></tr>
</table>
+{/if}
+
<br>
<input bgcolor="{#COULEUR_TEXTBOX#}" type=submit value="Valider les modifications">
</form>
Modified: trunk/module/films/lecture.php
===================================================================
--- trunk/module/films/lecture.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/films/lecture.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -235,7 +235,7 @@
if(trim($OSD)==''){
if($cansetfrontpannel and $VLC['etat']=='playing'){
if($vers_fbx>4 AND $VLC['duree_totale']>=5){
- set_refresh(2, '2;url=lecture.php');
+ set_refresh(3, '3;url=lecture.php');
}
$META['front_panel'] = calcul_hours($VLC['duree_courante']);
}
Modified: trunk/module/films/signet_film.tpl
===================================================================
--- trunk/module/films/signet_film.tpl 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/films/signet_film.tpl 2007-05-22 19:34:43 UTC (rev 156)
@@ -1,14 +1,14 @@
{section name=table loop=$CONTENT_TABLE}
{if $smarty.section.table.first}
Vous aviez enregistr\xE9 un signet pour ce film. A quel endroit du film voulez-vous aller ?<br \> <br \> <br \>
- <table cellpadding=0 cellspacing=0><tr><td>
- <tr><td width=434 bgcolor="#82B1EC6f"><a href="lecture.php">D\xE9but</a></td><td width="20" bgcolor="#82B1EC6f"><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="#82B1EC6f"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"> </td></tr></table></td></tr>
+ <table cellpadding=0 cellspacing=0 width="434">
+ <tr><td width="434" bgcolor="#82B1EC6f"><a href="lecture.php">D\xE9but</a></td></tr>
{/if}
{cycle name=color assign=COLOR print=false values="#3482E03f,#82B1EC3f"}
- <tr><td width=434 bgcolor="{$COLOR}"><a href="lecture.php?control=seek&seek_value={$CONTENT_TABLE[table].duree}">{$CONTENT_TABLE[table].duree}</a></td><td width="20" bgcolor="{$COLOR}"><a href="{$MODULE}signet/supsignet.php?toplay={$CONTENT_TABLE[table].id}&temps={$CONTENT_TABLE[table].duree}&return=film"><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{$COLOR}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$INTERFACE_REP}delete.gif" border="0" width="20" height="20"></td></tr></table></a></td></tr>
+ <tr><td width="434" bgcolor="{$COLOR}"><a href="lecture.php?control=seek&seek_value={$CONTENT_TABLE[table].duree}">{$CONTENT_TABLE[table].duree}</a></td></tr>
{if $smarty.section.table.last}
- </table></td></tr></table>
+ </table>
{/if}
{/section}
Modified: trunk/module/mp3/audio.tpl
===================================================================
--- trunk/module/mp3/audio.tpl 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/mp3/audio.tpl 2007-05-22 19:34:43 UTC (rev 156)
@@ -114,12 +114,12 @@
<tr><td bgcolor="{#COULEUR_FOND2#}" colspan="2" width="625" height="25">
<table width="625" height="25" border="0" align="center" cellpadding="0" cellspacing="0">
<tr>
- <td width="104" align=center><a href="lecteuraudio.php?mode=pla" {if $mode=='pla'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Playlist</td></tr></table></a></td>
- <td width="104" align=center><a href="lecteuraudio.php?mode=bib" {if $mode=='bib'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Biblioth\xE8que</td></tr></table></a></td>
- <td width="104" align=center><a href="lecteuraudio.php?mode=exp" {if $mode=='exp'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Explorateur</td></tr></table></a></td>
- <td width="104" align=center><a href="lecteuraudio.php?mode=par" {if $mode=='par'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Paroles</td></tr></table></a></td>
- <td width="104" align=center><a href="lecteuraudio.php?mode=pod" {if $mode=='pod'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Podcast</td></tr></table></a></td>
- <td width="104" align=center><a href="lecteuraudio.php?mode=web" {if $mode=='web'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Web-Radios</td></tr></table></a></td>
+ <td width="104" align=center><a href="lecteuraudio.php?mode=pla" onfocus='front_panel="PLAYLIST";' {if $mode=='pla'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Playlist</td></tr></table></a></td>
+ <td width="104" align=center><a href="lecteuraudio.php?mode=bib" onfocus='front_panel="BIBLIOTH";' {if $mode=='bib'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Biblioth\xE8que</td></tr></table></a></td>
+ <td width="104" align=center><a href="lecteuraudio.php?mode=exp" onfocus='front_panel="EXPLORAT";' {if $mode=='exp'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Explorateur</td></tr></table></a></td>
+ <td width="104" align=center><a href="lecteuraudio.php?mode=par" onfocus='front_panel="PAROLES";' {if $mode=='par'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Paroles</td></tr></table></a></td>
+ <td width="104" align=center><a href="lecteuraudio.php?mode=pod" onfocus='front_panel="PODCAST";' {if $mode=='pod'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Podcast</td></tr></table></a></td>
+ <td width="104" align=center><a href="lecteuraudio.php?mode=web" onfocus='front_panel="WEBMEDIA";' {if $mode=='web'}focused{/if}><table width="104" height="25" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr height="25"><td align=center width="104" height="25">Web-Radios</td></tr></table></a></td>
</tr>
</table>
</td></tr>
@@ -128,7 +128,7 @@
{eval var=$CONTENT}
- <var name=aide width=450>
+ <var name=aide width=650>
</td></tr>
</table>
Modified: trunk/module/signet/playsignet.php
===================================================================
--- trunk/module/signet/playsignet.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/signet/playsignet.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -8,9 +8,8 @@
save_variable('lastrep', dirname($basename));
save_variable('rep_min', '0');
-sleep(2);
-$file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control=seek&seek_value='.$value);
-$META['refresh']= '0;url='.$RACINE_REP.'module/films/info.php';
+sleep(1);
+$META['refresh']= '0;url='.$RACINE_REP.'module/films/lecture.php?control=seek&seek_value='.$value;
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<html>
Modified: trunk/module/stage6/index1.php
===================================================================
--- trunk/module/stage6/index1.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/stage6/index1.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -8,8 +8,8 @@
$MENU_ALT=array(array('lien'=>'index1.php?show=recent', 'nom'=>'R\xE9cents', 'selected'=>$show=='recent'),
array('lien'=>'index1.php?show=vus', 'nom'=>'Plus vus', 'selected'=>$show=='vus'),
array('lien'=>'index1.php?show=note', 'nom'=>'Mieux not\xE9s', 'selected'=>$show=='note'),
- array('lien'=>'index1.php?show=rec', 'nom'=>'Recherche', 'selected'=>$show=='rec'));
-
+ //array('lien'=>'index1.php?show=rec', 'nom'=>'Recherche', 'selected'=>$show=='rec'));
+ );
$title = array('recent'=>'Les plus r\xE9cents', 'vus'=>'Les plus vus', 'note'=>'Les mieux not\xE9s', 'rec'=>'Recherche');
$smarty->assign('TITRE','Vid\xE9os Stage6 - '.$title[$show]);
Modified: trunk/module/stage6/play_stage6.php
===================================================================
--- trunk/module/stage6/play_stage6.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/module/stage6/play_stage6.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -5,7 +5,7 @@
$url = urldecode($_REQUEST['url']);
- save_variable('backToURL', dirname($_SERVER['SCRIPT_NAME']).'/index1.php?show='.$_GET['show'].'&start='.$_GET['min'].'&string='.$_GET['string']);
+ save_variable('backToURL', dirname($_SERVER['SCRIPT_NAME']).'/index1.php?show='.$_GET['show'].'&start='.$_GET['min']);
play_fichier('type=40',$url,0,'backToURL','',$_GET['duree']);
$LINK['stop']=$MODULE.'films/lecture.php?control=stop';
Added: trunk/module/telesite/index.php
===================================================================
--- trunk/module/telesite/index.php (rev 0)
+++ trunk/module/telesite/index.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -0,0 +1,11 @@
+<?php
+$RACINE_REP = "../../";
+require($RACINE_REP.'_framework/framework.php');
+
+$base = 'http://www.freeplayer.org/freebox/hj/';
+$contenu = file_get_contents($base.'index.php?'.$_SERVER['QUERY_STRING']);
+$contenu = str_replace('src="images/', 'src="'.$IMG2FBX.'?cache=1&img='.urlencode($base.'images/'), $contenu);
+
+echo $contenu;
+
+?>
Modified: trunk/skin/mediacenter/audio.tpl
===================================================================
--- trunk/skin/mediacenter/audio.tpl 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/skin/mediacenter/audio.tpl 2007-05-22 19:34:43 UTC (rev 156)
@@ -23,6 +23,7 @@
$smarty->assign('CONTENT2',$smarty->fetch('interface.tpl'));
{/php}
{$CONTENT2}
+ <center><var name=aide width=450></center>
{*
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<html>
Modified: trunk/skin/mediacenter/framework_skin.php
===================================================================
--- trunk/skin/mediacenter/framework_skin.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/skin/mediacenter/framework_skin.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -35,7 +35,7 @@
// Fonction responsable de l'affichage du fond d'\xE9cran \xE0 la toute fin du processus de conception de la page (post-filtre de smarty)
function background($output, &$smarty){
global $contenu_html, $BACKGROUND, $BACKGROUND_REP, $SKIN_REP, $BACKGROUND_TYPE, $FORCED, $_SERVER, $BACK_DONE;
- if(((eregi("stop",$contenu_html) AND $BACKGROUND!="none" AND realpath($BACKGROUND_REP.$BACKGROUND)!='') OR $FORCED) AND !$BACK_DONE){
+ if((((eregi("stop",$contenu_html) AND $BACKGROUND!="none" AND realpath($BACKGROUND_REP.$BACKGROUND)!='') AND !eregi($BACKGROUND,$contenu_html)) OR $FORCED) AND !$BACK_DONE){
if($BACKGROUND_TYPE == 'add'){
play_fichier('type=21&temps=3000',realpath($BACKGROUND_REP.$BACKGROUND),1,'photo');
}else{
@@ -62,7 +62,7 @@
$_multipage['lien'] = $lien;
$_multipage['step'] = $step;
$_multipage['total'] = $total;
- $_multipage['nb_page'] = ceil($total/$step);
+ $_multipage['nb_page'] = max(ceil($total/$step),1);
$_multipage['current_page'] = ceil(($min/$step)+1);
$_multipage['is_last_page'] = ($_multipage['current_page']==$_multipage['nb_page']);
$_multipage['is_first_page'] = ($_multipage['current_page']==1);
@@ -92,7 +92,7 @@
}
function _multipage_pagination(){
-global $_multipage;
- //return '<font size="1">Page '.$_multipage['current_page'].' / '.$_multipage['nb_page'].'</font>';
+global $_multipage, $smarty;
+ $smarty->assign('MULTI_ACTIF',true);
}
?>
Added: trunk/skin/mediacenter/interface/pagination.gif
===================================================================
(Binary files differ)
Property changes on: trunk/skin/mediacenter/interface/pagination.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/skin/mediacenter/interface.tpl
===================================================================
--- trunk/skin/mediacenter/interface.tpl 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/skin/mediacenter/interface.tpl 2007-05-22 19:34:43 UTC (rev 156)
@@ -15,17 +15,21 @@
</tr>
<tr>
<td width="130" height="415" valign="top">
-
- <table><tr height="20"><td> </td></tr>
+{assign var=compter value=376}
+ <table height="415"><tr height="20"><td> </td></tr>
{section name=menu_alt loop=$MENU_ALT}
<tr><td width="115"><a onfocus='front_panel="{$MENU_ALT[menu_alt].front_pannel|default:$MENU_ALT[menu_alt].nom|cleanaff}";' href="{$MENU_ALT[menu_alt].lien}"{if $MENU_ALT[menu_alt].selected} focused{/if}><table width="115" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr><td>{$MENU_ALT[menu_alt].nom}</td></tr></table></a></td></tr>
{if $smarty.section.menu_alt.last}
<tr><td width="115"><a onfocus='front_panel="RETOUR";' href="{$LINK.red}"><table width="115" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr><td><img src="{$INTERFACE_REP}btn_rouge.gif" border="0"> Retour</td></tr></table></a></td></tr>
- {/if}
+ {assign var=compter value=$compter-20}
+ {/if}
+ {assign var=compter value=$compter-20}
{sectionelse}
{section name=menu_header loop=$MENU_SUP}
<tr><td width="115"><a onfocus='front_panel="{$MENU_SUP[menu_header].name|cleanaff}";' href="{$MODULE}_menu/menu.php?cat={$MENU_SUP[menu_header].nb}&show=1" {if $cat==$MENU_SUP[menu_header].nb} focused{/if}><table width="115" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr><td>{$MENU_SUP[menu_header].name}</td></tr></table></a></td>
+ {assign var=compter value=$compter-20}
{if $smarty.section.menu_header.last}
+ {assign var=compter value=$compter-20}
{if $LINK.red}
<tr><td width="115"><a onfocus='front_panel="RETOUR";' href="{$LINK.red}"><table width="115" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_TABLE_SELECTED#}"><tr><td><img src="{$INTERFACE_REP}btn_rouge.gif" border="0"> Retour</td></tr></table></a></td></tr>
{else}
@@ -34,6 +38,8 @@
{/if}
{/section}
{/section}
+ <tr><td height="{$compter}"><img src="blank.gif" height="{$compter}"></td></tr>
+ <tr><td height="39" width="97" background="{$PLAYER_REP}pagination.gif">{if $MULTI_ACTIF}{$_multipage.current_page} / {$_multipage.nb_page}{/if}</td></tr>
</table>
Modified: trunk/skin/mediacenter/menu.tpl
===================================================================
--- trunk/skin/mediacenter/menu.tpl 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/skin/mediacenter/menu.tpl 2007-05-22 19:34:43 UTC (rev 156)
@@ -8,19 +8,19 @@
{section name=menu loop=$MENU}
{if $CAT=="1" AND NOT $SHOW}
{if $smarty.section.menu.first}
- <a focused onfocus='front_panel="FILMS";{if $vers_fbx<=4}location{else}service{/if}="ts://127.0.0.1?bidule=0&ox=0&oy=0&ow=720&oh=576,&ix=0&iy=0&iw=360&ih=192";' href="../../module/films/index1.php">
+ <a focused onfocus='front_panel="FILMS";location="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=0&iw=360&ih=192";service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=0&iw=360&ih=192";' href="../../module/films/index1.php">
</a>
- <a onfocus='front_panel="MODULES";{if $vers_fbx<=4}location{else}service{/if}="ts://127.0.0.1?bidule=0&ox=0&oy=0&ow=720&oh=576,&ix=0&iy=384&iw=360&ih=192";' href="../../module/_menu/menu.php?show=1">
+ <a onfocus='front_panel="MODULES";location="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=384&iw=360&ih=192";service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=384&iw=360&ih=192";' href="../../module/_menu/menu.php?show=1">
</a>
- <a onfocus='front_panel="PHOTO";{if $vers_fbx<=4}location{else}service{/if}="ts://127.0.0.1?bidule=0&ox=0&oy=0&ow=720&oh=576,&ix=360&iy=192&iw=360&ih=192";' href="../../module/diaporama/index1.php">
+ <a onfocus='front_panel="PHOTO";location="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=192&iw=360&ih=192";service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=192&iw=360&ih=192";' href="../../module/diaporama/index1.php">
</a>
- <a onfocus='front_panel="AUDIO";{if $vers_fbx<=4}location{else}service{/if}="ts://127.0.0.1?bidule=0&ox=0&oy=0&ow=720&oh=576,&ix=0&iy=192&iw=360&ih=192";' href="../../module/mp3/lecteuraudio.php">
+ <a onfocus='front_panel="AUDIO";location="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=192&iw=360&ih=192";service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=192&iw=360&ih=192";' href="../../module/mp3/lecteuraudio.php">
</a>
- <a onfocus='front_panel="BIBLIOTHEQUE";{if $vers_fbx<=4}location{else}service{/if}="ts://127.0.0.1?bidule=0&ox=0&oy=0&ow=720&oh=576,&ix=360&iy=0&iw=360&ih=192";' href="../../module/films/catalogue.php">
+ <a onfocus='front_panel="BIBLIOTHEQUE";location="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=0&iw=360&ih=192";service="ts://127.0.0.1?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=0&iw=360&ih=192";' href="../../module/films/catalogue.php">
</a>
{/if}
Modified: trunk/skin/simple/framework_skin.php
===================================================================
--- trunk/skin/simple/framework_skin.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/skin/simple/framework_skin.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -31,7 +31,7 @@
// Fonction responsable de l'affichage du fond d'\xE9cran \xE0 la toute fin du processus de conception de la page (post-filtre de smarty)
function background($output, &$smarty){
global $contenu_html, $BACKGROUND, $BACKGROUND_REP, $SKIN_REP, $BACKGROUND_TYPE, $FORCED, $_SERVER, $BACK_DONE, $smarty;
- if(((eregi("stop",$contenu_html) AND $BACKGROUND!="none" AND realpath($BACKGROUND_REP.$BACKGROUND)!='') OR $FORCED) AND !$BACK_DONE){
+ if((((eregi("stop",$contenu_html) AND $BACKGROUND!="none" AND realpath($BACKGROUND_REP.$BACKGROUND)!='') AND !eregi($BACKGROUND,$contenu_html)) OR $FORCED) AND !$BACK_DONE){
if($BACKGROUND_TYPE == 'add'){
play_fichier('type=21&temps=8000',realpath($BACKGROUND_REP.$BACKGROUND),1,'photo');
}else{
@@ -58,7 +58,7 @@
$_multipage['lien'] = $lien;
$_multipage['step'] = $step;
$_multipage['total'] = $total;
- $_multipage['nb_page'] = ceil($total/$step);
+ $_multipage['nb_page'] = max(ceil($total/$step),1);
$_multipage['current_page'] = ceil(($min/$step)+1);
$_multipage['is_last_page'] = ($_multipage['current_page']==$_multipage['nb_page']);
$_multipage['is_first_page'] = ($_multipage['current_page']==1);
@@ -71,7 +71,7 @@
global $_multipage, $INTERFACE_REP, $min, $LINK;
if(!$_multipage['is_first_page']){
$LINK['green'] = $_multipage['lien'].'&start='.max(0,$min-$_multipage['step']);
- return '<a href="'.$_multipage['lien'].'&start='.max(0,$min-$_multipage['step']).'" onfocus=\'aide="Page pr\xE9c\xE9dente";\'><img src="'.$INTERFACE_REP.'btn_vert.gif" border="0"><font size="1"> Pr\xE9c\xE9dent</font></a>';
+ return '<a href="'.$_multipage['lien'].'&start='.max(0,$min-$_multipage['step']).'" onfocus=\'aide="Page pr\xE9c\xE9dente";\'><img src="'.$INTERFACE_REP.'btn_vert.gif" border="0"><font size="1"> Pr\xE9c\xE9dent</font></a> ';
}else{
return false;
}
Modified: trunk/skin/simplegreen/framework_skin.php
===================================================================
--- trunk/skin/simplegreen/framework_skin.php 2007-05-21 16:17:12 UTC (rev 155)
+++ trunk/skin/simplegreen/framework_skin.php 2007-05-22 19:34:43 UTC (rev 156)
@@ -31,7 +31,7 @@
// Fonction responsable de l'affichage du fond d'\xE9cran \xE0 la toute fin du processus de conception de la page (post-filtre de smarty)
function background($output, &$smarty){
global $contenu_html, $BACKGROUND, $BACKGROUND_REP, $SKIN_REP, $BACKGROUND_TYPE, $FORCED, $_SERVER, $BACK_DONE, $smarty;
- if(((eregi("stop",$contenu_html) AND $BACKGROUND!="none" AND realpath($BACKGROUND_REP.$BACKGROUND)!='') OR $FORCED) AND !$BACK_DONE){
+ if((((eregi("stop",$contenu_html) AND $BACKGROUND!="none" AND realpath($BACKGROUND_REP.$BACKGROUND)!='') AND !eregi($BACKGROUND,$contenu_html)) OR $FORCED) AND !$BACK_DONE){
if($BACKGROUND_TYPE == 'add'){
play_fichier('type=21&temps=8000',realpath($BACKGROUND_REP.$BACKGROUND),1,'photo');
}else{
@@ -58,7 +58,7 @@
$_multipage['lien'] = $lien;
$_multipage['step'] = $step;
$_multipage['total'] = $total;
- $_multipage['nb_page'] = ceil($total/$step);
+ $_multipage['nb_page'] = max(ceil($total/$step),1);
$_multipage['current_page'] = ceil(($min/$step)+1);
$_multipage['is_last_page'] = ($_multipage['current_page']==$_multipage['nb_page']);
$_multipage['is_first_page'] = ($_multipage['current_page']==1);
@@ -71,7 +71,7 @@
global $_multipage, $INTERFACE_REP, $min, $LINK;
if(!$_multipage['is_first_page']){
$LINK['green'] = $_multipage['lien'].'&start='.max(0,$min-$_multipage['step']);
- return '<a href="'.$_multipage['lien'].'&start='.max(0,$min-$_multipage['step']).'" onfocus=\'aide="Page pr\xE9c\xE9dente";\'><img src="'.$INTERFACE_REP.'btn_vert.gif" border="0"><font size="1"> Pr\xE9c\xE9dent</font></a>';
+ return '<a href="'.$_multipage['lien'].'&start='.max(0,$min-$_multipage['step']).'" onfocus=\'aide="Page pr\xE9c\xE9dente";\'><img src="'.$INTERFACE_REP.'btn_vert.gif" border="0"><font size="1"> Pr\xE9c\xE9dent</font></a> ';
}else{
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
