[Xoops-svn] SF.net SVN: xoops-svn:[12778] XoopsCore/branches/2.5.x/2.5.8

[<be...@us...>]

Revision: 12778
          http://sourceforge.net/p/xoops/svn/12778
Author:   beckmi
Date:     2014-09-14 10:03:01 +0000 (Sun, 14 Sep 2014)
Log Message:
-----------
fixing links to module after its installation

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php

Modified: XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt	2014-09-08 06:08:43 UTC (rev 12777)
+++ XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt	2014-09-14 10:03:01 UTC (rev 12778)
@@ -4,6 +4,15 @@
 Below are language differences from a version to next version.
 
 ===============================
+NOT RELEASED: Version 2.5.8 Beta
+===============================
+ADDED/DELETED DEFINES
+
+/install/language/english/install.php
+/modules/system/language/english/admin/modulesadmin.php
+- added define('_AM_SYSTEM_MODULES_INSTALL_MORE',"Install more modules");
+
+===============================
 2014/06/14: Version 2.5.7 Final
 ===============================
 ADDED/DELETED DEFINES

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php	2014-09-08 06:08:43 UTC (rev 12777)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php	2014-09-14 10:03:01 UTC (rev 12778)
@@ -422,24 +422,26 @@
             $msgs[] = '</div></div>';
 
             $blocks = $module->getInfo('blocks');
-            $msgs[] = '<div class="noininstall center"><a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . '</a> |
-                        <a href="admin.php?fct=modulesadmin&op=installlist">' . _AM_SYSTEM_MODULES_TOINSTALL . '</a> | ';
+            $redDevider = '<span class="red bold">  |  </span>';
+            $msgs[] = '<div class="noininstall center"><a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . $redDevider . '
+            </a> <a href="admin.php?fct=modulesadmin&op=installlist">' . _AM_SYSTEM_MODULES_INSTALL_MORE . '</a>';
             $msgs[] = '<br /><span class="red bold">' . _AM_SYSTEM_MODULES_MODULE . ' ' . $module->getInfo('name') . ': </span></div>';
+            $msg0 = '<div class="center">';
+            $msgBlocks = $msgAdmin = $msgTestData = '';
             if ($blocks != false) {
-                $msgs[] = '<div class="center"><a href="admin.php?fct=blocksadmin&op=list&filter=1&selgen=' . $newmid . '&selmod=-2&selgrp=-1&selvis=-1&filsave=1">' . _AM_SYSTEM_BLOCKS . '</a></div>';
-            }
-            ;
-            $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>';
+                $msgBlocks = '<a href="admin.php?fct=blocksadmin&op=list&filter=1&selgen=' . $newmid . '&selmod=-2&selgrp=-1&selvis=-1&filsave=1">' . _AM_SYSTEM_BLOCKS . '</a> ' . $redDevider;
+            };
+            $msgAdmin = '<a href="admin.php?fct=preferences&op=showmod&mod=' . $newmid . '">' . _AM_SYSTEM_PREF . '</a> ' . $redDevider . '
+            <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>';
+                $msgTestData = $redDevider . ' <a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/testdata/index.php' . '">' . _AM_SYSTEM_MODULES_INSTALL_TESTDATA . '</a></div>';
             } else {
-                $msgs[] = '</div>';
+                $msgTestData = '</div>';
             }
+            $msgs[] = $msg0 . $msgBlocks . $msgAdmin . $msgTestData;
 
-
             $ret = implode('<br />', $msgs);
             unset($blocks);
             unset($msgs);

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php	2014-09-08 06:08:43 UTC (rev 12777)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php	2014-09-14 10:03:01 UTC (rev 12778)
@@ -167,3 +167,5 @@
 </ul>");
 // 2.5.7
 define('_AM_SYSTEM_MODULES_INSTALL_TESTDATA',"Add Test Data");
+// 2.5.8
+define('_AM_SYSTEM_MODULES_INSTALL_MORE',"Install more modules");