diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-11 10:24:03 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-11 10:24:03 +0200 |
| commit | 135b76b6432f88e850b0149473af1b46408e4c91 (patch) | |
| tree | 6cdc75ca2f37e6fee6717d4891541980fa2d18e0 | |
| parent | 61c92c07eefdae649ab01ae16051e24f3a208058 (diff) | |
| parent | 1cdff6067640bcd7c0d408ce73f5e4fbb5121526 (diff) | |
| download | forums-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
| -rw-r--r-- | phpBB/language/en/common.php | 1 | ||||
| -rw-r--r-- | phpBB/search.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/search_results.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewforum_body.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/images/icon_topic_poll.gif | bin | 0 -> 120 bytes | |||
| -rw-r--r-- | phpBB/styles/prosilver/theme/imageset.css | 5 | ||||
| -rw-r--r-- | phpBB/viewforum.php | 1 |
7 files changed, 11 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 7faa46daf3..7026e60911 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -751,6 +751,7 @@ $lang = array_merge($lang, array( 1 => '%d private message in total', 2 => '%d private messages in total', ), + 'TOPIC_POLL' => 'This topic has a poll.', 'TOTAL_POSTS' => 'Total posts', 'TOTAL_POSTS_COUNT' => array( 2 => 'Total posts <strong>%d</strong>', diff --git a/phpBB/search.php b/phpBB/search.php index a34c0a4e5a..49df0d4da6 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -613,6 +613,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) 'REPORTED_IMG' => $user->img('icon_topic_reported', 'TOPIC_REPORTED'), 'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'TOPIC_UNAPPROVED'), 'DELETED_IMG' => $user->img('icon_topic_deleted', 'TOPIC_DELETED'), + 'POLL_IMG' => $user->img('icon_topic_poll', 'TOPIC_POLL'), 'LAST_POST_IMG' => $user->img('icon_topic_latest', 'VIEW_LATEST_POST'), 'U_SEARCH_WORDS' => $u_search, @@ -973,6 +974,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) 'S_TOPIC_UNAPPROVED' => $topic_unapproved, 'S_POSTS_UNAPPROVED' => $posts_unapproved, 'S_TOPIC_DELETED' => $topic_deleted, + 'S_HAS_POLL' => ($row['poll_start']) ? true : false, 'U_LAST_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params . '&p=' . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'], 'U_LAST_POST_AUTHOR' => get_username_string('profile', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), 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} » {searchresults.FIRST_POST_TIME} » {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} » {topicrow.FIRST_POST_TIME} <!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --> » {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 Binary files differnew file mode 100644 index 0000000000..1c80ec87c1 --- /dev/null +++ b/phpBB/styles/prosilver/theme/images/icon_topic_poll.gif 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; diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 8da8a0cdcc..f1b0b4df5b 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -336,6 +336,7 @@ $template->assign_vars(array( 'REPORTED_IMG' => $user->img('icon_topic_reported', 'TOPIC_REPORTED'), 'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'TOPIC_UNAPPROVED'), 'DELETED_IMG' => $user->img('icon_topic_deleted', 'TOPIC_DELETED'), + 'POLL_IMG' => $user->img('icon_topic_poll', 'TOPIC_POLL'), 'GOTO_PAGE_IMG' => $user->img('icon_post_target', 'GOTO_PAGE'), 'L_NO_TOPICS' => ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->lang['POST_FORUM_LOCKED'] : $user->lang['NO_TOPICS'], |
