Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #442 from marc1706/ticket/426

Browse Source 
[ticket/426] Correctly align left and right columns if one is disabled
This commit is contained in:
Marc Alexander
2015-01-18 18:13:17 +01:00
parent efdaa5d5b3 b971916f61
commit 970023c03f
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controller/main.php
View File

@@ -28,7 +28,7 @@ class main
/**
* Template object
* @var \phpbb\template
* @var \phpbb\template\template
*/
protected $template;
@@ -87,7 +87,7 @@ class main
* @param \board3\portal\portal\columns $portal_columns Board3 Portal columns object
* @param \phpbb\config\config $config phpBB Config object
* @param \board3\portal\controller\helper $controller_helper Controller helper
* @param \phpbb\template $template Template object
* @param \phpbb\template\template $template Template object
* @param \phpbb\user $user User object
* @param \phpbb\path_helper $path_helper phpBB path helper
* @param string $phpbb_root_path phpBB root path

19
styles/prosilver/template/portal/assets/portal.js
View File

@@ -24,17 +24,20 @@ phpbb.b3p_fix_right_column_margin = function() {
var $portal_center = $('#portal-center');
if (width <= (895 - $.getScrollbarWidth())) {
// Get height of left and center column
var right_height = $portal_right.height();
var left_height = $portal_left.height();
// Get correct margin-left for portal-right and add 10px for padding
$portal_right.css('margin-left', - ($portal_right.width() + 1));
$portal_center.css('margin-top', Math.max(left_height, right_height) + 'px');
if ($portal_left.width() > 0) {
$portal_right.css('margin-left', - ($portal_right.width() + 1));
$portal_right.css('margin-top', $portal_center.height() + 'px');
$portal_left.css('margin-top', $portal_center.height() + 'px');
} else {
$portal_right.css('margin-left', 0);
$portal_right.css('margin-top', 0);
}
} else {
$portal_right.css('margin-top', '0px');
$portal_right.css('margin-left', -$portal_left.width());
$portal_right.width($portal_left.width());
$portal_center.css('margin-top', 0);
$portal_right.css('margin-left', -portal_right_width);
$portal_right.width(portal_right_width);
$portal_left.css('margin-top', 0);
}
};