Merge branch 'prosilverhistory'

versuch live und prosilver 3.2.1 zu mergen, teilweise erfolgreich

dfdeREADME.txt

@@ -1,47 +0,0 @@
-
-Der Style basiert auf dem "alten Template" entwickelt von Timo Salmen, das wiederum war basierend auf dem Debian Live Template, entwickelt von Christoph Haas. 
-Vielen DANK dafür an Timo und Christoph!
-
-Infos zur Umstellung gibts in den Threads 
- https://debianforum.de/forum/viewtopic.php?f=5&t=158531
- https://debianforum.de/forum/viewtopic.php?f=14&t=165612
- https://debianforum.de/forum/viewtopic.php?f=15&t=165808
- https://debianforum.de/forum/viewtopic.php?f=5&t=165804
-sowie im Wiki auf
- https://wiki.debianforum.de/Dfdebugtrackerchen
-
-Dort im Wiki bitte auch gefundene Fehler etc eintragen, erleichtert uns hoffentlich die Koordination.
-
-
-
-Aktuell eingesetzte Version des Boards ist 
-https://www.phpbb.com/files/release/phpBB-3.2.0.zip (sha256: 1ffd519239acfb9ffe6c83f7e04879c10d02c40f30464906f90fb21ff7f83681 )
-
-
-
-
-Wenn Ihr Änderungen machen wollt: Mitarbeit ist ausdrücklich gewünscht. 
- Wichtig ist aber, dass der Style eine "minimal-inversive" Fassung bleibt. Daher bitte (wenn möglich) keine Änderungen vornehmen, die tiefer in die Struktur eingreifen - wir wollen, dass spätere Updates so schmerzlos wie möglich ablaufen! D.h. Änderungen an den Template und Theme Dateien sind ok, direkte Änderungen am php-Code des Boards eher nicht.
-
-
-
-Sinnvolle Einstellung (während des Testens) im Board damit die Styles nicht aus dem Cache sondern direkt von der Platte genommen werden:
- Administration Control Panel >> Load Settings >> Recompile Stale Style Components: Yes
-
-
-
-
-Falls jemand die Grafiken schöner machen möchte: 
-
- Auch an Grafiken wurde was geändert: die Anführungszeichen fürs quote-icon sind jetzt "unsicherbare Pixel", sonst muss man zuviel am Style rumpatchen - falls dazu jemand ne bessere Idee hat immer her damit.
-
- Umwandeln der blauen Icons (aus dem "normalen Style") zu roten: 
-
-    ls *.gif -1 |xargs -I{}  convert {}   -modulate 100,100,-20   converted/{};
-
-  Achtung, das funktioniert nur in ca. 80% der Fälle, bringt aber nen guten Start für händische Korrekturen.
-
-
-
-
-Aktuell (falls jemandem sehr sehr sehr langweilig ist) könnten auch noch einige der Template-Dateien auf das aktuelle prosilver umgestellt werden. Das würde spätere Migrationen erleichtern (oder auch nicht, falls Upstreamseitig alles umgeschmissen wird). Zur Zeit stammen die Template-Dateien aus drei unterschiedlichen Releases, daher sind in einigen noch falsche Variablen, sollte beim Testen aber auffallen, und falls nicht, wars wohl doch nicht wichtig ;) 

style.cfg

@@ -19,10 +19,10 @@
 #
 
 # General Information about this style
-name = debianforumde
+name = prosilver
-copyright = based on gplv2-ed "© phpBB Limited, 2007" - with additions by dfde: patched colors to match debians ci
+copyright = © phpBB Limited, 2007
-style_version = 3.2.0
+style_version = 3.2.1
-phpbb_version = 3.2.0
+phpbb_version = 3.2.1
 
 # Defining a different template bitfield
 # template_bitfield = lNg=

template/ajax.js

@@ -26,7 +26,7 @@ phpbb.addAjaxCallback('mark_forums_read', function(res) {
 	});
 
 	// Mark subforums read
-	$('a.subforum[class*="unread"]').removeClass('unread').addClass('read');
+	$('a.subforum[class*="unread"]').removeClass('unread').addClass('read').children('.icon.icon-red').removeClass('icon-red').addClass('icon-blue');
 
 	// Mark topics read if we are watching a category and showing active topics
 	if ($('#active_topics').length) {

template/bbcode.html

@@ -37,8 +37,6 @@
 					<xsl:text> </xsl:text>
 					<a class="debianforum_uparrow" href="{@post_url}" data-post-id="{@post_id}" onclick="if(document.getElementById(hash.substr(1)))href=hash"><img src="https://debianforum.de/forum/styles/debianforumde/theme/images/debianforum_uparrow.png" alt="&#8593; zum Beitrag &#8593;" /></a>
 				</xsl:if>
-				<xsl:if test="@date">
-				</xsl:if>
 				<xsl:if test="@date">
 					<div class="responsive-hide"><xsl:value-of select="@date"/></div>
 				</xsl:if>
@@ -55,13 +53,13 @@
 <!-- BEGIN inline_attachment_open --><div class="inline-attachment"><!-- END inline_attachment_open -->
 <!-- BEGIN inline_attachment_close --></div><!-- END inline_attachment_close -->
 
-<!-- BEGIN b_open --><strong><!-- END b_open -->
+<!-- BEGIN b_open --><strong class="text-strong"><!-- END b_open -->
 <!-- BEGIN b_close --></strong><!-- END b_close -->
 
 <!-- BEGIN u_open --><span style="text-decoration: underline"><!-- END u_open -->
 <!-- BEGIN u_close --></span><!-- END u_close -->
 
-<!-- BEGIN i_open --><em><!-- END i_open -->
+<!-- BEGIN i_open --><em class="text-italics"><!-- END i_open -->
 <!-- BEGIN i_close --></em><!-- END i_close -->
 
 <!-- BEGIN color --><span style="color: {COLOR}">{TEXT}</span><!-- END color -->

template/display_options.html

@@ -1,4 +1,4 @@
-<div class="dropdown-container dropdown-container-{S_CONTENT_FLOW_BEGIN} dropdown-button-control sort-tools">
+<div class="dropdown-container dropdown-container-left dropdown-button-control sort-tools">
 	<span title="{L_SORT_OPTIONS}" class="button button-secondary dropdown-trigger dropdown-select">
 		<i class="icon fa-sort-amount-asc fa-fw" aria-hidden="true"></i>
 		<span class="caret"><i class="icon fa-sort-down fa-fw" aria-hidden="true"></i></span>

template/forum_fn.js

@@ -57,7 +57,7 @@ function marklist(id, name, state) {
 
 	jQuery('#' + id + ' input[type=checkbox][name]').each(function() {
 		var $this = jQuery(this);
-		if ($this.attr('name').substr(0, name.length) === name) {
+		if ($this.attr('name').substr(0, name.length) === name && !$this.prop('disabled')) {
 			$this.prop('checked', state);
 		}
 	});
@@ -194,37 +194,6 @@ function selectCode(a) {
 	}
 }
 
-/**
-* Play quicktime file by determining it's width/height
-* from the displayed rectangle area
-*/
-function play_qt_file(obj) {
-	'use strict';
-
-	var rectangle = obj.GetRectangle();
-	var width, height;
-
-	if (rectangle) {
-		rectangle = rectangle.split(',');
-		var x1 = parseInt(rectangle[0], 10);
-		var x2 = parseInt(rectangle[2], 10);
-		var y1 = parseInt(rectangle[1], 10);
-		var y2 = parseInt(rectangle[3], 10);
-
-		width = (x1 < 0) ? (x1 * -1) + x2 : x2 - x1;
-		height = (y1 < 0) ? (y1 * -1) + y2 : y2 - y1;
-	} else {
-		width = 200;
-		height = 0;
-	}
-
-	obj.width = width;
-	obj.height = height + 16;
-
-	obj.SetControllerVisible(true);
-	obj.Play();
-}
-
 var inAutocomplete = false;
 var lastKeyEntered = '';
 

template/forumlist_body.html

@@ -52,10 +52,8 @@
 							<!-- EVENT forumlist_body_subforums_before -->
 							<br /><strong>{forumrow.L_SUBFORUM_STR}{L_COLON}</strong>
 							<!-- BEGIN subforum -->
-								<a href="{forumrow.subforum.U_SUBFORUM}" class="subforum<!-- IF forumrow.subforum.S_UNREAD --> unread<!-- ELSE --> read<!-- ENDIF -->" title="<!-- IF forumrow.subforum.S_UNREAD -->{L_UNREAD_POSTS}<!-- ELSE -->{L_NO_UNREAD_POSTS}<!-- ENDIF -->">
+								<!-- EVENT forumlist_body_subforum_link_prepend --><a href="{forumrow.subforum.U_SUBFORUM}" class="subforum<!-- IF forumrow.subforum.S_UNREAD --> unread<!-- ELSE --> read<!-- ENDIF -->" title="<!-- IF forumrow.subforum.S_UNREAD -->{L_UNREAD_POSTS}<!-- ELSE -->{L_NO_UNREAD_POSTS}<!-- ENDIF -->">
-									<i class="icon <!-- IF forumrow.subforum.IS_LINK -->fa-external-link<!-- ELSE -->fa-file-o<!-- ENDIF --> fa-fw <!-- IF forumrow.subforum.S_UNREAD --> icon-red<!-- ELSE --> icon-blue<!-- ENDIF --> icon-md" aria-hidden="true"></i>{forumrow.subforum.SUBFORUM_NAME}
+									<i class="icon <!-- IF forumrow.subforum.IS_LINK -->fa-external-link<!-- ELSE -->fa-file-o<!-- ENDIF --> fa-fw <!-- IF forumrow.subforum.S_UNREAD --> icon-red<!-- ELSE --> icon-blue<!-- ENDIF --> icon-md" aria-hidden="true"></i>{forumrow.subforum.SUBFORUM_NAME}</a><!-- IF not forumrow.subforum.S_LAST_ROW -->{L_COMMA_SEPARATOR}<!-- ENDIF --><!-- EVENT forumlist_body_subforum_link_append -->
-								</a>
-								<!-- IF not forumrow.subforum.S_LAST_ROW -->{L_COMMA_SEPARATOR}<!-- ENDIF -->
 							<!-- END subforum -->
 							<!-- EVENT forumlist_body_subforums_after -->
 						<!-- ENDIF -->

template/index_body.html

@@ -47,13 +47,18 @@
 		<!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF -->
 		<p>
 			<!-- EVENT index_body_block_online_prepend -->
-			{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /> <br />{LOGGED_IN_USER_LIST}
+			{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /> 
-			<!-- IF LEGEND --><br /><em>{L_LEGEND}{L_COLON} {LEGEND}</em><!-- ENDIF -->
+			<!-- IF U_VIEWONLINE -->
+				<br />{LOGGED_IN_USER_LIST}
+				<!-- IF LEGEND --><br /><em>{L_LEGEND}{L_COLON} {LEGEND}</em><!-- ENDIF -->
+			<!-- ENDIF -->
 			<!-- EVENT index_body_block_online_append -->
 		</p>
 	</div>
 <!-- ENDIF -->
 
+<!-- EVENT index_body_birthday_block_before -->
+
 <!-- IF S_DISPLAY_BIRTHDAY_LIST -->
 	<div class="stat-block birthday-list">
 		<h3>{L_BIRTHDAYS}</h3>

template/jumpbox.html

@@ -37,7 +37,7 @@
 			<ul class="dropdown-contents">
 				<!-- BEGIN jumpbox_forums -->
 				<!-- IF jumpbox_forums.FORUM_ID neq -1 -->
-				<li><a href="{jumpbox_forums.LINK}" class="<!-- IF jumpbox_forums.level -->jumpbox-sub-link<!-- ELSEIF jumpbox_forums.S_IS_CAT -->jumpbox-cat-link<!-- ELSE -->jumpbox-forum-link<!-- ENDIF -->"><!-- BEGIN level --><span class="spacer"></span><!-- END level --> <span><!-- IF jumpbox_forums.level --> &#8627; &nbsp;<!-- ENDIF --> {jumpbox_forums.FORUM_NAME}</span></a></li>
+				<li><a href="{jumpbox_forums.LINK}" class="<!-- IF jumpbox_forums.level -->jumpbox-sub-link<!-- ELSEIF jumpbox_forums.S_IS_CAT -->jumpbox-cat-link<!-- ELSE -->jumpbox-forum-link<!-- ENDIF -->"><!-- BEGIN level --><span class="spacer"></span><!-- END level --> <span><!-- IF jumpbox_forums.level --><!-- IF S_CONTENT_DIRECTION eq 'rtl' -->&#8626;<!-- ELSE -->&#8627;<!-- ENDIF --> &nbsp;<!-- ENDIF --> {jumpbox_forums.FORUM_NAME}</span></a></li>
 				<!-- ENDIF -->
 				<!-- END jumpbox_forums -->
 			</ul>
@@ -45,6 +45,6 @@
 	</div>
 
 	<!-- ELSE -->
-	</br></br>
+	<br /><br />
 	<!-- ENDIF -->
 </div>

template/mcp_front.html

@@ -30,7 +30,7 @@
 				<dl>
 					<dt>
 						<div class="list-inner">
-							<a href="{unapproved.U_POST_DETAILS}" class="topictitle">{unapproved.SUBJECT}</a> <i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <br />
+							<a href="{unapproved.U_POST_DETAILS}" class="topictitle">{unapproved.SUBJECT}</a> <!-- IF unapproved.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i><!-- ENDIF --> <br />
 							{L_POSTED} {L_POST_BY_AUTHOR} {unapproved.AUTHOR_FULL} &raquo; {unapproved.POST_TIME}
 						</div>
 					</dt>
@@ -86,12 +86,12 @@
 				<dl>
 					<dt>
 						<div class="list-inner">
-							<a href="{report.U_POST_DETAILS}#reports" class="topictitle">{report.SUBJECT}</a> <i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <br />
+							<a href="{report.U_POST_DETAILS}#reports" class="topictitle">{report.SUBJECT}</a> <!-- IF report.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i><!-- ENDIF --> <br />
 							<span>{L_POSTED} {L_POST_BY_AUTHOR} {report.AUTHOR_FULL} &raquo; {report.POST_TIME}</span>
 						</div>
 					</dt>
 					<dd class="moderation">
-						<span>{L_REPORTED} {L_POST_BY_AUTHOR} {report.REPORTER_FULL} {L_REPORTED_ON_DATE} <i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <br />
+						<span>{L_REPORTED} {L_POST_BY_AUTHOR} {report.REPORTER_FULL} {L_REPORTED_ON_DATE} <br />
 						{L_FORUM}{L_COLON} <a href="{report.U_FORUM}">{report.FORUM_NAME}</a></span>
 					</dd>
 				</dl>
@@ -129,7 +129,7 @@
 				<dl>
 					<dt>
 						<div class="list-inner">
-							<a href="{pm_report.U_PM_DETAILS}" class="topictitle">{pm_report.PM_SUBJECT}</a> <i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <br />
+							<a href="{pm_report.U_PM_DETAILS}" class="topictitle">{pm_report.PM_SUBJECT}</a> <!-- IF pm_report.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i><!-- ENDIF --> <br />
 							<span>{L_MESSAGE_BY_AUTHOR} {pm_report.PM_AUTHOR_FULL} &raquo; {pm_report.PM_TIME}</span><br />
 							<span>{L_MESSAGE_TO} {pm_report.RECIPIENTS}</span>
 						</div>

template/mcp_post.html

@@ -294,6 +294,14 @@
 			</tbody>
 			</table>
 
+			<div class="pagination">
+				<!-- INCLUDE pagination.html -->
+			</div>
+			</div>
+		</div>
+
+		<div class="panel">
+			<div class="inner">
 			<table class="table1">
 			<thead>
 			<tr>
@@ -315,7 +323,27 @@
 			</tbody>
 			</table>
 
-			<p><a href="{U_LOOKUP_ALL}#ip">{L_LOOKUP_ALL}</a></p>
+			<div class="buttons">
+				<p><a href="{U_LOOKUP_ALL}#ip">{L_LOOKUP_ALL}</a></p>
+			</div>
+
+			<div class="pagination">
+				<ul>
+				<!-- BEGIN pagination_ips -->
+					<!-- IF pagination_ips.S_IS_PREV -->
+					<li class="arrow previous"><a class="button button-icon-only" href="{pagination_ips.PAGE_URL}" rel="prev" role="button"><i class="icon fa-chevron-{S_CONTENT_FLOW_BEGIN} fa-fw" aria-hidden="true"></i><span class="sr-only">{L_PREVIOUS}</span></a></li>
+					<!-- ELSEIF pagination_ips.S_IS_CURRENT -->
+					<li class="active"><span>{pagination_ips.PAGE_NUMBER}</span></li>
+					<!-- ELSEIF pagination_ips.S_IS_ELLIPSIS -->
+					<li class="ellipsis" role="separator"><span>{L_ELLIPSIS}</span></li>
+					<!-- ELSEIF pagination_ips.S_IS_NEXT -->
+					<li class="arrow next"><a class="button button-icon-only" href="{pagination_ips.PAGE_URL}" rel="next" role="button"><i class="icon fa-chevron-{S_CONTENT_FLOW_END} fa-fw" aria-hidden="true"></i><span class="sr-only">{L_NEXT}</span></a></li>
+					<!-- ELSE -->
+					<li><a class="button" href="{pagination_ips.PAGE_URL}" role="button">{pagination_ips.PAGE_NUMBER}</a></li>
+					<!-- ENDIF -->
+				<!-- END pagination_ips -->
+				</ul>
+			</div>
 
 			</div>
 		</div>

template/mcp_topic.html

@@ -111,7 +111,9 @@
 					</li>
 				</ul>
 
+				<!-- EVENT mcp_topic_postrow_post_subject_before -->
 				<h3><a href="{postrow.U_POST_DETAILS}">{postrow.POST_SUBJECT}</a></h3>
+				<!-- EVENT mcp_topic_postrow_post_subject_after -->
 
 				<!-- EVENT mcp_topic_postrow_post_details_before -->
 				<p class="author">

template/navbar_header.html

@@ -78,6 +78,11 @@
 		</li>
 
 		<!-- EVENT overall_header_navigation_prepend -->
+		<li <!-- IF not S_USER_LOGGED_IN -->data-skip-responsive="true"<!-- ELSE -->data-last-responsive="true"<!-- ENDIF -->>
+			<a href="{U_FAQ}" rel="help" title="{L_FAQ_EXPLAIN}" role="menuitem">
+				<i class="icon fa-question-circle fa-fw" aria-hidden="true"></i><span>{L_FAQ}</span>
+			</a>
+		</li>
 		<!-- EVENT overall_header_navigation_append -->
 		<!-- IF U_ACP -->
 			<li data-last-responsive="true">
@@ -168,11 +173,13 @@
 		<!-- ENDIF -->
 		<!-- EVENT navbar_header_logged_out_content -->
 	<!-- ENDIF -->
-	<!--
-	 	 </ul>
 
-	<ul id="nav-breadcrumbs" class="nav-breadcrumbs linklist navlinks" role="menubar"> 
+	<!--  DEBIANFORUM: keine brotkrummennagivation
+	</ul>
+
+	<ul id="nav-breadcrumbs" class="nav-breadcrumbs linklist navlinks" role="menubar">
 	-->
+
 		<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
 		<!-- EVENT overall_header_breadcrumbs_before -->
 		<li class="breadcrumbs">

template/overall_footer.html

@@ -1,16 +1,6 @@
 		<!-- EVENT overall_footer_content_after -->
 	</div>
 
-
-<div class="debianforumde-sidebar">
-<!-- INCLUDE debianforumde_sidebar_menu.html -->
-</div>  
-
-</div>  <!-- debianforum outer ende -->
-
-</div>
-</div>
-
 <!-- EVENT overall_footer_page_body_after -->
 
 <div id="page-footer" class="page-footer" role="contentinfo">
@@ -18,10 +8,14 @@
 
 	<div class="copyright">
 		<!-- EVENT overall_footer_copyright_prepend -->
+		
+		<!-- Debianforum: disclaimer: -->
 		Diese Webseite ist keine offizielle Webseite des <a href="http://www.debian.org/">Debian</a>-Projekts.
                 <br /><a href="https://wiki.debianforum.de/debianforum.de/Impressum">Haftungsausschluss und Impressum</a> &ndash;
                 <a href="https://wiki.debianforum.de/debianforum.de/Verhaltensregeln">debianforum.de Verhaltensregeln</a>
 		<br /><br />
+		<!-- -- >
+
 		{CREDIT_LINE}
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- EVENT overall_footer_copyright_append -->
@@ -90,7 +84,8 @@
 				"content": {
 					"message": "{LA_COOKIE_CONSENT_MSG}",
 					"dismiss": "{LA_COOKIE_CONSENT_OK}",
-					"link": "{LA_COOKIE_CONSENT_INFO}"
+					"link": "{LA_COOKIE_CONSENT_INFO}",
+					"href": "{LA_COOKIE_CONSENT_HREF}"
 				}
 			})});
 	</script>

template/overall_header.html

@@ -33,7 +33,7 @@
 <script>
 	WebFontConfig = {
 		google: {
-			families: ['Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic']
+			families: ['Open+Sans:300,300i,400,400i,600,600i,700,700i,800,800i&subset=cyrillic,cyrillic-ext,greek,greek-ext,latin-ext,vietnamese']
 		}
 	};
 
@@ -85,10 +85,14 @@
 
 			<div id="site-description" class="site-description">
 				<a id="logo" class="logo" href="<!-- IF U_SITE_HOME -->{U_SITE_HOME}<!-- ELSE -->{U_INDEX}<!-- ENDIF -->" title="<!-- IF U_SITE_HOME -->{L_SITE_HOME}<!-- ELSE -->{L_INDEX}<!-- ENDIF -->"><span class="site_logo"></span></a>
+
+				<!-- Debianforum: Titel klickbar -->			
 				<a id="dfdeHeader" class="dfdeHeader" href="<!-- IF U_SITE_HOME -->{U_SITE_HOME}<!-- ELSE -->{U_INDEX}<!-- ENDIF -->" title="<!-- IF U_SITE_HOME -->{L_SITE_HOME}<!-- ELSE -->{L_INDEX}<!-- ENDIF -->">
 				<h1>{SITENAME}</h1>
 				<p>{SITE_DESCRIPTION}</p>
 				</a>
+				<!-- -->
+
 				<p class="skiplink"><a href="#start_here">{L_SKIP}</a></p>
 			</div>
 
@@ -120,7 +124,7 @@
 
 	<!-- EVENT overall_header_page_body_before -->
 
-	<div id=debianforum-outer> 
+	<div id=debianforum-outer> <!-- div ende ist in overall_footer.html -->
 
 	<a id="start_here" class="anchor"></a>
 	<div id="page-body" class="page-body" role="main">

template/pagination.html

@@ -16,13 +16,13 @@
 <!-- ENDIF -->
 <!-- BEGIN pagination -->
 	<!-- IF pagination.S_IS_PREV -->
-		<li class="arrow previous"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="prev" role="button"><i class="icon fa-chevron-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_PREVIOUS}</span></a></li>
+		<li class="arrow previous"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="prev" role="button"><i class="icon fa-chevron-{S_CONTENT_FLOW_BEGIN} fa-fw" aria-hidden="true"></i><span class="sr-only">{L_PREVIOUS}</span></a></li>
 	<!-- ELSEIF pagination.S_IS_CURRENT -->
 	<li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
 	<!-- ELSEIF pagination.S_IS_ELLIPSIS -->
 	<li class="ellipsis" role="separator"><span>{L_ELLIPSIS}</span></li>
 	<!-- ELSEIF pagination.S_IS_NEXT -->
-		<li class="arrow next"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="next" role="button"><i class="icon fa-chevron-right fa-fw" aria-hidden="true"></i><span class="sr-only">{L_NEXT}</span></a></li>
+		<li class="arrow next"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="next" role="button"><i class="icon fa-chevron-{S_CONTENT_FLOW_END} fa-fw" aria-hidden="true"></i><span class="sr-only">{L_NEXT}</span></a></li>
 	<!-- ELSE -->
 		<li><a class="button" href="{pagination.PAGE_URL}" role="button">{pagination.PAGE_NUMBER}</a></li>
 	<!-- ENDIF -->

template/search_results.html

@@ -78,7 +78,7 @@
 			<!-- EVENT search_results_topic_before -->
 			<li class="row<!-- IF searchresults.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 				<dl class="row-item {searchresults.TOPIC_IMG_STYLE}">
-					<dt<!-- IF searchresults.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url({T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{searchresults.TOPIC_FOLDER_IMG_ALT}">
+					<dt<!-- IF searchresults.TOPIC_ICON_IMG --> style="background-image: url({T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{searchresults.TOPIC_FOLDER_IMG_ALT}">
 						<!-- IF searchresults.S_UNREAD_TOPIC and not S_IS_BOT --><a href="{searchresults.U_NEWEST_POST}" class="row-item-link"></a><!-- ENDIF -->
 						<div class="list-inner">
 							<!-- EVENT topiclist_row_prepend -->
@@ -104,6 +104,7 @@
 								</a>
 							<!-- ENDIF -->
 							<br />
+							<!-- EVENT topiclist_row_topic_title_after -->
 
 							<!-- IF not S_IS_BOT -->
 								<div class="responsive-show" style="display: none;">
@@ -134,7 +135,6 @@
 								</ul>
 							</div>
 							<!-- ENDIF -->
-							<!-- EVENT topiclist_row_topic_title_after -->
 
 							<!-- EVENT topiclist_row_append -->
 						</div>
@@ -185,6 +185,7 @@
 			<dd class="search-result-date">{searchresults.POST_DATE}</dd>
 			<dd>{L_FORUM}{L_COLON} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></dd>
 			<dd>{L_TOPIC}{L_COLON} <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a></dd>
+			<!-- EVENT search_results_topic_title_after -->
 			<dd>{L_REPLIES}{L_COLON} <strong>{searchresults.TOPIC_REPLIES}</strong></dd>
 			<dd>{L_VIEWS}{L_COLON} <strong>{searchresults.TOPIC_VIEWS}</strong></dd>
 			<!-- EVENT search_results_postprofile_after -->

template/simple_header.html

@@ -11,7 +11,7 @@
 <script>
 	WebFontConfig = {
 		google: {
-			families: ['Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic']
+			families: ['Open+Sans:300,300i,400,400i,600,600i,700,700i,800,800i&subset=cyrillic,cyrillic-ext,greek,greek-ext,latin-ext,vietnamese']
 		}
 	};
 

template/ucp_pm_viewmessage.html

@@ -15,7 +15,7 @@
 		<!-- ENDIF -->
 		<!-- IF U_VIEW_NEXT_HISTORY -->
 			<a href="{U_VIEW_NEXT_HISTORY}" class="right-box arrow-{S_CONTENT_FLOW_END}">
-				<i class="icon fa-angle-{S_CONTENT_FLOW_BEGIN} fa-fw icon-black" aria-hidden="true"></i><span>{L_VIEW_NEXT_HISTORY}</span>
+				<i class="icon fa-angle-{S_CONTENT_FLOW_END} fa-fw icon-black" aria-hidden="true"></i><span>{L_VIEW_NEXT_HISTORY}</span>
 			</a>
 		<!-- ENDIF -->
 	</fieldset>
@@ -179,7 +179,7 @@
 	<!-- ENDIF -->
 	<!-- IF U_NEXT_PM -->
 		<a href="{U_NEXT_PM}" class="right-box arrow-{S_CONTENT_FLOW_END}">
-			<i class="icon fa-angle-{S_CONTENT_FLOW_BEGIN} fa-fw icon-black" aria-hidden="true"></i><span>{L_VIEW_NEXT_PM}</span>
+			<i class="icon fa-angle-{S_CONTENT_FLOW_END} fa-fw icon-black" aria-hidden="true"></i><span>{L_VIEW_NEXT_PM}</span>
 		</a>
 	<!-- ENDIF -->
 	<!-- IF not S_UNREAD and not S_SPECIAL_FOLDER --><label for="dest_folder"><!-- IF S_VIEW_MESSAGE -->{L_MOVE_TO_FOLDER}{L_COLON} <!-- ELSE -->{L_MOVE_MARKED_TO_FOLDER}<!-- ENDIF --> <select name="dest_folder" id="dest_folder">{S_TO_FOLDER_OPTIONS}</select></label> <input class="button2" type="submit" name="move_pm" value="{L_GO}" /><!-- ENDIF -->

template/viewforum_body.html

@@ -189,7 +189,9 @@
 							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
 							<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --><br />{L_POSTED} {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF -->
 						</div>
-						<!-- IF topicrow.REPLIES --><span class="responsive-show left-box" style="display: none;">{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong></span><!-- ENDIF -->
+							<!-- IF topicrow.REPLIES -->
+							<span class="responsive-show" style="display: none;">{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong></span>
+							<!-- ENDIF -->
 						<!-- ENDIF -->
 
 						<div class="topic-poster responsive-hide">
@@ -287,9 +289,9 @@
 
 <!-- INCLUDE jumpbox.html -->
 
-<!-- IF S_DISPLAY_ONLINE_LIST -->
+<!-- IF S_DISPLAY_ONLINE_LIST and U_VIEWONLINE -->
 	<div class="stat-block online-list">
-		<h3><!-- IF U_VIEWONLINE --><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a><!-- ELSE -->{L_WHO_IS_ONLINE}<!-- ENDIF --></h3>
+		<h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3>
 		<p>{LOGGED_IN_USER_LIST}</p>
 	</div>
 <!-- ENDIF -->

template/viewtopic_body.html

@@ -439,9 +439,9 @@
 <!-- EVENT viewtopic_body_footer_before -->
 <!-- INCLUDE jumpbox.html -->
 
-<!-- IF S_DISPLAY_ONLINE_LIST -->
+<!-- IF S_DISPLAY_ONLINE_LIST and U_VIEWONLINE -->
 	<div class="stat-block online-list">
-		<h3><!-- IF U_VIEWONLINE --><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a><!-- ELSE -->{L_WHO_IS_ONLINE}<!-- ENDIF --></h3>
+		<h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3>
 		<p>{LOGGED_IN_USER_LIST}</p>
 	</div>
 <!-- ENDIF -->

theme/bidi.css

@@ -13,6 +13,10 @@
 	text-align: left;
 }
 
+.rtl p.jumpbox-return {
+	float: right;
+}
+
 .rtl div.rules ul {
 	margin-left: 0;
 	margin-right: 20px;
@@ -118,6 +122,11 @@
 	float: left;
 }
 
+.rtl .jumpbox .dropdown-contents a {
+	margin-right: 0;
+	margin-left: 20px;
+}
+
 /* Notifications
 -----------------------------------------*/
 .rtl .notification_list ul li img {
@@ -261,11 +270,6 @@
 	margin-right: 0;
 }
 
-.rtl .topic-poster {
-	float: right;
-	padding-left: 0.5em;
-}
-
 /* Action Bar styles
 ---------------------------------------- */
 .rtl .action-bar .button {
@@ -497,7 +501,6 @@ li.breadcrumbs span:first-child > a {
 /* Quote block */
 .rtl blockquote {
 	margin: 0.5em 25px 0 1px;
-	background-position: 99% 8px;
 }
 
 .rtl blockquote blockquote {
@@ -507,10 +510,13 @@ li.breadcrumbs span:first-child > a {
 
 .rtl blockquote cite {
 	/* Username/source of quoter */
-	margin-right: 20px;
 	margin-left: 0;
 }
 
+.rtl blockquote cite:before, .rtl .uncited:before {
+	padding-left: 5px;
+}
+
 .rtl blockquote .codebox {
 	margin-right: 0;
 }
@@ -600,11 +606,12 @@ li.breadcrumbs span:first-child > a {
 */
 
 .rtl .caret {
-	float: right;
+	border-right: 1px solid;
+	border-right-color: inherit;
+	border-left: none;
+	right: 6px;
 }
 
-
-
 /* Post control buttons
 --------------------------------------------- */
 .rtl .post-buttons {
@@ -919,7 +926,8 @@ li.breadcrumbs span:first-child > a {
 	float: right;
 }
 
-.button-search-end {
+.rtl .button-search-end {
+	border-radius: 4px 0 0 4px;
 	border-left-width: 1px;
 	border-right-width: 0;
 }

theme/colours.css

@@ -413,14 +413,9 @@ dl.faq dt {
 /* Quote block */
 blockquote {
 	background-color: #EBEADD;
-	background-image: url("./images/quote.gif");
 	border-color:#DBDBCE;
 }
 
-.rtl blockquote {
-	background-image: url("./images/quote_rtl.gif");
-}
-
 blockquote blockquote {
 	/* Nested quotes */
 	background-color:#EFEED9;
@@ -445,13 +440,6 @@ blockquote blockquote blockquote {
 	color: #2E8B57;
 }
 
-.syntaxbg		{ color: #FFFFFF; }
-.syntaxcomment	{ color: #FF8000; }
-.syntaxdefault	{ color: #0000BB; }
-.syntaxhtml		{ color: #000000; }
-.syntaxkeyword	{ color: #007700; }
-.syntaxstring	{ color: #DD0000; }
-
 /* Attachments
 ----------------------------------------*/
 .attachbox {

theme/common.css

@@ -97,10 +97,18 @@ b, strong {
 	font-weight: bold;
 }
 
+.text-strong {
+	font-weight: bold;
+}
+
 i, em {
 	font-style: italic;
 }
 
+.text-italics {
+	font-style: italic;
+}
+
 u {
 	text-decoration: underline;
 }
@@ -133,6 +141,7 @@ a:hover	{ text-decoration: underline; }
 	border: 1px solid transparent;
 	border-radius: 8px;
 	margin: 0 auto;
+	max-width: 1152px;
 	min-width: 625px;
 	padding: 0px 7px 0px 7px;
 }
@@ -159,15 +168,15 @@ a:hover	{ text-decoration: underline; }
 }
 
 @media only screen and (min-width: 680px) {
-	.page-body {
+.page-body {
-		    margin: 4px 0;
+	margin: 4px 0;
-			clear: both;
+	clear: both;
 			float:right;
 		    /* margin-left: 160px;
 		    margin-right: 16px;
 	        padding-left: 15px;	*/
             width:85%;
-	}
+}
 
 	.debianforumde-sidebar {
 			margin-top:4px;
@@ -227,8 +236,6 @@ a:hover	{ text-decoration: underline; }
 			margin-left: 2px;
 			overflow: hidden;
 }
-								
-								
 
 /* Site description and logo */
 .site-description {
@@ -263,14 +270,15 @@ a:hover	{ text-decoration: underline; }
 	border-style: solid;
 	border-width: 1px 1px 1px 3px;
 	color: #000000;
-	clear: both;
 	margin-bottom: 4px;
+	padding: 5px;
+	clear: both;
+	/* clear: both; */	
 	margin-right: 3px;
-	padding: 0 5px;
+	border-radius: 7px;
+	
 }
 
-
-
 .forumbg {
 	margin-bottom: 4px;
 	padding: 5px;
@@ -947,6 +955,11 @@ fieldset.fields1 dl.pmlist dd.recipients {
 .row .pagination {
 	display: block;
 	margin-top: -0.8em;  /*TODO: macht evtl woanders was kaputt */
+        
+   	/*
+	margin-top: 0.3em;
+        margin-top: -12px;
+        */
 }
 
 .row .pagination > ul {
@@ -959,6 +972,8 @@ fieldset.fields1 dl.pmlist dd.recipients {
 	font-size: 9px;
 }
 
+
+/* TODO: .topic-poster ist raus aus 3.2.1, benutzen wir das irgendwo? */
 .topic-poster {
 	float: left;
 	padding-right: 0.5em;
@@ -1316,7 +1331,7 @@ ul.linklist:after,
 	margin: 0 7px 0 0;
 }
 
-.linklist.compact .rightside > a > span span {
+.linklist.compact .rightside > a > span {
 	display: none;
 }
 

theme/content.css

@@ -134,15 +134,17 @@ li.header dl.row-item dt .list-inner {
 dl.row-item {
 	background-position: 10px 50%;		/* Position of folder icon */
 	background-repeat: no-repeat;
+	background-size: 32px;
 }
 
 dl.row-item dt {
 	background-repeat: no-repeat;
 	background-position: 5px 95%;		/* Position of topic icon */
+	background-size: 17px;
 }
 
 dl.row-item dt .list-inner {
-	padding-left: 45px;					/* Space for folder icon */
+	padding-left: 52px;					/* Space for folder icon */
 }
 
 dl.row-item dt, dl.row-item dd {
@@ -446,7 +448,6 @@ ul.searchresults {
 ----------------------------------------*/
 /* Quote block */
 blockquote {
-	background: transparent none 6px 8px no-repeat;
 	border: 1px solid transparent;
 	font-size: 0.95em;
 	margin: 1em 1px 1em 25px;
@@ -464,7 +465,6 @@ blockquote cite {
 	/* Username/source of quoter */
 	font-style: normal;
 	font-weight: bold;
-	margin-left: 20px;
 	display: block;
 	font-size: 0.9em;
 }
@@ -473,8 +473,8 @@ blockquote cite cite {
 	font-size: 1em;
 }
 
-blockquote.uncited {
+blockquote cite:before, .uncited:before {
-	padding-top: 25px;
+	padding-right: 5px;
 }
 
 blockquote cite > div {
@@ -489,16 +489,17 @@ blockquote cite > div {
 
 /* Code block */
 .codebox {
-	padding: 3px;
 	border: 1px solid transparent;
 	font-size: 1em;
 	margin: 1em 0 1.2em 0;
+	word-wrap: normal;
 }
 
 .codebox p {
 	text-transform: uppercase;
 	border-bottom: 1px solid transparent;
-	margin-bottom: 3px;
+	margin-bottom: 0;
+	padding: 3px;
 	font-size: 0.8em !important;
 	font-weight: bold;
 	display: block;
@@ -513,10 +514,9 @@ blockquote .codebox {
 	display: block;
 	height: auto;
 	max-height: 200px;
-	padding-top: 5px;
+	padding: 5px 3px;
 	font: 0.9em Monaco, "Andale Mono","Courier New", Courier, monospace;
 	line-height: 1.3em;
-	margin: 2px 0;
 }
 
 /* Attachments

theme/forms.css

@@ -267,11 +267,11 @@ fieldset.submit-buttons input {
 	resize: vertical;
 	outline: 3px dashed transparent;
 	outline-offset: -4px;
-	-webkit-transition: all .5s ease;
+	-webkit-transition: all .5s ease, height 1ms linear;
-	-moz-transition: all .5s ease;
+	-moz-transition: all .5s ease, height 1ms linear;
-	-ms-transition: all .5s ease;
+	-ms-transition: all .5s ease, height 1ms linear;
-	-o-transition: all .5s ease;
+	-o-transition: all .5s ease, height 1ms linear;
-	transition: all .5s ease;
+	transition: all .5s ease, height 1ms linear;
 }
 
 /* Emoticons panel */
@@ -310,7 +310,7 @@ textarea.inputbox {
 }
 
 input[type="number"] {
-	-moz-padding-end: inherit;
+	-moz-padding-end: 0;
 }
 
 input[type="search"] {

theme/icons.css

@@ -9,7 +9,7 @@
  * Just change the name of the font after the 14/1 to the name of
  * the font you wish to use.
  */
-.icon, .button .icon  {
+.icon, .button .icon, blockquote cite:before, .uncited:before {
 	display: inline-block;
   	font-weight: normal;
   	font-style: normal;
@@ -54,6 +54,10 @@
 	font-size: 16px;
 }
 
+.arrow-left .icon {
+	float: left;
+}
+
 .arrow-left:hover .icon {
 	margin-left: -5px;
 	margin-right: 5px;
@@ -81,3 +85,12 @@
     line-height: .9;
     height: 12px;
 }
+
+blockquote cite:before, .uncited:before {
+	content: '\f10d'; /* Font Awesome quote-left */
+}
+
+.rtl blockquote cite:before, .rtl .uncited:before {
+	content: '\f10e'; /* Font Awesome quote-right */
+}
+