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

@@ -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',

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',

root/styles/prosilver/template/portal/block/announcements.html

@@ -14,7 +14,12 @@
 					<div class="postbody postbody_portal" style="width: 100%">
 						<h4 class="first"><span style="margin: 0 0 0 5px"><!-- IF announcements_row.S_UNREAD_INFO -->{NEWEST_POST_IMG}<!-- ELSE -->{READ_POST_IMG}<!-- ENDIF --> {announcements_row.ATTACH_ICON_IMG} <!-- IF announcements_row.S_POLL --> <strong>{L_POLL}: </strong><!-- ENDIF --><a href="{announcements_row.U_VIEW_COMMENTS}"><strong>{announcements_row.TITLE}</strong></a></span></h4>
 						<ul class="linklist">
-							<li><span style="margin: 0 0 0 5px">{L_POSTED_BY}: <strong><a href="{announcements_row.U_USER_PROFILE}">{announcements_row.POSTER}</a></strong><!-- IF announcements_row.FORUM_NAME --> &nbsp;&bull;&nbsp; {L_FORUM}: <strong><a href="{announcements_row.U_VIEWFORUM}">{announcements_row.FORUM_NAME}</a></strong><!-- ENDIF --></span></li>
+							<li><span style="margin: 0 0 0 5px">{L_POSTED_BY}: <strong><a href="{announcements_row.U_USER_PROFILE}">{announcements_row.POSTER}</a></strong><!-- IF announcements_row.FORUM_NAME --> &nbsp;&bull;&nbsp; {L_FORUM}: <strong><a href="{announcements_row.U_VIEWFORUM}">{announcements_row.FORUM_NAME}</a></strong>
+							<!-- ELSE -->
+								 &nbsp;&bull;&nbsp; {L_GLOBAL_ANNOUNCEMENT}
+							<!-- ENDIF -->
+								</span>
+							</li>
 							<li class="rightside"><span style="margin: 0 5px 0 0;">{announcements_row.TIME}</span></li>
 						</ul>		
 						<br />

root/styles/prosilver/template/portal/block/announcements_compact.html

@@ -23,13 +23,15 @@
 						<br style="clear:both" />
 						<!-- IF announcements_row.FORUM_NAME -->
 						<span style="float: left; font-size:1.0em; margin: 2px 0 0 28px;">{L_FORUM}: <strong><a href="{announcements_row.U_VIEWFORUM}">{announcements_row.FORUM_NAME}</a></strong></span>
-						<br style="clear:both" />
+						<!-- ELSE -->
+						<span style="float: left; font-size:1.0em; margin: 2px 0 0 28px;">{L_GLOBAL_ANNOUNCEMENT}</span>
 						<!-- ENDIF -->
+						<span style="float: right; margin: 0 5px 0 0;">{L_POSTED_ON_DATE} <strong>{announcements_row.TIME}</strong></span>	   
+						<br style="clear:both" />
 						<span style="float: left; margin: 0 0 0 28px;">
 							<!-- IF S_CAN_READ --><a href="{announcements_row.U_VIEW_COMMENTS}" title="{L_VIEW_COMMENTS}"><span style="font-size:0.9em;"><em>{L_COMMENTS}: {announcements_row.REPLIES}</em></span></a><!-- ENDIF -->
 							<span style="font-size:0.9em;"><em>{L_TOPIC_VIEWS}: {announcements_row.TOPIC_VIEWS}</em></span>
-						</span>
+						</span>   
-						<span style="float: right; margin: 0 5px 0 0;">{L_POSTED_ON_DATE} <strong>{announcements_row.TIME}</strong></span>	      
 					<!-- IF announcements_row.S_NOT_LAST --><hr style="margin: 0px 0px 3px 0px;" /><!-- ENDIF -->     
 					</li>
 					<!-- ENDIF -->

root/styles/prosilver/template/portal/block/news_compact.html

@@ -22,13 +22,13 @@
 						<br style="clear:both" />
 						<!-- IF news_row.FORUM_NAME -->
 						<span style="float: left; font-size:1.0em; margin: 2px 0 0 28px;">{L_FORUM}: <strong><a href="{news_row.U_VIEWFORUM}">{news_row.FORUM_NAME}</a></strong></span>
-						<br style="clear:both" />
 						<!-- ENDIF -->
+						<span style="float: right; margin: 0 5px 0 0;">{L_POSTED_ON_DATE} <strong>{news_row.TIME}</strong></span>
+						<br style="clear:both" />
 						<span style="float: left; margin: 0 0 0 28px;">
 							<a href="{news_row.U_VIEW_COMMENTS}" title="{L_JUMP_FIRST}"><span style="font-size:0.9em;"><em>{L_COMMENTS}: {news_row.REPLIES}</em></span></a>
 							<span style="font-size:0.9em;"><em>{L_TOPIC_VIEWS}: {news_row.TOPIC_VIEWS}</em></span>
 						</span>
-						<span style="float: right; margin: 0 5px 0 0;">{L_POSTED_ON_DATE} <strong>{news_row.TIME}</strong></span>
 						<!-- IF news_row.S_NOT_LAST --><hr style="margin: 0px 0px 3px 0px;" /><!-- ENDIF -->						
 					</li>
 					<!-- ENDIF -->

templates/subsilver2.xml

@@ -24,13 +24,6 @@ Dieses Portal basiert auf dem phpBB3 Portal  a.k.a canverPortal  ( www.phpbb3por
     <author-notes lang="en-gb">i hope you get everything working. Further developement, new boxes for the portal or questions are welcome at www.board3.de</author-notes>
     <author-notes lang="de">Ich hoffe ihr habt Spaß am Portal. Neuen Code, bzw neue Boxen und Fragen könnt ihr auf www.board3.de posten.</author-notes>
     <author-group>
-      <author>
-        <realname>Kevin</realname>
-        <email>nospam@breest.net</email>
-        <username>saint_hh</username>
-        <homepage>http://www.board3.de</homepage>
-        <contributions />
-      </author>
       <author>
         <realname>Ice</realname>
         <email></email>
@@ -38,6 +31,13 @@ Dieses Portal basiert auf dem phpBB3 Portal  a.k.a canverPortal  ( www.phpbb3por
         <homepage>http://www.board3.de</homepage>
         <contributions />
       </author>
+      <author>
+        <realname>Kevin</realname>
+        <email>nospam@breest.net</email>
+        <username>saint_hh</username>
+        <homepage>http://www.board3.de</homepage>
+        <contributions />
+      </author>
       <author>
         <realname>(N/A)</realname>
         <email>nickvergessen@gmx.de</email>
@@ -55,8 +55,8 @@ Dieses Portal basiert auf dem phpBB3 Portal  a.k.a canverPortal  ( www.phpbb3por
     </author-group>
     <mod-version>
       <major>0</major>
-      <minor>1</minor>
+      <minor>2</minor>
-      <revision>1</revision>
+      <revision>0</revision>
     </mod-version>
     <installation>
       <level>easy</level>

templates/subsilver2/template/portal/block/announcements.html

@@ -15,12 +15,17 @@
 			<table class="tablebg" cellspacing="1" width="100%">
 				<tr>
 					<td class="cat">
-						<!-- IF announcements_row.S_UNREAD_INFO -->{NEWEST_POST_IMG}<!-- ELSE -->{READ_POST_IMG}<!-- ENDIF --> {announcements_row.ATTACH_ICON_IMG}<!-- IF announcements_row.S_POLL --> <strong>{L_POLL}: </strong><!-- ENDIF --><a href="{announcements_row.U_VIEW_COMMENTS}"><strong><!-- IF announcements_row.FORUM_NAME -->{announcements_row.FORUM_NAME} &nbsp;&bull;&nbsp; <!-- ENDIF -->{announcements_row.TITLE}</strong></a>
+						<!-- IF announcements_row.S_UNREAD_INFO -->{NEWEST_POST_IMG}<!-- ELSE -->{READ_POST_IMG}<!-- ENDIF --> {announcements_row.ATTACH_ICON_IMG}<!-- IF announcements_row.S_POLL --> <strong>{L_POLL}: </strong><!-- ENDIF --><a href="{announcements_row.U_VIEW_COMMENTS}"><strong>{announcements_row.TITLE}</strong></a>
 					</td>
 				</tr>
 				<tr class="row1">
 					<td>
-						<span class="gensmall" style="float: left;">{L_POSTED_BY}: <strong><a href="{announcements_row.U_USER_PROFILE}">{announcements_row.POSTER}</a></strong></span>
+						<span class="gensmall" style="float: left;">{L_POSTED_BY}: <strong><a href="{announcements_row.U_USER_PROFILE}">{announcements_row.POSTER}</a></strong>
+							<!-- IF announcements_row.FORUM_NAME --> &nbsp;&bull;&nbsp; {L_FORUM}: <strong><a href="{announcements_row.U_VIEWFORUM}">{announcements_row.FORUM_NAME}</a></strong>
+							<!-- ELSE -->
+								 &nbsp;&bull;&nbsp; {L_GLOBAL_ANNOUNCEMENT}
+							<!-- ENDIF -->
+						</span>
 						<span class="gensmall" style="float: right;">{announcements_row.TIME}</span>
 						<br /><br />
 						{announcements_row.TEXT}

templates/subsilver2/template/portal/block/announcements_compact.html

@@ -14,15 +14,23 @@
 		<td>
 			<span style="float: left;">
 				<!-- IF announcements_row.S_UNREAD_INFO -->{NEWEST_POST_IMG}<!-- ELSE -->{READ_POST_IMG}<!-- ENDIF --> {announcements_row.ATTACH_ICON_IMG} <!-- IF announcements_row.S_POLL --> <strong style="font-size:1.1em;">{L_POLL}: </strong><!-- ENDIF -->
-				<a href="{announcements_row.U_VIEW_COMMENTS}" title="<!-- IF announcements_row.FORUM_NAME -->{announcements_row.FORUM_NAME} &nbsp;&bull;&nbsp; <!-- ENDIF -->{announcements_row.TITLE}"><strong style="font-size:1.1em;"><!-- IF announcements_row.FORUM_NAME -->{announcements_row.FORUM_NAME} &nbsp;&bull;&nbsp; <!-- ENDIF -->{announcements_row.TITLE}</strong></a>
+				<a href="{announcements_row.U_VIEW_COMMENTS}" title="{announcements_row.TITLE}"><strong style="font-size:1.1em;">{announcements_row.TITLE}</strong></a>
 			</span>
 			<span style="float: right;font-size:0.9em; margin: 0 5px 0 0;">
 				{L_POST_BY_AUTHOR}: <strong><a href="{announcements_row.U_USER_PROFILE}">{announcements_row.POSTER}</a></strong>
 			</span>
 			<br style="clear:both" />
+			<!-- IF announcements_row.FORUM_NAME -->
+				<span style="float: left; font-size:1.0em; margin: 2px 0 0 22px;">{L_FORUM}: <strong><a href="{announcements_row.U_VIEWFORUM}">{announcements_row.FORUM_NAME}</a></strong></span>
+			<!-- ELSE -->
+				<span style="float: left; font-size:1.0em; margin: 2px 0 0 22px;">{L_GLOBAL_ANNOUNCEMENT}</span>
+			<!-- ENDIF -->
+				<span style="float: right; margin: 0 5px 0 0;">{L_POSTED_ON_DATE} <strong>{announcements_row.TIME}</strong></span>				
+			<br style="clear:both" />
+			
 			<!-- IF S_CAN_READ --><span style="float: left; margin: 0 0 0 22px; font-size:0.9em;">
 			<a href="{announcements_row.U_VIEW_COMMENTS}" title="{L_VIEW_COMMENTS}">{L_COMMENTS}: {announcements_row.REPLIES}</a> {L_TOPIC_VIEWS}: {announcements_row.TOPIC_VIEWS}</span><!-- ENDIF -->
-			<span style="float: right; margin: 0 5px 0 0;">{L_POSTED_ON_DATE} <strong>{announcements_row.TIME}</strong></span>
+
 		</td>
 	</tr>
 	<!-- ENDIF -->

templates/subsilver2/template/portal/block/news.html

@@ -10,11 +10,11 @@
 		<!-- ELSE -->
 			<table class="tablebg" cellspacing="1" width="100%">
 				<tr>
-					<td class="cat"><!-- IF news_row.S_UNREAD_INFO -->{NEWEST_POST_IMG}<!-- ELSE -->{READ_POST_IMG}<!-- ENDIF --> {news_row.ATTACH_ICON_IMG} <!-- IF news_row.S_POLL --><strong>{L_POLL}: </strong><!-- ENDIF --><a href="{news_row.U_VIEW_COMMENTS}"><strong><!-- IF news_row.FORUM_NAME -->{news_row.FORUM_NAME} &nbsp;&bull;&nbsp; <!-- ENDIF -->{news_row.TITLE}</strong></a></td>
+					<td class="cat"><!-- IF news_row.S_UNREAD_INFO -->{NEWEST_POST_IMG}<!-- ELSE -->{READ_POST_IMG}<!-- ENDIF --> {news_row.ATTACH_ICON_IMG} <!-- IF news_row.S_POLL --><strong>{L_POLL}: </strong><!-- ENDIF --><a href="{news_row.U_VIEW_COMMENTS}"><strong>{news_row.TITLE}</strong></a></td>
 				</tr>
 				<tr class="row1">
 					<td>
-						<span class="gensmall" style="float: left;">{L_POSTED_BY}: <strong><a href="{news_row.U_USER_PROFILE}">{news_row.POSTER}</a></strong></span>
+						<span class="gensmall" style="float: left;">{L_POSTED_BY}: <strong><a href="{news_row.U_USER_PROFILE}">{news_row.POSTER}</a></strong><!-- IF news_row.FORUM_NAME --> &nbsp;&bull;&nbsp; {L_FORUM}: <strong><a href="{news_row.U_VIEWFORUM}">{news_row.FORUM_NAME}</a></strong><!-- ENDIF --></span>
 						<span class="gensmall" style="float: right;">{news_row.TIME}</span>
 						<br /><br />
 						{news_row.TEXT}

templates/subsilver2/template/portal/block/news_compact.html

@@ -13,14 +13,14 @@
 	<tr class="row1">
 		<td>
 			<span style="float: left;">
-				<!-- IF news_row.S_UNREAD_INFO -->{NEWEST_POST_IMG}<!-- ELSE -->{READ_POST_IMG}<!-- ENDIF --> {news_row.ATTACH_ICON_IMG}  <!-- IF news_row.S_POLL --><strong>{L_POLL}: </strong><!-- ENDIF --><a href="{news_row.U_LAST_COMMENTS}" title="{L_JUMP_NEWEST}"><strong style="font-size:1.1em;"><!-- IF news_row.FORUM_NAME -->{news_row.FORUM_NAME} &nbsp;&bull;&nbsp; <!-- ENDIF -->{news_row.TITLE}</strong></a>
+				<!-- IF news_row.S_UNREAD_INFO -->{NEWEST_POST_IMG}<!-- ELSE -->{READ_POST_IMG}<!-- ENDIF --> {news_row.ATTACH_ICON_IMG}  <!-- IF news_row.S_POLL --><strong>{L_POLL}: </strong><!-- ENDIF --><a href="{news_row.U_LAST_COMMENTS}" title="{L_JUMP_NEWEST}"><strong style="font-size:1.1em;">{news_row.TITLE}</strong></a>
 			</span>
 			<span style="float: right;font-size:0.9em; margin: 0 5px 0 0;">{L_LAST_POST} {L_POST_BY_AUTHOR}: <strong><a href="{news_row.U_USER_PROFILE}">{news_row.POSTER}</a></strong></span>
 						<br style="clear:both" />
-						<span style="float: left; margin: 0 0 0 22px; font-size:0.9em;">
+						<!-- IF news_row.FORUM_NAME --><span style="float: left; font-size:1.0em; margin: 2px 0 0 22px;">{L_FORUM}: <strong><a href="{news_row.U_VIEWFORUM}">{news_row.FORUM_NAME}</a></strong></span><!-- ENDIF -->
-							<a href="{news_row.U_VIEW_COMMENTS}" title="{L_JUMP_FIRST}">{L_COMMENTS}: {news_row.REPLIES}</a> {L_TOPIC_VIEWS}: {news_row.TOPIC_VIEWS}
-						</span>
 						<span style="float: right; margin: 0 5px 0 0;">{L_POSTED_ON_DATE} <strong>{news_row.TIME}</strong></span>
+						<br style="clear:both" />
+						<span style="float: left; margin: 0 0 0 22px; font-size:0.9em;"><a href="{news_row.U_VIEW_COMMENTS}" title="{L_JUMP_FIRST}">{L_COMMENTS}: {news_row.REPLIES}</a> {L_TOPIC_VIEWS}: {news_row.TOPIC_VIEWS}</span>
 		</td>
 	</tr>
 	<!-- ENDIF -->