From: <jon...@us...> - 2010-07-18 11:25:14
|
Revision: 28044 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=28044&view=rev Author: jonnybradley Date: 2010-07-18 11:25:08 +0000 (Sun, 18 Jul 2010) Log Message: ----------- [FIX] File galleries explorer when feature_phplayers is off no longer posts back to the server when opening/closing nodes. Modified Paths: -------------- branches/5.x/lib/smarty_tiki/function.tree.php branches/5.x/styles/layout/layout.css branches/5.x/tiki-list_file_gallery.php Modified: branches/5.x/lib/smarty_tiki/function.tree.php =================================================================== --- branches/5.x/lib/smarty_tiki/function.tree.php 2010-07-18 09:59:41 UTC (rev 28043) +++ branches/5.x/lib/smarty_tiki/function.tree.php 2010-07-18 11:25:08 UTC (rev 28044) @@ -21,9 +21,36 @@ function smarty_function_tree($params, &$smarty) { global $prefs; - if ( $prefs['feature_phplayers'] != 'y' || $prefs['javascript_enabled'] == 'n' ) { - // If PHP Layers and/or JavaScript are disabled, force the php version of the tree - $params['type'] = 'phptree'; + if ( $prefs['javascript_enabled'] == 'n' ) { + // If JavaScript is disabled, force the php version of the tree + $params['type'] = 'phptree'; + } else if ($prefs['feature_phplayers'] != 'y') { + // no phplayers - use category-style ones (for now) + require_once ('lib/tree/categ_browse_tree.php'); + $link = $params['data']['link']; + $name = $params['data']['name']; + $link_id = 'id'; + $link_var = 'galleryId'; + require_once $smarty->_get_plugin_filepath('function', 'icon'); + $icon = ' ' . smarty_function_icon(array('_id' => 'folder'), $smarty) . ' '; + + $tree_nodes = array( + array( + 'id' => 1, + 'parent' => 0, + 'data' => '<a class="fgalname" href="' . $link . '">' . $icon . htmlspecialchars($name) .'</a>', + ) + ); + foreach($params['data']['data'] as $d) { + $tree_nodes[] = array( + 'id' => $d['id'], + 'parent' => $d['parentId'], + 'data' => '<a class="fgalname" href="' . $link . '?' . $link_var . '=' . $d[$link_id] . '">' . $icon . htmlspecialchars($d['name']) .'</a>', + ); + } + $tm = new CatBrowseTreeMaker('categ'); + $res = $tm->make_tree( 1, $tree_nodes); + return $res; } global $tikiphplayers; Modified: branches/5.x/styles/layout/layout.css =================================================================== --- branches/5.x/styles/layout/layout.css 2010-07-18 09:59:41 UTC (rev 28043) +++ branches/5.x/styles/layout/layout.css 2010-07-18 11:25:08 UTC (rev 28044) @@ -391,6 +391,14 @@ width: 16px; height: 18px; } + +ul.tree { + list-style-type: none; +} + +ul.tree li { + white-space: nowrap; +} /** Links in other menus **/ Modified: branches/5.x/tiki-list_file_gallery.php =================================================================== --- branches/5.x/tiki-list_file_gallery.php 2010-07-18 09:59:41 UTC (rev 28043) +++ branches/5.x/tiki-list_file_gallery.php 2010-07-18 11:25:08 UTC (rev 28044) @@ -761,9 +761,20 @@ if ( $prefs['fgal_show_path'] == 'y' ) { $smarty->assign('gallery_path', $phplayersTreeData['path']); } - - $smarty->assign_by_ref('tree', $phplayersTreeData['tree']); - $smarty->assign_by_ref('expanded', $phplayersTreeData['expanded']); + + if ($prefs['feature_phplayers'] == 'y') { + + $smarty->assign_by_ref('tree', $phplayersTreeData['tree']); + $smarty->assign_by_ref('expanded', $phplayersTreeData['expanded']); + + } else if ($prefs['javascript_enabled'] != 'n') { + $tree_array = array('data' => $all_galleries['data'], + 'name' => $phplayersTreeData['tree']['name'], + 'link' => $phplayersTreeData['tree']['link'] + ); + $smarty->assign_by_ref('tree', $tree_array); + $smarty->assign('expanded', ''); + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |