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

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

Revision: 13150
          http://sourceforge.net/p/xoops/svn/13150
Author:   beckmi
Date:     2015-09-21 20:09:40 +0000 (Mon, 21 Sep 2015)
Log Message:
-----------
add option to set height of Themes block

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt
    XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/blocks.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/xoops_version.php

Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt	2015-09-21 19:59:57 UTC (rev 13149)
+++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt	2015-09-21 20:09:40 UTC (rev 13150)
@@ -24,6 +24,7 @@
 - added strong { font-weight: bold; } to reset.css (mamba)
 - added .tpl option for module Help files (mamba)
 - fix moved "count($tagsArray)" and "count($attrArray)" outside of FOR loop in xoopsfilterinput.php (mamba)
+- add option to set height of Themes block (mamba)
 
 
 Security fixes

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	2015-09-21 19:59:57 UTC (rev 13149)
+++ XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt	2015-09-21 20:09:40 UTC (rev 13150)
@@ -12,6 +12,12 @@
 /modules/system/language/english/admin/modulesadmin.php
 - added define('_AM_SYSTEM_MODULES_INSTALL_MORE',"Install more modules");
 
+/modules/system/language/english/admin\users.php
+define('_AM_SYSTEM_USERS_ACTIVATE', 'Activate User');
+
+/modules/system/language/english/blocks.php
+define('_MB_SYSTEM_BLOCK_HEIGHT',"Block Height (lines)");	
+
 ===============================
 2014/06/14: Version 2.5.7 Final
 ===============================

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php	2015-09-21 19:59:57 UTC (rev 13149)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php	2015-09-21 20:09:40 UTC (rev 13150)
@@ -642,7 +642,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=\"".(int)($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 name="xoops_theme_select" onchange="submit();" size="'. $options[2] .'">'.$theme_options.'</select>';
     }
 
     $block['theme_select'] .= '<br />('.sprintf(_MB_SYSTEM_NUMTHEME, '<strong>'.count($xoopsConfig['theme_set_allowed']).'</strong>').')<br />';
@@ -671,6 +671,8 @@
     $form .= '&nbsp;<input type="radio" name="options[0]" value="0"'.$chk.' />'._NO;
     $form .= '<br />'._MB_SYSTEM_THWIDTH.'&nbsp;';
     $form .= "<input type='text' name='options[1]' value='".$options[1]."' />";
+        $form .= '<br />'._MB_SYSTEM_BLOCK_HEIGHT.'&nbsp;';
+    $form .= "<input type='text' name='options[2]' value='".$options[2]."' />";
 
     return $form;
 }

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/blocks.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/blocks.php	2015-09-21 19:59:57 UTC (rev 13149)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/blocks.php	2015-09-21 20:09:40 UTC (rev 13150)
@@ -44,3 +44,5 @@
 define('_MB_SYSTEM_THSHOW',"Display screenshot image");
 define('_MB_SYSTEM_THWIDTH',"Screenshot image width");
 define('_MB_SYSTEM_REMEMBERME',"Remember me");
+//2.5.8
+define('_MB_SYSTEM_BLOCK_HEIGHT',"Block Height (lines)");	
\ No newline at end of file

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/xoops_version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/xoops_version.php	2015-09-21 19:59:57 UTC (rev 13149)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/xoops_version.php	2015-09-21 20:09:40 UTC (rev 13150)
@@ -175,7 +175,7 @@
 $modversion['blocks'][12]['name'] = _MI_SYSTEM_BNAME13;
 $modversion['blocks'][12]['description'] = 'Shows theme selection box';
 $modversion['blocks'][12]['show_func'] = 'b_system_themes_show';
-$modversion['blocks'][12]['options'] = '0|80';
+$modversion['blocks'][12]['options'] =  '0|80|3';
 $modversion['blocks'][12]['edit_func'] = 'b_system_themes_edit';
 $modversion['blocks'][12]['template'] = 'system_block_themes.html';