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

Merge pull request #374 from marc1706/ticket/365

Browse Source 
[ticket/365] Fix alignment in rtl languages
This commit is contained in:
Marc Alexander
2014-09-19 00:14:19 +02:00
parent 099a089145 da83856c00
commit d9ea2e4dda
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
styles/prosilver/template/portal/_block_config.html
View File

@@ -1,6 +1,6 @@
<!-- Config for the left and right blocks //--> <!-- Config for the left and right blocks //-->
<!-- DEFINE $LR_BLOCK_H_L = '<div class="forabg"><div class="inner"><ul class="topiclist"><li class="header"><dl><dt style="padding: 0px 0px 2px; white-space: nowrap; margin-bottom: 0px; margin-top: 0px;">' --> <!-- DEFINE $LR_BLOCK_H_L = '<div class="forabg"><div class="inner"><ul class="topiclist"><li class="header"><dl><dt style="padding: 0px 0px 2px; white-space: nowrap; margin-bottom: 0px; margin-top: 0px;">' -->
<!-- DEFINE $LR_BLOCK_H_R = '</dt><dd></dd></dl></li></ul><ul class="topiclist forums"><li><dl><dt></dt><dd style="border-left: 0px; width: 100%;"><div style="text-align: left; margin: 5px 5px 5px 5px">' --> <!-- DEFINE $LR_BLOCK_H_R = '</dt><dd></dd></dl></li></ul><ul class="topiclist forums"><li><dl><dt></dt><dd class="portal-side-wrapper"><div class="portal-side">' -->
<!-- DEFINE $LR_BLOCK_F_L = '</div></dd></dl></li></ul>' --> <!-- DEFINE $LR_BLOCK_F_L = '</div></dd></dl></li></ul>' -->
<!-- DEFINE $LR_BLOCK_F_R = '</div></div><br class="portal-clear" />' --> <!-- DEFINE $LR_BLOCK_F_R = '</div></div><br class="portal-clear" />' -->

19
styles/prosilver/theme/portal.css
View File

@@ -39,6 +39,10 @@
text-decoration: underline; text-decoration: underline;
} }
.rtl .portal-navigation .menutitle {
text-align: right;
}
.calendar-info { .calendar-info {
list-style-type: none; list-style-type: none;
} }
@@ -300,6 +304,20 @@ a.portal-forumtitle {
width: 100%; width: 100%;
} }
.portal-side {
text-align: left;
margin: 5px 5px 5px 5px
}
.rtl .portal-side {
text-align: right;
}
.portal-side-wrapper {
border-left: 0;
width: 100%;
}
/* /*
* This is needed in order to have the same spacing between blocks * This is needed in order to have the same spacing between blocks
* as we have between the top blocks and the headerbar * as we have between the top blocks and the headerbar
@@ -352,6 +370,7 @@ a.portal-forumtitle {
background-image: url("./images/portal/arrowbullet_rtl.gif"); background-image: url("./images/portal/arrowbullet_rtl.gif");
background-position: center right; /* custom bullet list image */ background-position: center right; /* custom bullet list image */
padding-right: 19px; /* link text is indented 19px */ padding-right: 19px; /* link text is indented 19px */
text-align: right;
} }
/* Portal clock /* Portal clock

6
tests/unit/event/listener_test.php
View File

@@ -58,12 +58,16 @@ class listener_test extends \phpbb_template_template_test_case
new \phpbb_mock_cache() new \phpbb_mock_cache()
); );
$finder->set_extensions(array_keys($manager->all_enabled())); $finder->set_extensions(array_keys($manager->all_enabled()));
$request = new \phpbb_mock_request();
$request->overwrite('SCRIPT_NAME', 'app.php', \phpbb\request\request_interface::SERVER);
$request->overwrite('SCRIPT_FILENAME', 'app.php', \phpbb\request\request_interface::SERVER);
$request->overwrite('REQUEST_URI', 'app.php', \phpbb\request\request_interface::SERVER);
$this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '1')); $this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '1'));
$provider = new \phpbb\controller\provider(); $provider = new \phpbb\controller\provider();
$provider->find_routing_files($finder); $provider->find_routing_files($finder);
$provider->find(dirname(__FILE__) . '/'); $provider->find(dirname(__FILE__) . '/');
$this->controller_helper = new \phpbb_mock_controller_helper($this->template, $this->user, $this->config, $provider, $manager, '', 'php', dirname(__FILE__) . '/'); $this->controller_helper = new \phpbb_mock_controller_helper($this->template, $this->user, $this->config, $provider, $manager, new \phpbb\symfony_request($request), new \phpbb\filesystem(), '', 'php', dirname(__FILE__) . '/');
$this->path_helper = new \phpbb\path_helper( $this->path_helper = new \phpbb\path_helper(
new \phpbb\symfony_request( new \phpbb\symfony_request(