subsilver2: hopefully we come to an end with ss2. XHTML valid, and cleaned up the styling.

2008-01-27 18:17:48 +00:00
parent 6860b04e49
commit 443f34d2ab
8 changed files with 42 additions and 32 deletions
--- a/templates/subsilver2.xml
+++ b/templates/subsilver2.xml
@@ -123,7 +123,22 @@ Dieses Portal basiert auf dem phpBB3 Portal  a.k.a canverPortal  ( www.phpbb3por
 		</table>
 	</div>]]></find>
        <action type="after-add"><![CDATA[<!-- IF not $S_IN_PORTAL -->]]></action>
-      </edit>
+      </edit>
+      <edit>
+        <find><![CDATA[	<div id="datebar">
+		<table width="100%" cellspacing="0">
+		<tr>
+			<td class="gensmall"><!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ENDIF --></td>
+			<td class="gensmall" align="{S_CONTENT_FLOW_END}">{CURRENT_TIME}<br /></td>
+		</tr>
+		</table>
+	</div>]]></find>
+        <action type="after-add"><![CDATA[<!-- ENDIF -->]]></action>
+      </edit>
+      <edit>
+        <find><![CDATA[<div id="wrapcentre">]]></find>
+        <action type="after-add"><![CDATA[<!-- IF not $S_IN_PORTAL -->]]></action>
+      </edit>
      <edit>
        <find><![CDATA[	<!-- INCLUDE breadcrumbs.html -->

--- a/templates/subsilver2/template/portal/block/announcements.html
+++ b/templates/subsilver2/template/portal/block/announcements.html
@@ -30,7 +30,7 @@
 				<tr class="row1">
 					<td>
 					<span style="float: left;">{L_TOPIC_VIEWS}: {announcements_row.TOPIC_VIEWS}<!-- IF S_CAN_READ --> &nbsp;&bull;&nbsp; <a href="{announcements_row.U_VIEW_COMMENTS}" title="{L_VIEW_COMMENTS}">{L_COMMENTS}: {announcements_row.REPLIES}</a> &nbsp;&bull;&nbsp; <a href="{announcements_row.U_POST_COMMENT}">{L_POST_REPLY}</a><!-- ENDIF --></span>
-					<span style="float: right;">{announcements_row.OPEN}<a href="{announcements_row.U_READ_FULL}">{announcements_row.L_READ_FULL}</a>{announcements_row.CLOSE} <a href="#wrap" class="top" title="{L_BACK_TO_TOP}">{L_BACK_TO_TOP}</a></span>
+					<span style="float: right;">{announcements_row.OPEN}<a href="{announcements_row.U_READ_FULL}">{announcements_row.L_READ_FULL}</a>{announcements_row.CLOSE} <a href="#wrapheader" class="top" title="{L_BACK_TO_TOP}">{L_BACK_TO_TOP}</a></span>
 					</td>
 				</tr>
 			</table>
--- a/templates/subsilver2/template/portal/block/announcements_compact.html
+++ b/templates/subsilver2/template/portal/block/announcements_compact.html
@@ -13,18 +13,16 @@
 	<tr class="row1">
 		<td>
 			<span style="float: left;">
-				&#187&nbsp;<!-- 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 -->
+				<!-- 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="{announcements_row.TITLE}"><strong style="font-size:1.1em;">{announcements_row.TITLE}</strong></a>
 			</span>
-			<span style="float: right;font-size:0.9em;">
+			<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 />
-			<!-- IF S_CAN_READ --><span style="float: left;font-size:0.9em;">
-				<a href="{announcements_row.U_VIEW_COMMENTS}" title="{L_VIEW_COMMENTS}"><em>{L_COMMENTS}: {announcements_row.REPLIES}</em></a>
-			</span><!-- ENDIF -->
-			<span style="font-size:0.9em;"><em>{L_TOPIC_VIEWS}: {announcements_row.TOPIC_VIEWS}</em></span>
-			<span style="float: right;">{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 -->
--- a/templates/subsilver2/template/portal/block/birthday_list.html
+++ b/templates/subsilver2/template/portal/block/birthday_list.html
@@ -10,9 +10,14 @@
 			<!-- ELSE -->
 			{L_NO_BIRTHDAYS}
 			<!-- ENDIF -->
-			<h3>{L_BIRTHDAYS_AHEAD}</h3>
+		</td>
+	</tr>
+	<tr class="row1">
+		<td>
+			<strong>{L_BIRTHDAYS_AHEAD}:</strong>
+			<br />
 			<!-- IF BIRTHDAYS_AHEAD_LIST -->
-			<strong>{BIRTHDAYS_AHEAD_LIST}</strong>
+			{BIRTHDAYS_AHEAD_LIST}
 			<!-- ELSE -->
 			{L_NO_BIRTHDAYS_AHEAD}
 			<!-- ENDIF -->
--- a/templates/subsilver2/template/portal/block/news.html
+++ b/templates/subsilver2/template/portal/block/news.html
@@ -24,7 +24,7 @@
 				<tr class="row1">
 					<td>
 					<span style="float: left;">{L_TOPIC_VIEWS}: {news_row.TOPIC_VIEWS} &nbsp;&bull;&nbsp; <a href="{news_row.U_VIEW_COMMENTS}" title="{L_VIEW_COMMENTS}">{L_COMMENTS}: {news_row.REPLIES}</a> &nbsp;&bull;&nbsp; <a href="{news_row.U_POST_COMMENT}">{L_POST_REPLY}</a></span>
-					<span style="float: right;">{news_row.OPEN}<a href="{news_row.U_READ_FULL}">{news_row.L_READ_FULL}</a>{news_row.CLOSE} <a href="#wrap" class="top" title="{L_BACK_TO_TOP}">{L_BACK_TO_TOP}</a></span>
+					<span style="float: right;">{news_row.OPEN}<a href="{news_row.U_READ_FULL}">{news_row.L_READ_FULL}</a>{news_row.CLOSE} <a href="#wrapheader" class="top" title="{L_BACK_TO_TOP}">{L_BACK_TO_TOP}</a></span>
 					</td>
 				</tr>
 			</table>
--- a/templates/subsilver2/template/portal/block/news_compact.html
+++ b/templates/subsilver2/template/portal/block/news_compact.html
@@ -12,19 +12,15 @@
 	<!-- ELSE -->
 	<tr class="row1">
 		<td>
-			<a href="{news_row.U_VIEW_COMMENTS}"><strong style="font-size:1.1em;">{news_row.TITLE}</strong></a>
-			<br />
-			<span style="float: left;font-size:0.9em;">
+			<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;">{news_row.TITLE}</strong></a>
 			</span>
-			<span style="float: right;">{L_LAST_POST} {L_POST_BY_AUTHOR}: <strong><a href="{news_row.U_USER_PROFILE}">{news_row.POSTER}</a></strong></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 14px;">
-							<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 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>
-						<span style="float: right;">{L_POSTED_ON_DATE} <strong>{news_row.TIME}</strong></span>
-						<!-- IF news_row.S_NOT_LAST --><hr /><!-- ENDIF -->
+						<span style="float: right; margin: 0 5px 0 0;">{L_POSTED_ON_DATE} <strong>{news_row.TIME}</strong></span>
 		</td>
 	</tr>
 	<!-- ENDIF -->
--- a/templates/subsilver2/template/portal/block/whois_online.html
+++ b/templates/subsilver2/template/portal/block/whois_online.html
@@ -4,16 +4,10 @@
 	</tr>
 	<tr class="row1">
 		<td>
-			<span style="float:left;">{L_WIO_TOTAL}:</span><span style="float:right;padding-right:10px;">{TOTAL_ONLINE_USERS}</span><br /><hr />
-			<span style="float:left;">{L_WIO_REGISTERED}:</span><span style="float:right;padding-right:10px;">{VISIBLE_ONLINE}</span><br />
-			<span style="float:left;">{L_WIO_HIDDEN}:</span><span style="float:right;padding-right:10px;">{HIDDEN_ONLINE}</span><br />
-			<span style="float:left;">{L_WIO_GUEST}:</span><span style="float:right;padding-right:10px;">{GUEST_ONLINE}</span><br />
-			<small>
-				<br />{RECORD_USERS}<br /><br />{LOGGED_IN_USER_LIST}
-				<!-- IF LEGEND --><br /><br />
-				{L_LEGEND} :: {LEGEND}
+				<!-- IF S_DISPLAY_ONLINE_LIST -->
+					<p style="font-size: 90%; margin: 0 5px 0 5px;">{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /> <br />{LOGGED_IN_USER_LIST}
+					<!-- IF LEGEND --><br /><em>{L_LEGEND}: {LEGEND}</em><!-- ENDIF --></p>
 				<!-- ENDIF -->
-			</small>
 		</td>
 	</tr>
 </table>
--- a/templates/subsilver2/template/portal/portal_body.html
+++ b/templates/subsilver2/template/portal/portal_body.html
@@ -147,7 +147,9 @@ small, .small {
 			<!-- INCLUDE portal/block/jumpbox.html -->
 		<!-- ENDIF -->	

-		<br /><div class="copyright">{L_PORTAL_COPY}</div>
+		<br />
+		<div class="copyright" align="center">{L_PORTAL_COPY}</div>
+		<br />
 	</td>
                         
 <!-- [-] center block area -->