diff options
Diffstat (limited to 'phpBB/styles/prosilver/template')
76 files changed, 694 insertions, 701 deletions
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js index 28656d47d3..bc68e5ae0c 100644 --- a/phpBB/styles/prosilver/template/ajax.js +++ b/phpBB/styles/prosilver/template/ajax.js @@ -8,7 +8,7 @@  * @param int Delay in ms until darkenwrapper's click event is triggered  */  phpbb.closeDarkenWrapper = function(delay) { -	setTimeout(function() { +	phpbbAlertTimer = setTimeout(function() {  		$('#darkenwrapper').trigger('click');  	}, delay);  }; @@ -106,6 +106,47 @@ phpbb.addAjaxCallback('mark_topics_read', function(res, update_topic_links) {  	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} el jQuery object(s) to mark read. + * @param {int} unreadCount The new unread notifications count. + */ +phpbb.markNotifications = function(el, unreadCount) { +	// Remove the unread status. +	el.removeClass('bg2'); +	el.find('a.mark_read').remove(); + +	// Update the notification link to the real URL. +	el.each(function() { +		var link = $(this).find('a'); +		link.attr('href', link.attr('data-real-url')); +	}); + +	// Update the unread count. +	$('#notification_list_button strong').html(unreadCount); +	// Remove the Mark all read link if there are no unread notifications. +	if (!unreadCount) { +		$('#mark_all_notifications').remove(); +	} +}; +  // This callback finds the post from the delete link, and removes it.  phpbb.addAjaxCallback('post_delete', function() {  	var el = $(this), @@ -165,6 +206,7 @@ phpbb.addAjaxCallback('vote_poll', function(res) {  		var poll = $('.topic_poll');  		var panel = poll.find('.panel');  		var results_visible = poll.find('dl:first-child .resultbar').is(':visible'); +		var most_votes = 0;  		// Set min-height to prevent the page from jumping when the content changes  		var update_panel_height = function (height) { @@ -186,6 +228,13 @@ phpbb.addAjaxCallback('vote_poll', function(res) {  			// 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 option_id = option.attr('data-poll-option-id'); +			most_votes = (res.vote_counts[option_id] >= most_votes) ? res.vote_counts[option_id] : most_votes; +		});  		// Update the total votes count  		poll.find('.poll_total_vote_cnt').html(res.total_votes); @@ -195,9 +244,12 @@ phpbb.addAjaxCallback('vote_poll', function(res) {  			var option = $(this);  			var option_id = option.attr('data-poll-option-id');  			var voted = (typeof res.user_votes[option_id] !== 'undefined') ? true : false; +			var most_voted = (res.vote_counts[option_id] == most_votes) ? true : false;  			var percent = (!res.total_votes) ? 0 : Math.round((res.vote_counts[option_id] / res.total_votes) * 100); +			var percent_rel = (most_votes == 0) ? 0 : Math.round((res.vote_counts[option_id] / most_votes) * 100);  			option.toggleClass('voted', voted); +			option.toggleClass('most-votes', most_voted);  			// Update the bars  			var bar = option.find('.resultbar div'); @@ -205,7 +257,7 @@ phpbb.addAjaxCallback('vote_poll', function(res) {  			var new_bar_class = (percent == 100) ? 'pollbar5' : 'pollbar' + (Math.floor(percent / 20) + 1);  			setTimeout(function () { -				bar.animate({width: percent + '%'}, 500).removeClass('pollbar1 pollbar2 pollbar3 pollbar4 pollbar5').addClass(new_bar_class); +				bar.animate({width: percent_rel + '%'}, 500).removeClass('pollbar1 pollbar2 pollbar3 pollbar4 pollbar5').addClass(new_bar_class);  				bar.html(res.vote_counts[option_id]);  				var percent_txt = (!percent) ? res.NO_VOTES : percent + '%'; @@ -332,7 +384,7 @@ $('#quick-mod-select').change(function () {  });  $('#delete_permanent').click(function () { -	if ($(this).attr('checked')) { +	if ($(this).prop('checked')) {  		$('#delete_reason').hide();  	} else {  		$('#delete_reason').show(); @@ -348,7 +400,7 @@ $('#delete_permanent').click(function () {  */  $('#member_search').click(function () {  	$('#memberlist_search').slideToggle('fast'); -	phpbb.ajax_callbacks.alt_text.call(this); +	phpbb.ajaxCallbacks.alt_text.call(this);  	// Focus on the username textbox if it's available and displayed  	if ($('#memberlist_search').is(':visible')) {  		$('#username').focus(); 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 909c09df5a..3e38d13a32 100644 --- a/phpBB/styles/prosilver/template/bbcode.html +++ b/phpBB/styles/prosilver/template/bbcode.html @@ -31,7 +31,7 @@  <!-- 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 --> diff --git a/phpBB/styles/prosilver/template/captcha_default.html b/phpBB/styles/prosilver/template/captcha_default.html index c9c5295d13..550962db67 100644 --- a/phpBB/styles/prosilver/template/captcha_default.html +++ b/phpBB/styles/prosilver/template/captcha_default.html @@ -2,7 +2,7 @@  <div class="panel">  	<div class="inner"> -	<h3>{L_CONFIRMATION}</h3> +	<h3 class="captcha-title">{L_CONFIRMATION}</h3>  	<p>{L_CONFIRM_EXPLAIN}</p>  	<fieldset class="fields2"> diff --git a/phpBB/styles/prosilver/template/captcha_qa.html b/phpBB/styles/prosilver/template/captcha_qa.html index c179f6dc20..1671987f63 100644 --- a/phpBB/styles/prosilver/template/captcha_qa.html +++ b/phpBB/styles/prosilver/template/captcha_qa.html @@ -2,7 +2,7 @@  <div class="panel">  	<div class="inner"> -	<h3>{L_CONFIRMATION}</h3> +	<h3 class="captcha-title">{L_CONFIRMATION}</h3>  	<fieldset class="fields2">  <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/captcha_recaptcha.html b/phpBB/styles/prosilver/template/captcha_recaptcha.html index aad1008241..bde0c9df13 100644 --- a/phpBB/styles/prosilver/template/captcha_recaptcha.html +++ b/phpBB/styles/prosilver/template/captcha_recaptcha.html @@ -2,7 +2,7 @@  <div class="panel">  	<div class="inner"> -	<h3>{L_CONFIRMATION}</h3> +	<h3 class="captcha-title">{L_CONFIRMATION}</h3>  	<p>{L_CONFIRM_EXPLAIN}</p>  	<fieldset class="fields2"> diff --git a/phpBB/styles/prosilver/template/confirm_body.html b/phpBB/styles/prosilver/template/confirm_body.html index a0428025cf..aaea5cfd05 100644 --- a/phpBB/styles/prosilver/template/confirm_body.html +++ b/phpBB/styles/prosilver/template/confirm_body.html @@ -17,7 +17,7 @@  <div class="panel">  	<div class="inner"> -	<h2>{MESSAGE_TITLE}</h2> +	<h2 class="message-title">{MESSAGE_TITLE}</h2>  	<p>{MESSAGE_TEXT}</p>  	<fieldset class="submit-buttons"> diff --git a/phpBB/styles/prosilver/template/confirm_delete_body.html b/phpBB/styles/prosilver/template/confirm_delete_body.html index dc09974d1c..2d4dde5cd5 100644 --- a/phpBB/styles/prosilver/template/confirm_delete_body.html +++ b/phpBB/styles/prosilver/template/confirm_delete_body.html @@ -33,7 +33,7 @@  <div class="panel">  	<div class="inner"> -	<h2>{MESSAGE_TITLE}</h2> +	<h2 class="message-title">{MESSAGE_TITLE}</h2>  	<p>{MESSAGE_TEXT}</p> 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 7de97f64cb..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="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 --> - -<!-- 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/drafts.html b/phpBB/styles/prosilver/template/drafts.html index 4b2e1bf0c6..ea2849a485 100644 --- a/phpBB/styles/prosilver/template/drafts.html +++ b/phpBB/styles/prosilver/template/drafts.html @@ -4,7 +4,7 @@  <div class="panel">  	<div class="inner"> -	<h3>{L_LOAD_DRAFT}</h3> +	<h3 class="draft-title">{L_LOAD_DRAFT}</h3>  	<p>{L_LOAD_DRAFT_EXPLAIN}</p>  	</div> diff --git a/phpBB/styles/prosilver/template/faq_body.html b/phpBB/styles/prosilver/template/faq_body.html index 46f738aa3a..53205d14e9 100644 --- a/phpBB/styles/prosilver/template/faq_body.html +++ b/phpBB/styles/prosilver/template/faq_body.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<h2>{L_FAQ_TITLE}</h2> +<h2 class="faq-title">{L_FAQ_TITLE}</h2>  <div class="panel bg1" id="faqlinks"> @@ -24,16 +24,12 @@  	</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">  		<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> diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index a45f750a63..1594d73517 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -37,17 +37,14 @@ function jumpto(item) {  		on_page = item.attr('data-on-page'),  		per_page = item.attr('data-per-page'),  		base_url = item.attr('data-base-url'), +		start_name = item.attr('data-start-name'),  		page = prompt(jump_page, on_page);  	if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0) { -		if (base_url.indexOf('%d') === -1) { -			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); -			} +		if (base_url.indexOf('?') === -1) { +			document.location.href = base_url + '?' + start_name + '=' + ((page - 1) * per_page);  		} else { -			document.location.href = base_url.replace('%d', page); +			document.location.href = base_url.replace(/&/g, '&') + '&' + start_name + '=' + ((page - 1) * per_page);  		}  	}  } @@ -95,23 +92,6 @@ 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  */  jQuery(document).ready(function() { @@ -187,9 +167,10 @@ function selectCode(a) {  	// Not IE and IE9+  	if (window.getSelection) {  		s = window.getSelection(); -		// Safari +		// Safari and Chrome  		if (s.setBaseAndExtent) { -			s.setBaseAndExtent(e, 0, e, e.innerText.length - 1); +			var l = (e.innerText.length > 1) ? e.innerText.length - 1 : 1; +			s.setBaseAndExtent(e, 0, e, l);  		}  		// Firefox and Opera  		else { @@ -306,64 +287,6 @@ function apply_onkeypress_event() {  jQuery(document).ready(apply_onkeypress_event);  /** -* Run MSN action -*/ -function msn_action(action, address) -{ -	// Does the browser support the MSNM object? -	var app = document.getElementById('objMessengerApp'); - -	if (!app || !app.MyStatus) { -		var lang = $('form[data-lang-im-msnm-browser]'); -		if (lang.length) { -			alert(lang.attr('data-lang-im-msnm-browser')); -		} -		return false; -	} - -	// Is MSNM connected? -	if (app.MyStatus == 1) { -		var lang = $('form[data-lang-im-msnm-connect]'); -		if (lang.length) { -			alert(lang.attr('data-lang-im-msnm-connect')); -		} -		return false; -	} - -	// Do stuff -	try { -		switch (action) { -			case 'add': -				app.AddContact(0, address); -				break; - -			case 'im': -				app.InstantMessage(address); -				break; -		} -	} -	catch (e) { -		return; -	} -} - -/** -* Add to your contact list -*/ -function add_contact(address)  -{ -	msn_action('add', address); -} - -/** -* Write IM to contact -*/ -function im_contact(address) -{ -	msn_action('im', address); -} - -/**  * Functions for user search popup  */  function insert_user(formId, value) @@ -747,7 +670,7 @@ function parse_document(container)  	/**  	* Hide empty responsive tables  	*/ -	container.find('table.responsive > tbody').each(function() { +	container.find('table.responsive > tbody').not('.responsive-skip-empty').each(function() {  		var items = $(this).children('tr');  		if (items.length == 0)  		{ diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html index f9019b4fe3..0dd47bea9e 100644 --- a/phpBB/styles/prosilver/template/forumlist_body.html +++ b/phpBB/styles/prosilver/template/forumlist_body.html @@ -7,6 +7,7 @@  		</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"> @@ -22,11 +23,13 @@  			</ul>  			<ul class="topiclist forums">  	<!-- ENDIF --> +	<!-- EVENT forumlist_body_category_header_after -->  	<!-- IF not forumrow.S_IS_CAT -->  		<li class="row">  			<dl class="icon {forumrow.FORUM_IMG_STYLE}">  				<dt title="{forumrow.FORUM_FOLDER_IMG_ALT}"> +					<!-- 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 --> @@ -37,10 +40,12 @@  							<br /><strong>{forumrow.L_MODERATOR_STR}{L_COLON}</strong> {forumrow.MODERATORS}  						<!-- ENDIF -->  						<!-- IF .forumrow.subforum and forumrow.S_LIST_SUBFORUMS --> -							<br /><strong>{forumrow.L_SUBFORUM_STR}</strong> +							<!-- 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 -->,<!-- ENDIF --> +								<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 --> @@ -83,6 +88,7 @@  			</div>  		</div> +	<!-- EVENT forumlist_body_last_row_after -->  	<!-- ENDIF -->  <!-- BEGINELSE --> diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html index 58a5420db3..3e9aae28e3 100644 --- a/phpBB/styles/prosilver/template/index_body.html +++ b/phpBB/styles/prosilver/template/index_body.html @@ -17,7 +17,7 @@  		<!-- ENDIF -->  		<li><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 mark-read"><a href="{U_MARK_FORUMS}" accesskey="m" data-ajax="mark_forums_read" data-overlay="false">{L_MARK_FORUMS_READ}</a></li><!-- ENDIF --> +	<!-- IF not S_IS_BOT and U_MARK_FORUMS --><li class="rightside mark-read"><a href="{U_MARK_FORUMS}" accesskey="m" data-ajax="mark_forums_read">{L_MARK_FORUMS_READ}</a></li><!-- ENDIF -->  </ul>  <!-- ENDIF --> @@ -31,6 +31,9 @@  		<fieldset class="quick-login">  			<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 -->  				<span class="responsive-hide">|</span> <label for="autologin">{L_LOG_ME_IN} <input type="checkbox" name="autologin" id="autologin" /></label>  			<!-- ENDIF --> @@ -43,19 +46,27 @@  <!-- 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}{L_COLON} {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>{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 --></p> +	</div>  <!-- ENDIF -->  <!-- IF S_DISPLAY_BIRTHDAY_LIST --> -	<h3>{L_BIRTHDAYS}</h3> -	<p><!-- 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 --></p> +	<div class="stat-block birthday-list"> +		<h3>{L_BIRTHDAYS}</h3> +		<p><!-- 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 --></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>{TOTAL_POSTS} • {TOTAL_TOPICS} • {TOTAL_USERS} • {NEWEST_USER}</p> +	</div>  <!-- ENDIF --> +<!-- 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 201b2dece2..47d322407d 100644 --- a/phpBB/styles/prosilver/template/jumpbox.html +++ b/phpBB/styles/prosilver/template/jumpbox.html @@ -1,10 +1,10 @@  <!-- IF S_VIEWTOPIC --> -	<p class="jumpbox-return"><a href="{U_VIEW_FORUM}" class="left-box arrow-{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 class="jumpbox-return"><a href="{U_INDEX}" class="left-box arrow-{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 class="jumpbox-return"><a class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}" accesskey="r">{L_RETURN_TO}{L_COLON} {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 class="jumpbox-return"><a class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}" accesskey="r">{L_RETURN_TO_SEARCH_ADV}</a></p>  <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/login_body.html b/phpBB/styles/prosilver/template/login_body.html index 38d9f8c68b..c852ffd5f2 100644 --- a/phpBB/styles/prosilver/template/login_body.html +++ b/phpBB/styles/prosilver/template/login_body.html @@ -5,7 +5,7 @@  	<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 --> diff --git a/phpBB/styles/prosilver/template/login_forum.html b/phpBB/styles/prosilver/template/login_forum.html index c83a625b3f..18a95c0a8f 100644 --- a/phpBB/styles/prosilver/template/login_forum.html +++ b/phpBB/styles/prosilver/template/login_forum.html @@ -1,6 +1,6 @@  <!-- 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} @@ -8,7 +8,7 @@  	<div class="inner">  	<div class="content"> -		<h2>{L_LOGIN}</h2> +		<h2 class="login-title">{L_LOGIN}</h2>  		<p>{L_LOGIN_FORUM}</p> diff --git a/phpBB/styles/prosilver/template/mcp_approve.html b/phpBB/styles/prosilver/template/mcp_approve.html index ab7f92e262..14472bcf4f 100644 --- a/phpBB/styles/prosilver/template/mcp_approve.html +++ b/phpBB/styles/prosilver/template/mcp_approve.html @@ -34,7 +34,7 @@  	<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> diff --git a/phpBB/styles/prosilver/template/mcp_footer.html b/phpBB/styles/prosilver/template/mcp_footer.html index e5768bdc6b..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 --> diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html index 6ca176a4aa..4a8c4c5de9 100644 --- a/phpBB/styles/prosilver/template/mcp_forum.html +++ b/phpBB/styles/prosilver/template/mcp_forum.html @@ -40,6 +40,7 @@  		<li class="row<!-- IF topicrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ENDIF -->">  			<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 --> diff --git a/phpBB/styles/prosilver/template/mcp_header.html b/phpBB/styles/prosilver/template/mcp_header.html index e3efe49943..bdfa254741 100644 --- a/phpBB/styles/prosilver/template/mcp_header.html +++ b/phpBB/styles/prosilver/template/mcp_header.html @@ -39,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_message.html b/phpBB/styles/prosilver/template/mcp_message.html index 7102c658c4..062103b91c 100644 --- a/phpBB/styles/prosilver/template/mcp_message.html +++ b/phpBB/styles/prosilver/template/mcp_message.html @@ -1,7 +1,7 @@  <!-- INCLUDE mcp_header.html -->  <div class="content"> -	<h2>{MESSAGE_TITLE}</h2> +	<h2 class="message-title">{MESSAGE_TITLE}</h2>  	<p>{MESSAGE_TEXT}</p>  </div> diff --git a/phpBB/styles/prosilver/template/mcp_move.html b/phpBB/styles/prosilver/template/mcp_move.html index c2ee25f0d9..d028fffeb4 100644 --- a/phpBB/styles/prosilver/template/mcp_move.html +++ b/phpBB/styles/prosilver/template/mcp_move.html @@ -37,7 +37,7 @@  	<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> diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html index 606314f9d0..dd5e27a10e 100644 --- a/phpBB/styles/prosilver/template/memberlist_body.html +++ b/phpBB/styles/prosilver/template/memberlist_body.html @@ -14,7 +14,7 @@  	<!-- 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 --> @@ -60,7 +60,7 @@  		<tr>  			<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> @@ -91,7 +91,7 @@  	<!-- IF not S_LEADERS_SET -->  		<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 --> @@ -111,9 +111,9 @@  	<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 --><!-- 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}{L_COLON} {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"> diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html index 8e7842e631..4fb383a0ba 100644 --- a/phpBB/styles/prosilver/template/memberlist_im.html +++ b/phpBB/styles/prosilver/template/memberlist_im.html @@ -1,9 +1,8 @@  <!-- 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> -<form method="post" action="{S_IM_ACTION}" data-lang-im-msnm-connect="{L_IM_MSNM_CONNECT|e('html_attr')}" data-lang-im-msnm-browser="{L_IM_MSNM_BROWSER|e('html_attr')}"> +<form method="post" action="{S_IM_ACTION}">  <div class="panel bg2">  	<div class="inner"> @@ -13,45 +12,9 @@  	<fieldset>  	<dl class="fields2">  		<dt><label>{L_IM_RECIPIENT}{L_COLON}</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> +		<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}{L_COLON}</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}{L_COLON}</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}{L_COLON}</label></dt> @@ -61,19 +24,14 @@  			<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} diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html index 0b04d0087c..ee89b103b5 100644 --- a/phpBB/styles/prosilver/template/memberlist_search.html +++ b/phpBB/styles/prosilver/template/memberlist_search.html @@ -18,25 +18,17 @@  	</dl>  <!-- ENDIF -->  	<dl> -		<dt><label for="icq">{L_ICQ}{L_COLON}</label></dt> -		<dd><input type="text" name="icq" id="icq" value="{ICQ}" class="inputbox" /></dd> -	</dl> -	<dl> -		<dt><label for="aim">{L_AIM}{L_COLON}</label></dt> -		<dd><input type="text" name="aim" id="aim" value="{AIM}" class="inputbox" /></dd> -	</dl> -	<dl> -		<dt><label for="yahoo">{L_YIM}{L_COLON}</label></dt> -		<dd><input type="text" name="yahoo" id="yahoo" value="{YAHOO}" class="inputbox" /></dd> -	</dl> -	<dl> -		<dt><label for="msn">{L_MSNM}{L_COLON}</label></dt> -		<dd><input type="text" name="msn" id="msn" value="{MSNM}" class="inputbox" /></dd> -	</dl> -	<dl>  		<dt><label for="jabber">{L_JABBER}:</label></dt>  		<dd><input type="text" name="jabber" id="jabber" value="{JABBER}" class="inputbox" /></dd>  	</dl> +		<dl> +			<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="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"> @@ -60,14 +52,6 @@  		<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}{L_COLON}</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}{L_COLON}</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> diff --git a/phpBB/styles/prosilver/template/memberlist_leaders.html b/phpBB/styles/prosilver/template/memberlist_team.html index fd2ba564d3..fd2ba564d3 100644 --- a/phpBB/styles/prosilver/template/memberlist_leaders.html +++ b/phpBB/styles/prosilver/template/memberlist_team.html diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index afe93ef9ac..3ef3f7ca07 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<h2>{PAGE_TITLE}</h2> +<h2 class="memberlist-title">{PAGE_TITLE}</h2>  <form method="post" action="{S_PROFILE_ACTION}" id="viewprofile">  <div class="panel bg1<!-- IF S_ONLINE --> online<!-- ENDIF -->"> @@ -27,12 +27,13 @@  			<!-- 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}{L_COLON}</dt> <dd>{USER_INACTIVE_REASON}</dd><!-- ENDIF --> -		<!-- IF LOCATION --><dt>{L_LOCATION}{L_COLON}</dt> <dd>{LOCATION}</dd><!-- ENDIF -->  		<!-- IF AGE !== '' --><dt>{L_AGE}{L_COLON}</dt> <dd>{AGE}</dd><!-- ENDIF --> -		<!-- IF OCCUPATION --><dt>{L_OCCUPATION}{L_COLON}</dt> <dd>{OCCUPATION}</dd><!-- ENDIF --> -		<!-- IF INTERESTS --><dt>{L_INTERESTS}{L_COLON}</dt> <dd>{INTERESTS}</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 --><dt>{custom_fields.PROFILE_FIELD_NAME}{L_COLON}</dt> <dd>{custom_fields.PROFILE_FIELD_VALUE}</dd><!-- END custom_fields --> +		<!-- 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 class="zebra"><a href="{U_REMOVE_FRIEND}" data-ajax="zebra"><strong>{L_REMOVE_FRIEND}</strong></a></dd> @@ -49,24 +50,30 @@  		<!-- ENDIF -->  	</dl> -	<span class="clear"></span></div> +	</div>  </div> +<!-- EVENT memberlist_view_contact_before -->  <div class="panel bg2">  	<div class="inner"> -	<div class="column1"> +	<div class="column1">  		<h3>{L_CONTACT_USER} {USERNAME}</h3>  		<dl class="details">  		<!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}{L_COLON}</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER} {USERNAME}</a></dd><!-- ENDIF --> -		<!-- IF U_WWW --><dt>{L_WEBSITE}{L_COLON}</dt> <dd><a href="{U_WWW}" title="{L_VISIT_WEBSITE}{L_COLON} {U_WWW}">{U_WWW}</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_MSN or USER_MSN --><dt>{L_MSNM}{L_COLON}</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}{L_COLON}</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}{L_COLON}</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}{L_COLON}</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}{L_COLON}</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}{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}{L_COLON}</dt> <dd>{PROFILE_FIELD1_VALUE}</dd> @@ -79,7 +86,7 @@  		<dl class="details">  			<!-- EVENT memberlist_view_user_statistics_before -->  			<dt>{L_JOINED}{L_COLON}</dt> <dd>{JOINED}</dd> -			<dt>{L_VISITED}{L_COLON}</dt> <dd>{VISITED}</dd> +			<dt>{L_LAST_ACTIVE}{L_COLON}</dt> <dd>{LAST_ACTIVE}</dd>  			<!-- IF S_WARNINGS -->  			<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> @@ -96,8 +103,10 @@  			<!-- EVENT memberlist_view_user_statistics_after -->  		</dl>  	</div> -	<span class="clear"></span></div> + +	</div>  </div> +<!-- EVENT memberlist_view_contact_after -->  <!-- IF SIGNATURE -->  <div class="panel bg1"> @@ -107,12 +116,14 @@  		<div class="postbody"><div class="signature standalone">{SIGNATURE}</div></div> -	<span class="clear"></span></div> +	</div>  </div>  <!-- ENDIF -->  </form> +<!-- EVENT memberlist_view_content_append --> +  <!-- INCLUDE jumpbox.html -->  <!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/prosilver/template/message_body.html b/phpBB/styles/prosilver/template/message_body.html index a844246055..8062fed9a0 100644 --- a/phpBB/styles/prosilver/template/message_body.html +++ b/phpBB/styles/prosilver/template/message_body.html @@ -6,7 +6,7 @@  <div class="panel" id="message">  	<div class="inner"> -	<h2>{MESSAGE_TITLE}</h2> +	<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="arrow-{S_CONTENT_FLOW_BEGIN}">{L_RETURN_TO_SEARCH_ADV}</a></p><!-- ENDIF -->  	</div> diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html new file mode 100644 index 0000000000..13e50dae19 --- /dev/null +++ b/phpBB/styles/prosilver/template/navbar_footer.html @@ -0,0 +1,23 @@ +<div class="navbar"> +	<div class="inner"> + +	<ul class="linklist bulletin"> +		<li class="small-icon icon-home breadcrumbs"> +			<!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}">{L_SITE_HOME}</a></span><!-- ENDIF --> +			<span class="crumb"><a href="{U_INDEX}">{L_INDEX}</a></span> +			<!-- EVENT overall_footer_breadcrumb_append --> +		</li> +		<!-- IF not S_IS_BOT --> +			<!-- IF U_WATCH_FORUM_LINK --><li class="small-icon icon-<!-- IF S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->"><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 --> +		<!-- ENDIF --> +		<!-- EVENT overall_footer_timezone_before --> +		<li class="rightside">{S_TIMEZONE}</li> +		<!-- EVENT overall_footer_timezone_after --> +		<!-- IF not S_IS_BOT --><li class="rightside"><a href="{U_DELETE_COOKIES}" data-ajax="true" data-refresh="true">{L_DELETE_COOKIES}</a></li><!-- ENDIF --> +		<!-- EVENT overall_footer_teamlink_before --> +		<!-- IF U_TEAM --><li class="rightside"><a href="{U_TEAM}">{L_THE_TEAM}</a></li><!-- ENDIF --> +		<!-- EVENT overall_footer_teamlink_after --> +	</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..7fbaa1254f --- /dev/null +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -0,0 +1,52 @@ +<div class="navbar"> +	<div class="inner"> + +	<ul class="linklist navlinks"> +		<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' --> +		<li class="small-icon icon-home breadcrumbs"> +			<!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a></span><!-- ENDIF --> +			<span class="crumb"><a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a></span> +			<!-- BEGIN navlinks --><span class="crumb"><a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a></span><!-- END navlinks --> +			<!-- EVENT overall_header_breadcrumb_append --> +		</li> + +		<!-- IF S_REGISTERED_USER --><li id="username_logged_in" class="rightside"><!-- IF CURRENT_USER_AVATAR --><a href="{U_USER_PROFILE}" class="header-avatar">{CURRENT_USER_AVATAR}</a> <!-- ENDIF -->{USERNAME_FULL}</li><!-- ENDIF --> +		<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH --><li class="responsive-search rightside" style="display: none;"><a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH}</a></li><!-- ENDIF --> +	</ul> + +	<ul class="linklist bulletin"> +	<!-- IF not S_IS_BOT and S_USER_LOGGED_IN --> +		<!-- IF S_NOTIFICATIONS_DISPLAY --> +		<li class="small-icon icon-notification" data-skip-responsive="true"> +			<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button"><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></a> +			<!-- INCLUDE notification_dropdown.html --> +		</li> +		<!-- ENDIF --> +		<!-- IF S_DISPLAY_PM --> +			<li class="small-icon icon-pm"> +				<a href="{U_PRIVATEMSGS}"><span>{L_PRIVATE_MESSAGES} [</span><strong>{PRIVATE_MESSAGE_COUNT}</strong><span>]</span></a> +			</li> +		<!-- ENDIF --> +		<li class="small-icon icon-ucp"> +			<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a> +		</li> +		<!-- IF S_DISPLAY_SEARCH --> +			<li class="icon-search-self"><a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a></li> +		<!-- ENDIF --> +		<!-- IF U_RESTORE_PERMISSIONS --> +			<li class="icon-restore-permissions"><a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a></li> +		<!-- ENDIF --> +	<!-- ENDIF --> + +		<!-- EVENT overall_header_navigation_append --> +		<!-- IF not S_IS_BOT --> +			<li class="small-icon icon-logout rightside no-bulletin"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x">{L_LOGIN_LOGOUT}</a></li> +			<!-- IF not S_USER_LOGGED_IN and S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --><li class="small-icon icon-register rightside no-bulletin"><a href="{U_REGISTER}">{L_REGISTER}</a></li><!-- ENDIF --> +			<!-- IF S_DISPLAY_MEMBERLIST --><li class="small-icon icon-members rightside no-bulletin"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF --> +		<!-- ENDIF --> +		<li class="small-icon icon-faq rightside no-bulletin"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li> +		<!-- EVENT overall_header_navigation_prepend --> +	</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..3f32189fe5 --- /dev/null +++ b/phpBB/styles/prosilver/template/notification_dropdown.html @@ -0,0 +1,42 @@ +<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> +					{L_NO_NOTIFICATIONS} +				</li> +			<!-- ENDIF --> +			<!-- BEGIN notifications --> +				<li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->"> +					<!-- IF notifications.URL --> +						<a 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>{notifications.FORMATTED_TITLE}</p> +							<p>» {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 f7d0269edb..a43dd3c8a6 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -1,25 +1,10 @@  		<!-- EVENT overall_footer_content_after -->  	</div> -<div id="page-footer"> - -	<div class="navbar"> -		<div class="inner"> +<!-- EVENT overall_footer_page_body_after --> -		<ul class="linklist bulletin"> -			<li class="small-icon icon-home breadcrumbs"><!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}">{L_SITE_HOME}</a> <strong>‹</strong></span> <!-- ENDIF --><span class="crumb"><a href="{U_INDEX}">{L_INDEX}</a></span> -				<!-- EVENT overall_footer_breadcrumb_append --> -			</li> -			<!-- IF not S_IS_BOT --> -				<!-- IF U_WATCH_FORUM_LINK --><li class="small-icon icon-<!-- IF S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->"><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 --> -			<!-- ENDIF --> -			<li class="rightside">{S_TIMEZONE}</li> -			<!-- IF not S_IS_BOT --><li class="rightside"><a href="{U_DELETE_COOKIES}" data-ajax="true" data-refresh="true">{L_DELETE_COOKIES}</a></li><!-- ENDIF --> -			<!-- IF U_TEAM --><li class="rightside"><a href="{U_TEAM}">{L_THE_TEAM}</a><!-- ENDIF --> -		</ul> - -		</div> -	</div> +<div id="page-footer"> +	<!-- INCLUDE navbar_footer.html -->  	<div class="copyright">  		<!-- EVENT overall_footer_copyright_prepend --> @@ -60,8 +45,8 @@  <!-- EVENT overall_footer_after --> -{$SCRIPTS}  <!-- IF S_PLUPLOAD --><!-- INCLUDE plupload.html --><!-- ENDIF --> +{$SCRIPTS}  </body>  </html> diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index e4e1b3443b..353ba9139a 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -36,7 +36,6 @@  <!-- ENDIF -->  <!-- IF S_PLUPLOAD --> -	<link href="{T_ASSETS_PATH}/plupload/jquery.plupload.queue/css/jquery.plupload.queue.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" />  	<link href="{T_THEME_PATH}/plupload.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" />  <!-- ENDIF --> @@ -49,7 +48,9 @@  {$STYLESHEETS}  </head> -<body id="phpbb" class="nojs section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}"> +<body id="phpbb" class="nojs section-{SCRIPT_NAME} {S_CONTENT_DIRECTION} {BODY_CLASS}"> + +<!-- EVENT overall_header_body_before -->  <div id="wrap">  	<a id="top" accesskey="t"></a> @@ -79,98 +80,11 @@  			</div>  		</div> -		<div class="navbar"> -			<div class="inner"> - -			<ul class="linklist navlinks"> -				<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' --> -				<li class="small-icon icon-home breadcrumbs"><!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>‹</strong></span> <!-- ENDIF --> -					<span class="crumb"><a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a></span>  -					<!-- BEGIN navlinks --> <span class="crumb"><strong>‹</strong> <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a></span><!-- END navlinks --> -					<!-- EVENT overall_header_breadcrumb_append --> -				</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 --> -				<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH --><li class="responsive-search rightside" style="display: none;"><a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH}</a></li><!-- ENDIF --> -			</ul> - -			<ul class="linklist bulletin"> -			<!-- IF not S_IS_BOT and S_USER_LOGGED_IN --> -				<!-- IF S_NOTIFICATIONS_DISPLAY --> -				<li class="small-icon icon-notification" data-skip-responsive="true"> -					<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button"><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></a> -					<div id="notification_list" class="dropdown 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></span> -							</div> - -							<ul> -								<!-- IF not .notifications --> -									<li> -										{L_NO_NOTIFICATIONS} -									</li> -								<!-- ENDIF --> -								<!-- BEGIN notifications --> -									<li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->"> -										<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- 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>{notifications.FORMATTED_TITLE}</p> -												<p>» {notifications.TIME}</p> - -												<!-- IF not notifications.URL and notifications.U_MARK_READ --> -													<p><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a></p> -												<!-- ENDIF --> -											</div> -										<!-- IF notifications.URL --></a><!-- ENDIF --> -									</li> -					   			<!-- END notifications --> -							</ul> - -							<div class="footer"> -								<a href="{U_VIEW_ALL_NOTIFICATIONS}"><span>{L_SEE_ALL}</span></a> -							</div> -						</div> -					</div> -				</li> -				<!-- ENDIF --> -				<!-- IF S_DISPLAY_PM --> -					<li class="small-icon icon-pm"> -						<a href="{U_PRIVATEMSGS}"><span>{L_PRIVATE_MESSAGES} [</span><strong>{PRIVATE_MESSAGE_COUNT}</strong><span>]</span></a> -					</li> -				<!-- ENDIF --> -				<li class="small-icon icon-ucp"> -					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a> -				</li> -				<!-- IF S_DISPLAY_SEARCH --> -					<li class="icon-search-self"><a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a></li> -				<!-- ENDIF --> -				<!-- IF U_RESTORE_PERMISSIONS --> -					<li class="icon-restore-permissions"><a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a></li> -				<!-- ENDIF --> -			<!-- ENDIF --> - -				<!-- EVENT overall_header_navigation_append --> -				<!-- IF not S_IS_BOT --> -					<li class="small-icon icon-logout rightside no-bulletin"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x">{L_LOGIN_LOGOUT}</a></li> -					<!-- IF not S_USER_LOGGED_IN and S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --><li class="small-icon icon-register rightside no-bulletin"><a href="{U_REGISTER}">{L_REGISTER}</a></li><!-- ENDIF --> -					<!-- IF S_DISPLAY_MEMBERLIST --><li class="small-icon icon-members rightside no-bulletin"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF --> -				<!-- ENDIF --> -				<li class="small-icon icon-faq rightside no-bulletin"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li> -				<!-- EVENT overall_header_navigation_prepend --> -			</ul> - -			</div> -		</div> - +		<!-- INCLUDE navbar_header.html -->  	</div> +	<!-- EVENT overall_header_page_body_before --> +  	<a id="start_here"></a>  	<div id="page-body">  		<!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN and (U_MCP or U_ACP) --> diff --git a/phpBB/styles/prosilver/template/pagination.html b/phpBB/styles/prosilver/template/pagination.html index 172bc952e4..e27a90900a 100644 --- a/phpBB/styles/prosilver/template/pagination.html +++ b/phpBB/styles/prosilver/template/pagination.html @@ -1,4 +1,8 @@ -					<a href="#" class="pagination-trigger" title="{L_JUMP_TO_PAGE}" data-lang-jump-page="{L_JUMP_PAGE|e('html_attr')}{L_COLON}" data-on-page="{ON_PAGE}" data-per-page="{PER_PAGE}" data-base-url="{BASE_URL|e('html_attr')}">{PAGE_NUMBER}</a> • +					<!-- IF BASE_URL --> +					<a href="#" class="pagination-trigger" title="{L_JUMP_TO_PAGE}" data-lang-jump-page="{L_JUMP_PAGE|e('html_attr')}{L_COLON}" data-on-page="{CURRENT_PAGE}" data-per-page="{PER_PAGE}" data-base-url="{BASE_URL|e('html_attr')}" data-base-is-route="{BASE_IS_ROUTE}" data-start-name="{START_NAME}">{PAGE_NUMBER}</a> • +					<!-- ELSE --> +					{PAGE_NUMBER} • +					<!-- ENDIF -->  					<ul>  					<!-- BEGIN pagination -->  						<!-- IF pagination.S_IS_PREV --> diff --git a/phpBB/styles/prosilver/template/plupload.html b/phpBB/styles/prosilver/template/plupload.html index 290992ddd6..fc663118c1 100644 --- a/phpBB/styles/prosilver/template/plupload.html +++ b/phpBB/styles/prosilver/template/plupload.html @@ -1,5 +1,3 @@ -<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/plupload.full.min.js?assets_version={T_ASSETS_VERSION}"></script> -<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/jquery.plupload.queue/jquery.plupload.queue.min.js?assets_version={T_ASSETS_VERSION}"></script>  <script type="text/javascript">  //<![CDATA[  phpbb.plupload = { @@ -14,19 +12,19 @@ phpbb.plupload = {  		'Close': '{LA_PLUPLOAD_CLOSE}',  		'Drag files here.': '{LA_PLUPLOAD_DRAG}',  		'Duplicate file error.': '{LA_PLUPLOAD_DUPLICATE_ERROR}', -		'Error: File too large:': '{LA_PLUPLOAD_ERR_FILE_TOO_LARGE}', -		'Error: Invalid file extension:': '{LA_PLUPLOAD_ERR_FILE_INVALID_EXT}',  		'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}', @@ -37,7 +35,6 @@ phpbb.plupload = {  		'Status': '{LA_PLUPLOAD_STATUS}',  		'Stop Upload': '{LA_PLUPLOAD_STOP_UPLOAD}',  		'Stop current upload': '{LA_PLUPLOAD_STOP_CURRENT_UPLOAD}', -		'Upload element accepts only %d file(s) at a time. Extra files were stripped.': '{LA_PLUPLOAD_ERR_UPLOAD_LIMIT}',  		"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}', @@ -51,14 +48,22 @@ phpbb.plupload = {  		unique_names: true,  		filters: [{FILTERS}],  		{S_RESIZE} -		headers: {'X-PHPBB-USING-PLUPLOAD': '1'}, +		headers: {'X-PHPBB-USING-PLUPLOAD': '1', 'X-Requested-With': 'XMLHttpRequest'},  		file_data_name: 'fileupload',  		multipart_params: {'add_file': '{LA_ADD_FILE}'}, -		img_path: '{T_ASSETS_PATH}/plupload/jquery.plupload.queue/img', -		element_hook: '#attach-panel .inner', -		form_hook: '#postform' -	} -}; +		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> -<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/plupload.js"></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 fa9dd19c09..b6f4d13804 100644 --- a/phpBB/styles/prosilver/template/posting_attach_body.html +++ b/phpBB/styles/prosilver/template/posting_attach_body.html @@ -1,9 +1,9 @@ -<div class="panel bg3" id="attach-panel"> +<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}{L_COLON}</label></dt>  		<dd> @@ -17,5 +17,69 @@  	</dl>  	</fieldset> +	<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"> +				<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"></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"><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 137970bbdf..3dad6606bb 100644 --- a/phpBB/styles/prosilver/template/posting_buttons.html +++ b/phpBB/styles/prosilver/template/posting_buttons.html @@ -34,7 +34,7 @@  	function change_palette()  	{ -		dE('colour_palette'); +		phpbb.toggleDisplay('colour_palette');  		e = document.getElementById('colour_palette');  		if (e.style.display == 'block') @@ -61,26 +61,26 @@  <!-- 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> @@ -91,9 +91,9 @@  			<!-- 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 --> diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index 5677b92fc3..e311b85cbe 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -1,73 +1,5 @@  <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}{L_COLON}</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}{L_COLON}</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><label>{L_TO}{L_COLON}<textarea id="username_list" name="username_list" class="inputbox" cols="50" rows="2" tabindex="1"></textarea></label></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}{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 .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}{L_COLON}</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 ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->  	<!-- IF S_SHOW_TOPIC_ICONS or S_SHOW_PM_ICONS -->  	<dl> @@ -140,7 +72,7 @@  	</div>  	<!-- EVENT posting_editor_message_after --> -</fieldset> +	</fieldset>  <!-- IF $EXTRA_POSTING_OPTIONS eq 1 --> @@ -149,34 +81,6 @@  	</div>  	<!-- ENDIF --> -	<!-- IF S_HAS_ATTACHMENTS --> -		<div class="panel bg2"> -			<div class="inner"> -			<h3>{L_POSTED_ATTACHMENTS}</h3> - -			<fieldset class="fields2"> - -			<!-- BEGIN attach_row --> -			<dl> - -				<dt><label for="comment_list_{attach_row.ASSOC_INDEX}">{L_FILE_COMMENT}{L_COLON}</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> - -			</div> -		</div> -	<!-- ENDIF --> -  	<!-- IF not S_SHOW_DRAFTS and not $SIG_EDIT eq 1 -->  	<div class="panel bg2">  		<div class="inner"> @@ -198,7 +102,15 @@  		<div id="tabs" class="sub-panels" data-show-panel="options-panel">  			<ul>  				<li id="options-panel-tab" class="activetab"><a href="#tabs" data-subpanel="options-panel"><span>{L_OPTIONS}</span></a></li> -				<!-- IF S_SHOW_ATTACH_BOX --><li id="attach-panel-tab"><a href="#tabs" data-subpanel="attach-panel"><span>{L_ADD_ATTACHMENT}</span></a></li><!-- ENDIF --> +				<!-- IF S_SHOW_ATTACH_BOX --> +					<li id="attach-panel-tab"> +						<a href="#tabs" data-subpanel="attach-panel"> +							<span> +								{L_ATTACHMENTS} <strong id="file-total-progress"><strong id="file-total-progress-bar"></strong></strong> +							</span> +						</a> +					</li>				 +				<!-- ENDIF -->  				<!-- IF S_SHOW_POLL_BOX || S_POLL_DELETE --><li id="poll-panel-tab"><a href="#tabs" data-subpanel="poll-panel"><span>{L_ADD_POLL}</span></a></li><!-- ENDIF -->  			</ul>  		</div> diff --git a/phpBB/styles/prosilver/template/posting_layout.html b/phpBB/styles/prosilver/template/posting_layout.html index c0bd0225de..4ef0954200 100644 --- a/phpBB/styles/prosilver/template/posting_layout.html +++ b/phpBB/styles/prosilver/template/posting_layout.html @@ -1,13 +1,13 @@  <!-- 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="rules<!-- IF U_FORUM_RULES --> rules-link<!-- ENDIF -->">  		<div class="inner">  		<!-- IF U_FORUM_RULES --> 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..dea50b5daf --- /dev/null +++ b/phpBB/styles/prosilver/template/posting_pm_header.html @@ -0,0 +1,81 @@ +<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" /> +				<span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></span> +				</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 5421cc2cbd..3bdadd06ca 100644 --- a/phpBB/styles/prosilver/template/posting_pm_layout.html +++ b/phpBB/styles/prosilver/template/posting_pm_layout.html @@ -15,7 +15,13 @@  <!-- 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"> diff --git a/phpBB/styles/prosilver/template/posting_review.html b/phpBB/styles/prosilver/template/posting_review.html index 2771c9829a..25b719420b 100644 --- a/phpBB/styles/prosilver/template/posting_review.html +++ b/phpBB/styles/prosilver/template/posting_review.html @@ -8,7 +8,7 @@  	<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="post <!-- IF post_review_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">  	<div class="inner">  <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/posting_smilies.html b/phpBB/styles/prosilver/template/posting_smilies.html index cb542c1a8c..c5371b9b6a 100644 --- a/phpBB/styles/prosilver/template/posting_smilies.html +++ b/phpBB/styles/prosilver/template/posting_smilies.html @@ -13,7 +13,7 @@  	<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 -->  	</div>  </div> 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 83d253384e..6a8846626e 100644 --- a/phpBB/styles/prosilver/template/quickreply_editor.html +++ b/phpBB/styles/prosilver/template/quickreply_editor.html @@ -1,15 +1,18 @@  <form method="post" action="{U_QR_ACTION}" id="qr_postform"> +<!-- EVENT quickreply_editor_panel_before -->  	<div class="panel">  		<div class="inner"> -				<h2>{L_QUICKREPLY}</h2> +				<h2 class="quickreply-title">{L_QUICKREPLY}</h2>  				<fieldset class="fields1">  					<dl style="clear: left;">  						<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} @@ -19,4 +22,5 @@  				</fieldset>  		</div>  	</div> +<!-- EVENT quickreply_editor_panel_after -->  </form> diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index 1a83484235..818b8ee642 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -1,12 +1,12 @@  <!-- INCLUDE overall_header.html --> -<h2><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE -->{SEARCH_MATCHES}<!-- ENDIF --><!-- IF SEARCH_WORDS -->{L_COLON} <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2> +<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="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}">{L_RETURN_TO}{L_COLON} {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="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}">{L_RETURN_TO_SEARCH_ADV}</a></p>  <!-- ENDIF --> @@ -61,16 +61,12 @@  			<li class="row<!-- IF searchresults.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- 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>  -								<a href="{searchresults.U_NEWEST_POST}" class="topictitle">{searchresults.TOPIC_TITLE}</a> -							<!-- ELSE --> -								<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a> -							<!-- ENDIF --> -							{searchresults.ATTACH_ICON_IMG} +							<!-- 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 /> @@ -88,7 +84,7 @@  								</ul>  							</div>  							<!-- ENDIF --> -							{L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} » <!-- IF not S_IS_BOT --><a href="{searchresults.U_VIEW_TOPIC}" title="{L_GOTO_FIRST_POST}">{searchresults.FIRST_POST_TIME}</a><!-- ELSE -->{searchresults.FIRST_POST_TIME}<!-- ENDIF --> » {L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a> +							{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> diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index 53c86689e0..f5e265ac16 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -26,7 +26,9 @@  </head> -<body id="phpbb" class="nojs {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" accesskey="t"></a> diff --git a/phpBB/styles/prosilver/template/ucp_agreement.html b/phpBB/styles/prosilver/template/ucp_agreement.html index 6c96be864a..b52acdd955 100644 --- a/phpBB/styles/prosilver/template/ucp_agreement.html +++ b/phpBB/styles/prosilver/template/ucp_agreement.html @@ -33,7 +33,7 @@  	<div class="panel">  		<div class="inner">  		<div class="content"> -			<h2>{SITENAME} - {L_REGISTRATION}</h2> +			<h2 class="sitename-title">{SITENAME} - {L_REGISTRATION}</h2>  			<p><!-- IF S_SHOW_COPPA -->{L_COPPA_BIRTHDAY}<!-- ELSE -->{L_TERMS_OF_USE}<!-- ENDIF --></p>  		</div>  		</div> @@ -60,7 +60,7 @@  	<div class="panel">  		<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> diff --git a/phpBB/styles/prosilver/template/ucp_footer.html b/phpBB/styles/prosilver/template/ucp_footer.html index ea546f7a82..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> diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html index eb431e9f3f..df80135acb 100644 --- a/phpBB/styles/prosilver/template/ucp_groups_manage.html +++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html @@ -56,7 +56,7 @@  		<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> +			<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> @@ -164,7 +164,7 @@  			<!-- IF .pagination -->   				<!-- INCLUDE pagination.html -->  			<!-- ELSE -->  -				{S_ON_PAGE} +				{PAGE_NUMBER}  			<!-- ENDIF -->  		</li>  	</ul> diff --git a/phpBB/styles/prosilver/template/ucp_header.html b/phpBB/styles/prosilver/template/ucp_header.html index c5d58b8eaa..102ea5a3a0 100644 --- a/phpBB/styles/prosilver/template/ucp_header.html +++ b/phpBB/styles/prosilver/template/ucp_header.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<h2>{L_UCP}</h2> +<h2 class="ucp-title">{L_UCP}</h2>  <div id="tabs">  	<ul> @@ -98,4 +98,4 @@  	</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_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html index 96becc42e7..b9e3c16524 100644 --- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html +++ b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html @@ -36,16 +36,11 @@  			<!-- ELSE -->  			<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}" class="icon-link"></a><!-- ENDIF -->  					<div class="list-inner"> -						<!-- IF topicrow.S_UNREAD_TOPIC --> -							<a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a>  -							<a href="{topicrow.U_NEWEST_POST}" class="topictitle">{topicrow.TOPIC_TITLE}</a> -						<!-- ELSE --> -							<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> -						<!-- ENDIF --> +						<!-- 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.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />  						<!-- IF .topicrow.pagination -->  						<div class="pagination">  							<ul> @@ -62,7 +57,7 @@  						<!-- ENDIF -->  						<div class="responsive-hide">  							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> -							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » <a href="{topicrow.U_VIEW_TOPIC}" title="{L_GOTO_FIRST_POST}">{topicrow.FIRST_POST_TIME}</a> +							{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 --> diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html index eca224f2d9..942d26edc6 100644 --- a/phpBB/styles/prosilver/template/ucp_main_front.html +++ b/phpBB/styles/prosilver/template/ucp_main_front.html @@ -15,14 +15,9 @@  		<li class="row<!-- IF topicrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">  			<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_UNREAD --> -							<a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a>  -							<a href="{topicrow.U_NEWEST_POST}" class="topictitle">{topicrow.TOPIC_TITLE}</a> -						<!-- ELSE --> -							<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> -						<!-- ENDIF --> -						<br /> +						<!-- 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> @@ -39,7 +34,7 @@  						<!-- ENDIF -->  						<div class="responsive-hide">  							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> -							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » <a href="{topicrow.U_VIEW_TOPIC}" title="{L_GOTO_FIRST_POST}">{topicrow.FIRST_POST_TIME}</a> +							{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 --> @@ -60,7 +55,7 @@  	<dl class="details">  		<dt>{L_JOINED}{L_COLON}</dt> <dd>{JOINED}</dd> -		<dt>{L_VISITED}{L_COLON}</dt> <dd>{LAST_VISIT_YOU}</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 --> diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html index 0187f3cc3f..74ab5226cb 100755..100644 --- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html +++ b/phpBB/styles/prosilver/template/ucp_main_subscribed.html @@ -24,6 +24,7 @@  		<li class="row<!-- IF forumrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">  			<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} @@ -35,7 +36,7 @@  					</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> @@ -71,16 +72,11 @@  		<li class="row<!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ELSEIF topicrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">  			<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}" class="icon-link"></a><!-- ENDIF -->  					<div class="list-inner"> -						<!-- IF topicrow.S_UNREAD_TOPIC --> -							<a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a>  -							<a href="{topicrow.U_NEWEST_POST}" class="topictitle">{topicrow.TOPIC_TITLE}</a> -						<!-- ELSE --> -							<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> -						<!-- ENDIF --> +						<!-- 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.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />  						<!-- IF .topicrow.pagination -->  						<div class="pagination">  							<ul> @@ -97,7 +93,7 @@  						<!-- ENDIF -->  						<div class="responsive-hide">  							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> -							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » <a href="{topicrow.U_VIEW_TOPIC}" title="{L_GOTO_FIRST_POST}">{topicrow.FIRST_POST_TIME}</a> +							{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 --> diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html index 6a711cfd30..b400a3c8b1 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications.html +++ b/phpBB/styles/prosilver/template/ucp_notifications.html @@ -11,11 +11,13 @@  		<!-- IF MODE == 'notification_options' -->  			<table class="table1">  				<thead> -					<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> +						<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 --> @@ -115,7 +117,7 @@  	<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').attr('checked', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="$('#ucp input:checkbox').attr('checked', false); return false;">{L_UNMARK_ALL}</a></div> +	<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 --> diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html index 7a80f72348..840eba4c83 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html +++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html @@ -15,10 +15,22 @@  		</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 dropdown-select-icon tools-icon"><span></span></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="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO} {CUR_FOLDER_NAME}</a><!-- ENDIF --> +			<!-- IF S_VIEW_MESSAGE --><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO_FOLDER}</a><!-- ENDIF -->  			<!-- IF FOLDER_CUR_MESSAGES neq 0 -->  				<!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES} • <!-- ENDIF -->  				<!-- IF .pagination --> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html index efe6663db0..b081c14498 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html @@ -59,6 +59,7 @@  			<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 {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 --> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index 208aeb9399..f14e4708e7 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -22,28 +22,35 @@  		<!-- 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><strong>{L_POSTS}{L_COLON}</strong> {AUTHOR_POSTS}</dd> -		<!-- IF AUTHOR_JOINED --><dd><strong>{L_JOINED}{L_COLON}</strong> {AUTHOR_JOINED}</dd><!-- ENDIF --> -		<!-- IF AUTHOR_FROM --><dd><strong>{L_LOCATION}{L_COLON}</strong> {AUTHOR_FROM}</dd><!-- ENDIF --> +		<dd class="profile-posts"><strong>{L_POSTS}{L_COLON}</strong> {AUTHOR_POSTS}</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 --> -			<dd><strong>{custom_fields.PROFILE_FIELD_NAME}{L_COLON}</strong> {custom_fields.PROFILE_FIELD_VALUE}</dd> +			<!-- 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 --> -		<!-- 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> +		<!-- IF U_PM or U_EMAIL or U_JABBER --> +		<dd class="profile-contact">  			<ul class="profile-icons"> +			<!-- EVENT ucp_pm_viewmessage_contact_fields_before -->  			<!-- 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}{L_COLON} {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 --> +			<!-- BEGIN custom_fields --> +				<!-- IF custom_fields.S_PROFILE_CONTACT --> +					<li class="{custom_fields.PROFILE_FIELD_IDENT}-icon"> +						<a href="<!-- IF custom_fields.PROFILE_FIELD_CONTACT -->{custom_fields.PROFILE_FIELD_CONTACT}<!-- ELSE -->{U_MESSAGE_AUTHOR}<!-- ENDIF -->"> +							<span>{custom_fields.PROFILE_FIELD_NAME}</span> +						</a> +					</li> +				<!-- ENDIF --> +			<!-- END custom_fields --> +			<!-- EVENT ucp_pm_viewmessage_contact_fields_after -->  			</ul>  		</dd>  		<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html index 4a8d3da08a..4d7346fda8 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html @@ -2,8 +2,6 @@  <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">  <head>  <meta charset="utf-8"> -<meta name="keywords" content="" /> -<meta name="description" content="" />  <meta name="robots" content="noindex" />  {META}  <title>{SITENAME} • {PAGE_TITLE}</title> diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html index 8111496dcb..d07aab1a89 100644 --- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html +++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html @@ -66,7 +66,7 @@  	<dl>  		<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> @@ -109,15 +109,15 @@  		// 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> diff --git a/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html index bf97434bac..6fec0b8aed 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html +++ b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html @@ -5,47 +5,41 @@  <h2>{L_TITLE}</h2>  <div class="panel">  	<div class="inner"> - -	<!-- IF .errors --> -	<p class="error"> -		<!-- BEGIN errors --> -			{errors} <br /> -		<!-- END errors --> -	</p> -	<!-- ENDIF --> - -	<p>{L_PROFILE_AUTOLOGIN_KEYS}</p><br /> -	<table class="table1"> -	<thead> -	<tr> -		<th>{L_MARK}</th> -		<th>{L_LOGIN_KEY}</th> -		<th>{L_IP}</th> -		<th>{L_LOGIN_TIME}</th> -	</tr> -	</thead> -	<tbody> -	<!-- BEGIN sessions --> -		<!-- IF sessions.S_ROW_COUNT is even --><tr class="bg1"><!-- ELSE --><tr class="bg2"><!-- ENDIF --> -			<td style="text-align: center"><input type="checkbox" name="keys[]" value="{sessions.KEY}" id="{sessions.KEY}"/></td> -			<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> -		</tr> -	<!-- BEGINELSE --> -		<tr><td colspan="4" class="bg1" style="text-align: center">{L_PROFILE_NO_AUTOLOGIN_KEYS}</td></tr> -	<!-- END sessions --> -	</tbody> -	</table> +		<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="submit-buttons"> -		{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_DELETE}" class="button1" /> +	<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_profile_info.html b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html index 3578c29e8e..c0bf681f47 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html +++ b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html @@ -10,52 +10,20 @@  	<fieldset>  	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF --> -	<dl> -		<dt><label for="icq">{L_UCP_ICQ}{L_COLON}</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}{L_COLON}</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}{L_COLON}</label></dt> -		<dd><input type="email" name="msn" id="msn" maxlength="255" value="{MSN}" class="inputbox" /></dd> -	</dl> -	<dl> -		<dt><label for="yim">{L_UCP_YIM}{L_COLON}</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}{L_COLON}</label></dt> -		<dd><input type="email" name="jabber" id="jabber" maxlength="255" value="{JABBER}" class="inputbox" /></dd> -	</dl> -	<dl> -		<dt><label for="website">{L_WEBSITE}{L_COLON}</label></dt> -		<dd><input type="url" name="website" id="website" maxlength="255" value="{WEBSITE}" class="inputbox" /></dd> -	</dl> -	<dl> -		<dt><label for="location">{L_LOCATION}{L_COLON}</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}{L_COLON}</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}{L_COLON}</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}{L_COLON}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>  			<dd> -				<label for="bday_day">{L_DAY}{L_COLON} <select name="bday_day" id="bday_day" style="width: 4em;">{S_BIRTHDAY_DAY_OPTIONS}</select></label> -				<label for="bday_month">{L_MONTH}{L_COLON} <select name="bday_month" id="bday_month" style="width: 4em;">{S_BIRTHDAY_MONTH_OPTIONS}</select></label> -				<label for="bday_year">{L_YEAR}{L_COLON} <select name="bday_year" id="bday_year" style="width: 6em;">{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 --> +		<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>  	<!-- BEGIN profile_fields -->  		<dl>  			<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> diff --git a/phpBB/styles/prosilver/template/ucp_zebra_friends.html b/phpBB/styles/prosilver/template/ucp_zebra_friends.html index 583b911284..fac0a18706 100644 --- a/phpBB/styles/prosilver/template/ucp_zebra_friends.html +++ b/phpBB/styles/prosilver/template/ucp_zebra_friends.html @@ -11,6 +11,7 @@  	<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}{L_COLON}</label><br /><span>{L_YOUR_FRIENDS_EXPLAIN}</span></dt>  		<dd> @@ -21,6 +22,7 @@  			<!-- ENDIF -->  		</dd>  	</dl> +	<!-- EVENT ucp_friend_list_after -->  	<dl>  		<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> diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index e4c0a40d3a..33d309bcb8 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html -->  <!-- IF U_MCP or U_ACP --><p class="responsive-center">[ <!-- IF U_ACP --><a href="{U_ACP}" title="{L_ACP}" data-responsive-text="{L_ACP_SHORT}">{L_ACP}</a><!-- IF U_MCP --> | <!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}" title="{L_MCP}" data-responsive-text="{L_MCP_SHORT}">{L_MCP}</a><!-- ENDIF --> ]</p><!-- ENDIF --> -<h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2> +<h2 class="forum-title"><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>  <!-- IF FORUM_DESC or MODERATORS or U_MCP -->  <div> @@ -11,7 +11,7 @@  <!-- ENDIF -->  <!-- IF S_FORUM_RULES --> -	<div class="rules"> +	<div class="rules<!-- IF U_FORUM_RULES --> rules-link<!-- ENDIF -->">  		<div class="inner">  		<!-- IF U_FORUM_RULES --> @@ -28,7 +28,7 @@  <!-- IF S_HAS_SUBFORUM -->  <!-- IF not S_IS_BOT and U_MARK_FORUMS -->  <ul class="linklist"> -	<li class="rightside mark-read"><a href="{U_MARK_FORUMS}" data-ajax="mark_forums_read" data-overlay="false">{L_MARK_SUBFORUMS_READ}</a></li> +	<li class="rightside mark-read"><a href="{U_MARK_FORUMS}" data-ajax="mark_forums_read">{L_MARK_SUBFORUMS_READ}</a></li>  </ul>  <!-- ENDIF -->  	<!-- INCLUDE forumlist_body.html --> @@ -56,7 +56,7 @@  	<!-- ENDIF -->  	<div class="pagination"> -		<!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}" accesskey="m" data-ajax="mark_topics_read" data-overlay="false">{L_MARK_TOPICS_READ}</a> • <!-- ENDIF --> +		<!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}" accesskey="m" data-ajax="mark_topics_read">{L_MARK_TOPICS_READ}</a> • <!-- ENDIF -->  		{TOTAL_TOPICS} •   		<!-- IF .pagination -->  			<!-- INCLUDE pagination.html --> @@ -141,14 +141,10 @@  		<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 {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>  -							<a href="{topicrow.U_NEWEST_POST}" class="topictitle">{topicrow.TOPIC_TITLE}</a> -						<!-- ELSE --> -							<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> -						<!-- ENDIF --> +						<!-- 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 /> @@ -168,7 +164,7 @@  						<!-- ENDIF -->  						<div class="responsive-hide">  							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> -							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » <!-- IF not S_IS_BOT --><a href="{topicrow.U_VIEW_TOPIC}" title="{L_GOTO_FIRST_POST}">{topicrow.FIRST_POST_TIME}</a><!-- ELSE -->{topicrow.FIRST_POST_TIME}<!-- 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>  						<!-- IF not S_IS_BOT --> @@ -231,7 +227,7 @@  		<!-- ENDIF -->  		<div class="pagination"> -			<!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}" data-ajax="mark_topics_read" data-overlay="false">{L_MARK_TOPICS_READ}</a> • <!-- 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 --> @@ -245,13 +241,17 @@  <!-- 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 --> diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html index 13f459b57f..553e322f92 100644 --- a/phpBB/styles/prosilver/template/viewonline_body.html +++ b/phpBB/styles/prosilver/template/viewonline_body.html @@ -1,6 +1,6 @@  <!-- 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"> diff --git a/phpBB/styles/prosilver/template/viewonline_whois.html b/phpBB/styles/prosilver/template/viewonline_whois.html index 8abd933efa..031f18afdc 100644 --- a/phpBB/styles/prosilver/template/viewonline_whois.html +++ b/phpBB/styles/prosilver/template/viewonline_whois.html @@ -1,6 +1,6 @@  <!-- INCLUDE simple_header.html --> -<h2>{L_WHOIS}</h2> +<h2 class="whois-title">{L_WHOIS}</h2>  <div class="panel">  	<div class="inner"> diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 338c67dd33..01a49d6888 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html -->  <!-- IF U_MCP or U_ACP --><p class="responsive-center">[ <!-- IF U_ACP --><a href="{U_ACP}" title="{L_ACP}" data-responsive-text="{L_ACP_SHORT}">{L_ACP}</a><!-- IF U_MCP --> | <!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}" title="{L_MCP}" data-responsive-text="{L_MCP_SHORT}">{L_MCP}</a><!-- ENDIF --> ]</p><!-- ENDIF --> -<h2><!-- EVENT viewtopic_topic_title_prepend --><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></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 --> @@ -11,7 +11,7 @@  <!-- ENDIF -->  <!-- IF S_FORUM_RULES --> -	<div class="rules"> +	<div class="rules<!-- IF U_FORUM_RULES --> rules-link<!-- ENDIF -->">  		<div class="inner">  		<!-- IF U_FORUM_RULES --> @@ -67,15 +67,15 @@  		<div class="inner">  		<div class="content"> -			<h2>{POLL_QUESTION}</h2> +			<h2 class="poll-title">{POLL_QUESTION}</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 --> data-poll-option-id="{poll_option.POLL_OPTION_ID}"> +				<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;" 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};">{poll_option.POLL_OPTION_RESULT}</div></dd> +					<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>  			<!-- END poll_option --> @@ -107,12 +107,12 @@  		{S_HIDDEN_FIELDS}  	</div> -  	</form>  	<hr />  <!-- ENDIF -->  <!-- BEGIN postrow --> +	<!-- EVENT viewtopic_body_postrow_post_before -->  	<!-- 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_POST_DELETED --> deleted<!-- ENDIF --><!-- IF postrow.S_ONLINE and not postrow.S_POST_HIDDEN --> online<!-- ENDIF -->">  		<div class="inner"> @@ -127,9 +127,8 @@  			<!-- 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><strong>{L_POSTS}{L_COLON}</strong> {postrow.POSTER_POSTS}</dd><!-- ENDIF --> -		<!-- IF postrow.POSTER_JOINED --><dd><strong>{L_JOINED}{L_COLON}</strong> {postrow.POSTER_JOINED}</dd><!-- ENDIF --> -		<!-- IF postrow.POSTER_FROM --><dd><strong>{L_LOCATION}{L_COLON}</strong> {postrow.POSTER_FROM}</dd><!-- ENDIF --> +		<!-- IF postrow.POSTER_POSTS != '' --><dd class="profile-posts"><strong>{L_POSTS}{L_COLON}</strong> {postrow.POSTER_POSTS}</dd><!-- ENDIF --> +		<!-- IF postrow.POSTER_JOINED --><dd class="profile-joined"><strong>{L_JOINED}{L_COLON}</strong> {postrow.POSTER_JOINED}</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. --> @@ -138,22 +137,28 @@  		<!-- EVENT viewtopic_body_postrow_custom_fields_before -->  		<!-- BEGIN custom_fields --> -			<dd><strong>{postrow.custom_fields.PROFILE_FIELD_NAME}{L_COLON}</strong> {postrow.custom_fields.PROFILE_FIELD_VALUE}</dd> +			<!-- 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 -->  		<!-- 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> +		<!-- IF postrow.U_PM or postrow.U_EMAIL or postrow.U_JABBER --> +			<dd class="profile-contact">  				<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}{L_COLON} {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 --> +					<!-- BEGIN custom_fields --> +						<!-- IF postrow.custom_fields.S_PROFILE_CONTACT --> +							<li class="{postrow.custom_fields.PROFILE_FIELD_IDENT}-icon"> +								<a href="<!-- IF postrow.custom_fields.PROFILE_FIELD_CONTACT -->{postrow.custom_fields.PROFILE_FIELD_CONTACT}<!-- ELSE -->{postrow.U_POST_AUTHOR}<!-- ENDIF -->"> +									<span>{postrow.custom_fields.PROFILE_FIELD_NAME}</span> +								</a> +							</li> +						<!-- ENDIF --> +					<!-- END custom_fields -->  				</ul>  			</dd>  		<!-- ENDIF --> @@ -247,6 +252,7 @@  				</dl>  			<!-- ENDIF --> +			<!-- EVENT viewtopic_body_postrow_post_notices_before -->  			<!-- IF postrow.S_DISPLAY_NOTICE --><div class="rules">{L_DOWNLOAD_NOTICE}</div><!-- ENDIF -->  			<!-- IF postrow.DELETED_MESSAGE or postrow.DELETE_REASON -->  				<div class="notice post_deleted_msg"> @@ -261,6 +267,7 @@  			<!-- 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 -->  			</div> @@ -272,6 +279,7 @@  	</div>  	<hr class="divider" /> +	<!-- EVENT viewtopic_body_postrow_post_after -->  <!-- END postrow -->  <!-- IF S_QUICK_REPLY -->  	<!-- INCLUDE quickreply_editor.html --> @@ -293,6 +301,7 @@  	<hr />  <!-- ENDIF --> +<!-- EVENT viewtopic_body_topic_actions_before -->  <div class="topic-actions">  	<div class="buttons">  	<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO --> @@ -334,8 +343,10 @@  <!-- 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 --> diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html index fd0b2dc3e6..6c4dcfadf1 100644 --- a/phpBB/styles/prosilver/template/viewtopic_print.html +++ b/phpBB/styles/prosilver/template/viewtopic_print.html @@ -2,8 +2,6 @@  <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">  <head>  <meta charset="utf-8"> -<meta name="keywords" content="" /> -<meta name="description" content="" />  <meta name="robots" content="noindex" />  {META}  <title>{SITENAME} • {PAGE_TITLE}</title> @@ -28,7 +26,7 @@  		<!-- BEGIN postrow -->  			<div class="post">  				<h3>{postrow.POST_SUBJECT}</h3> -				<div class="date">{postrow.MINI_POST_IMG}{L_POSTED}{L_COLON} <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> diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html index ec17185bae..89f34d1b3a 100644 --- a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html +++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html @@ -1,4 +1,4 @@ -<!-- IF not S_IS_BOT and (U_WATCH_TOPIC or U_BOOKMARK_TOPIC or U_BUMP_TOPIC or S_HAS_ATTACHMENTS or S_DISPLAY_TOPIC_TOOLS) --> +<!-- IF not S_IS_BOT and (U_WATCH_TOPIC or U_BOOKMARK_TOPIC or U_BUMP_TOPIC or S_HAS_ATTACHMENTS 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="dropdown-trigger dropdown-select dropdown-select-icon tools-icon"><span></span></span>  		<div class="dropdown hidden"> @@ -7,19 +7,21 @@  				<!-- 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}" 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}"> +						<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}" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}"> +						<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 -->  				<!-- IF S_HAS_ATTACHMENTS -->  					<li class="small-icon icon-download">  						<a class="dropdown-toggle-submenu" href="{U_DOWNLOAD_ALL_ATTACHMENTS}" title="{L_DOWNLOAD_ALL_ATTACHMENTS}">{L_DOWNLOAD_ALL_ATTACHMENTS}</a>  | 
