diff options
Diffstat (limited to 'phpBB/styles/prosilver/template')
128 files changed, 4759 insertions, 3439 deletions
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js new file mode 100644 index 0000000000..168efff4b4 --- /dev/null +++ b/phpBB/styles/prosilver/template/ajax.js @@ -0,0 +1,385 @@ +/* global phpbb */ + +(function($) {  // Avoid conflicts with other libraries + +'use strict'; + +// This callback will mark all forum icons read +phpbb.addAjaxCallback('mark_forums_read', function(res) { +	var readTitle = res.NO_UNREAD_POSTS; +	var unreadTitle = res.UNREAD_POSTS; +	var iconsArray = { +		'forum_unread': 'forum_read', +		'forum_unread_subforum': 'forum_read_subforum', +		'forum_unread_locked': 'forum_read_locked' +	}; + +	$('li.row').find('dl[class*="forum_unread"]').each(function() { +		var $this = $(this); + +		$.each(iconsArray, function(unreadClass, readClass) { +			if ($this.hasClass(unreadClass)) { +				$this.removeClass(unreadClass).addClass(readClass); +			} +		}); +		$this.children('dt[title="' + unreadTitle + '"]').attr('title', readTitle); +	}); + +	// Mark subforums read +	$('a.subforum[class*="unread"]').removeClass('unread').addClass('read'); + +	// Mark topics read if we are watching a category and showing active topics +	if ($('#active_topics').length) { +		phpbb.ajaxCallbacks.mark_topics_read.call(this, res, false); +	} + +	// Update mark forums read links +	$('[data-ajax="mark_forums_read"]').attr('href', res.U_MARK_FORUMS); + +	phpbb.closeDarkenWrapper(3000); +}); + +/**  +* This callback will mark all topic icons read +* +* @param update_topic_links bool Whether "Mark topics read" links should be +*     updated. Defaults to true. +*/ +phpbb.addAjaxCallback('mark_topics_read', function(res, updateTopicLinks) { +	var readTitle = res.NO_UNREAD_POSTS; +	var unreadTitle = res.UNREAD_POSTS; +	var iconsArray = { +		'global_unread': 'global_read', +		'announce_unread': 'announce_read', +		'sticky_unread': 'sticky_read', +		'topic_unread': 'topic_read' +	}; +	var iconsState = ['', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine']; +	var unreadClassSelectors; +	var classMap = {}; +	var classNames = []; + +	if (typeof updateTopicLinks === 'undefined') { +		updateTopicLinks = true; +	} + +	$.each(iconsArray, function(unreadClass, readClass) { +		$.each(iconsState, function(key, value) { +			// Only topics can be hot +			if ((value === '_hot' || value === '_hot_mine') && unreadClass !== 'topic_unread') { +				return true; +			} +			classMap[unreadClass + value] = readClass + value; +			classNames.push(unreadClass + value); +		}); +	}); + +	unreadClassSelectors = '.' + classNames.join(',.'); + +	$('li.row').find(unreadClassSelectors).each(function() { +		var $this = $(this); +		$.each(classMap, function(unreadClass, readClass) { +			if ($this.hasClass(unreadClass)) { +				$this.removeClass(unreadClass).addClass(readClass); +			} +		}); +		$this.children('dt[title="' + unreadTitle + '"]').attr('title', readTitle); +	}); + +	// Remove link to first unread post +	$('a').has('span.icon_topic_newest').remove(); + +	// Update mark topics read links +	if (updateTopicLinks) { +		$('[data-ajax="mark_topics_read"]').attr('href', res.U_MARK_TOPICS); +	} + +	phpbb.closeDarkenWrapper(3000); +}); + +// This callback will mark all notifications read +phpbb.addAjaxCallback('notification.mark_all_read', function(res) { +	if (typeof res.success !== 'undefined') { +		phpbb.markNotifications($('#notification_list li.bg2'), 0); +		phpbb.closeDarkenWrapper(3000); +	} +}); + +// This callback will mark a notification read +phpbb.addAjaxCallback('notification.mark_read', function(res) { +	if (typeof res.success !== 'undefined') { +		var unreadCount = Number($('#notification_list_button strong').html()) - 1; +		phpbb.markNotifications($(this).parent('li.bg2'), unreadCount); +	} +}); + +/** + * Mark notification popup rows as read. + * + * @param {jQuery} $popup jQuery object(s) to mark read. + * @param {int} unreadCount The new unread notifications count. + */ +phpbb.markNotifications = function($popup, unreadCount) { +	// Remove the unread status. +	$popup.removeClass('bg2'); +	$popup.find('a.mark_read').remove(); + +	// Update the notification link to the real URL. +	$popup.each(function() { +		var link = $(this).find('a'); +		link.attr('href', link.attr('data-real-url')); +	}); + +	// Update the unread count. +	$('strong', '#notification_list_button').html(unreadCount); +	// Remove the Mark all read link if there are no unread notifications. +	if (!unreadCount) { +		$('#mark_all_notifications').remove(); +	} + +	// Update page title +	$('title').text( +		(unreadCount ? '(' + unreadCount + ')' : '') + $('title').text().replace(/(\(([0-9])\))/, '') +	); +}; + +// This callback finds the post from the delete link, and removes it. +phpbb.addAjaxCallback('post_delete', function() { +	var $this = $(this), +		postId; + +	if ($this.attr('data-refresh') === undefined) { +		postId = $this[0].href.split('&p=')[1]; +		var post = $this.parents('#p' + postId).css('pointer-events', 'none'); +		if (post.hasClass('bg1') || post.hasClass('bg2')) { +			var posts1 = post.nextAll('.bg1'); +			post.nextAll('.bg2').removeClass('bg2').addClass('bg1'); +			posts1.removeClass('bg1').addClass('bg2'); +		} +		post.fadeOut(function() { +			$(this).remove(); +		}); +	} +}); + +// This callback removes the approve / disapprove div or link. +phpbb.addAjaxCallback('post_visibility', function(res) { +	var remove = (res.visible) ? $(this) : $(this).parents('.post'); +	$(remove).css('pointer-events', 'none').fadeOut(function() { +		$(this).remove(); +	}); + +	if (res.visible) { +		// Remove the "Deleted by" message from the post on restoring. +		remove.parents('.post').find('.post_deleted_msg').css('pointer-events', 'none').fadeOut(function() { +			$(this).remove(); +		}); +	} +}); + +// This removes the parent row of the link or form that fired the callback. +phpbb.addAjaxCallback('row_delete', function() { +	$(this).parents('tr').remove(); +}); + +// This handles friend / foe additions removals. +phpbb.addAjaxCallback('zebra', function(res) { +	var zebra; + +	if (res.success) { +		zebra = $('.zebra'); +		zebra.first().html(res.MESSAGE_TEXT); +		zebra.not(':first').html(' ').prev().html(' '); +	} +}); + +/** + * This callback updates the poll results after voting. + */ +phpbb.addAjaxCallback('vote_poll', function(res) { +	if (typeof res.success !== 'undefined') { +		var poll = $('.topic_poll'); +		var panel = poll.find('.panel'); +		var resultsVisible = poll.find('dl:first-child .resultbar').is(':visible'); +		var mostVotes = 0; + +		// Set min-height to prevent the page from jumping when the content changes +		var updatePanelHeight = function (height) { +			var height = (typeof height === 'undefined') ? panel.find('.inner').outerHeight() : height; +			panel.css('min-height', height); +		}; +		updatePanelHeight(); + +		// Remove the View results link +		if (!resultsVisible) { +			poll.find('.poll_view_results').hide(500); +		} + +		if (!res.can_vote) { +			poll.find('.polls, .poll_max_votes, .poll_vote, .poll_option_select').fadeOut(500, function () { +				poll.find('.resultbar, .poll_option_percent, .poll_total_votes').show(); +			}); +		} else { +			// If the user can still vote, simply slide down the results +			poll.find('.resultbar, .poll_option_percent, .poll_total_votes').show(500); +		} +		 +		// Get the votes count of the highest poll option +		poll.find('[data-poll-option-id]').each(function() { +			var option = $(this); +			var optionId = option.attr('data-poll-option-id'); +			mostVotes = (res.vote_counts[optionId] >= mostVotes) ? res.vote_counts[optionId] : mostVotes; +		}); + +		// Update the total votes count +		poll.find('.poll_total_vote_cnt').html(res.total_votes); + +		// Update each option +		poll.find('[data-poll-option-id]').each(function() { +			var $this = $(this); +			var optionId = $this.attr('data-poll-option-id'); +			var voted = (typeof res.user_votes[optionId] !== 'undefined'); +			var mostVoted = (res.vote_counts[optionId] === mostVotes); +			var percent = (!res.total_votes) ? 0 : Math.round((res.vote_counts[optionId] / res.total_votes) * 100); +			var percentRel = (mostVotes === 0) ? 0 : Math.round((res.vote_counts[optionId] / mostVotes) * 100); + +			$this.toggleClass('voted', voted); +			$this.toggleClass('most-votes', mostVoted); + +			// Update the bars +			var bar = $this.find('.resultbar div'); +			var barTimeLapse = (res.can_vote) ? 500 : 1500; +			var newBarClass = (percent === 100) ? 'pollbar5' : 'pollbar' + (Math.floor(percent / 20) + 1); + +			setTimeout(function () { +				bar.animate({width: percentRel + '%'}, 500) +					.removeClass('pollbar1 pollbar2 pollbar3 pollbar4 pollbar5') +					.addClass(newBarClass) +					.html(res.vote_counts[optionId]); + +				var percentText = percent ? percent + '%' : res.NO_VOTES; +				$this.find('.poll_option_percent').html(percentText); +			}, barTimeLapse); +		}); + +		if (!res.can_vote) { +			poll.find('.polls').delay(400).fadeIn(500); +		} + +		// Display "Your vote has been cast." message. Disappears after 5 seconds. +		var confirmationDelay = (res.can_vote) ? 300 : 900; +		poll.find('.vote-submitted').delay(confirmationDelay).slideDown(200, function() { +			if (resultsVisible) { +				updatePanelHeight(); +			} + +			$(this).delay(5000).fadeOut(500, function() { +				resizePanel(300); +			}); +		}); + +		// Remove the gap resulting from removing options +		setTimeout(function() { +			resizePanel(500); +		}, 1500); + +		var resizePanel = function (time) { +			var panelHeight = panel.height(); +			var innerHeight = panel.find('.inner').outerHeight(); + +			if (panelHeight != innerHeight) { +				panel.css({'min-height': '', 'height': panelHeight}) +					.animate({height: innerHeight}, time, function () { +						panel.css({'min-height': innerHeight, 'height': ''}); +					}); +			} +		}; +	} +}); + +/** + * Show poll results when clicking View results link. + */ +$('.poll_view_results a').click(function(e) { +	// Do not follow the link +	e.preventDefault(); + +	var $poll = $(this).parents('.topic_poll'); + +	$poll.find('.resultbar, .poll_option_percent, .poll_total_votes').show(500); +	$poll.find('.poll_view_results').hide(500); +}); + +$('[data-ajax]').each(function() { +	var $this = $(this); +	var ajax = $this.attr('data-ajax'); +	var filter = $this.attr('data-filter'); + +	if (ajax !== 'false') { +		var fn = (ajax !== 'true') ? ajax : null; +		filter = (filter !== undefined) ? phpbb.getFunctionByName(filter) : null; + +		phpbb.ajaxify({ +			selector: this, +			refresh: $this.attr('data-refresh') !== undefined, +			filter: filter, +			callback: fn +		}); +	} +}); + + +/** + * This simply appends #preview to the action of the + * QR action when you click the Full Editor & Preview button + */ +$('#qr_full_editor').click(function() { +	$('#qr_postform').attr('action', function(i, val) { +		return val + '#preview'; +	}); +}); + + +/** + * Make the display post links to use JS + */ +$('.display_post').click(function(e) { +	// Do not follow the link +	e.preventDefault(); + +	var postId = $(this).attr('data-post-id'); +	$('#post_content' + postId).show(); +	$('#profile' + postId).show(); +	$('#post_hidden' + postId).hide(); +}); + +/** +* Toggle the member search panel in memberlist.php. +* +* If user returns to search page after viewing results the search panel is automatically displayed. +* In any case the link will toggle the display status of the search panel and link text will be +* appropriately changed based on the status of the search panel. +*/ +$('#member_search').click(function () { +	var $memberlistSearch = $('#memberlist_search'); + +	$memberlistSearch.slideToggle('fast'); +	phpbb.ajaxCallbacks.alt_text.call(this); + +	// Focus on the username textbox if it's available and displayed +	if ($memberlistSearch.is(':visible')) { +		$('#username').focus(); +	} +	return false; +}); + +/** +* Automatically resize textarea +*/ +$(function() { +	phpbb.resizeTextArea($('textarea:not(#message-box textarea, .no-auto-resize)'), {minHeight: 75, maxHeight: 250}); +	phpbb.resizeTextArea($('#message-box textarea')); +}); + + +})(jQuery); // Avoid conflicts with other libraries diff --git a/phpBB/styles/prosilver/template/attachment.html b/phpBB/styles/prosilver/template/attachment.html index 4c0a326f1e..c227e710b1 100644 --- a/phpBB/styles/prosilver/template/attachment.html +++ b/phpBB/styles/prosilver/template/attachment.html @@ -6,7 +6,7 @@  		<!-- IF _file.S_THUMBNAIL -->  		<dl class="thumbnail"> -			<dt><a href="{_file.U_DOWNLOAD_LINK}"><img src="{_file.THUMB_IMAGE}" alt="{_file.DOWNLOAD_NAME}" title="{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}" /></a></dt> +			<dt><a href="{_file.U_DOWNLOAD_LINK}"><img src="{_file.THUMB_IMAGE}" class="postimage" alt="{_file.DOWNLOAD_NAME}" title="{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}" /></a></dt>  			<!-- IF _file.COMMENT --><dd> {_file.COMMENT}</dd><!-- ENDIF -->  		</dl>  		<!-- ENDIF --> @@ -14,7 +14,7 @@  		<!-- IF _file.S_IMAGE -->  		<dl class="file"> -			<dt class="attach-image"><img src="{_file.U_INLINE_LINK}" alt="{_file.DOWNLOAD_NAME}" onclick="viewableArea(this);" /></dt> +			<dt class="attach-image"><img src="{_file.U_INLINE_LINK}" class="postimage" alt="{_file.DOWNLOAD_NAME}" onclick="viewableArea(this);" /></dt>  			<!-- IF _file.COMMENT --><dd><em>{_file.COMMENT}</em></dd><!-- ENDIF -->  			<dd>{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}</dd>  		</dl> diff --git a/phpBB/styles/prosilver/template/bbcode.html b/phpBB/styles/prosilver/template/bbcode.html index bb90c46ced..3e38d13a32 100644 --- a/phpBB/styles/prosilver/template/bbcode.html +++ b/phpBB/styles/prosilver/template/bbcode.html @@ -8,12 +8,12 @@  <!-- BEGIN listitem --><li><!-- END listitem -->  <!-- BEGIN listitem_close --></li><!-- END listitem_close --> -<!-- BEGIN quote_username_open --><blockquote><div><cite>{USERNAME} {L_WROTE}:</cite><!-- END quote_username_open --> +<!-- BEGIN quote_username_open --><blockquote><div><cite>{USERNAME} {L_WROTE}{L_COLON}</cite><!-- END quote_username_open -->  <!-- BEGIN quote_open --><blockquote class="uncited"><div><!-- END quote_open -->  <!-- BEGIN quote_close --></div></blockquote><!-- END quote_close --> -<!-- BEGIN code_open --><dl class="codebox"><dt>{L_CODE}: <a href="#" onclick="selectCode(this); return false;">{L_SELECT_ALL_CODE}</a></dt><dd><code><!-- END code_open --> -<!-- BEGIN code_close --></code></dd></dl><!-- END code_close --> +<!-- BEGIN code_open --><div class="codebox"><p>{L_CODE}{L_COLON} <a href="#" onclick="selectCode(this); return false;">{L_SELECT_ALL_CODE}</a></p><code><!-- END code_open --> +<!-- BEGIN code_close --></code></div><!-- END code_close -->  <!-- BEGIN inline_attachment_open --><div class="inline-attachment"><!-- END inline_attachment_open -->  <!-- BEGIN inline_attachment_close --></div><!-- END inline_attachment_close --> @@ -31,10 +31,10 @@  <!-- BEGIN size --><span style="font-size: {SIZE}%; line-height: 116%;">{TEXT}</span><!-- END size --> -<!-- BEGIN img --><img src="{URL}" alt="{L_IMAGE}" /><!-- END img --> +<!-- BEGIN img --><img src="{URL}" class="postimage" alt="{L_IMAGE}" /><!-- END img -->  <!-- BEGIN url --><a href="{URL}" class="postlink">{DESCRIPTION}</a><!-- END url -->  <!-- BEGIN email --><a href="mailto:{EMAIL}">{DESCRIPTION}</a><!-- END email --> -<!-- BEGIN flash --><object classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000" codebase="http://active.macromedia.com/flash2/cabs/swflash.cab#version=5,0,0,0" width="{WIDTH}" height="{HEIGHT}"><param name="movie" value="{URL}" /><param name="play" value="false" /><param name="loop" value="false" /><param name="quality" value="high" /><param name="allowScriptAccess" value="never" /><param name="allowNetworking" value="internal" /><embed src="{URL}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{WIDTH}" height="{HEIGHT}" play="false" loop="false" quality="high" allowscriptaccess="never" allownetworking="internal"></embed></object><!-- END flash -->
\ No newline at end of file +<!-- BEGIN flash --><object classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000" codebase="http://active.macromedia.com/flash2/cabs/swflash.cab#version=5,0,0,0" width="{WIDTH}" height="{HEIGHT}"><param name="movie" value="{URL}" /><param name="play" value="false" /><param name="loop" value="false" /><param name="quality" value="high" /><param name="allowScriptAccess" value="never" /><param name="allowNetworking" value="internal" /><embed src="{URL}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{WIDTH}" height="{HEIGHT}" play="false" loop="false" quality="high" allowscriptaccess="never" allownetworking="internal"></embed></object><!-- END flash --> diff --git a/phpBB/styles/prosilver/template/captcha_default.html b/phpBB/styles/prosilver/template/captcha_default.html index bccf231251..02899bcafd 100644 --- a/phpBB/styles/prosilver/template/captcha_default.html +++ b/phpBB/styles/prosilver/template/captcha_default.html @@ -1,16 +1,16 @@  <!-- IF S_TYPE == 1 --> -<div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +<div class="panel captcha-panel"> +	<div class="inner"> -	<h3>{L_CONFIRMATION}</h3> +	<h3 class="captcha-title">{L_CONFIRMATION}</h3>  	<p>{L_CONFIRM_EXPLAIN}</p>  	<fieldset class="fields2">  <!-- ENDIF -->  	<dl> -		<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt> -		<dd><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd> +		<dt><label for="confirm_code">{L_CONFIRM_CODE}{L_COLON}</label></dt> +		<dd class="captcha captcha-image"><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>  		<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="{$CAPTCHA_TAB_INDEX}" class="inputbox narrow" title="{L_CONFIRM_CODE}" />  		<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF -->  		<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd> @@ -19,6 +19,6 @@  <!-- IF S_TYPE == 1 -->  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/captcha_qa.html b/phpBB/styles/prosilver/template/captcha_qa.html index 0b18ada3bb..b8c6678066 100644 --- a/phpBB/styles/prosilver/template/captcha_qa.html +++ b/phpBB/styles/prosilver/template/captcha_qa.html @@ -1,14 +1,14 @@  <!-- IF S_TYPE == 1 --> -<div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +<div class="panel captcha-panel"> +	<div class="inner"> -	<h3>{L_CONFIRMATION}</h3> +	<h3 class="captcha-title">{L_CONFIRMATION}</h3>  	<fieldset class="fields2">  <!-- ENDIF -->  	<dl> -	<dt><label>{QA_CONFIRM_QUESTION}:</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt> -	<dd> +	<dt><label>{QA_CONFIRM_QUESTION}{L_COLON}</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt> +	<dd class="captcha">  		<input type="text" tabindex="{$CAPTCHA_TAB_INDEX}" name="qa_answer" id="answer" size="45"  class="inputbox autowidth" title="{L_ANSWER}" />  		<input type="hidden" name="qa_confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" />  	</dd> @@ -16,6 +16,6 @@  <!-- IF S_TYPE == 1 -->  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/captcha_recaptcha.html b/phpBB/styles/prosilver/template/captcha_recaptcha.html index 51a1615bd5..fee0f7423e 100644 --- a/phpBB/styles/prosilver/template/captcha_recaptcha.html +++ b/phpBB/styles/prosilver/template/captcha_recaptcha.html @@ -1,8 +1,8 @@  <!-- IF S_TYPE == 1 --> -<div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +<div class="panel captcha-panel"> +	<div class="inner"> -	<h3>{L_CONFIRMATION}</h3> +	<h3 class="captcha-title">{L_CONFIRMATION}</h3>  	<p>{L_CONFIRM_EXPLAIN}</p>  	<fieldset class="fields2"> @@ -10,25 +10,17 @@  <!-- IF S_RECAPTCHA_AVAILABLE -->  	<dl> -	<dt><label>{L_CONFIRM_CODE}</label>:<br /><span>{L_RECAPTCHA_EXPLAIN}</span></dt> -	<dd> -		<script type="text/javascript"> -		// <![CDATA[ +	<dt><label>{L_CONFIRM_CODE}{L_COLON}</label><br /><span>{L_RECAPTCHA_EXPLAIN}</span></dt> +	<dd class="captcha"> +		<script>  		var RecaptchaOptions = {  			lang : '{LA_RECAPTCHA_LANG}',  			theme : 'clean',  			tabindex : <!-- IF $CAPTCHA_TAB_INDEX -->{$CAPTCHA_TAB_INDEX}<!-- ELSE -->10<!-- ENDIF -->  		}; -		// ]]> -		</script> -		<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"></script> -		<script type="text/javascript"> -		// <![CDATA[ -		<!-- IF S_CONTENT_DIRECTION eq 'rtl' --> -			document.getElementById('recaptcha_table').style.direction = 'ltr'; -		<!-- ENDIF --> -		// ]]>  		</script> +		<script src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"></script> +  		<noscript>  		<div>  			<object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br /> @@ -37,6 +29,7 @@  		</div>  		</noscript> +		<a href="http://www.google.com/intl/{LA_RECAPTCHA_LANG}/policies/" target="_blank" class="recaptcha-responsive" style="display: none"><img alt="" width="71" height="36" src="{RECAPTCHA_SERVER}/img/clean/logo.png"></a>  	</dd>  	</dl>  <!-- ELSE --> @@ -45,6 +38,6 @@  <!-- IF S_TYPE == 1 -->  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/confirm_body.html b/phpBB/styles/prosilver/template/confirm_body.html index 5b783915a4..aaea5cfd05 100644 --- a/phpBB/styles/prosilver/template/confirm_body.html +++ b/phpBB/styles/prosilver/template/confirm_body.html @@ -1,20 +1,35 @@ +<!-- IF S_AJAX_REQUEST --> +	<form action="{S_CONFIRM_ACTION}" method="post"> +		<h3>{MESSAGE_TITLE}</h3> +		<p>{MESSAGE_TEXT}</p> + +		<fieldset class="submit-buttons"> +			<input type="button" name="confirm" value="{L_YES}" class="button2" />  +			<input type="button" name="cancel" value="{L_NO}" class="button2" /> +		</fieldset> +	</form> + +<!-- ELSE --> +  <!-- INCLUDE overall_header.html -->  <form id="confirm" action="{S_CONFIRM_ACTION}" method="post">  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner"> -	<h2>{MESSAGE_TITLE}</h2> +	<h2 class="message-title">{MESSAGE_TITLE}</h2>  	<p>{MESSAGE_TEXT}</p> -	 +  	<fieldset class="submit-buttons">  		{S_HIDDEN_FIELDS} -		<input type="submit" name="confirm" value="{L_YES}" class="button2" />   +		<input type="submit" name="confirm" value="{L_YES}" class="button2" />   		<input type="submit" name="cancel" value="{L_NO}" class="button2" />  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  </form>  <!-- INCLUDE overall_footer.html --> + +<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/confirm_delete_body.html b/phpBB/styles/prosilver/template/confirm_delete_body.html new file mode 100644 index 0000000000..f164b5f357 --- /dev/null +++ b/phpBB/styles/prosilver/template/confirm_delete_body.html @@ -0,0 +1,66 @@ +<!-- IF S_AJAX_REQUEST --> +	<form action="{S_CONFIRM_ACTION}" method="post"> +		<p>{MESSAGE_TEXT}</p> + +		<!-- IF not S_SOFTDELETED and S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE --> +			<label> +				<strong>{L_DELETE_PERMANENTLY}{L_COLON}</strong> +				<input id="delete_permanent" name="delete_permanent" type="checkbox" value="1" {S_CHECKED_PERMANENT} /> +				<!-- IF S_TOPIC_MODE -->{L_DELETE_TOPIC_PERMANENTLY}<!-- ELSE -->{L_DELETE_POST_PERMANENTLY}<!-- ENDIF --> +			</label> +		<!-- ENDIF --> + +		<label for="delete_reason"> +			<strong>{L_DELETE_REASON}{L_COLON}</strong><br /><span>{L_DELETE_REASON_EXPLAIN}</span><br /> +			<input type="text" name="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" /> +		</label> + +		<fieldset class="submit-buttons"> +			<input type="button" name="confirm" value="{L_YES}" class="button1" />  +			<input type="button" name="cancel" value="{L_NO}" class="button2" /> +		</fieldset> +	</form> + +<!-- ELSE --> + +<!-- INCLUDE overall_header.html --> + +<form id="confirm" action="{S_CONFIRM_ACTION}" method="post"> +<div class="panel"> +	<div class="inner"> + +	<h2 class="message-title">{MESSAGE_TITLE}</h2> + +	<p>{MESSAGE_TEXT}</p> + +	<fieldset class="fields1"> +		<!-- IF not S_SOFTDELETED and S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE --> +			<dl> +				<dt><label for="delete_permanent">{L_DELETE_PERMANENTLY}{L_COLON}</label></dt> +				<dd> +					<label for="delete_permanent"> +						<input id="delete_permanent" name="delete_permanent" type="checkbox" value="1" {S_CHECKED_PERMANENT} /> +						<!-- IF S_TOPIC_MODE -->{L_DELETE_TOPIC_PERMANENTLY}<!-- ELSE -->{L_DELETE_POST_PERMANENTLY}<!-- ENDIF --> +					</label> +				</dd> +			</dl> +		<!-- ENDIF --> + +		<dl> +			<dt><label for="delete_reason">{L_DELETE_REASON}{L_COLON}</label><br /><span>{L_DELETE_REASON_EXPLAIN}</span></dt> +			<dd><input type="text" name="delete_reason" id="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" /></dd> +		</dl> +	</fieldset> + +	<fieldset class="submit-buttons"> +		{S_HIDDEN_FIELDS} +		<input type="submit" name="confirm" value="{L_YES}" class="button1" />   +		<input type="submit" name="cancel" value="{L_NO}" class="button2" /> +	</fieldset> + +	</div> +</div> +</form> + +<!-- INCLUDE overall_footer.html --> +<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/custom_profile_fields.html b/phpBB/styles/prosilver/template/custom_profile_fields.html deleted file mode 100644 index 44c68f532b..0000000000 --- a/phpBB/styles/prosilver/template/custom_profile_fields.html +++ /dev/null @@ -1,31 +0,0 @@ -<!-- BEGIN dropdown --> -<select name="{dropdown.FIELD_IDENT}" id="{dropdown.FIELD_IDENT}"> -	<!-- BEGIN options --><option value="{dropdown.options.OPTION_ID}"{dropdown.options.SELECTED}>{dropdown.options.VALUE}</option><!-- END options --> -</select> -<!-- END dropdown --> - -<!-- BEGIN text --> -<textarea name="{text.FIELD_IDENT}" id="{text.FIELD_IDENT}" rows="{text.FIELD_ROWS}" cols="{text.FIELD_COLS}" class="inputbox autowidth">{text.FIELD_VALUE}</textarea> -<!-- END text --> - -<!-- BEGIN string --> -<input type="text" class="inputbox autowidth" name="{string.FIELD_IDENT}" id="{string.FIELD_IDENT}" size="{string.FIELD_LENGTH}" maxlength="{string.FIELD_MAXLEN}" value="{string.FIELD_VALUE}" /> -<!-- END string --> - -<!-- BEGIN bool --> -<!-- IF bool.FIELD_LENGTH eq 1 --> -	<!-- BEGIN options --><label for="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}"><input type="radio" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}" value="{bool.options.OPTION_ID}"{bool.options.CHECKED} /> {bool.options.VALUE}</label> <!-- END options --> -<!-- ELSE --> -	<input type="checkbox" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}"<!-- IF bool.FIELD_VALUE --> checked="checked"<!-- ENDIF --> /> -<!-- ENDIF --> -<!-- END bool --> - -<!-- BEGIN int --> -<input type="text" class="inputbox autowidth" name="{int.FIELD_IDENT}" id="{int.FIELD_IDENT}" size="{int.FIELD_LENGTH}" value="{int.FIELD_VALUE}" /> -<!-- END int --> - -<!-- BEGIN date --> -<label for="{date.FIELD_IDENT}_day">{L_DAY}: <select name="{date.FIELD_IDENT}_day" id="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select></label>  -<label for="{date.FIELD_IDENT}_month">{L_MONTH}: <select name="{date.FIELD_IDENT}_month" id="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select></label>  -<label for="{date.FIELD_IDENT}_year">{L_YEAR}: <select name="{date.FIELD_IDENT}_year" id="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select></label> -<!-- END date --> diff --git a/phpBB/styles/prosilver/template/drafts.html b/phpBB/styles/prosilver/template/drafts.html index dea3bb414e..ea2849a485 100644 --- a/phpBB/styles/prosilver/template/drafts.html +++ b/phpBB/styles/prosilver/template/drafts.html @@ -2,43 +2,48 @@  <!-- IF .draftrow -->  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner"> -	<h3>{L_LOAD_DRAFT}</h3> +	<h3 class="draft-title">{L_LOAD_DRAFT}</h3>  	<p>{L_LOAD_DRAFT_EXPLAIN}</p> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <div class="<!-- IF not S_PRIVMSGS -->forumbg<!-- ELSE -->panel<!-- ENDIF -->"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner"> -	<ul class="topiclist"> +	<ul class="topiclist two-long-columns">  		<li class="header">  			<dl>  				<dt>{L_LOAD_DRAFT}</dt> -				<dd class="posted">{L_SAVE_DATE}</dd> +				<dd class="info">{L_SAVE_DATE}</dd>  			</dl>  		</li>  	</ul> -	<ul class="topiclist<!-- IF not S_PRIVMSGS --> topics<!-- ELSE --> cplist<!-- ENDIF -->"> +	<ul class="topiclist two-long-columns<!-- IF not S_PRIVMSGS --> topics<!-- ELSE --> cplist<!-- ENDIF -->">  	<!-- BEGIN draftrow -->  	<li class="row<!-- IF draftrow.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">  		<dl>  			<dt> -				<a href="{draftrow.U_INSERT}" title="{L_LOAD_DRAFT}" class="topictitle">{draftrow.DRAFT_SUBJECT}</a><br /> -				<!-- IF not S_PRIVMSGS --><!-- IF draftrow.S_LINK_TOPIC -->{L_TOPIC}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a> -				<!-- ELSEIF draftrow.S_LINK_FORUM -->{L_FORUM}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a> -				<!-- ELSE -->{L_NO_TOPIC_FORUM}<!-- ENDIF --><!-- ENDIF --> +				<div class="list-inner"> +					<a href="{draftrow.U_INSERT}" title="{L_LOAD_DRAFT}" class="topictitle">{draftrow.DRAFT_SUBJECT}</a><br /> +					<!-- IF not S_PRIVMSGS --><!-- IF draftrow.S_LINK_TOPIC -->{L_TOPIC}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a> +					<!-- ELSEIF draftrow.S_LINK_FORUM -->{L_FORUM}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a> +					<!-- ELSE -->{L_NO_TOPIC_FORUM}<!-- ENDIF --><!-- ENDIF --> +					<div class="responsive-show" style="display: none;"> +						{L_SAVE_DATE}{L_COLON} <strong>{draftrow.DATE}</strong> +					</div> +				</div>  			</dt> -			<dd class="posted">{draftrow.DATE}</dd> +			<dd class="info"><span>{draftrow.DATE}</span></dd>  		</dl>  	</li>  	<!-- END draftrow -->  	</ul> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js deleted file mode 100644 index 42be70be92..0000000000 --- a/phpBB/styles/prosilver/template/editor.js +++ /dev/null @@ -1,459 +0,0 @@ -/** -* bbCode control by subBlue design [ www.subBlue.com ] -* Includes unixsafe colour palette selector by SHS` -*/ - -// Startup variables -var imageTag = false; -var theSelection = false; - -var bbcodeEnabled = true; -// Check for Browser & Platform for PC & IE specific bits -// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html -var clientPC = navigator.userAgent.toLowerCase(); // Get client info -var clientVer = parseInt(navigator.appVersion); // Get browser version - -var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1)); -var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1)); -var baseHeight; - -/** -* Shows the help messages in the helpline window -*/ -function helpline(help) -{ -	document.forms[form_name].helpbox.value = help_line[help]; -} - -/** -* Fix a bug involving the TextRange object. From -* http://www.frostjedi.com/terra/scripts/demo/caretBug.html -*/  -function initInsertions()  -{ -	var doc; - -	if (document.forms[form_name]) -	{ -		doc = document; -	} -	else  -	{ -		doc = opener.document; -	} - -	var textarea = doc.forms[form_name].elements[text_name]; - -	if (is_ie && typeof(baseHeight) != 'number') -	{ -		textarea.focus(); -		baseHeight = doc.selection.createRange().duplicate().boundingHeight; - -		if (!document.forms[form_name]) -		{ -			document.body.focus(); -		} -	} -} - -/** -* bbstyle -*/ -function bbstyle(bbnumber) -{	 -	if (bbnumber != -1) -	{ -		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]); -	}  -	else  -	{ -		insert_text('[*]'); -		document.forms[form_name].elements[text_name].focus(); -	} -} - -/** -* Apply bbcodes -*/ -function bbfontstyle(bbopen, bbclose) -{ -	theSelection = false; - -	var textarea = document.forms[form_name].elements[text_name]; - -	textarea.focus(); - -	if ((clientVer >= 4) && is_ie && is_win) -	{ -		// Get text selection -		theSelection = document.selection.createRange().text; - -		if (theSelection) -		{ -			// Add tags around selection -			document.selection.createRange().text = bbopen + theSelection + bbclose; -			document.forms[form_name].elements[text_name].focus(); -			theSelection = ''; -			return; -		} -	} -	else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0)) -	{ -		mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose); -		document.forms[form_name].elements[text_name].focus(); -		theSelection = ''; -		return; -	} -	 -	//The new position for the cursor after adding the bbcode -	var caret_pos = getCaretPosition(textarea).start; -	var new_pos = caret_pos + bbopen.length;		 - -	// Open tag -	insert_text(bbopen + bbclose); - -	// Center the cursor when we don't have a selection -	// Gecko and proper browsers -	if (!isNaN(textarea.selectionStart)) -	{ -		textarea.selectionStart = new_pos; -		textarea.selectionEnd = new_pos; -	}	 -	// IE -	else if (document.selection) -	{ -		var range = textarea.createTextRange();  -		range.move("character", new_pos);  -		range.select(); -		storeCaret(textarea); -	} - -	textarea.focus(); -	return; -} - -/** -* Insert text at position -*/ -function insert_text(text, spaces, popup) -{ -	var textarea; -	 -	if (!popup)  -	{ -		textarea = document.forms[form_name].elements[text_name]; -	}  -	else  -	{ -		textarea = opener.document.forms[form_name].elements[text_name]; -	} -	if (spaces)  -	{ -		text = ' ' + text + ' '; -	} - -	// Since IE9, IE also has textarea.selectionStart, but it still needs to be treated the old way. -	// Therefore we simply add a !is_ie here until IE fixes the text-selection completely. -	if (!isNaN(textarea.selectionStart) && !is_ie) -	{ -		var sel_start = textarea.selectionStart; -		var sel_end = textarea.selectionEnd; - -		mozWrap(textarea, text, ''); -		textarea.selectionStart = sel_start + text.length; -		textarea.selectionEnd = sel_end + text.length; -	} -	else if (textarea.createTextRange && textarea.caretPos) -	{ -		if (baseHeight != textarea.caretPos.boundingHeight)  -		{ -			textarea.focus(); -			storeCaret(textarea); -		} - -		var caret_pos = textarea.caretPos; -		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text; -	} -	else -	{ -		textarea.value = textarea.value + text; -	} -	if (!popup)  -	{ -		textarea.focus(); -	} -} - -/** -* Add inline attachment at position -*/ -function attach_inline(index, filename) -{ -	insert_text('[attachment=' + index + ']' + filename + '[/attachment]'); -	document.forms[form_name].elements[text_name].focus(); -} - -/** -* Add quote text to message -*/ -function addquote(post_id, username, l_wrote) -{ -	var message_name = 'message_' + post_id; -	var theSelection = ''; -	var divarea = false; - -	if (l_wrote === undefined) -	{ -		// Backwards compatibility -		l_wrote = 'wrote'; -	} - -	if (document.all) -	{ -		divarea = document.all[message_name]; -	} -	else -	{ -		divarea = document.getElementById(message_name); -	} - -	// Get text selection - not only the post content :( -	// IE9 must use the document.selection method but has the *.getSelection so we just force no IE -	if (window.getSelection && !is_ie && !window.opera) -	{ -		theSelection = window.getSelection().toString(); -	} -	else if (document.getSelection && !is_ie) -	{ -		theSelection = document.getSelection(); -	} -	else if (document.selection) -	{ -		theSelection = document.selection.createRange().text; -	} - -	if (theSelection == '' || typeof theSelection == 'undefined' || theSelection == null) -	{ -		if (divarea.innerHTML) -		{ -			theSelection = divarea.innerHTML.replace(/<br>/ig, '\n'); -			theSelection = theSelection.replace(/<br\/>/ig, '\n'); -			theSelection = theSelection.replace(/<\;/ig, '<'); -			theSelection = theSelection.replace(/>\;/ig, '>'); -			theSelection = theSelection.replace(/&\;/ig, '&'); -			theSelection = theSelection.replace(/ \;/ig, ' '); -		} -		else if (document.all) -		{ -			theSelection = divarea.innerText; -		} -		else if (divarea.textContent) -		{ -			theSelection = divarea.textContent; -		} -		else if (divarea.firstChild.nodeValue) -		{ -			theSelection = divarea.firstChild.nodeValue; -		} -	} - -	if (theSelection) -	{ -		if (bbcodeEnabled) -		{ -			insert_text('[quote="' + username + '"]' + theSelection + '[/quote]'); -		} -		else -		{ -			insert_text(username + ' ' + l_wrote + ':' + '\n'); -			var lines = split_lines(theSelection); -			for (i = 0; i < lines.length; i++) -			{ -				insert_text('> ' + lines[i] + '\n'); -			} -		} -	} - -	return; -} - -function split_lines(text) -{ -	var lines = text.split('\n'); -	var splitLines = new Array(); -	var j = 0; -	for(i = 0; i < lines.length; i++) -	{ -		if (lines[i].length <= 80) -		{ -			splitLines[j] = lines[i]; -			j++; -		} -		else -		{ -			var line = lines[i]; -			do -			{ -				var splitAt = line.indexOf(' ', 80); -				 -				if (splitAt == -1) -				{ -					splitLines[j] = line; -					j++; -				} -				else -				{ -					splitLines[j] = line.substring(0, splitAt); -					line = line.substring(splitAt); -					j++; -				} -			} -			while(splitAt != -1); -		} -	} -	return splitLines; -} -/** -* From http://www.massless.org/mozedit/ -*/ -function mozWrap(txtarea, open, close) -{ -	var selLength = (typeof(txtarea.textLength) == 'undefined') ? txtarea.value.length : txtarea.textLength; -	var selStart = txtarea.selectionStart; -	var selEnd = txtarea.selectionEnd; -	var scrollTop = txtarea.scrollTop; - -	if (selEnd == 1 || selEnd == 2)  -	{ -		selEnd = selLength; -	} - -	var s1 = (txtarea.value).substring(0,selStart); -	var s2 = (txtarea.value).substring(selStart, selEnd); -	var s3 = (txtarea.value).substring(selEnd, selLength); - -	txtarea.value = s1 + open + s2 + close + s3; -	txtarea.selectionStart = selStart + open.length; -	txtarea.selectionEnd = selEnd + open.length; -	txtarea.focus(); -	txtarea.scrollTop = scrollTop; - -	return; -} - -/** -* Insert at Caret position. Code from -* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130 -*/ -function storeCaret(textEl) -{ -	if (textEl.createTextRange && document.selection) -	{ -		textEl.caretPos = document.selection.createRange().duplicate(); -	} -} - -/** -* Color pallette -*/ -function colorPalette(dir, width, height) -{ -	var r = 0, g = 0, b = 0; -	var numberList = new Array(6); -	var color = ''; - -	numberList[0] = '00'; -	numberList[1] = '40'; -	numberList[2] = '80'; -	numberList[3] = 'BF'; -	numberList[4] = 'FF'; - -	document.writeln('<table cellspacing="1" cellpadding="0" border="0">'); - -	for (r = 0; r < 5; r++) -	{ -		if (dir == 'h') -		{ -			document.writeln('<tr>'); -		} - -		for (g = 0; g < 5; g++) -		{ -			if (dir == 'v') -			{ -				document.writeln('<tr>'); -			} -			 -			for (b = 0; b < 5; b++) -			{ -				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]); -				document.write('<td bgcolor="#' + color + '" style="width: ' + width + 'px; height: ' + height + 'px;">'); -				document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>'); -				document.writeln('</td>'); -			} - -			if (dir == 'v') -			{ -				document.writeln('</tr>'); -			} -		} - -		if (dir == 'h') -		{ -			document.writeln('</tr>'); -		} -	} -	document.writeln('</table>'); -} - - -/** -* Caret Position object -*/ -function caretPosition() -{ -	var start = null; -	var end = null; -} - - -/** -* Get the caret position in an textarea -*/ -function getCaretPosition(txtarea) -{ -	var caretPos = new caretPosition(); -	 -	// simple Gecko/Opera way -	if(txtarea.selectionStart || txtarea.selectionStart == 0) -	{ -		caretPos.start = txtarea.selectionStart; -		caretPos.end = txtarea.selectionEnd; -	} -	// dirty and slow IE way -	else if(document.selection) -	{ -	 -		// get current selection -		var range = document.selection.createRange(); - -		// a new selection of the whole textarea -		var range_all = document.body.createTextRange(); -		range_all.moveToElementText(txtarea); -		 -		// calculate selection start point by moving beginning of range_all to beginning of range -		var sel_start; -		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++) -		{		 -			range_all.moveStart('character', 1); -		} -	 -		txtarea.sel_start = sel_start; -	 -		// we ignore the end value for IE, this is already dirty enough and we don't need it -		caretPos.start = txtarea.sel_start; -		caretPos.end = txtarea.sel_start;			 -	} - -	return caretPos; -} diff --git a/phpBB/styles/prosilver/template/faq_body.html b/phpBB/styles/prosilver/template/faq_body.html index 36d677a505..53205d14e9 100644 --- a/phpBB/styles/prosilver/template/faq_body.html +++ b/phpBB/styles/prosilver/template/faq_body.html @@ -1,10 +1,10 @@  <!-- INCLUDE overall_header.html --> -<h2>{L_FAQ_TITLE}</h2> +<h2 class="faq-title">{L_FAQ_TITLE}</h2>  <div class="panel bg1" id="faqlinks"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  		<div class="column1">  		<!-- BEGIN faq_block -->  			<!-- IF faq_block.SWITCH_COLUMN or (SWITCH_COLUMN_MANUALLY and faq_block.S_ROW_COUNT == 4) --> @@ -21,19 +21,15 @@  			</dl>  		<!-- END faq_block -->  		</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div> - - -<div class="clear"></div> -  <!-- BEGIN faq_block -->  	<div class="panel <!-- IF faq_block.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<div class="content"> -			<h2>{faq_block.BLOCK_TITLE}</h2> +			<h2 class="faq-title">{faq_block.BLOCK_TITLE}</h2>  			<!-- BEGIN faq_row -->  				<dl class="faq">  					<dt id="f{faq_block.S_ROW_COUNT}r{faq_block.faq_row.S_ROW_COUNT}"><strong>{faq_block.faq_row.FAQ_QUESTION}</strong></dt> @@ -44,7 +40,7 @@  			<!-- END faq_row -->  		</div> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  <!-- END faq_block --> diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index 6a65caf6f6..aabc5679f6 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -3,12 +3,22 @@  */  /** +* Find a member +*/ +function find_username(url) { +	'use strict'; + +	popup(url, 760, 570, '_usersearch'); +	return false; +} + +/**  * Window popup  */ -function popup(url, width, height, name) -{ -	if (!name) -	{ +function popup(url, width, height, name) { +	'use strict'; + +	if (!name) {  		name = '_popup';  	} @@ -19,19 +29,19 @@ function popup(url, width, height, name)  /**  * Jump to page  */ -function jumpto() -{ -	var page = prompt(jump_page, on_page); - -	if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0) -	{ -		if (base_url.indexOf('?') == -1) -		{ -			document.location.href = base_url + '?start=' + ((page - 1) * per_page); -		} -		else -		{ -			document.location.href = base_url.replace(/&/g, '&') + '&start=' + ((page - 1) * per_page); +function pageJump(item) { +	'use strict'; + +	var page = item.val(), +		perPage = item.attr('data-per-page'), +		baseUrl = item.attr('data-base-url'), +		startName = item.attr('data-start-name'); + +	if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0) { +		if (baseUrl.indexOf('?') === -1) { +			document.location.href = baseUrl + '?' + startName + '=' + ((page - 1) * perPage); +		} else { +			document.location.href = baseUrl.replace(/&/g, '&') + '&' + startName + '=' + ((page - 1) * perPage);  		}  	}  } @@ -40,53 +50,40 @@ function jumpto()  * Mark/unmark checklist  * id = ID of parent container, name = name prefix, state = state [true/false]  */ -function marklist(id, name, state) -{ -	var parent = document.getElementById(id); -	if (!parent) -	{ -		eval('parent = document.' + id); -	} - -	if (!parent) -	{ -		return; -	} +function marklist(id, name, state) { +	'use strict'; -	var rb = parent.getElementsByTagName('input'); -	 -	for (var r = 0; r < rb.length; r++) -	{	 -		if (rb[r].name.substr(0, name.length) == name) -		{ -			rb[r].checked = state; +	jQuery('#' + id + ' input[type=checkbox][name]').each(function() { +		var $this = jQuery(this); +		if ($this.attr('name').substr(0, name.length) === name) { +			$this.prop('checked', state);  		} -	} +	});  }  /**  * Resize viewable area for attached image or topic review panel (possibly others to come)  * e = element  */ -function viewableArea(e, itself) -{ -	if (!e) return; -	if (!itself) -	{ +function viewableArea(e, itself) { +	'use strict'; + +	if (!e) { +		return; +	} + +	if (!itself) {  		e = e.parentNode;  	} -	 -	if (!e.vaHeight) -	{ + +	if (!e.vaHeight) {  		// Store viewable area height before changing style to auto  		e.vaHeight = e.offsetHeight;  		e.vaMaxHeight = e.style.maxHeight;  		e.style.height = 'auto';  		e.style.maxHeight = 'none';  		e.style.overflow = 'visible'; -	} -	else -	{ +	} else {  		// Restore viewable area height to the default  		e.style.height = e.vaHeight + 'px';  		e.style.overflow = 'auto'; @@ -96,147 +93,93 @@ function viewableArea(e, itself)  }  /** -* Set display of page element -* s[-1,0,1] = hide,toggle display,show -* type = string: inline, block, inline-block or other CSS "display" type -*/ -function dE(n, s, type) -{ -	if (!type) -	{ -		type = 'block'; -	} - -	var e = document.getElementById(n); -	if (!s) -	{ -		s = (e.style.display == '' || e.style.display == type) ? -1 : 1; -	} -	e.style.display = (s == 1) ? type : 'none'; -} - -/**  * Alternate display of subPanels  */ -function subPanels(p) -{ -	var i, e, t; +jQuery(function($) { +	'use strict'; -	if (typeof(p) == 'string') -	{ -		show_panel = p; -	} +	$('.sub-panels').each(function() { -	for (i = 0; i < panels.length; i++) -	{ -		e = document.getElementById(panels[i]); -		t = document.getElementById(panels[i] + '-tab'); - -		if (e) -		{ -			if (panels[i] == show_panel) -			{ -				e.style.display = 'block'; -				if (t) -				{ -					t.className = 'activetab'; -				} -			} -			else -			{ -				e.style.display = 'none'; -				if (t) -				{ -					t.className = ''; -				} -			} +		var $childNodes = $('a[data-subpanel]', this), +			panels = $childNodes.map(function () { +				return this.getAttribute('data-subpanel'); +			}), +			showPanel = this.getAttribute('data-show-panel'); + +		if (panels.length) { +			activateSubPanel(showPanel, panels); +			$childNodes.click(function () { +				activateSubPanel(this.getAttribute('data-subpanel'), panels); +				return false; +			});  		} -	} -} +	}); +});  /** -* Call print preview +* Activate specific subPanel  */ -function printPage() -{ -	if (is_ie) -	{ -		printPreview(); -	} -	else -	{ -		window.print(); -	} -} +function activateSubPanel(p, panels) { +	'use strict'; -/** -* Show/hide groups of blocks -* c = CSS style name -* e = checkbox element -* t = toggle dispay state (used to show 'grip-show' image in the profile block when hiding the profiles)  -*/ -function displayBlocks(c, e, t) -{ -	var s = (e.checked == true) ?  1 : -1; +	var i, showPanel; -	if (t) -	{ -		s *= -1; +	if (typeof(p) === 'string') { +		showPanel = p;  	} +	$('input[name="show_panel"]').val(showPanel); -	var divs = document.getElementsByTagName("DIV"); +	if (typeof panels === 'undefined') { +		panels = jQuery('.sub-panels a[data-subpanel]').map(function() { +			return this.getAttribute('data-subpanel'); +		}); +	} -	for (var d = 0; d < divs.length; d++) -	{ -		if (divs[d].className.indexOf(c) == 0) -		{ -			divs[d].style.display = (s == 1) ? 'none' : 'block'; -		} +	for (i = 0; i < panels.length; i++) { +		jQuery('#' + panels[i]).css('display', panels[i] === showPanel ? 'block' : 'none'); +		jQuery('#' + panels[i] + '-tab').toggleClass('activetab', panels[i] === showPanel);  	}  } -function selectCode(a) -{ +function selectCode(a) { +	'use strict'; +  	// Get ID of code block  	var e = a.parentNode.parentNode.getElementsByTagName('CODE')[0]; +	var s, r;  	// Not IE and IE9+ -	if (window.getSelection) -	{ -		var s = window.getSelection(); -		// Safari -		if (s.setBaseAndExtent) -		{ -			s.setBaseAndExtent(e, 0, e, e.innerText.length - 1); +	if (window.getSelection) { +		s = window.getSelection(); +		// Safari and Chrome +		if (s.setBaseAndExtent) { +			var l = (e.innerText.length > 1) ? e.innerText.length - 1 : 1; +			s.setBaseAndExtent(e, 0, e, l);  		}  		// Firefox and Opera -		else -		{ +		else {  			// workaround for bug # 42885 -			if (window.opera && e.innerHTML.substring(e.innerHTML.length - 4) == '<BR>') -			{ +			if (window.opera && e.innerHTML.substring(e.innerHTML.length - 4) === '<BR>') {  				e.innerHTML = e.innerHTML + ' ';  			} -			var r = document.createRange(); +			r = document.createRange();  			r.selectNodeContents(e);  			s.removeAllRanges();  			s.addRange(r);  		}  	}  	// Some older browsers -	else if (document.getSelection) -	{ -		var s = document.getSelection(); -		var r = document.createRange(); +	else if (document.getSelection) { +		s = document.getSelection(); +		r = document.createRange();  		r.selectNodeContents(e);  		s.removeAllRanges();  		s.addRange(r);  	}  	// IE -	else if (document.selection) -	{ -		var r = document.body.createTextRange(); +	else if (document.selection) { +		r = document.body.createTextRange();  		r.moveToElementText(e);  		r.select();  	} @@ -246,25 +189,24 @@ function selectCode(a)  * Play quicktime file by determining it's width/height  * from the displayed rectangle area  */ -function play_qt_file(obj) -{ +function play_qt_file(obj) { +	'use strict'; +  	var rectangle = obj.GetRectangle(); +	var width, height; -	if (rectangle) -	{ +	if (rectangle) {  		rectangle = rectangle.split(','); -		var x1 = parseInt(rectangle[0]); -		var x2 = parseInt(rectangle[2]); -		var y1 = parseInt(rectangle[1]); -		var y2 = parseInt(rectangle[3]); - -		var width = (x1 < 0) ? (x1 * -1) + x2 : x2 - x1; -		var height = (y1 < 0) ? (y1 * -1) + y2 : y2 - y1; -	} -	else -	{ -		var width = 200; -		var height = 0; +		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; @@ -274,170 +216,721 @@ function play_qt_file(obj)  	obj.Play();  } -/** -* Check if the nodeName of elem is name -* @author jQuery -*/ -function is_node_name(elem, name) -{ -	return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase(); -} +var inAutocomplete = false; +var lastKeyEntered = '';  /** -* Check if elem is in array, return position -* @author jQuery +* Check event key  */ -function is_in_array(elem, array) -{ -	for (var i = 0, length = array.length; i < length; i++) -		// === is correct (IE) -		if (array[i] === elem) -			return i; +function phpbbCheckKey(event) { +	'use strict'; + +	// Keycode is array down or up? +	if (event.keyCode && (event.keyCode === 40 || event.keyCode === 38)) { +		inAutocomplete = true; +	} + +	// Make sure we are not within an "autocompletion" field +	if (inAutocomplete) { +		// If return pressed and key changed we reset the autocompletion +		if (!lastKeyEntered || lastKeyEntered === event.which) { +			inAutocomplete = false; +			return true; +		} +	} + +	// Keycode is not return, then return. ;) +	if (event.which !== 13) { +		lastKeyEntered = event.which; +		return true; +	} -	return -1; +	return false;  }  /** -* Find Element, type and class in tree -* Not used, but may come in handy for those not using JQuery -* @author jQuery.find, Meik Sievertsen +* Apply onkeypress event for forcing default submit button on ENTER key press  */ -function find_in_tree(node, tag, type, class_name) -{ -	var result, element, i = 0, length = node.childNodes.length; +jQuery(function($) { +	'use strict'; -	for (element = node.childNodes[0]; i < length; element = node.childNodes[++i]) -	{ -		if (!element || element.nodeType != 1) continue; +	$('form input[type=text], form input[type=password]').on('keypress', function (e) { +		var defaultButton = $(this).parents('form').find('input[type=submit].default-submit-action'); -		if ((!tag || is_node_name(element, tag)) && (!type || element.type == type) && (!class_name || is_in_array(class_name, (element.className || element).toString().split(/\s+/)) > -1)) -		{ -			return element; +		if (!defaultButton || defaultButton.length <= 0) { +			return true;  		} -		if (element.childNodes.length) -			result = find_in_tree(element, tag, type, class_name); +		if (phpbbCheckKey(e)) { +			return true; +		} -		if (result) return result; -	} -} +		if ((e.which && e.which === 13) || (e.keyCode && e.keyCode === 13)) { +			defaultButton.click(); +			return false; +		} -var in_autocomplete = false; -var last_key_entered = ''; +		return true; +	}); +});  /** -* Check event key +* Functions for user search popup  */ -function phpbb_check_key(event) +function insertUser(formId, value)  { -	// Keycode is array down or up? -	if (event.keyCode && (event.keyCode == 40 || event.keyCode == 38)) -		in_autocomplete = true; +	'use strict'; -	// Make sure we are not within an "autocompletion" field -	if (in_autocomplete) -	{ -		// If return pressed and key changed we reset the autocompletion -		if (!last_key_entered || last_key_entered == event.which) -		{ -			in_autocompletion = false; -			return true; -		} +	var $form = jQuery(formId), +		formName = $form.attr('data-form-name'), +		fieldName = $form.attr('data-field-name'), +		item = opener.document.forms[formName][fieldName]; + +	if (item.value.length && item.type == 'textarea') { +		value = item.value + '\n' + value;  	} -	// Keycode is not return, then return. ;) -	if (event.which != 13) -	{ -		last_key_entered = event.which; -		return true; +	item.value = value; +} + +function insert_marked_users(formId, users) { +	'use strict'; + +	for (var i = 0; i < users.length; i++) { +		if (users[i].checked) { +			insertUser(formId, users[i].value); +		}  	} -	return false; +	window.close(); +} + +function insert_single_user(formId, user) { +	'use strict'; + +	insertUser(formId, user); +	window.close();  }  /** -* Usually used for onkeypress event, to submit a form on enter +* Parse document block  */ -function submit_default_button(event, selector, class_name) -{ -	// Add which for key events -	if (!event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode)) -		event.which = event.charCode || event.keyCode; +function parseDocument($container) { +	'use strict'; + +	var test = document.createElement('div'), +		oldBrowser = (typeof test.style.borderRadius == 'undefined'), +		$body = $('body'); + +	/** +	* Reset avatar dimensions when changing URL or EMAIL +	*/ +	$container.find('input[data-reset-on-edit]').on('keyup', function() { +		$(this.getAttribute('data-reset-on-edit')).val(''); +	}); + +	/** +	* Pagination +	*/ +	$container.find('.pagination .page-jump-form :button').click(function() { +		var $input = $(this).siblings('input.inputbox'); +		pageJump($input); +	}); + +	$container.find('.pagination .page-jump-form input.inputbox').on('keypress', function(event) { +		if (event.which === 13 || event.keyCode === 13) { +			event.preventDefault(); +			pageJump($(this)); +		} +	}); + +	$container.find('.pagination .dropdown-trigger').click(function() { +		var $dropdownContainer = $(this).parent(); +		// Wait a little bit to make sure the dropdown has activated +		setTimeout(function() { +			if ($dropdownContainer.hasClass('dropdown-visible')) { +				$dropdownContainer.find('input.inputbox').focus(); +			} +		}, 100); +	}); + +	/** +	* Adjust HTML code for IE8 and older versions +	*/ +	if (oldBrowser) { +		// Fix .linklist.bulletin lists +		$container.find('ul.linklist.bulletin > li:first-child, ul.linklist.bulletin > li.rightside:last-child').addClass('no-bulletin'); +	} -	if (phpbb_check_key(event)) -		return true; +	/** +	* Resize navigation (breadcrumbs) block to keep all links on same line +	*/ +	$container.find('.navlinks').each(function() { +		var $this = $(this), +			$left = $this.children().not('.rightside'), +			$right = $this.children('.rightside'); -	var current = selector['parentNode']; +		if ($left.length !== 1 || !$right.length) { +			return; +		} -	// Search parent form element -	while (current && (!current.nodeName || current.nodeType != 1 || !is_node_name(current, 'form')) && current != document) -		current = current['parentNode']; +		function resize() { +			var width = 0, +				diff = $left.outerWidth(true) - $left.width(); -	// Find the input submit button with the class name -	//current = find_in_tree(current, 'input', 'submit', class_name); -	var input_tags = current.getElementsByTagName('input'); -	current = false; +			$right.each(function() { +				width += $(this).outerWidth(true); +			}); +			$left.css('max-width', Math.floor($this.width() - width - diff) + 'px'); +		} -	for (var i = 0, element = input_tags[0]; i < input_tags.length; element = input_tags[++i]) -	{ -		if (element.type == 'submit' && is_in_array(class_name, (element.className || element).toString().split(/\s+/)) > -1) -			current = element; -	} +		resize(); +		$(window).resize(resize); +	}); + +	/** +	* Makes breadcrumbs responsive +	*/ +	$container.find('.breadcrumbs:not([data-skip-responsive])').each(function() { +		var $this = $(this), +			$links = $this.find('.crumb'), +			length = $links.length, +			classes = ['wrapped-max', 'wrapped-wide', 'wrapped-medium', 'wrapped-small', 'wrapped-tiny'], +			classesLength = classes.length, +			maxHeight = 0, +			lastWidth = false, +			wrapped = false; + +		// Set tooltips +		$this.find('a').each(function() { +			var $link = $(this); +			$link.attr('title', $link.text()); +		}); -	if (!current) -		return true; +		// Function that checks breadcrumbs +		function check() { +			var height = $this.height(), +				width = $body.width(); -	// Submit form -	current.focus(); -	current.click(); -	return false; -} +			maxHeight = parseInt($this.css('line-height')); +			$links.each(function() { +				if ($(this).height() > 0) { +					maxHeight = Math.max(maxHeight, $(this).outerHeight(true)); +				} +			}); -/** -* Apply onkeypress event for forcing default submit button on ENTER key press -* The jQuery snippet used is based on http://greatwebguy.com/programming/dom/default-html-button-submit-on-enter-with-jquery/ -* The non-jQuery code is a mimick of the jQuery code ;) -*/ -function apply_onkeypress_event() -{ -	// jQuery code in case jQuery is used -	if (jquery_present) -	{ -		jQuery('form input[type=text], form input[type=password]').on('keypress', function (e) -		{ -			var default_button = jQuery(this).parents('form').find('input[type=submit].default-submit-action'); -			 -			if (!default_button || default_button.length <= 0) -				return true; - -			if (phpbb_check_key(e)) -				return true; - -			if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13)) -			{ -				default_button.click(); -				return false; +			if (height <= maxHeight) { +				if (!wrapped || lastWidth === false || lastWidth >= width) { +					return; +				}  			} +			lastWidth = width; -			return true; +			if (wrapped) { +				$this.removeClass('wrapped').find('.crumb.wrapped').removeClass('wrapped ' + classes.join(' ')); +				if ($this.height() <= maxHeight) { +					return; +				} +			} + +			wrapped = true; +			$this.addClass('wrapped'); +			if ($this.height() <= maxHeight) { +				return; +			} + +			for (var i = 0; i < classesLength; i ++) { +				for (var j = length - 1; j >= 0; j --) { +					$links.eq(j).addClass('wrapped ' + classes[i]); +					if ($this.height() <= maxHeight) { +						return; +					} +				} +			} +		} + +		// Run function and set event +		check(); +		$(window).resize(check); +	}); + +	/** +	* Responsive link lists +	*/ +	$container.find('.linklist:not(.navlinks, [data-skip-responsive]), .postbody .post-buttons:not([data-skip-responsive])').each(function() { +		var $this = $(this), +			filterSkip = '.breadcrumbs, [data-skip-responsive]', +			filterLast = '.edit-icon, .quote-icon, [data-last-responsive]', +			$linksAll = $this.children(), +			$linksNotSkip = $linksAll.not(filterSkip), // All items that can potentially be hidden +			$linksFirst = $linksNotSkip.not(filterLast), // The items that will be hidden first +			$linksLast = $linksNotSkip.filter(filterLast), // The items that will be hidden last +			persistent = $this.attr('id') == 'nav-main', // Does this list already have a menu (such as quick-links)? +			html = '<li class="responsive-menu hidden"><a href="javascript:void(0);" class="responsive-menu-link"> </a><div class="dropdown hidden"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>', +			slack = 3; // Vertical slack space (in pixels). Determines how sensitive the script is in determining whether a line-break has occured. + +		// Add a hidden drop-down menu to each links list (except those that already have one) +		if (!persistent) { +			if ($linksNotSkip.is('.rightside')) { +				$linksNotSkip.filter('.rightside:first').before(html); +				$this.children('.responsive-menu').addClass('rightside'); +			} else { +				$this.append(html); +			} +		} + +		// Set some object references and initial states +		var $menu = $this.children('.responsive-menu'), +			$menuContents = $menu.find('.dropdown-contents'), +			persistentContent = $menuContents.find('li:not(.separator)').length, +			lastWidth = false, +			compact = false, +			responsive1 = false, +			responsive2 = false, +			copied1 = false, +			copied2 = false, +			maxHeight = 0; + +		// Find the tallest element in the list (we assume that all elements are roughly the same height) +		$linksAll.each(function() { +			if (!$(this).height()) { +				return; +			} +			maxHeight = Math.max(maxHeight, $(this).outerHeight(true)); +		}); +		if (maxHeight < 1) { +			return; // Shouldn't be possible, but just in case, abort +		} else { +			maxHeight = maxHeight + slack; +		} + +		function check() { +			var width = $body.width(); +			// We can't make it any smaller than this, so just skip +			if (responsive2 && compact && (width <= lastWidth)) { +				return; +			} +			lastWidth = width; + +			// Reset responsive and compact layout +			if (responsive1 || responsive2) { +				$linksNotSkip.removeClass('hidden'); +				$menuContents.children('.clone').addClass('hidden'); +				responsive1 = responsive2 = false; +			} +			if (compact) { +				$this.removeClass('compact'); +				compact = false; +			} + +			// Unhide the quick-links menu if it has "persistent" content +			if (persistent && persistentContent) { +				$menu.removeClass('hidden'); +			} else { +				$menu.addClass('hidden'); +			} + +			// Nothing to resize if block's height is not bigger than tallest element's height +			if ($this.height() <= maxHeight) { +				return; +			} + +			// STEP 1: Compact +			if (!compact) { +				$this.addClass('compact'); +				compact = true; +			} +			if ($this.height() <= maxHeight) { +				return; +			} + +			// STEP 2: First responsive set - compact +			if (compact) { +				$this.removeClass('compact'); +				compact = false; +			} +			// Copy the list items to the dropdown +			if (!copied1) { +				var $clones1 = $linksFirst.clone(); +				$menuContents.prepend($clones1.addClass('clone clone-first').removeClass('leftside rightside')); + +				if ($this.hasClass('post-buttons')) { +					$('.button', $menuContents).removeClass('button icon-button'); +					$('.responsive-menu-link', $menu).addClass('button icon-button').prepend('<span></span>'); +				} +				copied1 = true; +			} +			if (!responsive1) { +				$linksFirst.addClass('hidden'); +				responsive1 = true; +				$menuContents.children('.clone-first').removeClass('hidden'); +				$menu.removeClass('hidden'); +			} +			if ($this.height() <= maxHeight) { +				return; +			} + +			// STEP 3: First responsive set + compact +			if (!compact) { +				$this.addClass('compact'); +				compact = true; +			} +			if ($this.height() <= maxHeight) { +				return; +			} + +			// STEP 4: Last responsive set - compact +			if (!$linksLast.length) { +				return; // No other links to hide, can't do more +			} +			if (compact) { +				$this.removeClass('compact'); +				compact = false; +			} +			// Copy the list items to the dropdown +			if (!copied2) { +				var $clones2 = $linksLast.clone(); +				$menuContents.prepend($clones2.addClass('clone clone-last').removeClass('leftside rightside')); +				copied2 = true; +			} +			if (!responsive2) { +				$linksLast.addClass('hidden'); +				responsive2 = true; +				$menuContents.children('.clone-last').removeClass('hidden'); +			} +			if ($this.height() <= maxHeight) { +				return; +			} + +			// STEP 5: Last responsive set + compact +			if (!compact) { +				$this.addClass('compact'); +				compact = true; +			} +		} + +		if (!persistent) { +			phpbb.registerDropdown($menu.find('a.responsive-menu-link'), $menu.find('.dropdown'), false); +		} + +		// If there are any images in the links list, run the check again after they have loaded +		$linksAll.find('img').each(function() { +			$(this).load(function() { +				check(); +			});  		}); -	 + +		check(); +		$(window).resize(check); +	}); + +	/** +	* Do not run functions below for old browsers +	*/ +	if (oldBrowser) {  		return;  	} -	var input_tags = document.getElementsByTagName('input'); +	/** +	* Adjust topiclist lists with check boxes +	*/ +	$container.find('ul.topiclist dd.mark').siblings('dt').children('.list-inner').addClass('with-mark'); + +	/** +	* Appends contents of all extra columns to first column in +	* .topiclist lists for mobile devices. Copies contents as is. +	* +	* To add that functionality to .topiclist list simply add +	* responsive-show-all to list of classes +	*/ +	$container.find('.topiclist.responsive-show-all > li > dl').each(function() { +		var $this = $(this), +			$block = $this.find('dt .responsive-show:last-child'), +			first = true; + +		// Create block that is visible only on mobile devices +		if (!$block.length) { +			$this.find('dt > .list-inner').append('<div class="responsive-show" style="display:none;" />'); +			$block = $this.find('dt .responsive-show:last-child'); +		} else { +			first = ($.trim($block.text()).length === 0); +		} + +		// Copy contents of each column +		$this.find('dd').not('.mark').each(function() { +			var column = $(this), +				$children = column.children(), +				html = column.html(); + +			if ($children.length == 1 && $children.text() == column.text()) { +				html = $children.html(); +			} + +			$block.append((first ? '' : '<br />') + html); -	for (var i = 0, element = input_tags[0]; i < input_tags.length ; element = input_tags[++i]) -	{ -		if (element.type == 'text' || element.type == 'password') -		{ -			// onkeydown is possible too -			element.onkeypress = function (evt) { submit_default_button((evt || window.event), this, 'default-submit-action'); }; +			first = false; +		}); +	}); + +	/** +	* Same as above, but prepends text from header to each +	* column before contents of that column. +	* +	* To add that functionality to .topiclist list simply add +	* responsive-show-columns to list of classes +	*/ +	$container.find('.topiclist.responsive-show-columns').each(function() { +		var $list = $(this), +			headers = [], +			headersLength = 0; + +		// Find all headers, get contents +		$list.prev('.topiclist').find('li.header dd').not('.mark').each(function() { +			headers.push($(this).text()); +			headersLength++; +		}); + +		if (!headersLength) { +			return;  		} -	} + +		// Parse each row +		$list.find('dl').each(function() { +			var $this = $(this), +				$block = $this.find('dt .responsive-show:last-child'), +				first = true; + +			// Create block that is visible only on mobile devices +			if (!$block.length) { +				$this.find('dt > .list-inner').append('<div class="responsive-show" style="display:none;" />'); +				$block = $this.find('dt .responsive-show:last-child'); +			} +			else { +				first = ($.trim($block.text()).length === 0); +			} + +			// Copy contents of each column +			$this.find('dd').not('.mark').each(function(i) { +				var column = $(this), +					children = column.children(), +					html = column.html(); + +				if (children.length == 1 && children.text() == column.text()) { +					html = children.html(); +				} + +				// Prepend contents of matching header before contents of column +				if (i < headersLength) { +					html = headers[i] + ': <strong>' + html + '</strong>'; +				} + +				$block.append((first ? '' : '<br />') + html); + +				first = false; +			}); +		}); +	}); + +	/** +	* Responsive tables +	*/ +	$container.find('table.table1').not('.not-responsive').each(function() { +		var $this = $(this), +			$th = $this.find('thead > tr > th'), +			headers = [], +			totalHeaders = 0, +			i, headersLength; + +		// Find each header +		$th.each(function(column) { +			var cell = $(this), +				colspan = parseInt(cell.attr('colspan')), +				dfn = cell.attr('data-dfn'), +				text = dfn ? dfn : cell.text(); + +			colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan; + +			for (i = 0; i < colspan; i++) { +				headers.push(text); +			} +			totalHeaders++; + +			if (dfn && !column) { +				$this.addClass('show-header'); +			} +		}); + +		headersLength = headers.length; + +		// Add header text to each cell as <dfn> +		$this.addClass('responsive'); + +		if (totalHeaders < 2) { +			$this.addClass('show-header'); +			return; +		} + +		$this.find('tbody > tr').each(function() { +			var row = $(this), +				cells = row.children('td'), +				column = 0; + +			if (cells.length == 1) { +				row.addClass('big-column'); +				return; +			} + +			cells.each(function() { +				var cell = $(this), +					colspan = parseInt(cell.attr('colspan')), +					text = $.trim(cell.text()); + +				if (headersLength <= column) { +					return; +				} + +				if ((text.length && text !== '-') || cell.children().length) { +					cell.prepend('<dfn style="display: none;">' + headers[column] + '</dfn>'); +				} else { +					cell.addClass('empty'); +				} + +				colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan; +				column += colspan; +			}); +		}); +	}); + +	/** +	* Hide empty responsive tables +	*/ +	$container.find('table.responsive > tbody').not('.responsive-skip-empty').each(function() { +		var $items = $(this).children('tr'); +		if (!$items.length) { +			$(this).parent('table:first').addClass('responsive-hide'); +		} +	}); + +	/** +	* Responsive tabs +	*/ +	$container.find('#tabs, #minitabs').not('[data-skip-responsive]').each(function() { +		var $this = $(this), +			$ul = $this.children(), +			$tabs = $ul.children().not('[data-skip-responsive]'), +			$links = $tabs.children('a'), +			$item = $ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link"> </a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'), +			$menu = $item.find('.dropdown-contents'), +			maxHeight = 0, +			lastWidth = false, +			responsive = false; + +		$links.each(function() { +			var $this = $(this); +			maxHeight = Math.max(maxHeight, Math.max($this.outerHeight(true), $this.parent().outerHeight(true))); +		}); + +		function check() { +			var width = $body.width(), +				height = $this.height(); + +			if (!arguments.length && (!responsive || width <= lastWidth) && height <= maxHeight) { +				return; +			} + +			$tabs.show(); +			$item.hide(); + +			lastWidth = width; +			height = $this.height(); +			if (height <= maxHeight) { +				if ($item.hasClass('dropdown-visible')) { +					phpbb.toggleDropdown.call($item.find('a.responsive-tab-link').get(0)); +				} +				return; +			} + +			responsive = true; +			$item.show(); +			$menu.html(''); + +			var $availableTabs = $tabs.filter(':not(.activetab, .responsive-tab)'), +				total = $availableTabs.length, +				i, $tab; + +			for (i = total - 1; i >= 0; i --) { +				$tab = $availableTabs.eq(i); +				$menu.prepend($tab.clone(true).removeClass('tab')); +				$tab.hide(); +				if ($this.height() <= maxHeight) { +					$menu.find('a').click(function() { check(true); }); +					return; +				} +			} +			$menu.find('a').click(function() { check(true); }); +		} + +		phpbb.registerDropdown($item.find('a.responsive-tab-link'), $item.find('.dropdown'), {visibleClass: 'activetab'}); + +		check(true); +		$(window).resize(check); +	}); + +	/** +	 * Hide UCP/MCP navigation if there is only 1 item +	 */ +	$container.find('#navigation').each(function() { +		var $items = $(this).children('ol, ul').children('li'); +		if ($items.length === 1) { +			$(this).addClass('responsive-hide'); +		} +	}); + +	/** +	* Replace responsive text +	*/ +	$container.find('[data-responsive-text]').each(function() { +		var $this = $(this), +			fullText = $this.text(), +			responsiveText = $this.attr('data-responsive-text'), +			responsive = false; + +		function check() { +			if ($(window).width() > 700) { +				if (!responsive) { +					return; +				} +				$this.text(fullText); +				responsive = false; +				return; +			} +			if (responsive) { +				return; +			} +			$this.text(responsiveText); +			responsive = true; +		} + +		check(); +		$(window).resize(check); +	});  }  /** -* Detect JQuery existance. We currently do not deliver it, but some styles do, so why not benefit from it. ;) +* Run onload functions  */ -var jquery_present = typeof jQuery == 'function'; +jQuery(function($) { +	'use strict'; + +	// Swap .nojs and .hasjs +	$('#phpbb.nojs').toggleClass('nojs hasjs'); +	$('#phpbb').toggleClass('hastouch', phpbb.isTouch); +	$('#phpbb.hastouch').removeClass('notouch'); + +	// Focus forms +	$('form[data-focus]:first').each(function() { +		$('#' + this.getAttribute('data-focus')).focus(); +	}); + +	parseDocument($('body')); +}); diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html index e9ed5d9daf..c90f5b0639 100644 --- a/phpBB/styles/prosilver/template/forumlist_body.html +++ b/phpBB/styles/prosilver/template/forumlist_body.html @@ -3,17 +3,18 @@  	<!-- IF (forumrow.S_IS_CAT and not forumrow.S_FIRST_ROW) or forumrow.S_NO_CAT  -->  			</ul> -			<span class="corners-bottom"><span></span></span></div> +			</div>  		</div>  	<!-- ENDIF --> +	<!-- EVENT forumlist_body_category_header_before -->  	<!-- IF forumrow.S_IS_CAT or forumrow.S_FIRST_ROW  or forumrow.S_NO_CAT  -->  		<div class="forabg"> -			<div class="inner"><span class="corners-top"><span></span></span> +			<div class="inner">  			<ul class="topiclist">  				<li class="header">  					<dl class="icon"> -						<dt><!-- IF forumrow.S_IS_CAT --><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a><!-- ELSE -->{L_FORUM}<!-- ENDIF --></dt> +						<dt><div class="list-inner"><!-- IF forumrow.S_IS_CAT --><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a><!-- ELSE -->{L_FORUM}<!-- ENDIF --></div></dt>  						<dd class="topics">{L_TOPICS}</dd>  						<dd class="posts">{L_POSTS}</dd>  						<dd class="lastpost"><span>{L_LAST_POST}</span></dd> @@ -22,47 +23,82 @@  			</ul>  			<ul class="topiclist forums">  	<!-- ENDIF --> +	<!-- EVENT forumlist_body_category_header_after -->  	<!-- IF not forumrow.S_IS_CAT --> +		<!-- EVENT forumlist_body_forum_row_before -->  		<li class="row"> -			<dl class="icon" style="background-image: url({forumrow.FORUM_FOLDER_IMG_SRC}); background-repeat: no-repeat;"> +			<!-- EVENT forumlist_body_forum_row_prepend --> +			<dl class="icon {forumrow.FORUM_IMG_STYLE}">  				<dt title="{forumrow.FORUM_FOLDER_IMG_ALT}"> -				<!-- IF S_ENABLE_FEEDS and forumrow.S_FEED_ENABLED --><!-- <a class="feed-icon-forum" title="{L_FEED} - {forumrow.FORUM_NAME}" href="{U_FEED}?f={forumrow.FORUM_ID}"><img src="{T_THEME_PATH}/images/feed.gif" alt="{L_FEED} - {forumrow.FORUM_NAME}" /></a> --><!-- ENDIF --> +					<!-- IF forumrow.S_UNREAD_FORUM --><a href="{forumrow.U_VIEWFORUM}" class="icon-link"></a><!-- ENDIF --> +					<div class="list-inner"> +						<!-- IF S_ENABLE_FEEDS and forumrow.S_FEED_ENABLED --><!-- <a class="feed-icon-forum" title="{L_FEED} - {forumrow.FORUM_NAME}" href="{U_FEED}?f={forumrow.FORUM_ID}"><img src="{T_THEME_PATH}/images/feed.gif" alt="{L_FEED} - {forumrow.FORUM_NAME}" /></a> --><!-- ENDIF --> -					<!-- IF forumrow.FORUM_IMAGE --><span class="forum-image">{forumrow.FORUM_IMAGE}</span><!-- ENDIF --> -					<a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a><br /> -					{forumrow.FORUM_DESC} -					<!-- IF forumrow.MODERATORS --> -						<br /><strong>{forumrow.L_MODERATOR_STR}:</strong> {forumrow.MODERATORS} -					<!-- ENDIF --> -					<!-- IF forumrow.SUBFORUMS and forumrow.S_LIST_SUBFORUMS --><br /><strong>{forumrow.L_SUBFORUM_STR}</strong> {forumrow.SUBFORUMS}<!-- ENDIF --> +						<!-- IF forumrow.FORUM_IMAGE --><span class="forum-image">{forumrow.FORUM_IMAGE}</span><!-- ENDIF --> +						<a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a> +						<!-- IF forumrow.FORUM_DESC --><br />{forumrow.FORUM_DESC}<!-- ENDIF --> +						<!-- IF forumrow.MODERATORS --> +							<br /><strong>{forumrow.L_MODERATOR_STR}{L_COLON}</strong> {forumrow.MODERATORS} +						<!-- ENDIF --> +						<!-- IF .forumrow.subforum and forumrow.S_LIST_SUBFORUMS --> +							<!-- 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.UNREAD -->{L_UNREAD_POSTS}<!-- ELSE -->{L_NO_UNREAD_POSTS}<!-- ENDIF -->">{forumrow.subforum.SUBFORUM_NAME}</a><!-- IF not forumrow.subforum.S_LAST_ROW -->{L_COMMA_SEPARATOR}<!-- ENDIF --> +							<!-- END subforum --> +							<!-- EVENT forumlist_body_subforums_after --> +						<!-- ENDIF --> + +						<!-- IF not S_IS_BOT --> +						<div class="responsive-show" style="display: none;"> +							<!-- IF forumrow.CLICKS --> +								{L_REDIRECTS}{L_COLON} <strong>{forumrow.CLICKS}</strong> +							<!-- ELSEIF not forumrow.S_IS_LINK and forumrow.TOPICS --> +								{L_TOPICS}{L_COLON} <strong>{forumrow.TOPICS}</strong> +							<!-- ENDIF --> +						</div> +						<!-- ENDIF --> +					</div>  				</dt>  				<!-- IF forumrow.CLICKS --> -					<dd class="redirect"><span>{L_REDIRECTS}: {forumrow.CLICKS}</span></dd> +					<dd class="redirect"><span>{L_REDIRECTS}{L_COLON} {forumrow.CLICKS}</span></dd>  				<!-- ELSEIF not forumrow.S_IS_LINK -->  					<dd class="topics">{forumrow.TOPICS} <dfn>{L_TOPICS}</dfn></dd>  					<dd class="posts">{forumrow.POSTS} <dfn>{L_POSTS}</dfn></dd>  					<dd class="lastpost"><span> -						<!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}">{UNAPPROVED_IMG}</a><!-- ENDIF --> -						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn> {L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL} +						<!-- IF forumrow.U_UNAPPROVED_TOPICS --> +							<a href="{forumrow.U_UNAPPROVED_TOPICS}">{UNAPPROVED_IMG}</a> +						<!-- ELSEIF forumrow.U_UNAPPROVED_POSTS --> +							<a href="{forumrow.U_UNAPPROVED_POSTS}">{UNAPPROVED_POST_IMG}</a> +						<!-- ENDIF --> +						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn> +						<!-- IF forumrow.S_DISPLAY_SUBJECT --> +							<!-- EVENT forumlist_body_last_post_title_prepend --> +							<a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a> <br /> +						<!-- ENDIF -->  +						{L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL}  						<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{forumrow.LAST_POST_TIME}<!-- ELSE -->{L_NO_POSTS}<br /> <!-- ENDIF --></span>  					</dd>  				<!-- ENDIF -->  			</dl> +			<!-- EVENT forumlist_body_forum_row_append -->  		</li> +		<!-- EVENT forumlist_body_forum_row_after -->  	<!-- ENDIF -->  	<!-- IF forumrow.S_LAST_ROW -->  			</ul> -			<span class="corners-bottom"><span></span></span></div> +			</div>  		</div> +	<!-- EVENT forumlist_body_last_row_after -->  	<!-- ENDIF -->  <!-- BEGINELSE -->  	<div class="panel"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<strong>{L_NO_FORUMS}</strong> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  <!-- END forumrow --> diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html index d4d50a11c0..1e1eb22c6f 100644 --- a/phpBB/styles/prosilver/template/index_body.html +++ b/phpBB/styles/prosilver/template/index_body.html @@ -1,16 +1,15 @@  <!-- INCLUDE overall_header.html --> -<p class="{S_CONTENT_FLOW_END}<!-- IF S_USER_LOGGED_IN --> rightside<!-- ENDIF -->"><!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ELSE -->{CURRENT_TIME}<!-- ENDIF --></p> -<!-- IF U_MCP --><p>{CURRENT_TIME} <br />[ <a href="{U_MCP}">{L_MCP}</a> ]</p><!-- ELSEIF S_USER_LOGGED_IN --><p>{CURRENT_TIME}</p><!-- ENDIF --> - -<!-- IF S_DISPLAY_SEARCH or (S_USER_LOGGED_IN and not S_IS_BOT) --> -<ul class="linklist"> -	<!-- IF S_DISPLAY_SEARCH --> -		<li><a href="{U_SEARCH_UNANSWERED}">{L_SEARCH_UNANSWERED}</a><!-- IF S_LOAD_UNREADS --> • <a href="{U_SEARCH_UNREAD}">{L_SEARCH_UNREAD}</a><!-- ENDIF --><!-- IF S_USER_LOGGED_IN --> • <a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a><!-- ENDIF --> • <a href="{U_SEARCH_ACTIVE_TOPICS}">{L_SEARCH_ACTIVE_TOPICS}</a></li> -	<!-- ENDIF --> -	<!-- IF not S_IS_BOT and U_MARK_FORUMS --><li class="rightside"><a href="{U_MARK_FORUMS}" accesskey="m">{L_MARK_FORUMS_READ}</a></li><!-- ENDIF --> -</ul> +<p class="{S_CONTENT_FLOW_END} responsive-center time<!-- IF S_USER_LOGGED_IN --> rightside<!-- ENDIF -->"><!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ELSE -->{CURRENT_TIME}<!-- ENDIF --></p> +<!-- IF S_USER_LOGGED_IN --><p class="responsive-center time">{CURRENT_TIME}</p><!-- ENDIF --> + +<!-- EVENT index_body_markforums_before --> +<!-- IF U_MARK_FORUMS --> +	<div class="action-bar compact"> +		<a href="{U_MARK_FORUMS}" class="mark-read rightside" accesskey="m" data-ajax="mark_forums_read">{L_MARK_FORUMS_READ}</a> +	</div>  <!-- ENDIF --> +<!-- EVENT index_body_markforums_after -->  <!-- INCLUDE forumlist_body.html --> @@ -18,10 +17,13 @@  	<form method="post" action="{S_LOGIN_ACTION}" class="headerspace">  	<h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED -->  •  <a href="{U_REGISTER}">{L_REGISTER}</a><!-- ENDIF --></h3>  		<fieldset class="quick-login"> -			<label for="username">{L_USERNAME}:</label> <input type="text" name="username" id="username" size="10" class="inputbox" title="{L_USERNAME}" /> -			<label for="password">{L_PASSWORD}:</label> <input type="password" name="password" id="password" size="10" class="inputbox" title="{L_PASSWORD}" /> +			<label for="username"><span>{L_USERNAME}{L_COLON}</span> <input type="text" name="username" id="username" size="10" class="inputbox" title="{L_USERNAME}" /></label> +			<label for="password"><span>{L_PASSWORD}{L_COLON}</span> <input type="password" name="password" id="password" size="10" class="inputbox" title="{L_PASSWORD}" /></label> +			<!-- IF U_SEND_PASSWORD --> +				<a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a> +			<!-- ENDIF -->  			<!-- IF S_AUTOLOGIN_ENABLED --> -				| <label for="autologin">{L_LOG_ME_IN} <input type="checkbox" name="autologin" id="autologin" /></label> +				<span class="responsive-hide">|</span> <label for="autologin">{L_LOG_ME_IN} <input type="checkbox" name="autologin" id="autologin" /></label>  			<!-- ENDIF -->  			<input type="submit" name="login" value="{L_LOGIN}" class="button2" />  			{S_LOGIN_REDIRECT} @@ -29,20 +31,42 @@  	</form>  <!-- ENDIF --> +<!-- EVENT index_body_stat_blocks_before --> +  <!-- IF S_DISPLAY_ONLINE_LIST --> -	<!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF --> -	<p>{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> +	<div class="stat-block online-list"> +		<!-- 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} +			<!-- IF LEGEND --><br /><em>{L_LEGEND}{L_COLON} {LEGEND}</em><!-- ENDIF --> +			<!-- EVENT index_body_block_online_append --> +		</p> +	</div>  <!-- ENDIF --> -<!-- IF S_DISPLAY_BIRTHDAY_LIST and BIRTHDAY_LIST --> -	<h3>{L_BIRTHDAYS}</h3> -	<p><!-- IF BIRTHDAY_LIST -->{L_CONGRATULATIONS}: <strong>{BIRTHDAY_LIST}</strong><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></p> +<!-- IF S_DISPLAY_BIRTHDAY_LIST --> +	<div class="stat-block birthday-list"> +		<h3>{L_BIRTHDAYS}</h3> +		<p> +			<!-- EVENT index_body_block_birthday_prepend --> +			<!-- IF .birthdays -->{L_CONGRATULATIONS}{L_COLON} <strong><!-- BEGIN birthdays -->{birthdays.USERNAME}<!-- IF birthdays.AGE !== '' --> ({birthdays.AGE})<!-- ENDIF --><!-- IF not birthdays.S_LAST_ROW -->, <!-- ENDIF --><!-- END birthdays --></strong><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --> +			<!-- EVENT index_body_block_birthday_append --> +		</p> +	</div>  <!-- ENDIF -->  <!-- IF NEWEST_USER --> -	<h3>{L_STATISTICS}</h3> -	<p>{TOTAL_POSTS} • {TOTAL_TOPICS} • {TOTAL_USERS} • {NEWEST_USER}</p> +	<div class="stat-block statistics"> +		<h3>{L_STATISTICS}</h3> +		<p> +			<!-- EVENT index_body_block_stats_prepend --> +			{TOTAL_POSTS} • {TOTAL_TOPICS} • {TOTAL_USERS} • {NEWEST_USER} +			<!-- EVENT index_body_block_stats_append --> +		</p> +	</div>  <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- EVENT index_body_stat_blocks_after --> + +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html index 1029627561..3096d08318 100644 --- a/phpBB/styles/prosilver/template/jumpbox.html +++ b/phpBB/styles/prosilver/template/jumpbox.html @@ -1,32 +1,31 @@  <!-- IF S_VIEWTOPIC --> -	<p></p><p><a href="{U_VIEW_FORUM}" class="left-box {S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO} {FORUM_NAME}</a></p> +	<p class="jumpbox-return"><a href="{U_VIEW_FORUM}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO_FORUM}</a></p>  <!-- ELSEIF S_VIEWFORUM --> -	<p></p><p><a href="{U_INDEX}" class="left-box {S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO} {L_INDEX}</a></p> +	<p class="jumpbox-return"><a href="{U_INDEX}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO_INDEX}</a></p>  <!-- ELSEIF SEARCH_TOPIC --> -	<p></p><p><a class="left-box {S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}" accesskey="r">{L_RETURN_TO}: {SEARCH_TOPIC}</a></p> +	<p class="jumpbox-return"><a class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}" accesskey="r">{L_RETURN_TO_TOPIC}</a></p>  <!-- ELSEIF S_SEARCH_ACTION --> -	<p></p><p><a class="left-box {S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}" accesskey="r">{L_RETURN_TO_SEARCH_ADV}</a></p> +	<p class="jumpbox-return"><a class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}" accesskey="r">{L_GO_TO_SEARCH_ADV}</a></p>  <!-- ENDIF -->  <!-- IF S_DISPLAY_JUMPBOX --> -	<form method="post" id="jumpbox" action="{S_JUMPBOX_ACTION}" onsubmit="if(this.f.value == -1){return false;}"> -	<!-- IF $CUSTOM_FIELDSET_CLASS --> -		<fieldset class="{$CUSTOM_FIELDSET_CLASS}"> -	<!-- ELSE --> -		<fieldset class="jumpbox"> -	<!-- ENDIF --> -			<label for="f" accesskey="j"><!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->:</label> -			<select name="f" id="f" onchange="if(this.options[this.selectedIndex].value != -1){ document.forms['jumpbox'].submit() }"> +	<div class="dropdown-container dropdown-container-{S_CONTENT_FLOW_END}<!-- IF not S_IN_MCP --> dropdown-up<!-- ENDIF --> dropdown-{S_CONTENT_FLOW_BEGIN} dropdown-button-control" id="jumpbox"> +		<span title="<!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->" class="dropdown-trigger button dropdown-select"> +			<!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF --> +		</span> +		<div class="dropdown hidden"> +			<div class="pointer"><div class="pointer-inner"></div></div> +			<ul class="dropdown-contents">  			<!-- BEGIN jumpbox_forums --> -				<!-- IF jumpbox_forums.S_FORUM_COUNT == 1 --><option value="-1">------------------</option><!-- ENDIF --> -				<option value="{jumpbox_forums.FORUM_ID}"{jumpbox_forums.SELECTED}><!-- BEGIN level -->   <!-- END level -->{jumpbox_forums.FORUM_NAME}</option> +				<!-- IF jumpbox_forums.FORUM_ID neq -1 --> +					<li><!-- BEGIN level -->   <!-- END level --><a href="{jumpbox_forums.LINK}">{jumpbox_forums.FORUM_NAME}</a></li> +				<!-- ENDIF -->  			<!-- END jumpbox_forums --> -			</select> -			<input type="submit" value="{L_GO}" class="button2" /> -		</fieldset> -	</form> +			</ul> +		</div> +	</div>  <!-- ELSE -->  	<br /><br /> diff --git a/phpBB/styles/prosilver/template/login_body.html b/phpBB/styles/prosilver/template/login_body.html index 36c2eae349..c852ffd5f2 100644 --- a/phpBB/styles/prosilver/template/login_body.html +++ b/phpBB/styles/prosilver/template/login_body.html @@ -1,26 +1,20 @@  <!-- INCLUDE overall_header.html --> -<script type="text/javascript"> -// <![CDATA[ -	onload_functions.push('document.getElementById("<!-- IF S_ADMIN_AUTH -->{PASSWORD_CREDENTIAL}<!-- ELSE -->{USERNAME_CREDENTIAL}<!-- ENDIF -->").focus();'); -// ]]> -</script> - -<form action="{S_LOGIN_ACTION}" method="post" id="login"> +<form action="{S_LOGIN_ACTION}" method="post" id="login" data-focus="<!-- IF S_ADMIN_AUTH -->{PASSWORD_CREDENTIAL}<!-- ELSE -->{USERNAME_CREDENTIAL}<!-- ENDIF -->">  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<div class="content"> -		<h2><!-- IF LOGIN_EXPLAIN -->{LOGIN_EXPLAIN}<!-- ELSE -->{L_LOGIN}<!-- ENDIF --></h2> +		<h2 class="login-title"><!-- IF LOGIN_EXPLAIN -->{LOGIN_EXPLAIN}<!-- ELSE -->{L_LOGIN}<!-- ENDIF --></h2>  		<fieldset <!-- IF not S_CONFIRM_CODE -->class="fields1"<!-- ELSE -->class="fields2"<!-- ENDIF -->>  		<!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF -->  		<dl> -			<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}:</label></dt> +			<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}{L_COLON}</label></dt>  			<dd><input type="text" tabindex="1" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>  		</dl>  		<dl> -			<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}:</label></dt> +			<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}{L_COLON}</label></dt>  			<dd><input type="password" tabindex="2" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd>  			<!-- IF S_DISPLAY_FULL_LOGIN and (U_SEND_PASSWORD or U_RESEND_ACTIVATION) -->  				<!-- IF U_SEND_PASSWORD --><dd><a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a></dd><!-- ENDIF --> @@ -45,13 +39,17 @@  		</dl>  		</fieldset>  	</div> -	<span class="corners-bottom"><span></span></span></div> + +	<!-- IF not S_ADMIN_AUTH and PROVIDER_TEMPLATE_FILE --> +		<!-- INCLUDE {PROVIDER_TEMPLATE_FILE} --> +	<!-- ENDIF --> +	</div>  </div>  <!-- IF not S_ADMIN_AUTH and S_REGISTER_ENABLED -->  	<div class="panel"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<div class="content">  			<h3>{L_REGISTER}</h3> @@ -61,10 +59,10 @@  			<p><a href="{U_REGISTER}" class="button2">{L_REGISTER}</a></p>  		</div> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  <!-- ENDIF -->  </form> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/prosilver/template/login_body_oauth.html b/phpBB/styles/prosilver/template/login_body_oauth.html new file mode 100644 index 0000000000..156485d211 --- /dev/null +++ b/phpBB/styles/prosilver/template/login_body_oauth.html @@ -0,0 +1,8 @@ +<div class="content"> +	<!-- BEGIN oauth --> +	<dl> +		<dt> </dt> +		<dd><a href="{oauth.REDIRECT_URL}" class="button2">{oauth.SERVICE_NAME}</a></dd> +	</dl> +	<!-- END oauth --> +</div> diff --git a/phpBB/styles/prosilver/template/login_forum.html b/phpBB/styles/prosilver/template/login_forum.html index 81a83b6340..18a95c0a8f 100644 --- a/phpBB/styles/prosilver/template/login_forum.html +++ b/phpBB/styles/prosilver/template/login_forum.html @@ -1,14 +1,14 @@  <!-- INCLUDE overall_header.html --> -<!-- IF FORUM_NAME --><h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2><!-- ENDIF --> +<!-- IF FORUM_NAME --><h2 class="forum-title"><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2><!-- ENDIF -->  <form id="login_forum" method="post" action="{S_LOGIN_ACTION}">  {S_FORM_TOKEN}  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<div class="content"> -		<h2>{L_LOGIN}</h2> +		<h2 class="login-title">{L_LOGIN}</h2>  		<p>{L_LOGIN_FORUM}</p> @@ -21,7 +21,7 @@  			<!-- ENDIF -->  			<dl> -				<dt><label for="password">{L_PASSWORD}:</label></dt> +				<dt><label for="password">{L_PASSWORD}{L_COLON}</label></dt>  				<dd><input type="password" tabindex="1" id="password" name="password" size="25" class="inputbox narrow" /></dd>  			</dl>  			{S_LOGIN_REDIRECT} @@ -32,10 +32,10 @@  		</fieldset>  	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  </form>  <!-- INCLUDE jumpbox.html --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/prosilver/template/mcp_approve.html b/phpBB/styles/prosilver/template/mcp_approve.html index 185dd49c1b..14472bcf4f 100644 --- a/phpBB/styles/prosilver/template/mcp_approve.html +++ b/phpBB/styles/prosilver/template/mcp_approve.html @@ -1,13 +1,40 @@ +<!-- IF S_AJAX_REQUEST --> + +	<h3>{MESSAGE_TITLE}</h3> +	<p>{MESSAGE_TEXT}</p> + +	<!-- IF S_NOTIFY_POSTER --> +		<label><input type="checkbox" name="notify_poster" checked="checked" /> <!-- IF S_APPROVE -->{L_NOTIFY_POSTER_APPROVAL}<!-- ELSE -->{L_NOTIFY_POSTER_DISAPPROVAL}<!-- ENDIF --></label> +	<!-- ENDIF --> + +	<!-- IF not S_APPROVE and not S_RESTORE and .reason --> +		<label><strong>{L_DISAPPROVE_REASON}{L_COLON}</strong> +		<select name="reason_id"> +			<!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason --> +		</select></label> + +		<label><strong>{L_MORE_INFO}{L_COLON}</strong><br /><span>{L_CAN_LEAVE_BLANK}</span> +			<textarea class="inputbox" name="reason" id="reason" rows="4" cols="40">{REASON}</textarea> +		</label> +	<!-- ENDIF --> + +	<fieldset class="submit-buttons"> +		<input type="button" name="confirm" value="{YES_VALUE}" class="button1" />  +		<input type="button" name="cancel" value="{L_NO}" class="button2" /> +	</fieldset> + +<!-- ELSE --> +  <!-- INCLUDE overall_header.html -->  <form id="confirm" action="{S_CONFIRM_ACTION}" method="post">  <div class="panel">  	{S_FORM_TOKEN} -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<div class="content"> -		<h2>{MESSAGE_TITLE}</h2> +		<h2 class="message-title">{MESSAGE_TITLE}</h2>  		<!-- IF ADDITIONAL_MSG --><p class="error">{ADDITIONAL_MSG}</p><!-- ENDIF -->  		<fieldset> @@ -18,16 +45,16 @@  			</dl>  		<!-- ENDIF --> -		<!-- IF not S_APPROVE --> +		<!-- IF not S_APPROVE and not S_RESTORE and .reason -->  			<dl class="fields2 nobg"> -				<dt><label>{L_DISAPPROVE_REASON}:</label></dt> +				<dt><label>{L_DISAPPROVE_REASON}{L_COLON}</label></dt>  				<dd><select name="reason_id">  					<!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason -->  					</select>  				</dd>  			</dl>  			<dl class="fields2 nobg"> -				<dt><label for="reason">{L_MORE_INFO}:</label><br /><span>{L_CAN_LEAVE_BLANK}</span></dt> +				<dt><label for="reason">{L_MORE_INFO}{L_COLON}</label><br /><span>{L_CAN_LEAVE_BLANK}</span></dt>  				<dd><textarea class="inputbox" name="reason" id="reason" rows="4" cols="40">{REASON}</textarea></dd>  			</dl>  		<!-- ENDIF --> @@ -45,9 +72,10 @@  	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  </form> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> +<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/mcp_ban.html b/phpBB/styles/prosilver/template/mcp_ban.html index 460c95e2a1..5a7eaa7840 100644 --- a/phpBB/styles/prosilver/template/mcp_ban.html +++ b/phpBB/styles/prosilver/template/mcp_ban.html @@ -5,27 +5,34 @@  	var ban_length = new Array();  		ban_length[-1] = ''; -	<!-- BEGIN ban_length --> -		ban_length['{ban_length.BAN_ID}'] = '{ban_length.A_LENGTH}'; -	<!-- END ban_length --> -  	var ban_reason = new Array();  		ban_reason[-1] = ''; -	<!-- BEGIN ban_reason --> -		ban_reason['{ban_reason.BAN_ID}'] = '{ban_reason.A_REASON}'; -	<!-- END ban_reason --> -  	var ban_give_reason = new Array();  		ban_give_reason[-1] = ''; -	<!-- BEGIN ban_give_reason --> -		ban_give_reason['{ban_give_reason.BAN_ID}'] = '{ban_give_reason.A_REASON}'; -	<!-- END ban_give_reason --> + +	<!-- BEGIN bans --> +		ban_length['{bans.BAN_ID}'] = '{bans.A_LENGTH}'; +		<!-- IF bans.A_REASON --> +			ban_reason['{bans.BAN_ID}'] = '{bans.A_REASON}'; +		<!-- ENDIF --> +		<!-- IF bans.A_GIVE_REASON --> +			ban_give_reason['{bans.BAN_ID}'] = '{bans.A_GIVE_REASON}'; +		<!-- ENDIF --> +	<!-- END bans -->  	function display_details(option)  	{ -		document.getElementById('unbangivereason').innerHTML = ban_give_reason[option]; -		document.getElementById('unbanreason').innerHTML = ban_reason[option];  		document.getElementById('unbanlength').innerHTML = ban_length[option]; +		if (option in ban_reason) { +			document.getElementById('unbanreason').innerHTML = ban_reason[option]; +		} else { +			document.getElementById('unbanreason').innerHTML = ''; +		} +		if (option in ban_give_reason) { +			document.getElementById('unbangivereason').innerHTML = ban_give_reason[option]; +		} else { +			document.getElementById('unbangivereason').innerHTML = ''; +		}  	}  // ]]> @@ -36,43 +43,45 @@  <h2>{L_TITLE}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<h3>{L_TITLE}</h3>  	<p>{L_EXPLAIN}</p>  	<fieldset> +	<!-- EVENT mcp_ban_fields_before -->  	<dl> -		<dt><label for="ban">{L_BAN_CELL}:</label></dt> +		<dt><label for="ban">{L_BAN_CELL}{L_COLON}</label></dt>  		<dd><label for="ban"><textarea name="ban" id="ban" class="inputbox" cols="40" rows="3">{BAN_QUANTIFIER}</textarea></label></dd>  		<!-- IF S_USERNAME_BAN --><dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd><!-- ENDIF -->  	</dl>  	<dl> -		<dt><label for="banlength">{L_BAN_LENGTH}:</label></dt> +		<dt><label for="banlength">{L_BAN_LENGTH}{L_COLON}</label></dt>  		<dd><label for="banlength"><select name="banlength" id="banlength" onchange="if(this.value==-1){document.getElementById('banlengthother').style.display = 'block';}else{document.getElementById('banlengthother').style.display='none';}">{S_BAN_END_OPTIONS}</select></label></dd>  		<dd id="banlengthother" style="display: none;"><label><input type="text" name="banlengthother" class="inputbox" /><br /><span>{L_YEAR_MONTH_DAY}</span></label></dd>  	</dl>  	<dl> -		<dt><label for="banreason">{L_BAN_REASON}:</label></dt> +		<dt><label for="banreason">{L_BAN_REASON}{L_COLON}</label></dt>  		<dd><input name="banreason" id="banreason" type="text" class="inputbox" maxlength="255" /></dd>  	</dl>  	<dl> -		<dt><label for="bangivereason">{L_BAN_GIVE_REASON}:</label></dt> +		<dt><label for="bangivereason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>  		<dd><input name="bangivereason" id="bangivereason" type="text" class="inputbox" maxlength="255" /></dd>  	</dl>  	<hr />  	<dl> -		<dt><label for="banexclude0">{L_BAN_EXCLUDE}:</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt> +		<dt><label for="banexclude0">{L_BAN_EXCLUDE}{L_COLON}</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>  		<dd>  			<label for="banexclude1"><input type="radio" name="banexclude" id="banexclude1" value="1" /> {L_YES}</label>   			<label for="banexclude0"><input type="radio" name="banexclude" id="banexclude0" value="0" checked="checked" /> {L_NO}</label>  		</dd>  	</dl> +	<!-- EVENT mcp_ban_fields_after -->  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <fieldset class="submit-buttons"> @@ -82,32 +91,34 @@  </fieldset>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<h3>{L_UNBAN_TITLE}</h3>  	<p>{L_UNBAN_EXPLAIN}</p>  	<!-- IF S_BANNED_OPTIONS -->  		<fieldset> +		<!-- EVENT mcp_ban_unban_before -->  		<dl> -			<dt><label for="unban">{L_BAN_CELL}:</label></dt> +			<dt><label for="unban">{L_BAN_CELL}{L_COLON}</label></dt>  			<dd><select name="unban[]" id="unban" multiple="multiple" size="5" onchange="if (this.selectedIndex != -1) {display_details(this.options[this.selectedIndex].value);}">{BANNED_OPTIONS}</select></dd>  		</dl>  		<dl> -			<dt>{L_BAN_LENGTH}:</dt> +			<dt>{L_BAN_LENGTH}{L_COLON}</dt>  			<dd><strong id="unbanlength"></strong></dd>  		</dl>  		<dl> -			<dt>{L_BAN_REASON}:</dt> +			<dt>{L_BAN_REASON}{L_COLON}</dt>  			<dd><strong id="unbanreason"></strong></dd>  		</dl>  		<dl> -			<dt>{L_BAN_GIVE_REASON}:</dt> +			<dt>{L_BAN_GIVE_REASON}{L_COLON}</dt>  			<dd><strong id="unbangivereason"></strong></dd>  		</dl> +		<!-- EVENT mcp_ban_unban_after -->  		</fieldset> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  	<fieldset class="submit-buttons"> @@ -119,10 +130,10 @@  		<p><strong>{L_NO_BAN_CELL}</strong></p> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  	<!-- ENDIF -->  </form> -<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file +<!-- INCLUDE mcp_footer.html --> diff --git a/phpBB/styles/prosilver/template/mcp_footer.html b/phpBB/styles/prosilver/template/mcp_footer.html index 5a48d95f23..89ce7c34ab 100644 --- a/phpBB/styles/prosilver/template/mcp_footer.html +++ b/phpBB/styles/prosilver/template/mcp_footer.html @@ -1,9 +1,8 @@  		</div> -	<div class="clear"></div>  	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html index 2c98f7c9fa..8fdec01212 100644 --- a/phpBB/styles/prosilver/template/mcp_forum.html +++ b/phpBB/styles/prosilver/template/mcp_forum.html @@ -3,47 +3,80 @@  <!-- DEFINE $CUSTOM_FIELDSET_CLASS = 'forum-selection2' -->  <!-- INCLUDE jumpbox.html --> -<h2><a href="{U_VIEW_FORUM}">{L_FORUM}: {FORUM_NAME}</a></h2> +<h2><a href="{U_VIEW_FORUM}">{L_FORUM}{L_COLON} {FORUM_NAME}</a></h2>  <form method="post" id="mcp" action="{S_MCP_ACTION}">  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner"> -	<!-- IF PAGINATION or TOTAL_TOPICS --> -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS}<!-- ENDIF --> -				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> -			</li> -		</ul> -	<!-- ENDIF --> +	<div class="action-bar top"> +		<div class="pagination"> +			{TOTAL_TOPICS} +			<!-- IF .pagination -->  +				<!-- INCLUDE pagination.html --> +			<!-- ELSE -->  +				 • {PAGE_NUMBER} +			<!-- ENDIF --> +		</div> +	</div>  	<!-- IF .topicrow --> -		<ul class="topiclist"> +		<ul class="topiclist<!-- IF S_MERGE_SELECT --> missing-column<!-- ENDIF -->">  			<li class="header">  				<dl class="icon"> -					<dt>{L_TOPICS}</dt> +					<dt><div class="list-inner">{L_TOPICS}</div></dt>  					<dd class="posts">{L_REPLIES}</dd>  					<dd class="lastpost"><span>{L_LAST_POST}</span></dd>  					<!-- IF not S_MERGE_SELECT --><dd class="mark">{L_MARK}</dd><!-- ENDIF -->  				</dl>  			</li>  		</ul> -		<ul class="topiclist cplist"> +		<ul class="topiclist cplist<!-- IF S_MERGE_SELECT --> missing-column<!-- ENDIF -->">  		<!-- BEGIN topicrow -->  		<li class="row<!-- IF topicrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ENDIF -->"> -			<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;"> +			<dl class="icon {topicrow.TOPIC_IMG_STYLE}">  				<dt <!-- IF topicrow.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->> +					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="icon-link"></a><!-- ENDIF --> +					<div class="list-inner"> +  					<!-- IF topicrow.S_SELECT_TOPIC --><a href="{topicrow.U_SELECT_TOPIC}" class="topictitle">[ {L_SELECT_MERGE} ]</a>   <!-- ENDIF -->  					<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>  					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF --> +					<!-- IF topicrow.S_TOPIC_DELETED or topicrow.S_POSTS_DELETED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.DELETED_IMG}</a> <!-- ENDIF -->  					<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF -->  					<!-- IF topicrow.S_MOVED_TOPIC and S_CAN_DELETE --> <a href="{topicrow.U_DELETE_TOPIC}" class="topictitle">[ {L_DELETE_SHADOW_TOPIC} ]</a><!-- ENDIF -->  					<br /> -					<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF --> -					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} </dt> + +					<div class="responsive-show" style="display: none;"> +						<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> +						{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} « {topicrow.LAST_POST_TIME}<br /> +					</div> +					<span class="responsive-show left-box" style="display: none;">{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong></span> + +					<!-- IF .topicrow.pagination --> +					<div class="pagination"> +						<ul> +						<!-- BEGIN pagination --> +							<!-- IF topicrow.pagination.S_IS_PREV --> +							<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><li class="active"><span>{topicrow.pagination.PAGE_NUMBER}</span></li> +							<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li> +							<!-- ELSEIF topicrow.pagination.S_IS_NEXT --> +							<!-- ELSE --><li><a href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a></li> +							<!-- ENDIF --> +						<!-- END pagination --> +						</ul> +					</div> +					<!-- ENDIF --> + +					<div class="responsive-hide"> +						<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> +						{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} +					</div> + +					</div> +				</dt>  				<dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd>  				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}<br />{topicrow.LAST_POST_TIME}</span>  				</dd> @@ -63,25 +96,26 @@  	<!-- ENDIF -->  	<fieldset class="display-options"> -		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF --> -		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -		<label>{L_DISPLAY_TOPICS}: {S_SELECT_SORT_DAYS}</label> +		<label>{L_DISPLAY_TOPICS}{L_COLON} {S_SELECT_SORT_DAYS}</label>  		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> -		<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label> +		<label>{S_SELECT_SORT_DIR}</label> +		<input type="submit" name="sort" value="{L_GO}" class="button2" />  	</fieldset>  	<hr /> -	<!-- IF PAGINATION or TOTAL_TOPICS --> -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS}<!-- ENDIF --> -				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> -			</li> -		</ul> -	<!-- ENDIF --> +	<div class="action-bar bottom"> +		<div class="pagination"> +			{TOTAL_TOPICS} +			<!-- IF .pagination -->  +				<!-- INCLUDE pagination.html --> +			<!-- ELSE -->  +				 • {PAGE_NUMBER} +			<!-- ENDIF --> +		</div> +	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <fieldset class="display-actions"> @@ -89,6 +123,7 @@  	<select name="action">  		<option value="" selected="selected">{L_SELECT_ACTION}</option>  		<!-- IF S_CAN_DELETE --><option value="delete_topic">{L_DELETE}</option><!-- ENDIF --> +		<!-- IF S_CAN_RESTORE --><option value="restore_topic">{L_RESTORE}</option><!-- ENDIF -->  		<!-- IF S_CAN_MERGE --><option value="merge_topics">{L_MERGE}</option><!-- ENDIF -->  		<!-- IF S_CAN_MOVE --><option value="move">{L_MOVE}</option><!-- ENDIF -->  		<!-- IF S_CAN_FORK --><option value="fork">{L_FORK}</option><!-- ENDIF --> @@ -108,4 +143,4 @@  </fieldset>  </form> -<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file +<!-- INCLUDE mcp_footer.html --> diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html index 89ab753f12..44295611cf 100644 --- a/phpBB/styles/prosilver/template/mcp_front.html +++ b/phpBB/styles/prosilver/template/mcp_front.html @@ -7,32 +7,34 @@  	<form id="mcp_queue" method="post" action="{S_MCP_QUEUE_ACTION}">  	<div class="panel"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<h3>{L_LATEST_UNAPPROVED}</h3> -		<!-- IF S_HAS_UNAPPROVED_POSTS --><p>{L_UNAPPROVED_TOTAL}</p><!-- ENDIF --> +		<p>{L_UNAPPROVED_TOTAL}</p>  		<!-- IF .unapproved --> -			<ul class="topiclist"> +			<ul class="topiclist missing-column">  				<li class="header">  					<dl> -						<dt>{L_VIEW_DETAILS}</dt> +						<dt><div class="list-inner">{L_VIEW_DETAILS}</div></dt>  						<dd class="moderation"><span>{L_TOPIC} & {L_FORUM}</span></dd>  					</dl>  				</li>  			</ul> -			<ul class="topiclist cplist"> +			<ul class="topiclist cplist missing-column responsive-show-all">  			<!-- BEGIN unapproved -->  			<li class="row<!-- IF unapproved.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">  				<dl>  					<dt> -						<a href="{unapproved.U_POST_DETAILS}" class="topictitle">{unapproved.SUBJECT}</a> {unapproved.ATTACH_ICON_IMG}<br /> -						{L_POSTED} {L_POST_BY_AUTHOR} {unapproved.AUTHOR_FULL} » {unapproved.POST_TIME} +						<div class="list-inner"> +							<a href="{unapproved.U_POST_DETAILS}" class="topictitle">{unapproved.SUBJECT}</a> {unapproved.ATTACH_ICON_IMG}<br /> +							{L_POSTED} {L_POST_BY_AUTHOR} {unapproved.AUTHOR_FULL} » {unapproved.POST_TIME} +						</div>  					</dt>  					<dd class="moderation"><span> -						{L_TOPIC}: <a href="{unapproved.U_TOPIC}">{unapproved.TOPIC_TITLE}</a> [<a href="{unapproved.U_MCP_TOPIC}">{L_MODERATE}</a>]<br /> -						{L_FORUM}: <!-- IF unapproved.U_FORUM --><a href="{unapproved.U_FORUM}">{unapproved.FORUM_NAME}</a><!-- ELSE -->{unapproved.FORUM_NAME}<!-- ENDIF --><!-- IF unapproved.U_MCP_FORUM --> [<a href="{unapproved.U_MCP_FORUM}">{L_MODERATE}</a>]<!-- ENDIF --></span> +						{L_TOPIC}{L_COLON} <a href="{unapproved.U_TOPIC}">{unapproved.TOPIC_TITLE}</a> [<a href="{unapproved.U_MCP_TOPIC}">{L_MODERATE}</a>]<br /> +						{L_FORUM}{L_COLON} <!-- IF unapproved.U_FORUM --><a href="{unapproved.U_FORUM}">{unapproved.FORUM_NAME}</a><!-- ELSE -->{unapproved.FORUM_NAME}<!-- ENDIF --><!-- IF unapproved.U_MCP_FORUM --> [<a href="{unapproved.U_MCP_FORUM}">{L_MODERATE}</a>]<!-- ENDIF --></span>  					</dd>  			 		<dd class="mark"><input type="checkbox" name="post_id_list[]" value="{unapproved.POST_ID}" /></dd> @@ -40,11 +42,9 @@  			</li>  			<!-- END unapproved -->  			</ul> -		<!-- ELSE --> -			<p>{L_UNAPPROVED_POSTS_ZERO_TOTAL}</p>  		<!-- ENDIF --> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	{S_FORM_TOKEN}  	</div> @@ -61,70 +61,72 @@  <!-- IF S_SHOW_REPORTS -->  	<div class="panel"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<h3>{L_LATEST_REPORTED}</h3> -		<!-- IF S_HAS_REPORTS --><p>{L_REPORTS_TOTAL}</p><!-- ENDIF --> +		<p>{L_REPORTS_TOTAL}</p>  		<!-- IF .report --> -			<ul class="topiclist"> +			<ul class="topiclist two-long-columns">  				<li class="header">  					<dl> -						<dt>{L_VIEW_DETAILS}</dt> +						<dt><div class="list-inner">{L_VIEW_DETAILS}</div></dt>  						<dd class="moderation"><span>{L_REPORTER} & {L_FORUM}</span></dd>  					</dl>  				</li>  			</ul> -			<ul class="topiclist cplist"> +			<ul class="topiclist cplist two-long-columns responsive-show-all">  			<!-- BEGIN report -->  			<li class="row<!-- IF report.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">  				<dl>  					<dt> -						<a href="{report.U_POST_DETAILS}#reports" class="topictitle">{report.SUBJECT}</a> {report.ATTACH_ICON_IMG}<br /> -						<span>{L_POSTED} {L_POST_BY_AUTHOR} {report.AUTHOR_FULL} » {report.POST_TIME}</span> +						<div class="list-inner"> +							<a href="{report.U_POST_DETAILS}#reports" class="topictitle">{report.SUBJECT}</a> {report.ATTACH_ICON_IMG}<br /> +							<span>{L_POSTED} {L_POST_BY_AUTHOR} {report.AUTHOR_FULL} » {report.POST_TIME}</span> +						</div>  					</dt>  					<dd class="moderation">  						<span>{L_REPORTED} {L_POST_BY_AUTHOR} {report.REPORTER_FULL} {L_REPORTED_ON_DATE} {report.REPORT_TIME}<br /> -						{L_FORUM}: <a href="{report.U_FORUM}">{report.FORUM_NAME}</a></span> +						{L_FORUM}{L_COLON} <a href="{report.U_FORUM}">{report.FORUM_NAME}</a></span>  					</dd>  				</dl>  			</li>  			<!-- END report -->  			</ul> -		<!-- ELSE --> -			<p>{L_REPORTS_ZERO_TOTAL}</p>  		<!-- ENDIF --> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  <!-- ENDIF -->  <!-- IF S_SHOW_PM_REPORTS -->  	<div class="panel"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<h3>{L_LATEST_REPORTED_PMS}</h3> -		<!-- IF S_HAS_PM_REPORTS --><p>{L_PM_REPORTS_TOTAL}</p><!-- ENDIF --> +		<p>{L_PM_REPORTS_TOTAL}</p>  		<!-- IF .pm_report --> -			<ul class="topiclist"> +			<ul class="topiclist two-long-columns">  				<li class="header">  					<dl> -						<dt>{L_VIEW_DETAILS}</dt> +						<dt><div class="list-inner">{L_VIEW_DETAILS}</div></dt>  						<dd class="moderation"><span>{L_REPORTER}</span></dd>  					</dl>  				</li>  			</ul> -			<ul class="topiclist cplist"> +			<ul class="topiclist cplist two-long-columns responsive-show-all">  			<!-- BEGIN pm_report -->  			<li class="row<!-- IF pm_report.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">  				<dl>  					<dt> -						<a href="{pm_report.U_PM_DETAILS}" class="topictitle">{pm_report.PM_SUBJECT}</a> {pm_report.ATTACH_ICON_IMG}<br /> -						<span>{L_MESSAGE_BY_AUTHOR} {pm_report.PM_AUTHOR_FULL} » {pm_report.PM_TIME}</span><br /> -						<span>{L_MESSAGE_TO} {pm_report.RECIPIENTS}</span> +						<div class="list-inner"> +							<a href="{pm_report.U_PM_DETAILS}" class="topictitle">{pm_report.PM_SUBJECT}</a> {pm_report.ATTACH_ICON_IMG}<br /> +							<span>{L_MESSAGE_BY_AUTHOR} {pm_report.PM_AUTHOR_FULL} » {pm_report.PM_TIME}</span><br /> +							<span>{L_MESSAGE_TO} {pm_report.RECIPIENTS}</span> +						</div>  					</dt>  					<dd class="moderation">  						<span>{L_REPORTED} {L_POST_BY_AUTHOR} {pm_report.REPORTER_FULL} {L_REPORTED_ON_DATE} {pm_report.REPORT_TIME}</span> @@ -133,21 +135,19 @@  			</li>  			<!-- END pm_report -->  			</ul> -		<!-- ELSE --> -			<p>{L_PM_REPORTS_ZERO_TOTAL}</p>  		<!-- ENDIF --> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  <!-- ENDIF -->  <!-- IF S_SHOW_LOGS -->  	<div class="panel"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<h3>{L_LATEST_LOGS}</h3> -		<table class="table1" cellspacing="0"> +		<table class="table1">  		<thead>  		<tr>  			<th class="name">{L_ACTION}</th> @@ -176,8 +176,8 @@  		</tbody>  		</table> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  <!-- ENDIF --> -<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file +<!-- INCLUDE mcp_footer.html --> diff --git a/phpBB/styles/prosilver/template/mcp_header.html b/phpBB/styles/prosilver/template/mcp_header.html index 13cc7e12cf..69239887e3 100644 --- a/phpBB/styles/prosilver/template/mcp_header.html +++ b/phpBB/styles/prosilver/template/mcp_header.html @@ -3,28 +3,26 @@  <h2>{L_MCP}</h2>  <!-- IF U_MCP --> -	<p class="linkmcp"> -		[ <a href="{U_MCP}">{L_MCP}</a><!-- IF U_MCP_FORUM --> | <a href="{U_MCP_FORUM}">{L_MODERATE_FORUM}</a><!-- ENDIF --> -		<!-- IF U_MCP_TOPIC --> | <a href="{U_MCP_TOPIC}">{L_MODERATE_TOPIC}</a><!-- ENDIF --> -		<!-- IF U_MCP_POST --> | <a href="{U_MCP_POST}">{L_MODERATE_POST}</a><!-- ENDIF --> ] +	<p class="linkmcp responsive-center"> +		[<!-- IF U_ACP --> <a href="{U_ACP}" title="{L_ACP}" data-responsive-text="{L_ACP_SHORT}">{L_ACP}</a> |<!-- ENDIF --> <a href="{U_MCP}" title="{L_MCP}" data-responsive-text="{L_MCP_SHORT}">{L_MCP}</a><!-- IF U_MCP_FORUM --> | <a href="{U_MCP_FORUM}">{L_MODERATE_FORUM}</a><!-- ENDIF --><!-- IF U_MCP_TOPIC --> | <a href="{U_MCP_TOPIC}">{L_MODERATE_TOPIC}</a><!-- ENDIF --><!-- IF U_MCP_POST --> | <a href="{U_MCP_POST}">{L_MODERATE_POST}</a><!-- ENDIF --> ]  	</p>  <!-- ENDIF -->  <div id="tabs">  	<ul>  		<!-- BEGIN l_block1 --> -		<li<!-- IF l_block1.S_SELECTED --> class="activetab"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li> +		<li class="tab<!-- IF l_block1.S_SELECTED --> activetab<!-- ENDIF -->"><a href="{l_block1.U_TITLE}">{l_block1.L_TITLE}</a></li>  		<!-- END l_block1 -->  	</ul>  </div>  <div class="panel bg3"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<div style="width: 100%;">  	<div id="cp-menu"> -		<div id="navigation"> +		<div id="navigation" role="navigation">  			<ul>  			<!-- BEGIN l_block1 -->  			<!-- IF l_block1.S_SELECTED --> @@ -41,27 +39,11 @@  		</div>  	</div> -	<div id="cp-main" class="mcp-main"> +	<div id="cp-main" class="mcp-main panel-container">  		<!-- IF MESSAGE -->  		<div class="content"> -			<h2>{L_MESSAGE}</h2> +			<h2 class="message-title">{L_MESSAGE}</h2>  			<p class="error">{MESSAGE}</p>  			<p><!-- BEGIN return_links -->{return_links.MESSAGE_LINK}<br /><br /><!-- END return_links --></p>  		</div>  		<!-- ENDIF --> - -		<!-- IF CONFIRM_MESSAGE --> -			<form id="confirm" method="post" action="{S_CONFIRM_ACTION}"{S_FORM_ENCTYPE}> - -			<div class="content"> -				<h2>{L_PLEASE_CONFIRM}</h2> -				<p>{CONFIRM_MESSAGE}</p> -			 -				<fieldset class="submit-buttons"> -					{S_HIDDEN_FIELDS}<input class="button1" type="submit" name="submit" value="{L_YES}" />   -					<input class="button2" type="cancel" value="{L_NO}" /> -				</fieldset> -			</div> - -			</form> -		<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/mcp_logs.html b/phpBB/styles/prosilver/template/mcp_logs.html index 494f63cb1b..eaa3838f17 100644 --- a/phpBB/styles/prosilver/template/mcp_logs.html +++ b/phpBB/styles/prosilver/template/mcp_logs.html @@ -5,19 +5,21 @@  <form method="post" id="mcp" action="{U_POST_ACTION}">  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner"> -	<ul class="linklist"> -		<li class="leftside"> -			{L_SEARCH_KEYWORDS}: <input type="text" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /> -		</li> -		<li class="rightside pagination"> -			<!-- IF TOTAL -->{TOTAL} <!-- ENDIF --> -			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> -		</li> -	</ul> +	<div class="action-bar top"> +		{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /> +		<div class="pagination"> +			{TOTAL} +			<!-- IF .pagination -->  +				<!-- INCLUDE pagination.html --> +			<!-- ELSE -->  +				 • {PAGE_NUMBER} +			<!-- ENDIF --> +		</div> +	</div> -	<table cellspacing="1" class="table1"> +	<table class="table1">  	<thead>  	<tr>  		<th>{L_USERNAME}</th> @@ -50,9 +52,7 @@  	<!-- IF .log -->  		<fieldset class="display-options"> -			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF --> -			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -			<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label> +			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>  			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>  			<label>{S_SELECT_SORT_DIR}</label>  			<input type="submit" name="sort" value="{L_GO}" class="button2" /> @@ -60,14 +60,19 @@  		<hr /> -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL -->{TOTAL} <!-- ENDIF --> -				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> -			</li> -		</ul> +		<div class="action-bar bottom"> +			<div class="pagination"> +				{TOTAL} +				<!-- IF .pagination -->  +					<!-- INCLUDE pagination.html --> +				<!-- ELSE -->  +					 • {PAGE_NUMBER} +				<!-- ENDIF --> +			</div> +		</div> +  		{S_FORM_TOKEN} -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  		<!-- IF S_CLEAR_ALLOWED --> @@ -80,11 +85,11 @@  		<!-- ENDIF -->  	<!-- ELSE -->  			{S_FORM_TOKEN} -			<span class="corners-bottom"><span></span></span></div> +			</div>  		</div>  	<!-- ENDIF -->  </form>  <br /> -<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file +<!-- INCLUDE mcp_footer.html --> diff --git a/phpBB/styles/prosilver/template/mcp_message.html b/phpBB/styles/prosilver/template/mcp_message.html index 1fde48b2cc..062103b91c 100644 --- a/phpBB/styles/prosilver/template/mcp_message.html +++ b/phpBB/styles/prosilver/template/mcp_message.html @@ -1,8 +1,8 @@  <!-- INCLUDE mcp_header.html -->  <div class="content"> -	<h2>{MESSAGE_TITLE}</h2> +	<h2 class="message-title">{MESSAGE_TITLE}</h2>  	<p>{MESSAGE_TEXT}</p>  </div> -<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file +<!-- INCLUDE mcp_footer.html --> diff --git a/phpBB/styles/prosilver/template/mcp_move.html b/phpBB/styles/prosilver/template/mcp_move.html index 804d76b14b..d028fffeb4 100644 --- a/phpBB/styles/prosilver/template/mcp_move.html +++ b/phpBB/styles/prosilver/template/mcp_move.html @@ -1,19 +1,51 @@ +<!-- IF S_AJAX_REQUEST --> + +	<h3>{MESSAGE_TITLE}</h3> +	<p>{MESSAGE_TEXT}</p> + +	<!-- IF ADDITIONAL_MSG --><p>{ADDITIONAL_MSG}</p><!-- ENDIF --> + +	<label> +		<strong>{L_SELECT_DESTINATION_FORUM}{L_COLON}</strong> +		<select name="to_forum_id">{S_FORUM_SELECT}</select> +	</label> + +	<!-- IF S_CAN_LEAVE_SHADOW --> +		<label for="move_leave_shadow"> +			<input type="checkbox" name="move_leave_shadow" id="move_leave_shadow" />{L_LEAVE_SHADOW} +		</label> +	<!-- ENDIF --> + +	<!-- IF S_CAN_LOCK_TOPIC --> +		<label for="move_lock_topics"> +			<input type="checkbox" name="move_lock_topics" id="move_lock_topics" />{L_LOCK_TOPIC} +		</label> +	<!-- ENDIF --> + +	<fieldset class="submit-buttons"> +		<input type="button" name="confirm" value="{YES_VALUE}" class="button1" />  +		<input type="button" name="cancel" value="{L_NO}" class="button2" /> +	</fieldset> + +<!-- ELSE --> +  <!-- INCLUDE overall_header.html -->  <form id="confirm" action="{S_CONFIRM_ACTION}" method="post">  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<div class="content"> -		<h2>{MESSAGE_TITLE}</h2> +		<h2 class="message-title">{MESSAGE_TITLE}</h2>  		<!-- IF ADDITIONAL_MSG --><p>{ADDITIONAL_MSG}</p><!-- ENDIF -->  		<fieldset>  		<dl class="fields2"> -			<dt><label>{L_SELECT_DESTINATION_FORUM}:</label></dt> +			<dt><label>{L_SELECT_DESTINATION_FORUM}{L_COLON}</label></dt>  			<dd><select name="to_forum_id">{S_FORUM_SELECT}</select></dd> -			<!-- IF S_CAN_LEAVE_SHADOW --><dd><label for="move_leave_shadow"><input type="checkbox" name="move_leave_shadow" id="move_leave_shadow" checked="checked" />{L_LEAVE_SHADOW}</label></dd><!-- ENDIF --> +			<!-- IF S_CAN_LEAVE_SHADOW --><dd><label for="move_leave_shadow"><input type="checkbox" name="move_leave_shadow" id="move_leave_shadow" />{L_LEAVE_SHADOW}</label></dd><!-- ENDIF --> +			<!-- IF S_CAN_LOCK_TOPIC --><dd><label for="move_lock_topics"><input type="checkbox" name="move_lock_topics" id="move_lock_topics" />{L_LOCK_TOPIC}</label></dd><!-- ENDIF -->  		</dl>  		<dl class="fields2">  			<dt> </dt> @@ -29,8 +61,9 @@  	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  </form> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> +<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/mcp_notes_front.html b/phpBB/styles/prosilver/template/mcp_notes_front.html index 045a7619ed..db10284bce 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_front.html +++ b/phpBB/styles/prosilver/template/mcp_notes_front.html @@ -5,17 +5,17 @@  <h2>{L_TITLE}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<fieldset>  	<dl> -		<dt><label for="username">{L_SELECT_USER}:</label></dt> +		<dt><label for="username">{L_SELECT_USER}{L_COLON}</label></dt>  		<dd><input name="username" id="username" type="text" class="inputbox" /></dd>  		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>  	</dl>  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <fieldset class="submit-buttons"> @@ -25,4 +25,4 @@  </fieldset>  </form> -<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file +<!-- INCLUDE mcp_footer.html --> diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html index 7e92445476..ec317b141a 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_user.html +++ b/phpBB/styles/prosilver/template/mcp_notes_user.html @@ -5,7 +5,7 @@  <h2>{L_TITLE}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<h3>{USERNAME_FULL}</h3> @@ -16,20 +16,20 @@  		<div class="column2">  			<dl class="details"> -				<!-- IF RANK_TITLE --><dt>{L_RANK}:</dt><dd>{RANK_TITLE}</dd><!-- ENDIF --> -				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE --> <!-- ELSE -->{L_RANK}:<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF --> -				<dt>{L_JOINED}:</dt><dd>{JOINED}</dd> -				<dt>{L_TOTAL_POSTS}:</dt><dd>{POSTS}</dd> -				<dt>{L_WARNINGS}: </dt><dd>{WARNINGS}</dd> +				<!-- IF RANK_TITLE --><dt>{L_RANK}{L_COLON}</dt><dd>{RANK_TITLE}</dd><!-- ENDIF --> +				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE --> <!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF --> +				<dt>{L_JOINED}{L_COLON}</dt><dd>{JOINED}</dd> +				<dt>{L_TOTAL_POSTS}{L_COLON}</dt><dd>{POSTS}</dd> +				<dt>{L_WARNINGS}{L_COLON} </dt><dd>{WARNINGS}</dd>  			</dl>  		</div>  	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<h3>{L_ADD_FEEDBACK}</h3>  	<p>{L_ADD_FEEDBACK_EXPLAIN}</p> @@ -38,7 +38,7 @@  		<textarea name="usernote" id="usernote" class="inputbox" cols="40" rows="3"></textarea>  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <fieldset class="submit-buttons"> @@ -48,19 +48,21 @@  </fieldset>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> - -	<ul class="linklist"> -		<li class="leftside"> -			{L_SEARCH_KEYWORDS}: <input type="text" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /> -		</li> -		<li class="rightside pagination"> -			<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS} <!-- ENDIF --> -			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> -		</li> -	</ul> - -	<table cellspacing="1" class="table1"> +	<div class="inner"> + +	<div class="action-bar top"> +		{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /> +		<div class="pagination"> +			{TOTAL_REPORTS} +			<!-- IF .pagination -->  +				<!-- INCLUDE pagination.html --> +			<!-- ELSE -->  +				 • {PAGE_NUMBER} +			<!-- ENDIF --> +		</div> +	</div> + +	<table class="table1">  	<thead>  	<tr>  		<th>{L_REPORT_BY}</th> @@ -84,30 +86,32 @@  	<tr>  		<td class="bg1" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->" align="center"><span class="gen">{L_NO_ENTRIES}</span></td>  	</tr> -	<!-- END usernames --> +	<!-- END usernotes -->  	</tbody>  	</table>  	<hr />  	<fieldset class="display-options"> -		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF --> -		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -		<label>{L_DISPLAY_LOG}: {S_SELECT_SORT_DAYS}</label> +		<label>{L_DISPLAY_LOG}{L_COLON} {S_SELECT_SORT_DAYS}</label>  		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>  		<input type="submit" name="sort" value="{L_GO}" class="button2" />  	</fieldset>  	<hr /> -	<ul class="linklist"> -		<li class="rightside pagination"> -			<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS}<!-- ENDIF --> -			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> -		</li> -	</ul> +	<div class="action-bar bottom"> +		<div class="pagination"> +			{TOTAL_REPORTS} +			<!-- IF .pagination -->  +				<!-- INCLUDE pagination.html --> +			<!-- ELSE -->  +				 • {PAGE_NUMBER} +			<!-- ENDIF --> +		</div> +	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- IF S_CLEAR_ALLOWED --> @@ -122,4 +126,4 @@  <!-- ENDIF -->  </form> -<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file +<!-- INCLUDE mcp_footer.html --> diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html index 11f63a3ea2..10ec6f3ea9 100644 --- a/phpBB/styles/prosilver/template/mcp_post.html +++ b/phpBB/styles/prosilver/template/mcp_post.html @@ -8,13 +8,13 @@  	<!-- ENDIF -->  	<div id="report" class="panel"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<div class="postbody"> -			<h3>{L_REPORT_REASON}: {REPORT_REASON_TITLE}</h3> +			<h3>{L_REPORT_REASON}{L_COLON} {REPORT_REASON_TITLE}</h3>  			<p class="author">{L_REPORTED} {L_POST_BY_AUTHOR} {REPORTER_FULL} « {REPORT_DATE}</p>  		<!-- IF S_REPORT_CLOSED --> -			<p class="rules">{L_REPORT_CLOSED}</p> +			<p class="post-notice reported">{L_REPORT_CLOSED}</p>  		<!-- ENDIF -->  			<div class="content">  			<!-- IF REPORT_TEXT --> @@ -25,7 +25,7 @@  			</div>  		</div> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  	<form method="post" id="mcp_report" action="{S_CLOSE_ACTION}"> @@ -45,24 +45,32 @@  <!-- ENDIF -->  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<div class="postbody"> -		<!-- IF U_EDIT --> -		<ul class="profile-icons"> -			<li class="edit-icon"><a href="{U_EDIT}" title="{L_EDIT_POST}"><span>{L_EDIT_POST}</span></a></li> -		</ul> -		<!-- ENDIF --> +		<h3><a href="{U_VIEW_POST}">{POST_SUBJECT}</a></h3> -		<span class="right-box" id="expand"><a href="#post_details" onclick="viewableArea(getElementById('post_details'), true); var rev_text = getElementById('expand').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'}; return false;">{L_EXPAND_VIEW}</a></span> +		<ul class="post-buttons"> +			<li id="expand"> +				<a href="#post_details" onclick="viewableArea(getElementById('post_details'), true); var rev_text = getElementById('expand').getElementsByTagName('a').item(0).firstChild; if (rev_text.data.trim() == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data.trim() == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}';} return false;"> +					{L_EXPAND_VIEW} +				</a> +			</li> +			<!-- IF U_EDIT --> +				<li> +					<a href="{U_EDIT}" title="{L_EDIT_POST}" class="button icon-button edit-icon"> +						<span>{L_EDIT_POST}</span> +					</a> +				</li> +			<!-- ENDIF --> +		</ul> -		<h3><a href="{U_VIEW_POST}">{POST_SUBJECT}</a></h3>  		<!-- IF S_PM -->  		<p class="author"> -			<strong>{L_SENT_AT}:</strong> {POST_DATE} -			<br /><strong>{L_PM_FROM}:</strong> {POST_AUTHOR_FULL} -			<!-- IF S_TO_RECIPIENT --><br /><strong>{L_TO}:</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}" style="color:<!-- IF to_recipient.COLOUR -->{to_recipient.COLOUR}<!-- ELSEIF to_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{to_recipient.NAME}</a><!-- ENDIF --> <!-- END to_recipient --><!-- ENDIF --> -			<!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}:</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}" style="color:<!-- IF bcc_recipient.COLOUR -->{bcc_recipient.COLOUR}<!-- ELSEIF bcc_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{bcc_recipient.NAME}</a><!-- ENDIF --> <!-- END bcc_recipient --><!-- ENDIF --> +			<strong>{L_SENT_AT}{L_COLON}</strong> {POST_DATE} +			<br /><strong>{L_PM_FROM}{L_COLON}</strong> {POST_AUTHOR_FULL} +			<!-- IF S_TO_RECIPIENT --><br /><strong>{L_TO}{L_COLON}</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}" style="color:<!-- IF to_recipient.COLOUR -->{to_recipient.COLOUR}<!-- ELSEIF to_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{to_recipient.NAME}</a><!-- ENDIF --> <!-- END to_recipient --><!-- ENDIF --> +			<!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}{L_COLON}</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}" style="color:<!-- IF bcc_recipient.COLOUR -->{bcc_recipient.COLOUR}<!-- ELSEIF bcc_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{bcc_recipient.NAME}</a><!-- ENDIF --> <!-- END bcc_recipient --><!-- ENDIF -->  		</p>  		<!-- ELSE -->  		<p class="author">{MINI_POST_IMG} {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} » {POST_DATE}</p> @@ -71,7 +79,7 @@  		<!-- IF S_POST_UNAPPROVED -->  			<form method="post" id="mcp_approve" action="{U_APPROVE_ACTION}"> -			<p class="rules"> +			<p class="post-notice unapproved">  				<input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" />    				<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" />  				<!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="unapproved_posts" /><!-- ENDIF --> @@ -79,10 +87,21 @@  				{S_FORM_TOKEN}  			</p>  			</form> +		<!-- ELSEIF S_POST_DELETED --> +			<form method="post" id="mcp_approve" action="{U_APPROVE_ACTION}"> + +			<p class="post-notice deleted"> +				<input class="button2" type="submit" value="{L_DELETE}" name="action[disapprove]" />   +				<input class="button1" type="submit" value="{L_RESTORE}" name="action[restore]" /> +				<!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="unapproved_posts" /><!-- ENDIF --> +				<input type="hidden" name="post_id_list[]" value="{POST_ID}" /> +				{S_FORM_TOKEN} +			</p> +			</form>  		<!-- ENDIF -->  		<!-- IF S_MESSAGE_REPORTED --> -			<p class="rules"> +			<p class="post-notice reported">  				{REPORTED_IMG} <a href="{U_MCP_REPORT}"><strong>{L_MESSAGE_REPORTED}</strong></a>  			</p>  		<!-- ENDIF --> @@ -100,13 +119,20 @@  			</dl>  		<!-- ENDIF --> +		<!-- IF DELETED_MESSAGE or DELETE_REASON --> +			<div class="notice"> +				{DELETED_MESSAGE} +				<!-- IF DELETE_REASON --><br /><strong>{L_REASON}{L_COLON}</strong> <em>{DELETE_REASON}</em><!-- ENDIF --> +			</div> +		<!-- ENDIF --> +  		<!-- IF SIGNATURE -->  			<div id="sig{POST_ID}" class="signature">{SIGNATURE}</div>  		<!-- ENDIF -->  		<!-- IF S_MCP_REPORT and S_CAN_VIEWIP -->  			<hr /> -			<div><!-- IF S_PM -->{L_THIS_PM_IP}<!-- ELSE -->{L_THIS_POST_IP}<!-- ENDIF -->: <!-- IF U_WHOIS --> +			<div><!-- IF S_PM -->{L_THIS_PM_IP}<!-- ELSE -->{L_THIS_POST_IP}<!-- ENDIF -->{L_COLON} <!-- IF U_WHOIS -->  				<a href="{U_WHOIS}"><!-- IF POST_IPADDR -->{POST_IPADDR}<!-- ELSE -->{POST_IP}<!-- ENDIF --></a> (<!-- IF POST_IPADDR -->{POST_IP}<!-- ELSE --><a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a><!-- ENDIF -->)  			<!-- ELSE -->  				<!-- IF POST_IPADDR -->{POST_IPADDR} ({POST_IP})<!-- ELSE -->{POST_IP}<!-- IF U_LOOKUP_IP --> (<a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a>)<!-- ENDIF --><!-- ENDIF --> @@ -115,12 +141,12 @@  	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- IF S_CAN_LOCK_POST or S_CAN_DELETE_POST or S_CAN_CHGPOSTER -->  	<div class="panel"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<h3>{L_MOD_OPTIONS}</h3>  		<!-- IF S_CAN_CHGPOSTER --> @@ -128,7 +154,7 @@  			<fieldset>  			<dl> -				<dt><label>{L_CHANGE_POSTER}:</label></dt> +				<dt><label>{L_CHANGE_POSTER}{L_COLON}</label></dt>  				<!-- IF S_USER_SELECT --><dd><select name="u">{S_USER_SELECT}</select> <input type="submit" class="button2" name="action[chgposter_ip]" value="{L_CONFIRM}" /></dd><!-- ENDIF -->  				<dd style="margin-top:3px;">  					<input class="inputbox autowidth" type="text" name="username" value="" /> @@ -147,7 +173,7 @@  			<fieldset>  			<dl> -				<dt><label>{L_MOD_OPTIONS}:</label></dt> +				<dt><label>{L_MOD_OPTIONS}{L_COLON}</label></dt>  				<dd><select name="action">  					<!-- IF S_CAN_LOCK_POST --><!-- IF S_POST_LOCKED --><option value="unlock_post">{L_UNLOCK_POST} [{L_UNLOCK_POST_EXPLAIN}]</option><!-- ELSE --><option value="lock_post">{L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</option><!-- ENDIF --><!-- ENDIF -->  					<!-- IF S_CAN_DELETE_POST --><option value="delete_post">{L_DELETE_POST}</option><!-- ENDIF --> @@ -159,18 +185,18 @@  			</form>  		<!-- ENDIF --> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  <!-- ENDIF -->  <!-- IF S_MCP_QUEUE or S_MCP_REPORT or RETURN_TOPIC -->  	<div class="panel"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<p><!-- IF S_MCP_QUEUE -->{RETURN_QUEUE} | {RETURN_TOPIC_SIMPLE} | {RETURN_POST}<!-- ELSEIF S_MCP_REPORT -->{RETURN_REPORTS}<!-- IF not S_PM --> | <a href="{U_VIEW_POST}">{L_VIEW_POST}</a> | <a href="{U_VIEW_TOPIC}">{L_VIEW_TOPIC}</a> | <a href="{U_VIEW_FORUM}">{L_VIEW_FORUM}</a><!-- ENDIF --><!-- ELSE -->{RETURN_TOPIC}<!-- ENDIF --></p> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  <!-- ENDIF --> @@ -179,7 +205,7 @@  	<!-- IF S_SHOW_USER_NOTES -->  		<div class="panel" id="usernotes"> -			<div class="inner"><span class="corners-top"><span></span></span> +			<div class="inner">  			<form method="post" id="mcp_notes" action="{U_POST_ACTION}"> @@ -187,7 +213,7 @@  				<h3>{L_FEEDBACK}</h3>  				<!-- BEGIN usernotes --> -					<span class="small"><strong>{L_REPORTED_BY}: {usernotes.REPORT_BY} « {usernotes.REPORT_AT}</strong></span> +					<span class="small"><strong>{L_REPORTED_BY}{L_COLON} {usernotes.REPORT_BY} « {usernotes.REPORT_AT}</strong></span>  					<!-- IF S_CLEAR_ALLOWED --><div class="right-box"><input type="checkbox" name="marknote[]" value="{usernotes.ID}" /></div><!-- ENDIF -->  					<div class="postbody">{usernotes.ACTION}</div> @@ -216,36 +242,36 @@  			</fieldset>  			</form> -			<span class="corners-bottom"><span></span></span></div> +			</div>  		</div>  	<!-- ENDIF -->  	<!-- IF S_SHOW_REPORTS -->  		<div class="panel" id="reports"> -			<div class="inner"><span class="corners-top"><span></span></span> +			<div class="inner">  			<h3>{L_MCP_POST_REPORTS}</h3>  			<!-- BEGIN reports --> -				<span class="small"><strong>{L_REPORTED_BY}: <!-- IF reports.U_REPORTER --><a href="{reports.U_REPORTER}">{reports.REPORTER}</a><!-- ELSE -->{reports.REPORTER}<!-- ENDIF --> « {reports.REPORT_TIME}</strong></span> -				<p><em>{reports.REASON_TITLE}: {reports.REASON_DESC}</em><!-- IF reports.REPORT_TEXT --><br />{reports.REPORT_TEXT}<!-- ENDIF --></p> +				<span class="small"><strong>{L_REPORTED_BY}{L_COLON} <!-- IF reports.U_REPORTER --><a href="{reports.U_REPORTER}">{reports.REPORTER}</a><!-- ELSE -->{reports.REPORTER}<!-- ENDIF --> « {reports.REPORT_TIME}</strong></span> +				<p><em>{reports.REASON_TITLE}{L_COLON} {reports.REASON_DESC}</em><!-- IF reports.REPORT_TEXT --><br />{reports.REPORT_TEXT}<!-- ENDIF --></p>  			<!-- END reports --> -			<span class="corners-bottom"><span></span></span></div> +			</div>  		</div>  	<!-- ENDIF -->  	<!-- IF S_CAN_VIEWIP and not S_MCP_REPORT -->  		<div class="panel" id="ip"> -			<div class="inner"><span class="corners-top"><span></span></span> +			<div class="inner"> -			<p>{L_THIS_POST_IP}: <!-- IF U_WHOIS --> +			<p>{L_THIS_POST_IP}{L_COLON} <!-- IF U_WHOIS -->  				<a href="{U_WHOIS}"><!-- IF POST_IPADDR -->{POST_IPADDR}<!-- ELSE -->{POST_IP}<!-- ENDIF --></a> (<!-- IF POST_IPADDR -->{POST_IP}<!-- ELSE --><a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a><!-- ENDIF -->)  			<!-- ELSE -->  				<!-- IF POST_IPADDR -->{POST_IPADDR} ({POST_IP})<!-- ELSE -->{POST_IP}<!-- IF U_LOOKUP_IP --> (<a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a>)<!-- ENDIF --><!-- ENDIF -->  			<!-- ENDIF --></p> -			<table class="table1" cellspacing="1"> +			<table class="table1">  			<thead>  			<tr>  				<th class="name">{L_OTHER_USERS}</th> @@ -266,7 +292,7 @@  			</tbody>  			</table> -			<table class="table1" cellspacing="1"> +			<table class="table1">  			<thead>  			<tr>  				<th class="name">{L_IPS_POSTED_FROM}</th> @@ -289,7 +315,7 @@  			<p><a href="{U_LOOKUP_ALL}#ip">{L_LOOKUP_ALL}</a></p> -			<span class="corners-bottom"><span></span></span></div> +			</div>  		</div>  	<!-- ENDIF --> @@ -297,4 +323,4 @@  <!-- IF S_TOPIC_REVIEW --><!-- INCLUDE posting_topic_review.html --><!-- ENDIF --> -<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file +<!-- INCLUDE mcp_footer.html --> diff --git a/phpBB/styles/prosilver/template/mcp_queue.html b/phpBB/styles/prosilver/template/mcp_queue.html index 57fb149257..864b231142 100644 --- a/phpBB/styles/prosilver/template/mcp_queue.html +++ b/phpBB/styles/prosilver/template/mcp_queue.html @@ -3,7 +3,7 @@  <form id="mcp" method="post" action="{S_MCP_ACTION}">  <fieldset class="forum-selection"> -	<label for="fo">{L_FORUM}: <select name="f" id="fo">{S_FORUM_OPTIONS}</select></label> +	<label for="fo">{L_FORUM}{L_COLON} <select name="f" id="fo">{S_FORUM_OPTIONS}</select></label>  	<input type="submit" name="sort" value="{L_GO}" class="button2" />  	{S_FORM_TOKEN}  </fieldset> @@ -11,27 +11,32 @@  <h2>{L_TITLE}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<p>{L_EXPLAIN}</p>  	<!-- IF .postrow --> -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL --> {TOTAL}<!-- ENDIF --> -				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> -			</li> -		</ul> -		<ul class="topiclist"> +		<div class="action-bar top"> +			<div class="pagination"> +				{TOTAL} +				<!-- IF .pagination -->  +					<!-- INCLUDE pagination.html --> +				<!-- ELSE -->  +					 • {PAGE_NUMBER} +				<!-- ENDIF --> +			</div> +		</div> + +		<ul class="topiclist missing-column">  			<li class="header">  				<dl> -					<dt><!-- IF S_TOPICS -->{L_TOPIC}<!-- ELSE -->{L_POST}<!-- ENDIF --></dt> +					<dt><div class="list-inner"><!-- IF S_TOPICS -->{L_TOPIC}<!-- ELSE -->{L_POST}<!-- ENDIF --></div></dt>  					<dd class="moderation"><span><!-- IF not S_TOPICS -->{L_TOPIC} & <!-- ENDIF -->{L_FORUM}</span></dd>  					<dd class="mark">{L_MARK}</dd>  				</dl>  			</li>  			</ul> -			<ul class="topiclist cplist"> +			<ul class="topiclist cplist missing-column responsive-show-all">  		<!-- BEGIN postrow --> @@ -42,18 +47,26 @@  		<li class="row<!-- IF postrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">  			<dl>  				<dt> -					<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a> <br /> -					<span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} » {postrow.POST_TIME}</span> +					<div class="list-inner"> +						<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a> {postrow.ATTACH_ICON_IMG}<br /> +						<span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} » {postrow.POST_TIME}</span> +					</div>  				</dt>  				<dd class="moderation">  					<span> -						<!-- IF S_TOPICS --><br /><!-- ELSE -->{L_TOPIC}: <a href="{postrow.U_TOPIC}">{postrow.TOPIC_TITLE}</a> <br /><!-- ENDIF --> -						{L_FORUM}: <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a> +						<!-- IF S_TOPICS --><br /><!-- ELSE -->{L_TOPIC}{L_COLON} <a href="{postrow.U_TOPIC}">{postrow.TOPIC_TITLE}</a> <br /><!-- ENDIF --> +						{L_FORUM}{L_COLON} <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a>  					</span>  				</dd> -		 		<dd class="mark"><input type="checkbox" name="post_id_list[]" value="{postrow.POST_ID}" /></dd> +		 		<dd class="mark"> +					<!-- IF S_TOPICS --> +						<input type="checkbox" name="topic_id_list[]" value="{postrow.TOPIC_ID}" /> +					<!-- ELSE --> +						<input type="checkbox" name="post_id_list[]" value="{postrow.POST_ID}" /> +					<!-- ENDIF --> +				</dd>  			</dl>  		</li>  		<!-- ENDIF --> @@ -61,9 +74,7 @@  		</ul>  		<fieldset class="display-options"> -			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF --> -			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -			<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label> +			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>  			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>  			<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />  <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->  			<input type="submit" name="sort" value="{L_GO}" class="button2" /> @@ -71,26 +82,48 @@  		<hr /> -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL -->{TOTAL}<!-- ENDIF --> -				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> -			</li> -		</ul> +		<div class="action-bar bottom"> +			<div class="pagination"> +				{TOTAL} +				<!-- IF .pagination -->  +					<!-- INCLUDE pagination.html --> +				<!-- ELSE -->  +					 • {PAGE_NUMBER} +				<!-- ENDIF --> +			</div> +		</div> +  	<!-- ELSE --> -		<p class="notopics"><strong><!-- IF S_TOPICS -->{L_NO_TOPICS_QUEUE}<!-- ELSE -->{L_UNAPPROVED_POSTS_ZERO_TOTAL}<!-- ENDIF --></strong></p> +		<p class="notopics"><strong> +			<!-- IF S_RESTORE --> +				<!-- IF S_TOPICS -->{L_NO_TOPICS_DELETED}<!-- ELSE -->{L_NO_POSTS_DELETED}<!-- ENDIF --> +			<!-- ELSE --> +				<!-- IF S_TOPICS -->{L_NO_TOPICS_QUEUE}<!-- ELSE -->{L_NO_POSTS_QUEUE}<!-- ENDIF --> +			<!-- ENDIF --> +		</strong></p>  	<!-- ENDIF --> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- IF .postrow -->  	<fieldset class="display-actions"> +		<!-- IF S_RESTORE --> +		<input class="button2" type="submit" name="action[delete]" value="{L_DELETE}" />  +		<input class="button1" type="submit" name="action[restore]" value="{L_RESTORE}" /> +		<!-- ELSE -->  		<input class="button2" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" />   		<input class="button1" type="submit" name="action[approve]" value="{L_APPROVE}" /> -		<div><a href="#" onclick="marklist('mcp', 'post_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'post_id_list', false); return false;">{L_UNMARK_ALL}</a></div> +		<!-- ENDIF --> +		<div> +			<!-- IF S_TOPICS --> +				<a href="#" onclick="marklist('mcp', 'topic_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'topic_id_list', false); return false;">{L_UNMARK_ALL}</a> +			<!-- ELSE --> +				<a href="#" onclick="marklist('mcp', 'post_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'post_id_list', false); return false;">{L_UNMARK_ALL}</a> +			<!-- ENDIF --> +		</div>  	</fieldset>  <!-- ENDIF -->  </form> -<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file +<!-- INCLUDE mcp_footer.html --> diff --git a/phpBB/styles/prosilver/template/mcp_reports.html b/phpBB/styles/prosilver/template/mcp_reports.html index eefb24ee91..24c0479f63 100644 --- a/phpBB/styles/prosilver/template/mcp_reports.html +++ b/phpBB/styles/prosilver/template/mcp_reports.html @@ -4,7 +4,7 @@  <!-- IF not S_PM -->  <fieldset class="forum-selection"> -	<label for="fo">{L_FORUM}: <select name="f" id="fo">{S_FORUM_OPTIONS}</select></label> +	<label for="fo">{L_FORUM}{L_COLON} <select name="f" id="fo">{S_FORUM_OPTIONS}</select></label>  	<input type="submit" name="sort" value="{L_GO}" class="button2" />  	{S_FORM_TOKEN}  </fieldset> @@ -13,48 +13,64 @@  <h2>{L_TITLE}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<p>{L_EXPLAIN}</p>  	<!-- IF .postrow --> -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL -->{TOTAL_REPORTS}<!-- ENDIF --> -				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> -			</li> -		</ul> -		<ul class="topiclist"> +		<div class="action-bar top"> +			<div class="pagination"> +				{TOTAL_REPORTS} +				<!-- IF .pagination -->  +					<!-- INCLUDE pagination.html --> +				<!-- ELSE -->  +					 • {PAGE_NUMBER} +				<!-- ENDIF --> +			</div> +		</div> + +		<ul class="topiclist missing-column">  			<li class="header">  				<dl> -					<dt>{L_VIEW_DETAILS}</dt> +					<dt><div class="list-inner">{L_VIEW_DETAILS}</div></dt>  					<dd class="moderation"><span>{L_REPORTER}<!-- IF not S_PM --> & {L_FORUM}<!-- ENDIF --></span></dd>  					<dd class="mark">{L_MARK}</dd>  				</dl>  			</li>  		</ul> -		<ul class="topiclist cplist"> +		<ul class="topiclist cplist missing-column">  		<!-- BEGIN postrow -->  			<li class="row<!-- IF postrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">  				<dl>  					<!-- IF S_PM -->  					<dt> -						<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.PM_SUBJECT}</a> {postrow.ATTACH_ICON_IMG}<br /> -						<span>{L_MESSAGE_BY_AUTHOR} {postrow.PM_AUTHOR_FULL} » {postrow.PM_TIME}</span><br /> -						<span>{L_MESSAGE_TO} {postrow.RECIPIENTS}</span> +						<div class="list-inner"> +							<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.PM_SUBJECT}</a> {postrow.ATTACH_ICON_IMG}<br /> +							<span>{L_MESSAGE_BY_AUTHOR} {postrow.PM_AUTHOR_FULL} » {postrow.PM_TIME}</span><br /> +							<span>{L_MESSAGE_TO} {postrow.RECIPIENTS}</span> +							<div class="responsive-show" style="display: none;"> +								{L_REPORTER}{L_COLON} {postrow.REPORTER_FULL} « {postrow.REPORT_TIME} +							</div> +						</div>  					</dt>  					<dd class="moderation">  						<span>{postrow.REPORTER_FULL} « {postrow.REPORT_TIME}</span>  					</dd>  					<!-- ELSE -->  					<dt> -						<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a> {postrow.ATTACH_ICON_IMG}<br /> -						<span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} » {postrow.POST_TIME}</span> +						<div class="list-inner"> +							<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a> {postrow.ATTACH_ICON_IMG}<br /> +							<span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} » {postrow.POST_TIME}</span> +							<div class="responsive-show" style="display: none;"> +								{L_REPORTER}{L_COLON} {postrow.REPORTER_FULL} « {postrow.REPORT_TIME}<br /> +								<!-- IF postrow.U_VIEWFORUM -->{L_FORUM}{L_COLON} <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a><!-- ELSE -->{postrow.FORUM_NAME}<!-- ENDIF --> +							</div> +						</div>  					</dt>  					<dd class="moderation">  						<span>{postrow.REPORTER_FULL} « {postrow.REPORT_TIME}<br /> -						<!-- IF postrow.U_VIEWFORUM -->{L_FORUM}: <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a><!-- ELSE -->{postrow.FORUM_NAME}<!-- ENDIF --></span> +						<!-- IF postrow.U_VIEWFORUM -->{L_FORUM}{L_COLON} <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a><!-- ELSE -->{postrow.FORUM_NAME}<!-- ENDIF --></span>  					</dd>  					<!-- ENDIF -->  					<dd class="mark"><input type="checkbox" name="report_id_list[]" value="{postrow.REPORT_ID}" /></dd> @@ -64,26 +80,30 @@  		</ul>  		<fieldset class="display-options"> -			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF --> -			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -			<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label> +			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>  			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>  			<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />  <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->  			<input type="submit" name="sort" value="{L_GO}" class="button2" />  		</fieldset> +  		<hr /> -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL -->{TOTAL_REPORTS}<!-- ENDIF --> -				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> -			</li> -		</ul> + +		<div class="action-bar bottom"> +			<div class="pagination"> +				{TOTAL_REPORTS} +				<!-- IF .pagination -->  +					<!-- INCLUDE pagination.html --> +				<!-- ELSE -->  +					 • {PAGE_NUMBER} +				<!-- ENDIF --> +			</div> +		</div>  	<!-- ELSE -->  		<p><strong>{L_NO_REPORTS}</strong></p>  	<!-- ENDIF --> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- IF .postrow --> @@ -95,4 +115,4 @@  <!-- ENDIF -->  </form> -<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file +<!-- INCLUDE mcp_footer.html --> diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index 13b661ef0a..082bea22f1 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -1,38 +1,26 @@  <!-- INCLUDE mcp_header.html -->  <div class="tabs-container"> -<h2><a href="{U_VIEW_TOPIC}">{L_TOPIC}: {TOPIC_TITLE}</a></h2> - -<script type="text/javascript"> -// <![CDATA[ -var panels = new Array('display-panel', 'split-panel', 'merge-panel'); +<h2><a href="{U_VIEW_TOPIC}">{L_TOPIC}{L_COLON} {TOPIC_TITLE}</a></h2>  <!-- IF S_MERGE_VIEW --> -	var show_panel = 'merge-panel'; +	<!-- DEFINE $SHOW_PANEL = 'merge-panel' -->  <!-- ELSEIF S_SPLIT_VIEW --> -	var show_panel = 'split-panel'; +	<!-- DEFINE $SHOW_PANEL = 'split-panel' -->  <!-- ELSE --> -	var show_panel = 'display-panel'; +	<!-- DEFINE $SHOW_PANEL = 'display-panel' -->  <!-- ENDIF --> -onload_functions.push('subPanels()'); - -// ]]> -</script> - -<div id="minitabs"> +<div id="minitabs" class="sub-panels" data-show-panel="{$SHOW_PANEL}" role="tablist">  	<ul> -		<li id="display-panel-tab"<!-- IF not S_MERGE_VIEW --> class="activetab"<!-- ENDIF -->> -			<span class="corners-top"><span></span></span> -			<a href="#minitabs" onclick="subPanels('display-panel'); return false;"><span>{L_DISPLAY_OPTIONS}</span></a> +		<li id="display-panel-tab" class="tab<!-- IF not S_MERGE_VIEW --> activetab<!-- ENDIF -->"> +			<a href="#minitabs" data-subpanel="display-panel" role="tab" aria-controls="display-panel">{L_DISPLAY_OPTIONS}</a>  		</li> -		<li id="split-panel-tab"> -			<span class="corners-top"><span></span></span> -			<a href="#minitabs" onclick="subPanels('split-panel'); return false;"><span>{L_SPLIT_TOPIC}</span></a> +		<li id="split-panel-tab" class="tab"> +			<a href="#minitabs" data-subpanel="split-panel" role="tab" aria-controls="split-panel">{L_SPLIT_TOPIC}</a>  		</li> -		<li id="merge-panel-tab"<!-- IF S_MERGE_VIEW --> class="activetab"<!-- ENDIF -->> -			<span class="corners-top"><span></span></span> -			<a href="#minitabs" onclick="subPanels('merge-panel'); return false;"><span>{L_MERGE_POSTS}</span></a> +		<li id="merge-panel-tab" class="tab<!-- IF S_MERGE_VIEW --> activetab<!-- ENDIF -->"> +			<a href="#minitabs" data-subpanel="merge-panel" role="tab" aria-controls="merge-panel">{L_MERGE_POSTS}</a>  		</li>  	</ul>  </div> @@ -41,49 +29,49 @@ onload_functions.push('subPanels()');  <form id="mcp" method="post" action="{S_MCP_ACTION}">  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner"> -	<fieldset id="display-panel" class="fields2"> +	<fieldset id="display-panel" class="fields2" role="tabpanel">  	<dl> -		<dt><label for="posts_per_page">{L_POSTS_PER_PAGE}:</label><br /><span>{L_POSTS_PER_PAGE_EXPLAIN}</span></dt> -		<dd><input class="inputbox autowidth" type="text" name="posts_per_page" id="posts_per_page" size="6" value="{POSTS_PER_PAGE}" /></dd> +		<dt><label for="posts_per_page">{L_POSTS_PER_PAGE}{L_COLON}</label><br /><span>{L_POSTS_PER_PAGE_EXPLAIN}</span></dt> +		<dd><input class="inputbox autowidth" type="number" min="0" name="posts_per_page" id="posts_per_page" size="6" value="{POSTS_PER_PAGE}" /></dd>  	</dl>  	<dl> -		<dt><label>{L_DISPLAY_POSTS}:</label></dt> +		<dt><label>{L_DISPLAY_POSTS}{L_COLON}</label></dt>  		<dd>{S_SELECT_SORT_DAYS}  <label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label> <input type="submit" name="sort" value="{L_GO}" class="button2" /></dd>  	</dl>  	</fieldset>  <!-- IF S_CAN_SPLIT --> -	<fieldset id="split-panel" class="fields2"> +	<fieldset id="split-panel" class="fields2" role="tabpanel">  		<p>{L_SPLIT_TOPIC_EXPLAIN}</p>  	<!-- IF S_SHOW_TOPIC_ICONS -->  		<dl> -			<dt><label for="icon">{L_TOPIC_ICON}:</label></dt> +			<dt><label for="icon">{L_TOPIC_ICON}{L_COLON}</label></dt>  			<dd><label for="icon"><input type="radio" name="icon" id="icon" value="0" checked="checked" /> {L_NO_TOPIC_ICON}</label>  			<!-- BEGIN topic_icon --><label for="icon-{topic_icon.ICON_ID}"><input type="radio" name="icon" id="icon-{topic_icon.ICON_ID}" value="{topic_icon.ICON_ID}" {topic_icon.S_ICON_CHECKED} /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" /></label> <!-- END topic_icon --></dd>  		</dl>  	<!-- ENDIF -->  	<dl> -		<dt><label for="subject">{L_SPLIT_SUBJECT}:</label></dt> -		<dd><input type="text" name="subject" id="subject" size="45" maxlength="64" tabindex="2" value="{SPLIT_SUBJECT}" title="{L_SPLIT_SUBJECT}" class="inputbox" /></dd> +		<dt><label for="subject">{L_SPLIT_SUBJECT}{L_COLON}</label></dt> +		<dd><input type="text" name="subject" id="subject" size="45" maxlength="124" tabindex="2" value="{SPLIT_SUBJECT}" title="{L_SPLIT_SUBJECT}" class="inputbox" /></dd>  	</dl>  	<dl> -		<dt><label>{L_SPLIT_FORUM}:</label></dt> +		<dt><label>{L_SPLIT_FORUM}{L_COLON}</label></dt>  		<dd><select name="to_forum_id">{S_FORUM_SELECT}</select></dd>  	</dl>  	</fieldset>  <!-- ENDIF -->  <!-- IF S_CAN_MERGE --> -	<fieldset id="merge-panel" class="fields2"> +	<fieldset id="merge-panel" class="fields2" role="tabpanel">  		<p>{L_MERGE_TOPIC_EXPLAIN}</p>  	<dl> -		<dt><label for="to_topic_id">{L_MERGE_TOPIC_ID}:</label></dt> +		<dt><label for="to_topic_id">{L_MERGE_TOPIC_ID}{L_COLON}</label></dt>  		<dd> -			<input class="inputbox autowidth" type="text" size="6" name="to_topic_id" id="to_topic_id" value="{TO_TOPIC_ID}" /> +			<input class="inputbox autowidth" type="number" min="0" size="6" name="to_topic_id" id="to_topic_id" value="{TO_TOPIC_ID}" />  			<a href="{U_SELECT_TOPIC}" >{L_SELECT_TOPIC}</a>  		</dd>  		<!-- IF TO_TOPIC_INFO --><dd>{TO_TOPIC_INFO}</dd><!-- ENDIF --> @@ -91,32 +79,54 @@ onload_functions.push('subPanels()');  	</fieldset>  <!-- ENDIF --> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<h3 id="review">  		<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span> -		{L_TOPIC_REVIEW}: {TOPIC_TITLE} +		{L_TOPIC_REVIEW}{L_COLON} {TOPIC_TITLE}  	</h3>  	<div id="topicreview">  		<!-- BEGIN postrow -->  		<div class="post <!-- IF postrow.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> -			<div class="inner"><span class="corners-top"><span></span></span> +			<div class="inner">  			<div class="postbody" id="pr{postrow.POST_ID}"> -				<ul class="profile-icons"><li class="info-icon"><a href="{postrow.U_POST_DETAILS}" title="{L_POST_DETAILS}"><span>{L_POST_DETAILS}</span></a></li><li><label for="post_id_list_select_{postrow.POST_ID}">{L_SELECT}: <input type="checkbox" id="post_id_list_select_{postrow.POST_ID}" name="post_id_list[]" value="{postrow.POST_ID}"<!-- IF postrow.S_CHECKED --> checked="checked"<!-- ENDIF --> /></label></li></ul> +				<ul class="post-buttons"> +					<li> +						<a href="{postrow.U_POST_DETAILS}" title="{L_POST_DETAILS}" class="button icon-button info-icon"> +							<span>{L_POST_DETAILS}</span> +						</a> +					</li> +					<li> +						<label for="post_id_list_select_{postrow.POST_ID}">{L_SELECT}{L_COLON} +							<input type="checkbox" id="post_id_list_select_{postrow.POST_ID}" name="post_id_list[]" value="{postrow.POST_ID}"<!-- IF postrow.S_CHECKED --> checked="checked"<!-- ENDIF --> /> +						</label> +					</li> +				</ul>  				<h3><a href="{postrow.U_POST_DETAILS}">{postrow.POST_SUBJECT}</a></h3>  				<p class="author"><a href="#pr{postrow.POST_ID}">{postrow.MINI_POST_IMG}</a> {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong><!-- IF postrow.U_MCP_DETAILS --> [ <a href="{postrow.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --></p> -				<!-- IF postrow.S_POST_UNAPPROVED or postrow.S_POST_REPORTED --> -				<p class="rules"> -					<!-- IF postrow.S_POST_UNAPPROVED -->{UNAPPROVED_IMG} <a href="{postrow.U_MCP_APPROVE}"><strong>{L_POST_UNAPPROVED}</strong></a><br /><!-- ENDIF --> -					<!-- IF postrow.S_POST_REPORTED -->{REPORTED_IMG} <a href="{postrow.U_MCP_REPORT}"><strong>{L_POST_REPORTED}</strong></a><!-- ENDIF --> +				<!-- IF postrow.S_POST_UNAPPROVED --> +				<p class="post-notice unapproved"> +					<a href="{postrow.U_MCP_APPROVE}"><strong>{L_POST_UNAPPROVED}</strong></a> +				</p> +				<!-- ENDIF --> + +				<!-- IF postrow.S_POST_DELETED --> +				<p class="post-notice deleted"> +					<a href="{postrow.U_MCP_APPROVE}"><strong>{L_POST_DELETED}</strong></a> +				</p> +				<!-- ENDIF --> + +				<!-- IF postrow.S_POST_REPORTED --> +				<p class="post-notice reported"> +					<a href="{postrow.U_MCP_REPORT}"><strong>{L_POST_REPORTED}</strong></a>  				</p>  				<!-- ENDIF --> @@ -133,23 +143,25 @@ onload_functions.push('subPanels()');  			</div> -			<span class="corners-bottom"><span></span></span></div> +			</div>  		</div>  		<!-- END postrow -->  	</div>  	<hr /> -	<!-- IF PAGINATION or TOTAL_POSTS --> -	<ul class="linklist"> -		<li class="rightside pagination"> -			<!-- IF TOTAL_POSTS --> {TOTAL_POSTS}<!-- ENDIF --> -			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> -		</li> -	</ul> -	<!-- ENDIF --> +	<div class="action-bar bottom"> +		<div class="pagination"> +			{TOTAL_POSTS} +			<!-- IF .pagination -->  +				<!-- INCLUDE pagination.html --> +			<!-- ELSE -->  +				 • {PAGE_NUMBER} +			<!-- ENDIF --> +		</div> +	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <fieldset class="display-actions"> @@ -158,6 +170,7 @@ onload_functions.push('subPanels()');  		<!-- IF S_CAN_APPROVE --><option value="approve">{L_APPROVE_POSTS}</option><!-- ENDIF -->  		<!-- IF S_CAN_LOCK --><option value="lock_post">{L_LOCK_POST_POSTS} [ {L_LOCK_POST_EXPLAIN} ]</option><option value="unlock_post">{L_UNLOCK_POST_POSTS}</option><!-- ENDIF -->  		<!-- IF S_CAN_DELETE --><option value="delete_post">{L_DELETE_POSTS}</option><!-- ENDIF --> +		<!-- IF S_CAN_RESTORE --><option value="restore">{L_RESTORE_POSTS}</option><!-- ENDIF -->  		<!-- IF S_CAN_MERGE --><option value="merge_posts"<!-- IF S_MERGE_VIEW --> selected="selected"<!-- ENDIF -->>{L_MERGE_POSTS}</option><!-- ENDIF -->  		<!-- IF S_CAN_SPLIT --><option value="split_all"<!-- IF S_SPLIT_VIEW --> selected="selected"<!-- ENDIF -->>{L_SPLIT_POSTS}</option><option value="split_beyond">{L_SPLIT_AFTER}</option><!-- ENDIF -->  		<!-- IF S_CAN_SYNC --><option value="resync">{L_RESYNC}</option><!-- ENDIF --> @@ -170,4 +183,4 @@ onload_functions.push('subPanels()');  </form> -<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file +<!-- INCLUDE mcp_footer.html --> diff --git a/phpBB/styles/prosilver/template/mcp_viewlogs.html b/phpBB/styles/prosilver/template/mcp_viewlogs.html deleted file mode 100644 index 264152d3ae..0000000000 --- a/phpBB/styles/prosilver/template/mcp_viewlogs.html +++ /dev/null @@ -1,53 +0,0 @@ -<!-- INCLUDE mcp_header.html --> - -<form method="post" id="mcp" action="{S_MCP_ACTION}"> - -<table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0"> -<tr> -	<th colspan="<!-- IF S_TOPIC_ID -->4<!-- ELSE -->5<!-- ENDIF -->" height="28" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th> -</tr> -<tr> -	<td colspan="<!-- IF S_TOPIC_ID -->4<!-- ELSE -->5<!-- ENDIF -->" class="cat" height="28" align="center"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td> -</tr> -<tr> -	<th width="15%" height="28" nowrap="nowrap">{L_USERNAME}</th> -	<th width="12%" nowrap="nowrap">{L_IP}</th> -	<th width="18%" nowrap="nowrap">{L_TIME}</th> -	<th width="45%" nowrap="nowrap">{L_ACTION}</th> -	<!-- IF not S_TOPIC_ID --><th width="8%" nowrap="nowrap"></th><!-- ENDIF --> -</tr> -<!-- IF S_TOPIC_ID --> -	<tr> -		<td class="bg3" colspan="5"><span class="gensmall">{L_LOGS_CURRENT_TOPIC} <a href="{U_VIEW_TOPIC}"><strong>{TOPIC_NAME}</strong></a></td> -	</tr> -<!-- ENDIF --> - -<!-- BEGIN log --> -<tr> -	<td class="bg1" nowrap="nowrap"><span class="gen">{log.USERNAME}</span></td> -	<td class="bg1" align="center" nowrap="nowrap"><span class="gen">{log.IP}</span></td> -	<td class="bg1" align="center" nowrap="nowrap"><span class="gensmall">{log.TIME}</span></td> -	<td class="bg1"><span class="gen">{log.ACTION}</span></td> -	<!-- IF not S_TOPIC_ID --> -		<td class="bg1" align="center" nowrap="nowrap"><span class="gensmall"><!-- IF log.U_VIEW_TOPIC --><a href="{log.U_VIEW_TOPIC}">{L_VIEW_TOPIC}</a><!-- IF log.U_VIEWLOGS --> | <!-- ENDIF --><!-- ENDIF --><!-- IF log.U_VIEWLOGS --><a href="{log.U_VIEWLOGS}">{L_VIEW_TOPIC_LOGS}</a><!-- ENDIF --></span></td> -	<!-- ENDIF --> -</tr> -<!-- BEGINELSE --> -	<tr> -		<td class="bg1" colspan="<!-- IF S_TOPIC_ID -->4<!-- ELSE -->5<!-- ENDIF -->" align="center"><span class="gen">{L_NO_ENTRIES}</span></td> -	</tr> -<!-- END log --> -<div> -	{S_FORM_TOKEN} -</div> -</table> -</form> - -<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> -<tr> -	<td class="nav" align="left" valign="middle">{PAGE_NUMBER}</td> -	<td align="right" valign="top" nowrap="nowrap"><!-- IF PAGINATION --><strong><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a>  <!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE -->  <a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></strong><!-- ENDIF --></td> -</tr> -</table> - -<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_warn_front.html b/phpBB/styles/prosilver/template/mcp_warn_front.html index fc8fa37fab..668a0d81a8 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_front.html +++ b/phpBB/styles/prosilver/template/mcp_warn_front.html @@ -5,19 +5,19 @@  <h2>{L_WARN_USER}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<h3>{L_SELECT_USER}</h3>  	<fieldset>  	<dl> -		<dt><label for="username">{L_SELECT_USER}:</label></dt> +		<dt><label for="username">{L_SELECT_USER}{L_COLON}</label></dt>  		<dd><input name="username" id="username" type="text" class="inputbox" /></dd>  		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>  	</dl>  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <fieldset class="submit-buttons"> @@ -28,12 +28,12 @@  </form>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<h3>{L_MOST_WARNINGS}</h3>  	<!-- IF .highest --> -		<table class="table1" cellspacing="0"> +		<table class="table1">  		<thead>  			<tr>  				<th class="name">{L_USERNAME}</th> @@ -51,23 +51,23 @@  				<td>{highest.WARNING_TIME}</td>  				<td><a href="{highest.U_NOTES}">{L_VIEW_NOTES}</a></td>  			</tr> -		<!-- END latest --> +		<!-- END highest -->  		</tbody>  		</table>  	<!-- ELSE --> -		<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p> +		<p><strong>{L_NO_WARNINGS}</strong></p>  	<!-- ENDIF --> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<h3>{L_LATEST_WARNINGS}</h3>  	<!-- IF .latest --> -		<table class="table1" cellspacing="0"> +		<table class="table1">  		<thead>  			<tr>  				<th class="name">{L_USERNAME}</th> @@ -88,10 +88,10 @@  		</tbody>  		</table>  	<!-- ELSE --> -		<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p> +		<p><strong>{L_NO_WARNINGS}</strong></p>  	<!-- ENDIF --> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div> -<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file +<!-- INCLUDE mcp_footer.html --> diff --git a/phpBB/styles/prosilver/template/mcp_warn_list.html b/phpBB/styles/prosilver/template/mcp_warn_list.html index 3da7c4c389..d0e80a1479 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_list.html +++ b/phpBB/styles/prosilver/template/mcp_warn_list.html @@ -5,19 +5,23 @@  <h2>{L_WARNED_USERS}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<p>{L_WARNED_USERS_EXPLAIN}</p>  	<!-- IF .user --> -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL_USERS -->{TOTAL_USERS} <!-- ENDIF --> -				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> -			</li> -		</ul> -		 -		<table class="table1" cellspacing="0"> +		<div class="action-bar top"> +			<div class="pagination"> +				{TOTAL_USERS} +				<!-- IF .pagination -->  +					<!-- INCLUDE pagination.html --> +				<!-- ELSE -->  +					 • {PAGE_NUMBER} +				<!-- ENDIF --> +			</div> +		</div> + +		<table class="table1">  		<thead>  			<tr>  				<th class="name">{L_USERNAME}</th> @@ -40,27 +44,33 @@  		</table>  		<fieldset class="display-options"> -			<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label> +			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>  			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>  			<input type="submit" name="sort" value="{L_GO}" class="button2" />  		</fieldset> +  		<hr /> -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL_USERS -->{TOTAL_USERS} <!-- ENDIF --> -				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> -			</li> -		</ul> +		<div class="action-bar bottom"> +			<div class="pagination"> +				{TOTAL_USERS} +				<!-- IF .pagination -->  +					<!-- INCLUDE pagination.html --> +				<!-- ELSE -->  +					 • {PAGE_NUMBER} +				<!-- ENDIF --> +			</div> +		</div> +  	<!-- ELSE --> -		<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p> +		<p><strong>{L_NO_WARNINGS}</strong></p>  	<!-- ENDIF --> -	<span class="corners-bottom"><span></span></span></div> +	</div>  {S_FORM_TOKEN}  </div>  </form> -<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file +<!-- INCLUDE mcp_footer.html --> diff --git a/phpBB/styles/prosilver/template/mcp_warn_post.html b/phpBB/styles/prosilver/template/mcp_warn_post.html index d09209f5a4..59c7d0d495 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_post.html +++ b/phpBB/styles/prosilver/template/mcp_warn_post.html @@ -5,7 +5,7 @@  <h2>{L_MCP_WARN_POST}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<h3><!-- IF USER_COLOR --><span style="color: #{USER_COLOR}">{USERNAME}</span><!-- ELSE -->{USERNAME}<!-- ENDIF --></h3> @@ -16,20 +16,20 @@  		<div class="column2">  			<dl class="details"> -				<!-- IF RANK_TITLE --><dt>{L_RANK}:</dt><dd>{RANK_TITLE}</dd><!-- ENDIF --> -				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE --> <!-- ELSE -->{L_RANK}:<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF --> -				<dt>{L_JOINED}:</dt><dd>{JOINED}</dd> -				<dt>{L_TOTAL_POSTS}:</dt><dd>{POSTS}</dd> -				<dt>{L_WARNINGS}: </dt><dd>{WARNINGS}</dd> +				<!-- IF RANK_TITLE --><dt>{L_RANK}{L_COLON}</dt><dd>{RANK_TITLE}</dd><!-- ENDIF --> +				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE --> <!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF --> +				<dt>{L_JOINED}{L_COLON}</dt><dd>{JOINED}</dd> +				<dt>{L_TOTAL_POSTS}{L_COLON}</dt><dd>{POSTS}</dd> +				<dt>{L_WARNINGS}{L_COLON} </dt><dd>{WARNINGS}</dd>  			</dl>  		</div>  	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<h3>{L_POST_DETAILS}</h3> @@ -41,11 +41,13 @@  	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div> +<!-- EVENT mcp_warn_post_add_warning_field_before --> +  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<h3>{L_ADD_WARNING}</h3>  	<p>{L_ADD_WARNING_EXPLAIN}</p> @@ -61,9 +63,11 @@  		<!-- ENDIF -->  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div> +<!-- EVENT mcp_warn_post_add_warning_field_after --> +  <fieldset class="submit-buttons">  	<input type="reset" value="{L_RESET}" name="reset" class="button2" />    	<input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1" /> @@ -71,4 +75,4 @@  </fieldset>  </form> -<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file +<!-- INCLUDE mcp_footer.html --> diff --git a/phpBB/styles/prosilver/template/mcp_warn_user.html b/phpBB/styles/prosilver/template/mcp_warn_user.html index dfc167399f..1ad6df7ade 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_user.html +++ b/phpBB/styles/prosilver/template/mcp_warn_user.html @@ -5,7 +5,7 @@  <h2>{L_WARN_USER}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<h3>{USERNAME_FULL}</h3> @@ -16,20 +16,22 @@  		<div class="column2">  			<dl class="details"> -				<!-- IF RANK_TITLE --><dt>{L_RANK}:</dt><dd>{RANK_TITLE}</dd><!-- ENDIF --> -				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE --> <!-- ELSE -->{L_RANK}:<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF --> -				<dt>{L_JOINED}:</dt><dd>{JOINED}</dd> -				<dt>{L_TOTAL_POSTS}:</dt><dd>{POSTS}</dd> -				<dt>{L_WARNINGS}: </dt><dd>{WARNINGS}</dd> +				<!-- IF RANK_TITLE --><dt>{L_RANK}{L_COLON}</dt><dd>{RANK_TITLE}</dd><!-- ENDIF --> +				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE --> <!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF --> +				<dt>{L_JOINED}{L_COLON}</dt><dd>{JOINED}</dd> +				<dt>{L_TOTAL_POSTS}{L_COLON}</dt><dd>{POSTS}</dd> +				<dt>{L_WARNINGS}{L_COLON} </dt><dd>{WARNINGS}</dd>  			</dl>  		</div>  	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div> +<!-- EVENT mcp_warn_user_add_warning_field_before --> +  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<h3>{L_ADD_WARNING}</h3>  	<p>{L_ADD_WARNING_EXPLAIN}</p> @@ -45,9 +47,11 @@  		<!-- ENDIF -->  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div> +<!-- EVENT mcp_warn_user_add_warning_field_after --> +  <fieldset class="submit-buttons">  	<input type="reset" value="{L_RESET}" name="reset" class="button2" />    	<input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1" /> @@ -55,4 +59,4 @@  </fieldset>  </form> -<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file +<!-- INCLUDE mcp_footer.html --> diff --git a/phpBB/styles/prosilver/template/mcp_whois.html b/phpBB/styles/prosilver/template/mcp_whois.html index 5872bd0b91..41a825458d 100644 --- a/phpBB/styles/prosilver/template/mcp_whois.html +++ b/phpBB/styles/prosilver/template/mcp_whois.html @@ -2,15 +2,15 @@  <h2>{L_WHOIS}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner"> -		<p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_RETURN_POST}">{L_RETURN_POST}</a></p> +		<p><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_RETURN_POST}">{L_RETURN_POST}</a></p>  		<div class="postbody"><div class="content">  			<pre>{WHOIS}</pre>  		</div></div> -		<p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_RETURN_POST}">{L_RETURN_POST}</a></p> +		<p><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_RETURN_POST}">{L_RETURN_POST}</a></p> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div> -<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file +<!-- INCLUDE mcp_footer.html --> diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html index 5ea774bf06..512df7b0a7 100644 --- a/phpBB/styles/prosilver/template/memberlist_body.html +++ b/phpBB/styles/prosilver/template/memberlist_body.html @@ -1,64 +1,59 @@  <!-- IF S_IN_SEARCH_POPUP -->  	<!-- INCLUDE simple_header.html -->  	<!-- INCLUDE memberlist_search.html --> -	<form method="post" id="results" action="{S_MODE_ACTION}" onsubmit="insert_marked(this.user); return false"> - -<!-- ELSEIF S_SEARCH_USER --> -	<!-- INCLUDE overall_header.html -->	 -	<!-- INCLUDE memberlist_search.html --> -	<form method="post" action="{S_MODE_ACTION}"> +	<form method="post" id="results" action="{S_MODE_ACTION}" onsubmit="insert_marked_users('#results', this.user); return false;" data-form-name="{S_FORM_NAME}" data-field-name="{S_FIELD_NAME}">  <!-- ELSE -->  	<!-- INCLUDE overall_header.html --> +	<div class="panel" id="memberlist_search"<!-- IF not S_SEARCH_USER --> style="display: none;"<!-- ENDIF -->> +	<!-- INCLUDE memberlist_search.html --> +	</div>  	<form method="post" action="{S_MODE_ACTION}">  <!-- ENDIF -->  	<!-- IF S_SHOW_GROUP --> - -		<h2<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR};"<!-- ENDIF -->>{GROUP_NAME}</h2> +		<h2 class="group-title"<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR};"<!-- ENDIF -->>{GROUP_NAME}</h2>  		<p>{GROUP_DESC} {GROUP_TYPE}</p>  		<p>  			<!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ENDIF -->  			<!-- IF RANK_IMG -->{RANK_IMG}<!-- ENDIF -->  			<!-- IF GROUP_RANK -->{GROUP_RANK}<!-- ENDIF -->  		</p> -  	<!-- ELSE --> -		<h2 class="solo">{PAGE_TITLE}<!-- IF SEARCH_WORDS -->: <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2> - -		<div class="panel"> -			<div class="inner"><span class="corners-top"><span></span></span> +		<h2 class="solo">{PAGE_TITLE}<!-- IF SEARCH_WORDS -->{L_COLON} <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2> -			<ul class="linklist"> -				<li> - -				<!-- IF U_FIND_MEMBER and not S_SEARCH_USER --><a href="{U_FIND_MEMBER}">{L_FIND_USERNAME}</a> • <!-- ELSEIF S_SEARCH_USER and U_HIDE_FIND_MEMBER and not S_IN_SEARCH_POPUP --><a href="{U_HIDE_FIND_MEMBER}">{L_HIDE_MEMBER_SEARCH}</a> • <!-- ENDIF --> -				<strong style="font-size: 0.95em;"> +		<div class="action-bar top"> +			<div class="member-search panel"> +				<!-- IF U_FIND_MEMBER and not S_SEARCH_USER --><a href="{U_FIND_MEMBER}" id="member_search" data-alt-text="{LA_HIDE_MEMBER_SEARCH}">{L_FIND_USERNAME}</a> • <!-- ELSEIF S_SEARCH_USER and U_HIDE_FIND_MEMBER and not S_IN_SEARCH_POPUP --><a href="{U_HIDE_FIND_MEMBER}" id="member_search" data-alt-text="{LA_FIND_USERNAME}">{L_HIDE_MEMBER_SEARCH}</a> • <!-- ENDIF --> +				<strong>  				<!-- BEGIN first_char --> -					<a href="{first_char.U_SORT}">{first_char.DESC}</a>   +					<a href="{first_char.U_SORT}">{first_char.DESC}</a>   				<!-- END first_char -->  				</strong> -				</li> -				<li class="rightside pagination"> -					{TOTAL_USERS} •  -					<!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE -->{PAGE_NUMBER}<!-- ENDIF --> -				</li> -			</ul> - -			<span class="corners-bottom"><span></span></span></div> +			</div> +		 +			<div class="pagination"> +				{TOTAL_USERS} +				<!-- IF .pagination -->  +					<!-- INCLUDE pagination.html --> +				<!-- ELSE -->  +					 • {PAGE_NUMBER} +				<!-- ENDIF --> +			</div>  		</div>  	<!-- ENDIF --> +  	<!-- IF S_LEADERS_SET or not S_SHOW_GROUP or not .memberrow -->  	<div class="forumbg forumbg-table"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner"> -		<table class="table1" cellspacing="1" id="memberlist"> +		<table class="table1" id="memberlist">  		<thead>  		<tr> -			<th class="name"><span class="rank-img"><a href="{U_SORT_RANK}">{L_RANK}</a></span><a href="{U_SORT_USERNAME}"><!-- IF S_SHOW_GROUP and .memberrow -->{L_GROUP_LEADER}<!-- ELSE -->{L_USERNAME}<!-- ENDIF --></a></th> +			<th class="name" data-dfn="{L_RANK}{L_COMMA_SEPARATOR}<!-- IF S_SHOW_GROUP and .memberrow -->{L_GROUP_LEADER}<!-- ELSE -->{L_USERNAME}<!-- ENDIF -->"><span class="rank-img"><a href="{U_SORT_RANK}">{L_RANK}</a></span><a href="{U_SORT_USERNAME}"><!-- IF S_SHOW_GROUP and .memberrow -->{L_GROUP_LEADER}<!-- ELSE -->{L_USERNAME}<!-- ENDIF --></a></th>  			<th class="posts"><a href="{U_SORT_POSTS}#memberlist">{L_POSTS}</a></th> -			<th class="info"><a href="{U_SORT_WEBSITE}#memberlist">{L_WEBSITE}</a>{L_COMMA_SEPARATOR}<a href="{U_SORT_LOCATION}">{L_LOCATION}</a></th> +			<th class="info"><!-- BEGIN custom_fields --><!-- IF not custom_fields.S_FIRST_ROW -->{L_COMMA_SEPARATOR} <!-- ENDIF -->{custom_fields.PROFILE_FIELD_NAME}<!-- END custom_fields --></th>  			<th class="joined"><a href="{U_SORT_JOINED}#memberlist">{L_JOINED}</a></th>  			<!-- IF U_SORT_ACTIVE --><th class="active"><a href="{U_SORT_ACTIVE}#memberlist">{L_LAST_ACTIVE}</a></th><!-- ENDIF -->  		</tr> @@ -77,27 +72,27 @@  		</tbody>  		</table> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- ENDIF -->  <div class="forumbg forumbg-table"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner"> -	<table class="table1" cellspacing="1"> +	<table class="table1">  	<thead>  	<tr>  	<!-- IF not S_LEADERS_SET --> -		<th class="name"><span class="rank-img"><a href="{U_SORT_RANK}">{L_RANK}</a></span><a href="{U_SORT_USERNAME}"><!-- IF S_SHOW_GROUP -->{L_GROUP_MEMBERS}<!-- ELSE -->{L_USERNAME}<!-- ENDIF --></a></th> +		<th class="name" data-dfn="{L_RANK}{L_COMMA_SEPARATOR}{L_USERNAME}"><span class="rank-img"><a href="{U_SORT_RANK}">{L_RANK}</a></span><a href="{U_SORT_USERNAME}"><!-- IF S_SHOW_GROUP -->{L_GROUP_MEMBERS}<!-- ELSE -->{L_USERNAME}<!-- ENDIF --></a></th>  			<th class="posts"><a href="{U_SORT_POSTS}#memberlist">{L_POSTS}</a></th> -			<th class="info"><a href="{U_SORT_WEBSITE}#memberlist">{L_WEBSITE}</a>{L_COMMA_SEPARATOR}<a href="{U_SORT_LOCATION}">{L_LOCATION}</a></th> +			<th class="info"><!-- BEGIN custom_fields --><!-- IF not custom_fields.S_FIRST_ROW -->{L_COMMA_SEPARATOR} <!-- ENDIF -->{custom_fields.PROFILE_FIELD_NAME}<!-- END custom_fields --></th>  			<th class="joined"><a href="{U_SORT_JOINED}#memberlist">{L_JOINED}</a></th>  			<!-- IF U_SORT_ACTIVE --><th class="active"><a href="{U_SORT_ACTIVE}#memberlist">{L_LAST_ACTIVE}</a></th><!-- ENDIF -->  	<!-- ELSEIF S_SHOW_GROUP -->  		<th class="name">{L_GROUP_MEMBERS}</th> -		<th class="posts"> </th> -		<th class="info"> </th> -		<th class="joined"> </th> -		<!-- IF U_SORT_ACTIVE --><th class="active"> </th><!-- ENDIF --> +		<th class="posts">{L_POSTS}</th> +		<th class="info"><!-- BEGIN custom_fields --><!-- IF not custom_fields.S_FIRST_ROW -->{L_COMMA_SEPARATOR} <!-- ENDIF -->{custom_fields.PROFILE_FIELD_NAME}<!-- END custom_fields --></th> +		<th class="joined">{L_JOINED}</th> +		<!-- IF U_SORT_ACTIVE --><th class="active">{L_LAST_ACTIVE}</th><!-- ENDIF -->  	<!-- ENDIF -->  	</tr>  	</thead> @@ -107,11 +102,11 @@  			<!-- ENDIF -->  	<tr class="<!-- IF memberrow.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> -		<td><!-- IF memberrow.RANK_IMG --><span class="rank-img">{memberrow.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{memberrow.RANK_TITLE}</span><!-- ENDIF --><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input type="checkbox" name="user" value="{memberrow.USERNAME}" /> <!-- ENDIF -->{memberrow.USERNAME_FULL}<!-- IF S_SELECT_SINGLE --><br />[ <a href="#" onclick="insert_single('{memberrow.A_USERNAME}'); return false;">{L_SELECT}</a> ]<!-- ENDIF --></td> +		<td><!-- IF memberrow.RANK_IMG --><span class="rank-img">{memberrow.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{memberrow.RANK_TITLE}</span><!-- ENDIF --><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input type="checkbox" name="user" value="{memberrow.USERNAME}" /> <!-- ENDIF --><!-- EVENT memberlist_body_username_prepend -->{memberrow.USERNAME_FULL}<!-- EVENT memberlist_body_username_append --><!-- IF S_IN_SEARCH_POPUP --><br />[ <a href="#" onclick="insert_single_user('#results', '{memberrow.A_USERNAME}'); return false;">{L_SELECT}</a> ]<!-- ENDIF --></td>  		<td class="posts"><!-- IF memberrow.POSTS and S_DISPLAY_SEARCH --><a href="{memberrow.U_SEARCH_USER}" title="{L_SEARCH_USER_POSTS}">{memberrow.POSTS}</a><!-- ELSE -->{memberrow.POSTS}<!-- ENDIF --></td> -		<td class="info"><!-- IF memberrow.U_WWW or memberrow.LOCATION --><!-- IF memberrow.U_WWW --><div><a href="{memberrow.U_WWW}" title="{L_VISIT_WEBSITE}: {memberrow.U_WWW}">{memberrow.U_SHORT_WWW}</a></div><!-- ENDIF --><!-- IF memberrow.LOCATION --><div>{memberrow.LOCATION}</div><!-- ENDIF --><!-- ELSE --> <!-- ENDIF --></td> +		<td class="info"><!-- BEGIN custom_fields --><div>{memberrow.custom_fields.PROFILE_FIELD_VALUE}</div><!-- BEGINELSE --> <!-- END custom_fields --></td>  		<td>{memberrow.JOINED}</td> -		<!-- IF S_VIEWONLINE --><td>{memberrow.VISITED} </td><!-- ENDIF --> +		<!-- IF S_VIEWONLINE --><td>{memberrow.LAST_ACTIVE} </td><!-- ENDIF -->  	</tr>  		<!-- BEGINELSE -->  	<tr class="bg1"> @@ -121,7 +116,7 @@  	</tbody>  	</table> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --> @@ -138,24 +133,28 @@  <!-- IF S_IN_SEARCH_POPUP and not S_SEARCH_USER -->  <fieldset class="display-options"> -	<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -	<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF --> -	<label for="sk">{L_SELECT_SORT_METHOD}: <select name="sk" id="sk">{S_MODE_SELECT}</select></label>  -	<label for="sd">{L_ORDER} <select name="sd" id="sd">{S_ORDER_SELECT}</select> <input type="submit" name="sort" value="{L_SUBMIT}" class="button2" /></label> +	<label for="sk">{L_SELECT_SORT_METHOD}{L_COLON} <select name="sk" id="sk">{S_MODE_SELECT}</select></label> +	<label for="sd">{L_ORDER} <select name="sd" id="sd">{S_ORDER_SELECT}</select></label> +	<input type="submit" name="sort" value="{L_SUBMIT}" class="button2" />  </fieldset>  <!-- ENDIF -->  </form> -<hr /> - -<ul class="linklist"> -	<li class="rightside pagination">{TOTAL_USERS} • <!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE -->{PAGE_NUMBER}<!-- ENDIF --></li> -</ul> +<div class="action-bar bottom"> +	<div class="pagination"> +		{TOTAL_USERS} +		<!-- IF .pagination -->  +			<!-- INCLUDE pagination.html --> +		<!-- ELSE -->  +			 • {PAGE_NUMBER} +		<!-- ENDIF --> +	</div> +</div>  <!-- IF S_IN_SEARCH_POPUP -->  	<!-- INCLUDE simple_footer.html -->  <!-- ELSE -->  	<!-- INCLUDE jumpbox.html -->  	<!-- INCLUDE overall_footer.html --> -<!-- ENDIF -->
\ No newline at end of file +<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/memberlist_email.html b/phpBB/styles/prosilver/template/memberlist_email.html index e8870d8921..e848844093 100644 --- a/phpBB/styles/prosilver/template/memberlist_email.html +++ b/phpBB/styles/prosilver/template/memberlist_email.html @@ -1,65 +1,105 @@  <!-- INCLUDE overall_header.html --> -<h2 class="titlespace">{L_SEND_EMAIL_USER} {USERNAME}</h2> +<!-- IF S_CONTACT_ADMIN--> +<h2 class="titlespace">{L_CONTACT_ADMIN}</h2> +<!-- ELSEIF S_SEND_USER --> +<h2 class="titlespace">{L_SEND_EMAIL_USER}</h2> +<!-- ELSE --> +<h2 class="titlespace">{L_EMAIL_TOPIC}</h2> +<!-- ENDIF -->  <form method="post" action="{S_POST_ACTION}" id="post"> -<div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<!-- IF CONTACT_INFO --> +	<div class="panel"> +		<div class="inner"> +			<div class="postbody"> +				<div class="content"> +					{CONTACT_INFO} +				</div> +			</div> +		</div> +	</div> +		<br class="clear" /> +	<!-- ENDIF --> +	<div class="panel"> +		<div class="inner">  	<div class="content"> +  		<!-- IF ERROR_MESSAGE --><p class="error">{ERROR_MESSAGE}</p><!-- ENDIF -->  		<fieldset class="fields2">  		<!-- IF S_SEND_USER -->  			<dl> +				<dt><label>{L_RECIPIENT}{L_COLON}</label></dt> +				<dd><strong>{USERNAME_FULL}</strong></dd> +			</dl> +			<dl> +				<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt> +				<dd><input class="inputbox autowidth" type="text" name="subject" id="subject" size="50" tabindex="1" value="{SUBJECT}" /></dd> +			</dl> +		<!-- ELSEIF S_CONTACT_ADMIN--> +			<dl>  				<dt><label>{L_RECIPIENT}:</label></dt> -				<dd><strong>{USERNAME}</strong></dd> +				<dd><strong>{L_ADMINISTRATOR}</strong></dd>  			</dl> +			<!-- IF not S_IS_REGISTERED --> +			<dl> +				<dt><label for="email">{L_SENDER_EMAIL_ADDRESS}:</label></dt> +				<dd><input class="inputbox autowidth" type="text" name="email" id="email" size="50" maxlength="100" tabindex="1" value="{EMAIL}" /></dd> +			</dl> +			<dl> +				<dt><label for="name">{L_SENDER_NAME}:</label></dt> +				<dd><input class="inputbox autowidth" type="text" name="name" id="name" size="50" tabindex="2" value="{NAME}" /></dd> +			</dl> +			<!-- ENDIF -->  			<dl>  				<dt><label for="subject">{L_SUBJECT}:</label></dt> -				<dd><input class="inputbox autowidth" type="text" name="subject" id="subject" size="50" tabindex="1" value="{SUBJECT}" /></dd> +				<dd><input class="inputbox autowidth" type="text" name="subject" id="subject" size="50" tabindex="3" value="{SUBJECT}" /></dd>  			</dl>  		<!-- ELSE -->  			<dl> -				<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt> -				<dd><input class="inputbox autowidth" type="text" name="email" id="email" size="50" maxlength="100" tabindex="2" value="{EMAIL}" /></dd> +				<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label></dt> +				<dd><input class="inputbox autowidth" type="email" name="email" id="email" size="50" maxlength="100" tabindex="2" value="{EMAIL}" /></dd>  			</dl>  			<dl> -				<dt><label for="name">{L_REAL_NAME}:</label></dt> +				<dt><label for="name">{L_REAL_NAME}{L_COLON}</label></dt>  				<dd><input class="inputbox autowidth" type="text" name="name" id="name" size="50" tabindex="3" value="{NAME}" /></dd>  			</dl>  			<dl> -				<dt><label for="lang">{L_DEST_LANG}:</label><br /> +				<dt><label for="lang">{L_DEST_LANG}{L_COLON}</label><br />  					<span>{L_DEST_LANG_EXPLAIN}</span></dt>  				<dd><select name="lang">{S_LANG_OPTIONS}</select></dd>  			</dl>  		<!-- ENDIF -->  		<dl> -			<dt><label for="message">{L_MESSAGE_BODY}:</label><br /> +			<dt><label for="message">{L_MESSAGE_BODY}{L_COLON}</label><br />  			<span>{L_EMAIL_BODY_EXPLAIN}</span></dt>  			<dd><textarea class="inputbox" name="message" id="message" rows="15" cols="76" tabindex="4">{MESSAGE}</textarea></dd>  		</dl> +		<!-- IF S_REGISTERED_USER -->  		<dl>  			<dt> </dt>  			<dd><label for="cc_email"><input type="checkbox" name="cc_email" id="cc_email" value="1" checked="checked" tabindex="5" /> {L_CC_EMAIL}</label></dd>  		</dl> +		<!-- ENDIF -->  		</fieldset>  	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<div class="content">  		<fieldset class="submit-buttons">  			<input type="submit" tabindex="6" name="submit" class="button1" value="{L_SEND_EMAIL}" />  		</fieldset>  	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  {S_FORM_TOKEN}  </div>  </form> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html index 49de3b2596..bc71aa0969 100644 --- a/phpBB/styles/prosilver/template/memberlist_im.html +++ b/phpBB/styles/prosilver/template/memberlist_im.html @@ -1,158 +1,46 @@  <!-- INCLUDE simple_header.html --> -<!-- MSNM info from http://www.cdolive.net/ - doesn't seem to work with MSN Messenger --> -<h2 class="solo">{L_SEND_IM}</h2> +<h2>{L_SEND_IM}</h2>  <form method="post" action="{S_IM_ACTION}">  <div class="panel bg2"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<p>{L_SEND_IM_EXPLAIN}</p>  	<fieldset>  	<dl class="fields2"> -		<dt><label>{L_IM_RECIPIENT}:</label></dt> -		<dd><strong>{USERNAME}</strong><!-- IF S_SEND_ICQ or S_SEND_AIM or S_SEND_MSNM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --><!-- IF PRESENCE_IMG --> {PRESENCE_IMG}<!-- ENDIF --></dd> +		<dt><label>{L_IM_RECIPIENT}{L_COLON}</label></dt> +		<dd><strong>{USERNAME}</strong><!-- IF S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --><!-- IF PRESENCE_IMG --> {PRESENCE_IMG}<!-- ENDIF --></dd>  	</dl> -	<!-- IF S_SEND_ICQ --> -		<dl class="fields2"> -			<dt><label for="from">{L_IM_NAME}:</label></dt> -			<dd><input class="inputbox autowidth" type="text" name="from" id="from" size="20" /></dd> -		</dl> -		<dl class="fields2"> -			<dt><label for="body">{L_IM_MESSAGE}:</label></dt> -			<dd><textarea class="inputbox autowidth" name="body" id="body" rows="5" cols="45"></textarea></dd> -		</dl> -		<dl class="fields2"> -			<dt> </dt> -			<dd><input class="button1" name="submit" type="submit" value="{L_IM_SEND}" /></dd> -		</dl> -		<input type="hidden" name="fromemail" value="{EMAIL}" /> -		<input type="hidden" name="subject" value="{SITENAME}" /> -		<input type="hidden" name="to" value="{IM_CONTACT}" /> -	<!-- ENDIF --> - -	<!-- IF S_SEND_AIM --> -		<dl class="fields2"> -			<dt> </dt> -			<dd><a href="{U_AIM_CONTACT}">{L_IM_ADD_CONTACT}</a></dd> -			<dd><a href="{U_AIM_MESSAGE}">{L_IM_SEND_MESSAGE}</a></dd> -			<dd><a href="http://www.aim.com">{L_IM_DOWNLOAD_APP}</a> | <a href="http://www.aim.com/products/express">{L_IM_AIM_EXPRESS}</a></dd> -		</dl> -	<!-- ENDIF --> - -	<!-- IF S_SEND_MSNM --> -		<dl class="fields2"> -			<dt> </dt> -			<dd><object classid="clsid:B69003B3-C55E-4B48-836C-BC5946FC3B28" codetype="application/x-oleobject" id="objMessengerApp" width="0" height="0"></object></dd> -			<dd><a href="#" onclick="add_contact('{A_IM_CONTACT}'); return false;">{L_IM_ADD_CONTACT}</a></dd> -			<dd><a href="#" onclick="im_contact('{A_IM_CONTACT}'); return false;">{L_IM_SEND_MESSAGE}</a></dd> -		</dl> -	<!-- ENDIF --> -  	<!-- IF S_SEND_JABBER -->  		<dl class="fields2"> -			<dt><label for="message">{L_IM_MESSAGE}:</label></dt> +			<dt><label for="message">{L_IM_MESSAGE}{L_COLON}</label></dt>  			<dd><textarea class="inputbox autowidth" name="message" id="message" rows="5" cols="45"></textarea></dd>  		</dl>  		<dl class="fields2">  			<dt> </dt>  			<dd><input class="button1" name="submit" type="submit" value="{L_IM_SEND}" /></dd>  		</dl> -	<!-- ENDIF --> - -	<!-- IF S_NO_SEND_JABBER -->  		<dl class="fields2">  			<dt> </dt> -			<dd>{L_IM_NO_JABBER}</dd> +			<dd>{L_IM_SENT_JABBER}</dd>  		</dl> -	<!-- ENDIF --> - -	<!-- IF S_SENT_JABBER --> +	<!-- ELSE IF S_NO_SEND_JABBER -->  		<dl class="fields2">  			<dt> </dt> -			<dd>{L_IM_SENT_JABBER}</dd> +			<dd>{L_IM_NO_JABBER}</dd>  		</dl>  	<!-- ENDIF -->  	{S_FORM_TOKEN}  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  </form>  <a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a> -<script type="text/javascript"> -// <![CDATA[ - -	/** The following will not work with Windows Vista **/ - -	var app = document.getElementById('objMessengerApp'); - -	/** -	* Check whether the browser supports this and whether MSNM is connected -	*/ -	function msn_supported() -	{ -		// Does the browser support the MSNM object? -		if (app.MyStatus) -		{ -			// Is MSNM connected? -			if (app.MyStatus == 1) -			{ -				alert('{LA_IM_MSNM_CONNECT}'); -				return false; -			} -		} -		else -		{ -			alert('{LA_IM_MSNM_BROWSER}'); -			return false; -		} -		return true; -	} - -	/** -	* Add to your contact list -	*/ -	function add_contact(address)  -	{ -		if (msn_supported())  -		{ -			// Could return an error while MSNM is connecting, don't want that -			try -			{ -				app.AddContact(0, address); -			} -			catch (e) -			{ -				return; -			} -	} -} - -/** -* Write IM to contact -*/ -function im_contact(address) -{ -	if (msn_supported()) -	{ -		// Could return an error while MSNM is connecting, don't want that -		try -		{ -			app.InstantMessage(address); -		} -		catch (e) -		{ -			return; -		} -	} -} -// ]]> -</script> - -<!-- INCLUDE simple_footer.html -->
\ No newline at end of file +<!-- INCLUDE simple_footer.html --> diff --git a/phpBB/styles/prosilver/template/memberlist_leaders.html b/phpBB/styles/prosilver/template/memberlist_leaders.html deleted file mode 100644 index 26e299d261..0000000000 --- a/phpBB/styles/prosilver/template/memberlist_leaders.html +++ /dev/null @@ -1,76 +0,0 @@ -<!-- INCLUDE overall_header.html --> - -<h2 class="solo">{PAGE_TITLE}</h2> - -<form method="post" action="{S_MODE_ACTION}"> - -<div class="forumbg forumbg-table"> -	<div class="inner"><span class="corners-top"><span></span></span> - -	<table class="table1" cellspacing="1"> -	<thead> -	<tr> -		<th class="name"><span class="rank-img">{L_RANK} </span>{L_ADMINISTRATORS}</th> -		<th class="info">{L_PRIMARY_GROUP}</th> -		<th class="info">{L_FORUMS}</th> -	</tr> -	</thead> -	<tbody> -<!-- BEGIN admin --> -	<tr class="<!-- IF admin.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> -		<td><!-- IF admin.RANK_IMG --><span class="rank-img">{admin.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{admin.RANK_TITLE}</span><!-- ENDIF -->{admin.USERNAME_FULL}</td> -		<td class="info"><!-- IF admin.U_GROUP --> -			<a<!-- IF admin.GROUP_COLOR --> style="font-weight: bold; color:#{admin.GROUP_COLOR}"<!-- ENDIF --> href="{admin.U_GROUP}">{admin.GROUP_NAME}</a> -			<!-- ELSE --> -				{admin.GROUP_NAME} -			<!-- ENDIF --></td> -		<td class="info">-</td> -	</tr> -<!-- BEGINELSE --> -	<tr class="bg1"> -		<td colspan="3"><strong>{L_NO_ADMINISTRATORS}</strong></td> -	</tr> -<!-- END admin --> -	</tbody> -	</table> -	 -	<span class="corners-bottom"><span></span></span></div> -</div> - -<div class="forumbg forumbg-table"> -	<div class="inner"><span class="corners-top"><span></span></span> -	  -	<table class="table1" cellspacing="1"> -	<thead> -	<tr> -		<th class="name">{L_MODERATORS}</th> -		<th class="info"> </th> -		<th class="info"> </th> -	</tr> -	</thead> -	<tbody> -<!-- BEGIN mod --> -	<tr class="<!-- IF mod.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> -		<td><!-- IF mod.RANK_IMG --><span class="rank-img">{mod.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{mod.RANK_TITLE}</span><!-- ENDIF -->{mod.USERNAME_FULL}</td> -		<td class="info"><!-- IF mod.U_GROUP --> -			<a<!-- IF mod.GROUP_COLOR --> style="font-weight: bold; color:#{mod.GROUP_COLOR}"<!-- ENDIF --> href="{mod.U_GROUP}">{mod.GROUP_NAME}</a> -			<!-- ELSE --> -				{mod.GROUP_NAME} -			<!-- ENDIF --></td> -		<td class="info"><!-- IF not mod.FORUMS -->{L_ALL_FORUMS}<!-- ELSE --><select style="width: 100%;">{mod.FORUMS}</select><!-- ENDIF --></td> -	</tr> -<!-- BEGINELSE --> -	<tr class="bg1"> -		<td colspan="3"><strong>{L_NO_MODERATORS}</strong></td> -	</tr> -<!-- END mod --> -	</tbody> -	</table> -	 -	<span class="corners-bottom"><span></span></span></div> -</div> -	 -</form> - -<!-- INCLUDE jumpbox.html --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html index e6a4bfba97..4fba966151 100644 --- a/phpBB/styles/prosilver/template/memberlist_search.html +++ b/phpBB/styles/prosilver/template/memberlist_search.html @@ -1,115 +1,71 @@ -<!-- IF S_IN_SEARCH_POPUP --> -<!-- You should retain this javascript in your own template! --> -<script type="text/javascript"> -// <![CDATA[ -function insert_user(user) -{ -	opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value = ( opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value.length && opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.type == "textarea" ) ? opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value + "\n" + user : user; -} - -function insert_marked(users) -{ -	if (typeof(users.length) == "undefined") -	{ -		if (users.checked) -		{ -			insert_user(users.value); -		} -	} -	else if (users.length > 0) -	{ -		for (i = 0; i < users.length; i++) -		{ -			if (users[i].checked) -			{ -				insert_user(users[i].value); -			} -		} -	} - -	self.close(); -} - -function insert_single(user) -{ -	opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value = user; -	self.close(); -} -// ]]> -</script> -<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js"></script> -<!-- ENDIF --> -  <h2 class="solo">{L_FIND_USERNAME}</h2>  <form method="post" action="{S_MODE_ACTION}" id="search_memberlist">  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<p>{L_FIND_USERNAME_EXPLAIN}</p>  	<fieldset class="fields1 column1"> -	<dl> -		<dt><label for="username">{L_USERNAME}:</label></dt> -		<dd><input type="text" name="username" id="username" value="{USERNAME}" class="inputbox" /></dd> +	<dl style="overflow: visible;"> +		<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt> +		<dd> +			<!-- IF U_LIVE_SEARCH --><div class="dropdown-container dropdown-{S_CONTENT_FLOW_END}"><!-- ENDIF --> +			<input type="text" name="username" id="username" value="{USERNAME}" class="inputbox"<!-- IF U_LIVE_SEARCH --> autocomplete="off" data-filter="phpbb.search.filter" data-ajax="member_search" data-min-length="3" data-url="{U_LIVE_SEARCH}" data-results="#user-search" data-overlay="false"<!-- ENDIF --> /> +			<!-- IF U_LIVE_SEARCH --> +				<div class="dropdown live-search hidden" id="user-search"> +					<div class="pointer"><div class="pointer-inner"></div></div> +					<ul class="dropdown-contents search-results"> +						<li class="search-result-tpl"><span class="search-result"></span></li> +					</ul> +				</div> +			</div> +			<!-- ENDIF --> +		</dd>  	</dl>  <!-- IF S_EMAIL_SEARCH_ALLOWED -->  	<dl> -		<dt><label for="email">{L_EMAIL}:</label></dt> +		<dt><label for="email">{L_EMAIL}{L_COLON}</label></dt>  		<dd><input type="text" name="email" id="email" value="{EMAIL}" class="inputbox" /></dd>  	</dl>  <!-- ENDIF --> +<!-- IF S_JABBER_ENABLED -->  	<dl> -		<dt><label for="icq">{L_ICQ}:</label></dt> -		<dd><input type="text" name="icq" id="icq" value="{ICQ}" class="inputbox" /></dd> -	</dl> -	<dl> -		<dt><label for="aim">{L_AIM}:</label></dt> -		<dd><input type="text" name="aim" id="aim" value="{AIM}" class="inputbox" /></dd> -	</dl> -	<dl> -		<dt><label for="yahoo">{L_YIM}:</label></dt> -		<dd><input type="text" name="yahoo" id="yahoo" value="{YAHOO}" class="inputbox" /></dd> +		<dt><label for="jabber">{L_JABBER}:</label></dt> +		<dd><input type="text" name="jabber" id="jabber" value="{JABBER}" class="inputbox" /></dd>  	</dl> +<!-- ENDIF -->  	<dl> -		<dt><label for="msn">{L_MSNM}:</label></dt> -		<dd><input type="text" name="msn" id="msn" value="{MSNM}" class="inputbox" /></dd> +		<dt><label for="search_group_id">{L_GROUP}{L_COLON}</label></dt> +		<dd><select name="search_group_id" id="search_group_id">{S_GROUP_SELECT}</select></dd>  	</dl>  	<dl> -		<dt><label for="jabber">{L_JABBER}:</label></dt> -		<dd><input type="text" name="jabber" id="jabber" value="{JABBER}" class="inputbox" /></dd> +		<dt><label for="sk" class="label3">{L_SORT_BY}{L_COLON}</label></dt> +		<dd><select name="sk" id="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select></dd>  	</dl>  	</fieldset>  	<fieldset class="fields1 column2">  	<dl> -		<dt><label for="joined">{L_JOINED}:</label></dt> +		<dt><label for="joined">{L_JOINED}{L_COLON}</label></dt>  		<dd><select name="joined_select">{S_JOINED_TIME_OPTIONS}</select> <input class="inputbox medium" type="text" name="joined" id="joined" value="{JOINED}" /></dd>  	</dl>  <!-- IF S_VIEWONLINE -->  	<dl> -		<dt><label for="active">{L_LAST_ACTIVE}:</label></dt> +		<dt><label for="active">{L_LAST_ACTIVE}{L_COLON}</label></dt>  		<dd><select name="active_select">{S_ACTIVE_TIME_OPTIONS}</select> <input class="inputbox medium" type="text" name="active" id="active" value="{ACTIVE}" /></dd>  	</dl>  <!-- ENDIF -->  	<dl> -		<dt><label for="count">{L_POSTS}:</label></dt> -		<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="inputbox medium" type="text" name="count" id="count" value="{COUNT}" /></dd> +		<dt><label for="count">{L_POSTS}{L_COLON}</label></dt> +		<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="inputbox medium" type="number" min="0" name="count" id="count" value="{COUNT}" /></dd>  	</dl>  <!-- IF S_IP_SEARCH_ALLOWED -->  	<dl> -		<dt><label for="ip">{L_POST_IP}:</label></dt> +		<dt><label for="ip">{L_POST_IP}{L_COLON}</label></dt>  		<dd><input class="inputbox medium" type="text" name="ip" id="ip" value="{IP}" /></dd>  	</dl>  <!-- ENDIF --> -	<dl> -		<dt><label for="search_group_id">{L_GROUP}:</label></dt> -		<dd><select name="search_group_id" id="search_group_id">{S_GROUP_SELECT}</select></dd> -	</dl> -	<dl> -		<dt><label for="sk" class="label3">{L_SORT_BY}:</label></dt> -		<dd><select name="sk" id="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select></dd> -	</dl>  	</fieldset>  	<div class="clear"></div> @@ -122,7 +78,7 @@ function insert_single(user)  		{S_FORM_TOKEN}  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  </form> diff --git a/phpBB/styles/prosilver/template/memberlist_team.html b/phpBB/styles/prosilver/template/memberlist_team.html new file mode 100644 index 0000000000..fd2ba564d3 --- /dev/null +++ b/phpBB/styles/prosilver/template/memberlist_team.html @@ -0,0 +1,47 @@ +<!-- INCLUDE overall_header.html --> + +<h2 class="solo">{PAGE_TITLE}</h2> + +<form method="post" action="{S_MODE_ACTION}"> + +<!-- BEGIN group --> +<div class="forumbg forumbg-table"> +	<div class="inner"> + +	<table class="table1"> +	<thead> +	<tr> +		<th class="name" data-dfn="{L_RANK}{L_COMMA_SEPARATOR}{L_USERNAME}"><span class="rank-img">{L_RANK} </span><!-- IF group.U_GROUP --><a href="{group.U_GROUP}">{group.GROUP_NAME}</a><!-- ELSE -->{group.GROUP_NAME}<!-- ENDIF --></th> +		<th class="info">{L_PRIMARY_GROUP}</th> +		<!-- IF S_DISPLAY_MODERATOR_FORUMS --><th class="info">{L_MODERATOR}</th><!-- ENDIF --> +	</tr> +	</thead> +	<tbody> +<!-- BEGIN user --> +	<tr class="<!-- IF group.user.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> +		<td><!-- IF group.user.RANK_IMG --><span class="rank-img">{group.user.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{group.user.RANK_TITLE}</span><!-- ENDIF -->{group.user.USERNAME_FULL}</td> +		<td class="info"><!-- IF group.user.U_GROUP --> +			<a<!-- IF group.user.GROUP_COLOR --> style="font-weight: bold; color: #{group.user.GROUP_COLOR}"<!-- ENDIF --> href="{group.user.U_GROUP}">{group.user.GROUP_NAME}</a> +			<!-- ELSE --> +				{group.user.GROUP_NAME} +			<!-- ENDIF --></td> +		<!-- IF S_DISPLAY_MODERATOR_FORUMS --> +			<td class="info"><!-- IF group.user.FORUM_OPTIONS --><select style="width: 100%;">{group.user.FORUMS}</select><!-- ELSEIF group.user.FORUMS -->{group.user.FORUMS}<!-- ELSE -->-<!-- ENDIF --></td> +		<!-- ENDIF --> +	</tr> +<!-- BEGINELSE --> +	<tr class="bg1"> +		<td colspan="3"><strong>{L_NO_MEMBERS}</strong></td> +	</tr> +<!-- END user --> +	</tbody> +	</table> +	 +	</div> +</div> +<!-- END group --> + +</form> + +<!-- INCLUDE jumpbox.html --> +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index 2758a7e6cc..5d8e6ec8a8 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -1,75 +1,85 @@  <!-- INCLUDE overall_header.html --> -<h2>{PAGE_TITLE}</h2> +<h2 class="memberlist-title">{PAGE_TITLE}</h2> + +<!-- EVENT memberlist_view_content_prepend -->  <form method="post" action="{S_PROFILE_ACTION}" id="viewprofile">  <div class="panel bg1<!-- IF S_ONLINE --> online<!-- ENDIF -->"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<!-- IF AVATAR_IMG -->  		<dl class="left-box"> -			<dt>{AVATAR_IMG}</dt> +			<dt class="profile-avatar">{AVATAR_IMG}</dt>  			<!-- IF RANK_TITLE --><dd style="text-align: center;">{RANK_TITLE}</dd><!-- ENDIF -->  			<!-- IF RANK_IMG --><dd style="text-align: center;">{RANK_IMG}</dd><!-- ENDIF -->  		</dl>  	<!-- ENDIF --> -	<dl class="left-box details" style="width: 80%;"> -		<dt>{L_USERNAME}:</dt> +	<dl class="left-box details profile-details"> +		<dt>{L_USERNAME}{L_COLON}</dt>  		<dd>  			<!-- IF USER_COLOR --><span style="color: {USER_COLOR}; font-weight: bold;"><!-- ELSE --><span><!-- ENDIF -->{USERNAME}</span> +			<!-- IF U_EDIT_SELF --> [ <a href="{U_EDIT_SELF}">{L_EDIT_PROFILE}</a> ]<!-- ENDIF -->  			<!-- IF U_USER_ADMIN --> [ <a href="{U_USER_ADMIN}">{L_USER_ADMIN}</a> ]<!-- ENDIF -->  			<!-- IF U_USER_BAN --> [ <a href="{U_USER_BAN}">{L_USER_BAN}</a> ]<!-- ENDIF -->  			<!-- IF U_SWITCH_PERMISSIONS --> [ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]<!-- ENDIF -->  		</dd>  		<!-- IF not AVATAR_IMG --> -			<!-- IF RANK_TITLE --><dt>{L_RANK}:</dt> <dd>{RANK_TITLE}</dd><!-- ENDIF --> -			<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE --> <!-- ELSE -->{L_RANK}:<!-- ENDIF --></dt> <dd>{RANK_IMG}</dd><!-- ENDIF --> +			<!-- IF RANK_TITLE --><dt>{L_RANK}{L_COLON}</dt> <dd>{RANK_TITLE}</dd><!-- ENDIF --> +			<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE --> <!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt> <dd>{RANK_IMG}</dd><!-- ENDIF -->  		<!-- ENDIF --> -		<!-- IF S_USER_INACTIVE --><dt>{L_USER_IS_INACTIVE}:</dt> <dd>{USER_INACTIVE_REASON}</dd><!-- ENDIF --> -		<!-- IF LOCATION --><dt>{L_LOCATION}:</dt> <dd>{LOCATION}</dd><!-- ENDIF --> -		<!-- IF AGE !== '' --><dt>{L_AGE}:</dt> <dd>{AGE}</dd><!-- ENDIF --> -		<!-- IF OCCUPATION --><dt>{L_OCCUPATION}:</dt> <dd>{OCCUPATION}</dd><!-- ENDIF --> -		<!-- IF INTERESTS --><dt>{L_INTERESTS}:</dt> <dd>{INTERESTS}</dd><!-- ENDIF --> -		<!-- IF S_GROUP_OPTIONS --><dt>{L_USERGROUPS}:</dt> <dd><select name="g">{S_GROUP_OPTIONS}</select> <input type="submit" name="submit" value="{L_GO}" class="button2" /></dd><!-- ENDIF --> -		<!-- BEGIN custom_fields --><dt>{custom_fields.PROFILE_FIELD_NAME}:</dt> <dd>{custom_fields.PROFILE_FIELD_VALUE}</dd><!-- END custom_fields --> +		<!-- IF S_USER_INACTIVE --><dt>{L_USER_IS_INACTIVE}{L_COLON}</dt> <dd>{USER_INACTIVE_REASON}</dd><!-- ENDIF --> +		<!-- IF AGE !== '' --><dt>{L_AGE}{L_COLON}</dt> <dd>{AGE}</dd><!-- ENDIF --> +		<!-- IF S_GROUP_OPTIONS --><dt>{L_USERGROUPS}{L_COLON}</dt> <dd><select name="g">{S_GROUP_OPTIONS}</select> <input type="submit" name="submit" value="{L_GO}" class="button2" /></dd><!-- ENDIF --> +		<!-- BEGIN custom_fields --> +			<!-- IF not custom_fields.S_PROFILE_CONTACT --> +				<dt>{custom_fields.PROFILE_FIELD_NAME}{L_COLON}</dt> <dd>{custom_fields.PROFILE_FIELD_VALUE}</dd> +			<!-- ENDIF --> +		<!-- END custom_fields -->  		<!-- IF S_USER_LOGGED_IN and S_ZEBRA -->  			<!-- IF U_REMOVE_FRIEND --> -				<dt> </dt> <dd><a href="{U_REMOVE_FRIEND}"><strong>{L_REMOVE_FRIEND}</strong></a></dd> +				<dt> </dt> <dd class="zebra"><a href="{U_REMOVE_FRIEND}" data-ajax="zebra"><strong>{L_REMOVE_FRIEND}</strong></a></dd>  			<!-- ELSEIF U_REMOVE_FOE --> -				<dt> </dt> <dd><a href="{U_REMOVE_FOE}"><strong>{L_REMOVE_FOE}</strong></a></dd> +				<dt> </dt> <dd class="zebra"><a href="{U_REMOVE_FOE}" data-ajax="zebra"><strong>{L_REMOVE_FOE}</strong></a></dd>  			<!-- ELSE -->  				<!-- IF U_ADD_FRIEND --> -					<dt> </dt> <dd><a href="{U_ADD_FRIEND}"><strong>{L_ADD_FRIEND}</strong></a></dd> +					<dt> </dt> <dd class="zebra"><a href="{U_ADD_FRIEND}" data-ajax="zebra"><strong>{L_ADD_FRIEND}</strong></a></dd>  				<!-- ENDIF -->  				<!-- IF U_ADD_FOE --> -					<dt> </dt> <dd><a href="{U_ADD_FOE}"><strong>{L_ADD_FOE}</strong></a></dd> +					<dt> </dt> <dd class="zebra"><a href="{U_ADD_FOE}" data-ajax="zebra"><strong>{L_ADD_FOE}</strong></a></dd>  				<!-- ENDIF -->  			<!-- ENDIF -->  		<!-- ENDIF -->  	</dl> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div> +<!-- EVENT memberlist_view_contact_before -->  <div class="panel bg2"> -	<div class="inner"><span class="corners-top"><span></span></span> -	<div class="column1"> +	<div class="inner"> -		<h3>{L_CONTACT_USER} {USERNAME}</h3> +	<div class="column1"> +		<h3>{L_CONTACT_USER}</h3>  		<dl class="details"> -		<!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}:</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER} {USERNAME}</a></dd><!-- ENDIF --> -		<!-- IF U_WWW --><dt>{L_WEBSITE}:</dt> <dd><a href="{U_WWW}" title="{L_VISIT_WEBSITE}: {U_WWW}">{U_WWW}</a></dd><!-- ENDIF --> -		<!-- IF U_PM --><dt>{L_PM}:</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd><!-- ENDIF --> -		<!-- IF U_MSN or USER_MSN --><dt>{L_MSNM}:</dt> <dd><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_MSNM_MESSAGE}</a><!-- ELSE -->{USER_MSN}<!-- ENDIF --></dd><!-- ENDIF --> -		<!-- IF U_YIM or USER_YIM --><dt>{L_YIM}:</dt> <dd><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false;">{L_SEND_YIM_MESSAGE}</a><!-- ELSE -->{USER_YIM}<!-- ENDIF --></dd><!-- ENDIF --> -		<!-- IF U_AIM or USER_AIM --><dt>{L_AIM}:</dt> <dd><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_AIM_MESSAGE}</a><!-- ELSE -->{USER_AIM}<!-- ENDIF --></dd><!-- ENDIF --> -		<!-- IF U_ICQ or USER_ICQ --><dt>{L_ICQ}:</dt> <dd><!-- IF U_ICQ --><a href="{U_ICQ}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_ICQ_MESSAGE}</a><!-- ELSE -->{USER_ICQ}<!-- ENDIF --></dd><!-- ENDIF --> -		<!-- IF U_JABBER and S_JABBER_ENABLED --><dt>{L_JABBER}:</dt> <dd><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_JABBER_MESSAGE}</a></dd><!-- ELSEIF USER_JABBER --><dt>{L_JABBER}:</dt> <dd>{USER_JABBER}</dd><!-- ENDIF --> +		<!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}{L_COLON}</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER}</a></dd><!-- ENDIF --> +		<!-- IF U_PM --><dt>{L_PM}{L_COLON}</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd><!-- ENDIF --> +		<!-- IF U_JABBER and S_JABBER_ENABLED --><dt>{L_JABBER}{L_COLON}</dt> <dd><a href="{U_JABBER}" onclick="popup(this.href, 750, 320); return false;">{L_SEND_JABBER_MESSAGE}</a></dd><!-- ELSEIF USER_JABBER --><dt>{L_JABBER}{L_COLON}</dt> <dd>{USER_JABBER}</dd><!-- ENDIF --> +		<!-- BEGIN custom_fields --> +			<!-- IF custom_fields.S_PROFILE_CONTACT --> +				<dt>{custom_fields.PROFILE_FIELD_NAME}{L_COLON}</dt> +				<!-- IF custom_fields.PROFILE_FIELD_CONTACT --> +					<dd><a href="{custom_fields.PROFILE_FIELD_CONTACT}">{custom_fields.PROFILE_FIELD_DESC}</a></dd> +				<!-- ELSE --> +					<dd>{custom_fields.PROFILE_FIELD_VALUE}</dd> +				<!-- ENDIF --> +			<!-- ENDIF --> +		<!-- END custom_fields -->  		<!-- IF S_PROFILE_FIELD1 -->  			<!-- NOTE: Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. --> -			<dt>{PROFILE_FIELD1_NAME}:</dt> <dd>{PROFILE_FIELD1_VALUE}</dd> +			<dt>{PROFILE_FIELD1_NAME}{L_COLON}</dt> <dd>{PROFILE_FIELD1_VALUE}</dd>  		<!-- ENDIF -->  		</dl>  	</div> @@ -77,40 +87,46 @@  	<div class="column2">  		<h3>{L_USER_FORUM}</h3>  		<dl class="details"> -			<dt>{L_JOINED}:</dt> <dd>{JOINED}</dd> -			<dt>{L_VISITED}:</dt> <dd>{VISITED}</dd> +			<!-- EVENT memberlist_view_user_statistics_before --> +			<dt>{L_JOINED}{L_COLON}</dt> <dd>{JOINED}</dd> +			<dt>{L_LAST_ACTIVE}{L_COLON}</dt> <dd>{LAST_ACTIVE}</dd>  			<!-- IF S_WARNINGS --> -			<dt>{L_WARNINGS}: </dt> +			<dt>{L_WARNINGS}{L_COLON} </dt>  			<dd><strong>{WARNINGS}</strong><!-- IF U_NOTES or U_WARN --> [ <!-- IF U_NOTES --><a href="{U_NOTES}">{L_VIEW_NOTES}</a><!-- ENDIF --> <!-- IF U_WARN --><!-- IF U_NOTES --> | <!-- ENDIF --><a href="{U_WARN}">{L_WARN_USER}</a><!-- ENDIF --> ]<!-- ENDIF --></dd>  			<!-- ENDIF --> -			<dt>{L_TOTAL_POSTS}:</dt> +			<dt>{L_TOTAL_POSTS}{L_COLON}</dt>  				<dd>{POSTS} <!-- IF S_DISPLAY_SEARCH -->| <strong><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a></strong><!-- ENDIF -->  					<!-- IF POSTS_PCT --><br />({POSTS_PCT} / {POSTS_DAY})<!-- ENDIF -->  					<!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --><br />(<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --><br />({L_POSTS_IN_QUEUE})<!-- ENDIF -->  				</dd>  			<!-- IF S_SHOW_ACTIVITY and POSTS --> -				<dt>{L_ACTIVE_IN_FORUM}:</dt> <dd><!-- IF ACTIVE_FORUM != '' --><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})<!-- ELSE --> - <!-- ENDIF --></dd> -				<dt>{L_ACTIVE_IN_TOPIC}:</dt> <dd><!-- IF ACTIVE_TOPIC != '' --><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})<!-- ELSE --> - <!-- ENDIF --></dd> +				<dt>{L_ACTIVE_IN_FORUM}{L_COLON}</dt> <dd><!-- IF ACTIVE_FORUM != '' --><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})<!-- ELSE --> - <!-- ENDIF --></dd> +				<dt>{L_ACTIVE_IN_TOPIC}{L_COLON}</dt> <dd><!-- IF ACTIVE_TOPIC != '' --><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})<!-- ELSE --> - <!-- ENDIF --></dd>  			<!-- ENDIF --> +			<!-- EVENT memberlist_view_user_statistics_after -->  		</dl>  	</div> -	<span class="corners-bottom"><span></span></span></div> + +	</div>  </div> +<!-- EVENT memberlist_view_contact_after -->  <!-- IF SIGNATURE -->  <div class="panel bg1"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  		<h3>{L_SIGNATURE}</h3> -		<div class="postbody"><div class="signature" style="border-top:none; margin-top: 0;">{SIGNATURE}</div></div> +		<div class="postbody"><div class="signature standalone">{SIGNATURE}</div></div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- ENDIF -->  </form> +<!-- EVENT memberlist_view_content_append --> +  <!-- INCLUDE jumpbox.html --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/prosilver/template/message_body.html b/phpBB/styles/prosilver/template/message_body.html index 3a970769b7..71eca203bc 100644 --- a/phpBB/styles/prosilver/template/message_body.html +++ b/phpBB/styles/prosilver/template/message_body.html @@ -5,11 +5,11 @@  <!-- ENDIF -->  <div class="panel" id="message"> -	<div class="inner"><span class="corners-top"><span></span></span> -	<h2>{MESSAGE_TITLE}</h2> +	<div class="inner"> +	<h2 class="message-title">{MESSAGE_TITLE}</h2>  	<p>{MESSAGE_TEXT}</p> -	<!-- IF SCRIPT_NAME == "search" and not S_BOARD_DISABLED and not S_NO_SEARCH and L_RETURN_TO_SEARCH_ADV --><p><a href="{U_SEARCH}" class="{S_CONTENT_FLOW_BEGIN}">{L_RETURN_TO_SEARCH_ADV}</a></p><!-- ENDIF --> -	<span class="corners-bottom"><span></span></span></div> +	<!-- IF SCRIPT_NAME == "search" and not S_BOARD_DISABLED and not S_NO_SEARCH and L_RETURN_TO_SEARCH_ADV --><p><a href="{U_SEARCH}" class="arrow-{S_CONTENT_FLOW_BEGIN}">{L_GO_TO_SEARCH_ADV}</a></p><!-- ENDIF --> +	</div>  </div>  <!-- IF S_SIMPLE_MESSAGE --> diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html new file mode 100644 index 0000000000..4a9275c898 --- /dev/null +++ b/phpBB/styles/prosilver/template/navbar_footer.html @@ -0,0 +1,27 @@ +<div class="navbar"> +	<div class="inner"> + +	<ul id="nav-footer" class="linklist bulletin" role="menubar"> +		<li class="small-icon icon-home breadcrumbs"> +			<!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}" data-navbar-reference="home">{L_SITE_HOME}</a></span><!-- ENDIF --> +			<!-- EVENT overall_footer_breadcrumb_prepend --> +			<span class="crumb"><a href="{U_INDEX}" data-navbar-reference="index">{L_INDEX}</a></span> +			<!-- EVENT overall_footer_breadcrumb_append --> +		</li> +		<!-- IF U_WATCH_FORUM_LINK and not S_IS_BOT --><li class="small-icon icon-<!-- IF S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-last-responsive="true"><a href="{U_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_FORUM_TOGGLE}" data-toggle-url="{U_WATCH_FORUM_TOGGLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF --> + +		<!-- EVENT overall_footer_timezone_before --> +		<li class="rightside">{S_TIMEZONE}</li> +		<!-- EVENT overall_footer_timezone_after --> +		<!-- IF not S_IS_BOT --> +			<li class="small-icon icon-delete-cookies rightside"><a href="{U_DELETE_COOKIES}" data-ajax="true" data-refresh="true" role="menuitem">{L_DELETE_COOKIES}</a></li> +			<!-- IF S_DISPLAY_MEMBERLIST --><li class="small-icon icon-members rightside" data-last-responsive="true"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}" role="menuitem">{L_MEMBERLIST}</a></li><!-- ENDIF --> +		<!-- ENDIF --> +		<!-- EVENT overall_footer_teamlink_before --> +		<!-- IF U_TEAM --><li class="small-icon icon-team rightside" data-last-responsive="true"><a href="{U_TEAM}" role="menuitem">{L_THE_TEAM}</a></li><!-- ENDIF --> +		<!-- EVENT overall_footer_teamlink_after --> +		<!-- IF U_CONTACT_US --><li class="small-icon icon-contact rightside" data-last-responsive="true"><a href="{U_CONTACT_US}" role="menuitem">{L_CONTACT_US}</a></li><!-- ENDIF --> +	</ul> + +	</div> +</div> diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html new file mode 100644 index 0000000000..41c5793320 --- /dev/null +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -0,0 +1,114 @@ +<div class="navbar" role="navigation"> +	<div class="inner"> + +	<ul id="nav-main" class="linklist bulletin" role="menubar"> + +		<li id="quick-links" class="small-icon responsive-menu dropdown-container<!-- IF not S_DISPLAY_QUICK_LINKS and not S_DISPLAY_SEARCH --> hidden<!-- ENDIF -->" data-skip-responsive="true"> +			<a href="#" class="responsive-menu-link dropdown-trigger">{L_QUICK_LINKS}</a> +			<div class="dropdown hidden"> +				<div class="pointer"><div class="pointer-inner"></div></div> +				<ul class="dropdown-contents" role="menu"> +					<!-- EVENT navbar_header_quick_links_before --> + +					<!-- IF S_DISPLAY_SEARCH --> +						<li class="separator"></li> +						<!-- IF S_REGISTERED_USER --> +							<li class="small-icon icon-search-self"><a href="{U_SEARCH_SELF}" role="menuitem">{L_SEARCH_SELF}</a></li> +						<!-- ENDIF --> +						<!-- IF S_USER_LOGGED_IN --> +							<li class="small-icon icon-search-new"><a href="{U_SEARCH_NEW}" role="menuitem">{L_SEARCH_NEW}</a></li> +						<!-- ENDIF --> +						<!-- IF S_LOAD_UNREADS -->  +							<li class="small-icon icon-search-unread"><a href="{U_SEARCH_UNREAD}" role="menuitem">{L_SEARCH_UNREAD}</a></li> +						<!-- ENDIF --> +						<li class="small-icon icon-search-unanswered"><a href="{U_SEARCH_UNANSWERED}" role="menuitem">{L_SEARCH_UNANSWERED}</a></li> +						<li class="small-icon icon-search-active"><a href="{U_SEARCH_ACTIVE_TOPICS}" role="menuitem">{L_SEARCH_ACTIVE_TOPICS}</a></li> +						<li class="separator"></li> +						<li class="small-icon icon-search"><a href="{U_SEARCH}" role="menuitem">{L_SEARCH}</a></li> +					<!-- ENDIF --> + +					<!-- IF not S_IS_BOT and (S_DISPLAY_MEMBERLIST or U_TEAM) --> +						<li class="separator"></li> +						<!-- IF S_DISPLAY_MEMBERLIST --><li class="small-icon icon-members"><a href="{U_MEMBERLIST}" role="menuitem">{L_MEMBERLIST}</a></li><!-- ENDIF --> +						<!-- IF U_TEAM --><li class="small-icon icon-team"><a href="{U_TEAM}" role="menuitem">{L_THE_TEAM}</a></li><!-- ENDIF --> +					<!-- ENDIF --> +					<li class="separator"></li> + +					<!-- EVENT navbar_header_quick_links_after --> +				</ul> +			</div> +		</li> + +		<!-- EVENT overall_header_navigation_prepend --> +		<li class="small-icon icon-faq" <!-- 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">{L_FAQ}</a></li> +		<!-- EVENT overall_header_navigation_append --> +		<!-- IF U_ACP --><li class="small-icon icon-acp" data-last-responsive="true"><a href="{U_ACP}" title="{L_ACP}" role="menuitem">{L_ACP_SHORT}</a></li><!-- ENDIF --> +		<!-- IF U_MCP --><li class="small-icon icon-mcp" data-last-responsive="true"><a href="{U_MCP}" title="{L_MCP}" role="menuitem">{L_MCP_SHORT}</a></li><!-- ENDIF --> + +	<!-- IF S_REGISTERED_USER --> +		<li id="username_logged_in" class="rightside <!-- IF CURRENT_USER_AVATAR --> no-bulletin<!-- ENDIF -->" data-skip-responsive="true"> +			<!-- EVENT navbar_header_username_prepend --> +			<div class="header-profile dropdown-container"> +				<a href="{U_PROFILE}" class="header-avatar dropdown-trigger"><!-- IF CURRENT_USER_AVATAR -->{CURRENT_USER_AVATAR} <!-- ENDIF -->{CURRENT_USERNAME_SIMPLE}</a> +				<div class="dropdown hidden"> +					<div class="pointer"><div class="pointer-inner"></div></div> +					<ul class="dropdown-contents" role="menu"> +						<!-- IF U_RESTORE_PERMISSIONS --><li class="small-icon icon-restore-permissions"><a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a></li><!-- ENDIF --> +	 +						<!-- EVENT navbar_header_profile_list_before --> +	 +						<li class="small-icon icon-ucp"><a href="{U_PROFILE}" title="{L_PROFILE}" role="menuitem">{L_PROFILE}</a></li> +						<li class="small-icon icon-profile"><a href="{U_USER_PROFILE}" title="{L_READ_PROFILE}" role="menuitem">{L_READ_PROFILE}</a></li> +	 +						<!-- EVENT navbar_header_profile_list_after --> +	 +						<li class="separator"></li> +						<li class="small-icon icon-logout"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x" role="menuitem">{L_LOGIN_LOGOUT}</a></li> +					</ul> +				</div> +			</div> +			<!-- EVENT navbar_header_username_append --> +		</li> +		<!-- IF S_DISPLAY_PM --> +			<li class="small-icon icon-pm rightside" data-skip-responsive="true"> +				<a href="{U_PRIVATEMSGS}" role="menuitem"><span>{L_PRIVATE_MESSAGES} [</span><strong>{PRIVATE_MESSAGE_COUNT}</strong><span>]</span></a> +			</li> +		<!-- ENDIF --> +		<!-- IF S_NOTIFICATIONS_DISPLAY --> +			<li class="small-icon icon-notification dropdown-container dropdown-{S_CONTENT_FLOW_END} rightside" data-skip-responsive="true"> +				<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" class="dropdown-trigger"><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></a> +				<!-- INCLUDE notification_dropdown.html --> +			</li> +		<!-- ENDIF --> +	<!-- ELSE --> +		<li class="small-icon icon-logout rightside"  data-skip-responsive="true"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x" role="menuitem">{L_LOGIN_LOGOUT}</a></li> +		<!-- IF S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --> +			<li class="small-icon icon-register rightside" data-skip-responsive="true"><a href="{U_REGISTER}" role="menuitem">{L_REGISTER}</a></li> +		<!-- ENDIF --> +		<!-- EVENT navbar_header_logged_out_content --> +	<!-- ENDIF --> +	</ul> + +	<ul id="nav-breadcrumbs" class="linklist navlinks" role="menubar"> +		<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' --> +		<!-- EVENT overall_header_breadcrumbs_before --> +		<li class="small-icon icon-home breadcrumbs"> +			<!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}"{$MICRODATA} data-navbar-reference="home">{L_SITE_HOME}</a></span><!-- ENDIF --> +			<!-- EVENT overall_header_breadcrumb_prepend --> +			<span class="crumb"><a href="{U_INDEX}" accesskey="h"{$MICRODATA} data-navbar-reference="index">{L_INDEX}</a></span> +			<!-- BEGIN navlinks --> +				<!-- EVENT overall_header_navlink_prepend --> +				<span class="crumb"><a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->>{navlinks.FORUM_NAME}</a></span> +				<!-- EVENT overall_header_navlink_append --> +			<!-- END navlinks --> +			<!-- EVENT overall_header_breadcrumb_append --> +		</li> +		<!-- EVENT overall_header_breadcrumbs_after --> + +		<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH --> +			<li class="rightside responsive-search" style="display: none;"><a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}" role="menuitem">{L_SEARCH}</a></li> +		<!-- ENDIF --> +	</ul> + +	</div> +</div> diff --git a/phpBB/styles/prosilver/template/notification_dropdown.html b/phpBB/styles/prosilver/template/notification_dropdown.html new file mode 100644 index 0000000000..13d90a9d38 --- /dev/null +++ b/phpBB/styles/prosilver/template/notification_dropdown.html @@ -0,0 +1,45 @@ +<div id="notification_list" class="dropdown dropdown-extended notification_list"> +	<div class="pointer"><div class="pointer-inner"></div></div> +	<div class="dropdown-contents"> +		<div class="header"> +			{L_NOTIFICATIONS} +			<span class="header_settings"> +				<a href="{U_NOTIFICATION_SETTINGS}">{L_SETTINGS}</a> +				<!-- IF NOTIFICATIONS_COUNT --> +					<span id="mark_all_notifications"> • <a href="{U_MARK_ALL_NOTIFICATIONS}" data-ajax="notification.mark_all_read">{L_MARK_ALL_READ}</a></span> +				<!-- ENDIF --> +			</span> +		</div> + +		<ul> +			<!-- IF not .notifications --> +				<li class="no_notifications"> +					{L_NO_NOTIFICATIONS} +				</li> +			<!-- ENDIF --> +			<!-- BEGIN notifications --> +				<li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF --><!-- IF notifications.STYLING --> {notifications.STYLING}<!-- ENDIF --><!-- IF not notifications.URL --> no-url<!-- ENDIF -->"> +					<!-- IF notifications.URL --> +						<a class="notification-block" href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}" data-real-url="{notifications.URL}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"> +					<!-- ENDIF --> +						<!-- IF notifications.AVATAR -->{notifications.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --> +						<div class="notification_text"> +							<p class="notification-title">{notifications.FORMATTED_TITLE}</p> +							<!-- IF notifications.REFERENCE --><p class="notification-reference">{notifications.REFERENCE}</p><!-- ENDIF --> +							<!-- IF notifications.FORUM --><p class="notification-forum">{notifications.FORUM}</p><!-- ENDIF --> +							<!-- IF notifications.REASON --><p class="notification-reason">{notifications.REASON}</p><!-- ENDIF --> +							<p class="notification-time">{notifications.TIME}</p> +						</div> +					<!-- IF notifications.URL --></a><!-- ENDIF --> +					<!-- IF notifications.UNREAD --> +						<a href="{notifications.U_MARK_READ}" class="mark_read icon-mark" data-ajax="notification.mark_read" title="{L_MARK_READ}"></a> +					<!-- ENDIF --> +				</li> +			<!-- END notifications --> +		</ul> + +		<div class="footer"> +			<a href="{U_VIEW_ALL_NOTIFICATIONS}"><span>{L_SEE_ALL}</span></a> +		</div> +	</div> +</div> diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index fc6a37cbe3..275859ac97 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -1,37 +1,52 @@ +		<!-- EVENT overall_footer_content_after -->  	</div> -<div id="page-footer"> +<!-- EVENT overall_footer_page_body_after --> -	<div class="navbar"> -		<div class="inner"><span class="corners-top"><span></span></span> - -		<ul class="linklist"> -			<li class="icon-home"><a href="{U_INDEX}">{L_INDEX}</a></li> -				<!-- IF not S_IS_BOT --> -					<!-- IF S_WATCH_FORUM_LINK --><li <!-- IF S_WATCHING_FORUM -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{S_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF --> -					<!-- IF U_WATCH_TOPIC --><li <!-- IF S_WATCHING_TOPIC -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}">{L_WATCH_TOPIC}</a></li><!-- ENDIF --> -					<!-- IF U_BOOKMARK_TOPIC --><li class="icon-bookmark"><a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}">{L_BOOKMARK_TOPIC}</a></li><!-- ENDIF --> -					<!-- IF U_BUMP_TOPIC --><li class="icon-bump"><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}">{L_BUMP_TOPIC}</a></li><!-- ENDIF --> -				<!-- ENDIF --> -			<li class="rightside"><!-- IF U_TEAM --><a href="{U_TEAM}">{L_THE_TEAM}</a> • <!-- ENDIF --><!-- IF not S_IS_BOT --><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a> • <!-- ENDIF -->{S_TIMEZONE}</li> -		</ul> - -		<span class="corners-bottom"><span></span></span></div> -	</div> +<div id="page-footer"> +	<!-- INCLUDE navbar_footer.html --> -	<div class="copyright">{CREDIT_LINE} +	<div class="copyright"> +		<!-- EVENT overall_footer_copyright_prepend --> +		{CREDIT_LINE}  		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF --> +		<!-- EVENT overall_footer_copyright_append -->  		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->  		<!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->  	</div> + +	<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}"> +		<div id="darken"> </div> +	</div> +	<div id="loading_indicator"></div> + +	<div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}"> +		<a href="#" class="alert_close"></a> +		<h3 class="alert_title"> </h3><p class="alert_text"></p> +	</div> +	<div id="phpbb_confirm" class="phpbb_alert"> +		<a href="#" class="alert_close"></a> +		<div class="alert_text"></div> +	</div>  </div>  </div>  <div> -	<a id="bottom" name="bottom" accesskey="z"></a> +	<a id="bottom" class="anchor" accesskey="z"></a>  	<!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF -->  </div> +<script type="text/javascript" src="{T_JQUERY_LINK}"></script> +<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> +<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> +<!-- INCLUDEJS forum_fn.js --> +<!-- INCLUDEJS ajax.js --> + +<!-- EVENT overall_footer_after --> + +<!-- IF S_PLUPLOAD --><!-- INCLUDE plupload.html --><!-- ENDIF --> +{$SCRIPTS} +  </body> -</html>
\ No newline at end of file +</html> diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index c75cc92940..ad08c1220b 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -1,17 +1,10 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}"> +<!DOCTYPE html> +<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">  <head> - -<meta http-equiv="content-type" content="text/html; charset={S_CONTENT_ENCODING}" /> -<meta http-equiv="content-style-type" content="text/css" /> -<meta http-equiv="content-language" content="{S_USER_LANG}" /> -<meta http-equiv="imagetoolbar" content="no" /> -<meta name="resource-type" content="document" /> -<meta name="distribution" content="global" /> -<meta name="keywords" content="" /> -<meta name="description" content="" /> +<meta charset="utf-8"> +<meta name="viewport" content="width=device-width" />  {META} -<title>{SITENAME} • <!-- IF S_IN_MCP -->{L_MCP} • <!-- ELSEIF S_IN_UCP -->{L_UCP} • <!-- ENDIF -->{PAGE_TITLE}</title> +<title><!-- IF UNREAD_NOTIFICATIONS_COUNT -->({UNREAD_NOTIFICATIONS_COUNT}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title>  <!-- IF S_ENABLE_FEEDS -->  	<!-- IF S_ENABLE_FEEDS_OVERALL --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {SITENAME}" href="{U_FEED}" /><!-- ENDIF --> @@ -23,6 +16,10 @@  	<!-- IF S_ENABLE_FEEDS_TOPIC and S_TOPIC_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_TOPIC} - {TOPIC_TITLE}" href="{U_FEED}?f={S_FORUM_ID}&t={S_TOPIC_ID}" /><!-- ENDIF -->  <!-- ENDIF --> +<!-- IF U_CANONICAL --> +	<link rel="canonical" href="{U_CANONICAL}" /> +<!-- ENDIF --> +  <!--  	phpBB style name: prosilver  	Based on style:   prosilver (this is the default phpBB3 style) @@ -30,147 +27,77 @@  	Modified by:  --> -<script type="text/javascript"> -// <![CDATA[ -	var jump_page = '{LA_JUMP_PAGE}:'; -	var on_page = '{ON_PAGE}'; -	var per_page = '{PER_PAGE}'; -	var base_url = '{A_BASE_URL}'; -	var style_cookie = 'phpBBstyle'; -	var style_cookie_settings = '{A_COOKIE_SETTINGS}'; -	var onload_functions = new Array(); -	var onunload_functions = new Array(); - -	<!-- IF S_USER_PM_POPUP and S_NEW_PM --> -		var url = '{UA_POPUP_PM}'; -		window.open(url.replace(/&/g, '&'), '_phpbbprivmsg', 'height=225,resizable=yes,scrollbars=yes, width=400'); -	<!-- ENDIF --> - -	/** -	* Find a member -	*/ -	function find_username(url) -	{ -		popup(url, 760, 570, '_usersearch'); -		return false; -	} - -	/** -	* New function for handling multiple calls to window.onload and window.unload by pentapenguin -	*/ -	window.onload = function() -	{ -		for (var i = 0; i < onload_functions.length; i++) -		{ -			eval(onload_functions[i]); -		} -	}; - -	window.onunload = function() -	{ -		for (var i = 0; i < onunload_functions.length; i++) -		{ -			eval(onunload_functions[i]); -		} -	}; - -// ]]> -</script> -<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/styleswitcher.js"></script> -<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js"></script> - -<link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" /> +<link href="{T_THEME_PATH}/print.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="print" title="printonly" /> +<!-- IF S_ALLOW_CDN --><link href="//fonts.googleapis.com/css?family=Open+Sans:600&subset=latin,cyrillic-ext,latin-ext,cyrillic,greek-ext,greek,vietnamese" rel="stylesheet" type="text/css" media="screen, projection" /><!-- ENDIF -->  <link href="{T_STYLESHEET_LINK}" rel="stylesheet" type="text/css" media="screen, projection" /> - -<link href="{T_THEME_PATH}/normal.css" rel="stylesheet" type="text/css" title="A" /> -<link href="{T_THEME_PATH}/medium.css" rel="alternate stylesheet" type="text/css" title="A+" /> -<link href="{T_THEME_PATH}/large.css" rel="alternate stylesheet" type="text/css" title="A++" /> +<link href="{T_STYLESHEET_LANG_LINK}" rel="stylesheet" type="text/css" media="screen, projection" /> +<link href="{T_THEME_PATH}/responsive.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="only screen and (max-width: 700px), only screen and (max-device-width: 700px)" />  <!-- IF S_CONTENT_DIRECTION eq 'rtl' --> -	<link href="{T_THEME_PATH}/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" /> +	<link href="{T_THEME_PATH}/bidi.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" /> +<!-- ENDIF --> + +<!-- IF S_PLUPLOAD --> +	<link href="{T_THEME_PATH}/plupload.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" />  <!-- ENDIF --> +<!--[if lte IE 9]> +	<link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" /> +<![endif]--> + +<!-- EVENT overall_header_head_append --> + +{$STYLESHEETS} + +<!-- EVENT overall_header_stylesheets_after --> +  </head> +<body id="phpbb" class="nojs notouch section-{SCRIPT_NAME} {S_CONTENT_DIRECTION} {BODY_CLASS}"> -<body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}"> +<!-- EVENT overall_header_body_before -->  <div id="wrap"> -	<a id="top" name="top" accesskey="t"></a> +	<a id="top" class="anchor" accesskey="t"></a>  	<div id="page-header">  		<div class="headerbar"> -			<div class="inner"><span class="corners-top"><span></span></span> +			<div class="inner">  			<div id="site-description"> -				<a href="{U_INDEX}" title="{L_INDEX}" id="logo">{SITE_LOGO_IMG}</a> +				<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 -->">{SITE_LOGO_IMG}</a>  				<h1>{SITENAME}</h1>  				<p>{SITE_DESCRIPTION}</p>  				<p class="skiplink"><a href="#start_here">{L_SKIP}</a></p>  			</div> -		<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH --> -			<div id="search-box"> +			<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH --> +			<div id="search-box" class="search-box search-header">  				<form action="{U_SEARCH}" method="get" id="search">  				<fieldset> -					<input name="keywords" id="keywords" type="text" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search" value="<!-- IF SEARCH_WORDS-->{SEARCH_WORDS}<!-- ELSE -->{L_SEARCH_MINI}<!-- ENDIF -->" onclick="if(this.value=='{LA_SEARCH_MINI}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_MINI}';" /> -					<input class="button2" value="{L_SEARCH}" type="submit" /><br /> -					<a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH_ADV}</a> {S_SEARCH_HIDDEN_FIELDS} +					<input name="keywords" id="keywords" type="search" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search tiny" size="20" value="{SEARCH_WORDS}" placeholder="{L_SEARCH_MINI}" /> +					<button class="button icon-button search-icon" type="submit" title="{L_SEARCH}">{L_SEARCH}</button> +					<a href="{U_SEARCH}" class="button icon-button search-adv-icon" title="{L_SEARCH_ADV}">{L_SEARCH_ADV}</a> +					{S_SEARCH_HIDDEN_FIELDS}  				</fieldset>  				</form>  			</div> -		<!-- ENDIF --> - -			<span class="corners-bottom"><span></span></span></div> -		</div> - -		<div class="navbar"> -			<div class="inner"><span class="corners-top"><span></span></span> - -			<ul class="linklist navlinks"> -				<li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a> <!-- BEGIN navlinks --> <strong>‹</strong> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></li> - -				<li class="rightside"><a href="#" onclick="fontsizeup(); return false;" onkeypress="return fontsizeup(event);" class="fontsize" title="{L_CHANGE_FONT_SIZE}">{L_CHANGE_FONT_SIZE}</a></li> - -				<!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF --> -				<!-- IF U_EMAIL_PM --><li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li><!-- ENDIF --> -				<!-- IF U_PRINT_TOPIC --><li class="rightside"><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p" class="print">{L_PRINT_TOPIC}</a></li><!-- ENDIF --> -				<!-- IF U_PRINT_PM --><li class="rightside"><a href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p" class="print">{L_PRINT_PM}</a></li><!-- ENDIF --> -			</ul> - -			<!-- IF not S_IS_BOT and S_USER_LOGGED_IN --> -			<ul class="linklist leftside"> -				<li class="icon-ucp"> -					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a> -						<!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a>)<!-- ENDIF --> -					<!-- IF S_DISPLAY_SEARCH --> • -					<a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a> -					<!-- ENDIF --> -					<!-- IF U_RESTORE_PERMISSIONS --> • -					<a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a> -					<!-- ENDIF --> -				</li> -			</ul>  			<!-- ENDIF --> -			<ul class="linklist rightside"> -				<li class="icon-faq"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li> -				<!-- IF not S_IS_BOT --> -					<!-- IF S_DISPLAY_MEMBERLIST --><li class="icon-members"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF --> -					<!-- IF not S_USER_LOGGED_IN and S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --><li class="icon-register"><a href="{U_REGISTER}">{L_REGISTER}</a></li><!-- ENDIF --> -					<li class="icon-logout"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x">{L_LOGIN_LOGOUT}</a></li> -				<!-- ENDIF --> -			</ul> - -			<span class="corners-bottom"><span></span></span></div> +			</div>  		</div> +		<!-- INCLUDE navbar_header.html -->  	</div> -	<a name="start_here"></a> +	<!-- EVENT overall_header_page_body_before --> + +	<a id="start_here" class="anchor"></a>  	<div id="page-body">  		<!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN and (U_MCP or U_ACP) -->  		<div id="information" class="rules"> -			<div class="inner"><span class="corners-top"><span></span></span> -				<strong>{L_INFORMATION}:</strong> {L_BOARD_DISABLED} -			<span class="corners-bottom"><span></span></span></div> +			<div class="inner"> +				<strong>{L_INFORMATION}{L_COLON}</strong> {L_BOARD_DISABLED} +			</div>  		</div>  		<!-- ENDIF --> + +		<!-- EVENT overall_header_content_before --> diff --git a/phpBB/styles/prosilver/template/pagination.html b/phpBB/styles/prosilver/template/pagination.html new file mode 100644 index 0000000000..4680eaa175 --- /dev/null +++ b/phpBB/styles/prosilver/template/pagination.html @@ -0,0 +1,30 @@ +<ul> +<!-- IF BASE_URL and TOTAL_PAGES > 6 --> +	<li class="dropdown-container dropdown-button-control dropdown-page-jump page-jump"> +		<a href="#" class="dropdown-trigger" title="{L_JUMP_TO_PAGE_CLICK}" role="button">{PAGE_NUMBER}</a> +		<div class="dropdown hidden"> +			<div class="pointer"><div class="pointer-inner"></div></div> +			<ul class="dropdown-contents"> +				<li>{L_JUMP_TO_PAGE}{L_COLON}</li> +				<li class="page-jump-form"> +					<input type="number" name="page-number" min="1" maxlength="6" title="{L_JUMP_PAGE}" class="inputbox tiny" data-per-page="{PER_PAGE}" data-base-url="{BASE_URL|e('html_attr')}" data-start-name="{START_NAME}" /> +					<input class="button2" value="{L_GO}" type="button" /> +				</li> +			</ul> +		</div> +	</li> +<!-- ENDIF --> +<!-- BEGIN pagination --> +	<!-- IF pagination.S_IS_PREV --> +	<li class="previous"><a href="{pagination.PAGE_URL}" rel="prev" role="button">{L_PREVIOUS}</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="next"><a href="{pagination.PAGE_URL}" rel="next" role="button">{L_NEXT}</a></li> +	<!-- ELSE --> +	<li><a href="{pagination.PAGE_URL}" role="button">{pagination.PAGE_NUMBER}</a></li> +	<!-- ENDIF --> +<!-- END pagination --> +</ul> diff --git a/phpBB/styles/prosilver/template/plupload.html b/phpBB/styles/prosilver/template/plupload.html new file mode 100644 index 0000000000..fc663118c1 --- /dev/null +++ b/phpBB/styles/prosilver/template/plupload.html @@ -0,0 +1,69 @@ +<script type="text/javascript"> +//<![CDATA[ +phpbb.plupload = { +	i18n: { +		'b': '{LA_BYTES_SHORT}', +		'kb': '{LA_KB}', +		'mb': '{LA_MB}', +		'gb': '{LA_GB}', +		'tb': '{LA_TB}', +		'Add Files': '{LA_PLUPLOAD_ADD_FILES}', +		'Add files to the upload queue and click the start button.': '{LA_PLUPLOAD_ADD_FILES_TO_QUEUE}', +		'Close': '{LA_PLUPLOAD_CLOSE}', +		'Drag files here.': '{LA_PLUPLOAD_DRAG}', +		'Duplicate file error.': '{LA_PLUPLOAD_DUPLICATE_ERROR}', +		'File: %s': '{LA_PLUPLOAD_FILE}', +		'File: %s, size: %d, max file size: %d': '{LA_PLUPLOAD_FILE_DETAILS}', +		'File count error.': '{LA_PLUPLOAD_ERR_FILE_COUNT}', +		'File extension error.': '{LA_PLUPLOAD_EXTENSION_ERROR}', +		'File size error.': '{LA_PLUPLOAD_SIZE_ERROR}', +		'File too large:': '{LA_PLUPLOAD_ERR_FILE_TOO_LARGE}', +		'Filename': '{LA_PLUPLOAD_FILENAME}', +		'Generic error.': '{LA_PLUPLOAD_GENERIC_ERROR}', +		'HTTP Error.': '{LA_PLUPLOAD_HTTP_ERROR}', +		'Image format either wrong or not supported.': '{LA_PLUPLOAD_IMAGE_FORMAT}', +		'Init error.': '{LA_PLUPLOAD_INIT_ERROR}', +		'IO error.': '{LA_PLUPLOAD_IO_ERROR}', +		'Invalid file extension:': '{LA_PLUPLOAD_ERR_FILE_INVALID_EXT}', +		'N/A': '{LA_PLUPLOAD_NOT_APPLICABLE}', +		'Runtime ran out of available memory.': '{LA_PLUPLOAD_ERR_RUNTIME_MEMORY}', +		'Security error.': '{LA_PLUPLOAD_SECURITY_ERROR}', +		'Select files': '{LA_PLUPLOAD_SELECT_FILES}', +		'Size': '{LA_PLUPLOAD_SIZE}', +		'Start Upload': '{LA_PLUPLOAD_START_UPLOAD}', +		'Start uploading queue': '{LA_PLUPLOAD_START_CURRENT_UPLOAD}', +		'Status': '{LA_PLUPLOAD_STATUS}', +		'Stop Upload': '{LA_PLUPLOAD_STOP_UPLOAD}', +		'Stop current upload': '{LA_PLUPLOAD_STOP_CURRENT_UPLOAD}', +		"Upload URL might be wrong or doesn't exist.": '{LA_PLUPLOAD_ERR_UPLOAD_URL}', +		'Uploaded %d/%d files': '{LA_PLUPLOAD_UPLOADED}', +		'%d files queued': '{LA_PLUPLOAD_FILES_QUEUED}', +		'%s already present in the queue.': '{LA_PLUPLOAD_ALREADY_QUEUED}' +	}, +	config: { +		runtimes: 'html5', +		url: '{S_PLUPLOAD_URL}', +		max_file_size: '{FILESIZE}b', +		chunk_size: '{CHUNK_SIZE}b', +		unique_names: true, +		filters: [{FILTERS}], +		{S_RESIZE} +		headers: {'X-PHPBB-USING-PLUPLOAD': '1', 'X-Requested-With': 'XMLHttpRequest'}, +		file_data_name: 'fileupload', +		multipart_params: {'add_file': '{LA_ADD_FILE}'}, +		form_hook: '#postform', +		browse_button: 'add_files', +		drop_element : 'message', +	}, +	lang: { +		ERROR: '{LA_ERROR}', +		TOO_MANY_ATTACHMENTS: '{LA_TOO_MANY_ATTACHMENTS}', +	}, +	order: '{ATTACH_ORDER}', +	maxFiles: {MAX_ATTACHMENTS}, +	data: {S_ATTACH_DATA}, +} +//]]> +</script> +<!-- INCLUDEJS {T_ASSETS_PATH}/plupload/plupload.full.min.js --> +<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/plupload.js --> diff --git a/phpBB/styles/prosilver/template/posting_attach_body.html b/phpBB/styles/prosilver/template/posting_attach_body.html index d39405487d..81b2c2bf41 100644 --- a/phpBB/styles/prosilver/template/posting_attach_body.html +++ b/phpBB/styles/prosilver/template/posting_attach_body.html @@ -1,21 +1,85 @@ -<div class="panel bg3" id="attach-panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +<div class="panel bg3 panel-container" id="attach-panel"> +	<div class="inner"> -	<p>{L_ADD_ATTACHMENT_EXPLAIN}</p> +	<p>{L_ADD_ATTACHMENT_EXPLAIN} <span class="hidden" id="drag-n-drop-message">{L_PLUPLOAD_DRAG_TEXTAREA}</span></p> -	<fieldset class="fields2"> +	<fieldset class="fields2" id="attach-panel-basic">  	<dl> -		<dt><label for="fileupload">{L_FILENAME}:</label></dt> +		<dt><label for="fileupload">{L_FILENAME}{L_COLON}</label></dt>  		<dd>  			<input type="file" name="fileupload" id="fileupload" maxlength="{FILESIZE}" value="" class="inputbox autowidth" />   			<input type="submit" name="add_file" value="{L_ADD_FILE}" class="button2" onclick="upload = true;" />  		</dd>  	</dl>  	<dl> -		<dt><label for="filecomment">{L_FILE_COMMENT}:</label></dt> +		<dt><label for="filecomment">{L_FILE_COMMENT}{L_COLON}</label></dt>  		<dd><textarea name="filecomment" id="filecomment" rows="1" cols="40" class="inputbox autowidth">{FILE_COMMENT}</textarea></dd>  	</dl>  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	<div id="attach-panel-multi"> +		<input type="button" class="button2" value="{L_PLUPLOAD_ADD_FILES}" id="add_files" /> +	</div> + +	<div class="panel<!-- IF not .attach_row --> hidden<!-- ENDIF -->" id="file-list-container"> +		<div class="inner"> +			<table class="table1 zebra-list fixed-width-table"> +				<thead> +					<tr> +						<th class="attach-name">{L_PLUPLOAD_FILENAME}</th> +						<th class="attach-comment">{L_FILE_COMMENT}</th> +						<th class="attach-filesize">{L_PLUPLOAD_SIZE}</th> +						<th class="attach-status">{L_PLUPLOAD_STATUS}</th> +					</tr> +				</thead> +				<tbody class="responsive-skip-empty" id="file-list"> +					<tr class="attach-row" id="attach-row-tpl"> +							<td class="attach-name"> +								<span class="file-name ellipsis-text"></span> +								<span class="attach-controls"> +									<input type="button" value="{L_PLACE_INLINE}" class="button2 hidden file-inline-bbcode" />  +									<input type="button" value="{L_DELETE_FILE}" class="button2 file-delete" /> +								</span> +								<span class="clear"></span> +							</td> +							<td class="attach-comment"> +								<textarea rows="1" cols="30" class="inputbox"></textarea> +							</td> +							<td class="attach-filesize"> +								<span class="file-size"></span> +							</td> +							<td class="attach-status"> +								<span class="file-progress"> +									<span class="file-progress-bar"></span> +								</span> +								<span class="file-status"></span> +							</td> +					</tr> +					<!-- BEGIN attach_row --> +						<tr class="attach-row" data-attach-id="{attach_row.ATTACH_ID}"> +							<td class="attach-name"> +								<span class="file-name ellipsis-text"><a href="{attach_row.U_VIEW_ATTACHMENT}">{attach_row.FILENAME}</a></span> +								<span class="attach-controls"> +									<!-- IF S_INLINE_ATTACHMENT_OPTIONS --><input type="button" value="{L_PLACE_INLINE}" class="button2 file-inline-bbcode" />  <!-- ENDIF --> +									<input type="submit" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" class="button2 file-delete" /> +								</span> +								<span class="clear"></span> +							</td> +							<td class="attach-comment"> +								<textarea name="comment_list[{attach_row.ASSOC_INDEX}]" rows="1" cols="30" class="inputbox">{attach_row.FILE_COMMENT}</textarea> +								{attach_row.S_HIDDEN} +							</td> +							<td class="attach-filesize"> +								<span class="file-size">{attach_row.FILESIZE}</span> +							</td> +							<td class="attach-status"> +								<span class="file-status file-uploaded"></span> +							</td> +						</tr> +					<!-- END attach_row --> +				</tbody> +			</table> +		</div> +	</div> +	</div>  </div> diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html index 78c2a0d9f2..3dad6606bb 100644 --- a/phpBB/styles/prosilver/template/posting_buttons.html +++ b/phpBB/styles/prosilver/template/posting_buttons.html @@ -32,64 +32,55 @@  		<!-- END custom_tags -->  	} -	var panels = new Array('options-panel', 'attach-panel', 'poll-panel'); -	var show_panel = 'options-panel'; +	function change_palette() +	{ +		phpbb.toggleDisplay('colour_palette'); +		e = document.getElementById('colour_palette'); +		if (e.style.display == 'block') +		{ +			document.getElementById('bbpalette').value = '{LA_FONT_COLOR_HIDE}'; +		} +		else +		{ +			document.getElementById('bbpalette').value = '{LA_FONT_COLOR}'; +		} +	}  // ]]>  </script> -<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/editor.js"></script> +<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->  <!-- IF S_BBCODE_ALLOWED -->  <div id="colour_palette" style="display: none;">  	<dl style="clear: left;"> -		<dt><label>{L_FONT_COLOR}:</label></dt> -		<dd> -		<script type="text/javascript"> -		// <![CDATA[ -			function change_palette() -			{ -				dE('colour_palette'); -				e = document.getElementById('colour_palette'); -				 -				if (e.style.display == 'block') -				{ -					document.getElementById('bbpalette').value = '{LA_FONT_COLOR_HIDE}'; -				} -				else -				{ -					document.getElementById('bbpalette').value = '{LA_FONT_COLOR}'; -				} -			} - -			colorPalette('h', 15, 10); -		// ]]> -		</script> -		</dd> +		<dt><label>{L_FONT_COLOR}{L_COLON}</label></dt> +		<dd id="color_palette_placeholder" data-orientation="h" data-height="12" data-width="15" data-bbcode="true"></dd>  	</dl>  </div> +<!-- EVENT posting_editor_buttons_before -->  <div id="format-buttons"> -	<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" /> -	<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" /> -	<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" /> +	<input type="button" class="button2 bbcode-b" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" /> +	<input type="button" class="button2 bbcode-i" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" /> +	<input type="button" class="button2 bbcode-u" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" />  	<!-- IF S_BBCODE_QUOTE --> -		<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" /> +		<input type="button" class="button2 bbcode-quote" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" />  	<!-- ENDIF --> -	<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" /> -	<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" /> -	<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" /> -	<input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" /> +	<input type="button" class="button2 bbcode-code" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" /> +	<input type="button" class="button2 bbcode-list" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" /> +	<input type="button" class="button2 bbcode-list-" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" /> +	<input type="button" class="button2 bbcode-asterisk" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" />  	<!-- IF S_BBCODE_IMG --> -		<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" /> +		<input type="button" class="button2 bbcode-img" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" />  	<!-- ENDIF -->  	<!-- IF S_LINKS_ALLOWED --> -		<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" /> +		<input type="button" class="button2 bbcode-url" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" />  	<!-- ENDIF -->  	<!-- IF S_BBCODE_FLASH --> -		<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}" /> +		<input type="button" class="button2 bbcode-flash" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}" />  	<!-- ENDIF --> -	<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}"> +	<select name="addbbcode20" class="bbcode-size" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">  		<option value="50">{L_FONT_TINY}</option>  		<option value="85">{L_FONT_SMALL}</option>  		<option value="100" selected="selected">{L_FONT_NORMAL}</option> @@ -100,9 +91,10 @@  			<!-- ENDIF -->  		<!-- ENDIF -->  	</select> -	<input type="button" class="button2" name="bbpalette" id="bbpalette" value="{L_FONT_COLOR}" onclick="change_palette();" title="{L_BBCODE_S_HELP}" /> +	<input type="button" class="button2 bbcode-color" name="bbpalette" id="bbpalette" value="{L_FONT_COLOR}" onclick="change_palette();" title="{L_BBCODE_S_HELP}" />  	<!-- BEGIN custom_tags --> -		<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" /> +		<input type="button" class="button2 bbcode-{custom_tags.BBCODE_TAG_CLEAN}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />  	<!-- END custom_tags -->  </div> +<!-- EVENT posting_editor_buttons_after -->  <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index 5acdb3a08c..333e61008e 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -1,91 +1,9 @@ -<script type="text/javascript"> -// <![CDATA[ -	onload_functions.push('apply_onkeypress_event()'); -// ]]> -</script> -  <fieldset class="fields1"> -	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF --> - -	<!-- IF S_PRIVMSGS and not S_SHOW_DRAFTS --> - -		<div class="column1"> -		<!-- IF S_ALLOW_MASS_PM --> -			<!-- IF .to_recipient --> -				<dl> -					<dt><label>{L_TO}:</label></dt> -					<dd> -						<!-- BEGIN to_recipient --> -							<!-- IF not to_recipient.S_FIRST_ROW and to_recipient.S_ROW_COUNT mod 2 eq 0 --></dd><dd><!-- ENDIF --> -							<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF -->  -							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" /> <!-- ENDIF --> -						<!-- END to_recipient --> -					</dd> -				</dl> -			<!-- ENDIF --> -			<!-- IF .bcc_recipient --> -				<dl> -					<dt><label>{L_BCC}:</label></dt> -					<dd> -						<!-- BEGIN bcc_recipient --> -							<!-- IF not bcc_recipient.S_FIRST_ROW and bcc_recipient.S_ROW_COUNT mod 2 eq 0 --></dd><dd><!-- ENDIF --> -							<!-- IF bcc_recipient.IS_GROUP --><a href="{bcc_recipient.U_VIEW}"><strong>{bcc_recipient.NAME}</strong></a><!-- ELSE -->{bcc_recipient.NAME_FULL}<!-- ENDIF -->  -							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]" value="x" class="button2" /> <!-- ENDIF --> -						<!-- END bcc_recipient --> -					</dd> -				</dl> -			<!-- ENDIF --> -			<!-- IF not S_EDIT_POST --> -			<dl class="pmlist"> -				<dt><textarea id="username_list" name="username_list" class="inputbox" cols="50" rows="2" tabindex="1"></textarea></dt> -				<dd><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></span></dd> -				<dd><input type="submit" name="add_to" value="{L_ADD}" class="button2" tabindex="1" /></dd> -				<dd><input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" tabindex="1" /></dd> -			</dl> -			<!-- ENDIF --> -		<!-- ELSE --> -			<dl> -				<dt><label for="username_list">{L_TO}:</label><!-- IF not S_EDIT_POST --><br /><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false">{L_FIND_USERNAME}</a></span><!-- ENDIF --></dt> -				<!-- IF .to_recipient --> -					<dd> -						<!-- BEGIN to_recipient --> -							<!-- IF not to_recipient.S_FIRST_ROW and to_recipient.S_ROW_COUNT mod 2 eq 0 --></dd><dd><!-- ENDIF --> -							<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF -->  -							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" /> <!-- ENDIF --> -						<!-- END to_recipient --> -					</dd> -				<!-- ENDIF --> - -				<!-- IF not S_EDIT_POST --> -				<dd><input class="inputbox" type="text" name="username_list" id="username_list" size="20" value="" /> <input type="submit" name="add_to" value="{L_ADD}" class="button2" /></dd> -				<!-- ENDIF --> -			</dl> -		<!-- ENDIF --> - -		</div> - -		<!-- IF S_GROUP_OPTIONS --> -			<div class="column2"> -				<dl> -					<dd><label for="group_list">{L_USERGROUPS}:</label> <select name="group_list[]" id="group_list" multiple="multiple" size="4" class="inputbox">{S_GROUP_OPTIONS}</select></dd> -				</dl> -			</div> -		<!-- ENDIF --> - -		<div class="clear"></div> - -	<!-- ENDIF --> - -	<!-- IF S_DELETE_ALLOWED --> -	<dl> -		<dt><label for="delete">{L_DELETE_POST}:</label></dt> -		<dd><label for="delete"><input type="checkbox" name="delete" id="delete" /> {L_DELETE_POST_WARN}</label></dd> -	</dl> -	<!-- ENDIF --> +<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->  	<!-- IF S_SHOW_TOPIC_ICONS or S_SHOW_PM_ICONS -->  	<dl> -		<dt><label for="icon">{L_ICON}:</label></dt> +		<dt><label for="icon">{L_ICON}{L_COLON}</label></dt>  		<dd>  			<label for="icon"><input type="radio" name="icon" id="icon" value="0" checked="checked" tabindex="1" /> <!-- IF S_SHOW_TOPIC_ICONS -->{L_NO_TOPIC_ICON}<!-- ELSE -->{L_NO_PM_ICON}<!-- ENDIF --></label>  			<!-- BEGIN topic_icon --><label for="icon-{topic_icon.ICON_ID}"><input type="radio" name="icon" id="icon-{topic_icon.ICON_ID}" value="{topic_icon.ICON_ID}" {topic_icon.S_ICON_CHECKED} tabindex="1" /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" /></label> <!-- END topic_icon --> @@ -95,15 +13,17 @@  	<!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME -->  	<dl style="clear: left;"> -		<dt><label for="username">{L_USERNAME}:</label></dt> +		<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>  		<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>  	</dl>  	<!-- ENDIF --> +	<!-- EVENT posting_editor_subject_before --> +  	<!-- IF S_POST_ACTION or S_PRIVMSGS or S_EDIT_DRAFT -->  	<dl style="clear: left;"> -		<dt><label for="subject">{L_SUBJECT}:</label></dt> -		<dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->60<!-- ELSE -->64<!-- ENDIF -->" tabindex="2" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd> +		<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt> +		<dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->120<!-- ELSE -->124<!-- ENDIF -->" tabindex="2" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd>  	</dl>  	<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->  		<!-- DEFINE $CAPTCHA_TAB_INDEX = 3 --> @@ -111,6 +31,8 @@  	<!-- ENDIF -->  	<!-- ENDIF --> +	<!-- EVENT posting_editor_subject_after --> +  	<!-- INCLUDE posting_buttons.html -->  	<div id="smiley-box"> @@ -121,18 +43,20 @@  			<!-- END smiley -->  		<!-- ENDIF -->  		<!-- IF S_SHOW_SMILEY_LINK and S_SMILIES_ALLOWED--> -			<br /><a href="{U_MORE_SMILIES}" onclick="popup(this.href, 300, 350, '_phpbbsmilies'); return false;">{L_MORE_SMILIES}</a> +			<br /><a href="{U_MORE_SMILIES}" onclick="popup(this.href, 750, 350, '_phpbbsmilies'); return false;">{L_MORE_SMILIES}</a>  		<!-- ENDIF -->  		<!-- IF BBCODE_STATUS --> -		<!-- IF .smiley --><hr /><!-- ENDIF --> -		{BBCODE_STATUS}<br /> -		<!-- IF S_BBCODE_ALLOWED --> -			{IMG_STATUS}<br /> -			{FLASH_STATUS}<br /> -			{URL_STATUS}<br /> -		<!-- ENDIF --> -		{SMILIES_STATUS} +		<div class="bbcode-status"> +			<!-- IF .smiley --><hr /><!-- ENDIF --> +			{BBCODE_STATUS}<br /> +			<!-- IF S_BBCODE_ALLOWED --> +				{IMG_STATUS}<br /> +				{FLASH_STATUS}<br /> +				{URL_STATUS}<br /> +			<!-- ENDIF --> +			{SMILIES_STATUS} +		</div>  		<!-- ENDIF -->  		<!-- IF S_EDIT_DRAFT || S_DISPLAY_REVIEW -->  			<!-- IF S_DISPLAY_REVIEW --><hr /><!-- ENDIF --> @@ -141,49 +65,25 @@  		<!-- ENDIF -->  	</div> +	<!-- EVENT posting_editor_message_before --> +  	<div id="message-box">  		<textarea <!-- IF S_UCP_ACTION and not S_PRIVMSGS and not S_EDIT_DRAFT -->name="signature" id="signature" style="height: 9em;"<!-- ELSE -->name="message" id="message"<!-- ENDIF --> rows="15" cols="76" tabindex="4" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" class="inputbox">{MESSAGE}{DRAFT_MESSAGE}{SIGNATURE}</textarea>  	</div> -</fieldset> + +	<!-- EVENT posting_editor_message_after --> +	</fieldset>  <!-- IF $EXTRA_POSTING_OPTIONS eq 1 -->  	<!-- IF not S_SHOW_DRAFTS --> -		<span class="corners-bottom"><span></span></span></div> -	</div> -	<!-- ENDIF --> - -	<!-- IF S_HAS_ATTACHMENTS --> -		<div class="panel bg2"> -			<div class="inner"><span class="corners-top"><span></span></span> -			<h3>{L_POSTED_ATTACHMENTS}</h3> - -			<fieldset class="fields2"> - -			<!-- BEGIN attach_row --> -			<dl> - -				<dt><label for="comment_list_{attach_row.ASSOC_INDEX}">{L_FILE_COMMENT}:</label></dt> -				<dd><textarea name="comment_list[{attach_row.ASSOC_INDEX}]" id="comment_list_{attach_row.ASSOC_INDEX}" rows="1" cols="35" class="inputbox">{attach_row.FILE_COMMENT}</textarea></dd> -				<dd><a href="{attach_row.U_VIEW_ATTACHMENT}">{attach_row.FILENAME}</a></dd> -				<dd style="margin-top: 5px;"> -					<!-- IF S_INLINE_ATTACHMENT_OPTIONS --><input type="button" value="{L_PLACE_INLINE}" onclick="attach_inline({attach_row.ASSOC_INDEX}, '{attach_row.A_FILENAME}');" class="button2" />  <!-- ENDIF --> -					<input type="submit" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" class="button2" /> -				</dd> -			</dl> -			{attach_row.S_HIDDEN} -				<!-- IF not attach_row.S_LAST_ROW --><hr class="dashed" /><!-- ENDIF --> -			<!-- END attach_row --> - -			</fieldset> - -			<span class="corners-bottom"><span></span></span></div>  		</div> +	</div>  	<!-- ENDIF -->  	<!-- IF not S_SHOW_DRAFTS and not $SIG_EDIT eq 1 -->  	<div class="panel bg2"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<fieldset class="submit-buttons">  			{S_HIDDEN_ADDRESS_FIELD}  			{S_HIDDEN_FIELDS} @@ -194,25 +94,36 @@  		</fieldset> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  	<!-- ENDIF -->  	<!-- IF not S_PRIVMSGS and not S_SHOW_DRAFTS and not $SIG_EDIT eq 1 --> -		<div id="tabs"> +		<div id="tabs" class="sub-panels" data-show-panel="<!-- IF SHOW_PANEL -->{SHOW_PANEL}<!-- ELSE -->options-panel<!-- ENDIF -->" role="tablist">  			<ul> -				<li id="options-panel-tab" class="activetab"><a href="#tabs" onclick="subPanels('options-panel'); return false;"><span>{L_OPTIONS}</span></a></li> -				<!-- IF S_SHOW_ATTACH_BOX --><li id="attach-panel-tab"><a href="#tabs" onclick="subPanels('attach-panel'); return false;"><span>{L_ADD_ATTACHMENT}</span></a></li><!-- ENDIF --> -				<!-- IF S_SHOW_POLL_BOX || S_POLL_DELETE --><li id="poll-panel-tab"><a href="#tabs" onclick="subPanels('poll-panel'); return false;"><span>{L_ADD_POLL}</span></a></li><!-- ENDIF --> +				<li id="options-panel-tab" class="tab activetab"><a href="#tabs" data-subpanel="options-panel" role="tab" aria-controls="options-panel"><span>{L_OPTIONS}</span></a></li> +				<!-- IF S_SHOW_ATTACH_BOX --> +					<li id="attach-panel-tab" class="tab"> +						<a href="#tabs" data-subpanel="attach-panel" role="tab" aria-controls="attach-panel"> +							{L_ATTACHMENTS} <strong id="file-total-progress"><strong id="file-total-progress-bar"></strong></strong> +						</a> +					</li> +				<!-- ENDIF --> +				<!-- IF S_SHOW_POLL_BOX || S_POLL_DELETE --> +					<li id="poll-panel-tab" class="tab"> +						<a href="#tabs" data-subpanel="poll-panel" role="tab" aria-controls="poll-panel">{L_ADD_POLL}</a> +					</li> +				<!-- ENDIF -->  			</ul>  		</div>  	<!-- ENDIF -->  	<!-- IF not S_SHOW_DRAFTS and not $SIG_EDIT eq 1 -->  	<div class="panel bg3" id="options-panel"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<fieldset class="fields1"> +			<!-- EVENT posting_editor_options_prepend -->  			<!-- IF S_BBCODE_ALLOWED -->  				<div><label for="disable_bbcode"><input type="checkbox" name="disable_bbcode" id="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label></div>  			<!-- ENDIF --> @@ -241,26 +152,37 @@  			<!-- IF S_TYPE_TOGGLE -->  			<dl> -				<dt><label for="topic_type-0"><!-- IF S_EDIT_POST -->{L_CHANGE_TOPIC_TO}<!-- ELSE -->{L_POST_TOPIC_AS}<!-- ENDIF -->:</label></dt> +				<dt><label for="topic_type-0"><!-- IF S_EDIT_POST -->{L_CHANGE_TOPIC_TO}<!-- ELSE -->{L_POST_TOPIC_AS}<!-- ENDIF -->{L_COLON}</label></dt>  				<dd><!-- BEGIN topic_type --><label for="topic_type-{topic_type.VALUE}"><input type="radio" name="topic_type" id="topic_type-{topic_type.VALUE}" value="{topic_type.VALUE}"{topic_type.S_CHECKED} />{topic_type.L_TOPIC_TYPE}</label> <!-- END topic_type --></dd>  			</dl>  			<!-- ENDIF -->  			<!-- IF S_TOPIC_TYPE_ANNOUNCE or S_TOPIC_TYPE_STICKY -->  			<dl> -				<dt><label for="topic_time_limit">{L_STICK_TOPIC_FOR}:</label></dt> -				<dd><label for="topic_time_limit"><input type="text" name="topic_time_limit" id="topic_time_limit" size="3" maxlength="3" value="{TOPIC_TIME_LIMIT}" class="inputbox autowidth" /> {L_DAYS}</label></dd> +				<dt><label for="topic_time_limit">{L_STICK_TOPIC_FOR}{L_COLON}</label></dt> +				<dd><label for="topic_time_limit"><input type="number" min="0" max="999" name="topic_time_limit" id="topic_time_limit" size="3" maxlength="3" value="{TOPIC_TIME_LIMIT}" class="inputbox autowidth" /> {L_DAYS}</label></dd>  				<dd>{L_STICK_TOPIC_FOR_EXPLAIN}</dd>  			</dl>  			<!-- ENDIF --> +			<!-- IF S_SOFTDELETE_ALLOWED or S_DELETE_ALLOWED --> +				<hr class="dashed" /> +				<dl> +					<dt><label for="delete">{L_DELETE_POST}{L_COLON}</label></dt> +					<dd><label for="delete"><input type="checkbox" name="delete" id="delete" {S_SOFTDELETE_CHECKED} /> {L_DELETE_POST_WARN}</label></dd> +					<!-- IF S_DELETE_ALLOWED and S_SOFTDELETE_ALLOWED --> +						<dd><label for="delete_permanent"><input type="checkbox" name="delete_permanent" id="delete_permanent" /> {L_DELETE_POST_PERMANENTLY}</label></dd> +					<!-- ENDIF --> +				</dl> +			<!-- ENDIF --> +  			<!-- IF S_EDIT_REASON -->  			<dl> -				<dt><label for="edit_reason">{L_EDIT_REASON}:</label></dt> +				<dt><label for="edit_reason">{L_EDIT_REASON}{L_COLON}</label></dt>  				<dd><input type="text" name="edit_reason" id="edit_reason" value="{EDIT_REASON}" class="inputbox" /></dd>  			</dl>  			<!-- ENDIF -->  		</fieldset>  		<!-- ENDIF --> -<!-- ENDIF -->
\ No newline at end of file +<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/posting_layout.html b/phpBB/styles/prosilver/template/posting_layout.html index b81c8162d7..630afdb832 100644 --- a/phpBB/styles/prosilver/template/posting_layout.html +++ b/phpBB/styles/prosilver/template/posting_layout.html @@ -1,14 +1,14 @@  <!-- INCLUDE overall_header.html -->  <!-- IF TOPIC_TITLE --> -	<h2><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2> +	<h2 class="posting-title"><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>  <!-- ELSE --> -	<h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2> +	<h2 class="posting-title"><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>   <!-- ENDIF -->  <!-- IF S_FORUM_RULES --> -	<div class="rules"> -		<div class="inner"><span class="corners-top"><span></span></span> +	<div class="rules<!-- IF U_FORUM_RULES --> rules-link<!-- ENDIF -->"> +		<div class="inner">  		<!-- IF U_FORUM_RULES -->  			<a href="{U_FORUM_RULES}">{L_FORUM_RULES}</a> @@ -17,7 +17,7 @@  			{FORUM_RULES}  		<!-- ENDIF --> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  <!-- ENDIF --> @@ -25,12 +25,12 @@  <!-- IF S_DRAFT_LOADED -->  	<div class="panel"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<h3>{L_INFORMATION}</h3>  		<p>{L_DRAFT_LOADED}</p> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  <!-- ENDIF --> @@ -40,12 +40,12 @@  <!-- IF S_UNGLOBALISE -->  	<div class="panel bg3"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<fieldset class="fields1">  			<h2>{L_SELECT_DESTINATION_FORUM}</h2>  			<p>{L_UNGLOBALISE_EXPLAIN}</p>  			<dl> -				<dt><label for="to_forum_id">{L_MOVE}:</label></dt> +				<dt><label for="to_forum_id">{L_MOVE}{L_COLON}</label></dt>  				<dd><select id="to_forum_id" name="to_forum_id">{S_FORUM_SELECT}</select></dd>  			</dl> @@ -55,21 +55,22 @@  			</dl>  		</fieldset> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  <!-- ENDIF -->  <!-- IF S_DISPLAY_PREVIEW --><!-- INCLUDE posting_preview.html --><!-- ENDIF -->  <div class="panel" id="postingbox"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<h3>{L_POST_A}</h3>  	<!-- DEFINE $EXTRA_POSTING_OPTIONS = 1 -->  	<!-- INCLUDE posting_editor.html --> +	<input type="hidden" name="show_panel" value="options-panel" />  	{S_FORM_TOKEN} -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- IF S_SHOW_ATTACH_BOX --><!-- INCLUDE posting_attach_body.html --><!-- ENDIF --> @@ -79,12 +80,5 @@  <!-- IF S_DISPLAY_REVIEW --><!-- INCLUDE posting_topic_review.html --><!-- ENDIF -->  </form> -<!-- IF not S_PRIVMSGS --> -<script type="text/javascript"> -// <![CDATA[ -	subPanels(show_panel); -// ]]> -</script> -<!-- ENDIF -->  <!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html new file mode 100644 index 0000000000..032d8c6a6f --- /dev/null +++ b/phpBB/styles/prosilver/template/posting_pm_header.html @@ -0,0 +1,83 @@ +<fieldset class="fields1"> +	<!-- IF not S_SHOW_DRAFTS --> + +		<!-- IF S_GROUP_OPTIONS --> +			<div class="column2"> +				<label for="group_list"><strong>{L_TO_ADD_GROUPS}{L_COLON}</strong></label><br /> +				<select name="group_list[]" id="group_list" multiple="multiple" size="3" class="inputbox">{S_GROUP_OPTIONS}</select><br /> +			</div> +		<!-- ENDIF --> +		<!-- IF S_ALLOW_MASS_PM --> +		<div class="column1"> +			<!-- IF not S_EDIT_POST --> +			<dl class="pmlist"> +				<dt><label><strong>{L_TO_ADD_MASS}{L_COLON}</strong><textarea id="username_list" name="username_list" class="inputbox" cols="50" rows="2" tabindex="1"></textarea></label></dt> +				<dd class="recipients"> +				<input type="submit" name="add_to" value="{L_ADD}" class="button2" tabindex="1" /> +				<input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" tabindex="1" /> +				<!-- EVENT posting_pm_header_find_username_before --> +				<span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></span> +				<!-- EVENT posting_pm_header_find_username_after --> +				</dd> +			</dl> +			<!-- ENDIF --> +		</div> +		<!-- IF .to_recipient or .bcc_recipient --><hr /><!-- ENDIF --> +		<div class="column1"> +			<!-- IF .to_recipient --> +				<dl> +					<dt><label>{L_TO_MASS}{L_COLON}</label></dt> +					<dd class="recipients"> +					<ul class="recipients"> +						<!-- BEGIN to_recipient --> +						<li> +							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF --> +							<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF --> +						</li> +						<!-- END to_recipient --> +					</ul> +					</dd> +				</dl> +			<!-- ENDIF --> +		</div> +			<!-- IF .bcc_recipient --> +			<div class="column2"> +				<dl> +					<dt><label>{L_BCC}{L_COLON}</label></dt> +					<dd class="recipients"> +					<ul class="recipients"> +						<!-- BEGIN bcc_recipient --> +						<li> +							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF --> +							<!-- IF bcc_recipient.IS_GROUP --><a href="{bcc_recipient.U_VIEW}"><strong>{bcc_recipient.NAME}</strong></a><!-- ELSE -->{bcc_recipient.NAME_FULL}<!-- ENDIF --> +						</li> +						<!-- END bcc_recipient --> +					</ul> +					</dd> +				</dl> +			</div> +			<!-- ENDIF --> +		<!-- ELSE --> +		<div class="column1"> +			<dl> +				<dt><label for="username_list">{L_TO_ADD}{L_COLON}</label><!-- IF not S_EDIT_POST --><br /><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false">{L_FIND_USERNAME}</a></span><!-- ENDIF --></dt> +				<!-- IF not S_EDIT_POST --> +				<dd><input class="inputbox" type="text" name="username_list" id="username_list" size="20" value="" /> <input type="submit" name="add_to" value="{L_ADD}" class="button2" /></dd> +				<!-- ENDIF --> +				<!-- IF .to_recipient --> +					<dd class="recipients"> +					<ul class="recipients"> +						<!-- BEGIN to_recipient --> +						<li> +							<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF -->  +							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF --> +						</li> +						<!-- END to_recipient --> +					</dd> +				<!-- ENDIF --> +			</dl> +		</div> +		<!-- ENDIF --> + +	<!-- ENDIF --> +	</fieldset> diff --git a/phpBB/styles/prosilver/template/posting_pm_layout.html b/phpBB/styles/prosilver/template/posting_pm_layout.html index 48812da102..3bdadd06ca 100644 --- a/phpBB/styles/prosilver/template/posting_pm_layout.html +++ b/phpBB/styles/prosilver/template/posting_pm_layout.html @@ -2,12 +2,12 @@  <!-- IF S_DRAFT_LOADED -->  	<div class="panel"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<h3>{L_INFORMATION}</h3>  		<p>{L_DRAFT_LOADED_PM}</p> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  <!-- ENDIF --> @@ -15,15 +15,21 @@  <!-- IF S_DISPLAY_PREVIEW --><!-- INCLUDE posting_preview.html --><!-- ENDIF --> -<h2>{L_TITLE}</h2> +<h2 class="posting-title">{L_TITLE}</h2> + +<div class="panel" id="pmheader-postingbox"> +	<div class="inner"> +	<!-- INCLUDE posting_pm_header.html --> +	</div> +</div>  <div class="panel" id="postingbox"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<!-- DEFINE $EXTRA_POSTING_OPTIONS = 1 -->  	<!-- INCLUDE posting_editor.html --> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- IF S_SHOW_ATTACH_BOX --><!-- INCLUDE posting_attach_body.html --><!-- ENDIF --> @@ -32,4 +38,4 @@  <!-- IF S_DISPLAY_HISTORY --><!-- INCLUDE ucp_pm_history.html --><!-- ENDIF --> -<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/posting_poll_body.html b/phpBB/styles/prosilver/template/posting_poll_body.html index ba0014ce57..a131c10533 100644 --- a/phpBB/styles/prosilver/template/posting_poll_body.html +++ b/phpBB/styles/prosilver/template/posting_poll_body.html @@ -1,5 +1,5 @@  <div class="panel bg3" id="poll-panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<!-- IF S_SHOW_POLL_BOX -->  	<p>{L_ADD_POLL_EXPLAIN}</p> @@ -9,48 +9,48 @@  	<!-- IF S_SHOW_POLL_BOX -->  		<!-- IF S_POLL_DELETE -->  			<dl> -				<dt><label for="poll_delete">{L_POLL_DELETE}:</label></dt> +				<dt><label for="poll_delete">{L_POLL_DELETE}{L_COLON}</label></dt>  				<dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /> </label></dd>  			</dl>  		<!-- ENDIF -->  		<dl> -			<dt><label for="poll_title">{L_POLL_QUESTION}:</label></dt> +			<dt><label for="poll_title">{L_POLL_QUESTION}{L_COLON}</label></dt>  			<dd><input type="text" name="poll_title" id="poll_title" maxlength="255" value="{POLL_TITLE}" class="inputbox" /></dd>  		</dl>  		<dl> -			<dt><label for="poll_option_text">{L_POLL_OPTIONS}:</label><br /><span>{L_POLL_OPTIONS_EXPLAIN}</span></dt> +			<dt><label for="poll_option_text">{L_POLL_OPTIONS}{L_COLON}</label><br /><span>{L_POLL_OPTIONS_EXPLAIN}</span></dt>  			<dd><textarea name="poll_option_text" id="poll_option_text" rows="5" cols="35" class="inputbox">{POLL_OPTIONS}</textarea></dd>  		</dl>  		<hr class="dashed" />  		<dl> -			<dt><label for="poll_max_options">{L_POLL_MAX_OPTIONS}:</label></dt> -			<dd><input type="text" name="poll_max_options" id="poll_max_options" size="3" maxlength="3" value="{POLL_MAX_OPTIONS}" class="inputbox autowidth" /></dd> +			<dt><label for="poll_max_options">{L_POLL_MAX_OPTIONS}{L_COLON}</label></dt> +			<dd><input type="number" min="0" max="999" name="poll_max_options" id="poll_max_options" size="3" maxlength="3" value="{POLL_MAX_OPTIONS}" class="inputbox autowidth" /></dd>  			<dd>{L_POLL_MAX_OPTIONS_EXPLAIN}</dd>  		</dl>  		<dl> -			<dt><label for="poll_length">{L_POLL_FOR}:</label></dt> -			<dd><label for="poll_length"><input type="text" name="poll_length" id="poll_length" size="3" maxlength="3" value="{POLL_LENGTH}" class="inputbox autowidth" /> {L_DAYS}</label></dd> +			<dt><label for="poll_length">{L_POLL_FOR}{L_COLON}</label></dt> +			<dd><label for="poll_length"><input type="number" min="0" max="999" name="poll_length" id="poll_length" size="3" maxlength="3" value="{POLL_LENGTH}" class="inputbox autowidth" /> {L_DAYS}</label></dd>  			<dd>{L_POLL_FOR_EXPLAIN}</dd>  		</dl>  		<!-- IF S_POLL_VOTE_CHANGE -->  			<hr class="dashed" /> -			 +  			<dl> -				<dt><label for="poll_vote_change">{L_POLL_VOTE_CHANGE}:</label></dt> +				<dt><label for="poll_vote_change">{L_POLL_VOTE_CHANGE}{L_COLON}</label></dt>  				<dd><label for="poll_vote_change"><input type="checkbox" id="poll_vote_change" name="poll_vote_change"{VOTE_CHANGE_CHECKED} /> {L_POLL_VOTE_CHANGE_EXPLAIN}</label></dd>  			</dl>  		<!-- ENDIF -->  	<!-- ELSEIF S_POLL_DELETE -->  		<dl class="fields1"> -			<dt><label for="poll_delete">{L_POLL_DELETE}:</label></dt> +			<dt><label for="poll_delete">{L_POLL_DELETE}{L_COLON}</label></dt>  			<dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /> </label></dd>  		</dl>  	<!-- ENDIF -->  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div> diff --git a/phpBB/styles/prosilver/template/posting_preview.html b/phpBB/styles/prosilver/template/posting_preview.html index 82227c23b0..a5aae8c436 100644 --- a/phpBB/styles/prosilver/template/posting_preview.html +++ b/phpBB/styles/prosilver/template/posting_preview.html @@ -1,9 +1,9 @@  <div class="post <!-- IF S_PRIVMSGS -->pm<!-- ELSE -->bg2<!-- ENDIF -->" id="preview"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  <!-- IF S_HAS_POLL_OPTIONS -->  	<div class="content"> -		<h2>{L_PREVIEW}: {POLL_QUESTION}</h2> +		<h2>{L_PREVIEW}{L_COLON} {POLL_QUESTION}</h2>  		<p class="author"><!-- IF L_POLL_LENGTH -->{L_POLL_LENGTH}<br /><!-- ENDIF -->{L_MAX_VOTES}</p>  		<fieldset class="polls"> @@ -16,16 +16,16 @@  		</fieldset>  	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <div class="post bg2"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  <!-- ENDIF -->  	<div class="postbody"> -		<h3>{L_PREVIEW}: {PREVIEW_SUBJECT}</h3> +		<h3>{L_PREVIEW}{L_COLON} {PREVIEW_SUBJECT}</h3>  		<div class="content">{PREVIEW_MESSAGE}</div> @@ -41,7 +41,7 @@  		<!-- IF PREVIEW_SIGNATURE --><div class="signature">{PREVIEW_SIGNATURE}</div><!-- ENDIF -->  	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <hr /> diff --git a/phpBB/styles/prosilver/template/posting_review.html b/phpBB/styles/prosilver/template/posting_review.html index 78b994c989..25b719420b 100644 --- a/phpBB/styles/prosilver/template/posting_review.html +++ b/phpBB/styles/prosilver/template/posting_review.html @@ -5,11 +5,11 @@  <!-- BEGIN post_review_row -->  <!-- IF post_review_row.S_IGNORE_POST -->  <div class="post bg3 post-ignore"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  		{post_review_row.L_IGNORE_POST}  <!-- ELSE --> -<div class="post <!-- IF post_review_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF post_review_row.ONLINE_STATUS --> online<!-- ENDIF -->"> -	<div class="inner"><span class="corners-top"><span></span></span> +<div class="post <!-- IF post_review_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> +	<div class="inner">  <!-- ENDIF -->  	<div class="postbody" id="ppr{post_review_row.POST_ID}"> @@ -28,8 +28,8 @@  	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- END post_review_row --> -<hr />
\ No newline at end of file +<hr /> diff --git a/phpBB/styles/prosilver/template/posting_smilies.html b/phpBB/styles/prosilver/template/posting_smilies.html index d45b185ed3..3bd51275ec 100644 --- a/phpBB/styles/prosilver/template/posting_smilies.html +++ b/phpBB/styles/prosilver/template/posting_smilies.html @@ -6,18 +6,22 @@  	var text_name = opener.text_name;  // ]]>  </script> -<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/editor.js"></script> +<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->  <h2>{L_SMILIES}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  		<!-- BEGIN smiley -->   			<a href="#" onclick="initInsertions(); insert_text('{smiley.A_SMILEY_CODE}', true, true); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" /></a>  -		<!-- END smiley	--> +		<!-- END smiley --> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div> -<div>{PAGINATION}</div> -<a  href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a> +<!-- IF .pagination -->  +	<div class="pagination"> +		<!-- INCLUDE pagination.html --> +	</div> +<!-- ENDIF --> +<a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a> -<!-- INCLUDE simple_footer.html -->
\ No newline at end of file +<!-- INCLUDE simple_footer.html --> diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html index a05f057e21..6909877196 100644 --- a/phpBB/styles/prosilver/template/posting_topic_review.html +++ b/phpBB/styles/prosilver/template/posting_topic_review.html @@ -1,7 +1,7 @@  <h3 id="review">  	<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span> -	{L_TOPIC_REVIEW}: {TOPIC_TITLE} +	{L_TOPIC_REVIEW}{L_COLON} {TOPIC_TITLE}  </h3>  <div id="topicreview"> @@ -14,21 +14,35 @@  	<!-- IF topic_review_row.S_IGNORE_POST -->  	<div class="post bg3 post-ignore"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  			{topic_review_row.L_IGNORE_POST}  	<!-- ELSE --> -	<div class="post <!-- IF topic_review_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> -		<div class="inner"><span class="corners-top"><span></span></span> +	<div class="post <!-- IF topic_review_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF topic_review_row.POST_ID == REPORTED_POST_ID --> reported<!-- ENDIF -->"> +		<div class="inner">  	<!-- ENDIF -->  		<div class="postbody" id="pr{topic_review_row.POST_ID}"> +			<h3><a href="#pr{topic_review_row.POST_ID}">{topic_review_row.POST_SUBJECT}</a></h3> + +			<!-- IF (topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE) or topic_review_row.U_MCP_DETAILS --> +			<ul class="post-buttons"> +			<!-- IF topic_review_row.U_MCP_DETAILS --> +				<li> +					<a href="{topic_review_row.U_MCP_DETAILS}" title="{L_POST_DETAILS}" class="button icon-button info-icon"> +						<span>{L_POST_DETAILS}</span> +					</a> +				<li> +			<!-- ENDIF -->  			<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE --> -			<ul class="profile-icons"> -				<li class="quote-icon"><a href="#postingbox" onclick="addquote({topic_review_row.POST_ID}, '{topic_review_row.POSTER_QUOTE}', '{LA_WROTE}');" title="{L_QUOTE} {topic_review_row.POST_AUTHOR}"><span>{L_QUOTE} {topic_review_row.POST_AUTHOR}</span></a></li> +				<li> +					<a href="#postingbox" onclick="addquote({topic_review_row.POST_ID}, '{topic_review_row.POSTER_QUOTE}', '{LA_WROTE}');" title="{L_QUOTE} {topic_review_row.POST_AUTHOR}" class="button icon-button quote-icon"> +						<span>{L_QUOTE} {topic_review_row.POST_AUTHOR}</span> +					</a> +				</li> +			<!-- ENDIF -->  			</ul>  			<!-- ENDIF --> -			<!-- IF topic_review_row.U_MCP_DETAILS --><div class="right-box"><a href="{topic_review_row.U_MCP_DETAILS}">{L_POST_DETAILS}</a></div><!-- ENDIF --> -			<h3><a href="#pr{topic_review_row.POST_ID}">{topic_review_row.POST_SUBJECT}</a></h3> +  			<p class="author"><!-- IF S_IS_BOT -->{topic_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{topic_review_row.U_MINI_POST}">{topic_review_row.MINI_POST_IMG}</a><!-- ENDIF --> {L_POST_BY_AUTHOR} <strong>{topic_review_row.POST_AUTHOR_FULL}</strong> » {topic_review_row.POST_DATE}  </p>  			<div class="content">{topic_review_row.MESSAGE}</div> @@ -45,7 +59,7 @@  				<div id="message_{topic_review_row.POST_ID}" style="display: none;">{topic_review_row.DECODED_MESSAGE}</div>  			<!-- ENDIF -->  		</div> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  	<!-- END topic_review_row -->  </div> @@ -56,4 +70,4 @@  	<p><a href="#report" class="top2">{L_BACK_TO_TOP}</a></p>  <!-- ELSE -->  	<p><a href="#postingbox" class="top2">{L_BACK_TO_TOP}</a></p> -<!-- ENDIF -->
\ No newline at end of file +<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/profilefields/bool.html b/phpBB/styles/prosilver/template/profilefields/bool.html new file mode 100644 index 0000000000..f1d7ba75f4 --- /dev/null +++ b/phpBB/styles/prosilver/template/profilefields/bool.html @@ -0,0 +1,7 @@ +<!-- BEGIN bool --> +<!-- IF bool.FIELD_LENGTH eq 1 --> +	<!-- BEGIN options --><label for="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}"><input type="radio" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}" value="{bool.options.OPTION_ID}"{bool.options.CHECKED} /> {bool.options.VALUE}</label> <!-- END options --> +<!-- ELSE --> +	<input type="checkbox" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}"<!-- IF bool.FIELD_VALUE --> checked="checked"<!-- ENDIF --> /> +<!-- ENDIF --> +<!-- END bool --> diff --git a/phpBB/styles/prosilver/template/profilefields/date.html b/phpBB/styles/prosilver/template/profilefields/date.html new file mode 100644 index 0000000000..5d5bc04ed6 --- /dev/null +++ b/phpBB/styles/prosilver/template/profilefields/date.html @@ -0,0 +1,5 @@ +<!-- BEGIN date --> +<label for="{date.FIELD_IDENT}_day">{L_DAY}{L_COLON} <select name="{date.FIELD_IDENT}_day" id="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select></label> +<label for="{date.FIELD_IDENT}_month">{L_MONTH}{L_COLON} <select name="{date.FIELD_IDENT}_month" id="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select></label> +<label for="{date.FIELD_IDENT}_year">{L_YEAR}{L_COLON} <select name="{date.FIELD_IDENT}_year" id="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select></label> +<!-- END date --> diff --git a/phpBB/styles/prosilver/template/profilefields/dropdown.html b/phpBB/styles/prosilver/template/profilefields/dropdown.html new file mode 100644 index 0000000000..243b7039da --- /dev/null +++ b/phpBB/styles/prosilver/template/profilefields/dropdown.html @@ -0,0 +1,5 @@ +<!-- BEGIN dropdown --> +<select name="{dropdown.FIELD_IDENT}" id="{dropdown.FIELD_IDENT}"> +	<!-- BEGIN options --><option value="{dropdown.options.OPTION_ID}"{dropdown.options.SELECTED}>{dropdown.options.VALUE}</option><!-- END options --> +</select> +<!-- END dropdown --> diff --git a/phpBB/styles/prosilver/template/profilefields/int.html b/phpBB/styles/prosilver/template/profilefields/int.html new file mode 100644 index 0000000000..a6f9a0a49e --- /dev/null +++ b/phpBB/styles/prosilver/template/profilefields/int.html @@ -0,0 +1,3 @@ +<!-- BEGIN int --> +<input type="number" min="{int.FIELD_MINLEN}" max="{int.FIELD_MAXLEN}" class="inputbox autowidth" name="{int.FIELD_IDENT}" id="{int.FIELD_IDENT}" size="{int.FIELD_LENGTH}" value="{int.FIELD_VALUE}" /> +<!-- END int --> diff --git a/phpBB/styles/prosilver/template/profilefields/string.html b/phpBB/styles/prosilver/template/profilefields/string.html new file mode 100644 index 0000000000..cf457d39ad --- /dev/null +++ b/phpBB/styles/prosilver/template/profilefields/string.html @@ -0,0 +1,3 @@ +<!-- BEGIN string --> +<input type="text" class="inputbox autowidth" name="{string.FIELD_IDENT}" id="{string.FIELD_IDENT}" size="{string.FIELD_LENGTH}" maxlength="{string.FIELD_MAXLEN}" value="{string.FIELD_VALUE}" /> +<!-- END string --> diff --git a/phpBB/styles/prosilver/template/profilefields/text.html b/phpBB/styles/prosilver/template/profilefields/text.html new file mode 100644 index 0000000000..f54c63925c --- /dev/null +++ b/phpBB/styles/prosilver/template/profilefields/text.html @@ -0,0 +1,3 @@ +<!-- BEGIN text --> +<textarea name="{text.FIELD_IDENT}" id="{text.FIELD_IDENT}" rows="{text.FIELD_ROWS}" cols="{text.FIELD_COLS}" class="inputbox">{text.FIELD_VALUE}</textarea> +<!-- END text --> diff --git a/phpBB/styles/prosilver/template/profilefields/url.html b/phpBB/styles/prosilver/template/profilefields/url.html new file mode 100644 index 0000000000..8dd3a90de1 --- /dev/null +++ b/phpBB/styles/prosilver/template/profilefields/url.html @@ -0,0 +1,3 @@ +<!-- BEGIN url --> +<input type="url" class="inputbox autowidth" name="{url.FIELD_IDENT}" id="{url.FIELD_IDENT}" size="{url.FIELD_LENGTH}" maxlength="{url.FIELD_MAXLEN}" value="{url.FIELD_VALUE}" /> +<!-- END url --> diff --git a/phpBB/styles/prosilver/template/quickreply_editor.html b/phpBB/styles/prosilver/template/quickreply_editor.html index ea07c2e6d8..6a8846626e 100644 --- a/phpBB/styles/prosilver/template/quickreply_editor.html +++ b/phpBB/styles/prosilver/template/quickreply_editor.html @@ -1,79 +1,26 @@ -<script type="text/javascript"> -// <![CDATA[ -	function hide_qr(show) -	{ -		dE('qr_editor_div'); -		dE('qr_showeditor_div'); -		if (show && document.getElementById('qr_editor_div').style.display != 'none') -		{ -			document.getElementsByName('message')[0].focus(); -		} -		return true; -	} - - -	function init_qr() -	{ -		dE('qr_showeditor_div'); -		return true; -	} -	onload_functions.push('init_qr();'); -	// ]]> -</script> -<noscript> -	<form method="post" action="{U_QR_ACTION}"> -		<div class="panel" id="qr_ns_editor_div"> -			<div class="inner"><span class="corners-top"><span></span></span> -					<h2>{L_QUICKREPLY}</h2> -					<fieldset class="fields1"> -						<dl style="clear: left;"> -							<dt><label for="subject">{L_SUBJECT}:</label></dt> -							<dd><input type="text" name="subject" id="subject-ns" size="45" maxlength="64" tabindex="2" value="{SUBJECT}" class="inputbox autowidth" /></dd> -						</dl> -					<div id="message-box-ns"> -						<textarea style="height: 9em;" name="message" rows="7" cols="76" tabindex="3" class="inputbox"></textarea> -					</div> -					</fieldset> -					<fieldset class="submit-buttons"> -						{S_FORM_TOKEN} -						{QR_HIDDEN_FIELDS} -						<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />  -						<input type="submit" accesskey="f" tabindex="7" name="full_editor" value="{L_FULL_EDITOR}" class="button2" />  -					</fieldset> -			<span class="corners-bottom"><span></span></span></div> -		</div> -	</form> -</noscript> -<form method="post" action="{U_QR_ACTION}"> -	<div class="panel" style="display: none" id="qr_editor_div"> -		<div class="inner"><span class="corners-top"><span></span></span> -				<h2>{L_QUICKREPLY}</h2> +<form method="post" action="{U_QR_ACTION}" id="qr_postform"> +<!-- EVENT quickreply_editor_panel_before --> +	<div class="panel"> +		<div class="inner"> +				<h2 class="quickreply-title">{L_QUICKREPLY}</h2>  				<fieldset class="fields1">  					<dl style="clear: left;"> -						<dt><label for="subject">{L_SUBJECT}:</label></dt> -						<dd><input type="text" name="subject" id="subject" size="45" maxlength="64" tabindex="2" value="{SUBJECT}" class="inputbox autowidth" /></dd> +						<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt> +						<dd><input type="text" name="subject" id="subject" size="45" maxlength="124" tabindex="2" value="{SUBJECT}" class="inputbox autowidth" /></dd>  					</dl> +				<!-- EVENT quickreply_editor_message_before -->  				<div id="message-box">  					<textarea style="height: 9em;" name="message" rows="7" cols="76" tabindex="3" class="inputbox"></textarea>  				</div> +				<!-- EVENT quickreply_editor_message_after -->  				</fieldset>  				<fieldset class="submit-buttons">  					{S_FORM_TOKEN}  					{QR_HIDDEN_FIELDS} -					<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />  -					<input type="submit" accesskey="f" tabindex="7" name="full_editor" value="{L_FULL_EDITOR}" class="button2" />  +					<input type="submit" accesskey="f" tabindex="6" name="preview" value="{L_FULL_EDITOR}" class="button2" id="qr_full_editor" />  +					<input type="submit" accesskey="s" tabindex="7" name="post" value="{L_SUBMIT}" class="button1" />   				</fieldset> -				<a href="" class="right-box up" onclick="hide_qr(false); return false;" title="{L_COLLAPSE_QR}">{L_COLLAPSE_QR}</a> -		<span class="corners-bottom"><span></span></span></div> -	</div> -	<div class="panel" style="display: none" id="qr_showeditor_div" > -		<div class="inner"><span class="corners-top"><span></span></span> - -			<div class="content"> -				<fieldset class="submit-buttons"> -					<input type="submit" name="show_qr" tabindex="1" class="button2" value="{L_SHOW_QR}" onclick="hide_qr(true);return false;"/> -				</fieldset> -			</div> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div> +<!-- EVENT quickreply_editor_panel_after -->  </form> diff --git a/phpBB/styles/prosilver/template/report_body.html b/phpBB/styles/prosilver/template/report_body.html index 2d6a857afb..2a5e6c9d0e 100644 --- a/phpBB/styles/prosilver/template/report_body.html +++ b/phpBB/styles/prosilver/template/report_body.html @@ -4,7 +4,7 @@  <form method="post" action="{S_REPORT_ACTION}" id="report">  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<div class="content">  		<p><!-- IF S_REPORT_POST -->{L_REPORT_POST_EXPLAIN}<!-- ELSE -->{L_REPORT_MESSAGE_EXPLAIN}<!-- ENDIF --></p> @@ -12,12 +12,12 @@  		<fieldset>  		<!-- IF ERROR --><dl><dd class="error">{ERROR}</dd></dl><!-- ENDIF -->  		<dl class="fields2"> -			<dt><label for="reason_id">{L_REASON}:</label></dt> +			<dt><label for="reason_id">{L_REASON}{L_COLON}</label></dt>  			<dd><select name="reason_id" id="reason_id" class="full"><!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason --></select></dd>  		</dl>  		<!-- IF S_CAN_NOTIFY -->  			<dl class="fields2"> -				<dt><label for="notify1">{L_REPORT_NOTIFY}:</label><br /><span>{L_REPORT_NOTIFY_EXPLAIN}</span></dt> +				<dt><label for="notify1">{L_REPORT_NOTIFY}{L_COLON}</label><br /><span>{L_REPORT_NOTIFY_EXPLAIN}</span></dt>  				<dd>  					<label for="notify1"><input type="radio" name="notify" id="notify1" value="1" <!-- IF not S_NOTIFY -->checked="checked"<!-- ENDIF --> /> {L_YES}</label>   					<label for="notify0"><input type="radio" name="notify" id="notify0" value="0" <!-- IF S_NOTIFY -->checked="checked"<!-- ENDIF --> /> {L_NO}</label> @@ -25,7 +25,7 @@  			</dl>  		<!-- ENDIF -->  		<dl class="fields2"> -			<dt><label for="report_text">{L_MORE_INFO}:</label><br /><span>{L_CAN_LEAVE_BLANK}</span></dt> +			<dt><label for="report_text">{L_MORE_INFO}{L_COLON}</label><br /><span>{L_CAN_LEAVE_BLANK}</span></dt>  			<dd><textarea name="report_text" id="report_text" rows="10" cols="76" class="inputbox">{REPORT_TEXT}</textarea></dd>  		</dl>  		<!-- IF CAPTCHA_TEMPLATE --> @@ -34,11 +34,11 @@  		</fieldset>  	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<div class="content">  		<fieldset class="submit-buttons"> @@ -48,8 +48,8 @@  		</fieldset>  	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  </form> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/prosilver/template/search_body.html b/phpBB/styles/prosilver/template/search_body.html index 4b1d30d77d..2f15830eb1 100644 --- a/phpBB/styles/prosilver/template/search_body.html +++ b/phpBB/styles/prosilver/template/search_body.html @@ -1,54 +1,48 @@  <!-- INCLUDE overall_header.html --> -<script type="text/javascript"> -// <![CDATA[ -	onload_functions.push('document.getElementById("keywords").focus();'); -// ]]> -</script> -  <h2 class="solo">{L_SEARCH}</h2> -<form method="get" action="{S_SEARCH_ACTION}"> +<form method="get" action="{S_SEARCH_ACTION}" data-focus="keywords">  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<h3>{L_SEARCH_QUERY}</h3>  	<fieldset>  	<dl> -		<dt><label for="keywords">{L_SEARCH_KEYWORDS}:</label><br /><span>{L_SEARCH_KEYWORDS_EXPLAIN}</span></dt> -		<dd><input type="text" class="inputbox" name="keywords" id="keywords" size="40" title="{L_SEARCH_KEYWORDS}" /></dd> +		<dt><label for="keywords">{L_SEARCH_KEYWORDS}{L_COLON}</label><br /><span>{L_SEARCH_KEYWORDS_EXPLAIN}</span></dt> +		<dd><input type="search" class="inputbox" name="keywords" id="keywords" size="40" title="{L_SEARCH_KEYWORDS}" /></dd>  		<dd><label for="terms1"><input type="radio" name="terms" id="terms1" value="all" checked="checked" /> {L_SEARCH_ALL_TERMS}</label></dd>  		<dd><label for="terms2"><input type="radio" name="terms" id="terms2" value="any" /> {L_SEARCH_ANY_TERMS}</label></dd>  	</dl>  	<dl> -		<dt><label for="author">{L_SEARCH_AUTHOR}:</label><br /><span>{L_SEARCH_AUTHOR_EXPLAIN}</span></dt> -		<dd><input type="text" class="inputbox" name="author" id="author" size="40" title="{L_SEARCH_AUTHOR}" /></dd> +		<dt><label for="author">{L_SEARCH_AUTHOR}{L_COLON}</label><br /><span>{L_SEARCH_AUTHOR_EXPLAIN}</span></dt> +		<dd><input type="search" class="inputbox" name="author" id="author" size="40" title="{L_SEARCH_AUTHOR}" /></dd>  	</dl>  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <div class="panel bg2"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<h3>{L_SEARCH_OPTIONS}</h3>  	<fieldset>  	<dl> -		<dt><label for="search_forum">{L_SEARCH_FORUMS}:</label><br /><span>{L_SEARCH_FORUMS_EXPLAIN}</span></dt> +		<dt><label for="search_forum">{L_SEARCH_FORUMS}{L_COLON}</label><br /><span>{L_SEARCH_FORUMS_EXPLAIN}</span></dt>  		<dd><select name="fid[]" id="search_forum" multiple="multiple" size="8" title="{L_SEARCH_FORUMS}">{S_FORUM_OPTIONS}</select></dd>  	</dl>  	<dl> -		<dt><label for="search_child1">{L_SEARCH_SUBFORUMS}:</label></dt> +		<dt><label for="search_child1">{L_SEARCH_SUBFORUMS}{L_COLON}</label></dt>  		<dd>  			<label for="search_child1"><input type="radio" name="sc" id="search_child1" value="1" checked="checked" /> {L_YES}</label>  			<label for="search_child2"><input type="radio" name="sc" id="search_child2" value="0" /> {L_NO}</label>  		</dd>  	</dl>  	<dl> -		<dt><label for="sf1">{L_SEARCH_WITHIN}:</label></dt> +		<dt><label for="sf1">{L_SEARCH_WITHIN}{L_COLON}</label></dt>  		<dd><label for="sf1"><input type="radio" name="sf" id="sf1" value="all" checked="checked" /> {L_SEARCH_TITLE_MSG}</label></dd>  		<dd><label for="sf2"><input type="radio" name="sf" id="sf2" value="msgonly" /> {L_SEARCH_MSG_ONLY}</label></dd>  		<dd><label for="sf3"><input type="radio" name="sf" id="sf3" value="titleonly" /> {L_SEARCH_TITLE_ONLY}</label></dd> @@ -58,50 +52,50 @@  	<hr class="dashed" />  	<dl> -		<dt><label for="show_results1">{L_DISPLAY_RESULTS}:</label></dt> +		<dt><label for="show_results1">{L_DISPLAY_RESULTS}{L_COLON}</label></dt>  		<dd>  			<label for="show_results1"><input type="radio" name="sr" id="show_results1" value="posts" checked="checked" /> {L_POSTS}</label>  			<label for="show_results2"><input type="radio" name="sr" id="show_results2" value="topics" /> {L_TOPICS}</label>  		</dd>  	</dl>  	<dl> -		<dt><label for="sd">{L_RESULT_SORT}:</label></dt> +		<dt><label for="sd">{L_RESULT_SORT}{L_COLON}</label></dt>  		<dd>{S_SELECT_SORT_KEY}   			<label for="sa"><input type="radio" name="sd" id="sa" value="a" /> {L_SORT_ASCENDING}</label>  			<label for="sd"><input type="radio" name="sd" id="sd" value="d" checked="checked" /> {L_SORT_DESCENDING}</label>  		</dd>  	</dl>  	<dl> -		<dt><label>{L_RESULT_DAYS}:</label></dt> +		<dt><label>{L_RESULT_DAYS}{L_COLON}</label></dt>  		<dd>{S_SELECT_SORT_DAYS}</dd>  	</dl>  	<dl> -		<dt><label>{L_RETURN_FIRST}:</label></dt> +		<dt><label>{L_RETURN_FIRST}{L_COLON}</label></dt>  		<dd><select name="ch" title="{L_RETURN_FIRST}">{S_CHARACTER_OPTIONS}</select> {L_POST_CHARACTERS}</dd>  	</dl>  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <div class="panel bg3"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<fieldset class="submit-buttons">  		{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />   		<input type="submit" name="submit" value="{L_SEARCH}" class="button1" />  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  </form>  <!-- IF .recentsearch -->  <div class="forumbg forumbg-table"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner"> -	<table class="table1" cellspacing="1"> +	<table class="table1">  	<thead>  	<tr>  		<th colspan="2" class="name">{L_RECENT_SEARCHES}</th> @@ -111,7 +105,7 @@  	<!-- BEGIN recentsearch -->  		<tr class="<!-- IF recentsearch.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">  			<td><a href="{recentsearch.U_KEYWORDS}">{recentsearch.KEYWORDS}</a></td> -			<td class="active"><span> {recentsearch.TIME}</span></td> +			<td class="active">{recentsearch.TIME}</td>  		</tr>  	<!-- BEGINELSE -->  		<tr class="bg1"> @@ -121,7 +115,7 @@  	</tbody>  	</table> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index 0ea9d8a047..970a7bcdd1 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -1,35 +1,40 @@  <!-- INCLUDE overall_header.html --> -<h2><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE -->{SEARCH_MATCHES}<!-- ENDIF --><!-- IF SEARCH_WORDS -->: <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2> -<!-- IF SEARCHED_QUERY --> <p>{L_SEARCHED_QUERY}: <strong>{SEARCHED_QUERY}</strong></p><!-- ENDIF --> -<!-- IF IGNORED_WORDS --> <p>{L_IGNORED_TERMS}: <strong>{IGNORED_WORDS}</strong></p><!-- ENDIF --> +<h2 class="searchresults-title"><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE -->{SEARCH_MATCHES}<!-- ENDIF --><!-- IF SEARCH_WORDS -->{L_COLON} <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2> +<!-- IF SEARCHED_QUERY --> <p>{L_SEARCHED_QUERY}{L_COLON} <strong>{SEARCHED_QUERY}</strong></p><!-- ENDIF --> +<!-- IF IGNORED_WORDS --> <p>{L_IGNORED_TERMS}{L_COLON} <strong>{IGNORED_WORDS}</strong></p><!-- ENDIF --> +<!-- IF PHRASE_SEARCH_DISABLED --> <p><strong>{L_PHRASE_SEARCH_DISABLED}</strong></p><!-- ENDIF -->  <!-- IF SEARCH_TOPIC --> -	<p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}">{L_RETURN_TO}: {SEARCH_TOPIC}</a></p> +	<p><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}">{L_RETURN_TO_TOPIC}</a></p>  <!-- ELSE --> -	<p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}">{L_RETURN_TO_SEARCH_ADV}</a></p> +	<p><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}">{L_GO_TO_SEARCH_ADV}</a></p>  <!-- ENDIF --> -<!-- IF PAGINATION or SEARCH_MATCHES or PAGE_NUMBER --> -	<form method="post" action="{S_SEARCH_ACTION}"> - -	<div class="topic-actions"> +<!-- IF .pagination or SEARCH_MATCHES or TOTAL_MATCHES or PAGE_NUMBER --> +	<div class="action-bar top"> -	<!-- IF SEARCH_MATCHES --> +	<!-- IF TOTAL_MATCHES > 0 -->  		<div class="search-box"> -			<!-- IF SEARCH_IN_RESULTS --> -				<label for="add_keywords">{L_SEARCH_IN_RESULTS}: <input type="text" name="add_keywords" id="add_keywords" value="" class="inputbox narrow" /></label> -				<input class="button2" type="submit" name="submit" value="{L_SEARCH}" /> -			<!-- ENDIF --> +			<form method="post" action="{S_SEARCH_ACTION}"> +			<fieldset> +				<input class="inputbox search tiny" type="search" name="add_keywords" id="add_keywords" value="" placeholder="{L_SEARCH_IN_RESULTS}" /> +				<button class="button icon-button search-icon" type="submit" title="{L_SEARCH}">{L_SEARCH}</button> +				<a href="{U_SEARCH}" class="button icon-button search-adv-icon" title="{L_SEARCH_ADV}">{L_SEARCH_ADV}</a> +			</fieldset> +			</form>  		</div>  	<!-- ENDIF --> -		<div class="rightside pagination"> -			{SEARCH_MATCHES}<!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --> +		<div class="pagination"> +			{SEARCH_MATCHES} +			<!-- IF .pagination --> +				<!-- INCLUDE pagination.html --> +			<!-- ELSE --> +				 • {PAGE_NUMBER} +			<!-- ENDIF -->  		</div>  	</div> - -	</form>  <!-- ENDIF -->  <!-- IF S_SHOW_TOPICS --> @@ -37,11 +42,11 @@  	<!-- IF .searchresults -->  	<div class="forumbg"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<ul class="topiclist">  			<li class="header">  				<dl class="icon"> -					<dt>{L_TOPICS}</dt> +					<dt><div class="list-inner">{L_TOPICS}</div></dt>  					<dd class="posts">{L_REPLIES}</dd>  					<dd class="views">{L_VIEWS}</dd>  					<dd class="lastpost"><span>{L_LAST_POST}</span></dd> @@ -51,95 +56,116 @@  		<ul class="topiclist topics">  		<!-- BEGIN searchresults --> +			<!-- EVENT search_results_topic_before -->  			<li class="row<!-- IF searchresults.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF -->"> -				<dl class="icon" style="background-image: url({searchresults.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;"> -					<dt <!-- IF searchresults.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->> -						<!-- IF searchresults.S_UNREAD_TOPIC --><a href="{searchresults.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --> -						<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a> {searchresults.ATTACH_ICON_IMG} -						<!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED --><a href="{searchresults.U_MCP_QUEUE}">{searchresults.UNAPPROVED_IMG}</a> <!-- ENDIF --> -						<!-- IF searchresults.S_TOPIC_REPORTED --><a href="{searchresults.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br /> -						<!-- IF searchresults.PAGINATION --><strong class="pagination"><span>{searchresults.PAGINATION}</span></strong><!-- ENDIF --> -						{L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} » {searchresults.FIRST_POST_TIME} -						<!-- IF not searchresults.S_TOPIC_GLOBAL -->{L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a><!-- ELSE --> ({L_GLOBAL})<!-- ENDIF --> +				<dl class="icon {searchresults.TOPIC_IMG_STYLE}"> +					<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="icon-link"></a><!-- ENDIF --> +						<div class="list-inner"> + +							<!-- EVENT topiclist_row_prepend --> +							<!-- IF searchresults.S_UNREAD_TOPIC and not S_IS_BOT --><a href="{searchresults.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --> +							<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a> {searchresults.ATTACH_ICON_IMG} +							<!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED --><a href="{searchresults.U_MCP_QUEUE}">{searchresults.UNAPPROVED_IMG}</a> <!-- ENDIF --> +							<!-- IF searchresults.S_TOPIC_DELETED --><a href="{searchresults.U_MCP_QUEUE}">{DELETED_IMG}</a> <!-- ENDIF --> +							<!-- IF searchresults.S_TOPIC_REPORTED --><a href="{searchresults.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br /> +							<!-- IF .searchresults.pagination --> +							<div class="pagination"> +								<ul> +								<!-- BEGIN pagination --> +									<!-- IF searchresults.pagination.S_IS_PREV --> +									<!-- ELSEIF searchresults.pagination.S_IS_CURRENT --><li class="active"><span>{searchresults.pagination.PAGE_NUMBER}</span></li> +									<!-- ELSEIF searchresults.pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li> +									<!-- ELSEIF searchresults.pagination.S_IS_NEXT --> +									<!-- ELSE --><li><a href="{searchresults.pagination.PAGE_URL}">{searchresults.pagination.PAGE_NUMBER}</a></li> +									<!-- ENDIF --> +								<!-- END pagination --> +								</ul> +							</div> +							<!-- ENDIF --> +							<!-- IF searchresults.S_HAS_POLL -->{POLL_IMG} <!-- ENDIF --> +							{L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} » {searchresults.FIRST_POST_TIME} » {L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a> +							<!-- EVENT topiclist_row_append --> + +						</div>  					</dt>  					<dd class="posts">{searchresults.TOPIC_REPLIES}</dd>  					<dd class="views">{searchresults.TOPIC_VIEWS}</dd>  					<dd class="lastpost"><span>  						{L_POST_BY_AUTHOR} {searchresults.LAST_POST_AUTHOR_FULL} -						<!-- IF not S_IS_BOT --><a href="{searchresults.U_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{searchresults.LAST_POST_TIME}<br /> </span> +						<!-- IF not S_IS_BOT --><a href="{searchresults.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{searchresults.LAST_POST_TIME}<br /> </span>  					</dd>  				</dl>  			</li> +			<!-- EVENT search_results_topic_after -->  		<!-- END searchresults -->  		</ul> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  	<!-- ELSE -->  		<div class="panel"> -			<div class="inner"><span class="corners-top"><span></span></span> +			<div class="inner">  			<strong>{L_NO_SEARCH_RESULTS}</strong> -			<span class="corners-bottom"><span></span></span></div> +			</div>  		</div>  	<!-- ENDIF -->  <!-- ELSE -->  	<!-- BEGIN searchresults --> +		<!-- EVENT search_results_post_before -->  		<div class="search post <!-- IF searchresults.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF searchresults.S_POST_REPORTED --> reported<!-- ENDIF -->"> -			<div class="inner"><span class="corners-top"><span></span></span> +			<div class="inner">  	<!-- IF searchresults.S_IGNORE_POST -->  		<div class="postbody">  			{searchresults.L_IGNORE_POST}  		</div>  	<!-- ELSE --> +		<dl class="postprofile"> +			<!-- EVENT search_results_postprofile_before --> +			<dt class="author">{L_POST_BY_AUTHOR} {searchresults.POST_AUTHOR_FULL}</dt> +			<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> +			<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 --> +		</dl> +  		<div class="postbody">  			<h3><a href="{searchresults.U_VIEW_POST}">{searchresults.POST_SUBJECT}</a></h3>  			<div class="content">{searchresults.MESSAGE}</div>  		</div> - -		<dl class="postprofile"> -			<dt class="author">{L_POST_BY_AUTHOR} {searchresults.POST_AUTHOR_FULL}</dt> -			<dd>{searchresults.POST_DATE}</dd> -			<dd> </dd> -			<!-- IF searchresults.FORUM_TITLE --> -				<dd>{L_FORUM}: <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></dd> -				<dd>{L_TOPIC}: <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a></dd> -			<!-- ELSE --> -				<dd>{L_GLOBAL}: <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a></dd> -			<!-- ENDIF --> -			<dd>{L_REPLIES}: <strong>{searchresults.TOPIC_REPLIES}</strong></dd> -			<dd>{L_VIEWS}: <strong>{searchresults.TOPIC_VIEWS}</strong></dd> -		</dl>  	<!-- ENDIF -->  	<!-- IF not searchresults.S_IGNORE_POST -->  		<ul class="searchresults"> -			<li ><a href="{searchresults.U_VIEW_POST}" class="{S_CONTENT_FLOW_END}">{L_JUMP_TO_POST}</a></li> +			<li ><a href="{searchresults.U_VIEW_POST}" class="arrow-{S_CONTENT_FLOW_END}">{L_JUMP_TO_POST}</a></li>  		</ul>  	<!-- ENDIF --> -			<span class="corners-bottom"><span></span></span></div> +			</div>  		</div> +		<!-- EVENT search_results_post_after -->  	<!-- BEGINELSE -->  		<div class="panel"> -			<div class="inner"><span class="corners-top"><span></span></span> +			<div class="inner">  			<strong>{L_NO_SEARCH_RESULTS}</strong> -			<span class="corners-bottom"><span></span></span></div> +			</div>  		</div>  	<!-- END searchresults -->  <!-- ENDIF --> -<!-- IF PAGINATION or .searchresults or S_SELECT_SORT_KEY or S_SELECT_SORT_DAYS --> +<!-- IF .pagination or .searchresults or S_SELECT_SORT_KEY or S_SELECT_SORT_DAYS -->  	<form method="post" action="{S_SEARCH_ACTION}">  	<fieldset class="display-options"> -		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->  		<!-- IF S_SELECT_SORT_DAYS or S_SELECT_SORT_KEY -->  			<label><!-- IF S_SHOW_TOPICS -->{L_DISPLAY_POSTS}<!-- ELSE -->{L_SORT_BY}</label><label><!-- ENDIF --> {S_SELECT_SORT_DAYS}<!-- IF S_SELECT_SORT_KEY --></label> <label>{S_SELECT_SORT_KEY}</label> -			<label>{S_SELECT_SORT_DIR}<!-- ENDIF --> <input type="submit" name="sort" value="{L_GO}" class="button2" /></label> +			<label>{S_SELECT_SORT_DIR}<!-- ENDIF --></label> +			<input type="submit" name="sort" value="{L_GO}" class="button2" />  		<!-- ENDIF -->  	</fieldset> @@ -148,14 +174,19 @@  	<hr />  <!-- ENDIF --> -<!-- IF PAGINATION or .searchresults or PAGE_NUMBER --> -	<ul class="linklist"> -		<li class="rightside pagination"> -			{SEARCH_MATCHES}<!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --> -		</li> -	</ul> +<!-- IF .pagination or .searchresults or PAGE_NUMBER --> +<div class="action-bar bottom"> +	<div class="pagination"> +		{SEARCH_MATCHES} +		<!-- IF .pagination --> +			<!-- INCLUDE pagination.html --> +		<!-- ELSE --> +			 • {PAGE_NUMBER} +		<!-- ENDIF --> +	</div> +</div>  <!-- ENDIF -->  <!-- INCLUDE jumpbox.html --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html index cc54c42d18..d5d0f45fa9 100644 --- a/phpBB/styles/prosilver/template/simple_footer.html +++ b/phpBB/styles/prosilver/template/simple_footer.html @@ -4,7 +4,31 @@  		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->  		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->  	</div> + +	<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}"> +		<div id="darken"> </div> +	</div> +	<div id="loading_indicator"></div> + +	<div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}"> +		<a href="#" class="alert_close"></a> +		<h3 class="alert_title"></h3><p class="alert_text"></p> +	</div> +	<div id="phpbb_confirm" class="phpbb_alert"> +		<a href="#" class="alert_close"></a> +		<div class="alert_text"></div> +	</div>  </div> +<script type="text/javascript" src="{T_JQUERY_LINK}"></script> +<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> +<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> +<!-- INCLUDEJS forum_fn.js --> +<!-- INCLUDEJS ajax.js --> + +<!-- EVENT simple_footer_after --> + +{$SCRIPTS} +  </body> -</html>
\ No newline at end of file +</html> diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index 9cc8060762..6d22a074be 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -1,71 +1,39 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}"> +<!DOCTYPE html> +<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">  <head> - -<meta http-equiv="content-type" content="text/html; charset={S_CONTENT_ENCODING}" /> -<meta http-equiv="content-style-type" content="text/css" /> -<meta http-equiv="content-language" content="{S_USER_LANG}" /> -<meta http-equiv="imagetoolbar" content="no" /> -<meta name="resource-type" content="document" /> -<meta name="distribution" content="global" /> -<meta name="keywords" content="" /> -<meta name="description" content="" /> +<meta charset="utf-8"> +<meta name="viewport" content="width=device-width" />  {META}  <title>{SITENAME} • <!-- IF S_IN_MCP -->{L_MCP} • <!-- ELSEIF S_IN_UCP -->{L_UCP} • <!-- ENDIF -->{PAGE_TITLE}</title> -<script type="text/javascript"> -// <![CDATA[ - -	var jump_page = '{LA_JUMP_PAGE}:'; -	var on_page = '{ON_PAGE}'; -	var per_page = '{PER_PAGE}'; -	var base_url = '{A_BASE_URL}'; -	var style_cookie = 'phpBBstyle'; -	var onload_functions = new Array(); -	var onunload_functions = new Array(); -	var style_cookie_settings = '{A_COOKIE_SETTINGS}'; - -	/** -	* New function for handling multiple calls to window.onload and window.unload by pentapenguin -	*/ -	window.onload = function() -	{ -		for (var i = 0; i < onload_functions.length; i++) -		{ -			eval(onload_functions[i]); -		} -	} - -	window.onunload = function() -	{ -		for (var i = 0; i < onunload_functions.length; i++) -		{ -			eval(onunload_functions[i]); -		} -	} - -// ]]> -</script> -<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/styleswitcher.js"></script> -<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js"></script> - -<link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" /> +<link href="{T_THEME_PATH}/print.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="print" title="printonly" /> +<!-- IF S_ALLOW_CDN --><link href="//fonts.googleapis.com/css?family=Open+Sans:600&subset=latin,cyrillic-ext,latin-ext,cyrillic,greek-ext,greek,vietnamese" rel="stylesheet" type="text/css" media="screen, projection" /><!-- ENDIF -->  <link href="{T_STYLESHEET_LINK}" rel="stylesheet" type="text/css" media="screen, projection" /> - -<link href="{T_THEME_PATH}/normal.css" rel="alternate stylesheet" type="text/css" title="A" /> -<link href="{T_THEME_PATH}/medium.css" rel="alternate stylesheet" type="text/css" title="A+" /> -<link href="{T_THEME_PATH}/large.css" rel="alternate stylesheet" type="text/css" title="A++" /> +<link href="{T_STYLESHEET_LANG_LINK}" rel="stylesheet" type="text/css" media="screen, projection" /> +<link href="{T_THEME_PATH}/responsive.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="only screen and (max-width: 700px), only screen and (max-device-width: 700px)" />  <!-- IF S_CONTENT_DIRECTION eq 'rtl' --> -	<link href="{T_THEME_PATH}/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" /> +	<link href="{T_THEME_PATH}/bidi.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" />  <!-- ENDIF --> +<!--[if lte IE 8]> +	<link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" /> +<![endif]--> +  <!-- DEFINE $POPUP = 1 --> +<!-- EVENT simple_header_head_append --> + +{$STYLESHEETS} + +<!-- EVENT simple_header_stylesheets_after --> +  </head> -<body id="phpbb" class="{S_CONTENT_DIRECTION}"> +<body id="phpbb" class="nojs {S_CONTENT_DIRECTION} {BODY_CLASS}"> + +<!-- EVENT simple_header_body_before --> -<div id="simple-wrap"> -	<a id="top" name="top" accesskey="t"></a> -	<div id="page-body">
\ No newline at end of file +<div id="wrap"> +	<a id="top" class="anchor" accesskey="t"></a> +	<div id="page-body"> diff --git a/phpBB/styles/prosilver/template/styleswitcher.js b/phpBB/styles/prosilver/template/styleswitcher.js deleted file mode 100644 index bbcac9b69c..0000000000 --- a/phpBB/styles/prosilver/template/styleswitcher.js +++ /dev/null @@ -1,193 +0,0 @@ - -function fontsizeup(event) -{ -	// Skip tabs; 9 being the ASCII code for a tab -	if (event && getKeyCode(event) == 9) -	{ -		return true; -	} - -	var active = getActiveStyleSheet(); - -	switch (active) -	{ -		case 'A--': -			setActiveStyleSheet('A-'); -		break; - -		case 'A-': -			setActiveStyleSheet('A'); -		break; - -		case 'A': -			setActiveStyleSheet('A+'); -		break; - -		case 'A+': -			setActiveStyleSheet('A++'); -		break; - -		case 'A++': -			setActiveStyleSheet('A'); -		break; - -		default: -			setActiveStyleSheet('A'); -		break; -	} - -	return false; -} - -function fontsizedown(event) -{ -	// Skip tabs -	if (event && getKeyCode(event) == 9) -	{ -		return true; -	} - -	var active = getActiveStyleSheet(); - -	switch (active) -	{ -		case 'A++' :  -			setActiveStyleSheet('A+'); -		break; - -		case 'A+' :  -			setActiveStyleSheet('A'); -		break; - -		case 'A' :  -			setActiveStyleSheet('A-'); -		break; - -		case 'A-' :  -			setActiveStyleSheet('A--'); -		break; - -		case 'A--' :  -		break; - -		default : -			setActiveStyleSheet('A--'); -		break; -	} - -	return false; -} - -function getKeyCode(event) -{ -	// IE doesn't fire the onkeypress event for tabs -	// Reference: http://www.quirksmode.org/js/keys.html - -	var code = (event.keyCode) ? event.keyCode : 0; - -	// Probably using FF -	if (!code && event.charCode) -	{ -		code = event.charCode; -	} - -	return code; -} - -function setActiveStyleSheet(title) -{ -	var i, a, main; - -	for (i = 0; (a = document.getElementsByTagName('link')[i]); i++) -	{ -		if (a.getAttribute('rel').indexOf('style') != -1 && a.getAttribute('title')) -		{ -			a.disabled = true; -			if (a.getAttribute('title') == title) -			{ -				a.disabled = false; -			} -		} -	} -} - -function getActiveStyleSheet() -{ -	var i, a; - -	for (i = 0; (a = document.getElementsByTagName('link')[i]); i++) -	{ -		if (a.getAttribute('rel').indexOf('style') != -1 && a.getAttribute('title') && !a.disabled) -		{ -			return a.getAttribute('title'); -		} -	} - -	return null; -} - -function getPreferredStyleSheet() -{ -	return ('A-'); -} - -function createCookie(name, value, days) -{ -	if (days) -	{ -		var date = new Date(); -		date.setTime(date.getTime() + (days*24*60*60*1000)); -		var expires = '; expires=' + date.toGMTString(); -	} -	else -	{ -		expires = ''; -	} - -	document.cookie = name + '=' + value + expires + style_cookie_settings; -} - -function readCookie(name) -{ -	var nameEQ = name + '='; -	var ca = document.cookie.split(';'); - -	for (var i = 0; i < ca.length; i++) -	{ -		var c = ca[i]; - -		while (c.charAt(0) == ' ') -		{ -			c = c.substring(1, c.length); -		} - -		if (c.indexOf(nameEQ) == 0) -		{ -			return c.substring(nameEQ.length, c.length); -		} -	} - -	return null; -} - -function load_cookie() -{ -	var cookie = readCookie('style_cookie'); -	var title = cookie ? cookie : getPreferredStyleSheet(); -	setActiveStyleSheet(title); -} - -function unload_cookie() -{ -	var title = getActiveStyleSheet(); -	createCookie('style_cookie', title, 365); -} - -onload_functions.push('load_cookie()'); -onunload_functions.push('unload_cookie()'); - -/* -var cookie = readCookie("style"); -var title = cookie ? cookie : getPreferredStyleSheet(); -setActiveStyleSheet(title); -*/ diff --git a/phpBB/styles/prosilver/template/template.cfg b/phpBB/styles/prosilver/template/template.cfg deleted file mode 100644 index af84a0a66c..0000000000 --- a/phpBB/styles/prosilver/template/template.cfg +++ /dev/null @@ -1,30 +0,0 @@ -# -# phpBB Template Configuration File -# -# @package phpBB3 -# @copyright (c) 2006 phpBB Group -# @license http://opensource.org/licenses/gpl-license.php GNU Public License -# -# -# At the left is the name, please do not change this -# At the right the value is entered -# For on/off options the valid values are on, off, 1, 0, true and false -# -# Values get trimmed, if you want to add a space in front or at the end of -# the value, then enclose the value with single or double quotes. -# Single and double quotes do not need to be escaped. -# -# - -# General Information about this template -name = prosilver -copyright = © phpBB Group, 2007 -version = 3.0.12 - -# Defining a different template bitfield -template_bitfield = lNg= - -# Template inheritance -# See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/ -# Set value to empty to ignore template inheritance -inherit_from = prosilver diff --git a/phpBB/styles/prosilver/template/timezone.js b/phpBB/styles/prosilver/template/timezone.js new file mode 100644 index 0000000000..44ec1b0979 --- /dev/null +++ b/phpBB/styles/prosilver/template/timezone.js @@ -0,0 +1,20 @@ +/* global phpbb */ + +(function($) { // Avoid conflicts with other libraries + +'use strict'; + +$('#tz_date').change(function() { +	phpbb.timezoneSwitchDate(false); +}); + +$('#tz_select_date_suggest').click(function(){ +	phpbb.timezonePreselectSelect(true); +}); + +$(function () { +	phpbb.timezoneEnableDateSelection(); +	phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('timezone-preselect') === 'true'); +}); + +})(jQuery); // Avoid conflicts with other libraries diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html new file mode 100644 index 0000000000..b8be456489 --- /dev/null +++ b/phpBB/styles/prosilver/template/timezone_option.html @@ -0,0 +1,28 @@ +<dl> +	<dt><label for="timezone">{L_BOARD_TIMEZONE}{L_COLON}</label></dt> +	<!-- IF .timezone_date --> +	<dd id="tz_select_date" style="display: none;"> +		<select name="tz_date" id="tz_date" class="autowidth tz_select"> +			<option value="">{L_SELECT_CURRENT_TIME}</option> +			<!-- BEGIN timezone_date --> +				<option value="{timezone_date.VALUE}"<!-- IF timezone_date.SELECTED --> selected="selected"<!-- ENDIF -->>{timezone_date.TITLE}</option> +			<!-- END timezone_date --> +		</select> +		<input type="button" id="tz_select_date_suggest" class="button2" style="display: none;" timezone-preselect="<!-- IF S_TZ_PRESELECT -->true<!-- ELSE -->false<!-- ENDIF -->" data-l-suggestion="{L_TIMEZONE_DATE_SUGGESTION}" value="{L_TIMEZONE_DATE_SUGGESTION}" /> +	</dd> +	<!-- ENDIF --> +	<dd> +		<select name="tz" id="timezone" class="autowidth tz_select"> +			<option value="">{L_SELECT_TIMEZONE}</option> +			<!-- BEGIN timezone_select --> +			<optgroup label="{timezone_select.LABEL}" data-tz-value="{timezone_select.VALUE}"> +				<!-- BEGIN timezone_options --> +				<option title="{timezone_select.timezone_options.TITLE}" value="{timezone_select.timezone_options.VALUE}"<!-- IF timezone_select.timezone_options.SELECTED --> selected="selected"<!-- ENDIF -->>{timezone_select.timezone_options.LABEL}</option> +				<!-- END timezone_options --> +			</optgroup> +			<!-- END timezone_select --> +		</select> + +		<!-- INCLUDEJS timezone.js --> +	</dd> +</dl> diff --git a/phpBB/styles/prosilver/template/ucp_agreement.html b/phpBB/styles/prosilver/template/ucp_agreement.html index 3825abc08f..943774c6ec 100644 --- a/phpBB/styles/prosilver/template/ucp_agreement.html +++ b/phpBB/styles/prosilver/template/ucp_agreement.html @@ -10,6 +10,7 @@  	*/  	function change_language(lang_iso)  	{ +		document.cookie = '{COOKIE_NAME}_lang=' + lang_iso + '; path={COOKIE_PATH}';  		document.forms['register'].change_lang.value = lang_iso;  		document.forms['register'].submit();  	} @@ -19,7 +20,7 @@  	<form method="post" action="{S_UCP_ACTION}" id="register">  		<p class="rightside"> -			<label for="lang">{L_LANGUAGE}:</label><select name="lang" id="lang" onchange="change_language(this.value); return false;" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select> +			<label for="lang">{L_LANGUAGE}{L_COLON}</label><select name="lang" id="lang" onchange="change_language(this.value); return false;" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select>  			{S_HIDDEN_FIELDS}  		</p>  	</form> @@ -31,16 +32,18 @@  	<form method="post" action="{S_UCP_ACTION}" id="agreement">  	<div class="panel"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<div class="content"> -			<h2>{SITENAME} - {L_REGISTRATION}</h2> +			<h2 class="sitename-title">{SITENAME} - {L_REGISTRATION}</h2> +			<!-- EVENT ucp_agreement_terms_before -->  			<p><!-- IF S_SHOW_COPPA -->{L_COPPA_BIRTHDAY}<!-- ELSE -->{L_TERMS_OF_USE}<!-- ENDIF --></p> +			<!-- EVENT ucp_agreement_terms_after --> +		</div>  		</div> -		<span class="corners-bottom"><span></span></span></div>  	</div>  	<div class="panel"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<fieldset class="submit-buttons">  			<!-- IF S_SHOW_COPPA -->  			<strong><a href="{U_COPPA_NO}" class="button1">{L_COPPA_NO}</a></strong>  <a href="{U_COPPA_YES}" class="button2">{L_COPPA_YES}</a> @@ -51,21 +54,21 @@  			{S_HIDDEN_FIELDS}  			{S_FORM_TOKEN}  		</fieldset> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  	</form>  <!-- ELSEIF S_AGREEMENT -->  	<div class="panel"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<div class="content"> -			<h2>{SITENAME} - {AGREEMENT_TITLE}</h2> +			<h2 class="sitename-title">{SITENAME} - {AGREEMENT_TITLE}</h2>  			<p>{AGREEMENT_TEXT}</p>  			<hr class="dashed" />  			<p><a href="{U_BACK}" class="button2">{L_BACK}</a></p>  		</div> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/ucp_attachments.html b/phpBB/styles/prosilver/template/ucp_attachments.html index 8052fdc435..1d4963273c 100644 --- a/phpBB/styles/prosilver/template/ucp_attachments.html +++ b/phpBB/styles/prosilver/template/ucp_attachments.html @@ -5,35 +5,43 @@  <h2>{L_TITLE}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<p>{L_ATTACHMENTS_EXPLAIN}</p>  	<!-- IF .attachrow --> -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL_ATTACHMENTS -->{TOTAL_ATTACHMENTS} {L_TITLE}<!-- ENDIF --> -				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> -			</li> -		</ul>	 +		<div class="action-bar top"> +			<div class="pagination"> +				{NUM_ATTACHMENTS} +				<!-- IF .pagination -->  +					<!-- INCLUDE pagination.html --> +				<!-- ELSE -->  +					 • {PAGE_NUMBER} +				<!-- ENDIF --> +			</div> +		</div>  		<ul class="topiclist">  			<li class="header">  				<dl> -					<dt style="width: 40%"><a href="{U_SORT_FILENAME}">{L_FILENAME}</a></dt> +					<dt><div class="list-inner"><a href="{U_SORT_FILENAME}">{L_FILENAME}</a></div></dt>  					<dd class="extra"><a href="{U_SORT_DOWNLOADS}">{L_DOWNLOADS}</a></dd>  					<dd class="time"><span><a href="{U_SORT_POST_TIME}">{L_POST_TIME}</a></span></dd>  					<dd class="mark">{L_MARK}</dd>  				</dl>  			</li>  		</ul> -		<ul class="topiclist cplist"> +		<ul class="topiclist cplist responsive-show-columns">  		<!-- BEGIN attachrow -->  		<li class="row<!-- IF attachrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">  			<dl> -				<dt style="width: 40%"><a href="{attachrow.U_VIEW_ATTACHMENT}" class="topictitle">{attachrow.FILENAME}</a> ({attachrow.SIZE})<br /> -					<!-- IF attachrow.S_IN_MESSAGE -->{L_PM}: <!-- ELSE -->{L_TOPIC}: <!-- ENDIF --><a href="{attachrow.U_VIEW_TOPIC}">{attachrow.TOPIC_TITLE}</a></dt> +				<dt> +					<div class="list-inner"> +						<a href="{attachrow.U_VIEW_ATTACHMENT}" class="topictitle attachment-filename ellipsis-text" title="{attachrow.FILENAME}">{attachrow.FILENAME}</a> ({attachrow.SIZE})<br /> +						<!-- IF attachrow.S_IN_MESSAGE -->{L_PM}{L_COLON} <!-- ELSE -->{L_TOPIC}{L_COLON} <!-- ENDIF --><a href="{attachrow.U_VIEW_TOPIC}">{attachrow.TOPIC_TITLE}</a> +					</div> +				</dt>  				<dd class="extra">{attachrow.DOWNLOAD_COUNT}</dd>  				<dd class="time"><span>{attachrow.POST_TIME}</span></dd>  				<dd class="mark"><input type="checkbox" name="attachment[{attachrow.ATTACH_ID}]" value="1" /></dd> @@ -43,27 +51,30 @@  		</ul>  		<fieldset class="display-options"> -			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF --> -			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -			<label for="sk">{L_SORT_BY}: <select name="sk" id="sk">{S_SORT_OPTIONS}</select></label>  +			<label for="sk">{L_SORT_BY}{L_COLON} <select name="sk" id="sk">{S_SORT_OPTIONS}</select></label>   			<label><select name="sd" id="sd">{S_ORDER_SELECT}</select></label>  			<input class="button2" type="submit" name="sort" value="{L_SORT}" />  			{S_FORM_TOKEN}  		</fieldset>  		<hr /> -		 -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL_ATTACHMENTS -->{TOTAL_ATTACHMENTS} {L_TITLE}<!-- ENDIF --> -				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> -			</li> -		</ul> + +		<div class="action-bar bottom"> +			<div class="pagination"> +				{TOTAL_ATTACHMENTS} {L_TITLE} +				<!-- IF .pagination -->  +					<!-- INCLUDE pagination.html --> +				<!-- ELSE -->  +					 • {PAGE_NUMBER} +				<!-- ENDIF --> +			</div> +		</div> +  	<!-- ELSE -->  		<p><strong>{L_UCP_NO_ATTACHMENTS}</strong></p>  	<!-- ENDIF --> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- IF S_ATTACHMENT_ROWS --> @@ -75,4 +86,4 @@  <!-- ENDIF -->  </form> -<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_auth_link.html b/phpBB/styles/prosilver/template/ucp_auth_link.html new file mode 100644 index 0000000000..078da58d19 --- /dev/null +++ b/phpBB/styles/prosilver/template/ucp_auth_link.html @@ -0,0 +1,15 @@ +<!-- INCLUDE ucp_header.html --> + +<h2>{L_UCP_AUTH_LINK_TITLE}</h2> + +<div class="panel"> +	<div class="inner"> +		<!-- IF ERROR --><dl><dd class="error">{ERROR}</dd></dl><!-- ENDIF --> + +		<!-- IF PROVIDER_TEMPLATE_FILE --> +			<!-- INCLUDE {PROVIDER_TEMPLATE_FILE} --> +		<!-- ENDIF --> +	</div> +</div> + +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html b/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html new file mode 100644 index 0000000000..18316613b0 --- /dev/null +++ b/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html @@ -0,0 +1,29 @@ +<!-- BEGIN oauth --> +	<form id="ucp" method="post" action="{S_UCP_ACTION}"> +		<h3>{oauth.SERVICE_NAME}</h3> + +		<fieldset class="fields2"> +			<!-- IF oauth.UNIQUE_ID --> +				<dl> +					<dt>{L_UCP_AUTH_LINK_ID}{L_COLON}</dt> +					<dd>{oauth.UNIQUE_ID}</dd> +				</dl> +				<dl> +					<dt> </dt> +					<dd><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_UNLINK}" class="button1" /></dd> +				</dl> +			<!-- ELSE --> +				<dl> +					<dd>{L_UCP_AUTH_LINK_ASK}</dd> +				</dl> +				<dl> +					<dt> </dt> +					<dd><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_LINK}" class="button1" /></dd> +				</dl> +			<!-- ENDIF --> +		</fieldset> +		{oauth.HIDDEN_FIELDS} +		{S_HIDDEN_FIELDS} +		{S_FORM_TOKEN} +	</form> +<!-- END oauth --> diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html index 7012c42f3b..2cf9488ed0 100644 --- a/phpBB/styles/prosilver/template/ucp_avatar_options.html +++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html @@ -1,70 +1,47 @@ -  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<!-- IF not S_AVATARS_ENABLED -->  		<p>{L_AVATAR_FEATURES_DISABLED}</p>  	<!-- ENDIF -->  	<fieldset>  	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF --> -	<dl> -		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt> -		<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd> -		<dd><label for="delete"><input type="checkbox" name="delete" id="delete" /> {L_DELETE_AVATAR}</label></dd> -	</dl> - -	<!-- IF S_UPLOAD_AVATAR_FILE -->  		<dl> -			<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt> -			<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input type="file" name="uploadfile" id="uploadfile" class="inputbox autowidth" /></dd> -		</dl> -	<!-- ENDIF --> - -	<!-- IF S_UPLOAD_AVATAR_URL --> -		<dl> -			<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt> -			<dd><input type="text" name="uploadurl" id="uploadurl" value="{AVATAR_URL}" class="inputbox" /></dd> -		</dl> -	<!-- ENDIF --> - -	<!-- IF S_LINK_AVATAR --> -		<dl> -			<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt> -			<dd><input type="text" name="remotelink" id="remotelink" value="{AVATAR_REMOTE}" class="inputbox" /></dd> +			<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt> +			<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd> +			<dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete" /> {L_DELETE_AVATAR}</label></dd>  		</dl> +	</fieldset> +	<h3>{L_AVATAR_SELECT}</h3> +	<fieldset>  		<dl> -			<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt> -			<dd> -				<label for="width"><input type="text" name="width" id="width" size="3" value="{AVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> ×   -				<label for="height"><input type="text" name="height" id="height" size="3" value="{AVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label> -			</dd> +			<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt> +			<dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true"> +				<!-- BEGIN avatar_drivers --> +				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option> +				<!-- END avatar_drivers --> +			</select></dd>  		</dl> -	<!-- ENDIF -->  	</fieldset> +	<div id="avatar_options"> +<!-- BEGIN avatar_drivers --> +	<div id="avatar_option_{avatar_drivers.DRIVER}"> +	<noscript> +	<h3 class="avatar_section_header">{avatar_drivers.L_TITLE}</h3> +	</noscript> +	<p>{avatar_drivers.L_EXPLAIN}</p> -	<!-- IF S_IN_AVATAR_GALLERY --> -		<span class="corners-bottom"><span></span></span></div> +	<fieldset> +	{avatar_drivers.OUTPUT} +	</fieldset> +	</div> +<!-- END avatar_drivers --> +	</div> +<!-- IF not S_GROUP_MANAGE --> +	<fieldset class="submit-buttons"> +		<input type="reset" value="{L_RESET}" name="reset" class="button2" />   +		<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" /> +	</fieldset> +<!-- ENDIF -->  	</div> - -	<div class="panel"> -		<div class="inner"><span class="corners-top"><span></span></span> - -		<h3>{L_AVATAR_GALLERY}</h3> - -		<fieldset> -			<label for="category">{L_AVATAR_CATEGORY}: <select name="category" id="category">{S_CAT_OPTIONS}</select></label> -			<input type="submit" value="{L_GO}" name="display_gallery" class="button2" /> -			<input type="submit" name="cancel" value="{L_CANCEL}" class="button2" /> -		</fieldset> - -		<div id="gallery"> -		<!-- BEGIN avatar_row --><!-- BEGIN avatar_column --> -			<label for="av-{avatar_row.S_ROW_COUNT}-{avatar_row.avatar_column.S_ROW_COUNT}"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="" /><br /> -				<input type="radio" name="avatar_select" id="av-{avatar_row.S_ROW_COUNT}-{avatar_row.avatar_column.S_ROW_COUNT}" value="{avatar_row.avatar_column.AVATAR_FILE}" /></label> -		<!-- END avatar_column --><!-- END avatar_row --> -		</div> - -	<!-- ENDIF --> - -	<span class="corners-bottom"><span></span></span></div>  </div> diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html b/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html new file mode 100644 index 0000000000..b1076c2d14 --- /dev/null +++ b/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html @@ -0,0 +1,11 @@ +<dl> +	<dt><label for="avatar_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt> +	<dd><input type="email" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" data-reset-on-edit="#avatar_gravatar_width, #avatar_gravatar_height" /></dd> +</dl> +<dl> +	<dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt> +	<dd> +		<label for="avatar_gravatar_width"><input type="text" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> ×   +		<label for="avatar_gravatar_height"><input type="text" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label> +	</dd> +</dl> diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html new file mode 100644 index 0000000000..2a0f403782 --- /dev/null +++ b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html @@ -0,0 +1,19 @@ +<!-- IF .avatar_local_cats --> +<label for="category">{L_AVATAR_CATEGORY}{L_COLON} <select name="avatar_local_cat" id="category"> +<!-- BEGIN avatar_local_cats --> +<option value="{avatar_local_cats.NAME}"<!-- IF avatar_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_local_cats.NAME}</option> +<!-- END avatar_local_cats --> +</select></label> +<input type="submit" value="{L_GO}" name="avatar_local_go" class="button2" /> + +<div id="gallery"> +<!-- BEGIN avatar_local_row --> +<!-- BEGIN avatar_local_col --> +	<label for="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}"><img src="{avatar_local_row.avatar_local_col.AVATAR_IMAGE}" alt="" /><br /> +	<input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_col.AVATAR_FILE}" /></label> +<!-- END avatar_local_col --> +<!-- END avatar_local_row --> +</div> +<!-- ELSE --> +<p><strong>{L_NO_AVATARS}</strong></p> +<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html new file mode 100644 index 0000000000..a8f6135fb2 --- /dev/null +++ b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html @@ -0,0 +1,11 @@ +<dl> +	<dt><label for="avatar_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt> +	<dd><input type="url" name="avatar_remote_url" id="avatar_remote_url" value="{AVATAR_REMOTE_URL}" class="inputbox" data-reset-on-edit="#avatar_remote_width, #avatar_remote_height" /></dd> +</dl> +<dl> +	<dt><label for="avatar_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt> +	<dd> +		<label for="avatar_remote_width"><input type="text" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> ×   +		<label for="avatar_remote_height"><input type="text" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label> +	</dd> +</dl> diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html b/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html new file mode 100644 index 0000000000..63a734ea7d --- /dev/null +++ b/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html @@ -0,0 +1,11 @@ +<dl> +	<dt><label for="avatar_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt> +	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" /></dd> +</dl> + +<!-- IF S_UPLOAD_AVATAR_URL --> +	<dl> +		<dt><label for="avatar_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt> +		<dd><input type="url" name="avatar_upload_url" id="avatar_upload_url" value="" class="inputbox" /></dd> +	</dl> +<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/ucp_footer.html b/phpBB/styles/prosilver/template/ucp_footer.html index 4b3b14b4b7..f2f1a68db3 100644 --- a/phpBB/styles/prosilver/template/ucp_footer.html +++ b/phpBB/styles/prosilver/template/ucp_footer.html @@ -1,9 +1,8 @@  		</div> -	<div class="clear"></div>  	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- IF S_COMPOSE_PM -->  <div>{S_FORM_TOKEN}</div> @@ -12,4 +11,4 @@  <!-- INCLUDE jumpbox.html --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html index 53d2dfffb3..3b805c4862 100644 --- a/phpBB/styles/prosilver/template/ucp_groups_manage.html +++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html @@ -5,7 +5,7 @@  <form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<!-- IF S_ERROR -->  	<fieldset> @@ -20,18 +20,18 @@  		<fieldset>  		<dl> -			<dt><label for="group_name">{L_GROUP_NAME}:</label></dt> +			<dt><label for="group_name">{L_GROUP_NAME}{L_COLON}</label></dt>  			<dd><!-- IF S_SPECIAL_GROUP --><strong<!-- IF GROUP_COLOUR --> style="color: #{GROUP_COLOUR};"<!-- ENDIF -->>{GROUP_NAME}</strong> <input name="group_name" type="hidden" value="{GROUP_INTERNAL_NAME}" />  				<!-- ELSE --><input name="group_name" type="text" id="group_name" value="{GROUP_INTERNAL_NAME}" class="inputbox" /><!-- ENDIF --></dd>  		</dl>  		<dl> -			<dt><label for="group_desc">{L_GROUP_DESC}:</label></dt> +			<dt><label for="group_desc">{L_GROUP_DESC}{L_COLON}</label></dt>  			<dd><textarea id="group_desc" name="group_desc" rows="5" cols="45" class="inputbox">{GROUP_DESC}</textarea></dd>  			<dd><label for="desc_parse_bbcode"><input type="checkbox" class="radio" name="desc_parse_bbcode" id="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label> <label for="desc_parse_smilies"><input type="checkbox" class="radio" name="desc_parse_smilies" id="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label> <label for="desc_parse_urls"><input type="checkbox" class="radio" name="desc_parse_urls" id="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>  		</dl>  		<!-- IF not S_SPECIAL_GROUP -->  		<dl> -			<dt><label for="group_type1">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt> +			<dt><label for="group_type1">{L_GROUP_TYPE}{L_COLON}</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>  			<dd>  				<label for="group_type1"><input type="radio" class="radio" name="group_type" id="group_type1" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label>   				<label for="group_type2"><input type="radio" class="radio" name="group_type" id="group_type2" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label>  @@ -44,34 +44,37 @@  		<!-- ENDIF -->  		</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<h3>{L_GROUP_SETTINGS_SAVE}</h3>  	<fieldset>  	<dl> -		<dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt> -		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" class="inputbox narrow" /> <span style="background-color: #{GROUP_COLOUR};">   </span> [ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false;">{L_COLOUR_SWATCH}</a> ]</dd> +		<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt> +		<dd> +			<input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" class="inputbox narrow" /> +			<span style="background-color: #{GROUP_COLOUR};">   </span> +			[ <a href="#" id="color_palette_toggle">{L_COLOUR_SWATCH}</a> ] +			<div id="color_palette_placeholder" class="hidden" data-orientation="h" data-height="12" data-width="15" data-target="#group_colour"></div> +		</dd>  	</dl>  	<dl> -		<dt><label for="group_rank">{L_GROUP_RANK}:</label></dt> +		<dt><label for="group_rank">{L_GROUP_RANK}{L_COLON}</label></dt>  		<dd><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></dd>  	</dl>  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- INCLUDE ucp_avatar_options.html -->  <fieldset class="submit-buttons">  	{S_HIDDEN_FIELDS} -	<!-- IF S_DISPLAY_GALLERY --><input type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" class="button2" />  <!-- ENDIF --> -	<!-- IF S_IN_AVATAR_GALLERY --><input type="submit" name="cancel" value="{L_CANCEL}" class="button2" />  <!-- ELSE --> -	<input type="reset" value="{L_RESET}" name="reset" class="button2" />  <!-- ENDIF --> +	<input type="reset" value="{L_RESET}" name="reset" class="button2" />    	<input type="submit" name="update" value="{L_SUBMIT}" class="button1" />  	{S_FORM_TOKEN}  </fieldset> @@ -79,7 +82,7 @@  <!-- ELSEIF S_LIST -->  	<!-- IF .leader --> -	<table class="table1" cellspacing="1"> +	<table class="table1">  	<thead>  	<tr>  		<th class="name">{L_GROUP_LEAD}</th> @@ -105,7 +108,7 @@  	<!-- BEGIN member -->  		<!-- IF member.S_PENDING --> -			<table class="table1" cellspacing="1"> +			<table class="table1">  			<thead>  			<tr>  				<th class="name">{L_GROUP_PENDING}</th> @@ -121,7 +124,7 @@  				</tbody>  				</table>  			<!-- ENDIF --> -			<table class="table1" cellspacing="1"> +			<table class="table1">  			<thead>  			<tr>  				<th class="name">{L_GROUP_APPROVED}</th> @@ -142,7 +145,7 @@  			</tr>  		<!-- ENDIF -->  	<!-- BEGINELSE --> -		<table class="table1" cellspacing="1"> +		<table class="table1">  		<thead>  		<tr>  			<th class="name">{L_MEMBERS}</th> @@ -156,13 +159,15 @@  	</tbody>  	</table> -	<ul class="linklist"> -		<li class="leftside pagination"> -			<!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span><!-- ELSE -->{S_ON_PAGE}<!-- ENDIF --> -		</li> -	</ul> +	<!-- IF .pagination --> +	<div class="action-bar bottom"> +		<div class="pagination">  +			<!-- INCLUDE pagination.html --> +		</div> +	</div> +	<!-- ENDIF --> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <fieldset class="display-actions">	 @@ -172,7 +177,7 @@  </fieldset>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<h3>{L_ADD_USERS}</h3> @@ -180,20 +185,20 @@  	<fieldset>  	<dl> -		<dt><label for="default0">{L_USER_GROUP_DEFAULT}:</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt> +		<dt><label for="default0">{L_USER_GROUP_DEFAULT}{L_COLON}</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>  		<dd>  			<label for="default1"><input type="radio" name="default" id="default1" value="1" /> {L_YES}</label>   			<label for="default0"><input type="radio" name="default" id="default0" value="0" checked="checked" /> {L_NO}</label>  		</dd>  	</dl>  	<dl> -		<dt><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt> +		<dt><label for="usernames">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>  		<dd><textarea name="usernames" id="usernames" rows="3" cols="30" class="inputbox"></textarea></dd>  		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>  	</dl>  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <fieldset class="submit-buttons"> @@ -204,21 +209,25 @@  <!-- ELSE -->  	<!-- IF .leader --> -		<ul class="topiclist"> +		<ul class="topiclist two-long-columns">  			<li class="header">  				<dl> -					<dt>{L_GROUP_LEADER}</dt> +					<dt><div class="list-inner">{L_GROUP_LEADER}</div></dt>  					<dd class="info"><span>{L_OPTIONS}</span></dd>  				</dl>  			</li>  		</ul> -		<ul class="topiclist cplist"> +		<ul class="topiclist cplist two-long-columns responsive-show-all">  		<!-- BEGIN leader -->  		<li class="row<!-- IF attachrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">  			<dl> -				<dt><a href="{leader.U_EDIT}" class="topictitle"<!-- IF leader.GROUP_COLOUR --> style="color: #{leader.GROUP_COLOUR};"<!-- ENDIF -->>{leader.GROUP_NAME}</a> -					<!-- IF leader.GROUP_DESC --><br />{leader.GROUP_DESC}<!-- ENDIF --></dt> +				<dt> +					<div class="list-inner"> +						<a href="{leader.U_EDIT}" class="topictitle"<!-- IF leader.GROUP_COLOUR --> style="color: #{leader.GROUP_COLOUR};"<!-- ENDIF -->>{leader.GROUP_NAME}</a> +						<!-- IF leader.GROUP_DESC --><br />{leader.GROUP_DESC}<!-- ENDIF --> +					</div> +				</dt>  				<dd class="option"><span><a href="{leader.U_EDIT}" >{L_EDIT}</a></span></dd>  				<dd class="option"><span><a href="{leader.U_LIST}">{L_GROUP_LIST}</a></span></dd>  			</dl> @@ -229,10 +238,10 @@  		<p><strong>{L_NO_LEADERS}</strong></p>  	<!-- ENDIF --> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- ENDIF -->  </form> -<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_groups_membership.html b/phpBB/styles/prosilver/template/ucp_groups_membership.html index ef595dd62d..d7df3b02c2 100644 --- a/phpBB/styles/prosilver/template/ucp_groups_membership.html +++ b/phpBB/styles/prosilver/template/ucp_groups_membership.html @@ -5,20 +5,20 @@  <form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<p>{L_GROUPS_EXPLAIN}</p>  	<!-- DEFINE $SHOW_BUTTONS = 0 -->  	<!-- IF .leader --> -		<ul class="topiclist"> +		<ul class="topiclist two-columns">  			<li class="header">  				<dl> -					<dt>{L_GROUP_LEADER}</dt> +					<dt><div class="list-inner">{L_GROUP_LEADER}</div></dt>  					<dd class="mark">{L_SELECT}</dd>  				</dl>  			</li>  		</ul> -		<ul class="topiclist cplist"> +		<ul class="topiclist cplist two-columns">  		<!-- BEGIN leader -->  		<!-- IF not leader.GROUP_SPECIAL --> @@ -26,10 +26,13 @@  		<!-- ENDIF -->  		<li class="row<!-- IF leader.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">  			<dl> -				<dt><!-- IF S_CHANGE_DEFAULT --><input title="{L_CHANGE_DEFAULT_GROUP}" type="radio" name="default"<!-- IF leader.S_GROUP_DEFAULT --> checked="checked"<!-- ENDIF --> value="{leader.GROUP_ID}" /> <!-- ENDIF --> -				<a href="{leader.U_VIEW_GROUP}" class="forumtitle"<!-- IF leader.GROUP_COLOUR --> style="color:#{leader.GROUP_COLOUR}"<!-- ENDIF -->>{leader.GROUP_NAME}</a> -				<!-- IF leader.GROUP_DESC --><br />{leader.GROUP_DESC}<!-- ENDIF --> -				<!-- IF not leader.GROUP_SPECIAL --><br /><i>{leader.GROUP_STATUS}</i><!-- ENDIF --> +				<dt> +					<div class="list-inner"> +						<!-- IF S_CHANGE_DEFAULT --><input title="{L_CHANGE_DEFAULT_GROUP}" type="radio" name="default"<!-- IF leader.S_GROUP_DEFAULT --> checked="checked"<!-- ENDIF --> value="{leader.GROUP_ID}" /> <!-- ENDIF --> +						<a href="{leader.U_VIEW_GROUP}" class="forumtitle"<!-- IF leader.GROUP_COLOUR --> style="color:#{leader.GROUP_COLOUR}"<!-- ENDIF -->>{leader.GROUP_NAME}</a> +						<!-- IF leader.GROUP_DESC --><br />{leader.GROUP_DESC}<!-- ENDIF --> +						<!-- IF not leader.GROUP_SPECIAL --><br /><i>{leader.GROUP_STATUS}</i><!-- ENDIF --> +					</div>  				</dt>  				<dd class="mark"><input type="radio" name="selected" value="{leader.GROUP_ID}" <!-- IF leader.GROUP_SPECIAL -->disabled="disabled"<!-- ENDIF --> /></dd>  			</dl> @@ -39,15 +42,15 @@  	<!-- ENDIF -->  	<!-- IF .member --> -		<ul class="topiclist"> +		<ul class="topiclist two-columns">  			<li class="header">  				<dl> -					<dt>{L_GROUP_MEMBER}</dt> +					<dt><div class="list-inner">{L_GROUP_MEMBER}</div></dt>  					<dd class="mark">{L_SELECT}</dd>  				</dl>  			</li>  		</ul> -		<ul class="topiclist cplist"> +		<ul class="topiclist cplist two-columns">  		<!-- BEGIN member -->  		<!-- IF not member.GROUP_SPECIAL --> @@ -55,10 +58,13 @@  		<!-- ENDIF -->		  		<li class="row<!-- IF member.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">  			<dl> -				<dt><!-- IF S_CHANGE_DEFAULT --><input title="{L_CHANGE_DEFAULT_GROUP}" type="radio" name="default"<!-- IF member.S_GROUP_DEFAULT --> checked="checked"<!-- ENDIF --> value="{member.GROUP_ID}" /> <!-- ENDIF --> -				<a href="{member.U_VIEW_GROUP}" class="forumtitle"<!-- IF member.GROUP_COLOUR --> style="color:#{member.GROUP_COLOUR}"<!-- ENDIF -->>{member.GROUP_NAME}</a> -				<!-- IF member.GROUP_DESC --><br />{member.GROUP_DESC}<!-- ENDIF --> -				<!-- IF not member.GROUP_SPECIAL --><br /><i>{member.GROUP_STATUS}</i><!-- ENDIF --> +				<dt> +					<div class="list-inner"> +						<!-- IF S_CHANGE_DEFAULT --><input title="{L_CHANGE_DEFAULT_GROUP}" type="radio" name="default"<!-- IF member.S_GROUP_DEFAULT --> checked="checked"<!-- ENDIF --> value="{member.GROUP_ID}" /> <!-- ENDIF --> +						<a href="{member.U_VIEW_GROUP}" class="forumtitle"<!-- IF member.GROUP_COLOUR --> style="color:#{member.GROUP_COLOUR}"<!-- ENDIF -->>{member.GROUP_NAME}</a> +						<!-- IF member.GROUP_DESC --><br />{member.GROUP_DESC}<!-- ENDIF --> +						<!-- IF not member.GROUP_SPECIAL --><br /><i>{member.GROUP_STATUS}</i><!-- ENDIF --> +					</div>  				</dt>  				<dd class="mark"><input type="radio" name="selected" value="{member.GROUP_ID}" <!-- IF member.GROUP_SPECIAL -->disabled="disabled"<!-- ENDIF --> /></dd>  			</dl> @@ -66,21 +72,21 @@  		<!-- END member -->  		</ul>  	<!-- ENDIF --> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>	  <!-- IF .pending -->  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span>	 -		<ul class="topiclist"> +	<div class="inner">	 +		<ul class="topiclist two-columns">  			<li class="header">  				<dl> -					<dt>{L_GROUP_PENDING}</dt> +					<dt><div class="list-inner">{L_GROUP_PENDING}</div></dt>  					<dd class="mark">{L_SELECT}</dd>  				</dl>  			</li>  		</ul> -		<ul class="topiclist cplist"> +		<ul class="topiclist cplist two-columns">  		<!-- BEGIN pending -->  		<!-- IF not pending.GROUP_SPECIAL --> @@ -89,30 +95,32 @@  		<li class="row<!-- IF pending.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">  			<dl>  				<dt> -				<a href="{pending.U_VIEW_GROUP}" class="forumtitle"<!-- IF pending.GROUP_COLOUR --> style="color:#{pending.GROUP_COLOUR}"<!-- ENDIF -->>{pending.GROUP_NAME}</a> -				<!-- IF pending.GROUP_DESC --><br />{pending.GROUP_DESC}<!-- ENDIF --> -				<!-- IF not pending.GROUP_SPECIAL --><br /><i>{pending.GROUP_STATUS}</i><!-- ENDIF --> +					<div class="list-inner"> +						<a href="{pending.U_VIEW_GROUP}" class="forumtitle"<!-- IF pending.GROUP_COLOUR --> style="color:#{pending.GROUP_COLOUR}"<!-- ENDIF -->>{pending.GROUP_NAME}</a> +						<!-- IF pending.GROUP_DESC --><br />{pending.GROUP_DESC}<!-- ENDIF --> +						<!-- IF not pending.GROUP_SPECIAL --><br /><i>{pending.GROUP_STATUS}</i><!-- ENDIF --> +					</div>  				</dt>  				<dd class="mark"><input type="radio" name="selected" value="{pending.GROUP_ID}" <!-- IF pending.GROUP_SPECIAL -->disabled="disabled"<!-- ENDIF --> /></dd>  			</dl>  		</li>  		<!-- END pending -->  		</ul> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- ENDIF -->  <!-- IF .nonmember -->  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> -		<ul class="topiclist"> +	<div class="inner"> +		<ul class="topiclist two-columns">  			<li class="header">  				<dl> -					<dt>{L_GROUP_NONMEMBER}</dt> +					<dt><div class="list-inner">{L_GROUP_NONMEMBER}</div></dt>  					<dd class="mark">{L_SELECT}</dd>  				</dl>  			</li>  		</ul> -		<ul class="topiclist cplist"> +		<ul class="topiclist cplist two-columns">  		<!-- BEGIN nonmember -->  		<!-- IF nonmember.S_CAN_JOIN --> @@ -121,16 +129,18 @@  		<li class="row<!-- IF nonmember.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">  			<dl>  				<dt> -				<a href="{nonmember.U_VIEW_GROUP}" class="forumtitle"<!-- IF nonmember.GROUP_COLOUR --> style="color:#{nonmember.GROUP_COLOUR}"<!-- ENDIF -->>{nonmember.GROUP_NAME}</a> -				<!-- IF nonmember.GROUP_DESC --><br />{nonmember.GROUP_DESC}<!-- ENDIF --> -				<!-- IF not nonmember.GROUP_SPECIAL --><br /><i>{nonmember.GROUP_STATUS}</i><!-- ENDIF --> +					<div class="list-inner"> +						<a href="{nonmember.U_VIEW_GROUP}" class="forumtitle"<!-- IF nonmember.GROUP_COLOUR --> style="color:#{nonmember.GROUP_COLOUR}"<!-- ENDIF -->>{nonmember.GROUP_NAME}</a> +						<!-- IF nonmember.GROUP_DESC --><br />{nonmember.GROUP_DESC}<!-- ENDIF --> +						<!-- IF not nonmember.GROUP_SPECIAL --><br /><i>{nonmember.GROUP_STATUS}</i><!-- ENDIF --> +					</div>  				</dt>  				<dd class="mark"><input type="radio" name="selected" value="{nonmember.GROUP_ID}" <!-- IF not nonmember.S_CAN_JOIN -->disabled="disabled"<!-- ENDIF --> /></dd>  			</dl>  		</li>  		<!-- END nonmember -->  		</ul> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  <!-- ENDIF --> @@ -146,7 +156,7 @@  		<!-- IF $SHOW_BUTTONS eq 1 -->  		<div class="right-box"> -			<label for="action">{L_SELECT}:</label>  +			<label for="action">{L_SELECT}{L_COLON}</label>   			<select name="action" id="action">  				<option value="join">{L_JOIN_SELECTED}</option>  				<option value="resign">{L_RESIGN_SELECTED}</option> @@ -161,4 +171,4 @@  </form> -<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_header.html b/phpBB/styles/prosilver/template/ucp_header.html index 4d008564c4..a17f145cbc 100644 --- a/phpBB/styles/prosilver/template/ucp_header.html +++ b/phpBB/styles/prosilver/template/ucp_header.html @@ -1,11 +1,11 @@  <!-- INCLUDE overall_header.html --> -<h2>{L_UCP}</h2> +<h2 class="ucp-title">{L_UCP}</h2>  <div id="tabs">  	<ul>  		<!-- BEGIN t_block1 --> -		<li <!-- IF t_block1.S_SELECTED -->class="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li> +		<li class="tab<!-- IF t_block1.S_SELECTED --> activetab<!-- ENDIF -->"><a href="{t_block1.U_TITLE}">{t_block1.L_TITLE}</a></li>  		<!-- END t_block1 -->  	</ul>  </div> @@ -15,12 +15,12 @@  <!-- ENDIF -->  <div class="panel bg3"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<div style="width: 100%;">  	<div id="cp-menu"> -		<div id="navigation"> +		<div id="navigation" role="navigation">  		<!-- IF S_PRIVMSGS -->  			<!-- BEGIN t_block2 --> @@ -63,7 +63,7 @@  		<!-- IF .friends_online or .friends_offline -->  		<div class="cp-mini"> -			<div class="inner"><span class="corners-top"><span></span></span> +			<div class="inner">  			<dl class="mini">  				<dt>{L_FRIENDS}</dt> @@ -77,13 +77,13 @@  				<!-- END friends_offline -->  			</dl> -			<span class="corners-bottom"><span></span></span></div> +			</div>  		</div>  		<!-- ENDIF -->  		<!-- IF S_SHOW_COLOUR_LEGEND -->  		<div class="cp-mini"> -			<div class="inner"><span class="corners-top"><span></span></span> +			<div class="inner">  			<dl class="mini">  				<dt>{L_MESSAGE_COLOURS}</dt> @@ -92,10 +92,10 @@  				<!-- END pm_colour_info -->  			</dl> -			<span class="corners-bottom"><span></span></span></div> +			</div>  		</div>  		<!-- ENDIF -->  	</div> -	<div id="cp-main" class="ucp-main"> +	<div id="cp-main" class="ucp-main panel-container"> diff --git a/phpBB/styles/prosilver/template/ucp_login_link.html b/phpBB/styles/prosilver/template/ucp_login_link.html new file mode 100644 index 0000000000..d3c6931ce3 --- /dev/null +++ b/phpBB/styles/prosilver/template/ucp_login_link.html @@ -0,0 +1,58 @@ +<!-- INCLUDE overall_header.html --> + +<div class="panel"> +	<div class="inner"> + +	<h2>{SITENAME} - {L_LOGIN_LINK}</h2> + +	<p>{L_LOGIN_LINK_EXPLAIN}</p> + +	<!-- IF LOGIN_LINK_ERROR --><div class="content"> +		<div class="error">{LOGIN_LINK_ERROR}</div> +	</div><!-- ENDIF --> + +	<div class="content"> +		<h2>{L_REGISTER}</h2> + +		<form action="{REGISTER_ACTION}" method="post" id="register"> +			<fieldset class="fields1"> +				<dl> +					<dt> </dt> +					<dd>{S_HIDDEN_FIELDS}<input type="submit" name="register" tabindex="1" value="{L_REGISTER}" class="button1" /></dd> +				</dl> +			</fieldset> +		</form> +	</div> + +	<div class="content"> +		<h2>{L_LOGIN}</h2> + +		<form action="{LOGIN_ACTION}" method="post" id="login"> +			<fieldset class="fields1"> +				<!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF --> +				<dl> +					<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}{L_COLON}</label></dt> +					<dd><input type="text" tabindex="2" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{LOGIN_USERNAME}" class="inputbox autowidth" /></dd> +				</dl> +				<dl> +					<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}{L_COLON}</label></dt> +					<dd><input type="password" tabindex="3" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd> +				</dl> +				<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE --> +					<!-- DEFINE $CAPTCHA_TAB_INDEX = 4 --> +					<!-- INCLUDE {CAPTCHA_TEMPLATE} --> +				<!-- ENDIF --> + +				{S_LOGIN_REDIRECT} +				<dl> +					<dt> </dt> +					<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="5" value="{L_LOGIN}" class="button1" /></dd> +				</dl> +			</fieldset> +		</form> +	</div> + +	</div> +</div> + +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html index 9d7c4ce1aa..f74728bdb3 100644 --- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html +++ b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html @@ -5,7 +5,7 @@  <h2>{L_TITLE}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<p>{L_BOOKMARKS_EXPLAIN}</p> @@ -14,33 +14,60 @@  <!-- ELSE -->  <!-- IF .topicrow --> -	<ul class="topiclist"> +	<ul class="topiclist missing-column">  		<li class="header">  			<dl class="icon"> -				<dt>{L_BOOKMARKS}</dt> +				<dt><div class="list-inner">{L_BOOKMARKS}</div></dt>  				<dd class="lastpost"><span>{L_LAST_POST}</span></dd> +				<dd class="mark">{L_MARK}</dd>  			</dl>  		</li>  	</ul> -	<ul class="topiclist cplist"> +	<ul class="topiclist cplist missing-column">  	<!-- BEGIN topicrow -->  		<li class="row<!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ELSEIF topicrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">  			<!-- IF topicrow.S_DELETED_TOPIC --> -				<dl><dt><strong>{L_DELETED_TOPIC}</strong></dt> -				<dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}" /></dd> +				<dl> +					<dt><div class="list-inner"><strong>{L_DELETED_TOPIC}</strong></div></dt> +					<dd class="lastpost"><span> </span></dd> +					<dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}" /></dd>  				</dl>  			<!-- ELSE --> -			<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;"> +			<dl class="icon {topicrow.TOPIC_IMG_STYLE}">  				<dt<!-- IF topicrow.TOPIC_ICON_IMG --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}"> -					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> -					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF --> -					<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br /> -					<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF --> -					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} +					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="icon-link"></a><!-- ENDIF --> +					<div class="list-inner"> +						<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> +						<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF --> +						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br /> +						<!-- IF .topicrow.pagination --> +						<div class="pagination"> +							<ul> +							<!-- BEGIN pagination --> +								<!-- IF topicrow.pagination.S_IS_PREV --> +								<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><li class="active"><span>{topicrow.pagination.PAGE_NUMBER}</span></li> +								<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li> +								<!-- ELSEIF topicrow.pagination.S_IS_NEXT --> +								<!-- ELSE --><li><a href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a></li> +								<!-- ENDIF --> +							<!-- END pagination --> +							</ul> +						</div> +						<!-- ENDIF --> +						<div class="responsive-hide"> +							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> +							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} +						</div> +						<div class="responsive-show" style="display: none;"> +							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> +							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} « +							<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a> +						</div> +					</div>  				</dt>  				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} -					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span> +					<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span>  				</dd>  				<dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}" /></dd>  			</dl> @@ -48,19 +75,25 @@  		</li>  	<!-- END topicrow -->  	</ul> -	<ul class="linklist"> -		<li class="rightside pagination"> -			<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS} <!-- ENDIF --> -			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> -		</li> -	</ul> + +	<div class="action-bar bottom"> +		<div class="pagination"> +			{TOTAL_TOPICS} +			<!-- IF .pagination -->  +				<!-- INCLUDE pagination.html --> +			<!-- ELSE -->  +				 • {PAGE_NUMBER} +			<!-- ENDIF --> +		</div> +	</div> +  <!-- ELSE -->  	<p><strong>{L_NO_BOOKMARKS}</strong></p>  <!-- ENDIF -->  <!-- ENDIF --> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- IF .topicrow and not S_NO_DISPLAY_BOOKMARKS --> @@ -72,4 +105,4 @@  <!-- ENDIF -->  </form> -<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_main_drafts.html b/phpBB/styles/prosilver/template/ucp_main_drafts.html index dffe0a37ef..52ad5b503b 100644 --- a/phpBB/styles/prosilver/template/ucp_main_drafts.html +++ b/phpBB/styles/prosilver/template/ucp_main_drafts.html @@ -5,14 +5,14 @@  <h2>{L_TITLE}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<p>{L_DRAFTS_EXPLAIN}</p>  <!-- IF S_EDIT_DRAFT -->  		<!-- INCLUDE posting_editor.html --> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  			<fieldset class="submit-buttons"> @@ -24,26 +24,32 @@  <!-- ELSE -->  	<!-- IF .draftrow --> -		<ul class="topiclist"> +		<ul class="topiclist missing-column">  			<li class="header">  				<dl> -					<dt>{L_DRAFT_TITLE}</dt> +					<dt><div class="list-inner">{L_DRAFT_TITLE}</div></dt>  					<dd class="info"><span>{L_SAVE_DATE}</span></dd>  					<dd class="mark">{L_MARK}</dd>  				</dl>  			</li>  		</ul> -		<ul class="topiclist cplist"> +		<ul class="topiclist cplist missing-column">  		<!-- BEGIN draftrow -->  			<li class="row<!-- IF draftrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">  				<dl>  					<dt> -						<a class="topictitle" href="{draftrow.U_VIEW_EDIT}">{draftrow.DRAFT_SUBJECT}</a><br /> -						<!-- IF draftrow.S_LINK_TOPIC -->{L_TOPIC}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a> -						<!-- ELSEIF draftrow.S_LINK_FORUM -->{L_FORUM}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a> -						<!-- ELSEIF S_PRIVMSGS --> -						<!-- ELSE -->{L_NO_TOPIC_FORUM}<!-- ENDIF --> +						<div class="list-inner"> +							<a class="topictitle" href="{draftrow.U_VIEW_EDIT}">{draftrow.DRAFT_SUBJECT}</a><br /> +							<!-- IF draftrow.S_LINK_TOPIC -->{L_TOPIC}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a> +							<!-- ELSEIF draftrow.S_LINK_FORUM -->{L_FORUM}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a> +							<!-- ELSEIF S_PRIVMSGS --> +							<!-- ELSE -->{L_NO_TOPIC_FORUM}<!-- ENDIF --> +							<div class="responsive-show" style="display: none;"> +								{L_SAVE_DATE}{L_COLON} <strong>{draftrow.DATE}</strong><br /> +								<!-- IF draftrow.U_INSERT --><a href="{draftrow.U_INSERT}">{L_LOAD_DRAFT}</a> • <!-- ENDIF --><a href="{draftrow.U_VIEW_EDIT}">{L_VIEW_EDIT}</a> +							</div> +						</div>  					</dt>  					<dd class="info"><span>{draftrow.DATE}<br /><!-- IF draftrow.U_INSERT --><a href="{draftrow.U_INSERT}">{L_LOAD_DRAFT}</a> • <!-- ENDIF --><a href="{draftrow.U_VIEW_EDIT}">{L_VIEW_EDIT}</a></span></dd>  					<dd class="mark"><input type="checkbox" name="d[{draftrow.DRAFT_ID}]" id="d{draftrow.DRAFT_ID}" /></dd> @@ -55,7 +61,7 @@  		<p><strong>{L_NO_SAVED_DRAFTS}</strong></p>  	<!-- ENDIF --> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  	<!-- IF .draftrow --> @@ -70,4 +76,4 @@  </form> -<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html index 4a6fa3bf86..942d26edc6 100644 --- a/phpBB/styles/prosilver/template/ucp_main_front.html +++ b/phpBB/styles/prosilver/template/ucp_main_front.html @@ -3,24 +3,47 @@  <h2>{L_TITLE}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<p>{L_UCP_WELCOME}</p>  <!-- IF .topicrow -->  	<h3>{L_IMPORTANT_NEWS}</h3> -	<ul class="topiclist cplist"> +	<ul class="topiclist cplist two-long-columns">  	<!-- BEGIN topicrow -->  		<li class="row<!-- IF topicrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->"> -			<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;"> +			<dl class="icon {topicrow.TOPIC_IMG_STYLE}">  				<dt <!-- IF topicrow.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->> -					<!-- IF topicrow.S_UNREAD --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a><br /> -					<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF --> -					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} +					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="icon-link"></a><!-- ENDIF --> +					<div class="list-inner"> +						<!-- IF topicrow.S_UNREAD --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a><br /> +						<!-- IF .topicrow.pagination --> +						<div class="pagination"> +							<ul> +							<!-- BEGIN pagination --> +								<!-- IF topicrow.pagination.S_IS_PREV --> +								<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><li class="active"><span>{topicrow.pagination.PAGE_NUMBER}</span></li> +								<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li> +								<!-- ELSEIF topicrow.pagination.S_IS_NEXT --> +								<!-- ELSE --><li><a href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a></li> +								<!-- ENDIF --> +							<!-- END pagination --> +							</ul> +						</div> +						<!-- ENDIF --> +						<div class="responsive-hide"> +							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> +							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} +						</div> +						<div class="responsive-show" style="display: none;"> +							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> +							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} « <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a> +						</div> +					</div>  				</dt>  				<dd class="lastpost"><span>{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} -					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span> +					<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span>  				</dd>  			</dl>  		</li> @@ -31,15 +54,15 @@  	<h3>{L_YOUR_DETAILS}</h3>  	<dl class="details"> -		<dt>{L_JOINED}:</dt> <dd>{JOINED}</dd> -		<dt>{L_VISITED}:</dt> <dd>{LAST_VISIT_YOU}</dd> -		<dt>{L_TOTAL_POSTS}:</dt> <dd><!-- IF POSTS_PCT -->{POSTS}<!-- IF S_DISPLAY_SEARCH --> | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></strong><!-- ENDIF --><br />({POSTS_DAY} / {POSTS_PCT})<!-- ELSE -->{POSTS}<!-- ENDIF --></dd> -		<!-- IF ACTIVE_FORUM != '' --><dt>{L_ACTIVE_IN_FORUM}:</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF --> -		<!-- IF ACTIVE_TOPIC != '' --><dt>{L_ACTIVE_IN_TOPIC}:</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF --> -		<!-- IF WARNINGS --><dt>{L_YOUR_WARNINGS}:</dt> <dd class="error">{WARNING_IMG} [{WARNINGS}]</dd><!-- ENDIF --> +		<dt>{L_JOINED}{L_COLON}</dt> <dd>{JOINED}</dd> +		<dt>{L_LAST_ACTIVE}{L_COLON}</dt> <dd>{LAST_VISIT_YOU}</dd> +		<dt>{L_TOTAL_POSTS}{L_COLON}</dt> <dd><!-- IF POSTS_PCT -->{POSTS}<!-- IF S_DISPLAY_SEARCH --> | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></strong><!-- ENDIF --><br />({POSTS_DAY} / {POSTS_PCT})<!-- ELSE -->{POSTS}<!-- ENDIF --></dd> +		<!-- IF ACTIVE_FORUM != '' --><dt>{L_ACTIVE_IN_FORUM}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF --> +		<!-- IF ACTIVE_TOPIC != '' --><dt>{L_ACTIVE_IN_TOPIC}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF --> +		<!-- IF WARNINGS --><dt>{L_YOUR_WARNINGS}{L_COLON}</dt> <dd class="error">{WARNING_IMG} [{WARNINGS}]</dd><!-- ENDIF -->  	</dl> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div> -<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html index 210537ced8..ef03317578 100644 --- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html +++ b/phpBB/styles/prosilver/template/ucp_main_subscribed.html @@ -4,28 +4,39 @@  <h2>{L_TITLE}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<p>{L_WATCHED_EXPLAIN}</p>  <!-- IF .forumrow --> -	<ul class="topiclist"> +	<ul class="topiclist missing-column">  		<li class="header">  			<dl class="icon"> -				<dt>{L_WATCHED_FORUMS}</dt> -				<dd class="lastpost">{L_LAST_POST}</dd> +				<dt><div class="list-inner">{L_WATCHED_FORUMS}</div></dt> +				<dd class="lastpost"><span>{L_LAST_POST}</span></dd>  				<dd class="mark">{L_MARK}</dd>  			</dl>  		</li>  	</ul> -	<ul class="topiclist cplist"> +	<ul class="topiclist cplist missing-column">  	<!-- BEGIN forumrow -->  		<li class="row<!-- IF forumrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->"> -			<dl class="icon" style="background-image: url({forumrow.FORUM_FOLDER_IMG_SRC}); background-repeat: no-repeat;"> -				<dt><a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a><br />{forumrow.FORUM_DESC}</dt> +			<dl class="icon {forumrow.FORUM_IMG_STYLE}"> +				<dt> +					<!-- IF forumrow.S_UNREAD_FORUM --><a href="{forumrow.U_VIEWFORUM}" class="icon-link"></a><!-- ENDIF --> +					<div class="list-inner"> +						<a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a><br /> +						{forumrow.FORUM_DESC} +						<!-- IF forumrow.LAST_POST_TIME --> +						<div class="responsive-show" style="display: none;"> +							{L_LAST_POST} {L_POST_BY_AUTHOR} {forumrow.LAST_POST_AUTHOR_FULL} « <a href="{topicrow.U_LAST_POST}">{forumrow.LAST_POST_TIME}</a> +						</div> +						<!-- ENDIF --> +					</div> +				</dt>  				<dd class="lastpost"><!-- IF forumrow.LAST_POST_TIME --><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {forumrow.LAST_POST_AUTHOR_FULL} -					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{forumrow.LAST_POST_TIME}</span> +					<a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{forumrow.LAST_POST_TIME}</span>  					<!-- ELSE -->{L_NO_POSTS}<br /> <!-- ENDIF -->  				</dd>  				<dd class="mark"><input type="checkbox" name="f[{forumrow.FORUM_ID}]" id="f{forumrow.FORUM_ID}" /></dd> @@ -34,50 +45,94 @@  	<!-- END forumrow -->  	</ul>  <!-- ELSEIF S_FORUM_NOTIFY --> +    <ul class="topiclist"> +        <li class="header"> +            <dl class="icon"> +                <dt>{L_WATCHED_FORUMS}</dt> +            </dl> +        </li> +    </ul>  	<p><strong>{L_NO_WATCHED_FORUMS}</strong></p>  <!-- ENDIF --> +    <br />  <!-- IF .topicrow --> -	<ul class="topiclist"> +	<ul class="topiclist missing-column">  		<li class="header">  			<dl class="icon"> -				<dt>{L_WATCHED_TOPICS}</dt> -				<dd class="lastpost">{L_LAST_POST}</dd> +				<dt><div class="list-inner">{L_WATCHED_TOPICS}</div></dt> +				<dd class="lastpost"><span>{L_LAST_POST}</span></dd>  				<dd class="mark">{L_MARK}</dd>  			</dl>  		</li>  	</ul> -	<ul class="topiclist cplist"> +	<ul class="topiclist cplist missing-column">  	<!-- BEGIN topicrow -->  		<li class="row<!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ELSEIF topicrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->"> -			<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;"> +			<dl class="icon {topicrow.TOPIC_IMG_STYLE}">  				<dt<!-- IF topicrow.TOPIC_ICON_IMG --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}"> -					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> -					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF --> -					<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br /> -					<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF --> -					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} +					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="icon-link"></a><!-- ENDIF --> +					<div class="list-inner"> +						<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> +						<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF --> +						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br /> +						<!-- IF .topicrow.pagination --> +						<div class="pagination"> +							<ul> +							<!-- BEGIN pagination --> +								<!-- IF topicrow.pagination.S_IS_PREV --> +								<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><li class="active"><span>{topicrow.pagination.PAGE_NUMBER}</span></li> +								<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li> +								<!-- ELSEIF topicrow.pagination.S_IS_NEXT --> +								<!-- ELSE --><li><a href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a></li> +								<!-- ENDIF --> +							<!-- END pagination --> +							</ul> +						</div> +						<!-- ENDIF --> +						<div class="responsive-hide"> +							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> +							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} +						</div> +						<div class="responsive-show" style="display: none;"> +							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> +							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} « <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a> +						</div> +					</div>  				</dt>  				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} -					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span> +					<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span>  				</dd>  				<dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}" /></dd>  			</dl>  		</li>  	<!-- END topicrow -->  	</ul> -	<ul class="linklist"> -		<li class="rightside pagination"> -			<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS} <!-- ENDIF --> -			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> -		</li> -	</ul> + +	<div class="action-bar bottom"> +		<div class="pagination"> +			{TOTAL_TOPICS} +			<!-- IF .pagination -->  +				<!-- INCLUDE pagination.html --> +			<!-- ELSE -->  +				 • {PAGE_NUMBER} +			<!-- ENDIF --> +		</div> +	</div> +  <!-- ELSEIF S_TOPIC_NOTIFY --> +    <ul class="topiclist"> +        <li class="header"> +            <dl class="icon"> +                <dt>{L_WATCHED_TOPICS}</dt> +            </dl> +        </li> +    </ul>  	<p><strong>{L_NO_WATCHED_TOPICS}</strong></p>  <!-- ENDIF --> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- IF .topicrow or .forumrow --> @@ -89,4 +144,4 @@  <!-- ENDIF -->  </form> -<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html new file mode 100644 index 0000000000..500bae0c47 --- /dev/null +++ b/phpBB/styles/prosilver/template/ucp_notifications.html @@ -0,0 +1,122 @@ +<!-- INCLUDE ucp_header.html --> + +<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}> + +<h2>{TITLE}</h2> +<div class="panel"> +	<div class="inner"> + +		<p>{TITLE_EXPLAIN}</p> + +		<!-- IF MODE == 'notification_options' --> +			<table class="table1"> +				<thead> +					<tr> +						<th>{L_NOTIFICATION_TYPE}</th> +						<!-- BEGIN notification_methods --> +							<th class="mark">{notification_methods.NAME}</th> +						<!-- END notification_methods --> +						<th class="mark">{L_NOTIFICATIONS}</th> +					</tr> +				</thead> +				<tbody> +				<!-- BEGIN notification_types --> +					<!-- IF notification_types.GROUP_NAME --> +						<tr class="bg3"> +							<td colspan="{NOTIFICATION_TYPES_COLS}">{notification_types.GROUP_NAME}</td> +						</tr> +					<!-- ELSE --> +						<tr class="<!-- IF notification_types.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> +							<td> +								{notification_types.NAME} +								<!-- IF notification_types.EXPLAIN --><br />   {notification_types.EXPLAIN}<!-- ENDIF --> +							</td> +							<!-- BEGIN notification_methods --> +								<td class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td> +							<!-- END notification_methods --> +							<td class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td> +						</tr> +					<!-- ENDIF --> +				<!-- END notification_types --> +				</tbody> +			</table> +		<!-- ELSE --> +			<!-- IF .notification_list --> +				<div class="action-bar top"> +					<div class="pagination"> +						<!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}" class="mark">{L_NOTIFICATIONS_MARK_ALL_READ}</a> • <!-- ENDIF --> +						{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>] +						<!-- IF .pagination --> +							<!-- INCLUDE pagination.html --> +						<!-- ELSE --> +							 • {PAGE_NUMBER} +						<!-- ENDIF --> +					</div> +				</div> + +			<div class="notification_list"> +				<ul class="topiclist two-columns"> +					<li class="header"> +						<dl> +							<dt><div class="list-inner">{L_NOTIFICATIONS}</div></dt> +							<dd class="mark">{L_MARK_READ}</dd> +						</dl> +					</li> +				</ul> +				<ul class="topiclist cplist two-columns"> +					<!-- BEGIN notification_list --> +						<li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF --><!-- IF notification_list.STYLING --> {notification_list.STYLING}<!-- ENDIF -->"> +							<dl> +								<dt> +									<div class="list-inner">										 +										<!-- IF notification_list.AVATAR -->{notification_list.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --> +										<div class="notifications"> +											<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF --> +											<p class="notifications_title">{notification_list.FORMATTED_TITLE}<!-- IF notification_list.REFERENCE --> {notification_list.REFERENCE}<!-- ENDIF --></p> +											<!-- IF notification_list.URL --></a><!-- ENDIF -->				 +											<!-- IF notification_list.FORUM --><p class="notifications_forum">{notification_list.FORUM}</p><!-- ENDIF --> +											<!-- IF notification_list.REASON --><p class="notifications_reason">{notification_list.REASON}</p><!-- ENDIF --> +											<p class="notifications_time">{notification_list.TIME}</p> +										</div> +									</div> +								</dt> + +								<dd class="mark"> <input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}"<!-- IF not notification_list.UNREAD --> disabled="disabled"<!-- ENDIF --> /> <dfn>{L_MARK_READ}</dfn> </dd> +							</dl> +						</li> +					<!-- END notification_list --> +				</ul> +			</div> + +			<div class="action-bar bottom"> +				<div class="pagination"> +					{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>] +					<!-- IF .pagination --> +						<!-- INCLUDE pagination.html --> +					<!-- ELSE --> +						  • {PAGE_NUMBER} +					<!-- ENDIF --> +				</div> +			</div> + +			<!-- ELSE --> +				<p><strong>{L_NO_NOTIFICATIONS}</strong></p> +			<!-- ENDIF --> + +		<!-- ENDIF --> +	</div> +</div> + +<!-- IF .notification_types or .notification_list --> +<fieldset class="display-actions"> +	<input type="hidden" name="form_time" value="{FORM_TIME}" /> +	{S_HIDDEN_FIELDS} +	<input type="submit" name="submit" value="<!-- IF MODE == 'notification_options' -->{L_SUBMIT}<!-- ELSE -->{L_MARK_READ}<!-- ENDIF -->" class="button1" /> +	<div><a href="#" onclick="$('#ucp input:checkbox').prop('checked', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="$('#ucp input:checkbox').prop('checked', false); return false;">{L_UNMARK_ALL}</a></div> +	{S_FORM_TOKEN} +</fieldset> +<!-- ENDIF --> + +</form> + +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html index 0767920c1b..0e9c3844cc 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_history.html +++ b/phpBB/styles/prosilver/template/ucp_pm_history.html @@ -1,7 +1,7 @@  <h3 id="review">  	<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span> -	{L_MESSAGE_HISTORY}: +	{L_MESSAGE_HISTORY}{L_COLON}  </h3>  <div id="topicreview"> @@ -12,23 +12,28 @@  	</script>  	<!-- BEGIN history_row -->  	<div class="post <!-- IF history_row.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<div class="postbody" id="pr{history_row.MSG_ID}"> +			<h3><a href="{history_row.U_VIEW_MESSAGE}" <!-- IF history_row.S_CURRENT_MSG -->class="current"<!-- ENDIF -->>{history_row.SUBJECT}</a></h3> +  			<!-- IF history_row.U_QUOTE or history_row.MESSAGE_AUTHOR_QUOTE --> -			<ul class="profile-icons"> -				<li class="quote-icon"><a <!-- IF history_row.U_QUOTE -->href="{history_row.U_QUOTE}"<!-- ELSE -->href="#postingbox" onclick="addquote({history_row.MSG_ID}, '{history_row.MESSAGE_AUTHOR_QUOTE}', '{LA_WROTE}');"<!-- ENDIF --> title="{L_QUOTE} {history_row.MESSAGE_AUTHOR}"><span>{L_QUOTE} {history_row.MESSAGE_AUTHOR}</span></a></li> +			<ul class="post-buttons"> +				<li> +					<a <!-- IF history_row.U_QUOTE -->href="{history_row.U_QUOTE}"<!-- ELSE -->href="#postingbox" onclick="addquote({history_row.MSG_ID}, '{history_row.MESSAGE_AUTHOR_QUOTE}', '{LA_WROTE}');"<!-- ENDIF --> title="{L_QUOTE} {history_row.MESSAGE_AUTHOR}" class="button icon-button quote-icon"> +						<span>{L_QUOTE} {history_row.MESSAGE_AUTHOR}</span> +					</a> +				</li>  			</ul>  			<!-- ENDIF --> -			<h3><a href="{history_row.U_VIEW_MESSAGE}" <!-- IF history_row.S_CURRENT_MSG -->class="current"<!-- ENDIF -->>{history_row.SUBJECT}</a></h3> -			<p class="author">{history_row.MINI_POST_IMG} {L_SENT_AT}: <strong>{history_row.SENT_DATE}</strong><br /> +			<p class="author">{history_row.MINI_POST_IMG} {L_SENT_AT}{L_COLON} <strong>{history_row.SENT_DATE}</strong><br />  				{L_MESSAGE_BY_AUTHOR} {history_row.MESSAGE_AUTHOR_FULL}</p>  			<div class="content"><!-- IF history_row.MESSAGE -->{history_row.MESSAGE}<!-- ELSE --><span class="error">{L_MESSAGE_REMOVED_FROM_OUTBOX}</span><!-- ENDIF --></div>  			<div id="message_{history_row.MSG_ID}" style="display: none;">{history_row.DECODED_MESSAGE}</div>  		</div> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  	<!-- END history_row -->  </div> diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html index ae66dd0a36..7be51e0034 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html +++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html @@ -1,28 +1,61 @@ -<h2>{L_TITLE}<!-- IF CUR_FOLDER_NAME -->: {CUR_FOLDER_NAME}<!-- ENDIF --></h2> +<h2>{L_TITLE}<!-- IF CUR_FOLDER_NAME -->{L_COLON} {CUR_FOLDER_NAME}<!-- ENDIF --></h2>  <form id="viewfolder" method="post" action="{S_PM_ACTION}">  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> - +	<div class="inner">  	<!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF --> + +	<div class="action-bar top">  	<!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM -->  		<div class="buttons"> -			<!-- IF U_POST_REPLY_PM --><div class="pmreply-icon"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div> -			<!-- ELSEIF U_POST_NEW_TOPIC --><div class="newpm-icon"><a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}"><span></span>{L_UCP_PM_COMPOSE}</a></div><!-- ENDIF --> -			<!-- IF U_FORWARD_PM --><div class="forwardpm-icon"><a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}"><span></span>{L_FORWARD_PM}</a></div><!-- ENDIF --> -			<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 --><div class="reply-all"><a class="left" title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">{L_REPLY_TO_ALL}</a></div><!-- ENDIF -->			 +			<!-- IF U_POST_REPLY_PM --> +				<a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}" class="button icon-button pmreply-icon"> +					{L_BUTTON_PM_REPLY} +				</a> +			<!-- ELSEIF U_POST_NEW_TOPIC --> +				<a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}" class="button icon-button newpm-icon"> +					{L_BUTTON_PM_NEW} +				</a> +			<!-- ENDIF --> +			<!-- IF U_FORWARD_PM --> +				<a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}" class="button icon-button forwardpm-icon"> +					{L_BUTTON_PM_FORWARD} +				</a> +			<!-- ENDIF --> +			<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 --> +				<a title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}" class="button icon-button reply-all"> +					{L_BUTTON_PM_REPLY_ALL} +				</a> +			<!-- ENDIF --> +		</div> +	<!-- ENDIF --> + +	<!-- IF not S_IS_BOT and U_PRINT_PM --> +		<div class="dropdown-container dropdown-button-control topic-tools"> +			<span title="{L_PM_TOOLS}" class="dropdown-trigger dropdown-select button icon-button tools-icon"></span> +			<div class="dropdown hidden"> +				<div class="pointer"><div class="pointer-inner"></div></div> +				<ul class="dropdown-contents"> +					<!-- IF U_PRINT_PM --><li class="small-icon icon-print"><a href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p">{L_PRINT_PM}</a></li><!-- ENDIF --> +				</ul> +			</div>  		</div>  	<!-- ENDIF -->  	<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE --> -	<ul class="linklist"> -		<li class="rightside pagination"> -			<!-- IF S_VIEW_MESSAGE --><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO} {CUR_FOLDER_NAME}</a><!-- ENDIF --> -			<!-- IF FOLDER_CUR_MESSAGES neq 0 --> -				<!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES}<!-- ENDIF --> -				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> +		<div class="pagination"> +			<!-- IF S_VIEW_MESSAGE --> +				<a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO_FOLDER}</a> +			<!-- ELSEIF FOLDER_CUR_MESSAGES neq 0 --> +				<!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}" class="mark">{L_PM_MARK_ALL_READ}</a> • <!-- ENDIF --> +				{TOTAL_MESSAGES} +				<!-- IF .pagination --> +					<!-- INCLUDE pagination.html --> +				<!-- ELSE --> +					 • {PAGE_NUMBER} +				<!-- ENDIF -->  			<!-- ENDIF --> -		</li> -	</ul> +		</div>  	<!-- ENDIF --> +	</div> diff --git a/phpBB/styles/prosilver/template/ucp_pm_options.html b/phpBB/styles/prosilver/template/ucp_pm_options.html index a8693ac9b9..247be8b6fd 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_options.html +++ b/phpBB/styles/prosilver/template/ucp_pm_options.html @@ -5,16 +5,16 @@  <form id="ucp" method="post" action="{S_UCP_ACTION}">  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<!-- IF ERROR_MESSAGE --><p class="error">{ERROR_MESSAGE}</p><!-- ENDIF -->  	<!-- IF NOTIFICATION_MESSAGE --><p class="error">{NOTIFICATION_MESSAGE}</p><!-- ENDIF --> -	 +  	<h3>{L_DEFINED_RULES}</h3>  	<ol class="def-rules">  	<!-- BEGIN rule --> -		<li><div class="right-box"><input type="submit" name="delete_rule[{rule.RULE_ID}]" value="{L_DELETE_RULE}" class="button2" /></div><strong>{L_IF}</strong> {rule.CHECK} <em>{rule.RULE}</em> <!-- IF rule.STRING --><strong>{rule.STRING}</strong> | <!-- ENDIF -->{rule.ACTION}<!-- IF rule.FOLDER -->: {rule.FOLDER}<!-- ENDIF --><div style="clear: both;"></div></li> +		<li><div class="right-box"><input type="submit" name="delete_rule[{rule.RULE_ID}]" value="{L_DELETE_RULE}" class="button2" /></div><strong>{L_IF}</strong> {rule.CHECK} <em>{rule.RULE}</em> <!-- IF rule.STRING --><strong>{rule.STRING}</strong> | <!-- ENDIF -->{rule.ACTION}<!-- IF rule.FOLDER -->{L_COLON} {rule.FOLDER}<!-- ENDIF --><div style="clear: both;"></div></li>  	<!-- BEGINELSE -->  		<li><strong>{L_NO_RULES_DEFINED}</strong></li>  	<!-- END rule --> @@ -26,7 +26,7 @@  	<!-- IF S_CHECK_DEFINED -->  		<dl> -			<dt><label<!-- IF S_CHECK_SELECT --> for="check_option"<!-- ENDIF -->>{L_IF}:</label></dt> +			<dt><label<!-- IF S_CHECK_SELECT --> for="check_option"<!-- ENDIF -->>{L_IF}{L_COLON}</label></dt>  			<dd>  				<!-- IF S_CHECK_SELECT --><select name="check_option" id="check_option">{S_CHECK_OPTIONS}</select> <input type="submit" name="next" value="{L_NEXT_STEP}" class="button2" /><!-- ELSE -->{CHECK_CURRENT}<input type="hidden" name="check_option" value="{CHECK_OPTION}" /><!-- ENDIF -->  			</dd> @@ -81,26 +81,26 @@  	<!-- IF not S_MAX_FOLDER_ZERO -->  	<dl> -		<dt><label for="foldername">{L_ADD_FOLDER}:</label></dt> +		<dt><label for="foldername">{L_ADD_FOLDER}{L_COLON}</label></dt>  		<dd><!-- IF S_MAX_FOLDER_REACHED -->{L_MAX_FOLDER_REACHED}<!-- ELSE --><input type="text" class="inputbox medium" name="foldername" id="foldername" size="30" maxlength="30" /> <input class="button2" type="submit" name="addfolder" value="{L_ADD}" /><!-- ENDIF --></dd>  	</dl>  	<!-- IF S_FOLDER_OPTIONS --><hr class="dashed" /><!-- ENDIF -->  	<!-- ENDIF --> -	 +  	<!-- IF S_FOLDER_OPTIONS -->  		<dl> -			<dt><label for="rename_folder_id">{L_RENAME_FOLDER}:</label></dt> +			<dt><label for="rename_folder_id">{L_RENAME_FOLDER}{L_COLON}</label></dt>  			<dd><select name="rename_folder_id" id="rename_folder_id">{S_FOLDER_OPTIONS}</select></dd> -			<dt><label for="new_folder_name">{L_NEW_FOLDER_NAME}:</label></dt> +			<dt><label for="new_folder_name">{L_NEW_FOLDER_NAME}{L_COLON}</label></dt>  			<dd><input type="text" class="inputbox tiny" name="new_folder_name" id="new_folder_name" maxlength="30" /> <input class="button2" type="submit" name="rename_folder" value="{L_RENAME}" /></dd>  		</dl>  		<hr class="dashed" />  		<dl> -			<dt><label for="remove_folder_id">{L_REMOVE_FOLDER}:</label></dt> +			<dt><label for="remove_folder_id">{L_REMOVE_FOLDER}{L_COLON}</label></dt>  			<dd><select name="remove_folder_id" id="remove_folder_id">{S_FOLDER_OPTIONS}</select></dd> -			<dd style="margin-top: 3px;"><label for="remove_action1"><input type="radio" name="remove_action" id="remove_action1" value="1" checked="checked" /> {L_MOVE_DELETED_MESSAGES_TO}:</label> <select name="move_to">{S_TO_FOLDER_OPTIONS}</select></dd> +			<dd style="margin-top: 3px;"><label for="remove_action1"><input type="radio" name="remove_action" id="remove_action1" value="1" checked="checked" /> {L_MOVE_DELETED_MESSAGES_TO}{L_COLON}</label> <select name="move_to">{S_TO_FOLDER_OPTIONS}</select></dd>  			<dd style="margin-top: 3px;"><label for="remove_action2"><input type="radio" name="remove_action" id="remove_action2" value="2" /> {L_DELETE_MESSAGES_IN_FOLDER}</label></dd>  			<dd style="margin-top: 3px;"><input class="button2" type="submit" name="remove_folder" value="{L_REMOVE}" /></dd>  		</dl> @@ -109,23 +109,23 @@  	<hr class="dashed" />  	<dl> -		<dt><label for="full_action1">{L_IF_FOLDER_FULL}:</label></dt> +		<dt><label for="full_action1">{L_IF_FOLDER_FULL}{L_COLON}</label></dt>  		<dd style="margin-top: 3px;"><label for="full_action1"><input type="radio" name="full_action" id="full_action1" value="1"{S_DELETE_CHECKED} /> {L_DELETE_OLDEST_MESSAGES}</label></dd> -		<dd style="margin-top: 3px;"><label for="full_action2"><input type="radio" name="full_action" id="full_action2" value="2"{S_MOVE_CHECKED} /> {L_MOVE_TO_FOLDER}:</label> <select name="full_move_to">{S_FULL_FOLDER_OPTIONS}</select></dd> +		<dd style="margin-top: 3px;"><label for="full_action2"><input type="radio" name="full_action" id="full_action2" value="2"{S_MOVE_CHECKED} /> {L_MOVE_TO_FOLDER}{L_COLON}</label> <select name="full_move_to">{S_FULL_FOLDER_OPTIONS}</select></dd>  		<dd style="margin-top: 3px;"><label for="full_action3" style="white-space:normal;"><input type="radio" name="full_action" id="full_action3" value="3"{S_HOLD_CHECKED} /> {L_HOLD_NEW_MESSAGES}</label></dd>  	</dl>  	<dl> -		<dt><label>{L_DEFAULT_ACTION}:</label><br /><span>{L_DEFAULT_ACTION_EXPLAIN}</span></dt> +		<dt><label>{L_DEFAULT_ACTION}{L_COLON}</label><br /><span>{L_DEFAULT_ACTION_EXPLAIN}</span></dt>  		<dd>{DEFAULT_ACTION}</dd>  		<dd><input class="button2" type="submit" name="fullfolder" value="{L_CHANGE}" /></dd>  	</dl>  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  	{S_FORM_TOKEN}  </div>  </form> -<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_pm_popup.html b/phpBB/styles/prosilver/template/ucp_pm_popup.html deleted file mode 100644 index 325362dc4d..0000000000 --- a/phpBB/styles/prosilver/template/ucp_pm_popup.html +++ /dev/null @@ -1,25 +0,0 @@ -<!-- INCLUDE simple_header.html --> - -<script type="text/javascript"> -// <![CDATA[ -/** -* Jump to inbox -*/ -function jump_to_inbox(url) -{ -	opener.document.location.href = url.replace(/&/g, '&'); -	window.close(); -} -// ]]> -</script> - -<div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> -	<div class="content"> -		<p><!-- IF S_NOT_LOGGED_IN -->{L_LOGIN_CHECK_PM}<!-- ELSE -->{MESSAGE}<br /><br />{CLICK_TO_VIEW}<!-- ENDIF --></p> -		<p class="small"><a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a></p> -	</div> -	<span class="corners-bottom"><span></span></span></div> -</div> - -<!-- INCLUDE simple_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html index c9f28cec64..d93a62282e 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html @@ -8,19 +8,19 @@  	<h2>{L_EXPORT_AS_CSV}</h2>  	<form id="viewfolder" method="post" action="{S_PM_ACTION}">  	<div class="panel"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<h3>{L_OPTIONS}</h3>  		<fieldset>  			<dl> -				<dt><label for="delimiter">{L_DELIMITER}:</label></dt> +				<dt><label for="delimiter">{L_DELIMITER}{L_COLON}</label></dt>  				<dd><input class="inputbox" type="text" id="delimiter" name="delimiter" value="," /></dd>  			</dl>  			<dl> -				<dt><label for="enclosure">{L_ENCLOSURE}:</label></dt> +				<dt><label for="enclosure">{L_ENCLOSURE}{L_COLON}</label></dt>  				<dd><input class="inputbox" type="text" id="enclosure" name="enclosure" value=""" /></dd>  			</dl>  		</fieldset> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  	<fieldset class="submit-buttons">  		<input type="hidden" name="export_option" value="CSV" /> @@ -45,20 +45,22 @@  	<!-- ENDIF -->  	<!-- IF .messagerow --> -		<ul class="topiclist"> +		<ul class="topiclist two-columns">  			<li class="header">  				<dl> -					<dt>{L_MESSAGE}</dt> +					<dt><div class="list-inner">{L_MESSAGE}</div></dt>  					<dd class="mark">{L_MARK}</dd>  				</dl>  			</li>  		</ul> -		<ul class="topiclist cplist pmlist"> +		<ul class="topiclist cplist pmlist responsive-show-all <!-- IF S_SHOW_RECIPIENTS -->missing-column<!-- ELSE -->two-columns<!-- ENDIF -->">  		<!-- BEGIN messagerow -->  			<li class="row<!-- IF messagerow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF messagerow.PM_CLASS --> {messagerow.PM_CLASS}<!-- ENDIF -->"> -				<dl class="icon" style="background-image: url({messagerow.FOLDER_IMG_SRC}); background-repeat: no-repeat;"> +				<dl class="icon {messagerow.FOLDER_IMG_STYLE}">  					<dt<!-- IF messagerow.PM_ICON_URL and S_PM_ICONS --> style="background-image: url({messagerow.PM_ICON_URL}); background-repeat: no-repeat;"<!-- ENDIF -->> +						<!-- IF messagerow.S_PM_UNREAD and not messagerow.S_PM_DELETED --><a href="{messagerow.U_VIEW_PM}" class="icon-link"></a><!-- ENDIF --> +						<div class="list-inner">  						<!-- IF messagerow.S_PM_DELETED -->  							<a href="{messagerow.U_REMOVE_PM}" class="topictitle">{L_DELETE_MESSAGE}</a><br /> @@ -72,8 +74,10 @@  						<!-- IF messagerow.S_PM_REPORTED --><a href="{messagerow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --> {messagerow.ATTACH_ICON_IMG}<br />  						<!-- IF S_SHOW_RECIPIENTS -->{L_MESSAGE_TO} {messagerow.RECIPIENTS}<!-- ELSE -->{L_MESSAGE_BY_AUTHOR} {messagerow.MESSAGE_AUTHOR_FULL} » {messagerow.SENT_TIME}<!-- ENDIF --> + +						</div>  					</dt> -					<!-- IF S_SHOW_RECIPIENTS --><dd class="info"><span>{L_SENT_AT}: {messagerow.SENT_TIME}</span></dd><!-- ENDIF --> +					<!-- IF S_SHOW_RECIPIENTS --><dd class="info"><span>{L_SENT_AT}{L_COLON} {messagerow.SENT_TIME}</span></dd><!-- ENDIF -->  					<!-- IF S_UNREAD --><dd class="info"><!-- IF messagerow.FOLDER --><a href="{messagerow.U_FOLDER}">{messagerow.FOLDER}</a><!-- ELSE -->{L_UNKNOWN_FOLDER}<!-- ENDIF --></dd><!-- ENDIF -->  					<dd class="mark"><input type="checkbox" name="marked_msg_id[]" value="{messagerow.MESSAGE_ID}" /></dd>  				</dl> @@ -92,38 +96,39 @@  	<!-- ENDIF -->  	<!-- IF FOLDER_CUR_MESSAGES neq 0 --> -	<fieldset class="display-actions"> -		<div class="left-box"><label for="export_option">{L_EXPORT_FOLDER}: <select name="export_option" id="export_option"><option value="CSV">{L_EXPORT_AS_CSV}</option><option value="CSV_EXCEL">{L_EXPORT_AS_CSV_EXCEL}</option><option value="XML">{L_EXPORT_AS_XML}</option></select></label> <input class="button2" type="submit" name="submit_export" value="{L_GO}" /><br /></div> -		<select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" /> -		<div><a href="#" onclick="marklist('viewfolder', 'marked_msg', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('viewfolder', 'marked_msg', false); return false;">{L_UNMARK_ALL}</a></div> -	</fieldset> - -	<hr /> - -	<ul class="linklist"> -		<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE --> -		<li class="rightside pagination"> -			<!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES}<!-- ENDIF --> -			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> -		</li> -		<!-- ENDIF --> -	</ul> +		<fieldset class="display-actions"> +			<div class="left-box"><label for="export_option">{L_EXPORT_FOLDER}{L_COLON} <select name="export_option" id="export_option"><option value="CSV">{L_EXPORT_AS_CSV}</option><option value="CSV_EXCEL">{L_EXPORT_AS_CSV_EXCEL}</option><option value="XML">{L_EXPORT_AS_XML}</option></select></label> <input class="button2" type="submit" name="submit_export" value="{L_GO}" /><br /></div> +			<select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" /> +			<div><a href="#" onclick="marklist('viewfolder', 'marked_msg', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('viewfolder', 'marked_msg', false); return false;">{L_UNMARK_ALL}</a></div> +		</fieldset> +	 +		<hr /> +	 +		<div class="action-bar bottom"> +			<div class="pagination"> +				{TOTAL_MESSAGES} +				<!-- IF .pagination -->  +					<!-- INCLUDE pagination.html --> +				<!-- ELSE -->  +					 • {PAGE_NUMBER} +				<!-- ENDIF --> +			</div> +		</div>  	<!-- ENDIF --> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  	<!-- IF FOLDER_CUR_MESSAGES neq 0 -->  	<fieldset class="display-options"> -		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF --> -		<label>{L_DISPLAY}: {S_SELECT_SORT_DAYS}</label> +		<label>{L_DISPLAY}{L_COLON} {S_SELECT_SORT_DAYS}</label>  		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> -		<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label> +		<label>{S_SELECT_SORT_DIR}</label> +		<input type="submit" name="sort" value="{L_GO}" class="button2" />  		<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />  	</fieldset>  	<!-- ENDIF -->  	<!-- INCLUDE ucp_pm_message_footer.html -->  <!-- ENDIF --> -<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index 1840732b64..02c5f5b1a5 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -2,60 +2,132 @@  <!-- INCLUDE ucp_pm_message_header.html --> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- IF S_DISPLAY_HISTORY and (U_VIEW_PREVIOUS_HISTORY or U_VIEW_NEXT_HISTORY) -->  	<fieldset class="display-options clearfix"> -		<!-- IF U_VIEW_PREVIOUS_HISTORY --><a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_HISTORY}</a><!-- ENDIF --> -		<!-- IF U_VIEW_NEXT_HISTORY --><a href="{U_VIEW_NEXT_HISTORY}" class="right-box {S_CONTENT_FLOW_END}">{L_VIEW_NEXT_HISTORY}</a><!-- ENDIF --> +		<!-- IF U_VIEW_PREVIOUS_HISTORY --><a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_HISTORY}</a><!-- ENDIF --> +		<!-- IF U_VIEW_NEXT_HISTORY --><a href="{U_VIEW_NEXT_HISTORY}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_VIEW_NEXT_HISTORY}</a><!-- ENDIF -->  	</fieldset>  <!-- ENDIF --> -<div id="post-{MESSAGE_ID}" class="post pm<!-- IF S_POST_UNAPPROVED or S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF S_ONLINE --> online<!-- ENDIF -->"> -<div class="inner"><span class="corners-top"><span></span></span> +<div id="post-{MESSAGE_ID}" class="post pm has-profile<!-- IF S_POST_UNAPPROVED or S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF S_ONLINE --> online<!-- ENDIF -->"> +<div class="inner"> + +	<dl class="postprofile" id="profile{MESSAGE_ID}"> +		<dt class="<!-- IF RANK_TITLE or RANK_IMG -->has-profile-rank<!-- ELSE -->no-profile-rank<!-- ENDIF --> <!-- IF AUTHOR_AVATAR -->has-avatar<!-- ELSE -->no-avatar<!-- ENDIF -->"> +			<div class="avatar-container"> +				<!-- EVENT ucp_pm_viewmessage_avatar_before --> +				<!-- IF AUTHOR_AVATAR --><a href="{U_MESSAGE_AUTHOR}" class="avatar">{AUTHOR_AVATAR}</a><!-- ENDIF --> +				<!-- EVENT ucp_pm_viewmessage_avatar_after --> +			</div> +			{MESSAGE_AUTHOR_FULL} +		</dt> + +		<!-- IF RANK_TITLE or RANK_IMG --><dd class="profile-rank">{RANK_TITLE}<!-- IF RANK_TITLE and RANK_IMG --><br /><!-- ENDIF -->{RANK_IMG}</dd><!-- ENDIF --> + +		<dd class="profile-posts"><strong>{L_POSTS}{L_COLON}</strong> <!-- IF U_AUTHOR_POSTS != '' --><a href="{U_AUTHOR_POSTS}">{AUTHOR_POSTS}</a><!-- ELSE -->{AUTHOR_POSTS}<!-- ENDIF --></dd> +		<!-- IF AUTHOR_JOINED --><dd class="profile-joined"><strong>{L_JOINED}{L_COLON}</strong> {AUTHOR_JOINED}</dd><!-- ENDIF --> + +		<!-- EVENT ucp_pm_viewmessage_custom_fields_before --> +		<!-- BEGIN custom_fields --> +			<!-- IF not custom_fields.S_PROFILE_CONTACT --> +				<dd class="profile-custom-field profile-{custom_fields.PROFILE_FIELD_IDENT}"><strong>{custom_fields.PROFILE_FIELD_NAME}{L_COLON}</strong> {custom_fields.PROFILE_FIELD_VALUE}</dd> +			<!-- ENDIF --> +		<!-- END custom_fields --> +		<!-- EVENT ucp_pm_viewmessage_custom_fields_after --> + +		<!-- EVENT ucp_pm_viewmessage_contact_fields_before --> +		<!-- IF .contact --> +			<dd class="profile-contact"> +				<strong>{L_CONTACT}{L_COLON}</strong> +				<div class="dropdown-container dropdown-left"> +					<a href="#" class="dropdown-trigger"><span class="imageset icon_contact" title="{CONTACT_USER}">{CONTACT_USER}</span></a> +					<div class="dropdown hidden"> +						<div class="pointer"><div class="pointer-inner"></div></div> +						<div class="dropdown-contents contact-icons"> +							<!-- BEGIN contact --> +								{% set REMAINDER = contact.S_ROW_COUNT % 4 %} +								<!-- DEFINE $S_LAST_CELL = ((REMAINDER eq 3) or (contact.S_LAST_ROW and contact.S_NUM_ROWS < 4)) --> +								<!-- IF REMAINDER eq 0 --> +									<div> +								<!-- ENDIF --> +									<a href="<!-- IF contact.U_CONTACT -->{contact.U_CONTACT}<!-- ELSE -->{contact.U_PROFILE_AUTHOR}<!-- ENDIF -->" title="{contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF contact.ID eq 'jabber' --> onclick="popup(this.href, 750, 320); return false;"<!-- ENDIF -->> +										<span class="contact-icon {contact.ID}-icon">{contact.NAME}</span> +									</a> +								<!-- IF REMAINDER eq 3 or contact.S_LAST_ROW --> +									</div> +								<!-- ENDIF --> +							<!-- END contact --> +						</div> +					</div> +				</div> +			</dd> +		<!-- ENDIF --> +		<!-- EVENT ucp_pm_viewmessage_contact_fields_after --> +	</dl>  	<div class="postbody"> +		<h3 class="first">{SUBJECT}</h3>  		<!-- IF U_DELETE or U_EDIT or U_QUOTE or U_REPORT --> -		<ul class="profile-icons"> -			<!-- IF U_EDIT --><li class="edit-icon"><a href="{U_EDIT}" title="{L_POST_EDIT_PM}"><span>{L_POST_EDIT_PM}</span></a></li><!-- ENDIF --> -			<!-- IF U_DELETE --><li class="delete-icon"><a href="{U_DELETE}" title="{L_DELETE_MESSAGE}"><span>{L_DELETE_MESSAGE}</span></a></li><!-- ENDIF --> -			<!-- IF U_REPORT --><li class="report-icon"><a href="{U_REPORT}" title="{L_REPORT_PM}"><span>{L_REPORT_PM}</span></a></li><!-- ENDIF --> -			<!-- IF U_QUOTE --><li class="quote-icon"><a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}"><span>{L_POST_QUOTE_PM}</span></a></li><!-- ENDIF --> +		<ul class="post-buttons"> +			<!-- EVENT ucp_pm_viewmessage_post_buttons_before --> +			<!-- IF U_EDIT --> +				<li> +					<a href="{U_EDIT}" title="{L_POST_EDIT_PM}" class="button icon-button edit-icon"><span>{L_POST_EDIT_PM}</span></a> +				</li> +			<!-- ENDIF --> +			<!-- IF U_DELETE --> +				<li> +					<a href="{U_DELETE}" title="{L_DELETE_MESSAGE}" class="button icon-button delete-icon"><span>{L_DELETE_MESSAGE}</span></a> +				</li> +			<!-- ENDIF --> +			<!-- IF U_REPORT --> +				<li> +					<a href="{U_REPORT}" title="{L_REPORT_PM}" class="button icon-button report-icon"><span>{L_REPORT_PM}</span></a> +				</li> +			<!-- ENDIF --> +			<!-- IF U_QUOTE --> +				<li> +					<a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}" class="button icon-button quote-icon"><span>{L_POST_QUOTE_PM}</span></a> +				</li> +			<!-- ENDIF --> +			<!-- EVENT ucp_pm_viewmessage_post_buttons_after -->  		</ul>  		<!-- ENDIF --> -		<h3 class="first">{SUBJECT}</h3> -  		<p class="author"> -			<strong>{L_SENT_AT}:</strong> {SENT_DATE} -			<br /><strong>{L_PM_FROM}:</strong> {MESSAGE_AUTHOR_FULL} -			<!-- IF S_TO_RECIPIENT --><br /><strong>{L_TO}:</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}" style="color:<!-- IF to_recipient.COLOUR -->{to_recipient.COLOUR}<!-- ELSEIF to_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{to_recipient.NAME}</a><!-- ENDIF --> <!-- END to_recipient --><!-- ENDIF --> -			<!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}:</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}" style="color:<!-- IF bcc_recipient.COLOUR -->{bcc_recipient.COLOUR}<!-- ELSEIF bcc_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{bcc_recipient.NAME}</a><!-- ENDIF --> <!-- END bcc_recipient --><!-- ENDIF --> +			<strong>{L_SENT_AT}{L_COLON}</strong> {SENT_DATE} +			<br /><strong>{L_PM_FROM}{L_COLON}</strong> {MESSAGE_AUTHOR_FULL} +			<!-- IF S_TO_RECIPIENT --><br /><strong>{L_TO}{L_COLON}</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}" style="color:<!-- IF to_recipient.COLOUR -->{to_recipient.COLOUR}<!-- ELSEIF to_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{to_recipient.NAME}</a><!-- ENDIF --> <!-- END to_recipient --><!-- ENDIF --> +			<!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}{L_COLON}</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}" style="color:<!-- IF bcc_recipient.COLOUR -->{bcc_recipient.COLOUR}<!-- ELSEIF bcc_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{bcc_recipient.NAME}</a><!-- ENDIF --> <!-- END bcc_recipient --><!-- ENDIF -->  		</p>  		<div class="content">{MESSAGE}</div>  		<!-- IF S_HAS_ATTACHMENTS --> -		<dl class="attachbox"> -			<dt>{L_ATTACHMENTS}</dt> -			<!-- BEGIN attachment --> -			<dd>{attachment.DISPLAY_ATTACHMENT}</dd> -			<!-- END attachment --> -		</dl> +			<dl class="attachbox"> +				<dt> +					{L_ATTACHMENTS} +				</dt> +				<!-- BEGIN attachment --> +					<dd>{attachment.DISPLAY_ATTACHMENT}</dd> +				<!-- END attachment --> +			</dl>  		<!-- ENDIF -->  		<!-- IF S_DISPLAY_NOTICE --> -			<div class="rules">{L_DOWNLOAD_NOTICE}</div> +			<div class="post-notice error">{L_DOWNLOAD_NOTICE}</div>  		<!-- ENDIF -->  		<!-- IF EDITED_MESSAGE or EDIT_REASON -->  		<div class="notice">{EDITED_MESSAGE} -			<!-- IF EDIT_REASON --><br /><strong>{L_REASON}:</strong> <em>{EDIT_REASON}</em><!-- ENDIF --> +			<!-- IF EDIT_REASON --><br /><strong>{L_REASON}{L_COLON}</strong> <em>{EDIT_REASON}</em><!-- ENDIF -->  		</div>  		<!-- ENDIF --> @@ -64,43 +136,18 @@  		<!-- ENDIF -->  	</div> -	<dl class="postprofile" id="profile{MESSAGE_ID}"> -		<dt><!-- IF AUTHOR_AVATAR --><a href="{U_MESSAGE_AUTHOR}">{AUTHOR_AVATAR}</a><br /><!-- ENDIF -->{MESSAGE_AUTHOR_FULL}</dt> -		<!-- IF RANK_TITLE --><dd>{RANK_TITLE}</dd><!-- ENDIF --> -		<!-- IF RANK_IMG --><dd>{RANK_IMG}</dd><!-- ENDIF --> -		<dd> </dd> -		<dd><strong>{L_POSTS}:</strong> {AUTHOR_POSTS}</dd> -		<!-- IF AUTHOR_JOINED --><dd><strong>{L_JOINED}:</strong> {AUTHOR_JOINED}</dd><!-- ENDIF --> -		<!-- IF AUTHOR_FROM --><dd><strong>{L_LOCATION}:</strong> {AUTHOR_FROM}</dd><!-- ENDIF --> -		 -		<!-- IF U_PM or U_EMAIL or U_WWW or U_MSN or U_ICQ or U_YIM or U_AIM or U_JABBER --> -		<dd> -			<ul class="profile-icons"> -			<!-- IF U_PM --><li class="pm-icon"><a href="{U_PM}" title="{L_PRIVATE_MESSAGE}"><span>{L_PRIVATE_MESSAGE}</span></a></li><!-- ENDIF --> -			<!-- IF U_EMAIL --><li class="email-icon"><a href="{U_EMAIL}" title="{L_SEND_EMAIL_USER} {MESSAGE_AUTHOR}"><span>{L_SEND_EMAIL_USER} {MESSAGE_AUTHOR}</span></a></li><!-- ENDIF --> -			<!-- IF U_WWW --><li class="web-icon"><a href="{U_WWW}" title="{L_VISIT_WEBSITE}: {U_WWW}"><span>{L_WEBSITE}</span></a></li><!-- ENDIF --> -			<!-- IF U_MSN --><li class="msnm-icon"><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false;" title="{L_MSNM}"><span>{L_MSNM}</span></a></li><!-- ENDIF --> -			<!-- IF U_ICQ --><li class="icq-icon"><a href="{U_ICQ}" onclick="popup(this.href, 550, 320); return false;" title="{L_ICQ}"><span>{L_ICQ}</span></a></li><!-- ENDIF --> -			<!-- IF U_YIM --><li class="yahoo-icon"><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false;" title="{L_YIM}"><span>{L_YIM}</span></a></li><!-- ENDIF --> -			<!-- IF U_AIM --><li class="aim-icon"><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false;" title="{L_AIM}"><span>{L_AIM}</span></a></li><!-- ENDIF --> -			<!-- IF U_JABBER --><li class="jabber-icon"><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false;" title="{L_JABBER}"><span>{L_JABBER}</span></a></li><!-- ENDIF --> -			</ul> -		</dd> -		<!-- ENDIF --> -	</dl> -  	<div class="back2top"><a href="#top" class="top" title="{L_BACK_TO_TOP}">{L_BACK_TO_TOP}</a></div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- IF S_VIEW_MESSAGE -->  <fieldset class="display-options"> -	<!-- IF U_PREVIOUS_PM --><a href="{U_PREVIOUS_PM}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_PM}</a><!-- ENDIF --> -	<!-- IF U_NEXT_PM --><a href="{U_NEXT_PM}" class="right-box {S_CONTENT_FLOW_END}">{L_VIEW_NEXT_PM}</a><!-- ENDIF --> +	<!-- IF U_PREVIOUS_PM --><a href="{U_PREVIOUS_PM}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_PM}</a><!-- ENDIF --> +	<!-- IF U_NEXT_PM --><a href="{U_NEXT_PM}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_VIEW_NEXT_PM}</a><!-- ENDIF -->  	<!-- IF S_MARK_OPTIONS --><label for="mark_option"><select name="mark_option" id="mark_option">{S_MARK_OPTIONS}</select></label> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" /><!-- ENDIF --> -	<!-- IF not S_UNREAD and not S_SPECIAL_FOLDER --><label for="dest_folder"><!-- IF S_VIEW_MESSAGE -->{L_MOVE_TO_FOLDER}: <!-- 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 --> +	<!-- 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 -->  	<input type="hidden" name="marked_msg_id[]" value="{MSG_ID}" />  	<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />  	<input type="hidden" name="p" value="{MSG_ID}" /> @@ -111,4 +158,4 @@  <!-- IF S_DISPLAY_HISTORY --><!-- INCLUDE ucp_pm_history.html --><!-- ENDIF --> -<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html index 91dd4606c8..ce0f4941a5 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html @@ -1,23 +1,17 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}"> +<!DOCTYPE html> +<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">  <head> - -<meta http-equiv="content-type" content="text/html; charset={S_CONTENT_ENCODING}" /> -<meta http-equiv="content-style-type" content="text/css" /> -<meta http-equiv="content-language" content="{S_USER_LANG}" /> -<meta http-equiv="imagetoolbar" content="no" /> -<meta name="resource-type" content="document" /> -<meta name="distribution" content="global" /> +<meta charset="utf-8">  <meta name="robots" content="noindex" />  {META}  <title>{SITENAME} • {PAGE_TITLE}</title>  <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" /> +<!-- EVENT ucp_pm_viewmessage_print_head_append -->  </head> -  <body id="phpbb">  <div id="wrap"> -	<a id="top" name="top" accesskey="t"></a> +	<a id="top" class="anchor" accesskey="t"></a>  	<div id="page-header">  		<h1>{SITENAME}</h1> @@ -46,9 +40,9 @@  	<div id="page-footer">  		<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div> -		<div class="copyright">Powered by phpBB® Forum Software © phpBB Group<br />https://www.phpbb.com/</div> +		<div class="copyright">Powered by phpBB® Forum Software © phpBB Limited<br />https://www.phpbb.com/</div>  	</div>  </div>  </body> -</html>
\ No newline at end of file +</html> diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html index 600319fc72..c8b028f83a 100644 --- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html +++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html @@ -5,103 +5,81 @@  <h2>{L_TITLE}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<fieldset>  	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF --> +	<!-- EVENT ucp_prefs_personal_prepend -->  	<dl> -		<dt><label for="viewemail0">{L_SHOW_EMAIL}:</label></dt> +		<dt><label for="viewemail0">{L_SHOW_EMAIL}{L_COLON}</label></dt>  		<dd> -			<label for="viewemail1"><input type="radio" name="viewemail" id="viewemail1" value="1"<!-- IF S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  +			<label for="viewemail1"><input type="radio" name="viewemail" id="viewemail1" value="1"<!-- IF S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label for="viewemail0"><input type="radio" name="viewemail" id="viewemail0" value="0"<!-- IF not S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  		</dd>  	</dl>  	<dl> -		<dt><label for="massemail1">{L_ADMIN_EMAIL}:</label></dt> +		<dt><label for="massemail1">{L_ADMIN_EMAIL}{L_COLON}</label></dt>  		<dd> -			<label for="massemail1"><input type="radio" name="massemail" id="massemail1" value="1"<!-- IF S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  +			<label for="massemail1"><input type="radio" name="massemail" id="massemail1" value="1"<!-- IF S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label for="massemail0"><input type="radio" name="massemail" id="massemail0" value="0"<!-- IF not S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  		</dd>  	</dl>  	<dl> -		<dt><label for="allowpm1">{L_ALLOW_PM}:</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt> +		<dt><label for="allowpm1">{L_ALLOW_PM}{L_COLON}</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt>  		<dd> -			<label for="allowpm1"><input type="radio" name="allowpm" id="allowpm1" value="1"<!-- IF S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  +			<label for="allowpm1"><input type="radio" name="allowpm" id="allowpm1" value="1"<!-- IF S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label for="allowpm0"><input type="radio" name="allowpm" id="allowpm0" value="0"<!-- IF not S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  		</dd>  	</dl>  	<!-- IF S_CAN_HIDE_ONLINE -->  		<dl> -			<dt><label for="hideonline0">{L_HIDE_ONLINE}:</label><br /><span>{L_HIDE_ONLINE_EXPLAIN}</span></dt> +			<dt><label for="hideonline0">{L_HIDE_ONLINE}{L_COLON}</label><br /><span>{L_HIDE_ONLINE_EXPLAIN}</span></dt>  			<dd> -				<label for="hideonline1"><input type="radio" name="hideonline" id="hideonline1" value="1"<!-- IF S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  +				<label for="hideonline1"><input type="radio" name="hideonline" id="hideonline1" value="1"<!-- IF S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label for="hideonline0"><input type="radio" name="hideonline" id="hideonline0" value="0"<!-- IF not S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  			</dd>  		</dl> -	<!-- ENDIF -->		 +	<!-- ENDIF -->  	<!-- IF S_SELECT_NOTIFY -->  		<dl> -			<dt><label for="notifymethod0">{L_NOTIFY_METHOD}:</label></dt> +			<dt><label for="notifymethod0">{L_NOTIFY_METHOD}{L_COLON}</label></dt>  			<dd> -				<label for="notifymethod0"><input type="radio" name="notifymethod" id="notifymethod0" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label>  -				<label for="notifymethod1"><input type="radio" name="notifymethod" id="notifymethod1" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label>  +				<label for="notifymethod0"><input type="radio" name="notifymethod" id="notifymethod0" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label> +				<label for="notifymethod1"><input type="radio" name="notifymethod" id="notifymethod1" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label>  				<label for="notifymethod2"><input type="radio" name="notifymethod" id="notifymethod2" value="2"<!-- IF S_NOTIFY_BOTH --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label>  			</dd>  		</dl>  	<!-- ENDIF --> -	<dl> -		<dt><label for="notifypm1">{L_NOTIFY_ON_PM}:</label></dt> -		<dd> -			<label for="notifypm1"><input type="radio" name="notifypm" id="notifypm1" value="1"<!-- IF S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  -			<label for="notifypm0"><input type="radio" name="notifypm" id="notifypm0" value="0"<!-- IF not S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> -		</dd> -	</dl> -	<dl> -		<dt><label for="popuppm0">{L_POPUP_ON_PM}:</label></dt> -		<dd> -			<label for="popuppm1"><input type="radio" name="popuppm" id="popuppm1" value="1"<!-- IF S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  -			<label for="popuppm0"><input type="radio" name="popuppm" id="popuppm0" value="0"<!-- IF not S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> -		</dd> -	</dl>  	<!-- IF S_MORE_LANGUAGES -->  		<dl> -			<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt> +			<dt><label for="lang">{L_BOARD_LANGUAGE}{L_COLON}</label></dt>  			<dd><select name="lang" id="lang">{S_LANG_OPTIONS}</select></dd>  		</dl>  	<!-- ENDIF -->  	<!-- IF S_STYLE_OPTIONS and S_MORE_STYLES -->  		<dl> -			<dt><label for="style">{L_BOARD_STYLE}:</label></dt> -			<dd><select name="style" id="style">{S_STYLE_OPTIONS}</select></dd> +			<dt><label for="user_style">{L_BOARD_STYLE}{L_COLON}</label></dt> +			<dd><select name="user_style" id="user_style">{S_STYLE_OPTIONS}</select></dd>  		</dl>  	<!-- ENDIF --> +	<!-- INCLUDE timezone_option.html -->  	<dl> -		<dt><label for="timezone">{L_BOARD_TIMEZONE}:</label></dt> -		<dd><select name="tz" id="timezone" class="autowidth">{S_TZ_OPTIONS}</select></dd> -	</dl> -	<dl> -		<dt><label for="dst1">{L_BOARD_DST}:</label></dt> -		<dd> -			<label for="dst1"><input type="radio" name="dst" id="dst1" value="1"<!-- IF S_DST --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  -			<label for="dst0"><input type="radio" name="dst" id="dst0" value="0"<!-- IF not S_DST --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> -		</dd> -	</dl> -	<dl> -		<dt><label for="dateformat">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt> +		<dt><label for="dateformat">{L_BOARD_DATE_FORMAT}{L_COLON}</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>  		<dd> -			<select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }"> +			<select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){phpbb.toggleDisplay('custom_date',1);}else{phpbb.toggleDisplay('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">  				{S_DATEFORMAT_OPTIONS}  			</select>  		</dd>  		<dd id="custom_date" style="display:none;"><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" class="inputbox narrow" style="margin-top: 3px;" /></dd>  	</dl> +	<!-- EVENT ucp_prefs_personal_append -->  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div> -	 +  <fieldset class="submit-buttons"> -	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />   +	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />   	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />  	{S_FORM_TOKEN}  </fieldset> @@ -115,9 +93,9 @@  	function customDates()  	{  		var e = document.getElementById('dateoptions'); -	 +  		e.selectedIndex = e.length - 1; -	 +  		// Loop and match date_format in menu  		for (var i = 0; i < e.length; i++)  		{ @@ -127,20 +105,20 @@  				break;  			}  		} -	 +  		// Show/hide custom field  		if (e.selectedIndex == e.length - 1)  		{ -			dE('custom_date',1); +			phpbb.toggleDisplay('custom_date',1);  		}  		else  		{ -			dE('custom_date',-1); +			phpbb.toggleDisplay('custom_date',-1);  		}  	} -	customDates(); +	window.onload = customDates;  // ]]>  </script> -<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_prefs_post.html b/phpBB/styles/prosilver/template/ucp_prefs_post.html index 74af90ca5a..891e49af6f 100644 --- a/phpBB/styles/prosilver/template/ucp_prefs_post.html +++ b/phpBB/styles/prosilver/template/ucp_prefs_post.html @@ -4,41 +4,43 @@  <h2>{L_TITLE}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<fieldset>  	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF --> +	<!-- EVENT ucp_prefs_post_prepend -->  	<dl> -		<dt><label for="bbcode1">{L_DEFAULT_BBCODE}:</label></dt> +		<dt><label for="bbcode1">{L_DEFAULT_BBCODE}{L_COLON}</label></dt>  		<dd>  			<label for="bbcode1"><input type="radio" name="bbcode" id="bbcode1" value="1"<!-- IF S_BBCODE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   			<label for="bbcode0"><input type="radio" name="bbcode" id="bbcode0" value="0"<!-- IF not S_BBCODE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  		</dd>  	</dl>  	<dl> -		<dt><label for="smilies1">{L_DEFAULT_SMILIES}:</label></dt> +		<dt><label for="smilies1">{L_DEFAULT_SMILIES}{L_COLON}</label></dt>  		<dd>  			<label for="smilies1"><input type="radio" name="smilies" id="smilies1" value="1"<!-- IF S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   			<label for="smilies0"><input type="radio" name="smilies" id="smilies0" value="0"<!-- IF not S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  		</dd>  	</dl>  	<dl> -		<dt><label for="sig1">{L_DEFAULT_ADD_SIG}:</label></dt> +		<dt><label for="sig1">{L_DEFAULT_ADD_SIG}{L_COLON}</label></dt>  		<dd>  			<label for="sig1"><input type="radio" name="sig" id="sig1" value="1"<!-- IF S_SIG --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   			<label for="sig0"><input type="radio" name="sig" id="sig0" value="0"<!-- IF not S_SIG --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  		</dd>  	</dl>  	<dl> -		<dt><label for="notify1">{L_DEFAULT_NOTIFY}:</label></dt> +		<dt><label for="notify1">{L_DEFAULT_NOTIFY}{L_COLON}</label></dt>  		<dd>  			<label for="notify1"><input type="radio" name="notify" id="notify1" value="1"<!-- IF S_NOTIFY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   			<label for="notify0"><input type="radio" name="notify" id="notify0" value="0"<!-- IF not S_NOTIFY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  		</dd>  	</dl> +	<!-- EVENT ucp_prefs_post_append -->  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <fieldset class="submit-buttons"> @@ -48,4 +50,4 @@  </fieldset>  </form> -<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_prefs_view.html b/phpBB/styles/prosilver/template/ucp_prefs_view.html index dc773584df..7f8d0a344c 100644 --- a/phpBB/styles/prosilver/template/ucp_prefs_view.html +++ b/phpBB/styles/prosilver/template/ucp_prefs_view.html @@ -5,40 +5,41 @@  <h2>{L_TITLE}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  		<fieldset>  		<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF --> +		<!-- EVENT ucp_prefs_view_radio_buttons_prepend -->  		<dl> -			<dt><label for="images1">{L_VIEW_IMAGES}:</label></dt> +			<dt><label for="images1">{L_VIEW_IMAGES}{L_COLON}</label></dt>  			<dd>  				<label for="images1"><input type="radio" name="images" id="images1" value="1"<!-- IF S_IMAGES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   				<label for="images0"><input type="radio" name="images" id="images0" value="0"<!-- IF not S_IMAGES --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  			</dd>  		</dl>  		<dl> -			<dt><label for="flash0">{L_VIEW_FLASH}:</label></dt> +			<dt><label for="flash0">{L_VIEW_FLASH}{L_COLON}</label></dt>  			<dd>  				<label for="flash1"><input type="radio" name="flash" id="flash1" value="1"<!-- IF S_FLASH --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   				<label for="flash0"><input type="radio" name="flash" id="flash0" value="0"<!-- IF not S_FLASH --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  			</dd>  		</dl>  		<dl> -			<dt><label for="smilies1">{L_VIEW_SMILIES}:</label></dt> +			<dt><label for="smilies1">{L_VIEW_SMILIES}{L_COLON}</label></dt>  			<dd>  				<label for="smilies1"><input type="radio" name="smilies" id="smilies1" value="1"<!-- IF S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   				<label for="smilies0"><input type="radio" name="smilies" id="smilies0" value="0"<!-- IF not S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  			</dd>  		</dl>  		<dl> -			<dt><label for="sigs1">{L_VIEW_SIGS}:</label></dt> +			<dt><label for="sigs1">{L_VIEW_SIGS}{L_COLON}</label></dt>  			<dd>  				<label for="sigs1"><input type="radio" name="sigs" id="sigs1" value="1"<!-- IF S_SIGS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   				<label for="sigs0"><input type="radio" name="sigs" id="sigs0" value="0"<!-- IF not S_SIGS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  			</dd>  		</dl>  		<dl> -			<dt><label for="avatars1">{L_VIEW_AVATARS}:</label></dt> +			<dt><label for="avatars1">{L_VIEW_AVATARS}{L_COLON}</label></dt>  			<dd>  				<label for="avatars1"><input type="radio" name="avatars" id="avatars1" value="1"<!-- IF S_AVATARS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   				<label for="avatars0"><input type="radio" name="avatars" id="avatars0" value="0"<!-- IF not S_AVATARS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> @@ -46,42 +47,45 @@  		</dl>  		<!-- IF S_CHANGE_CENSORS -->  			<dl> -				<dt><label for="wordcensor1">{L_DISABLE_CENSORS}:</label></dt> +				<dt><label for="wordcensor1">{L_DISABLE_CENSORS}{L_COLON}</label></dt>  				<dd>  					<label for="wordcensor1"><input type="radio" name="wordcensor" id="wordcensor1" value="1"<!-- IF S_DISABLE_CENSORS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   					<label for="wordcensor0"><input type="radio" name="wordcensor" id="wordcensor0" value="0"<!-- IF not S_DISABLE_CENSORS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  				</dd>  			</dl>  		<!-- ENDIF --> +		<!-- EVENT ucp_prefs_view_radio_buttons_append -->  		<hr /> +		<!-- EVENT ucp_prefs_view_select_menu_prepend -->  		<dl> -			<dt><label>{L_VIEW_TOPICS_DAYS}:</label></dt> +			<dt><label>{L_VIEW_TOPICS_DAYS}{L_COLON}</label></dt>  			<dd>{S_TOPIC_SORT_DAYS}</dd>  		</dl>  		<dl> -			<dt><label>{L_VIEW_TOPICS_KEY}:</label></dt> +			<dt><label>{L_VIEW_TOPICS_KEY}{L_COLON}</label></dt>  			<dd>{S_TOPIC_SORT_KEY}</dd>  		</dl>  		<dl> -			<dt><label>{L_VIEW_TOPICS_DIR}:</label></dt> +			<dt><label>{L_VIEW_TOPICS_DIR}{L_COLON}</label></dt>  			<dd>{S_TOPIC_SORT_DIR}</dd>  		</dl>  		<hr />  		<dl> -			<dt><label>{L_VIEW_POSTS_DAYS}:</label></dt> +			<dt><label>{L_VIEW_POSTS_DAYS}{L_COLON}</label></dt>  			<dd>{S_POST_SORT_DAYS}</dd>  		</dl>  		<dl> -			<dt><label>{L_VIEW_POSTS_KEY}:</label></dt> +			<dt><label>{L_VIEW_POSTS_KEY}{L_COLON}</label></dt>  			<dd>{S_POST_SORT_KEY}</dd>  		</dl>  		<dl> -			<dt><label>{L_VIEW_POSTS_DIR}:</label></dt> +			<dt><label>{L_VIEW_POSTS_DIR}{L_COLON}</label></dt>  			<dd>{S_POST_SORT_DIR}</dd>  		</dl> +		<!-- EVENT ucp_prefs_view_select_menu_append -->  		</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <fieldset class="submit-buttons"> @@ -91,4 +95,4 @@  </fieldset>  </form> -<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html new file mode 100644 index 0000000000..6fec0b8aed --- /dev/null +++ b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html @@ -0,0 +1,45 @@ +<!-- INCLUDE ucp_header.html --> + +<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}> + +<h2>{L_TITLE}</h2> +<div class="panel"> +	<div class="inner"> +		<p>{L_PROFILE_AUTOLOGIN_KEYS}</p> +		<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF --> +		<table class="table1"> +			<thead> +				<tr> +					<th>{L_LOGIN_KEY}</th> +					<th>{L_IP}</th> +					<th>{L_LOGIN_TIME}</th> +					<th class="mark">{L_MARK}</th> +				</tr> +			</thead> +			<tbody> +			<!-- BEGIN sessions --> +				<!-- IF sessions.S_ROW_COUNT is even --><tr class="bg1"><!-- ELSE --><tr class="bg2"><!-- ENDIF --> +					<td><label for="{sessions.KEY}">{sessions.KEY}</label></td> +					<td style="text-align: center">{sessions.IP}</td> +					<td style="text-align: center">{sessions.LOGIN_TIME}</td> +					<td style="text-align: center" class="mark"><input type="checkbox" name="keys[]" value="{sessions.KEY}" id="{sessions.KEY}" /></td> +				</tr> +			<!-- BEGINELSE --> +				<tr><td colspan="4" class="bg1" style="text-align: center">{L_PROFILE_NO_AUTOLOGIN_KEYS}</td></tr> +			<!-- END sessions --> +			</tbody> +		</table> +	</div> +</div> + +<!-- IF .sessions --> +	<fieldset class="display-actions"> +		{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_DELETE_MARKED}" class="button2" /> +		<div><a href="#" onclick="$('#ucp input:checkbox').prop('checked', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="$('#ucp input:checkbox').prop('checked', false); return false;">{L_UNMARK_ALL}</a></div> +		{S_FORM_TOKEN} +	</fieldset> +<!-- ENDIF --> + +</form> + +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_profile_avatar.html b/phpBB/styles/prosilver/template/ucp_profile_avatar.html index 2669ed3c22..8157d8c15b 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_avatar.html +++ b/phpBB/styles/prosilver/template/ucp_profile_avatar.html @@ -6,14 +6,8 @@  <!-- INCLUDE ucp_avatar_options.html --> -<fieldset class="submit-buttons"> -	{S_HIDDEN_FIELDS} -	<!-- IF S_DISPLAY_GALLERY --><input type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" class="button2" />  <!-- ENDIF --> -	<!-- IF S_IN_AVATAR_GALLERY --><input type="submit" name="cancel" value="{L_CANCEL}" class="button2" />  <!-- ELSE --> -	<input type="reset" value="{L_RESET}" name="reset" class="button2" />  <!-- ENDIF --> -	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" /> -	{S_FORM_TOKEN} -</fieldset> +{S_HIDDEN_FIELDS} +{S_FORM_TOKEN}  </form> -<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html index 0d3a48c334..e8e2aedc14 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html +++ b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html @@ -2,63 +2,33 @@  <form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}> -<h2>{L_TITLE}</h2> +<h2>{L_TITLE} <span class="small">[ <a href="{U_USER_PROFILE}" title="{L_VIEW_PROFILE}">{L_VIEW_PROFILE}</a> ]</span></h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<p>{L_PROFILE_INFO_NOTICE}</p>  	<fieldset>  	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF --> -	<dl> -		<dt><label for="icq">{L_UCP_ICQ}:</label></dt> -		<dd><input type="text" name="icq" id="icq" maxlength="15" value="{ICQ}" class="inputbox" /></dd> -	</dl> -	<dl> -		<dt><label for="aim">{L_UCP_AIM}:</label></dt> -		<dd><input type="text" name="aim" id="aim" maxlength="255" value="{AIM}" class="inputbox" /></dd> -	</dl> -	<dl> -		<dt><label for="msn">{L_UCP_MSNM}:</label></dt> -		<dd><input type="text" name="msn" id="msn" maxlength="255" value="{MSN}" class="inputbox" /></dd> -	</dl> -	<dl> -		<dt><label for="yim">{L_UCP_YIM}:</label></dt> -		<dd><input type="text" name="yim" id="yim" maxlength="255" value="{YIM}" class="inputbox" /></dd> -	</dl> -	<dl> -		<dt><label for="jabber">{L_UCP_JABBER}:</label></dt> -		<dd><input type="text" name="jabber" id="jabber" maxlength="255" value="{JABBER}" class="inputbox" /></dd> -	</dl> -	<dl> -		<dt><label for="website">{L_WEBSITE}:</label></dt> -		<dd><input type="text" name="website" id="website" maxlength="255" value="{WEBSITE}" class="inputbox" /></dd> -	</dl> -	<dl> -		<dt><label for="location">{L_LOCATION}:</label></dt> -		<dd><input type="text" name="location" id="location" maxlength="255" value="{LOCATION}" class="inputbox" /></dd> -	</dl> -	<dl> -		<dt><label for="occupation">{L_OCCUPATION}:</label></dt> -		<dd><textarea name="occupation" id="occupation" class="inputbox" rows="3" cols="30">{OCCUPATION}</textarea></dd> -	</dl> -	<dl> -		<dt><label for="interests">{L_INTERESTS}:</label></dt> -		<dd><textarea name="interests" id="interests" class="inputbox" rows="3" cols="30">{INTERESTS}</textarea></dd> -	</dl>  	<!-- IF S_BIRTHDAYS_ENABLED -->  		<dl> -			<dt><label for="bday_day">{L_BIRTHDAY}:</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt> +			<dt><label for="bday_day">{L_BIRTHDAY}{L_COLON}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>  			<dd> -				<label for="bday_day">{L_DAY}: <select name="bday_day" id="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select></label>  -				<label for="bday_month">{L_MONTH}: <select name="bday_month" id="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select></label>  -				<label for="bday_year">{L_YEAR}: <select name="bday_year" id="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></label> +				<label for="bday_day">{L_DAY}{L_COLON} <select name="bday_day" id="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select></label> +				<label for="bday_month">{L_MONTH}{L_COLON} <select name="bday_month" id="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select></label> +				<label for="bday_year">{L_YEAR}{L_COLON} <select name="bday_year" id="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></label>  			</dd>  		</dl>  	<!-- ENDIF --> +	<!-- IF S_JABBER_ENABLED --> +		<dl> +			<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt> +			<dd><input type="email" name="jabber" id="jabber" maxlength="255" value="{JABBER}" class="inputbox" /></dd> +		</dl> +	<!-- ENDIF -->  	<!-- BEGIN profile_fields -->  		<dl> -			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}:<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label> +			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}{L_COLON}<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label>  			<!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt>  			<!-- IF profile_fields.ERROR --><dd class="error">{profile_fields.ERROR}</dd><!-- ENDIF -->  			<dd>{profile_fields.FIELD}</dd> @@ -66,14 +36,14 @@  	<!-- END profile_fields -->  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <fieldset class="submit-buttons"> -	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />   +	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />   	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />  	{S_FORM_TOKEN}  </fieldset>  </form> -<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html index 2f24601645..4b26bc2e99 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html +++ b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html @@ -4,7 +4,7 @@  <h2>{L_TITLE}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<!-- IF S_FORCE_PASSWORD -->  		<p class="error">{L_FORCE_PASSWORD_EXPLAIN}</p> @@ -13,44 +13,38 @@  	<fieldset>  	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->  	<dl> -		<dt><label <!-- IF S_CHANGE_USERNAME -->for="username"<!-- ENDIF -->>{L_USERNAME}:</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt> +		<dt><label <!-- IF S_CHANGE_USERNAME -->for="username"<!-- ENDIF -->>{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>  		<dd><!-- IF S_CHANGE_USERNAME --><input type="text" name="username" id="username" value="{USERNAME}" class="inputbox" title="{L_USERNAME}" /><!-- ELSE --><strong>{USERNAME}</strong><!-- ENDIF --></dd>  	</dl>  	<dl> -		<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt> -		<dd><!-- IF S_CHANGE_EMAIL --><input type="text" name="email" id="email" maxlength="100" value="{EMAIL}" class="inputbox" title="{L_EMAIL_ADDRESS}" /><!-- ELSE --><strong>{EMAIL}</strong><!-- ENDIF --></dd> +		<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label></dt> +		<dd><!-- IF S_CHANGE_EMAIL --><input type="email" name="email" id="email" maxlength="100" value="{EMAIL}" class="inputbox" title="{L_EMAIL_ADDRESS}" /><!-- ELSE --><strong>{EMAIL}</strong><!-- ENDIF --></dd>  	</dl> -	<!-- IF S_CHANGE_EMAIL --> -		<dl> -			<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label><br /><span>{L_CONFIRM_EMAIL_EXPLAIN}</span></dt> -			<dd><input type="text" name="email_confirm" id="email_confirm" maxlength="100" value="{CONFIRM_EMAIL}" class="inputbox" title="{L_CONFIRM_EMAIL}" /></dd> -		</dl> -	<!-- ENDIF -->  	<!-- IF S_CHANGE_PASSWORD -->  		<dl> -			<dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt> +			<dt><label for="new_password">{L_NEW_PASSWORD}{L_COLON}</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>  			<dd><input type="password" name="new_password" id="new_password" maxlength="255" value="{NEW_PASSWORD}" class="inputbox" title="{L_CHANGE_PASSWORD}" /></dd>  		</dl>  		<dl> -			<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt> +			<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>  			<dd><input type="password" name="password_confirm" id="password_confirm" maxlength="255" value="{PASSWORD_CONFIRM}" class="inputbox" title="{L_CONFIRM_PASSWORD}" /></dd>  		</dl>  	<!-- ENDIF -->  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<fieldset>  	<dl> -		<dt><label for="cur_password">{L_CURRENT_PASSWORD}:</label><br /><span><!-- IF S_CHANGE_PASSWORD -->{L_CURRENT_CHANGE_PASSWORD_EXPLAIN}<!-- ELSE -->{L_CURRENT_PASSWORD_EXPLAIN}<!-- ENDIF --></span></dt> +		<dt><label for="cur_password">{L_CURRENT_PASSWORD}{L_COLON}</label><br /><span><!-- IF S_CHANGE_PASSWORD -->{L_CURRENT_CHANGE_PASSWORD_EXPLAIN}<!-- ELSE -->{L_CURRENT_PASSWORD_EXPLAIN}<!-- ENDIF --></span></dt>  		<dd><input type="password" name="cur_password" id="cur_password" maxlength="255" value="{CUR_PASSWORD}" class="inputbox" title="{L_CURRENT_PASSWORD}" /></dd>  	</dl>  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <fieldset class="submit-buttons"> diff --git a/phpBB/styles/prosilver/template/ucp_profile_signature.html b/phpBB/styles/prosilver/template/ucp_profile_signature.html index ab23b84076..614f6f440d 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_signature.html +++ b/phpBB/styles/prosilver/template/ucp_profile_signature.html @@ -6,17 +6,17 @@  <!-- IF SIGNATURE_PREVIEW != '' -->  	<div class="panel"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<h3>{L_SIGNATURE_PREVIEW}</h3>  		<div class="postbody"> -			<div class="signature" style="border-top:none; margin-top: 0; ">{SIGNATURE_PREVIEW}</div> +			<div class="signature standalone">{SIGNATURE_PREVIEW}</div> +		</div>  		</div> -		<span class="corners-bottom"><span></span></span></div>  	</div>  <!-- ENDIF -->  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<p>{L_SIGNATURE_EXPLAIN}</p> @@ -36,7 +36,7 @@  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <fieldset class="submit-buttons"> @@ -48,4 +48,4 @@  </fieldset>  </form> -<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html index 0c632f5c69..020f69cb26 100644 --- a/phpBB/styles/prosilver/template/ucp_register.html +++ b/phpBB/styles/prosilver/template/ucp_register.html @@ -7,21 +7,17 @@  	*/  	function change_language(lang_iso)  	{ +		document.cookie = '{COOKIE_NAME}_lang=' + lang_iso + '; path={COOKIE_PATH}';  		document.forms['register'].change_lang.value = lang_iso;  		document.forms['register'].submit.click();  	} - -	<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_REFRESH --> -	onload_functions.push('apply_onkeypress_event()'); -	<!-- ENDIF --> -  // ]]>  </script>  <form method="post" action="{S_UCP_ACTION}" id="register">  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<h2>{SITENAME} - {L_REGISTRATION}</h2> @@ -30,44 +26,42 @@  	<!-- IF L_REG_COND -->  		<dl><dd><strong>{L_REG_COND}</strong></dd></dl>  	<!-- ENDIF --> +	<!-- EVENT ucp_register_credentials_before -->  	<dl> -		<dt><label for="username">{L_USERNAME}:</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt> +		<dt><label for="username">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>  		<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" title="{L_USERNAME}" /></dd>  	</dl>  	<dl> -		<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt> -		<dd><input type="text" tabindex="2" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" /></dd> -	</dl> -	<dl> -		<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label></dt> -		<dd><input type="text" tabindex="3" name="email_confirm" id="email_confirm" size="25" maxlength="100" value="{EMAIL_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_EMAIL}" /></dd> +		<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label></dt> +		<dd><input type="email" tabindex="2" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" /></dd>  	</dl>  	<dl> -		<dt><label for="new_password">{L_PASSWORD}:</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt> +		<dt><label for="new_password">{L_PASSWORD}{L_COLON}</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt>  		<dd><input type="password" tabindex="4" name="new_password" id="new_password" size="25" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}" /></dd>  	</dl>  	<dl> -		<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label></dt> -		<dd><input type="password" tabindex="5" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" /></dd> +		<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label></dt> +		<dd><input type="password"  tabindex="5" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" /></dd>  	</dl> +	<!-- EVENT ucp_register_credentials_after -->  	<hr /> +	<!-- EVENT ucp_register_options_before -->  	<dl> -		<dt><label for="lang">{L_LANGUAGE}:</label></dt> +		<dt><label for="lang">{L_LANGUAGE}{L_COLON}</label></dt>  		<dd><select name="lang" id="lang" onchange="change_language(this.value); return false;" tabindex="6" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></dd>  	</dl> -	<dl> -		<dt><label for="tz">{L_TIMEZONE}:</label></dt> -		<dd><select name="tz" id="tz" tabindex="7" class="autowidth">{S_TZ_OPTIONS}</select></dd> -	</dl> +	<!-- INCLUDE timezone_option.html --> + +	<!-- EVENT ucp_register_profile_fields_before -->  	<!-- IF .profile_fields -->  		<dl><dd><strong>{L_ITEMS_REQUIRED}</strong></dd></dl>  	<!-- BEGIN profile_fields -->  		<dl> -			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}:<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label> +			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}{L_COLON}<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label>  			<!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF -->  			<!-- IF profile_fields.ERROR --><br /><span class="error">{profile_fields.ERROR}</span><!-- ENDIF --></dt>  			<dd>{profile_fields.FIELD}</dd> @@ -75,8 +69,9 @@  	<!-- END profile_fields -->  	<!-- ENDIF --> +	<!-- EVENT ucp_register_profile_fields_after -->  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- IF CAPTCHA_TEMPLATE -->  	<!-- DEFINE $CAPTCHA_TAB_INDEX = 8 --> @@ -87,17 +82,17 @@  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<h4>{L_COPPA_COMPLIANCE}</h4>  	<p>{L_COPPA_EXPLAIN}</p> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <!-- ENDIF -->  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<fieldset class="submit-buttons">  		{S_HIDDEN_FIELDS} @@ -106,8 +101,8 @@  		{S_FORM_TOKEN}  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  </form> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_remind.html b/phpBB/styles/prosilver/template/ucp_remind.html index 7dbc23b733..0ab1251d9e 100644 --- a/phpBB/styles/prosilver/template/ucp_remind.html +++ b/phpBB/styles/prosilver/template/ucp_remind.html @@ -3,19 +3,19 @@  <form action="{S_PROFILE_ACTION}" method="post" id="remind">  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<div class="content">  		<h2>{L_SEND_PASSWORD}</h2>  		<fieldset>  		<dl> -			<dt><label for="username">{L_USERNAME}:</label></dt> +			<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>  			<dd><input class="inputbox narrow" type="text" name="username" id="username" size="25" /></dd>  		</dl>  		<dl> -			<dt><label for="email">{L_EMAIL_ADDRESS}:</label><br /><span>{L_EMAIL_REMIND}</span></dt> -			<dd><input class="inputbox narrow" type="text" name="email" id="email" size="25" maxlength="100" /></dd> +			<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label><br /><span>{L_EMAIL_REMIND}</span></dt> +			<dd><input class="inputbox narrow" type="email" name="email" id="email" size="25" maxlength="100" /></dd>  		</dl>  		<dl>  			<dt> </dt> @@ -25,8 +25,8 @@  		</fieldset>  	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  </form> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_resend.html b/phpBB/styles/prosilver/template/ucp_resend.html index 840e972995..7713efe521 100644 --- a/phpBB/styles/prosilver/template/ucp_resend.html +++ b/phpBB/styles/prosilver/template/ucp_resend.html @@ -4,19 +4,19 @@  <form action="{S_PROFILE_ACTION}" method="post" id="resend">  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<div class="content">  		<h2>{L_UCP_RESEND}</h2>  		<fieldset>  		<dl> -			<dt><label for="username">{L_USERNAME}:</label></dt> +			<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>  			<dd><input class="inputbox narrow" type="text" name="username" id="username" size="25" /></dd>  		</dl>  		<dl> -			<dt><label for="email">{L_EMAIL_ADDRESS}:</label><br /><span>{L_EMAIL_REMIND}</span></dt> -			<dd><input class="inputbox narrow" type="text" name="email" id="email" size="25" maxlength="100" /></dd> +			<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label><br /><span>{L_EMAIL_REMIND}</span></dt> +			<dd><input class="inputbox narrow" type="email" name="email" id="email" size="25" maxlength="100" /></dd>  		</dl>  		<dl>  			<dt> </dt> @@ -25,8 +25,8 @@  		</fieldset>  	</div> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  </form> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_zebra_foes.html b/phpBB/styles/prosilver/template/ucp_zebra_foes.html index 3c1b1cddce..712479dc18 100644 --- a/phpBB/styles/prosilver/template/ucp_zebra_foes.html +++ b/phpBB/styles/prosilver/template/ucp_zebra_foes.html @@ -5,14 +5,14 @@  <h2>{L_TITLE}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<p>{L_FOES_EXPLAIN}</p>  	<fieldset class="fields2">  	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->  	<dl> -		<dt><label <!-- IF S_USERNAME_OPTIONS -->for="usernames"<!-- ENDIF -->>{L_YOUR_FOES}:</label><br /><span>{L_YOUR_FOES_EXPLAIN}</span></dt> +		<dt><label <!-- IF S_USERNAME_OPTIONS -->for="usernames"<!-- ENDIF -->>{L_YOUR_FOES}{L_COLON}</label><br /><span>{L_YOUR_FOES_EXPLAIN}</span></dt>  		<dd>  			<!-- IF S_USERNAME_OPTIONS -->  				<select name="usernames[]" id="usernames" multiple="multiple" size="5">{S_USERNAME_OPTIONS}</select> @@ -22,13 +22,13 @@  		</dd>  	</dl>  	<dl> -		<dt><label for="add">{L_ADD_FOES}:</label><br /><span>{L_ADD_FOES_EXPLAIN}</span></dt> +		<dt><label for="add">{L_ADD_FOES}{L_COLON}</label><br /><span>{L_ADD_FOES_EXPLAIN}</span></dt>  		<dd><textarea name="add" id="add" rows="3" cols="30" class="inputbox">{USERNAMES}</textarea></dd>  		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>  	</dl>  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <fieldset class="submit-buttons"> @@ -38,4 +38,4 @@  </fieldset>  </form> -<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_zebra_friends.html b/phpBB/styles/prosilver/template/ucp_zebra_friends.html index 1e0efbfdf8..fac0a18706 100644 --- a/phpBB/styles/prosilver/template/ucp_zebra_friends.html +++ b/phpBB/styles/prosilver/template/ucp_zebra_friends.html @@ -5,14 +5,15 @@  <h2>{L_TITLE}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner">  	<p>{L_FRIENDS_EXPLAIN}</p>  	<fieldset class="fields2">  	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF --> +	<!-- EVENT ucp_friend_list_before -->  	<dl> -		<dt><label <!-- IF S_USERNAME_OPTIONS -->for="usernames"<!-- ENDIF -->>{L_YOUR_FRIENDS}:</label><br /><span>{L_YOUR_FRIENDS_EXPLAIN}</span></dt> +		<dt><label <!-- IF S_USERNAME_OPTIONS -->for="usernames"<!-- ENDIF -->>{L_YOUR_FRIENDS}{L_COLON}</label><br /><span>{L_YOUR_FRIENDS_EXPLAIN}</span></dt>  		<dd>  			<!-- IF S_USERNAME_OPTIONS -->  				<select name="usernames[]" id="usernames" multiple="multiple" size="5">{S_USERNAME_OPTIONS}</select> @@ -21,14 +22,15 @@  			<!-- ENDIF -->  		</dd>  	</dl> +	<!-- EVENT ucp_friend_list_after -->  	<dl> -		<dt><label for="add">{L_ADD_FRIENDS}:</label><br /><span>{L_ADD_FRIENDS_EXPLAIN}</span></dt> +		<dt><label for="add">{L_ADD_FRIENDS}{L_COLON}</label><br /><span>{L_ADD_FRIENDS_EXPLAIN}</span></dt>  		<dd><textarea name="add" id="add" rows="3" cols="30" class="inputbox">{USERNAMES}</textarea></dd>  		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>  	</dl>  	</fieldset> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div>  <fieldset class="submit-buttons"> @@ -38,4 +40,4 @@  </fieldset>  </form> -<!-- INCLUDE ucp_footer.html -->
\ No newline at end of file +<!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index 02f42fa097..43e994f1f9 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -1,18 +1,18 @@  <!-- INCLUDE overall_header.html --> -<!-- IF U_MCP --><p>[ <a href="{U_MCP}">{L_MCP}</a> ]</p><!-- ENDIF --> -<h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2> + +<h2 class="forum-title"><!-- EVENT viewforum_forum_name_prepend --><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a><!-- EVENT viewforum_forum_name_append --></h2>  <!-- IF FORUM_DESC or MODERATORS or U_MCP -->  <div>  	<!-- NOTE: remove the style="display: none" when you want to have the forum description on the forum body -->  	<!-- IF FORUM_DESC --><div style="display: none !important;">{FORUM_DESC}<br /></div><!-- ENDIF --> -	<!-- IF MODERATORS --><p><strong><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->:</strong> {MODERATORS}</p><!-- ENDIF --> +	<!-- IF MODERATORS --><p><strong><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->{L_COLON}</strong> {MODERATORS}</p><!-- ENDIF -->  </div>  <!-- ENDIF -->  <!-- IF S_FORUM_RULES --> -	<div class="rules"> -		<div class="inner"><span class="corners-top"><span></span></span> +	<div class="rules<!-- IF U_FORUM_RULES --> rules-link<!-- ENDIF -->"> +		<div class="inner">  		<!-- IF U_FORUM_RULES -->  			<a href="{U_FORUM_RULES}">{L_FORUM_RULES}</a> @@ -21,25 +21,31 @@  			{FORUM_RULES}  		<!-- ENDIF --> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  <!-- ENDIF -->  <!-- IF S_HAS_SUBFORUM -->  <!-- IF not S_IS_BOT and U_MARK_FORUMS --> -<ul class="linklist"> -	<li class="rightside"><a href="{U_MARK_FORUMS}">{L_MARK_SUBFORUMS_READ}</a></li> -</ul> +	<div class="action-bar compact"> +		<a href="{U_MARK_FORUMS}" class="mark-read rightside" data-ajax="mark_forums_read">{L_MARK_SUBFORUMS_READ}</a> +	</div>  <!-- ENDIF -->  	<!-- INCLUDE forumlist_body.html -->  <!-- ENDIF --> -<!-- IF S_DISPLAY_POST_INFO or PAGINATION or TOTAL_POSTS or TOTAL_TOPICS --> -	<div class="topic-actions" <!-- IF S_HAS_SUBFORUM -->style="margin-top: 2em;"<!-- ENDIF -->> +<!-- IF S_DISPLAY_POST_INFO or .pagination or TOTAL_POSTS or TOTAL_TOPICS --> +	<div class="action-bar top">  	<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->  		<div class="buttons"> -			<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"><a href="{U_POST_NEW_TOPIC}"><span></span><!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF --></a></div> +			<!-- EVENT viewforum_buttons_top_before --> + +			<a href="{U_POST_NEW_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"> +				<!-- IF S_IS_LOCKED -->{L_BUTTON_FORUM_LOCKED}<!-- ELSE -->{L_BUTTON_NEW_TOPIC}<!-- ENDIF --> +			</a> + +			<!-- EVENT viewforum_buttons_top_after -->  		</div>  	<!-- ENDIF --> @@ -47,22 +53,24 @@  		<div class="search-box">  			<form method="get" id="forum-search" action="{S_SEARCHBOX_ACTION}">  			<fieldset> -				<input class="inputbox search tiny" type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_FORUM}" onclick="if (this.value == '{LA_SEARCH_FORUM}') this.value = '';" onblur="if (this.value == '') this.value = '{LA_SEARCH_FORUM}';" /> -				<input class="button2" type="submit" value="{L_SEARCH}" /> +				<input class="inputbox search tiny" type="search" name="keywords" id="search_keywords" size="20" placeholder="{L_SEARCH_FORUM}" /> +				<button class="button icon-button search-icon" type="submit" title="{L_SEARCH}">{L_SEARCH}</button> +				<a href="{U_SEARCH}" class="button icon-button search-adv-icon" title="{L_SEARCH_ADV}">{L_SEARCH_ADV}</a>  				{S_SEARCH_LOCAL_HIDDEN_FIELDS}  			</fieldset>  			</form>  		</div>  	<!-- ENDIF --> -	<!-- IF PAGINATION or TOTAL_POSTS or TOTAL_TOPICS --> -		<div class="pagination"> -			<!-- IF not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}" accesskey="m">{L_MARK_TOPICS_READ}</a> • <!-- ENDIF --><!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF --> -			<!-- IF PAGE_NUMBER --> -				<!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --> -			<!-- ENDIF --> -		</div> -	<!-- ENDIF --> +	<div class="pagination"> +		<!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}" class="mark" accesskey="m" data-ajax="mark_topics_read">{L_MARK_TOPICS_READ}</a> • <!-- ENDIF --> +		{TOTAL_TOPICS} +		<!-- IF .pagination --> +			<!-- INCLUDE pagination.html --> +		<!-- ELSE --> +			• {PAGE_NUMBER} +		<!-- ENDIF --> +	</div>  	</div>  <!-- ENDIF --> @@ -70,9 +78,9 @@  <!-- IF S_NO_READ_ACCESS -->  	<div class="panel"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<strong>{L_NO_READ_ACCESS}</strong> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  	<!-- IF not S_USER_LOGGED_IN and not S_IS_BOT --> @@ -80,18 +88,18 @@  		<form action="{S_LOGIN_ACTION}" method="post">  		<div class="panel"> -			<div class="inner"><span class="corners-top"><span></span></span> +			<div class="inner">  			<div class="content">  				<h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED -->  •  <a href="{U_REGISTER}">{L_REGISTER}</a><!-- ENDIF --></h3>  				<fieldset class="fields1">  				<dl> -					<dt><label for="username">{L_USERNAME}:</label></dt> +					<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>  					<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>  				</dl>  				<dl> -					<dt><label for="password">{L_PASSWORD}:</label></dt> +					<dt><label for="password">{L_PASSWORD}{L_COLON}</label></dt>  					<dd><input type="password" tabindex="2" id="password" name="password" size="25" class="inputbox autowidth" /></dd>  					<!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="3" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->  					<dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="4" /> {L_HIDE_ME}</label></dd> @@ -104,7 +112,7 @@  				</fieldset>  			</div> -			<span class="corners-bottom"><span></span></span></div> +			</div>  		</div>  		</form> @@ -117,17 +125,17 @@  	<!-- IF not topicrow.S_TOPIC_TYPE_SWITCH and not topicrow.S_FIRST_ROW -->  		</ul> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  	<!-- ENDIF -->  	<!-- IF topicrow.S_FIRST_ROW or not topicrow.S_TOPIC_TYPE_SWITCH -->  		<div class="forumbg<!-- IF topicrow.S_TOPIC_TYPE_SWITCH and (topicrow.S_POST_ANNOUNCE or topicrow.S_POST_GLOBAL) --> announcement<!-- ENDIF -->"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<ul class="topiclist">  			<li class="header">  				<dl class="icon"> -					<dt><!-- IF S_DISPLAY_ACTIVE -->{L_ACTIVE_TOPICS}<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH and (topicrow.S_POST_ANNOUNCE or topicrow.S_POST_GLOBAL) -->{L_ANNOUNCEMENTS}<!-- ELSE -->{L_TOPICS}<!-- ENDIF --></dt> +					<dt<!-- IF S_DISPLAY_ACTIVE --> id="active_topics"<!-- ENDIF -->><div class="list-inner"><!-- IF S_DISPLAY_ACTIVE -->{L_ACTIVE_TOPICS}<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH and (topicrow.S_POST_ANNOUNCE or topicrow.S_POST_GLOBAL) -->{L_ANNOUNCEMENTS}<!-- ELSE -->{L_TOPICS}<!-- ENDIF --></div></dt>  					<dd class="posts">{L_REPLIES}</dd>  					<dd class="views">{L_VIEWS}</dd>  					<dd class="lastpost"><span>{L_LAST_POST}</span></dd> @@ -138,33 +146,69 @@  	<!-- ENDIF -->  		<li class="row<!-- IF topicrow.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF topicrow.S_POST_GLOBAL --> global-announce<!-- ENDIF --><!-- IF topicrow.S_POST_ANNOUNCE --> announce<!-- ENDIF --><!-- IF topicrow.S_POST_STICKY --> sticky<!-- ENDIF --><!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ENDIF -->"> -			<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;"> -				<dt<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> -					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF --> -					<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br /> -					<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF --> -					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} +			<dl class="icon {topicrow.TOPIC_IMG_STYLE}"> +				<dt<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}"> +					<!-- IF topicrow.S_UNREAD_TOPIC and not S_IS_BOT --><a href="{topicrow.U_NEWEST_POST}" class="icon-link"></a><!-- ENDIF --> +					<div class="list-inner"> +						<!-- EVENT topiclist_row_prepend --> +						<!-- IF topicrow.S_UNREAD_TOPIC and not S_IS_BOT --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> +						<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF --> +						<!-- IF topicrow.S_TOPIC_DELETED --><a href="{topicrow.U_MCP_QUEUE}">{DELETED_IMG}</a> <!-- ENDIF --> +						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br /> + +						<!-- IF not S_IS_BOT --> +						<div class="responsive-show" style="display: none;"> +							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} « <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 --> +						<!-- ENDIF --> + +						<!-- IF .topicrow.pagination --> +						<div class="pagination"> +							<ul> +							<!-- BEGIN pagination --> +								<!-- IF topicrow.pagination.S_IS_PREV --> +								<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><li class="active"><span>{topicrow.pagination.PAGE_NUMBER}</span></li> +								<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li> +								<!-- ELSEIF topicrow.pagination.S_IS_NEXT --> +								<!-- ELSE --><li><a href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a></li> +								<!-- ENDIF --> +							<!-- END pagination --> +							</ul> +						</div> +						<!-- ENDIF --> + +						<div class="responsive-hide"> +							<!-- IF topicrow.S_HAS_POLL -->{POLL_IMG} <!-- ENDIF --> +							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> +							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} +							<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --> » {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF --> +						</div> + +						<!-- EVENT topiclist_row_append --> +					</div>  				</dt>  				<dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd>  				<dd class="views">{topicrow.VIEWS} <dfn>{L_VIEWS}</dfn></dd>  				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} -					<!-- IF not S_IS_BOT --><a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{topicrow.LAST_POST_TIME}</span> +					<!-- IF not S_IS_BOT --><a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{topicrow.LAST_POST_TIME}</span>  				</dd>  			</dl>  		</li>  	<!-- IF topicrow.S_LAST_ROW -->  			</ul> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  	<!-- ENDIF -->  <!-- BEGINELSE -->  	<!-- IF S_IS_POSTABLE -->  	<div class="panel"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<strong>{L_NO_TOPICS}</strong> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  	<!-- ENDIF -->  <!-- END topicrow --> @@ -172,12 +216,11 @@  <!-- IF S_SELECT_SORT_DAYS and not S_DISPLAY_ACTIVE -->  	<form method="post" action="{S_FORUM_ACTION}">  		<fieldset class="display-options"> -			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->  	<!-- IF not S_IS_BOT --> -			<label>{L_DISPLAY_TOPICS}: {S_SELECT_SORT_DAYS}</label> +			<label>{L_DISPLAY_TOPICS}{L_COLON} {S_SELECT_SORT_DAYS}</label>  			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> -			<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label> +			<label>{S_SELECT_SORT_DIR}</label> +			<input type="submit" name="sort" value="{L_GO}" class="button2" />  	<!-- ENDIF -->  		</fieldset>  	</form> @@ -185,35 +228,45 @@  <!-- ENDIF -->  <!-- IF .topicrow and not S_DISPLAY_ACTIVE --> -	<div class="topic-actions"> +	<div class="action-bar bottom">  		<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO --> -		<div class="buttons"> -			<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"><a href="{U_POST_NEW_TOPIC}"><span></span><!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF --></a></div> -		</div> +			<div class="buttons"> +				<!-- EVENT viewforum_buttons_bottom_before --> + +				<a href="{U_POST_NEW_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"> +					<!-- IF S_IS_LOCKED -->{L_BUTTON_FORUM_LOCKED}<!-- ELSE -->{L_BUTTON_NEW_TOPIC}<!-- ENDIF --> +				</a> + +				<!-- EVENT viewforum_buttons_bottom_after --> +			</div>  		<!-- ENDIF --> -		<!-- IF PAGINATION or TOTAL_POSTS or TOTAL_TOPICS -->  		<div class="pagination"> -			<!-- IF TOTAL_TOPICS and not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}">{L_MARK_TOPICS_READ}</a> •  <!-- ENDIF --> -			<!-- IF TOTAL_POSTS and not NEWEST_USER --> {TOTAL_POSTS}<!-- ELSEIF TOTAL_TOPICS and not NEWEST_USER --> {TOTAL_TOPICS}<!-- ENDIF --> -			<!-- IF TOTAL_USERS -->{TOTAL_USERS}<!-- ENDIF --> -			<!-- IF PAGINATION --> •  <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> -			 •  <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --> +			<!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}" data-ajax="mark_topics_read">{L_MARK_TOPICS_READ}</a> • <!-- ENDIF --> +			{TOTAL_TOPICS} +			<!-- IF .pagination --> +				<!-- INCLUDE pagination.html --> +			<!-- ELSE --> +				 • {PAGE_NUMBER} +			<!-- ENDIF -->  		</div> -		<!-- ENDIF -->  	</div>  <!-- ENDIF -->  <!-- INCLUDE jumpbox.html -->  <!-- IF S_DISPLAY_ONLINE_LIST --> -	<h3><!-- IF U_VIEWONLINE --><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a><!-- ELSE -->{L_WHO_IS_ONLINE}<!-- ENDIF --></h3> -	<p>{LOGGED_IN_USER_LIST}</p> +	<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> +		<p>{LOGGED_IN_USER_LIST}</p> +	</div>  <!-- ENDIF -->  <!-- IF S_DISPLAY_POST_INFO --> -	<h3>{L_FORUM_PERMISSIONS}</h3> -	<p><!-- BEGIN rules -->{rules.RULE}<br /><!-- END rules --></p> +	<div class="stat-block permissions"> +		<h3>{L_FORUM_PERMISSIONS}</h3> +		<p><!-- BEGIN rules -->{rules.RULE}<br /><!-- END rules --></p> +	</div>  <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html index 3f1f0e64bf..ee1672c6c9 100644 --- a/phpBB/styles/prosilver/template/viewonline_body.html +++ b/phpBB/styles/prosilver/template/viewonline_body.html @@ -1,16 +1,22 @@  <!-- INCLUDE overall_header.html --> -<h2>{TOTAL_REGISTERED_USERS_ONLINE}</h2> +<h2 class="viewonline-title">{TOTAL_REGISTERED_USERS_ONLINE}</h2>  <p>{TOTAL_GUEST_USERS_ONLINE}<!-- IF S_SWITCH_GUEST_DISPLAY --> • <a href="{U_SWITCH_GUEST_DISPLAY}">{L_SWITCH_GUEST_DISPLAY}</a><!-- ENDIF --></p> -<ul class="linklist"> -	<li class="rightside pagination"><!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE -->{PAGE_NUMBER}<!-- ENDIF --></li> -</ul> +<div class="action-bar top"> +	<div class="pagination"> +		<!-- IF .pagination -->  +			<!-- INCLUDE pagination.html --> +		<!-- ELSE -->  +			{PAGE_NUMBER} +		<!-- ENDIF --> +	</div> +</div>  <div class="forumbg forumbg-table"> -	<div class="inner"><span class="corners-top"><span></span></span> +	<div class="inner"> -	<table class="table1" cellspacing="1"> +	<table class="table1">  	<!-- IF .user_row -->  		<thead> @@ -23,7 +29,7 @@  		<tbody>  		<!-- BEGIN user_row -->  		<tr class="<!-- IF user_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> -			<td>{user_row.USERNAME_FULL}<!-- IF user_row.USER_IP --> <span style="margin-left: 30px;">{L_IP}: <a href="{user_row.U_USER_IP}">{user_row.USER_IP}</a> » <a href="{user_row.U_WHOIS}" onclick="popup(this.href, 750, 500); return false;">{L_WHOIS}</a></span><!-- ENDIF --> +			<td>{user_row.USERNAME_FULL}<!-- IF user_row.USER_IP --> <span style="float: {S_CONTENT_FLOW_END};">{L_IP}{L_COLON} <a href="{user_row.U_USER_IP}">{user_row.USER_IP}</a> » <a href="{user_row.U_WHOIS}" onclick="popup(this.href, 750, 500); return false;">{L_WHOIS}</a></span><!-- ENDIF -->  				<!-- IF user_row.USER_BROWSER --><br />{user_row.USER_BROWSER}<!-- ENDIF --></td>  			<td class="info"><a href="{user_row.U_FORUM_LOCATION}">{user_row.FORUM_LOCATION}</a></td>  			<td class="active">{user_row.LASTUPDATE}</td> @@ -38,20 +44,20 @@  	</tbody>  	</table> -	<span class="corners-bottom"><span></span></span></div> +	</div>  </div> -<!-- IF PREVIOUS_PAGE or NEXT_PAGE --> -<fieldset class="display-options right-box"> -	<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ELSE -->{L_PREVIOUS}<!-- ENDIF --> • <!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ELSE -->{L_NEXT}<!-- ENDIF --> -</fieldset> -<!-- ENDIF --> - -<!-- IF LEGEND --><p><em>{L_LEGEND}: {LEGEND}</em></p><!-- ENDIF --> +<!-- IF LEGEND --><p><em>{L_LEGEND}{L_COLON} {LEGEND}</em></p><!-- ENDIF --> -<ul class="linklist"> -	<li class="rightside pagination"><!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE -->{PAGE_NUMBER}<!-- ENDIF --></li> -</ul> +<div class="action-bar bottom"> +	<div class="pagination"> +		<!-- IF .pagination -->  +			<!-- INCLUDE pagination.html --> +		<!-- ELSE -->  +			{PAGE_NUMBER} +		<!-- ENDIF --> +	</div> +</div>  <!-- INCLUDE jumpbox.html -->  <!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/prosilver/template/viewonline_whois.html b/phpBB/styles/prosilver/template/viewonline_whois.html index a9c6473727..5d780490da 100644 --- a/phpBB/styles/prosilver/template/viewonline_whois.html +++ b/phpBB/styles/prosilver/template/viewonline_whois.html @@ -3,14 +3,10 @@  <h2>{L_WHOIS}</h2>  <div class="panel"> -	<div class="inner"><span class="corners-top"><span></span></span> - -	<div class="postbody"><div class="content"> -		<pre>{WHOIS}</pre> -	</div></div> - -	<span class="corners-bottom"><span></span></span></div> +	<div class="inner"> +	   <pre>{WHOIS}</pre> +	</div>  </div>  <a  href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a> -<!-- INCLUDE simple_footer.html -->
\ No newline at end of file +<!-- INCLUDE simple_footer.html --> diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 57de96d853..621e2d6143 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -1,18 +1,18 @@  <!-- INCLUDE overall_header.html --> -<!-- IF U_MCP --><p>[ <a href="{U_MCP}">{L_MCP}</a> ]</p><!-- ENDIF --> -<h2><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2> + +<h2 class="topic-title"><!-- EVENT viewtopic_topic_title_prepend --><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a><!-- EVENT viewtopic_topic_title_append --></h2>  <!-- NOTE: remove the style="display: none" when you want to have the forum description on the topic body -->  <!-- IF FORUM_DESC --><div style="display: none !important;">{FORUM_DESC}<br /></div><!-- ENDIF -->  <!-- IF MODERATORS -->  <p> -	<strong><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->:</strong> {MODERATORS} +	<strong><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->{L_COLON}</strong> {MODERATORS}  </p>  <!-- ENDIF -->  <!-- IF S_FORUM_RULES --> -	<div class="rules"> -		<div class="inner"><span class="corners-top"><span></span></span> +	<div class="rules<!-- IF U_FORUM_RULES --> rules-link<!-- ENDIF -->"> +		<div class="inner">  		<!-- IF U_FORUM_RULES -->  			<a href="{U_FORUM_RULES}">{L_FORUM_RULES}</a> @@ -21,251 +21,376 @@  			{FORUM_RULES}  		<!-- ENDIF --> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  <!-- ENDIF --> -<div class="topic-actions"> +<div class="action-bar top">  	<div class="buttons"> +		<!-- EVENT viewtopic_buttons_top_before --> +  	<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO --> -		<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->"><a href="{U_POST_REPLY_TOPIC}" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"><span></span><!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED_SHORT}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF --></a></div> +		<a href="{U_POST_REPLY_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"> +			<!-- IF S_IS_LOCKED -->{L_BUTTON_TOPIC_LOCKED}<!-- ELSE -->{L_BUTTON_POST_REPLY}<!-- ENDIF --> +		</a>  	<!-- ENDIF --> + +		<!-- EVENT viewtopic_buttons_top_after -->  	</div> +	<!-- INCLUDE viewtopic_topic_tools.html --> +  	<!-- IF S_DISPLAY_SEARCHBOX -->  		<div class="search-box">  			<form method="get" id="topic-search" action="{S_SEARCHBOX_ACTION}">  			<fieldset> -				<input class="inputbox search tiny"  type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_TOPIC}" onclick="if(this.value=='{LA_SEARCH_TOPIC}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_TOPIC}';" /> -				<input class="button2" type="submit" value="{L_SEARCH}" /> +				<input class="inputbox search tiny"  type="search" name="keywords" id="search_keywords" size="20" placeholder="{L_SEARCH_TOPIC}" /> +				<button class="button icon-button search-icon" type="submit" title="{L_SEARCH}">{L_SEARCH}</button> +				<a href="{U_SEARCH}" class="button icon-button search-adv-icon" title="{L_SEARCH_ADV}">{L_SEARCH_ADV}</a>  				{S_SEARCH_LOCAL_HIDDEN_FIELDS}  			</fieldset>  			</form>  		</div>  	<!-- ENDIF --> -	<!-- IF PAGINATION or TOTAL_POSTS --> +	<!-- IF .pagination or TOTAL_POSTS -->  		<div class="pagination"> -			<!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_POSTS} -			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> +			<!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}" class="mark">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_POSTS} +			<!-- IF .pagination --> +				<!-- INCLUDE pagination.html --> +			<!-- ELSE --> +				• {PAGE_NUMBER} +			<!-- ENDIF -->  		</div>  	<!-- ENDIF -->  </div> -<div class="clear"></div>  <!-- IF S_HAS_POLL --> -	<form method="post" action="{S_POLL_ACTION}"> +	<form method="post" action="{S_POLL_ACTION}" data-ajax="vote_poll" class="topic_poll">  	<div class="panel"> -		<div class="inner"><span class="corners-top"><span></span></span> +		<div class="inner">  		<div class="content"> -			<h2>{POLL_QUESTION}</h2> -			<p class="author">{L_POLL_LENGTH}<!-- IF S_CAN_VOTE and L_POLL_LENGTH --><br /><!-- ENDIF --><!-- IF S_CAN_VOTE -->{L_MAX_VOTES}<!-- ENDIF --></p> +			<h2 class="poll-title"><!-- EVENT viewtopic_body_poll_question_prepend -->{POLL_QUESTION}<!-- EVENT viewtopic_body_poll_question_append --></h2> +			<p class="author">{L_POLL_LENGTH}<!-- IF S_CAN_VOTE and L_POLL_LENGTH --><br /><!-- ENDIF --><!-- IF S_CAN_VOTE --><span class="poll_max_votes">{L_MAX_VOTES}</span><!-- ENDIF --></p>  			<fieldset class="polls">  			<!-- BEGIN poll_option --> -				<dl class="<!-- IF poll_option.POLL_OPTION_VOTED -->voted<!-- ENDIF -->"<!-- IF poll_option.POLL_OPTION_VOTED --> title="{L_POLL_VOTED_OPTION}"<!-- ENDIF -->> +				<!-- EVENT viewtopic_body_poll_option_before --> +				<dl class="<!-- IF poll_option.POLL_OPTION_VOTED -->voted<!-- ENDIF --><!-- IF poll_option.POLL_OPTION_MOST_VOTES --> most-votes<!-- ENDIF -->"<!-- IF poll_option.POLL_OPTION_VOTED --> title="{L_POLL_VOTED_OPTION}"<!-- ENDIF --> data-poll-option-id="{poll_option.POLL_OPTION_ID}">  					<dt><!-- IF S_CAN_VOTE --><label for="vote_{poll_option.POLL_OPTION_ID}">{poll_option.POLL_OPTION_CAPTION}</label><!-- ELSE -->{poll_option.POLL_OPTION_CAPTION}<!-- ENDIF --></dt> -					<!-- IF S_CAN_VOTE --><dd style="width: auto;"><!-- IF S_IS_MULTI_CHOICE --><input type="checkbox" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /><!-- ELSE --><input type="radio" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /><!-- ENDIF --></dd><!-- ENDIF --> -					<!-- IF S_DISPLAY_RESULTS --><dd class="resultbar"><div class="<!-- IF poll_option.POLL_OPTION_PCT < 20 -->pollbar1<!-- ELSEIF poll_option.POLL_OPTION_PCT < 40 -->pollbar2<!-- ELSEIF poll_option.POLL_OPTION_PCT < 60 -->pollbar3<!-- ELSEIF poll_option.POLL_OPTION_PCT < 80 -->pollbar4<!-- ELSE -->pollbar5<!-- ENDIF -->" style="width:{poll_option.POLL_OPTION_PERCENT};">{poll_option.POLL_OPTION_RESULT}</div></dd> -					<dd><!-- IF poll_option.POLL_OPTION_RESULT == 0 -->{L_NO_VOTES}<!-- ELSE -->{poll_option.POLL_OPTION_PERCENT}<!-- ENDIF --></dd><!-- ENDIF --> +					<!-- IF S_CAN_VOTE --><dd style="width: auto;" class="poll_option_select"><!-- IF S_IS_MULTI_CHOICE --><input type="checkbox" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /><!-- ELSE --><input type="radio" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /><!-- ENDIF --></dd><!-- ENDIF --> +					<dd class="resultbar<!-- IF not S_DISPLAY_RESULTS --> hidden<!-- ENDIF -->"><div class="<!-- IF poll_option.POLL_OPTION_PCT < 20 -->pollbar1<!-- ELSEIF poll_option.POLL_OPTION_PCT < 40 -->pollbar2<!-- ELSEIF poll_option.POLL_OPTION_PCT < 60 -->pollbar3<!-- ELSEIF poll_option.POLL_OPTION_PCT < 80 -->pollbar4<!-- ELSE -->pollbar5<!-- ENDIF -->" style="width:{poll_option.POLL_OPTION_PERCENT_REL};">{poll_option.POLL_OPTION_RESULT}</div></dd> +					<dd class="poll_option_percent<!-- IF not S_DISPLAY_RESULTS --> hidden<!-- ENDIF -->"><!-- IF poll_option.POLL_OPTION_RESULT == 0 -->{L_NO_VOTES}<!-- ELSE -->{poll_option.POLL_OPTION_PERCENT}<!-- ENDIF --></dd>  				</dl> +				<!-- EVENT viewtopic_body_poll_option_after -->  			<!-- END poll_option --> -			<!-- IF S_DISPLAY_RESULTS --> -				<dl> +				<dl class="poll_total_votes<!-- IF not S_DISPLAY_RESULTS --> hidden<!-- ENDIF -->">  					<dt> </dt> -					<dd class="resultbar">{L_TOTAL_VOTES} : {TOTAL_VOTES}</dd> +					<dd class="resultbar">{L_TOTAL_VOTES}{L_COLON} <span class="poll_total_vote_cnt">{TOTAL_VOTES}</span></dd>  				</dl> -			<!-- ENDIF -->  			<!-- IF S_CAN_VOTE --> -				<dl style="border-top: none;"> +				<dl style="border-top: none;" class="poll_vote">  					<dt> </dt>  					<dd class="resultbar"><input type="submit" name="update" value="{L_SUBMIT_VOTE}" class="button1" /></dd>  				</dl>  			<!-- ENDIF -->  			<!-- IF not S_DISPLAY_RESULTS --> -				<dl style="border-top: none;"> +				<dl style="border-top: none;" class="poll_view_results">  					<dt> </dt>  					<dd class="resultbar"><a href="{U_VIEW_RESULTS}">{L_VIEW_RESULTS}</a></dd>  				</dl>  			<!-- ENDIF -->  			</fieldset> +			<div class="vote-submitted hidden">{L_VOTE_SUBMITTED}</div>  		</div> -		<span class="corners-bottom"><span></span></span></div> +		</div>  		{S_FORM_TOKEN}  		{S_HIDDEN_FIELDS}  	</div> -  	</form>  	<hr />  <!-- ENDIF -->  <!-- BEGIN postrow --> -	<!-- IF postrow.S_FIRST_UNREAD --><a id="unread"></a><!-- ENDIF --> -	<div id="p{postrow.POST_ID}" class="post <!-- IF postrow.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF postrow.S_UNREAD_POST --> unreadpost<!-- ENDIF --><!-- IF postrow.S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF postrow.S_ONLINE and not postrow.S_IGNORE_POST --> online<!-- ENDIF -->"> -		<div class="inner"><span class="corners-top"><span></span></span> +	<!-- EVENT viewtopic_body_postrow_post_before --> +	<!-- IF postrow.S_FIRST_UNREAD --> +		<a id="unread" class="anchor"<!-- IF S_UNREAD_VIEW --> data-url="{postrow.U_MINI_POST}"<!-- ENDIF -->></a> +	<!-- ENDIF --> +	<div id="p{postrow.POST_ID}" class="post has-profile <!-- IF postrow.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF postrow.S_UNREAD_POST --> unreadpost<!-- ENDIF --><!-- IF postrow.S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF postrow.S_POST_DELETED --> deleted<!-- ENDIF --><!-- IF postrow.S_ONLINE and not postrow.S_POST_HIDDEN --> online<!-- ENDIF --><!-- IF postrow.POSTER_WARNINGS --> warned<!-- ENDIF -->"> +		<div class="inner"> + +		<dl class="postprofile" id="profile{postrow.POST_ID}"<!-- IF postrow.S_POST_HIDDEN --> style="display: none;"<!-- ENDIF -->> +			<dt class="<!-- IF postrow.RANK_TITLE or postrow.RANK_IMG -->has-profile-rank<!-- ELSE -->no-profile-rank<!-- ENDIF --> <!-- IF postrow.POSTER_AVATAR -->has-avatar<!-- ELSE -->no-avatar<!-- ENDIF -->"> +				<div class="avatar-container"> +					<!-- EVENT viewtopic_body_avatar_before --> +					<!-- IF postrow.POSTER_AVATAR --> +						<!-- IF postrow.U_POST_AUTHOR --><a href="{postrow.U_POST_AUTHOR}" class="avatar">{postrow.POSTER_AVATAR}</a><!-- ELSE --><span class="avatar">{postrow.POSTER_AVATAR}</span><!-- ENDIF --> +					<!-- ENDIF --> +					<!-- EVENT viewtopic_body_avatar_after --> +				</div> +				<!-- IF not postrow.U_POST_AUTHOR --><strong>{postrow.POST_AUTHOR_FULL}</strong><!-- ELSE -->{postrow.POST_AUTHOR_FULL}<!-- ENDIF --> +			</dt> + +			<!-- IF postrow.RANK_TITLE or postrow.RANK_IMG --><dd class="profile-rank">{postrow.RANK_TITLE}<!-- IF postrow.RANK_TITLE and postrow.RANK_IMG --><br /><!-- ENDIF -->{postrow.RANK_IMG}</dd><!-- ENDIF --> + +		<!-- IF postrow.POSTER_POSTS != '' --><dd class="profile-posts"><strong>{L_POSTS}{L_COLON}</strong> <!-- IF postrow.U_SEARCH !== '' --><a href="{postrow.U_SEARCH}"><!-- ENDIF -->{postrow.POSTER_POSTS}<!-- IF postrow.U_SEARCH !== '' --></a><!-- ENDIF --></dd><!-- ENDIF --> +		<!-- IF postrow.POSTER_JOINED --><dd class="profile-joined"><strong>{L_JOINED}{L_COLON}</strong> {postrow.POSTER_JOINED}</dd><!-- ENDIF --> +		<!-- IF postrow.POSTER_WARNINGS --><dd class="profile-warnings"><strong>{L_WARNINGS}{L_COLON}</strong> {postrow.POSTER_WARNINGS}</dd><!-- ENDIF --> + +		<!-- IF postrow.S_PROFILE_FIELD1 --> +			<!-- Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. --> +			<dd><strong>{postrow.PROFILE_FIELD1_NAME}{L_COLON}</strong> {postrow.PROFILE_FIELD1_VALUE}</dd> +		<!-- ENDIF --> + +		<!-- EVENT viewtopic_body_postrow_custom_fields_before --> +		<!-- BEGIN custom_fields --> +			<!-- IF not postrow.custom_fields.S_PROFILE_CONTACT --> +				<dd class="profile-custom-field profile-{postrow.custom_fields.PROFILE_FIELD_IDENT}"><strong>{postrow.custom_fields.PROFILE_FIELD_NAME}{L_COLON}</strong> {postrow.custom_fields.PROFILE_FIELD_VALUE}</dd> +			<!-- ENDIF --> +		<!-- END custom_fields --> +		<!-- EVENT viewtopic_body_postrow_custom_fields_after --> + +		<!-- EVENT viewtopic_body_contact_fields_before --> +		<!-- IF not S_IS_BOT and .postrow.contact --> +			<dd class="profile-contact"> +				<strong>{L_CONTACT}{L_COLON}</strong> +				<div class="dropdown-container dropdown-left"> +					<a href="#" class="dropdown-trigger"><span class="imageset icon_contact" title="{postrow.CONTACT_USER}">{postrow.CONTACT_USER}</span></a> +					<div class="dropdown hidden"> +						<div class="pointer"><div class="pointer-inner"></div></div> +						<div class="dropdown-contents contact-icons"> +							<!-- BEGIN contact --> +								{% set REMAINDER = postrow.contact.S_ROW_COUNT % 4 %} +								<!-- DEFINE $S_LAST_CELL = ((REMAINDER eq 3) or (postrow.contact.S_LAST_ROW and postrow.contact.S_NUM_ROWS < 4)) --> +								<!-- IF REMAINDER eq 0 --> +									<div> +								<!-- ENDIF --> +									<a href="<!-- IF postrow.contact.U_CONTACT -->{postrow.contact.U_CONTACT}<!-- ELSE -->{postrow.U_POST_AUTHOR}<!-- ENDIF -->" title="{postrow.contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF postrow.contact.ID eq 'jabber' --> onclick="popup(this.href, 750, 320); return false;"<!-- ENDIF -->> +										<span class="contact-icon {postrow.contact.ID}-icon">{postrow.contact.NAME}</span> +									</a> +								<!-- IF REMAINDER eq 3 or postrow.contact.S_LAST_ROW --> +									</div> +								<!-- ENDIF --> +							<!-- END contact --> +						</div> +					</div> +				</div> +			</dd> +		<!-- ENDIF --> +		<!-- EVENT viewtopic_body_contact_fields_after --> + +		</dl>  		<div class="postbody"> -			<!-- IF postrow.S_IGNORE_POST --> -				<div class="ignore">{postrow.L_IGNORE_POST}</div> -			<!-- ELSE --> +			<!-- IF postrow.S_POST_HIDDEN --> +				<!-- IF postrow.S_POST_DELETED --> +					<div class="ignore" id="post_hidden{postrow.POST_ID}"> +						{postrow.L_POST_DELETED_MESSAGE}<br /> +						{postrow.L_POST_DISPLAY} +					</div> +				<!-- ELSEIF postrow.S_IGNORE_POST --> +					<div class="ignore" id="post_hidden{postrow.POST_ID}"> +						{postrow.L_IGNORE_POST}<br /> +						{postrow.L_POST_DISPLAY} +					</div> +				<!-- ENDIF --> +			<!-- ENDIF --> +			<div id="post_content{postrow.POST_ID}"<!-- IF postrow.S_POST_HIDDEN --> style="display: none;"<!-- ENDIF -->> + +			<h3 <!-- IF postrow.S_FIRST_ROW -->class="first"<!-- ENDIF -->><!-- IF postrow.POST_ICON_IMG --><img src="{T_ICONS_PATH}{postrow.POST_ICON_IMG}" width="{postrow.POST_ICON_IMG_WIDTH}" height="{postrow.POST_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="#p{postrow.POST_ID}">{postrow.POST_SUBJECT}</a></h3>  		<!-- IF not S_IS_BOT -->  			<!-- IF postrow.U_EDIT or postrow.U_DELETE or postrow.U_REPORT or postrow.U_WARN or postrow.U_INFO or postrow.U_QUOTE --> -				<ul class="profile-icons"> -					<!-- IF postrow.U_EDIT --><li class="edit-icon"><a href="{postrow.U_EDIT}" title="{L_EDIT_POST}"><span>{L_EDIT_POST}</span></a></li><!-- ENDIF --> -					<!-- IF postrow.U_DELETE --><li class="delete-icon"><a href="{postrow.U_DELETE}" title="{L_DELETE_POST}"><span>{L_DELETE_POST}</span></a></li><!-- ENDIF --> -					<!-- IF postrow.U_REPORT --><li class="report-icon"><a href="{postrow.U_REPORT}" title="{L_REPORT_POST}"><span>{L_REPORT_POST}</span></a></li><!-- ENDIF --> -					<!-- IF postrow.U_WARN --><li class="warn-icon"><a href="{postrow.U_WARN}" title="{L_WARN_USER}"><span>{L_WARN_USER}</span></a></li><!-- ENDIF --> -					<!-- IF postrow.U_INFO --><li class="info-icon"><a href="{postrow.U_INFO}" title="{L_INFORMATION}"><span>{L_INFORMATION}</span></a></li><!-- ENDIF --> -					<!-- IF postrow.U_QUOTE --><li class="quote-icon"><a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}"><span>{L_REPLY_WITH_QUOTE}</span></a></li><!-- ENDIF --> +				<ul class="post-buttons"> +					<!-- EVENT viewtopic_body_post_buttons_before --> +					<!-- IF postrow.U_EDIT --> +						<li> +							<a href="{postrow.U_EDIT}" title="{L_EDIT_POST}" class="button icon-button edit-icon"><span>{L_BUTTON_EDIT}</span></a> +						</li> +					<!-- ENDIF --> +					<!-- IF postrow.U_DELETE --> +						<li> +							<a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" class="button icon-button delete-icon"><span>{L_DELETE_POST}</span></a> +						</li> +					<!-- ENDIF --> +					<!-- IF postrow.U_REPORT --> +						<li> +							<a href="{postrow.U_REPORT}" title="{L_REPORT_POST}" class="button icon-button report-icon"><span>{L_REPORT_POST}</span></a> +						</li> +					<!-- ENDIF --> +					<!-- IF postrow.U_WARN --> +						<li> +							<a href="{postrow.U_WARN}" title="{L_WARN_USER}" class="button icon-button warn-icon"><span>{L_WARN_USER}</span></a> +						</li> +					<!-- ENDIF --> +					<!-- IF postrow.U_INFO --> +						<li> +							<a href="{postrow.U_INFO}" title="{L_INFORMATION}" class="button icon-button info-icon"><span>{L_INFORMATION}</span></a> +						</li> +					<!-- ENDIF --> +					<!-- IF postrow.U_QUOTE --> +						<li> +							<a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}" class="button icon-button quote-icon"><span>{L_QUOTE}</span></a> +						</li> +					<!-- ENDIF --> +					<!-- EVENT viewtopic_body_post_buttons_after -->  				</ul>  			<!-- ENDIF -->  		<!-- ENDIF --> -			<h3 <!-- IF postrow.S_FIRST_ROW -->class="first"<!-- ENDIF -->><!-- IF postrow.POST_ICON_IMG --><img src="{T_ICONS_PATH}{postrow.POST_ICON_IMG}" width="{postrow.POST_ICON_IMG_WIDTH}" height="{postrow.POST_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="#p{postrow.POST_ID}">{postrow.POST_SUBJECT}</a></h3> -			<p class="author"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><!-- ENDIF -->{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong> » {postrow.POST_DATE} </p> +			<p class="author"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><!-- ENDIF --><span class="responsive-hide">{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong> » </span>{postrow.POST_DATE} </p> -			<!-- IF postrow.S_POST_UNAPPROVED or postrow.S_POST_REPORTED --> -				<p class="rules"> -					<!-- IF postrow.S_POST_UNAPPROVED -->{UNAPPROVED_IMG} <a href="{postrow.U_MCP_APPROVE}"><strong>{L_POST_UNAPPROVED}</strong></a><br /><!-- ENDIF --> -					<!-- IF postrow.S_POST_REPORTED -->{REPORTED_IMG} <a href="{postrow.U_MCP_REPORT}"><strong>{L_POST_REPORTED}</strong></a><!-- ENDIF --> +			<!-- IF postrow.S_POST_UNAPPROVED --> +			<form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}"> +				<p class="post-notice unapproved"> +					<strong>{L_POST_UNAPPROVED_ACTION}</strong> +					<input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" /> +					<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" /> +					<input type="hidden" name="post_id_list[]" value="{postrow.POST_ID}" /> +					{S_FORM_TOKEN}  				</p> +			</form> +			<!-- ELSEIF postrow.S_POST_DELETED --> +			<form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}"> +				<p class="post-notice deleted"> +					<strong>{L_POST_DELETED_ACTION}</strong> +					<input class="button2" type="submit" value="{L_DELETE}" name="action[disapprove]" /> +					<input class="button1" type="submit" value="{L_RESTORE}" name="action[restore]" /> +					<input type="hidden" name="post_id_list[]" value="{postrow.POST_ID}" /> +					{S_FORM_TOKEN} +				</p> +			</form> +			<!-- ENDIF --> + +			<!-- IF postrow.S_POST_REPORTED --> +			<p class="post-notice reported"> +				<a href="{postrow.U_MCP_REPORT}"><strong>{L_POST_REPORTED}</strong></a> +			</p>  			<!-- ENDIF -->  			<div class="content">{postrow.MESSAGE}</div>  			<!-- IF postrow.S_HAS_ATTACHMENTS -->  				<dl class="attachbox"> -					<dt>{L_ATTACHMENTS}</dt> +					<dt> +						{L_ATTACHMENTS} +					</dt>  					<!-- BEGIN attachment -->  						<dd>{postrow.attachment.DISPLAY_ATTACHMENT}</dd>  					<!-- END attachment -->  				</dl>  			<!-- ENDIF --> +			<!-- EVENT viewtopic_body_postrow_post_notices_before -->  			<!-- IF postrow.S_DISPLAY_NOTICE --><div class="rules">{L_DOWNLOAD_NOTICE}</div><!-- ENDIF --> -			<!-- IF postrow.EDITED_MESSAGE or postrow.EDIT_REASON --> -				<div class="notice">{postrow.EDITED_MESSAGE} -					<!-- IF postrow.EDIT_REASON --><br /><strong>{L_REASON}:</strong> <em>{postrow.EDIT_REASON}</em><!-- ENDIF --> +			<!-- IF postrow.DELETED_MESSAGE or postrow.DELETE_REASON --> +				<div class="notice post_deleted_msg"> +					{postrow.DELETED_MESSAGE} +					<!-- IF postrow.DELETE_REASON --><br /><strong>{L_REASON}{L_COLON}</strong> <em>{postrow.DELETE_REASON}</em><!-- ENDIF --> +				</div> +			<!-- ELSEIF postrow.EDITED_MESSAGE or postrow.EDIT_REASON --> +				<div class="notice"> +					{postrow.EDITED_MESSAGE} +					<!-- IF postrow.EDIT_REASON --><br /><strong>{L_REASON}{L_COLON}</strong> <em>{postrow.EDIT_REASON}</em><!-- ENDIF -->  				</div>  			<!-- ENDIF -->  			<!-- IF postrow.BUMPED_MESSAGE --><div class="notice"><br /><br />{postrow.BUMPED_MESSAGE}</div><!-- ENDIF --> +			<!-- EVENT viewtopic_body_postrow_post_notices_after -->  			<!-- IF postrow.SIGNATURE --><div id="sig{postrow.POST_ID}" class="signature">{postrow.SIGNATURE}</div><!-- ENDIF --> -		<!-- ENDIF --> -		</div> +			<!-- EVENT viewtopic_body_postrow_post_content_footer --> +			</div> -		<!-- IF not postrow.S_IGNORE_POST --> -			<dl class="postprofile" id="profile{postrow.POST_ID}"> -			<dt> -				<!-- IF postrow.POSTER_AVATAR --> -					<!-- IF postrow.U_POST_AUTHOR --><a href="{postrow.U_POST_AUTHOR}">{postrow.POSTER_AVATAR}</a><!-- ELSE -->{postrow.POSTER_AVATAR}<!-- ENDIF --><br /> -				<!-- ENDIF --> -				<!-- IF not postrow.U_POST_AUTHOR --><strong>{postrow.POST_AUTHOR_FULL}</strong><!-- ELSE -->{postrow.POST_AUTHOR_FULL}<!-- ENDIF --> -			</dt> - -			<!-- IF postrow.RANK_TITLE or postrow.RANK_IMG --><dd>{postrow.RANK_TITLE}<!-- IF postrow.RANK_TITLE and postrow.RANK_IMG --><br /><!-- ENDIF -->{postrow.RANK_IMG}</dd><!-- ENDIF --> - -		<dd> </dd> - -		<!-- IF postrow.POSTER_POSTS != '' --><dd><strong>{L_POSTS}:</strong> {postrow.POSTER_POSTS}</dd><!-- ENDIF --> -		<!-- IF postrow.POSTER_JOINED --><dd><strong>{L_JOINED}:</strong> {postrow.POSTER_JOINED}</dd><!-- ENDIF --> -		<!-- IF postrow.POSTER_FROM --><dd><strong>{L_LOCATION}:</strong> {postrow.POSTER_FROM}</dd><!-- ENDIF --> - -		<!-- IF postrow.S_PROFILE_FIELD1 --> -			<!-- Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. --> -			<dd><strong>{postrow.PROFILE_FIELD1_NAME}:</strong> {postrow.PROFILE_FIELD1_VALUE}</dd> -		<!-- ENDIF --> - -		<!-- BEGIN custom_fields --> -			<dd><strong>{postrow.custom_fields.PROFILE_FIELD_NAME}:</strong> {postrow.custom_fields.PROFILE_FIELD_VALUE}</dd> -		<!-- END custom_fields --> - -		<!-- IF not S_IS_BOT --> -		<!-- IF postrow.U_PM or postrow.U_EMAIL or postrow.U_WWW or postrow.U_MSN or postrow.U_ICQ or postrow.U_YIM or postrow.U_AIM or postrow.U_JABBER --> -			<dd> -				<ul class="profile-icons"> -					<!-- IF postrow.U_PM --><li class="pm-icon"><a href="{postrow.U_PM}" title="{L_PRIVATE_MESSAGE}"><span>{L_PRIVATE_MESSAGE}</span></a></li><!-- ENDIF --> -					<!-- IF postrow.U_EMAIL --><li class="email-icon"><a href="{postrow.U_EMAIL}" title="{L_SEND_EMAIL_USER} {postrow.POST_AUTHOR}"><span>{L_SEND_EMAIL_USER} {postrow.POST_AUTHOR}</span></a></li><!-- ENDIF --> -					<!-- IF postrow.U_WWW --><li class="web-icon"><a href="{postrow.U_WWW}" title="{L_VISIT_WEBSITE}: {postrow.U_WWW}"><span>{L_WEBSITE}</span></a></li><!-- ENDIF --> -					<!-- IF postrow.U_MSN --><li class="msnm-icon"><a href="{postrow.U_MSN}" onclick="popup(this.href, 550, 320); return false;" title="{L_MSNM}"><span>{L_MSNM}</span></a></li><!-- ENDIF --> -					<!-- IF postrow.U_ICQ --><li class="icq-icon"><a href="{postrow.U_ICQ}" onclick="popup(this.href, 550, 320); return false;" title="{L_ICQ}"><span>{L_ICQ}</span></a></li><!-- ENDIF --> -					<!-- IF postrow.U_YIM --><li class="yahoo-icon"><a href="{postrow.U_YIM}" onclick="popup(this.href, 780, 550); return false;" title="{L_YIM}"><span>{L_YIM}</span></a></li><!-- ENDIF --> -					<!-- IF postrow.U_AIM --><li class="aim-icon"><a href="{postrow.U_AIM}" onclick="popup(this.href, 550, 320); return false;" title="{L_AIM}"><span>{L_AIM}</span></a></li><!-- ENDIF --> -					<!-- IF postrow.U_JABBER --><li class="jabber-icon"><a href="{postrow.U_JABBER}" onclick="popup(this.href, 550, 320); return false;" title="{L_JABBER}"><span>{L_JABBER}</span></a></li><!-- ENDIF --> -				</ul> -			</dd> -		<!-- ENDIF --> -		<!-- ENDIF --> - -		</dl> -	<!-- ENDIF --> +		</div>  		<div class="back2top"><a href="#wrap" class="top" title="{L_BACK_TO_TOP}">{L_BACK_TO_TOP}</a></div> -		<span class="corners-bottom"><span></span></span></div> +		</div>  	</div>  	<hr class="divider" /> +	<!-- EVENT viewtopic_body_postrow_post_after -->  <!-- END postrow --> +  <!-- IF S_QUICK_REPLY -->  	<!-- INCLUDE quickreply_editor.html -->  <!-- ENDIF --> -<!-- IF S_NUM_POSTS > 1 or PREVIOUS_PAGE --> -	<form id="viewtopic" method="post" action="{S_TOPIC_ACTION}"> +<!-- IF S_NUM_POSTS > 1 or .pagination --> +	<form id="viewtopic" method="post" action="{S_TOPIC_ACTION}">  	<fieldset class="display-options" style="margin-top: 0; "> -		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->  		<!-- IF not S_IS_BOT --> -		<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label> -		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> <label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label> +		<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label> +		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> <label>{S_SELECT_SORT_DIR}</label> +		<input type="submit" name="sort" value="{L_GO}" class="button2" />  		<!-- ENDIF -->  	</fieldset> -  	</form>  	<hr />  <!-- ENDIF --> -<div class="topic-actions"> +<!-- EVENT viewtopic_body_topic_actions_before --> +<div class="action-bar bottom">  	<div class="buttons"> +		<!-- EVENT viewtopic_buttons_bottom_before --> +  	<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO --> -		<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->"><a href="{U_POST_REPLY_TOPIC}" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"><span></span><!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED_SHORT}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF --></a></div> +		<a href="{U_POST_REPLY_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"> +			<!-- IF S_IS_LOCKED -->{L_BUTTON_TOPIC_LOCKED}<!-- ELSE -->{L_BUTTON_POST_REPLY}<!-- ENDIF --> +		</a>  	<!-- ENDIF --> + +		<!-- EVENT viewtopic_buttons_bottom_after -->  	</div> -	<!-- IF PAGINATION or TOTAL_POSTS --> +	<!-- INCLUDE viewtopic_topic_tools.html --> + +	<!-- IF .quickmod --> +		<div class="dropdown-container dropdown-container-{S_CONTENT_FLOW_BEGIN} dropdown-up dropdown-{S_CONTENT_FLOW_END} dropdown-button-control" id="quickmod"> +			<span title="{L_QUICK_MOD}" class="dropdown-trigger button icon-button modtools-icon dropdown-select">{L_QUICK_MOD}</span> +			<div class="dropdown hidden"> +				<div class="pointer"><div class="pointer-inner"></div></div> +				<ul class="dropdown-contents"> +				<!-- BEGIN quickmod --> +					<!-- DEFINE $QUICKMOD_AJAX = (quickmod.VALUE in ['lock', 'unlock', 'delete_topic', 'restore_topic', 'make_normal', 'make_sticky', 'make_announce', 'make_global']) --> +					<li><a href="{quickmod.LINK}"<!-- IF $QUICKMOD_AJAX --> data-ajax="true" data-refresh="true"<!-- ENDIF -->>{quickmod.TITLE}</a></li> +				<!-- END quickmod --> +				</ul> +			</div> +		</div> +	<!-- ENDIF --> + +	<!-- IF .pagination or TOTAL_POSTS -->  		<div class="pagination">  			{TOTAL_POSTS} -			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> +			<!-- IF .pagination --> +				<!-- INCLUDE pagination.html --> +			<!-- ELSE --> +				• {PAGE_NUMBER} +			<!-- ENDIF -->  		</div>  	<!-- ENDIF --> +	<div class="clear"></div>  </div> +<!-- EVENT viewtopic_body_footer_before -->  <!-- INCLUDE jumpbox.html --> -<!-- IF S_TOPIC_MOD --> -	<form method="post" action="{S_MOD_ACTION}"> -	<fieldset class="quickmod"> -		<label for="quick-mod-select">{L_QUICK_MOD}:</label> {S_TOPIC_MOD} <input type="submit" value="{L_GO}" class="button2" /> -		{S_FORM_TOKEN} -	</fieldset> -	</form> -<!-- ENDIF --> -  <!-- IF S_DISPLAY_ONLINE_LIST --> -	<h3><!-- IF U_VIEWONLINE --><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a><!-- ELSE -->{L_WHO_IS_ONLINE}<!-- ENDIF --></h3> -	<p>{LOGGED_IN_USER_LIST}</p> +	<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> +		<p>{LOGGED_IN_USER_LIST}</p> +	</div>  <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html index 168305a6a4..5c44f58adb 100644 --- a/phpBB/styles/prosilver/template/viewtopic_print.html +++ b/phpBB/styles/prosilver/template/viewtopic_print.html @@ -1,23 +1,17 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}"> +<!DOCTYPE html> +<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">  <head> - -<meta http-equiv="content-type" content="text/html; charset={S_CONTENT_ENCODING}" /> -<meta http-equiv="content-style-type" content="text/css" /> -<meta http-equiv="content-language" content="{S_USER_LANG}" /> -<meta http-equiv="imagetoolbar" content="no" /> -<meta name="resource-type" content="document" /> -<meta name="distribution" content="global" /> +<meta charset="utf-8">  <meta name="robots" content="noindex" />  {META}  <title>{SITENAME} • {PAGE_TITLE}</title>  <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" /> +<!-- EVENT viewtopic_print_head_append -->  </head> -  <body id="phpbb">  <div id="wrap"> -	<a id="top" name="top" accesskey="t"></a> +	<a id="top" class="anchor" accesskey="t"></a>  	<div id="page-header">  		<h1>{SITENAME}</h1> @@ -32,7 +26,7 @@  		<!-- BEGIN postrow -->  			<div class="post">  				<h3>{postrow.POST_SUBJECT}</h3> -				<div class="date">{postrow.MINI_POST_IMG}{L_POSTED}: <strong>{postrow.POST_DATE}</strong></div> +				<div class="date">{L_POSTED}{L_COLON} <strong>{postrow.POST_DATE}</strong></div>  				<div class="author">{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR}</strong></div>  				<div class="content">{postrow.MESSAGE}</div>  			</div> @@ -42,9 +36,9 @@  	<div id="page-footer">  		<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div> -		<div class="copyright">Powered by phpBB® Forum Software © phpBB Group<br />https://www.phpbb.com/</div> +		<div class="copyright">Powered by phpBB® Forum Software © phpBB Limited<br />https://www.phpbb.com/</div>  	</div>  </div>  </body> -</html>
\ No newline at end of file +</html> diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html new file mode 100644 index 0000000000..8378e3bcf4 --- /dev/null +++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html @@ -0,0 +1,25 @@ +<!-- IF not S_IS_BOT and (U_WATCH_TOPIC or U_BOOKMARK_TOPIC or U_BUMP_TOPIC or U_EMAIL_TOPIC or U_PRINT_TOPIC or S_DISPLAY_TOPIC_TOOLS) --> +	<div class="dropdown-container dropdown-button-control topic-tools"> +		<span title="{L_TOPIC_TOOLS}" class="button icon-button tools-icon dropdown-trigger dropdown-select"></span> +		<div class="dropdown hidden"> +			<div class="pointer"><div class="pointer-inner"></div></div> +			<ul class="dropdown-contents"> +				<!-- EVENT viewtopic_topic_tools_before --> +				<!-- IF U_WATCH_TOPIC --> +					<li class="small-icon icon-<!-- IF S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->"> +						<a href="{U_WATCH_TOPIC}" class="watch-topic-link" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}" data-update-all=".watch-topic-link">{S_WATCH_TOPIC_TITLE}</a> +					</li> +				<!-- ENDIF --> +				<!-- IF U_BOOKMARK_TOPIC --> +					<li class="small-icon icon-bookmark"> +						<a href="{U_BOOKMARK_TOPIC}" class="bookmark-link" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}" data-update-all=".bookmark-link">{S_BOOKMARK_TOPIC}</a> +					</li> +				<!-- ENDIF --> +				<!-- IF U_BUMP_TOPIC --><li class="small-icon icon-bump"><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}" data-ajax="true">{L_BUMP_TOPIC}</a></li><!-- ENDIF --> +				<!-- IF U_EMAIL_TOPIC --><li class="small-icon icon-sendemail"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}">{L_EMAIL_TOPIC}</a></li><!-- ENDIF --> +				<!-- IF U_PRINT_TOPIC --><li class="small-icon icon-print"><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p">{L_PRINT_TOPIC}</a></li><!-- ENDIF --> +				<!-- EVENT viewtopic_topic_tools_after --> +			</ul> +		</div> +	</div> +<!-- ENDIF -->  | 
