Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[8408] XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/ smilies
|
From: <ma...@us...> - 2011-12-04 20:28:54
|
Revision: 8408
http://xoops.svn.sourceforge.net/xoops/?rev=8408&view=rev
Author: mageg
Date: 2011-12-04 20:28:48 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Update module smilies to use XoopsModuleAdmin
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/about.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/header.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/menu.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/smilies.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/language/english/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/xoops_version.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/about.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/about.php 2011-12-04 20:26:13 UTC (rev 8407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/about.php 2011-12-04 20:28:48 UTC (rev 8408)
@@ -21,7 +21,7 @@
*/
include dirname(__FILE__) . '/header.php';
$xoops->header('smilies_about.html');
-$aboutAdmin = new ModuleAdmin();
+$aboutAdmin = new XoopsModuleAdmin();
$xoops->tpl->assign('navigation', $aboutAdmin->addNavigation('about.php'));
$xoops->tpl->assign('about', $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false));
$xoops->footer();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/header.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/header.php 2011-12-04 20:26:13 UTC (rev 8407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/header.php 2011-12-04 20:28:48 UTC (rev 8408)
@@ -22,11 +22,5 @@
require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
$xoops = Xoops::getInstance();
-
-if (file_exists($xoops->path('Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))) {
- include_once $xoops->path('Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
-} else {
- echo $xoops->error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
-}
?>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/index.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/index.php 2011-12-04 20:26:13 UTC (rev 8407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/index.php 2011-12-04 20:28:48 UTC (rev 8408)
@@ -20,8 +20,30 @@
* @version $Id$
*/
include dirname(__FILE__) . '/header.php';
+// Get smilies handler
+$smilies_Handler = $xoops->getHandler("smilies");
+
$xoops->header('smilies_index.html');
-$indexAdmin = new ModuleAdmin();
+// smilies not display
+$criteria = new CriteriaCompo();
+$criteria->add(new Criteria('display', 0));
+$smilies_notdisplay = $smilies_Handler->getCount($criteria);
+// smilies display
+$criteria = new CriteriaCompo();
+$criteria->add(new Criteria('display', 0, '!='));
+$smilies_display = $smilies_Handler->getCount($criteria);
+// total smilies
+$smilies_total= $smilies_notdisplay + $smilies_display;
+// folder path
+$folder_path = XOOPS_ROOT_PATH . '/uploads/smilies';
+
+$indexAdmin = new XoopsModuleAdmin();
+$indexAdmin->addInfoBox(_SMILIES_MI_SMILIES);
+$indexAdmin->addInfoBoxLine(_SMILIES_MI_SMILIES, _SMILIES_AM_NBTOTAL, $smilies_total);
+$indexAdmin->addInfoBoxLine(_SMILIES_MI_SMILIES, _SMILIES_AM_NBDISPLAY, $smilies_display, 'Green');
+$indexAdmin->addInfoBoxLine(_SMILIES_MI_SMILIES, _SMILIES_AM_NBNOTDISPLAY, $smilies_notdisplay, 'Red');
+$indexAdmin->addConfigBoxLine($folder_path, 'folder');
+$indexAdmin->addConfigBoxLine(array($folder_path, '777'), 'chmod');
$xoops->tpl->assign('navigation', $indexAdmin->addNavigation('index.php'));
$xoops->tpl->assign('about', $indexAdmin->renderIndex());
$xoops->footer();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/menu.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/menu.php 2011-12-04 20:26:13 UTC (rev 8407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/menu.php 2011-12-04 20:28:48 UTC (rev 8408)
@@ -19,21 +19,20 @@
* @author Mage Grégory (AKA Mage)
* @version $Id$
*/
-$pathIcon32 = Xoops::getInstance()->getHandlerModule()->getByDirname('smilies')->getInfo('icons32');
+$pathIcon32 = '../../media/xoops/images/icons/32/';
$adminmenu = array();
-
$i = 1;
$adminmenu[$i]['title'] = _SMILIES_MI_INDEX;
$adminmenu[$i]['link'] = "admin/index.php";
-$adminmenu[$i]['icon'] = '../../' . $pathIcon32 . '/home.png';
+$adminmenu[$i]['icon'] = $pathIcon32 . 'home.png';
$i++;
$adminmenu[$i]['title'] = _SMILIES_MI_SMILIES;
$adminmenu[$i]['link'] = "admin/smilies.php";
-$adminmenu[$i]['icon'] = '../../' . $pathIcon32 . '/smilies.png';
+$adminmenu[$i]['icon'] = $pathIcon32 . 'smilies.png';
$i++;
$adminmenu[$i]['title'] = _SMILIES_MI_ABOUT;
$adminmenu[$i]['link'] = 'admin/about.php';
-$adminmenu[$i]['icon'] = '../../' . $pathIcon32 . '/about.png';
+$adminmenu[$i]['icon'] = $pathIcon32 . 'about.png';
?>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/smilies.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/smilies.php 2011-12-04 20:26:13 UTC (rev 8407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/smilies.php 2011-12-04 20:28:48 UTC (rev 8408)
@@ -33,7 +33,7 @@
$xoops->header('smilies_smilies.html');
-$smiliesAdmin = new ModuleAdmin();
+$smiliesAdmin = new XoopsModuleAdmin();
$xoops->tpl->assign('navigation', $smiliesAdmin->addNavigation('smilies.php'));
switch ($op) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/language/english/admin.php 2011-12-04 20:26:13 UTC (rev 8407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/language/english/admin.php 2011-12-04 20:28:48 UTC (rev 8408)
@@ -29,6 +29,9 @@
define("_SMILIES_AM_FILE","Smilie file");
define("_SMILIES_AM_IMAGE_PATH","Files exist in: %s");
define("_SMILIES_AM_LIST", "List of smilies");
+define("_SMILIES_AM_NBTOTAL","There are %s smilies in our database");
+define("_SMILIES_AM_NBDISPLAY","There are %s visible smilies");
+define("_SMILIES_AM_NBNOTDISPLAY","There are %s smilies not visible");
define("_SMILIES_AM_OFF","Display in the form ");
define("_SMILIES_AM_ON","Does not display in the form");
define("_SMILIES_AM_SAVE","Smilie saved");
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/xoops_version.php 2011-12-04 20:26:13 UTC (rev 8407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/xoops_version.php 2011-12-04 20:28:48 UTC (rev 8408)
@@ -24,7 +24,7 @@
$modversion['description'] = _SMILIES_MI_DESC;
$modversion['version'] = 0.1;
$modversion['author'] = 'Mage';
-$modversion['pseudo'] = 'Mage';
+$modversion['nickname'] = 'Mage';
$modversion['credits'] = 'The XOOPS Project';
$modversion['license'] = 'GNU GPL 2.0';
$modversion['license_url'] = 'www.gnu.org/licenses/gpl-2.0.html/';
@@ -32,9 +32,6 @@
$modversion['help'] = 'page=help';
$modversion['image'] = 'images/logo.png';
$modversion['dirname'] = 'smilies';
-$modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses';
-$modversion['icons16'] = 'Frameworks/moduleclasses/icons/16';
-$modversion['icons32'] = 'Frameworks/moduleclasses/icons/32';
//about
$modversion['release_date'] = '2011/12/20';
$modversion['module_website_url'] = 'http://www.xoops.org/';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
