Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9472] XoopsCore/branches/2.6.x/2.6.0/htdocs
|
From: <for...@us...> - 2012-05-10 10:00:14
|
Revision: 9472
http://xoops.svn.sourceforge.net/xoops/?rev=9472&view=rev
Author: forxoops
Date: 2012-05-10 10:00:07 +0000 (Thu, 10 May 2012)
Log Message:
-----------
Manage plugins link in admin area for each module
Add some change to admin theme
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/css/moduladmin.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/mailusers/language/english/modinfo.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/plugins/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/module.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/header.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/admin_index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/css/style.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/icons/mailuser_small.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/language/english/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/theme.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/icons.html
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/css/moduladmin.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/css/moduladmin.css 2012-05-09 17:59:30 UTC (rev 9471)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/css/moduladmin.css 2012-05-10 10:00:07 UTC (rev 9472)
@@ -102,6 +102,10 @@
vertical-align: middle;
width: 68px !important;
}
+.moduleadmin-icon a:hover {
+ background-color: #D2E2F9;
+ border: 1px solid #A4C3EF;
+}
.moduleadmin-icon a img {
margin: 6px 0;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/mailusers/language/english/modinfo.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/mailusers/language/english/modinfo.php 2012-05-09 17:59:30 UTC (rev 9471)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/mailusers/language/english/modinfo.php 2012-05-10 10:00:07 UTC (rev 9472)
@@ -22,7 +22,7 @@
// Info module
define("_MI_MAILUSERS_NAME", "Mail users");
-define("_MI_MAILUSERS_DESC", "Module for managing mails");
+define("_MI_MAILUSERS_DESC", "Plugin for managing mails");
define("_MI_MAILUSERS_SENDMAIL", "Send Mail");
// Menu
define("_MI_MAILUSERS_INDEX", "Home");
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/plugins/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/plugins/main.php 2012-05-09 17:59:30 UTC (rev 9471)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/plugins/main.php 2012-05-10 10:00:07 UTC (rev 9472)
@@ -53,15 +53,15 @@
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
$admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
- $admin_page->addBreadLink(_AM_SYSTEM_PLUGINS_ADMIN, $system->adminVersion('plugins', 'adminpath'));
- $admin_page->addBreadLink(_AM_SYSTEM_PLUGINS_MAIN);
+ $admin_page->addBreadcrumbLink(_AM_SYSTEM_PLUGINS_ADMIN, $system->adminVersion('plugins', 'adminpath'));
+ $admin_page->addBreadcrumbLink(_AM_SYSTEM_PLUGINS_MAIN);
$admin_page->addTips(_AM_SYSTEM_PLUGINS_TIPS);
$admin_page->renderBreadcrumb();
$admin_page->renderTips();
- $system_module = new SystemModule();
+ $system_plugin = new SystemPlugin();
- $plugin = $system_module->getPlugin();
+ $plugin = $system_plugin->getPluginList();
$xoops->tpl->assign('xoops', $xoops);
$xoops->tpl->assign('plugin_list', $plugin);
@@ -77,24 +77,24 @@
$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_PLUGINS_ADMIN, $system->adminVersion('plugins', 'adminpath'));
- $admin_page->addBreadLink(_AM_SYSTEM_PLUGINS_INSTALL);
+ $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(_AM_SYSTEM_PLUGINS_ADMIN, $system->adminVersion('plugins', 'adminpath'));
+ $admin_page->addBreadcrumbLink(_AM_SYSTEM_PLUGINS_INSTALL);
$admin_page->renderBreadcrumb();
$ret = array();
- $system_module = new SystemModule();
- $ret = $system_module->install($module);
+ $system_plugin = new SystemPlugin();
+ $ret = $system_plugin->install($module);
if ($ret) {
$xoops->tpl->assign('install', 1);
$xoops->tpl->assign('module', $ret);
$xoops->tpl->assign('from_title', _AM_SYSTEM_PLUGINS_ADMIN);
$xoops->tpl->assign('from_link', $system->adminVersion('plugins', 'adminpath'));
$xoops->tpl->assign('title', _AM_SYSTEM_PLUGINS_INSTALL);
- $xoops->tpl->assign('log', $system_module->trace);
+ $xoops->tpl->assign('log', $system_plugin->trace);
} else {
- print_r($system_module->error);
- //print_r($system_module->trace);
+ print_r($system_plugin->error);
+ //print_r($system_plugin->trace);
}
//Set active modules in cache folder
$xoops->setActiveModules();
@@ -112,20 +112,20 @@
$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_PLUGINS_ADMIN, $system->adminVersion('plugins', 'adminpath'));
- $admin_page->addBreadLink(_AM_SYSTEM_PLUGINS_UNINSTALL);
+ $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(_AM_SYSTEM_PLUGINS_ADMIN, $system->adminVersion('plugins', 'adminpath'));
+ $admin_page->addBreadcrumbLink(_AM_SYSTEM_PLUGINS_UNINSTALL);
$admin_page->renderBreadcrumb();
$ret = array();
- $system_module = new SystemModule();
- $ret = $system_module->uninstall($module->getVar('dirname'));
+ $system_plugin = new SystemPlugin();
+ $ret = $system_plugin->uninstall($module->getVar('dirname'));
$xoops->tpl->assign('module', $ret);
if ($ret) {
$xoops->tpl->assign('from_title', _AM_SYSTEM_PLUGINS_ADMIN);
$xoops->tpl->assign('from_link', $system->adminVersion('plugins', 'adminpath'));
$xoops->tpl->assign('title', _AM_SYSTEM_PLUGINS_UNINSTALL);
- $xoops->tpl->assign('log', $system_module->trace);
+ $xoops->tpl->assign('log', $system_plugin->trace);
}
// Call Footer
$xoops->footer();
@@ -142,21 +142,21 @@
$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_PLUGINS_ADMIN, $system->adminVersion('plugins', 'adminpath'));
- $admin_page->addBreadLink(_AM_SYSTEM_PLUGINS_UPDATE);
+ $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(_AM_SYSTEM_PLUGINS_ADMIN, $system->adminVersion('plugins', 'adminpath'));
+ $admin_page->addBreadcrumbLink(_AM_SYSTEM_PLUGINS_UPDATE);
$admin_page->renderBreadcrumb();
$ret = array();
- $system_module = new SystemModule();
- $ret = $system_module->update($module->getVar('dirname'));
+ $system_plugin = new SystemPlugin();
+ $ret = $system_plugin->update($module->getVar('dirname'));
$xoops->tpl->assign('module', $ret);
if ($ret) {
$xoops->tpl->assign('install', 1);
$xoops->tpl->assign('from_title', _AM_SYSTEM_PLUGINS_ADMIN);
$xoops->tpl->assign('from_link', $system->adminVersion('plugins', 'adminpath'));
$xoops->tpl->assign('title', _AM_SYSTEM_PLUGINS_UPDATE);
- $xoops->tpl->assign('log', $system_module->trace);
+ $xoops->tpl->assign('log', $system_plugin->trace);
}
// Call Footer
$xoops->footer();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/module.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/module.php 2012-05-09 17:59:30 UTC (rev 9471)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/module.php 2012-05-10 10:00:07 UTC (rev 9472)
@@ -15,7 +15,7 @@
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
* @author Andricq Nicolas (AKA MusS)
- * @package
+ * @package System
* @version $Id$
*/
@@ -26,11 +26,11 @@
public $trace = array();
- private $_list = array();
+ protected $_list = array();
- private $_mods = array();
+ protected $_mods = array();
- private $_reservedTables = array(
+ protected $_reservedTables = array(
'avatar', 'avatar_users_link', 'block_module_link', 'xoopscomments', 'config', 'configcategory', 'configoption',
'image', 'imagebody', 'imagecategory', 'imgset', 'imgset_tplset_link', 'imgsetimg', 'groups',
'groups_users_link', 'group_permission', 'online', 'bannerclient', 'banner', 'bannerfinish', 'priv_msgs',
@@ -134,58 +134,6 @@
}
/**
- * @return array
- */
- public function getPlugin()
- {
- // Get main instance
- $xoops = Xoops::getInstance();
- $module_handler = $xoops->getHandlerModule();
- $moduleperm_handler = $xoops->getHandlerGroupperm();
-
- $ret = array();
- $i = 0;
- foreach ($this->_list as $file) {
- if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $file . '/xoops_version.php')) {
- clearstatcache();
- $file = trim($file);
- /* @var $module XoopsModule */
- $module = $module_handler->create();
- $module->loadInfo($file);
- if ($module->getInfo('plugin')) {
- if (in_array($file, $this->_mods)) {
- $module->setInfo('install', true);
- $plugin = $module_handler->getByDirname($module->getInfo('dirname'));
- $module->setInfo('mid', $plugin->getVar('mid'));
- $module->setInfo('update', XoopsLocal::formatTimestamp($plugin->getVar('last_update'), 's'));
- if (round($module->getInfo('version'), 2) != $plugin->getVar('version')) {
- $module->setInfo('warning_update', true);
- }
- $sadmin = $moduleperm_handler->checkRight('module_admin', $module->getInfo('mid'), $xoops->user->getGroups());
- if ($sadmin && ($module->getVar('hasnotification') || is_array($module->getInfo('config')) || is_array($module->getInfo('comments')))) {
- $module->setInfo('link_pref', XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $module->getInfo('mid'));
- }
- } else {
- $module->setInfo('install', false);
- }
- $module->setInfo('version', round($module->getInfo('version'), 2));
- if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getInfo('dirname') . '/icons/logo_small.png')) {
- $module->setInfo('logo_small', XOOPS_URL . '/modules/' . $module->getInfo('dirname') . '/icons/logo_small.png');
- } else {
- $module->setInfo('logo_small', XOOPS_URL . '/media/xoops/images/icons/16/default.png');
- }
- $module->setInfo('link_admin', XOOPS_URL . '/modules/' .$module->getInfo('dirname') . '/' . $module->getInfo('adminindex'));
- $module->setInfo('options', $module->getAdminMenu());
- $ret[] = $module;
- unset($module);
- $i++;
- }
- }
- }
- return $ret;
- }
-
- /**
* @param string $mod
* @return bool|XoopsModule|XoopsObject
*/
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/header.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/header.php 2012-05-09 17:59:30 UTC (rev 9471)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/header.php 2012-05-10 10:00:07 UTC (rev 9472)
@@ -25,6 +25,7 @@
XoopsLoad::load('system', 'system');
XoopsLoad::load('module', 'system');
+XoopsLoad::load('plugin', 'system');
$system = System::getInstance();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/admin_index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/admin_index.html 2012-05-09 17:59:30 UTC (rev 9471)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/admin_index.html 2012-05-10 10:00:07 UTC (rev 9472)
@@ -4,7 +4,7 @@
<div class="xo-window-data">
<div class="moduleadmin-icon">
<{foreach item=menu from=$xo_admin_index_menu}>
- <a href="../<{$menu.link}>" title="<{$menu.title}>">
+ <a class="xo-tooltip" href="../<{$menu.link}>" title="<{$menu.title}>">
<img src="<{$menu.icon}>" alt="<{$menu.title}>" />
<span><{$menu.title}></span>
</a>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/css/style.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/css/style.css 2012-05-09 17:59:30 UTC (rev 9471)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/css/style.css 2012-05-10 10:00:07 UTC (rev 9472)
@@ -82,6 +82,10 @@
vertical-align: middle;
width: 68px !important;
}
+.cp-icon a:hover {
+ background-color: #D2E2F9;
+ border: 1px solid #A4C3EF;
+}
.cp-icon a img {
margin: 6px 0;
}
@@ -91,12 +95,24 @@
font-weight: bold;
line-height: 1;
}
+.cp-cat {
+ border-bottom: 1px solid #ccc;
+ margin-right: 6px;
+ padding: 4px 0 6px;
+ text-align: left;
+}
.mod-icons {
float: right;
width: 32%;
}
+.mod-icons .mod-link {
+ border-top: 1px solid #ccc;
+ margin: 10px 5px 0 0;
+ padding: 5px;
+}
+
ul.breadcrumb {
text-shadow: 0 0 2px #000;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php 2012-05-09 17:59:30 UTC (rev 9471)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php 2012-05-10 10:00:07 UTC (rev 9472)
@@ -45,7 +45,7 @@
$xoops->theme->addScript($xoops->url('/media/jquery/jquery.js'));
$xoops->theme->addScript($xoops->url('/media/jquery/plugins/jquery.ui.js'));
$xoops->theme->addScript($xoops->url('/media/bootstrap/js/bootstrap.min.js'));
- //ddsmoothmenu
+ // ddsmoothmenu
$xoops->theme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/ddsmoothmenu.js');
$xoops->theme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/tooltip.js');
@@ -58,7 +58,9 @@
$xoops->tpl->assign('quick_menu', $quick);
XoopsLoad::load('module', 'system');
+ XoopsLoad::load('plugin', 'system');
$system_module = new SystemModule();
+ $system_plugin = new SystemPlugin();
$adminmenu = null;
include dirname(__FILE__) . '/menu.php';
@@ -77,6 +79,7 @@
: XOOPS_ADMINTHEME_URL . '/default/' . $mod_options[$item]['icon'];
unset($mod_options[$item]['icon_small']);
}
+
} else {
$moddir = $xoops->module->getVar('dirname', 'n');
$modpath = XOOPS_URL . '/modules/' . $moddir;
@@ -103,10 +106,13 @@
unset($module_list);
// Plugins list
- $plugin_list = $system_module->getPlugin();
+ $plugin_list = $system_plugin->getPluginList();
$xoops->tpl->assign('plugin_menu', $plugin_list);
- unset($module_list);
+ unset($plugin_list);
+ $plugin_mod = $system_plugin->getPlugin( $moddir );
+ $xoops->tpl->assign('plugin_mod', $plugin_mod);
+
// add preferences menu
$menu = array();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/icons/mailuser_small.png
===================================================================
(Binary files differ)
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/language/english/admin.php 2012-05-09 17:59:30 UTC (rev 9471)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/language/english/admin.php 2012-05-10 10:00:07 UTC (rev 9472)
@@ -26,8 +26,8 @@
define("_DEFAULT_DASHBORD","Dashboard");
define("_DEFAULT_DASHBORD_DESC","Control and manage your site");
-define("_DEFAULT_INSTALLEDMODULES","Modules");
-define("_DEFAULT_INSTALLEDPLUGINS","Plugins");
+define("_DEFAULT_INSTALLEDMODULES","Installed modules");
+define("_DEFAULT_INSTALLEDPLUGINS","Installed plugins");
define("_DEFAULT_XOOPSTHEMES","XOOPS Themes");
define("_DEFAULT_XOOPSMODULES","XOOPS Modules");
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/theme.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/theme.html 2012-05-09 17:59:30 UTC (rev 9471)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/theme.html 2012-05-10 10:00:07 UTC (rev 9472)
@@ -1,127 +1,37 @@
<!DOCTYPE html>
<html lang="<{$xoops_langcode}>">
- <head>
- <{includeq file="$theme_tpl/head.html"}>
- </head>
- <body id="<{$xoops_dirname}>" class="<{$xoops_langcode}>">
- <div class="navbar navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container-fluid">
- <{includeq file="$theme_tpl/menu.html"}>
- </div>
- </div>
- </div>
- <div class="subnav subnav-fixed">
- <{includeq file="$theme_tpl/icons.html"}>
- </div>
- <div class="clear"></div>
+<head>
+ <{includeq file="$theme_tpl/head.html"}>
+</head>
+<body id="<{$xoops_dirname}>" class="<{$xoops_langcode}>">
+<div class="navbar navbar-fixed-top">
+ <div class="navbar-inner">
<div class="container-fluid">
- <div class="dashboard-content">
- <{if !$xoops_contents}>
-
- <section id="panel">
- <div class="page-header">
- <h1><{$smarty.const._DEFAULT_DASHBORD}> <small><{$smarty.const._DEFAULT_DASHBORD_DESC}></small></h1>
- </div>
- <{if !$error_msg}>
- <{foreach item=msg from=$error_msg}>
- <div class="row">
- <div class="span16 alert-message error">
- <p><{$msg}></p>
- </div>
- </div>
- <{/foreach}>
- <{/if}>
-
- <div class="card-icons outer">
- <div class="xo-window">
- <div class="xo-window-title"><span class="ico ico-wrench-5"></span> <{$smarty.const._DEFAULT_CPHOME}></div>
- <div class="xo-window-data">
- <div class="cp-icon">
- <{foreach item=op from=$mod_options}>
- <a class="xo-tooltip" href="<{$op.link}>" title="<{$op.desc}>">
- <img src='<{$op.icon|default:"$theme_icons/icon_options.png"}>' alt="<{$op.desc}>" />
- <span><{$op.title}></span>
- </a>
- <{/foreach}>
- <a class="xo-tooltip" href="<{xoAppUrl modules/system/admin.php}>" title="<{$smarty.const._AM_SYSTEM_CONFIG}>">
- <img src='<{"$theme_icons/configuration.png"}>' />
- <span><{$smarty.const._AM_SYSTEM_CONFIG}></span>
- </a>
- <a class="xo-tooltip" href="<{xoAppUrl modules/system/help.php}>" title="<{$smarty.const._AM_SYSTEM_HELP}>">
- <img src='<{"$theme_icons/help.png"}>' />
- <span><{$smarty.const._AM_SYSTEM_HELP}></span>
- </a>
- </div>
- </div>
- </div>
- </div>
- <div class="mod-icons">
- <div class="outer">
- <div class="xo-window">
- <div class="xo-window-title">
- <span class="ico ico-box"></span> <{$smarty.const._DEFAULT_INSTALLEDMODULES}>
- <a class="down" href="javascript:;"> </a>
- </div>
- <div class="xo-window-data">
- <table class="condensed-table">
- <{foreach item=mod_list from=$module_menu}>
- <{if $mod_list->getInfo(dirname) != 'system'}>
- <tr>
- <td class="span1"><img src="<{$mod_list->getInfo('logo_small')}>" alt="" /></td>
- <td><a href="<{$mod_list->getInfo('link_admin')}>"><{$mod_list->getVar(name)}></a></td>
- </tr>
- <{/if}>
- <{/foreach}>
- </table>
- </div>
- </div>
- <div class="clear"></div>
- </div>
- <br />
- <div class="outer">
- <div class="xo-window">
- <div class="xo-window-title">
- <span class="ico ico-plugin"></span> <{$smarty.const._DEFAULT_INSTALLEDPLUGINS}>
- <a class="down" href="javascript:;"> </a>
- </div>
- <div class="xo-window-data">
- <table class="condensed-table">
- <{foreach item=plug_list from=$plugin_menu}>
- <{if $plug_list->getInfo(install)}>
- <tr>
- <td class="span1"><img src="<{$plug_list->getInfo('logo_small')}>" alt="" /></td>
- <td><a href="<{$plug_list->getInfo('link_admin')}>"><{$plug_list->getInfo(name)}></a></td>
- </tr>
- <{/if}>
- <{/foreach}>
- </table>
- </div>
- </div>
- <div class="clear"></div>
- </div>
- </div>
- <div class="clear"></div>
- </section>
- <{else}>
- <!-- Display Admin menu -->
- <{includeq file="admin:system|admin_tabs.html"}>
- <div class="xo-module-content <{if $xoops_dirname != 'system'}>modules<{/if}>"><{$xoops_contents}></div>
- <{/if}>
- </div>
+ <{includeq file="$theme_tpl/menu.html"}>
</div>
- <div class="center">
- <a href="<{$xoops_url}>/modules/system/testform.php">Test new form</a>
- </div>
- <div class="footer">
- <p class="pull-right"><a href="#">Back to top</a></p>
- <p class="txtcenter">
- Powered by <a href="http://sourceforge.net/projects/xoops/" rel="external" title="Xoops Project"><{$xoops_version}></a> © 2001-<{$smarty.now|date_format:"%Y"}>
- </p>
- <!--{xo-logger-output}-->
- </div>
- <script type="text/javascript">
- ddsmoothmenu.init({mainmenuid: "xo-menu-modules", orientation: 'h', classname: 'ddsmoothmenu', contentsource: "markup"})
- </script>
- </body>
+ </div>
+</div>
+<div class="subnav subnav-fixed">
+ <{includeq file="$theme_tpl/icons.html"}>
+</div>
+<div class="clear"></div>
+<div class="container-fluid">
+ <{includeq file="$theme_tpl/dashboard.html"}>
+</div>
+<div class="center">
+ <a href="<{$xoops_url}>/modules/system/testform.php">Test new form</a>
+</div>
+<div class="footer">
+ <p class="pull-right"><a href="#">Back to top</a></p>
+
+ <p class="txtcenter">
+ Powered by <a href="http://sourceforge.net/projects/xoops/" rel="external" title="Xoops Project"><{$xoops_version}></a> ©
+ 2001-<{$smarty.now|date_format:"%Y"}>
+ </p>
+ <!--{xo-logger-output}-->
+</div>
+<script type="text/javascript">
+ ddsmoothmenu.init({mainmenuid:"xo-menu-modules", orientation:'h', classname:'ddsmoothmenu', contentsource:"markup"})
+</script>
+</body>
</html>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/icons.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/icons.html 2012-05-09 17:59:30 UTC (rev 9471)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/icons.html 2012-05-10 10:00:07 UTC (rev 9472)
@@ -2,18 +2,35 @@
<ul class="nav nav-pills pull-right">
<{foreach item=op from=$mod_options}>
<li>
- <a class="" href="<{$op.link}>" title="<{$op.title}>">
- <img src='<{$op.icon|default:"$theme_icons/icon_options.png"}>' alt="<{$op.title}>" />
- </a></li>
+ <a class="xo-tooltip" href="<{$op.link}>" title="<{$op.title}>">
+ <img src='<{$op.icon|default:"$theme_icons/icon_options.png"}>' alt="<{$op.title}>"/>
+ </a></li>
<{/foreach}>
- <{if $moddir !='system' && $mod_options}>
+ <{foreach item=plug from=$plugin_mod}>
<li>
- <a class="" href="<{$xoops_url}>/modules/system/admin.php?fct=preferences&op=showmod&mod=<{$modid}>" title="<{$smarty.const._OXYGEN_SITEPREF}>">
- <img src="<{$theme_icons}>/prefs.png" alt="<{$smarty.const._OXYGEN_SITEPREF}>" />
- </a></li>
+ <a class="xo-tooltip" href="<{$xoops_url}>/modules/<{$plug->getInfo('dirname')}>/<{$plug->getInfo('adminindex')}>" title="<{$plug->getInfo('name')}>">
+ <img src="<{$plug->getInfo('logo_large')}>" alt="<{$plug->getInfo('name')}>"/>
+ </a></li>
+ <{/foreach}>
+ <{if $moddir != 'system' && $mod_options}>
+ <li>
+ <a class="xo-tooltip"
+ href="<{$xoops_url}>/modules/system/admin.php?fct=preferences&op=showmod&mod=<{$modid}>"
+ title="<{$smarty.const._OXYGEN_SITEPREF}>">
+ <img src="<{$theme_icons}>/prefs.png" alt="<{$smarty.const._OXYGEN_SITEPREF}>"/>
+ </a>
+ </li>
<{/if}>
+ <{if $moddir == 'system' && $mod_options}>
<li>
- <a class="" href="<{xoAppUrl modules/system/help.php}>" title="<{$smarty.const._AM_SYSTEM_HELP}>">
- <img src='<{"$theme_icons/help.png"}>' alt="<{$smarty.const._AM_SYSTEM_HELP}>" />
- </a></li>
+ <a class="xo-tooltip" href="<{xoAppUrl modules/system/admin.php}>" title="<{$smarty.const._AM_SYSTEM_CONFIG}>">
+ <img src='<{"$theme_icons/configuration.png"}>' alt="<{$smarty.const._AM_SYSTEM_CONFIG}>"/>
+ </a>
+ </li>
+ <{/if}>
+ <li>
+ <a class="xo-tooltip" href="<{xoAppUrl modules/system/help.php}>" title="<{$smarty.const._AM_SYSTEM_HELP}>">
+ <img src='<{"$theme_icons/help.png"}>' alt="<{$smarty.const._AM_SYSTEM_HELP}>"/>
+ </a>
+ </li>
</ul>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
