Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9814] XoopsModules/TDMPicture/trunk/TDMPicture
|
From: <lor...@us...> - 2012-07-09 12:24:18
|
Revision: 9814
http://xoops.svn.sourceforge.net/xoops/?rev=9814&view=rev
Author: lord_venom
Date: 2012-07-09 12:24:07 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
new category
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_index.html
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewcat.html
XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-09 12:21:37 UTC (rev 9813)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-09 12:24:07 UTC (rev 9814)
@@ -56,7 +56,7 @@
$gperm_handler =& xoops_gethandler('groupperm');
$parent = "";
- $GLOBALS['navbar'] .= "";
+ //$GLOBALS['navbar'] .= "";
if ( $key > 0 && $gperm_handler->checkRight('tdmpicture_catview', $this->_tree[$key]['obj']->getVar('cat_id'), $groups, $xoopsModule->getVar('mid'))) {
@@ -76,30 +76,35 @@
$picture = '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'"><img src="' . TDM_CAT_URL . 'no_picture.png" class="img" width="'.$xoopsModuleConfig['tdmpicture_cat_width'].'" height="'.$xoopsModuleConfig['tdmpicture_cat_height'].'"></a>';
}
- //echo $selected;
+
if (isset($selected) && $value == $selected ) {
+
+ $url_link = TDMPICTURE_URL."/index.php";
+ $GLOBALS['navbar'] = '<a href ="'.$url_link.'" title="'. $xoopsModule->name().'">' . $xoopsModule->name(). '</a> > ';
+ //trie
+ $navtrie = $this->makeSelTris(intval($value), $tris);
+
if ( isset( $this->_tree[$this->_tree[$key]['parent']]['obj'] ) ) {
- echo "passe";
- $parent_link = TDMPICTURE_URL."/viewcat.php?ct=".$this->_tree[$key]['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> >';
- //$parent = '<div align="right"><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></div>';
+
+ $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_title'] = $this->_tree[$key]['obj']->getVar('cat_title');
- echo "passe";
- //$ret2 = '<br />
- //<table cellpadding="0" class="outer tdmcat" cellspacing="0"><tr><th>
- echo '<ul>'.$picture. '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">' . $this->_tree[$key]['obj']->getVar( $fieldName ). '</a> ('.$count.')';
- //<br style="clear: both;" /></ul></th></tr></table>';
-
+ $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="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="text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="form">'.$GLOBALS['navbar'].$select.' | '._MD_TDMPICTURE_TRIBY.' > '.$navtrie.'</div></li>';
+
}
if ((!$prefix_curr) && ($this->_tree[$key]['obj']->getVar('cat_pid') == $selected)) {
- $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');
+ $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 class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="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="text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="form">'.$select.'</div></li>';
+ $ret .= '<li style="width:47%;" class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="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="text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="form">'.$select.'</div></li>';
}
@@ -150,12 +155,33 @@
}
}
+ //fonction du trie
+ function makeSelTris($cat, $tris) {
+
+ global $start, $tris, $limit, $groups, $xoopsUser, $xoopsModule, $xoopsModuleConfig;
+
+ //option du tris / nom de champ sql => nom afficher //
+ $option = array('file_title' => _MD_TDMPICTURE_TRITITLE , 'file_indate' => _MD_TDMPICTURE_TRIDATE, 'file_counts' => _MD_TDMPICTURE_TRICOUNTS, 'file_hits' => _MD_TDMPICTURE_TRIHITS, 'file_comments' => _MD_TDMPICTURE_TRICOMMENT);
+
+ $ret = '<select name="tris" onchange="window.document.location=this.options[this.selectedIndex].value;">';
+
+ foreach ($option as $key => $value) {
+ $select = ($tris == $key) ? 'selected="selected"' : false;
+ $cat_link = TDMPICTURE_URL."/viewcat.php?ct=".$cat."&tris=".$key;
+ $ret .= '<option '.$select.' value="'.$cat_link.'">'.$value.'</option>';
+
+ }
+ $ret .= '</select>';
+
+ return $ret;
+ }
+
//makeCatBox($item_handler,name cat, )
function makeCatBox( $item_handler, $fieldName, $prefix = '-', $selected = '', $key = 0 ) {
Global $cat_display;
$ret = '<div style="text-align:right"><a href="javascript:;" onclick="javascript:masque(\'1\')" >+-</a></div>';
- $ret .= '<table cellpadding="0" id="masque_1" cellspacing="0"><tr><td><ul id="menu">';
+ $ret .= '<table cellpadding="0" id="masque_1" cellspacing="0" style="margin:5px;"><tr><td><ul id="menu">';
$chcount = 1;
$GLOBALS['class'] = "odd";
$this->_makeCatBoxOptions( $item_handler, $fieldName, $selected, $key, $ret, $select, $prefix, '', $chcount );
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-09 12:21:37 UTC (rev 9813)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-09 12:24:07 UTC (rev 9814)
@@ -17,16 +17,16 @@
*/
ul#menu {
- margin: 0;
- padding-left: 1%;
- padding-right:1%;
+ margin: 0 auto;
+ padding:0 auto;
text-align: center;
+ width:100%;
}
ul#menu li {
list-style: none;
float:left;
- width:47%;
+ width:97%;
height: 130px;
margin: 10px; padding: 0px;
-webkit-border-radius: 4px;
@@ -34,6 +34,7 @@
border: 2px solid white;
/* background: whiteSmoke url(../images/decos/downloads-bg.gif) repeat-x left top; */
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+ overflow: auto;
}
ul#menu img {
float:left;
@@ -75,6 +76,7 @@
text-align: center;
font-size: 11px;
color: #25587C;
+font-weight: bold;
text-shadow: 0 1px 0 white;
}
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php 2012-07-09 12:21:37 UTC (rev 9813)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php 2012-07-09 12:24:07 UTC (rev 9814)
@@ -245,24 +245,25 @@
}
- function tdmpicture_trisselect($cat, $tris) {
+ //fonction deplacer
+ //function tdmpicture_trisselect($cat, $tris) {
- global $start, $tris, $limit, $groups, $xoopsUser, $xoopsModule, $xoopsModuleConfig;
+ //global $start, $tris, $limit, $groups, $xoopsUser, $xoopsModule, $xoopsModuleConfig;
//$cat_handler =& xoops_getModuleHandler('tdmpicture_cat', 'TDMPicture');
- $option = array('file_title' => _MD_TDMPICTURE_TRITITLE , 'file_indate' => _MD_TDMPICTURE_TRIDATE, 'file_counts' => _MD_TDMPICTURE_TRICOUNTS, 'file_hits' => _MD_TDMPICTURE_TRIHITS, 'file_comments' => _MD_TDMPICTURE_TRICOMMENT);
- $select_tris = '<select name="tris" onchange="window.document.location=this.options[this.selectedIndex].value;">';
+ //$option = array('file_title' => _MD_TDMPICTURE_TRITITLE , 'file_indate' => _MD_TDMPICTURE_TRIDATE, 'file_counts' => _MD_TDMPICTURE_TRICOUNTS, 'file_hits' => _MD_TDMPICTURE_TRIHITS, 'file_comments' => _MD_TDMPICTURE_TRICOMMENT);
+ //$select_tris = '<select name="tris" onchange="window.document.location=this.options[this.selectedIndex].value;">';
//trouve le nom de la cat
//$cat = $cat_handler->get($cat);
- foreach ($option as $key => $value) {
- $select = ($tris == $key) ? 'selected="selected"' : false;
- $cat_link = TDMPICTURE_URL."/viewcat.php?ct=".$cat."&tris=".$key."&limit=".$limit;
- $select_tris .= '<option '.$select.' value="'.$cat_link.'">'.$value.'</option>';
+ //foreach ($option as $key => $value) {
+ //$select = ($tris == $key) ? 'selected="selected"' : false;
+ //$cat_link = TDMPICTURE_URL."/viewcat.php?ct=".$cat."&tris=".$key."&limit=".$limit;
+ //$select_tris .= '<option '.$select.' value="'.$cat_link.'">'.$value.'</option>';
-}
-$select_tris .= '</select>';
+//}
+//$select_tris .= '</select>';
-return $select_tris;
-}
+//return $select_tris;
+//}
function tdmpicture_viewselect($cat, $limit) {
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_index.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_index.html 2012-07-09 12:21:37 UTC (rev 9813)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_index.html 2012-07-09 12:24:07 UTC (rev 9814)
@@ -1,9 +1,6 @@
<br />
<div style="margin-left:auto;margin-right:auto;">
-<div class="TDMNav">
-<span><{$nav}></span><span> > <{$nav_bar}></span><span> <{$selectcat}><{$catform.elements.pid.body}></span>
-</div>
<br style="clear: both;"/> <br />
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewcat.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewcat.html 2012-07-09 12:21:37 UTC (rev 9813)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewcat.html 2012-07-09 12:24:07 UTC (rev 9814)
@@ -2,19 +2,6 @@
<div style="margin-left:auto;margin-right:auto;">
-<div class="TDMNav">
-<form name="xd_select_header" style="text-align: right;" method="post" action="genre.php">
-<{$smarty.const._MD_TDMPICTURE_TRIPARC}> <{$numfile}> <{$smarty.const._MD_TDMPICTURE_TRIFILE}>
-
-| <{$smarty.const._MD_TDMPICTURE_TRIBY}> <{$selecttris}>
-| <{$smarty.const._MD_TDMPICTURE_TRIVIEW}> <{$selectview}>
-</form>
-
-<br />
-<span><{$nav}></span><span> > <{$nav_bar}></span><span> <{$selectcat}><{$catform.elements.pid.body}></span>
-
-</div>
-
<br style="clear: both;"/> <br />
<{$display_cat}>
<br /><br />
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php 2012-07-09 12:21:37 UTC (rev 9813)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php 2012-07-09 12:24:07 UTC (rev 9814)
@@ -37,7 +37,7 @@
//variable post
$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'list';
- $limit = !empty($_REQUEST['limit']) ? $_REQUEST['limit'] : $xoopsModuleConfig['tdmpicture_page'];
+ //$limit = !empty($_REQUEST['limit']) ? $_REQUEST['limit'] : $xoopsModuleConfig['tdmpicture_page'];
$ct = isset($_REQUEST['ct']) ? $_REQUEST['ct'] : false;
$start = isset($_REQUEST['start']) ? $_REQUEST['start'] : 0;
$tris = isset($_REQUEST['tris']) ? $_REQUEST['tris'] : 'file_indate';
@@ -47,7 +47,7 @@
//mode de visualisation
//$xoopsTpl->assign('view_mode', $view_mode = isset($_REQUEST['view_mode']) ? $_REQUEST['view_mode'] : 'block' );
$xoopsTpl->assign('tris', $tris);
-$xoopsTpl->assign('limit', $limit);
+$xoopsTpl->assign('limit', $xoopsModuleConfig['tdmpicture_page']);
$xoopsTpl->assign('slide_width', $xoopsModuleConfig['tdmpicture_slide_width']);
$xoopsTpl->assign('slide_height', $xoopsModuleConfig['tdmpicture_slide_height']);
$xoopsTpl->assign('baseurl', $_SERVER['PHP_SELF']);
@@ -103,9 +103,9 @@
//navigation
$navigation = '';
$xoopsTpl->assign('cat_view', true);
- $xoopsTpl->assign('selectcat', tdmpicture_catselect($mytree, intval($ct)));
- $xoopsTpl->assign('selecttris', tdmpicture_trisselect(intval($ct), $tris));
- $xoopsTpl->assign('selectview', tdmpicture_viewselect(intval($ct), $limit));
+ //$xoopsTpl->assign('selectcat', tdmpicture_catselect($mytree, intval($ct)));
+ //$xoopsTpl->assign('selecttris', tdmpicture_trisselect(intval($ct), $tris));
+ //$xoopsTpl->assign('selectview', tdmpicture_viewselect(intval($ct), $limit));
$meta_title = $meta_keywords = $meta_description = $GLOBALS['cat_title'];
$xoopsTpl->assign('nav_bar', $GLOBALS['navbar']);
@@ -122,7 +122,7 @@
$criteria3->add(new Criteria('file_display', 1));
$criteria3->add(new Criteria('file_cat', $ct));
$criteria3->setStart($start);
- $criteria3->setLimit($limit);
+ $criteria3->setLimit($xoopsModuleConfig['tdmpicture_page']);
$criteria3->setSort($tris);
$criteria3->setOrder('DESC');
@@ -218,7 +218,7 @@
//navigation
if ( $numfile > $limit ) {
- $pagenav = new XoopsPageNav($numfile, $limit, $start, 'start', 'ct='.$ct.'&tris='.$tris.'&limit='.$limit);
+ $pagenav = new XoopsPageNav($numfile, $xoopsModuleConfig['tdmpicture_page'], $start, 'start', 'ct='.$ct.'&tris='.$tris.'&limit='.$limit);
$xoopsTpl->assign('nav_page', $pagenav->renderNav(2));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
