Menu
▾
▴
xoops-svn
|
From: <ma...@us...> - 2012-04-27 21:41:59
|
Revision: 9391
http://xoops.svn.sourceforge.net/xoops/?rev=9391&view=rev
Author: mageg
Date: 2012-04-27 21:41:52 +0000 (Fri, 27 Apr 2012)
Log Message:
-----------
suppression of templates for banners in the module system
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_banner.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_bannerdisplay.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_bannerlogin.html
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_banner.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_banner.html 2012-04-27 21:33:42 UTC (rev 9390)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_banner.html 2012-04-27 21:41:52 UTC (rev 9391)
@@ -1,70 +0,0 @@
-<h1><{$smarty.const._BANNERS_MANAGEMENT}></h1>
-<h5><{$welcomeuser}></h5>
-<div class="txtcenter"><a href="banners.php?op=logout" title="<{$smarty.const._BANNERS_LOGOUT}>"><{$smarty.const._BANNERS_LOGOUT}></a></div>
-<h4 class="content_title"><{$smarty.const._BANNERS_TITLE}></h4>
-<table cellpadding="2" cellspacing="1" summary="" class="outer">
- <tr class="txtcenter">
- <th><{$smarty.const._BANNERS_NO}></th>
- <th><{$smarty.const._BANNERS_IMP_MADE}></th>
- <th><{$smarty.const._BANNERS_IMP_TOTAL}></th>
- <th><{$smarty.const._BANNERS_IMP_LEFT}></th>
- <th><{$smarty.const._BANNERS_CLICKS}></th>
- <th><{$smarty.const._BANNERS_PER_CLICKS}></th>
- <th><{$smarty.const._BANNERS_FUNCTIONS}></th>
- </tr>
- <{if $bcount}>
- <{foreach item=banner from=$banners}>
- <tr class="even txtcenter">
- <td><{$banner.bid}></td>
- <td><{$banner.impmade}></td>
- <td><{$banner.imptotal}></td>
- <td><{$banner.left}></td>
- <td><{$banner.clicks}></td>
- <td><{$banner.percent}>%</td>
- <td>
- <a href="banners.php?op=banner_email&cid=<{$banner.cid}>&bid=<{$banner.bid}>" title="<{$smarty.const._BANNERS_STATS}>"><{$smarty.const._BANNERS_STATS}></a>
- <a href="banners.php?op=banner_display&cid=<{$banner.cid}>" title="<{$banner.bid}>"><{$smarty.const._BANNERS_SHOWBANNER}></a>
- </td>
- </tr>
- <{/foreach}>
- <{else}>
- <tr>
- <td class="even txtcenter" colspan="7"><{$smarty.const._BANNERS_NOTHINGFOUND}></td>
- </tr>
- <{/if}>
- <tr>
- <td class="head" colspan="7"> </td>
- </tr>
-</table><br /><br />
-
-<h4 class="content_title"><{$smarty.const._BANNERS_FINISHED}></h4>
-
-<table cellpadding="2" cellspacing="1" summary="" class="outer">
- <tr class="txtcenter">
- <th><{$smarty.const._BANNERS_NO}></th>
- <th><{$smarty.const._BANNERS_IMP_MADE}></th>
- <th><{$smarty.const._BANNERS_CLICKS}></th>
- <th><{$smarty.const._BANNERS_PER_CLICKS}></th>
- <th><{$smarty.const._BANNERS_STARTED}></th>
- <th><{$smarty.const._BANNERS_ENDED}></th>
- </tr>
- <{if $bcount}>
- <{foreach item=ebanner from=$ebanners}>
- <tr class="even txtcenter">
- <td><{$ebanner.bid}></td>
- <td><{$ebanner.impressions}></td>
- <td><{$ebanner.clicks}></td>
- <td><{$ebanner.percent}></td>
- <td><{$ebanner.datestart}></td>
- <td><{$ebanner.dateend}>%</td>
- </tr>
- <{/foreach}>
- <{else}>
- <tr>
- <td class="even txtcenter" colspan="7"><{$smarty.const._BANNERS_NOTHINGFOUND}></td>
- </tr>
- <{/if}>
- <tr>
- <td class="head" colspan="7"> </td>
- </tr>
-</table><br />
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_bannerdisplay.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_bannerdisplay.html 2012-04-27 21:33:42 UTC (rev 9390)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_bannerdisplay.html 2012-04-27 21:41:52 UTC (rev 9391)
@@ -1,35 +0,0 @@
-<h1><{$smarty.const._BANNERS_MANAGEMENT}></h1>
-<h5><{$welcomeuser}></h5>
-<div class="txtcenter"><a href="banners.php?op=logout" title="<{$smarty.const._BANNERS_LOGOUT}>"><{$smarty.const._BANNERS_LOGOUT}></a></div>
-<div class="txtcenter"><a href="banners.php?op=list" title="<{$smarty.const._BANNERS_BACK}>"><{$smarty.const._BANNERS_BACK}></a></div>
-<div><{$banneractive}></div><br />
-<{if $count}>
- <{foreach item=banner from=$banners}>
- <form action="banners.php" method="post">
- <table cellspacing="1" class="outer width100">
- <th colspan="2"><{$smarty.const._BANNERS_ID}> <{$banner.bid}></th>
- <tr>
- <td class="head width50">
- <div><{$banner.sendstats}></div>
- <div><{$banner.bannerpoints}></div>
- <{if !$banner.htmlbanner}>
- <div></div>
- <div><{$smarty.const._BANNERS_URL}>
- <input type="text" name="url" size="50" maxlength="200" value="<{$banner.clickurl}>" />
- <input type="hidden" name="bid" value="<{$banner.bid}>" />
- <input type="hidden" name="cid" value="<{$banner.cid}>" />
- <input type="submit" name="op" value="save" />
- <{$TOKEN}>
- </div>
- <{/if}>
- </td>
- <td class="even txtcenter"><{$banner.banner_url}></td>
- </tr>
- <tr>
- <td class="head" colspan="2"> </td>
- </tr>
- </table>
- <br />
- </form>
- <{/foreach}>
-<{/if}>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_bannerlogin.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_bannerlogin.html 2012-04-27 21:33:42 UTC (rev 9390)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_bannerlogin.html 2012-04-27 21:41:52 UTC (rev 9391)
@@ -1,16 +0,0 @@
-<div id="login_window">
-<h2 class='content_title'><{$smarty.const._BANNERS_LOGIN_TITLE}></h2>
-<form method='post' action='banners.php' class='login_form'>
- <div class='credentials'>
- <label for='login_form-login'><{$smarty.const._BANNERS_LOGIN_LOGIN}></label>
- <input type='text' name='login' id='login_form-login' value='' /><br />
- <label for='login_form-password'><{$smarty.const._BANNERS_LOGIN_PASS}></label>
- <input type='password' name='pass' id='login_form-password' value='' /><br />
- </div>
- <div class='actions'>
- <input type='hidden' name='op' value='list' />
- <button type='submit'><{$smarty.const._BANNERS_LOGIN_OK}></button></div>
- <div class='login_info'><{$smarty.const._BANNERS_LOGIN_INFO}></div>
- <{$TOKEN}>
-</form>
-</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php 2012-04-27 21:33:42 UTC (rev 9390)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php 2012-04-27 21:41:52 UTC (rev 9391)
@@ -75,9 +75,6 @@
$modversion['templates'][] = array('file' => 'system_notification_select.html', 'description' => '');
$modversion['templates'][] = array('file' => 'system_block_dummy.html', 'description' => '');
$modversion['templates'][] = array('file' => 'system_homepage.html', 'description' => '');
-$modversion['templates'][] = array('file' => 'system_bannerlogin.html', 'description' => '');
-$modversion['templates'][] = array('file' => 'system_banner.html', 'description' => '');
-$modversion['templates'][] = array('file' => 'system_bannerdisplay.html', 'description' => '');
// Admin Templates
/*$modversion['templates'][] = array('file' => 'system_header.html', 'description' => '', 'type' => 'admin');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-04-29 17:01:45
|
Revision: 9406
http://xoops.svn.sourceforge.net/xoops/?rev=9406&view=rev
Author: mageg
Date: 2012-04-29 17:01:39 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Fixed errors with bootstrap 2.0
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/maintenance.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/admin.css
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/theme.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/menu.html
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/maintenance.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/maintenance.php 2012-04-29 16:58:43 UTC (rev 9405)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/maintenance.php 2012-04-29 17:01:39 UTC (rev 9406)
@@ -38,7 +38,7 @@
public function getMaintenance()
{
$maintenance = new SystemMaintenance();
- parent::__construct(_AM_SYSTEM_MAINTENANCE, "maintenance_save", "admin.php", 'post', true);
+ parent::__construct(_AM_SYSTEM_MAINTENANCE, "form_maintenance", "admin.php", 'post', true);
$cache = new XoopsFormSelect(_AM_SYSTEM_MAINTENANCE_CACHE, "cache", '', 3, true);
$cache->setDescription(XOOPS_VAR_PATH . "/cache/smarty_cache/<br />" . XOOPS_VAR_PATH . "/cache/smarty_compile/<br />" . XOOPS_VAR_PATH . "/cache/xoops_cache/");
@@ -50,13 +50,12 @@
$this->addElement(new XoopsFormRadioYN(_AM_SYSTEM_MAINTENANCE_SESSION, 'session', '', _YES, _NO));
- $tables_tray = new XoopsFormElementTray(_AM_SYSTEM_MAINTENANCE_TABLES, '');
+ $tables_tray = new XoopsFormElementTray(_AM_SYSTEM_MAINTENANCE_TABLES, ' ');
$tables_tray->setDescription(_AM_SYSTEM_MAINTENANCE_TABLES_DESC);
$select_tables = new XoopsFormSelect('', "tables", '', 7, true);
$select_tables->addOptionArray($maintenance->displayTables(true));
$tables_tray->addElement($select_tables, false);
- $tables_tray->addElement(new xoopsFormLabel(' ' . _AM_SYSTEM_MAINTENANCE_DUMP_AND . ' '));
- $choice = new XoopsFormSelect(' ', "maintenance", '', 4, true);
+ $choice = new XoopsFormSelect(' ' . _AM_SYSTEM_MAINTENANCE_DUMP_AND . ' ', "maintenance", '', 4, true);
$options = array(
'1' => _AM_SYSTEM_MAINTENANCE_CHOICE1, '2' => _AM_SYSTEM_MAINTENANCE_CHOICE2,
'3' => _AM_SYSTEM_MAINTENANCE_CHOICE3, '4' => _AM_SYSTEM_MAINTENANCE_CHOICE4
@@ -77,15 +76,13 @@
{
$xoops = Xoops::getInstance();
$maintenance = new SystemMaintenance();
- parent::__construct(_AM_SYSTEM_MAINTENANCE_DUMP, "dump_save", "admin.php?fct=maintenance", 'post', true);
+ parent::__construct(_AM_SYSTEM_MAINTENANCE_DUMP, "form_dump", "admin.php?fct=maintenance", 'post', true);
$dump_tray = new XoopsFormElementTray(_AM_SYSTEM_MAINTENANCE_DUMP_TABLES_OR_MODULES, '');
$select_tables1 = new XoopsFormSelect('', "dump_tables", '', 7, true);
$select_tables1->addOptionArray($maintenance->displayTables(true));
$dump_tray->addElement($select_tables1, false);
-
- $dump_tray->addElement(new xoopsFormLabel(' ' . _AM_SYSTEM_MAINTENANCE_DUMP_OR . ' '));
- $ele = new XoopsFormSelect(' ', 'dump_modules', '', 7, true);
+ $ele = new XoopsFormSelect(' ' . _AM_SYSTEM_MAINTENANCE_DUMP_OR . ' ', 'dump_modules', '', 7, true);
/* @var $module_handler XoopsModuleHandler */
$module_handler = $xoops->getHandlerModule();
$criteria = new CriteriaCompo(new Criteria('hasmain', 1));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/admin.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/admin.css 2012-04-29 16:58:43 UTC (rev 9405)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/admin.css 2012-04-29 17:01:39 UTC (rev 9406)
@@ -228,7 +228,7 @@
.ui-corner-all { -moz-border-radius: 5px; -webkit-border-radius: 5px; }
/*==================== tooltip =========================*/
-#tooltip {
+#tooltip{
position: absolute;
border: 1px solid #A4C3EF;
border-radius: 3px;
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-04-29 16:58:43 UTC (rev 9405)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/admin_index.html 2012-04-29 17:01:39 UTC (rev 9406)
@@ -1,6 +1,6 @@
<div class="xo-moduleadmin-icon outer">
<div class="xo-window">
- <div class="xo-window-title"><span class="icon icon-lightning"></span> <{$smarty.const._AM_SYSTEM_LINKS}></div>
+ <div class="xo-window-title"><span class="ico ico-lightning"></span> <{$smarty.const._AM_SYSTEM_LINKS}></div>
<div class="xo-window-data">
<div class="moduleadmin-icon">
<{foreach item=menu from=$xo_admin_index_menu}>
@@ -18,7 +18,7 @@
<div class="xo-moduleadmin-config outer">
<div class="xo-window">
<div class="xo-window-title">
- <span class="icon icon-computer"></span> <{$smarty.const._AM_MODULEADMIN_CONFIG}>
+ <span class="ico ico-computer"></span> <{$smarty.const._AM_MODULEADMIN_CONFIG}>
<a class="down" href="javascript:;"> </a>
</div>
<div class="xo-window-data">
@@ -26,11 +26,11 @@
<{foreach item=config from=$xo_admin_index_config}>
<{if $config.type == 'error'}>
<li class="red">
- <span class="icon icon-cross"></span> <{$config.text}>
+ <span class="ico ico-cross"></span> <{$config.text}>
</li>
<{else}>
<li class="green">
- <span class="icon icon-tick"></span> <{$config.text}>
+ <span class="ico ico-tick"></span> <{$config.text}>
</li>
<{/if}>
<{/foreach}>
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-04-29 16:58:43 UTC (rev 9405)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/css/style.css 2012-04-29 17:01:39 UTC (rev 9406)
@@ -154,7 +154,7 @@
table.outer th, table.outer td {
padding: 8px 8px 6px;
line-height: 18px;
- text-align: left;
+ /*text-align: left;*/
}
table.outer thead {
background-color: #222222;
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-04-29 16:58:43 UTC (rev 9405)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php 2012-04-29 17:01:39 UTC (rev 9406)
@@ -88,7 +88,7 @@
$mod_options[$item]['link'] = empty($mod_options[$item]['absolute'])
? XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['link'] : $mod_options[$item]['link'];
$mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? ''
- : XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['icon'];
+ : XOOPS_URL . "/media/xoops/images/icons/32/" . $mod_options[$item]['icon'];
}
}
$xoops->tpl->assign('mod_options', $mod_options);
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-04-29 16:58:43 UTC (rev 9405)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/theme.html 2012-04-29 17:01:39 UTC (rev 9406)
@@ -35,7 +35,7 @@
<div class="card-icons outer">
<div class="xo-window">
- <div class="xo-window-title"><span class="icon icon-wrench-5"></span> <{$smarty.const._DEFAULT_CPHOME}></div>
+ <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}>
@@ -60,7 +60,7 @@
<div class="outer">
<div class="xo-window">
<div class="xo-window-title">
- <span class="icon icon-box"></span> <{$smarty.const._DEFAULT_INSTALLEDMODULES}>
+ <span class="ico ico-box"></span> <{$smarty.const._DEFAULT_INSTALLEDMODULES}>
<a class="down" href="javascript:;"> </a>
</div>
<div class="xo-window-data">
@@ -82,7 +82,7 @@
<div class="outer">
<div class="xo-window">
<div class="xo-window-title">
- <span class="icon icon-plugin"></span> <{$smarty.const._DEFAULT_INSTALLEDPLUGINS}>
+ <span class="ico ico-plugin"></span> <{$smarty.const._DEFAULT_INSTALLEDPLUGINS}>
<a class="down" href="javascript:;"> </a>
</div>
<div class="xo-window-data">
@@ -110,7 +110,7 @@
<{/if}>
</div>
</div>
- <div center>
+ <div class="center">
<a href="<{$xoops_url}>/modules/system/testform.php">Test new form</a>
</div>
<div class="footer">
@@ -120,8 +120,8 @@
</p>
<!--{xo-logger-output}-->
</div>
+ <script type="text/javascript">
+ ddsmoothmenu.init({mainmenuid: "xo-menu-modules", orientation: 'h', classname: 'ddsmoothmenu', contentsource: "markup"})
+ </script>
</body>
- <script type="text/javascript">
- ddsmoothmenu.init({mainmenuid: "xo-menu-modules", orientation: 'h', classname: 'ddsmoothmenu', contentsource: "markup"})
- </script>
</html>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/menu.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/menu.html 2012-04-29 16:58:43 UTC (rev 9405)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/menu.html 2012-04-29 17:01:39 UTC (rev 9406)
@@ -55,13 +55,13 @@
<li>
<a href="<{$pref->getInfo(link_pref)}>" title="<{$pref->getVar(name)}>"><{$pref->getVar(name)}></a>
<ul class="dropdown-menu">
- <li><a href="<{xoAppUrl modules/system/admin.php?fct=preferences&op=show&confcat_id=1}>"><{$smarty.const._DEFAULT_GENERAL}></a></li>
- <li><a href="<{xoAppUrl modules/system/admin.php?fct=preferences&op=show&confcat_id=2}>"><{$smarty.const._DEFAULT_USERSETTINGS}></a></li>
- <li><a href="<{xoAppUrl modules/system/admin.php?fct=preferences&op=show&confcat_id=3}>"><{$smarty.const._DEFAULT_METAFOOTER}></a></li>
- <li><a href="<{xoAppUrl modules/system/admin.php?fct=preferences&op=show&confcat_id=4}>"><{$smarty.const._DEFAULT_CENSOR}></a></li>
- <li><a href="<{xoAppUrl modules/system/admin.php?fct=preferences&op=show&confcat_id=5}>"><{$smarty.const._DEFAULT_SEARCH}></a></li>
- <li><a href="<{xoAppUrl modules/system/admin.php?fct=preferences&op=show&confcat_id=6}>"><{$smarty.const._DEFAULT_MAILER}></a></li>
- <li><a href="<{xoAppUrl modules/system/admin.php?fct=preferences&op=show&confcat_id=7}>"><{$smarty.const._DEFAULT_AUTHENTICATION}></a></li>
+ <li><a href="<{xoAppUrl modules/system/admin.php?fct=preferences&op=show&confcat_id=1}>"><{$smarty.const._DEFAULT_GENERAL}></a></li>
+ <li><a href="<{xoAppUrl modules/system/admin.php?fct=preferences&op=show&confcat_id=2}>"><{$smarty.const._DEFAULT_USERSETTINGS}></a></li>
+ <li><a href="<{xoAppUrl modules/system/admin.php?fct=preferences&op=show&confcat_id=3}>"><{$smarty.const._DEFAULT_METAFOOTER}></a></li>
+ <li><a href="<{xoAppUrl modules/system/admin.php?fct=preferences&op=show&confcat_id=4}>"><{$smarty.const._DEFAULT_CENSOR}></a></li>
+ <li><a href="<{xoAppUrl modules/system/admin.php?fct=preferences&op=show&confcat_id=5}>"><{$smarty.const._DEFAULT_SEARCH}></a></li>
+ <li><a href="<{xoAppUrl modules/system/admin.php?fct=preferences&op=show&confcat_id=6}>"><{$smarty.const._DEFAULT_MAILER}></a></li>
+ <li><a href="<{xoAppUrl modules/system/admin.php?fct=preferences&op=show&confcat_id=7}>"><{$smarty.const._DEFAULT_AUTHENTICATION}></a></li>
</ul>
</li>
<{/if}>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-04-29 19:52:17
|
Revision: 9408
http://xoops.svn.sourceforge.net/xoops/?rev=9408&view=rev
Author: mageg
Date: 2012-04-29 19:52:09 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Display change to the help section
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/help.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/help.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/blocksadmin.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/comments.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/groups.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/help_center.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/images.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/mailusers.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/maintenance.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/module_index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/modulesadmin.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/preferences.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/tplsets.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/users.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_help.html
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/plugins.html
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/smilies.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/userrank.html
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/help.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/help.css 2012-04-29 17:05:07 UTC (rev 9407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/help.css 2012-04-29 19:52:09 UTC (rev 9408)
@@ -30,4 +30,9 @@
font-style: 12px;
font-weight: bold;
+}
+
+.system-help {
+ float: left;
+ width: 100%;
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/help.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/help.php 2012-04-29 17:05:07 UTC (rev 9407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/help.php 2012-04-29 19:52:09 UTC (rev 9408)
@@ -74,10 +74,12 @@
}
$xoops->tpl->assign('modname', $module->getVar('name'));
+ $xoops->tpl->assign('moddirname', $module->getVar('dirname', 'e'));
if ($page != '') {
// Call template
if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.html')) {
+
$helpcontent = $xoops->tpl->fetch(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.html');
} else {
if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.html')) {
@@ -86,15 +88,16 @@
$xoops->tpl->assign('load_error', 1);
}
}
-
+ if ($module->getVar('dirname', 'e') != 'system') {
+ $xoops->tpl->assign('help_module', true);
+ }
$xoops->tpl->assign('helpcontent', $helpcontent);
} else {
if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoops->getConfig('language') . '/help/module_index.html')) {
$helpcontent = $xoops->tpl->fetch(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoops->getConfig('language') . '/help/module_index.html');
} else {
- $helpcontent = $module->getInfo('description');
- $helpcontent = '<div id="non-modhelp">' . $helpcontent . '</div>';
+ $helpcontent = '<p>' . $module->getInfo('description') . '</p>';
}
$xoops->tpl->assign('helpcontent', $helpcontent);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/blocksadmin.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/blocksadmin.html 2012-04-29 17:05:07 UTC (rev 9407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/blocksadmin.html 2012-04-29 19:52:09 UTC (rev 9408)
@@ -1,8 +1,7 @@
-<div id="help-template" class="outer">
-<h1 class="head">Help: Blocks</h1>
+<h1>Help: Blocks</h1>
-<h4 class="odd">Description</h4>
-<p class="even">
+<h4>Description</h4>
+<p>
Blocks are discreet sections of content that can be created and configured in the admin interface. Custom blocks can be created and are typically made up of text, graphics and pictures. The content in these blocks may be formatted individually or inherit the site formatting. Blocks may also be part of a modules display output. The blocks administration page is where all blocks are configured and administered. <br /><br />
Blocks are like a newspapers' front page: they are teasers that incite readers to read more complete stories in the inside pages. Blocks offer small bits of dynamic content with links to the actual content stored in the module.<br /><br />
@@ -12,6 +11,4 @@
Every module that is installed in a XOOPS site registers its blocks in the system, and the webmaster can decide where it will be shown, in what part of the page it'll appear and what kind of relevance, weight or position will it have. The site administrator can also edit the block's label and, if knowledgeable enough, can even edit the template that underlies the block's presentation.
-</p>
-
-</div>
+</p>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/comments.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/comments.html 2012-04-29 17:05:07 UTC (rev 9407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/comments.html 2012-04-29 19:52:09 UTC (rev 9408)
@@ -1,8 +1,7 @@
-<div id="help-template" class="outer">
-<h1 class="head">Help: Comments</h1>
+<h1>Help: Comments</h1>
-<h4 class="odd">Description</h4>
-<p class="even">
+<h4>Description</h4>
+<p>
Site administrators have the option of providing a comments section for users. Comments can be added to many modules and displayed in a variety of ways. Comments can be screened, filtered, and made available to selected groups. This provides quick easy interaction from site users, while maintaining good moderation and security.<br /><br />
The Comment Manager allows the Site administrator to edit and delete any comment that has been posted to the site, originating in any module that supports the comments feature.
@@ -10,6 +9,4 @@
You can also select several comments and delete them at once.
-</p>
-
-</div>
+</p>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/groups.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/groups.html 2012-04-29 17:05:07 UTC (rev 9407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/groups.html 2012-04-29 19:52:09 UTC (rev 9408)
@@ -1,8 +1,7 @@
-<div id="help-template" class="outer">
-<h1 class="head">Help: Groups</h1>
+<h1>Help: Groups</h1>
-<h4 class="odd">Description</h4>
-<p class="even">
+<h4">Description</h4>
+<p>
XOOPS incorporates a member registration system - you can optionally require people to sign up to your site in order to have access to certain areas or functions. For example, most sites require people to join before they are allowed to contribute news or post messages in the forums
Access and administration rights to a XOOPS website are set through a flexible permission system based on 'user groups'. The default groups include anonymous users, registered members and webmasters, but of course you can define as many groups as you need to manage your site. Each group can be given a unique set of access rights governing:<br /><br />
@@ -15,6 +14,4 @@
Custom groups can also be created through the groups administration page.
-</p>
-
-</div>
+</p>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/help_center.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/help_center.html 2012-04-29 17:05:07 UTC (rev 9407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/help_center.html 2012-04-29 19:52:09 UTC (rev 9408)
@@ -1,17 +1,13 @@
-<div id="help-template" class="outer">
+<h2>Welcome to: XOOPS Help center</h2>
-<h2 class="head">Welcome to: XOOPS Help center</h2>
+<h4>How do I use XOOPS?</h4>
+<p>XOOPS is a web application platform written in PHP for the MySQL database. Its object orientation makes it an ideal tool for developing small or large community websites, intra company and corporate portals, weblogs and much more. In order to use XOOPS effectively, you need to install modules that provide the functionality that you're looking for. There are many different modules in <a href="http://www.xoops.org/modules/repository/" rel="external" title="Module Repository">Module Repository</a>, from calendars, photo galleries, through news, bulletin boards, to weather updates.</p>
-<h4 class="odd">How do I use XOOPS?</h4>
-<p class="even">XOOPS is a web application platform written in PHP for the MySQL database. Its object orientation makes it an ideal tool for developing small or large community websites, intra company and corporate portals, weblogs and much more. In order to use XOOPS effectively, you need to install modules that provide the functionality that you're looking for. There are many different modules in <a href="http://www.xoops.org/modules/repository/" rel="external" title="Module Repository">Module Repository</a>, from calendars, photo galleries, through news, bulletin boards, to weather updates.</p>
+<h4>How do I use the Help Center?</h4>
+<p>The Help Center is to provide you with basic information related to individual features of the Administration. Whenever you would like to know more about particular page you are on, just click the help icon in the right hand corner</p>
-<h4 class="odd">How do I use the Help Center?</h4>
-<p class="even">The Help Center is to provide you with basic information related to individual features of the Administration. Whenever you would like to know more about particular page you are on, just click the help icon in the right hand corner</p>
+<h4>How I can create content in XOOPS?</h4>
+<p>You'll need a module for it. This could be a News module, or a Content module. </p>
-<h4 class="odd">How I can create content in XOOPS?</h4>
-<p class="even">You'll need a module for it. This could be a News module, or a Content module. </p>
-
-<h4 class="odd">How I can get more help?</h4>
-<p class="even">Please visit our Support Forums at: <a href="http://www.xoops.org/modules/newbb" rel="external" title="Forum">http://www.xoops.org/modules/newbb</a> </p>
-
-</div>
\ No newline at end of file
+<h4>How I can get more help?</h4>
+<p>Please visit our Support Forums at: <a href="http://www.xoops.org/modules/newbb" rel="external" title="Forum">http://www.xoops.org/modules/newbb</a> </p>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/images.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/images.html 2012-04-29 17:05:07 UTC (rev 9407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/images.html 2012-04-29 19:52:09 UTC (rev 9408)
@@ -1,13 +1,9 @@
-<div id="help-template" class="outer">
-<h1 class="head">Help: Image Manager</h1>
+<h1>Help: Image Manager</h1>
-<h4 class="odd">Description</h4>
-<p class="even">
+<h4>Description</h4>
+<p>
The Image Manager is a tool that enables people to upload, organize and retrieve images for use throughout the site. You must configure the image manager before you can use it - this involves creating some categories to store your images and setting preferences on issues such as maximum image dimensions, file size and user group access rights. Each category is configured separately.<br /><br />
Images can be categorized and uploaded directly into the images manager through a browser in this window with one click of a button, enabling easy insertion of images into news articles and other content. There is an extensive permission system controlling image dimensions, file size and access of user groups to different categories.
-</p>
-
-</div>
-
+</p>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/mailusers.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/mailusers.html 2012-04-29 17:05:07 UTC (rev 9407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/mailusers.html 2012-04-29 19:52:09 UTC (rev 9408)
@@ -1,12 +1,8 @@
-<div id="help-template" class="outer">
-<h1 class="head">Help: Mail Users</h1>
-<h4 class="odd">Description</h4>
+<h1>Help: Mail Users</h1>
+<h4>Description</h4>
-<p class="even">
+<p>
XOOPS has a built in messaging system that enables you to send a message to your entire registered user base or subgroups thereof, or using date filters. This can be in the form of a private message (i.e. through the XOOPS built-in messaging system) or through an email. A range of options is available for filtering out subgroups of users from your membership.<br /><br />
You can also use predefined tags that will enable you to personalize your message.
-</p>
-
-</div>
-
+</p>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/maintenance.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/maintenance.html 2012-04-29 17:05:07 UTC (rev 9407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/maintenance.html 2012-04-29 19:52:09 UTC (rev 9408)
@@ -1,9 +1,7 @@
-<div id="help-template" class="outer">
+<h1>Help: Maintenance</h1>
+<h4>Description</h4>
-<h1 class="head">Help: Maintenance</h1>
-<h4 class="odd">Description</h4>
-
-<p class="even">
+<p>
Maintenance provides several basic functions to help you in mantaining your XOOPS installation and keep it healthy:<br /><br />
- clean cache folder<br />
@@ -11,5 +9,4 @@
- perform maintenance of the database tables (analyze, check, optimize, and repair) <br /><br />
You can also perform a "Dump" of the whole database or individual tables for backup purposes.
-
-</div>
\ No newline at end of file
+</p>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/module_index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/module_index.html 2012-04-29 17:05:07 UTC (rev 9407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/module_index.html 2012-04-29 19:52:09 UTC (rev 9408)
@@ -1,7 +1,3 @@
-<div id="help-template" class="outer">
-
-<h2 class="head">Welcom to: System module</h2>
-<h4 class="odd">Description</h4>
-<p class="even">For administration of core settings of the site.</p>
-
-</div>
\ No newline at end of file
+<h2>Welcom to: System module</h2>
+<h4>Description</h4>
+<p>For administration of core settings of the site.</p>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/modulesadmin.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/modulesadmin.html 2012-04-29 17:05:07 UTC (rev 9407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/modulesadmin.html 2012-04-29 19:52:09 UTC (rev 9408)
@@ -1,8 +1,7 @@
-<div id="help-template" class="outer">
-<h1 class="head">Help: Modules</h1>
+<h1>Help: Modules</h1>
-<h4 class="odd">Description</h4>
-<p class="even">
+<h4 >Description</h4>
+<p>
Modules are the software constructs that, taking advantage of the infrastructure that XOOPS provides, let the webmaster offer the site’s users dynamic or static content generated using a Web interface that more often that not is very easy to use.<br /><br />
Part of the power of XOOPS resides in the way modules are managed. The webmaster can easily install, uninstall, activate or deactivate any specific module (except the System module, for obvious reasons). It’s also possible to rename modules, and to determine the order in which they will appear to the end user in the site’s menu –if you want them to appear at all–, because you can also provide hidden functionality, defining active modules that have no visible presence to the casual user. For instance, you could define a module as not visible in the menu by disabling the check icon in the Menu column. So for the News module, you could then send a private messages to selected group of your users and tell them to access that directory typing the address in the URL field, something like <em>http://www.yoursite.com/modules/news</em>. <br /><br />
@@ -12,6 +11,4 @@
Module installation needs some planning, both for the modules to be displayed and also the layout on the pages. It is a good idea to review other XOOPS sites and see which modules are used to display various types of content. This is easily done by opening any XOOPS site and hovering over the menu links on the left and right hand side panels. At the same time look at the URLs displayed in the status bar on your browser. You should see addresses like this: http://the_site.com/modules/news/.... All modules are stored in the /modules/ directory, thus the following sector of the address (in this example 'news') shows the module that will display contents of that menu link. <br /><br />
If you open the page for the link it will show an example of how the module is used and the type of content it displays. Reviewing other sites like this will also give you some good insight into layout and design capabilities.
-</p>
-
-</div>
+</p>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/plugins.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/plugins.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/plugins.html 2012-04-29 19:52:09 UTC (rev 9408)
@@ -0,0 +1,8 @@
+<h1 class="head">Help: Plugins</h1>
+
+<h4>Description</h4>
+<p>
+
+Empty...
+
+</p>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/preferences.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/preferences.html 2012-04-29 17:05:07 UTC (rev 9407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/preferences.html 2012-04-29 19:52:09 UTC (rev 9408)
@@ -1,18 +1,16 @@
-<div id="help-template" class="outer">
+<h1>Help: Preferences</h1>
+<h4>Description</h4>
-<h1 class="head">Help: Preferences</h1>
-<h4 class="odd">Description</h4>
-
-<p class="even">
+<p>
The preference panels are where you configure your site-wide preferences. It is worth taking the time to work through them as some settings can have a significant impact on the performance, security and ease of use of your site.
</p>
-<h4 class="odd">General Settings</h4>
-<p class="even">
+<h4>General Settings</h4>
+<p>
These are the most important and most frequently accessed preferences. You will set the Site name and the Slogan for your Website. You'll also select the default Theme and Admin GUI. And if you need to work on your Website, you can close it for all users. You can also set Module-wide Cache times.
</p>
-<h4 class="odd">Meta Tags and Footer</h4>
-<p class="even">
+<h4>Meta Tags and Footer</h4>
+<p>
Meta tags provide information about your information – they describe the nature of your website. Their main use is to help search engines and their robots to index your website correctly, i.e. to help the right people find it. The information you supply is included in the header of each webpage. It should represent the content of the site as a whole - the meta information is the same on every page, it currently cannot be customised for different modules or pages.<br /><br />
Be aware that the major search engines use different strategies for indexing websites. They may place different weightings on meta tags or even ignore them completely. Careful use of meta information may help your website to gain better search engine rankings and it is useful to seek information on the indexing strategies of your dominant referrers (see your website logfile). This may help you to optimise your meta information or other aspects of your site design and content to improve your rankings. <br /><br />
@@ -21,16 +19,16 @@
</p>
-<h4 class="odd">Word Censoring Options</h4>
-<p class="even">
+<h4>Word Censoring Options</h4>
+<p>
XOOPS can automatically censor undesirable words that may be posted by visitors to your site and replace them with a generic, alternative term of your choice. The censorship function does consume some system resources and may slow your site somewhat. It is disabled by default.<br /><br />
To implement censorship on your site select the ‘<em>enable</em>’ radio button. You need to enter a list of unwanted words in the ‘<em>words to censor</em>’ box, separating them with the pipe character. This function is case insensitive. Enter a suitable replacement term in the ‘<em>replace bad words with</em>’ box. The default is #OOPS#.
</p>
-<h4 class="odd">Search Options</h4>
-<p class="even">
+<h4>Search Options</h4>
+<p>
The search facility is one of the most important tools for locating information in a portal website. The XOOPS search categorises results by module – records are identified as news items, downloads, links or other types as per the modules you have installed. <br /><br />
Global searches of all resources on your site are enabled by default. If you disable global searches this facility will no longer be available and the search block will become non-functional.
@@ -40,21 +38,19 @@
</p>
-<h4 class="odd">Mail Setup</h4>
-<p class="even">
+<h4>Mail Setup</h4>
+<p>
This section of the control panel is used to configure your email for the system. It is recommended that you leave the Mail Delivery Method on the default setting “PHP (mail)”. You do not need to fill in the Sendmail or SMTP fields unless you use an alternative mail delivery option.
</p>
-<h4 class="odd">Authentication Options</h4>
-<p class="even">
+<h4>Authentication Options</h4>
+<p>
Just leave it at Xoops Database and you can ignore all the other options in there.<br /><br />
LDAP or Microsoft Active directory servers have been added for authentification as an alternate to the normal Xoops users. The reason is that in many company you already have a user database in ADS or LDAP and they can use that to logon to Xoops and don´t have to register yet another account.
</p>
-<h4 class="odd">System Module Settings</h4>
-<p class="even">
+<h4>System Module Settings</h4>
+<p>
Here you can activate/deactivate each of the System sections, as well as specify system-wide defaults, e.g. for number of displayed avatars or images per page. You can also select a default editor for blocks, comments, and for all modules.
-</p>
-
-</div>
\ No newline at end of file
+</p>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/smilies.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/smilies.html 2012-04-29 17:05:07 UTC (rev 9407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/smilies.html 2012-04-29 19:52:09 UTC (rev 9408)
@@ -1,14 +0,0 @@
-<div id="help-template" class="outer">
-<h1 class="head">Help: Smilies</h1>
-
-<h4 class="odd">Description</h4>
-<p class="even">
-Smiles are little graphic symbols that people can use to express themselves. They can be inserted anywhere in the text of an article, comment or post from both the user and admin sides of the system. XOOPS ships with a collection of 17 smilies built in. Some of these are displayed on the submission forms in various modules (including forums, news, downloads, links and others). Clicking on a smilie will insert it into the post. Smilies can also be inserted by typing in their unique ‘codes’ (keyboard shortcuts), for example typing ':' '-' 'D' in a post will insert this smilie: <img src="http://www.xoops.org/uploads/smil42e7a3d4c7b9f.gif" alt=""/> <br /><br />
-
-The full list of smilies available on your system and their codes is accessible through the Smilies, which is where you're now. Here you can add, edit and delete smilies, and control which are displayed on submission forms (only nine of the 17 are displayed by default)<br /><br />
-
-If you don’t want smilies on your system, you can either uncheck the “display in form?” box (in which case they won’t appear on submission forms, but will still be available via their codes), or use the delete link to remove them entirely.
-</p>
-
-</div>
-
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/tplsets.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/tplsets.html 2012-04-29 17:05:07 UTC (rev 9407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/tplsets.html 2012-04-29 19:52:09 UTC (rev 9408)
@@ -1,8 +1,7 @@
-<div id="help-template" class="outer">
-<h1 class="head">Help: Templates</h1>
+<h1>Help: Templates</h1>
-<h4 class="odd">Description</h4>
-<p class="even">
+<h4>Description</h4>
+<p>
XOOPS allows for some separation between the actual presentation of the site (the “<em>skin</em>” or user interface) and the code that runs in the back. The first one is handled by a sophisticated mechanism based on graphical themes. A theme may include, in its basic form, the essential HTML templates that define the visual interface of the site, as well as the style sheets and images needed to complement that visual interface. Themes are switchable in the administrative interface, so changing the whole appearance of a XOOPS site it’s just a matter of changing the value of a selector and clicking on “Accept”. XOOPS also provides site administrators with the ability to let users choose among some available themes.<br /><br />
Generally speaking, a <strong><em>theme</em></strong> is the high level visual framework of a site: the theme defines, for instance, the general layout of the site; on the other hand, it does not usually define the specific distribution of content within a block. This is handled by a different entity called a <em><strong>template set</strong></em>. A template set<em> </em>is an ensemble of HTML templates that define the presentation of content within all the blocks that form a XOOPS Web site. If we want a more clear metaphor for this, we could say that the theme is like the architect of a house, while the template set is like the interiors decorator. The first one sets the walls and defines the general distribution, but it’s the second one who’s in charge of “<em>dressing</em>” those walls.<br /><br />
@@ -13,18 +12,16 @@
<strong><a rel="external" href="http://www.smarty.net/">Smarty</a></strong> that makes the function of what used to be called
<em><strong>variable interpolation</strong></em>. Expressed in a simple way, we could say that the XOOPS system uses PHP files to hold the logic of the modules (access to the database, allocation of variables, management of rights...), HTML files with Smarty variables inserted to manage the actual visual interface, and the Smarty engine to insert values and strings in specific places within the HTML that builds the pages seen by the end user. All in all, what this means to you can be easily summarized: thanks to its theming system, XOOPS lets site designers build more interesting and visually stunning sites without much concern about what happens under the hood.
-<h4 class="odd">Cloning and downloading template sets</h4>
-<p class="even">
+<h4>Cloning and downloading template sets</h4>
+<p>
If you would like to create a custom template set you can make a copy of the default set (or any other) by selecting the ‘<em>clone</em>’ link (you will be prompted to give the new set a name). Unlike the default, other template sets can be freely edited. You can also save a copy of a template set to disk by selecting the ‘<em>download</em>’ link, or remove it with the ‘<em>delete</em>’ link. You may also sometimes see an additional ‘<em>Generate</em>’ link next to new modules for which templates have not yet been created.
</p>
-<h4 class="odd">Editing templates</h4>
-<p class="even">
+<h4>Editing templates</h4>
+<p>
You can see a full list of available templates by browsing the directory treeview. When you select a template, XOOPS will open it in an editor where you can edit it. <br /><br />
While editing templates you must enable a preference that automatically updates module template .html files if there are newer files under the themes/your theme/templates directory for the current theme (System Module -> Preferences -> General Settings -> Update module template .html files from themes/your theme/templates directory? -> ‘<em>Yes</em>’). This should be turned off once the site goes public.<br /><br />
If you accidentally mess up a template don’t forget that you can retrieve a ‘<em>good</em>’ copy from the default template set. If you are working with non-standard templates it may be a good idea to save a copy to disk before you start modifying them.
-</p>
-
-</div>
+</p>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/userrank.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/userrank.html 2012-04-29 17:05:07 UTC (rev 9407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/userrank.html 2012-04-29 19:52:09 UTC (rev 9408)
@@ -1,17 +0,0 @@
-<div id="help-template" class="outer">
-
-<h1 class="head">Help: User Ranks</h1>
-<h4 class="odd">Description</h4>
-
-<p class="even">
-User Ranks allow you to give people some ‘<em>status</em>’ based on either their role or level of participation in the community. It is important to note that user ranks are functionally irrelevant - they *do not* confer any extra privileges or administrative rights at all – they are just titles. User access rights are actually controlled elsewhere (through the Groups section of the control panel). If you assign someone the Webmaster user rank but forget to also assign them to the Webmaster user group (a common mistake) they may look cool but they won’t be able to administer the site !<br /><br />
-
-‘<em>Normal</em>’ ranks are assigned on the basis of the number of forum posts and comments a user has made. A user’s rank will change as they make enough posts to qualify for the next level. XOOPS ships with the following default ranks: Just popping in; Not too shy to talk; Quite a regular; Just can’t stay away; and Home away from home.
-XOOPS also ships with two ‘<em>special ranks</em>’: Moderator and Webmaster. Special ranks differ in that they can be assigned to users irrespective of the number of posts they have made. A typical use of special ranks is to give recognition to people performing various administrative functions.<br /><br />
-
-The ‘<em>edit</em>’ link allows you to change the name of a rank, to alter the minimum / maximum number of posts needed to qualify, to designate it as a ‘<em>special</em>’ rank (or not), and to upload a new rank image. You can remove unnecessary ranks (‘delete’ link). <br /><br />
-
-You can create additional ranks through the form at the bottom of the user rank page. Simply assign a name, minimum and maximum number of posts (if desired), upload a rank image and assign it as either normal or special.
-</p>
-
-</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/users.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/users.html 2012-04-29 17:05:07 UTC (rev 9407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/users.html 2012-04-29 19:52:09 UTC (rev 9408)
@@ -1,20 +1,19 @@
-<div id="help-template" class="outer">
-<h1 class="head">Help: Users</h1>
+<h1>Help: Users</h1>
-<h4 class="odd">Description</h4>
-<p class="even">
+<h4>Description</h4>
+<p>
XOOPS provides built in tools for easy user management. These include the ability to search for users by various criteria, send email and private messages to users through a template-based messaging system. In your site, users have the rights that pertain to the group they're assigned to.<br /><br />
As to users, they have access to their profile, have some control over most of the information that will be visible to other users, and have also an inbox to receive private messages from the site administrator or from other users. They have besides control over what changes in the site will trigger personal notifications. And depending on the permissions set by the site manager, they can see content and participate in the site's life by uploading content, writing stories or comments, rating content and in general giving their feedback to what they see on the site.<br /><br />
</p>
-<h4 class="odd">Advanced Search</h4>
-<p class="even">
+<h4>Advanced Search</h4>
+<p>
"Advanced Search" provides a wide range of options that you can use to search for specific users or to filter your membership. You can also obtain a complete list of members by pressing the ‘submit’ button without using any of the filters.
</p>
-<h4 class="odd">Edit Users</h4>
-<p class="even">
+<h4>Edit Users</h4>
+<p>
You can add, edit and delete users through this section of the System Module.<br /><br />
To edit a user, search for one based on the name or other criteria. You may then choose to either <br /><br />
@@ -22,7 +21,4 @@
ii) delete them using the second drop down box.<br /><br />
Selecting ‘modify’ will open the user’s profile which you may then change as you see fit (note that you can also reach the edit profile page from the user side via the member directory, or by clicking on a username anywhere in the site).
-</p>
-
-
-</div>
+</p>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_help.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_help.html 2012-04-29 17:05:07 UTC (rev 9407)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_help.html 2012-04-29 19:52:09 UTC (rev 9408)
@@ -1,30 +1,55 @@
<{includeq file="admin:system|system_header.html"}>
<table>
- <tr>
- <td class="width20" valign="top">
- <{if $help}>
- <div class="xo-help-menu">
- <h2 class="head"><{$modname}></h2>
- <{foreach item=help from=$help}>
- <div class="<{cycle values='odd, even'}>"><a href="<{$help.link}>"><{$help.name}></a></div>
- <{/foreach}>
- </div>
- <{/if}>
- <{if $list_mods}>
- <div class="xo-help-menu">
- <{foreach item=row from=$list_mods}>
- <h2 class="head"><{$row.name}></h2>
- <{foreach item=list from=$row.help_page}>
- <div class="<{cycle values='odd, even'}>" title="<{$list.name}>"><a href="<{$list.link}>"><{$list.name}></a></div>
- <{/foreach}>
- <{/foreach}>
- </div>
- <{/if}>
- </td>
- <td valign="top">
- <div id="help-content">
- <{$helpcontent}>
- </div>
- </td>
- </tr>
+ <tr>
+ <td class="width20" valign="top">
+ <{if $help}>
+ <div id="help-content">
+ <div class="system-help outer">
+ <div class="xo-window">
+ <div class="xo-window-title"><span class="ico ico-application"></span> <{$smarty.const._AM_SYSTEM_HELP}></div>
+ <div class="xo-window-data">
+ <{foreach item=help from=$help}>
+ <div><a href="<{$help.link}>"><{$help.name}></a></div>
+ <{/foreach}>
+ </div>
+ </div>
+ </div>
+ </div>
+ <{/if}>
+ <{if $list_mods}>
+ <div id="help-content">
+ <div class="system-help outer">
+ <div class="xo-window">
+ <div class="xo-window-title"><span class="ico ico-application"></span> <{$smarty.const._AM_SYSTEM_HELP}></div>
+ <div class="xo-window-data">
+ <{foreach item=row from=$list_mods}>
+ <h2 class="head"><{$row.name}></h2>
+ <{foreach item=list from=$row.help_page}>
+ <div title="<{$list.name}>"><a href="<{$list.link}>"><{$list.name}></a></div>
+ <{/foreach}>
+ <{/foreach}>
+ </div>
+ </div>
+ </div>
+ </div>
+ <{/if}>
+ </td>
+ <td valign="top">
+ <div id="help-content">
+ <div class="system-help outer">
+ <div class="xo-window">
+ <div class="xo-window-title"><span class="ico ico-help"></span> <{$smarty.const._AM_SYSTEM_HELP}>: <{$modname}></div>
+ <div class="xo-window-data">
+ <{$helpcontent}>
+ <{if $help_module}>
+ <div class="txtcenter">
+ <a class="btn btn-primary btn-mini" href="<{$xoops_url}>/modules/<{$moddirname}>/admin/index.php"><i class="icon-home icon-white"></i> <{$modname}></a>
+ </div>
+ <{/if}>
+ </div>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr>
</table>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
![http://www.xoops.org/uploads/smil42e7a3d4c7b9f.gif"](http://www.xoops.org/uploads/smil42e7a3d4c7b9f.gif"){kind=link}
|
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] |
|
From: <for...@us...> - 2012-05-10 21:05:42
|
Revision: 9479
http://xoops.svn.sourceforge.net/xoops/?rev=9479&view=rev
Author: forxoops
Date: 2012-05-10 21:05:35 +0000 (Thu, 10 May 2012)
Log Message:
-----------
Add plugin class
Modified Paths:
--------------
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
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/plugin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/dashboard.html
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/plugin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/plugin.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/plugin.php 2012-05-10 21:05:35 UTC (rev 9479)
@@ -0,0 +1,104 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ *
+ *
+ * @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 System
+ * @version $Id$
+ */
+
+class SystemPlugin extends SystemModule
+{
+
+ public function getPlugin( $mod = '' )
+ {
+ $ret = array();
+ $plugin = $this->getPluginList();
+ foreach( $plugin as $list ) {
+ /* @var $list XoopsModule */
+ if ( $list->getInfo('install') ) {
+ if ( !is_array( $list->getInfo('plugin_module') ) ) {
+ $ret[] = $list;
+ } else {
+ if ( array_search( $mod, $list->getInfo('plugin_module')) !== false ){
+ $ret[] = $list;
+ //echo $list->getInfo('name') . is_array( $list->getInfo('plugin_module') );
+ }
+ }
+ unset($list);
+ }
+ }
+
+ return $ret;
+ }
+
+ /**
+ * Return all plugins
+ * @return array
+ */
+ public function getPluginList()
+ {
+ // 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');
+ }
+ if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getInfo('dirname') . '/icons/logo_large.png')) {
+ $module->setInfo('logo_large', XOOPS_URL . '/modules/' . $module->getInfo('dirname') . '/icons/logo_large.png');
+ } else {
+ $module->setInfo('logo_large', XOOPS_URL . '/media/xoops/images/icons/32/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;
+ }
+}
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/plugin.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
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-10 12:15:02 UTC (rev 9478)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/language/english/admin.php 2012-05-10 21:05:35 UTC (rev 9479)
@@ -25,7 +25,8 @@
// Control Panel
define("_DEFAULT_DASHBORD","Dashboard");
define("_DEFAULT_DASHBORD_DESC","Control and manage your site");
-
+define("_DEFAULT_SYSTEM_TOOL","System tools");
+define("_DEFAULT_SYSTEM_PLUGIN","System plugins");
define("_DEFAULT_INSTALLEDMODULES","Installed modules");
define("_DEFAULT_INSTALLEDPLUGINS","Installed plugins");
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-10 12:15:02 UTC (rev 9478)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/theme.html 2012-05-10 21:05:35 UTC (rev 9479)
@@ -23,10 +23,8 @@
</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"}>
+ 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>
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/dashboard.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/dashboard.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/dashboard.html 2012-05-10 21:05:35 UTC (rev 9479)
@@ -0,0 +1,128 @@
+<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">
+ <h4 class="cp-cat"><{$smarty.const._DEFAULT_SYSTEM_TOOL}></h4>
+ <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"}>' alt="<{$smarty.const._AM_SYSTEM_CONFIG}>"/>
+ <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"}>' alt="<{$smarty.const._AM_SYSTEM_HELP}>"/>
+ <span><{$smarty.const._AM_SYSTEM_HELP}></span>
+ </a>
+ </div>
+ <div class="clear"></div>
+ <{if $plugin_mod}>
+ <h4 class="cp-cat"><{$smarty.const._DEFAULT_SYSTEM_PLUGIN}></h4>
+ <div class="cp-icon">
+ <{foreach item=plug from=$plugin_mod}>
+ <a class="xo-tooltip" href="<{$xoops_url}>/modules/<{$plug->getInfo('dirname')}>/<{$plug->getInfo('adminindex')}>" title="<{$plug->getInfo('description')}>">
+ <img src="<{$plug->getInfo('logo_large')}>" alt="<{$plug->getInfo('name')}>"/>
+ <span><{$plug->getInfo('name')}></span>
+ </a>
+ <{/foreach}>
+ </div>
+ <{/if}>
+ </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 class="mod-link">
+ <div class="pull-right">
+ <a class="btn btn-mini btn-info" href="<{xoAppUrl modules/system/admin.php?fct=modulesadmin}>">
+ <i class="icon-white icon-tags"></i>
+ <{$smarty.const._DEFAULT_MANAGE}><{$smarty.const._AM_SYSTEM_MODULES}>
+ </a>
+ </div>
+ </div>
+ </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 class="mod-link">
+ <div class="pull-right">
+ <a class="btn btn-mini btn-warning" href="<{xoAppUrl modules/system/admin.php?fct=plugins}>">
+ <i class="icon-white icon-tag"></i>
+ <{$smarty.const._DEFAULT_MANAGE}><{$smarty.const._AM_SYSTEM_PLUGINS}>
+ </a>
+ </div>
+ </div>
+ </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>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-05-12 17:30:35
|
Revision: 9491
http://xoops.svn.sourceforge.net/xoops/?rev=9491&view=rev
Author: mageg
Date: 2012-05-12 17:30:28 +0000 (Sat, 12 May 2012)
Log Message:
-----------
remove system maintenance
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/maintenance/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/maintenance.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/maintenance.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/maintenance.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_maintenance.html
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/maintenance.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/maintenance.php 2012-05-12 17:26:48 UTC (rev 9490)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/maintenance.php 2012-05-12 17:30:28 UTC (rev 9491)
@@ -1,100 +0,0 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-/**
- * Maintenance Form Class
- *
- * @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 system
- * @subpackage maintenance
- * @version $Id$
- */
-
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-class SystemMaintenanceForm extends XoopsThemeForm
-{
- /**
- * @param null $obj
- */
- public function __construct($obj = null)
- {
- }
-
- /**
- * Maintenance Form
- * @return void
- */
- public function getMaintenance()
- {
- $maintenance = new SystemMaintenance();
- parent::__construct(_AM_SYSTEM_MAINTENANCE, "form_maintenance", "admin.php", 'post', true);
-
- $cache = new XoopsFormSelect(_AM_SYSTEM_MAINTENANCE_CACHE, "cache", '', 3, true);
- $cache->setDescription(XOOPS_VAR_PATH . "/cache/smarty_cache/<br />" . XOOPS_VAR_PATH . "/cache/smarty_compile/<br />" . XOOPS_VAR_PATH . "/cache/xoops_cache/");
- $cache_arr = array(
- 1 => 'smarty_cache', 2 => 'smarty_compile', 3 => 'xoops_cache'
- );
- $cache->addOptionArray($cache_arr);
- $this->addElement($cache);
-
- $this->addElement(new XoopsFormRadioYN(_AM_SYSTEM_MAINTENANCE_SESSION, 'session', '', _YES, _NO));
-
- $tables_tray = new XoopsFormElementTray(_AM_SYSTEM_MAINTENANCE_TABLES, ' ');
- $tables_tray->setDescription(_AM_SYSTEM_MAINTENANCE_TABLES_DESC);
- $select_tables = new XoopsFormSelect('', "tables", '', 7, true);
- $select_tables->addOptionArray($maintenance->displayTables(true));
- $tables_tray->addElement($select_tables, false);
- $choice = new XoopsFormSelect(' ' . _AM_SYSTEM_MAINTENANCE_DUMP_AND . ' ', "maintenance", '', 4, true);
- $options = array(
- '1' => _AM_SYSTEM_MAINTENANCE_CHOICE1, '2' => _AM_SYSTEM_MAINTENANCE_CHOICE2,
- '3' => _AM_SYSTEM_MAINTENANCE_CHOICE3, '4' => _AM_SYSTEM_MAINTENANCE_CHOICE4
- );
- $choice->addOptionArray($options);
- $tables_tray->addElement($choice, false);
- $this->addElement($tables_tray);
-
- $this->addElement(new XoopsFormHidden("fct", "maintenance"));
- $this->addElement(new XoopsFormHidden("op", "maintenance_save"));
- $this->addElement(new XoopsFormButton("", "maintenance_save", _SEND, "submit"));
- }
-
- /**
- * @return void
- */
- public function getDump()
- {
- $xoops = Xoops::getInstance();
- $maintenance = new SystemMaintenance();
- parent::__construct(_AM_SYSTEM_MAINTENANCE_DUMP, "form_dump", "admin.php?fct=maintenance", 'post', true);
-
- $dump_tray = new XoopsFormElementTray(_AM_SYSTEM_MAINTENANCE_DUMP_TABLES_OR_MODULES, '');
- $select_tables1 = new XoopsFormSelect('', "dump_tables", '', 7, true);
- $select_tables1->addOptionArray($maintenance->displayTables(true));
- $dump_tray->addElement($select_tables1, false);
- $ele = new XoopsFormSelect(' ' . _AM_SYSTEM_MAINTENANCE_DUMP_OR . ' ', 'dump_modules', '', 7, true);
- /* @var $module_handler XoopsModuleHandler */
- $module_handler = $xoops->getHandlerModule();
- $criteria = new CriteriaCompo(new Criteria('hasmain', 1));
- $criteria->add(new Criteria('isactive', 1));
- $moduleslist = $module_handler->getNameList($criteria, true);
- $ele->addOptionArray($moduleslist);
- $dump_tray->addElement($ele);
- $this->addElement($dump_tray);
-
- $this->addElement(new XoopsFormRadioYN(_AM_SYSTEM_MAINTENANCE_DUMP_DROP, 'drop', 1, _YES, _NO));
-
- $this->addElement(new XoopsFormHidden("op", "dump_save"));
- $this->addElement(new XoopsFormButton("", "dump_save", _SEND, "submit"));
- }
-}
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/maintenance.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/maintenance.php 2012-05-12 17:26:48 UTC (rev 9490)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/maintenance.php 2012-05-12 17:30:28 UTC (rev 9491)
@@ -1,371 +0,0 @@
-<?php
-/**
- * Maintenance class manager
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @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 Cointin Maxime (AKA Kraven30)
- * @package system
- * @version $Id$
- */
-
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-/**
- * System Maintenance
- *
- * @copyright copyright (c) 2000 XOOPS.org
- * @package system
- */
-class SystemMaintenance
-{
- var $db;
- var $prefix;
-
- /**
- * Constructor
- */
- function SystemMaintenance()
- {
- $db = XoopsDatabaseFactory::getDatabaseConnection();
- $this->db = $db;
- $this->prefix = $this->db->prefix . '_';
- }
-
- /**
- * Display Tables
- *
- * @param array
- * @return
- */
- function displayTables($array = true)
- {
- $tables = array();
- $result = $this->db->queryF('SHOW TABLES');
- while ($myrow = $this->db->fetchArray($result)) {
- $value = array_values($myrow);
- $value = substr($value[0], 5);
- $tables[$value] = $value;
- }
- if ($array = true) {
- return $tables;
- } else {
- return join(',', $tables);
- }
- }
-
- /**
- * Clear sessions
- *
- * @return
- */
- function CleanSession()
- {
- $result = $this->db->queryF('TRUNCATE TABLE ' . $this->db->prefix('session'));
- return true;
- }
-
- /**
- * Clean cache 'xoops_data/caches/smarty_cache'
- *
- * @param array cache
- * @return
- */
- function CleanCache($cache)
- {
- for ($i = 0; $i < count($cache); $i++) {
- if ($cache[$i] == 1) {
- $files = glob(XOOPS_VAR_PATH . '/caches/smarty_cache/*.*');
- foreach ($files as $filename) {
- if (basename(strtolower($filename)) != 'index.html') {
- unlink($filename);
- }
- }
- } else {
- if ($cache[$i] == 2) {
- $files = glob(XOOPS_VAR_PATH . '/caches/smarty_compile/*.*');
- foreach ($files as $filename) {
- if (basename(strtolower($filename)) != 'index.html') {
- unlink($filename);
- }
- }
- } else {
- if ($cache[$i] == 3) {
- $files = glob(XOOPS_VAR_PATH . '/caches/xoops_cache/*.*');
- foreach ($files as $filename) {
- if (basename(strtolower($filename)) != 'index.html') {
- unlink($filename);
- }
- }
- }
- }
- }
- }
- return true;
- }
-
- /**
- * Maintenance database
- *
- * @param array tables 'list of tables'
- * @param array maintenance 'optimize, check, repair, analyze'
- * @return array
- */
- function CheckRepairAnalyzeOptimizeQueries($tables, $maintenance)
- {
- $ret = '<table class="outer"><th>' . _AM_SYSTEM_MAINTENANCE_TABLES1 . '</th><th>' . _AM_SYSTEM_MAINTENANCE_TABLES_OPTIMIZE . '</th><th>' . _AM_SYSTEM_MAINTENANCE_TABLES_CHECK . '</th><th>' . _AM_SYSTEM_MAINTENANCE_TABLES_REPAIR . '</th><th>' . _AM_SYSTEM_MAINTENANCE_TABLES_ANALYZE . '</th>';
- $tab = array();
- for ($i = 0; $i < 4; $i++) {
- $tab[$i] = $i + 1;
- }
- $tab1 = array();
- for ($i = 0; $i < 4; $i++) {
- if (in_array($tab[$i], $maintenance)) {
- $tab1[$i] = $tab[$i];
- } else {
- $tab1[$i] = '0';
- }
- }
- unset($tab);
- $class = 'odd';
- for ($i = 0; $i < count($tables); $i++) {
- $ret .= '<tr class="' . $class . '"><td align="center">' . $this->prefix . $tables[$i] . '</td>';
- for ($j = 0; $j < 4; $j++) {
- if ($tab1[$j] == 1) {
- // Optimize
- $result = $this->db->queryF('OPTIMIZE TABLE ' . $this->prefix . $tables[$i]);
- if ($result) {
- $ret .= '<td class="xo-actions txtcenter"><img src="' . system_AdminIcons('success.png') . '" /></td>';
- } else {
- $ret .= '<td class="xo-actions txtcenter"><img src="' . system_AdminIcons('cancel.png') . '" /></td>';
- }
- } else {
- if ($tab1[$j] == 2) {
- // Check tables
- $result = $this->db->queryF('CHECK TABLE ' . $this->prefix . $tables[$i]);
- if ($result) {
- $ret .= '<td class="xo-actions txtcenter"><img src="' . system_AdminIcons('success.png') . '" /></td>';
- } else {
- $ret .= '<td class="xo-actions txtcenter"><img src="' . system_AdminIcons('cancel.png') . '" /></td>';
- }
- } else {
- if ($tab1[$j] == 3) {
- // Repair
- $result = $this->db->queryF('REPAIR TABLE ' . $this->prefix . $tables[$i]);
- if ($result) {
- $ret .= '<td class="xo-actions txtcenter"><img src="' . system_AdminIcons('success.png') . '" /></td>';
- } else {
- $ret .= '<td class="xo-actions txtcenter"><img src="' . system_AdminIcons('cancel.png') . '" /></td>';
- }
- } else {
- if ($tab1[$j] == 4) {
- // Analyze
- $result = $this->db->queryF('ANALYZE TABLE ' . $this->prefix . $tables[$i]);
- if ($result) {
- $ret .= '<td class="xo-actions txtcenter"><img src="' . system_AdminIcons('success.png') . '" /></td>';
- } else {
- $ret .= '<td class="xo-actions txtcenter"><img src="' . system_AdminIcons('cancel.png') . '" /></td>';
- }
- } else {
- $ret .= '<td> </td>';
- }
- }
- }
- }
- }
- $ret .= '</tr>';
- $class = ($class == 'even') ? 'odd' : 'even';
- }
- $ret .= '</table>';
- return $ret;
- }
-
- /**
- * Dump by tables
- *
- * @param array tables 'list of tables'
- * @param int drop
- * @return array 'ret[0] = dump, ret[1] = display result
- */
- function dump_tables($tables, $drop)
- {
- $ret = array();
- $ret[0] = "# \n";
- $ret[0] .= "# Dump SQL, Generate by Xoops \n";
- $ret[0] .= "# Date : " . date('d-m-Y � H:i') . " \n";
- $ret[1] = '<table class="outer"><tr><th width="30%">' . _AM_SYSTEM_MAINTENANCE_DUMP_TABLES . '</th><th width="35%">' . _AM_SYSTEM_MAINTENANCE_DUMP_STRUCTURES . '</th><th width="35%">' . _AM_SYSTEM_MAINTENANCE_DUMP_NB_RECORDS . '</th></tr>';
- $class = 'odd';
- for ($i = 0; $i < count($tables); $i++) {
- //structure
- $ret = $this->dump_table_structure($ret, $this->prefix . $tables[$i], $drop, $class);
- //data
- $ret = $this->dump_table_datas($ret, $this->prefix . $tables[$i]);
- $class = ($class == 'even') ? 'odd' : 'even';
- }
- $ret = $this->dump_write($ret);
- $ret[1] .= '</table>';
- return $ret;
- }
-
- /**
- * Dump by modules
- *
- * @param array modules 'list of modules'
- * @param int drop
- * @return array 'ret[0] = dump, ret[1] = display result
- */
- function dump_modules($modules, $drop)
- {
- $xoops = Xoops::getInstance();
- $ret = array();
- $ret[0] = "# \n";
- $ret[0] .= "# Dump SQL, Generate by Xoops \n";
- $ret[0] .= "# Date : " . date('d-m-Y � H:i') . " \n";
- $ret[0] .= "# \n\n";
- $ret[1] = '<table class="outer"><tr><th width="30%">' . _AM_SYSTEM_MAINTENANCE_DUMP_TABLES . '</th><th width="35%">' . _AM_SYSTEM_MAINTENANCE_DUMP_STRUCTURES . '</th><th width="35%">' . _AM_SYSTEM_MAINTENANCE_DUMP_NB_RECORDS . '</th></tr>';
- $class = 'odd';
- for ($i = 0; $i < count($modules); $i++) {
- $module_handler = $xoops->getHandlerModule();
- $module = $module_handler->getByDirname($modules[$i]);
- $ret[1] .= '<tr><th colspan="3" align="left">' . ucfirst($modules[$i]) . '</th></tr>';
- $modtables = $module->getInfo('tables');
- if ($modtables != false && is_array($modtables)) {
- foreach ($modtables as $table) {
- //structure
- $ret = $this->dump_table_structure($ret, $this->prefix . $table, $drop, $class);
- //data
- $ret = $this->dump_table_datas($ret, $this->prefix . $table);
- $class = ($class == 'even') ? 'odd' : 'even';
- }
- } else {
- $ret[1] .= '<tr><td colspan="3" align="center">' . _AM_SYSTEM_MAINTENANCE_DUMP_NO_TABLES . '</td></tr>';
- }
- }
- $ret[1] .= '</table>';
- $ret = $this->dump_write($ret);
- return $ret;
- }
-
- /**
- * Dump table structure
- *
- * @param array
- * @param string table
- * @param int drop
- * @param string class
- * @return array 'ret[0] = dump, ret[1] = display result
- */
- function dump_table_structure($ret, $table, $drop, $class)
- {
- $verif = false;
- $result = $this->db->queryF('SHOW create table `' . $table . '`;');
- if ($result) {
- if ($row = $this->db->fetchArray($result)) {
- $ret[0] .= "# Table structure for table `" . $table . "` \n\n";
- if ($drop == 1) {
- $ret[0] .= "DROP TABLE IF EXISTS `" . $table . "`;\n\n";
- }
- $verif = true;
- $ret[0] .= $row['Create Table'] . ";\n\n";
- }
- }
- $ret[1] .= '<tr class="' . $class . '"><td align="center">' . $table . '</td><td class="xo-actions txtcenter">';
- $ret[1] .= ($verif == true) ? '<img src="' . system_AdminIcons('success.png') . '" />'
- : '<img src="' . system_AdminIcons('cancel.png') . '" />';
- $ret[1] .= '</td>';
- $this->db->freeRecordSet($result);
- return $ret;
- }
-
- /**
- * Dump table data
- *
- * @param array
- * @param string table
- * @return array 'ret[0] = dump, ret[1] = display result
- */
- function dump_table_datas($ret, $table)
- {
- $count = 0;
- $result = $this->db->queryF('SELECT * FROM ' . $table . ';');
- if ($result) {
- $num_rows = $this->db->getRowsNum($result);
- $num_fields = $this->db->getFieldsNum($result);
-
- if ($num_rows > 0) {
- $field_type = array();
- $i = 0;
- while ($i < $num_fields) {
- $meta = mysql_fetch_field($result, $i);
- array_push($field_type, $meta->type);
- $i++;
- }
-
- $ret[0] .= "INSERT INTO `" . $table . "` values\n";
- $index = 0;
- while ($row = $this->db->fetchRow($result)) {
- $count++;
- $ret[0] .= "(";
- for ($i = 0; $i < $num_fields; $i++) {
- if (is_null($row[$i])) {
- $ret[0] .= "null";
- } else {
- switch ($field_type[$i]) {
- case 'int':
- $ret[0] .= $row[$i];
- break;
- default:
- $ret[0] .= "'" . mysql_real_escape_string($row[$i]) . "'";
- }
- }
- if ($i < $num_fields - 1) {
- $ret[0] .= ",";
- }
- }
- $ret[0] .= ")";
-
- if ($index < $num_rows - 1) {
- $ret[0] .= ",";
- } else {
- $ret[0] .= ";";
- }
- $ret[0] .= "\n";
- $index++;
- }
- }
- }
- $ret[1] .= '<td align="center">';
- $ret[1] .= $count . ' ' . _AM_SYSTEM_MAINTENANCE_DUMP_RECORDS . '</td></tr>';
- $ret[0] .= "\n";
- $this->db->freeRecordSet($result);
- $ret[0] .= "\n";
- return $ret;
- }
-
- /**
- * Dump Write
- *
- * @param array
- * @return array 'ret[0] = dump, ret[1] = display result
- */
- function dump_write($ret)
- {
- $file_name = "dump_" . date("Y.m.d") . "_" . date("H.i.s") . ".sql";
- $path_file = "./admin/maintenance/dump/" . $file_name;
- if (file_put_contents($path_file, $ret[0])) {
- $ret[1] .= '<table class="outer"><tr><th colspan="2" align="center">' . _AM_SYSTEM_MAINTENANCE_DUMP_FILE_CREATED . '</th><th>' . _AM_SYSTEM_MAINTENANCE_DUMP_RESULT . '</th></tr><tr><td colspan="2" align="center"><a href="' . XOOPS_URL . '/modules/system/admin/maintenance/dump/' . $file_name . '">' . $file_name . '</a></td><td class="xo-actions txtcenter"><img src="' . system_AdminIcons('success.png') . '" /></td><tr></table>';
- } else {
- $ret[1] .= '<table class="outer"><tr><th colspan="2" align="center">' . _AM_SYSTEM_MAINTENANCE_DUMP_FILE_CREATED . '</th><th>' . _AM_SYSTEM_MAINTENANCE_DUMP_RESULT . '</th></tr><tr><td colspan="2" class="xo-actions txtcenter">' . $file_name . '</td><td class="xo-actions txtcenter"><img src="' . system_AdminIcons('cancel.png') . '" /></td><tr></table>';
- }
- return $ret;
- }
-}
-
-?>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/maintenance.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/maintenance.php 2012-05-12 17:26:48 UTC (rev 9490)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/maintenance.php 2012-05-12 17:30:28 UTC (rev 9491)
@@ -1,71 +0,0 @@
-<?php
-/**
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * _LANGCODE en
- * _CHARSET UTF-8
- * @version $Id$
- */
-
-//Nav
-define("_AM_SYSTEM_MAINTENANCE_NAV_MANAGER", "Maintenance");
-define("_AM_SYSTEM_MAINTENANCE_NAV_LIST","All maintenance");
-define("_AM_SYSTEM_MAINTENANCE_NAV_DUMP","Dump");
-
-define("_AM_SYSTEM_MAINTENANCE_SESSION","Empty the sessions table");
-define("_AM_SYSTEM_MAINTENANCE_SESSION_OK","Session maintenance : OK");
-define("_AM_SYSTEM_MAINTENANCE_SESSION_NOTOK","Session maintenance : Error");
-define("_AM_SYSTEM_MAINTENANCE_CACHE","Clean cache folder");
-define("_AM_SYSTEM_MAINTENANCE_CACHE_OK","Cache maintenance : OK");
-define("_AM_SYSTEM_MAINTENANCE_CACHE_NOTOK","Cache maintenance : Error");
-define("_AM_SYSTEM_MAINTENANCE_TABLES","Tables maintenance");
-define("_AM_SYSTEM_MAINTENANCE_TABLES_OK","Tables maintenance : OK");
-define("_AM_SYSTEM_MAINTENANCE_TABLES_NOTOK","Tables maintenance : Error");
-define("_AM_SYSTEM_MAINTENANCE_QUERY_DESC","Optimize, Check, Repair and Analyze your tables");
-define("_AM_SYSTEM_MAINTENANCE_QUERY_OK","Maintain database : OK");
-define("_AM_SYSTEM_MAINTENANCE_QUERY_NOTOK","Maintain database : Error");
-define("_AM_SYSTEM_MAINTENANCE_CHOICE1","Optimize table(s)");
-define("_AM_SYSTEM_MAINTENANCE_CHOICE2","Check table(s)");
-define("_AM_SYSTEM_MAINTENANCE_CHOICE3","Repair table(s)");
-define("_AM_SYSTEM_MAINTENANCE_CHOICE4","Analyze table(s)");
-define("_AM_SYSTEM_MAINTENANCE_TABLES_DESC",
-"ANALYZE TABLE analyzes and stores the key distribution for a table. During the analysis, the table is locked with a read lock.<br />
-CHECK TABLE checks a table or tables for errors.<br />
-OPTIMIZE TABLE to reclaim the unused space and to defragment the data file.<br />
-REPAIR TABLE repairs a possibly corrupted table.");
-
-define("_AM_SYSTEM_MAINTENANCE_RESULT","Result");
-define("_AM_SYSTEM_MAINTENANCE_RESULT_NO_RESULT","Not Result");
-define("_AM_SYSTEM_MAINTENANCE_RESULT_CACHE","Clean Cache task");
-define("_AM_SYSTEM_MAINTENANCE_RESULT_SESSION","Clean sessions table task");
-define("_AM_SYSTEM_MAINTENANCE_RESULT_QUERY","Database task");
-define("_AM_SYSTEM_MAINTENANCE_ERROR_MAINTENANCE","No choice for maintenance");
-
-define("_AM_SYSTEM_MAINTENANCE_TABLES1","Tables");
-define("_AM_SYSTEM_MAINTENANCE_TABLES_OPTIMIZE","Optimize");
-define("_AM_SYSTEM_MAINTENANCE_TABLES_CHECK","Check");
-define("_AM_SYSTEM_MAINTENANCE_TABLES_REPAIR","Repair");
-define("_AM_SYSTEM_MAINTENANCE_TABLES_ANALYZE","Analyze");
-
-//Dump
-define("_AM_SYSTEM_MAINTENANCE_DUMP","Dump");
-define("_AM_SYSTEM_MAINTENANCE_DUMP_TABLES_OR_MODULES","Select tables or modules");
-define("_AM_SYSTEM_MAINTENANCE_DUMP_DROP","Add command DROP TABLE IF EXISTS 'tables' in the dump");
-define("_AM_SYSTEM_MAINTENANCE_DUMP_OR", "OR");
-define("_AM_SYSTEM_MAINTENANCE_DUMP_AND", "AND");
-define("_AM_SYSTEM_MAINTENANCE_DUMP_ERROR_TABLES_OR_MODULES", "You must select the tables or modules");
-define("_AM_SYSTEM_MAINTENANCE_DUMP_NO_TABLES", "No tables");
-define("_AM_SYSTEM_MAINTENANCE_DUMP_TABLES", "Tables");
-define("_AM_SYSTEM_MAINTENANCE_DUMP_STRUCTURES", "Structures");
-define("_AM_SYSTEM_MAINTENANCE_DUMP_NB_RECORDS", "Numbers of records");
-define("_AM_SYSTEM_MAINTENANCE_DUMP_FILE_CREATED", "File created");
-define("_AM_SYSTEM_MAINTENANCE_DUMP_RESULT", "Result");
-define("_AM_SYSTEM_MAINTENANCE_DUMP_RECORDS", "record(s)");
-
-// Tips
-define("_AM_SYSTEM_MAINTENANCE_TIPS",
-"<ul>
-<li>You can do a simple maintenance of your XOOPS Installation: clear your cache and session table, and do maintenance of your tables</li>
-</ul>");
-
-?>
Deleted: 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-12 17:26:48 UTC (rev 9490)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_maintenance.html 2012-05-12 17:30:28 UTC (rev 9491)
@@ -1,32 +0,0 @@
-<!--maintenance-->
-<{includeq file="admin:system|system_header.html"}>
-<!-- Display mailusers form -->
-<br />
-<{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}>
-<{else}>
- <{$result_dump}>
-<{/if}>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <for...@us...> - 2012-05-17 11:51:44
|
Revision: 9537
http://xoops.svn.sourceforge.net/xoops/?rev=9537&view=rev
Author: forxoops
Date: 2012-05-17 11:51:37 +0000 (Thu, 17 May 2012)
Log Message:
-----------
Update all template with HTML5 and bootstrap
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_comments.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_login.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_mainmenu.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_newusers.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_notification.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_online.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_search.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_siteinfo.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_themes.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_topusers.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_waiting.html
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php 2012-05-17 11:51:37 UTC (rev 9537)
@@ -300,7 +300,7 @@
function b_system_info_show($options)
{
- global $xoopsConfig, $xoopsUser;
+ global $xoopsUser;
$xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
$myts = MyTextSanitizer::getInstance();
$block = array();
@@ -318,20 +318,19 @@
if (isset($xoopsUser) && is_object($xoopsUser)) {
$block['groups'][$i]['users'][] = array(
'id' => $userinfo['uid'], 'name' => $myts->htmlspecialchars($userinfo['uname']),
- 'msglink' => "<a href=\"javascript:openWithSelfMain('" . XOOPS_URL . "/pmlite.php?send2=1&to_userid=" . $userinfo['uid'] . "','pmlite',450,370);\"><img src=\"" . XOOPS_URL . "/images/icons/pm_small.gif\" border=\"0\" width=\"27\" height=\"17\" alt=\"\" /></a>",
+ 'pm_link' => XOOPS_URL . "/pmlite.php?send2=1&to_userid=" . $userinfo['uid'],
'avatar' => XOOPS_UPLOAD_URL . '/' . $userinfo['user_avatar']
);
} else {
if ($userinfo['user_viewemail']) {
$block['groups'][$i]['users'][] = array(
'id' => $userinfo['uid'], 'name' => $myts->htmlspecialchars($userinfo['uname']),
- 'msglink' => '<a href="mailto:' . $userinfo['email'] . '"><img src="' . XOOPS_URL . '/images/icons/em_small.gif" border="0" width="16" height="14" alt="" /></a>',
+ 'msg_link' => $userinfo['email'],
'avatar' => XOOPS_UPLOAD_URL . '/' . $userinfo['user_avatar']
);
} else {
$block['groups'][$i]['users'][] = array(
- 'id' => $userinfo['uid'], 'name' => $myts->htmlspecialchars($userinfo['uname']),
- 'msglink' => ' ', 'avatar' => XOOPS_UPLOAD_URL . '/' . $userinfo['user_avatar']
+ 'id' => $userinfo['uid'], 'name' => $myts->htmlspecialchars($userinfo['uname'])
);
}
}
@@ -603,7 +602,7 @@
if ($options[0] == 1) {
$block['theme_select'] = "<img vspace=\"2\" id=\"xoops_theme_img\" src=\"" . XOOPS_THEME_URL . "/" . $xoopsConfig['theme_set'] . "/shot.gif\" alt=\"screenshot\" width=\"" . intval($options[1]) . "\" /><br /><select id=\"xoops_theme_select\" name=\"xoops_theme_select\" onchange=\"showImgSelected('xoops_theme_img', 'xoops_theme_select', 'themes', '/shot.gif', '" . XOOPS_URL . "');\">" . $theme_options . "</select><input type=\"submit\" value=\"" . _GO . "\" />";
} else {
- $block['theme_select'] = '<select name="xoops_theme_select" onchange="submit();" size="3">' . $theme_options . '</select>';
+ $block['theme_select'] = '<select class="span2" name="xoops_theme_select" onchange="submit();" size="3">' . $theme_options . '</select>';
}
$block['theme_select'] .= '<br />(' . sprintf(_MB_SYSTEM_NUMTHEME, '<strong>' . count($xoopsConfig['theme_set_allowed']) . '</strong>') . ')<br />';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_comments.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_comments.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_comments.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,11 +1,15 @@
-<table cellspacing="1" class="outer width100">
- <{foreach item=comment from=$block.comments}>
- <tr class="<{cycle values='even,odd'}>">
- <td class="txtcenter"><img src="<{$xoops_url}>/images/subject/<{$comment.icon}>" alt="" /></td>
- <td><{$comment.title}></td>
- <td class="txtcenter"><{$comment.module}></td>
- <td class="txtcenter"><{$comment.poster}></td>
- <td class="txtright"><{$comment.time}></td>
- </tr>
- <{/foreach}>
-</table>
\ No newline at end of file
+<div class="xo-block-comment">
+ <table class="table table-striped table-condensed">
+ <tbody>
+ <{foreach item=comment from=$block.comments}>
+ <tr>
+ <td class="txtcenter"><img src="<{$xoops_url}>/images/subject/<{$comment.icon}>" alt="" /></td>
+ <td><{$comment.title}></td>
+ <td class="txtcenter"><{$comment.module}></td>
+ <td class="txtcenter"><{$comment.poster}></td>
+ <td class="txtright"><{$comment.time}></td>
+ </tr>
+ <{/foreach}>
+ </tbody>
+ </table>
+</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_login.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_login.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_login.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,20 +1,43 @@
-<div class="txtcenter">
- <form style="margin-top: 0;" action="<{xoAppUrl user.php}>" method="post">
- <{$block.lang_username}><br />
- <input type="text" name="uname" size="12" value="<{$block.unamevalue}>" maxlength="25" /><br />
- <{$block.lang_password}><br />
- <input type="password" name="pass" size="12" maxlength="32" /><br />
- <{if isset($block.lang_rememberme)}>
- <input type="checkbox" name="rememberme" value="On" class ="formButton" /><{$block.lang_rememberme}><br />
- <{/if}>
- <br />
- <input type="hidden" name="xoops_redirect" value="<{$xoops_requesturi}>" />
- <input type="hidden" name="op" value="login" />
- <input type="submit" value="<{$block.lang_login}>" /><br />
- <{$block.sslloginlink}>
- </form>
- <br />
- <a href="<{xoAppUrl user.php#lost}>" title="<{$block.lang_lostpass}>"><{$block.lang_lostpass}></a>
- <br /><br />
- <a href="<{xoAppUrl register.php}>" title="<{$block.lang_registernow}>"><{$block.lang_registernow}></a>
+<div class="xo-block-login">
+ <form class="form" action="<{xoAppUrl user.php}>" method="post">
+ <div class="control-group">
+ <label class="control-label" for="xo-login-uname"><{$block.lang_username}></label>
+ <div class="controls">
+ <div class="input-prepend">
+ <span class="add-on">
+ <i class="icon-user"></i>
+ </span><input class="span2" type="text" name="uname" id="xo-login-uname" value="<{$block.unamevalue}>" placeholder="Login…">
+ </div>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label" for="xo-login-pass"><{$block.lang_password}></label>
+ <div class="controls">
+ <div class="input-prepend">
+ <span class="add-on">
+ <i class="icon-cog"></i>
+ </span><input class="span2" type="password" name="pass" id="xo-login-pass">
+ </div>
+ </div>
+ </div>
+ <{if isset($block.lang_rememberme)}>
+ <label class="checkbox">
+ <input type="checkbox" name="rememberme" value="On" class="formButton"/><{$block.lang_rememberme}>
+ </label>
+ <{/if}>
+ <br/>
+ <input type="hidden" name="xoops_redirect" value="<{$xoops_requesturi}>"/>
+ <input type="hidden" name="op" value="login"/>
+ <div class="pagination-centered">
+ <button class="btn btn-primary" type="submit">
+ <i class="icon-white icon-user"></i>
+ <{$block.lang_login}>
+ </button>
+ <hr />
+ <a class="btn btn-mini pull-left" href="<{xoAppUrl user.php#lost}>" title="<{$block.lang_lostpass}>"><{$block.lang_lostpass}></a>
+ <a class="btn btn-mini btn-info pull-right" href="<{xoAppUrl register.php}>" title="<{$block.lang_registernow}>"><{$block.lang_registernow}></a>
+ <div class="clear"></div>
+ </div>
+ <{$block.sslloginlink}>
+ </form>
</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_mainmenu.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_mainmenu.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_mainmenu.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,11 +1,27 @@
-<div id="mainmenu">
- <a class="menuTop <{if !$block.nothome}>maincurrent<{/if}>" href="<{xoAppUrl }>" title="<{$block.lang_home}>"><{$block.lang_home}></a>
+<ul class="nav nav-list">
+ <li class="<{if !$block.nothome}>active<{/if}>">
+ <a href="<{xoAppUrl }>" title="<{$block.lang_home}>">
+ <i class="icon-home <{if !$block.nothome}>icon-white<{/if}>"></i>
+ <{$block.lang_home}>
+ </a>
+ </li>
<!-- start module menu loop -->
<{foreach item=module from=$block.modules}>
- <a class="menuMain <{if $module.highlight}>maincurrent<{/if}>" href="<{$xoops_url}>/modules/<{$module.directory}>/" title="<{$module.name}>"><{$module.name}></a>
- <{foreach item=sublink from=$module.sublinks}>
- <a class="menuSub" href="<{$sublink.url}>" title="<{$sublink.name}>"><{$sublink.name}></a>
- <{/foreach}>
+ <li class="<{if $module.highlight}>active<{/if}>">
+ <a class="" href="<{$xoops_url}>/modules/<{$module.directory}>/" title="<{$module.name}>">
+ <i class="icon-tags <{if $module.highlight}>icon-white<{/if}>"></i>
+ <{$module.name}>
+ </a>
+ <{if $module.sublinks}>
+ <ul class="nav nav-list">
+ <{foreach item=sublink from=$module.sublinks}>
+ <li>
+ <a class="" href="<{$sublink.url}>" title="<{$sublink.name}>"><{$sublink.name}></a>
+ </li>
+ <{/foreach}>
+ </ul>
+ <{/if}>
+ </li>
<{/foreach}>
<!-- end module menu loop -->
-</div>
\ No newline at end of file
+</ul>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_newusers.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_newusers.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_newusers.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,13 +1,19 @@
-<table cellspacing="1" class="outer">
- <{foreach item=user from=$block.users}>
- <tr class="<{cycle values='even,odd'}> alignmiddle">
- <td class="txtcenter">
- <{if $user.avatar != ""}>
- <img style="width:32px;" src="<{$user.avatar}>" alt="<{$user.name}>" /><br />
- <{/if}>
- <a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>" title="<{$user.name}>"><{$user.name}></a>
- </td>
- <td class="txtcenter"><{$user.joindate}></td>
- </tr>
- <{/foreach}>
-</table>
+<div class="xo-block-newuser">
+ <table class="table table-striped table-condensed">
+ <tbody>
+ <{foreach item=user from=$block.users}>
+ <tr>
+ <td class="span2 txt-centered">
+ <{if $user.avatar != ""}>
+ <img class="thumbnail" src="<{$user.avatar}>" alt="<{$user.name}>" />
+ <{/if}>
+ <h5>
+ <a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>" title="<{$user.name}>"><{$user.name}></a>
+ </h5>
+ </td>
+ <td class="txt-centered"><{$user.joindate}></td>
+ </tr>
+ <{/foreach}>
+ </tbody>
+ </table>
+</div>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_notification.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_notification.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_notification.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,28 +1,28 @@
<form action="<{$block.target_page}>" method="post">
-<table class="outer">
- <{foreach item=category from=$block.categories}>
- <{foreach name=inner item=event from=$category.events}>
- <{if $smarty.foreach.inner.first}>
- <tr>
- <td class="head" colspan="2"><{$category.title}></td>
- </tr>
- <{/if}>
- <tr>
- <td class="odd">
- <{counter assign=index}>
- <input type="hidden" name="not_list[<{$index}>][params]" value="<{$category.name}>,<{$category.itemid}>,<{$event.name}>" />
- <input type="checkbox" name="not_list[<{$index}>][status]" value="1" <{if $event.subscribed}>checked="checked"<{/if}> />
- </td>
- <td class="odd"><{$event.caption}></td>
- </tr>
- <{/foreach}>
- <{/foreach}>
- <tr>
- <td class="foot" colspan="2">
- <input type="hidden" name="not_redirect" value="<{$block.redirect_script}>">
- <input type="hidden" value="<{$block.notification_token}>" name="XOOPS_TOKEN_REQUEST" />
- <input type="submit" name="not_submit" value="<{$block.submit_button}>" />
- </td>
- </tr>
-</table>
+ <table class="outer">
+ <{foreach item=category from=$block.categories}>
+ <{foreach name=inner item=event from=$category.events}>
+ <{if $smarty.foreach.inner.first}>
+ <tr>
+ <td class="head" colspan="2"><{$category.title}></td>
+ </tr>
+ <{/if}>
+ <tr>
+ <td class="odd">
+ <{counter assign=index}>
+ <input type="hidden" name="not_list[<{$index}>][params]" value="<{$category.name}>,<{$category.itemid}>,<{$event.name}>" />
+ <input type="checkbox" name="not_list[<{$index}>][status]" value="1" <{if $event.subscribed}>checked="checked"<{/if}> />
+ </td>
+ <td class="odd"><{$event.caption}></td>
+ </tr>
+ <{/foreach}>
+ <{/foreach}>
+ <tr>
+ <td class="foot" colspan="2">
+ <input type="hidden" name="not_redirect" value="<{$block.redirect_script}>">
+ <input type="hidden" value="<{$block.notification_token}>" name="XOOPS_TOKEN_REQUEST" />
+ <input type="submit" name="not_submit" value="<{$block.submit_button}>" />
+ </td>
+ </tr>
+ </table>
</form>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_online.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_online.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_online.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,10 +1,20 @@
-<{$block.online_total}>
-<br /><br />
-<{$block.lang_members}>: <{$block.online_members}>
-<br />
-<{$block.lang_guests}>: <{$block.online_guests}>
-<br /><br />
-<{$block.online_names}>
-<a href="javascript:openWithSelfMain('<{$xoops_url}>/misc.php?action=showpopups&type=online','Online',420,350);" title="<{$block.lang_more}>">
- <{$block.lang_more}>
-</a>
\ No newline at end of file
+<div class="xo-block-online">
+ <ul class="nav nav-list">
+ <li class="nav-header">
+ <{$block.online_total}>
+ </li>
+ <li>
+ <i class="icon-user"></i>
+ <{$block.lang_members}>: <{$block.online_members}>
+ </li>
+ <li>
+ <i class="icon-globe"></i>
+ <{$block.lang_guests}>: <{$block.online_guests}>
+ </li>
+ </ul>
+ <hr />
+ <{$block.online_names}>
+ <a href="javascript:openWithSelfMain('<{$xoops_url}>/misc.php?action=showpopups&type=online','Online',420,350);" title="<{$block.lang_more}>">
+ <{$block.lang_more}>
+ </a>
+</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_search.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_search.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_search.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,8 +1,10 @@
-<div class="txtcenter">
-<form style="margin-top: 0;" action="<{xoAppUrl search.php}>" method="get">
- <input type="text" name="query" size="14" />
- <input type="hidden" name="action" value="results" /><br />
- <input type="submit" value="<{$block.lang_search}>" />
-</form>
-<a href="<{xoAppUrl search.php}>" title="<{$block.lang_advsearch}>"><{$block.lang_advsearch}></a>
+<div class="xo-block-search">
+ <form action="<{xoAppUrl search.php}>" method="get">
+ <input class="span2" type="text" name="query">
+ <input type="hidden" name="action" value="results" />
+ <div class="btn-group">
+ <button class="btn btn-primary btn-small" type="submit"><{$block.lang_search}></button>
+ <a class="btn btn-small" href="<{xoAppUrl search.php}>" title="<{$block.lang_advsearch}>"><{$block.lang_advsearch}></a>
+ </div>
+ </form>
</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_siteinfo.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_siteinfo.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_siteinfo.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,34 +1,43 @@
-<table class="outer collapse">
-
- <{if $block.showgroups == true}>
-
- <!-- start group loop -->
- <{foreach item=group from=$block.groups}>
- <tr>
- <th colspan="2"><{$group.name}></th>
- </tr>
-
- <!-- start group member loop -->
- <{foreach item=user from=$group.users}>
- <tr>
- <td class="even txtcenter alignmiddle">
- <img style="width:32px;" src="<{$user.avatar}>" alt="<{$user.name}>" /><br />
- <a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>" title="<{$user.name}>"><{$user.name}></a>
- </td>
- <td class="odd width20 txtright alignmiddle">
- <{$user.msglink}>
- </td>
- </tr>
- <{/foreach}>
- <!-- end group member loop -->
-
- <{/foreach}>
- <!-- end group loop -->
- <{/if}>
-</table>
-
-<br />
-
-<div class="txtcenter marg3">
- <img src="<{$block.logourl}>" alt="" /><br /><{$block.recommendlink}>
+<div class="xo-block-siteinfo">
+ <ul class="nav nav-list">
+ <{if $block.showgroups == true}>
+ <!-- start group loop -->
+ <{foreach item=group from=$block.groups}>
+ <li class="nav-header">
+ <{$group.name}>
+ </li>
+ <!-- start group member loop -->
+ <{foreach item=user from=$group.users}>
+ <li>
+ <img class="thumbnail pull-left" src="<{$user.avatar}>" alt="<{$user.name}>">
+ <div class="pull-left">
+ <h5>
+ <a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>" title="<{$user.name}>">
+ <i class="icon-user"></i>
+ <{$user.name}>
+ </a>
+ </h5>
+ <{if $user.pm_link}>
+ <a class="pull-left" href="javascript:openWithSelfMain('<{$user.pm_link}>','pmlite',500,450)">
+ <i class="ico-email"></i>
+ </a>
+ <{/if}>
+ <{if $user.msg_link}>
+ <a class="pull-left" href="mailto:<{$user.msg_link}>">
+ <i class="ico-email"></i>
+ </a>
+ <{/if}>
+ </div>
+ </li>
+ <{/foreach}>
+ <!-- end group member loop -->
+ <{/foreach}>
+ <!-- end group loop -->
+ <{/if}>
+ </ul>
+</div>
+<div class="clear"></div>
+<hr />
+<div class="pagination-centered">
+ <img src="<{$block.logourl}>" alt=""><br /><{$block.recommendlink}>
</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_themes.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_themes.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_themes.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,5 +1,5 @@
-<div class="txtcenter">
-<form action="<{xoAppUrl index.php}>" method="post">
-<{$block.theme_select}>
-</form>
+<div class="xo-block-theme">
+ <form action="<{xoAppUrl index.php}>" method="post">
+ <{$block.theme_select}>
+ </form>
</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_topusers.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_topusers.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_topusers.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,14 +1,18 @@
-<table cellspacing="1" class="outer">
- <{foreach item=user from=$block.users}>
- <tr class="<{cycle values='even,odd'}> alignmiddle">
- <td><{$user.rank}></td>
- <td class="txtcenter">
- <{if $user.avatar != ""}>
- <img style="width:32px;" src="<{$user.avatar}>" alt="<{$user.name}>" /><br />
- <{/if}>
- <a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>" title="<{$user.name}>"><{$user.name}></a>
- </td>
- <td class="txtcenter"><{$user.posts}></td>
- </tr>
- <{/foreach}>
-</table>
+<div class="xo-block-topuser">
+ <table class="table table-striped table-condensed">
+ <tbody>
+ <{foreach item=user from=$block.users}>
+ <tr>
+ <td class="txt-centered"><{$user.rank}></td>
+ <td class="txt-centered span1">
+ <{if $user.avatar != ""}>
+ <img class="thumbnail" src="<{$user.avatar}>" alt="<{$user.name}>" />
+ <{/if}>
+ <h5><a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>" title="<{$user.name}>"><{$user.name}></a></h5>
+ </td>
+ <td class="txt-centered"><{$user.posts}></td>
+ </tr>
+ <{/foreach}>
+ </tbody>
+ </table>
+</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,16 +1,49 @@
-<div id="usermenu">
- <{if $xoops_isadmin}>
- <a class="menuTop" href="<{xoAppUrl admin.php}>" title="<{$block.lang_adminmenu}>"><{$block.lang_adminmenu}></a>
- <a href="<{xoAppUrl user.php}>" title="<{$block.lang_youraccount}>"><{$block.lang_youraccount}></a>
- <{else}>
- <a class="menuTop" href="<{xoAppUrl user.php}>" title="<{$block.lang_youraccount}>"><{$block.lang_youraccount}></a>
- <{/if}>
- <a href="<{xoAppUrl edituser.php}>" title="<{$block.lang_editaccount}>"><{$block.lang_editaccount}></a>
- <a href="<{xoAppUrl notifications.php}>" title="<{$block.lang_notifications}>"><{$block.lang_notifications}></a>
- <{if $block.new_messages > 0}>
- <a class="highlight" href="<{xoAppUrl viewpmsg.php}>" title="<{$block.lang_inbox}>"><{$block.lang_inbox}> (<strong><{$block.new_messages}></strong>)</a>
- <{else}>
- <a href="<{xoAppUrl viewpmsg.php}>" title="<{$block.lang_inbox}>"><{$block.lang_inbox}></a>
- <{/if}>
- <a href="<{xoAppUrl user.php?op=logout}>" title="<{$block.lang_logout}>"><{$block.lang_logout}></a>
-</div>
+<ul class="nav nav-list">
+ <{if $xoops_isadmin}>
+ <li>
+ <a href="<{xoAppUrl admin.php}>" title="<{$block.lang_adminmenu}>">
+ <i class="icon-wrench"></i>
+ <{$block.lang_adminmenu}>
+ </a>
+ </li>
+ <{/if}>
+ <li>
+ <a href="<{xoAppUrl user.php}>" title="<{$block.lang_youraccount}>">
+ <i class="icon-user"></i>
+ <{$block.lang_youraccount}>
+ </a>
+ </li>
+ <li>
+ <a href="<{xoAppUrl edituser.php}>" title="<{$block.lang_editaccount}>">
+ <i class="icon-edit"></i>
+ <{$block.lang_editaccount}>
+ </a>
+ </li>
+ <li>
+ <a href="<{xoAppUrl notifications.php}>" title="<{$block.lang_notifications}>">
+ <i class="icon-comment"></i>
+ <{$block.lang_notifications}>
+ </a>
+ </li>
+ <{if $block.new_messages > 0}>
+ <li>
+ <a class="highlight" href="<{xoAppUrl viewpmsg.php}>" title="<{$block.lang_inbox}>">
+ <i class="icon-envelope"></i>
+ <{$block.lang_inbox}> (<strong><{$block.new_messages}></strong>)
+ </a>
+ </li>
+ <{else}>
+ <li>
+ <a href="<{xoAppUrl viewpmsg.php}>" title="<{$block.lang_inbox}>">
+ <i class="icon-envelope"></i>
+ <{$block.lang_inbox}>
+ </a>
+ </li>
+ <{/if}>
+ <li>
+ <a href="<{xoAppUrl user.php?op=logout}>" title="<{$block.lang_logout}>">
+ <i class="icon-off"></i>
+ <{$block.lang_logout}>
+ </a>
+ </li>
+</ul>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_waiting.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_waiting.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_waiting.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,5 +1,10 @@
-<ul>
- <{foreach item=module from=$block.modules}>
- <li><a href="<{$module.adminlink}>" title="<{$module.lang_linkname}>"><{$module.lang_linkname}></a>: <{$module.pendingnum}></li>
- <{/foreach}>
+<ul class="nav nav-list">
+ <{foreach item=module from=$block.modules}>
+ <li>
+ <a href="<{$module.adminlink}>" title="<{$module.lang_linkname}>">
+ <i class="icon-time"></i>
+ <{$module.lang_linkname}> : <{$module.pendingnum}>
+ </a>
+ </li>
+ <{/foreach}>
</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.
|
|
From: <be...@us...> - 2012-05-23 21:23:52
|
Revision: 9585
http://xoops.svn.sourceforge.net/xoops/?rev=9585&view=rev
Author: beckmi
Date: 2012-05-23 21:23:46 +0000 (Wed, 23 May 2012)
Log Message:
-----------
Fixing typo
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_index.html
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-23 17:35:10 UTC (rev 9584)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin.php 2012-05-23 21:23:46 UTC (rev 9585)
@@ -80,7 +80,7 @@
if (false != $error) {
$op = $system->cleanVars($_REQUEST, 'op', '', 'string');
- if ($op == 'system_avtivate') {
+ if ($op == 'system_activate') {
$part = $system->cleanVars($_REQUEST, 'type', '', 'string');
$config_handler = $xoops->getHandlerConfig();
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-23 17:35:10 UTC (rev 9584)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_index.html 2012-05-23 21:23:46 UTC (rev 9585)
@@ -29,7 +29,7 @@
<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="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}>" />
+ <img class="xo-tooltip" id="<{$menu.file}>" onclick="system_setStatus( { op: 'system_activate', 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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-06-16 20:45:40
|
Revision: 9662
http://xoops.svn.sourceforge.net/xoops/?rev=9662&view=rev
Author: mageg
Date: 2012-06-16 20:45:34 +0000 (Sat, 16 Jun 2012)
Log Message:
-----------
Use moduleadmin for system/preferences
Modified Paths:
--------------
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/language/english/admin/preferences.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_preferences.html
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-06-16 18:12:06 UTC (rev 9661)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php 2012-06-16 20:45:34 UTC (rev 9662)
@@ -66,10 +66,12 @@
if (!is_object($confcat)) {
$xoops->redirect('admin.php?fct=preferences', 1);
}
- $system_breadcrumb->addLink(_AM_SYSTEM_PREFERENCES_NAV_MAIN, system_adminVersion('preferences', 'adminpath'));
- $system_breadcrumb->addLink(constant($confcat->getVar('confcat_name')));
- $system_breadcrumb->addHelp(system_adminVersion('preferences', 'help'));
- $system_breadcrumb->render();
+ // Define Breadcrumb and tips
+ $admin_page = new XoopsModuleAdmin();
+ $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(_AM_SYSTEM_PREFERENCES_NAV_MAIN, $system->adminVersion('preferences', 'adminpath'));
+ $admin_page->addBreadcrumbLink(constant($confcat->getVar('confcat_name')));
+ $admin_page->renderBreadcrumb();
/* @var $form SystemPreferenceForm */
$form = $xoops->getModuleForm(null, 'preference');
$form->getForm($confcat);
@@ -94,10 +96,12 @@
$module = $module_handler->getById($mod);
$xoops->loadLanguage('modinfo', $module->getVar('dirname'));
- $system_breadcrumb->addLink(_AM_SYSTEM_PREFERENCES_NAV_MAIN, system_adminVersion('preferences', 'adminpath'));
- $system_breadcrumb->addLink($module->getVar('name'));
- $system_breadcrumb->addHelp(system_adminVersion('preferences', 'help'));
- $system_breadcrumb->render();
+ // Define Breadcrumb and tips
+ $admin_page = new XoopsModuleAdmin();
+ $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(_AM_SYSTEM_PREFERENCES_NAV_MAIN, $system->adminVersion('plugins', 'adminpath'));
+ $admin_page->addBreadcrumbLink($module->getVar('name'));
+ $admin_page->renderBreadcrumb();
/* @var $form SystemPreferenceForm */
$form = $xoops->getModuleForm(null, 'preference');
@@ -175,10 +179,14 @@
default:
// Display setting cats
- $system_breadcrumb->addLink(_AM_SYSTEM_PREFERENCES_NAV_MAIN);
- $system_breadcrumb->addTips(_AM_SYSTEM_PREFERENCES_NAV_TIPS);
- $system_breadcrumb->addHelp(system_adminVersion('preferences', 'help'));
- $system_breadcrumb->render();
+ // Define Breadcrumb and tips
+ $admin_page = new XoopsModuleAdmin();
+ $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(_AM_SYSTEM_PREFERENCES_NAV_MAIN, $system->adminVersion('plugins', 'adminpath'));
+ $admin_page->addBreadcrumbLink(_AM_SYSTEM_PREFERENCES_MAIN);
+ $admin_page->addTips(_AM_SYSTEM_PREFERENCES_NAV_TIPS);
+ $admin_page->renderBreadcrumb();
+ $admin_page->renderTips();
$confcat_handler = $xoops->getHandlerConfigcategory();
$confcats = $confcat_handler->getCategoryObjects();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/preferences.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/preferences.php 2012-06-16 18:12:06 UTC (rev 9661)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/preferences.php 2012-06-16 20:45:34 UTC (rev 9662)
@@ -12,6 +12,7 @@
//Nav
define("_AM_SYSTEM_PREFERENCES_NAV_MAIN","Preferences");
+define("_AM_SYSTEM_PREFERENCES_MAIN","Main");
/*define("_AM_SYSTEM_PREFERENCES_NAV_MD_AM_GENERAL","General Settings");
define("_AM_SYSTEM_PREFERENCES_NAV_MD_AM_USERSETTINGS","User Info Settings");
define("_AM_SYSTEM_PREFERENCES_NAV_MD_AM_METAFOOTER","Meta Tags and Footer");
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-06-16 18:12:06 UTC (rev 9661)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_preferences.html 2012-06-16 20:45:34 UTC (rev 9662)
@@ -1,4 +1,6 @@
-<{includeq file="admin:system|system_header.html"}>
+<{includeq file="admin:system|admin_breadcrumb.html"}>
+<{includeq file="admin:system|admin_tips.html"}>
+
<!--Preferences-->
<{if $menu}>
<div class="xo-catsetting">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-09-12 16:52:06
|
Revision: 10172
http://xoops.svn.sourceforge.net/xoops/?rev=10172&view=rev
Author: mageg
Date: 2012-09-12 16:51:55 +0000 (Wed, 12 Sep 2012)
Log Message:
-----------
update form for module system
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/testform.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php 2012-09-11 10:41:55 UTC (rev 10171)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php 2012-09-12 16:51:55 UTC (rev 10172)
@@ -59,10 +59,10 @@
if ($config[$i]->getVar('conf_valuetype') == 'array') {
// this is exceptional.. only when value type is arrayneed a smarter way for this
$ele = ($config[$i]->getVar('conf_value') != '')
- ? new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $config[$i]->getConfValueForOutput())), 5, 50)
- : new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), '', 5, 50);
+ ? new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $config[$i]->getConfValueForOutput())), 5, 5)
+ : new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), '', 5, 5);
} else {
- $ele = new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars($config[$i]->getConfValueForOutput()), 5, 50);
+ $ele = new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars($config[$i]->getConfValueForOutput()), 5, 5);
}
break;
@@ -217,7 +217,7 @@
case 'textbox':
default:
$myts = MyTextSanitizer::getInstance();
- $ele = new XoopsFormText($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
+ $ele = new XoopsFormText($title, $config[$i]->getVar('conf_name'), 5, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
break;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/testform.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/testform.php 2012-09-11 10:41:55 UTC (rev 10171)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/testform.php 2012-09-12 16:51:55 UTC (rev 10172)
@@ -122,8 +122,8 @@
$select_tray->addOption(6, 'Select_tray 6');
$select_tray->setDescription('Description Select_tray');
$select_tray->setClass('span2');
+$testtray ->addElement($select_tray, true);
$testtray ->addElement($select_tray);
-$testtray ->addElement($select_tray);
$form->addElement($testtray);
$button = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X