diff options
Diffstat (limited to 'phpBB/styles/prosilver')
54 files changed, 924 insertions, 702 deletions
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index 52293a8f2a..ea2b815e77 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -25,20 +25,12 @@ function popup(url, width, height, name) {  /**  * Jump to page  */ -function jumpto(item) { -	if (!item || !item.length) { -		item = $('a.pagination-trigger[data-lang-jump-page]'); -		if (!item.length) { -			return; -		} -	} +function pageJump(item) { -	var jump_page = item.attr('data-lang-jump-page'), -		on_page = item.attr('data-on-page'), +	var page = item.val(),  		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); +		start_name = item.attr('data-start-name');  	if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0) {  		if (base_url.indexOf('?') === -1) { @@ -104,27 +96,38 @@ jQuery(document).ready(function() {  			show_panel = this.getAttribute('data-show-panel');  		if (panels.length) { -			subPanels(show_panel); +			activateSubPanel(show_panel, panels);  			childNodes.click(function () { -				subPanels(this.getAttribute('data-subpanel')); +				activateSubPanel(this.getAttribute('data-subpanel'), panels);  				return false;  			});  		} +	}); +}); -		function subPanels(p) { -			var i; +/** +* Activate specific subPanel +*/ +function activateSubPanel(p, panels) { +	var i; -			if (typeof(p) === 'string') { -				show_panel = p; -			} +	if (typeof(p) === 'string') { +		show_panel = p; +	} +	$('input[name="show_panel"]').val(show_panel); -			for (i = 0; i < panels.length; i++) { -				jQuery('#' + panels[i]).css('display', panels[i] === show_panel ? 'block' : 'none'); -				jQuery('#' + panels[i] + '-tab').toggleClass('activetab', panels[i] === show_panel); -			} -		} -	}); -}); +	if (typeof(panels) === 'undefined') { +		panels = []; +		jQuery('.sub-panels a[data-subpanel]').each(function() { +			panels.push(this.getAttribute('data-subpanel')); +		}); +	} + +	for (i = 0; i < panels.length; i++) { +		jQuery('#' + panels[i]).css('display', panels[i] === show_panel ? 'block' : 'none'); +		jQuery('#' + panels[i] + '-tab').toggleClass('activetab', panels[i] === show_panel); +	} +}  /**  * Call print preview @@ -352,41 +355,26 @@ function parse_document(container)  	/**  	* Pagination  	*/ -	container.find('a.pagination-trigger').click(function() { -		jumpto($(this)); +	container.find('.pagination .page-jump-form :button').click(function() { +		$input = $(this).siblings('input.inputbox'); +		pageJump($input);  	}); -	/** -	* Dropdowns -	*/ -	container.find('.dropdown-container').each(function() { -		var $this = $(this), -			trigger = $this.find('.dropdown-trigger:first'), -			contents = $this.find('.dropdown'), -			options = { -				direction: 'auto', -				verticalDirection: 'auto' -			}, -			data; - -		if (!trigger.length) { -			data = $this.attr('data-dropdown-trigger'); -			trigger = data ? $this.children(data) : $this.children('a:first'); +	container.find('.pagination .page-jump-form input.inputbox').on('keypress', function(event) { +		if (event.which == 13 || event.keyCode == 13) { +			event.preventDefault(); +			pageJump($(this));  		} +	}); -		if (!contents.length) { -			data = $this.attr('data-dropdown-contents'); -			contents = data ? $this.children(data) : $this.children('div:first'); -		} - -		if (!trigger.length || !contents.length) return; - -		if ($this.hasClass('dropdown-up')) options.verticalDirection = 'up'; -		if ($this.hasClass('dropdown-down')) options.verticalDirection = 'down'; -		if ($this.hasClass('dropdown-left')) options.direction = 'left'; -		if ($this.hasClass('dropdown-right')) options.direction = 'right'; - -		phpbb.registerDropdown(trigger, contents, options); +	container.find('.pagination .dropdown-trigger').click(function() { +		$dropdown_container = $(this).parent(); +		// Wait a little bit to make sure the dropdown has activated +		setTimeout(function() {  +			if ($dropdown_container.hasClass('dropdown-visible')) { +				$dropdown_container.find('input.inputbox').focus(); +			} +		},100);  	});  	/** @@ -817,7 +805,7 @@ function parse_document(container)  			ul = $this.children(),  			tabs = ul.children().not('[data-skip-responsive]'),  			links = tabs.children('a'), -			item = ul.append('<li class="responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link"><span> </span></a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'), +			item = ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link"> </a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'),  			menu = item.find('.dropdown-contents'),  			maxHeight = 0,  			lastWidth = false, @@ -859,7 +847,7 @@ function parse_document(container)  			for (i = total - 1; i >= 0; i --) {  				tab = availableTabs.eq(i); -				menu.prepend(tab.clone(true)); +				menu.prepend(tab.clone(true).removeClass('tab'));  				tab.hide();  				if ($this.height() <= maxHeight) {  					menu.find('a').click(function() { check(true); }); diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html index 4a8c4c5de9..c9f81a4099 100644 --- a/phpBB/styles/prosilver/template/mcp_forum.html +++ b/phpBB/styles/prosilver/template/mcp_forum.html @@ -10,18 +10,16 @@  <div class="panel">  	<div class="inner"> -	<!-- IF .pagination or TOTAL_TOPICS --> -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS} • <!-- ENDIF --> -				<!-- IF .pagination -->  -					<!-- INCLUDE pagination.html --> -				<!-- ELSE -->  -					{PAGE_NUMBER} -				<!-- ENDIF --> -			</li> -		</ul> -	<!-- ENDIF --> +	<div class="action-bar top"> +		<div class="pagination"> +			{TOTAL_TOPICS} +			<!-- IF .pagination -->  +				<!-- INCLUDE pagination.html --> +			<!-- ELSE -->  +				 • {PAGE_NUMBER} +			<!-- ENDIF --> +		</div> +	</div>  	<!-- IF .topicrow -->  		<ul class="topiclist<!-- IF S_MERGE_SELECT --> missing-column<!-- ENDIF -->"> @@ -95,8 +93,6 @@  	<!-- ENDIF -->  	<fieldset class="display-options"> -		<!-- IF U_NEXT_PAGE --><a href="{U_NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF --> -		<!-- IF U_PREVIOUS_PAGE --><a href="{U_PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->  		<label>{L_DISPLAY_TOPICS}{L_COLON} {S_SELECT_SORT_DAYS}</label>  		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>  		<label>{S_SELECT_SORT_DIR}</label> @@ -105,18 +101,16 @@  	<hr /> -	<!-- IF .pagination or TOTAL_TOPICS --> -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS} • <!-- ENDIF --> -				<!-- IF .pagination -->  -					<!-- INCLUDE pagination.html --> -				<!-- ELSE -->  -					{PAGE_NUMBER} -				<!-- ENDIF --> -			</li> -		</ul> -	<!-- ENDIF --> +	<div class="action-bar bottom"> +		<div class="pagination"> +			{TOTAL_TOPICS} +			<!-- IF .pagination -->  +				<!-- INCLUDE pagination.html --> +			<!-- ELSE -->  +				 • {PAGE_NUMBER} +			<!-- ENDIF --> +		</div> +	</div>  	</div>  </div> diff --git a/phpBB/styles/prosilver/template/mcp_header.html b/phpBB/styles/prosilver/template/mcp_header.html index bdfa254741..69239887e3 100644 --- a/phpBB/styles/prosilver/template/mcp_header.html +++ b/phpBB/styles/prosilver/template/mcp_header.html @@ -11,7 +11,7 @@  <div id="tabs">  	<ul>  		<!-- BEGIN l_block1 --> -		<li<!-- IF l_block1.S_SELECTED --> class="activetab"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li> +		<li class="tab<!-- IF l_block1.S_SELECTED --> activetab<!-- ENDIF -->"><a href="{l_block1.U_TITLE}">{l_block1.L_TITLE}</a></li>  		<!-- END l_block1 -->  	</ul>  </div> @@ -22,7 +22,7 @@  	<div style="width: 100%;">  	<div id="cp-menu"> -		<div id="navigation"> +		<div id="navigation" role="navigation">  			<ul>  			<!-- BEGIN l_block1 -->  			<!-- IF l_block1.S_SELECTED --> diff --git a/phpBB/styles/prosilver/template/mcp_logs.html b/phpBB/styles/prosilver/template/mcp_logs.html index b930bbbcc6..eaa3838f17 100644 --- a/phpBB/styles/prosilver/template/mcp_logs.html +++ b/phpBB/styles/prosilver/template/mcp_logs.html @@ -7,19 +7,17 @@  <div class="panel">  	<div class="inner"> -	<ul class="linklist"> -		<li class="leftside"> -			{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /> -		</li> -		<li class="rightside pagination"> -			<!-- IF TOTAL -->{TOTAL} • <!-- ENDIF --> +	<div class="action-bar top"> +		{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /> +		<div class="pagination"> +			{TOTAL}  			<!-- IF .pagination -->   				<!-- INCLUDE pagination.html -->  			<!-- ELSE -->  -				{PAGE_NUMBER} +				 • {PAGE_NUMBER}  			<!-- ENDIF --> -		</li> -	</ul> +		</div> +	</div>  	<table class="table1">  	<thead> @@ -54,8 +52,6 @@  	<!-- IF .log -->  		<fieldset class="display-options"> -			<!-- IF U_NEXT_PAGE --><a href="{U_NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF --> -			<!-- IF U_PREVIOUS_PAGE --><a href="{U_PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->  			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>  			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>  			<label>{S_SELECT_SORT_DIR}</label> @@ -64,16 +60,17 @@  		<hr /> -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL -->{TOTAL} • <!-- ENDIF --> +		<div class="action-bar bottom"> +			<div class="pagination"> +				{TOTAL}  				<!-- IF .pagination -->   					<!-- INCLUDE pagination.html -->  				<!-- ELSE -->  -					{PAGE_NUMBER} +					 • {PAGE_NUMBER}  				<!-- ENDIF --> -			</li> -		</ul> +			</div> +		</div> +  		{S_FORM_TOKEN}  		</div>  	</div> diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html index 9b6c9b2667..ec317b141a 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_user.html +++ b/phpBB/styles/prosilver/template/mcp_notes_user.html @@ -50,19 +50,17 @@  <div class="panel">  	<div class="inner"> -	<ul class="linklist"> -		<li class="leftside"> -			{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /> -		</li> -		<li class="rightside pagination"> -			<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS} • <!-- ENDIF --> +	<div class="action-bar top"> +		{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /> +		<div class="pagination"> +			{TOTAL_REPORTS}  			<!-- IF .pagination -->   				<!-- INCLUDE pagination.html -->  			<!-- ELSE -->  -				{PAGE_NUMBER} +				 • {PAGE_NUMBER}  			<!-- ENDIF --> -		</li> -	</ul> +		</div> +	</div>  	<table class="table1">  	<thead> @@ -95,8 +93,6 @@  	<hr />  	<fieldset class="display-options"> -		<!-- IF U_NEXT_PAGE --><a href="{U_NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF --> -		<!-- IF U_PREVIOUS_PAGE --><a href="{U_PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->  		<label>{L_DISPLAY_LOG}{L_COLON} {S_SELECT_SORT_DAYS}</label>  		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>  		<input type="submit" name="sort" value="{L_GO}" class="button2" /> @@ -104,16 +100,16 @@  	<hr /> -	<ul class="linklist"> -		<li class="rightside pagination"> -			<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS} • <!-- ENDIF --> +	<div class="action-bar bottom"> +		<div class="pagination"> +			{TOTAL_REPORTS}  			<!-- IF .pagination -->   				<!-- INCLUDE pagination.html -->  			<!-- ELSE -->  -				{PAGE_NUMBER} +				 • {PAGE_NUMBER}  			<!-- ENDIF --> -		</li> -	</ul> +		</div> +	</div>  	</div>  </div> diff --git a/phpBB/styles/prosilver/template/mcp_queue.html b/phpBB/styles/prosilver/template/mcp_queue.html index 461d5982db..864b231142 100644 --- a/phpBB/styles/prosilver/template/mcp_queue.html +++ b/phpBB/styles/prosilver/template/mcp_queue.html @@ -16,16 +16,17 @@  	<p>{L_EXPLAIN}</p>  	<!-- IF .postrow --> -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL --> {TOTAL} • <!-- ENDIF --> +		<div class="action-bar top"> +			<div class="pagination"> +				{TOTAL}  				<!-- IF .pagination -->   					<!-- INCLUDE pagination.html -->  				<!-- ELSE -->  -					{PAGE_NUMBER} +					 • {PAGE_NUMBER}  				<!-- ENDIF --> -			</li> -		</ul> +			</div> +		</div> +  		<ul class="topiclist missing-column">  			<li class="header">  				<dl> @@ -73,8 +74,6 @@  		</ul>  		<fieldset class="display-options"> -			<!-- IF U_NEXT_PAGE --><a href="{U_NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF --> -			<!-- IF U_PREVIOUS_PAGE --><a href="{U_PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->  			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>  			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>  			<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />  <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF --> @@ -83,16 +82,17 @@  		<hr /> -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL -->{TOTAL} • <!-- ENDIF --> +		<div class="action-bar bottom"> +			<div class="pagination"> +				{TOTAL}  				<!-- IF .pagination -->   					<!-- INCLUDE pagination.html -->  				<!-- ELSE -->  -					{PAGE_NUMBER} +					 • {PAGE_NUMBER}  				<!-- ENDIF --> -			</li> -		</ul> +			</div> +		</div> +  	<!-- ELSE -->  		<p class="notopics"><strong>  			<!-- IF S_RESTORE --> diff --git a/phpBB/styles/prosilver/template/mcp_reports.html b/phpBB/styles/prosilver/template/mcp_reports.html index ffa82d5e0e..24c0479f63 100644 --- a/phpBB/styles/prosilver/template/mcp_reports.html +++ b/phpBB/styles/prosilver/template/mcp_reports.html @@ -18,16 +18,17 @@  	<p>{L_EXPLAIN}</p>  	<!-- IF .postrow --> -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL -->{TOTAL_REPORTS} • <!-- ENDIF --> +		<div class="action-bar top"> +			<div class="pagination"> +				{TOTAL_REPORTS}  				<!-- IF .pagination -->   					<!-- INCLUDE pagination.html -->  				<!-- ELSE -->  -					{PAGE_NUMBER} +					 • {PAGE_NUMBER}  				<!-- ENDIF --> -			</li> -		</ul> +			</div> +		</div> +  		<ul class="topiclist missing-column">  			<li class="header">  				<dl> @@ -79,24 +80,24 @@  		</ul>  		<fieldset class="display-options"> -			<!-- IF U_NEXT_PAGE --><a href="{U_NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF --> -			<!-- IF U_PREVIOUS_PAGE --><a href="{U_PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->  			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>  			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>  			<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />  <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->  			<input type="submit" name="sort" value="{L_GO}" class="button2" />  		</fieldset> +  		<hr /> -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL -->{TOTAL_REPORTS} • <!-- ENDIF --> + +		<div class="action-bar bottom"> +			<div class="pagination"> +				{TOTAL_REPORTS}  				<!-- IF .pagination -->   					<!-- INCLUDE pagination.html -->  				<!-- ELSE -->  -					{PAGE_NUMBER} +					 • {PAGE_NUMBER}  				<!-- ENDIF --> -			</li> -		</ul> +			</div> +		</div>  	<!-- ELSE -->  		<p><strong>{L_NO_REPORTS}</strong></p> diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index 19ee123eba..6bf6af1b78 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -11,16 +11,16 @@  	<!-- DEFINE $SHOW_PANEL = 'display-panel' -->  <!-- ENDIF --> -<div id="minitabs" class="sub-panels" data-show-panel="{$SHOW_PANEL}"> +<div id="minitabs" class="sub-panels" data-show-panel="{$SHOW_PANEL}" role="tablist">  	<ul> -		<li id="display-panel-tab"<!-- IF not S_MERGE_VIEW --> class="activetab"<!-- ENDIF -->> -			<a href="#minitabs" data-subpanel="display-panel"><span>{L_DISPLAY_OPTIONS}</span></a> +		<li id="display-panel-tab" class="tab<!-- IF not S_MERGE_VIEW --> activetab<!-- ENDIF -->"> +			<a href="#minitabs" data-subpanel="display-panel" role="tab" aria-controls="display-panel">{L_DISPLAY_OPTIONS}</a>  		</li> -		<li id="split-panel-tab"> -			<a href="#minitabs" data-subpanel="split-panel"><span>{L_SPLIT_TOPIC}</span></a> +		<li id="split-panel-tab" class="tab"> +			<a href="#minitabs" data-subpanel="split-panel" role="tab" aria-controls="split-panel">{L_SPLIT_TOPIC}</a>  		</li> -		<li id="merge-panel-tab"<!-- IF S_MERGE_VIEW --> class="activetab"<!-- ENDIF -->> -			<a href="#minitabs" data-subpanel="merge-panel"><span>{L_MERGE_POSTS}</span></a> +		<li id="merge-panel-tab" class="tab<!-- IF S_MERGE_VIEW --> activetab<!-- ENDIF -->"> +			<a href="#minitabs" data-subpanel="merge-panel" role="tab" aria-controls="merge-panel">{L_MERGE_POSTS}</a>  		</li>  	</ul>  </div> @@ -31,7 +31,7 @@  <div class="panel">  	<div class="inner"> -	<fieldset id="display-panel" class="fields2"> +	<fieldset id="display-panel" class="fields2" role="tabpanel">  	<dl>  		<dt><label for="posts_per_page">{L_POSTS_PER_PAGE}{L_COLON}</label><br /><span>{L_POSTS_PER_PAGE_EXPLAIN}</span></dt>  		<dd><input class="inputbox autowidth" type="number" min="1" name="posts_per_page" id="posts_per_page" size="6" value="{POSTS_PER_PAGE}" /></dd> @@ -43,7 +43,7 @@  	</fieldset>  <!-- IF S_CAN_SPLIT --> -	<fieldset id="split-panel" class="fields2"> +	<fieldset id="split-panel" class="fields2" role="tabpanel">  		<p>{L_SPLIT_TOPIC_EXPLAIN}</p>  	<!-- IF S_SHOW_TOPIC_ICONS --> @@ -66,7 +66,7 @@  <!-- ENDIF -->  <!-- IF S_CAN_MERGE --> -	<fieldset id="merge-panel" class="fields2"> +	<fieldset id="merge-panel" class="fields2" role="tabpanel">  		<p>{L_MERGE_TOPIC_EXPLAIN}</p>  	<dl>  		<dt><label for="to_topic_id">{L_MERGE_TOPIC_ID}{L_COLON}</label></dt> @@ -150,18 +150,16 @@  	<hr /> -	<!-- IF .pagination or TOTAL_POSTS --> -	<ul class="linklist"> -		<li class="rightside pagination"> -			<!-- IF TOTAL_POSTS --> {TOTAL_POSTS} • <!-- ENDIF --> -			<!-- IF .pagination --> +	<div class="action-bar bottom"> +		<div class="pagination"> +			{TOTAL_POSTS} +			<!-- IF .pagination -->   				<!-- INCLUDE pagination.html --> -			<!-- ELSE --> -				{PAGE_NUMBER} +			<!-- ELSE -->  +				 • {PAGE_NUMBER}  			<!-- ENDIF --> -		</li> -	</ul> -	<!-- ENDIF --> +		</div> +	</div>  	</div>  </div> diff --git a/phpBB/styles/prosilver/template/mcp_warn_list.html b/phpBB/styles/prosilver/template/mcp_warn_list.html index 731c945fe6..d0e80a1479 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_list.html +++ b/phpBB/styles/prosilver/template/mcp_warn_list.html @@ -10,17 +10,17 @@  	<p>{L_WARNED_USERS_EXPLAIN}</p>  	<!-- IF .user --> -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL_USERS -->{TOTAL_USERS} •  <!-- ENDIF --> +		<div class="action-bar top"> +			<div class="pagination"> +				{TOTAL_USERS}  				<!-- IF .pagination -->   					<!-- INCLUDE pagination.html -->  				<!-- ELSE -->  -					{PAGE_NUMBER} +					 • {PAGE_NUMBER}  				<!-- ENDIF --> -			</li> -		</ul> -		 +			</div> +		</div> +  		<table class="table1">  		<thead>  			<tr> @@ -48,18 +48,20 @@  			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>  			<input type="submit" name="sort" value="{L_GO}" class="button2" />  		</fieldset> +  		<hr /> -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL_USERS -->{TOTAL_USERS} •  <!-- ENDIF --> +		<div class="action-bar bottom"> +			<div class="pagination"> +				{TOTAL_USERS}  				<!-- IF .pagination -->   					<!-- INCLUDE pagination.html -->  				<!-- ELSE -->  -					{PAGE_NUMBER} +					 • {PAGE_NUMBER}  				<!-- ENDIF --> -			</li> -		</ul> +			</div> +		</div> +  	<!-- ELSE -->  		<p><strong>{L_NO_WARNINGS}</strong></p>  	<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html index 7623fbe38b..512df7b0a7 100644 --- a/phpBB/styles/prosilver/template/memberlist_body.html +++ b/phpBB/styles/prosilver/template/memberlist_body.html @@ -13,7 +13,6 @@  <!-- ENDIF -->  	<!-- IF S_SHOW_GROUP --> -  		<h2 class="group-title"<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR};"<!-- ENDIF -->>{GROUP_NAME}</h2>  		<p>{GROUP_DESC} {GROUP_TYPE}</p>  		<p> @@ -21,36 +20,30 @@  			<!-- IF RANK_IMG -->{RANK_IMG}<!-- ENDIF -->  			<!-- IF GROUP_RANK -->{GROUP_RANK}<!-- ENDIF -->  		</p> -  	<!-- ELSE -->  		<h2 class="solo">{PAGE_TITLE}<!-- IF SEARCH_WORDS -->{L_COLON} <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2> -		<div class="panel"> -			<div class="inner"> - -			<ul class="linklist wrap"> -				<li> +		<div class="action-bar top"> +			<div class="member-search panel">  				<!-- IF U_FIND_MEMBER and not S_SEARCH_USER --><a href="{U_FIND_MEMBER}" id="member_search" data-alt-text="{LA_HIDE_MEMBER_SEARCH}">{L_FIND_USERNAME}</a> • <!-- ELSEIF S_SEARCH_USER and U_HIDE_FIND_MEMBER and not S_IN_SEARCH_POPUP --><a href="{U_HIDE_FIND_MEMBER}" id="member_search" data-alt-text="{LA_FIND_USERNAME}">{L_HIDE_MEMBER_SEARCH}</a> • <!-- ENDIF --> -				<strong style="font-size: 0.95em;"> +				<strong>  				<!-- BEGIN first_char -->  					<a href="{first_char.U_SORT}">{first_char.DESC}</a>   				<!-- END first_char -->  				</strong> -				</li> -				<li class="rightside pagination"> -					{TOTAL_USERS} -					<!-- IF .pagination --> -						• -						<!-- INCLUDE pagination.html --> -					<!-- ELSE --> -						{PAGE_NUMBER} -					<!-- ENDIF --> -				</li> -			</ul> - +			</div> +		 +			<div class="pagination"> +				{TOTAL_USERS} +				<!-- IF .pagination -->  +					<!-- INCLUDE pagination.html --> +				<!-- ELSE -->  +					 • {PAGE_NUMBER} +				<!-- ENDIF -->  			</div>  		</div>  	<!-- ENDIF --> +  	<!-- IF S_LEADERS_SET or not S_SHOW_GROUP or not .memberrow -->  	<div class="forumbg forumbg-table">  		<div class="inner"> @@ -140,8 +133,6 @@  <!-- IF S_IN_SEARCH_POPUP and not S_SEARCH_USER -->  <fieldset class="display-options"> -	<!-- IF U_PREVIOUS_PAGE --><a href="{U_PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -	<!-- IF U_NEXT_PAGE --><a href="{U_NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->  	<label for="sk">{L_SELECT_SORT_METHOD}{L_COLON} <select name="sk" id="sk">{S_MODE_SELECT}</select></label>  	<label for="sd">{L_ORDER} <select name="sd" id="sd">{S_ORDER_SELECT}</select></label>  	<input type="submit" name="sort" value="{L_SUBMIT}" class="button2" /> @@ -150,18 +141,16 @@  </form> -<hr /> - -<ul class="linklist"> -	<li class="rightside pagination">{TOTAL_USERS} -		<!-- IF .pagination --> -			• +<div class="action-bar bottom"> +	<div class="pagination"> +		{TOTAL_USERS} +		<!-- IF .pagination -->   			<!-- INCLUDE pagination.html --> -		<!-- ELSE --> -			{PAGE_NUMBER} +		<!-- ELSE -->  +			 • {PAGE_NUMBER}  		<!-- ENDIF --> -	</li> -</ul> +	</div> +</div>  <!-- IF S_IN_SEARCH_POPUP -->  	<!-- INCLUDE simple_footer.html --> diff --git a/phpBB/styles/prosilver/template/memberlist_email.html b/phpBB/styles/prosilver/template/memberlist_email.html index 78d0eba5a8..865f0b883c 100644 --- a/phpBB/styles/prosilver/template/memberlist_email.html +++ b/phpBB/styles/prosilver/template/memberlist_email.html @@ -1,24 +1,62 @@  <!-- INCLUDE overall_header.html --> +<!-- IF S_CONTACT_ADMIN--> +<h2 class="titlespace">{L_CONTACT_ADMIN}</h2> +<!-- ELSEIF S_SEND_USER -->  <h2 class="titlespace">{L_SEND_EMAIL_USER}</h2> +<!-- ELSE --> +<h2 class="titlespace">{L_EMAIL_TOPIC}</h2> +<!-- ENDIF -->  <form method="post" action="{S_POST_ACTION}" id="post"> -<div class="panel"> -	<div class="inner"> +	<!-- IF CONTACT_INFO --> +	<div class="panel"> +		<div class="inner"> +			<div class="postbody"> +				<div class="content"> +					{CONTACT_INFO} +				</div> +			</div> +		</div> +	</div> +		<br class="clear" /> +	<!-- ENDIF --> +	<div class="panel"> +		<div class="inner">  	<div class="content"> +  		<!-- IF ERROR_MESSAGE --><p class="error">{ERROR_MESSAGE}</p><!-- ENDIF -->  		<fieldset class="fields2">  		<!-- IF S_SEND_USER -->  			<dl>  				<dt><label>{L_RECIPIENT}{L_COLON}</label></dt> -				<dd><strong>{USERNAME}</strong></dd> +				<dd><strong>{USERNAME_FULL}</strong></dd>  			</dl>  			<dl>  				<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>  				<dd><input class="inputbox autowidth" type="text" name="subject" id="subject" size="50" tabindex="1" value="{SUBJECT}" /></dd>  			</dl> +		<!-- ELSEIF S_CONTACT_ADMIN--> +			<dl> +				<dt><label>{L_RECIPIENT}:</label></dt> +				<dd><strong>{L_ADMINISTRATOR}</strong></dd> +			</dl> +			<!-- IF not S_IS_REGISTERED --> +			<dl> +				<dt><label for="email">{L_SENDER_EMAIL_ADDRESS}:</label></dt> +				<dd><input class="inputbox autowidth" type="text" name="email" id="email" size="50" maxlength="100" tabindex="1" value="{EMAIL}" /></dd> +			</dl> +			<dl> +				<dt><label for="name">{L_SENDER_NAME}:</label></dt> +				<dd><input class="inputbox autowidth" type="text" name="name" id="name" size="50" tabindex="2" value="{NAME}" /></dd> +			</dl> +			<!-- ENDIF --> +			<dl> +				<dt><label for="subject">{L_SUBJECT}:</label></dt> +				<dd><input class="inputbox autowidth" type="text" name="subject" id="subject" size="50" tabindex="3" value="{SUBJECT}" /></dd> +			</dl>  		<!-- ELSE -->  			<dl>  				<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label></dt> diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html index f4439b6934..4c14baf2b6 100644 --- a/phpBB/styles/prosilver/template/memberlist_search.html +++ b/phpBB/styles/prosilver/template/memberlist_search.html @@ -10,9 +10,9 @@  	<dl style="overflow: visible;">  		<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>  		<dd> +			<!-- IF U_LIVE_SEARCH --><div class="dropdown-container dropdown-{S_CONTENT_FLOW_END}"><!-- ENDIF -->  			<input type="text" name="username" id="username" value="{USERNAME}" class="inputbox"<!-- IF U_LIVE_SEARCH --> autocomplete="off" data-filter="phpbb.search.filter" data-ajax="member_search" data-min-length="3" data-url="{U_LIVE_SEARCH}" data-results="#user-search" data-overlay="false"<!-- ENDIF --> />  			<!-- IF U_LIVE_SEARCH --> -			<div class="dropdown-container">  				<div class="dropdown live-search hidden" id="user-search">  					<div class="pointer"><div class="pointer-inner"></div></div>  					<ul class="dropdown-contents search-results"> diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html index 13e50dae19..e2259e8712 100644 --- a/phpBB/styles/prosilver/template/navbar_footer.html +++ b/phpBB/styles/prosilver/template/navbar_footer.html @@ -3,8 +3,8 @@  	<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> +			<!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}" data-navbar-reference="home">{L_SITE_HOME}</a></span><!-- ENDIF --> +			<span class="crumb"><a href="{U_INDEX}" data-navbar-reference="index">{L_INDEX}</a></span>  			<!-- EVENT overall_footer_breadcrumb_append -->  		</li>  		<!-- IF not S_IS_BOT --> @@ -16,6 +16,7 @@  		<!-- 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 --> +		<!-- IF U_CONTACT_US --><li class="rightside"><a href="{U_CONTACT_US}">{L_CONTACT_US}</a></li><!-- ENDIF -->  		<!-- EVENT overall_footer_teamlink_after -->  	</ul> diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html index 804fa5b2aa..67a3b553fd 100644 --- a/phpBB/styles/prosilver/template/navbar_header.html +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -4,21 +4,38 @@  	<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 --><!-- EVENT overall_header_navlink_prepend --><span class="crumb"><a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a></span><!-- EVENT overall_header_navlink_append --><!-- END navlinks --> +			<!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}"{$MICRODATA} data-navbar-reference="home">{L_SITE_HOME}</a></span><!-- ENDIF --> +			<span class="crumb"><a href="{U_INDEX}" accesskey="h"{$MICRODATA} data-navbar-reference="index">{L_INDEX}</a></span> +			<!-- BEGIN navlinks --> +				<!-- EVENT overall_header_navlink_prepend --> +				<span class="crumb"><a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->>{navlinks.FORUM_NAME}</a></span> +				<!-- EVENT overall_header_navlink_append --> +			<!-- END navlinks -->  			<!-- EVENT overall_header_breadcrumb_append -->  		</li> -		<!-- 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 -->{CURRENT_USERNAME_FULL}</li><!-- ENDIF --> +		<!-- IF S_REGISTERED_USER --> +			<li id="username_logged_in" class="rightside"> +				<!-- EVENT navbar_header_username_prepend --> +				<!-- IF CURRENT_USER_AVATAR --> +					<a href="{U_USER_PROFILE}" class="header-avatar">{CURRENT_USER_AVATAR}</a> +				<!-- ENDIF --> +				{CURRENT_USERNAME_FULL} +				<!-- EVENT navbar_header_username_append --> +			</li> +		<!-- ELSE --> +			<li id="logged_out" class="rightside"> +				<!-- EVENT navbar_header_logged_out_content --> +			</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> +		<li class="small-icon icon-notification dropdown-container dropdown-{S_CONTENT_FLOW_END}" data-skip-responsive="true"> +			<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" class="dropdown-trigger"><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></a>  			<!-- INCLUDE notification_dropdown.html -->  		</li>  		<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/notification_dropdown.html b/phpBB/styles/prosilver/template/notification_dropdown.html index db4d5bade7..13d90a9d38 100644 --- a/phpBB/styles/prosilver/template/notification_dropdown.html +++ b/phpBB/styles/prosilver/template/notification_dropdown.html @@ -18,14 +18,17 @@  				</li>  			<!-- ENDIF -->  			<!-- BEGIN notifications --> -				<li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->"> +				<li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF --><!-- IF notifications.STYLING --> {notifications.STYLING}<!-- ENDIF --><!-- IF not notifications.URL --> no-url<!-- ENDIF -->">  					<!-- IF notifications.URL --> -						<a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}" data-real-url="{notifications.URL}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"> +						<a class="notification-block" href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}" data-real-url="{notifications.URL}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->">  					<!-- ENDIF -->  						<!-- IF notifications.AVATAR -->{notifications.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF -->  						<div class="notification_text"> -							<p>{notifications.FORMATTED_TITLE}</p> -							<p>» {notifications.TIME}</p> +							<p class="notification-title">{notifications.FORMATTED_TITLE}</p> +							<!-- IF notifications.REFERENCE --><p class="notification-reference">{notifications.REFERENCE}</p><!-- ENDIF --> +							<!-- IF notifications.FORUM --><p class="notification-forum">{notifications.FORUM}</p><!-- ENDIF --> +							<!-- IF notifications.REASON --><p class="notification-reason">{notifications.REASON}</p><!-- ENDIF --> +							<p class="notification-time">{notifications.TIME}</p>  						</div>  					<!-- IF notifications.URL --></a><!-- ENDIF -->  					<!-- IF notifications.UNREAD --> diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index 28ed215662..e9c95aa799 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -33,7 +33,7 @@  </div>  <div> -	<a id="bottom" accesskey="z"></a> +	<a id="bottom" class="anchor" accesskey="z"></a>  	<!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF -->  </div> diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index d18fff6bb0..df09fc6a30 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -57,13 +57,13 @@  <!-- EVENT overall_header_body_before -->  <div id="wrap"> -	<a id="top" accesskey="t"></a> +	<a id="top" class="anchor" accesskey="t"></a>  	<div id="page-header">  		<div class="headerbar">  			<div class="inner">  			<div id="site-description"> -				<a href="<!-- IF U_SITE_HOME -->{U_SITE_HOME}<!-- ELSE -->{U_INDEX}<!-- ENDIF -->" title="<!-- IF U_SITE_HOME -->{L_SITE_HOME}<!-- ELSE -->{L_INDEX}<!-- ENDIF -->" id="logo">{SITE_LOGO_IMG}</a> +				<a id="logo" class="logo" href="<!-- IF U_SITE_HOME -->{U_SITE_HOME}<!-- ELSE -->{U_INDEX}<!-- ENDIF -->" title="<!-- IF U_SITE_HOME -->{L_SITE_HOME}<!-- ELSE -->{L_INDEX}<!-- ENDIF -->">{SITE_LOGO_IMG}</a>  				<h1>{SITENAME}</h1>  				<p>{SITE_DESCRIPTION}</p>  				<p class="skiplink"><a href="#start_here">{L_SKIP}</a></p> @@ -89,7 +89,7 @@  	<!-- EVENT overall_header_page_body_before --> -	<a id="start_here"></a> +	<a id="start_here" class="anchor"></a>  	<div id="page-body">  		<!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN and (U_MCP or U_ACP) -->  		<div id="information" class="rules"> diff --git a/phpBB/styles/prosilver/template/pagination.html b/phpBB/styles/prosilver/template/pagination.html index e27a90900a..cde183291d 100644 --- a/phpBB/styles/prosilver/template/pagination.html +++ b/phpBB/styles/prosilver/template/pagination.html @@ -1,18 +1,30 @@ -					<!-- 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 --> -						<!-- ELSEIF pagination.S_IS_CURRENT --> -						<li class="active"><span>{pagination.PAGE_NUMBER}</span></li> -						<!-- ELSEIF pagination.S_IS_ELLIPSIS --> -						<li class="ellipsis"><span>{L_ELLIPSIS}</span></li> -						<!-- ELSEIF pagination.S_IS_NEXT --> -						<!-- ELSE --> -						<li><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a></li> -						<!-- ENDIF --> -					<!-- END pagination --> -					</ul> +<ul> +<!-- IF BASE_URL and TOTAL_PAGES > 6 --> +	<li class="dropdown-container dropdown-button-control dropdown-page-jump page-jump"> +		<a href="#" class="dropdown-trigger" title="{L_JUMP_TO_PAGE_CLICK}" role="button">{PAGE_NUMBER}</a> +		<div class="dropdown hidden"> +			<div class="pointer"><div class="pointer-inner"></div></div> +			<ul class="dropdown-contents"> +				<li>{L_JUMP_TO_PAGE}{L_COLON}</li> +				<li class="page-jump-form"> +					<input type="text" name="page-number"  maxlength="6" title="{L_SEARCH_KEYWORDS}" class="inputbox tiny" value="" data-per-page="{PER_PAGE}" data-base-url="{BASE_URL|e('html_attr')}" data-start-name="{START_NAME}" /> +					<input class="button2" value="{L_GO}" type="button" /> +				</li> +			</ul> +		</div> +	</li> +<!-- ENDIF --> +<!-- BEGIN pagination --> +	<!-- IF pagination.S_IS_PREV --> +	<li class="previous"><a href="{pagination.PAGE_URL}" rel="prev" role="button">{L_PREVIOUS}</a></li> +	<!-- ELSEIF pagination.S_IS_CURRENT --> +	<li class="active"><span>{pagination.PAGE_NUMBER}</span></li> +	<!-- ELSEIF pagination.S_IS_ELLIPSIS --> +	<li class="ellipsis" role="separator"><span>{L_ELLIPSIS}</span></li> +	<!-- ELSEIF pagination.S_IS_NEXT --> +	<li class="next"><a href="{pagination.PAGE_URL}" rel="next" role="button">{L_NEXT}</a></li> +	<!-- ELSE --> +	<li><a href="{pagination.PAGE_URL}" role="button">{pagination.PAGE_NUMBER}</a></li> +	<!-- ENDIF --> +<!-- END pagination --> +</ul> diff --git a/phpBB/styles/prosilver/template/posting_attach_body.html b/phpBB/styles/prosilver/template/posting_attach_body.html index 4ad66656b2..81b2c2bf41 100644 --- a/phpBB/styles/prosilver/template/posting_attach_body.html +++ b/phpBB/styles/prosilver/template/posting_attach_body.html @@ -23,7 +23,7 @@  	<div class="panel<!-- IF not .attach_row --> hidden<!-- ENDIF -->" id="file-list-container">  		<div class="inner"> -			<table class="table1 zebra-list"> +			<table class="table1 zebra-list fixed-width-table">  				<thead>  					<tr>  						<th class="attach-name">{L_PLUPLOAD_FILENAME}</th> diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index e311b85cbe..25e3be3bcb 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -99,19 +99,21 @@  	<!-- ENDIF -->  	<!-- IF not S_PRIVMSGS and not S_SHOW_DRAFTS and not $SIG_EDIT eq 1 --> -		<div id="tabs" class="sub-panels" data-show-panel="options-panel"> +		<div id="tabs" class="sub-panels" data-show-panel="<!-- IF SHOW_PANEL -->{SHOW_PANEL}<!-- ELSE -->options-panel<!-- ENDIF -->" role="tablist">  			<ul> -				<li id="options-panel-tab" class="activetab"><a href="#tabs" data-subpanel="options-panel"><span>{L_OPTIONS}</span></a></li> +				<li id="options-panel-tab" class="tab activetab"><a href="#tabs" data-subpanel="options-panel" role="tab" aria-controls="options-panel"><span>{L_OPTIONS}</span></a></li>  				<!-- IF S_SHOW_ATTACH_BOX --> -					<li id="attach-panel-tab"> -						<a href="#tabs" data-subpanel="attach-panel"> -							<span> -								{L_ATTACHMENTS} <strong id="file-total-progress"><strong id="file-total-progress-bar"></strong></strong> -							</span> +					<li id="attach-panel-tab" class="tab"> +						<a href="#tabs" data-subpanel="attach-panel" role="tab" aria-controls="attach-panel"> +							{L_ATTACHMENTS} <strong id="file-total-progress"><strong id="file-total-progress-bar"></strong></strong>  						</a>  					</li>				  				<!-- ENDIF --> -				<!-- IF S_SHOW_POLL_BOX || S_POLL_DELETE --><li id="poll-panel-tab"><a href="#tabs" data-subpanel="poll-panel"><span>{L_ADD_POLL}</span></a></li><!-- ENDIF --> +				<!-- IF S_SHOW_POLL_BOX || S_POLL_DELETE --> +					<li id="poll-panel-tab" class="tab"> +						<a href="#tabs" data-subpanel="poll-panel" role="tab" aria-controls="poll-panel">{L_ADD_POLL}</a> +					</li> +				<!-- ENDIF -->  			</ul>  		</div>  	<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/posting_layout.html b/phpBB/styles/prosilver/template/posting_layout.html index 4ef0954200..630afdb832 100644 --- a/phpBB/styles/prosilver/template/posting_layout.html +++ b/phpBB/styles/prosilver/template/posting_layout.html @@ -68,6 +68,7 @@  	<!-- DEFINE $EXTRA_POSTING_OPTIONS = 1 -->  	<!-- INCLUDE posting_editor.html --> +	<input type="hidden" name="show_panel" value="options-panel" />  	{S_FORM_TOKEN}  	</div>  </div> diff --git a/phpBB/styles/prosilver/template/posting_smilies.html b/phpBB/styles/prosilver/template/posting_smilies.html index c5371b9b6a..3bd51275ec 100644 --- a/phpBB/styles/prosilver/template/posting_smilies.html +++ b/phpBB/styles/prosilver/template/posting_smilies.html @@ -17,11 +17,11 @@  	</div>  </div> -<div class="pagination"> -	<!-- IF .pagination -->  +<!-- IF .pagination -->  +	<div class="pagination">  		<!-- INCLUDE pagination.html --> -	<!-- ENDIF --> -</div> +	</div> +<!-- ENDIF -->  <a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>  <!-- INCLUDE simple_footer.html --> diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index 0043da4507..47aa8d85de 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -14,7 +14,7 @@  <!-- IF .pagination or SEARCH_MATCHES or PAGE_NUMBER -->  	<form method="post" action="{S_SEARCH_ACTION}"> -	<div class="topic-actions"> +	<div class="action-bar top">  	<!-- IF SEARCH_MATCHES -->  		<div class="search-box"> @@ -25,13 +25,12 @@  		</div>  	<!-- ENDIF --> -		<div class="rightside pagination"> +		<div class="pagination">  			{SEARCH_MATCHES}  			<!-- IF .pagination --> -				•  				<!-- INCLUDE pagination.html -->  			<!-- ELSE --> -				{PAGE_NUMBER} +				 • {PAGE_NUMBER}  			<!-- ENDIF -->  		</div>  	</div> @@ -164,8 +163,6 @@  	<form method="post" action="{S_SEARCH_ACTION}">  	<fieldset class="display-options"> -		<!-- IF U_PREVIOUS_PAGE --><a href="{U_PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -		<!-- IF U_NEXT_PAGE --><a href="{U_NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->  		<!-- IF S_SELECT_SORT_DAYS or S_SELECT_SORT_KEY -->  			<label><!-- IF S_SHOW_TOPICS -->{L_DISPLAY_POSTS}<!-- ELSE -->{L_SORT_BY}</label><label><!-- ENDIF --> {S_SELECT_SORT_DAYS}<!-- IF S_SELECT_SORT_KEY --></label> <label>{S_SELECT_SORT_KEY}</label>  			<label>{S_SELECT_SORT_DIR}<!-- ENDIF --></label> @@ -179,17 +176,16 @@  <!-- ENDIF -->  <!-- IF .pagination or .searchresults or PAGE_NUMBER --> -	<ul class="linklist"> -		<li class="rightside pagination"> -			{SEARCH_MATCHES} -			<!-- IF .pagination --> -				• -				<!-- INCLUDE pagination.html --> -			<!-- ELSE --> -				{PAGE_NUMBER} -			<!-- ENDIF --> -		</li> -	</ul> +<div class="action-bar bottom"> +	<div class="pagination"> +		{SEARCH_MATCHES} +		<!-- IF .pagination -->  +			<!-- INCLUDE pagination.html --> +		<!-- ELSE -->  +			 • {PAGE_NUMBER} +		<!-- ENDIF --> +	</div> +</div>  <!-- ENDIF -->  <!-- INCLUDE jumpbox.html --> diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index 48f6cc87da..d31dd32cf6 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -35,5 +35,5 @@  <!-- EVENT simple_header_body_before -->  <div id="simple-wrap"> -	<a id="top" accesskey="t"></a> +	<a id="top" class="anchor" accesskey="t"></a>  	<div id="page-body"> diff --git a/phpBB/styles/prosilver/template/ucp_attachments.html b/phpBB/styles/prosilver/template/ucp_attachments.html index 4731683a80..ddbf892dee 100644 --- a/phpBB/styles/prosilver/template/ucp_attachments.html +++ b/phpBB/styles/prosilver/template/ucp_attachments.html @@ -10,16 +10,16 @@  	<p>{L_ATTACHMENTS_EXPLAIN}</p>  	<!-- IF .attachrow --> -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL_ATTACHMENTS -->{TOTAL_ATTACHMENTS} {L_TITLE} • <!-- ENDIF --> +		<div class="action-bar top"> +			<div class="pagination"> +				{TOTAL_ATTACHMENTS} {L_TITLE}  				<!-- IF .pagination -->   					<!-- INCLUDE pagination.html -->  				<!-- ELSE -->  -					{PAGE_NUMBER} +					 • {PAGE_NUMBER}  				<!-- ENDIF --> -			</li> -		</ul>	 +			</div> +		</div>  		<ul class="topiclist">  			<li class="header"> @@ -51,8 +51,6 @@  		</ul>  		<fieldset class="display-options"> -			<!-- IF U_NEXT_PAGE --><a href="{U_NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF --> -			<!-- IF U_PREVIOUS_PAGE --><a href="{U_PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->  			<label for="sk">{L_SORT_BY}{L_COLON} <select name="sk" id="sk">{S_SORT_OPTIONS}</select></label>   			<label><select name="sd" id="sd">{S_ORDER_SELECT}</select></label>  			<input class="button2" type="submit" name="sort" value="{L_SORT}" /> @@ -60,17 +58,18 @@  		</fieldset>  		<hr /> -		 -		<ul class="linklist"> -			<li class="rightside pagination"> -				<!-- IF TOTAL_ATTACHMENTS -->{TOTAL_ATTACHMENTS} {L_TITLE} • <!-- ENDIF --> + +		<div class="action-bar bottom"> +			<div class="pagination"> +				{TOTAL_ATTACHMENTS} {L_TITLE}  				<!-- IF .pagination -->   					<!-- INCLUDE pagination.html -->  				<!-- ELSE -->  -					{PAGE_NUMBER} +					 • {PAGE_NUMBER}  				<!-- ENDIF --> -			</li> -		</ul> +			</div> +		</div> +  	<!-- ELSE -->  		<p><strong>{L_UCP_NO_ATTACHMENTS}</strong></p>  	<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html index 3946b9d269..2a0f403782 100644 --- a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html +++ b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html @@ -1,6 +1,5 @@  <!-- IF .avatar_local_cats -->  <label for="category">{L_AVATAR_CATEGORY}{L_COLON} <select name="avatar_local_cat" id="category"> -<option value="">{L_NO_AVATAR_CATEGORY}</option>  <!-- BEGIN avatar_local_cats -->  <option value="{avatar_local_cats.NAME}"<!-- IF avatar_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_local_cats.NAME}</option>  <!-- END avatar_local_cats --> diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html index df80135acb..3b805c4862 100644 --- a/phpBB/styles/prosilver/template/ucp_groups_manage.html +++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html @@ -159,15 +159,13 @@  	</tbody>  	</table> -	<ul class="linklist"> -		<li class="leftside pagination"> -			<!-- IF .pagination -->  -				<!-- INCLUDE pagination.html --> -			<!-- ELSE -->  -				{PAGE_NUMBER} -			<!-- ENDIF --> -		</li> -	</ul> +	<!-- IF .pagination --> +	<div class="action-bar bottom"> +		<div class="pagination">  +			<!-- INCLUDE pagination.html --> +		</div> +	</div> +	<!-- ENDIF -->  	</div>  </div> diff --git a/phpBB/styles/prosilver/template/ucp_header.html b/phpBB/styles/prosilver/template/ucp_header.html index 102ea5a3a0..a17f145cbc 100644 --- a/phpBB/styles/prosilver/template/ucp_header.html +++ b/phpBB/styles/prosilver/template/ucp_header.html @@ -5,7 +5,7 @@  <div id="tabs">  	<ul>  		<!-- BEGIN t_block1 --> -		<li <!-- IF t_block1.S_SELECTED -->class="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li> +		<li class="tab<!-- IF t_block1.S_SELECTED --> activetab<!-- ENDIF -->"><a href="{t_block1.U_TITLE}">{t_block1.L_TITLE}</a></li>  		<!-- END t_block1 -->  	</ul>  </div> @@ -20,7 +20,7 @@  	<div style="width: 100%;">  	<div id="cp-menu"> -		<div id="navigation"> +		<div id="navigation" role="navigation">  		<!-- IF S_PRIVMSGS -->  			<!-- BEGIN t_block2 --> diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html index b9e3c16524..f74728bdb3 100644 --- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html +++ b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html @@ -75,16 +75,18 @@  		</li>  	<!-- END topicrow -->  	</ul> -	<ul class="linklist"> -		<li class="rightside pagination"> -			<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS} • <!-- ENDIF --> + +	<div class="action-bar bottom"> +		<div class="pagination"> +			{TOTAL_TOPICS}  			<!-- IF .pagination -->   				<!-- INCLUDE pagination.html -->  			<!-- ELSE -->  -				{PAGE_NUMBER} +				 • {PAGE_NUMBER}  			<!-- ENDIF --> -		</li> -	</ul> +		</div> +	</div> +  <!-- ELSE -->  	<p><strong>{L_NO_BOOKMARKS}</strong></p>  <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html index 74ab5226cb..ef03317578 100644 --- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html +++ b/phpBB/styles/prosilver/template/ucp_main_subscribed.html @@ -109,16 +109,18 @@  		</li>  	<!-- END topicrow -->  	</ul> -	<ul class="linklist"> -		<li class="rightside pagination"> -			<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS} • <!-- ENDIF --> -			<!-- IF .pagination --> + +	<div class="action-bar bottom"> +		<div class="pagination"> +			{TOTAL_TOPICS} +			<!-- IF .pagination -->   				<!-- INCLUDE pagination.html --> -			<!-- ELSE --> -				{PAGE_NUMBER} +			<!-- ELSE -->  +				 • {PAGE_NUMBER}  			<!-- ENDIF --> -		</li> -	</ul> +		</div> +	</div> +  <!-- ELSEIF S_TOPIC_NOTIFY -->      <ul class="topiclist">          <li class="header"> diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html index b400a3c8b1..500bae0c47 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications.html +++ b/phpBB/styles/prosilver/template/ucp_notifications.html @@ -42,19 +42,17 @@  			</table>  		<!-- ELSE -->  			<!-- IF .notification_list --> -			<!-- IF .pagination or TOTAL_COUNT --> -				<div class="topic-actions"> +				<div class="action-bar top">  					<div class="pagination"> -						<!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}">{L_NOTIFICATIONS_MARK_ALL_READ}</a> • <!-- ENDIF --> -						<!-- IF TOTAL_COUNT -->{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>] • <!-- ENDIF --> +						<!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}" class="mark">{L_NOTIFICATIONS_MARK_ALL_READ}</a> • <!-- ENDIF --> +						{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>]  						<!-- IF .pagination -->  							<!-- INCLUDE pagination.html -->  						<!-- ELSE --> -							{PAGE_NUMBER} +							 • {PAGE_NUMBER}  						<!-- ENDIF -->  					</div>  				</div> -			<!-- ENDIF -->  			<div class="notification_list">  				<ul class="topiclist two-columns"> @@ -67,19 +65,18 @@  				</ul>  				<ul class="topiclist cplist two-columns">  					<!-- BEGIN notification_list --> -						<li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF -->"> +						<li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF --><!-- IF notification_list.STYLING --> {notification_list.STYLING}<!-- ENDIF -->">  							<dl>  								<dt>  									<div class="list-inner">										  										<!-- IF notification_list.AVATAR -->{notification_list.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF -->  										<div class="notifications">  											<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF --> -											<p class="notifications_title">{notification_list.FORMATTED_TITLE}</p> -											<!-- IF notification_list.URL --></a><!-- ENDIF --> +											<p class="notifications_title">{notification_list.FORMATTED_TITLE}<!-- IF notification_list.REFERENCE --> {notification_list.REFERENCE}<!-- ENDIF --></p> +											<!-- IF notification_list.URL --></a><!-- ENDIF -->				 +											<!-- IF notification_list.FORUM --><p class="notifications_forum">{notification_list.FORUM}</p><!-- ENDIF --> +											<!-- IF notification_list.REASON --><p class="notifications_reason">{notification_list.REASON}</p><!-- ENDIF -->  											<p class="notifications_time">{notification_list.TIME}</p> -											<!-- IF not notification_list.URL and notification_list.U_MARK_READ --> -												<p><a href="{notification_list.U_MARK_READ}">{L_MARK_READ}</a></p> -											<!-- ENDIF -->  										</div>  									</div>  								</dt> @@ -91,18 +88,16 @@  				</ul>  			</div> -			<!-- IF .pagination or TOTAL_COUNT --> -				<div class="topic-actions"> -					<div class="pagination"> -						<!-- IF TOTAL_COUNT -->{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>] • <!-- ENDIF --> -						<!-- IF .pagination --> -							<!-- INCLUDE pagination.html --> -						<!-- ELSE --> -							{PAGE_NUMBER} -						<!-- ENDIF --> -					</div> +			<div class="action-bar bottom"> +				<div class="pagination"> +					{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>] +					<!-- IF .pagination --> +						<!-- INCLUDE pagination.html --> +					<!-- ELSE --> +						  • {PAGE_NUMBER} +					<!-- ENDIF -->  				</div> -			<!-- ENDIF --> +			</div>  			<!-- ELSE -->  				<p><strong>{L_NO_NOTIFICATIONS}</strong></p> diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html index 56e27811c6..d777de908d 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html +++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html @@ -4,8 +4,9 @@  <div class="panel">  	<div class="inner"> -  	<!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF --> + +	<div class="action-bar top">  	<!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM -->  		<div class="buttons">  			<!-- IF U_POST_REPLY_PM --> @@ -43,17 +44,17 @@  	<!-- 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_FOLDER}</a><!-- ENDIF --> -			<!-- IF FOLDER_CUR_MESSAGES neq 0 --> -				<!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES} • <!-- ENDIF --> +		<div class="pagination"> +			<!-- IF S_VIEW_MESSAGE --> +				<a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO_FOLDER}</a> +			<!-- ELSEIF FOLDER_CUR_MESSAGES neq 0 --> +				{TOTAL_MESSAGES}  				<!-- IF .pagination -->  					<!-- INCLUDE pagination.html -->  				<!-- ELSE --> -					{PAGE_NUMBER} +					 • {PAGE_NUMBER}  				<!-- ENDIF -->  			<!-- ENDIF --> -		</li> -	</ul> +		</div>  	<!-- ENDIF --> +	</div> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html index b081c14498..d93a62282e 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html @@ -96,26 +96,24 @@  	<!-- ENDIF -->  	<!-- IF FOLDER_CUR_MESSAGES neq 0 --> -	<fieldset class="display-actions"> -		<div class="left-box"><label for="export_option">{L_EXPORT_FOLDER}{L_COLON} <select name="export_option" id="export_option"><option value="CSV">{L_EXPORT_AS_CSV}</option><option value="CSV_EXCEL">{L_EXPORT_AS_CSV_EXCEL}</option><option value="XML">{L_EXPORT_AS_XML}</option></select></label> <input class="button2" type="submit" name="submit_export" value="{L_GO}" /><br /></div> -		<select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" /> -		<div><a href="#" onclick="marklist('viewfolder', 'marked_msg', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('viewfolder', 'marked_msg', false); return false;">{L_UNMARK_ALL}</a></div> -	</fieldset> - -	<hr /> - -	<ul class="linklist"> -		<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE --> -		<li class="rightside pagination"> -			<!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES} • <!-- ENDIF --> -			<!-- IF .pagination -->  -				<!-- INCLUDE pagination.html --> -			<!-- ELSE -->  -				{PAGE_NUMBER} -			<!-- ENDIF --> -		</li> -		<!-- ENDIF --> -	</ul> +		<fieldset class="display-actions"> +			<div class="left-box"><label for="export_option">{L_EXPORT_FOLDER}{L_COLON} <select name="export_option" id="export_option"><option value="CSV">{L_EXPORT_AS_CSV}</option><option value="CSV_EXCEL">{L_EXPORT_AS_CSV_EXCEL}</option><option value="XML">{L_EXPORT_AS_XML}</option></select></label> <input class="button2" type="submit" name="submit_export" value="{L_GO}" /><br /></div> +			<select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" /> +			<div><a href="#" onclick="marklist('viewfolder', 'marked_msg', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('viewfolder', 'marked_msg', false); return false;">{L_UNMARK_ALL}</a></div> +		</fieldset> +	 +		<hr /> +	 +		<div class="action-bar bottom"> +			<div class="pagination"> +				{TOTAL_MESSAGES} +				<!-- IF .pagination -->  +					<!-- INCLUDE pagination.html --> +				<!-- ELSE -->  +					 • {PAGE_NUMBER} +				<!-- ENDIF --> +			</div> +		</div>  	<!-- ENDIF -->  		</div> @@ -123,8 +121,6 @@  	<!-- IF FOLDER_CUR_MESSAGES neq 0 -->  	<fieldset class="display-options"> -		<!-- IF U_PREVIOUS_PAGE --><a href="{U_PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -		<!-- IF U_NEXT_PAGE --><a href="{U_NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->  		<label>{L_DISPLAY}{L_COLON} {S_SELECT_SORT_DAYS}</label>  		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>  		<label>{S_SELECT_SORT_DIR}</label> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html index 551e58f62f..ce0f4941a5 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html @@ -11,7 +11,7 @@  </head>  <body id="phpbb">  <div id="wrap"> -	<a id="top" accesskey="t"></a> +	<a id="top" class="anchor" accesskey="t"></a>  	<div id="page-header">  		<h1>{SITENAME}</h1> diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html index b27003faab..020f69cb26 100644 --- a/phpBB/styles/prosilver/template/ucp_register.html +++ b/phpBB/styles/prosilver/template/ucp_register.html @@ -26,6 +26,7 @@  	<!-- IF L_REG_COND -->  		<dl><dd><strong>{L_REG_COND}</strong></dd></dl>  	<!-- ENDIF --> +	<!-- EVENT ucp_register_credentials_before -->  	<dl>  		<dt><label for="username">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>  		<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" title="{L_USERNAME}" /></dd> @@ -43,8 +44,10 @@  		<dd><input type="password"  tabindex="5" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" /></dd>  	</dl> +	<!-- EVENT ucp_register_credentials_after -->  	<hr /> +	<!-- EVENT ucp_register_options_before -->  	<dl>  		<dt><label for="lang">{L_LANGUAGE}{L_COLON}</label></dt>  		<dd><select name="lang" id="lang" onchange="change_language(this.value); return false;" tabindex="6" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></dd> @@ -52,6 +55,7 @@  	<!-- INCLUDE timezone_option.html --> +	<!-- EVENT ucp_register_profile_fields_before -->  	<!-- IF .profile_fields -->  		<dl><dd><strong>{L_ITEMS_REQUIRED}</strong></dd></dl> @@ -65,6 +69,7 @@  	<!-- END profile_fields -->  	<!-- ENDIF --> +	<!-- EVENT ucp_register_profile_fields_after -->  	</fieldset>  	</div>  </div> diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index c747dd01f5..c44e830b9c 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -35,7 +35,7 @@  <!-- ENDIF -->  <!-- IF S_DISPLAY_POST_INFO or .pagination or TOTAL_POSTS or TOTAL_TOPICS --> -	<div class="topic-actions" <!-- IF S_HAS_SUBFORUM -->style="margin-top: 2em;"<!-- ENDIF -->> +	<div class="action-bar top" <!-- IF S_HAS_SUBFORUM -->style="margin-top: 2em;"<!-- ENDIF -->>  	<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->  		<div class="buttons"> @@ -58,12 +58,12 @@  	<!-- 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">{L_MARK_TOPICS_READ}</a> • <!-- ENDIF --> -		{TOTAL_TOPICS} •  +		<!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}" class="mark" accesskey="m" data-ajax="mark_topics_read">{L_MARK_TOPICS_READ}</a> • <!-- ENDIF --> +		{TOTAL_TOPICS}   		<!-- IF .pagination -->  			<!-- INCLUDE pagination.html -->  		<!-- ELSE --> -			{PAGE_NUMBER} +			• {PAGE_NUMBER}  		<!-- ENDIF -->  	</div> @@ -208,8 +208,6 @@  <!-- IF S_SELECT_SORT_DAYS and not S_DISPLAY_ACTIVE -->  	<form method="post" action="{S_FORUM_ACTION}">  		<fieldset class="display-options"> -			<!-- IF U_PREVIOUS_PAGE --><a href="{U_PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -			<!-- IF U_NEXT_PAGE --><a href="{U_NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->  	<!-- IF not S_IS_BOT -->  			<label>{L_DISPLAY_TOPICS}{L_COLON} {S_SELECT_SORT_DAYS}</label>  			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> @@ -222,7 +220,7 @@  <!-- ENDIF -->  <!-- IF .topicrow and not S_DISPLAY_ACTIVE --> -	<div class="topic-actions"> +	<div class="action-bar bottom">  		<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->  			<div class="buttons">  				<a href="{U_POST_NEW_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"> @@ -233,11 +231,11 @@  		<div class="pagination">  			<!-- 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} •  +			{TOTAL_TOPICS}   			<!-- IF .pagination -->  				<!-- INCLUDE pagination.html -->  			<!-- ELSE --> -				{PAGE_NUMBER} +				 • {PAGE_NUMBER}  			<!-- ENDIF -->  		</div>  	</div> diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html index 553e322f92..ee1672c6c9 100644 --- a/phpBB/styles/prosilver/template/viewonline_body.html +++ b/phpBB/styles/prosilver/template/viewonline_body.html @@ -3,15 +3,15 @@  <h2 class="viewonline-title">{TOTAL_REGISTERED_USERS_ONLINE}</h2>  <p>{TOTAL_GUEST_USERS_ONLINE}<!-- IF S_SWITCH_GUEST_DISPLAY --> • <a href="{U_SWITCH_GUEST_DISPLAY}">{L_SWITCH_GUEST_DISPLAY}</a><!-- ENDIF --></p> -<ul class="linklist"> -	<li class="rightside pagination"> +<div class="action-bar top"> +	<div class="pagination">  		<!-- IF .pagination -->   			<!-- INCLUDE pagination.html -->  		<!-- ELSE -->   			{PAGE_NUMBER}  		<!-- ENDIF --> -	</li> -</ul> +	</div> +</div>  <div class="forumbg forumbg-table">  	<div class="inner"> @@ -47,23 +47,17 @@  	</div>  </div> -<!-- IF U_PREVIOUS_PAGE or U_NEXT_PAGE --> -<fieldset class="display-options right-box"> -	<!-- IF U_PREVIOUS_PAGE --><a href="{U_PREVIOUS_PAGE}" class="arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ELSE -->{L_PREVIOUS}<!-- ENDIF --> • <!-- IF U_NEXT_PAGE --><a href="{U_NEXT_PAGE}" class="arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ELSE -->{L_NEXT}<!-- ENDIF --> -</fieldset> -<!-- ENDIF --> -  <!-- IF LEGEND --><p><em>{L_LEGEND}{L_COLON} {LEGEND}</em></p><!-- ENDIF --> -<ul class="linklist"> -	<li class="rightside pagination"> +<div class="action-bar bottom"> +	<div class="pagination">  		<!-- IF .pagination -->   			<!-- INCLUDE pagination.html -->  		<!-- ELSE -->   			{PAGE_NUMBER}  		<!-- ENDIF --> -	</li> -</ul> +	</div> +</div>  <!-- INCLUDE jumpbox.html -->  <!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index eb61bd3e72..38836f3ee4 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -25,7 +25,7 @@  	</div>  <!-- ENDIF --> -<div class="topic-actions"> +<div class="action-bar top">  	<div class="buttons">  	<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO --> @@ -51,15 +51,15 @@  	<!-- IF .pagination or TOTAL_POSTS -->  		<div class="pagination"> -			<!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_POSTS} • +			<!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}" class="mark">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_POSTS}   			<!-- IF .pagination -->  				<!-- INCLUDE pagination.html -->  			<!-- ELSE --> -				{PAGE_NUMBER} +				• {PAGE_NUMBER}  			<!-- ENDIF -->  		</div>  	<!-- ENDIF --> -	<div class="clear"></div> +  </div>  <!-- IF S_HAS_POLL --> @@ -117,7 +117,9 @@  <!-- BEGIN postrow -->  	<!-- EVENT viewtopic_body_postrow_post_before --> -	<!-- IF postrow.S_FIRST_UNREAD --><a id="unread" data-url="{postrow.U_MINI_POST}"></a><!-- ENDIF --> +	<!-- IF postrow.S_FIRST_UNREAD --> +		<a id="unread" class="anchor"<!-- IF S_UNREAD_VIEW --> data-url="{postrow.U_MINI_POST}"<!-- ENDIF -->></a> +	<!-- ENDIF -->  	<div id="p{postrow.POST_ID}" class="post <!-- IF postrow.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF postrow.S_UNREAD_POST --> unreadpost<!-- ENDIF --><!-- IF postrow.S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF postrow.S_POST_DELETED --> deleted<!-- ENDIF --><!-- IF postrow.S_ONLINE and not postrow.S_POST_HIDDEN --> online<!-- ENDIF --><!-- IF postrow.POSTER_WARNINGS --> warned<!-- ENDIF -->">  		<div class="inner"> @@ -318,28 +320,26 @@  	<hr class="divider" />  	<!-- EVENT viewtopic_body_postrow_post_after -->  <!-- END postrow --> +  <!-- IF S_QUICK_REPLY -->  	<!-- INCLUDE quickreply_editor.html -->  <!-- ENDIF --> -<!-- IF S_NUM_POSTS > 1 or U_PREVIOUS_PAGE or U_NEXT_PAGE --> -	<form id="viewtopic" method="post" action="{S_TOPIC_ACTION}"> +<!-- IF S_NUM_POSTS > 1 or .pagination --> +	<form id="viewtopic" method="post" action="{S_TOPIC_ACTION}">  	<fieldset class="display-options" style="margin-top: 0; "> -		<!-- IF U_PREVIOUS_PAGE --><a href="{U_PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -		<!-- IF U_NEXT_PAGE --><a href="{U_NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->  		<!-- IF not S_IS_BOT -->  		<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>  		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> <label>{S_SELECT_SORT_DIR}</label>  		<input type="submit" name="sort" value="{L_GO}" class="button2" />  		<!-- ENDIF -->  	</fieldset> -  	</form>  	<hr />  <!-- ENDIF -->  <!-- EVENT viewtopic_body_topic_actions_before --> -<div class="topic-actions"> +<div class="action-bar bottom">  	<div class="buttons">  	<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->  		<a href="{U_POST_REPLY_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"> @@ -352,11 +352,11 @@  	<!-- IF .pagination or TOTAL_POSTS -->  		<div class="pagination"> -			{TOTAL_POSTS} • +			{TOTAL_POSTS}   			<!-- IF .pagination -->  				<!-- INCLUDE pagination.html -->  			<!-- ELSE --> -				{PAGE_NUMBER} +				• {PAGE_NUMBER}  			<!-- ENDIF -->  		</div>  	<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html index 98308c4adc..5c44f58adb 100644 --- a/phpBB/styles/prosilver/template/viewtopic_print.html +++ b/phpBB/styles/prosilver/template/viewtopic_print.html @@ -11,7 +11,7 @@  </head>  <body id="phpbb">  <div id="wrap"> -	<a id="top" accesskey="t"></a> +	<a id="top" class="anchor" accesskey="t"></a>  	<div id="page-header">  		<h1>{SITENAME}</h1> diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index 78b95d902e..2e9253928e 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -20,7 +20,7 @@  /* Main blocks  ---------------------------------------- */ -.rtl #logo { +.rtl .logo {  	float: right;  	padding: 10px 10px 0 13px;  } @@ -112,6 +112,32 @@  	padding-right: 10px;  } +.rtl .dropdown-extended .header .header_settings { +	float: left; +} + +/* Notifications +----------------------------------------*/ +.rtl .notification_list ul li img { +	float: right; +	margin-left: 5px; +	margin-right: 0; +} + +.rtl .notification_list div.notifications { +	margin-left: 0; +	margin-right: 50px; +} + +.rtl .notification_text { +	margin-left: 0; +	margin-right: 58px; +} + +.rtl .notification_list p.notification-time { +	text-align: left; +} +  /* Responsive breadcrumbs  ----------------------------------------*/  .rtl .breadcrumbs .crumb { @@ -206,26 +232,39 @@  .rtl .pagination {  	text-align: left;  	float: left; -	padding-left: 5px; +} + +.rtl .pagination > ul { +	margin-left: 0; +	margin-right: 5px;  }  /* Pagination in viewforum for multipage topics */  .rtl .row .pagination {  	background-position: 100% 50%;  	float: left; -	padding: 1px 15px 1px 0; +	padding-left: 0; +	padding-right: 15px; +} + +.rtl .row .pagination > ul { +	margin: 0;  }  .rtl .pagination span {  	direction: ltr;  } -.rtl .pagination span.page-sep { -	display: inline; -	visibility: hidden; -	position: absolute; +.pagination li.page-jump { +	margin-left: 5px; +	margin-right: 0;  } +.pagination li.previous a { background-position: -50px 2px; } +.pagination li.next a { background-position: -30px 2px; } +.pagination li.previous a:hover { background-position: -50px -18px; } +.pagination li.next a:hover { background-position: -30px -18px; } +  /* Miscellaneous styles  ---------------------------------------- */  .rtl #forum-permissions { @@ -245,6 +284,10 @@  	width: 99%;	/* fix for IE6 */  } +.rtl .member-search { +	float: right; +} +  /**  * links.css  */ @@ -300,7 +343,7 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {  .rtl ul.topiclist.missing-column dt {  	margin-right: 0; -	margin-left: -330px; +	margin-left: -345px;  }  .rtl ul.topiclist.two-long-columns dt { @@ -333,10 +376,6 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {  	margin-left: 80px;  } -.rtl ul.topiclist dl { -	position: static;	/* fix for IE6 */ -} -  .rtl ul.topiclist dd {  	float: right;  	border-right-width: 1px; @@ -389,10 +428,6 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {  	padding-right: 45px;					/* Space for folder icon */  } -.rtl dl.icon dt {							/* fix for topic row icon links */ -	position: relative; -} -  .rtl dl a.icon-link {						/* topic row icon links */  	display: inline-block;  	left: auto; @@ -602,6 +637,19 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {  	margin-right: 0;  } +/* Poster contact icons + ----------------------------------------*/ +.rtl .contact-icons a { +	border-left-width: 1px; +	border-left-style: dotted; +	border-right: none; +	float: right; +} + +.rtl .contact-icons .last-cell { +	border-left: none; +} +  /**  * cp.css  */ @@ -624,10 +672,6 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {  	margin-left: 0;  } -.rtl #cp-main .pagination { -	float: left; -} -  .rtl #cp-main .buttons {  	margin-right: 0;  	margin-left: 0; @@ -640,34 +684,63 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {  /* CP tabbed menu  ----------------------------------------*/  .rtl #tabs { -	margin: 20px 7px -1px 0; +	margin-left: 0; +	margin-right: 7px;  } -.rtl #tabs a { +.rtl #tabs .tab {  	float: right;  } -/*.rtl #tabs a span { -	float: right; -}*/ +.rtl #tabs .tab > a { +	margin-left: 1px; +	margin-right: 0; +}  /* Mini tabbed menu used in MCP  ----------------------------------------*/  .rtl #minitabs { +	float: left;  	margin-right: 0;  	margin-left: 7px;  } -.rtl .tabs-container #minitabs { +.rtl #minitabs .tab {  	float: left;  } -.rtl #minitabs li { -	float: left; +.rtl #minitabs .tab > a {  	margin-right: 2px;  	margin-left: 0;  } +/* Responsive tabs +----------------------------------------*/ +.rtl #tabs .dropdown { +	margin-left: -2px; +} + +.rtl #tabs .dropdown li { +	text-align: left; +} + +.rtl #minitabs .dropdown { +	margin-left: -4px; +} + +.rtl #minitabs .dropdown li { +	text-align: right; +} + +/* Responsive *CP navigation +----------------------------------------*/ +@media only screen and (max-width: 900px), only screen and (max-device-width: 900px) +{ +	.rtl #cp-menu, .rtl #navigation, .rtl #cp-main { +		float: none; +	} +} +  /* UCP navigation menu  ----------------------------------------*/ @@ -718,6 +791,15 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {  	float: right;  } +/* Responsive *CP navigation +----------------------------------------*/ +@media only screen and (max-width: 900px), only screen and (max-device-width: 900px) +{ +	.rtl #cp-menu, .rtl #navigation, .rtl #cp-main { +		float: none; +	} +} +  /**  * forms.css  */ @@ -865,10 +947,6 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {  }  /* Former imageset */ -.rtl .imageset.site_logo { -	padding-right: 139px; -	padding-left: 0; -}  .rtl .imageset.forum_link, .rtl .imageset.forum_read, .rtl .imageset.forum_read_locked, .rtl .imageset.forum_read_subforum, .rtl .imageset.forum_unread, .rtl .imageset.forum_unread_locked, .rtl .imageset.forum_unread_subforum, .rtl .imageset.topic_moved, .rtl .imageset.topic_read, .rtl .imageset.topic_read_mine, .rtl .imageset.topic_read_hot, .rtl .imageset.topic_read_hot_mine, .rtl .imageset.topic_read_locked, .rtl .imageset.topic_read_locked_mine, .rtl .imageset.topic_unread, .rtl .imageset.topic_unread_mine, .rtl .imageset.topic_unread_hot, .rtl .imageset.topic_unread_hot_mine, .rtl .imageset.topic_unread_locked, .rtl .imageset.topic_unread_locked_mine, .rtl .imageset.sticky_read, .rtl .imageset.sticky_read_mine, .rtl .imageset.sticky_read_locked, .rtl .imageset.sticky_read_locked_mine, .rtl .imageset.sticky_unread, .rtl .imageset.sticky_unread_mine, .rtl .imageset.sticky_unread_locked, .rtl .imageset.sticky_unread_locked_mine, .rtl .imageset.announce_read, .rtl .imageset.announce_read_mine, .rtl .imageset.announce_read_locked, .rtl .imageset.announce_read_locked_mine, .rtl .imageset.announce_unread, .rtl .imageset.announce_unread_mine, .rtl .imageset.announce_unread_locked, .rtl .imageset.announce_unread_locked_mine, .rtl .imageset.global_read, .rtl .imageset.global_read_mine, .rtl .imageset.global_read_locked, .rtl .imageset.global_read_locked_mine, .rtl .imageset.global_unread, .rtl .imageset.global_unread_mine, .rtl .imageset.global_unread_locked, .rtl .imageset.global_unread_locked_mine, .rtl .imageset.pm_read, .rtl .imageset.pm_unread {  	padding-right: 27px;  	padding-left: 0; @@ -893,3 +971,104 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {  	padding-right: 16px;  	padding-left: 0;  } + +/** +* plupload.css +*/ + +.rtl .attach-controls { +	float: left; +} + +/** +* responsive.css +*/ +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ +	/* .topiclist lists +	----------------------------------------*/ +	.rtl ul.topiclist li.header dt, .rtl ul.topiclist li.header dt .list-inner { +		margin-left: 0 !important; +		padding-left: 0; +	} + +	.rtl ul.topiclist dt, .rtl ul.topiclist dt .list-inner, +	.rtl ul.topiclist.missing-column dt, .rtl ul.topiclist.missing-column dt .list-inner, +	.rtl ul.topiclist.two-long-columns dt, .rtl ul.topiclist.two-long-columns dt .list-inner, +	.rtl ul.topiclist.two-columns dt, .rtl ul.topiclist.two-columns dt .list-inner { +		margin-left: 0; +	} + +	.rtl ul.topiclist dt .list-inner.with-mark { +		padding-left: 34px; +	} + +	/* Forums and topics lists +	----------------------------------------*/ +	.rtl ul.topiclist.forums dt, .rtl ul.topiclist.topics dt { +		margin-left: -250px; +	} +	.rtl ul.topiclist.forums dt .list-inner, .rtl ul.topiclist.topics dt .list-inner { +		margin-left: 250px; +	} + +	.rtl ul.topiclist dd.mark { +		left: 5px; +		right: auto; +		text-align: right; +	} + +	@media only screen and (max-width: 550px), only screen and (max-device-width: 550px) +	{ +		.rtl ul.topiclist.forums dt, .rtl ul.topiclist.topics dt { +			margin-left: 0; +		} + +		.rtl ul.topiclist.forums dt .list-inner, .rtl ul.topiclist.topics dt .list-inner { +			margin-left: 0; +		} +	} + +	.rtl table.responsive.show-header thead, .rtl table.responsive.show-header th:first-child { +		text-align: right !important; +	} + +	.rtl table.responsive td { +		text-align: right !important; +	} + +	/* User profile +	----------------------------------------*/ +	.rtl .column1, .rtl .column2, .rtl .left-box.profile-details { +		float: none; +	} + +	@media only screen and (max-width: 500px), only screen and (max-device-width: 500px) +	{ +		.rtl dl.details dt, .rtl dl.details dd { +			float: none; +			text-align: right;	 +		} + +		.rtl dl.details dd { +			margin-left: 0; +			margin-right: 20px; +		} +	} + +	/* Post +	----------------------------------------*/ +	.rtl .postprofile, .rtl .postbody, .rtl .search .postbody { +		float: none; +	} + +	.rtl .post .postprofile { +		border-width: 0 0 1px 0; +	} + +	.rtl .postprofile .avatar { +		float: right; +		margin-left: 5px; +		margin-right: 0; +	} +} diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index 19cb547bd4..c5e97d03c4 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -143,7 +143,7 @@ ul.linklist.bulletin li.small-icon:before {  .phpbb_website-icon		{ background-position: -40px 0; }  .phpbb_youtube-icon		{ background-position: -98px 0; }  .phpbb_facebook-icon	{ background-position: -119px 0; } -.phpbb_google_plus-icon	{ background-position: -140px 0; } +.phpbb_googleplus-icon	{ background-position: -140px 0; }  .phpbb_skype-icon		{ background-position: -161px 0; }  .phpbb_twitter-icon		{ background-position: -203px 0; }  .phpbb_yahoo-icon		{ background-position: -224px 0; } diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 72c8b5f226..4b7532ab8a 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -159,7 +159,7 @@ dl.details dd {  /* Pagination  ---------------------------------------- */ -.pagination li a, .pagination li a:link, .pagination li a:visited { +.pagination li a {  	color: #5C758C;  	background-color: #ECEDEE;  	border-color: #B4BAC0; @@ -176,16 +176,14 @@ dl.details dd {  	border-color: #4692BF;  } -.pagination li a:hover, .pagination .active a:hover { +.pagination li a:hover, .pagination .dropdown-visible a.dropdown-trigger, .nojs .pagination .dropdown-container:hover a.dropdown-trigger {  	border-color: #368AD2;  	background-color: #368AD2;  	color: #FFFFFF;  } -.pagination li a:active, .pagination li.active a:active { -	color: #5C758C; -	background-color: #ECEDEE; -	border-color: #B4BAC0; +.pagination li.next a, .pagination li.previous a, .pagination li.page-jump a { +	background-image: url("./images/icons_pagination.png");  }  /* Pagination in viewforum for multipage topics */ @@ -193,14 +191,6 @@ dl.details dd {  	background-image: url("./images/icon_pages.gif");  } -.row .pagination span a, li.pagination span a { -	background-color: #FFFFFF; -} - -.row .pagination span a:hover, li.pagination span a:hover { -	background-color: #368AD2; -} -  /* Miscellaneous styles  ---------------------------------------- */ @@ -817,52 +807,54 @@ ul.cplist {  /* CP tabbed menu  ----------------------------------------*/ -#tabs a { -	background-image: url("./images/bg_tabs1.gif"); -} - -#tabs a span { -	background-image: url("./images/bg_tabs2.gif"); +#tabs .tab > a { +	background: #BACCD9;  	color: #536482;  } -#tabs a:hover span { +#tabs .tab > a:hover { +	background: #DDEDFB;  	color: #BC2A4D;  } -#tabs .activetab a { -	border-bottom-color: #CADCEB; -} - -#tabs .activetab a span { +#tabs .activetab > a, +#tabs .activetab > a:hover { +	background: #CADCEB; +	background: -moz-linear-gradient(top, #E2F2FF 0%, #CADCEB 100%); +	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #E2F2FF), color-stop(100%, #CADCEB)); +	background: -webkit-linear-gradient(top, #E2F2FF 0%, #CADCEB 100%); +	background: -o-linear-gradient(top, #E2F2FF 0%, #CADCEB 100%); +	background: -ms-linear-gradient(top, #E2F2FF 0%, #CADCEB 100%); +	background: linear-gradient(to bottom, #E2F2FF 0%, #CADCEB 100%); +	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#E2F2FF', endColorstr='#CADCEB', GradientType=0 ); +	border-color: #CADCEB; +	box-shadow: 0 1px 1px #F2F9FF inset;  	color: #333333;  } -#tabs .activetab a:hover span { +#tabs .activetab > a:hover {  	color: #000000;  }  /* Mini tabbed menu used in MCP  ----------------------------------------*/ -#minitabs li { +#minitabs .tab > a {  	background-color: #E1EBF2;  } -#minitabs li.activetab { +#minitabs .activetab > a, +#minitabs .activetab > a:hover {  	background-color: #F9F9F9; -} - -#minitabs li.activetab a span, #minitabs li.activetab a:hover span {  	color: #333333;  }  /* Responsive tabs  ----------------------------------------*/ -.responsive-tab .responsive-tab-link span:before { +.responsive-tab .responsive-tab-link:before {  	border-color: #536482;  } -.responsive-tab .responsive-tab-link:hover span:before { +.responsive-tab .responsive-tab-link:hover:before {  	border-color: #BC2A4D;  } @@ -872,35 +864,47 @@ ul.cplist {  /* Link styles for the sub-section links */  #navigation a {  	color: #333; -	background-color: #B2C2CF; -	background-image: url("./images/bg_menu.gif"); +	background: #B4C4D1; +	background: -moz-linear-gradient(left, #B4C4D1 50%, #CADCEB 100%); +	background: -webkit-gradient(left top, right top, color-stop(50%, #B4C4D1), color-stop(100%, #CADCEB)); +	background: -webkit-linear-gradient(left, #B4C4D1 50%, #CADCEB 100%); +	background: -o-linear-gradient(left, #B4C4D1 50%, #CADCEB 100%); +	background: -ms-linear-gradient(left, #B4C4D1 50%, #CADCEB 100%); +	background: linear-gradient(to right, #B4C4D1 50%, #CADCEB 100%); +	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#B4C4D1', endColorstr='#CADCEB', GradientType=1 );  }  .rtl #navigation a { -	background-image: url("./images/bg_menu_rtl.gif"); -	background-position: 0 100%; +	background: #B4C4D1; +	background: -moz-linear-gradient(left, #CADCEB 0%, #B4C4D1 50%); +	background: -webkit-gradient(left top, right top, color-stop(0%, #CADCEB), color-stop(50%, #B4C4D1)); +	background: -webkit-linear-gradient(left, #CADCEB 0%, #B4C4D1 50%); +	background: -o-linear-gradient(left, #CADCEB 0%, #B4C4D1 50%); +	background: -ms-linear-gradient(left, #CADCEB 0%, #B4C4D1 50%); +	background: linear-gradient(to right, #CADCEB 0%, #B4C4D1 50%); +	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#CADCEB', endColorstr='#B4C4D1', GradientType=1 );  }  #navigation a:hover { -	background-image: none; -	background-color: #aabac6; +	background: #AABAC6;  	color: #BC2A4D; +	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);  }  #navigation #active-subsection a { +	background: #F9F9F9;  	color: #D31141; -	background-color: #F9F9F9; -	background-image: none; +	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);  }  #navigation #active-subsection a:hover {  	color: #D31141;  } -@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +@media only screen and (max-width: 900px), only screen and (max-device-width: 900px)  {  	#navigation a, .rtl #navigation a { -		background-image: none; +		background: #B2C2CF;  	}  } @@ -1154,7 +1158,7 @@ input.disabled {  	border-color: #FFF transparent;  } -.dropdown-extended .pointer-inner, #minitabs .pointer-inner { +.dropdown-extended .pointer-inner {  	border-color: #F1F8FF transparent;  } @@ -1180,6 +1184,13 @@ ul.linklist li.responsive-menu a.responsive-menu-link:hover:before, ul.linklist  	border-color: #DCDCDC;  } -#minitabs .dropdown-contents { -	background-color: #F1F8FF; +/* Notifications +---------------------------------------- */ + +.notification_list p.notification-time { +	color: #4C5D77; +} + +li.notification-reported strong, li.notification-disapproved strong { +	color: #D31141;  } diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 0ece2a529f..2aa126c3d1 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -198,13 +198,13 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul {  	margin-top: 20px;  } -#logo { +.logo {  	float: left;  	width: auto;  	padding: 10px 13px 0 10px;  } -a#logo:hover { +.logo:hover {  	text-decoration: none;  } @@ -804,63 +804,111 @@ fieldset.fields1 dl.pmlist dd.recipients {  	margin-left: 0 !important;  } +/* Action-bars (container for post/reply buttons, pagination, etc.) +---------------------------------------- */ +.action-bar { +	font-size: 11px; +	margin: 4px 0; +} + +.action-bar:after { +	clear: both; +	content: ''; +	display: block; +} +  /* Pagination  ---------------------------------------- */  .pagination { -	width: auto; -	text-align: right; -	margin-top: 5px;  	float: right; +	font-size: 11px; +	margin-top: 3px; +	text-align: right; +	width: auto;  } -li.pagination { +.action-bar.bottom .pagination {  	margin-top: 0;  } -.pagination img { -	vertical-align: middle; -} - -.pagination ul { +.pagination > ul {  	display: inline-block; -	*display: inline; /* IE7 inline-block hack */ -	*zoom: 1; -	margin-left: 0; -	margin-bottom: 0; -} - -li.pagination ul { -	margin-top: -2px; -	vertical-align: middle; +	list-style: none !important; +	margin-left: 5px;  } -.pagination ul li, dl .pagination ul li, dl.icon .pagination ul li { -	display: inline; +.pagination > ul > li { +	display: inline-block !important;  	padding: 0;  	font-size: 100%;  	line-height: normal; +	vertical-align: middle;  } -.pagination li a, .pagnation li span, li .pagination li a, li .pagination li span, .pagination li.active span, .pagination li.ellipsis span { -	font-weight: normal; -	text-decoration: none; -	padding: 0 2px; +.pagination li a, .pagination li span {  	border: 1px solid transparent; +	border-radius: 2px; +	display: block;  	font-size: 0.9em; -	line-height: 1.5em; +	font-weight: normal; +	line-height: 13px; +	min-width: 10px; +	padding: 3px; +	text-align: center; +	text-decoration: none; +} + +.pagination li.ellipsis span { +	border: none; +	padding: 0;  } +.pagination li.page-jump { +	margin-right: 5px; +} + +.pagination li.page-jump a, .pagination li.next a, .pagination li.previous a { +	background-repeat: no-repeat; +	font-size: 0; +	height: 13px; +	width: 11px; +} + +.pagination li.page-jump a { +	background-position: 0 2px; +	width: 24px; +} + +.pagination li.next a { +	background-position: -50px 2px; +} + +.pagination li.previous a { +	background-position: -30px 2px; +} + +.pagination li.page-jump a:hover, .pagination .dropdown-visible a.dropdown-trigger, .nojs .pagination .dropdown-container:hover a.dropdown-trigger { background-position: 0 -18px; } +.pagination li.next a:hover { background-position: -50px -18px; } +.pagination li.previous a:hover { background-position: -30px -18px; } +  /* Pagination in viewforum for multipage topics */  .row .pagination {  	display: block; -	float: right; -	width: auto;  	margin-top: 0; -	padding: 1px 0 1px 8px; +	padding: 1px 0 1px 15px;  	font-size: 0.9em;  	background: none 0 50% no-repeat;  } +.row .pagination > ul { +	margin: 0; +} + +.row .pagination li a, .row .pagination li span { +	border-radius: 1px; +	padding: 1px; +} +  /* jQuery popups  ---------------------------------------- */  .phpbb_alert { @@ -1041,11 +1089,21 @@ form > p.post-notice strong {  	position: relative;  } +.member-search { +	float: left; +	margin: 0; +	padding: 6px 10px; +} + +.member-search strong { +	font-size: 0.95em; +} +  .dropdown-extended {  	display: none;  	position: absolute;  	left: 0; -	width: 330px; +	width: 340px;  	z-index: 1;  	top: 22px;  } @@ -1059,7 +1117,7 @@ form > p.post-notice strong {  .dropdown-extended ul li {  	padding: 0; -	margin: 0; +	margin: 0 !important;  	float: none;  	border-bottom: 1px solid;  	list-style-type: none; @@ -1104,8 +1162,8 @@ form > p.post-notice strong {  	font-size: 1.1em;  } -.dropdown-extended ul li a{ -	padding: 10px; +.dropdown-extended ul li a, .dropdown-extended ul li.no-url { +	padding: 8px;  }  .dropdown-extended .footer > a { @@ -1120,28 +1178,55 @@ form > p.post-notice strong {  .notification_list ul li img {  	float: left;  	max-height: 50px; +	max-width: 50px;  	width: auto !important;  	height: auto !important;  	margin-right: 5px;  }  .notification_list ul li p { -	margin: 0; +	margin-bottom: 4px;  	font-size: 1em;  } +.notification_list p.notification-reference, +.notification_list p.notification-location, +.notification_list li a p.notification-reason { +	overflow: hidden; +	text-overflow: ellipsis; +	white-space: nowrap; +} + +.notification_list p.notification-time { +	font-size: 10px; +	margin: 0; +	text-align: right; +} +  .notification_list div.notifications { +	margin-left: 50px;  	padding: 5px;  } +.notification_list div.notifications a { +	display: block; +} +  .notification_list p.notifications_title {  	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;  	font-size: 13px !important; +} + +.notification_list p.notifications_title strong {  	font-weight: bold;  }  .notification_list p.notifications_time { -	font-size: 11px !important; +	font-size: 10px !important; +} + +.notification_text { +	margin-left: 58px;  }  .notification_text:after { @@ -1157,3 +1242,15 @@ form > p.post-notice strong {  .compact .icon-notification > a > strong, .compact .icon-pm > a > strong {  	padding-left: 2px;  } + +.dropdown-page-jump .dropdown { +	top: 20px; +} + +.dropdown-page-jump.dropdown-up .dropdown { +	bottom: 20px; +} + +.dropdown-page-jump input.tiny { +	width: 50px; +} diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index b66c841d7c..b99312a5be 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -37,7 +37,7 @@ ul.topiclist dt {  }  ul.topiclist.missing-column dt { -	margin-right: -330px; +	margin-right: -345px;  }  ul.topiclist.two-long-columns dt { @@ -55,7 +55,7 @@ ul.topiclist dt .list-inner {  }  ul.topiclist.missing-column dt .list-inner { -	margin-right: 330px; +	margin-right: 345px;  }  ul.topiclist.two-long-columns dt .list-inner { @@ -226,17 +226,6 @@ dd.option {  	font-size: 1.1em;  } -/* Container for post/reply buttons and pagination */ -.topic-actions { -	margin-bottom: 3px; -	font-size: 1.1em; -	height: 28px; -	min-height: 28px; -} -div[class].topic-actions { -	height: auto; -} -  /* Post body styles  ----------------------------------------*/  .postbody { @@ -278,7 +267,7 @@ div[class].topic-actions {  }  .postbody img.postimage { -	max-width: 99%; +	max-width: 100%;  }  .search .postbody { @@ -613,6 +602,7 @@ dl.file dd {  dl.thumbnail img {  	padding: 3px;  	border: 1px solid transparent; +	box-sizing: border-box;  }  dl.thumbnail dd { @@ -745,14 +735,16 @@ dd.profile-contact {  .profile-contact .dropdown-container {  	display: inline-block; -	text-align: left; -	width: 30px;  }  .profile-contact .icon_contact {  	vertical-align: middle;  } +.profile-contact .dropdown { +	margin-right: -14px; +} +  .online {  	background-image: none;  	background-position: 100% 0; @@ -778,7 +770,7 @@ dl.pmlist dd {  	margin-bottom: 2px;  } -.topic-actions div.dl_links { +.action-bar div.dl_links {  	padding: 10px 0 0 10px;  } @@ -812,6 +804,10 @@ div.dl_links {  	white-space: nowrap;  } +table.fixed-width-table { +	table-layout: fixed; +} +  /* Show scrollbars for items with overflow on iOS devices  ----------------------------------------*/  .postbody .content::-webkit-scrollbar, #topicreview::-webkit-scrollbar, #post_details::-webkit-scrollbar, .codebox code::-webkit-scrollbar, .attachbox dd::-webkit-scrollbar, .attach-image::-webkit-scrollbar, .dropdown-extended ul::-webkit-scrollbar { diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css index 61df82c0ce..e144c74f20 100644 --- a/phpBB/styles/prosilver/theme/cp.css +++ b/phpBB/styles/prosilver/theme/cp.css @@ -59,12 +59,6 @@ ul.cplist {  	border-bottom: none;  } -#cp-main .pagination { -	float: right; -	width: auto; -	padding-top: 1px; -} -  #cp-main .postbody p {  	font-size: 1.1em;  } @@ -103,117 +97,82 @@ ul.cplist {  }  .tabs-container:after { -	display: block;  	clear: both;  	content: ''; +	display: block;  } -/* CP tabbed menu +/* CP tabs shared  ----------------------------------------*/ -#tabs { +#tabs, #minitabs {  	line-height: normal; -	margin: 20px 0 -1px 7px; -	*overflow: hidden;  } -#tabs ul { -	margin:0; -	padding: 0; +#tabs > ul, #minitabs > ul {  	list-style: none; +	margin: 0; +	padding: 0; +	position: relative;  } -#tabs ul:after { +#tabs > ul:after, #minitabs > ul:after { +	clear: both;  	content: '';  	display: block; -	clear: both;  } -#tabs li { -	display: inline; -	margin: 0; -	padding: 0; +#tabs .tab, #minitabs .tab { +	display: inline-block; +	float: left;  	font-size: 1em;  	font-weight: bold; +	line-height: 14px;  } -#tabs a { -	float: left; -	background: none no-repeat 0% -35px; -	margin: 0 1px 0 0; -	padding: 0 0 0 5px; -	text-decoration: none; +#tabs .tab > a, #minitabs .tab > a { +	display: block; +	padding: 5px 9px;  	position: relative; +	text-decoration: none; +	white-space: nowrap;  	cursor: pointer;  } -#tabs a span { -	float: left; -	display: block; -	background: none no-repeat 100% -35px; -	padding: 6px 10px 6px 5px; -	white-space: nowrap; +/* CP tabbed menu  +----------------------------------------*/ +#tabs { +	margin: 20px 0 0 7px;  } -#tabs .activetab a { -	background-position: 0 0; -	border-bottom: 1px solid transparent; +#tabs .tab > a { +	border: 1px solid transparent; +	border-radius: 4px 4px 0 0; +	margin: 1px 1px 0 0;  } -#tabs .activetab a span { -	background-position: 100% 0; +#tabs .activetab > a { +	margin-top: 0;  	padding-bottom: 7px;  } -#tabs a:hover { -	background-position: 0 -70px; -} - -#tabs a:hover span { -	background-position:100% -70px; -} - -#tabs .activetab a:hover { -	background-position: 0 0; -} - -#tabs .activetab a:hover span { -	background-position: 100% 0; -} -  /* Mini tabbed menu used in MCP  ----------------------------------------*/  #minitabs { -	line-height: normal; -	margin: -20px 7px 0 0; -} - -.tabs-container #minitabs {  	float: right; -	margin-top: 19px; +	margin: 15px 7px 0 0;  	max-width: 50%;  } -#minitabs ul { -	margin:0; -	padding: 0; -	list-style: none; -} - -#minitabs li { -	display: block; +#minitabs .tab {  	float: right; -	border-top-left-radius: 5px; -	border-top-right-radius: 5px; -	padding: 5px 10px 4px 10px; -	font-size: 1em; -	font-weight: bold; -	margin-left: 2px;  } -#minitabs a { +#minitabs .tab > a { +	border-radius: 5px 5px 0 0; +	margin-left: 2px;  } -#minitabs a:hover { +#minitabs .tab > a:hover {  	text-decoration: none;  } @@ -223,8 +182,8 @@ ul.cplist {  	position: relative;  } -.responsive-tab .responsive-tab-link span { -	display: inline-block; +.responsive-tab > a.responsive-tab-link { +	display: block;  	font-size: 16px;  	position: relative;  	width: 16px; @@ -232,80 +191,41 @@ ul.cplist {  	text-decoration: none;  } -#minitabs .responsive-tab .responsive-tab-link span { -	display: block; -} - -.responsive-tab .responsive-tab-link span:before { +.responsive-tab .responsive-tab-link:before {  	content: '';  	position: absolute; -	left: 5px; -	top: 8px; +	left: 10px; +	top: 7px;  	height: .125em;  	width: 14px;  	border-bottom: 0.125em solid transparent;  	border-top: 0.375em double transparent;  } -#minitabs .responsive-tab .responsive-tab-link span:before { -	left: 0; -	top: 2px; -} - -#tabs ul, #minitabs ul { -	position: relative; -} -  #tabs .dropdown, #minitabs .dropdown { -	top: 29px; -	margin-right: -1px; +	top: 20px; +	margin-right: -2px; +	font-size: 1.1em; +	font-weight: normal;  }  #minitabs .dropdown { -	top: 18px; +	margin-right: -4px;  }  #tabs .dropdown-up .dropdown, #minitabs .dropdown-up .dropdown { -	bottom: -5px; +	bottom: 20px;  	top: auto;  } -#minitabs .dropdown-up .dropdown { -	bottom: 18px; -} - -#tabs .dropdown-right .dropdown, #minitabs .dropdown-right .dropdown { -	margin-left: -41px; -} - -#tabs .dropdown li, #minitabs .dropdown li { -	display: block !important; -	background: transparent none; -	padding: 0; -} - -.tabs-container #minitabs .dropdown a span { -	display: block; -} - -#tabs .dropdown a, #tabs .dropdown a span, #minitabs .dropdown a, #minitabs .dropdown a span { -	background: transparent; -	float: none; -	margin: 0; -	padding: 0; +#tabs .dropdown li {  	text-align: right;  } -.tabs-container #minitabs .dropdown a span { +#minitabs .dropdown li {  	text-align: left;  } -#tabs .dropdown a span, #minitabs .dropdown a span { -	padding: 5px 8px; -	color: inherit !important; -} - -  /* UCP navigation menu  ----------------------------------------*/  /* Container for sub-navigation list */ @@ -315,15 +235,15 @@ ul.cplist {  }  #navigation ul { -	list-style:none; +	list-style: none;  }  /* Default list state */  #navigation li { +	display: inline; +	font-weight: bold;  	margin: 1px 0;  	padding: 0; -	font-weight: bold; -	display: inline;  }  /* Link styles for the sub-section links */ @@ -332,18 +252,10 @@ ul.cplist {  	padding: 5px;  	margin: 1px 0;  	text-decoration: none; -	font-weight: bold; -	background: transparent none repeat-y 100% 0;  }  #navigation a:hover {  	text-decoration: none; -	background-image: none; -} - -#navigation #active-subsection a { -	display: block; -	background-image: none;  }  /* Preferences pane layout diff --git a/phpBB/styles/prosilver/theme/images/bg_menu.gif b/phpBB/styles/prosilver/theme/images/bg_menu.gif Binary files differdeleted file mode 100644 index 4a9f5a9174..0000000000 --- a/phpBB/styles/prosilver/theme/images/bg_menu.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/bg_menu_rtl.gif b/phpBB/styles/prosilver/theme/images/bg_menu_rtl.gif Binary files differdeleted file mode 100644 index 10add09a17..0000000000 --- a/phpBB/styles/prosilver/theme/images/bg_menu_rtl.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/bg_tabs1.gif b/phpBB/styles/prosilver/theme/images/bg_tabs1.gif Binary files differdeleted file mode 100644 index 335a72c711..0000000000 --- a/phpBB/styles/prosilver/theme/images/bg_tabs1.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/bg_tabs2.gif b/phpBB/styles/prosilver/theme/images/bg_tabs2.gif Binary files differdeleted file mode 100644 index a2142d5432..0000000000 --- a/phpBB/styles/prosilver/theme/images/bg_tabs2.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/corners_left2.gif b/phpBB/styles/prosilver/theme/images/corners_left2.gif Binary files differdeleted file mode 100644 index fa27ce3ba2..0000000000 --- a/phpBB/styles/prosilver/theme/images/corners_left2.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/corners_right2.gif b/phpBB/styles/prosilver/theme/images/corners_right2.gif Binary files differdeleted file mode 100644 index 2d689446ee..0000000000 --- a/phpBB/styles/prosilver/theme/images/corners_right2.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icons_pagination.png b/phpBB/styles/prosilver/theme/images/icons_pagination.png Binary files differnew file mode 100644 index 0000000000..872b7308c2 --- /dev/null +++ b/phpBB/styles/prosilver/theme/images/icons_pagination.png diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css index ff6df7c9a7..89639dde02 100644 --- a/phpBB/styles/prosilver/theme/links.css +++ b/phpBB/styles/prosilver/theme/links.css @@ -62,6 +62,9 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {  	top: 50%;  	width: 30px;  	height: 40px; +	-webkit-box-sizing: border-box; +	-moz-box-sizing: border-box; +	box-sizing: border-box;  }  .dropdown-extended li:hover a.mark_read { @@ -228,3 +231,7 @@ a.feed-icon-forum {  	float: right;  	margin: 3px;  } + +a.anchor { +	display: block; +} diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index 27aed47c7c..ebae9f6a17 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -41,7 +41,7 @@ body {  	text-align: center;  } -#logo { +.logo {  	/* change display value to inline-block to show logo */  	display: none;  	float: none; @@ -197,14 +197,12 @@ ul.topiclist li.row dt a.subforum {  /* Pagination  ----------------------------------------*/ -.pagination { -	margin: 5px 0; +.pagination > ul { +	margin: 5px 0 0;  } -.pagination li a, .pagination li span { -	min-width: 10px; -	display: inline-block; -	text-align: center; +.row .pagination > ul { +	margin-top: 0;  }  /* Responsive tables @@ -459,11 +457,6 @@ p.rightside {  	margin-bottom: 0;  } -.column1, .column2 { -	width: auto; -	float: none; -} -  fieldset.quickmod {  	width: auto;  	float: none; @@ -507,18 +500,21 @@ fieldset.display-actions {  		margin: 0;  	} -	.topic-actions > .pagination, fieldset.jumpbox { +	.action-bar > .pagination, fieldset.jumpbox {  		text-align: center;  	} -	.topic-actions > .pagination { +	.action-bar > .pagination {  		float: none; -		overflow: hidden;  		clear: both;  		padding-bottom: 1px;  	} -	.topic-actions > div.search-box, p.jumpbox-return { +	.action-bar > .pagination li.page-jump { +		margin: 0 2px; +	} + +	.action-bar > div.search-box, p.jumpbox-return {  		display: none;  	}  | 
