Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12945] XoopsModules/modulepacks/x257basicmodulepack/ trunk/modules/mymenus
|
From: <be...@us...> - 2015-01-23 13:15:33
|
Revision: 12945
http://sourceforge.net/p/xoops/svn/12945
Author: beckmi
Date: 2015-01-23 13:15:29 +0000 (Fri, 23 Jan 2015)
Log Message:
-----------
Code cleanup, adding XoopsRequest in couple of places
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/admin/admin_links.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/admin/admin_menus.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/blocks/mymenus_block.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/class/registry.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/include/xoops.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/plugins/dynamic/dynamic.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/plugins/mymenus/mymenus.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/bootstrap/templates/template.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/clean/templates/template.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/default/templates/template.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/mainmenu/templates/template.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/multiblack/stuHover.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/superfish/templates/template.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/superfish_navbar/templates/template.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/tw_blue/templates/template.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/xoops_version.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/admin/admin_links.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/admin/admin_links.php 2015-01-23 13:05:09 UTC (rev 12944)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/admin/admin_links.php 2015-01-23 13:15:29 UTC (rev 12945)
@@ -34,8 +34,8 @@
}
$valid_menu_ids = array_keys($menus_list);
-if (isset($_REQUEST['mid']) && in_array($_REQUEST['mid'], $valid_menu_ids)) {
- $menu_id = (int) $_REQUEST['mid'];
+if (XoopsRequest::getInt('mid', 0) && in_array(XoopsRequest::getInt('mid', 0), $valid_menu_ids)) {
+ $menu_id = XoopsRequest::getInt('mid', 0);
$menu_title = $menus_list[$menu_id];
} else {
$keys = array_keys($menus_list);
@@ -340,7 +340,7 @@
$link_obj = $links_handler->get((int) $id);
//if this was moved then parent could be in different menu, if so then set parent to top level
- if (!empty($_POST['pid'])) {
+ if (XoopsRequest::getInt('pid', '', 'POST')) {
$parent_obj = $links_handler->get($link_obj->getVar('pid')); //get the parent oject
if(($parent_obj instanceof MylinksLinks) && ($link_obj->getVar('mid') != $parent_obj->getVar('mid'))) {
$link_obj->setVar('pid', 0);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/admin/admin_menus.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/admin/admin_menus.php 2015-01-23 13:05:09 UTC (rev 12944)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/admin/admin_menus.php 2015-01-23 13:15:29 UTC (rev 12945)
@@ -45,7 +45,7 @@
echo $indexAdmin->addNavigation('admin_menus.php');
//mymenus_adminMenu(0, _MI_MYMENUS_MENUSMANAGER);
echo mymenus_admin_form($id);
- include 'admin_footer.php';
+ include_once __DIR__ . '/admin_footer.php';
break;
case 'editok':
mymenus_admin_edit($id);
@@ -67,7 +67,7 @@
xoops_cp_header();
echo $indexAdmin->addNavigation('admin_menus.php');
echo mymenus_admin_list($start, $limit);
- include 'admin_footer.php';
+ include_once __DIR__ . '/admin_footer.php';
break;
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/blocks/mymenus_block.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/blocks/mymenus_block.php 2015-01-23 13:05:09 UTC (rev 12944)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/blocks/mymenus_block.php 2015-01-23 13:15:29 UTC (rev 12945)
@@ -176,8 +176,9 @@
*/
function mymenus_block_edit($options)
{
+ xoops_load('XoopsRequest');
//Unique ID
- if (!$options[3] || (isset($_GET['op']) && 'clone' == $_GET['op'])) {
+ if (!$options[3] || ('clone' == XoopsRequest::getCmd('op', '', 'GET'))) {
$options[3] = time();
}
$i = 0;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/class/registry.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/class/registry.php 2015-01-23 13:05:09 UTC (rev 12944)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/class/registry.php 2015-01-23 13:15:29 UTC (rev 12945)
@@ -40,7 +40,7 @@
/**
* @return object MymenusRegistry
*/
- static public function getInstance()
+ public static function getInstance()
{
static $instance = false;
if (!$instance) {
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/include/xoops.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/include/xoops.php 2015-01-23 13:05:09 UTC (rev 12944)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/include/xoops.php 2015-01-23 13:15:29 UTC (rev 12945)
@@ -134,7 +134,7 @@
$cP = $id;
$sql="SELECT storyid FROM ".$xoopsDB->prefix($modulname)." WHERE parent_id=".intval($cP);
$result = $xoopsDB->query($sql);
- while ($row = $xoopsDB->fetchArray($result)) {
+ while ($row == $xoopsDB->fetchArray($result)) {
if (intval($row['storyid']) > 0) {
$cP = intval($row['storyid']);
$currentParent[]=$cP;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/plugins/dynamic/dynamic.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/plugins/dynamic/dynamic.php 2015-01-23 13:05:09 UTC (rev 12944)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/plugins/dynamic/dynamic.php 2015-01-23 13:15:29 UTC (rev 12945)
@@ -72,7 +72,7 @@
xoops_loadLanguage('modinfo', $module);
$overwrite = false;
- if ($force = true) { //can set to false for debug
+ if ($force == true) { //can set to false for debug
if (!($xoopsModule instanceof XoopsModule) || ($xoopsModule->getVar('dirname') != $module)) {
// @todo: check the following 2 statements, they're basically just assigns - is this intended?
$_xoopsModule = ($xoopsModule instanceof XoopsModule) ? $xoopsModule : $xoopsModule;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/plugins/mymenus/mymenus.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/plugins/mymenus/mymenus.php 2015-01-23 13:05:09 UTC (rev 12944)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/plugins/mymenus/mymenus.php 2015-01-23 13:15:29 UTC (rev 12945)
@@ -30,6 +30,7 @@
{
$registry =& MymenusRegistry::getInstance();
$member_handler =& xoops_getHandler('member');
+ xoops_load('XoopsRequest');
$user = ($GLOBALS['xoopsUser'] instanceof XoopsUser) ? $GLOBALS['xoopsUser'] : null;
if (!$user) {
@@ -38,7 +39,7 @@
$user->setVar('uname', $GLOBALS['xoopsConfig']['anonymous']);
}
- $ownerid = isset($_GET['uid']) ? intval($_GET['uid']) : null;
+ $ownerid = XoopsRequest::getInt('uid', null, 'GET');
$owner = $member_handler->getUser($ownerid);
//if uid > 0 but user does not exists
if (!($owner instanceof XoopsUser)) {
@@ -53,7 +54,7 @@
$registry->setEntry('owner', $owner->getValues());
$registry->setEntry('user_groups', ($GLOBALS['xoopsUser'] instanceof XoopsUser) ? $GLOBALS['xoopsUser']->getGroups() : array(XOOPS_GROUP_ANONYMOUS));
$registry->setEntry('user_uid', ($GLOBALS['xoopsUser'] instanceof XoopsUser) ? $GLOBALS['xoopsUser']->getVar('uid') : 0);
- $registry->setEntry('get_uid', isset($_GET['uid']) ? intval($_GET['uid']) : 0);
+ $registry->setEntry('get_uid', XoopsRequest::getInt('uid', 0, 'GET'));
}
@@ -127,7 +128,7 @@
}
if ($validator == 'uri') {
- $value = isset($_GET[$value]) ? $_GET[$value] : 0;
+ $value = XoopsRequest::getString($value, 0, 'GET');
$string = str_replace($expression, $value, $string);
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/bootstrap/templates/template.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/bootstrap/templates/template.tpl 2015-01-23 13:05:09 UTC (rev 12944)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/bootstrap/templates/template.tpl 2015-01-23 13:15:29 UTC (rev 12945)
@@ -1,30 +1,43 @@
<{foreach item=menu from = $block}>
<{if $menu.oul}>
-<{ if $menu.level == 0}>
- <ul class="nav navbar-nav<{if $menu.css}> <{$menucss}><{/if}>">
-<{ elseif $menu.level == 1}>
+<{if $menu.level == 0}>
+<ul class="nav navbar-nav<{if $menu.css}> <{$menucss}><{/if}>">
+ <{elseif $menu.level == 1}>
<ul class="dropdown-menu<{if $menu.css}> <{$menucss}><{/if}>">
-<{ else}>
- <ul class="dropdown-menu sub-menu<{if $menu.css}> <{$menucss}><{/if}>">
-<{ /if}>
-<{/if}>
-<{if $menu.oli}>
-<{ assign var=myStr value="["|cat:$xoops_langcode|cat:"]"}>
-<{ if ($xlanguage && (($menu.title|strstr:$myStr) OR ($menu.image|strstr:$myStr)) OR !$xlanguage)}>
+ <{else}>
+ <ul class="dropdown-menu sub-menu<{if $menu.css}> <{$menucss}><{/if}>">
+ <{/if}>
+ <{/if}>
+ <{if $menu.oli}>
+ <{assign var=myStr value="["|cat:$xoops_langcode|cat:"]"}>
+ <{if ($xlanguage && (($menu.title|strstr:$myStr) OR ($menu.image|strstr:$myStr)) OR !$xlanguage)}>
-<{ if $menu.hassub && $menu.level == 0}>
- <li class="dropdown<{if $menu.selected}> active<{/if}><{if $menu.css}> <{$menu.css}><{/if}>">
- <a href="<{$menu.link}>" target="<{$menu.target}>" alt="<{$menu.alt_title}>" title="<{$menu.alt_title}>">
-<{ if $menu.image}><img class="menu-image" src="<{$menu.image}>" /> <{/if}><{$menu.title}> <b class="caret"></b></a>
-<{ elseif $menu.hassub && $menu.level == 1}>
- <li<{if $menu.selected | $menu.css}> class="<{/if}><{if $menu.selected}>active<{/if}><{if $menu.css}> <{$menu.css}><{/if}><{if $menu.selected | $menu.css}>"<{/if}>>
- <a href="<{$menu.link}>" target="<{$menu.target}>" alt="<{$menu.alt_title}>" title="<{$menu.alt_title}>">
-<{ if $menu.image}><img class="menu-image" src="<{$menu.image}>" /> <{/if}><{$menu.title}> <i class="glyphicon glyphicon-arrow-right"></i></a>
-<{ else}>
- <li<{if $menu.selected | $menu.css}> class="<{/if}><{if $menu.selected}>active<{/if}><{if $menu.css}> <{$menu.css}><{/if}><{if $menu.selected | $menu.css}>"<{/if}>>
- <a href="<{$menu.link}>" target="<{$menu.target}>" alt="<{$menu.alt_title}>" title="<{$menu.alt_title}>">
-<{ if $menu.image}><img class="menu-image" src="<{$menu.image}>" /> <{/if}><{$menu.title}></a><{/if}>
-<{ /if}>
-<{/if}>
-<{if $menu.close != ''}><{$menu.close}><{/if}>
-<{/foreach}>
+ <{if $menu.hassub && $menu.level == 0}>
+ <li class="dropdown<{if $menu.selected}> active<{/if}><{if $menu.css}> <{$menu.css}><{/if}>">
+ <a href="<{$menu.link}>" target="<{$menu.target}>" alt="<{$menu.alt_title}>" title="<{$menu.alt_title}>">
+ <{if $menu.image}><img class="menu-image" src="<{$menu.image}>"/> <{/if}>
+ <{$menu.title}> <b class="caret"></b>
+ </a>
+ <{elseif $menu.hassub && $menu.level == 1}>
+ <li<{if $menu.selected || $menu.css}> class="<{/if}>
+ <{if $menu.selected}>active<{/if}>
+ <{if $menu.css}> <{$menu.css}><{/if}>
+ <{if $menu.selected || $menu.css}>"<{/if}>>
+ <a href="<{$menu.link}>" target="<{$menu.target}>" alt="<{$menu.alt_title}>" title="<{$menu.alt_title}>">
+ <{if $menu.image}><img class="menu-image" src="<{$menu.image}>"/> <{/if}>
+ <{$menu.title}> <i class="glyphicon glyphicon-arrow-right"></i>
+ </a>
+ <{else}>
+ <li<{if $menu.selected || $menu.css}> class="<{/if}>
+ <{if $menu.selected}>active<{/if}>
+ <{if $menu.css}> <{$menu.css}><{/if}>
+ <{if $menu.selected || $menu.css}>"<{/if}>>
+ <a href="<{$menu.link}>" target="<{$menu.target}>" alt="<{$menu.alt_title}>" title="<{$menu.alt_title}>">
+ <{if $menu.image}><img class="menu-image" src="<{$menu.image}>"/> <{/if}>
+ <{$menu.title}>
+ </a>
+ <{/if}>
+ <{/if}>
+ <{/if}>
+ <{if $menu.close != ''}><{$menu.close}><{/if}>
+ <{/foreach}>
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/clean/templates/template.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/clean/templates/template.tpl 2015-01-23 13:05:09 UTC (rev 12944)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/clean/templates/template.tpl 2015-01-23 13:15:29 UTC (rev 12945)
@@ -1,40 +1,43 @@
<{foreach item=menu from=$block}>
-<{ if $menu.oul && $menu.level == 0}>
-<{ if $menucss != ''}>
+<{if $menu.oul && $menu.level == 0}>
+<{if $menucss != ''}>
<ul class="<{$menucss}>">
-<{ else}>
-<ul>
-<{ /if}>
-<{ /if}>
+ <{else}>
+ <ul>
+ <{/if}>
+ <{/if}>
-<{assign var=myStr value="["|cat:$xoops_langcode|cat:"]"}>
-<{if ($xlanguage && (($menu.title|strstr:$myStr) OR ($menu.image|strstr:$myStr)) OR !$xlanguage)}>
-<{ if $menu.level == 0}>
- <li<{if $menu.css}> class="<{$menu.css}>"<{/if}>>
- <a<{if $menu.selected}> class="active"<{/if}> href="<{$menu.link}>"><{$menu.title}></a>
-<{ if $menu.hassub}>
-<{ foreach item=sub from=$block name=sublp}>
-<{ if $smarty.foreach.sublp.first}> <ul class="dropdown-menu"><!-- sub menu --><{/if}>
-<{ if ($xlanguage && (($menu.title|strstr:$myStr) OR ($menu.image|strstr:$myStr)) OR !$xlanguage)}>
-<{ if $menu.id == $sub.pid}>
- <li<{if $sub.css}> class="<{$sub.css}>"<{/if}>>
- <a<{if $sub.selected}> class="active"<{/if}> href="<{$sub.link}>" target="<{$sub.target}>" title="<{$sub.alt_title}>"><{$sub.title}></a>
-<{ if !empty($block.subsub)}>
-<{ foreach item=subsub from=$block name=subsublp}>
-<{ if $smarty.foreach.subsublp.first}> <ul class="dropdown-menu"><!-- subsub menu --><{/if}>
-<{ if $sub.id == $subsub.pid}>
- <li<{if $subsub.css}> class="<{$subsub.css}>"<{/if}>>
- <a<{if $subsub.selected}> class="active"<{/if}> href="<{$subsub.link}>" target="<{$subsub.target}>" title="<{$subsub.alt_title}>"><{$subsub.title}></a>
-<{ /if}>
-<{ if $smarty.foreach.subsublp.last}></ul><{/if}>
-<{ /foreach}>
-<{ /if}>
-<{ /if}>
-<{ /if}>
-<{ /foreach}>
-<{ /if}>
-<{ /if}>
-<{/if}>
+ <{assign var=myStr value="["|cat:$xoops_langcode|cat:"]"}>
+ <{if ($xlanguage && (($menu.title|strstr:$myStr) OR ($menu.image|strstr:$myStr)) OR !$xlanguage)}>
+ <{if $menu.level == 0}>
+ <li<{if $menu.css}> class="<{$menu.css}>"<{/if}>>
+ <a<{if $menu.selected}> class="active"<{/if}> href="<{$menu.link}>"><{$menu.title}></a>
+ <{if $menu.hassub}>
+ <{foreach item=sub from=$block name=sublp}>
+ <{if $smarty.foreach.sublp.first}>
+ <ul class="dropdown-menu"><!-- sub menu --><{/if}>
+ <{if ($xlanguage && (($menu.title|strstr:$myStr) OR ($menu.image|strstr:$myStr)) OR !$xlanguage)}>
+ <{if $menu.id == $sub.pid}>
+ <li<{if $sub.css}> class="<{$sub.css}>"<{/if}>>
+ <a<{if $sub.selected}> class="active"<{/if}> href="<{$sub.link}>" target="<{$sub.target}>" title="<{$sub.alt_title}>"><{$sub.title}></a>
+ <{if !empty($block.subsub)}>
+ <{foreach item=subsub from=$block name=subsublp}>
+ <{if $smarty.foreach.subsublp.first}>
+ <ul class="dropdown-menu"><!-- subsub menu --><{/if}>
+ <{if $sub.id == $subsub.pid}>
+ <li<{if $subsub.css}> class="<{$subsub.css}>"<{/if}>>
+ <a<{if $subsub.selected}> class="active"<{/if}> href="<{$subsub.link}>" target="<{$subsub.target}>" title="<{$subsub.alt_title}>"><{$subsub.title}></a>
+ <{/if}>
+ <{if $smarty.foreach.subsublp.last}>
+ </ul><{/if}>
+ <{/foreach}>
+ <{/if}>
+ <{/if}>
+ <{/if}>
+ <{/foreach}>
+ <{/if}>
+ <{/if}>
+ <{/if}>
-<{if '' != $menu.close}><{$menu.close}><{/if}>
-<{/foreach}>
+ <{if '' != $menu.close}><{$menu.close}><{/if}>
+ <{/foreach}>
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/default/templates/template.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/default/templates/template.tpl 2015-01-23 13:05:09 UTC (rev 12944)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/default/templates/template.tpl 2015-01-23 13:15:29 UTC (rev 12945)
@@ -1,30 +1,30 @@
<span class="default_preload1"></span>
<span class="default_preload2"></span>
<{foreach item=menu from = $block}>
-<{ if $menu.oul}>
-<{ if 0 == $menu.level}>
+<{if $menu.oul}>
+<{if 0 == $menu.level}>
<ul id="default_nav">
-<{ elseif 1 == $menu.level}>
-<ul class="default_sub">
-<{ else}>
-<ul>
-<{ /if}>
-<{ /if}>
-<{ if $menu.oli}>
-<{ if 0 == $menu.level}>
- <li class="default_top<{if $menu.css}> <{$menu.css}><{/if}>">
-<{ else}>
- <li<{if $menu.css}> class="<{$menu.css}>"<{/if}>>
-<{ /if}>
-<{ /if}>
-<{ assign var=myStr value="["|cat:$xoops_langcode|cat:"]"}>
-<{ if ($xlanguage && (($menu.title|strstr:$myStr) OR ($menu.image|strstr:$myStr)) OR !$xlanguage)}>
-<{ if 0 == $menu.level}>
- <a href="<{$menu.link}>" class="default_top_link<{if $menu.selected}> default_selected<{/if}>" target="<{$menu.target}>" alt="<{$menu.alt_title}>" title="<{$menu.alt_title}>">
- <span<{if $menu.hassub}> class="default_down"<{/if}>><{if $menu.image}><img src="<{$menu.image}>" /><{/if}><{$menu.title}></span></a>
-<{ else}>
- <a href="<{$menu.link}>"<{if $menu.hassub}> class="default_fly"<{/if}> target="<{$menu.target}>" alt="<{$menu.alt_title}>" title="<{$menu.alt_title}>"><{if $menu.image}><img src="<{$menu.image}>" /><{/if}><{$menu.title}></a>
-<{ /if}>
-<{ /if}>
-<{ if '' != $menu.close}><{$menu.close}><{/if}>
-<{/foreach}>
+ <{elseif 1 == $menu.level}>
+ <ul class="default_sub">
+ <{else}>
+ <ul>
+ <{/if}>
+ <{/if}>
+ <{if $menu.oli}>
+ <{if 0 == $menu.level}>
+ <li class="default_top<{if $menu.css}> <{$menu.css}><{/if}>">
+ <{else}>
+ <li<{if $menu.css}> class="<{$menu.css}>"<{/if}>>
+ <{/if}>
+ <{/if}>
+ <{assign var=myStr value="["|cat:$xoops_langcode|cat:"]"}>
+ <{if ($xlanguage && (($menu.title|strstr:$myStr) || ($menu.image|strstr:$myStr)) || !$xlanguage)}>
+ <{if 0 == $menu.level}>
+ <a href="<{$menu.link}>" class="default_top_link<{if $menu.selected}> default_selected<{/if}>" target="<{$menu.target}>" alt="<{$menu.alt_title}>" title="<{$menu.alt_title}>">
+ <span<{if $menu.hassub}> class="default_down"<{/if}>><{if $menu.image}><img src="<{$menu.image}>" /><{/if}><{$menu.title}></span></a>
+ <{else}>
+ <a href="<{$menu.link}>"<{if $menu.hassub}> class="default_fly"<{/if}> target="<{$menu.target}>" alt="<{$menu.alt_title}>" title="<{$menu.alt_title}>"><{if $menu.image}><img src="<{$menu.image}>" /><{/if}><{$menu.title}></a>
+ <{/if}>
+ <{/if}>
+ <{if '' != $menu.close}><{$menu.close}><{/if}>
+ <{/foreach}>
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/mainmenu/templates/template.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/mainmenu/templates/template.tpl 2015-01-23 13:05:09 UTC (rev 12944)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/mainmenu/templates/template.tpl 2015-01-23 13:15:29 UTC (rev 12945)
@@ -1,23 +1,27 @@
<div id="mainmenu">
-<{foreach item=menu from=$block}>
-<{ if $menu.level == 0}>
-<{ assign var=myStr value="["|cat:$xoops_langcode|cat:"]"}>
-<{ if ($xlanguage && (($menu.title|strstr:$myStr) OR ($menu.image|strstr:$myStr)) OR !$xlanguage)}>
- <a class="menuMain<{if $menu.css}> <{$menu.css}><{/if}><{if $menu.topselected}> maincurrent<{/if}>" href="<{$menu.link}>" target="<{$menu.target}>" title="<{$menu.alt_title}>">
- <{if $menu.image}><img src="<{$menu.image}>"/><{/if}><{$menu.title}></a>
- <br />
-<{ if $menu.selected}>
-<{ foreach item=sub from=$block}>
-<{ if $menu.id == $sub.pid}>
-<{ if ($xlanguage && (($menu.title|strstr:$myStr) OR ($menu.image|strstr:$myStr)) OR !$xlanguage)}>
- <a class="menuSub marg5<{if $sub.css}> <{$sub.css}><{/if}><{if $sub.selected}> maincurrent<{/if}>" href="<{$sub.link}>" target="<{$sub.target}>" title="<{$sub.alt_title}>">
- <{if $sub.image}><img src="<{$sub.image}>" alt="<{$sub.alt_title}>" /><{/if}><{$sub.title}></a>
- <br />
-<{ /if}>
-<{ /if}>
-<{ /foreach}>
-<{ /if}>
-<{ /if}>
-<{ /if}>
-<{/foreach}>
+ <{foreach item=menu from=$block}>
+ <{if $menu.level == 0}>
+ <{assign var=myStr value="["|cat:$xoops_langcode|cat:"]"}>
+ <{if ($xlanguage && (($menu.title|strstr:$myStr) || ($menu.image|strstr:$myStr)) || !$xlanguage)}>
+ <a class="menuMain<{if $menu.css}> <{$menu.css}><{/if}><{if $menu.topselected}> maincurrent<{/if}>" href="<{$menu.link}>" target="<{$menu.target}>" title="<{$menu.alt_title}>">
+ <{if $menu.image}><img src="<{$menu.image}>"/><{/if}>
+ <{$menu.title}>
+ </a>
+ <br/>
+ <{if $menu.selected}>
+ <{foreach item=sub from=$block}>
+ <{if $menu.id == $sub.pid}>
+ <{if ($xlanguage && (($menu.title|strstr:$myStr) OR ($menu.image|strstr:$myStr)) OR !$xlanguage)}>
+ <a class="menuSub marg5<{if $sub.css}> <{$sub.css}><{/if}><{if $sub.selected}> maincurrent<{/if}>" href="<{$sub.link}>" target="<{$sub.target}>" title="<{$sub.alt_title}>">
+ <{if $sub.image}><img src="<{$sub.image}>" alt="<{$sub.alt_title}>" /><{/if}>
+ <{$sub.title}>
+ </a>
+ <br/>
+ <{/if}>
+ <{/if}>
+ <{/foreach}>
+ <{/if}>
+ <{/if}>
+ <{/if}>
+ <{/foreach}>
</div>
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/multiblack/stuHover.js
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/multiblack/stuHover.js 2015-01-23 13:05:09 UTC (rev 12944)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/multiblack/stuHover.js 2015-01-23 13:15:29 UTC (rev 12945)
@@ -30,6 +30,6 @@
this.className=this.className.replace(new RegExp(" iehover\\b"), "");
}
}
-}
+};
if (window.attachEvent) window.attachEvent("onload", stuHover);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/superfish/templates/template.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/superfish/templates/template.tpl 2015-01-23 13:05:09 UTC (rev 12944)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/superfish/templates/template.tpl 2015-01-23 13:15:29 UTC (rev 12945)
@@ -1,19 +1,19 @@
<{foreach item=menu from = $block}>
-<{ if $menu.oul}>
-<{ if 0 == $menu.level}>
+<{if $menu.oul}>
+<{if 0 == $menu.level}>
<ul class="sf-menu">
-<{ else}>
+ <{else}>
<ul>
-<{ /if}>
-<{ /if}>
-<{ if $menu.oli}>
- <li<{if $menu.css | $menu.selected}> class="<{/if}><{if $menu.css}><{$menu.css}> <{/if}><{if $menu.selected}>current<{/if}><{if $menu.css | $menu.selected}>"<{/if}>>
-<{ /if}>
-<{ assign var=myStr value="["|cat:$xoops_langcode|cat:"]"}>
-<{ if ($xlanguage && (($menu.title|strstr:$myStr) OR ($menu.image|strstr:$myStr)) OR !$xlanguage)}>
- <a href="<{$menu.link}>" target="<{$menu.target}>" alt="<{$menu.alt_title}>" title="<{$menu.alt_title}>">
-<{if $main.image}> <img src="<{$menu.image}>" alt="<{$menu.alt_title}>" /><{/if}><{$menu.title}></a>
-<{ if $menu.close != ''}><{$menu.close}><{/if}>
-<{ /if}>
-<{/foreach}>
-<div style="clear: both"></div>
+ <{/if}>
+ <{/if}>
+ <{if $menu.oli}>
+ <li<{if $menu.css || $menu.selected}> class="<{/if}><{if $menu.css}><{$menu.css}> <{/if}><{if $menu.selected}>current<{/if}><{if $menu.css || $menu.selected}>"<{/if}>>
+ <{/if}>
+ <{assign var=myStr value="["|cat:$xoops_langcode|cat:"]"}>
+ <{if ($xlanguage && (($menu.title|strstr:$myStr) OR ($menu.image|strstr:$myStr)) OR !$xlanguage)}>
+ <a href="<{$menu.link}>" target="<{$menu.target}>" alt="<{$menu.alt_title}>" title="<{$menu.alt_title}>">
+ <{if $main.image}> <img src="<{$menu.image}>" alt="<{$menu.alt_title}>" /><{/if}><{$menu.title}></a>
+ <{if $menu.close != ''}><{$menu.close}><{/if}>
+ <{/if}>
+ <{/foreach}>
+ <div style="clear: both"></div>
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/superfish_navbar/templates/template.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/superfish_navbar/templates/template.tpl 2015-01-23 13:05:09 UTC (rev 12944)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/superfish_navbar/templates/template.tpl 2015-01-23 13:15:29 UTC (rev 12945)
@@ -1,19 +1,19 @@
<{foreach item=menu from = $block}>
-<{ if $menu.oul}>
-<{ if 0 == $menu.level}>
+<{if $menu.oul}>
+<{if 0 == $menu.level}>
<ul class="sf-menu sf-navbar">
-<{ else}>
+ <{else}>
<ul>
-<{ /if}>
-<{ /if}>
-<{ if $menu.oli}>
- <li<{if $menu.css | $menu.selected}> class="<{/if}><{if $menu.css}>{<$menu.css}> <{/if}><{if $menu.selected}>current<{/if}><{if $menu.css | $menu.selected}>"<{/if}>>
-<{ /if}>
-<{ assign var=myStr value="["|cat:$xoops_langcode|cat:"]"}>
-<{ if ($xlanguage && (($menu.title|strstr:$myStr) OR ($menu.image|strstr:$myStr)) OR !$xlanguage)}>
- <a href="<{$menu.link}>" target="<{$menu.target}>" alt="<{$menu.alt_title}>" title="<{$menu.alt_title}>">
-<{if $main.image}><img src="<{$menu.image}>" alt="<{$menu.alt_title}>" /><{/if}><{$menu.title}></a>
-<{ /if}>
-<{ if '' != $menu.close}><{$menu.close}><{/if}>
-<{/foreach}>
-<div style="clear:both"></div>
+ <{/if}>
+ <{/if}>
+ <{if $menu.oli}>
+ <li<{if $menu.css || $menu.selected}> class="<{/if}><{if $menu.css}>{<$menu.css}> <{/if}><{if $menu.selected}>current<{/if}><{if $menu.css || $menu.selected}>"<{/if}>>
+ <{/if}>
+ <{assign var=myStr value="["|cat:$xoops_langcode|cat:"]"}>
+ <{if ($xlanguage && (($menu.title|strstr:$myStr) OR ($menu.image|strstr:$myStr)) OR !$xlanguage)}>
+ <a href="<{$menu.link}>" target="<{$menu.target}>" alt="<{$menu.alt_title}>" title="<{$menu.alt_title}>">
+ <{if $main.image}><img src="<{$menu.image}>" alt="<{$menu.alt_title}>" /><{/if}><{$menu.title}></a>
+ <{/if}>
+ <{if '' != $menu.close}><{$menu.close}><{/if}>
+ <{/foreach}>
+ <div style="clear:both"></div>
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/tw_blue/templates/template.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/tw_blue/templates/template.tpl 2015-01-23 13:05:09 UTC (rev 12944)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/skins/tw_blue/templates/template.tpl 2015-01-23 13:15:29 UTC (rev 12945)
@@ -4,37 +4,47 @@
<div class="nav-left"></div>
<div class="nav">
<ul id="navigation">
-<{ foreach item=menu from=$block}>
-<{ assign var=myStr value="["|cat:$xoops_langcode|cat:"]"}>
-<{ if ($xlanguage && (($menu.title|strstr:$myStr) OR ($menu.image|strstr:$myStr)) OR !$xlanguage)}>
-<{ if 0 == $menu.level}>
- <li<{if $menu.css | $menu.selected}> class="<{/if}><{if $menu.selected}>active<{/if}><{if $menu.css}> <{$menu.css}><{/if}><{if $menu.css | $menu.selected}>"<{/if}>>
- <a href="<{$menu.link}>" target="<{$menu.target}>" alt="<{$menu.alt_title}>" title="<{$menu.alt_title}>">
- <span class="menu-left"></span>
- <span class="menu-mid"><{if $menu.image}><img src="<{$menu.image}>" /><{/if}><{$menu.title}></span>
- <span class="menu-right"></span>
- </a>
-<{ if $menu.hassub}>
- <div class="sub">
- <ul>
-<{ foreach item=sub from=$block}>
-<{ if $sub.pid == $menu.id}>
-<{ if ($xlanguage && (($menu.title|strstr:$myStr) OR ($menu.image|strstr:$myStr)) OR !$xlanguage)}>
- <li<{if $sub.class}> class="<{$sub.css}>"<{/if}>>
- <a href="<{$sub.link}>" target="<{$sub.target}>" alt="<{$sub.alt_title}>" title="<{$sub.alt_title}>">
- <{if $sub.image}><img src="<{$sub.image}>" alt="<{$sub.alt_title}>" /><{/if}><{$sub.title}></a>
+ <{foreach item=menu from=$block}>
+ <{assign var=myStr value="["|cat:$xoops_langcode|cat:"]"}>
+ <{if ($xlanguage && (($menu.title|strstr:$myStr) OR ($menu.image|strstr:$myStr)) OR !$xlanguage)}>
+ <{if 0 == $menu.level}>
+ <li<{if $menu.css || $menu.selected}> class="<{/if}>
+ <{if $menu.selected}>active<{/if}>
+ <{if $menu.css}> <{$menu.css}><{/if}>
+ <{if $menu.css || $menu.selected}>"<{/if}>>
+ <a href="<{$menu.link}>" target="<{$menu.target}>" alt="<{$menu.alt_title}>" title="<{$menu.alt_title}>">
+ <span class="menu-left"></span>
+ <span class="menu-mid">
+ <{if $menu.image}>
+ <img src="<{$menu.image}>"/>
+ <{/if}>
+ <{$menu.title}>
+ </span>
+ <span class="menu-right"></span>
+ </a>
+ <{if $menu.hassub}>
+ <div class="sub">
+ <ul>
+ <{foreach item=sub from=$block}>
+ <{if $sub.pid == $menu.id}>
+ <{if ($xlanguage && (($menu.title|strstr:$myStr) OR ($menu.image|strstr:$myStr)) OR !$xlanguage)}>
+ <li<{if $sub.class}> class="<{$sub.css}>"<{/if}>>
+ <a href="<{$sub.link}>" target="<{$sub.target}>" alt="<{$sub.alt_title}>" title="<{$sub.alt_title}>">
+ <{if $sub.image}><img src="<{$sub.image}>" alt="<{$sub.alt_title}>" /><{/if}>
+ <{$sub.title}>
+ </a>
+ </li>
+ <{/if}>
+ <{/if}>
+ <{/foreach}>
+ </ul>
+ <div class="btm-bg"></div>
+ </div>
+ <{/if}>
</li>
-<{ /if}>
-<{ /if}>
-<{ /foreach}>
- </ul>
- <div class="btm-bg"></div>
- </div>
-<{ /if}>
- </li>
-<{ /if}>
-<{ /if}>
-<{ /foreach}>
+ <{/if}>
+ <{/if}>
+ <{/foreach}>
</ul>
</div>
<div class="nav-right"></div>
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/xoops_version.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/xoops_version.php 2015-01-23 13:05:09 UTC (rev 12944)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mymenus/xoops_version.php 2015-01-23 13:15:29 UTC (rev 12945)
@@ -28,7 +28,7 @@
$modversion['help'] = 'page=help';
$modversion['license'] = 'GNU GPL 2.0';
$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html";
-$modversion['official'] = 0;
+$modversion['official'] = 1; //1 indicates supported by XOOPS Dev Team, 0 means 3rd party supported
$modversion['image'] = "assets/images/mymenus.png";
$modversion['dirname'] = basename(__DIR__);
$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
|
