[xoops-svn] SF.net SVN: xoops-svn:[12390] XoopsCore/branches/2.5.x/2.5.7

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

Revision: 12390
          http://sourceforge.net/p/xoops/svn/12390
Author:   beckmi
Date:     2014-03-18 21:02:55 +0000 (Tue, 18 Mar 2014)
Log Message:
-----------
fixed icons for active module sections in System module not shown correctly (Slider84/mamba) 

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
    XoopsCore/branches/2.5.x/2.5.7/docs/lang_diff.txt
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_index.html

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	2014-03-17 13:49:38 UTC (rev 12389)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt	2014-03-18 21:02:55 UTC (rev 12390)
@@ -7,6 +7,8 @@
 Bugfixes:
 - fixed System Module image manager html/js bugs (luciorota)
 - replaced "array_diff_assoc" with "array_diff_key" in /class/theme_blocks.php (masel/mamba)
+- icons for active module sections in System module not shown correctly (Slider84/mamba)  
+- added two new language definitions (see lang_diff.txt)
 
 ===============================
 2014/03/06: Version 2.5.7 Beta 1

Modified: XoopsCore/branches/2.5.x/2.5.7/docs/lang_diff.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/lang_diff.txt	2014-03-17 13:49:38 UTC (rev 12389)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/lang_diff.txt	2014-03-18 21:02:55 UTC (rev 12390)
@@ -2,7 +2,18 @@
 =====================
 
 Below are language differences from a version to next version.
+
 ===============================
+2014/03/18: Version 2.5.7 RC1
+===============================
+ADDED/DELETED DEFINES
+
+/modules/system/language/english/admin.php
+- added define('_AM_SYSTEM_USAGE',"Usage");
+- added define('_AM_SYSTEM_ACTIVE',"Active");
+
+
+===============================
 2012/04/15: Version 2.5.5
 ===============================
 ADDED/DELETED DEFINES

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin.php	2014-03-17 13:49:38 UTC (rev 12389)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin.php	2014-03-18 21:02:55 UTC (rev 12390)
@@ -130,7 +130,7 @@
 
             if ($modversion['hasAdmin']) {
 
-                if ( xoops_getModuleOption('active_' . $directory) ) {
+                if ( xoops_getModuleOption('active_' . $directory, 'system') ) {
                     $category = isset($modversion['category']) ? intval($modversion['category']) : 0;
                     if ( false != $all_ok || in_array($modversion['category'], $ok_syscats)) {
                         $menu['file']  = $directory;

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin.php	2014-03-17 13:49:38 UTC (rev 12389)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin.php	2014-03-18 21:02:55 UTC (rev 12390)
@@ -71,3 +71,7 @@
 define('_MD_AM_PERMRESETNG',"Could not reset group permission for module %s");
 define('_MD_AM_PERMADDNGP',"All parent items must be selected.");
 define('_AM_SYSTEM_UNINSTALL',"Uninstall");
+
+//2.5.7
+define('_AM_SYSTEM_USAGE',"Usage");
+define('_AM_SYSTEM_ACTIVE',"Active");

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_index.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_index.html	2014-03-17 13:49:38 UTC (rev 12389)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_index.html	2014-03-18 21:02:55 UTC (rev 12390)
@@ -8,11 +8,11 @@
         <tr>
             <th class="txtcenter"><{$smarty.const._AM_SYSTEM_SECTION}></th>
             <th class="txtcenter"><{$smarty.const._AM_SYSTEM_DESC}></th>
-            <th class="txtcenter">&nbsp;</th>
-            <th class="txtcenter">&nbsp;</th>
+            <th class="txtcenter"><{$smarty.const._AM_SYSTEM_USAGE}></th>
+            <th class="txtcenter"><{$smarty.const._AM_SYSTEM_ACTIVE}></th>
         </tr>
     </thead>
-    
+
     <tbody>
     <{foreach item=menu from=$menu}>
     <{if $menu.title}>
@@ -35,4 +35,4 @@
     <{/if}>
     <{/foreach}>
     </tbody>
-</table>
\ No newline at end of file
+</table>