Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9406] XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/ system
|
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.
|
