|
From: <be...@us...> - 2012-12-18 06:56:28
|
Revision: 10436
http://sourceforge.net/p/xoops/svn/10436
Author: beckmi
Date: 2012-12-18 06:56:26 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Updating to 1.41 Final
Modified Paths:
--------------
XoopsModules/mymenus/trunk/mymenus/admin/admin_footer.php
XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/mymenus.php
XoopsModules/mymenus/trunk/mymenus/xoops_version.php
Modified: XoopsModules/mymenus/trunk/mymenus/admin/admin_footer.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_footer.php 2012-12-18 06:34:10 UTC (rev 10435)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_footer.php 2012-12-18 06:56:26 UTC (rev 10436)
@@ -20,7 +20,7 @@
echo "<div class='adminfooter'>\n"
." <div style='text-align: center;'>\n"
- ." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
." </div>\n"
." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
."</div>";
Modified: XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/mymenus.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/mymenus.php 2012-12-18 06:34:10 UTC (rev 10435)
+++ XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/mymenus.php 2012-12-18 06:56:26 UTC (rev 10436)
@@ -60,7 +60,7 @@
$linkArray = $registry->getEntry('link_array');
$linkArray['link'] = self::_doDecoration($linkArray['link']);
//if (!eregi('mailto:', $linkArray['link']) && !eregi('://', $linkArray['link'])) {
- if (!preg_match('/mailto:/i', $linkArray['link']) && !preg_match('/:\/\//i', $linkArray['link'])) {
+ if (!preg_match('/mailto:/i', $linkArray['link']) && !preg_match('#://#i', $linkArray['link'])) {
$linkArray['link'] = XOOPS_URL . '/' . $linkArray['link']; //Do not do this in other decorators
}
$registry->setEntry('link_array', $linkArray);
Modified: XoopsModules/mymenus/trunk/mymenus/xoops_version.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/xoops_version.php 2012-12-18 06:34:10 UTC (rev 10435)
+++ XoopsModules/mymenus/trunk/mymenus/xoops_version.php 2012-12-18 06:56:26 UTC (rev 10436)
@@ -20,42 +20,41 @@
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
-$modversion['name'] = _MI_MYMENUS_MD_NAME;
-$modversion['version'] = 1.4;
-$modversion['description'] = _MI_MYMENUS_MD_DESC;
-$modversion['credits'] = "Xuups";
-$modversion['author'] = "Trabis (www.xuups.com)";
-$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['image'] = "images/mymenus.png";
-$modversion['dirname'] = "mymenus";
-
+$modversion['name'] = _MI_MYMENUS_MD_NAME;
+$modversion['version'] = 1.41;
+$modversion['description'] = _MI_MYMENUS_MD_DESC;
+$modversion['credits'] = "Xuups";
+$modversion['author'] = "Trabis (www.xuups.com)";
+$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['image'] = "images/mymenus.png";
+$modversion['dirname'] = "mymenus";
$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
-$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
-$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
+$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
+$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
- //about
- $modversion['release_date'] = '2012/05/22';
- $modversion["module_website_url"] = "http://www.xoops.org/";
- $modversion["module_website_name"] = "XOOPS";
- $modversion["module_status"] = "Final";
- $modversion["author_website_url"] = "http://www.xuups.com/";
- $modversion["author_website_name"] = "Xuups";
- $modversion['min_php']='5.2';
- $modversion['min_xoops']="2.5";
- $modversion['min_admin']='1.1';
- $modversion['min_db']= array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
+//about
+$modversion['release_date'] = '2012/12/17';
+$modversion["module_website_url"] = "www.xoops.org";
+$modversion["module_website_name"] = "XOOPS";
+$modversion["module_status"] = "Final";
+$modversion["author_website_url"] = "http://www.xuups.com/";
+$modversion["author_website_name"] = "Xuups";
+$modversion['min_php'] = '5.2';
+$modversion['min_xoops'] = "2.5.5";
+$modversion['min_admin'] = '1.1';
+$modversion['min_db'] = array('mysql' => '5.0.7', 'mysqli' => '5.0.7');
// Menu
$modversion['hasMain'] = 0;
// Admin things
-$modversion['hasAdmin'] = 1;
-$modversion['adminindex'] = "admin/index.php";
-$modversion['adminmenu'] = "admin/menu.php";
-$modversion['system_menu'] =1;
+$modversion['hasAdmin'] = 1;
+$modversion['adminindex'] = "admin/index.php";
+$modversion['adminmenu'] = "admin/menu.php";
+$modversion['system_menu'] = 1;
// Search
$modversion['hasSearch'] = 0;
@@ -65,7 +64,7 @@
// Sql
$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
-$i = 0;
+$i = 0;
$i++;
$modversion['tables'][$i] = "mymenus_menu";
$i++;
@@ -74,24 +73,23 @@
// Config
$i = 0;
$i++;
-$modversion['config'][$i]['name'] = 'assign_method';
-$modversion['config'][$i]['title'] = '_MI_MENUS_CONF_ASSIGN_METHOD';
+$modversion['config'][$i]['name'] = 'assign_method';
+$modversion['config'][$i]['title'] = '_MI_MENUS_CONF_ASSIGN_METHOD';
$modversion['config'][$i]['description'] = '_MI_MENUS_CONF_ASSIGN_METHOD_DSC';
-$modversion['config'][$i]['formtype'] = 'select';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = 'xotheme';
-$modversion['config'][$i]['options'] = array(
- _MI_MENUS_CONF_ASSIGN_METHOD_XOOPSTPL => 'xoopstpl',
- _MI_MENUS_CONF_ASSIGN_METHOD_XOTHEME => 'xotheme'
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = 'xotheme';
+$modversion['config'][$i]['options'] = array(
+ _MI_MENUS_CONF_ASSIGN_METHOD_XOOPSTPL => 'xoopstpl', _MI_MENUS_CONF_ASSIGN_METHOD_XOTHEME => 'xotheme'
);
// Blocks
$i = 0;
$i++;
-$modversion['blocks'][$i]['file'] = "mymenus_block.php";
-$modversion['blocks'][$i]['name'] = _MI_MYMENUS_BLK;
+$modversion['blocks'][$i]['file'] = "mymenus_block.php";
+$modversion['blocks'][$i]['name'] = _MI_MYMENUS_BLK;
$modversion['blocks'][$i]['description'] = _MI_MYMENUS_BLK_DSC;
-$modversion['blocks'][$i]['show_func'] = "mymenus_block_show";
-$modversion['blocks'][$i]['edit_func'] = "mymenus_block_edit";
-$modversion['blocks'][$i]['options'] = "0|default|0|block|0";
-$modversion['blocks'][$i]['template'] = "mymenus_block.html";
+$modversion['blocks'][$i]['show_func'] = "mymenus_block_show";
+$modversion['blocks'][$i]['edit_func'] = "mymenus_block_edit";
+$modversion['blocks'][$i]['options'] = "0|default|0|block|0";
+$modversion['blocks'][$i]['template'] = "mymenus_block.html";
|
|
From: <be...@us...> - 2012-12-18 07:16:06
|
Revision: 10437
http://sourceforge.net/p/xoops/svn/10437
Author: beckmi
Date: 2012-12-18 07:16:04 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Updating to 1.41 Final
Modified Paths:
--------------
XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt
XoopsModules/mymenus/trunk/mymenus/language/english/modinfo.php
Modified: XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt 2012-12-18 06:56:26 UTC (rev 10436)
+++ XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt 2012-12-18 07:16:04 UTC (rev 10437)
@@ -1,6 +1,10 @@
+<b><u>Version 1.41 (2012-12-17)</u></b>
+
+- small adjustments (mamba)
+
<b><u>Version 1.4 (2011-12-05)</u></b>
-- converted to XOOPS 2.5.x GUI
+- converted to XOOPS 2.5.x GUI (mamba)
<b><u>Version 1.3 (2011-04-02)</u></b>
Modified: XoopsModules/mymenus/trunk/mymenus/language/english/modinfo.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/language/english/modinfo.php 2012-12-18 06:56:26 UTC (rev 10436)
+++ XoopsModules/mymenus/trunk/mymenus/language/english/modinfo.php 2012-12-18 07:16:04 UTC (rev 10437)
@@ -13,7 +13,7 @@
// Admin menu
define('_MI_MYMENUS_MENUSMANAGER',"Menus manager");
-define('_MI_MYMENUS_MENUMANAGER',"Menu manager");
+define('_MI_MYMENUS_MENUMANAGER',"Links manager");
define('_MI_MYMENUS_ABOUT',"About");
//Configs
|
|
From: <be...@us...> - 2014-02-10 10:21:48
|
Revision: 12300
http://sourceforge.net/p/xoops/svn/12300
Author: beckmi
Date: 2014-02-10 10:21:40 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
Updating to 1.50 Beta 1 (Bleekk)
Modified Paths:
--------------
XoopsModules/mymenus/trunk/mymenus/admin/about.php
XoopsModules/mymenus/trunk/mymenus/admin/admin_about.php
XoopsModules/mymenus/trunk/mymenus/admin/admin_footer.php
XoopsModules/mymenus/trunk/mymenus/admin/admin_header.php
XoopsModules/mymenus/trunk/mymenus/admin/admin_menus.php
XoopsModules/mymenus/trunk/mymenus/admin/index.php
XoopsModules/mymenus/trunk/mymenus/admin/menu.php
XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php
XoopsModules/mymenus/trunk/mymenus/class/about.php
XoopsModules/mymenus/trunk/mymenus/class/builder.php
XoopsModules/mymenus/trunk/mymenus/class/menus.php
XoopsModules/mymenus/trunk/mymenus/class/plugin.php
XoopsModules/mymenus/trunk/mymenus/class/registry.php
XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt
XoopsModules/mymenus/trunk/mymenus/docs/skins.txt
XoopsModules/mymenus/trunk/mymenus/include/functions.php
XoopsModules/mymenus/trunk/mymenus/language/english/about.php
XoopsModules/mymenus/trunk/mymenus/language/english/admin.php
XoopsModules/mymenus/trunk/mymenus/language/english/blocks.php
XoopsModules/mymenus/trunk/mymenus/language/english/modinfo.php
XoopsModules/mymenus/trunk/mymenus/plugins/constant/constant.php
XoopsModules/mymenus/trunk/mymenus/plugins/dynamic/dynamic.php
XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/mymenus.php
XoopsModules/mymenus/trunk/mymenus/plugins/smarty/smarty.php
XoopsModules/mymenus/trunk/mymenus/skins/breadcrumb/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/breadcrumb/style.css
XoopsModules/mymenus/trunk/mymenus/skins/default/pro_dropdown_3.css
XoopsModules/mymenus/trunk/mymenus/skins/default/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/default/stuHover.js
XoopsModules/mymenus/trunk/mymenus/skins/default/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/mainmenu/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/mainmenu/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/multiblack/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/multiblack/stuHover.js
XoopsModules/mymenus/trunk/mymenus/skins/multiblack/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/superfish/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/superfish/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/superfish_navbar/css/superfish-navbar.css
XoopsModules/mymenus/trunk/mymenus/skins/superfish_navbar/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/superfish_navbar/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/tw_blue/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/tw_blue/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/tw_blue/tw_blue.css
XoopsModules/mymenus/trunk/mymenus/sql/mysql.sql
XoopsModules/mymenus/trunk/mymenus/templates/static/mymenus_admin_about.html
XoopsModules/mymenus/trunk/mymenus/templates/static/mymenus_admin_adminmenu.html
XoopsModules/mymenus/trunk/mymenus/templates/static/mymenus_admin_menus.html
XoopsModules/mymenus/trunk/mymenus/xoops_version.php
Added Paths:
-----------
XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php
XoopsModules/mymenus/trunk/mymenus/class/links.php
XoopsModules/mymenus/trunk/mymenus/css/admin.css
XoopsModules/mymenus/trunk/mymenus/images/actions/move_vertical-16.png
XoopsModules/mymenus/trunk/mymenus/images/edit.png
XoopsModules/mymenus/trunk/mymenus/images/loading.gif
XoopsModules/mymenus/trunk/mymenus/include/update.php
XoopsModules/mymenus/trunk/mymenus/include/xoops.php
XoopsModules/mymenus/trunk/mymenus/js/nestedSortable.js
XoopsModules/mymenus/trunk/mymenus/js/order.js
XoopsModules/mymenus/trunk/mymenus/skins/clean/
XoopsModules/mymenus/trunk/mymenus/skins/clean/index.html
XoopsModules/mymenus/trunk/mymenus/skins/clean/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/clean/template.html
XoopsModules/mymenus/trunk/mymenus/skins/default/index.html
XoopsModules/mymenus/trunk/mymenus/skins/multiblack/index.html
XoopsModules/mymenus/trunk/mymenus/skins/tw_blue/images/index.html
XoopsModules/mymenus/trunk/mymenus/skins/tw_blue/index.html
XoopsModules/mymenus/trunk/mymenus/templates/static/mymenus_admin_links.html
Removed Paths:
-------------
XoopsModules/mymenus/trunk/mymenus/admin/admin_menu.php
XoopsModules/mymenus/trunk/mymenus/class/menu.php
XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/language/arabic/
XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/language/french/
XoopsModules/mymenus/trunk/mymenus/skins/tw_red/
XoopsModules/mymenus/trunk/mymenus/templates/static/mymenus_admin_menu.html
Modified: XoopsModules/mymenus/trunk/mymenus/admin/about.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/about.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/admin/about.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -27,4 +27,4 @@
echo $aboutAdmin->addNavigation('about.php');
echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
-include 'admin_footer.php';
\ No newline at end of file
+include 'admin_footer.php';
Modified: XoopsModules/mymenus/trunk/mymenus/admin/admin_about.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_about.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_about.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -23,5 +23,3 @@
$aboutObj = new MymenusAbout();
$aboutObj->render();
-
-?>
\ No newline at end of file
Modified: XoopsModules/mymenus/trunk/mymenus/admin/admin_footer.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_footer.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_footer.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -25,4 +25,4 @@
." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
."</div>";
-xoops_cp_footer();
\ No newline at end of file
+xoops_cp_footer();
Modified: XoopsModules/mymenus/trunk/mymenus/admin/admin_header.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_header.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_header.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -20,30 +20,30 @@
require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
+if ( !@include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php') ) {
+ redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
+ exit();
+}
+
+//global $xoopsModule;
+$moduleInfo = $module_handler->get($xoopsModule->getVar('mid'));
+$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+
+$indexAdmin = new ModuleAdmin();
+
include_once $GLOBALS['xoops']->path('class/template.php');
include_once $GLOBALS['xoops']->path('modules/mymenus/include/functions.php');
include_once $GLOBALS['xoops']->path('modules/mymenus/class/registry.php');
include_once $GLOBALS['xoops']->path('modules/mymenus/class/plugin.php');
-xoops_load('XoopsFormLoader');
-xoops_loadLanguage('modinfo', 'mymenus');
-
$mymenusTpl = new XoopsTpl();
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once(XOOPS_ROOT_PATH."/class/template.php");
+ $xoopsTpl = new XoopsTpl();
+}
+$xoopsTpl->assign('pathIcon16', $pathIcon16);
-if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
- //return true;
- }else{
- redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
- //return false;
- }
-global $xoopsModule;
-$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
-$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
-
-if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
- include_once(XOOPS_ROOT_PATH."/class/template.php");
- $xoopsTpl = new XoopsTpl();
-}
-$xoopsTpl->assign('pathIcon16', $pathIcon16);
\ No newline at end of file
+xoops_load('XoopsFormLoader');
+xoops_loadLanguage('modinfo', 'mymenus');
Added: XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php (rev 0)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -0,0 +1,438 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @package Mymenus
+ * @since 1.0
+ * @author trabis <lus...@gm...>, bleekk <bl...@ou...>
+ * @version $Id$
+ */
+
+include_once dirname(__FILE__) . '/admin_header.php';
+
+$menus_handler =& xoops_getModuleHandler('menus', 'mymenus');
+$criteria = new CriteriaCompo();
+$criteria->setSort('id');
+$criteria->setOrder('ASC');
+$menus_list = $menus_handler->getList($criteria);
+
+$indexAdmin = new ModuleAdmin();
+
+
+if (empty($menus_list)) {
+ redirect_header('admin_menus.php', 1, _AM_MYMENUS_MSG_NOMENUS);
+ exit;
+}
+
+if (isset($_REQUEST['menu_id']) && in_array($_REQUEST['menu_id'], array_keys($menus_list))) {
+ $menu_id = $_REQUEST['menu_id'];
+ $menu_title = $menus_list[$menu_id];
+} else {
+ $keys = array_keys($menus_list);
+ $menu_id = $keys[0];
+ $menu_title = $menus_list[$menu_id];
+}
+
+$mymenusTpl->assign('menu_id', $menu_id);
+$mymenusTpl->assign('menu_title', $menu_title);
+$mymenusTpl->assign('menus_list', $menus_list);
+
+$op = isset($_GET['op']) ? trim($_GET['op']) : (isset($_POST['op']) ? trim($_POST['op']) : 'list');
+
+$id = isset($_GET['id']) ? intval($_GET['id']) : (isset($_POST['id']) ? intval($_POST['id']) : null);
+$pid = isset($_GET['pid']) ? intval($_GET['pid']) : (isset($_POST['pid']) ? intval($_POST['pid']) : null);
+
+$limit = isset($_GET['limit']) ? intval($_GET['limit']) : (isset($_POST['limit']) ? intval($_POST['limit']) : 15);
+$start = isset($_GET['start']) ? intval($_GET['start']) : (isset($_POST['start']) ? intval($_POST['start']) : 0);
+$redir = isset($_GET['redir']) ? $_GET['redir'] : (isset($_POST['redir']) ? $_POST['redir'] : null);
+
+$weight = isset($_GET['weight']) ? intval($_GET['weight']) : (isset($_POST['weight']) ? intval($_POST['weight']) : 0);
+$visible = isset($_GET['visible']) ? intval($_GET['visible']) : (isset($_POST['visible']) ? intval($_POST['visible']) : 0);
+
+$mymenus_adminpage = 'admin_links.php';
+
+switch ($op) {
+ case 'add':
+ mymenus_admin_add();
+ break;
+ case 'form':
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('admin_links.php');
+ echo mymenus_admin_form(null, $pid);
+ include 'admin_footer.php';
+ break;
+ case 'edit':
+ echo mymenus_admin_form($id);
+ break;
+ case 'editok':
+ mymenus_admin_edit($id);
+ break;
+ case 'del':
+ mymenus_admin_confirmdel($id, $redir);
+ break;
+ case 'delok':
+ mymenus_admin_del($id, $redir);
+ break;
+ case 'delall':
+ mymenus_admin_confirmdel(null, $redir, 'delallok');
+ break;
+ case 'delallok':
+ mymenus_admin_delall($redir);
+ break;
+ case 'move':
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('admin_links.php');
+ mymenus_admin_move($id, $weight);
+ echo mymenus_admin_list($start);
+ include 'admin_footer.php';
+ break;
+ case 'toggle':
+ mymenus_admin_toggle($id, $visible);
+ break;
+ case 'order':
+ $order = $_POST['mod'];
+ parse_str($order,$test);
+
+ $i = 1;
+ $this_handler =& xoops_getModuleHandler('links', 'mymenus');
+ foreach ($test['mod'] as $order=>$value) {
+
+ $obj = $this_handler->get($order);
+ $obj->setVar('weight', $i++);
+
+ /*set submenu*/
+ if(isset($value)){
+ $obj->setVar('pid', $value);
+ }else{
+ $obj->setVar('pid', 0);
+ }
+ $this_handler->insert($obj);
+ $this_handler->update_weights($obj);
+
+ }
+ break;
+ case 'list':
+ default:
+ xoops_cp_header();
+ // Add module stylesheet
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/mymenus/css/admin.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/Frameworks/moduleclasses/moduleadmin/css/admin.css');
+ // Define scripts
+ $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+ $xoTheme->addScript(XOOPS_URL . '/modules/mymenus/js/nestedSortable.js');
+ //$xoTheme->addScript(XOOPS_URL . '/modules/mymenus/js/switchButton.js');
+ $xoTheme->addScript(XOOPS_URL . '/modules/mymenus/js/order.js');
+
+ echo $indexAdmin->addNavigation('admin_links.php');
+ echo mymenus_admin_list($start);
+
+ /* Disable xoops debugger in dialog window */
+ include_once XOOPS_ROOT_PATH . '/class/logger/xoopslogger.php';
+ $xoopsLogger =& XoopsLogger::getInstance();
+ $xoopsLogger->activated = true;
+ error_reporting(-1);
+
+
+ include 'admin_footer.php';
+ break;
+
+
+}
+
+function mymenus_admin_list($start = 0)
+{
+ global $mymenusTpl, $menu_id;
+
+ $this_handler =& xoops_getModuleHandler('links', 'mymenus');
+
+ $criteria = new CriteriaCompo(new Criteria('mid', $menu_id));
+
+ $count = $this_handler->getCount($criteria);
+ $mymenusTpl->assign('count', $count);
+ $criteria->setSort('weight');
+ $criteria->setOrder('ASC');
+
+ $menus = array();
+ $menusArray = array();
+ if ($count > 0) {
+ $menus = $this_handler->getObjects($criteria);
+ foreach ($menus as $menu) {
+ $array[] = $menu->getValues();
+ }
+ include_once $GLOBALS['xoops']->path('modules/mymenus/class/builder.php');
+ $builder = new MymenusBuilder($array);
+ $menusArray = $builder->render();
+ $mymenusTpl->assign('menus', $menusArray);
+ }
+
+ $mymenusTpl->assign('addform', mymenus_admin_form());
+
+ return $mymenusTpl->fetch($GLOBALS['xoops']->path('modules/mymenus/templates/static/mymenus_admin_links.html'));
+}
+
+function mymenus_admin_del($id, $redir = null)
+{
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($GLOBALS['mymenus_adminpage'], 1, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+
+ if ($id <= 0) {
+ redirect_header($GLOBALS['mymenus_adminpage'], 1);
+ }
+
+ $this_handler =& xoops_getModuleHandler('links' , 'mymenus');
+ $obj = $this_handler->get($id);
+ if (!is_object($obj)) {
+ redirect_header($GLOBALS['mymenus_adminpage'], 1);
+ }
+
+ //get sub item
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('id', $id));
+ $criteria->add(new Criteria('pid', $id),'OR');
+
+ //first delete links level 2
+ global $xoopsDB;
+ $query = "DELETE FROM ".$xoopsDB->prefix("mymenus_links")." WHERE pid = (
+ SELECT id FROM (
+ SELECT * FROM ".$xoopsDB->prefix("mymenus_links")." WHERE pid = ".$id.") AS sec
+ );";
+ $result = $xoopsDB->queryF($query);
+ //delete links level 0 and 1
+ if (!$this_handler->deleteAll($criteria)) {
+ xoops_cp_header();
+ xoops_error(_AM_MYMENUS_MSG_ERROR, $obj->getVar('id'));
+ xoops_cp_footer();
+ exit();
+ }
+
+ redirect_header(!is_null($redir) ? base64_decode($redir) : $GLOBALS['mymenus_adminpage'] , 2, _AM_MYMENUS_MSG_SUCCESS);
+}
+
+function mymenus_admin_delall($redir = null)
+{
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($GLOBALS['mymenus_adminpage'], 1, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+
+ $this_handler =& xoops_getModuleHandler('links' , 'mymenus');
+
+ if (!$this_handler->deleteAll()) {
+ redirect_header(!is_null($redir) ? base64_decode($redir) : $GLOBALS['mymenus_adminpage'] , 2, _AM_MYMENUS_MSG_ERROR);
+ }
+
+ redirect_header(!is_null($redir) ? base64_decode($redir) : $GLOBALS['mymenus_adminpage'] , 2, _AM_MYMENUS_MSG_SUCCESS);
+}
+
+function mymenus_admin_confirmdel($id = null, $redir = null, $op = 'delok')
+{
+
+ $arr = array();
+ $arr['op'] = $op;
+ $arr['id'] = $id;
+ if (!is_null($redir)) {
+ $arr['redir'] = $redir;
+ }
+
+ xoops_cp_header();
+ xoops_confirm($arr, $GLOBALS['mymenus_adminpage'], _AM_MYMENUS_MSG_AYSL);
+ xoops_cp_footer();
+}
+
+function mymenus_admin_add()
+{
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($GLOBALS['mymenus_adminpage'], 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+
+ $this_handler =& xoops_getModuleHandler('links','mymenus');
+ $criteria = new CriteriaCompo(new Criteria('mid', $_POST['mid']));
+ $criteria->setSort('weight');
+ $criteria->setOrder('DESC');
+ $criteria->setLimit(1);
+ $menus = $this_handler->getObjects($criteria);
+ $weight = 1;
+ if (isset($menus[0]) && is_object($menus[0])) {
+ $weight = $menus[0]->getVar('weight') + 1;
+ }
+
+ $obj = $this_handler->create();
+ if (!isset($_POST['hooks'])) {
+ $_POST['hooks'] = array();
+ }
+ $obj->setVars($_POST);
+ $obj->setVar('weight', $weight);
+
+ if (!$this_handler->insert($obj)) {
+ $msg = _AM_MYMENUS_MSG_ERROR;
+ } else {
+ $this_handler->update_weights($obj);
+ $msg = _AM_MYMENUS_MSG_SUCCESS;
+ }
+
+ redirect_header($GLOBALS['mymenus_adminpage'] . '?op=list&menu_id=' . $obj->getVar('mid'), 2, $msg);
+}
+
+function mymenus_admin_edit($id)
+{
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($GLOBALS['mymenus_adminpage'], 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+
+
+ /* Disable xoops debugger in dialog window */
+ include_once XOOPS_ROOT_PATH.'/class/logger/xoopslogger.php';
+ $xoopsLogger =& XoopsLogger::getInstance();
+ $xoopsLogger->activated = false;
+ error_reporting(0);
+
+
+ $this_handler =& xoops_getModuleHandler('links','mymenus');
+ $obj = $this_handler->get($id);
+ $obj->setVars($_POST);
+
+ if (!$this_handler->insert($obj)) {
+ $msg = _AM_MYMENUS_MSG_ERROR;
+ } else {
+ $msg = _AM_MYMENUS_MSG_SUCCESS;
+ }
+
+ redirect_header($GLOBALS['mymenus_adminpage'] . '?op=list', 2, $msg);
+}
+
+function mymenus_admin_form($id = null, $pid = null)
+{
+ /* Disable xoops debugger in dialog window */
+ include_once XOOPS_ROOT_PATH.'/class/logger/xoopslogger.php';
+ $xoopsLogger =& XoopsLogger::getInstance();
+ $xoopsLogger->activated = false;
+ error_reporting(0);
+
+ global $menu_id;
+
+ $registry =& MymenusRegistry::getInstance();
+ $plugin =& MymenusPlugin::getInstance();
+
+ $this_handler =& xoops_getModuleHandler('links','mymenus');
+ $objArray = array();
+
+ if (isset($id)) {
+ $ftitle = _EDIT;
+ $obj = $this_handler->get($id);
+ $objArray = $obj->getValues();
+
+ } else {
+ $ftitle = _ADD;
+ $obj = $this_handler->create();
+ $objArray = $obj->getValues();
+ if (isset($pid)) {
+ $objArray['pid'] = $pid;
+ }
+ }
+
+ $form = new XoopsThemeForm($ftitle, 'admin_form', $GLOBALS['mymenus_adminpage'], "post", true);
+ $formtitle = new XoopsFormText(_AM_MYMENUS_MENU_TITLE, 'title', 50, 255, $objArray['title']);
+ $formalttitle = new XoopsFormText(_AM_MYMENUS_MENU_ALTTITLE, 'alt_title', 50, 255, $objArray['alt_title']);
+
+ $formlink = new XoopsFormText(_AM_MYMENUS_MENU_LINK, 'link', 50, 255, $objArray['link']);
+ $formimage = new XoopsFormText(_AM_MYMENUS_MENU_IMAGE, 'image', 50, 255, $objArray['image']);
+
+ $criteria = new CriteriaCompo(new Criteria('mid', $menu_id));
+ $criteria->add(new Criteria('id', $id, '<>'));
+ $criteria->setSort('weight');
+ $criteria->setOrder('ASC');
+
+ global $xoopsModule;
+ $pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+
+ $statontxt
+ = " <img src=". $pathIcon16 .'/1.png'.' '. "alt='" ._YES . "' /> " . _YES
+ . " ";
+ $statofftxt
+ = " <img src=". $pathIcon16 .'/0.png' .' '."alt='" . _NO . "' /> "
+ . _NO . " ";
+ $formvis = new XoopsFormRadioYN(_AM_MYMENUS_MENU_VISIBLE, 'visible', $objArray['visible'], $statontxt, $statofftxt);
+//---------------mamba
+
+ $formtarget = new XoopsFormSelect(_AM_MYMENUS_MENU_TARGET, "target", $objArray['target']);
+ $formtarget->addOption("_self", _AM_MYMENUS_MENU_TARG_SELF);
+ $formtarget->addOption("_blank", _AM_MYMENUS_MENU_TARG_BLANK);
+ $formtarget->addOption("_parent", _AM_MYMENUS_MENU_TARG_PARENT);
+ $formtarget->addOption("_top", _AM_MYMENUS_MENU_TARG_TOP);
+
+ $formgroups = new XoopsFormSelectGroup(_AM_MYMENUS_MENU_GROUPS, "groups", true, $objArray['groups'], 5, true);
+ $formgroups->setDescription(_AM_MYMENUS_MENU_GROUPS_HELP);
+
+ $formcss = new XoopsFormText(_AM_MYMENUS_MENU_CSS, 'css', 50, 255, $objArray['css']);
+
+ $form->addElement($formtitle, true);
+ $form->addElement($formalttitle);
+ $form->addElement($formlink);
+ $form->addElement($formimage);
+ $form->addElement($formparent);
+ $form->addElement($formvis);
+ $form->addElement($formtarget);
+ $form->addElement($formgroups);
+ $form->addElement($formhooks);
+ $form->addElement($formcss);
+
+ $tray = new XoopsFormElementTray('' ,'');
+ $tray->addElement(new XoopsFormButton('', 'submit_button', _SUBMIT, 'submit'));
+
+ $btn = new XoopsFormButton('', 'reset', _CANCEL, 'button');
+
+ if (isset($id)) {
+ $btn->setExtra('onclick="document.location.href=\'' . $GLOBALS['mymenus_adminpage'] . '?op=list&menu_id=' . $menu_id . ' \'"');
+ } else {
+ $btn->setExtra('onclick="document.getElementById(\'addform\').style.display = \'none\'; return false;"');
+ }
+
+ $tray->addElement($btn);
+ $form->addElement($tray);
+
+ if (isset($id)) {
+ $form->addElement(new XoopsFormHidden('op', 'editok'));
+ $form->addElement(new XoopsFormHidden('id', $id));
+ } else {
+ $form->addElement(new XoopsFormHidden('op', 'add'));
+ }
+
+ $form->addElement(new XoopsFormHidden('mid', $menu_id));
+
+ return $form->render();
+}
+
+function mymenus_admin_move($id, $weight)
+{
+ $this_handler =& xoops_getModuleHandler('links', 'mymenus');
+ $obj = $this_handler->get($id);
+ $obj->setVar('weight', $weight);
+ $this_handler->insert($obj);
+ $this_handler->update_weights($obj);
+}
+
+function mymenus_admin_toggle($id, $visible)
+{
+ include_once XOOPS_ROOT_PATH.'/class/logger/xoopslogger.php';
+ $xoopsLogger =& XoopsLogger::getInstance();
+ $xoopsLogger->activated = true;
+ error_reporting(0);
+
+ $this_handler =& xoops_getModuleHandler('links', 'mymenus');
+ $obj = $this_handler->get($id);
+ $visible = ($obj->getVar('visible') == 1) ? 0 : 1;
+ $obj->setVar('visible', $visible);
+ $this_handler->insert($obj);
+ echo $obj->getVar('visible');
+}
Property changes on: XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: XoopsModules/mymenus/trunk/mymenus/admin/admin_menu.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_menu.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_menu.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -1,402 +0,0 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/**
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
- * @package Mymenus
- * @since 1.0
- * @author trabis <lus...@gm...>
- * @version $Id: admin_menu.php 0 2010-07-21 18:47:04Z trabis $
- */
-
-include_once dirname(__FILE__) . '/admin_header.php';
-
-$menus_handler =& xoops_getModuleHandler('menus', 'mymenus');
-$criteria = new CriteriaCompo();
-$criteria->setSort('title');
-$criteria->setOrder('ASC');
-$menus_list = $menus_handler->getList($criteria);
-
-$indexAdmin = new ModuleAdmin();
-
-if (empty($menus_list)) {
- redirect_header('admin_menus.php', 1, _AM_MYMENUS_MSG_NOMENUS);
- exit;
-}
-
-if (isset($_REQUEST['menu_id']) && in_array($_REQUEST['menu_id'], array_keys($menus_list))){
- $menu_id = $_REQUEST['menu_id'];
- $menu_title = $menus_list[$menu_id];
-} else {
- $keys = array_keys($menus_list);
- $menu_id = $keys[0];
- $menu_title = $menus_list[$menu_id];
-}
-
-$mymenusTpl->assign('menu_id', $menu_id);
-$mymenusTpl->assign('menu_title', $menu_title);
-$mymenusTpl->assign('menus_list', $menus_list);
-
-
-$op = isset($_GET['op']) ? trim($_GET['op']) : (isset($_POST['op']) ? trim($_POST['op']) : 'list');
-
-$id = isset($_GET['id']) ? intval($_GET['id']) : (isset($_POST['id']) ? intval($_POST['id']) : null);
-$pid = isset($_GET['pid']) ? intval($_GET['pid']) : (isset($_POST['pid']) ? intval($_POST['pid']) : null);
-
-$limit = isset($_GET['limit']) ? intval($_GET['limit']) : (isset($_POST['limit']) ? intval($_POST['limit']) : 15);
-$start = isset($_GET['start']) ? intval($_GET['start']) : (isset($_POST['start']) ? intval($_POST['start']) : 0);
-$redir = isset($_GET['redir']) ? $_GET['redir'] : (isset($_POST['redir']) ? $_POST['redir'] : null);
-
-$weight = isset($_GET['weight']) ? intval($_GET['weight']) : (isset($_POST['weight']) ? intval($_POST['weight']) : 0);
-$visible = isset($_GET['visible']) ? intval($_GET['visible']) : (isset($_POST['visible']) ? intval($_POST['visible']) : 0);
-
-$mymenus_adminpage = 'admin_menu.php';
-
-switch ($op) {
- case 'add':
- mymenus_admin_add();
- break;
- case 'form':
- xoops_cp_header();
- echo $indexAdmin->addNavigation('admin_menu.php');
- echo mymenus_admin_form(null, $pid);
- include 'admin_footer.php';
- break;
- case 'edit':
- xoops_cp_header();
- echo $indexAdmin->addNavigation('admin_menu.php');
- echo mymenus_admin_form($id);
- include 'admin_footer.php';
- break;
- case 'editok':
- mymenus_admin_edit($id);
- break;
- case 'del':
- mymenus_admin_confirmdel($id, $redir);
- break;
- case 'delok':
- mymenus_admin_del($id, $redir);
- break;
- case 'delall':
- mymenus_admin_confirmdel(null, $redir, 'delallok');
- break;
- case 'delallok':
- mymenus_admin_delall($redir);
- break;
- case 'move':
- xoops_cp_header();
- echo $indexAdmin->addNavigation('admin_menu.php');
- mymenus_admin_move($id, $weight);
- echo mymenus_admin_list($start);
- include 'admin_footer.php';
- break;
- case 'toggle':
- xoops_cp_header();
- echo $indexAdmin->addNavigation('admin_menu.php');
- mymenus_admin_toggle($id, $visible);
- echo mymenus_admin_list($start);
- include 'admin_footer.php';
- break;
- case 'list':
- default:
- xoops_cp_header();
- echo $indexAdmin->addNavigation('admin_menu.php');
- echo mymenus_admin_list($start);
- include 'admin_footer.php';
- break;
-}
-
-function mymenus_admin_list($start = 0)
-{
- global $mymenusTpl, $menu_id;
-
- $this_handler =& xoops_getModuleHandler('menu', 'mymenus');
-
- $criteria = new CriteriaCompo(new Criteria('mid', $menu_id));
- //$criteria->add(new Criteria('pid', 0));
-
- $count = $this_handler->getCount($criteria);
- $mymenusTpl->assign('count', $count);
- $criteria->setSort('weight');
- $criteria->setOrder('ASC');
-
- $menus = array();
- $menusArray = array();
- if ($count > 0) {
- $menus = $this_handler->getObjects($criteria);
- foreach ($menus as $menu) {
- $array[] = $menu->getValues();
- }
- include_once $GLOBALS['xoops']->path('modules/mymenus/class/builder.php');
- $builder = new MymenusBuilder($array);
- $menusArray = $builder->render();
- $mymenusTpl->assign('menus', $menusArray);
- }
-
- $mymenusTpl->assign('addform', mymenus_admin_form());
-
- return $mymenusTpl->fetch($GLOBALS['xoops']->path('modules/mymenus/templates/static/mymenus_admin_menu.html'));
-}
-
-function mymenus_admin_del($id, $redir = null)
-{
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header($GLOBALS['mymenus_adminpage'],...
[truncated message content] |
|
From: <be...@us...> - 2014-02-10 10:46:35
|
Revision: 12301
http://sourceforge.net/p/xoops/svn/12301
Author: beckmi
Date: 2014-02-10 10:46:32 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
Adding Sahi test
Added Paths:
-----------
XoopsModules/mymenus/trunk/mymenus/tests/
XoopsModules/mymenus/trunk/mymenus/tests/sahi/
XoopsModules/mymenus/trunk/mymenus/tests/sahi/mymenus150.sah
Added: XoopsModules/mymenus/trunk/mymenus/tests/sahi/mymenus150.sah
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/tests/sahi/mymenus150.sah (rev 0)
+++ XoopsModules/mymenus/trunk/mymenus/tests/sahi/mymenus150.sah 2014-02-10 10:46:32 UTC (rev 12301)
@@ -0,0 +1,25 @@
+_click(_span("Menus manager"));
+_click(_button("Add"));
+_setValue(_textbox("title"), "Menu1");
+_click(_submit("Submit"));
+_click(_button("Add"));
+_setValue(_textbox("title"), "Menu2");
+_click(_submit("Submit"));
+_click(_span("Links manager"));
+_click(_span("Add new item"));
+_setValue(_textbox("title"), "Item1");
+_setValue(_textbox("alt_title"), "Item1");
+_setValue(_textbox("link"), "/user.php");
+_setValue(_textbox("title"), "View Account");
+_setValue(_textbox("alt_title"), "View User Account");
+_click(_submit("Submit"));
+_click(_span("Add new item"));
+_setValue(_textbox("title"), "Inbox");
+_setValue(_textbox("alt_title"), "Email Inbox");
+_setValue(_textbox("link"), "/viewpmsg.php");
+_click(_submit("Submit"));
+_click(_span("Add new item"));
+_setValue(_textbox("title"), "Notifications");
+_setValue(_textbox("alt_title"), "Notifications");
+_setValue(_textbox("link"), "/notifications.php");
+_click(_submit("Submit"));
|
|
From: <be...@us...> - 2014-02-10 12:35:10
|
Revision: 12302
http://sourceforge.net/p/xoops/svn/12302
Author: beckmi
Date: 2014-02-10 12:35:06 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
fixed some minor issues with block options (mamba)
Modified Paths:
--------------
XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php
XoopsModules/mymenus/trunk/mymenus/admin/menu.php
XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php
XoopsModules/mymenus/trunk/mymenus/class/builder.php
XoopsModules/mymenus/trunk/mymenus/class/links.php
XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt
XoopsModules/mymenus/trunk/mymenus/xoops_version.php
Modified: XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php 2014-02-10 10:46:32 UTC (rev 12301)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php 2014-02-10 12:35:06 UTC (rev 12302)
@@ -108,7 +108,7 @@
foreach ($test['mod'] as $order=>$value) {
$obj = $this_handler->get($order);
- $obj->setVar('weight', $i++);
+ $obj->setVar('weight', ++$i);
/*set submenu*/
if(isset($value)){
@@ -201,11 +201,11 @@
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('id', $id));
$criteria->add(new Criteria('pid', $id),'OR');
-
+
//first delete links level 2
global $xoopsDB;
- $query = "DELETE FROM ".$xoopsDB->prefix("mymenus_links")." WHERE pid = (
- SELECT id FROM (
+ $query = "DELETE FROM ".$xoopsDB->prefix("mymenus_links")." WHERE pid = (
+ SELECT id FROM (
SELECT * FROM ".$xoopsDB->prefix("mymenus_links")." WHERE pid = ".$id.") AS sec
);";
$result = $xoopsDB->queryF($query);
Modified: XoopsModules/mymenus/trunk/mymenus/admin/menu.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/menu.php 2014-02-10 10:46:32 UTC (rev 12301)
+++ XoopsModules/mymenus/trunk/mymenus/admin/menu.php 2014-02-10 12:35:06 UTC (rev 12302)
@@ -28,19 +28,19 @@
xoops_loadLanguage('admin', $dirname);
$i = 0;
-$i++;
+++$i;
$adminmenu[$i]["title"] = _MI_MYMENUS_ADMMENU0;
$adminmenu[$i]["link"] = 'admin/index.php';
$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_MYMENUS_MENUSMANAGER;
$adminmenu[$i]['link'] = "admin/admin_menus.php";
$adminmenu[$i]["icon"] = $pathIcon32.'/manage.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_MYMENUS_MENUMANAGER;
$adminmenu[$i]['link'] = "admin/admin_links.php";
$adminmenu[$i]["icon"] = $pathIcon32.'/insert_table_row.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_MYMENUS_ABOUT;
$adminmenu[$i]['link'] = "admin/about.php";
$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
Modified: XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php 2014-02-10 10:46:32 UTC (rev 12301)
+++ XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php 2014-02-10 12:35:06 UTC (rev 12302)
@@ -135,7 +135,7 @@
$menuObj = $menus_handler->getAll($menucriteria, null, false, false);
$itemsCount = count($menuObj);
if ($menuObj) {
- for ($i = 0; $i < $itemsCount; $i++) {
+ for ($i = 0; $i < $itemsCount; ++$i) {
$menucss = isset($menuObj[$i]['css']) ? $menuObj[$i]['css']: '';
}
}
@@ -160,7 +160,7 @@
{
//Unique ID
if (!$options[3] || (isset($_GET['op']) && $_GET['op'] == 'clone')) $options[3] = time();
-
+$i = 0;
$menus_handler =& xoops_getModuleHandler('menus', 'mymenus');
xoops_loadLanguage('admin', 'mymenus');
@@ -177,16 +177,17 @@
xoops_load('XoopsFormLoader');
- //Menu
- $form = "<b>" . _MB_MYMENUS_SELECT_MENU . "</b> ";
- $element = new XoopsFormSelect('', 'options[0]', $options[0], 1);
+ //Menu 0
+ $form = "<b>" . _MB_MYMENUS_SELECT_MENU . "</b> ";
+ $element = new XoopsFormSelect('', 'options['.$i.'0]', $options[$i], 1);
$element->addOptionArray($menus);
$form .= $element->render();
$form .= "</select>\n <i>" . _MB_MYMENUS_SELECT_MENU_DSC . "</i><br /><br />";
- //Skin
+ //Skin 1
+ ++$i;
xoops_load('XoopsLists');
- $temp_skins = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . "/modules/mymenus/skins/", "");
+ $temp_skins = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . "/modules/mymenus/skins/", "");
$skins_options = array();
foreach ($temp_skins as $key => $skin) {
if (file_exists($GLOBALS['xoops']->path('modules/mymenus/skins/' . $skin . '/skin_version.php'))) {
@@ -194,48 +195,58 @@
}
}
$form .= "<b>" . _MB_MYMENUS_SELECT_SKIN . "</b> ";
- $element = new XoopsFormSelect('', 'options[1]', $options[1], 1);
+ $element = new XoopsFormSelect('', 'options['.$i.'0]', $options[$i], 1);
$element->addOptionArray($skins_options);
$form .= $element->render();
$form .= "</select>\n <i>" . _MB_MYMENUS_SELECT_SKIN_DSC . "</i><br /><br />";
- //Use skin from,theme
+ //Use skin from,theme 2
+ ++$i;
$form .= "<b>" . _MB_MYMENUS_USE_THEME_SKIN . "</b> ";
- $element = new XoopsFormRadioYN('', 'options[2]', $options[2]);
+ $element = new XoopsFormRadioYN('', 'options['.$i.'0]', $options[$i]);
$form .= $element->render();
$form .= "</select>\n <i>" . _MB_MYMENUS_USE_THEME_SKIN_DSC . "</i><br /><br />";
- //Skin from theme - @luciorota
- xoops_load('XoopsLists');
- $temp_theme_skins = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . "/themes/" . $GLOBALS['xoopsConfig']['theme_set'] . "/modules/mymenus/skins/", "");
- $theme_skins_options = array();
- foreach ($temp_theme_skins as $key => $theme_skin) {
- if (file_exists(XOOPS_ROOT_PATH . '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/modules/mymenus/skins/' . $theme_skin . '/skin_version.php')) {
- $theme_skins_options[$theme_skin] = '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/modules/mymenus/skins/' . $theme_skin . '';
- }
- }
+ //Skin from theme 3 - @luciorota
- $form .= "<b>" . _MB_MYMENUS_SELECT_SKIN_FROM_THEME . "</b> ";
- $element = new XoopsFormSelect('', 'options[3]', $options[3], 1);
- $element->addOption('', '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/menu');
- $element->addOptionArray($theme_skins_options);
- $form .= $element->render();
- $form .= "</select>\n <i>" . _MB_MYMENUS_SELECT_SKIN_FROM_THEME_DSC . "</i><br /><br />";
- //Display method
+ if (file_exists(XOOPS_ROOT_PATH . '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/modules/mymenus/skins/')) {
+ ++$i;
+ xoops_load('XoopsLists');
+ $temp_theme_skins = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . "/themes/" . $GLOBALS['xoopsConfig']['theme_set'] . "/modules/mymenus/skins/","");
+ if (isset($temp_theme_skins)) {
+ $theme_skins_options = array();
+ foreach ($temp_theme_skins as $key => $theme_skin) {
+ if (file_exists(XOOPS_ROOT_PATH . '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/modules/mymenus/skins/' . $theme_skin . '/skin_version.php')) {
+ $theme_skins_options[$theme_skin] = '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/modules/mymenus/skins/' . $theme_skin . '';
+ }
+ }
+
+ $form .= "<b>" . _MB_MYMENUS_SELECT_SKIN_FROM_THEME . "</b> ";
+ $element = new XoopsFormSelect('', 'options['.$i.'0]', $options[$i], 1);
+ $element->addOption('', '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/menu');
+ $element->addOptionArray($theme_skins_options);
+ $form .= $element->render();
+ $form .= "</select>\n <i>" . _MB_MYMENUS_SELECT_SKIN_FROM_THEME_DSC . "</i><br /><br />";
+}
+}
+
+ //Display method 4
+ ++$i;
$display_options = array(
'block' => _MB_MYMENUS_DISPLAY_METHOD_BLOCK,
'template' => _MB_MYMENUS_DISPLAY_METHOD_TEMPLATE
);
$form .= "<b>" . _MB_MYMENUS_DISPLAY_METHOD . "</b> ";
- $element = new XoopsFormSelect('', 'options[4]', $options[4], 1);
+ $element = new XoopsFormSelect('', 'options['.$i.'0]', $options[$i], 1);
$element->addOptionArray($display_options);
$form .= $element->render();
$form .= "</select>\n <i>" . _MB_MYMENUS_DISPLAY_METHOD_DSC . "</i><br /><br />";
- //Unique ID
+ //Unique ID 5
+ ++$i;
$form .= "<b>" . _MB_MYMENUS_UNIQUEID . "</b> ";
- $element = new XoopsFormText('', 'options[5]', 10, 50, $options[5]);
+ $element = new XoopsFormText('', 'options['.$i.'0]', 10, 50, $options[$i]);
$form .= $element->render();
$form .= "\n <i>" . _MB_MYMENUS_UNIQUEID_DSC . "</i><br /><br />";
Modified: XoopsModules/mymenus/trunk/mymenus/class/builder.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/builder.php 2014-02-10 10:46:32 UTC (rev 12301)
+++ XoopsModules/mymenus/trunk/mymenus/class/builder.php 2014-02-10 12:35:06 UTC (rev 12302)
@@ -114,7 +114,7 @@
$query_string = $_SERVER['QUERY_STRING'] ? '?' . $_SERVER['QUERY_STRING'] : '';
$self = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] . $query_string;
- //set a default page in case we don�t get matches
+ //set a default page in case we don't get matches
$default = XOOPS_URL . "/index.php";
//get all matching links
Modified: XoopsModules/mymenus/trunk/mymenus/class/links.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/links.php 2014-02-10 10:46:32 UTC (rev 12301)
+++ XoopsModules/mymenus/trunk/mymenus/class/links.php 2014-02-10 12:35:06 UTC (rev 12302)
@@ -106,7 +106,7 @@
. " WHERE id = {$id}"
;
$this->db->queryF($sql);
- $i++;
+ ++$i;
}
}
}
Modified: XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt 2014-02-10 10:46:32 UTC (rev 12301)
+++ XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt 2014-02-10 12:35:06 UTC (rev 12302)
@@ -1,6 +1,7 @@
<b><u>Version 1.5 Beta 1 (2014-02-08)</u></b>
- merged @luciorota code: possibility to have more then one skin provided in the theme (bleekk)
+- fixed some minor issues with block options (mamba)
<b><u>Version 1.454 Beta 1 (2014-01-29)</u></b>
Modified: XoopsModules/mymenus/trunk/mymenus/xoops_version.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/xoops_version.php 2014-02-10 10:46:32 UTC (rev 12301)
+++ XoopsModules/mymenus/trunk/mymenus/xoops_version.php 2014-02-10 12:35:06 UTC (rev 12302)
@@ -30,7 +30,7 @@
$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html";
$modversion['official'] = 0;
$modversion['image'] = "images/mymenus.png";
-$modversion['dirname'] = basename(dirname(__FILE__));
+$modversion['dirname'] = basename(dirname(__FILE__));
$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
@@ -68,14 +68,14 @@
// Sql
$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
$i = 0;
-$i++;
+++$i;
$modversion['tables'][$i] = "mymenus_links";
-$i++;
+++$i;
$modversion['tables'][$i] = "mymenus_menus";
// Config
$i = 0;
-$i++;
+++$i;
$modversion['config'][$i]['name'] = 'assign_method';
$modversion['config'][$i]['title'] = '_MI_MENUS_CONF_ASSIGN_METHOD';
$modversion['config'][$i]['description'] = '_MI_MENUS_CONF_ASSIGN_METHOD_DSC';
@@ -88,7 +88,7 @@
// Blocks
$i = 0;
-$i++;
+++$i;
$modversion['blocks'][$i]['file'] = "mymenus_block.php";
$modversion['blocks'][$i]['name'] = _MI_MYMENUS_BLK;
$modversion['blocks'][$i]['description'] = _MI_MYMENUS_BLK_DSC;
|
|
From: <be...@us...> - 2014-02-10 12:38:51
|
Revision: 12303
http://sourceforge.net/p/xoops/svn/12303
Author: beckmi
Date: 2014-02-10 12:38:48 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
Changing version to Beta 2
Modified Paths:
--------------
XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt
XoopsModules/mymenus/trunk/mymenus/xoops_version.php
Modified: XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt 2014-02-10 12:35:06 UTC (rev 12302)
+++ XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt 2014-02-10 12:38:48 UTC (rev 12303)
@@ -1,7 +1,9 @@
+<b><u>Version 1.5 Beta 2 (2014-02-10)</u></b>
+- fixed some minor issues with block options (mamba)
+
<b><u>Version 1.5 Beta 1 (2014-02-08)</u></b>
- merged @luciorota code: possibility to have more then one skin provided in the theme (bleekk)
-- fixed some minor issues with block options (mamba)
<b><u>Version 1.454 Beta 1 (2014-01-29)</u></b>
Modified: XoopsModules/mymenus/trunk/mymenus/xoops_version.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/xoops_version.php 2014-02-10 12:35:06 UTC (rev 12302)
+++ XoopsModules/mymenus/trunk/mymenus/xoops_version.php 2014-02-10 12:38:48 UTC (rev 12303)
@@ -36,10 +36,10 @@
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2013/10/06';
+$modversion['release_date'] = '2014/02/10';
$modversion["module_website_url"] = "www.xoops.org";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "Beta 1";
+$modversion["module_status"] = "Beta 2";
$modversion["author_website_url"] = "http://www.xuups.com/";
$modversion["author_website_name"] = "Xuups";
$modversion['min_php'] = '5.3.7';
|
|
From: <be...@us...> - 2014-03-21 19:35:18
|
Revision: 12400
http://sourceforge.net/p/xoops/svn/12400
Author: beckmi
Date: 2014-03-21 19:35:13 +0000 (Fri, 21 Mar 2014)
Log Message:
-----------
Adding changes from Trabis (see changelog), updating to Beta 3
Modified Paths:
--------------
XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php
XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php
XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt
XoopsModules/mymenus/trunk/mymenus/docs/skins.txt
XoopsModules/mymenus/trunk/mymenus/js/order.js
XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/mymenus.php
XoopsModules/mymenus/trunk/mymenus/templates/static/mymenus_admin_links.html
XoopsModules/mymenus/trunk/mymenus/xoops_version.php
Added Paths:
-----------
XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/
XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/css/
XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/css/index.html
XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/css/superfish-navbar.css
XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/css/superfish-vertical.css
XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/css/superfish.css
XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/images/
XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/images/arrows-ffffff.png
XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/images/index.html
XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/images/shadow.png
XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/index.html
XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/templates/
XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/templates/index.html
XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/templates/template.html
Modified: XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php 2014-03-21 15:05:23 UTC (rev 12399)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php 2014-03-21 19:35:13 UTC (rev 12400)
@@ -289,6 +289,7 @@
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($GLOBALS['mymenus_adminpage'], 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
}
+ global $menu_id;
/* Disable xoops debugger in dialog window */
@@ -308,7 +309,7 @@
$msg = _AM_MYMENUS_MSG_SUCCESS;
}
- redirect_header($GLOBALS['mymenus_adminpage'] . '?op=list', 2, $msg);
+ redirect_header($GLOBALS['mymenus_adminpage'] . "?op=list&menu_id=$menu_id", 2, $msg);
}
function mymenus_admin_form($id = null, $pid = null)
@@ -409,6 +410,7 @@
}
$form->addElement(new XoopsFormHidden('mid', $menu_id));
+ $form->addElement(new XoopsFormHidden('menu_id', $menu_id));
return $form->render();
}
Modified: XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php 2014-03-21 15:05:23 UTC (rev 12399)
+++ XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php 2014-03-21 19:35:13 UTC (rev 12400)
@@ -144,9 +144,9 @@
$block['content'] = $blockTpl->fetch($skin_info['template']);
- if ($options[4] == 'template') {
- $xoopsTpl->assign('xoops_links_' . $options[5] , $block['content']);
- $block = array();
+ if ($options[3] == 'template') {
+ $xoopsTpl->assign($options[4] , $block['content']);
+ $block = false;
}
$registry->unsetAll();
Modified: XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt 2014-03-21 15:05:23 UTC (rev 12399)
+++ XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt 2014-03-21 19:35:13 UTC (rev 12400)
@@ -1,3 +1,8 @@
+<b><u>Version 1.5 Beta 3 (2014-03-21)</u></b>
+- fixed bug: when editing a menu it looses the parent id (trabis)
+- changes: Prefix is not used anymore when assigning menus to smarty, choose full name now (trabis)
+- added: bootstrap skin with multi level menu support, requires a bootstrap theme prepared to hold the menu (trabis)
+
<b><u>Version 1.5 Beta 2 (2014-02-10)</u></b>
- fixed some minor issues with block options (mamba)
Modified: XoopsModules/mymenus/trunk/mymenus/docs/skins.txt
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/docs/skins.txt 2014-03-21 15:05:23 UTC (rev 12399)
+++ XoopsModules/mymenus/trunk/mymenus/docs/skins.txt 2014-03-21 19:35:13 UTC (rev 12400)
@@ -29,7 +29,7 @@
)
[image] => (image to be used in the link, you can choose not to support it in your skin)
- [css] => (this is inline css for this item, it goes inside <a style="$item.css">)
+ [css] => (this is inline css for this item, it goes inside <a style="$item.css">)
[oul] => 1 (IMPORTANT! Open UL -> this menu item requires skin to prepend <ul> open element tag)
[oli] => 1 (IMPORTANT! Open LI -> this menu item requires skin to prepend <li> open element tag)
[close] => (IMPORTANT! this holds closing tags, it will automatically generate </li></ul> tags for you)
@@ -43,7 +43,7 @@
)
-- Skin structure:
-Skins go into
+Skins go into
"mymenus/skins" folder or
"public_html/themes/yourtheme/menu" folder
and they should have a skin_version.php file in it
@@ -92,9 +92,9 @@
$skinpath - holds the path of the skin
-- For Theme designers:
-Since users can choose the smarty variable for each menu,
+Since users can choose the smarty variable for each menu,
I would advise you to use <{$xoops_links_navbar}> as a place holder.
-If you provide a skin for your theme, ask users to:
--- --enter "navbar" as unique_id in block settings.
+If you provide a skin for your theme, ask users to:
+-- --enter "xoops_links_navbar" as unique_id in block settings.
-- --set "render to smarty variable" in block settings.
-- --set "use skin from theme" in block settings.
Modified: XoopsModules/mymenus/trunk/mymenus/js/order.js
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/js/order.js 2014-03-21 15:05:23 UTC (rev 12399)
+++ XoopsModules/mymenus/trunk/mymenus/js/order.js 2014-03-21 19:35:13 UTC (rev 12400)
@@ -75,9 +75,9 @@
});
}
- function showWindow(id){
+ function showWindow(id, menuid){
$("#hidden-result_"+id).show();
- $( "#result" ).load( "admin_links.php?id="+id+"&op=edit", function(response, status, xhr) {
+ $( "#result" ).load( "admin_links.php?id="+id+"&menu_id="+menuid+"&op=edit", function(response, status, xhr) {
if ( status == "error" ) {
var msg = "Sorry but there was an error: ";
$( "#error" ).html( msg + xhr.status + " " + xhr.statusText );
Modified: XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/mymenus.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/mymenus.php 2014-03-21 15:05:23 UTC (rev 12399)
+++ XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/mymenus.php 2014-03-21 19:35:13 UTC (rev 12400)
@@ -68,13 +68,15 @@
function eventImageDecoration()
{
- /*
+
$registry =& MymenusRegistry::getInstance();
$linkArray = $registry->getEntry('link_array');
if (!empty($linkArray['image'])) {
- $linkArray['image'] = XOOPS_URL . '/' . $linkArray['image']; //Do not do this in other decorators
+ $linkArray['image'] = XOOPS_URL . '/' . $linkArray['image'];
+ //Do not do this in other decorators
+ $linkArray['image'] = self::_doDecoration($linkArray['image']);
$registry->setEntry('link_array', $linkArray);
- }*/
+ }
}
function eventTitleDecoration()
Added: XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/css/index.html
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/css/index.html (rev 0)
+++ XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/css/index.html 2014-03-21 19:35:13 UTC (rev 12400)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
Added: XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/css/superfish-navbar.css
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/css/superfish-navbar.css (rev 0)
+++ XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/css/superfish-navbar.css 2014-03-21 19:35:13 UTC (rev 12400)
@@ -0,0 +1,101 @@
+/*** adding the class sf-navbar in addition to sf-menu creates an all-horizontal nav-bar menu ***/
+.sf-navbar {
+ background: #BDD2FF;
+ height: 2.5em;
+ /*padding-bottom: 2.5em;*/
+ position: relative;
+}
+
+.sf-navbar li {
+ background: #AABDE6;
+ position: static;
+}
+
+.sf-navbar a {
+ border-top: none;
+}
+
+.sf-navbar li ul {
+ width: 44em; /*IE6 soils itself without this*/
+}
+
+.sf-navbar li li {
+ background: #BDD2FF;
+ position: relative;
+}
+
+.sf-navbar li li ul {
+ width: 13em;
+}
+
+.sf-navbar li li li {
+ width: 100%;
+}
+
+.sf-navbar ul li {
+ width: auto;
+ float: left;
+}
+
+.sf-navbar a,.sf-navbar a:visited {
+ border: none;
+}
+
+.sf-navbar li.current {
+ background: #BDD2FF;
+}
+
+.sf-navbar li:hover,.sf-navbar li.sfHover,.sf-navbar li li.current,.sf-navbar a:focus,.sf-navbar a:hover,.sf-navbar a:active
+ {
+ background: #BDD2FF;
+}
+
+.sf-navbar ul li:hover,.sf-navbar ul li.sfHover,ul.sf-navbar ul li:hover li,ul.sf-navbar ul li.sfHover li,.sf-navbar ul a:focus,.sf-navbar ul a:hover,.sf-navbar ul a:active
+ {
+ background: #D1DFFF;
+}
+
+ul.sf-navbar li li li:hover,ul.sf-navbar li li li.sfHover,.sf-navbar li li.current li.current,.sf-navbar ul li li a:focus,.sf-navbar ul li li a:hover,.sf-navbar ul li li a:active
+ {
+ background: #E6EEFF;
+}
+
+ul.sf-navbar .current ul,ul.sf-navbar ul li:hover ul,ul.sf-navbar ul li.sfHover ul
+ {
+ left: 0;
+ top: 2.5em; /* match top ul list item height */
+}
+
+ul.sf-navbar .current ul ul {
+ top: -999em;
+}
+
+.sf-navbar li li.current>a {
+ font-weight: bold;
+}
+
+/*** point all arrows down ***/ /* point right for anchors in subs */
+.sf-navbar ul .sf-sub-indicator {
+ background-position: -10px -100px;
+}
+
+.sf-navbar ul a>.sf-sub-indicator {
+ background-position: 0 -100px;
+}
+
+/* apply hovers to modern browsers */
+.sf-navbar ul a:focus>.sf-sub-indicator,.sf-navbar ul a:hover>.sf-sub-indicator,.sf-navbar ul a:active>.sf-sub-indicator,.sf-navbar ul li:hover>a>.sf-sub-indicator,.sf-navbar ul li.sfHover>a>.sf-sub-indicator
+ {
+ background-position: -10px -100px;
+ /* arrow hovers for modern browsers*/
+}
+
+/*** remove shadow on first submenu ***/
+.sf-navbar>li>ul {
+ background: transparent;
+ padding: 0;
+ -moz-border-radius-bottomleft: 0;
+ -moz-border-radius-topright: 0;
+ -webkit-border-top-right-radius: 0;
+ -webkit-border-bottom-left-radius: 0;
+}
\ No newline at end of file
Added: XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/css/superfish-vertical.css
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/css/superfish-vertical.css (rev 0)
+++ XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/css/superfish-vertical.css 2014-03-21 19:35:13 UTC (rev 12400)
@@ -0,0 +1,23 @@
+/*** adding sf-vertical in addition to sf-menu creates a vertical menu ***/
+.sf-vertical,.sf-vertical li {
+ width: 10em;
+}
+
+/* this lacks ul at the start of the selector, so the styles from the main CSS file override it where needed */
+.sf-vertical li:hover ul,.sf-vertical li.sfHover ul {
+ left: 10em; /* match ul width */
+ top: 0;
+}
+
+/*** alter arrow directions ***/
+.sf-vertical .sf-sub-indicator {
+ background-position: -10px 0;
+} /* IE6 gets solid image only */
+.sf-vertical a>.sf-sub-indicator {
+ background-position: 0 0;
+} /* use translucent arrow for modern browsers*/
+ /* hover arrow direction for modern browsers*/
+.sf-vertical a:focus>.sf-sub-indicator,.sf-vertical a:hover>.sf-sub-indicator,.sf-vertical a:active>.sf-sub-indicator,.sf-vertical li:hover>a>.sf-sub-indicator,.sf-vertical li.sfHover>a>.sf-sub-indicator
+ {
+ background-position: -10px 0; /* arrow hovers for modern browsers*/
+}
\ No newline at end of file
Added: XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/css/superfish.css
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/css/superfish.css (rev 0)
+++ XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/css/superfish.css 2014-03-21 19:35:13 UTC (rev 12400)
@@ -0,0 +1,156 @@
+/*** ESSENTIAL STYLES ***/
+.sf-menu,.sf-menu * {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+
+.sf-menu {
+ line-height: 1.0;
+}
+
+.sf-menu ul {
+ position: absolute;
+ top: -999em;
+ width: 10em; /* left offset of submenus need to match (see below) */
+}
+
+.sf-menu ul li {
+ width: 100%;
+}
+
+.sf-menu li:hover {
+ visibility: inherit; /* fixes IE7 'sticky bug' */
+}
+
+.sf-menu li {
+ float: left;
+ position: relative;
+}
+
+.sf-menu a {
+ display: block;
+ position: relative;
+}
+
+.sf-menu li:hover ul,.sf-menu li.sfHover ul {
+ left: 0;
+ top: 2.5em; /* match top ul list item height */
+ z-index: 99;
+}
+
+ul.sf-menu li:hover li ul,ul.sf-menu li.sfHover li ul {
+ top: -999em;
+}
+
+ul.sf-menu li li:hover ul,ul.sf-menu li li.sfHover ul {
+ left: 10em; /* match ul width */
+ top: 0;
+}
+
+ul.sf-menu li li:hover li ul,ul.sf-menu li li.sfHover li ul {
+ top: -999em;
+}
+
+ul.sf-menu li li li:hover ul,ul.sf-menu li li li.sfHover ul {
+ left: 10em; /* match ul width */
+ top: 0;
+}
+
+/*** DEMO SKIN ***/
+.sf-menu {
+ float: left;
+ margin-bottom: 1em;
+}
+
+.sf-menu a {
+ border-left: 1px solid #fff;
+ border-top: 1px solid #CFDEFF;
+ padding: .75em 1em;
+ text-decoration: none;
+}
+
+.sf-menu a,.sf-menu a:visited {
+ /* visited pseudo selector so IE6 applies text colour*/
+ color: #13a;
+}
+
+.sf-menu li {
+ background: #BDD2FF;
+}
+
+.sf-menu li li {
+ background: #AABDE6;
+}
+
+.sf-menu li li li {
+ background: #9AAEDB;
+}
+
+.sf-menu li:hover,.sf-menu li.sfHover,.sf-menu a:focus,.sf-menu a:hover,.sf-menu a:active
+ {
+ background: #CFDEFF;
+ outline: 0;
+}
+
+/*** arrows **/
+.sf-menu a.sf-with-ul {
+ padding-right: 2.25em;
+ min-width: 1px;
+ /* trigger IE7 hasLayout so spans position accurately */
+}
+
+.sf-sub-indicator {
+ position: absolute;
+ display: block;
+ right: .75em;
+ top: 1.05em; /* IE6 only */
+ width: 10px;
+ height: 10px;
+ text-indent: -999em;
+ overflow: hidden;
+ background: url('../images/arrows-ffffff.png') no-repeat -10px -100px;
+ /* 8-bit indexed alpha png. IE6 gets solid image only */
+}
+
+a>.sf-sub-indicator { /* give all except IE6 the correct values */
+ top: .8em;
+ background-position: 0 -100px;
+ /* use translucent arrow for modern browsers*/
+}
+
+/* apply hovers to modern browsers */
+a:focus>.sf-sub-indicator,a:hover>.sf-sub-indicator,a:active>.sf-sub-indicator,li:hover>a>.sf-sub-indicator,li.sfHover>a>.sf-sub-indicator
+ {
+ background-position: -10px -100px;
+ /* arrow hovers for modern browsers*/
+}
+
+/* point right for anchors in subs */
+.sf-menu ul .sf-sub-indicator {
+ background-position: -10px 0;
+}
+
+.sf-menu ul a>.sf-sub-indicator {
+ background-position: 0 0;
+}
+
+/* apply hovers to modern browsers */
+.sf-menu ul a:focus>.sf-sub-indicator,.sf-menu ul a:hover>.sf-sub-indicator,.sf-menu ul a:active>.sf-sub-indicator,.sf-menu ul li:hover>a>.sf-sub-indicator,.sf-menu ul li.sfHover>a>.sf-sub-indicator
+ {
+ background-position: -10px 0; /* arrow hovers for modern browsers*/
+}
+
+/*** shadows for all but IE6 ***/
+.sf-shadow ul {
+ background: url('../images/shadow.png') no-repeat bottom right;
+ padding: 0 8px 9px 0;
+ -moz-border-radius-bottomleft: 17px;
+ -moz-border-radius-topright: 17px;
+ -webkit-border-top-right-radius: 17px;
+ -webkit-border-bottom-left-radius: 17px;
+}
+
+.sf-shadow ul.sf-shadow-off {
+ background: transparent;
+}
\ No newline at end of file
Added: XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/images/arrows-ffffff.png
===================================================================
(Binary files differ)
Index: XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/images/arrows-ffffff.png
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/images/arrows-ffffff.png 2014-03-21 15:05:23 UTC (rev 12399)
+++ XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/images/arrows-ffffff.png 2014-03-21 19:35:13 UTC (rev 12400)
Property changes on: XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/images/arrows-ffffff.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/images/index.html
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/images/index.html (rev 0)
+++ XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/images/index.html 2014-03-21 19:35:13 UTC (rev 12400)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
Added: XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/images/shadow.png
===================================================================
(Binary files differ)
Index: XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/images/shadow.png
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/images/shadow.png 2014-03-21 15:05:23 UTC (rev 12399)
+++ XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/images/shadow.png 2014-03-21 19:35:13 UTC (rev 12400)
Property changes on: XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/images/shadow.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/index.html
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/index.html (rev 0)
+++ XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/index.html 2014-03-21 19:35:13 UTC (rev 12400)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
Added: XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/skin_version.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/skin_version.php (rev 0)
+++ XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/skin_version.php 2014-03-21 19:35:13 UTC (rev 12400)
@@ -0,0 +1,43 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @package Mymenus
+ * @since 1.0
+ * @author trabis <lus...@gm...>
+ * @version $Id$
+ */
+
+$skinversion['template'] = 'templates/template.html';
+
+$skinversion['css'] = array(
+ 'css/superfish.css',
+ 'css/superfish-navbar.css'
+);
+
+$skinversion['js'] = array(
+ '../../js/jquery-1.3.2.min.js',
+ '../../js/hoverIntent.js',
+ '../../js/superfish.js'
+);
+
+$header = "\n" . '<script type="text/javascript">';
+$header .= "\n" . ' var $sfnav = jQuery.noConflict()';
+$header .= "\n" . ' $sfnav(function(){';
+$header .= "\n" . ' $sfnav(\'ul.sf-menu\').superfish({';
+$header .= "\n" . ' pathClass: \'current\'';
+$header .= "\n" . ' });';
+$header .= "\n" . ' });';
+$header .= "\n" . '</script>';
+
+$skinversion['header'] = $header;
Property changes on: XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/skin_version.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/templates/index.html
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/templates/index.html (rev 0)
+++ XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/templates/index.html 2014-03-21 19:35:13 UTC (rev 12400)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
Added: XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/templates/template.html
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/templates/template.html (rev 0)
+++ XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/templates/template.html 2014-03-21 19:35:13 UTC (rev 12400)
@@ -0,0 +1,35 @@
+<{foreach item=menu from = $block}>
+<{if $menu.oul}>
+ <{if $menu.level == 0}>
+ <ul class="nav navbar-nav <{$menucss}>">
+ <{elseif $menu.level == 1}>
+ <ul class="dropdown-menu <{$menucss}>">
+ <{else}>
+ <ul class="dropdown-menu sub-menu <{$menucss}>">
+ <{/if}>
+<{/if}>
+
+ <{if $menu.oli}>
+ <{if $menu.hassub && $menu.level == 0}>
+ <li class="dropdown <{if $menu.selected}>active <{/if}><{$menu.css}>">
+ <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 class="<{if $menu.selected}>active <{/if}><{$menu.css}>">
+ <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 class="<{if $menu.selected}>active <{/if}><{$menu.css}>">
+ <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 $menu.close != ''}><{$menu.close}><{/if}>
+<{/foreach}>
\ No newline at end of file
Modified: XoopsModules/mymenus/trunk/mymenus/templates/static/mymenus_admin_links.html
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/templates/static/mymenus_admin_links.html 2014-03-21 15:05:23 UTC (rev 12399)
+++ XoopsModules/mymenus/trunk/mymenus/templates/static/mymenus_admin_links.html 2014-03-21 19:35:13 UTC (rev 12400)
@@ -54,7 +54,7 @@
<input id="id-<{$menu.id}>" type="button" title="<{$smarty.const._AM_MYMENUS_ACTION_TOGGLE}>" class="toggleBtn icon-<{$menu.visible}>" onclick="itemOnOff(<{$menu.id}>)" readonly="readonly">
- <a href="#" onclick="showWindow(<{$menu.id}>)">
+ <a href="#" onclick="showWindow(<{$menu.id}>, <{$menu_id}>)">
<img style="padding: 1px 2px 0 0" src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>"/>
</a>
<a href="admin_links.php?menu_id=<{$menu_id}>&op=del&id=<{$menu.id}>">
Modified: XoopsModules/mymenus/trunk/mymenus/xoops_version.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/xoops_version.php 2014-03-21 15:05:23 UTC (rev 12399)
+++ XoopsModules/mymenus/trunk/mymenus/xoops_version.php 2014-03-21 19:35:13 UTC (rev 12400)
@@ -36,10 +36,10 @@
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2014/02/10';
+$modversion['release_date'] = '2014/03/21';
$modversion["module_website_url"] = "www.xoops.org";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "Beta 2";
+$modversion["module_status"] = "Beta 3";
$modversion["author_website_url"] = "http://www.xuups.com/";
$modversion["author_website_name"] = "Xuups";
$modversion['min_php'] = '5.3.7';
|
|
From: <be...@us...> - 2014-03-25 08:47:53
|
Revision: 12408
http://sourceforge.net/p/xoops/svn/12408
Author: beckmi
Date: 2014-03-25 08:47:48 +0000 (Tue, 25 Mar 2014)
Log Message:
-----------
Adding checks for Multilingual menus
Modified Paths:
--------------
XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php
XoopsModules/mymenus/trunk/mymenus/admin/admin_menus.php
XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php
XoopsModules/mymenus/trunk/mymenus/class/about.php
XoopsModules/mymenus/trunk/mymenus/class/builder.php
XoopsModules/mymenus/trunk/mymenus/class/links.php
XoopsModules/mymenus/trunk/mymenus/class/menus.php
XoopsModules/mymenus/trunk/mymenus/class/plugin.php
XoopsModules/mymenus/trunk/mymenus/class/registry.php
XoopsModules/mymenus/trunk/mymenus/docs/readme.txt
XoopsModules/mymenus/trunk/mymenus/docs/skins.txt
XoopsModules/mymenus/trunk/mymenus/docs/usage.txt
XoopsModules/mymenus/trunk/mymenus/include/functions.php
XoopsModules/mymenus/trunk/mymenus/include/update.php
XoopsModules/mymenus/trunk/mymenus/include/xoops.php
XoopsModules/mymenus/trunk/mymenus/plugins/constant/constant.php
XoopsModules/mymenus/trunk/mymenus/plugins/dynamic/dynamic.php
XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/mymenus.php
XoopsModules/mymenus/trunk/mymenus/plugins/smarty/smarty.php
XoopsModules/mymenus/trunk/mymenus/skins/bootstrap/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/breadcrumb/template.html
XoopsModules/mymenus/trunk/mymenus/skins/clean/template.html
XoopsModules/mymenus/trunk/mymenus/skins/default/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/mainmenu/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/multiblack/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/superfish/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/superfish_navbar/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/tw_blue/templates/template.html
Modified: XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php 2014-03-25 05:05:24 UTC (rev 12407)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php 2014-03-25 08:47:48 UTC (rev 12408)
@@ -28,7 +28,6 @@
$indexAdmin = new ModuleAdmin();
-
if (empty($menus_list)) {
redirect_header('admin_menus.php', 1, _AM_MYMENUS_MSG_NOMENUS);
exit;
@@ -96,30 +95,30 @@
echo mymenus_admin_list($start);
include 'admin_footer.php';
break;
- case 'toggle':
+ case 'toggle':
mymenus_admin_toggle($id, $visible);
break;
case 'order':
- $order = $_POST['mod'];
- parse_str($order,$test);
+ $order = $_POST['mod'];
+ parse_str($order,$test);
- $i = 1;
+ $i = 1;
$this_handler =& xoops_getModuleHandler('links', 'mymenus');
- foreach ($test['mod'] as $order=>$value) {
+ foreach ($test['mod'] as $order=>$value) {
- $obj = $this_handler->get($order);
- $obj->setVar('weight', ++$i);
+ $obj = $this_handler->get($order);
+ $obj->setVar('weight', ++$i);
- /*set submenu*/
- if(isset($value)){
- $obj->setVar('pid', $value);
- }else{
- $obj->setVar('pid', 0);
- }
- $this_handler->insert($obj);
- $this_handler->update_weights($obj);
+ /*set submenu*/
+ if (isset($value)) {
+ $obj->setVar('pid', $value);
+ } else {
+ $obj->setVar('pid', 0);
+ }
+ $this_handler->insert($obj);
+ $this_handler->update_weights($obj);
- }
+ }
break;
case 'list':
default:
@@ -143,13 +142,16 @@
$xoopsLogger->activated = true;
error_reporting(-1);
-
include 'admin_footer.php';
break;
-
}
+/**
+ * @param int $start
+ *
+ * @return bool|mixed|string
+ */
function mymenus_admin_list($start = 0)
{
global $mymenusTpl, $menu_id;
@@ -181,6 +183,10 @@
return $mymenusTpl->fetch($GLOBALS['xoops']->path('modules/mymenus/templates/static/mymenus_admin_links.html'));
}
+/**
+ * @param $id
+ * @param null $redir
+ */
function mymenus_admin_del($id, $redir = null)
{
if (!$GLOBALS['xoopsSecurity']->check()) {
@@ -197,19 +203,19 @@
redirect_header($GLOBALS['mymenus_adminpage'], 1);
}
- //get sub item
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('id', $id));
- $criteria->add(new Criteria('pid', $id),'OR');
+ //get sub item
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('id', $id));
+ $criteria->add(new Criteria('pid', $id),'OR');
- //first delete links level 2
- global $xoopsDB;
- $query = "DELETE FROM ".$xoopsDB->prefix("mymenus_links")." WHERE pid = (
- SELECT id FROM (
- SELECT * FROM ".$xoopsDB->prefix("mymenus_links")." WHERE pid = ".$id.") AS sec
- );";
- $result = $xoopsDB->queryF($query);
- //delete links level 0 and 1
+ //first delete links level 2
+ global $xoopsDB;
+ $query = "DELETE FROM ".$xoopsDB->prefix("mymenus_links")." WHERE pid = (
+ SELECT id FROM (
+ SELECT * FROM ".$xoopsDB->prefix("mymenus_links")." WHERE pid = ".$id.") AS sec
+ );";
+ $result = $xoopsDB->queryF($query);
+ //delete links level 0 and 1
if (!$this_handler->deleteAll($criteria)) {
xoops_cp_header();
xoops_error(_AM_MYMENUS_MSG_ERROR, $obj->getVar('id'));
@@ -220,6 +226,9 @@
redirect_header(!is_null($redir) ? base64_decode($redir) : $GLOBALS['mymenus_adminpage'] , 2, _AM_MYMENUS_MSG_SUCCESS);
}
+/**
+ * @param null $redir
+ */
function mymenus_admin_delall($redir = null)
{
if (!$GLOBALS['xoopsSecurity']->check()) {
@@ -235,6 +244,11 @@
redirect_header(!is_null($redir) ? base64_decode($redir) : $GLOBALS['mymenus_adminpage'] , 2, _AM_MYMENUS_MSG_SUCCESS);
}
+/**
+ * @param null $id
+ * @param null $redir
+ * @param string $op
+ */
function mymenus_admin_confirmdel($id = null, $redir = null, $op = 'delok')
{
@@ -271,7 +285,7 @@
if (!isset($_POST['hooks'])) {
$_POST['hooks'] = array();
}
- $obj->setVars($_POST);
+ $obj->setVars($_POST);
$obj->setVar('weight', $weight);
if (!$this_handler->insert($obj)) {
@@ -284,6 +298,9 @@
redirect_header($GLOBALS['mymenus_adminpage'] . '?op=list&menu_id=' . $obj->getVar('mid'), 2, $msg);
}
+/**
+ * @param $id
+ */
function mymenus_admin_edit($id)
{
if (!$GLOBALS['xoopsSecurity']->check()) {
@@ -291,14 +308,12 @@
}
global $menu_id;
+ /* Disable xoops debugger in dialog window */
+ include_once XOOPS_ROOT_PATH.'/class/logger/xoopslogger.php';
+ $xoopsLogger =& XoopsLogger::getInstance();
+ $xoopsLogger->activated = false;
+ error_reporting(0);
- /* Disable xoops debugger in dialog window */
- include_once XOOPS_ROOT_PATH.'/class/logger/xoopslogger.php';
- $xoopsLogger =& XoopsLogger::getInstance();
- $xoopsLogger->activated = false;
- error_reporting(0);
-
-
$this_handler =& xoops_getModuleHandler('links','mymenus');
$obj = $this_handler->get($id);
$obj->setVars($_POST);
@@ -312,13 +327,19 @@
redirect_header($GLOBALS['mymenus_adminpage'] . "?op=list&menu_id=$menu_id", 2, $msg);
}
+/**
+ * @param null $id
+ * @param null $pid
+ *
+ * @return string
+ */
function mymenus_admin_form($id = null, $pid = null)
{
- /* Disable xoops debugger in dialog window */
- include_once XOOPS_ROOT_PATH.'/class/logger/xoopslogger.php';
- $xoopsLogger =& XoopsLogger::getInstance();
- $xoopsLogger->activated = false;
- error_reporting(0);
+ /* Disable xoops debugger in dialog window */
+ include_once XOOPS_ROOT_PATH.'/class/logger/xoopslogger.php';
+ $xoopsLogger =& XoopsLogger::getInstance();
+ $xoopsLogger->activated = false;
+ error_reporting(0);
global $menu_id;
@@ -415,6 +436,10 @@
return $form->render();
}
+/**
+ * @param $id
+ * @param $weight
+ */
function mymenus_admin_move($id, $weight)
{
$this_handler =& xoops_getModuleHandler('links', 'mymenus');
@@ -424,17 +449,21 @@
$this_handler->update_weights($obj);
}
+/**
+ * @param $id
+ * @param $visible
+ */
function mymenus_admin_toggle($id, $visible)
{
- include_once XOOPS_ROOT_PATH.'/class/logger/xoopslogger.php';
- $xoopsLogger =& XoopsLogger::getInstance();
- $xoopsLogger->activated = true;
- error_reporting(0);
+ include_once XOOPS_ROOT_PATH.'/class/logger/xoopslogger.php';
+ $xoopsLogger =& XoopsLogger::getInstance();
+ $xoopsLogger->activated = true;
+ error_reporting(0);
- $this_handler =& xoops_getModuleHandler('links', 'mymenus');
+ $this_handler =& xoops_getModuleHandler('links', 'mymenus');
$obj = $this_handler->get($id);
$visible = ($obj->getVar('visible') == 1) ? 0 : 1;
$obj->setVar('visible', $visible);
$this_handler->insert($obj);
- echo $obj->getVar('visible');
+ echo $obj->getVar('visible');
}
Modified: XoopsModules/mymenus/trunk/mymenus/admin/admin_menus.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_menus.php 2014-03-25 05:05:24 UTC (rev 12407)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_menus.php 2014-03-25 08:47:48 UTC (rev 12408)
@@ -58,13 +58,18 @@
break;
case 'list':
default:
- xoops_cp_header();
- echo $indexAdmin->addNavigation('admin_menus.php');
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('admin_menus.php');
echo mymenus_admin_list($start);
include 'admin_footer.php';
break;
}
+/**
+ * @param int $start
+ *
+ * @return bool|mixed|string
+ */
function mymenus_admin_list($start = 0)
{
global $mymenusTpl, $limit;
@@ -114,6 +119,10 @@
return $mymenusTpl->fetch($GLOBALS['xoops']->path('modules/mymenus/templates/static/mymenus_admin_menus.html'));
}
+/**
+ * @param $id
+ * @param null $redir
+ */
function mymenus_admin_del($id, $redir = null)
{
if (!$GLOBALS['xoopsSecurity']->check()) {
@@ -145,6 +154,9 @@
redirect_header(!is_null($redir) ? base64_decode($redir) : $GLOBALS['mymenus_adminpage'] , 2, _AM_MYMENUS_MSG_SUCCESS);
}
+/**
+ * @param null $redir
+ */
function mymenus_admin_delall($redir = null)
{
if (!$GLOBALS['xoopsSecurity']->check()) {
@@ -160,6 +172,11 @@
redirect_header(!is_null($redir) ? base64_decode($redir) : $GLOBALS['mymenus_adminpage'] , 2, _AM_MYMENUS_MSG_SUCCESS);
}
+/**
+ * @param null $id
+ * @param null $redir
+ * @param string $op
+ */
function mymenus_admin_confirmdel($id = null, $redir = null, $op = 'delok')
{
$arr = array();
@@ -192,6 +209,9 @@
redirect_header($GLOBALS['mymenus_adminpage'] . '?op=list', 2, $msg);
}
+/**
+ * @param $id
+ */
function mymenus_admin_edit($id)
{
if (!$GLOBALS['xoopsSecurity']->check()) {
@@ -210,6 +230,11 @@
redirect_header($GLOBALS['mymenus_adminpage'] . '?op=list', 2, $msg);
}
+/**
+ * @param null $id
+ *
+ * @return string
+ */
function mymenus_admin_form($id = null)
{
$this_handler =& xoops_getmodulehandler('menus','mymenus');
Modified: XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php 2014-03-25 05:05:24 UTC (rev 12407)
+++ XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php 2014-03-25 08:47:48 UTC (rev 12408)
@@ -20,6 +20,11 @@
defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
+/**
+ * @param $options
+ *
+ * @return array|bool
+ */
function mymenus_block_show($options)
{
$block = array();
@@ -128,6 +133,12 @@
$blockTpl->assign('skinurl', $skin_info['url']);
$blockTpl->assign('skinpath', $skin_info['path']);
+ // xLanguage check
+ if (xoops_isActiveModule('xlanguage')) {
+ $blockTpl->assign('xlanguage', true);
+ }
+
+
/*assign ul class*/
$menucss='';
$menus_handler = xoops_getModuleHandler('menus', 'mymenus');
@@ -136,10 +147,10 @@
$itemsCount = count($menuObj);
if ($menuObj) {
for ($i = 0; $i < $itemsCount; ++$i) {
- $menucss = isset($menuObj[$i]['css']) ? $menuObj[$i]['css']: '';
+ $menucss = isset($menuObj[$i]['css']) ? $menuObj[$i]['css']: '';
}
}
- if(!$menucss){$menucss = "";}
+ if (!$menucss) {$menucss = "";}
$blockTpl->assign('menucss', $menucss);
$block['content'] = $blockTpl->fetch($skin_info['template']);
@@ -156,6 +167,11 @@
return $block;
}
+/**
+ * @param $options
+ *
+ * @return string
+ */
function mymenus_block_edit($options)
{
//Unique ID
@@ -172,6 +188,7 @@
if (count($menus) == 0) {
$form = "<a href='" . $GLOBALS['xoops']->url('modules/mymenus/admin/admin_menus.php') . "'>" . _AM_MYMENUS_MSG_NOMENUS . "</a>";
+
return $form;
}
@@ -209,7 +226,6 @@
//Skin from theme 3 - @luciorota
-
if (file_exists(XOOPS_ROOT_PATH . '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/modules/mymenus/skins/')) {
++$i;
xoops_load('XoopsLists');
Modified: XoopsModules/mymenus/trunk/mymenus/class/about.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/about.php 2014-03-25 05:05:24 UTC (rev 12407)
+++ XoopsModules/mymenus/trunk/mymenus/class/about.php 2014-03-25 08:47:48 UTC (rev 12408)
@@ -49,6 +49,9 @@
var $_lang_by;
var $_tpl;
+ /**
+ * @param string $aboutTitle
+ */
function __construct($aboutTitle = 'About')
{
@@ -75,6 +78,11 @@
}
+ /**
+ * @param $value
+ *
+ * @return mixed
+ */
function sanitize($value)
{
$myts =& MyTextSanitizer::getInstance();
Modified: XoopsModules/mymenus/trunk/mymenus/class/builder.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/builder.php 2014-03-25 05:05:24 UTC (rev 12407)
+++ XoopsModules/mymenus/trunk/mymenus/class/builder.php 2014-03-25 08:47:48 UTC (rev 12408)
@@ -22,11 +22,17 @@
var $parents = array();
var $output = array();
+ /**
+ * @param $array
+ */
function __construct($array)
{
$this->addMenu($array);
}
+ /**
+ * @param $array
+ */
function addMenu($array)
{
foreach ($array as $item) {
@@ -34,11 +40,17 @@
}
}
+ /**
+ * @param $item
+ */
function add($item)
{
$this->parents[$item['pid']][] = $item;
}
+ /**
+ * @param int $pid
+ */
function buildMenus($pid = 0)
{
static $idx = -1;
@@ -77,6 +89,9 @@
$level -= 1;
}
+ /**
+ * @param int $pid
+ */
function buildUpDown($pid = 0)
{
static $idx = -1;
@@ -153,6 +168,9 @@
}
}
+ /**
+ * @param $pid
+ */
function addSelectedParents($pid)
{
foreach ($this->output as $idx => $menu) {
@@ -163,6 +181,9 @@
}
}
+ /**
+ * @return array
+ */
function render()
{
$this->buildMenus();
Modified: XoopsModules/mymenus/trunk/mymenus/class/links.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/links.php 2014-03-25 05:05:24 UTC (rev 12407)
+++ XoopsModules/mymenus/trunk/mymenus/class/links.php 2014-03-25 08:47:48 UTC (rev 12408)
@@ -20,6 +20,9 @@
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+/**
+ * Class MymenusLinks
+ */
class MymenusLinks extends XoopsObject
{
/**
@@ -42,6 +45,9 @@
$this->initVar('css', XOBJ_DTYPE_TXTBOX);
}
+ /**
+ * @return bool
+ */
function checkAccess()
{
$hooks = $this->getHooks();
@@ -55,6 +61,9 @@
return true;
}
+ /**
+ * @return array
+ */
function getHooks()
{
$ret = array();
@@ -69,19 +78,29 @@
//$info = split(',', trim($line[0]));
$ret[$hook][] = $method;
}
+
return $ret;
}
}
+/**
+ * Class MymenusLinksHandler
+ */
class MymenusLinksHandler extends XoopsPersistableObjectHandler
{
+ /**
+ * @param null|object $db
+ */
function __construct(&$db)
{
parent::__construct($db, 'mymenus_links', 'MymenusLinks', 'id', 'title');
}
+ /**
+ * @param $obj
+ */
function update_weights(&$obj)
{
$sql = "UPDATE " . $this->table
Modified: XoopsModules/mymenus/trunk/mymenus/class/menus.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/menus.php 2014-03-25 05:05:24 UTC (rev 12407)
+++ XoopsModules/mymenus/trunk/mymenus/class/menus.php 2014-03-25 08:47:48 UTC (rev 12408)
@@ -20,6 +20,9 @@
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+/**
+ * Class MymenusMenus
+ */
class MymenusMenus extends XoopsObject
{
/**
@@ -35,8 +38,14 @@
}
}
+/**
+ * Class MymenusMenusHandler
+ */
class MymenusMenusHandler extends XoopsPersistableObjectHandler
{
+ /**
+ * @param null|object $db
+ */
function __construct(&$db)
{
parent::__construct($db, 'mymenus_menus', 'MymenusMenus', 'id', 'title', 'css');
Modified: XoopsModules/mymenus/trunk/mymenus/class/plugin.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/plugin.php 2014-03-25 05:05:24 UTC (rev 12407)
+++ XoopsModules/mymenus/trunk/mymenus/class/plugin.php 2014-03-25 08:47:48 UTC (rev 12408)
@@ -23,6 +23,9 @@
xoops_load('XoopsLists');
include_once $GLOBALS['xoops']->path('modules/mymenus/class/registry.php');
+/**
+ * Class MymenusPlugin
+ */
class MymenusPlugin
{
@@ -30,6 +33,9 @@
var $_plugins;
var $_events;
+ /**
+ *
+ */
function __construct()
{
$this->_plugins = array();
@@ -39,6 +45,9 @@
$this->setEvents();
}
+ /**
+ * @return MymenusPlugin
+ */
static function &getInstance()
{
static $instance = false;
@@ -80,6 +89,10 @@
}
}
+ /**
+ * @param $event_name
+ * @param array $args
+ */
function triggerEvent($event_name, $args = array())
{
$event_name = strtolower(str_replace('.', '', $event_name));
@@ -92,9 +105,17 @@
}
+/**
+ * Class MymenusPluginItem
+ */
class MymenusPluginItem
{
+ /**
+ * @param $name
+ *
+ * @return mixed
+ */
function loadLanguage($name)
{
$language = $GLOBALS['xoopsConfig']['language'];
@@ -102,6 +123,7 @@
if (!($ret = @include_once "{$path}/{$language}/{$name}.php")) {
$ret = @include_once "{$path}/english/{$name}.php";
}
+
return $ret;
}
}
Modified: XoopsModules/mymenus/trunk/mymenus/class/registry.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/registry.php 2014-03-25 05:05:24 UTC (rev 12407)
+++ XoopsModules/mymenus/trunk/mymenus/class/registry.php 2014-03-25 08:47:48 UTC (rev 12408)
@@ -20,42 +20,68 @@
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+/**
+ * Class MymenusRegistry
+ */
class MymenusRegistry
{
protected $_entries;
protected $_locks;
+ /**
+ *
+ */
protected function __construct()
{
$this->_entries = array();
$this->_locks = array();
}
+ /**
+ * @return MymenusRegistry
+ */
static public function getInstance()
{
static $instance = false;
if (!$instance) {
$instance = new self();
}
+
return $instance;
}
+ /**
+ * @param $key
+ * @param $item
+ *
+ * @return bool
+ */
public function setEntry($key, $item)
{
if ($this->isLocked($key) == true) {
trigger_error('Unable to set entry `' . $key . '`. Entry is locked.', E_USER_WARNING);
+
return false;
}
$this->_entries[$key] = $item;
+
return true;
}
+ /**
+ * @param $key
+ */
public function unsetEntry($key)
{
unset($this->_entries[$key]);
}
+ /**
+ * @param $key
+ *
+ * @return null
+ */
public function getEntry($key)
{
if (isset($this->_entries[$key]) == false) {
@@ -65,22 +91,41 @@
return $this->_entries[$key];
}
+ /**
+ * @param $key
+ *
+ * @return bool
+ */
public function isEntry($key)
{
return ($this->getEntry($key) !== null);
}
+ /**
+ * @param $key
+ *
+ * @return bool
+ */
public function lockEntry($key)
{
$this->_locks[$key] = true;
+
return true;
}
+ /**
+ * @param $key
+ */
public function unlockEntry($key)
{
unset($this->_locks[$key]);
}
+ /**
+ * @param $key
+ *
+ * @return bool
+ */
public function isLocked($key)
{
return (isset($this->_locks[$key]) == true);
Modified: XoopsModules/mymenus/trunk/mymenus/docs/readme.txt
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/docs/readme.txt 2014-03-25 05:05:24 UTC (rev 12407)
+++ XoopsModules/mymenus/trunk/mymenus/docs/readme.txt 2014-03-25 08:47:48 UTC (rev 12408)
@@ -1,6 +1,6 @@
-What is mymenus module (v1.0) ?
+What is MyMenus module ?
======================
-Mymenus is menu manager module that allows you to display dynamic or static menus in your website.
+MyMenus is menu manager module that allows you to display dynamic or static menus in your website.
Features
@@ -9,24 +9,24 @@
- pluggable plugins (title and links decorators for integration of module features)
- infinite menus levels(nested menus)
- auto selected menus(menus are highlighted depending on the page you are in)
-- ability to assign a menu to a smarty variable(you can use my menus has a block or use it inside your theme or templates)
+- ability to assign a menu to a smarty variable(you can use my menus as a block or use it inside your theme or templates)
- ability to get a skin from the current theme folder(theme/mytheme/menu/scripts go here)
- and much more
Requirements
====================
-Requires xoops 2.4.x and php5
+Requires minimum 2.5.x and PHP 5.3.7
-How to install mymenus
+How to install MyMenus
====================
-Copy mymenus folder into the /modules directory of your website.
-Log in to your site as administrator, go to System Admin > Modules, look for the mymenus
-icon in the list of uninstalled modules and click in the install icon.
+Copy mymenus folder into the /modules directory of your website.
+Log in to your site as administrator, go to System Admin > Modules, look for the MyMenus
+icon in the list of uninstalled modules and click in the install icon.
Follow the directions in the screen and you'll be ready to go.
Usage and developing documentation
======================
-Please refer to docs folder for more information.
\ No newline at end of file
+Please refer to docs folder for more information.
Modified: XoopsModules/mymenus/trunk/mymenus/docs/skins.txt
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/docs/skins.txt 2014-03-25 05:05:24 UTC (rev 12407)
+++ XoopsModules/mymenus/trunk/mymenus/docs/skins.txt 2014-03-25 08:47:48 UTC (rev 12408)
@@ -33,13 +33,13 @@
[oul] => 1 (IMPORTANT! Open UL -> this menu item requires skin to prepend <ul> open element tag)
[oli] => 1 (IMPORTANT! Open LI -> this menu item requires skin to prepend <li> open element tag)
[close] => (IMPORTANT! this holds closing tags, it will automatically generate </li></ul> tags for you)
- [cul] => (IMPORTANT! Close UL -> this menu item requires skin to apend </ul> close element tag, you should use [close] instead, unless you are not suporting multilevel menus)
- [cli] => (IMPORTANT! Close LI -> this menu item requires skin to apend </li> close element tag, you should use [close] instead, unless you are not suporting multilevel menus)
+ [cul] => (IMPORTANT! Close UL -> this menu item requires skin to append </ul> close element tag, you should use [close] instead, unless you are not supporting multilevel menus)
+ [cli] => (IMPORTANT! Close LI -> this menu item requires skin to append </li> close element tag, you should use [close] instead, unless you are not supporting multilevel menus)
[hassub] => 1 (informs if this menu item has submenus, 1 for true, 0 for false)
[level] => 0 (informs the level of nesting of the menu item, 0 is for root, 1 for second level, etc..)
[down_weight] => 3 (for usage in menu sorting in admin side, you can ignore it)
[selected] => 1 (IMPORTANT, this tells the skin to highlight this item)
- [topselected] => 1 (Important, this informs the skin that the menu is of level 0(root) and it is selected, you should higlight it)
+ [topselected] => 1 (Important, this informs the skin that the menu is of level 0(root) and it is selected, you should highlight it)
)
-- Skin structure:
Modified: XoopsModules/mymenus/trunk/mymenus/docs/usage.txt
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/docs/usage.txt 2014-03-25 05:05:24 UTC (rev 12407)
+++ XoopsModules/mymenus/trunk/mymenus/docs/usage.txt 2014-03-25 08:47:48 UTC (rev 12408)
@@ -10,25 +10,25 @@
You can use DECORATORS for links, images, title, and alt_title.
-The decorators follow this sintax:
+The decorators follow this syntax:
{decorator|value}
There are 6 decorators available:
-USER -> gets info for the user that is seing the page
+USER -> gets info for the user that is seeing the page
OWNER -> gets info for the user that match uid on the url(if given)
URI -> gets info about the url arguments
MODULE -> gets dynamic menu from a module (Used in title field only)
SMARTY -> gets smarty variables
CONSTANT -> gets defined constants
-Some sintax examples
+Some syntax examples
{USER|UNAME} gets the username of this user, returns anonymous if not a user
{USER|UID} gets the uid of this user, returns 0 if not a user
{USER|REGDATE} gets the regdate of this user, returns empty if not a user
{USER|any other field of the user table} yes! You can get what you need!
Some special fields you may use
-{USER|PM_NEW} Show number of private messages not readed
+{USER|PM_NEW} Show number of private messages not read
{USER|PM_READED}
{USER|PM_TOTAL}
@@ -37,7 +37,7 @@
{OWNER|UID}
etc..
-And you can get any paramater on the uri with:
+And you can get any parameter on the uri with:
{URI|UID}
{URI|ID}
{URI|SEARCH}
Modified: XoopsModules/mymenus/trunk/mymenus/include/functions.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/include/functions.php 2014-03-25 05:05:24 UTC (rev 12407)
+++ XoopsModules/mymenus/trunk/mymenus/include/functions.php 2014-03-25 08:47:48 UTC (rev 12408)
@@ -20,6 +20,10 @@
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+/**
+ * @param int $currentoption
+ * @param string $breadcrumb
+ */
function mymenus_adminMenu($currentoption = 0, $breadcrumb = '')
{
include_once $GLOBALS['xoops']->path('class/template.php');
@@ -39,6 +43,11 @@
$tpl->display($GLOBALS['xoops']->path('modules/mymenus/templates/static/mymenus_admin_adminmenu.html'));
}
+/**
+ * @param string $dirname
+ *
+ * @return mixed
+ */
function mymenus_getModuleConfig($dirname = 'mymenus')
{
static $config;
@@ -58,6 +67,13 @@
return $config;
}
+/**
+ * @param $skin
+ * @param $skin_from_theme
+ * @param $skin_theme
+ *
+ * @return array
+ */
function mymenus_getSkinInfo($skin, $skin_from_theme, $skin_theme)
{
$error = false;
Modified: XoopsModules/mymenus/trunk/mymenus/include/update.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/include/update.php 2014-03-25 05:05:24 UTC (rev 12407)
+++ XoopsModules/mymenus/trunk/mymenus/include/update.php 2014-03-25 08:47:48 UTC (rev 12408)
@@ -17,7 +17,7 @@
//Install
eval ('function xoops_module_pre_install_'.$infoname.'($module) {
- // Templatevorlagen pr�fen
+ // Templatevorlagen prüfen
if (!check_infotemplates($module)) return false;
if (!check_infotable($module)) return false;
return true;
@@ -25,7 +25,7 @@
//Install
eval ('function xoops_module_install_'.$infoname.'($module) {
- // Templatevorlagen pr�fen
+ // Templatevorlagen prüfen
if (!check_infotemplates($module)) return false;
if (!check_infotable($module)) return false;
return true;
@@ -33,23 +33,32 @@
//Update
eval('function xoops_module_update_'.$infoname.'($module) {
- // Templatevorlagen pr�fen
+ // Templatevorlagen prüfen
if (!check_infotemplates($module)) return false;
if (!check_infotable($module)) return false;
return true;
}');
-
+/**
+ * @param $module
+ *
+ * @return bool
+ */
function check_infotemplates($module) {
$err = true;
if (!file_exists(XOOPS_ROOT_PATH."/modules/".$module->getInfo("dirname")."/templates/blocks/".$module->getInfo("dirname")."_block.html")) {
$module->setErrors("Template ".$module->getInfo("dirname")."_block.html not exists!");
- $err = false;
+ $err = false;
}
+
return $err;
}
-
+/**
+ * @param $module
+ *
+ * @return bool
+ */
function check_infotable($module) {
global $xoopsDB;
$err=true;
@@ -73,7 +82,6 @@
"css" => "varchar(150) default NULL"
);
-
if (!InfoTableExists($xoopsDB->prefix($module->getInfo("dirname")).'_menus')) {
$sql= "CREATE TABLE ".$xoopsDB->prefix($module->getInfo("dirname"))."_...
[truncated message content] |
|
From: <luc...@us...> - 2014-03-28 20:15:46
|
Revision: 12415
http://sourceforge.net/p/xoops/svn/12415
Author: luciorota
Date: 2014-03-28 20:15:39 +0000 (Fri, 28 Mar 2014)
Log Message:
-----------
multi pages help (only on Xoops 2.5.7+)
Modified Paths:
--------------
XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php
XoopsModules/mymenus/trunk/mymenus/xoops_version.php
Added Paths:
-----------
XoopsModules/mymenus/trunk/mymenus/language/english/help/skins.html
XoopsModules/mymenus/trunk/mymenus/language/english/help/usage.html
XoopsModules/mymenus/trunk/mymenus/language/english/help/usage.txt
Modified: XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php 2014-03-28 20:12:18 UTC (rev 12414)
+++ XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php 2014-03-28 20:15:39 UTC (rev 12415)
@@ -101,11 +101,11 @@
if ($config['assign_method'] == 'xoopstpl') {
$tpl_vars = '';
foreach ($css as $file) {
- $tpl_vars .= "\n" . '<link rel="stylesheet" type="text/css" media="all" href="'. $file . '" />';
+ $tpl_vars .= "\n" . '<link rel="stylesheet" type="text/css" media="all" href="' . $file . '" />';
}
foreach ($js as $file) {
- $tpl_vars .= "\n" . '<script type="text/javascript" src="'. $file . '"></script>';
+ $tpl_vars .= "\n" . '<script type="text/javascript" src="' . $file . '"></script>';
}
if (isset($skin_info['header'])) {
@@ -194,14 +194,14 @@
xoops_load('XoopsFormLoader');
- //Menu 0
+ // Menu 0
$form = "<b>" . _MB_MYMENUS_SELECT_MENU . "</b> ";
- $element = new XoopsFormSelect('', 'options['.$i.'0]', $options[$i], 1);
+ $element = new XoopsFormSelect('', 'options[' . $i . '0]', $options[$i], 1);
$element->addOptionArray($menus);
$form .= $element->render();
$form .= "</select>\n <i>" . _MB_MYMENUS_SELECT_MENU_DSC . "</i><br /><br />";
- //Skin 1
+ // Skin 1
++$i;
xoops_load('XoopsLists');
$temp_skins = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . "/modules/mymenus/skins/", "");
@@ -212,20 +212,24 @@
}
}
$form .= "<b>" . _MB_MYMENUS_SELECT_SKIN . "</b> ";
- $element = new XoopsFormSelect('', 'options['.$i.'0]', $options[$i], 1);
+ $element = new XoopsFormSelect('', 'options[' . $i . '0]', $options[$i], 1);
$element->addOptionArray($skins_options);
$form .= $element->render();
$form .= "</select>\n <i>" . _MB_MYMENUS_SELECT_SKIN_DSC . "</i><br /><br />";
- //Use skin from,theme 2
+ // Use skin from theme 2
++$i;
$form .= "<b>" . _MB_MYMENUS_USE_THEME_SKIN . "</b> ";
- $element = new XoopsFormRadioYN('', 'options['.$i.'0]', $options[$i]);
+ $element = new XoopsFormRadioYN('', 'options[' . $i . '0]', $options[$i]);
$form .= $element->render();
$form .= "</select>\n <i>" . _MB_MYMENUS_USE_THEME_SKIN_DSC . "</i><br /><br />";
+<<<<<<< .mine
+ // Skin from theme 3 - @luciorota
+=======
//Skin from theme 3 - @luciorota
+>>>>>>> .r12414
if (file_exists(XOOPS_ROOT_PATH . '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/modules/mymenus/skins/')) {
++$i;
xoops_load('XoopsLists');
@@ -237,24 +241,23 @@
$theme_skins_options[$theme_skin] = '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/modules/mymenus/skins/' . $theme_skin . '';
}
}
-
$form .= "<b>" . _MB_MYMENUS_SELECT_SKIN_FROM_THEME . "</b> ";
- $element = new XoopsFormSelect('', 'options['.$i.'0]', $options[$i], 1);
+ $element = new XoopsFormSelect('', 'options[' . $i . '0]', $options[$i], 1);
$element->addOption('', '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/menu');
$element->addOptionArray($theme_skins_options);
$form .= $element->render();
$form .= "</select>\n <i>" . _MB_MYMENUS_SELECT_SKIN_FROM_THEME_DSC . "</i><br /><br />";
-}
-}
+ }
+ }
- //Display method 4
+ // Display method 4
++$i;
$display_options = array(
'block' => _MB_MYMENUS_DISPLAY_METHOD_BLOCK,
'template' => _MB_MYMENUS_DISPLAY_METHOD_TEMPLATE
);
$form .= "<b>" . _MB_MYMENUS_DISPLAY_METHOD . "</b> ";
- $element = new XoopsFormSelect('', 'options['.$i.'0]', $options[$i], 1);
+ $element = new XoopsFormSelect('', 'options[' . $i . '0]', $options[$i], 1);
$element->addOptionArray($display_options);
$form .= $element->render();
$form .= "</select>\n <i>" . _MB_MYMENUS_DISPLAY_METHOD_DSC . "</i><br /><br />";
@@ -262,7 +265,7 @@
//Unique ID 5
++$i;
$form .= "<b>" . _MB_MYMENUS_UNIQUEID . "</b> ";
- $element = new XoopsFormText('', 'options['.$i.'0]', 10, 50, $options[$i]);
+ $element = new XoopsFormText('', 'options[' . $i . '0]', 10, 50, $options[$i]);
$form .= $element->render();
$form .= "\n <i>" . _MB_MYMENUS_UNIQUEID_DSC . "</i><br /><br />";
Added: XoopsModules/mymenus/trunk/mymenus/language/english/help/skins.html
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/language/english/help/skins.html (rev 0)
+++ XoopsModules/mymenus/trunk/mymenus/language/english/help/skins.html 2014-03-28 20:15:39 UTC (rev 12415)
@@ -0,0 +1,121 @@
+<div id="help-template" class="outer">
+ <h1 class="head">Skins:
+ <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/mymenus/admin/index.php" title="Back to the administration of MyMenus"> MyMenus
+ <img src="<{xoAdminIcons home.png}>" alt="Back to the Administration of MyMenus"/>
+ </a>
+ </h1>
+
+ <h4 class="odd">Theory of operation</h4>
+ <p class="even">
+ Mymenus separates logic from presentation almost 100%!<br>
+ It is mymenus task to generate an array with menus information and let each skin decide what to do with that information.
+ <br>
+ <br>
+ How can skin know when to open a new <li> or <ul> and when to close it?<br>
+ Mymenus append that information to each menu item, that way you can know if that item should be prefixed with a <li> or not.
+ <br>
+ <br>
+ This is the composition of an item array:
+ <br>
+ <code>
+[id] => 3 (id of the menu item)
+ [pid] => 0 (id of the parent menu item)
+ [mid] => 2 (id of the menu package)
+ [title] => Home (title of the menu item)
+ [alt_title] => Home (alt/title of the menu item)
+ [visible] => 1 (visibility of the menu item, it will be 1 for all menus,you can disregard it)
+ [link] => http://localhost/xoops-2.4.5/htdocs/ (alt/title of the menu item)
+ [weight] => 1 (this is for internal usage of the builder class, you can disregard it)
+ [target] => _self (to be used in link target element, it can be _self, _blank, etc..)
+ [groups] => Array (holds the groups who can view this link, you can disregard it)
+ (
+ [0] => 2
+ [1] => 3
+ )
+ [hooks] => Array (holds the hooks available to render the menu, you can disregard it)
+ (
+ )
+ [image] => (image to be used in the link, you can choose not to support it in your skin)
+ [css] => (this is inline css for this item, it goes inside <a style="$item.css">)
+ [oul] => 1 (IMPORTANT! Open UL -> this menu item requires skin to prepend <ul> open element tag)
+ [oli] => 1 (IMPORTANT! Open LI -> this menu item requires skin to prepend <li> open element tag)
+ [close] => (IMPORTANT! this holds closing tags, it will automatically generate </li></ul> tags for you)
+ [cul] => (IMPORTANT! Close UL -> this menu item requires skin to append </ul> close element tag, you should use [close] instead, unless you are not supporting multilevel menus)
+ [cli] => (IMPORTANT! Close LI -> this menu item requires skin to append </li> close element tag, you should use [close] instead, unless you are not supporting multilevel menus)
+ [hassub] => 1 (informs if this menu item has submenus, 1 for true, 0 for false)
+ [level] => 0 (informs the level of nesting of the menu item, 0 is for root, 1 for second level, etc..)
+ [down_weight] => 3 (for usage in menu sorting in admin side, you can ignore it)
+ [selected] => 1 (IMPORTANT, this tells the skin to highlight this item)
+ [topselected] => 1 (Important, this informs the skin that the menu is of level 0(root) and it is selected, you should highlight it)
+ )
+ </code>
+ </p>
+ <h4 class="odd">Skin structure</h4>
+ <p class="even">
+ Skins go into<br>
+ "mymenus/skins" folder or<br>
+ "public_html/themes/yourtheme/menu" folder<br>
+ and they should have a skin_version.php file in it<br>
+ <br>
+ skin_version.php structure:<br>
+ <code>
+//informs where to find the template for this skin(relative to skin folder)
+$skinversion['template'] = 'templates/template.html';
+
+//informs where to find css file/files
+$skinversion['css'] = 'css/superfish.css';
+ </code>
+ or
+ <code>
+$skinversion['css'] = array('css/superfish.css', css/anotherone.css);
+
+//informs where to find js file/files
+$skinversion['js'] = '../../js/jquery-1.3.2.min.js';
+ </code>
+ or
+ <code>
+$skinversion['js'] = array(
+ '../../js/jquery-1.3.2.min.js'
+ '../../js/hoverIntent.js',
+ '../../js/superfish.js'
+ );
+
+//code to be appended in the <head> theme tag
+$header = "\n" . '<script type="text/javascript">';
+$header .= "\n" . ' var $sf = jQuery.noConflict()';
+$header .= "\n" . ' $sf(function(){';
+$header .= "\n" . ' $sf(\'ul.sf-menu\').superfish({';
+$header .= "\n" . ' delay: 1000,';
+$header .= "\n" . ' animation: {opacity:\'show\',height:\'show\'},';
+$header .= "\n" . ' speed: \'fast\'';
+$header .= "\n" . ' });';
+$header .= "\n" . ' });';
+$header .= "\n" . '</script>';
+$skinversion['header'] = $header;
+
+//you can pass any configuration from this file to the template using ['config']
+ </code>
+ example:
+ <code>
+$skinversion['config']['home'] = true;
+$skinversion['config']['iconset'] = 'default';
+This can be fetched in template with <{$config.home}> and <{$config.iconset}>
+ </code>
+ </p>
+ <h4 class="odd">Smarty variables available in the template</h4>
+ <p class="even">
+ $block - holds an array of menu items<br>
+ $config - holds configuration set in skin_version.php<br>
+ $skinurl - holds the url of the skin<br>
+ $skinpath - holds the path of the skin<br>
+ </p>
+ <h4 class="odd">For Theme designers</h4>
+ <p class="even">
+ Since users can choose the smarty variable for each menu,<br>
+ I would advise you to use <{$xoops_links_navbar}> as a place holder.<br>
+ If you provide a skin for your theme, ask users to:<br>
+ -- --enter "xoops_links_navbar" as unique_id in block settings.<br>
+ -- --set "render to smarty variable" in block settings.<br>
+ -- --set "use skin from theme" in block settings.<br>
+ </p>
+</div>
\ No newline at end of file
Added: XoopsModules/mymenus/trunk/mymenus/language/english/help/usage.html
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/language/english/help/usage.html (rev 0)
+++ XoopsModules/mymenus/trunk/mymenus/language/english/help/usage.html 2014-03-28 20:15:39 UTC (rev 12415)
@@ -0,0 +1,79 @@
+<div id="help-template" class="outer">
+ <h1 class="head">Usage:
+ <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/mymenus/admin/index.php" title="Back to the administration of MyMenus"> MyMenus
+ <img src="<{xoAdminIcons home.png}>" alt="Back to the Administration of MyMenus"/>
+ </a>
+ </h1>
+ Important to know:<br>
+ <br>
+ Links and images are relative to the root of your site:<br>
+ modules/profile<br>
+ search.php<br>
+ uploads/blank.gif<br>
+ <br>
+ For linking to external sites you need to use complete url:<br>
+ http://www.xuups.com<br>
+ <br>
+ <br>
+ You can use DECORATORS for links, images, title, and alt_title.<br>
+ The decorators follow this syntax:<br>
+ {decorator|value}<br>
+ <br>
+ There are 6 decorators available:<br>
+ USER -> gets info for the user that is seeing the page<br>
+ OWNER -> gets info for the user that match uid on the url(if given)<br>
+ URI -> gets info about the url arguments<br>
+ MODULE -> gets dynamic menu from a module (Used in title field only)<br>
+ SMARTY -> gets smarty variables<br>
+ CONSTANT -> gets defined constants<br>
+ <br>
+ Some syntax examples<br>
+ {USER|UNAME} gets the username of this user, returns anonymous if not a
+ user<br>
+ {USER|UID} gets the uid of this user, returns 0 if not a user<br>
+ {USER|REGDATE} gets the regdate of this user, returns empty if not a
+ user<br>
+ {USER|any other field of the user table} yes! You can get what you need!<br>
+ <br>
+ Some special fields you may use<br>
+ {USER|PM_NEW} Show number of private messages not read<br>
+ {USER|PM_READED}<br>
+ {USER|PM_TOTAL}<br>
+ <br>
+ The same is valid for OWNER:<br>
+ {OWNER|UNAME}<br>
+ {OWNER|UID}<br>
+ etc..<br>
+ <br>
+ And you can get any parameter on the uri with:<br>
+ {URI|UID}<br>
+ {URI|ID}<br>
+ {URI|SEARCH}<br>
+ {URI|ITEMID}<br>
+ {URI|CATID}<br>
+ etc...<br>
+ <br>
+ Example of links using decorators:<br>
+ modules/profile/userinfo.php?uid={USER|UID}<br>
+ modules/yogurt/pictures.php?uid={OWNER|UID}<br>
+ <br>
+ Example on titles using decorators:<br>
+ {USER|UNAME}<br>
+ {OWNER|UNAME} profile<br>
+ You have searched for {URI|SEARCH}<br>
+ <br>
+ Populating menus with modules information:<br>
+ {MODULE|NEWS}<br>
+ {MODULE|XHELP}<br>
+ {MODULE|MYLINKS}<br>
+ {MODULE|TDMDOWNLOADS}<br>
+ <br>
+ Using smarty information:<br>
+ {SMARTY|xoops_uname}<br>
+ {SMARTY|xoops_avatar}<br>
+ <br>
+ Using constants information:<br>
+ {CONSTANT|XOOPS_URL}/myimages/image.gif<br>
+ {CONSTANT|XOOPS_ROOT_PATH}<br>
+ <br>
+</div>
\ No newline at end of file
Added: XoopsModules/mymenus/trunk/mymenus/language/english/help/usage.txt
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/language/english/help/usage.txt (rev 0)
+++ XoopsModules/mymenus/trunk/mymenus/language/english/help/usage.txt 2014-03-28 20:15:39 UTC (rev 12415)
@@ -0,0 +1,69 @@
+Important to know:
+
+Links and images are relative to the root of your site:
+modules/profile
+search.php
+uploads/blank.gif
+
+For linking to external sites you need to use complete url:
+http://www.xuups.com
+
+
+You can use DECORATORS for links, images, title, and alt_title.
+The decorators follow this syntax:
+{decorator|value}
+
+There are 6 decorators available:
+USER -> gets info for the user that is seeing the page
+OWNER -> gets info for the user that match uid on the url(if given)
+URI -> gets info about the url arguments
+MODULE -> gets dynamic menu from a module (Used in title field only)
+SMARTY -> gets smarty variables
+CONSTANT -> gets defined constants
+
+Some syntax examples
+{USER|UNAME} gets the username of this user, returns anonymous if not a user
+{USER|UID} gets the uid of this user, returns 0 if not a user
+{USER|REGDATE} gets the regdate of this user, returns empty if not a user
+{USER|any other field of the user table} yes! You can get what you need!
+
+Some special fields you may use
+{USER|PM_NEW} Show number of private messages not read
+{USER|PM_READED}
+{USER|PM_TOTAL}
+
+The same is valid for OWNER:
+{OWNER|UNAME}
+{OWNER|UID}
+etc..
+
+And you can get any parameter on the uri with:
+{URI|UID}
+{URI|ID}
+{URI|SEARCH}
+{URI|ITEMID}
+{URI|CATID}
+etc...
+
+Example of links using decorators:
+modules/profile/userinfo.php?uid={USER|UID}
+modules/yogurt/pictures.php?uid={OWNER|UID}
+
+Example on titles using decorators:
+{USER|UNAME}
+{OWNER|UNAME} profile
+You have searched for {URI|SEARCH}
+
+Populating menus with modules information:
+{MODULE|NEWS}
+{MODULE|XHELP}
+{MODULE|MYLINKS}
+{MODULE|TDMDOWNLOADS}
+
+Using smarty information:
+{SMARTY|xoops_uname}
+{SMARTY|xoops_avatar}
+
+Using constants information:
+{CONSTANT|XOOPS_URL}/myimages/image.gif
+{CONSTANT|XOOPS_ROOT_PATH}
Modified: XoopsModules/mymenus/trunk/mymenus/xoops_version.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/xoops_version.php 2014-03-28 20:12:18 UTC (rev 12414)
+++ XoopsModules/mymenus/trunk/mymenus/xoops_version.php 2014-03-28 20:15:39 UTC (rev 12415)
@@ -35,6 +35,19 @@
$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
+
+//help files
+$i = 0;
+$modversion['helpsection'][$i]['name'] = "Overview";
+$modversion['helpsection'][$i]['link'] = "page=help";
+$i++;
+$modversion['helpsection'][$i]['name'] = "Skins";
+$modversion['helpsection'][$i]['link'] = "page=skins";
+$i++;
+$modversion['helpsection'][$i]['name'] = "Usage";
+$modversion['helpsection'][$i]['link'] = "page=usage";
+
+
//about
$modversion['release_date'] = '2014/03/21';
$modversion["module_website_url"] = "www.xoops.org";
|