From: <be...@us...> - 2011-12-26 18:43:51
|
Revision: 8564 http://xoops.svn.sourceforge.net/xoops/?rev=8564&view=rev Author: beckmi Date: 2011-12-26 18:43:44 +0000 (Mon, 26 Dec 2011) Log Message: ----------- Final adjustments Modified Paths: -------------- XoopsModules/tag/branches/Mamba/tag/admin/about.php XoopsModules/tag/branches/Mamba/tag/admin/admin.tag.php XoopsModules/tag/branches/Mamba/tag/admin/admin_footer.php XoopsModules/tag/branches/Mamba/tag/admin/admin_header.php XoopsModules/tag/branches/Mamba/tag/admin/menu.php XoopsModules/tag/branches/Mamba/tag/language/english/admin.php XoopsModules/tag/branches/Mamba/tag/xoops_version.php Added Paths: ----------- XoopsModules/tag/branches/Mamba/tag/docs/changelog.txt Removed Paths: ------------- XoopsModules/tag/branches/Mamba/tag/language/english/changelog.txt Modified: XoopsModules/tag/branches/Mamba/tag/admin/about.php =================================================================== --- XoopsModules/tag/branches/Mamba/tag/admin/about.php 2011-12-26 17:11:17 UTC (rev 8563) +++ XoopsModules/tag/branches/Mamba/tag/admin/about.php 2011-12-26 18:43:44 UTC (rev 8564) @@ -16,18 +16,13 @@ * @author Mage, Mamba * @version $Id $ **/ +include_once dirname(__FILE__) . '/admin_header.php'; -include '../../../include/cp_header.php'; -include '../../../class/xoopsformloader.php'; -include 'admin_header.php'; - -//$module_info =& $module_handler->get($xoopsModule->getVar("mid")); - xoops_cp_header(); $aboutAdmin = new ModuleAdmin(); echo $aboutAdmin->addNavigation('about.php'); -echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false); +echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false); include 'admin_footer.php'; \ No newline at end of file Modified: XoopsModules/tag/branches/Mamba/tag/admin/admin.tag.php =================================================================== --- XoopsModules/tag/branches/Mamba/tag/admin/admin.tag.php 2011-12-26 17:11:17 UTC (rev 8563) +++ XoopsModules/tag/branches/Mamba/tag/admin/admin.tag.php 2011-12-26 18:43:44 UTC (rev 8564) @@ -115,9 +115,9 @@ foreach (array_keys($tags) as $key) { $form_tags .= "<tr class='" . $class_tr[(++$i) % 2] . "'>"; $form_tags .= "<td>" . $tags[$key]["term"] . "</td>"; - $form_tags .= "<td><input type='radio' name='tags[{$key}]' value='0' " . ( $tags[$key]["status"] ? "" : " 'checked' ") . "></td>"; - $form_tags .= "<td><input type='radio' name='tags[{$key}]' value='1' " . ( $tags[$key]["status"] ? " 'checked' " : "") . "></td>"; - $form_tags .= "<td><input type='radio' name='tags[{$key}]' value='-1'></td>"; + $form_tags .= "<td align='center'><input type='radio' name='tags[{$key}]' value='0' " . ( $tags[$key]["status"] ? "" : " 'checked' ") . "></td>"; + $form_tags .= "<td align='center'><input type='radio' name='tags[{$key}]' value='1' " . ( $tags[$key]["status"] ? " 'checked' " : "") . "></td>"; + $form_tags .= "<td align='center'><input type='radio' name='tags[{$key}]' value='-1'></td>"; $form_tags .= "</tr>"; } if ( !empty($start) || count($tags) >= $limit ) { Modified: XoopsModules/tag/branches/Mamba/tag/admin/admin_footer.php =================================================================== --- XoopsModules/tag/branches/Mamba/tag/admin/admin_footer.php 2011-12-26 17:11:17 UTC (rev 8563) +++ XoopsModules/tag/branches/Mamba/tag/admin/admin_footer.php 2011-12-26 18:43:44 UTC (rev 8564) @@ -17,7 +17,11 @@ * @version $Id $ **/ -echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . XOOPS_URL ."/". $moduleInfo->getInfo("icons32")."/xoopsmicrobutton.gif"." alt=\"XOOPS\" title=\"XOOPS\"></a></div>"; -echo "<div class='center smallsmall italic pad5'><strong>" . $xoopsModule->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>"; +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" + ." </div>\n" + ." " . _AM_TAG_FOOTER . "\n" + ."</div>"; xoops_cp_footer(); \ No newline at end of file Modified: XoopsModules/tag/branches/Mamba/tag/admin/admin_header.php =================================================================== --- XoopsModules/tag/branches/Mamba/tag/admin/admin_header.php 2011-12-26 17:11:17 UTC (rev 8563) +++ XoopsModules/tag/branches/Mamba/tag/admin/admin_header.php 2011-12-26 18:43:44 UTC (rev 8564) @@ -20,27 +20,30 @@ * @package tag */ -include "../../../include/cp_header.php"; -require XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar("dirname") . "/include/vars.php"; -require_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar("dirname") . "/include/functions.php"; -xoops_loadLanguage("main", $xoopsModule->getVar("dirname")); +$path = dirname(dirname(dirname(dirname(__FILE__)))); +require_once $path . '/include/cp_header.php'; -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; - } +require_once dirname(dirname(__FILE__)) . '/include/vars.php'; +require_once dirname(dirname(__FILE__)) . '/include/functions.php'; -$myts =& MyTextSanitizer::getInstance(); +$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname'); -$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid')); -$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16'); -$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32'); +// Load language files +xoops_loadLanguage('admin', $thisModuleDir); +xoops_loadLanguage('modinfo', $thisModuleDir); +xoops_loadLanguage('main', $thisModuleDir); +$pathIcon16 = '../'.$xoopsModule->getInfo('icons16'); +$pathIcon32 = '../'.$xoopsModule->getInfo('icons32'); +$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin'); +if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){ + include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'); + }else{ + redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false); + } + IF (!@ include_once XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php"): function loadModuleAdminMenu($currentoption, $breadcrumb = "") Modified: XoopsModules/tag/branches/Mamba/tag/admin/menu.php =================================================================== --- XoopsModules/tag/branches/Mamba/tag/admin/menu.php 2011-12-26 17:11:17 UTC (rev 8563) +++ XoopsModules/tag/branches/Mamba/tag/admin/menu.php 2011-12-26 18:43:44 UTC (rev 8564) @@ -25,7 +25,7 @@ $module_handler =& xoops_gethandler('module'); $xoopsModule =& XoopsModule::getByDirname('tag'); $moduleInfo =& $module_handler->get($xoopsModule->getVar('mid')); -$pathImageAdmin = $moduleInfo->getInfo('icons32'); +$pathIcon32 = $moduleInfo->getInfo('icons32'); $adminmenu = array(); @@ -33,19 +33,19 @@ $adminmenu[$i]["title"] = TAG_MI_ADMENU_INDEX; $adminmenu[$i]["link"] = "admin/index.php"; $adminmenu[$i]["desc"] = _TAG_ADMIN_HOME_DESC; -$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/home.png'; +$adminmenu[$i]["icon"] = $pathIcon32.'/home.png'; $i++; $adminmenu[$i]["title"] = TAG_MI_ADMENU_EDIT; $adminmenu[$i]["link"] = "admin/admin.tag.php"; $adminmenu[$i]["desc"] = _TAG_ADMIN_ABOUT_DESC; -$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/administration.png'; +$adminmenu[$i]["icon"] = $pathIcon32.'/administration.png'; $i++; $adminmenu[$i]["title"] = TAG_MI_ADMENU_SYNCHRONIZATION; $adminmenu[$i]["link"] = "admin/syn.tag.php"; $adminmenu[$i]["desc"] = _TAG_ADMIN_HELP_DESC; -$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/synchronized.png'; +$adminmenu[$i]["icon"] = $pathIcon32.'/synchronized.png'; $i++; $adminmenu[$i]["title"] = _TAG_ADMIN_ABOUT; $adminmenu[$i]["link"] = "admin/about.php"; $adminmenu[$i]["desc"] = _TAG_ADMIN_ABOUT_DESC; -$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/about.png'; \ No newline at end of file +$adminmenu[$i]["icon"] = $pathIcon32.'/about.png'; \ No newline at end of file Added: XoopsModules/tag/branches/Mamba/tag/docs/changelog.txt =================================================================== --- XoopsModules/tag/branches/Mamba/tag/docs/changelog.txt (rev 0) +++ XoopsModules/tag/branches/Mamba/tag/docs/changelog.txt 2011-12-26 18:43:44 UTC (rev 8564) @@ -0,0 +1,30 @@ +2.31 Final (Dec. 12, 2011) +========================= ++ small code adjustments + + +2.31 Beta (July 10, 2011) +================================= +- removed all icon files and point them to /Frameworks/moduleclasses (Mamba) ++ Updated GUI to XOOPS Module Standard (Mamba) ++ Fix tag phrase (Voltan) + +2.3 Final (August 11th, 2010) +================================= ++ Fixed footer.php file inclusion + +2.30 RC (October 12th, 2008) +================================= ++ For XOOPS 2.3+ + +2.0 (May 4th, 2008) +================================= ++ For XOOPS 2.3.0 + +1.60 (Jan 3rd, 2007) +================================= ++ Added global search + +Oct 29th, 2006 +================================= ++ Minor bugfix by Gizmhail \ No newline at end of file Modified: XoopsModules/tag/branches/Mamba/tag/language/english/admin.php =================================================================== --- XoopsModules/tag/branches/Mamba/tag/language/english/admin.php 2011-12-26 17:11:17 UTC (rev 8563) +++ XoopsModules/tag/branches/Mamba/tag/language/english/admin.php 2011-12-26 18:43:44 UTC (rev 8564) @@ -49,10 +49,10 @@ // text in admin footer define('_AM_TAG_ADMIN_FOOTER', "<div class='right smallsmall italic pad5'><b>" . $xoopsModule->getVar("name") . "</b> is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>"); -// Configuration check -define('_AM_TAG_CONFIG_CHECK','Configuration Check'); -define('_AM_TAG_CONFIG_PHP',"Minimum PHP required: %s (your version is %s)"); -define('_AM_TAG_CONFIG_XOOPS',"Minimum XOOPS required: %s (your version is %s)"); +//ModuleAdmin +define('_AM_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class (see /docs/readme.txt)'); -//ModuleAdmin -define('_AM_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)'); \ No newline at end of file +//define('_AM_TAG_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)'); + +// Text for Admin footer +define("_AM_TAG_FOOTER", "<div class='center smallsmall italic pad5'>Tag Module is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>"); \ No newline at end of file Deleted: XoopsModules/tag/branches/Mamba/tag/language/english/changelog.txt =================================================================== --- XoopsModules/tag/branches/Mamba/tag/language/english/changelog.txt 2011-12-26 17:11:17 UTC (rev 8563) +++ XoopsModules/tag/branches/Mamba/tag/language/english/changelog.txt 2011-12-26 18:43:44 UTC (rev 8564) @@ -1,25 +0,0 @@ -2.31 Beta (July 10, 2011) -================================= -- removed all icon files and point them to /Frameworks/moduleclasses (Mamba) -+ Updated GUI to XOOPS Module Standard (Mamba) -+ Fix tag phrase (Voltan) - -2.3 Final (August 11th, 2010) -================================= -+ Fixed footer.php file inclusion - -2.30 RC (October 12th, 2008) -================================= -+ For XOOPS 2.3+ - -2.0 (May 4th, 2008) -================================= -+ For XOOPS 2.3.0 - -1.60 (Jan 3rd, 2007) -================================= -+ Added global search - -Oct 29th, 2006 -================================= -+ Minor bugfix by Gizmhail \ No newline at end of file Modified: XoopsModules/tag/branches/Mamba/tag/xoops_version.php =================================================================== --- XoopsModules/tag/branches/Mamba/tag/xoops_version.php 2011-12-26 17:11:17 UTC (rev 8563) +++ XoopsModules/tag/branches/Mamba/tag/xoops_version.php 2011-12-26 18:43:44 UTC (rev 8564) @@ -40,17 +40,17 @@ $modversion["official"] = 0; $modversion["author_website_url"] = "http://xoops.org"; $modversion["author_website_name"] = "XOOPS"; -$modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses'; -$modversion['icons16'] = 'Frameworks/moduleclasses/icons/16'; -$modversion['icons32'] = 'Frameworks/moduleclasses/icons/32'; +$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin'; +$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16'; +$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32'; //about -$modversion["release_date"] = "2011/05/10"; +$modversion["release_date"] = "2011/12/12"; $modversion["demo_site_url"] = ""; $modversion["demo_site_name"] = ""; $modversion["module_website_url"] = "http://xoops.org"; $modversion["module_website_name"] = "XOOPS"; -$modversion["module_status"] = "RC"; +$modversion["module_status"] = "Final"; $modversion['min_php'] = '5.2'; $modversion['min_xoops'] = "2.5.0"; $modversion['min_admin']='1.1'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |