[xoops-svn] SF.net SVN: xoops:[9879] XoopsModules/TDMPicture/trunk/TDMPicture

[<lor...@us...>]

Revision: 9879
          http://xoops.svn.sourceforge.net/xoops/?rev=9879&view=rev
Author:   lord_venom
Date:     2012-07-14 23:46:12 +0000 (Sat, 14 Jul 2012)
Log Message:
-----------
minitable

Modified Paths:
--------------
    XoopsModules/TDMPicture/trunk/TDMPicture/blocks/tdmpicture_minitable.php
    XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
    XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
    XoopsModules/TDMPicture/trunk/TDMPicture/index.php
    XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php
    XoopsModules/TDMPicture/trunk/TDMPicture/templates/blocks/tdmpicture_minitable.html
    XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/blocks/tdmpicture_minitable.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/blocks/tdmpicture_minitable.php	2012-07-14 18:25:12 UTC (rev 9878)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/blocks/tdmpicture_minitable.php	2012-07-14 23:46:12 UTC (rev 9879)
@@ -21,6 +21,10 @@
 die("XOOPS root path not defined");
 }
 
+global $xoopsModuleConfig, $xoopsModule;
+include_once XOOPS_ROOT_PATH."/modules/".basename(dirname(dirname(__FILE__)))."/include/common.php";
+
+echo TDMPICTURE_URL."passe";
 function addCatSelect($cats) {
 	if(is_array($cats)) {
 		$cat_sql = '('.current($cats);
@@ -37,9 +41,9 @@
 global $xoopsConfig, $xoopsModule, $xoTheme, $xoopsTpl;
 
 if(isset($xoTheme) && is_object($xoTheme)) {
-  $xoTheme->addStylesheet(XOOPS_URL."/modules/".basename(dirname(dirname(__FILE__)))."/css/tdmpicture.css");
-  $xoTheme->addScript(XOOPS_URL."/modules/".basename(dirname(dirname(__FILE__)))."/js/jquery-1.4.4.js");
-  $xoTheme->addScript(XOOPS_URL."/modules/".basename(dirname(dirname(__FILE__)))."/js/AudioPlayer.js");
+  $xoTheme->addStylesheet(TDMPICTURE_URL."/css/tdmpicture.css");
+  $xoTheme->addScript(TDMPICTURE_URL."/js/jquery-1.4.4.js");
+  $xoTheme->addScript(TDMPICTURE_URL."/js/AudioPlayer.js");
   }
 
   xoops_loadLanguage('main', 'TDMPicture');
@@ -84,12 +88,12 @@
 		$blocks[$i]['file_cat_id'] = $file_arr[$i]->getVar('file_cat');
 	
 	//on test l'existance de l'image
-	$imgpath = XOOPS_ROOT_PATH . "/modules/TDMPicture/upload/thumb/".$file_arr[$i]->getVar("file_file");
+	$imgpath = TDMPICTURE_THUMB_PATH.$file_arr[$i]->getVar("file_file");
 		if (file_exists($imgpath)) {
-		$blocks[$i]['img'] = XOOPS_URL. "/modules/TDMPicture/upload/thumb/".$file_arr[$i]->getVar("file_file");
-		$blocks[$i]['img_popup'] = XOOPS_URL. "/modules/TDMPicture/upload/".$file_arr[$i]->getVar("file_file");
+		$blocks[$i]['img'] = TDMPICTURE_THUMB_URL.$file_arr[$i]->getVar("file_file");
+		$blocks[$i]['img_popup'] = TDMPICTURE_UPLOADS_URL.$file_arr[$i]->getVar("file_file");
 		} else {
-		$blocks[$i]['img'] = XOOPS_URL. "/modules/TDMPicture/images/blank.png";
+		$blocks[$i]['img'] = TDMPICTURE_UPLOADS_URL."blank.png";
 		}
 		$blocks[$i]['i'] = $e;
 		$blocks[$i]['id'] = $file_arr[$i]->getVar('file_id');

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php	2012-07-14 18:25:12 UTC (rev 9878)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php	2012-07-14 23:46:12 UTC (rev 9879)
@@ -94,7 +94,7 @@
 		$GLOBALS['cat_title'] = $this->_tree[$key]['obj']->getVar('cat_title');
 		$select = $this->makeSelBox('cat_pid', 'cat_title','-', $selected, '', $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview');
 
-		$ret .=  '<li class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="tree_form">'.$GLOBALS['navbar'].$select.' | '._MD_TDMPICTURE_TRIBY.' > '.$navtrie.'</div></li>';
+		$ret .=  '<li class="'.$GLOBALS['class'].'"><div><div id="img">'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div id="tree_detail"><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><span id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><br style="clear: both;" /><div id="tree_form">'.$GLOBALS['navbar'].$select.' | '._MD_TDMPICTURE_TRIBY.' > '.$navtrie.'</div></div></div></li>';
 
 		}	
 		
@@ -104,7 +104,7 @@
 		$select = $this->makeSelBox('cat_pid', 'cat_title','-', 0, '', $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview');
 			
 			
-		$ret .=  '<li style="width:47%;" class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="tree_form">'.$select.'</div></div></li>';
+		$ret .=  '<li style="width:47%;" class="'.$GLOBALS['class'].'"><div><div id="img">'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div id="tree_detail"><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><span id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><br style="clear: both;" /><div id="tree_form">'.$select.'</div></div></div></li>';
 		
 			}
 			

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css	2012-07-14 18:25:12 UTC (rev 9878)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css	2012-07-14 23:46:12 UTC (rev 9879)
@@ -27,7 +27,8 @@
     list-style: none;
 	float:left;
 	width:97%;
-	height: 130px;
+	min-height:140px;
+	/*height: 130px;*/
     margin: 10px; padding: 0px; 
 	-webkit-border-radius: 4px; 
 	border-radius: 4px;
@@ -36,7 +37,7 @@
 	-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
 	overflow: auto;
   }
-  ul#tree_menu img {
+  ul#tree_menu #img {
   float:left;
   padding-left:20px;
   padding-right:20px;
@@ -46,22 +47,28 @@
     ul#tree_menu h2{
 	left:0;
 	text-align:left;
-padding-top:10px;
+padding-top:5px;
 padding-bottom:5px;
+margin-bottom:0px;
   }
   
+     ul#tree_menu #tree_detail{
+  text-align:left;
+  }
    ul#tree_menu div{
-  float:left;
+  
  
   }
 
   #tdmpicture_text, ul#tree_menu #tree_text {
-  float:left;
   font-size: 13px;
   font-weight: normal;
 color: #728DA9;
 text-shadow: 0 1px 0 white;
 line-height: 20px;
+max-height:60px;
+overflow:auto;
+display:block;
 }
   
   #tdmpicture_num, #tdmpicture_num a,  ul#tree_menu #tree_num{
@@ -78,7 +85,7 @@
 
     ul#tree_menu #tree_form{
 	float:right;
-	padding-top:100px;
+	padding-top:10px;
 	  padding-right:20px;
   text-align: center;
 font-size: 11px;

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/index.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/index.php	2012-07-14 18:25:12 UTC (rev 9878)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/index.php	2012-07-14 23:46:12 UTC (rev 9879)
@@ -131,7 +131,7 @@
 	
 	$file['id'] = $file_arr[$f]->getVar("file_id");
 	$file['title'] = $myts->displayTarea($file_arr[$f]->getVar("file_title"));
-	$file['text'] = $myts->displayTarea($file_arr[$f]->getVar("file_text"));
+	$file['text'] = $file_arr[$f]->getVar("file_text");
 	
 	
 	$file['file_catum'] = $file_arr[$f]->getVar("file_catum");

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php	2012-07-14 18:25:12 UTC (rev 9878)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php	2012-07-14 23:46:12 UTC (rev 9879)
@@ -46,7 +46,7 @@
 define("_MD_TDMPICTURE_COMMENT","Réaction");
 define("_MD_TDMPICTURE_FILECD","Nombre de CD");
 define("_MD_TDMPICTURE_FILEEDITOR","Editeur");
-define("_MD_TDMPICTURE_NBFILE","Nombre de fichier");
+//define("_MD_TDMPICTURE_NBFILE","Nombre de fichier");
 define("_MD_TDMPICTURE_ALBUM","Album de");
 define("_MD_TDMPICTURE_DESC","Pr&#233;sentation:");
 define("_MD_TDMPICTURE_VOTEADD","Ajouter un vote");

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/blocks/tdmpicture_minitable.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/blocks/tdmpicture_minitable.html	2012-07-14 18:25:12 UTC (rev 9878)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/blocks/tdmpicture_minitable.html	2012-07-14 23:46:12 UTC (rev 9879)
@@ -5,7 +5,7 @@
 	<{foreach item=blocks from=$block.blocks}>
 	
 	<tr class="<{cycle values="even,odd"}>">
-	<td><a href="<{$xoops_url}>/modules/TDMPicture/viewfile.php?st=<{$blocks.id}>"><{$blocks.title}></a> (<{$smarty.const._MD_TDMPICTURE_COMMENT}>: <{$blocks.comments}> - <{$smarty.const._MD_TDMPICTURE_VOTE}>: <{$blocks.counts}>/<{$blocks.votes}>)</td>
+	<td><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$blocks.id}>"><{$blocks.title}></a> (<{$smarty.const._MD_TDMPICTURE_COMMENT}>: <{$blocks.comments}> - <{$smarty.const._MD_TDMPICTURE_VOTE}>: <{$blocks.counts}>/<{$blocks.votes}>)</td>
 	</tr>
 	
 	<{/foreach}>
@@ -21,7 +21,7 @@
 	<{foreach item=blocks from=$block.blocks}>
 	<li>
      <div class="switch_img">
-	<a href="<{$xoops_url}>/modules/TDMPicture/viewfile.php?st=<{$blocks.id}>"><img src="<{$blocks.img}>" title="<{$blocks.title}>" alt="<{$blocks.title}>" /></a>		
+	<a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$blocks.id}>"><img src="<{$blocks.img}>" title="<{$blocks.title}>" alt="<{$blocks.title}>" /></a>		
 
 	</div>	
 	</li>
@@ -40,7 +40,7 @@
 
 	<li>
      <div class="switch_img">
-	<a href="<{$xoops_url}>/modules/TDMPicture/viewfile.php?st=<{$blocks.id}>"><img src="<{$blocks.img}>" title="<{$blocks.title}>" alt="<{$blocks.title}>" /></a>		
+	<a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$blocks.id}>"><img src="<{$blocks.img}>" title="<{$blocks.title}>" alt="<{$blocks.title}>" /></a>		
 
 	</div>	
 	<div style="float:left; text-align:left;">
@@ -119,7 +119,7 @@
 	<{foreach item=blocks from=$block.blocks}> 
     <li style="display: none;  list-style-type: none; float:left;">
 	<div class="switch_img">
-	<a href="<{$xoops_url}>/modules/TDMPicture/viewfile.php?st=<{$blocks.id}>"><img src="<{$blocks.img}>" alt="<{$blocks.title}>" title="<{$blocks.title}>" /></a></li> 
+	<a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$blocks.id}>"><img src="<{$blocks.img}>" alt="<{$blocks.title}>" title="<{$blocks.title}>" /></a></li> 
 </div>
 	
 <{/foreach}>

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php	2012-07-14 18:25:12 UTC (rev 9878)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php	2012-07-14 23:46:12 UTC (rev 9879)
@@ -22,7 +22,7 @@
 }
 
 $modversion['name'] = "TDMPicture";
-$modversion['version'] = 1.063;
+$modversion['version'] = 1.064;
 $modversion['description'] = 'Image manager';
 $modversion['credits'] = "none";
 $modversion['author'] = 'TDM';

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.