Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[8460] XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/ smilies
|
From: <ma...@us...> - 2011-12-11 20:08:13
|
Revision: 8460
http://xoops.svn.sourceforge.net/xoops/?rev=8460&view=rev
Author: mageg
Date: 2011-12-11 20:08:06 +0000 (Sun, 11 Dec 2011)
Log Message:
-----------
Updating smilies (draft 1)
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/class/form/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/language/english/modinfo.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_smilies.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/xoops_version.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/index.html
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/docs/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/images/spinner.gif
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/preloads/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/sql/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_about.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_index.html
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-11 17:04:52 UTC (rev 8459)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/about.php 2011-12-11 20:08:06 UTC (rev 8460)
@@ -20,10 +20,8 @@
* @version $Id$
*/
include dirname(__FILE__) . '/header.php';
-$xoops->header('smilies_about.html');
+$xoops->header();
$aboutAdmin = new XoopsModuleAdmin();
-$xoops->tpl->assign('navigation', $aboutAdmin->addNavigation('about.php'));
-$xoops->tpl->assign('about', $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false));
-$xoops->footer();
-?>
-
+$aboutAdmin->renderNavigation('about.php');
+$aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false);
+$xoops->footer();
\ No newline at end of file
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-11 17:04:52 UTC (rev 8459)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/header.php 2011-12-11 20:08:06 UTC (rev 8460)
@@ -22,5 +22,4 @@
require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
$xoops = Xoops::getInstance();
-?>
-
+XoopsLoad::load('system', 'system');
\ No newline at end of file
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-11 17:04:52 UTC (rev 8459)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/index.php 2011-12-11 20:08:06 UTC (rev 8460)
@@ -23,7 +23,7 @@
// Get smilies handler
$smilies_Handler = $xoops->getHandler("smilies");
-$xoops->header('smilies_index.html');
+$xoops->header();
// smilies not display
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('display', 0));
@@ -37,15 +37,17 @@
// 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());
+$admin_page = new XoopsModuleAdmin();
+
+$admin_page->addInfoBox(_MI_SMILIES_SMILIES, 'default');
+$admin_page->addInfoBoxLine(sprintf(_AM_SMILIES_NBTOTAL, $smilies_total), 'default');
+$admin_page->addInfoBoxLine(sprintf(_AM_SMILIES_NBDISPLAY, $smilies_display), 'default', 'green');
+$admin_page->addInfoBoxLine(sprintf(_AM_SMILIES_NBNOTDISPLAY, $smilies_notdisplay), 'default', 'red');
+
+$admin_page->addConfigBoxLine($folder_path, 'folder');
+$admin_page->addConfigBoxLine(array($folder_path, '777'), 'chmod');
+
+$admin_page->renderButton();
+$admin_page->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-11 17:04:52 UTC (rev 8459)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/menu.php 2011-12-11 20:08:06 UTC (rev 8460)
@@ -23,16 +23,14 @@
$adminmenu = array();
$i = 1;
-$adminmenu[$i]['title'] = _SMILIES_MI_INDEX;
+$adminmenu[$i]['title'] = _MI_SMILIES_INDEX;
$adminmenu[$i]['link'] = "admin/index.php";
$adminmenu[$i]['icon'] = $pathIcon32 . 'home.png';
$i++;
-$adminmenu[$i]['title'] = _SMILIES_MI_SMILIES;
+$adminmenu[$i]['title'] = _MI_SMILIES_SMILIES;
$adminmenu[$i]['link'] = "admin/smilies.php";
$adminmenu[$i]['icon'] = $pathIcon32 . 'smilies.png';
$i++;
-$adminmenu[$i]['title'] = _SMILIES_MI_ABOUT;
+$adminmenu[$i]['title'] = _MI_SMILIES_ABOUT;
$adminmenu[$i]['link'] = 'admin/about.php';
-$adminmenu[$i]['icon'] = $pathIcon32 . 'about.png';
-?>
-
+$adminmenu[$i]['icon'] = $pathIcon32 . 'about.png';
\ No newline at end of file
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-11 17:04:52 UTC (rev 8459)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/smilies.php 2011-12-11 20:08:06 UTC (rev 8460)
@@ -20,7 +20,16 @@
* @version $Id$
*/
include dirname(__FILE__) . '/header.php';
-include_once dirname(dirname(dirname(__FILE__))) . '/system/class/system.php';
+// Get main instance
+$system = System::getInstance();
+// Check users rights
+if (!$xoops->isUser() || !$xoops->isModule() || !$xoops->user->isAdmin($xoops->module->mid())) {
+ exit(_NOPERM);
+}
+// Check is active
+if (!$xoops->getModuleConfig('active_smilies', 'system')) {
+ $xoops->redirect('admin.php', 2, _AM_SYSTEM_NOTACTIVE);
+}
// Parameters
$nb_smilies = $xoops->getModuleConfig('smilies_pager');
$mimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
@@ -30,11 +39,11 @@
$op = $system->cleanVars($_REQUEST, 'op', 'list', 'string');
// Get smilies handler
$smilies_Handler = $xoops->getHandler("smilies");
-
+// Call Header
$xoops->header('smilies_smilies.html');
-$smiliesAdmin = new XoopsModuleAdmin();
-$xoops->tpl->assign('navigation', $smiliesAdmin->addNavigation('smilies.php'));
+$admin_page = new XoopsModuleAdmin();
+$admin_page->renderNavigation('smilies.php');
switch ($op) {
@@ -43,9 +52,12 @@
// Define Stylesheet
$xoops->theme->addStylesheet('modules/system/css/admin.css');
$xoops->theme->addScript('media/jquery/plugins/jquery.tablesorter.js');
- $xoops->theme->addScript('modules/system/js/admin.js');
- $smiliesAdmin->addItemButton(_SMILIES_AM_ADD, 'smilies.php?op=new_smilie', 'add');
- $xoops->tpl->assign('button', $smiliesAdmin->renderButton());
+ $xoops->theme->addScript('media/xoops/xoops.js');
+
+ $admin_page->addTips(_AM_SMILIES_TIPS);
+ $admin_page->addItemButton(_AM_SMILIES_ADD, 'smilies.php?op=new_smilie', 'add');
+ $admin_page->renderTips();
+ $admin_page->renderButton();
// Get start pager
$start = $system->cleanVars($_REQUEST, 'start', 0, 'int');
// Criteria
@@ -70,9 +82,9 @@
: 'blank.gif';
$smilies['image'] = '<img src="' . XOOPS_UPLOAD_URL . '/' . $smilies_img . '" alt="" />';
$smilies['edit_delete'] = '<a href="admin.php?fct=smilies&op=edit_smilie&smilies_id=' . $smilies_id . '">
- <img src="./images/icons/edit.png" border="0" alt="' . _SMILIES_AM_EDIT . '" title="' . _SMILIES_AM_EDIT . '"></a>
+ <img src="./images/icons/edit.png" border="0" alt="' . _AM_SMILIES_EDIT . '" title="' . _AM_SMILIES_EDIT . '"></a>
<a href="admin.php?fct=smilies&op=smilies_delete&smilies_id=' . $smilies_id . '">
- <img src="./images/icons/delete.png" border="0" alt="' . _SMILIES_AM_DELETE . '" title="' . _SMILIES_AM_DELETE . '"></a>';
+ <img src="./images/icons/delete.png" border="0" alt="' . _AM_SMILIES_DELETE . '" title="' . _AM_SMILIES_DELETE . '"></a>';
$xoops->tpl->append_by_ref('smilies', $smilies);
unset($smilies);
}
@@ -88,8 +100,11 @@
case "new_smilie":
// Define Stylesheet
$xoops->theme->addStylesheet('modules/system/css/admin.css');
- $smiliesAdmin->addItemButton(_SMILIES_AM_LIST, 'smilies.php', 'list');
- $xoops->tpl->assign('button', $smiliesAdmin->renderButton());
+ $admin_page->addTips(sprintf(_AM_SMILIES_TIPS_FORM1, implode(', ', $mimetypes)) . sprintf(_AM_SMILIES_TIPS_FORM2, $upload_size / 1000));
+ $admin_page->addItemButton(_AM_SMILIES_ADD, 'smilies.php?op=new_smilie', 'add');
+ $admin_page->addItemButton(_AM_SMILIES_LIST, 'smilies.php', 'list');
+ $admin_page->renderTips();
+ $admin_page->renderButton();
// Create form
$obj = $smilies_Handler->create();
$form = $xoops->getModuleForm($obj, 'smilies');
@@ -101,8 +116,11 @@
case "edit_smilie":
// Define Stylesheet
$xoops->theme->addStylesheet('modules/system/css/admin.css');
- $smiliesAdmin->addItemButton(_SMILIES_AM_LIST, 'smilies.php', 'list');
- $xoops->tpl->assign('button', $smiliesAdmin->renderButton());
+ $admin_page->addTips(sprintf(_AM_SMILIES_TIPS_FORM1, implode(', ', $mimetypes)) . sprintf(_AM_SMILIES_TIPS_FORM2, $upload_size / 1000));
+ $admin_page->addItemButton(_AM_SMILIES_ADD, 'smilies.php?op=new_smilie', 'add');
+ $admin_page->addItemButton(_AM_SMILIES_LIST, 'smilies.php', 'list');
+ $admin_page->renderTips();
+ $admin_page->renderButton();
// Create form
$obj = $smilies_Handler->get($system->cleanVars($_REQUEST, 'smilies_id', 0, 'int'));
$form = $xoops->getModuleForm($obj, 'smilies');
@@ -142,16 +160,16 @@
$obj->setVar("smile_url", 'smilies/' . $_POST["smile_url"]);
}
if ($smilies_Handler->insert($obj)) {
- $xoops->redirect("smilies.php?fct=smilies", 2, _SMILIES_AM_SAVE);
+ $xoops->redirect("smilies.php?fct=smilies", 2, _AM_SMILIES_SAVE);
}
$xoops->error($obj->getHtmlErrors());
break;
//Del a smilie
case "smilies_delete":
- $smiliesAdmin->addItemButton(_SMILIES_AM_LIST, 'smilies.php', 'list');
- $smiliesAdmin->addItemButton(_SMILIES_AM_ADD, 'smilies.php?op=new_smilie', 'add');
- $xoops->tpl->assign('button', $smiliesAdmin->renderButton());
+ $admin_page->addItemButton(_AM_SMILIES_ADD, 'smilies.php?op=new_smilie', 'add');
+ $admin_page->addItemButton(_AM_SMILIES_LIST, 'smilies.php', 'list');
+ $admin_page->renderButton();
$smilies_id = $system->cleanVars($_REQUEST, 'smilies_id', 0, 'int');
$obj = $smilies_Handler->get($smilies_id);
if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
@@ -164,7 +182,7 @@
chmod($urlfile, 0777);
unlink($urlfile);
}
- $xoops->redirect("smilies.php", 2, _SMILIES_AM_SAVE);
+ $xoops->redirect("smilies.php", 2, _AM_SMILIES_SAVE);
} else {
$xoops->error($obj->getHtmlErrors());
}
@@ -174,7 +192,7 @@
$smilies_img = ($obj->getVar("smile_url")) ? $obj->getVar("smile_url") : 'blank.gif';
$xoops->confirm(array(
"ok" => 1, "smilies_id" => $_REQUEST["smilies_id"], "op" => "smilies_delete"
- ), $_SERVER["REQUEST_URI"], sprintf(_SMILIES_AM_SUREDEL) . '<br \><img src="' . XOOPS_UPLOAD_URL . '/' . $smilies_img . '" alt="" /><br \>');
+ ), $_SERVER["REQUEST_URI"], sprintf(_AM_SMILIES_SUREDEL) . '<br \><img src="' . XOOPS_UPLOAD_URL . '/' . $smilies_img . '" alt="" /><br \>');
}
break;
@@ -192,8 +210,4 @@
}
break;
}
-
-
-$xoops->footer();
-?>
-
+$xoops->footer();
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/class/form/smilies.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/class/form/smilies.php 2011-12-11 17:04:52 UTC (rev 8459)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/class/form/smilies.php 2011-12-11 20:08:06 UTC (rev 8460)
@@ -36,15 +36,15 @@
}
- $title = $obj->isNew() ? sprintf(_SMILIES_AM_ADD) : sprintf(_SMILIES_AM_EDIT);
+ $title = $obj->isNew() ? sprintf(_AM_SMILIES_ADD) : sprintf(_AM_SMILIES_EDIT);
parent::__construct($title, 'form', 'smilies.php', 'post', true);
$this->setExtra('enctype="multipart/form-data"');
- $this->addElement(new XoopsFormText(_SMILIES_AM_CODE, 'code', 26, 25, $obj->getVar('code')), true);
- $this->addElement(new XoopsFormText(_SMILIES_AM_DESCRIPTION, 'emotion', 50, 50, $obj->getVar('emotion')), true);
+ $this->addElement(new XoopsFormText(_AM_SMILIES_CODE, 'code', 26, 25, $obj->getVar('code')), true);
+ $this->addElement(new XoopsFormText(_AM_SMILIES_DESCRIPTION, 'emotion', 50, 50, $obj->getVar('emotion')), true);
- $imgtray_img = new XoopsFormElementTray( _SMILIES_AM_FILE, '<br />' );
- $imgpath_img = sprintf( _SMILIES_AM_IMAGE_PATH, XOOPS_UPLOAD_PATH . '/smilies/' );
+ $imgtray_img = new XoopsFormElementTray( _AM_SMILIES_FILE, '<br />' );
+ $imgpath_img = sprintf( _AM_SMILIES_IMAGE_PATH, XOOPS_UPLOAD_PATH . '/smilies/' );
$imageselect_img = new XoopsFormSelect( $imgpath_img, 'smile_url', $blank_img );
$image_array_img = XoopsLists::getImgListAsArray( XOOPS_UPLOAD_PATH . '/smilies' );
$imageselect_img->addOption("$blank_img", $blank_img);
@@ -56,7 +56,7 @@
$imgtray_img->addElement( new XoopsFormLabel( '', "<br /><img src='" . XOOPS_UPLOAD_URL . "/smilies/" . $blank_img . "' name='image_img' id='xo-smilies-img' alt='' />" ) );
$fileseltray_img = new XoopsFormElementTray('<br />','<br /><br />');
- $fileseltray_img->addElement(new XoopsFormFile(_SMILIES_AM_UPLOADS , 'smile_url', 500000),false);
+ $fileseltray_img->addElement(new XoopsFormFile(_AM_SMILIES_UPLOADS , 'smile_url', 500000),false);
$fileseltray_img->addElement(new XoopsFormLabel(''), false);
$imgtray_img->addElement($fileseltray_img);
$this->addElement($imgtray_img);
@@ -68,9 +68,9 @@
$display = 0;
}
- $this->addElement(new XoopsFormRadioYN(_SMILIES_AM_OFF, 'display', $display));
+ $this->addElement(new XoopsFormRadioYN(_AM_SMILIES_OFF, 'display', $display));
$this->addElement(new XoopsFormHidden('op', 'save_smilie'));
$this->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
}
-}
+}
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/images/spinner.gif
===================================================================
(Binary files differ)
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/index.html 2011-12-11 20:08:06 UTC (rev 8460)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
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-11 17:04:52 UTC (rev 8459)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/language/english/admin.php 2011-12-11 20:08:06 UTC (rev 8460)
@@ -19,24 +19,28 @@
* @author Mage Grégory (AKA Mage)
* @version $Id$
*/
-define("_SMILIES_AM_ACTION","Action");
-define("_SMILIES_AM_ADD", "Add a new smilie");
-define("_SMILIES_AM_CODE","Code");
-define("_SMILIES_AM_DELETE","Delete smilie");
-define("_SMILIES_AM_DESCRIPTION","Description");
-define("_SMILIES_AM_DISPLAY","Display in form");
-define("_SMILIES_AM_EDIT","Edit smilie");
-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");
-define("_SMILIES_AM_SUREDEL","Are you sure you want to delete this smilie?");
-define("_SMILIES_AM_SMILIE","Smilie");
-define("_SMILIES_AM_UPLOADS","Upload");
-?>
+define("_AM_SMILIES_ACTION","Action");
+define("_AM_SMILIES_ADD", "Add a new smilie");
+define("_AM_SMILIES_CODE","Code");
+define("_AM_SMILIES_DELETE","Delete smilie");
+define("_AM_SMILIES_DESCRIPTION","Description");
+define("_AM_SMILIES_DISPLAY","Display in form");
+define("_AM_SMILIES_EDIT","Edit smilie");
+define("_AM_SMILIES_FILE","Smilie file");
+define("_AM_SMILIES_IMAGE_PATH","Files exist in: %s");
+define("_AM_SMILIES_LIST", "List of smilies");
+define("_AM_SMILIES_NBTOTAL","There are %s smilies in our database");
+define("_AM_SMILIES_NBDISPLAY","There are %s visible smilies");
+define("_AM_SMILIES_NBNOTDISPLAY","There are %s smilies not visible");
+define("_AM_SMILIES_OFF","Display in the form ");
+define("_AM_SMILIES_ON","Does not display in the form");
+define("_AM_SMILIES_SAVE","Smilie saved");
+define("_AM_SMILIES_SUREDEL","Are you sure you want to delete this smilie?");
+define("_AM_SMILIES_SMILIE","Smilie");
+define("_AM_SMILIES_UPLOADS","Upload");
+
+// Tips
+define("_AM_SMILIES_TIPS","<ul><li>Add, update or delete smilies</li></ul>");
+define("_AM_SMILIES_TIPS_FORM1","<ul><li>Authorized mime types: %s</li>");
+define("_AM_SMILIES_TIPS_FORM2","<li>Max uploaded files size: %s ko</li></ul>");
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/language/english/modinfo.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/language/english/modinfo.php 2011-12-11 17:04:52 UTC (rev 8459)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/language/english/modinfo.php 2011-12-11 20:08:06 UTC (rev 8460)
@@ -20,13 +20,12 @@
* @version $Id$
*/
// Info module
-define("_SMILIES_MI_NAME", "Smilies");
-define("_SMILIES_MI_DESC", "Module for managing smilies");
+define("_MI_SMILIES_NAME", "Smilies");
+define("_MI_SMILIES_DESC", "Module for managing smilies");
// Menu
-define("_SMILIES_MI_INDEX", "Home");
-define("_SMILIES_MI_SMILIES", "Smilies manager");
-define("_SMILIES_MI_ABOUT", "About");
+define("_MI_SMILIES_INDEX", "Home");
+define("_MI_SMILIES_SMILIES", "Smilies manager");
+define("_MI_SMILIES_ABOUT", "About");
// Preferences
-define("_SMILIES_MI_PREFERENCE_PAGER", "Number of smilies to display per page");
-?>
+define("_MI_SMILIES_PREFERENCE_PAGER", "Number of smilies to display per page");
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_about.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_about.html 2011-12-11 17:04:52 UTC (rev 8459)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_about.html 2011-12-11 20:08:06 UTC (rev 8460)
@@ -1,2 +0,0 @@
-<{$navigation}>
-<{$about}>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_index.html 2011-12-11 17:04:52 UTC (rev 8459)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_index.html 2011-12-11 20:08:06 UTC (rev 8460)
@@ -1,2 +0,0 @@
-<{$navigation}>
-<{$about}>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_smilies.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_smilies.html 2011-12-11 17:04:52 UTC (rev 8459)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_smilies.html 2011-12-11 20:08:06 UTC (rev 8460)
@@ -1,18 +1,21 @@
<script type="text/javascript">
- IMG_ON = '<{xoAdminIcons success.png}>';
- IMG_OFF = '<{xoAdminIcons cancel.png}>';
+ Xoops.setStatusImg('accept', '<{xoAdminIcons success.png}>');
+ Xoops.setStatusImg('cancel', '<{xoAdminIcons cancel.png}>');
+ Xoops.setStatusText('accept', '<{$smarty.const._AM_SMILIES_OFF}>');
+ Xoops.setStatusText('cancel', '<{$smarty.const._AM_SMILIES_ON}>');
</script>
-<{$navigation}>
-<{$button}>
+<{includeq file="admin:system|admin_navigation.html"}>
+<{includeq file="admin:system|admin_tips.html"}>
+<{includeq file="admin:system|admin_buttons.html"}>
<{if $smilies_count == true}>
<table id="xo-smilies-sorter" cellspacing="1" class="outer tablesorter">
<thead>
<tr>
- <th class="txtcenter"><{$smarty.const._SMILIES_AM_CODE}></th>
- <th class="txtcenter"><{$smarty.const._SMILIES_AM_SMILIE}></th>
- <th class="txtcenter"><{$smarty.const._SMILIES_AM_DESCRIPTION}></th>
- <th class="txtcenter"><{$smarty.const._SMILIES_AM_DISPLAY}></th>
- <th class="txtcenter width10"><{$smarty.const._SMILIES_AM_ACTION}></th>
+ <th class="txtcenter"><{$smarty.const._AM_SMILIES_CODE}></th>
+ <th class="txtcenter"><{$smarty.const._AM_SMILIES_SMILIE}></th>
+ <th class="txtcenter"><{$smarty.const._AM_SMILIES_DESCRIPTION}></th>
+ <th class="txtcenter"><{$smarty.const._AM_SMILIES_DISPLAY}></th>
+ <th class="txtcenter width10"><{$smarty.const._AM_SMILIES_ACTION}></th>
</tr>
</thead>
<tbody>
@@ -22,15 +25,15 @@
<td class="txtcenter width5"><{$smilies.image}></td>
<td class="txtcenter width50"><{$smilies.emotion}></td>
<td class="xo-actions txtcenter width10">
- <img id="loading_sml<{$smilies.smilies_id}>" src="../images/spinner.gif" style="display:none;" title="<{$smarty.const._AM_SYSTEM_LOADING}>" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
- <img class="cursorpointer tooltip" id="sml<{$smilies.smilies_id}>" onclick="system_setStatus( { op: 'smilies_update_display', smilies_id: <{$smilies.smilies_id}> }, 'sml<{$smilies.smilies_id}>', 'smilies.php' )" src="<{if $smilies.display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{if $smilies.display}><{$smarty.const._SMILIES_AM_OFF}><{else}><{$smarty.const._SMILIES_AM_ON}><{/if}>" title="<{if $smilies.display}><{$smarty.const._SMILIES_AM_OFF}><{else}><{$smarty.const._SMILIES_AM_ON}><{/if}>" />
+ <img id="loading_sml<{$smilies.smilies_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
+ <img class="cursorpointer tooltip" id="sml<{$smilies.smilies_id}>" onclick="Xoops.changeStatus( 'smilies.php', { op: 'smilies_update_display', smilies_id: <{$smilies.smilies_id}> }, 'sml<{$smilies.smilies_id}>', 'smilies.php' )" src="<{if $smilies.display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{if $smilies.display}><{$smarty.const._AM_SMILIES_OFF}><{else}><{$smarty.const._AM_SMILIES_ON}><{/if}>" title="<{if $smilies.display}><{$smarty.const._AM_SMILIES_OFF}><{else}><{$smarty.const._AM_SMILIES_ON}><{/if}>" />
</td>
<td class="xo-actions txtcenter width10">
- <a class="tooltip" href="smilies.php?op=edit_smilie&smilies_id=<{$smilies.smilies_id}>" title="<{$smarty.const._SMILIES_AM_EDIT}>">
- <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._SMILIES_AM_EDIT}>" />
+ <a class="tooltip" href="smilies.php?op=edit_smilie&smilies_id=<{$smilies.smilies_id}>" title="<{$smarty.const._AM_SMILIES_EDIT}>">
+ <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._AM_SMILIES_EDIT}>" />
</a>
- <a class="tooltip" href="smilies.php?op=smilies_delete&smilies_id=<{$smilies.smilies_id}>" title="<{$smarty.const._SMILIES_AM_DELETE}>">
- <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._SMILIES_AM_DELETE}>" />
+ <a class="tooltip" href="smilies.php?op=smilies_delete&smilies_id=<{$smilies.smilies_id}>" title="<{$smarty.const._AM_SMILIES_DELETE}>">
+ <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._AM_SMILIES_DELETE}>" />
</a>
</td>
</tr>
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-11 17:04:52 UTC (rev 8459)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/xoops_version.php 2011-12-11 20:08:06 UTC (rev 8460)
@@ -20,8 +20,8 @@
* @version $Id$
*/
$modversion = array();
-$modversion['name'] = _SMILIES_MI_NAME;
-$modversion['description'] = _SMILIES_MI_DESC;
+$modversion['name'] = _MI_SMILIES_NAME;
+$modversion['description'] = _MI_SMILIES_DESC;
$modversion['version'] = 0.1;
$modversion['author'] = 'Mage';
$modversion['nickname'] = 'Mage';
@@ -51,12 +51,7 @@
$modversion['adminmenu'] = 'admin/menu.php';
// Admin Templates
-$modversion['templates'][] = array( 'file' => 'smilies_index.html', 'description' => '', 'type' => 'admin' );
$modversion['templates'][] = array( 'file' => 'smilies_smilies.html', 'description' => '', 'type' => 'admin' );
-$modversion['templates'][] = array( 'file' => 'smilies_about.html', 'description' => '', 'type' => 'admin' );
-// Scripts to run upon installation or update
-//$modversion['onInstall'] = 'include/install.php';
-//$modversion['onUpdate'] = 'include/update.php';
// JQuery
$modversion['jquery'] = 1;
@@ -64,10 +59,9 @@
// Preferences
$i = 0;
$modversion['config'][$i]['name'] = 'smilies_pager';
-$modversion['config'][$i]['title'] = '_SMILIES_MI_PREFERENCE_PAGER';
+$modversion['config'][$i]['title'] = '_MI_SMILIES_PREFERENCE_PAGER';
$modversion['config'][$i]['description'] = '';
$modversion['config'][$i]['formtype'] = 'textbox';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 20;
-$i++;
-?>
+$i++;
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
