Changeset 7814 for extensions/rv_menutree/trunk

Timestamp:

Nov 18, 2010, 10:09:23 PM (14 years ago)

Author:

rvelices

Message:

rv_menutree small modifs

Location:

extensions/rv_menutree/trunk

Files:

• changelog.txt (modified) (1 diff)
• main.inc.php (modified) (2 diffs)
• template/rv_menutree_categories.tpl (modified) (2 diffs)

extensions/rv_menutree/trunk/changelog.txt

@@ -1 @@
-2.1.c
-        - improved javascript (faster, async loading in browser, better compressed zith google closure compiler)
-
 2.1.b
         - themes can define their own rv_menutree_categories.tpl
+        - improved javascript (faster, async loading in browser, better compressed zith google closure compiler)
 
 2.1.a

extensions/rv_menutree/trunk/main.inc.php

@@ -8 +8 @@
 */
 
-if (!function_exists('rv_ua_is_handheld'))
-{
-        function rv_ua_is_handheld()
-        {
-                if ( isset($_SESSION['is_handheld']) )
-                        return $_SESSION['is_handheld'];
-                $ret=false;
-                if ( strpos($_SERVER['HTTP_USER_AGENT'], 'BlackBerry')!==false )
-                        $ret=true;
-                if ( session_id()!="" )
-                        $_SESSION['is_handheld']=$ret;
-                return $ret;
-        }
-}
-
 add_event_handler('get_categories_menu_sql_where', 'rv_mt_get_categories_menu_sql_where', EVENT_HANDLER_PRIORITY_NEUTRAL, 3 );
 
 function rv_mt_get_categories_menu_sql_where($where, $expand, $filter)
 {
-        if (rv_ua_is_handheld()) return $where;
         add_event_handler('blockmanager_apply', 'rv_mt_menubar_categories');
 
@@ -53 +37 @@
                 global $template, $page;
 
-                $rvmt_path = 'plugins/'. basename(dirname(__FILE__)).'/';
-                $template->set_template_dir(PHPWG_ROOT_PATH.$rvmt_path.'template/');
+                $rvmt_base_name  = basename(dirname(__FILE__));
+                $template->set_template_dir(PHPWG_ROOT_PATH.'plugins/'.$rvmt_base_name.'/template/');
                 $template->assign(array(
-                        'RVMT_PATH' => get_root_url().$rvmt_path,
+                        'RVMT_BASE_NAME' => $rvmt_base_name,
                         'RVMT_UPPER_IDS' => isset($page['category']['uppercats']) ? array_flip( explode(',', $page['category']['uppercats'])) : null,
                         )

extensions/rv_menutree/trunk/template/rv_menutree_categories.tpl

@@ -1 +1 @@
 {html_head}
 <style type="text/css">
-.rvTree li .bullet {ldelim}padding-left:14px;margin-left:0;background:url({$RVMT_PATH}img/bpm.gif) no-repeat scroll;}
+.rvTree li .bullet {ldelim}padding-left:14px;margin-left:0;background:url({$ROOT_URL}plugins/{$RVMT_BASE_NAME}/img/bpm.gif) no-repeat scroll;}
 .rvTree li.liOpen .bullet {ldelim}cursor:pointer;background-position:-38px center;}
 .rvTree li.liClosed .bullet {ldelim}cursor:pointer;background-position:-19px center;}
@@ -56 +56 @@
         rvTreeAutoConvert = document.getElementById("theCategoryMenu");
         (function () {ldelim}
-        var s = document.createElement('script'); s.type = 'text/javascript'; s.async = true; s.src = '{$RVMT_PATH|@cat:"js/rvtree-min.js"}';
+        var s = document.createElement('script'); s.type = 'text/javascript'; s.async = true; s.src = '{$ROOT_URL}plugins/{$RVMT_BASE_NAME}/js/rvtree-min.js';
         var s0 = document.getElementsByTagName('script')[0]; s0.parentNode.insertBefore(s, s0);
         })();
-  //RVTree.convertTree( document.getElementById("theCategoryMenu") );
 </script>
         {if isset($block->data.U_UPLOAD)}