aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-05-11 10:24:03 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-05-11 10:24:03 +0200
commit135b76b6432f88e850b0149473af1b46408e4c91 (patch)
tree6cdc75ca2f37e6fee6717d4891541980fa2d18e0 /phpBB/styles
parent61c92c07eefdae649ab01ae16051e24f3a208058 (diff)
parent1cdff6067640bcd7c0d408ce73f5e4fbb5121526 (diff)
downloadforums-135b76b6432f88e850b0149473af1b46408e4c91.tar
forums-135b76b6432f88e850b0149473af1b46408e4c91.tar.gz
forums-135b76b6432f88e850b0149473af1b46408e4c91.tar.bz2
forums-135b76b6432f88e850b0149473af1b46408e4c91.tar.xz
forums-135b76b6432f88e850b0149473af1b46408e4c91.zip
Merge pull request #2340 from PayBas/ticket/12431
[ticket/12431] Add has_poll icon to topiclists * PayBas/ticket/12431: [ticket/12431] Lang full sentence [ticket/12431] Add topic poll icon. [ticket/12431] Add has_poll icon to topiclists
Diffstat (limited to 'phpBB/styles')
-rw-r--r--phpBB/styles/prosilver/template/search_results.html1
-rw-r--r--phpBB/styles/prosilver/template/viewforum_body.html1
-rw-r--r--phpBB/styles/prosilver/theme/images/icon_topic_poll.gifbin0 -> 120 bytes
-rw-r--r--phpBB/styles/prosilver/theme/imageset.css5
4 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index 41af5a5183..0043da4507 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -85,6 +85,7 @@
</ul>
</div>
<!-- ENDIF -->
+ <!-- IF searchresults.S_HAS_POLL -->{POLL_IMG} <!-- ENDIF -->
{L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} &raquo; {searchresults.FIRST_POST_TIME} &raquo; {L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a>
<!-- EVENT topiclist_row_append -->
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 6646f40f01..7a0ebaafcf 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -163,6 +163,7 @@
</div>
<!-- ENDIF -->
<div class="responsive-hide">
+ <!-- IF topicrow.S_HAS_POLL -->{POLL_IMG} <!-- ENDIF -->
<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --> &raquo; {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/theme/images/icon_topic_poll.gif b/phpBB/styles/prosilver/theme/images/icon_topic_poll.gif
new file mode 100644
index 0000000000..1c80ec87c1
--- /dev/null
+++ b/phpBB/styles/prosilver/theme/images/icon_topic_poll.gif
Binary files differ
diff --git a/phpBB/styles/prosilver/theme/imageset.css b/phpBB/styles/prosilver/theme/imageset.css
index 6bc345889e..8e3348a99d 100644
--- a/phpBB/styles/prosilver/theme/imageset.css
+++ b/phpBB/styles/prosilver/theme/imageset.css
@@ -350,6 +350,11 @@ span.imageset {
padding-left: 16px;
padding-top: 14px;
}
+.imageset.icon_topic_poll {
+ background-image: url("./images/icon_topic_poll.gif");
+ padding-left: 11px;
+ padding-top: 10px;
+}
.imageset.icon_user_warn {
background-image: url("./images/icon_user_warn.gif");
padding-left: 20px;