From: <be...@us...> - 2012-04-02 23:03:03
|
Revision: 9241 http://xoops.svn.sourceforge.net/xoops/?rev=9241&view=rev Author: beckmi Date: 2012-04-02 23:02:56 +0000 (Mon, 02 Apr 2012) Log Message: ----------- Version 1.71 RC2 - XOOPS 2.5.x Admin GUI Modified Paths: -------------- XoopsModules/boox/trunk/boox/admin/admin_footer.php XoopsModules/boox/trunk/boox/admin/admin_header.php XoopsModules/boox/trunk/boox/admin/main.php XoopsModules/boox/trunk/boox/admin/menu.php XoopsModules/boox/trunk/boox/docs/README.TXT XoopsModules/boox/trunk/boox/docs/changelog.txt XoopsModules/boox/trunk/boox/language/english/admin.php XoopsModules/boox/trunk/boox/language/englishUTF8/admin.php XoopsModules/boox/trunk/boox/language/french/admin.php XoopsModules/boox/trunk/boox/language/frenchUTF8/admin.php XoopsModules/boox/trunk/boox/language/portuguesebr/admin.php XoopsModules/boox/trunk/boox/xoops_version.php Modified: XoopsModules/boox/trunk/boox/admin/admin_footer.php =================================================================== --- XoopsModules/boox/trunk/boox/admin/admin_footer.php 2012-04-02 22:19:24 UTC (rev 9240) +++ XoopsModules/boox/trunk/boox/admin/admin_footer.php 2012-04-02 23:02:56 UTC (rev 9241) @@ -2,7 +2,7 @@ /** * **************************************************************************** * boox - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com) + * Copyright (c) Herv� Thouzard (http://www.herve-thouzard.com) * * 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 @@ -11,10 +11,10 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com) + * @copyright Herv� Thouzard (http://www.herve-thouzard.com) * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License * @package boox - * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com) + * @author Herv� Thouzard (http://www.herve-thouzard.com) * * Version : $Id: * **************************************************************************** @@ -26,7 +26,7 @@ ." <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_BOOX_FOOTER . "\n" + ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" ."</div>"; xoops_cp_footer(); \ No newline at end of file Modified: XoopsModules/boox/trunk/boox/admin/admin_header.php =================================================================== --- XoopsModules/boox/trunk/boox/admin/admin_header.php 2012-04-02 22:19:24 UTC (rev 9240) +++ XoopsModules/boox/trunk/boox/admin/admin_header.php 2012-04-02 23:02:56 UTC (rev 9241) @@ -2,7 +2,7 @@ /** * **************************************************************************** * boox - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com) + * Copyright (c) Herv� Thouzard (http://www.herve-thouzard.com) * * 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 @@ -11,10 +11,10 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com) + * @copyright Herv� Thouzard (http://www.herve-thouzard.com) * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License * @package boox - * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com) + * @author Herv� Thouzard (http://www.herve-thouzard.com) * * Version : $Id: * **************************************************************************** @@ -43,6 +43,6 @@ 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); + redirect_header("../../../admin.php", 5, _AM_BOOX_MODULEADMIN_MISSING, false); } Modified: XoopsModules/boox/trunk/boox/admin/main.php =================================================================== --- XoopsModules/boox/trunk/boox/admin/main.php 2012-04-02 22:19:24 UTC (rev 9240) +++ XoopsModules/boox/trunk/boox/admin/main.php 2012-04-02 23:02:56 UTC (rev 9241) @@ -2,7 +2,7 @@ /** * **************************************************************************** * boox - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com) + * Copyright (c) Herv� Thouzard (http://www.herve-thouzard.com) * * 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 @@ -11,10 +11,10 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com) + * @copyright Herv� Thouzard (http://www.herve-thouzard.com) * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License * @package boox - * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com) + * @author Herv� Thouzard (http://www.herve-thouzard.com) * * Version : $Id: * **************************************************************************** @@ -140,7 +140,10 @@ } xoops_cp_header(); echo $indexAdmin->addNavigation('main.php'); - echo '<h4>'._AM_BOOX_FILES.'</h4>'; + $indexAdmin->addItemButton(_ADD, 'main.php?op=addfile', 'add', ''); + echo $indexAdmin->renderButton('right', ''); + + echo '<h4>'._AM_BOOX_FILES.'</h4>'; $files = array(); $files = $storage->getAllFiles(); echo '<table border="0" align="center" width="95%">'; @@ -152,18 +155,18 @@ $class=''; foreach($files as $file) { $class = ($class == 'even') ? 'odd' : 'even'; - $action_delete = '<a '.boox_JavascriptLinkConfirm(_AM_BOOX_CONFIRM).' title="'._DELETE.'" href="main.php?op=delete&filename='.urlencode($file).'"><img border="0" src="../images/delete.gif" /></a>'; - $action_edit = '<a title="'._EDIT.'" href="main.php?op=edit&filename='.urlencode($file).'"><img border="0" src="../images/edit.gif" /></a>'; + $action_edit = '<a title="'._EDIT.'" href="main.php?op=edit&filename='.urlencode($file).'"><img border="0" src="../images/edit.gif" /></a>'; + $action_delete = '<a '.boox_JavascriptLinkConfirm(_AM_BOOX_CONFIRM).' title="'._DELETE.'" href="main.php?op=delete&filename='.urlencode($file).'"><img border="0" src="../images/delete.gif" /></a>'; $command = "<{php}>include_once '".$folder_storage.$file."';<{/php}>"; echo "<tr class='".$class."'>"; echo '<td>'.$file.'</td>'; echo '<td>'.$command.'</td>'; - echo "<td align='center'>".$action_delete.' '.$action_edit.'</td>'; + echo "<td align='center'>".$action_edit.' '.$action_delete.'</td>'; echo "</tr>"; } $class = ($class == 'even') ? 'odd' : 'even'; - echo "<tr class='".$class."'><td colspan='3' align='center'><br /><form method='post' name='fadd' id='fadd' action='main.php'><input type='hidden' name='op' value='addfile' /><input type='submit' name='btngo' value='"._AM_BOOX_ADD."' /></form><br /></td></tr>"; - echo '</table>'; + //echo "<tr class='".$class."'><td colspan='3' align='center'><br /><form method='post' name='fadd' id='fadd' action='main.php'><input type='hidden' name='op' value='addfile' /><input type='submit' name='btngo' value='"._AM_BOOX_ADD."' /></form><br /></td></tr>"; + echo '</table><br/>'; //echo "<br /><div align='center'><a href='http://xoops.instant-zero.com' target='_blank'><img src='../images/instantzero.gif'></a></div>"; break; Modified: XoopsModules/boox/trunk/boox/admin/menu.php =================================================================== --- XoopsModules/boox/trunk/boox/admin/menu.php 2012-04-02 22:19:24 UTC (rev 9240) +++ XoopsModules/boox/trunk/boox/admin/menu.php 2012-04-02 23:02:56 UTC (rev 9241) @@ -2,7 +2,7 @@ /** * **************************************************************************** * boox - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com) + * Copyright (c) Herv� Thouzard (http://www.herve-thouzard.com) * * 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 @@ -11,10 +11,10 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com) + * @copyright Herv� Thouzard (http://www.herve-thouzard.com) * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License * @package boox - * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com) + * @author Herv� Thouzard (http://www.herve-thouzard.com) * * Version : $Id: * **************************************************************************** @@ -22,18 +22,14 @@ defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined"); -//$dirname = basename(dirname(dirname(__FILE__))); -//$module_handler = xoops_gethandler('module'); -//$module = $module_handler->getByDirname($dirname); -//$pathIcon32 = $module->getInfo('icons32'); -$pathIcon32 = '../../Frameworks/moduleclasses/icons/32'; +$dirname = basename(dirname(dirname(__FILE__))); +$module_handler = xoops_gethandler('module'); +$module = $module_handler->getByDirname($dirname); +$pathIcon32 = $module->getInfo('icons32'); +xoops_loadLanguage('admin', $dirname); -//xoops_loadLanguage('admin', $dirname); - -$adminmenu = array(); - -$i = 1; +$i = 0; $adminmenu[$i]["title"] = _MI_BOOX_MENU_00; $adminmenu[$i]["link"] = 'admin/index.php'; $adminmenu[$i]["icon"] = $pathIcon32.'/home.png'; Modified: XoopsModules/boox/trunk/boox/docs/README.TXT =================================================================== --- XoopsModules/boox/trunk/boox/docs/README.TXT 2012-04-02 22:19:24 UTC (rev 9240) +++ XoopsModules/boox/trunk/boox/docs/README.TXT 2012-04-02 23:02:56 UTC (rev 9241) @@ -1,8 +1,8 @@ BOOX -Boox (Blocks Out Of Xoops) is a module which is to help you to manage content that Xoops can't access but which is part of your site. +Boox (Blocks Out Of Xoops) is a module which is to help you to manage content that XOOPS can't access but which is part of your site. -Typically, this content is created on the form of blocks which are not parts of a Xoops module and that's also a content which is, in general, placed in the theme. +Typically, this content is created on the form of blocks which are not parts of a XOOPS module and that's also a content which is, in general, placed in the theme. With the module, you can create as many "virtual blocks" as you want, they are saved in files (the module does not use database) and you just need to call them in your theme with the following line of code : @@ -10,4 +10,4 @@ So it's possible to create a content you can modify without putting your hands in the theme (except the first time to write the include commands) -The module is running with all the Editors you can use in Xoops : Spaw, Fck editor, Htmlarea, Tinyeditor et Kiovi \ No newline at end of file +The module is running with all the Editors you can use in XOOPS : Spaw, Fck editor, Htmlarea, Tinyeditor et Kiovi \ No newline at end of file Modified: XoopsModules/boox/trunk/boox/docs/changelog.txt =================================================================== --- XoopsModules/boox/trunk/boox/docs/changelog.txt 2012-04-02 22:19:24 UTC (rev 9240) +++ XoopsModules/boox/trunk/boox/docs/changelog.txt 2012-04-02 23:02:56 UTC (rev 9241) @@ -1,5 +1,5 @@ ============================ -Version 1.71 2011/12/12: +Version 1.71 2011/04/02: ============================ - Conversion to XOOPS 2.5.0 GUI (mamba) Modified: XoopsModules/boox/trunk/boox/language/english/admin.php =================================================================== --- XoopsModules/boox/trunk/boox/language/english/admin.php 2012-04-02 22:19:24 UTC (rev 9240) +++ XoopsModules/boox/trunk/boox/language/english/admin.php 2012-04-02 23:02:56 UTC (rev 9241) @@ -2,7 +2,7 @@ /** * **************************************************************************** * boox - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com) + * Copyright (c) Herv� Thouzard (http://www.herve-thouzard.com) * * 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 @@ -11,10 +11,10 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com) + * @copyright Herv� Thouzard (http://www.herve-thouzard.com) * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License * @package boox - * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com) + * @author Herv� Thouzard (http://www.herve-thouzard.com) * * Version : $Id: * **************************************************************************** @@ -37,5 +37,5 @@ define('_AM_BOOX_ERROR3',"Error, unable to read the file %s"); define('_AM_BOOX_CONTENT',"Content"); -// Text for Admin footer -define("_AM_BOOX_FOOTER", "<div class='center smallsmall italic pad5'>Boox 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 +//ModuleAdmin +define('_AM_BOOX_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 Modified: XoopsModules/boox/trunk/boox/language/englishUTF8/admin.php =================================================================== --- XoopsModules/boox/trunk/boox/language/englishUTF8/admin.php 2012-04-02 22:19:24 UTC (rev 9240) +++ XoopsModules/boox/trunk/boox/language/englishUTF8/admin.php 2012-04-02 23:02:56 UTC (rev 9241) @@ -37,5 +37,5 @@ define("_AM_BOOX_ERROR3","Error, unable to read the file %s"); define("_AM_BOOX_CONTENT","Content"); -// Text for Admin footer -define("_AM_BOOX_FOOTER", "<div class='center smallsmall italic pad5'>Boox is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>"); +//ModuleAdmin +define('_AM_BOOX_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 Modified: XoopsModules/boox/trunk/boox/language/french/admin.php =================================================================== --- XoopsModules/boox/trunk/boox/language/french/admin.php 2012-04-02 22:19:24 UTC (rev 9240) +++ XoopsModules/boox/trunk/boox/language/french/admin.php 2012-04-02 23:02:56 UTC (rev 9241) @@ -2,7 +2,7 @@ /** * **************************************************************************** * boox - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com) + * Copyright (c) Herv� Thouzard (http://www.herve-thouzard.com) * * 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 @@ -11,16 +11,16 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com) + * @copyright Herv� Thouzard (http://www.herve-thouzard.com) * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License * @package boox - * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com) + * @author Herv� Thouzard (http://www.herve-thouzard.com) * * Version : $Id: * **************************************************************************** */ -define("_AM_BOOX_DBUPDATED","Base de donn\xE9es mise \xE0 jour avec succ\xE8s"); +define("_AM_BOOX_DBUPDATED","Base de donn�es mise � jour avec succ�s"); define("_AM_BOOX_GENERALSET", "Options du module" ); define("_AM_BOOX_MODULEADMIN","Administration"); define("_AM_BOOX_EDIT","Editer"); @@ -31,11 +31,11 @@ define("_AM_BOOX_FILE","Fichier"); define("_AM_BOOX_FILENAME","Nom de fichier"); define("_AM_BOOX_ACTION","Action"); -define("_AM_BOOX_COMMAND","Commande \xE0 inclure dans votre th\xE8me"); -define("_AM_BOOX_ERROR1","Veuillez sp\xE9cifier un nom de fichier"); +define("_AM_BOOX_COMMAND","Commande � inclure dans votre th�me"); +define("_AM_BOOX_ERROR1","Veuillez sp�cifier un nom de fichier"); define("_AM_BOOX_ERROR2","Erreur, impossible de sauvegarder le fichier %s"); define("_AM_BOOX_ERROR3","Erreur, impossible de lire le fichier %s"); define("_AM_BOOX_CONTENT","Contenu"); -// Text for Admin footer -define("_AM_BOOX_FOOTER", "<div class='center smallsmall italic pad5'>Boox 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 +//ModuleAdmin +define('_AM_BOOX_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 Modified: XoopsModules/boox/trunk/boox/language/frenchUTF8/admin.php =================================================================== --- XoopsModules/boox/trunk/boox/language/frenchUTF8/admin.php 2012-04-02 22:19:24 UTC (rev 9240) +++ XoopsModules/boox/trunk/boox/language/frenchUTF8/admin.php 2012-04-02 23:02:56 UTC (rev 9241) @@ -37,5 +37,5 @@ define("_AM_BOOX_ERROR3","Erreur, impossible de lire le fichier %s"); define("_AM_BOOX_CONTENT","Contenu"); -// Text for Admin footer -define("_AM_BOOX_FOOTER", "<div class='center smallsmall italic pad5'>Boox is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>"); +//ModuleAdmin +define('_AM_BOOX_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 Modified: XoopsModules/boox/trunk/boox/language/portuguesebr/admin.php =================================================================== --- XoopsModules/boox/trunk/boox/language/portuguesebr/admin.php 2012-04-02 22:19:24 UTC (rev 9240) +++ XoopsModules/boox/trunk/boox/language/portuguesebr/admin.php 2012-04-02 23:02:56 UTC (rev 9241) @@ -2,26 +2,26 @@ /** * **************************************************************************** * BOOX - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com) + * Copyright (c) Herv� Thouzard (http://www.herve-thouzard.com) * **************************************************************************** */ define("_AM_BOOX_DBUPDATED","Banco de dados atualizado"); -define("_AM_BOOX_GENERALSET", "Op\xE7\xF5es do m\xF3dulo" ); -define("_AM_BOOX_MODULEADMIN","Administra\xE7\xE3o"); +define("_AM_BOOX_GENERALSET", "Op��es do m�dulo" ); +define("_AM_BOOX_MODULEADMIN","Administra��o"); define("_AM_BOOX_EDIT","Editar"); define("_AM_BOOX_DELETE","Deletar"); define("_AM_BOOX_ADD","Incluir"); -define("_AM_BOOX_CONFIRM","Voc\xEA tem certeza ?"); +define("_AM_BOOX_CONFIRM","Voc� tem certeza ?"); define("_AM_BOOX_FILES","Arquivos"); define("_AM_BOOX_FILE","Arquivo"); define("_AM_BOOX_FILENAME","Nome do arquivo"); -define("_AM_BOOX_ACTION","A\xE7\xE3o"); +define("_AM_BOOX_ACTION","A��o"); define("_AM_BOOX_COMMAND","Script para incluir no seu tema"); define("_AM_BOOX_ERROR1","Por favor especifique um nome de arquivo"); -define("_AM_BOOX_ERROR2","Erro, imposs\xEDvel salvar arquivo %s"); -define("_AM_BOOX_ERROR3","Erro, imposs\xEDvel ler arquivo %s"); -define("_AM_BOOX_CONTENT","Conte\xFAdo"); +define("_AM_BOOX_ERROR2","Erro, imposs�vel salvar arquivo %s"); +define("_AM_BOOX_ERROR3","Erro, imposs�vel ler arquivo %s"); +define("_AM_BOOX_CONTENT","Conte�do"); -// Text for Admin footer -define("_AM_BOOX_FOOTER", "<div class='center smallsmall italic pad5'>Boox 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 +//ModuleAdmin +define('_AM_BOOX_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 Modified: XoopsModules/boox/trunk/boox/xoops_version.php =================================================================== --- XoopsModules/boox/trunk/boox/xoops_version.php 2012-04-02 22:19:24 UTC (rev 9240) +++ XoopsModules/boox/trunk/boox/xoops_version.php 2012-04-02 23:02:56 UTC (rev 9241) @@ -47,8 +47,8 @@ $modversion["module_website_url"] = 'http://xoops.org'; $modversion["module_website_name"] = 'XOOPS'; $modversion["release"] = '0'; -$modversion["module_status"] = 'RC'; -$modversion['release_date'] = '2011/12/12'; +$modversion["module_status"] = 'RC2'; +$modversion['release_date'] = '2012/04/02'; $modversion['min_php'] = '5.2'; $modversion['min_xoops'] = '2.5.0'; $modversion['min_admin']='1.1'; @@ -99,8 +99,10 @@ $modversion['config'][$i]['valuetype'] = 'text'; $modversion['config'][$i]['default'] = 'dhtml'; xoops_load('xoopseditorhandler'); -$modversion['config'][$i]['options'] = array_flip(xoopsEditorHandler::getList()); +$editor_handler = XoopsEditorHandler::getInstance(); +$modversion['config'][$i]['options'] = array_flip($editor_handler->getList()); + /** * Trim file's content before to save it ? */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |