diff options
Diffstat (limited to 'phpBB/styles/prosilver/template')
| -rw-r--r-- | phpBB/styles/prosilver/template/forum_fn.js | 33 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/index_body.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_footer.html | 3 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/plupload.html | 50 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/search_results.html | 13 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_main_bookmarks.html | 16 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_main_front.html | 14 | ||||
| -rwxr-xr-x | phpBB/styles/prosilver/template/ucp_main_subscribed.html | 16 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewforum_body.html | 40 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_body.html | 17 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_topic_tools.html | 39 | 
11 files changed, 173 insertions, 70 deletions
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index 1b2b1954ef..a45f750a63 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -434,6 +434,39 @@ function parse_document(container)  	});  	/** +	* 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'); +		} + +		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); +	}); + +	/**  	* Adjust HTML code for IE8 and older versions		  	*/  	if (oldBrowser) { diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html index 8acc0a8812..bd640fd63f 100644 --- a/phpBB/styles/prosilver/template/index_body.html +++ b/phpBB/styles/prosilver/template/index_body.html @@ -19,6 +19,8 @@  </ul>  <!-- ENDIF --> +<!-- EVENT index_body_forumlist_before --> +  <!-- INCLUDE forumlist_body.html -->  <!-- IF not S_USER_LOGGED_IN and not S_IS_BOT --> diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index 6f297660a2..bbffe8dc3d 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -12,9 +12,6 @@  			</li>  			<!-- IF not S_IS_BOT -->  				<!-- IF U_WATCH_FORUM_LINK --><li class="small-icon icon-<!-- IF S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->"><a href="{U_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_FORUM_TOGGLE}" data-toggle-url="{U_WATCH_FORUM_TOGGLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF --> -				<!-- IF U_WATCH_TOPIC --><li class="small-icon icon-<!-- IF S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->"><a href="{U_WATCH_TOPIC}" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}">{S_WATCH_TOPIC_TITLE}</a></li><!-- ENDIF --> -				<!-- IF U_BOOKMARK_TOPIC --><li class="small-icon icon-bookmark"><a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}">{S_BOOKMARK_TOPIC}</a></li><!-- ENDIF --> -				<!-- IF U_BUMP_TOPIC --><li class="small-icon icon-bump"><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}" data-ajax="true">{L_BUMP_TOPIC}</a></li><!-- ENDIF -->  			<!-- ENDIF -->  			<li class="rightside">{S_TIMEZONE}</li>  			<!-- IF not S_IS_BOT --><li class="rightside"><a href="{U_DELETE_COOKIES}" data-ajax="true" data-refresh="true">{L_DELETE_COOKIES}</a></li><!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/plupload.html b/phpBB/styles/prosilver/template/plupload.html index 564c1b5c36..290992ddd6 100644 --- a/phpBB/styles/prosilver/template/plupload.html +++ b/phpBB/styles/prosilver/template/plupload.html @@ -1,31 +1,47 @@ -<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/plupload.js"></script> -<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/plupload.html5.js"></script> -<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/jquery.plupload.queue/jquery.plupload.queue.js"></script> +<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/plupload.full.min.js?assets_version={T_ASSETS_VERSION}"></script> +<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/jquery.plupload.queue/jquery.plupload.queue.min.js?assets_version={T_ASSETS_VERSION}"></script>  <script type="text/javascript">  //<![CDATA[  phpbb.plupload = {  	i18n: { -		'Select files': '{LA_PLUPLOAD_SELECT_FILES}', +		'b': '{LA_BYTES_SHORT}', +		'kb': '{LA_KB}', +		'mb': '{LA_MB}', +		'gb': '{LA_GB}', +		'tb': '{LA_TB}', +		'Add Files': '{LA_PLUPLOAD_ADD_FILES}',  		'Add files to the upload queue and click the start button.': '{LA_PLUPLOAD_ADD_FILES_TO_QUEUE}', -		'Filename': '{LA_PLUPLOAD_FILENAME}', -		'Status': '{LA_PLUPLOAD_STATUS}', -		'Size': '{LA_PLUPLOAD_SIZE}', -		'Add files': '{LA_PLUPLOAD_ADD_FILES}', -		'Stop current upload': '{LA_PLUPLOAD_STOP_CURRENT_UPLOAD}', -		'Start uploading queue': '{LA_PLUPLOAD_START_CURRENT_UPLOAD}', -		'Uploaded %d/%d files': '{LA_PLUPLOAD_UPLOADED}', -		'N/A': '{LA_PLUPLOAD_NOT_APPLICABLE}', +		'Close': '{LA_PLUPLOAD_CLOSE}',  		'Drag files here.': '{LA_PLUPLOAD_DRAG}', +		'Duplicate file error.': '{LA_PLUPLOAD_DUPLICATE_ERROR}', +		'Error: File too large:': '{LA_PLUPLOAD_ERR_FILE_TOO_LARGE}', +		'Error: Invalid file extension:': '{LA_PLUPLOAD_ERR_FILE_INVALID_EXT}', +		'File: %s': '{LA_PLUPLOAD_FILE}', +		'File: %s, size: %d, max file size: %d': '{LA_PLUPLOAD_FILE_DETAILS}', +		'File count error.': '{LA_PLUPLOAD_ERR_FILE_COUNT}',  		'File extension error.': '{LA_PLUPLOAD_EXTENSION_ERROR}',  		'File size error.': '{LA_PLUPLOAD_SIZE_ERROR}', -		'Init error.': '{LA_PLUPLOAD_INIT_ERROR}', -		'HTTP Error.': '{LA_PLUPLOAD_HTTP_ERROR}', -		'Security error.': '{LA_PLUPLOAD_SECURITY_ERROR}', +		'Filename': '{LA_PLUPLOAD_FILENAME}',  		'Generic error.': '{LA_PLUPLOAD_GENERIC_ERROR}', +		'HTTP Error.': '{LA_PLUPLOAD_HTTP_ERROR}', +		'Image format either wrong or not supported.': '{LA_PLUPLOAD_IMAGE_FORMAT}', +		'Init error.': '{LA_PLUPLOAD_INIT_ERROR}',  		'IO error.': '{LA_PLUPLOAD_IO_ERROR}', +		'N/A': '{LA_PLUPLOAD_NOT_APPLICABLE}', +		'Runtime ran out of available memory.': '{LA_PLUPLOAD_ERR_RUNTIME_MEMORY}', +		'Security error.': '{LA_PLUPLOAD_SECURITY_ERROR}', +		'Select files': '{LA_PLUPLOAD_SELECT_FILES}', +		'Size': '{LA_PLUPLOAD_SIZE}', +		'Start Upload': '{LA_PLUPLOAD_START_UPLOAD}', +		'Start uploading queue': '{LA_PLUPLOAD_START_CURRENT_UPLOAD}', +		'Status': '{LA_PLUPLOAD_STATUS}',  		'Stop Upload': '{LA_PLUPLOAD_STOP_UPLOAD}', -		'Start upload': '{LA_PLUPLOAD_START_UPLOAD}', -		'%d files queued': '{LA_PLUPLOAD_FILES_QUEUED}' +		'Stop current upload': '{LA_PLUPLOAD_STOP_CURRENT_UPLOAD}', +		'Upload element accepts only %d file(s) at a time. Extra files were stripped.': '{LA_PLUPLOAD_ERR_UPLOAD_LIMIT}', +		"Upload URL might be wrong or doesn't exist.": '{LA_PLUPLOAD_ERR_UPLOAD_URL}', +		'Uploaded %d/%d files': '{LA_PLUPLOAD_UPLOADED}', +		'%d files queued': '{LA_PLUPLOAD_FILES_QUEUED}', +		'%s already present in the queue.': '{LA_PLUPLOAD_ALREADY_QUEUED}'  	},  	config: {  		runtimes: 'html5', diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index c5b2b990c8..1a83484235 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -64,8 +64,13 @@  						<div class="list-inner">  							<!-- EVENT topiclist_row_prepend --> -							<!-- IF searchresults.S_UNREAD_TOPIC --><a href="{searchresults.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --> -							<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a> {searchresults.ATTACH_ICON_IMG} +							<!-- IF searchresults.S_UNREAD_TOPIC and not S_IS_BOT --> +								<a href="{searchresults.U_NEWEST_POST}">{NEWEST_POST_IMG}</a>  +								<a href="{searchresults.U_NEWEST_POST}" class="topictitle">{searchresults.TOPIC_TITLE}</a> +							<!-- ELSE --> +								<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a> +							<!-- ENDIF --> +							{searchresults.ATTACH_ICON_IMG}  							<!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED --><a href="{searchresults.U_MCP_QUEUE}">{searchresults.UNAPPROVED_IMG}</a> <!-- ENDIF -->  							<!-- IF searchresults.S_TOPIC_DELETED --><a href="{searchresults.U_MCP_QUEUE}">{DELETED_IMG}</a> <!-- ENDIF -->  							<!-- IF searchresults.S_TOPIC_REPORTED --><a href="{searchresults.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br /> @@ -83,7 +88,7 @@  								</ul>  							</div>  							<!-- ENDIF --> -							{L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} » {searchresults.FIRST_POST_TIME} » {L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a> +							{L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} » <!-- IF not S_IS_BOT --><a href="{searchresults.U_VIEW_TOPIC}" title="{L_GOTO_FIRST_POST}">{searchresults.FIRST_POST_TIME}</a><!-- ELSE -->{searchresults.FIRST_POST_TIME}<!-- ENDIF --> » {L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a>  							<!-- EVENT topiclist_row_append -->  						</div> @@ -92,7 +97,7 @@  					<dd class="views">{searchresults.TOPIC_VIEWS}</dd>  					<dd class="lastpost"><span>  						{L_POST_BY_AUTHOR} {searchresults.LAST_POST_AUTHOR_FULL} -						<!-- IF not S_IS_BOT --><a href="{searchresults.U_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{searchresults.LAST_POST_TIME}<br /> </span> +						<!-- IF not S_IS_BOT --><a href="{searchresults.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{searchresults.LAST_POST_TIME}<br /> </span>  					</dd>  				</dl>  			</li> diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html index 477b06249e..96becc42e7 100644 --- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html +++ b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html @@ -37,9 +37,15 @@  			<dl class="icon {topicrow.TOPIC_IMG_STYLE}">  				<dt<!-- IF topicrow.TOPIC_ICON_IMG --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}">  					<div class="list-inner"> -						<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> +						<!-- IF topicrow.S_UNREAD_TOPIC --> +							<a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a>  +							<a href="{topicrow.U_NEWEST_POST}" class="topictitle">{topicrow.TOPIC_TITLE}</a> +						<!-- ELSE --> +							<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> +						<!-- ENDIF -->  						<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF --> -						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br /> +						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --> +						<br />  						<!-- IF .topicrow.pagination -->  						<div class="pagination">  							<ul> @@ -56,17 +62,17 @@  						<!-- ENDIF -->  						<div class="responsive-hide">  							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> -							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} +							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » <a href="{topicrow.U_VIEW_TOPIC}" title="{L_GOTO_FIRST_POST}">{topicrow.FIRST_POST_TIME}</a>  						</div>  						<div class="responsive-show" style="display: none;">  							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->  							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} « -							<a href="{topicrow.U_LAST_POST}">{topicrow.LAST_POST_TIME}</a> +							<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a>  						</div>  					</div>  				</dt>  				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} -					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span> +					<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span>  				</dd>  				<dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}" /></dd>  			</dl> diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html index fa3291cd6c..eca224f2d9 100644 --- a/phpBB/styles/prosilver/template/ucp_main_front.html +++ b/phpBB/styles/prosilver/template/ucp_main_front.html @@ -16,7 +16,13 @@  			<dl class="icon {topicrow.TOPIC_IMG_STYLE}">  				<dt <!-- IF topicrow.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->>  					<div class="list-inner"> -						<!-- IF topicrow.S_UNREAD --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a><br /> +						<!-- IF topicrow.S_UNREAD --> +							<a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a>  +							<a href="{topicrow.U_NEWEST_POST}" class="topictitle">{topicrow.TOPIC_TITLE}</a> +						<!-- ELSE --> +							<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> +						<!-- ENDIF --> +						<br />  						<!-- IF .topicrow.pagination -->  						<div class="pagination">  							<ul> @@ -33,16 +39,16 @@  						<!-- ENDIF -->  						<div class="responsive-hide">  							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> -							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} +							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » <a href="{topicrow.U_VIEW_TOPIC}" title="{L_GOTO_FIRST_POST}">{topicrow.FIRST_POST_TIME}</a>  						</div>  						<div class="responsive-show" style="display: none;">  							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> -							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} « <a href="{topicrow.U_LAST_POST}">{topicrow.LAST_POST_TIME}</a> +							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} « <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a>  						</div>  					</div>  				</dt>  				<dd class="lastpost"><span>{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} -					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span> +					<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span>  				</dd>  			</dl>  		</li> diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html index 7344a4af1a..0187f3cc3f 100755 --- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html +++ b/phpBB/styles/prosilver/template/ucp_main_subscribed.html @@ -72,9 +72,15 @@  			<dl class="icon {topicrow.TOPIC_IMG_STYLE}">  				<dt<!-- IF topicrow.TOPIC_ICON_IMG --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}">  					<div class="list-inner"> -						<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> +						<!-- IF topicrow.S_UNREAD_TOPIC --> +							<a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a>  +							<a href="{topicrow.U_NEWEST_POST}" class="topictitle">{topicrow.TOPIC_TITLE}</a> +						<!-- ELSE --> +							<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> +						<!-- ENDIF -->  						<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF --> -						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br /> +						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --> +						<br />  						<!-- IF .topicrow.pagination -->  						<div class="pagination">  							<ul> @@ -91,16 +97,16 @@  						<!-- ENDIF -->  						<div class="responsive-hide">  							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> -							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} +							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » <a href="{topicrow.U_VIEW_TOPIC}" title="{L_GOTO_FIRST_POST}">{topicrow.FIRST_POST_TIME}</a>  						</div>  						<div class="responsive-show" style="display: none;">  							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> -							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} « <a href="{topicrow.U_LAST_POST}">{topicrow.LAST_POST_TIME}</a> +							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} « <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a>  						</div>  					</div>  				</dt>  				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} -					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span> +					<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span>  				</dd>  				<dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}" /></dd>  			</dl> diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index f0994f0716..e4c0a40d3a 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -55,17 +55,15 @@  		</div>  	<!-- ENDIF --> -	<!-- IF .pagination or TOTAL_POSTS or TOTAL_TOPICS --> -		<div class="pagination"> -			<!-- IF not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}" accesskey="m" data-ajax="mark_topics_read" data-overlay="false">{L_MARK_TOPICS_READ}</a> • <!-- ENDIF --> -			<!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS} • <!-- ENDIF --> -			<!-- IF .pagination --> -				<!-- INCLUDE pagination.html --> -			<!-- ELSE --> -				{PAGE_NUMBER} -			<!-- ENDIF --> -		</div> -	<!-- ENDIF --> +	<div class="pagination"> +		<!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}" accesskey="m" data-ajax="mark_topics_read" data-overlay="false">{L_MARK_TOPICS_READ}</a> • <!-- ENDIF --> +		{TOTAL_TOPICS} •  +		<!-- IF .pagination --> +			<!-- INCLUDE pagination.html --> +		<!-- ELSE --> +			{PAGE_NUMBER} +		<!-- ENDIF --> +	</div>  	</div>  <!-- ENDIF --> @@ -145,7 +143,12 @@  				<dt<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}">  					<div class="list-inner">  						<!-- EVENT topiclist_row_prepend --> -						<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> +						<!-- IF topicrow.S_UNREAD_TOPIC and not S_IS_BOT --> +							<a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a>  +							<a href="{topicrow.U_NEWEST_POST}" class="topictitle">{topicrow.TOPIC_TITLE}</a> +						<!-- ELSE --> +							<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> +						<!-- ENDIF -->  						<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->  						<!-- IF topicrow.S_TOPIC_DELETED --><a href="{topicrow.U_MCP_QUEUE}">{DELETED_IMG}</a> <!-- ENDIF -->  						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br /> @@ -165,12 +168,12 @@  						<!-- ENDIF -->  						<div class="responsive-hide">  							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> -							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} +							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » <!-- IF not S_IS_BOT --><a href="{topicrow.U_VIEW_TOPIC}" title="{L_GOTO_FIRST_POST}">{topicrow.FIRST_POST_TIME}</a><!-- ELSE -->{topicrow.FIRST_POST_TIME}<!-- ENDIF -->  							<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --> » {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF -->  						</div>  						<!-- IF not S_IS_BOT -->  						<div class="responsive-show" style="display: none;"> -							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} « <a href="{topicrow.U_LAST_POST}">{topicrow.LAST_POST_TIME}</a> +							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} « <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a>  							<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --><br />{L_POSTED} {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF -->  							<!-- IF topicrow.REPLIES --><br />{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong><!-- ENDIF -->  						</div> @@ -182,7 +185,7 @@  				<dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd>  				<dd class="views">{topicrow.VIEWS} <dfn>{L_VIEWS}</dfn></dd>  				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} -					<!-- IF not S_IS_BOT --><a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{topicrow.LAST_POST_TIME}</span> +					<!-- IF not S_IS_BOT --><a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{topicrow.LAST_POST_TIME}</span>  				</dd>  			</dl>  		</li> @@ -227,18 +230,15 @@  		</div>  		<!-- ENDIF --> -		<!-- IF PAGE_NUMBER or TOTAL_POSTS or TOTAL_TOPICS -->  		<div class="pagination"> -			<!-- IF TOTAL_TOPICS and not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}" data-ajax="mark_topics_read" data-overlay="false">{L_MARK_TOPICS_READ}</a> •  <!-- ENDIF --> -			<!-- IF TOTAL_POSTS and not NEWEST_USER --> {TOTAL_POSTS}<!-- ELSEIF TOTAL_TOPICS and not NEWEST_USER --> {TOTAL_TOPICS} • <!-- ENDIF --> -			<!-- IF TOTAL_USERS -->{TOTAL_USERS} • <!-- ENDIF --> +			<!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}" data-ajax="mark_topics_read" data-overlay="false">{L_MARK_TOPICS_READ}</a> • <!-- ENDIF --> +			{TOTAL_TOPICS} •   			<!-- IF .pagination -->  				<!-- INCLUDE pagination.html -->  			<!-- ELSE -->  				{PAGE_NUMBER}  			<!-- ENDIF -->  		</div> -		<!-- ENDIF -->  	</div>  <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 46881d3b03..338c67dd33 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -33,6 +33,8 @@  	<!-- ENDIF -->  	</div> +	<!-- INCLUDE viewtopic_topic_tools.html --> +  	<!-- IF S_DISPLAY_SEARCHBOX -->  		<div class="search-box">  			<form method="get" id="topic-search" action="{S_SEARCHBOX_ACTION}"> @@ -55,9 +57,8 @@  			<!-- ENDIF -->  		</div>  	<!-- ENDIF --> - +	<div class="clear"></div>  </div> -<div class="clear"></div>  <!-- IF S_HAS_POLL -->  	<form method="post" action="{S_POLL_ACTION}" data-ajax="vote_poll" class="topic_poll"> @@ -299,16 +300,7 @@  	<!-- ENDIF -->  	</div> -	<!-- IF S_HAS_ATTACHMENTS --> -		<div class="dl_links"> -			<strong>{L_DOWNLOAD_ALL_ATTACHMENTS}{L_COLON}</strong> -			<ul> -			<!-- BEGIN dl_method --> -				<li>[ <a href="{dl_method.LINK}">{dl_method.TYPE}</a> ]</li> -			<!-- END dl_method --> -			</ul> -		</div> -	<!-- ENDIF --> +	<!-- INCLUDE viewtopic_topic_tools.html -->  	<!-- IF .pagination or TOTAL_POSTS -->  		<div class="pagination"> @@ -320,6 +312,7 @@  			<!-- ENDIF -->  		</div>  	<!-- ENDIF --> +	<div class="clear"></div>  </div>  <!-- EVENT viewtopic_body_footer_before --> diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html new file mode 100644 index 0000000000..ec17185bae --- /dev/null +++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html @@ -0,0 +1,39 @@ +<!-- IF not S_IS_BOT and (U_WATCH_TOPIC or U_BOOKMARK_TOPIC or U_BUMP_TOPIC or S_HAS_ATTACHMENTS or S_DISPLAY_TOPIC_TOOLS) --> +	<div class="dropdown-container dropdown-button-control topic-tools"> +		<span title="{L_TOPIC_TOOLS}" class="dropdown-trigger dropdown-select dropdown-select-icon tools-icon"><span></span></span> +		<div class="dropdown hidden"> +			<div class="pointer"><div class="pointer-inner"></div></div> +			<ul class="dropdown-contents"> +				<!-- EVENT viewtopic_topic_tools_before --> +				<!-- IF U_WATCH_TOPIC --> +					<li class="small-icon icon-<!-- IF S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->"> +						<a href="{U_WATCH_TOPIC}" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}"> +							{S_WATCH_TOPIC_TITLE} +						</a> +					</li> +				<!-- ENDIF --> +				<!-- IF U_BOOKMARK_TOPIC --> +					<li class="small-icon icon-bookmark"> +						<a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}"> +							{S_BOOKMARK_TOPIC} +						</a> +					</li> +				<!-- ENDIF --> +				<!-- IF U_BUMP_TOPIC --><li class="small-icon icon-bump"><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}" data-ajax="true">{L_BUMP_TOPIC}</a></li><!-- ENDIF --> +				<!-- IF S_HAS_ATTACHMENTS --> +					<li class="small-icon icon-download"> +						<a class="dropdown-toggle-submenu" href="{U_DOWNLOAD_ALL_ATTACHMENTS}" title="{L_DOWNLOAD_ALL_ATTACHMENTS}">{L_DOWNLOAD_ALL_ATTACHMENTS}</a> +						<ul class="dropdown-submenu hidden"> +							<li> +							<!-- BEGIN dl_method --> +								<a href="{dl_method.LINK}">{dl_method.TYPE}</a><!-- IF not dl_method.S_LAST_ROW --> • <!-- ENDIF -->  +							<!-- END dl_method --> +							</li> +						</ul> +					</li> +				<!-- ENDIF --> +				<!-- EVENT viewtopic_topic_tools_after --> +			</ul> +		</div> +	</div> +<!-- ENDIF -->  | 
