From de7ee5662d04592e89999a94cac7b95432176495 Mon Sep 17 00:00:00 2001 From: Kevin Date: Wed, 30 Jan 2008 13:58:49 +0000 Subject: [PATCH] Report#44: get the topic title and the forum name separated - forum name now with link to the forum - finished ss2 integration, as well as displayed "global announcement" without link instead of "Forum name", if a global announcement is given. --- languages/de/mods/lang_portal.php | 1 + root/language/en/mods/lang_portal.php | 1 + .../template/portal/block/announcements.html | 7 ++++++- .../portal/block/announcements_compact.html | 8 +++++--- .../template/portal/block/news_compact.html | 4 ++-- templates/subsilver2.xml | 18 +++++++++--------- .../template/portal/block/announcements.html | 9 +++++++-- .../portal/block/announcements_compact.html | 12 ++++++++++-- .../subsilver2/template/portal/block/news.html | 4 ++-- .../template/portal/block/news_compact.html | 8 ++++---- 10 files changed, 47 insertions(+), 25 deletions(-) diff --git a/languages/de/mods/lang_portal.php b/languages/de/mods/lang_portal.php index 7b86ac97..efcba868 100644 --- a/languages/de/mods/lang_portal.php +++ b/languages/de/mods/lang_portal.php @@ -41,6 +41,7 @@ $lang = array_merge($lang, array( // news & global announcements 'LATEST_ANNOUNCEMENTS' => 'Letzte Bekanntmachung', + 'GLOBAL_ANNOUNCEMENT' => 'Globale Bekanntmachung', 'LATEST_NEWS' => 'Aktuelle Beiträge', 'READ_FULL' => 'alles lesen', 'NO_NEWS' => 'Keine neuen Beiträge', diff --git a/root/language/en/mods/lang_portal.php b/root/language/en/mods/lang_portal.php index 36d5717c..618f19b1 100644 --- a/root/language/en/mods/lang_portal.php +++ b/root/language/en/mods/lang_portal.php @@ -41,6 +41,7 @@ $lang = array_merge($lang, array( // news & global announcements 'LATEST_ANNOUNCEMENTS' => 'Latest global announcements', + 'GLOBAL_ANNOUNCEMENT' => 'Global announcement', 'LATEST_NEWS' => 'Latest news', 'READ_FULL' => 'Read all', 'NO_NEWS' => 'No news', diff --git a/root/styles/prosilver/template/portal/block/announcements.html b/root/styles/prosilver/template/portal/block/announcements.html index 2e6ffe3a..158ec487 100644 --- a/root/styles/prosilver/template/portal/block/announcements.html +++ b/root/styles/prosilver/template/portal/block/announcements.html @@ -14,7 +14,12 @@

{NEWEST_POST_IMG}{READ_POST_IMG} {announcements_row.ATTACH_ICON_IMG} {L_POLL}: {announcements_row.TITLE}


diff --git a/root/styles/prosilver/template/portal/block/announcements_compact.html b/root/styles/prosilver/template/portal/block/announcements_compact.html index ef0a8632..4f3e26e4 100644 --- a/root/styles/prosilver/template/portal/block/announcements_compact.html +++ b/root/styles/prosilver/template/portal/block/announcements_compact.html @@ -23,13 +23,15 @@
{L_FORUM}: {announcements_row.FORUM_NAME} -
+ + {L_GLOBAL_ANNOUNCEMENT} + {L_POSTED_ON_DATE} {announcements_row.TIME} +
{L_COMMENTS}: {announcements_row.REPLIES} {L_TOPIC_VIEWS}: {announcements_row.TOPIC_VIEWS} - - {L_POSTED_ON_DATE} {announcements_row.TIME} +
diff --git a/root/styles/prosilver/template/portal/block/news_compact.html b/root/styles/prosilver/template/portal/block/news_compact.html index ceea8c94..a53c04c5 100644 --- a/root/styles/prosilver/template/portal/block/news_compact.html +++ b/root/styles/prosilver/template/portal/block/news_compact.html @@ -22,13 +22,13 @@
{L_FORUM}: {news_row.FORUM_NAME} -
+ {L_POSTED_ON_DATE} {news_row.TIME} +
{L_COMMENTS}: {news_row.REPLIES} {L_TOPIC_VIEWS}: {news_row.TOPIC_VIEWS} - {L_POSTED_ON_DATE} {news_row.TIME}
diff --git a/templates/subsilver2.xml b/templates/subsilver2.xml index 838539fc..0dd07c1c 100644 --- a/templates/subsilver2.xml +++ b/templates/subsilver2.xml @@ -24,13 +24,6 @@ Dieses Portal basiert auf dem phpBB3 Portal a.k.a canverPortal ( www.phpbb3por i hope you get everything working. Further developement, new boxes for the portal or questions are welcome at www.board3.de Ich hoffe ihr habt Spaß am Portal. Neuen Code, bzw neue Boxen und Fragen könnt ihr auf www.board3.de posten. - - Kevin - nospam@breest.net - saint_hh - http://www.board3.de - - Ice @@ -38,6 +31,13 @@ Dieses Portal basiert auf dem phpBB3 Portal a.k.a canverPortal ( www.phpbb3por http://www.board3.de + + Kevin + nospam@breest.net + saint_hh + http://www.board3.de + + (N/A) nickvergessen@gmx.de @@ -55,8 +55,8 @@ Dieses Portal basiert auf dem phpBB3 Portal a.k.a canverPortal ( www.phpbb3por 0 - 1 - 1 + 2 + 0 easy diff --git a/templates/subsilver2/template/portal/block/announcements.html b/templates/subsilver2/template/portal/block/announcements.html index 207c0f4a..fa948dcd 100644 --- a/templates/subsilver2/template/portal/block/announcements.html +++ b/templates/subsilver2/template/portal/block/announcements.html @@ -15,12 +15,17 @@ diff --git a/templates/subsilver2/template/portal/block/news.html b/templates/subsilver2/template/portal/block/news.html index de4c24ba..97073d02 100644 --- a/templates/subsilver2/template/portal/block/news.html +++ b/templates/subsilver2/template/portal/block/news.html @@ -10,11 +10,11 @@
- {NEWEST_POST_IMG}{READ_POST_IMG} {announcements_row.ATTACH_ICON_IMG} {L_POLL}: {announcements_row.FORUM_NAME}  •  {announcements_row.TITLE} + {NEWEST_POST_IMG}{READ_POST_IMG} {announcements_row.ATTACH_ICON_IMG} {L_POLL}: {announcements_row.TITLE}
- {L_POSTED_BY}: {announcements_row.POSTER} + {L_POSTED_BY}: {announcements_row.POSTER} +  •  {L_FORUM}: {announcements_row.FORUM_NAME} + +  •  {L_GLOBAL_ANNOUNCEMENT} + + {announcements_row.TIME}

{announcements_row.TEXT} diff --git a/templates/subsilver2/template/portal/block/announcements_compact.html b/templates/subsilver2/template/portal/block/announcements_compact.html index 2ef739cd..9014c0f9 100644 --- a/templates/subsilver2/template/portal/block/announcements_compact.html +++ b/templates/subsilver2/template/portal/block/announcements_compact.html @@ -14,15 +14,23 @@ 		{NEWEST_POST_IMG}{READ_POST_IMG} {announcements_row.ATTACH_ICON_IMG} {L_POLL}: - {announcements_row.FORUM_NAME}  •  {announcements_row.TITLE} + {announcements_row.TITLE} {L_POST_BY_AUTHOR}: {announcements_row.POSTER}
+ + {L_FORUM}: {announcements_row.FORUM_NAME} + + {L_GLOBAL_ANNOUNCEMENT} + + {L_POSTED_ON_DATE} {announcements_row.TIME} +
+ {L_COMMENTS}: {announcements_row.REPLIES} {L_TOPIC_VIEWS}: {announcements_row.TOPIC_VIEWS} - {L_POSTED_ON_DATE} {announcements_row.TIME} +
- +
{NEWEST_POST_IMG}{READ_POST_IMG} {news_row.ATTACH_ICON_IMG} {L_POLL}: {news_row.FORUM_NAME}  •  {news_row.TITLE}{NEWEST_POST_IMG}{READ_POST_IMG} {news_row.ATTACH_ICON_IMG} {L_POLL}: {news_row.TITLE}
- {L_POSTED_BY}: {news_row.POSTER} + {L_POSTED_BY}: {news_row.POSTER}  •  {L_FORUM}: {news_row.FORUM_NAME} {news_row.TIME}

{news_row.TEXT} diff --git a/templates/subsilver2/template/portal/block/news_compact.html b/templates/subsilver2/template/portal/block/news_compact.html index 099155e9..82198db3 100644 --- a/templates/subsilver2/template/portal/block/news_compact.html +++ b/templates/subsilver2/template/portal/block/news_compact.html @@ -13,14 +13,14 @@
- {NEWEST_POST_IMG}{READ_POST_IMG} {news_row.ATTACH_ICON_IMG} {L_POLL}: {news_row.FORUM_NAME}  •  {news_row.TITLE} + {NEWEST_POST_IMG}{READ_POST_IMG} {news_row.ATTACH_ICON_IMG} {L_POLL}: {news_row.TITLE} {L_LAST_POST} {L_POST_BY_AUTHOR}: {news_row.POSTER}
- - {L_COMMENTS}: {news_row.REPLIES} {L_TOPIC_VIEWS}: {news_row.TOPIC_VIEWS} - + {L_FORUM}: {news_row.FORUM_NAME} {L_POSTED_ON_DATE} {news_row.TIME} +
+ {L_COMMENTS}: {news_row.REPLIES} {L_TOPIC_VIEWS}: {news_row.TOPIC_VIEWS}