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

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

Revision: 9885
          http://xoops.svn.sourceforge.net/xoops/?rev=9885&view=rev
Author:   lord_venom
Date:     2012-07-16 08:12:51 +0000 (Mon, 16 Jul 2012)
Log Message:
-----------
tree and language

Modified Paths:
--------------
    XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
    XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php
    XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php
    XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php	2012-07-15 11:14:37 UTC (rev 9884)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php	2012-07-16 08:12:51 UTC (rev 9885)
@@ -99,10 +99,14 @@
 		}	
 		
 		
-		if ((!$prefix_curr) && ($this->_tree[$key]['obj']->getVar('cat_pid') == $selected)) {
+		//if ((!$prefix_curr) && ($this->_tree[$key]['obj']->getVar('cat_pid') == $selected)) {
+		if ($this->_tree[$key]['obj']->getVar('cat_pid') == $selected) {
 		
+		if (!empty( $this->_tree[$key]['child'] )) {
 		$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');
-		
+		} else {
+		$select = false;
+		}
 		$cat_title = (strlen($this->_tree[$key]['obj']->getVar('cat_title')) > 30 ? substr($this->_tree[$key]['obj']->getVar('cat_title'),0,(30)) : $this->_tree[$key]['obj']->getVar('cat_title'));
 		$cat_text = (strlen($this->_tree[$key]['obj']->getVar('cat_text')) > 120 ? substr($this->_tree[$key]['obj']->getVar('cat_text'),0,(120))."..." : $this->_tree[$key]['obj']->getVar('cat_text'));
 

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php	2012-07-15 11:14:37 UTC (rev 9884)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php	2012-07-16 08:12:51 UTC (rev 9885)
@@ -140,7 +140,7 @@
 define("_AM_TDMPICTURE_PERM_512","Supprimer Image (Aucune validation)");
 define('_AM_TDMPICTURE_PERM_USER','Permissions des membres enregistrer');
 define('_AM_TDMPICTURE_PERM_GLOBAL','Permissions pour tous les visiteurs');
-define("_MD_TDMPICTURE_MULTIUPLOAD","Vous pouvez charger %s fichier(s).");
+define("_AM_TDMPICTURE_MULTIUPLOAD","Vous pouvez charger %s fichier(s).");
 //1.5
 //2.5
 define("_AM_TDMPICTURE_PERM_1024","Proposer Catégorie");

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php	2012-07-15 11:14:37 UTC (rev 9884)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php	2012-07-16 08:12:51 UTC (rev 9885)
@@ -80,7 +80,7 @@
 		$criteria = new CriteriaCompo();
 		if ($cat_index) {
 		$criteria->add(new Criteria('cat_display', 1));
-		$criteria->add(new Criteria('cat_index', 1));
+		//$criteria->add(new Criteria('cat_index', 1));
 		$xoopsTpl->assign('nav', "<a href='".XOOPS_URL. "/modules/".$xoopsModule->dirname()."'/>".$xoopsModule->name()."</a>");
 		} else {
 		$criteria->add(new Criteria('cat_display', 1));

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php	2012-07-15 11:14:37 UTC (rev 9884)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php	2012-07-16 08:12:51 UTC (rev 9885)
@@ -22,7 +22,7 @@
 }
 
 $modversion['name'] = "TDMPicture";
-$modversion['version'] = 1.064;
+$modversion['version'] = 1.065;
 $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.