From d486ff62091952cc83aa9c25b674100b270e8098 Mon Sep 17 00:00:00 2001 From: PayBas Date: Tue, 22 Apr 2014 17:18:32 +0200 Subject: [PATCH 1/3] [ticket/12431] Add has_poll icon to topiclists PHPBB3-12431 --- phpBB/language/en/common.php | 1 + phpBB/search.php | 2 ++ phpBB/styles/prosilver/template/search_results.html | 1 + phpBB/styles/prosilver/template/viewforum_body.html | 1 + phpBB/styles/prosilver/theme/imageset.css | 5 +++++ phpBB/viewforum.php | 1 + 6 files changed, 11 insertions(+) diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 569ec776f5..6bcb0fe9b3 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -748,6 +748,7 @@ $lang = array_merge($lang, array( 1 => '%d private message in total', 2 => '%d private messages in total', ), + 'TOPIC_POLL' => 'Topic has a poll', 'TOTAL_POSTS' => 'Total posts', 'TOTAL_POSTS_COUNT' => array( 2 => 'Total posts %d', diff --git a/phpBB/search.php b/phpBB/search.php index dfb53c6896..da7d6ee02f 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, @@ -919,6 +920,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 818b8ee642..514327462c 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -84,6 +84,7 @@ + {POLL_IMG} {L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} » {searchresults.FIRST_POST_TIME} » {L_IN} {searchresults.FORUM_TITLE} diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index 33d309bcb8..08d9b8ae30 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -163,6 +163,7 @@
+ {POLL_IMG} {topicrow.ATTACH_ICON_IMG} {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} » {L_IN} {topicrow.FORUM_NAME} diff --git a/phpBB/styles/prosilver/theme/imageset.css b/phpBB/styles/prosilver/theme/imageset.css index e6d306c7fd..4e321ca41a 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.png"); + padding-left: 1px; + padding-top: 1px; +} .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'], From 2e6413a52266423da313035f05816c3fc220f397 Mon Sep 17 00:00:00 2001 From: Cesar G Date: Sun, 4 May 2014 12:34:51 -0700 Subject: [PATCH 2/3] [ticket/12431] Add topic poll icon. PHPBB3-12431 --- .../prosilver/theme/images/icon_topic_poll.gif | Bin 0 -> 120 bytes phpBB/styles/prosilver/theme/imageset.css | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 phpBB/styles/prosilver/theme/images/icon_topic_poll.gif 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 0000000000000000000000000000000000000000..1c80ec87c167c58e1a75d42c8566d3cd0cc54297 GIT binary patch literal 120 zcmZ?wbhEHbo3ikxA4v9?_hZpLh&aH zBLf2`gAPa(WCjC^s=>*Wj+qt{=RQ}P`$g5gFd=#2qB&W!qF%3i8FOTT^_z|d%DWv| G7_0&8Whh$! literal 0 HcmV?d00001 diff --git a/phpBB/styles/prosilver/theme/imageset.css b/phpBB/styles/prosilver/theme/imageset.css index 4e321ca41a..b3b8d5e431 100644 --- a/phpBB/styles/prosilver/theme/imageset.css +++ b/phpBB/styles/prosilver/theme/imageset.css @@ -351,9 +351,9 @@ span.imageset { padding-top: 14px; } .imageset.icon_topic_poll { - background-image: url("./images/icon_topic_poll.png"); - padding-left: 1px; - padding-top: 1px; + 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"); From 1cdff6067640bcd7c0d408ce73f5e4fbb5121526 Mon Sep 17 00:00:00 2001 From: PayBas Date: Thu, 8 May 2014 15:27:27 +0200 Subject: [PATCH 3/3] [ticket/12431] Lang full sentence PHPBB3-12431 --- phpBB/language/en/common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 6bcb0fe9b3..abaf73e5dc 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -748,7 +748,7 @@ $lang = array_merge($lang, array( 1 => '%d private message in total', 2 => '%d private messages in total', ), - 'TOPIC_POLL' => 'Topic has a poll', + 'TOPIC_POLL' => 'This topic has a poll.', 'TOTAL_POSTS' => 'Total posts', 'TOTAL_POSTS_COUNT' => array( 2 => 'Total posts %d',