From 710766066939278561b3ff432d0540464e2845c0 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 18 Sep 2014 22:55:20 +0200
Subject: [PATCH 1/2] [ticket/365] Fix alignment in rtl languages

B3P-365
---
 .../template/portal/_block_config.html        |  2 +-
 styles/prosilver/theme/portal.css             | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/styles/prosilver/template/portal/_block_config.html b/styles/prosilver/template/portal/_block_config.html
index 440c7563..3929d4de 100644
--- a/styles/prosilver/template/portal/_block_config.html
+++ b/styles/prosilver/template/portal/_block_config.html
@@ -1,6 +1,6 @@
 <!-- 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_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_R = '</div></div><br class="portal-clear" />' -->
 
diff --git a/styles/prosilver/theme/portal.css b/styles/prosilver/theme/portal.css
index 032dcae2..a14ef214 100644
--- a/styles/prosilver/theme/portal.css
+++ b/styles/prosilver/theme/portal.css
@@ -39,6 +39,10 @@
 	text-decoration: underline;
 }
 
+.rtl .portal-navigation .menutitle {
+	text-align: right;
+}
+
 .calendar-info {
 	list-style-type: none;
 }
@@ -300,6 +304,20 @@ a.portal-forumtitle {
 	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
 * 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-position: center right; /* custom bullet list image */
 	padding-right: 19px; /* link text is indented 19px */
+	text-align: right;
 }
 
 /* Portal clock

From da83856c00650d7daf3610b5de81bf1fac761639 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 18 Sep 2014 23:39:04 +0200
Subject: [PATCH 2/2] [ticket/365] Fix tests due to controller helper changes

B3P-365
---
 tests/unit/event/listener_test.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/unit/event/listener_test.php b/tests/unit/event/listener_test.php
index 7dcd5c35..02f469ff 100644
--- a/tests/unit/event/listener_test.php
+++ b/tests/unit/event/listener_test.php
@@ -58,12 +58,16 @@ class listener_test extends \phpbb_template_template_test_case
 			new \phpbb_mock_cache()
 		);
 		$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'));
 		$provider = new \phpbb\controller\provider();
 		$provider->find_routing_files($finder);
 		$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(
 			new \phpbb\symfony_request(