Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9452] XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/ system
|
From: <ma...@us...> - 2012-05-07 20:48:27
|
Revision: 9452
http://xoops.svn.sourceforge.net/xoops/?rev=9452&view=rev
Author: mageg
Date: 2012-05-07 20:48:18 +0000 (Mon, 07 May 2012)
Log Message:
-----------
update system module
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/comments/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/images/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/maintenance/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/blocksadmin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_blocks.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_blocks_item.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_comments.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_groups.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_images.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_maintenance.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_preferences.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_templates.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_users.html
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php 2012-05-07 19:54:50 UTC (rev 9451)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php 2012-05-07 20:48:18 UTC (rev 9452)
@@ -80,11 +80,11 @@
$admin_page->addBreadLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadLink(_AM_SYSTEM_BLOCKS_ADMIN, $system->adminVersion('blocksadmin', 'adminpath'));
$admin_page->addBreadLink(_AM_SYSTEM_BLOCKS_MANAGMENT);
+ $admin_page->renderBreadcrumb();
$admin_page->addItemButton(_AM_SYSTEM_BLOCKS_ADD, 'admin.php?fct=blocksadmin&op=add', 'add');
+ $admin_page->renderButton();
$admin_page->addTips(sprintf(_AM_SYSTEM_BLOCKS_TIPS, system_AdminIcons('block.png'), system_AdminIcons('success.png'), system_AdminIcons('cancel.png')));
- $admin_page->renderBreadcrumb();
$admin_page->renderTips();
- $admin_page->renderButton();
// Initialize module handler
$module_handler = $xoops->getHandlerModule();
$modules = $module_handler->getObjects(null, true);
@@ -174,7 +174,7 @@
$block = $block_handler->create();
$form = $xoops->getModuleForm($block, 'block');
$form->getForm();
- $xoops->tpl->assign('blockform', $form->render());
+ $form->render();
// Call Footer
$xoops->footer();
break;
@@ -191,15 +191,17 @@
$xoops->theme->addScript('modules/system/js/admin.js');
$xoops->theme->addScript('modules/system/js/blocks.js');
// Define Breadcrumb and tips
- $system_breadcrumb->addLink(_AM_SYSTEM_BLOCKS_ADMIN, system_adminVersion('blocksadmin', 'adminpath'));
- $system_breadcrumb->addLink(_AM_SYSTEM_BLOCKS_ADDBLOCK);
- $system_breadcrumb->render();
+ $admin_page = new XoopsModuleAdmin();
+ $admin_page->addBreadLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadLink(_AM_SYSTEM_BLOCKS_ADMIN, $system->adminVersion('blocksadmin', 'adminpath'));
+ $admin_page->addBreadLink(_AM_SYSTEM_BLOCKS_ADDBLOCK);
+ $admin_page->renderBreadcrumb();
// Initialize blocks handler
$block_handler = $xoops->getHandlerBlock();
$block = $block_handler->create();
$form = $xoops->getModuleForm($block, 'block');
$form->getForm();
- $xoops->tpl->assign('blockform', $form->render());
+ $form->render();
// Call Footer
$xoops->footer();
break;
@@ -390,15 +392,16 @@
$xoops->theme->addScript('media/jquery/plugins/jquery.form.js');
$xoops->theme->addScript('modules/system/js/admin.js');
// Define Breadcrumb and tips
- $system_breadcrumb->addLink(_AM_SYSTEM_BLOCKS_ADMIN, system_adminVersion('blocksadmin', 'adminpath'));
- $system_breadcrumb->addLink(_AM_SYSTEM_BLOCKS_EDITBLOCK);
- $system_breadcrumb->render();
-
+ $admin_page = new XoopsModuleAdmin();
+ $admin_page->addBreadLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadLink(_AM_SYSTEM_BLOCKS_ADMIN, $system->adminVersion('blocksadmin', 'adminpath'));
+ $admin_page->addBreadLink(_AM_SYSTEM_BLOCKS_EDITBLOCK);
+ $admin_page->renderBreadcrumb();
$block = $block_handler->get($block_id);
/* @var $form SystemBlockForm */
$form = $xoops->getModuleForm($block, 'block');
$form->getForm();
- $xoops->tpl->assign('blockform', $form->render());
+ $form->render();
// Call Footer
$xoops->footer();
} else {
@@ -407,6 +410,16 @@
break;
case 'delete':
+ // Call Header
+ $xoops->header('system_blocks.html');
+ // Define Stylesheet
+ $xoops->theme->addStylesheet('modules/system/css/admin.css');
+ // Define Breadcrumb and tips
+ $admin_page = new XoopsModuleAdmin();
+ $admin_page->addBreadLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadLink(_AM_SYSTEM_BLOCKS_ADMIN, $system->adminVersion('blocksadmin', 'adminpath'));
+ $admin_page->addBreadLink(_AM_SYSTEM_BLOCKS_DELETEBLOCK);
+ $admin_page->renderBreadcrumb();
// Initialize blocks handler
$block_handler = $xoops->getHandlerBlock();
// Get avatar id
@@ -498,7 +511,7 @@
/* @var $form SystemBlockForm */
$form = $xoops->getModuleForm($block, 'block');
$form->getForm('clone');
- $xoops->tpl->assign('blockform', $form->render());
+ $form->render();
// Call Footer
$xoops->footer();
} else {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/comments/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/comments/main.php 2012-05-07 19:54:50 UTC (rev 9451)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/comments/main.php 2012-05-07 20:48:18 UTC (rev 9452)
@@ -93,12 +93,13 @@
break;
case 'comments_form_purge':
- //Affichage des coms
- $system_breadcrumb->addLink(_AM_SYSTEM_COMMENTS_NAV_PURGE);
- $system_breadcrumb->addHelp(system_adminVersion('comments', 'help') . '#purge');
- $system_breadcrumb->addTips(_AM_SYSTEM_COMMENTS_NAV_TIPS);
- $system_breadcrumb->render();
-
+ // Define Breadcrumb and tips
+ $admin_page = new XoopsModuleAdmin();
+ $admin_page->addBreadLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadLink(_AM_SYSTEM_COMMENTS_NAV_MANAGER, $system->adminVersion('comments', 'adminpath'));
+ $admin_page->addBreadLink(_AM_SYSTEM_COMMENTS_NAV_PURGE);
+ $admin_page->renderBreadcrumb();
+
//Affichage du formulaire de purge
$form_purge = new XoopsThemeForm(_AM_SYSTEM_COMMENTS_FORM_PURGE, 'form', 'admin.php?fct=comments', 'post', true);
@@ -126,7 +127,8 @@
$form_purge->addElement($modules, true);
$form_purge->addElement(new XoopsFormHidden("op", "comments_purge"));
$form_purge->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));
- $xoops->tpl->assign('form', $form_purge->render());
+ $form_purge->render();
+ $xoops->tpl->assign('form', true);
break;
case 'comments_purge':
@@ -197,12 +199,15 @@
break;
default:
+ // Define Breadcrumb and tips
+ $admin_page = new XoopsModuleAdmin();
+ $admin_page->addBreadLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadLink(_AM_SYSTEM_COMMENTS_NAV_MANAGER, $system->adminVersion('comments', 'adminpath'));
+ $admin_page->addBreadLink(_AM_SYSTEM_COMMENTS_NAV_MAIN);
+ $admin_page->renderBreadcrumb();
+ $admin_page->addTips(_AM_SYSTEM_COMMENTS_NAV_TIPS);
+ $admin_page->renderTips();
// Display comments
- $system_breadcrumb->addLink(_AM_SYSTEM_COMMENTS_NAV_MAIN);
- $system_breadcrumb->addHelp(system_adminVersion('comments', 'help'));
- $system_breadcrumb->addTips(_AM_SYSTEM_COMMENTS_NAV_TIPS);
- $system_breadcrumb->render();
-
$myts = MyTextSanitizer::getInstance();
$comments_Handler = $xoops->getHandlerComment();
$comments_module = '';
@@ -272,7 +277,7 @@
$form .= '</select> <input type="hidden" name="fct" value="comments" /><input type="submit" value="' . _GO . '" name="selsubmit" /></form>';
$xoops->tpl->assign('form_sort', $form);
- $xoops->tpl->assign('php_selft', $_SERVER['PHP_SELF'] . '?fct=comments&op=comments_purge');
+ $xoops->tpl->assign('php_selft', $_SERVER['PHP_SELF'] . '?fct=comments&op=comments_purge');
if ($comments_count > 0) {
foreach (array_keys($comments_arr) as $i) {
@@ -292,7 +297,7 @@
$comments['comments_id'] = $com_id;
$comments['comments_poster'] = $comments_poster_uname;
$comments['comments_icon'] = $comments_icon;
- $comments['comments_title'] = '<a href="admin.php?fct=comments&op=comments_jump&com_id=' . $comments_arr[$i]->getVar("com_id") . '">' . $comments_arr[$i]->getVar("com_title");
+ $comments['comments_title'] = '<a href="admin.php?fct=comments&op=comments_jump&com_id=' . $comments_arr[$i]->getVar("com_id") . '">' . $comments_arr[$i]->getVar("com_title") . '</a>';
$comments['comments_ip'] = $comments_arr[$i]->getVar('com_ip');
$comments['comments_date'] = XoopsLocal::formatTimeStamp($comments_arr[$i]->getVar('com_created'));
$comments['comments_text'] = $myts->undoHtmlSpecialChars($comments_arr[$i]->getVar('com_text'));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/main.php 2012-05-07 19:54:50 UTC (rev 9451)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/main.php 2012-05-07 20:48:18 UTC (rev 9452)
@@ -125,7 +125,8 @@
$obj = $groups_Handler->create();
$form = $xoops->getModuleForm($obj, 'group');
// Assign form
- $xoops->tpl->assign('form', $form->render());
+ $form->render();
+ $xoops->tpl->assign('form', true);
break;
//Edit a group
@@ -146,7 +147,8 @@
$obj = $groups_Handler->get($groups_id);
$form = $xoops->getModuleForm($obj, 'group');
// Assign form
- $xoops->tpl->assign('form', $form->render());
+ $form->render();
+ $xoops->tpl->assign('form', true);
} else {
$xoops->redirect('admin.php?fct=groups', 1, _AM_SYSTEM_DBERROR);
}
@@ -301,6 +303,12 @@
//Del a group
case 'groups_delete':
+ // Define Breadcrumb and tips
+ $admin_page = new XoopsModuleAdmin();
+ $admin_page->addBreadLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadLink(_AM_SYSTEM_GROUPS_NAV_MANAGER, $system->adminVersion('groups', 'adminpath'));
+ $admin_page->addBreadLink(_AM_SYSTEM_GROUPS_NAV_DELETE);
+ $admin_page->renderBreadcrumb();
$groups_id = $system->cleanVars($_REQUEST, 'groups_id', 0, 'int');
if ($groups_id > 0) {
$obj = $groups_Handler->get($groups_id);
@@ -331,7 +339,7 @@
// Display message
$xoops->confirm(array(
"ok" => 1, "groups_id" => $_REQUEST["groups_id"], "op" => "groups_delete"
- ), 'admin.php?fct=groups', sprintf(_AM_SYSTEM_GROUPS_SUREDEL) . '<br \>' . $obj->getVar("name") . '<br \>');
+ ), 'admin.php?fct=groups', sprintf(_AM_SYSTEM_GROUPS_SUREDEL) . '<br />' . $obj->getVar("name") . '<br />');
}
} else {
$xoops->redirect('admin.php?fct=groups', 1, _AM_SYSTEM_DBERROR);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/images/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/images/main.php 2012-05-07 19:54:50 UTC (rev 9451)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/images/main.php 2012-05-07 20:48:18 UTC (rev 9452)
@@ -84,6 +84,14 @@
$xoops->theme->addScript('browse.php?Frameworks/jquery/plugins/jquery.lightbox.js');
$xoops->theme->addScript('modules/system/js/admin.js');
// Define Breadcrumb and tips
+ $admin_page = new XoopsModuleAdmin();
+ $admin_page->addBreadLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadLink(_AM_SYSTEM_IMAGES_MANAGER, $system->adminVersion('images', 'adminpath'));
+ $admin_page->addBreadLink(_AM_SYSTEM_IMAGES_MANAGER);
+ $admin_page->renderBreadcrumb();
+ $admin_page->addTips(_AM_SYSTEM_IMAGES_TIPS);
+ $admin_page->renderTips();
+ // Define Breadcrumb and tips
$system_breadcrumb->addLink(_AM_SYSTEM_IMAGES_MANAGER, system_adminVersion('images', 'adminpath'));
$system_breadcrumb->addHelp(system_adminVersion('images', 'help'));
$system_breadcrumb->addTips(_AM_SYSTEM_IMAGES_TIPS);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/maintenance/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/maintenance/main.php 2012-05-07 19:54:50 UTC (rev 9451)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/maintenance/main.php 2012-05-07 20:48:18 UTC (rev 9452)
@@ -60,10 +60,10 @@
/* @var $form SystemMaintenanceForm */
$form = $xoops->getModuleForm(null, 'maintenance');
$form->getMaintenance();
- $xoops->tpl->assign('form_maintenance', $form->render());
+ $form->render(false);
$form = $xoops->getModuleForm(null, 'maintenance');
$form->getDump();
- $xoops->tpl->assign('form_dump', $form->render());
+ $form->render(false);
break;
case 'maintenance_save':
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php 2012-05-07 19:54:50 UTC (rev 9451)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php 2012-05-07 20:48:18 UTC (rev 9452)
@@ -73,7 +73,8 @@
/* @var $form SystemPreferenceForm */
$form = $xoops->getModuleForm(null, 'preference');
$form->getForm($confcat);
- $xoops->tpl->assign('form', $form->render());
+ $form->render();
+ $xoops->tpl->assign('form', true);
break;
case 'showmod':
@@ -101,7 +102,8 @@
/* @var $form SystemPreferenceForm */
$form = $xoops->getModuleForm(null, 'preference');
$form->getModuleForm($config, $module);
- $xoops->tpl->assign('form', $form->render());
+ $form->render();
+ $xoops->tpl->assign('form', true);
break;
case 'save':
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/main.php 2012-05-07 19:54:50 UTC (rev 9451)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/main.php 2012-05-07 20:48:18 UTC (rev 9452)
@@ -53,10 +53,14 @@
switch ($op) {
//index
default:
- // Assign Breadcrumb menu
- $system_breadcrumb->addHelp(system_adminVersion('tplsets', 'help'));
- $system_breadcrumb->addTips(_AM_SYSTEM_TEMPLATES_NAV_TIPS);
- $system_breadcrumb->render();
+
+ // Define Breadcrumb and tips
+ $admin_page = new XoopsModuleAdmin();
+ $admin_page->addBreadLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadLink(_AM_SYSTEM_TEMPLATES_NAV_MANAGER, $system->adminVersion('tplsets', 'adminpath'));
+ $admin_page->renderBreadcrumb();
+ $admin_page->addTips(_AM_SYSTEM_TEMPLATES_NAV_TIPS);
+ $admin_page->renderTips();
$xoops->tpl->assign('index', true);
@@ -86,7 +90,7 @@
$form->addElement(new XoopsFormHidden("active_modules", "0"));
$form->addElement(new XoopsFormHidden("op", "tpls_generate_surcharge"));
$form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));
- $xoops->tpl->assign('form', $form->render());
+ $form->render();
break;
//generate surcharge
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/main.php 2012-05-07 19:54:50 UTC (rev 9451)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/main.php 2012-05-07 20:48:18 UTC (rev 9452)
@@ -63,38 +63,37 @@
$admin_page = new XoopsModuleAdmin();
$admin_page->addBreadLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadLink(_AM_SYSTEM_USERS_NAV_MAIN, $system->adminVersion('users', 'adminpath'));
- //$admin_page->addBreadLink(_AM_SYSTEM_GROUPS_NAV_EDIT);
- $admin_page->addTips(_AM_SYSTEM_GROUPS_NAV_TIPS_2);
+ $admin_page->addBreadLink(_AM_SYSTEM_USERS_NAV_EDIT_USER);
$admin_page->renderBreadcrumb();
- $admin_page->renderTips();
-
- $system_breadcrumb->addHelp(system_adminVersion('users', 'help') . '#edit');
- $system_breadcrumb->addLink(_AM_SYSTEM_USERS_NAV_EDIT_USER);
- $system_breadcrumb->render();
-
$uid = $system->cleanVars($_GET, 'uid', 0);
-
$member_handler = $xoops->getHandlerMember();
$user = $member_handler->getUser($uid);
$form = $xoops->getModuleForm($user, 'user');
- $form->display();
+ $form->render();
break;
// Add user
case 'users_add':
// Assign Breadcrumb menu
- $system_breadcrumb->addHelp(system_adminVersion('users', 'help') . '#add');
- $system_breadcrumb->addLink(_AM_SYSTEM_USERS_NAV_ADD_USER);
- $system_breadcrumb->render();
-
+ $admin_page = new XoopsModuleAdmin();
+ $admin_page->addBreadLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadLink(_AM_SYSTEM_USERS_NAV_MAIN, $system->adminVersion('users', 'adminpath'));
+ $admin_page->addBreadLink(_AM_SYSTEM_USERS_NAV_ADD_USER);
+ $admin_page->renderBreadcrumb();
$member_handler = $xoops->getHandlerMember();
$user = $member_handler->createUser();
$form = $xoops->getModuleForm($user, 'user');
- $form->display();
+ $form->render();
break;
// Delete user
case 'users_delete':
+ // Assign Breadcrumb menu
+ $admin_page = new XoopsModuleAdmin();
+ $admin_page->addBreadLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadLink(_AM_SYSTEM_USERS_NAV_MAIN, $system->adminVersion('users', 'adminpath'));
+ $admin_page->addBreadLink(_AM_SYSTEM_USERS_NAV_DELETE_USER);
+ $admin_page->renderBreadcrumb();
$system_breadcrumb->render();
$user = $member_handler->getUser($uid);
if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
@@ -120,7 +119,7 @@
$system_breadcrumb->render();
$xoops->confirm(array(
'ok' => 1, 'uid' => $uid, 'op' => 'users_delete'
- ), $_SERVER['REQUEST_URI'], sprintf(_AM_SYSTEM_USERS_FORM_SURE_DEL, $user->getVar('uname')));
+ ), "admin.php?fct=users", sprintf(_AM_SYSTEM_USERS_FORM_SURE_DEL, $user->getVar('uname')) . '<br />');
}
break;
@@ -355,17 +354,16 @@
if (isset($_REQUEST['complet_search'])) {
// Assign Breadcrumb menu
- $system_breadcrumb->addLink(_AM_SYSTEM_USERS_NAV_ADVANCED_SEARCH);
- $system_breadcrumb->addHelp(system_adminVersion('users', 'help'));
- $system_breadcrumb->addTips(_AM_SYSTEM_USERS_NAV_TIPS);
- $system_breadcrumb->render();
+ $admin_page = new XoopsModuleAdmin();
+ $admin_page->addBreadLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadLink(_AM_SYSTEM_USERS_NAV_MAIN, $system->adminVersion('users', 'adminpath'));
+ $admin_page->addBreadLink(_AM_SYSTEM_USERS_NAV_ADVANCED_SEARCH);
+ $admin_page->renderBreadcrumb();
$acttotal = $member_handler->getUserCount(new Criteria('level', 0, '>'));
$inacttotal = $member_handler->getUserCount(new Criteria('level', 0));
-
//$group_select = new XoopsFormSelectGroup(_AM_SYSTEM_USERS_GROUPS, "selgroups", null, false, 1, false);
$group_select = new XoopsFormSelect(_AM_SYSTEM_USERS_GROUPS, "selgroups");
-
$group_handler = $xoops->getHandlerGroup();
$group_arr = $group_handler->getObjects();
$group_select->addOption("", "--------------");
@@ -374,8 +372,6 @@
$group_select->addOption("" . $group_arr[$i]->getVar("groupid") . "", "" . $group_arr[$i]->getVar("name") . "");
}
}
-
-
$uname_text = new XoopsFormText("", "user_uname", 30, 60);
$uname_match = new XoopsFormSelectMatchOption("", "user_uname_match");
$uname_tray = new XoopsFormElementTray(_AM_SYSTEM_USERS_UNAME, " ");
@@ -466,9 +462,7 @@
$form->addElement($type_radio);
$form->addElement($sort_select);
$form->addElement($order_select);
- $form->addElement($fct_hidden);
$form->addElement($limit_text);
- $form->addElement($op_hidden);
// if this is to find users for a specific group
if (!empty($_GET['group']) && intval($_GET['group']) > 0) {
@@ -484,9 +478,12 @@
$admin_page->addBreadLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadLink(_AM_SYSTEM_USERS_NAV_MAIN, $system->adminVersion('users', 'adminpath'));
$admin_page->addBreadLink(_AM_SYSTEM_USERS_NAV_LIST);
- $admin_page->addTips(_AM_SYSTEM_USERS_NAV_TIPS);
$admin_page->renderBreadcrumb();
+ $admin_page->addTips(_AM_SYSTEM_USERS_NAV_TIPS);
$admin_page->renderTips();
+ $admin_page->addItemButton(_AM_SYSTEM_USERS_SYNCHRONIZE, 'admin.php?fct=users&op=users_synchronize&status=2', 'arrow-rotate-anticlockwise');
+ $admin_page->addItemButton(_AM_SYSTEM_USERS_ADDUSER, 'admin.php?fct=users&op=users_add', 'add');
+ $admin_page->renderButton();
$requete_search = '<br /><br /><strong>See search request: </strong><br /><br />';
$requete_pagenav = '';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin.php 2012-05-07 19:54:50 UTC (rev 9451)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin.php 2012-05-07 20:48:18 UTC (rev 9452)
@@ -103,9 +103,12 @@
$xoops->theme->addScript('media/jquery/jquery.js');
$xoops->theme->addScript('modules/system/js/admin.js');
// Define Breadcrumb and tips
- $system_breadcrumb->addLink(_AM_SYSTEM_CONFIG);
- $system_breadcrumb->addTips(_AM_SYSTEM_TIPS_MAIN);
- $system_breadcrumb->render();
+ $admin_page = new XoopsModuleAdmin();
+ $admin_page->addBreadLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadLink(_AM_SYSTEM_CONFIG);
+ $admin_page->renderBreadcrumb();
+ $admin_page->addTips(_AM_SYSTEM_TIPS_MAIN);
+ $admin_page->renderTips();
$groups = $xoopsUser->getGroups();
$all_ok = false;
if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/blocksadmin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/blocksadmin.php 2012-05-07 19:54:50 UTC (rev 9451)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/blocksadmin.php 2012-05-07 20:48:18 UTC (rev 9452)
@@ -13,6 +13,7 @@
define("_AM_SYSTEM_BLOCKS_ADDBLOCK","Add a new block");
define("_AM_SYSTEM_BLOCKS_EDITBLOCK","Edit a block");
define("_AM_SYSTEM_BLOCKS_CLONEBLOCK","Create a clone block");
+define("_AM_SYSTEM_BLOCKS_DELETEBLOCK","Delete a block");
// Forms
define("_AM_SYSTEM_BLOCKS_CUSTOM","Custom Block");
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_blocks.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_blocks.html 2012-05-07 19:54:50 UTC (rev 9451)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_blocks.html 2012-05-07 20:48:18 UTC (rev 9452)
@@ -7,9 +7,6 @@
</script>
<{if $filterform}>
<{includeq file="admin:system|admin_buttons.html"}>
-
-
-
<div class="clear"></div>
<div id="xo-block-dragndrop">
<table class="outer">
@@ -83,6 +80,7 @@
<div id="xo-block-add" <{if $filterform}>class="hide"<{/if}>>
<{if !$filterform}><br /><{/if}>
<{$blockform}>
+ <{includeq file="module:system|system_form.html"}>
</div>
<!-- Preview block -->
<div id="xo-preview-block" class="hide"></div>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_blocks_item.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_blocks_item.html 2012-05-07 19:54:50 UTC (rev 9451)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_blocks_item.html 2012-05-07 20:48:18 UTC (rev 9452)
@@ -8,16 +8,16 @@
</span>
<{$item.title}>
</div>
- <div class="xo-blockaction xo-actions"><img id="loading_img<{$item.bid}>" src="./images/mimetypes/spinner.gif" style="display:none;" title="<{$smarty.const._AM_SYSTEM_LOADING}>" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" /><img class="tooltip" id="img<{$item.bid}>" onclick="system_setStatus( { fct: 'blocksadmin', op: 'display', bid: <{$item.bid}>, visible: <{if $item.visible}>0<{else}>1<{/if}> }, 'img<{$item.bid}>', 'admin.php' )" src="<{if $item.visible}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{if $item.visible}><{$smarty.const._AM_SYSTEM_BLOCKS_HIDE}><{else}><{$smarty.const._AM_SYSTEM_BLOCKS_DISPLAY}><{/if}><{$item.name}>" title="<{if $item.visible}><{$smarty.const._AM_SYSTEM_BLOCKS_HIDE}><{else}><{$smarty.const._AM_SYSTEM_BLOCKS_DISPLAY}><{/if}><{$item.name}>" />
- <a class="tooltip" href="admin.php?fct=blocksadmin&op=edit&bid=<{$item.bid}>" title="<{$smarty.const._EDIT}>">
+ <div class="xo-blockaction xo-actions"><img id="loading_img<{$item.bid}>" src="./images/mimetypes/spinner.gif" style="display:none;" title="<{$smarty.const._AM_SYSTEM_LOADING}>" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" /><img class="xo-tooltip" id="img<{$item.bid}>" onclick="system_setStatus( { fct: 'blocksadmin', op: 'display', bid: <{$item.bid}>, visible: <{if $item.visible}>0<{else}>1<{/if}> }, 'img<{$item.bid}>', 'admin.php' )" src="<{if $item.visible}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{if $item.visible}><{$smarty.const._AM_SYSTEM_BLOCKS_HIDE}><{else}><{$smarty.const._AM_SYSTEM_BLOCKS_DISPLAY}><{/if}><{$item.name}>" title="<{if $item.visible}><{$smarty.const._AM_SYSTEM_BLOCKS_HIDE}><{else}><{$smarty.const._AM_SYSTEM_BLOCKS_DISPLAY}><{/if}><{$item.name}>" />
+ <a class="xo-tooltip" href="admin.php?fct=blocksadmin&op=edit&bid=<{$item.bid}>" title="<{$smarty.const._EDIT}>">
<img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>" />
</a>
<{if $item.block_type != 'S'}>
- <a class="tooltip" href="admin.php?fct=blocksadmin&op=delete&bid=<{$item.bid}>" title="<{$smarty.const._DELETE}>">
+ <a class="xo-tooltip" href="admin.php?fct=blocksadmin&op=delete&bid=<{$item.bid}>" title="<{$smarty.const._DELETE}>">
<img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>" />
</a>
<{/if}>
- <a class="tooltip" href="admin.php?fct=blocksadmin&op=clone&bid=<{$item.bid}>" title="<{$smarty.const._AM_SYSTEM_BLOCKS_CLONE}>">
+ <a class="xo-tooltip" href="admin.php?fct=blocksadmin&op=clone&bid=<{$item.bid}>" title="<{$smarty.const._AM_SYSTEM_BLOCKS_CLONE}>">
<img src="<{xoAdminIcons clone.png}>" alt="<{$smarty.const._AM_SYSTEM_BLOCKS_CLONE}>" />
</a>
</div>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_comments.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_comments.html 2012-05-07 19:54:50 UTC (rev 9451)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_comments.html 2012-05-07 20:48:18 UTC (rev 9452)
@@ -1,62 +1,64 @@
-<{includeq file="admin:system|system_header.html"}>
+<{includeq file="admin:system|admin_breadcrumb.html"}>
+<{includeq file="admin:system|admin_tips.html"}>
+<{includeq file="admin:system|admin_buttons.html"}>
<!--Comments-->
<{if $form}>
-<div class="spacer"><{$form}></div>
+<{includeq file="module:system|system_form.html"}>
<{else}>
<div class="floatleft"><{$form_sort}></div>
<div class="floatright">
<div class="xo-buttons">
- <button class="ui-corner-all" onclick="self.location.href='admin.php?fct=comments&op=comments_form_purge'">
+ <button class="btn" onclick="self.location.href='admin.php?fct=comments&op=comments_form_purge'">
<img src="<{xoAdminIcons clear.png}>" alt="<{$smarty.const._AM_SYSTEM_COMMENTS_FORM_PURGE}>" />
<{$smarty.const._AM_SYSTEM_COMMENTS_FORM_PURGE}>
</button>
</div>
</div>
<div class="clear"></div>
-<table id="xo-comment-sorter" cellspacing="1" class="outer tablesorter">
- <thead>
- <tr>
- <th class="txtcenter width5"><input name='allbox' id='allbox' onclick='xoopsCheckAll("commentslist", "allbox");' type='checkbox' value='Check All' /></th>
- <th class="txtcenter width5"></th>
- <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_TITLE}></th>
- <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_POSTED}></th>
- <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_IP}></th>
- <th class="txtcenter"><{$smarty.const._DATE}></th>
- <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_MODULE}></th>
- <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_STATUS}></th>
- <th class="txtcenter width10"><{$smarty.const._AM_SYSTEM_COMMENTS_ACTION}></th>
- </tr>
- </thead>
- <form name='commentslist' id='commentslist' action='<{$php_selft}>' method="post">
- <tbody>
- <{foreach item=comments from=$comments}>
- <tr class="<{cycle values='even,odd'}> alignmiddle">
- <td class="txtcenter"><input type='checkbox' name='commentslist_id[]' id='commentslist_id[]' value='<{$comments.comments_id}>'/></td>
- <td class="txtcenter"><{$comments.comments_icon}></td>
- <td class="txtcenter"><{$comments.comments_title}></td>
- <td class="txtcenter"><{$comments.comments_poster}></td>
- <td class="txtcenter"><{$comments.comments_ip}></td>
- <td class="txtcenter"><{$comments.comments_date}></td>
- <td class="txtcenter"><{$comments.comments_modid}></td>
- <td class="txtcenter"><{$comments.comments_status}></td>
- <td class="xo-actions txtcenter">
- <img class="cursorpointer" onclick="display_dialog('<{$comments.comments_id}>', true, true, 'slide', 'slide', 300, 500);" src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._AM_SYSTEM_COMMENTS_VIEW}>" title="<{$smarty.const._AM_SYSTEM_COMMENTS_VIEW}>" />
- <a href="admin/comments/comment_edit.php?com_id=<{$comments.comments_id}>" title="<{$smarty.const._EDIT}>">
- <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>">
- </a>
- <a href="admin/comments/comment_delete.php?com_id=<{$comments.comments_id}>" title="<{$smarty.const._DELETE}>">
- <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>">
- </a>
- </td>
- </tr>
- <{/foreach}>
- </tbody>
- <tr>
- <td><input type='submit' name='<{$smarty.const._DELETE}>' value='<{$smarty.const._DELETE}>' /></td>
- <td colspan="7"> </td>
- </tr>
- </form>
-</table>
+<form name='commentslist' id='commentslist' action='<{$php_selft}>' method="post">
+ <table id="xo-comment-sorter" class="outer tablesorter">
+ <thead>
+ <tr>
+ <th class="txtcenter width5"><input name='allbox' id='allbox' onclick='xoopsCheckAll("commentslist", "allbox");' type='checkbox' value='Check All' /></th>
+ <th class="txtcenter width5"></th>
+ <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_TITLE}></th>
+ <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_POSTED}></th>
+ <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_IP}></th>
+ <th class="txtcenter"><{$smarty.const._DATE}></th>
+ <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_MODULE}></th>
+ <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_STATUS}></th>
+ <th class="txtcenter width10"><{$smarty.const._AM_SYSTEM_COMMENTS_ACTION}></th>
+ </tr>
+ </thead>
+ <tbody>
+ <{foreach item=comments from=$comments}>
+ <tr class="<{cycle values='even,odd'}> alignmiddle">
+ <td class="txtcenter"><input type='checkbox' name='commentslist_id[]' id='commentslist_id[]' value='<{$comments.comments_id}>'/></td>
+ <td class="txtcenter"><{$comments.comments_icon}></td>
+ <td class="txtcenter"><{$comments.comments_title}></td>
+ <td class="txtcenter"><{$comments.comments_poster}></td>
+ <td class="txtcenter"><{$comments.comments_ip}></td>
+ <td class="txtcenter"><{$comments.comments_date}></td>
+ <td class="txtcenter"><{$comments.comments_modid}></td>
+ <td class="txtcenter"><{$comments.comments_status}></td>
+ <td class="xo-actions txtcenter">
+ <img class="cursorpointer" onclick="display_dialog('<{$comments.comments_id}>', true, true, 'slide', 'slide', 300, 500);" src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._AM_SYSTEM_COMMENTS_VIEW}>" title="<{$smarty.const._AM_SYSTEM_COMMENTS_VIEW}>" />
+ <a href="admin/comments/comment_edit.php?com_id=<{$comments.comments_id}>" title="<{$smarty.const._EDIT}>">
+ <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>">
+ </a>
+ <a href="admin/comments/comment_delete.php?com_id=<{$comments.comments_id}>" title="<{$smarty.const._DELETE}>">
+ <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>">
+ </a>
+ </td>
+ </tr>
+ <{/foreach}>
+ </tbody>
+ <tr>
+ <td><input class='btn' type='submit' name='<{$smarty.const._DELETE}>' value='<{$smarty.const._DELETE}>' /></td>
+ <td colspan="8"> </td>
+ </tr>
+ </table>
+</form>
<{foreach item=comments from=$comments_popup}>
<!--Pop-pup-->
<div id='dialog<{$comments.comments_id}>' title='<{$comments.comments_icon}> <{$comments.comments_title}>' style='display:none;'>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_groups.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_groups.html 2012-05-07 19:54:50 UTC (rev 9451)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_groups.html 2012-05-07 20:48:18 UTC (rev 9452)
@@ -3,22 +3,22 @@
<{includeq file="admin:system|admin_tips.html"}>
<{if $groups_count == true}>
<{includeq file="admin:system|admin_buttons.html"}>
-<table id="xo-group-sorter" cellspacing="1" class="outer tablesorter">
+<table id="xo-group-sorter" class="outer tablesorter">
<thead>
<tr>
- <th class="txtcenter span2"><{$smarty.const._AM_SYSTEM_GROUPS_ID}></th>
- <th class="txtcenter span6"><{$smarty.const._AM_SYSTEM_GROUPS_NAME}></th>
- <th class="txtcenter"><{$smarty.const._AM_SYSTEM_GROUPS_DESCRIPTION}></th>
- <th class="txtcenter span5"><{$smarty.const._AM_SYSTEM_GROUPS_NB_USERS_BY_GROUPS}></th>
+ <th class="txtcenter span1"><{$smarty.const._AM_SYSTEM_GROUPS_ID}></th>
+ <th class="txtcenter span3"><{$smarty.const._AM_SYSTEM_GROUPS_NAME}></th>
+ <th class="txtleft"><{$smarty.const._AM_SYSTEM_GROUPS_DESCRIPTION}></th>
+ <th class="txtcenter span3"><{$smarty.const._AM_SYSTEM_GROUPS_NB_USERS_BY_GROUPS}></th>
<th class="txtcenter span2"><{$smarty.const._AM_SYSTEM_GROUPS_ACTION}></th>
</tr>
- </thead>
- <tbody>
+ </thead>
+ <tbody>
<{foreach item=groups from=$groups}>
<tr class="<{cycle values='odd, even'}> alignmiddle">
<td class="txtcenter"><{$groups.groups_id}></td>
<td class="txtleft">
- <a class="tooltip" href="admin.php?fct=groups&op=groups_edit&groups_id=<{$groups.groups_id}>" title="<{$smarty.const._AM_SYSTEM_GROUPS_EDIT}>">
+ <a class="xo-tooltip" href="admin.php?fct=groups&op=groups_edit&groups_id=<{$groups.groups_id}>" title="<{$smarty.const._AM_SYSTEM_GROUPS_EDIT}>">
<{$groups.name}>
</a>
</td>
@@ -27,18 +27,18 @@
<a href="./admin.php?fct=users&selgroups=<{$groups.groups_id}>"><{$groups.nb_users_by_groups}></a>
</td>
<td class="xo-actions txtcenter">
- <a class="tooltip" href="admin.php?fct=groups&op=groups_edit&groups_id=<{$groups.groups_id}>" title="<{$smarty.const._AM_SYSTEM_GROUPS_EDIT}>">
+ <a class="xo-tooltip" href="admin.php?fct=groups&op=groups_edit&groups_id=<{$groups.groups_id}>" title="<{$smarty.const._AM_SYSTEM_GROUPS_EDIT}>">
<img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._AM_SYSTEM_GROUPS_EDIT}>" />
</a>
<{if $groups.delete}>
- <a class="tooltip" href="admin.php?fct=groups&op=groups_delete&groups_id=<{$groups.groups_id}>" title="<{$smarty.const._AM_SYSTEM_GROUPS_DELETE}>">
+ <a class="xo-tooltip" href="admin.php?fct=groups&op=groups_delete&groups_id=<{$groups.groups_id}>" title="<{$smarty.const._AM_SYSTEM_GROUPS_DELETE}>">
<img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._AM_SYSTEM_GROUPS_DELETE}>" />
</a>
<{/if}>
</td>
</tr>
<{/foreach}>
- </tbody>
+ </tbody>
</table>
<!-- Display groups navigation -->
<div class="clear spacer"></div>
@@ -48,5 +48,5 @@
<{/if}>
<!-- Display groups form (add,edit) -->
<{if $form}>
-<div class="spacer"><{$form}></div>
+<{includeq file="module:system|system_form.html"}>
<{/if}>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_images.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_images.html 2012-05-07 19:54:50 UTC (rev 9451)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_images.html 2012-05-07 20:48:18 UTC (rev 9452)
@@ -1,16 +1,18 @@
<!-- Header -->
-<{includeq file="admin:system|system_header.html"}>
+<{includeq file="admin:system|admin_breadcrumb.html"}>
+<{includeq file="admin:system|admin_tips.html"}>
+<{includeq file="admin:system|admin_buttons.html"}>
<!-- Buttons -->
<div class="floatright">
<div class="xo-buttons">
<{if !$edit_form && !$listimg}>
- <button id="xo-addcat-btn" class="ui-corner-all tooltip" onclick="xo_toggle('div#xo-category-add');" title="<{$smarty.const._AM_SYSTEM_IMAGES_ADDCAT}>">
+ <button id="xo-addcat-btn" class="btn" onclick="xo_toggle('div#xo-category-add');" title="<{$smarty.const._AM_SYSTEM_IMAGES_ADDCAT}>">
<img src="<{xoAdminIcons add.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_ADDCAT}>" />
<{$smarty.const._AM_SYSTEM_IMAGES_ADDCAT}>
</button>
<{/if}>
<{if $cat_img || $listimg}>
- <button id="xo-addimg-btn" class="ui-corner-all tooltip" onclick="xo_toggle('div#xo-images-add');" title="<{$smarty.const._AM_SYSTEM_IMAGES_ADDIMG}>">
+ <button id="xo-addimg-btn" class="btn" onclick="xo_toggle('div#xo-images-add');" title="<{$smarty.const._AM_SYSTEM_IMAGES_ADDIMG}>">
<img src="<{xoAdminIcons add.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_ADDIMG}>" />
<{$smarty.const._AM_SYSTEM_IMAGES_ADDIMG}>
</button>
@@ -35,7 +37,7 @@
<{foreach item=cat from=$cat_img}>
<tr class="<{cycle values='odd, even'}> txtcenter">
<td>
- <a class="tooltip" href="admin.php?fct=images&op=listimg&imgcat_id=<{$cat.id}>" title="<{$smarty.const._AM_SYSTEM_IMAGES_VIEW}>">
+ <a class="xo-tooltip" href="admin.php?fct=images&op=listimg&imgcat_id=<{$cat.id}>" title="<{$smarty.const._AM_SYSTEM_IMAGES_VIEW}>">
<{$cat.name}>
</a>
</td>
@@ -43,17 +45,17 @@
<td><{$cat.maxsize}></td>
<td><{$cat.maxwidth}></td>
<td><{$cat.maxheight}></td>
- <td class="xo-actions"><img id="loading_cat<{$cat.id}>" src="./images/spinner.gif" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" /><img class="cursorpointer tooltip" id="cat<{$cat.id}>" onclick="system_setStatus( { fct: 'images', op: 'display_cat', imgcat_id: <{$cat.id}> }, 'cat<{$cat.id}>', 'admin.php' )" src="<{if $cat.display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="" title="<{if $cat.display}><{$smarty.const._AM_SYSTEM_IMAGES_OFF}><{else}><{$smarty.const._AM_SYSTEM_IMAGES_ON}><{/if}>" />
+ <td class="xo-actions"><img id="loading_cat<{$cat.id}>" src="./images/spinner.gif" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" /><img class="cursorpointer xo-tooltip" id="cat<{$cat.id}>" onclick="system_setStatus( { fct: 'images', op: 'display_cat', imgcat_id: <{$cat.id}> }, 'cat<{$cat.id}>', 'admin.php' )" src="<{if $cat.display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="" title="<{if $cat.display}><{$smarty.const._AM_SYSTEM_IMAGES_OFF}><{else}><{$smarty.const._AM_SYSTEM_IMAGES_ON}><{/if}>" />
</td>
<td class="xo-actions txtcenter">
- <a class="tooltip" href="admin.php?fct=images&op=listimg&imgcat_id=<{$cat.id}>" title="<{$smarty.const._AM_SYSTEM_IMAGES_VIEW}>">
+ <a class="xo-tooltip" href="admin.php?fct=images&op=listimg&imgcat_id=<{$cat.id}>" title="<{$smarty.const._AM_SYSTEM_IMAGES_VIEW}>">
<img src="<{xoAdminIcons view.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_VIEW}>" />
</a>
<{if $xoops_isadmin}>
- <a class="tooltip" href="admin.php?fct=images&op=editcat&imgcat_id=<{$cat.id}>" title="<{$smarty.const._EDIT}>">
+ <a class="xo-tooltip" href="admin.php?fct=images&op=editcat&imgcat_id=<{$cat.id}>" title="<{$smarty.const._EDIT}>">
<img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>" />
</a>
- <a class="tooltip" href="admin.php?fct=images&op=delcat&imgcat_id=<{$cat.id}>" title="<{$smarty.const._EDIT}>">
+ <a class="xo-tooltip" href="admin.php?fct=images&op=delcat&imgcat_id=<{$cat.id}>" title="<{$smarty.const._EDIT}>">
<img src="<{xoAdminIcons delete.png}>" alt="" />
</a>
<{/if}>
@@ -78,41 +80,41 @@
<div class="ui-corner-all xo-thumb txtcenter">
<div class="xo-thumbimg">
<{if !$db_store}>
- <img class="tooltip" src="class/thumbs/phpThumb.php?src=<{$xoops_rootpath}>/uploads/<{$img.image_name}>&h=120&w=120" alt="<{$img.image_nicename}>" title="<{$img.image_nicename}>" />
+ <img class="xo-tooltip" src="class/thumbs/phpThumb.php?src=<{$xoops_rootpath}>/uploads/<{$img.image_name}>&h=120&w=120" alt="<{$img.image_nicename}>" title="<{$img.image_nicename}>" />
<{else}>
- <img class="tooltip" src="<{$xoops_url}>/image.php?id=<{$img.image_id}>" alt="<{$img.image_nicename}>" title="<{$img.image_nicename}>" style="max-width:120px; max-height:120px;" />
+ <img class="xo-tooltip" src="<{$xoops_url}>/image.php?id=<{$img.image_id}>" alt="<{$img.image_nicename}>" title="<{$img.image_nicename}>" style="max-width:120px; max-height:120px;" />
<{/if}>
</div>
<div class="xo-actions txtcenter">
<div class="spacer bold"><{$img.image_nicename}></div>
- <img id="loading_img<{$img.image_id}>" src="./images/spinner.gif" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" /><img class="cursorpointer tooltip" id="img<{$img.image_id}>" onclick="system_setStatus( { fct: 'images', op: 'display_img', image_id: <{$img.image_id}> }, 'img<{$img.image_id}>', 'admin.php' )" src="<{if $img.image_display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{$smarty.const._IMGDISPLAY}>" title="<{$smarty.const._IMGDISPLAY}>" />
- <{if !$db_store}>
- <a class="lightbox tooltip" href="<{$xoops_upload_url}>/<{$img.image_name}>" title="<{$img.image_nicename}>">
+ <img id="loading_img<{$img.image_id}>" src="./images/spinner.gif" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" /><img class="cursorpointer xo-tooltip" id="img<{$img.image_id}>" onclick="system_setStatus( { fct: 'images', op: 'display_img', image_id: <{$img.image_id}> }, 'img<{$img.image_id}>', 'admin.php' )" src="<{if $img.image_display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{$smarty.const._IMGDISPLAY}>" title="<{$smarty.const._IMGDISPLAY}>" />
+ <{if !$db_store}>
+ <a class="lightbox xo-tooltip" href="<{$xoops_upload_url}>/<{$img.image_name}>" title="<{$img.image_nicename}>">
<{else}>
- <a class="lightbox tooltip" href="<{$xoops_url}>/image.php?id=<{$img.image_id}>" title="<{$img.image_nicename}>">
- <{/if}>
+ <a class="lightbox xo-tooltip" href="<{$xoops_url}>/image.php?id=<{$img.image_id}>" title="<{$img.image_nicename}>">
+ <{/if}>
<img src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_VIEW}>" />
</a>
- <a class="tooltip" href="admin.php?fct=images&op=editimg&image_id=<{$img.image_id}>" title="<{$smarty.const._EDIT}>">
+ <a class="xo-tooltip" href="admin.php?fct=images&op=editimg&image_id=<{$img.image_id}>" title="<{$smarty.const._EDIT}>">
<img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>" />
</a>
- <a class="tooltip" href="admin.php?fct=images&op=delfile&image_id=<{$img.image_id}>" title="<{$smarty.const._DELETE}>">
+ <a class="xo-tooltip" href="admin.php?fct=images&op=delfile&image_id=<{$img.image_id}>" title="<{$smarty.const._DELETE}>">
<img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>" />
</a>
- <img class="tooltip" onclick="display_dialog(<{$img.image_id}>, true, true, 'slide', 'slide', 120, 350);" src="<{xoAdminIcons url.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_URL}>" title="<{$smarty.const._AM_SYSTEM_IMAGES_URL}>" />
+ <img class="xo-tooltip" onclick="display_dialog(<{$img.image_id}>, true, true, 'slide', 'slide', 120, 350);" src="<{xoAdminIcons url.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_URL}>" title="<{$smarty.const._AM_SYSTEM_IMAGES_URL}>" />
</div>
</div>
</div>
<div id="dialog<{$img.image_id}>" title="<{$img.image_nicename}>" style='display:none;'>
- <div class="center">
- <{if !$db_store}>
- <{$xoops_upload_url}>/<{$img.image_name}>
- <{else}>
- <{$xoops_url}>/image.php?id=<{$img.image_id}>
- <{/if}>
- </div>
- </div>
+ <div class="center">
+ <{if !$db_store}>
+ <{$xoops_upload_url}>/<{$img.image_name}>
+ <{else}>
+ <{$xoops_url}>/image.php?id=<{$img.image_id}>
+ <{/if}>
+ </div>
+ </div>
<{/foreach}>
<div class="clear"></div>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_index.html 2012-05-07 19:54:50 UTC (rev 9451)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_index.html 2012-05-07 20:48:18 UTC (rev 9452)
@@ -1,9 +1,11 @@
-<{includeq file="admin:system|system_header.html"}>
+<{includeq file="admin:system|admin_breadcrumb.html"}>
+<{includeq file="admin:system|admin_tips.html"}>
+<{includeq file="admin:system|admin_buttons.html"}>
<script type="text/javascript">
IMG_ON = '<{xoAdminIcons success.png}>';
IMG_OFF = '<{xoAdminIcons cancel.png}>';
</script>
-<table cellspacing="1" class="outer">
+<table class="outer">
<thead>
<tr>
<th class="txtcenter"><{$smarty.const._AM_SYSTEM_SECTION}></th>
@@ -17,7 +19,7 @@
<{foreach item=menu from=$menu}>
<tr class="<{cycle values='even,odd'}>">
<td class="bold width15">
- <a class="tooltip" href="admin.php?fct=<{$menu.file}>" title="<{$smarty.const._AM_SYSTEM_GO}>: <{$menu.title}>">
+ <a class="xo-tooltip" href="admin.php?fct=<{$menu.file}>" title="<{$smarty.const._AM_SYSTEM_GO}>: <{$menu.title}>">
<img class="xo-imgmini" src='<{$theme_icons}>/<{$menu.icon}>' alt="<{$menu.title}>" />
<{$menu.title}>
</a>
@@ -26,8 +28,8 @@
<td class="width15"><{$menu.infos}></td>
<td class="xo-actions width2">
<{if $menu.used}>
- <img id="loading_<{$menu.file}>" src="images/spinner.gif" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
- <img class="tooltip" id="<{$menu.file}>" onclick="system_setStatus( { op: 'system_avtivate', type: '<{$menu.file}>' }, '<{$menu.file}>', 'admin.php' )" src="<{if $menu.status}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{$smarty.const._AM_SYSTEM_STATUS}>" title="<{$smarty.const._AM_SYSTEM_STATUS}>" />
+ <img id="loading_<{$menu.file}>" src="images/spinner.gif" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
+ <img class="xo-tooltip" id="<{$menu.file}>" onclick="system_setStatus( { op: 'system_avtivate', type: '<{$menu.file}>' }, '<{$menu.file}>', 'admin.php' )" src="<{if $menu.status}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{$smarty.const._AM_SYSTEM_STATUS}>" title="<{$smarty.const._AM_SYSTEM_STATUS}>" />
<{/if}>
</td>
</tr>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_maintenance.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_maintenance.html 2012-05-07 19:54:50 UTC (rev 9451)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_maintenance.html 2012-05-07 20:48:18 UTC (rev 9452)
@@ -2,34 +2,31 @@
<{includeq file="admin:system|system_header.html"}>
<!-- Display mailusers form -->
<br />
-<{if $form_maintenance}>
- <div class="spacer"><{$form_maintenance}></div><br />
- <div class="spacer"><{$form_dump}></div>
-<{elseif $maintenance}>
- <{if $verif_cache || $verif_session}>
- <table class="outer ui-corner-all" cellspacing="1">
- <tr>
- <th><{$smarty.const._AM_SYSTEM_MAINTENANCE}></th>
- <th><{$smarty.const._AM_SYSTEM_MAINTENANCE_RESULT}></th>
- </tr>
- <{if $verif_cache}>
- <tr>
- <td class="aligntop txtcenter"><{$smarty.const._AM_SYSTEM_MAINTENANCE_RESULT_CACHE}></td>
- <td class="aligntop txtcenter"><{if $result_cache}><img width="16" src="<{xoAdminIcons success.png}>" /><{else}><img style="width:16px;" src="<{xoAdminIcons cancel.png}>" alt="Cancel"/><{/if}></td>
- </tr>
- <{/if}>
+<{if $maintenance}>
+ <{if $verif_cache || $verif_session}>
+ <table class="outer ui-corner-all" cellspacing="1">
+ <tr>
+ <th><{$smarty.const._AM_SYSTEM_MAINTENANCE}></th>
+ <th><{$smarty.const._AM_SYSTEM_MAINTENANCE_RESULT}></th>
+ </tr>
+ <{if $verif_cache}>
+ <tr>
+ <td class="aligntop txtcenter"><{$smarty.const._AM_SYSTEM_MAINTENANCE_RESULT_CACHE}></td>
+ <td class="aligntop txtcenter"><{if $result_cache}><img width="16" src="<{xoAdminIcons success.png}>" /><{else}><img style="width:16px;" src="<{xoAdminIcons cancel.png}>" alt="Cancel"/><{/if}></td>
+ </tr>
+ <{/if}>
- <{if $verif_session}>
- <tr>
- <td class="aligntop" align="center"><{$smarty.const._AM_SYSTEM_MAINTENANCE_RESULT_SESSION}></td>
- <td class="aligntop" align="center"><{if $result_session}><img style="width:16px;" src="<{xoAdminIcons success.png}>" alt="Success"/><{else}><img style="width:16px;" src="<{xoAdminIcons cancel.png}>" alt="Cancel"/><{/if}></td>
- </tr>
- <{/if}>
- </table><br />
- <{/if}>
- <{if $verif_maintenance}>
- <{$result_maintenance}>
- <{/if}>
+ <{if $verif_session}>
+ <tr>
+ <td class="aligntop" align="center"><{$smarty.const._AM_SYSTEM_MAINTENANCE_RESULT_SESSION}></td>
+ <td class="aligntop" align="center"><{if $result_session}><img style="width:16px;" src="<{xoAdminIcons success.png}>" alt="Success"/><{else}><img style="width:16px;" src="<{xoAdminIcons cancel.png}>" alt="Cancel"/><{/if}></td>
+ </tr>
+ <{/if}>
+ </table><br />
+ <{/if}>
+ <{if $verif_maintenance}>
+ <{$result_maintenance}>
+ <{/if}>
<{else}>
- <{$result_dump}>
+ <{$result_dump}>
<{/if}>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_preferences.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_preferences.html 2012-05-07 19:54:50 UTC (rev 9451)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_preferences.html 2012-05-07 20:48:18 UTC (rev 9452)
@@ -2,13 +2,13 @@
<!--Preferences-->
<{if $menu}>
<div class="xo-catsetting">
- <{foreach item=preferences from=$preferences}>
- <a class="tooltip" href="admin.php?fct=preferences&op=show&confcat_id=<{$preferences.id}>" title="<{$preferences.name}>">
+ <{foreach item=preferences from=$preferences}>
+ <a class="xo-tooltip" href="admin.php?fct=preferences&op=show&confcat_id=<{$preferences.id}>" title="<{$preferences.name}>">
<img src="<{$preferences.image}>" alt="<{$preferences.name}>" />
<span><{$preferences.name}></span>
</a>
- <{/foreach}>
- <a class="tooltip" href="admin.php?fct=preferences&op=showmod&mod=1" title="<{$smarty.const._AM_SYSTEM_PREFERENCES_SETTINGS}>">
+ <{/foreach}>
+ <a class="xo-tooltip" href="admin.php?fct=preferences&op=showmod&mod=1" title="<{$smarty.const._AM_SYSTEM_PREFERENCES_SETTINGS}>">
<img src="<{xoAdminIcons xoops/system_mods.png}>" alt="<{$smarty.const._AM_SYSTEM_PREFERENCES_SETTINGS}>" />
<span><{$smarty.const._AM_SYSTEM_PREFERENCES_SETTINGS}></span>
</a>
@@ -16,6 +16,5 @@
<{/if}>
<div class="clear"> </div>
<{if $form}>
-<{$form}>
-<{/if}>
-
+<{includeq file="module:system|system_form.html"}>
+<{/if}>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_templates.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_templates.html 2012-05-07 19:54:50 UTC (rev 9451)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_templates.html 2012-05-07 20:48:18 UTC (rev 9452)
@@ -1,5 +1,6 @@
-<{includeq file="admin:system|system_header.html"}>
-
+<{includeq file="admin:system|admin_breadcrumb.html"}>
+<{includeq file="admin:system|admin_tips.html"}>
+<{includeq file="admin:system|admin_buttons.html"}>
<{if $index}>
<br class="clear" />
<div class="spacer">
@@ -11,7 +12,9 @@
<tr>
<td class="aligntop width10"><div id="fileTree" class="display_folder"></div></td>
<td class="aligntop">
- <div id="display_form"><{$form}></div>
+ <div id="display_form">
+ <{includeq file="module:system|system_form.html"}>
+ </div>
<div id="display_contenu"></div>
<div id='display_message' class="txtcenter" style="display:none;"></div>
<div id='loading' class="txtcenter" style="display:none;"><br /><br /><img src="images/loading.gif" title="Loading" alt="Loading" /></div>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_users.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_users.html 2012-05-07 19:54:50 UTC (rev 9451)
+++ Xo...
[truncated message content] |
