Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11982] XoopsCore/branches/2.5.x/2.5.7
|
From: <be...@us...> - 2013-08-27 10:08:41
|
Revision: 11982
http://sourceforge.net/p/xoops/svn/11982
Author: beckmi
Date: 2013-08-27 10:08:37 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
added link to Module's Admin after "Update" (currently only to XOOPS Modules section)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/modulesadmin.php
Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-08-25 23:21:52 UTC (rev 11981)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-08-27 10:08:37 UTC (rev 11982)
@@ -17,6 +17,7 @@
- added: check if 'date.timezone' is set in php.ini, if not, set it to UTC (cesag/mamba)
- assigned _SHORTDATESTRING to _CAL_FORMAT to have consistency in local languages (jcweb/guspel)
- fixed bug in calendar.js (mamba)
+- added link to Module's Admin after "Update" (currently only to XOOPS Modules section)
===============================
2013/04/21: Version 2.5.6 Final
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php 2013-08-25 23:21:52 UTC (rev 11981)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php 2013-08-27 10:08:37 UTC (rev 11982)
@@ -861,7 +861,7 @@
}
$msgs[] = sprintf(_AM_SYSTEM_MODULES_OKUPD, '<strong>' . $module->getVar('name', 's') . '</strong>');
$msgs[] = '</div></div>';
- $msgs[] = '<div class="center"><a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . '</a></div>';
+ $msgs[] = '<div class="center"><a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . '</a> | <a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/' . $module->getInfo('adminindex') . '">' . _AM_SYSTEM_MODULES_ADMIN . '</a></div>';
foreach ($msgs as $msg) {
echo $msg.'<br />';
}
@@ -881,4 +881,4 @@
break;
}
-?>
\ No newline at end of file
+?>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2013-08-25 23:21:52 UTC (rev 11981)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2013-08-27 10:08:37 UTC (rev 11982)
@@ -425,8 +425,16 @@
}
;
$msgs[] = '<div class="noininstall center"><a href="admin.php?fct=preferences&op=showmod&mod=' . $newmid . '">' . _AM_SYSTEM_PREF . '</a>';
- $msgs[] = '<a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/' . $module->getInfo('adminindex') . '">' . _AM_SYSTEM_MODULES_ADMIN . '</a></div>';
+ $msgs[] = '<a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/' . $module->getInfo('adminindex') . '">' . _AM_SYSTEM_MODULES_ADMIN . '</a>';
+ $testdataDirectory = XOOPS_ROOT_PATH . '/modules/' . $module->getInfo('dirname', 'e') . '/testdata';
+ if (file_exists($testdataDirectory)) {
+ $msgs[] = '<a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/testdata/index.php' . '">' . _AM_SYSTEM_MODULES_INSTALL_TESTDATA . '</a></div>';
+ } else {
+ $msgs[] = '</div>';
+ }
+
+
$ret = implode('<br />', $msgs);
unset($blocks);
unset($msgs);
@@ -742,4 +750,4 @@
return $msgs;
}
-?>
\ No newline at end of file
+?>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/modulesadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/modulesadmin.php 2013-08-25 23:21:52 UTC (rev 11981)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/modulesadmin.php 2013-08-27 10:08:37 UTC (rev 11982)
@@ -7,7 +7,7 @@
* @version $Id$
*/
// Navigation
-define('_AM_SYSTEM_MODULES_ADMIN',"Modules Administration");
+define('_AM_SYSTEM_MODULES_ADMIN',"This Module Admin");
define('_AM_SYSTEM_MODULES_LIST',"Module List");
define('_AM_SYSTEM_MODULES_TOINSTALL',"Install module");
define('_AM_SYSTEM_MODULES_VALIDATE',"Validate changes");
@@ -16,7 +16,7 @@
define('_AM_SYSTEM_MODULES_RUSUREINS',"Press the button below to install this module");
define('_AM_SYSTEM_MODULES_RUSUREUNINS',"Are you sure you would like to uninstall this module?");
define('_AM_SYSTEM_MODULES_RUSUREUPD',"Press the button below to update this module");
-define('_AM_SYSTEM_MODULES_BTOMADMIN',"Back to Module Administration page");
+define('_AM_SYSTEM_MODULES_BTOMADMIN',"XOOPS Module Administration");
define('_AM_SYSTEM_MODULES_INSTALLING',"Installing ");
define('_AM_SYSTEM_MODULES_UNINSTAL',"Uninstall ");
define('_AM_SYSTEM_MODULES_DEACTIVATE',"Deactivate ");
@@ -155,7 +155,7 @@
define('_AM_SYSTEM_MODULES_TABLE_DROPPED_ERROR',"ERROR: Could not drop table %s");
define('_AM_SYSTEM_MODULES_TABLE_DROPPED_FAILDED',"ERROR: Not allowed to drop table %s !");
// Tips
-define('_AM_SYSTEM_MODULES_TIPS',
+define('_AM_SYSTEM_MODULES_TIPS',
"<ul>
<li>If you install a new module, remember to setup module preferences, blocks and users permissions!</li>
<li>For hide module into Main Menu block, set order to 0</li>
@@ -165,4 +165,6 @@
define('_AM_SYSTEM_MODULES_CONFIRM_TIPS',
"<ul>
<li>Check all modifications for validate.</li>
-</ul>");
\ No newline at end of file
+</ul>");
+// 2.5.7
+define('_AM_SYSTEM_MODULES_INSTALL_TESTDATA',"Add Test Data");
|
