Thread: [xoops-svn] SF.net SVN: xoops:[9900] XoopsModules/TDMPicture/trunk/TDMPicture (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 9900
          http://xoops.svn.sourceforge.net/xoops/?rev=9900&view=rev
Author:   lord_venom
Date:     2012-07-19 09:19:29 +0000 (Thu, 19 Jul 2012)
Log Message:
-----------
re-news category

Modified Paths:
--------------
    XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
    XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php
    XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
    XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
===================================================================

--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php	2012-07-18 13:40:59 UTC (rev 9899)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php	2012-07-19 09:19:29 UTC (rev 9900)
@@ -89,31 +89,35 @@
 		$parent_link = TDMPICTURE_URL."/viewcat.php?ct=".$this->_tree[$this->_tree[$key]['parent']]['obj']->getVar('cat_id')."&tris=".$tris."&limit=".$limit;
 		$GLOBALS['navbar'] .= '<a href ="'.$parent_link.'" title="'. $this->_tree[$this->_tree[$key]['parent']]['obj']->getVar('cat_title').'">' . $this->_tree[$this->_tree[$key]['parent']]['obj']->getVar('cat_title'). '</a> > ';
 		
-		}
+		}	
+
 		
-		$GLOBALS['cat_count'] = $count;
+		//$GLOBALS['cat_count'] = $count;
 		$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');
-
 		$ret2 =  '<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>';
 
-		}	
 		
+		}		
 		
 		//if ((!$prefix_curr) && ($this->_tree[$key]['obj']->getVar('cat_pid') == $selected)) {
-		if (($scat_display) && $this->_tree[$key]['obj']->getVar('cat_pid') == $selected) {
+		if (($scat_display) && $this->_tree[$key]['obj']->getVar('cat_pid') == $selected) {	
 		
-		if (!empty( $this->_tree[$key]['child'] )) {
+		if ((!$prefix_curr) || ($xoopsModuleConfig['tdmpicture_cat_display'])) {
+		
+		if (!empty( $this->_tree[$key]['child'] ) && ($xoopsModuleConfig['tdmpicture_cat_select'])) {
 		$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'));
+		$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'));	
+		$ret .=  '<li style="width:46%;" 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').'">'. $cat_title. '</h2></a><span id="tree_text">'. $cat_text. '</span></div><br style="clear: both;" /><div id="tree_form">'.$select.'</div></div></div></li>';
+		}
 
-			
-		$ret .=  '<li style="width:46%;" 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').'">'. $cat_title. '</h2></a><span id="tree_text">'. $cat_text. '</span></div><br style="clear: both;" /><div id="tree_form">'.$select.'</div></div></div></li>';
-		
 			}
 			
 		

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php	2012-07-18 13:40:59 UTC (rev 9899)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php	2012-07-19 09:19:29 UTC (rev 9900)
@@ -79,10 +79,10 @@
 
 //version 1.5
 //define("_MI_TDMPICTURE_CAT_CEL","Affichage catégorie : Nombre de colonne");
-//define("_MI_TDMPICTURE_CAT_DISPLAY","Affichage : Style des catégories");
-//define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT","Catégorie puis sous-catégorie (sans image)");
-//define("_MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG","Catégorie puis sous-catégorie (avec image)");
-//define("_MI_TDMPICTURE_CAT_DISPLAY_SUB","Catégorie et sous-catégorie (sans image)");
+define("_MI_TDMPICTURE_CAT_DISPLAY","Catégorie: Afficher les sous-catégorie");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_BLOCK","Block");
+define("_MI_TDMPICTURE_CAT_SELECT","Catégorie: Afficher les Select");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_ALL","Les deux");
 //define("_MI_TDMPICTURE_CAT_DISPLAY_SUBIMG","Catégorie et sous-catégorie (avec image)");
 //define("_MI_TDMPICTURE_CAT_DISPLAY_IMG","Image");
 //define("_MI_TDMPICTURE_CAT_DISPLAY_NONE","Non");

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html	2012-07-18 13:40:59 UTC (rev 9899)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html	2012-07-19 09:19:29 UTC (rev 9900)
@@ -9,7 +9,7 @@
 	
 	<li>	
 <div class="switch_img">
-<a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&tris=<{$tris}>"><img src="<{$file.img}>" slide="<{$file.img_popup}>" rel="group1" title="<{$file.title}>" alt="<{$file.title}>" /></a>		
+<a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&tris=<{$tris}>"><img src="<{$file.img}>" slide="<{$file.img_popup}>" class="group1" rel="group1" title="<{$file.title}>" alt="<{$file.title}>" /></a>		
 </div>
 
 	

Modified: XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php	2012-07-18 13:40:59 UTC (rev 9899)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php	2012-07-19 09:19:29 UTC (rev 9900)
@@ -272,14 +272,20 @@
 $modversion['config'][$i]['default'] = 400;
 $i++;
 //version 1.5
-//$modversion['config'][$i]['name'] = 'tdmpicture_cat_display';
-//$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_CAT_DISPLAY';
-//$modversion['config'][$i]['description'] = '';
-//$modversion['config'][$i]['formtype'] = 'select';
-//$modversion['config'][$i]['valuetype'] = 'text';
-//$modversion['config'][$i]['default'] = 'text';
-//$modversion['config'][$i]['options'] = array(_MI_TDMPICTURE_CAT_DISPLAY_NONE => 'none' , _MI_TDMPICTURE_CAT_DISPLAY_SUB  => 'sub', _MI_TDMPICTURE_CAT_DISPLAY_SUBIMG  => 'subimg', _MI_TDMPICTURE_CAT_DISPLAY_TEXT  => 'text',  _MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG  => 'textimg',  _MI_TDMPICTURE_CAT_DISPLAY_IMG => 'img');
-//$i++;
+$modversion['config'][$i]['name'] = 'tdmpicture_cat_display';
+$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_CAT_DISPLAY';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
+$i++;
+$modversion['config'][$i]['name'] = 'tdmpicture_cat_select';
+$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_CAT_SELECT';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = '1';
+$i++;
 //$modversion['config'][$i]['name'] = 'tdmpicture_cat_cel';
 //$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_CAT_CEL';
 //$modversion['config'][$i]['description'] = '';

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





Thread: [xoops-svn] SF.net SVN: xoops:[9900] XoopsModules/TDMPicture/trunk/TDMPicture (Page 2)

The world's leading content management systems (CMS) written in PHP

xoops-svn