From 5c35cb9cf8064c25a993e42cedd4438c9846e37f Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 25 Aug 2014 22:49:13 +0200
Subject: [PATCH] [ticket/358] Remove use of T_EXT_THEME_PATH in attachments
 side

Additionally, we'll now also test that the portal doesn't show errors
while using subsilver.

B3P-358
---
 .../portal/modules/attachments_side.html       |  2 +-
 tests/functional/portal_no_error_test.php      | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/styles/prosilver/template/portal/modules/attachments_side.html b/styles/prosilver/template/portal/modules/attachments_side.html
index 31b4f9ff..ccaa082d 100644
--- a/styles/prosilver/template/portal/modules/attachments_side.html
+++ b/styles/prosilver/template/portal/modules/attachments_side.html
@@ -2,7 +2,7 @@
 	<!-- IF .attach_side -->
 		<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;"><strong>{L_FILENAME}</strong></span><br />
 		<!-- BEGIN attach_side -->
-			<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;" class="portal-gensmall"><img src="{T_EXT_THEME_PATH}/images/portal/icon_topic_attach.gif" alt="" />&nbsp;<a href="{attach_side.U_TOPIC}" title="{attach_side.REAL_FILENAME}"><strong>{attach_side.FILENAME}</strong></a></span><br style="clear:both" />
+			<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;" class="portal-gensmall imageset icon_topic_attach">&nbsp;</span>&nbsp;<a href="{attach_side.U_TOPIC}" title="{attach_side.REAL_FILENAME}"><strong>{attach_side.FILENAME}</strong></a><br style="clear:both" />
 			<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;padding-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->left<!-- ELSE -->right<!-- ENDIF -->:10px;">{L_FILESIZE}{L_COLON}</span><span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->left<!-- ELSE -->right<!-- ENDIF -->;padding-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->left<!-- ELSE -->right<!-- ENDIF -->:10px;" class="portal-gensmall"><strong>{attach_side.FILESIZE}</strong></span><br style="clear:both" />
 			<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;padding-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->left<!-- ELSE -->right<!-- ENDIF -->:10px;">{L_DOWNLOADS}{L_COLON}</span><span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->left<!-- ELSE -->right<!-- ENDIF -->;padding-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->left<!-- ELSE -->right<!-- ENDIF -->:10px;" class="portal-gensmall"><strong>{attach_side.DOWNLOAD_COUNT}</strong></span><br style="clear:both" />
 			<!-- IF not attach_side.S_LAST_ROW --><hr class="dashed" /><!-- ENDIF -->
diff --git a/tests/functional/portal_no_error_test.php b/tests/functional/portal_no_error_test.php
index d12b08a8..cfd58479 100644
--- a/tests/functional/portal_no_error_test.php
+++ b/tests/functional/portal_no_error_test.php
@@ -24,4 +24,22 @@ class phpbb_functional_portal_no_error_test extends \board3\portal\tests\testfra
 	{
 		self::request('GET', 'app.php/portal');
 	}
+
+	public function test_enable_subsilver()
+	{
+		$crawler = self::request('GET', 'adm/index.php?i=acp_styles&mode=install&sid=' . $this->sid);
+		$link = $crawler->selectLink('Install style')->link()->getUri();
+		$crawler = self::request('GET', substr($link, strpos($link, '/adm') + 1));
+		$this->assertContains('Style "subsilver2" has been installed', $crawler->text());
+	}
+
+	/**
+	 * @dependsOn test_enable_subsilver
+	 */
+	public function test_portal_subsilver()
+	{
+		$crawler = self::request('GET', 'app.php/portal');
+		$this->assertContains('subsilver', $crawler->text());
+		self::request('GET', 'app.php/portal?style=2');
+	}
 }