diff options
Diffstat (limited to 'phpBB/styles/prosilver')
194 files changed, 3459 insertions, 2776 deletions
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 019db11bc7..697bcee97d 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -21,11 +21,11 @@ # General Information about this style name = prosilver copyright = © phpBB Limited, 2007 -style_version = 3.1.11 -phpbb_version = 3.1.11 +style_version = 3.2.9 +phpbb_version = 3.2.9 # Defining a different template bitfield -# template_bitfield = lNg= +# template_bitfield = //g= # Parent style # Set value to empty or to this style's name if this style does not have a parent style diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js index ec9b53328f..5e66e5cda1 100644 --- a/phpBB/styles/prosilver/template/ajax.js +++ b/phpBB/styles/prosilver/template/ajax.js @@ -26,7 +26,7 @@ phpbb.addAjaxCallback('mark_forums_read', function(res) { }); // Mark subforums read - $('a.subforum[class*="unread"]').removeClass('unread').addClass('read'); + $('a.subforum[class*="unread"]').removeClass('unread').addClass('read').children('.icon.icon-red').removeClass('icon-red').addClass('icon-blue'); // Mark topics read if we are watching a category and showing active topics if ($('#active_topics').length) { @@ -87,7 +87,7 @@ phpbb.addAjaxCallback('mark_topics_read', function(res, updateTopicLinks) { }); // Remove link to first unread post - $('a').has('span.icon_topic_newest').remove(); + $('a.unread').has('.icon-red').remove(); // Update mark topics read links if (updateTopicLinks) { @@ -199,7 +199,7 @@ phpbb.addAjaxCallback('zebra', function(res) { */ phpbb.addAjaxCallback('vote_poll', function(res) { if (typeof res.success !== 'undefined') { - var poll = $('.topic_poll'); + var poll = $(this).closest('.topic_poll'); var panel = poll.find('.panel'); var resultsVisible = poll.find('dl:first-child .resultbar').is(':visible'); var mostVotes = 0; diff --git a/phpBB/styles/prosilver/template/attachment.html b/phpBB/styles/prosilver/template/attachment.html index 4546f53d6c..615717e026 100644 --- a/phpBB/styles/prosilver/template/attachment.html +++ b/phpBB/styles/prosilver/template/attachment.html @@ -8,14 +8,14 @@ <!-- IF _file.S_THUMBNAIL --> <dl class="thumbnail"> - <dt><a href="{_file.U_DOWNLOAD_LINK}"><img src="{_file.THUMB_IMAGE}" class="postimage" alt="{_file.DOWNLOAD_NAME}" title="{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}" /></a></dt> + <dt><a href="{_file.U_DOWNLOAD_LINK}"><img src="{_file.THUMB_IMAGE}" class="postimage" alt="{% if _file.COMMENT %}{{ _file.COMMENT|e('html') }}{% else %}{{ _file.DOWNLOAD_NAME }}{% endif %}" title="{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}" /></a></dt> <!-- IF _file.COMMENT --><dd> {_file.COMMENT}</dd><!-- ENDIF --> </dl> <!-- ENDIF --> <!-- IF _file.S_IMAGE --> <dl class="file"> - <dt class="attach-image"><img src="{_file.U_INLINE_LINK}" class="postimage" alt="{_file.DOWNLOAD_NAME}" onclick="viewableArea(this);" /></dt> + <dt class="attach-image"><img src="{_file.U_INLINE_LINK}" class="postimage" alt="{% if _file.COMMENT %}{{ _file.COMMENT|e('html') }}{% else %}{{ _file.DOWNLOAD_NAME }}{% endif %}" onclick="viewableArea(this);" /></dt> <!-- IF _file.COMMENT --><dd><em>{_file.COMMENT}</em></dd><!-- ENDIF --> <dd>{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}</dd> </dl> @@ -29,36 +29,7 @@ </dl> <!-- ENDIF --> - <!-- IF _file.S_WM_FILE --> - <!-- method used here from http://alistapart.com/articles/byebyeembed / autosizing seems to not work always, this will not fix --> - <object width="320" height="285" classid="CLSID:6BF52A52-394A-11d3-B153-00C04F79FAA6" id="wmstream_{_file.ATTACH_ID}"> - <param name="url" value="{_file.U_DOWNLOAD_LINK}" /> - <param name="showcontrols" value="1" /> - <param name="showdisplay" value="0" /> - <param name="showstatusbar" value="0" /> - <param name="autosize" value="1" /> - <param name="autostart" value="0" /> - <param name="visible" value="1" /> - <param name="animationstart" value="0" /> - <param name="loop" value="0" /> - <param name="src" value="{_file.U_DOWNLOAD_LINK}" /> - <!--[if !IE]>--> - <object width="320" height="285" type="video/x-ms-wmv" data="{_file.U_DOWNLOAD_LINK}"> - <param name="src" value="{_file.U_DOWNLOAD_LINK}" /> - <param name="controller" value="1" /> - <param name="showcontrols" value="1" /> - <param name="showdisplay" value="0" /> - <param name="showstatusbar" value="0" /> - <param name="autosize" value="1" /> - <param name="autostart" value="0" /> - <param name="visible" value="1" /> - <param name="animationstart" value="0" /> - <param name="loop" value="0" /> - </object> - <!--<![endif]--> - </object> - - <!-- ELSEIF _file.S_FLASH_FILE --> + <!-- IF _file.S_FLASH_FILE --> <object classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000" codebase="http://active.macromedia.com/flash2/cabs/swflash.cab#version=5,0,0,0" width="{_file.WIDTH}" height="{_file.HEIGHT}"> <param name="movie" value="{_file.U_VIEW_LINK}" /> <param name="play" value="true" /> @@ -68,53 +39,7 @@ <param name="allowNetworking" value="internal" /> <embed src="{_file.U_VIEW_LINK}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{_file.WIDTH}" height="{_file.HEIGHT}" play="true" loop="true" quality="high" allowscriptaccess="never" allownetworking="internal"></embed> </object> - <!-- ELSEIF _file.S_QUICKTIME_FILE --> - <object id="qtstream_{_file.ATTACH_ID}" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0" width="320" height="285"> - <param name="src" value="{_file.U_DOWNLOAD_LINK}" /> - <param name="controller" value="true" /> - <param name="autoplay" value="false" /> - <param name="type" value="video/quicktime" /> - <embed name="qtstream_{_file.ATTACH_ID}" src="{_file.U_DOWNLOAD_LINK}" pluginspage="http://www.apple.com/quicktime/download/" enablejavascript="true" controller="true" width="320" height="285" type="video/quicktime" autoplay="false"></embed> - </object> - <!-- ELSEIF _file.S_RM_FILE --> - <object id="rmstream_{_file.ATTACH_ID}" classid="clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA" width="200" height="50"> - <param name="src" value="{_file.U_DOWNLOAD_LINK}" /> - <param name="autostart" value="false" /> - <param name="controls" value="ImageWindow" /> - <param name="console" value="ctrls_{_file.ATTACH_ID}" /> - <param name="prefetch" value="false" /> - <embed name="rmstream_{_file.ATTACH_ID}" type="audio/x-pn-realaudio-plugin" src="{_file.U_DOWNLOAD_LINK}" width="0" height="0" autostart="false" controls="ImageWindow" console="ctrls_{_file.ATTACH_ID}" prefetch="false"></embed> - </object> - <br /> - <object id="ctrls_{_file.ATTACH_ID}" classid="clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA" width="0" height="36"> - <param name="controls" value="ControlPanel" /> - <param name="console" value="ctrls_{_file.ATTACH_ID}" /> - <embed name="ctrls_{_file.ATTACH_ID}" type="audio/x-pn-realaudio-plugin" width="200" height="36" controls="ControlPanel" console="ctrls_{_file.ATTACH_ID}"></embed> - </object> - - <script type="text/javascript"> - // <![CDATA[ - if (document.rmstream_{_file.ATTACH_ID}.GetClipWidth) - { - while (!document.rmstream_{_file.ATTACH_ID}.GetClipWidth()) - { - } - - var width = document.rmstream_{_file.ATTACH_ID}.GetClipWidth(); - var height = document.rmstream_{_file.ATTACH_ID}.GetClipHeight(); - - document.rmstream_{_file.ATTACH_ID}.width = width; - document.rmstream_{_file.ATTACH_ID}.height = height; - document.ctrls_{_file.ATTACH_ID}.width = width; - } - // ]]> - </script> - <!-- ENDIF --> - - <!-- IF _file.S_WM_FILE or _file.S_RM_FILE or _file.S_FLASH_FILE or _file.S_QUICKTIME_FILE --> - <p> - <!-- IF _file.S_QUICKTIME_FILE --><a href="#" onclick="play_qt_file(document.qtstream_{_file.ATTACH_ID}); return false;">[ {L_PLAY_QUICKTIME_FILE} ]</a> <!-- ENDIF --> - <a href="{_file.U_DOWNLOAD_LINK}">{_file.DOWNLOAD_NAME}</a> [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ]</p> + <p><a href="{_file.U_DOWNLOAD_LINK}">{_file.DOWNLOAD_NAME}</a> [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ]</p> <!-- ENDIF --> <!-- EVENT attachment_file_append --> diff --git a/phpBB/styles/prosilver/template/bbcode.html b/phpBB/styles/prosilver/template/bbcode.html index 49bcd56945..b37ba238d2 100644 --- a/phpBB/styles/prosilver/template/bbcode.html +++ b/phpBB/styles/prosilver/template/bbcode.html @@ -11,9 +11,48 @@ <!-- BEGIN quote_username_open --><blockquote><div><cite>{USERNAME} {L_WROTE}{L_COLON}</cite><!-- END quote_username_open --> <!-- BEGIN quote_open --><blockquote class="uncited"><div><!-- END quote_open --> <!-- BEGIN quote_close --></div></blockquote><!-- END quote_close --> +<!-- BEGIN quote_extended --> +<blockquote> + <xsl:if test="not(@author)"> + <xsl:attribute name="class">uncited</xsl:attribute> + </xsl:if> + <div> + <xsl:if test="@author"> + <cite> + <xsl:choose> + <xsl:when test="@url"> + <a href="{@url}" class="postlink"><xsl:value-of select="@author"/></a> + </xsl:when> + <xsl:when test="@profile_url"> + <a href="{@profile_url}"><xsl:value-of select="@author"/></a> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="@author"/> + </xsl:otherwise> + </xsl:choose> + <xsl:text> </xsl:text> + <xsl:value-of select="$L_WROTE"/> + <xsl:value-of select="$L_COLON"/> + <xsl:if test="@post_url"> + <xsl:text> </xsl:text> + <a href="{@post_url}" data-post-id="{@post_id}" onclick="if(document.getElementById(hash.substr(1)))href=hash">↑</a> + </xsl:if> + <xsl:if test="@msg_url"> + <xsl:text> </xsl:text> + <a href="{@msg_url}" data-msg-id="{@msg_id}">↑</a> + </xsl:if> + <xsl:if test="@date"> + <div class="responsive-hide"><xsl:value-of select="@date"/></div> + </xsl:if> + </cite> + </xsl:if> + <xsl:apply-templates/> + </div> +</blockquote> +<!-- END quote_extended --> -<!-- BEGIN code_open --><div class="codebox"><p>{L_CODE}{L_COLON} <a href="#" onclick="selectCode(this); return false;">{L_SELECT_ALL_CODE}</a></p><code><!-- END code_open --> -<!-- BEGIN code_close --></code></div><!-- END code_close --> +<!-- BEGIN code_open --><div class="codebox"><p>{L_CODE}{L_COLON} <a href="#" onclick="selectCode(this); return false;">{L_SELECT_ALL_CODE}</a></p><pre><code><!-- END code_open --> +<!-- BEGIN code_close --></code></pre></div><!-- END code_close --> <!-- BEGIN inline_attachment_open --><div class="inline-attachment"><!-- END inline_attachment_open --> <!-- BEGIN inline_attachment_close --></div><!-- END inline_attachment_close --> diff --git a/phpBB/styles/prosilver/template/captcha_recaptcha.html b/phpBB/styles/prosilver/template/captcha_recaptcha.html index fee0f7423e..a123f543a8 100644 --- a/phpBB/styles/prosilver/template/captcha_recaptcha.html +++ b/phpBB/styles/prosilver/template/captcha_recaptcha.html @@ -12,24 +12,11 @@ <dl> <dt><label>{L_CONFIRM_CODE}{L_COLON}</label><br /><span>{L_RECAPTCHA_EXPLAIN}</span></dt> <dd class="captcha"> - <script> - var RecaptchaOptions = { - lang : '{LA_RECAPTCHA_LANG}', - theme : 'clean', - tabindex : <!-- IF $CAPTCHA_TAB_INDEX -->{$CAPTCHA_TAB_INDEX}<!-- ELSE -->10<!-- ENDIF --> - }; - </script> - <script src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"></script> - <noscript> - <div> - <object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br /> - <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea> - <input type="hidden" name="recaptcha_response_field" value="manual_challenge" /> - </div> + <div>{L_RECAPTCHA_NOSCRIPT}</div> </noscript> - - <a href="http://www.google.com/intl/{LA_RECAPTCHA_LANG}/policies/" target="_blank" class="recaptcha-responsive" style="display: none"><img alt="" width="71" height="36" src="{RECAPTCHA_SERVER}/img/clean/logo.png"></a> + <script src="{RECAPTCHA_SERVER}.js?hl={LA_RECAPTCHA_LANG}" async defer></script> + <div class="g-recaptcha" data-sitekey="{RECAPTCHA_PUBKEY}" data-tabindex="<!-- IF $CAPTCHA_TAB_INDEX -->{$CAPTCHA_TAB_INDEX}<!-- ELSE -->10<!-- ENDIF -->"></div> </dd> </dl> <!-- ELSE --> diff --git a/phpBB/styles/prosilver/template/confirm_delete_body.html b/phpBB/styles/prosilver/template/confirm_delete_body.html index fbd881a940..637830a5bc 100644 --- a/phpBB/styles/prosilver/template/confirm_delete_body.html +++ b/phpBB/styles/prosilver/template/confirm_delete_body.html @@ -49,6 +49,8 @@ </dl> <!-- ENDIF --> + {% EVENT confirm_delete_body_delete_reason_before %} + <dl> <dt><label for="delete_reason">{L_DELETE_REASON}{L_COLON}</label><br /><span>{L_DELETE_REASON_EXPLAIN}</span></dt> <dd><input type="text" name="delete_reason" id="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" /></dd> @@ -58,7 +60,7 @@ <fieldset class="submit-buttons"> {S_HIDDEN_FIELDS} - <input type="submit" name="confirm" value="{L_YES}" class="button1" /> + <input type="submit" name="confirm" value="{L_YES}" class="button1" /> <input type="submit" name="cancel" value="{L_NO}" class="button2" /> </fieldset> diff --git a/phpBB/styles/prosilver/template/display_options.html b/phpBB/styles/prosilver/template/display_options.html new file mode 100644 index 0000000000..a426d08845 --- /dev/null +++ b/phpBB/styles/prosilver/template/display_options.html @@ -0,0 +1,27 @@ +<div class="dropdown-container dropdown-container-left dropdown-button-control sort-tools"> + <span title="{L_SORT_OPTIONS}" class="button button-secondary dropdown-trigger dropdown-select"> + <i class="icon fa-sort-amount-asc fa-fw" aria-hidden="true"></i> + <span class="caret"><i class="icon fa-sort-down fa-fw" aria-hidden="true"></i></span> + </span> + <div class="dropdown hidden"> + <div class="pointer"><div class="pointer-inner"></div></div> + <div class="dropdown-contents"> + <fieldset class="display-options"> + <!-- IF S_SORT_OPTIONS --> + <label>{L_SORT_BY}{L_COLON} <select name="sk" id="sk">{S_SORT_OPTIONS}</select></label> + <label>{L_SORT_DIRECTION}{L_COLON} <select name="sd" id="sd">{S_ORDER_SELECT}</select></label> + <hr class="dashed" /> + <input type="submit" class="button2" name="sort" value="{L_SORT}" /> + <!-- ELSE --> + <label>{L_DISPLAY}{L_COLON} {S_SELECT_SORT_DAYS}</label> + <!-- IF S_SELECT_SORT_KEY --> + <label>{L_SORT_BY}{L_COLON} {S_SELECT_SORT_KEY}</label> + <label>{L_SORT_DIRECTION}{L_COLON} {S_SELECT_SORT_DIR}</label> + <!-- ENDIF --> + <hr class="dashed" /> + <input type="submit" class="button2" name="sort" value="{L_GO}" /> + <!-- ENDIF --> + </fieldset> + </div> + </div> +</div> diff --git a/phpBB/styles/prosilver/template/faq_body.html b/phpBB/styles/prosilver/template/faq_body.html index 53205d14e9..e55c12ac48 100644 --- a/phpBB/styles/prosilver/template/faq_body.html +++ b/phpBB/styles/prosilver/template/faq_body.html @@ -34,8 +34,10 @@ <dl class="faq"> <dt id="f{faq_block.S_ROW_COUNT}r{faq_block.faq_row.S_ROW_COUNT}"><strong>{faq_block.faq_row.FAQ_QUESTION}</strong></dt> <dd>{faq_block.faq_row.FAQ_ANSWER}</dd> - <dd><a href="#faqlinks" class="top2">{L_BACK_TO_TOP}</a></dd> </dl> + <a href="#faqlinks" class="top"> + <i class="icon fa-chevron-circle-up fa-fw icon-gray" aria-hidden="true"></i><span>{L_BACK_TO_TOP}</span> + </a> <!-- IF not faq_block.faq_row.S_LAST_ROW --><hr class="dashed" /><!-- ENDIF --> <!-- END faq_row --> </div> diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index d779008f80..3f28f8a326 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -194,37 +194,6 @@ function selectCode(a) { } } -/** -* Play quicktime file by determining it's width/height -* from the displayed rectangle area -*/ -function play_qt_file(obj) { - 'use strict'; - - var rectangle = obj.GetRectangle(); - var width, height; - - if (rectangle) { - rectangle = rectangle.split(','); - var x1 = parseInt(rectangle[0], 10); - var x2 = parseInt(rectangle[2], 10); - var y1 = parseInt(rectangle[1], 10); - var y2 = parseInt(rectangle[3], 10); - - width = (x1 < 0) ? (x1 * -1) + x2 : x2 - x1; - height = (y1 < 0) ? (y1 * -1) + y2 : y2 - y1; - } else { - width = 200; - height = 0; - } - - obj.width = width; - obj.height = height + 16; - - obj.SetControllerVisible(true); - obj.Play(); -} - var inAutocomplete = false; var lastKeyEntered = ''; @@ -304,11 +273,9 @@ function insertUser(formId, value) { function insert_marked_users(formId, users) { 'use strict'; - for (var i = 0; i < users.length; i++) { - if (users[i].checked) { - insertUser(formId, users[i].value); - } - } + $(users).filter(':checked').each(function() { + insertUser(formId, this.value); + }); window.close(); } @@ -365,13 +332,13 @@ function parseDocument($container) { /** * Adjust HTML code for IE8 and older versions */ - if (oldBrowser) { - // Fix .linklist.bulletin lists - $container - .find('ul.linklist.bulletin > li') - .filter(':first-child, .rightside:last-child') - .addClass('no-bulletin'); - } + // if (oldBrowser) { + // // Fix .linklist.bulletin lists + // $container + // .find('ul.linklist.bulletin > li') + // .filter(':first-child, .rightside:last-child') + // .addClass('no-bulletin'); + // } /** * Resize navigation (breadcrumbs) block to keep all links on same line @@ -492,7 +459,7 @@ function parseDocument($container) { $linksFirst = $linksNotSkip.not(filterLast), // The items that will be hidden first $linksLast = $linksNotSkip.filter(filterLast), // The items that will be hidden last persistent = $this.attr('id') === 'nav-main', // Does this list already have a menu (such as quick-links)? - html = '<li class="responsive-menu hidden"><a href="javascript:void(0);" class="responsive-menu-link"> </a><div class="dropdown hidden"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>', + html = '<li class="responsive-menu hidden"><a href="javascript:void(0);" class="js-responsive-menu-link responsive-menu-link"><i class="icon fa-bars fa-fw" aria-hidden="true"></i></a><div class="dropdown"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>', slack = 3; // Vertical slack space (in pixels). Determines how sensitive the script is in determining whether a line-break has occured. // Add a hidden drop-down menu to each links list (except those that already have one) @@ -581,8 +548,10 @@ function parseDocument($container) { $menuContents.prepend($clones1.addClass('clone clone-first').removeClass('leftside rightside')); if ($this.hasClass('post-buttons')) { - $('.button', $menuContents).removeClass('button icon-button'); - $('.responsive-menu-link', $menu).addClass('button icon-button').prepend('<span></span>'); + $('.button', $menuContents).removeClass('button'); + $('.sr-only', $menuContents).removeClass('sr-only'); + $('.js-responsive-menu-link').addClass('button').addClass('button-icon-only'); + $('.js-responsive-menu-link .icon').removeClass('fa-bars').addClass('fa-ellipsis-h'); } copied1 = true; } @@ -636,12 +605,12 @@ function parseDocument($container) { } if (!persistent) { - phpbb.registerDropdown($menu.find('a.responsive-menu-link'), $menu.find('.dropdown'), false); + phpbb.registerDropdown($menu.find('a.js-responsive-menu-link'), $menu.find('.dropdown'), false); } // If there are any images in the links list, run the check again after they have loaded $linksAll.find('img').each(function() { - $(this).load(function() { + $(this).on('load', function() { check(); }); }); diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html index a197545b90..4932860f8c 100644 --- a/phpBB/styles/prosilver/template/forumlist_body.html +++ b/phpBB/styles/prosilver/template/forumlist_body.html @@ -14,7 +14,7 @@ <ul class="topiclist"> <li class="header"> <!-- EVENT forumlist_body_category_header_row_prepend --> - <dl class="icon"> + <dl class="row-item"> <dt><div class="list-inner"><!-- IF forumrow.S_IS_CAT --><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a><!-- ELSE -->{L_FORUM}<!-- ENDIF --></div></dt> <dd class="topics">{L_TOPICS}</dd> <dd class="posts">{L_POSTS}</dd> @@ -31,13 +31,22 @@ <!-- EVENT forumlist_body_forum_row_before --> <li class="row"> <!-- EVENT forumlist_body_forum_row_prepend --> - <dl class="icon {forumrow.FORUM_IMG_STYLE}"> + <dl class="row-item {forumrow.FORUM_IMG_STYLE}"> <dt title="{forumrow.FORUM_FOLDER_IMG_ALT}"> - <!-- IF forumrow.S_UNREAD_FORUM --><a href="{forumrow.U_VIEWFORUM}" class="icon-link"></a><!-- ENDIF --> + <!-- IF forumrow.S_UNREAD_FORUM --><a href="{forumrow.U_VIEWFORUM}" class="row-item-link"></a><!-- ENDIF --> <div class="list-inner"> - <!-- IF S_ENABLE_FEEDS and forumrow.S_FEED_ENABLED --><!-- <a class="feed-icon-forum" title="{L_FEED} - {forumrow.FORUM_NAME}" href="{U_FEED}?f={forumrow.FORUM_ID}"><img src="{T_THEME_PATH}/images/feed.gif" alt="{L_FEED} - {forumrow.FORUM_NAME}" /></a> --><!-- ENDIF --> - - <!-- IF forumrow.FORUM_IMAGE --><span class="forum-image">{forumrow.FORUM_IMAGE}</span><!-- ENDIF --> + <!-- IF S_ENABLE_FEEDS and forumrow.S_FEED_ENABLED --> + <!-- + <a class="feed-icon-forum" title="{L_FEED} - {forumrow.FORUM_NAME}" href="{U_FEED}?f={forumrow.FORUM_ID}"> + <i class="icon fa-rss-square fa-fw icon-orange" aria-hidden="true"></i><span class="sr-only">{L_FEED} - {forumrow.FORUM_NAME}</span> + </a> + --> + <!-- ENDIF --> + <!-- IF forumrow.FORUM_IMAGE --> + <!-- EVENT forumlist_body_forum_image_before --> + <span class="forum-image"><!-- EVENT forumlist_body_forum_image_prepend -->{forumrow.FORUM_IMAGE}<!-- EVENT forumlist_body_forum_image_append --></span> + <!-- EVENT forumlist_body_forum_image_after --> + <!-- ENDIF --> <a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a> <!-- IF forumrow.FORUM_DESC --><br />{forumrow.FORUM_DESC}<!-- ENDIF --> <!-- IF forumrow.MODERATORS --> @@ -47,7 +56,8 @@ <!-- EVENT forumlist_body_subforums_before --> <br /><strong>{forumrow.L_SUBFORUM_STR}{L_COLON}</strong> <!-- BEGIN subforum --> - <!-- EVENT forumlist_body_subforum_link_prepend --><a href="{forumrow.subforum.U_SUBFORUM}" class="subforum<!-- IF forumrow.subforum.S_UNREAD --> unread<!-- ELSE --> read<!-- ENDIF -->" title="<!-- IF forumrow.subforum.S_UNREAD -->{L_UNREAD_POSTS}<!-- ELSE -->{L_NO_UNREAD_POSTS}<!-- ENDIF -->">{forumrow.subforum.SUBFORUM_NAME}</a><!-- IF not forumrow.subforum.S_LAST_ROW -->{L_COMMA_SEPARATOR}<!-- ENDIF --><!-- EVENT forumlist_body_subforum_link_append --> + <!-- EVENT forumlist_body_subforum_link_prepend --><a href="{forumrow.subforum.U_SUBFORUM}" class="subforum<!-- IF forumrow.subforum.S_UNREAD --> unread<!-- ELSE --> read<!-- ENDIF -->" title="<!-- IF forumrow.subforum.S_UNREAD -->{L_UNREAD_POSTS}<!-- ELSE -->{L_NO_UNREAD_POSTS}<!-- ENDIF -->"> + <i class="icon <!-- IF forumrow.subforum.IS_LINK -->fa-external-link<!-- ELSE -->fa-file-o<!-- ENDIF --> fa-fw <!-- IF forumrow.subforum.S_UNREAD --> icon-red<!-- ELSE --> icon-blue<!-- ENDIF --> icon-md" aria-hidden="true"></i>{forumrow.subforum.SUBFORUM_NAME}</a><!-- IF not forumrow.subforum.S_LAST_ROW -->{L_COMMA_SEPARATOR}<!-- ENDIF --><!-- EVENT forumlist_body_subforum_link_append --> <!-- END subforum --> <!-- EVENT forumlist_body_subforums_after --> <!-- ENDIF --> @@ -68,19 +78,38 @@ <!-- ELSEIF not forumrow.S_IS_LINK --> <dd class="topics">{forumrow.TOPICS} <dfn>{L_TOPICS}</dfn></dd> <dd class="posts">{forumrow.POSTS} <dfn>{L_POSTS}</dfn></dd> - <dd class="lastpost"><span> - <!-- IF forumrow.U_UNAPPROVED_TOPICS --> - <a href="{forumrow.U_UNAPPROVED_TOPICS}">{UNAPPROVED_IMG}</a> - <!-- ELSEIF forumrow.U_UNAPPROVED_POSTS --> - <a href="{forumrow.U_UNAPPROVED_POSTS}">{UNAPPROVED_POST_IMG}</a> - <!-- ENDIF --> - <!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn> - <!-- IF forumrow.S_DISPLAY_SUBJECT --> - <!-- EVENT forumlist_body_last_post_title_prepend --> - <a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a> <br /> - <!-- ENDIF --> - {L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL} - <!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{forumrow.LAST_POST_TIME}<!-- ELSE -->{L_NO_POSTS}<br /> <!-- ENDIF --></span> + <dd class="lastpost"> + <span> + <!-- IF forumrow.U_UNAPPROVED_TOPICS --> + <a href="{forumrow.U_UNAPPROVED_TOPICS}" title="{L_TOPICS_UNAPPROVED}"> + <i class="icon fa-question fa-fw icon-blue" aria-hidden="true"></i><span class="sr-only">{L_TOPICS_UNAPPROVED}</span> + </a> + <!-- ELSEIF forumrow.U_UNAPPROVED_POSTS --> + <a href="{forumrow.U_UNAPPROVED_POSTS}" title="{L_POSTS_UNAPPROVED_FORUM}"> + <i class="icon fa-question fa-fw icon-blue" aria-hidden="true"></i><span class="sr-only">{L_POSTS_UNAPPROVED_FORUM}</span> + </a> + <!-- ENDIF --> + <!-- IF forumrow.LAST_POST_TIME --> + <dfn>{L_LAST_POST}</dfn> + <!-- IF forumrow.S_DISPLAY_SUBJECT --> + <!-- EVENT forumlist_body_last_post_title_prepend --> + <a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a> <br /> + <!-- ENDIF --> + {L_POST_BY_AUTHOR} <!-- EVENT forumlist_body_last_poster_username_prepend -->{forumrow.LAST_POSTER_FULL}<!-- EVENT forumlist_body_last_poster_username_append --> + <!-- IF not S_IS_BOT --> + <a href="{forumrow.U_LAST_POST}" title="{L_VIEW_LATEST_POST}"> + <i class="icon fa-external-link-square fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{L_VIEW_LATEST_POST}</span> + </a> + <!-- ENDIF --> + <br /><time datetime="{forumrow.LAST_POST_TIME_RFC3339}">{forumrow.LAST_POST_TIME}</time> + <!-- ELSE --> + {% if forumrow.U_UNAPPROVED_TOPICS %} + {{ lang('TOPIC_UNAPPROVED_FORUM', forumrow.TOPICS) }} + {% else %} + {{ lang('NO_POSTS') }} + {% endif %} + <!-- ENDIF --> + </span> </dd> <!-- ELSE --> <dd> </dd> diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html index b292c40eb2..239a91c580 100644 --- a/phpBB/styles/prosilver/template/index_body.html +++ b/phpBB/styles/prosilver/template/index_body.html @@ -29,6 +29,7 @@ <!-- ENDIF --> <input type="submit" tabindex="5" name="login" value="{L_LOGIN}" class="button2" /> {S_LOGIN_REDIRECT} + {S_FORM_TOKEN_LOGIN} </fieldset> </form> <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html index fcd8ddbc1e..070efc0cb9 100644 --- a/phpBB/styles/prosilver/template/jumpbox.html +++ b/phpBB/styles/prosilver/template/jumpbox.html @@ -1,34 +1,50 @@ <div class="action-bar actions-jump"> <!-- IF S_VIEWTOPIC --> - <p class="jumpbox-return"><a href="{U_VIEW_FORUM}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO_FORUM}</a></p> + <p class="jumpbox-return"> + <a href="{U_VIEW_FORUM}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r"> + <i class="icon fa-angle-{S_CONTENT_FLOW_BEGIN} fa-fw icon-black" aria-hidden="true"></i><span>{L_RETURN_TO_FORUM}</span> + </a> + </p> <!-- ELSEIF S_VIEWFORUM --> - <p class="jumpbox-return"><a href="{U_INDEX}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO_INDEX}</a></p> + <p class="jumpbox-return"> + <a href="{U_INDEX}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r"> + <i class="icon fa-angle-{S_CONTENT_FLOW_BEGIN} fa-fw icon-black" aria-hidden="true"></i><span>{L_RETURN_TO_INDEX}</span> + </a> + </p> <!-- ELSEIF SEARCH_TOPIC --> - <p class="jumpbox-return"><a class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}" accesskey="r">{L_RETURN_TO_TOPIC}</a></p> + <p class="jumpbox-return"> + <a class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}" accesskey="r"> + <i class="icon fa-angle-{S_CONTENT_FLOW_BEGIN} fa-fw icon-black" aria-hidden="true"></i><span>{L_RETURN_TO_TOPIC}</span> + </a> + </p> <!-- ELSEIF S_SEARCH_ACTION --> - <p class="jumpbox-return"><a class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}" accesskey="r">{L_GO_TO_SEARCH_ADV}</a></p> + <p class="jumpbox-return"> + <a class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}" accesskey="r"> + <i class="icon fa-angle-{S_CONTENT_FLOW_BEGIN} fa-fw icon-black" aria-hidden="true"></i><span>{L_GO_TO_SEARCH_ADV}</span> + </a> + </p> <!-- ENDIF --> <!-- IF S_DISPLAY_JUMPBOX --> - - <div class="dropdown-container dropdown-container-{S_CONTENT_FLOW_END}<!-- IF not S_IN_MCP --> dropdown-up<!-- ENDIF --> dropdown-{S_CONTENT_FLOW_BEGIN} dropdown-button-control" id="jumpbox"> - <span title="<!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->" class="dropdown-trigger button dropdown-select"> - <!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF --> + <div class="jumpbox dropdown-container dropdown-container-right<!-- IF not S_IN_MCP --> dropdown-up<!-- ENDIF --> dropdown-{S_CONTENT_FLOW_BEGIN} dropdown-button-control" id="jumpbox"> + <span title="<!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->" class="button button-secondary dropdown-trigger dropdown-select"> + <span><!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF --></span> + <span class="caret"><i class="icon fa-sort-down fa-fw" aria-hidden="true"></i></span> </span> - <div class="dropdown hidden"> - <div class="pointer"><div class="pointer-inner"></div></div> - <ul class="dropdown-contents"> + <div class="dropdown"> + <div class="pointer"><div class="pointer-inner"></div></div> + <ul class="dropdown-contents"> <!-- BEGIN jumpbox_forums --> - <!-- IF jumpbox_forums.FORUM_ID neq -1 --> - <li><!-- BEGIN level --> <!-- END level --><a href="{jumpbox_forums.LINK}">{jumpbox_forums.FORUM_NAME}</a></li> - <!-- ENDIF --> + <!-- IF jumpbox_forums.FORUM_ID neq -1 --> + <li><a href="{jumpbox_forums.LINK}" class="<!-- IF jumpbox_forums.level -->jumpbox-sub-link<!-- ELSEIF jumpbox_forums.S_IS_CAT -->jumpbox-cat-link<!-- ELSE -->jumpbox-forum-link<!-- ENDIF -->"><!-- BEGIN level --><span class="spacer"></span><!-- END level --> <span><!-- IF jumpbox_forums.level --><!-- IF S_CONTENT_DIRECTION eq 'rtl' -->↲<!-- ELSE -->↳<!-- ENDIF --> <!-- ENDIF --> {jumpbox_forums.FORUM_NAME}</span></a></li> + <!-- ENDIF --> <!-- END jumpbox_forums --> - </ul> - </div> + </ul> </div> + </div> <!-- ELSE --> - </br></br> + <br /><br /> <!-- ENDIF --> </div> diff --git a/phpBB/styles/prosilver/template/login_body.html b/phpBB/styles/prosilver/template/login_body.html index ef08035717..dc597af51d 100644 --- a/phpBB/styles/prosilver/template/login_body.html +++ b/phpBB/styles/prosilver/template/login_body.html @@ -33,6 +33,7 @@ <!-- ENDIF --> {S_LOGIN_REDIRECT} + {S_FORM_TOKEN_LOGIN} <dl> <dt> </dt> <dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" class="button1" /></dd> diff --git a/phpBB/styles/prosilver/template/login_body_oauth.html b/phpBB/styles/prosilver/template/login_body_oauth.html index 156485d211..1364d01ccb 100644 --- a/phpBB/styles/prosilver/template/login_body_oauth.html +++ b/phpBB/styles/prosilver/template/login_body_oauth.html @@ -1,8 +1,6 @@ +<br> <div class="content"> - <!-- BEGIN oauth --> - <dl> - <dt> </dt> - <dd><a href="{oauth.REDIRECT_URL}" class="button2">{oauth.SERVICE_NAME}</a></dd> - </dl> - <!-- END oauth --> + {% for oauth in oauth %} + <a href="{{ oauth.REDIRECT_URL }}" class="button2">{{ oauth.SERVICE_NAME }}</a> + {% endfor %} </div> diff --git a/phpBB/styles/prosilver/template/login_forum.html b/phpBB/styles/prosilver/template/login_forum.html index 7fa9736a96..c5c36d4564 100644 --- a/phpBB/styles/prosilver/template/login_forum.html +++ b/phpBB/styles/prosilver/template/login_forum.html @@ -25,6 +25,7 @@ <dd><input type="password" tabindex="1" id="password" name="password" size="25" class="inputbox narrow" autocomplete="off" /></dd> </dl> {S_LOGIN_REDIRECT} + {S_FORM_TOKEN_LOGIN} <dl> <dt> </dt> <dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" id="login" class="button1" value="{L_LOGIN}" tabindex="2" /></dd> diff --git a/phpBB/styles/prosilver/template/mcp_approve.html b/phpBB/styles/prosilver/template/mcp_approve.html index 14472bcf4f..f7874ab90b 100644 --- a/phpBB/styles/prosilver/template/mcp_approve.html +++ b/phpBB/styles/prosilver/template/mcp_approve.html @@ -39,7 +39,7 @@ <fieldset> <!-- IF S_NOTIFY_POSTER --> - <dl class="panel"> + <dl class="fields2 nobg"> <dt> </dt> <dd><label><input type="checkbox" name="notify_poster" checked="checked" /> <!-- IF S_APPROVE -->{L_NOTIFY_POSTER_APPROVAL}<!-- ELSE -->{L_NOTIFY_POSTER_DISAPPROVAL}<!-- ENDIF --></label></dd> </dl> @@ -66,7 +66,7 @@ </fieldset> <fieldset class="submit-buttons"> - {S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="button1" /> + {S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="button1" /> <input type="submit" name="cancel" value="{L_NO}" class="button2" /> </fieldset> diff --git a/phpBB/styles/prosilver/template/mcp_ban.html b/phpBB/styles/prosilver/template/mcp_ban.html index 5a7eaa7840..86a322435d 100644 --- a/phpBB/styles/prosilver/template/mcp_ban.html +++ b/phpBB/styles/prosilver/template/mcp_ban.html @@ -1,8 +1,6 @@ <!-- INCLUDE mcp_header.html --> -<script type="text/javascript"> -// <![CDATA[ - +<script> var ban_length = new Array(); ban_length[-1] = ''; var ban_reason = new Array(); @@ -11,12 +9,12 @@ ban_give_reason[-1] = ''; <!-- BEGIN bans --> - ban_length['{bans.BAN_ID}'] = '{bans.A_LENGTH}'; + ban_length['{bans.BAN_ID}'] = '{{ bans.A_LENGTH }}'; <!-- IF bans.A_REASON --> - ban_reason['{bans.BAN_ID}'] = '{bans.A_REASON}'; + ban_reason['{bans.BAN_ID}'] = '{{ bans.REASON | e('js') }}'; <!-- ENDIF --> <!-- IF bans.A_GIVE_REASON --> - ban_give_reason['{bans.BAN_ID}'] = '{bans.A_GIVE_REASON}'; + ban_give_reason['{bans.BAN_ID}'] = '{{ bans.GIVE_REASON | e('js') }}'; <!-- ENDIF --> <!-- END bans --> @@ -34,8 +32,6 @@ document.getElementById('unbangivereason').innerHTML = ''; } } - -// ]]> </script> <form id="mcp_ban" method="post" action="{U_ACTION}"> @@ -74,7 +70,7 @@ <dl> <dt><label for="banexclude0">{L_BAN_EXCLUDE}{L_COLON}</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt> <dd> - <label for="banexclude1"><input type="radio" name="banexclude" id="banexclude1" value="1" /> {L_YES}</label> + <label for="banexclude1"><input type="radio" name="banexclude" id="banexclude1" value="1" /> {L_YES}</label> <label for="banexclude0"><input type="radio" name="banexclude" id="banexclude0" value="0" checked="checked" /> {L_NO}</label> </dd> </dl> @@ -85,7 +81,7 @@ </div> <fieldset class="submit-buttons"> - {S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" /> + {S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" /> <input type="submit" name="bansubmit" value="{L_SUBMIT}" class="button1" /> {S_FORM_TOKEN} </fieldset> @@ -122,7 +118,7 @@ </div> <fieldset class="submit-buttons"> - {S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" /> + {S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" /> <input type="submit" name="unbansubmit" value="{L_SUBMIT}" class="button1" /> </fieldset> diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html index 4c037f56ae..82df5d5dbe 100644 --- a/phpBB/styles/prosilver/template/mcp_forum.html +++ b/phpBB/styles/prosilver/template/mcp_forum.html @@ -10,7 +10,7 @@ <div class="panel"> <div class="inner"> - <div class="action-bar top"> + <div class="action-bar bar-top"> <div class="pagination"> {TOTAL_TOPICS} <!-- IF .pagination --> @@ -24,7 +24,7 @@ <!-- IF .topicrow --> <ul class="topiclist<!-- IF S_MERGE_SELECT --> missing-column<!-- ENDIF -->"> <li class="header"> - <dl class="icon"> + <dl class="row-item"> <dt><div class="list-inner">{L_TOPICS}</div></dt> <dd class="posts">{L_REPLIES}</dd> <dd class="lastpost"><span>{L_LAST_POST}</span></dd> @@ -36,23 +36,35 @@ <!-- BEGIN topicrow --> <li class="row<!-- IF topicrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ENDIF -->"> - <dl class="icon {topicrow.TOPIC_IMG_STYLE}"> + <dl class="row-item {topicrow.TOPIC_IMG_STYLE}"> <dt <!-- IF topicrow.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->> - <!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="icon-link"></a><!-- ENDIF --> + <!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="row-item-link"></a><!-- ENDIF --> <div class="list-inner"> <!-- EVENT topiclist_row_prepend --> <!-- IF topicrow.S_SELECT_TOPIC --><a href="{topicrow.U_SELECT_TOPIC}" class="topictitle">[ {L_SELECT_MERGE} ]</a> <!-- ENDIF --> <!-- EVENT mcp_forum_topic_title_before --> <a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> <!-- EVENT mcp_forum_topic_title_after --> - <!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF --> - <!-- IF topicrow.S_TOPIC_DELETED or topicrow.S_POSTS_DELETED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.DELETED_IMG}</a> <!-- ENDIF --> - <!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --> + <!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --> + <a href="{topicrow.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}"> + <i class="icon fa-question fa-fw icon-blue" aria-hidden="true"></i><span class="sr-only">{L_TOPIC_UNAPPROVED}</span> + </a> + <!-- ENDIF --> + <!-- IF topicrow.S_TOPIC_DELETED or topicrow.S_POSTS_DELETED --> + <a href="{topicrow.U_MCP_QUEUE}" title="{L_TOPIC_DELETED}"> + <i class="icon fa-recycle fa-fw icon-green" aria-hidden="true"></i><span class="sr-only">{L_TOPIC_DELETED}</span> + </a> + <!-- ENDIF --> + <!-- IF topicrow.S_TOPIC_REPORTED --> + <a href="{topicrow.U_MCP_REPORT}" title="{L_TOPIC_REPORTED}"> + <i class="icon fa-exclamation fa-fw icon-red" aria-hidden="true"></i><span class="sr-only">{L_TOPIC_REPORTED}</span> + </a> + <!-- ENDIF --> <!-- IF topicrow.S_MOVED_TOPIC and S_CAN_DELETE --> <a href="{topicrow.U_DELETE_TOPIC}" class="topictitle">[ {L_DELETE_SHADOW_TOPIC} ]</a><!-- ENDIF --> <br /> <!-- EVENT topiclist_row_topic_title_after --> <div class="responsive-show" style="display: none;"> - <!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> + <!-- IF topicrow.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <!-- ENDIF --> {L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} « {topicrow.LAST_POST_TIME}<br /> </div> <span class="responsive-show left-box" style="display: none;">{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong></span> @@ -73,15 +85,16 @@ <!-- ENDIF --> <div class="responsive-hide"> - <!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> + <!-- IF topicrow.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <!-- ENDIF --> + {% EVENT topiclist_row_topic_by_author_before %} {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} + {% EVENT topiclist_row_topic_by_author_after %} </div> <!-- EVENT topiclist_row_append --> </div> </dt> <dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd> - <dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}<br />{topicrow.LAST_POST_TIME}</span> - </dd> + <dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}<br />{topicrow.LAST_POST_TIME}</span></dd> <!-- IF not S_MERGE_SELECT --> <dd class="mark"> <!-- IF not topicrow.S_MOVED_TOPIC --><input type="checkbox" name="topic_id_list[]" value="{topicrow.TOPIC_ID}"<!-- IF topicrow.S_TOPIC_CHECKED --> checked="checked"<!-- ENDIF --> /><!-- ELSE --> <!-- ENDIF --> @@ -97,16 +110,9 @@ </ul> <!-- ENDIF --> - <fieldset class="display-options"> - <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> - <input type="submit" name="sort" value="{L_GO}" class="button2" /> - </fieldset> - - <hr /> - <div class="action-bar bottom"> + <!-- INCLUDE display_options.html --> + <div class="pagination"> {TOTAL_TOPICS} <!-- IF .pagination --> @@ -134,10 +140,8 @@ <!-- IF S_CAN_SYNC --><option value="resync">{L_RESYNC}</option><!-- ENDIF --> <!-- IF S_CAN_MAKE_NORMAL --><option value="make_normal">{L_MAKE_NORMAL}</option><!-- ENDIF --> <!-- IF S_CAN_MAKE_STICKY --><option value="make_sticky">{L_MAKE_STICKY}</option><!-- ENDIF --> - <!-- IF S_CAN_MAKE_ANNOUNCE --> - <option value="make_announce">{L_MAKE_ANNOUNCE}</option> - <option value="make_global">{L_MAKE_GLOBAL}</option> - <!-- ENDIF --> + <!-- IF S_CAN_MAKE_ANNOUNCE --><option value="make_announce">{L_MAKE_ANNOUNCE}</option><!-- ENDIF --> + <!-- IF S_CAN_MAKE_ANNOUNCE_GLOBAL --><option value="make_global">{L_MAKE_GLOBAL}</option><!-- ENDIF --> <!-- EVENT mcp_forum_actions_append --> </select> <input class="button2" type="submit" value="{L_SUBMIT}" /> diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html index 8fe7dfdf65..90793d072b 100644 --- a/phpBB/styles/prosilver/template/mcp_front.html +++ b/phpBB/styles/prosilver/template/mcp_front.html @@ -30,7 +30,7 @@ <dl> <dt> <div class="list-inner"> - <a href="{unapproved.U_POST_DETAILS}" class="topictitle">{unapproved.SUBJECT}</a> {unapproved.ATTACH_ICON_IMG}<br /> + <a href="{unapproved.U_POST_DETAILS}" class="topictitle">{unapproved.SUBJECT}</a> <!-- IF unapproved.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i><!-- ENDIF --> <br /> {L_POSTED} {L_POST_BY_AUTHOR} {unapproved.AUTHOR_FULL} » {unapproved.POST_TIME} </div> </dt> @@ -86,12 +86,12 @@ <dl> <dt> <div class="list-inner"> - <a href="{report.U_POST_DETAILS}#reports" class="topictitle">{report.SUBJECT}</a> {report.ATTACH_ICON_IMG}<br /> + <a href="{report.U_POST_DETAILS}#reports" class="topictitle">{report.SUBJECT}</a> <!-- IF report.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i><!-- ENDIF --> <br /> <span>{L_POSTED} {L_POST_BY_AUTHOR} {report.AUTHOR_FULL} » {report.POST_TIME}</span> </div> </dt> <dd class="moderation"> - <span>{L_REPORTED} {L_POST_BY_AUTHOR} {report.REPORTER_FULL} {L_REPORTED_ON_DATE} {report.REPORT_TIME}<br /> + <span>{L_REPORTED} {L_POST_BY_AUTHOR} {report.REPORTER_FULL} {L_REPORTED_ON_DATE} <br /> {L_FORUM}{L_COLON} <a href="{report.U_FORUM}">{report.FORUM_NAME}</a></span> </dd> </dl> @@ -129,7 +129,7 @@ <dl> <dt> <div class="list-inner"> - <a href="{pm_report.U_PM_DETAILS}" class="topictitle">{pm_report.PM_SUBJECT}</a> {pm_report.ATTACH_ICON_IMG}<br /> + <a href="{pm_report.U_PM_DETAILS}" class="topictitle">{pm_report.PM_SUBJECT}</a> <!-- IF pm_report.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i><!-- ENDIF --> <br /> <span>{L_MESSAGE_BY_AUTHOR} {pm_report.PM_AUTHOR_FULL} » {pm_report.PM_TIME}</span><br /> <span>{L_MESSAGE_TO} {pm_report.RECIPIENTS}</span> </div> diff --git a/phpBB/styles/prosilver/template/mcp_header.html b/phpBB/styles/prosilver/template/mcp_header.html index 69239887e3..5841c1bbd2 100644 --- a/phpBB/styles/prosilver/template/mcp_header.html +++ b/phpBB/styles/prosilver/template/mcp_header.html @@ -8,7 +8,7 @@ </p> <!-- ENDIF --> -<div id="tabs"> +<div id="tabs" class="tabs"> <ul> <!-- BEGIN l_block1 --> <li class="tab<!-- IF l_block1.S_SELECTED --> activetab<!-- ENDIF -->"><a href="{l_block1.U_TITLE}">{l_block1.L_TITLE}</a></li> @@ -21,14 +21,14 @@ <div style="width: 100%;"> - <div id="cp-menu"> - <div id="navigation" role="navigation"> + <div id="cp-menu" class="cp-menu"> + <div id="navigation" class="navigation" role="navigation"> <ul> <!-- BEGIN l_block1 --> <!-- IF l_block1.S_SELECTED --> <!-- BEGIN l_block2 --> <!-- IF l_block1.l_block2.S_SELECTED --> - <li id="active-subsection"><a href="{l_block1.l_block2.U_TITLE}"><span>{l_block1.l_block2.L_TITLE}<!-- IF l_block1.l_block2.ADD_ITEM --> ({l_block1.l_block2.ADD_ITEM})<!-- ENDIF --></span></a></li> + <li id="active-subsection" class="active-subsection"><a href="{l_block1.l_block2.U_TITLE}"><span>{l_block1.l_block2.L_TITLE}<!-- IF l_block1.l_block2.ADD_ITEM --> ({l_block1.l_block2.ADD_ITEM})<!-- ENDIF --></span></a></li> <!-- ELSE --> <li><a href="{l_block1.l_block2.U_TITLE}"><span>{l_block1.l_block2.L_TITLE}<!-- IF l_block1.l_block2.ADD_ITEM --> ({l_block1.l_block2.ADD_ITEM})<!-- ENDIF --></span></a></li> <!-- ENDIF --> @@ -39,7 +39,7 @@ </div> </div> - <div id="cp-main" class="mcp-main panel-container"> + <div id="cp-main" class="cp-main mcp-main panel-container"> <!-- IF MESSAGE --> <div class="content"> <h2 class="message-title">{L_MESSAGE}</h2> diff --git a/phpBB/styles/prosilver/template/mcp_logs.html b/phpBB/styles/prosilver/template/mcp_logs.html index 4f74085968..03216b4f38 100644 --- a/phpBB/styles/prosilver/template/mcp_logs.html +++ b/phpBB/styles/prosilver/template/mcp_logs.html @@ -7,13 +7,13 @@ <div class="panel"> <div class="inner"> - <div class="action-bar top"> + <div class="action-bar 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 --> + <!-- IF .pagination --> <!-- INCLUDE pagination.html --> - <!-- ELSE --> + <!-- ELSE --> • {PAGE_NUMBER} <!-- ENDIF --> </div> @@ -51,21 +51,14 @@ </table> <!-- IF .log --> - <fieldset class="display-options"> - <label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label> - <label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> - <label>{S_SELECT_SORT_DIR}</label> - <input type="submit" name="sort" value="{L_GO}" class="button2" /> - </fieldset> - - <hr /> - <div class="action-bar bottom"> + <!-- INCLUDE display_options.html --> + <div class="pagination"> {TOTAL} - <!-- IF .pagination --> + <!-- IF .pagination --> <!-- INCLUDE pagination.html --> - <!-- ELSE --> + <!-- ELSE --> • {PAGE_NUMBER} <!-- ENDIF --> </div> diff --git a/phpBB/styles/prosilver/template/mcp_move.html b/phpBB/styles/prosilver/template/mcp_move.html index 45a9ae83bc..63197ef274 100644 --- a/phpBB/styles/prosilver/template/mcp_move.html +++ b/phpBB/styles/prosilver/template/mcp_move.html @@ -43,12 +43,14 @@ <!-- IF ADDITIONAL_MSG --><p>{ADDITIONAL_MSG}</p><!-- ENDIF --> <fieldset> + {% EVENT mcp_move_destination_forum_before %} <dl class="fields2"> <dt><label>{L_SELECT_DESTINATION_FORUM}{L_COLON}</label></dt> <dd><select name="to_forum_id">{S_FORUM_SELECT}</select></dd> <!-- IF S_CAN_LEAVE_SHADOW --><dd><label for="move_leave_shadow"><input type="checkbox" name="move_leave_shadow" id="move_leave_shadow" />{L_LEAVE_SHADOW}</label></dd><!-- ENDIF --> <!-- IF S_CAN_LOCK_TOPIC --><dd><label for="move_lock_topics"><input type="checkbox" name="move_lock_topics" id="move_lock_topics" />{L_LOCK_TOPIC}</label></dd><!-- ENDIF --> </dl> + {% EVENT mcp_move_destination_forum_after %} <dl class="fields2"> <dt> </dt> <dd><strong>{MESSAGE_TEXT}</strong></dd> diff --git a/phpBB/styles/prosilver/template/mcp_notes_front.html b/phpBB/styles/prosilver/template/mcp_notes_front.html index db10284bce..11f362376d 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_front.html +++ b/phpBB/styles/prosilver/template/mcp_notes_front.html @@ -19,7 +19,7 @@ </div> <fieldset class="submit-buttons"> - <input type="reset" value="{L_RESET}" name="reset" class="button2" /> + <input type="reset" value="{L_RESET}" name="reset" class="button2" /> <input type="submit" name="submituser" value="{L_SUBMIT}" class="button1" /> {S_FORM_TOKEN} </fieldset> diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html index 3e8d47eb9d..62d0562a46 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_user.html +++ b/phpBB/styles/prosilver/template/mcp_notes_user.html @@ -50,13 +50,13 @@ <div class="panel"> <div class="inner"> - <div class="action-bar top"> + <div class="action-bar 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 --> + <!-- IF .pagination --> <!-- INCLUDE pagination.html --> - <!-- ELSE --> + <!-- ELSE --> • {PAGE_NUMBER} <!-- ENDIF --> </div> @@ -90,22 +90,14 @@ </tbody> </table> - <hr /> - - <fieldset class="display-options"> - <label>{L_DISPLAY_LOG}{L_COLON} {S_SELECT_SORT_DAYS}</label> - <label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label> - <input type="submit" name="sort" value="{L_GO}" class="button2" /> - </fieldset> - - <hr /> - <div class="action-bar bottom"> + <!-- INCLUDE display_options.html --> + <div class="pagination"> {TOTAL_REPORTS} - <!-- IF .pagination --> + <!-- IF .pagination --> <!-- INCLUDE pagination.html --> - <!-- ELSE --> + <!-- ELSE --> • {PAGE_NUMBER} <!-- ENDIF --> </div> diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html index 5acdcef859..c2297a8053 100644 --- a/phpBB/styles/prosilver/template/mcp_post.html +++ b/phpBB/styles/prosilver/template/mcp_post.html @@ -14,7 +14,7 @@ <h3>{L_REPORT_REASON}{L_COLON} {REPORT_REASON_TITLE}</h3> <p class="author">{L_REPORTED} {L_POST_BY_AUTHOR} {REPORTER_FULL} « {REPORT_DATE}</p> <!-- IF S_REPORT_CLOSED --> - <p class="post-notice reported">{L_REPORT_CLOSED}</p> + <p class="post-notice reported"><i class="icon fa-exclamation fa-fw icon-red" aria-hidden="true"></i>{L_REPORT_CLOSED}</p> <!-- ENDIF --> <div class="content"> <!-- IF REPORT_TEXT --> @@ -31,10 +31,12 @@ <form method="post" id="mcp_report" action="{S_CLOSE_ACTION}"> <fieldset class="submit-buttons"> + {% EVENT mcp_post_report_buttons_top_before %} <!-- IF not S_REPORT_CLOSED --> <input class="button1" type="submit" value="{L_CLOSE_REPORT}" name="action[close]" /> <!-- ENDIF --> <input class="button2" type="submit" value="{L_DELETE_REPORT}" name="action[delete]" /> + {% EVENT mcp_post_report_buttons_top_after %} <input type="hidden" name="report_id_list[]" value="{REPORT_ID}" /> {S_FORM_TOKEN} </fieldset> @@ -58,8 +60,8 @@ </li> <!-- IF U_EDIT --> <li> - <a href="{U_EDIT}" title="{L_EDIT_POST}" class="button icon-button edit-icon"> - <span>{L_EDIT_POST}</span> + <a href="{U_EDIT}" title="{L_EDIT_POST}" class="button"> + <i class="icon fa-pencil fa-fw" aria-hidden="true"></i><span class="sr-only">{L_EDIT_POST}</span> </a> </li> <!-- ENDIF --> @@ -69,11 +71,11 @@ <p class="author"> <strong>{L_SENT_AT}{L_COLON}</strong> {POST_DATE} <br /><strong>{L_PM_FROM}{L_COLON}</strong> {POST_AUTHOR_FULL} - <!-- IF S_TO_RECIPIENT --><br /><strong>{L_TO}{L_COLON}</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}" style="color:<!-- IF to_recipient.COLOUR -->{to_recipient.COLOUR}<!-- ELSEIF to_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{to_recipient.NAME}</a><!-- ENDIF --> <!-- END to_recipient --><!-- ENDIF --> - <!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}{L_COLON}</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}" style="color:<!-- IF bcc_recipient.COLOUR -->{bcc_recipient.COLOUR}<!-- ELSEIF bcc_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{bcc_recipient.NAME}</a><!-- ENDIF --> <!-- END bcc_recipient --><!-- ENDIF --> + <!-- IF S_TO_RECIPIENT --><br /><strong>{L_TO}{L_COLON}</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}"<!-- IF to_recipient.COLOUR --> style="color:{to_recipient.COLOUR};"<!-- ENDIF -->><strong>{to_recipient.NAME}</strong></a><!-- ENDIF --> <!-- END to_recipient --><!-- ENDIF --> + <!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}{L_COLON}</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}"<!-- IF bcc_recipient.COLOUR --> style="color:{bcc_recipient.COLOUR};"<!-- ENDIF -->><strong>{bcc_recipient.NAME}</strong></a><!-- ENDIF --> <!-- END bcc_recipient --><!-- ENDIF --> </p> <!-- ELSE --> - <p class="author">{MINI_POST_IMG} {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} » {POST_DATE}</p> + <p class="author"><span><i class="icon fa-file fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{MINI_POST_IMG}</span></span> {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} » {POST_DATE}</p> <!-- ENDIF --> <!-- IF S_POST_UNAPPROVED --> @@ -102,14 +104,18 @@ <!-- IF S_MESSAGE_REPORTED --> <p class="post-notice reported"> - {REPORTED_IMG} <a href="{U_MCP_REPORT}"><strong>{L_MESSAGE_REPORTED}</strong></a> + <i class="icon fa-exclamation fa-fw icon-red" aria-hidden="true"></i><span class="sr-only">{L_TOPIC_REPORTED}</span> <a href="{U_MCP_REPORT}"><strong>{L_MESSAGE_REPORTED}</strong></a> </p> <!-- ENDIF --> - <div class="content" id="post_details"> + {% EVENT mcp_post_text_before %} + + <div id="post_details" class="content post_details"> {POST_PREVIEW} </div> + {% EVENT mcp_post_text_after %} + <!-- IF S_HAS_ATTACHMENTS --> <dl class="attachbox"> <dt>{L_ATTACHMENTS}</dt> @@ -331,15 +337,15 @@ <ul> <!-- BEGIN pagination_ips --> <!-- IF pagination_ips.S_IS_PREV --> - <li class="previous"><a href="{pagination_ips.PAGE_URL}" rel="prev" role="button">{L_PREVIOUS}</a></li> + <li class="arrow previous"><a class="button button-icon-only" href="{pagination_ips.PAGE_URL}" rel="prev" role="button"><i class="icon fa-chevron-{S_CONTENT_FLOW_BEGIN} fa-fw" aria-hidden="true"></i><span class="sr-only">{L_PREVIOUS}</span></a></li> <!-- ELSEIF pagination_ips.S_IS_CURRENT --> - <li class="active"><span>{pagination_ips.PAGE_NUMBER}</span></li> + <li class="active"><span>{pagination_ips.PAGE_NUMBER}</span></li> <!-- ELSEIF pagination_ips.S_IS_ELLIPSIS --> - <li class="ellipsis" role="separator"><span>{L_ELLIPSIS}</span></li> + <li class="ellipsis" role="separator"><span>{L_ELLIPSIS}</span></li> <!-- ELSEIF pagination_ips.S_IS_NEXT --> - <li class="next"><a href="{pagination_ips.PAGE_URL}" rel="next" role="button">{L_NEXT}</a></li> + <li class="arrow next"><a class="button button-icon-only" href="{pagination_ips.PAGE_URL}" rel="next" role="button"><i class="icon fa-chevron-{S_CONTENT_FLOW_END} fa-fw" aria-hidden="true"></i><span class="sr-only">{L_NEXT}</span></a></li> <!-- ELSE --> - <li><a href="{pagination_ips.PAGE_URL}" role="button">{pagination_ips.PAGE_NUMBER}</a></li> + <li><a class="button" href="{pagination_ips.PAGE_URL}" role="button">{pagination_ips.PAGE_NUMBER}</a></li> <!-- ENDIF --> <!-- END pagination_ips --> </ul> diff --git a/phpBB/styles/prosilver/template/mcp_queue.html b/phpBB/styles/prosilver/template/mcp_queue.html index 864b231142..ee69bf448d 100644 --- a/phpBB/styles/prosilver/template/mcp_queue.html +++ b/phpBB/styles/prosilver/template/mcp_queue.html @@ -16,12 +16,12 @@ <p>{L_EXPLAIN}</p> <!-- IF .postrow --> - <div class="action-bar top"> + <div class="action-bar bar-top"> <div class="pagination"> {TOTAL} - <!-- IF .pagination --> + <!-- IF .pagination --> <!-- INCLUDE pagination.html --> - <!-- ELSE --> + <!-- ELSE --> • {PAGE_NUMBER} <!-- ENDIF --> </div> @@ -48,7 +48,7 @@ <dl> <dt> <div class="list-inner"> - <a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a> {postrow.ATTACH_ICON_IMG}<br /> + <a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a><!-- IF postrow.S_HAS_ATTACHMENTS --> <i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <!-- ENDIF --><br /> <span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} » {postrow.POST_TIME}</span> </div> </dt> @@ -73,21 +73,15 @@ <!-- END postrow --> </ul> - <fieldset class="display-options"> - <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 /> - <div class="action-bar bottom"> + <!-- INCLUDE display_options.html --> + <!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" onClick="document.getElementById('mcp').submit()" /> <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF --> + <div class="pagination"> {TOTAL} - <!-- IF .pagination --> + <!-- IF .pagination --> <!-- INCLUDE pagination.html --> - <!-- ELSE --> + <!-- ELSE --> • {PAGE_NUMBER} <!-- ENDIF --> </div> diff --git a/phpBB/styles/prosilver/template/mcp_reports.html b/phpBB/styles/prosilver/template/mcp_reports.html index 24c0479f63..e7e0a5c9ba 100644 --- a/phpBB/styles/prosilver/template/mcp_reports.html +++ b/phpBB/styles/prosilver/template/mcp_reports.html @@ -18,12 +18,12 @@ <p>{L_EXPLAIN}</p> <!-- IF .postrow --> - <div class="action-bar top"> + <div class="action-bar bar-top"> <div class="pagination"> {TOTAL_REPORTS} - <!-- IF .pagination --> + <!-- IF .pagination --> <!-- INCLUDE pagination.html --> - <!-- ELSE --> + <!-- ELSE --> • {PAGE_NUMBER} <!-- ENDIF --> </div> @@ -46,7 +46,7 @@ <!-- IF S_PM --> <dt> <div class="list-inner"> - <a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.PM_SUBJECT}</a> {postrow.ATTACH_ICON_IMG}<br /> + <a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.PM_SUBJECT}</a> <i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <br /> <span>{L_MESSAGE_BY_AUTHOR} {postrow.PM_AUTHOR_FULL} » {postrow.PM_TIME}</span><br /> <span>{L_MESSAGE_TO} {postrow.RECIPIENTS}</span> <div class="responsive-show" style="display: none;"> @@ -60,7 +60,7 @@ <!-- ELSE --> <dt> <div class="list-inner"> - <a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a> {postrow.ATTACH_ICON_IMG}<br /> + <a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <br /> <span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} » {postrow.POST_TIME}</span> <div class="responsive-show" style="display: none;"> {L_REPORTER}{L_COLON} {postrow.REPORTER_FULL} « {postrow.REPORT_TIME}<br /> @@ -79,21 +79,15 @@ <!-- END postrow --> </ul> - <fieldset class="display-options"> - <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 /> - <div class="action-bar bottom"> + <!-- INCLUDE display_options.html --> + <!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" onClick="document.getElementById('mcp').submit()" /> <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF --> + <div class="pagination"> {TOTAL_REPORTS} - <!-- IF .pagination --> + <!-- IF .pagination --> <!-- INCLUDE pagination.html --> - <!-- ELSE --> + <!-- ELSE --> • {PAGE_NUMBER} <!-- ENDIF --> </div> diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index af4b63265f..889cab8b83 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -11,7 +11,7 @@ <!-- DEFINE $SHOW_PANEL = 'display-panel' --> <!-- ENDIF --> -<div id="minitabs" class="sub-panels" data-show-panel="{$SHOW_PANEL}" role="tablist"> +<div id="minitabs" class="minitabs sub-panels" data-show-panel="{$SHOW_PANEL}" role="tablist"> <ul> <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> @@ -87,21 +87,22 @@ <div class="panel"> <div class="inner"> - <h3 id="review"> + <h3 id="review" class="review"> <span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span> {L_TOPIC_REVIEW}{L_COLON} <!-- EVENT mcp_topic_topic_title_before -->{TOPIC_TITLE}<!-- EVENT mcp_topic_topic_title_after --> </h3> - <div id="topicreview"> + <div id="topicreview" class="topicreview"> <!-- BEGIN postrow --> + <!-- EVENT mcp_topic_postrow_post_before --> <div class="post <!-- IF postrow.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> <div class="inner"> <div class="postbody" id="pr{postrow.POST_ID}"> <ul class="post-buttons"> <li> - <a href="{postrow.U_POST_DETAILS}" title="{L_POST_DETAILS}" class="button icon-button info-icon"> - <span>{L_POST_DETAILS}</span> + <a href="{postrow.U_POST_DETAILS}" title="{L_POST_DETAILS}" class="button button-icon-only"> + <i class="icon fa-info fa-fw" aria-hidden="true"></i><span class="sr-only">{L_POST_DETAILS}</span> </a> </li> <li> @@ -116,12 +117,16 @@ <!-- EVENT mcp_topic_postrow_post_subject_after --> <!-- EVENT mcp_topic_postrow_post_details_before --> - <p class="author"><a href="#pr{postrow.POST_ID}">{postrow.MINI_POST_IMG}</a> {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong><!-- IF postrow.U_MCP_DETAILS --> [ <a href="{postrow.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --></p> + <p class="author"> + <a href="{postrow.U_MINI_POST}" title="{postrow.MINI_POST}"> + <i class="icon fa-file fa-fw icon-lightgray icon-tiny" aria-hidden="true"></i><span class="sr-only">{postrow.MINI_POST}</span> + </a> {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} {% EVENT mcp_topic_post_author_full_prepend %}<strong>{postrow.POST_AUTHOR_FULL}</strong>{% EVENT mcp_topic_post_author_full_append %}<!-- IF postrow.U_MCP_DETAILS --> [ <a href="{postrow.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --> + </p> <!-- EVENT mcp_topic_postrow_post_details_after --> <!-- IF postrow.S_POST_UNAPPROVED --> <p class="post-notice unapproved"> - <a href="{postrow.U_MCP_APPROVE}"><strong>{L_POST_UNAPPROVED}</strong></a> + <a href="{postrow.U_MCP_APPROVE}"><i class="icon fa-exclamation fa-fw icon-red" aria-hidden="true"></i><strong>{L_POST_UNAPPROVED}</strong></a> </p> <!-- ENDIF --> @@ -133,12 +138,14 @@ <!-- IF postrow.S_POST_REPORTED --> <p class="post-notice reported"> - <a href="{postrow.U_MCP_REPORT}"><strong>{L_POST_REPORTED}</strong></a> + <a href="{postrow.U_MCP_REPORT}"><i class="icon fa-exclamation fa-fw icon-red" aria-hidden="true"></i><strong>{L_POST_REPORTED}</strong></a> </p> <!-- ENDIF --> <div class="content" id="message_{postrow.POST_ID}">{postrow.MESSAGE}</div> + <!-- EVENT mcp_topic_postrow_attachments_before --> + <!-- IF postrow.S_HAS_ATTACHMENTS --> <dl class="attachbox"> <dt>{L_ATTACHMENTS}</dt> @@ -148,6 +155,8 @@ </dl> <!-- ENDIF --> + <!-- EVENT mcp_topic_postrow_attachments_after --> + </div> </div> @@ -157,7 +166,7 @@ <hr /> - <div class="action-bar bottom"> + <div class="action-bar bar-bottom"> <div class="pagination"> {TOTAL_POSTS} <!-- IF .pagination --> diff --git a/phpBB/styles/prosilver/template/mcp_warn_front.html b/phpBB/styles/prosilver/template/mcp_warn_front.html index 668a0d81a8..9b188b52ac 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_front.html +++ b/phpBB/styles/prosilver/template/mcp_warn_front.html @@ -21,7 +21,7 @@ </div> <fieldset class="submit-buttons"> - <input type="reset" value="{L_RESET}" name="reset" class="button2" /> + <input type="reset" value="{L_RESET}" name="reset" class="button2" /> <input type="submit" name="submituser" value="{L_SUBMIT}" class="button1" /> {S_FORM_TOKEN} </fieldset> diff --git a/phpBB/styles/prosilver/template/mcp_warn_list.html b/phpBB/styles/prosilver/template/mcp_warn_list.html index d0e80a1479..29a2d29e8f 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_list.html +++ b/phpBB/styles/prosilver/template/mcp_warn_list.html @@ -10,12 +10,12 @@ <p>{L_WARNED_USERS_EXPLAIN}</p> <!-- IF .user --> - <div class="action-bar top"> + <div class="action-bar bar-top"> <div class="pagination"> {TOTAL_USERS} - <!-- IF .pagination --> + <!-- IF .pagination --> <!-- INCLUDE pagination.html --> - <!-- ELSE --> + <!-- ELSE --> • {PAGE_NUMBER} <!-- ENDIF --> </div> @@ -43,20 +43,14 @@ </tbody> </table> - <fieldset class="display-options"> - <label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label> - <label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label> - <input type="submit" name="sort" value="{L_GO}" class="button2" /> - </fieldset> - - <hr /> - <div class="action-bar bottom"> + <!-- INCLUDE display_options.html --> + <div class="pagination"> {TOTAL_USERS} - <!-- IF .pagination --> + <!-- IF .pagination --> <!-- INCLUDE pagination.html --> - <!-- ELSE --> + <!-- ELSE --> • {PAGE_NUMBER} <!-- ENDIF --> </div> diff --git a/phpBB/styles/prosilver/template/mcp_warn_post.html b/phpBB/styles/prosilver/template/mcp_warn_post.html index 59c7d0d495..5e39480658 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_post.html +++ b/phpBB/styles/prosilver/template/mcp_warn_post.html @@ -69,7 +69,7 @@ <!-- EVENT mcp_warn_post_add_warning_field_after --> <fieldset class="submit-buttons"> - <input type="reset" value="{L_RESET}" name="reset" class="button2" /> + <input type="reset" value="{L_RESET}" name="reset" class="button2" /> <input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1" /> {S_FORM_TOKEN} </fieldset> diff --git a/phpBB/styles/prosilver/template/mcp_warn_user.html b/phpBB/styles/prosilver/template/mcp_warn_user.html index 1ad6df7ade..f4dbf2819e 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_user.html +++ b/phpBB/styles/prosilver/template/mcp_warn_user.html @@ -53,7 +53,7 @@ <!-- EVENT mcp_warn_user_add_warning_field_after --> <fieldset class="submit-buttons"> - <input type="reset" value="{L_RESET}" name="reset" class="button2" /> + <input type="reset" value="{L_RESET}" name="reset" class="button2" /> <input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1" /> {S_FORM_TOKEN} </fieldset> diff --git a/phpBB/styles/prosilver/template/mcp_whois.html b/phpBB/styles/prosilver/template/mcp_whois.html index 41a825458d..1d08a4627e 100644 --- a/phpBB/styles/prosilver/template/mcp_whois.html +++ b/phpBB/styles/prosilver/template/mcp_whois.html @@ -3,13 +3,19 @@ <div class="panel"> <div class="inner"> - - <p><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_RETURN_POST}">{L_RETURN_POST}</a></p> + <p> + <a href="{U_RETURN_POST}" class="arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r"> + <i class="icon fa-angle-{S_CONTENT_FLOW_BEGIN} fa-fw icon-black" aria-hidden="true"></i><span>{L_RETURN_POST}</span> + </a> + </p> <div class="postbody"><div class="content"> <pre>{WHOIS}</pre> </div></div> - <p><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_RETURN_POST}">{L_RETURN_POST}</a></p> - + <p> + <a href="{U_RETURN_POST}" class="arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r"> + <i class="icon fa-angle-{S_CONTENT_FLOW_BEGIN} fa-fw icon-black" aria-hidden="true"></i><span>{L_RETURN_POST}</span> + </a> + </p> </div> </div> diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html index 5fba59159c..b8ff092372 100644 --- a/phpBB/styles/prosilver/template/memberlist_body.html +++ b/phpBB/styles/prosilver/template/memberlist_body.html @@ -12,36 +12,50 @@ <!-- ENDIF --> +{% EVENT memberlist_body_page_header_after %} + <!-- IF S_SHOW_GROUP --> + {% EVENT memberlist_body_group_name_before %} <h2 class="group-title"<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR};"<!-- ENDIF -->>{GROUP_NAME}</h2> + {% EVENT memberlist_body_group_name_after %} <!-- IF U_MANAGE --> <p class="right responsive-center manage rightside"><a href="{U_MANAGE}">{L_MANAGE_GROUP}</a></p> <!-- ENDIF --> <p>{GROUP_DESC} {GROUP_TYPE}</p> + {% EVENT memberlist_body_group_desc_after %} + <p> <!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ENDIF --> - <!-- IF RANK_IMG -->{RANK_IMG}<!-- ENDIF --> - <!-- IF GROUP_RANK -->{GROUP_RANK}<!-- ENDIF --> + {% EVENT memberlist_body_group_rank_before %} + {% if RANK_IMG %}{{ RANK_IMG }}{% endif %} + {% if GROUP_RANK %} + {% if not RANK_IMG %} + {{ lang('GROUP_RANK') ~ lang('COLON') }} + {% endif %} + {{ GROUP_RANK }} + {% endif %} + {% EVENT memberlist_body_group_rank_after %} </p> <!-- ELSE --> + {% EVENT memberlist_body_page_title_before %} <h2 class="solo">{PAGE_TITLE}<!-- IF SEARCH_WORDS -->{L_COLON} <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2> - <div class="action-bar top"> + <div class="action-bar 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 --> + <!-- IF U_FIND_MEMBER and not S_SEARCH_USER --><a href="{U_FIND_MEMBER}" id="member_search" data-alt-text="{L_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="{L_FIND_USERNAME}">{L_HIDE_MEMBER_SEARCH}</a> • <!-- ENDIF --> <strong> <!-- BEGIN first_char --> <a href="{first_char.U_SORT}">{first_char.DESC}</a> <!-- END first_char --> </strong> </div> - + <div class="pagination"> {TOTAL_USERS} - <!-- IF .pagination --> + <!-- IF .pagination --> <!-- INCLUDE pagination.html --> - <!-- ELSE --> + <!-- ELSE --> • {PAGE_NUMBER} <!-- ENDIF --> </div> @@ -52,7 +66,7 @@ <div class="forumbg forumbg-table"> <div class="inner"> - <table class="table1" id="memberlist"> + <table class="table1 memberlist" id="memberlist"> <thead> <tr> <th class="name" data-dfn="{L_RANK}{L_COMMA_SEPARATOR}<!-- IF S_SHOW_GROUP and .memberrow -->{L_GROUP_LEADER}<!-- ELSE -->{L_USERNAME}<!-- ENDIF -->"><span class="rank-img"><a href="{U_SORT_RANK}">{L_RANK}</a></span><a href="{U_SORT_USERNAME}"><!-- IF S_SHOW_GROUP and .memberrow -->{L_GROUP_LEADER}<!-- ELSE -->{L_USERNAME}<!-- ENDIF --></a></th> @@ -60,6 +74,7 @@ <th class="info"><!-- BEGIN custom_fields --><!-- IF not custom_fields.S_FIRST_ROW -->{L_COMMA_SEPARATOR} <!-- ENDIF -->{custom_fields.PROFILE_FIELD_NAME}<!-- END custom_fields --></th> <th class="joined"><a href="{U_SORT_JOINED}#memberlist">{L_JOINED}</a></th> <!-- IF U_SORT_ACTIVE --><th class="active"><a href="{U_SORT_ACTIVE}#memberlist">{L_LAST_ACTIVE}</a></th><!-- ENDIF --> + {% EVENT memberlist_body_memberlist_after %} </tr> </thead> <tbody> @@ -88,15 +103,17 @@ <!-- IF not S_LEADERS_SET --> <th class="name" data-dfn="{L_RANK}{L_COMMA_SEPARATOR}{L_USERNAME}"><span class="rank-img"><a href="{U_SORT_RANK}">{L_RANK}</a></span><a href="{U_SORT_USERNAME}"><!-- IF S_SHOW_GROUP -->{L_GROUP_MEMBERS}<!-- ELSE -->{L_USERNAME}<!-- ENDIF --></a></th> <th class="posts"><a href="{U_SORT_POSTS}#memberlist">{L_POSTS}</a></th> - <th class="info"><!-- BEGIN custom_fields --><!-- IF not custom_fields.S_FIRST_ROW -->{L_COMMA_SEPARATOR} <!-- ENDIF -->{custom_fields.PROFILE_FIELD_NAME}<!-- END custom_fields --></th> + <th class="info">{% for field in custom_fields %}{% if not loop.first %}{L_COMMA_SEPARATOR} {% endif %}{{ field.PROFILE_FIELD_NAME }}{% endfor %}</th> <th class="joined"><a href="{U_SORT_JOINED}#memberlist">{L_JOINED}</a></th> <!-- IF U_SORT_ACTIVE --><th class="active"><a href="{U_SORT_ACTIVE}#memberlist">{L_LAST_ACTIVE}</a></th><!-- ENDIF --> + {% EVENT memberlist_body_leaders_set_after %} <!-- ELSEIF S_SHOW_GROUP --> <th class="name">{L_GROUP_MEMBERS}</th> <th class="posts">{L_POSTS}</th> <th class="info"><!-- BEGIN custom_fields --><!-- IF not custom_fields.S_FIRST_ROW -->{L_COMMA_SEPARATOR} <!-- ENDIF -->{custom_fields.PROFILE_FIELD_NAME}<!-- END custom_fields --></th> <th class="joined">{L_JOINED}</th> <!-- IF U_SORT_ACTIVE --><th class="active">{L_LAST_ACTIVE}</th><!-- ENDIF --> + {% EVENT memberlist_body_show_group_after %} <!-- ENDIF --> </tr> </thead> @@ -108,9 +125,16 @@ <tr class="<!-- IF memberrow.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF memberrow.S_INACTIVE --> inactive<!-- ENDIF -->"> <td><span class="rank-img"><!-- EVENT memberlist_body_rank_prepend --><!-- IF memberrow.RANK_IMG -->{memberrow.RANK_IMG}<!-- ELSE -->{memberrow.RANK_TITLE}<!-- ENDIF --><!-- EVENT memberlist_body_rank_append --></span><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input type="checkbox" name="user" value="{memberrow.USERNAME}" /> <!-- ENDIF --><!-- EVENT memberlist_body_username_prepend -->{memberrow.USERNAME_FULL}<!-- IF memberrow.S_INACTIVE --> ({L_INACTIVE})<!-- ENDIF --><!-- EVENT memberlist_body_username_append --><!-- IF S_IN_SEARCH_POPUP --><br />[ <a href="#" onclick="insert_single_user('#results', '{memberrow.A_USERNAME}'); return false;">{L_SELECT}</a> ]<!-- ENDIF --></td> <td class="posts"><!-- IF memberrow.POSTS and S_DISPLAY_SEARCH --><a href="{memberrow.U_SEARCH_USER}" title="{L_SEARCH_USER_POSTS}">{memberrow.POSTS}</a><!-- ELSE -->{memberrow.POSTS}<!-- ENDIF --></td> - <td class="info"><!-- BEGIN custom_fields --><div>{memberrow.custom_fields.PROFILE_FIELD_VALUE}</div><!-- BEGINELSE --> <!-- END custom_fields --></td> + <td class="info"> + {%- for field in memberrow.custom_fields -%} + <div>{% if field.S_PROFILE_CONTACT %}<a href="{{ field.PROFILE_FIELD_CONTACT }}">{% endif %}{{ field.PROFILE_FIELD_VALUE }}{% if field.S_PROFILE_CONTACT %}</a>{% endif %}</div> + {%- else -%} + + {%- endfor -%} + </td> <td>{memberrow.JOINED}</td> <!-- IF S_VIEWONLINE --><td>{memberrow.LAST_ACTIVE} </td><!-- ENDIF --> + {% EVENT memberlist_body_memberrow_after %} </tr> <!-- BEGINELSE --> <tr class="bg1"> @@ -145,17 +169,19 @@ </form> -<div class="action-bar bottom"> +<div class="action-bar bar-bottom"> <div class="pagination"> {TOTAL_USERS} - <!-- IF .pagination --> + <!-- IF .pagination --> <!-- INCLUDE pagination.html --> - <!-- ELSE --> + <!-- ELSE --> • {PAGE_NUMBER} <!-- ENDIF --> </div> </div> +{% EVENT memberlist_body_page_footer_before %} + <!-- IF S_IN_SEARCH_POPUP --> <!-- INCLUDE simple_footer.html --> <!-- ELSE --> diff --git a/phpBB/styles/prosilver/template/memberlist_team.html b/phpBB/styles/prosilver/template/memberlist_team.html index 327dde412e..59041fbac0 100644 --- a/phpBB/styles/prosilver/template/memberlist_team.html +++ b/phpBB/styles/prosilver/template/memberlist_team.html @@ -36,7 +36,7 @@ <!-- END user --> </tbody> </table> - + </div> </div> <!-- END group --> diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index a7439bc759..debf64cba2 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -21,7 +21,7 @@ <dl class="left-box details profile-details"> <dt>{L_USERNAME}{L_COLON}</dt> <dd> - <!-- IF USER_COLOR --><span style="color: {USER_COLOR}; font-weight: bold;"><!-- ELSE --><span><!-- ENDIF -->{USERNAME}</span> + <!-- EVENT memberlist_view_username_prepend --><!-- IF USER_COLOR --><span style="color: {USER_COLOR}; font-weight: bold;"><!-- ELSE --><span><!-- ENDIF -->{USERNAME}</span><!-- EVENT memberlist_view_username_append --> <!-- IF U_EDIT_SELF --> [ <a href="{U_EDIT_SELF}">{L_EDIT_PROFILE}</a> ]<!-- ENDIF --> <!-- IF U_USER_ADMIN --> [ <a href="{U_USER_ADMIN}">{L_USER_ADMIN}</a> ]<!-- ENDIF --> <!-- IF U_USER_BAN --> [ <a href="{U_USER_BAN}">{L_USER_BAN}</a> ]<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/message_body.html b/phpBB/styles/prosilver/template/message_body.html index 71eca203bc..330203e19e 100644 --- a/phpBB/styles/prosilver/template/message_body.html +++ b/phpBB/styles/prosilver/template/message_body.html @@ -8,7 +8,13 @@ <div class="inner"> <h2 class="message-title">{MESSAGE_TITLE}</h2> <p>{MESSAGE_TEXT}</p> - <!-- IF SCRIPT_NAME == "search" and not S_BOARD_DISABLED and not S_NO_SEARCH and L_RETURN_TO_SEARCH_ADV --><p><a href="{U_SEARCH}" class="arrow-{S_CONTENT_FLOW_BEGIN}">{L_GO_TO_SEARCH_ADV}</a></p><!-- ENDIF --> + <!-- IF SCRIPT_NAME == "search" and not S_BOARD_DISABLED and not S_NO_SEARCH and L_RETURN_TO_SEARCH_ADV --> + <p> + <a href="{U_SEARCH}" class="arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r"> + <i class="icon fa-angle-{S_CONTENT_FLOW_BEGIN} fa-fw icon-black" aria-hidden="true"></i><span>{L_GO_TO_SEARCH_ADV}</span> + </a> + </p> + <!-- ENDIF --> </div> </div> diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html index b5a705d567..4e3d1e295e 100644 --- a/phpBB/styles/prosilver/template/navbar_footer.html +++ b/phpBB/styles/prosilver/template/navbar_footer.html @@ -1,26 +1,68 @@ <div class="navbar" role="navigation"> <div class="inner"> - <ul id="nav-footer" class="linklist bulletin" role="menubar"> - <li class="small-icon icon-home breadcrumbs"> - <!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}" data-navbar-reference="home">{L_SITE_HOME}</a></span><!-- ENDIF --> + <ul id="nav-footer" class="nav-footer linklist" role="menubar"> + <li class="breadcrumbs"> + <!-- IF U_SITE_HOME --> + {% spaceless %} + <span class="crumb"> + <a href="{U_SITE_HOME}" data-navbar-reference="home"> + <i class="icon fa-home fa-fw" aria-hidden="true"></i><span>{L_SITE_HOME}</span> + </a> + </span> + {% endspaceless %} + <!-- ENDIF --> <!-- EVENT overall_footer_breadcrumb_prepend --> - <span class="crumb"><a href="{U_INDEX}" data-navbar-reference="index">{L_INDEX}</a></span> + {% spaceless %} + <span class="crumb"> + <a href="{U_INDEX}" data-navbar-reference="index"> + <!-- IF not U_SITE_HOME --><i class="icon fa-home fa-fw" aria-hidden="true"></i><!-- ENDIF --><span>{L_INDEX}</span> + </a> + </span> + {% endspaceless %} <!-- EVENT overall_footer_breadcrumb_append --> </li> - <!-- IF U_WATCH_FORUM_LINK and not S_IS_BOT --><li class="small-icon icon-<!-- IF S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-last-responsive="true"><a href="{U_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_FORUM_TOGGLE}" data-toggle-url="{U_WATCH_FORUM_TOGGLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF --> + <!-- IF U_WATCH_FORUM_LINK and not S_IS_BOT --> + <li data-last-responsive="true"> + <a href="{U_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}" data-ajax="toggle_link" data-toggle-class="icon <!-- IF S_WATCHING_FORUM -->fa-check-square-o<!-- ELSE -->fa-square-o<!-- ENDIF --> fa-fw" data-toggle-text="{S_WATCH_FORUM_TOGGLE}" data-toggle-url="{U_WATCH_FORUM_TOGGLE}"> + <i class="icon <!-- IF S_WATCHING_FORUM -->fa-square-o<!-- ELSE -->fa-check-square-o<!-- ENDIF --> fa-fw" aria-hidden="true"></i><span>{S_WATCH_FORUM_TITLE}</span> + </a> + </li> + <!-- ENDIF --> <!-- EVENT overall_footer_timezone_before --> <li class="rightside">{S_TIMEZONE}</li> <!-- EVENT overall_footer_timezone_after --> <!-- IF not S_IS_BOT --> - <li class="small-icon icon-delete-cookies rightside"><a href="{U_DELETE_COOKIES}" data-ajax="true" data-refresh="true" role="menuitem">{L_DELETE_COOKIES}</a></li> - <!-- IF S_DISPLAY_MEMBERLIST --><li class="small-icon icon-members rightside" data-last-responsive="true"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}" role="menuitem">{L_MEMBERLIST}</a></li><!-- ENDIF --> + <li class="rightside"> + <a href="{U_DELETE_COOKIES}" data-ajax="true" data-refresh="true" role="menuitem"> + <i class="icon fa-trash fa-fw" aria-hidden="true"></i><span>{L_DELETE_COOKIES}</span> + </a> + </li> + <!-- IF S_DISPLAY_MEMBERLIST --> + <li class="rightside" data-last-responsive="true"> + <a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}" role="menuitem"> + <i class="icon fa-group fa-fw" aria-hidden="true"></i><span>{L_MEMBERLIST}</span> + </a> + </li> + <!-- ENDIF --> <!-- ENDIF --> <!-- EVENT overall_footer_teamlink_before --> - <!-- IF U_TEAM --><li class="small-icon icon-team rightside" data-last-responsive="true"><a href="{U_TEAM}" role="menuitem">{L_THE_TEAM}</a></li><!-- ENDIF --> + <!-- IF U_TEAM --> + <li class="rightside" data-last-responsive="true"> + <a href="{U_TEAM}" role="menuitem"> + <i class="icon fa-shield fa-fw" aria-hidden="true"></i><span>{L_THE_TEAM}</span> + </a> + </li> + <!-- ENDIF --> <!-- EVENT overall_footer_teamlink_after --> - <!-- IF U_CONTACT_US --><li class="small-icon icon-contact rightside" data-last-responsive="true"><a href="{U_CONTACT_US}" role="menuitem">{L_CONTACT_US}</a></li><!-- ENDIF --> + <!-- IF U_CONTACT_US --> + <li class="rightside" data-last-responsive="true"> + <a href="{U_CONTACT_US}" role="menuitem"> + <i class="icon fa-envelope fa-fw" aria-hidden="true"></i><span>{L_CONTACT_US}</span> + </a> + </li> + <!-- ENDIF --> </ul> </div> diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html index bdfb5fb87d..77f5dae0c0 100644 --- a/phpBB/styles/prosilver/template/navbar_header.html +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -1,11 +1,13 @@ <div class="navbar" role="navigation"> <div class="inner"> - <ul id="nav-main" class="linklist bulletin" role="menubar"> + <ul id="nav-main" class="nav-main linklist" role="menubar"> - <li id="quick-links" class="small-icon responsive-menu dropdown-container<!-- IF not S_DISPLAY_QUICK_LINKS and not S_DISPLAY_SEARCH --> hidden<!-- ENDIF -->" data-skip-responsive="true"> - <a href="#" class="responsive-menu-link dropdown-trigger">{L_QUICK_LINKS}</a> - <div class="dropdown hidden"> + <li id="quick-links" class="quick-links dropdown-container responsive-menu<!-- IF not S_DISPLAY_QUICK_LINKS and not S_DISPLAY_SEARCH --> hidden<!-- ENDIF -->" data-skip-responsive="true"> + <a href="#" class="dropdown-trigger"> + <i class="icon fa-bars fa-fw" aria-hidden="true"></i><span>{L_QUICK_LINKS}</span> + </a> + <div class="dropdown"> <div class="pointer"><div class="pointer-inner"></div></div> <ul class="dropdown-contents" role="menu"> <!-- EVENT navbar_header_quick_links_before --> @@ -13,24 +15,60 @@ <!-- IF S_DISPLAY_SEARCH --> <li class="separator"></li> <!-- IF S_REGISTERED_USER --> - <li class="small-icon icon-search-self"><a href="{U_SEARCH_SELF}" role="menuitem">{L_SEARCH_SELF}</a></li> + <li> + <a href="{U_SEARCH_SELF}" role="menuitem"> + <i class="icon fa-file-o fa-fw icon-gray" aria-hidden="true"></i><span>{L_SEARCH_SELF}</span> + </a> + </li> <!-- ENDIF --> <!-- IF S_USER_LOGGED_IN --> - <li class="small-icon icon-search-new"><a href="{U_SEARCH_NEW}" role="menuitem">{L_SEARCH_NEW}</a></li> + <li> + <a href="{U_SEARCH_NEW}" role="menuitem"> + <i class="icon fa-file-o fa-fw icon-red" aria-hidden="true"></i><span>{L_SEARCH_NEW}</span> + </a> + </li> <!-- ENDIF --> <!-- IF S_LOAD_UNREADS --> - <li class="small-icon icon-search-unread"><a href="{U_SEARCH_UNREAD}" role="menuitem">{L_SEARCH_UNREAD}</a></li> + <li> + <a href="{U_SEARCH_UNREAD}" role="menuitem"> + <i class="icon fa-file-o fa-fw icon-red" aria-hidden="true"></i><span>{L_SEARCH_UNREAD}</span> + </a> + </li> <!-- ENDIF --> - <li class="small-icon icon-search-unanswered"><a href="{U_SEARCH_UNANSWERED}" role="menuitem">{L_SEARCH_UNANSWERED}</a></li> - <li class="small-icon icon-search-active"><a href="{U_SEARCH_ACTIVE_TOPICS}" role="menuitem">{L_SEARCH_ACTIVE_TOPICS}</a></li> - <li class="separator"></li> - <li class="small-icon icon-search"><a href="{U_SEARCH}" role="menuitem">{L_SEARCH}</a></li> + <li> + <a href="{U_SEARCH_UNANSWERED}" role="menuitem"> + <i class="icon fa-file-o fa-fw icon-gray" aria-hidden="true"></i><span>{L_SEARCH_UNANSWERED}</span> + </a> + </li> + <li> + <a href="{U_SEARCH_ACTIVE_TOPICS}" role="menuitem"> + <i class="icon fa-file-o fa-fw icon-blue" aria-hidden="true"></i><span>{L_SEARCH_ACTIVE_TOPICS}</span> + </a> + </li> + <li class="separator"></li> + <li> + <a href="{U_SEARCH}" role="menuitem"> + <i class="icon fa-search fa-fw" aria-hidden="true"></i><span>{L_SEARCH}</span> + </a> + </li> <!-- ENDIF --> <!-- IF not S_IS_BOT and (S_DISPLAY_MEMBERLIST or U_TEAM) --> <li class="separator"></li> - <!-- IF S_DISPLAY_MEMBERLIST --><li class="small-icon icon-members"><a href="{U_MEMBERLIST}" role="menuitem">{L_MEMBERLIST}</a></li><!-- ENDIF --> - <!-- IF U_TEAM --><li class="small-icon icon-team"><a href="{U_TEAM}" role="menuitem">{L_THE_TEAM}</a></li><!-- ENDIF --> + <!-- IF S_DISPLAY_MEMBERLIST --> + <li> + <a href="{U_MEMBERLIST}" role="menuitem"> + <i class="icon fa-group fa-fw" aria-hidden="true"></i><span>{L_MEMBERLIST}</span> + </a> + </li> + <!-- ENDIF --> + <!-- IF U_TEAM --> + <li> + <a href="{U_TEAM}" role="menuitem"> + <i class="icon fa-shield fa-fw" aria-hidden="true"></i><span>{L_THE_TEAM}</span> + </a> + </li> + <!-- ENDIF --> <!-- ENDIF --> <li class="separator"></li> @@ -40,67 +78,119 @@ </li> <!-- EVENT overall_header_navigation_prepend --> - <li class="small-icon icon-faq" <!-- IF not S_USER_LOGGED_IN -->data-skip-responsive="true"<!-- ELSE -->data-last-responsive="true"<!-- ENDIF -->><a href="{U_FAQ}" rel="help" title="{L_FAQ_EXPLAIN}" role="menuitem">{L_FAQ}</a></li> + <li <!-- IF not S_USER_LOGGED_IN -->data-skip-responsive="true"<!-- ELSE -->data-last-responsive="true"<!-- ENDIF -->> + <a href="{U_FAQ}" rel="help" title="{L_FAQ_EXPLAIN}" role="menuitem"> + <i class="icon fa-question-circle fa-fw" aria-hidden="true"></i><span>{L_FAQ}</span> + </a> + </li> <!-- EVENT overall_header_navigation_append --> - <!-- IF U_ACP --><li class="small-icon icon-acp" data-last-responsive="true"><a href="{U_ACP}" title="{L_ACP}" role="menuitem">{L_ACP_SHORT}</a></li><!-- ENDIF --> - <!-- IF U_MCP --><li class="small-icon icon-mcp" data-last-responsive="true"><a href="{U_MCP}" title="{L_MCP}" role="menuitem">{L_MCP_SHORT}</a></li><!-- ENDIF --> + <!-- IF U_ACP --> + <li data-last-responsive="true"> + <a href="{U_ACP}" title="{L_ACP}" role="menuitem"> + <i class="icon fa-cogs fa-fw" aria-hidden="true"></i><span>{L_ACP_SHORT}</span> + </a> + </li> + <!-- ENDIF --> + <!-- IF U_MCP --> + <li data-last-responsive="true"> + <a href="{U_MCP}" title="{L_MCP}" role="menuitem"> + <i class="icon fa-gavel fa-fw" aria-hidden="true"></i><span>{L_MCP_SHORT}</span> + </a> + </li> + <!-- ENDIF --> <!-- IF S_REGISTERED_USER --> <!-- EVENT navbar_header_user_profile_prepend --> <li id="username_logged_in" class="rightside <!-- IF CURRENT_USER_AVATAR --> no-bulletin<!-- ENDIF -->" data-skip-responsive="true"> <!-- EVENT navbar_header_username_prepend --> <div class="header-profile dropdown-container"> - <a href="{U_PROFILE}" class="header-avatar dropdown-trigger"><!-- IF CURRENT_USER_AVATAR -->{CURRENT_USER_AVATAR} <!-- ENDIF -->{CURRENT_USERNAME_SIMPLE}</a> - <div class="dropdown hidden"> + <a href="{U_PROFILE}" class="header-avatar dropdown-trigger"><!-- IF CURRENT_USER_AVATAR -->{CURRENT_USER_AVATAR} <!-- ENDIF --> {CURRENT_USERNAME_SIMPLE}</a> + <div class="dropdown"> <div class="pointer"><div class="pointer-inner"></div></div> <ul class="dropdown-contents" role="menu"> - <!-- IF U_RESTORE_PERMISSIONS --><li class="small-icon icon-restore-permissions"><a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a></li><!-- ENDIF --> + <!-- IF U_RESTORE_PERMISSIONS --> + <li> + <a href="{U_RESTORE_PERMISSIONS}"> + <i class="icon fa-refresh fa-fw" aria-hidden="true"></i><span>{L_RESTORE_PERMISSIONS}</span> + </a> + </li> + <!-- ENDIF --> - <!-- EVENT navbar_header_profile_list_before --> + <!-- EVENT navbar_header_profile_list_before --> - <li class="small-icon icon-ucp"><a href="{U_PROFILE}" title="{L_PROFILE}" role="menuitem">{L_PROFILE}</a></li> - <li class="small-icon icon-profile"><a href="{U_USER_PROFILE}" title="{L_READ_PROFILE}" role="menuitem">{L_READ_PROFILE}</a></li> + <li> + <a href="{U_PROFILE}" title="{L_PROFILE}" role="menuitem"> + <i class="icon fa-sliders fa-fw" aria-hidden="true"></i><span>{L_PROFILE}</span> + </a> + </li> + <!-- IF U_USER_PROFILE --> + <li> + <a href="{U_USER_PROFILE}" title="{L_READ_PROFILE}" role="menuitem"> + <i class="icon fa-user fa-fw" aria-hidden="true"></i><span>{L_READ_PROFILE}</span> + </a> + </li> + <!-- ENDIF --> <!-- EVENT navbar_header_profile_list_after --> <li class="separator"></li> - <li class="small-icon icon-logout"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x" role="menuitem">{L_LOGIN_LOGOUT}</a></li> + <li> + <a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x" role="menuitem"> + <i class="icon fa-power-off fa-fw" aria-hidden="true"></i><span>{L_LOGIN_LOGOUT}</span> + </a> + </li> </ul> </div> </div> <!-- EVENT navbar_header_username_append --> </li> <!-- IF S_DISPLAY_PM --> - <li class="small-icon icon-pm rightside" data-skip-responsive="true"> - <a href="{U_PRIVATEMSGS}" role="menuitem"><span>{L_PRIVATE_MESSAGES} </span><strong class="badge<!-- IF not PRIVATE_MESSAGE_COUNT --> hidden<!-- ENDIF -->">{PRIVATE_MESSAGE_COUNT}</strong></a> + <li class="rightside" data-skip-responsive="true"> + <a href="{U_PRIVATEMSGS}" role="menuitem"> + <i class="icon fa-inbox fa-fw" aria-hidden="true"></i><span>{L_PRIVATE_MESSAGES} </span><strong class="badge<!-- IF not PRIVATE_MESSAGE_COUNT --> hidden<!-- ENDIF -->">{PRIVATE_MESSAGE_COUNT}</strong> + </a> </li> <!-- ENDIF --> <!-- IF S_NOTIFICATIONS_DISPLAY --> - <li class="small-icon icon-notification dropdown-container dropdown-{S_CONTENT_FLOW_END} rightside" data-skip-responsive="true"> - <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" class="dropdown-trigger"><span>{L_NOTIFICATIONS} </span><strong class="badge<!-- IF not NOTIFICATIONS_COUNT --> hidden<!-- ENDIF -->">{NOTIFICATIONS_COUNT}</strong></a> + <li class="dropdown-container dropdown-{S_CONTENT_FLOW_END} rightside" data-skip-responsive="true"> + <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" class="dropdown-trigger"> + <i class="icon fa-bell fa-fw" aria-hidden="true"></i><span>{L_NOTIFICATIONS} </span><strong class="badge<!-- IF not NOTIFICATIONS_COUNT --> hidden<!-- ENDIF -->">{NOTIFICATIONS_COUNT}</strong> + </a> <!-- INCLUDE notification_dropdown.html --> </li> <!-- ENDIF --> <!-- EVENT navbar_header_user_profile_append --> - <!-- ELSE --> - <li class="small-icon icon-logout rightside" data-skip-responsive="true"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x" role="menuitem">{L_LOGIN_LOGOUT}</a></li> + <!-- ELSE IF not S_IS_BOT --> + <li class="rightside" data-skip-responsive="true"> + <a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x" role="menuitem"> + <i class="icon fa-power-off fa-fw" aria-hidden="true"></i><span>{L_LOGIN_LOGOUT}</span> + </a> + </li> <!-- IF S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --> - <li class="small-icon icon-register rightside" data-skip-responsive="true"><a href="{U_REGISTER}" role="menuitem">{L_REGISTER}</a></li> + <li class="rightside" data-skip-responsive="true"> + <a href="{U_REGISTER}" role="menuitem"> + <i class="icon fa-pencil-square-o fa-fw" aria-hidden="true"></i><span>{L_REGISTER}</span> + </a> + </li> <!-- ENDIF --> <!-- EVENT navbar_header_logged_out_content --> <!-- ENDIF --> </ul> - <ul id="nav-breadcrumbs" class="linklist navlinks" role="menubar"> - <!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' --> + <ul id="nav-breadcrumbs" class="nav-breadcrumbs linklist navlinks" role="menubar"> + <!-- DEFINE $MICRODATA = ' itemtype="http://schema.org/ListItem" itemprop="itemListElement" itemscope' --> + {% set navlink_position = 1 %} <!-- EVENT overall_header_breadcrumbs_before --> - <li class="small-icon icon-home breadcrumbs"> - <!-- IF U_SITE_HOME --><span class="crumb"{$MICRODATA}><a href="{U_SITE_HOME}" data-navbar-reference="home" itemprop="url"><span itemprop="title">{L_SITE_HOME}</span></a></span><!-- ENDIF --> + <li class="breadcrumbs" itemscope itemtype="http://schema.org/BreadcrumbList"> + <!-- IF U_SITE_HOME --> + <span class="crumb" {$MICRODATA}><a href="{U_SITE_HOME}" itemtype="https://schema.org/Thing" itemscope itemprop="item" data-navbar-reference="home"><i class="icon fa-home fa-fw" aria-hidden="true"></i><span itemprop="name">{L_SITE_HOME}</span></a><meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}" /></span> + <!-- ENDIF --> <!-- EVENT overall_header_breadcrumb_prepend --> - <span class="crumb"{$MICRODATA}><a href="{U_INDEX}" accesskey="h" data-navbar-reference="index" itemprop="url"><span itemprop="title">{L_INDEX}</span></a></span> + <span class="crumb" {$MICRODATA}><a href="{U_INDEX}" itemtype="https://schema.org/Thing" itemscope itemprop="item" accesskey="h" data-navbar-reference="index"><!-- IF not U_SITE_HOME --><i class="icon fa-home fa-fw"></i><!-- ENDIF --><span itemprop="name">{L_INDEX}</span></a><meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}" /></span> + <!-- BEGIN navlinks --> <!-- EVENT overall_header_navlink_prepend --> - <span class="crumb"{$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->><a href="{navlinks.U_VIEW_FORUM}" itemprop="url"><span itemprop="title">{navlinks.FORUM_NAME}</span></a></span> + <span class="crumb" {$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->><a href="{navlinks.U_VIEW_FORUM}" itemtype="https://schema.org/Thing" itemscope itemprop="item"><span itemprop="name">{navlinks.FORUM_NAME}</span></a><meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}" /></span> <!-- EVENT overall_header_navlink_append --> <!-- END navlinks --> <!-- EVENT overall_header_breadcrumb_append --> @@ -108,7 +198,11 @@ <!-- EVENT overall_header_breadcrumbs_after --> <!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH --> - <li class="rightside responsive-search" style="display: none;"><a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}" role="menuitem">{L_SEARCH}</a></li> + <li class="rightside responsive-search"> + <a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}" role="menuitem"> + <i class="icon fa-search fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH}</span> + </a> + </li> <!-- ENDIF --> </ul> diff --git a/phpBB/styles/prosilver/template/notification_dropdown.html b/phpBB/styles/prosilver/template/notification_dropdown.html index 13d90a9d38..e444d8fb90 100644 --- a/phpBB/styles/prosilver/template/notification_dropdown.html +++ b/phpBB/styles/prosilver/template/notification_dropdown.html @@ -32,7 +32,9 @@ </div> <!-- IF notifications.URL --></a><!-- ENDIF --> <!-- IF notifications.UNREAD --> - <a href="{notifications.U_MARK_READ}" class="mark_read icon-mark" data-ajax="notification.mark_read" title="{L_MARK_READ}"></a> + <a href="{notifications.U_MARK_READ}" class="mark_read icon-mark" data-ajax="notification.mark_read" title="{L_MARK_READ}"> + <i class="icon fa-check-circle icon-xl fa-fw" aria-hidden="true"></i><span class="sr-only">{L_MARK_READ}</span> + </a> <!-- ENDIF --> </li> <!-- END notifications --> diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index faacdbff42..42c6d56c4b 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -3,28 +3,55 @@ <!-- EVENT overall_footer_page_body_after --> -<div id="page-footer" role="contentinfo"> +<div id="page-footer" class="page-footer" role="contentinfo"> <!-- INCLUDE navbar_footer.html --> <div class="copyright"> <!-- EVENT overall_footer_copyright_prepend --> - {CREDIT_LINE} - <!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF --> + <p class="footer-row"> + <span class="footer-copyright">{{ CREDIT_LINE }}</span> + </p> + <!-- IF TRANSLATION_INFO --> + <p class="footer-row"> + <span class="footer-copyright">{{ TRANSLATION_INFO }}</span> + </p> + <!-- ENDIF --> <!-- EVENT overall_footer_copyright_append --> - <!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF --> - <!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF --> + <p class="footer-row" role="menu"> + <a class="footer-link" href="{{ U_PRIVACY }}" title="{{ lang('PRIVACY_LINK') }}" role="menuitem"> + <span class="footer-link-text">{{ lang('PRIVACY_LINK') }}</span> + </a> + | + <a class="footer-link" href="{{ U_TERMS_USE }}" title="{{ lang('TERMS_LINK') }}" role="menuitem"> + <span class="footer-link-text">{{ lang('TERMS_LINK') }}</span> + </a> + </p> + <!-- IF DEBUG_OUTPUT --> + <p class="footer-row"> + <span class="footer-info">{{ DEBUG_OUTPUT }}</span> + </p> + <!-- ENDIF --> + <!-- IF U_ACP --> + <p class="footer-row"> + <a class="footer-link text-strong" href="{{ U_ACP }}">{{ lang('ACP') }}</a> + </p> + <!-- ENDIF --> </div> - <div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}"> - <div id="darken"> </div> + <div id="darkenwrapper" class="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}"> + <div id="darken" class="darken"> </div> </div> <div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}"> - <a href="#" class="alert_close"></a> + <a href="#" class="alert_close"> + <i class="icon fa-times-circle fa-fw" aria-hidden="true"></i> + </a> <h3 class="alert_title"> </h3><p class="alert_text"></p> </div> <div id="phpbb_confirm" class="phpbb_alert"> - <a href="#" class="alert_close"></a> + <a href="#" class="alert_close"> + <i class="icon fa-times-circle fa-fw" aria-hidden="true"></i> + </a> <div class="alert_text"></div> </div> </div> @@ -36,11 +63,51 @@ <!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF --> </div> -<script type="text/javascript" src="{T_JQUERY_LINK}"></script> -<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF --> -<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> +<script src="{T_JQUERY_LINK}"></script> +<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF --> +<script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> <!-- INCLUDEJS forum_fn.js --> <!-- INCLUDEJS ajax.js --> +<!-- IF S_ALLOW_CDN --> + <script> + (function($){ + var $fa_cdn = $('head').find('link[rel="stylesheet"]').first(), + $span = $('<span class="fa" style="display:none"></span>').appendTo('body'); + if ($span.css('fontFamily') !== 'FontAwesome' ) { + $fa_cdn.after('<link href="{T_ASSETS_PATH}/css/font-awesome.min.css" rel="stylesheet">'); + $fa_cdn.remove(); + } + $span.remove(); + })(jQuery); + </script> +<!-- ENDIF --> + +<!-- IF S_COOKIE_NOTICE --> + <script src="{T_ASSETS_PATH}/cookieconsent/cookieconsent.min.js?assets_version={T_ASSETS_VERSION}"></script> + <script> + if (typeof window.cookieconsent === "object") { + window.addEventListener("load", function(){ + window.cookieconsent.initialise({ + "palette": { + "popup": { + "background": "#0F538A" + }, + "button": { + "background": "#E5E5E5" + } + }, + "theme": "classic", + "content": { + "message": "{LA_COOKIE_CONSENT_MSG}", + "dismiss": "{LA_COOKIE_CONSENT_OK}", + "link": "{LA_COOKIE_CONSENT_INFO}", + "href": "{UA_PRIVACY}" + } + }); + }); + } + </script> +<!-- ENDIF --> <!-- EVENT overall_footer_after --> diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 8b2e592d02..8265825996 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -8,14 +8,14 @@ <title><!-- IF UNREAD_NOTIFICATIONS_COUNT -->({UNREAD_NOTIFICATIONS_COUNT}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title> <!-- IF S_ENABLE_FEEDS --> - <!-- IF S_ENABLE_FEEDS_OVERALL --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {SITENAME}" href="{U_FEED}"><!-- ENDIF --> - <!-- IF S_ENABLE_FEEDS_NEWS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FEED_NEWS}" href="{U_FEED}?mode=news"><!-- ENDIF --> - <!-- IF S_ENABLE_FEEDS_FORUMS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_ALL_FORUMS}" href="{U_FEED}?mode=forums"><!-- ENDIF --> - <!-- IF S_ENABLE_FEEDS_TOPICS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FEED_TOPICS_NEW}" href="{U_FEED}?mode=topics"><!-- ENDIF --> - <!-- IF S_ENABLE_FEEDS_TOPICS_ACTIVE --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FEED_TOPICS_ACTIVE}" href="{U_FEED}?mode=topics_active"><!-- ENDIF --> - <!-- IF S_ENABLE_FEEDS_FORUM and S_FORUM_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FORUM} - {FORUM_NAME}" href="{U_FEED}?f={S_FORUM_ID}"><!-- ENDIF --> - <!-- IF S_ENABLE_FEEDS_TOPIC and S_TOPIC_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_TOPIC} - {TOPIC_TITLE}" href="{U_FEED}?f={S_FORUM_ID}&t={S_TOPIC_ID}"><!-- ENDIF --> - <!-- EVENT overall_header_feeds --> + <!-- IF S_ENABLE_FEEDS_OVERALL --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {SITENAME}" href="{{ path('phpbb_feed_index') }}"><!-- ENDIF --> + <!-- IF S_ENABLE_FEEDS_NEWS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FEED_NEWS}" href="{{ path('phpbb_feed_news') }}"><!-- ENDIF --> + <!-- IF S_ENABLE_FEEDS_FORUMS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_ALL_FORUMS}" href="{{ path('phpbb_feed_forums') }}"><!-- ENDIF --> + <!-- IF S_ENABLE_FEEDS_TOPICS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FEED_TOPICS_NEW}" href="{{ path('phpbb_feed_topics') }}"><!-- ENDIF --> + <!-- IF S_ENABLE_FEEDS_TOPICS_ACTIVE --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FEED_TOPICS_ACTIVE}" href="{{ path('phpbb_feed_topics_active') }}"><!-- ENDIF --> + <!-- IF S_ENABLE_FEEDS_FORUM and S_FORUM_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FORUM} - {FORUM_NAME}" href="{{ path('phpbb_feed_forum', { forum_id : S_FORUM_ID } ) }}"><!-- ENDIF --> + <!-- IF S_ENABLE_FEEDS_TOPIC and S_TOPIC_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_TOPIC} - {TOPIC_TITLE}" href="{{ path('phpbb_feed_topic', { topic_id : S_TOPIC_ID } ) }}"><!-- ENDIF --> + <!-- EVENT overall_header_feeds --> <!-- ENDIF --> <!-- IF U_CANONICAL --> @@ -31,40 +31,39 @@ <!-- IF S_ALLOW_CDN --> <script> - WebFontConfig = { - google: { - families: ['Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic'] - } - }; + WebFontConfig = { + google: { + families: ['Open+Sans:300,300i,400,400i,600,600i,700,700i,800,800i&subset=cyrillic,cyrillic-ext,greek,greek-ext,latin-ext,vietnamese'] + } + }; (function(d) { var wf = d.createElement('script'), s = d.scripts[0]; wf.src = 'https://ajax.googleapis.com/ajax/libs/webfont/1.5.18/webfont.js'; wf.async = true; s.parentNode.insertBefore(wf, s); - })(document); + })(document); </script> <!-- ENDIF --> <link href="{T_FONT_AWESOME_LINK}" rel="stylesheet"> <link href="{T_STYLESHEET_LINK}" rel="stylesheet"> <link href="{T_STYLESHEET_LANG_LINK}" rel="stylesheet"> -<link href="{T_THEME_PATH}/responsive.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" media="all and (max-width: 700px)"> <!-- IF S_CONTENT_DIRECTION eq 'rtl' --> - <link href="{T_THEME_PATH}/bidi.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet"> + <link href="{T_THEME_PATH}/bidi.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet"> <!-- ENDIF --> <!-- IF S_PLUPLOAD --> - <link href="{T_THEME_PATH}/plupload.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet"> + <link href="{T_THEME_PATH}/plupload.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet"> <!-- ENDIF --> <!-- IF S_COOKIE_NOTICE --> - <link href="{T_ASSETS_PATH}/cookieconsent/cookieconsent.min.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet"> + <link href="{T_ASSETS_PATH}/cookieconsent/cookieconsent.min.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet"> <!-- ENDIF --> <link rel="shortcut icon" type="image/png" href="https://nav.mageia.org/g/favicon.png" /> <!--[if lte IE 9]> - <link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet"> + <link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet"> <![endif]--> <!-- EVENT overall_header_head_append --> @@ -78,31 +77,35 @@ <!-- EVENT overall_header_body_before --> -<div id="wrap"> - <a id="top" class="anchor" accesskey="t"></a> - <div id="page-header"> - <div class="headerbar" role="banner"> - <!-- EVENT overall_header_headerbar_before --> - <div class="inner"> - - <div id="site-description"> - <a id="logo" class="logo" href="<!-- IF U_SITE_HOME -->{U_SITE_HOME}<!-- ELSE -->{U_INDEX}<!-- ENDIF -->" title="<!-- IF U_SITE_HOME -->{L_SITE_HOME}<!-- ELSE -->{L_INDEX}<!-- ENDIF -->">{SITE_LOGO_IMG}</a> - <h1>{SITENAME}</h1> - <p>{SITE_DESCRIPTION}</p> - <p class="skiplink"><a href="#start_here">{L_SKIP}</a></p> +<div id="wrap" class="wrap"> + <a id="top" class="top-anchor" accesskey="t"></a> + <div id="page-header"> + <div class="headerbar" role="banner"> + <!-- EVENT overall_header_headerbar_before --> + <div class="inner"> + + <div id="site-description" class="site-description"> + <a id="logo" class="logo" href="<!-- IF U_SITE_HOME -->{U_SITE_HOME}<!-- ELSE -->{U_INDEX}<!-- ENDIF -->" title="<!-- IF U_SITE_HOME -->{L_SITE_HOME}<!-- ELSE -->{L_INDEX}<!-- ENDIF -->"><span class="site_logo"></span></a> + <h1>{SITENAME}</h1> + <p>{SITE_DESCRIPTION}</p> + <p class="skiplink"><a href="#start_here">{L_SKIP}</a></p> </div> <!-- EVENT overall_header_searchbox_before --> <!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH --> <div id="search-box" class="search-box search-header" role="search"> - <form action="{U_SEARCH}" method="get" id="search"> - <fieldset> - <input name="keywords" id="keywords" type="search" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search tiny" size="20" value="{SEARCH_WORDS}" placeholder="{L_SEARCH_MINI}" /> - <button class="button icon-button search-icon" type="submit" title="{L_SEARCH}">{L_SEARCH}</button> - <a href="{U_SEARCH}" class="button icon-button search-adv-icon" title="{L_SEARCH_ADV}">{L_SEARCH_ADV}</a> - {S_SEARCH_HIDDEN_FIELDS} - </fieldset> - </form> + <form action="{U_SEARCH}" method="get" id="search"> + <fieldset> + <input name="keywords" id="keywords" type="search" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search tiny" size="20" value="{SEARCH_WORDS}" placeholder="{L_SEARCH_MINI}" /> + <button class="button button-search" type="submit" title="{L_SEARCH}"> + <i class="icon fa-search fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH}</span> + </button> + <a href="{U_SEARCH}" class="button button-search-end" title="{L_SEARCH_ADV}"> + <i class="icon fa-cog fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH_ADV}</span> + </a> + {S_SEARCH_HIDDEN_FIELDS} + </fieldset> + </form> </div> <!-- ENDIF --> <!-- EVENT overall_header_searchbox_after --> @@ -114,13 +117,13 @@ <!-- INCLUDE navbar_header.html --> </div> - <!-- EVENT overall_header_page_body_before --> + <!-- EVENT overall_header_page_body_before --> - <a id="start_here" class="anchor"></a> - <div id="page-body" role="main"> - <!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN and (U_MCP or U_ACP) --> - <div id="information" class="rules"> - <div class="inner"> + <a id="start_here" class="anchor"></a> + <div id="page-body" class="page-body" role="main"> + <!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN and (U_MCP or U_ACP) --> + <div id="information" class="rules"> + <div class="inner"> <strong>{L_INFORMATION}{L_COLON}</strong> {L_BOARD_DISABLED} </div> </div> diff --git a/phpBB/styles/prosilver/template/pagination.html b/phpBB/styles/prosilver/template/pagination.html index 88c67459c2..5d484517ad 100644 --- a/phpBB/styles/prosilver/template/pagination.html +++ b/phpBB/styles/prosilver/template/pagination.html @@ -1,8 +1,8 @@ <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"> + <a class="button button-icon-only dropdown-trigger" href="#" title="{L_JUMP_TO_PAGE_CLICK}" role="button"><i class="icon fa-level-down fa-rotate-270" aria-hidden="true"></i><span class="sr-only">{PAGE_NUMBER}</span></a> + <div class="dropdown"> <div class="pointer"><div class="pointer-inner"></div></div> <ul class="dropdown-contents"> <li>{L_JUMP_TO_PAGE}{L_COLON}</li> @@ -16,15 +16,15 @@ <!-- ENDIF --> <!-- BEGIN pagination --> <!-- IF pagination.S_IS_PREV --> - <li class="previous"><a href="{pagination.PAGE_URL}" rel="prev" role="button">{L_PREVIOUS}</a></li> + <li class="arrow previous"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="prev" role="button"><i class="icon fa-chevron-{S_CONTENT_FLOW_BEGIN} fa-fw" aria-hidden="true"></i><span class="sr-only">{L_PREVIOUS}</span></a></li> <!-- ELSEIF pagination.S_IS_CURRENT --> <li class="active"><span>{pagination.PAGE_NUMBER}</span></li> <!-- ELSEIF pagination.S_IS_ELLIPSIS --> <li class="ellipsis" role="separator"><span>{L_ELLIPSIS}</span></li> <!-- ELSEIF pagination.S_IS_NEXT --> - <li class="next"><a href="{pagination.PAGE_URL}" rel="next" role="button">{L_NEXT}</a></li> + <li class="arrow next"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="next" role="button"><i class="icon fa-chevron-{S_CONTENT_FLOW_END} fa-fw" aria-hidden="true"></i><span class="sr-only">{L_NEXT}</span></a></li> <!-- ELSE --> - <li><a href="{pagination.PAGE_URL}" role="button">{pagination.PAGE_NUMBER}</a></li> + <li><a class="button" href="{pagination.PAGE_URL}" role="button">{pagination.PAGE_NUMBER}</a></li> <!-- ENDIF --> <!-- END pagination --> </ul> diff --git a/phpBB/styles/prosilver/template/plupload.html b/phpBB/styles/prosilver/template/plupload.html index fc663118c1..9425b7d769 100644 --- a/phpBB/styles/prosilver/template/plupload.html +++ b/phpBB/styles/prosilver/template/plupload.html @@ -1,5 +1,4 @@ -<script type="text/javascript"> -//<![CDATA[ +<script> phpbb.plupload = { i18n: { 'b': '{LA_BYTES_SHORT}', @@ -46,7 +45,14 @@ phpbb.plupload = { max_file_size: '{FILESIZE}b', chunk_size: '{CHUNK_SIZE}b', unique_names: true, - filters: [{FILTERS}], + filters: { + mime_types: [ + {FILTERS} + ], + mime_types_max_file_size: [ + {FILTERS} + ], + }, {S_RESIZE} headers: {'X-PHPBB-USING-PLUPLOAD': '1', 'X-Requested-With': 'XMLHttpRequest'}, file_data_name: 'fileupload', @@ -58,12 +64,12 @@ phpbb.plupload = { lang: { ERROR: '{LA_ERROR}', TOO_MANY_ATTACHMENTS: '{LA_TOO_MANY_ATTACHMENTS}', + FORM_INVALID: '{LA_FORM_INVALID}', }, order: '{ATTACH_ORDER}', maxFiles: {MAX_ATTACHMENTS}, data: {S_ATTACH_DATA}, } -//]]> </script> <!-- INCLUDEJS {T_ASSETS_PATH}/plupload/plupload.full.min.js --> <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/plupload.js --> diff --git a/phpBB/styles/prosilver/template/posting_attach_body.html b/phpBB/styles/prosilver/template/posting_attach_body.html index d7922297a7..0363fe0f05 100644 --- a/phpBB/styles/prosilver/template/posting_attach_body.html +++ b/phpBB/styles/prosilver/template/posting_attach_body.html @@ -2,7 +2,7 @@ <div class="inner"> <p>{L_ADD_ATTACHMENT_EXPLAIN} <span class="hidden" id="drag-n-drop-message">{L_PLUPLOAD_DRAG_TEXTAREA}</span></p> - + <fieldset class="fields2" id="attach-panel-basic"> <dl> <dt><label for="fileupload">{L_FILENAME}{L_COLON}</label></dt> @@ -17,11 +17,12 @@ </dl> </fieldset> - <div id="attach-panel-multi"> + <div id="attach-panel-multi" class="attach-panel-multi"> <input type="button" class="button2" value="{L_PLUPLOAD_ADD_FILES}" id="add_files" /> </div> - <div class="panel<!-- IF not .attach_row --> hidden<!-- ENDIF -->" id="file-list-container"> + {% EVENT posting_attach_body_file_list_before %} + <div class="panel<!-- IF not .attach_row --> hidden<!-- ENDIF --> file-list-container" id="file-list-container"> <div class="inner"> <table class="table1 zebra-list fixed-width-table"> <thead> @@ -32,12 +33,12 @@ <th class="attach-status">{L_PLUPLOAD_STATUS}</th> </tr> </thead> - <tbody class="responsive-skip-empty" id="file-list"> - <tr class="attach-row" id="attach-row-tpl"> + <tbody class="responsive-skip-empty file-list" id="file-list"> + <tr class="attach-row attach-row-tpl" id="attach-row-tpl"> <td class="attach-name"> <span class="file-name ellipsis-text"></span> <span class="attach-controls"> - <input type="button" value="{L_PLACE_INLINE}" class="button2 hidden file-inline-bbcode" /> + {% if S_BBCODE_ALLOWED %}<input type="button" value="{{ lang('PLACE_INLINE') }}" class="button2 hidden file-inline-bbcode" /> {% endif %} <input type="button" value="{L_DELETE_FILE}" class="button2 file-delete" /> </span> <span class="clear"></span> @@ -55,14 +56,18 @@ <span class="file-status"></span> </td> </tr> + {% EVENT posting_attach_body_attach_row_before %} <!-- BEGIN attach_row --> + {% EVENT posting_attach_body_attach_row_prepend %} <tr class="attach-row" data-attach-id="{attach_row.ATTACH_ID}"> <td class="attach-name"> <span class="file-name ellipsis-text"><a href="{attach_row.U_VIEW_ATTACHMENT}">{attach_row.FILENAME}</a></span> + {% EVENT posting_attach_body_attach_row_controls_prepend %} <span class="attach-controls"> - <!-- IF S_INLINE_ATTACHMENT_OPTIONS --><input type="button" value="{L_PLACE_INLINE}" class="button2 file-inline-bbcode" /> <!-- ENDIF --> + {% if S_BBCODE_ALLOWED and S_INLINE_ATTACHMENT_OPTIONS %}<input type="button" value="{{ lang('PLACE_INLINE') }}" class="button2 file-inline-bbcode" /> {% endif %} <input type="submit" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" class="button2 file-delete" /> </span> + {% EVENT posting_attach_body_attach_row_controls_append %} <span class="clear"></span> </td> <td class="attach-comment"> @@ -76,10 +81,13 @@ <span class="file-status file-uploaded"></span> </td> </tr> + {% EVENT posting_attach_body_attach_row_append %} <!-- END attach_row --> + {% EVENT posting_attach_body_attach_row_after %} </tbody> </table> </div> </div> + {% EVENT posting_attach_body_file_list_after %} </div> </div> diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html index 1555b12369..cb305eee4b 100644 --- a/phpBB/styles/prosilver/template/posting_buttons.html +++ b/phpBB/styles/prosilver/template/posting_buttons.html @@ -1,6 +1,5 @@ -<script type="text/javascript"> -// <![CDATA[ +<script> var form_name = 'postform'; var text_name = <!-- IF $SIG_EDIT -->'signature'<!-- ELSE -->'message'<!-- ENDIF -->; var load_draft = false; @@ -11,27 +10,6 @@ var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->); var imageTag = false; - // Helpline messages - var help_line = { - b: '{LA_BBCODE_B_HELP}', - i: '{LA_BBCODE_I_HELP}', - u: '{LA_BBCODE_U_HELP}', - q: '{LA_BBCODE_Q_HELP}', - c: '{LA_BBCODE_C_HELP}', - l: '{LA_BBCODE_L_HELP}', - o: '{LA_BBCODE_O_HELP}', - p: '{LA_BBCODE_P_HELP}', - w: '{LA_BBCODE_W_HELP}', - a: '{LA_BBCODE_A_HELP}', - s: '{LA_BBCODE_S_HELP}', - f: '{LA_BBCODE_F_HELP}', - y: '{LA_BBCODE_Y_HELP}', - d: '{LA_BBCODE_D_HELP}' - <!-- BEGIN custom_tags --> - ,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}' - <!-- END custom_tags --> - } - function change_palette() { phpbb.toggleDisplay('colour_palette'); @@ -46,8 +24,6 @@ document.getElementById('bbpalette').value = '{LA_FONT_COLOR}'; } } - -// ]]> </script> <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js --> @@ -55,31 +31,56 @@ <div id="colour_palette" style="display: none;"> <dl style="clear: left;"> <dt><label>{L_FONT_COLOR}{L_COLON}</label></dt> - <dd id="color_palette_placeholder" data-orientation="h" data-height="12" data-width="15" data-bbcode="true"></dd> + <dd id="color_palette_placeholder" class="color_palette_placeholder" data-orientation="h" data-height="12" data-width="15" data-bbcode="true"></dd> </dl> </div> <!-- EVENT posting_editor_buttons_before --> -<div id="format-buttons"> - <input type="button" class="button2 bbcode-b" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" /> - <input type="button" class="button2 bbcode-i" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" /> - <input type="button" class="button2 bbcode-u" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" /> +<div id="format-buttons" class="format-buttons"> + <button type="button" class="button button-icon-only bbcode-b" accesskey="b" name="addbbcode0" value=" B " onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}"> + <i class="icon fa-bold fa-fw" aria-hidden="true"></i> + </button> + <button type="button" class="button button-icon-only bbcode-i" accesskey="i" name="addbbcode2" value=" i " onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}"> + <i class="icon fa-italic fa-fw" aria-hidden="true"></i> + </button> + <button type="button" class="button button-icon-only bbcode-u" accesskey="u" name="addbbcode4" value=" u " onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}"> + <i class="icon fa-underline fa-fw" aria-hidden="true"></i> + </button> <!-- IF S_BBCODE_QUOTE --> - <input type="button" class="button2 bbcode-quote" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" /> + <button type="button" class="button button-icon-only bbcode-quote" accesskey="q" name="addbbcode6" value="Quote" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}"> + <i class="icon fa-quote-left fa-fw" aria-hidden="true"></i> + </button> <!-- ENDIF --> - <input type="button" class="button2 bbcode-code" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" /> - <input type="button" class="button2 bbcode-list" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" /> - <input type="button" class="button2 bbcode-list-" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" /> - <input type="button" class="button2 bbcode-asterisk" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" /> + <button type="button" class="button button-icon-only bbcode-code" accesskey="c" name="addbbcode8" value="Code" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}"> + <i class="icon fa-code fa-fw" aria-hidden="true"></i> + </button> + <button type="button" class="button button-icon-only bbcode-list" accesskey="l" name="addbbcode10" value="List" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}"> + <i class="icon fa-list fa-fw" aria-hidden="true"></i> + </button> + <button type="button" class="button button-icon-only bbcode-list-" accesskey="o" name="addbbcode12" value="List=" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}"> + <i class="icon fa-list-ol fa-fw" aria-hidden="true"></i> + </button> + <button type="button" class="button button-icon-only bbcode-asterisk" accesskey="y" name="addlistitem" value="[*]" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}"> + <i class="icon fa-asterisk fa-fw" aria-hidden="true"></i> + </button> <!-- IF S_BBCODE_IMG --> - <input type="button" class="button2 bbcode-img" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" /> + <button type="button" class="button button-icon-only bbcode-img" accesskey="p" name="addbbcode14" value="Img" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}"> + <i class="icon fa-image fa-fw" aria-hidden="true"></i> + </button> <!-- ENDIF --> <!-- IF S_LINKS_ALLOWED --> - <input type="button" class="button2 bbcode-url" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" /> + <button type="button" class="button button-icon-only bbcode-url" accesskey="w" name="addbbcode16" value="URL" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}"> + <i class="icon fa-link fa-fw" aria-hidden="true"></i> + </button> <!-- ENDIF --> <!-- IF S_BBCODE_FLASH --> - <input type="button" class="button2 bbcode-flash" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}" /> + <button type="button" class="button button-icon-only bbcode-flash" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}"> + <i class="icon fa-flash fa-fw" aria-hidden="true"></i> + </button> <!-- ENDIF --> + <button type="button" class="button button-icon-only bbcode-color" name="bbpalette" id="bbpalette" value="{L_FONT_COLOR}" onclick="change_palette();" title="{L_BBCODE_S_HELP}"> + <i class="icon fa-tint fa-fw" aria-hidden="true"></i> + </button> <select name="addbbcode20" class="bbcode-size" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}"> <option value="50">{L_FONT_TINY}</option> <option value="85">{L_FONT_SMALL}</option> @@ -91,12 +92,13 @@ <!-- ENDIF --> <!-- ENDIF --> </select> - <input type="button" class="button2 bbcode-color" name="bbpalette" id="bbpalette" value="{L_FONT_COLOR}" onclick="change_palette();" title="{L_BBCODE_S_HELP}" /> <!-- EVENT posting_editor_buttons_custom_tags_before --> <!-- BEGIN custom_tags --> - <input type="button" class="button2 bbcode-{custom_tags.BBCODE_TAG_CLEAN}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" /> + <button type="button" class="button button-secondary bbcode-{custom_tags.BBCODE_TAG_CLEAN}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{{ custom_tags.BBCODE_HELPLINE|e('html_attr') }}"> + {custom_tags.BBCODE_TAG} + </button> <!-- END custom_tags --> </div> <!-- EVENT posting_editor_buttons_after --> diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index 5258ea09a2..d963c98e08 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -6,7 +6,7 @@ <dt><label for="icon">{L_ICON}{L_COLON}</label></dt> <dd> <label for="icon"><input type="radio" name="icon" id="icon" value="0" checked="checked" tabindex="1" /> <!-- IF S_SHOW_TOPIC_ICONS -->{L_NO_TOPIC_ICON}<!-- ELSE -->{L_NO_PM_ICON}<!-- ENDIF --></label> - <!-- BEGIN topic_icon --><label for="icon-{topic_icon.ICON_ID}"><input type="radio" name="icon" id="icon-{topic_icon.ICON_ID}" value="{topic_icon.ICON_ID}" {topic_icon.S_ICON_CHECKED} tabindex="1" /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="{topic_icon.ICON_NAME}" title="" /></label> <!-- END topic_icon --> + <!-- BEGIN topic_icon --><label for="icon-{topic_icon.ICON_ID}"><input type="radio" name="icon" id="icon-{topic_icon.ICON_ID}" value="{topic_icon.ICON_ID}" {topic_icon.S_ICON_CHECKED} tabindex="1" /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="{topic_icon.ICON_ALT}" title="{topic_icon.ICON_ALT}" /></label> <!-- END topic_icon --> </dd> </dl> <!-- ENDIF --> @@ -39,8 +39,8 @@ <!-- INCLUDE posting_buttons.html --> - <div id="smiley-box"> - <!-- EVENT posting_editor_smilies_before --> + <div id="smiley-box" class="smiley-box"> + <!-- EVENT posting_editor_smilies_before --> <!-- IF S_SMILIES_ALLOWED and .smiley --> <strong>{L_SMILIES}</strong><br /> <!-- BEGIN smiley --> @@ -73,7 +73,7 @@ <!-- EVENT posting_editor_message_before --> - <div id="message-box"> + <div id="message-box" class="message-box"> <textarea <!-- IF S_UCP_ACTION and not S_PRIVMSGS and not S_EDIT_DRAFT -->name="signature" id="signature" style="height: 9em;"<!-- ELSE -->name="message" id="message"<!-- ENDIF --> rows="15" cols="76" tabindex="4" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" class="inputbox">{MESSAGE}{DRAFT_MESSAGE}{SIGNATURE}</textarea> </div> @@ -106,13 +106,13 @@ <!-- 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="<!-- IF SHOW_PANEL -->{SHOW_PANEL}<!-- ELSE -->options-panel<!-- ENDIF -->" role="tablist"> + <div id="tabs" class="tabs sub-panels" data-show-panel="<!-- IF SHOW_PANEL -->{SHOW_PANEL}<!-- ELSE -->options-panel<!-- ENDIF -->" role="tablist"> <ul> <li id="options-panel-tab" class="tab activetab"><a href="#tabs" data-subpanel="options-panel" role="tab" aria-controls="options-panel"><span>{L_OPTIONS}</span></a></li> <!-- IF S_SHOW_ATTACH_BOX --> <li id="attach-panel-tab" class="tab"> <a href="#tabs" data-subpanel="attach-panel" role="tab" aria-controls="attach-panel"> - {L_ATTACHMENTS} <strong id="file-total-progress"><strong id="file-total-progress-bar"></strong></strong> + {L_ATTACHMENTS} <strong id="file-total-progress" class="file-total-progress"><strong id="file-total-progress-bar" class="file-total-progress-bar"></strong></strong> </a> </li> <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/posting_layout.html b/phpBB/styles/prosilver/template/posting_layout.html index 22da32076c..bca9195f0e 100644 --- a/phpBB/styles/prosilver/template/posting_layout.html +++ b/phpBB/styles/prosilver/template/posting_layout.html @@ -9,14 +9,14 @@ <!-- IF S_FORUM_RULES --> <div class="rules<!-- IF U_FORUM_RULES --> rules-link<!-- ENDIF -->"> <div class="inner"> - + <!-- IF U_FORUM_RULES --> <a href="{U_FORUM_RULES}">{L_FORUM_RULES}</a> <!-- ELSE --> <strong>{L_FORUM_RULES}</strong><br /> {FORUM_RULES} <!-- ENDIF --> - + </div> </div> <!-- ENDIF --> @@ -26,10 +26,10 @@ <!-- IF S_DRAFT_LOADED --> <div class="panel"> <div class="inner"> - + <h3>{L_INFORMATION}</h3> <p>{L_DRAFT_LOADED}</p> - + </div> </div> <!-- ENDIF --> @@ -48,7 +48,7 @@ <dt><label for="to_forum_id">{L_MOVE}{L_COLON}</label></dt> <dd><select id="to_forum_id" name="to_forum_id">{S_FORUM_SELECT}</select></dd> </dl> - + <dl> <dt> </dt> <dd><input class="button1" type="submit" name="post" value="{L_CONFIRM}" /> <input class="button2" type="submit" name="cancel_unglobalise" value="{L_CANCEL}" /></dd> @@ -63,7 +63,7 @@ <div class="panel" id="postingbox"> <div class="inner"> - + <h3>{L_POST_A}</h3> <!-- DEFINE $EXTRA_POSTING_OPTIONS = 1 --> diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html index 032d8c6a6f..7fee914525 100644 --- a/phpBB/styles/prosilver/template/posting_pm_header.html +++ b/phpBB/styles/prosilver/template/posting_pm_header.html @@ -32,7 +32,7 @@ <!-- BEGIN to_recipient --> <li> <!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF --> - <!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF --> + <!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}" style="color: {{ to_recipient.COLOUR }}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF --> </li> <!-- END to_recipient --> </ul> @@ -49,7 +49,7 @@ <!-- BEGIN bcc_recipient --> <li> <!-- IF not S_EDIT_POST --><input type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF --> - <!-- IF bcc_recipient.IS_GROUP --><a href="{bcc_recipient.U_VIEW}"><strong>{bcc_recipient.NAME}</strong></a><!-- ELSE -->{bcc_recipient.NAME_FULL}<!-- ENDIF --> + <!-- IF bcc_recipient.IS_GROUP --><a href="{bcc_recipient.U_VIEW}" style="color: {{ bcc_recipient.COLOUR }}"><strong>{bcc_recipient.NAME}</strong></a><!-- ELSE -->{bcc_recipient.NAME_FULL}<!-- ENDIF --> </li> <!-- END bcc_recipient --> </ul> diff --git a/phpBB/styles/prosilver/template/posting_pm_layout.html b/phpBB/styles/prosilver/template/posting_pm_layout.html index 7f4a0ea8d7..316fa791e4 100644 --- a/phpBB/styles/prosilver/template/posting_pm_layout.html +++ b/phpBB/styles/prosilver/template/posting_pm_layout.html @@ -3,10 +3,10 @@ <!-- IF S_DRAFT_LOADED --> <div class="panel"> <div class="inner"> - + <h3>{L_INFORMATION}</h3> <p>{L_DRAFT_LOADED_PM}</p> - + </div> </div> <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/posting_poll_body.html b/phpBB/styles/prosilver/template/posting_poll_body.html index ee7100aded..795649650d 100644 --- a/phpBB/styles/prosilver/template/posting_poll_body.html +++ b/phpBB/styles/prosilver/template/posting_poll_body.html @@ -15,8 +15,8 @@ <!-- IF S_SHOW_POLL_BOX --> <dl> - <dt><label for="poll_title">{L_POLL_QUESTION}{L_COLON}</label></dt> - <dd><input type="text" name="poll_title" id="poll_title" maxlength="255" value="{POLL_TITLE}" class="inputbox" /></dd> + <dt><label for="poll_title">{{ lang('POLL_QUESTION') ~ lang('COLON') }}</label></dt> + <dd><input type="text" name="poll_title" id="poll_title" maxlength="100" value="{{ POLL_TITLE }}" class="inputbox" /></dd> </dl> <dl> <dt><label for="poll_option_text">{L_POLL_OPTIONS}{L_COLON}</label><br /><span>{L_POLL_OPTIONS_EXPLAIN}</span></dt> diff --git a/phpBB/styles/prosilver/template/posting_preview.html b/phpBB/styles/prosilver/template/posting_preview.html index aac117c090..781d0de06b 100644 --- a/phpBB/styles/prosilver/template/posting_preview.html +++ b/phpBB/styles/prosilver/template/posting_preview.html @@ -31,6 +31,8 @@ <div class="content">{PREVIEW_MESSAGE}</div> + <!-- EVENT posting_preview_content_after --> + <!-- IF .attachment --> <dl class="attachbox"> <dt>{L_ATTACHMENTS}</dt> diff --git a/phpBB/styles/prosilver/template/posting_review.html b/phpBB/styles/prosilver/template/posting_review.html index 25b719420b..e5d285e7bf 100644 --- a/phpBB/styles/prosilver/template/posting_review.html +++ b/phpBB/styles/prosilver/template/posting_review.html @@ -13,8 +13,17 @@ <!-- ENDIF --> <div class="postbody" id="ppr{post_review_row.POST_ID}"> - <h3><a href="#ppr{post_review_row.POST_ID}">{post_review_row.POST_SUBJECT}</a></h3> - <p class="author"><!-- IF S_IS_BOT -->{post_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{post_review_row.U_MINI_POST}">{post_review_row.MINI_POST_IMG}</a><!-- ENDIF --> {L_POST_BY_AUTHOR}<strong> {post_review_row.POST_AUTHOR_FULL}</strong> » {post_review_row.POST_DATE}</p> + <h3><a href="{post_review_row.U_MINI_POST}">{post_review_row.POST_SUBJECT}</a></h3> + <p class="author"> + <!-- IF S_IS_BOT --> + <span><i class="icon fa-file fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{post_review_row.MINI_POST}</span></span> + <!-- ELSE --> + <a href="{post_review_row.U_MINI_POST}" title="{post_review_row.MINI_POST}"> + <i class="icon fa-file fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{post_review_row.MINI_POST}</span> + </a> + <!-- ENDIF --> + {L_POST_BY_AUTHOR} <!-- EVENT posting_review_row_post_author_username_prepend --><strong>{post_review_row.POST_AUTHOR_FULL}</strong><!-- EVENT posting_review_row_post_author_username_append --> » {post_review_row.POST_DATE} + </p> <div class="content">{post_review_row.MESSAGE}</div> <!-- IF post_review_row.S_HAS_ATTACHMENTS --> diff --git a/phpBB/styles/prosilver/template/posting_smilies.html b/phpBB/styles/prosilver/template/posting_smilies.html index 3bd51275ec..b5794d5aff 100644 --- a/phpBB/styles/prosilver/template/posting_smilies.html +++ b/phpBB/styles/prosilver/template/posting_smilies.html @@ -1,23 +1,21 @@ <!-- INCLUDE simple_header.html --> -<script type="text/javascript"> -// <![CDATA[ +<script> var form_name = opener.form_name; var text_name = opener.text_name; -// ]]> </script> <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js --> <h2>{L_SMILIES}</h2> <div class="panel"> <div class="inner"> - <!-- BEGIN smiley --> - <a href="#" onclick="initInsertions(); insert_text('{smiley.A_SMILEY_CODE}', true, true); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" /></a> + <!-- BEGIN smiley --> + <a href="#" onclick="initInsertions(); insert_text('{smiley.A_SMILEY_CODE}', true, true); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" /></a> <!-- END smiley --> - + </div> </div> -<!-- IF .pagination --> +<!-- IF .pagination --> <div class="pagination"> <!-- INCLUDE pagination.html --> </div> diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html index 4d5ab16afe..209dadf327 100644 --- a/phpBB/styles/prosilver/template/posting_topic_review.html +++ b/phpBB/styles/prosilver/template/posting_topic_review.html @@ -1,14 +1,12 @@ -<h3 id="review"> +<h3 id="review" class="review"> <span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span> {L_TOPIC_REVIEW}{L_COLON} {TOPIC_TITLE} </h3> -<div id="topicreview"> -<script type="text/javascript"> -// <![CDATA[ +<div id="topicreview" class="topicreview"> +<script> bbcodeEnabled = {S_BBCODE_ALLOWED}; -// ]]> </script> <!-- BEGIN topic_review_row --> @@ -26,21 +24,21 @@ <!-- ENDIF --> <div class="postbody" id="pr{topic_review_row.POST_ID}"> - <h3><a href="#pr{topic_review_row.POST_ID}">{topic_review_row.POST_SUBJECT}</a></h3> + <h3><a href="{topic_review_row.U_MINI_POST}">{topic_review_row.POST_SUBJECT}</a></h3> <!-- IF (topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE) or topic_review_row.U_MCP_DETAILS --> <ul class="post-buttons"> <!-- IF topic_review_row.U_MCP_DETAILS --> <li> - <a href="{topic_review_row.U_MCP_DETAILS}" title="{L_POST_DETAILS}" class="button icon-button info-icon"> - <span>{L_POST_DETAILS}</span> + <a href="{topic_review_row.U_MCP_DETAILS}" title="{L_POST_DETAILS}" class="button button-icon-only"> + <i class="icon fa-info fa-fw" aria-hidden="true"></i><span class="sr-only">{L_POST_DETAILS}</span> </a> <li> <!-- ENDIF --> <!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE --> <li> - <a href="#postingbox" onclick="addquote({topic_review_row.POST_ID}, '{topic_review_row.POSTER_QUOTE}', '{LA_WROTE}');" title="{L_QUOTE} {topic_review_row.POST_AUTHOR}" class="button icon-button quote-icon"> - <span>{L_QUOTE} {topic_review_row.POST_AUTHOR}</span> + <a href="#postingbox" onclick="addquote({topic_review_row.POST_ID}, '{topic_review_row.POSTER_QUOTE}', '{LA_WROTE}', {post_id:{topic_review_row.POST_ID},time:{topic_review_row.POST_TIME},user_id:{topic_review_row.USER_ID}});" title="{L_QUOTE} {topic_review_row.POST_AUTHOR}" class="button button-icon-only"> + <i class="icon fa-quote-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_QUOTE} {topic_review_row.POST_AUTHOR}</span> </a> </li> <!-- ENDIF --> @@ -48,11 +46,22 @@ <!-- ENDIF --> <!-- EVENT posting_topic_review_row_post_details_before --> - <p class="author"><!-- IF S_IS_BOT -->{topic_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{topic_review_row.U_MINI_POST}">{topic_review_row.MINI_POST_IMG}</a><!-- ENDIF --> {L_POST_BY_AUTHOR} <strong>{topic_review_row.POST_AUTHOR_FULL}</strong> » {topic_review_row.POST_DATE} </p> + <p class="author"> + <!-- IF S_IS_BOT --> + <span><i class="icon fa-file fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{topic_review_row.MINI_POST}</span></span> + <!-- ELSE --> + <a href="{topic_review_row.U_MINI_POST}" title="{topic_review_row.MINI_POST}"> + <i class="icon fa-file fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{topic_review_row.MINI_POST}</span> + </a> + <!-- ENDIF --> + {L_POST_BY_AUTHOR} <!-- EVENT posting_topic_review_row_post_author_username_prepend --><strong>{topic_review_row.POST_AUTHOR_FULL}</strong><!-- EVENT posting_topic_review_row_post_author_username_append --> » {topic_review_row.POST_DATE} + </p> <!-- EVENT posting_topic_review_row_post_details_after --> <div class="content">{topic_review_row.MESSAGE}</div> + <!-- EVENT posting_topic_review_row_content_after --> + <!-- IF topic_review_row.S_HAS_ATTACHMENTS --> <dl class="attachbox"> <dt>{L_ATTACHMENTS}</dt> @@ -73,8 +82,8 @@ <hr /> -<!-- IF S_MCP_REPORT --> - <p><a href="#report" class="top2">{L_BACK_TO_TOP}</a></p> -<!-- ELSE --> - <p><a href="#postingbox" class="top2">{L_BACK_TO_TOP}</a></p> -<!-- ENDIF --> +<p> + <a href="<!-- IF S_MCP_REPORT -->#report<!-- ELSE -->#postingbox<!-- ENDIF -->" class="top"> + <i class="icon fa-chevron-circle-up fa-fw icon-gray" aria-hidden="true"></i><span>{L_BACK_TO_TOP}</span> + </a> +</p> diff --git a/phpBB/styles/prosilver/template/quickreply_editor.html b/phpBB/styles/prosilver/template/quickreply_editor.html index ca8ccc0a6b..9839494491 100644 --- a/phpBB/styles/prosilver/template/quickreply_editor.html +++ b/phpBB/styles/prosilver/template/quickreply_editor.html @@ -10,7 +10,7 @@ <dd><input type="text" name="subject" id="subject" size="45" maxlength="124" tabindex="2" value="{SUBJECT}" class="inputbox autowidth" /></dd> </dl> <!-- EVENT quickreply_editor_message_before --> - <div id="message-box"> + <div id="message-box" class="message-box"> <textarea style="height: 9em;" name="message" rows="7" cols="76" tabindex="3" class="inputbox"></textarea> </div> <!-- EVENT quickreply_editor_message_after --> diff --git a/phpBB/styles/prosilver/template/report_body.html b/phpBB/styles/prosilver/template/report_body.html index 2a5e6c9d0e..285e8ec8d7 100644 --- a/phpBB/styles/prosilver/template/report_body.html +++ b/phpBB/styles/prosilver/template/report_body.html @@ -8,7 +8,7 @@ <div class="content"> <p><!-- IF S_REPORT_POST -->{L_REPORT_POST_EXPLAIN}<!-- ELSE -->{L_REPORT_MESSAGE_EXPLAIN}<!-- ENDIF --></p> - + <fieldset> <!-- IF ERROR --><dl><dd class="error">{ERROR}</dd></dl><!-- ENDIF --> <dl class="fields2"> @@ -19,7 +19,7 @@ <dl class="fields2"> <dt><label for="notify1">{L_REPORT_NOTIFY}{L_COLON}</label><br /><span>{L_REPORT_NOTIFY_EXPLAIN}</span></dt> <dd> - <label for="notify1"><input type="radio" name="notify" id="notify1" value="1" <!-- IF not S_NOTIFY -->checked="checked"<!-- ENDIF --> /> {L_YES}</label> + <label for="notify1"><input type="radio" name="notify" id="notify1" value="1" <!-- IF not S_NOTIFY -->checked="checked"<!-- ENDIF --> /> {L_YES}</label> <label for="notify0"><input type="radio" name="notify" id="notify0" value="0" <!-- IF S_NOTIFY -->checked="checked"<!-- ENDIF --> /> {L_NO}</label> </dd> </dl> diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index 4c83e95a1b..9ee13a4224 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -8,23 +8,35 @@ <!-- IF PHRASE_SEARCH_DISABLED --> <p><strong>{L_PHRASE_SEARCH_DISABLED}</strong></p><!-- ENDIF --> <!-- IF SEARCH_TOPIC --> - <p class="return-link"><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}">{L_RETURN_TO_TOPIC}</a></p> + <p class="return-link"> + <a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}"> + <i class="icon fa-angle-{S_CONTENT_FLOW_BEGIN} fa-fw icon-black" aria-hidden="true"></i><span>{L_RETURN_TO_TOPIC}</span> + </a> + </p> <!-- ELSE --> - <p class="advanced-search-link"><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}">{L_GO_TO_SEARCH_ADV}</a></p> + <p class="advanced-search-link"> + <a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}"> + <i class="icon fa-angle-{S_CONTENT_FLOW_BEGIN} fa-fw icon-black" aria-hidden="true"></i><span>{L_GO_TO_SEARCH_ADV}</span> + </a> + </p> <!-- ENDIF --> <!-- EVENT search_results_header_after --> <!-- IF .pagination or SEARCH_MATCHES or TOTAL_MATCHES or PAGE_NUMBER --> - <div class="action-bar top"> + <div class="action-bar bar-top"> <!-- IF TOTAL_MATCHES > 0 --> <div class="search-box" role="search"> <form method="post" action="{S_SEARCH_ACTION}"> <fieldset> <input class="inputbox search tiny" type="search" name="add_keywords" id="add_keywords" value="" placeholder="{L_SEARCH_IN_RESULTS}" /> - <button class="button icon-button search-icon" type="submit" title="{L_SEARCH}">{L_SEARCH}</button> - <a href="{U_SEARCH}" class="button icon-button search-adv-icon" title="{L_SEARCH_ADV}">{L_SEARCH_ADV}</a> + <button class="button button-search" type="submit" title="{L_SEARCH}"> + <i class="icon fa-search fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH}</span> + </button> + <a href="{U_SEARCH}" class="button button-search-end" title="{L_SEARCH_ADV}"> + <i class="icon fa-cog fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH_ADV}</span> + </a> </fieldset> </form> </div> @@ -52,7 +64,7 @@ <div class="inner"> <ul class="topiclist"> <li class="header"> - <dl class="icon"> + <dl class="row-item"> <dt><div class="list-inner">{L_TOPICS}</div></dt> <dd class="posts">{L_REPLIES}</dd> <dd class="views">{L_VIEWS}</dd> @@ -65,43 +77,81 @@ <!-- BEGIN searchresults --> <!-- EVENT search_results_topic_before --> <li class="row<!-- IF searchresults.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF -->"> - <dl class="icon {searchresults.TOPIC_IMG_STYLE}"> - <dt <!-- IF searchresults.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{searchresults.TOPIC_FOLDER_IMG_ALT}"> - <!-- IF searchresults.S_UNREAD_TOPIC and not S_IS_BOT --><a href="{searchresults.U_NEWEST_POST}" class="icon-link"></a><!-- ENDIF --> + <dl class="row-item {searchresults.TOPIC_IMG_STYLE}"> + <dt<!-- IF searchresults.TOPIC_ICON_IMG --> style="background-image: url({T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{searchresults.TOPIC_FOLDER_IMG_ALT}"> + <!-- IF searchresults.S_UNREAD_TOPIC and not S_IS_BOT --><a href="{searchresults.U_NEWEST_POST}" class="row-item-link"></a><!-- ENDIF --> <div class="list-inner"> - <!-- EVENT topiclist_row_prepend --> - <!-- IF searchresults.S_UNREAD_TOPIC and not S_IS_BOT --><a href="{searchresults.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --> - <a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a> {searchresults.ATTACH_ICON_IMG} - <!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED --><a href="{searchresults.U_MCP_QUEUE}">{searchresults.UNAPPROVED_IMG}</a> <!-- ENDIF --> - <!-- IF searchresults.S_TOPIC_DELETED --><a href="{searchresults.U_MCP_QUEUE}">{DELETED_IMG}</a> <!-- ENDIF --> - <!-- IF searchresults.S_TOPIC_REPORTED --><a href="{searchresults.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br /> + <!-- IF searchresults.S_UNREAD_TOPIC and not S_IS_BOT --> + <a class="unread" href="{searchresults.U_NEWEST_POST}"> + <i class="icon fa-file fa-fw icon-red icon-md" aria-hidden="true"></i><span class="sr-only">{L_NEW_POST}</span> + </a> + <!-- ENDIF --> + <a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a> + <!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED --> + <a href="{searchresults.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}"> + <i class="icon fa-question fa-fw icon-blue" aria-hidden="true"></i><span class="sr-only">{L_TOPIC_UNAPPROVED}</span> + </a> + <!-- ENDIF --> + <!-- IF searchresults.S_TOPIC_DELETED --> + <a href="{searchresults.U_MCP_QUEUE}" title="{L_TOPIC_DELETED}"> + <i class="icon fa-recycle fa-fw icon-green" aria-hidden="true"></i><span class="sr-only">{L_TOPIC_DELETED}</span> + </a> + <!-- ENDIF --> + <!-- IF searchresults.S_TOPIC_REPORTED --> + <a href="{searchresults.U_MCP_REPORT}" title="{L_TOPIC_REPORTED}"> + <i class="icon fa-exclamation fa-fw icon-red" aria-hidden="true"></i><span class="sr-only">{L_TOPIC_REPORTED}</span> + </a> + <!-- ENDIF --> + <br /> <!-- EVENT topiclist_row_topic_title_after --> + + <!-- IF not S_IS_BOT --> + <div class="responsive-show" style="display: none;"> + {L_LAST_POST} {L_POST_BY_AUTHOR} <!-- EVENT search_results_last_post_author_username_prepend -->{searchresults.LAST_POST_AUTHOR_FULL}<!-- EVENT search_results_last_post_author_username_append --> « <a href="{searchresults.U_LAST_POST}" title="{L_GOTO_LAST_POST}"><time datetime="{searchresults.LAST_POST_TIME_RFC3339}">{searchresults.LAST_POST_TIME}</time></a> + <br />{L_POSTED} {L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a> + </div> + <!-- IF searchresults.TOPIC_REPLIES --><span class="responsive-show left-box" style="display: none;">{L_REPLIES}{L_COLON} <strong>{searchresults.TOPIC_REPLIES}</strong></span><!-- ENDIF --> + <!-- ENDIF --> + + <div class="responsive-hide left-box"> + <!-- IF searchresults.S_HAS_POLL --><i class="icon fa-bar-chart fa-fw" aria-hidden="true"></i><!-- ENDIF --> + <!-- IF searchresults.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i><!-- ENDIF --> + {% EVENT topiclist_row_topic_by_author_before %} + {L_POST_BY_AUTHOR} <!-- EVENT search_results_topic_author_username_prepend -->{searchresults.TOPIC_AUTHOR_FULL}<!-- EVENT search_results_topic_author_username_append --> » <time datetime="{searchresults.FIRST_POST_TIME_RFC3339}">{searchresults.FIRST_POST_TIME}</time> » {L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a> + {% EVENT topiclist_row_topic_by_author_after %} + </div> + <!-- IF .searchresults.pagination --> <div class="pagination"> + <span><i class="icon fa-clone fa-fw" aria-hidden="true"></i></span> <ul> <!-- BEGIN pagination --> <!-- IF searchresults.pagination.S_IS_PREV --> <!-- ELSEIF searchresults.pagination.S_IS_CURRENT --><li class="active"><span>{searchresults.pagination.PAGE_NUMBER}</span></li> <!-- ELSEIF searchresults.pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li> <!-- ELSEIF searchresults.pagination.S_IS_NEXT --> - <!-- ELSE --><li><a href="{searchresults.pagination.PAGE_URL}">{searchresults.pagination.PAGE_NUMBER}</a></li> + <!-- ELSE --><li><a class="button" href="{searchresults.pagination.PAGE_URL}">{searchresults.pagination.PAGE_NUMBER}</a></li> <!-- ENDIF --> <!-- END pagination --> </ul> </div> <!-- ENDIF --> - <!-- IF searchresults.S_HAS_POLL -->{POLL_IMG} <!-- ENDIF --> - {L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} » {searchresults.FIRST_POST_TIME} » {L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a> - <!-- EVENT topiclist_row_append --> + <!-- EVENT topiclist_row_append --> </div> </dt> - <dd class="posts">{searchresults.TOPIC_REPLIES}</dd> - <dd class="views">{searchresults.TOPIC_VIEWS}</dd> - <dd class="lastpost"><span> - {L_POST_BY_AUTHOR} {searchresults.LAST_POST_AUTHOR_FULL} - <!-- IF not S_IS_BOT --><a href="{searchresults.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{searchresults.LAST_POST_TIME}<br /> </span> + <dd class="posts">{searchresults.TOPIC_REPLIES} <dfn>{L_REPLIES}</dfn></dd> + <dd class="views">{searchresults.TOPIC_VIEWS} <dfn>{L_VIEWS}</dfn></dd> + <dd class="lastpost"> + <span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} <!-- EVENT search_results_last_post_author_username_prepend -->{searchresults.LAST_POST_AUTHOR_FULL}<!-- EVENT search_results_last_post_author_username_append --> + <!-- IF not S_IS_BOT --> + <a href="{searchresults.U_LAST_POST}" title="{L_GOTO_LAST_POST}"> + <i class="icon fa-external-link-square fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{VIEW_LATEST_POST}</span> + </a> + <!-- ENDIF --> + <br /><time datetime="{searchresults.LAST_POST_TIME_RFC3339}">{searchresults.LAST_POST_TIME}</time> + </span> </dd> </dl> </li> @@ -133,7 +183,7 @@ <!-- ELSE --> <dl class="postprofile"> <!-- EVENT search_results_postprofile_before --> - <dt class="author">{L_POST_BY_AUTHOR} {searchresults.POST_AUTHOR_FULL}</dt> + <dt class="author">{L_POST_BY_AUTHOR} <!-- EVENT search_results_post_author_username_prepend -->{searchresults.POST_AUTHOR_FULL}<!-- EVENT search_results_post_author_username_append --></dt> <dd class="search-result-date">{searchresults.POST_DATE}</dd> <dd>{L_FORUM}{L_COLON} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></dd> <dd>{L_TOPIC}{L_COLON} <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a></dd> @@ -146,12 +196,17 @@ <div class="postbody"> <h3><a href="{searchresults.U_VIEW_POST}">{searchresults.POST_SUBJECT}</a></h3> <div class="content">{searchresults.MESSAGE}</div> + <!-- EVENT search_results_content_after --> </div> <!-- ENDIF --> <!-- IF not searchresults.S_IGNORE_POST --> <ul class="searchresults"> - <li ><a href="{searchresults.U_VIEW_POST}" class="arrow-{S_CONTENT_FLOW_END}">{L_JUMP_TO_POST}</a></li> + <li> + <a href="{searchresults.U_VIEW_POST}" class="arrow-{S_CONTENT_FLOW_END}"> + <i class="icon fa-angle-{S_CONTENT_FLOW_END} fa-fw icon-black" aria-hidden="true"></i><span>{L_JUMP_TO_POST}</span> + </a> + </li> </ul> <!-- ENDIF --> @@ -167,24 +222,13 @@ <!-- END searchresults --> <!-- ENDIF --> -<!-- IF .pagination or .searchresults or S_SELECT_SORT_KEY or S_SELECT_SORT_DAYS --> +<div class="action-bar bottom"> + <!-- IF .searchresults and (S_SELECT_SORT_DAYS or S_SELECT_SORT_KEY) --> <form method="post" action="{S_SEARCH_ACTION}"> - - <fieldset class="display-options"> - <!-- 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> - <input type="submit" name="sort" value="{L_GO}" class="button2" /> - <!-- ENDIF --> - </fieldset> - + <!-- INCLUDE display_options.html --> </form> + <!-- ENDIF --> - <hr /> -<!-- ENDIF --> - -<!-- IF .pagination or .searchresults or PAGE_NUMBER --> -<div class="action-bar bottom"> <div class="pagination"> {SEARCH_MATCHES} <!-- IF .pagination --> @@ -194,7 +238,6 @@ <!-- ENDIF --> </div> </div> -<!-- ENDIF --> <!-- INCLUDE jumpbox.html --> diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html index 77980a9dea..1ef44d1688 100644 --- a/phpBB/styles/prosilver/template/simple_footer.html +++ b/phpBB/styles/prosilver/template/simple_footer.html @@ -5,24 +5,28 @@ <!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF --> </div> - <div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}"> - <div id="darken"> </div> + <div id="darkenwrapper" class="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}"> + <div id="darken" class="darken"> </div> </div> - <div id="loading_indicator"></div> + <div id="loading_indicator" class="loading_indicator"></div> <div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}"> - <a href="#" class="alert_close"></a> + <a href="#" class="alert_close"> + <i class="icon fa-times-circle fa-fw" aria-hidden="true"></i> + </a> <h3 class="alert_title"></h3><p class="alert_text"></p> </div> - <div id="phpbb_confirm" class="phpbb_alert"> - <a href="#" class="alert_close"></a> + <div id="phpbb_confirm" class="phpbb_confirm phpbb_alert"> + <a href="#" class="alert_close"> + <i class="icon fa-times-circle fa-fw" aria-hidden="true"></i> + </a> <div class="alert_text"></div> </div> </div> -<script type="text/javascript" src="{T_JQUERY_LINK}"></script> -<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF --> -<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> +<script src="{T_JQUERY_LINK}"></script> +<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF --> +<script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> <!-- INCLUDEJS forum_fn.js --> <!-- INCLUDEJS ajax.js --> @@ -30,5 +34,7 @@ {$SCRIPTS} +{% EVENT simple_footer_body_after %} + </body> </html> diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index 3924aa29d9..905d25096f 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -11,7 +11,7 @@ <script> WebFontConfig = { google: { - families: ['Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic'] + families: ['Open+Sans:300,300i,400,400i,600,600i,700,700i,800,800i&subset=cyrillic,cyrillic-ext,greek,greek-ext,latin-ext,vietnamese'] } }; @@ -23,9 +23,9 @@ })(document); </script> <!-- ENDIF --> +<link href="{T_FONT_AWESOME_LINK}" rel="stylesheet"> <link href="{T_STYLESHEET_LINK}" rel="stylesheet"> <link href="{T_STYLESHEET_LANG_LINK}" rel="stylesheet"> -<link href="{T_THEME_PATH}/responsive.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" media="all and (max-width: 700px)"> <!-- IF S_CONTENT_DIRECTION eq 'rtl' --> <link href="{T_THEME_PATH}/bidi.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet"> @@ -49,6 +49,6 @@ <!-- EVENT simple_header_body_before --> -<div id="wrap"> - <a id="top" class="anchor" accesskey="t"></a> - <div id="page-body" role="main"> +<div id="wrap" class="wrap"> + <a id="top" class="top-anchor" accesskey="t"></a> + <div id="page-body" class="page-body" role="main"> diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html index b8be456489..728dc9487a 100644 --- a/phpBB/styles/prosilver/template/timezone_option.html +++ b/phpBB/styles/prosilver/template/timezone_option.html @@ -12,7 +12,7 @@ </dd> <!-- ENDIF --> <dd> - <select name="tz" id="timezone" class="autowidth tz_select"> + <select name="tz" id="timezone" class="autowidth tz_select timezone"> <option value="">{L_SELECT_TIMEZONE}</option> <!-- BEGIN timezone_select --> <optgroup label="{timezone_select.LABEL}" data-tz-value="{timezone_select.VALUE}"> diff --git a/phpBB/styles/prosilver/template/ucp_agreement.html b/phpBB/styles/prosilver/template/ucp_agreement.html index 943774c6ec..7959925d30 100644 --- a/phpBB/styles/prosilver/template/ucp_agreement.html +++ b/phpBB/styles/prosilver/template/ucp_agreement.html @@ -3,8 +3,7 @@ <!-- IF S_SHOW_COPPA or S_REGISTRATION --> <!-- IF S_LANG_OPTIONS --> -<script type="text/javascript"> -// <![CDATA[ +<script> /** * Change language */ @@ -14,8 +13,6 @@ document.forms['register'].change_lang.value = lang_iso; document.forms['register'].submit(); } - -// ]]> </script> <form method="post" action="{S_UCP_ACTION}" id="register"> @@ -46,7 +43,8 @@ <div class="inner"> <fieldset class="submit-buttons"> <!-- IF S_SHOW_COPPA --> - <strong><a href="{U_COPPA_NO}" class="button1">{L_COPPA_NO}</a></strong> <a href="{U_COPPA_YES}" class="button2">{L_COPPA_YES}</a> + <input type="submit" name="coppa_no" id="coppa_no" value="{{ L_COPPA_NO }}" class="button1" /> + <input type="submit" name="coppa_yes" id="coppa_yes" value="{{ L_COPPA_YES }}" class="button2" /> <!-- ELSE --> <input type="submit" name="agreed" id="agreed" value="{L_AGREE}" class="button1" /> <input type="submit" name="not_agreed" value="{L_NOT_AGREE}" class="button2" /> @@ -65,8 +63,6 @@ <div class="content"> <h2 class="sitename-title">{SITENAME} - {AGREEMENT_TITLE}</h2> <p>{AGREEMENT_TEXT}</p> - <hr class="dashed" /> - <p><a href="{U_BACK}" class="button2">{L_BACK}</a></p> </div> </div> </div> diff --git a/phpBB/styles/prosilver/template/ucp_attachments.html b/phpBB/styles/prosilver/template/ucp_attachments.html index 1d4963273c..cfdbf9c7ea 100644 --- a/phpBB/styles/prosilver/template/ucp_attachments.html +++ b/phpBB/styles/prosilver/template/ucp_attachments.html @@ -6,21 +6,21 @@ <div class="panel"> <div class="inner"> - + <p>{L_ATTACHMENTS_EXPLAIN}</p> <!-- IF .attachrow --> <div class="action-bar top"> <div class="pagination"> {NUM_ATTACHMENTS} - <!-- IF .pagination --> + <!-- IF .pagination --> <!-- INCLUDE pagination.html --> - <!-- ELSE --> + <!-- ELSE --> • {PAGE_NUMBER} <!-- ENDIF --> </div> </div> - + <ul class="topiclist"> <li class="header"> <dl> @@ -44,27 +44,21 @@ </dt> <dd class="extra">{attachrow.DOWNLOAD_COUNT}</dd> <dd class="time"><span>{attachrow.POST_TIME}</span></dd> - <dd class="mark"><input type="checkbox" name="attachment[{attachrow.ATTACH_ID}]" value="1" /></dd> + <dd class="mark"><input type="checkbox" name="attachment[{attachrow.ATTACH_ID}]" value="1"{% if attachrow.S_LOCKED %} disabled title="{{ lang('ATTACHMENT_LOCKED') }}"{% endif %} /></dd> </dl> </li> <!-- END attachrow --> </ul> - <fieldset class="display-options"> - <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}" /> + <div class="action-bar bottom"> + <!-- INCLUDE display_options.html --> {S_FORM_TOKEN} - </fieldset> - <hr /> - - <div class="action-bar bottom"> <div class="pagination"> {TOTAL_ATTACHMENTS} {L_TITLE} - <!-- IF .pagination --> + <!-- IF .pagination --> <!-- INCLUDE pagination.html --> - <!-- ELSE --> + <!-- ELSE --> • {PAGE_NUMBER} <!-- ENDIF --> </div> @@ -76,9 +70,9 @@ </div> </div> - + <!-- IF S_ATTACHMENT_ROWS --> - <fieldset class="display-actions"> + <fieldset class="display-actions"> <input class="button2" type="submit" name="delete" value="{L_DELETE_MARKED}" /> <div><a href="#" onclick="marklist('ucp', 'attachment', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('ucp', 'attachment', false); return false;">{L_UNMARK_ALL}</a></div> {S_FORM_TOKEN} diff --git a/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html b/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html index 18316613b0..60061a3139 100644 --- a/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html +++ b/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html @@ -1,5 +1,5 @@ <!-- BEGIN oauth --> - <form id="ucp" method="post" action="{S_UCP_ACTION}"> + <form id="ucp_oauth_{oauth.SERVICE_ID}" method="post" action="{S_UCP_ACTION}"> <h3>{oauth.SERVICE_NAME}</h3> <fieldset class="fields2"> diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html index 80c7f28ca3..e431b7425e 100644 --- a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html +++ b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html @@ -6,7 +6,7 @@ </select></label> <input type="submit" value="{L_GO}" name="avatar_local_go" class="button2" /> -<div id="gallery"> +<div id="gallery" class="gallery"> <!-- BEGIN avatar_local_row --> <!-- BEGIN avatar_local_col --> <label for="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}"><img src="{avatar_local_row.avatar_local_col.AVATAR_IMAGE}" alt="" /><br /> diff --git a/phpBB/styles/prosilver/template/ucp_footer.html b/phpBB/styles/prosilver/template/ucp_footer.html index f2f1a68db3..eb07f52e05 100644 --- a/phpBB/styles/prosilver/template/ucp_footer.html +++ b/phpBB/styles/prosilver/template/ucp_footer.html @@ -9,6 +9,4 @@ </form> <!-- ENDIF --> -<!-- INCLUDE jumpbox.html --> - <!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html index 3b805c4862..f2b4f003e0 100644 --- a/phpBB/styles/prosilver/template/ucp_groups_manage.html +++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html @@ -33,9 +33,9 @@ <dl> <dt><label for="group_type1">{L_GROUP_TYPE}{L_COLON}</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt> <dd> - <label for="group_type1"><input type="radio" class="radio" name="group_type" id="group_type1" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label> - <label for="group_type2"><input type="radio" class="radio" name="group_type" id="group_type2" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label> - <label for="group_type3"><input type="radio" class="radio" name="group_type" id="group_type3" value="{GROUP_TYPE_CLOSED}"{GROUP_CLOSED} /> {L_GROUP_CLOSED}</label> + <label for="group_type1"><input type="radio" class="radio" name="group_type" id="group_type1" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label> + <label for="group_type2"><input type="radio" class="radio" name="group_type" id="group_type2" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label> + <label for="group_type3"><input type="radio" class="radio" name="group_type" id="group_type3" value="{GROUP_TYPE_CLOSED}"{GROUP_CLOSED} /> {L_GROUP_CLOSED}</label> <label for="group_type4"><input type="radio" class="radio" name="group_type" id="group_type4" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN}</label> </dd> </dl> @@ -58,7 +58,7 @@ <input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" class="inputbox narrow" /> <span style="background-color: #{GROUP_COLOUR};"> </span> [ <a href="#" id="color_palette_toggle">{L_COLOUR_SWATCH}</a> ] - <div id="color_palette_placeholder" class="hidden" data-orientation="h" data-height="12" data-width="15" data-target="#group_colour"></div> + <div id="color_palette_placeholder" class="color_palette_placeholder hidden" data-orientation="h" data-height="12" data-width="15" data-target="#group_colour"></div> </dd> </dl> <dl> @@ -74,7 +74,7 @@ <fieldset class="submit-buttons"> {S_HIDDEN_FIELDS} - <input type="reset" value="{L_RESET}" name="reset" class="button2" /> + <input type="reset" value="{L_RESET}" name="reset" class="button2" /> <input type="submit" name="update" value="{L_SUBMIT}" class="button1" /> {S_FORM_TOKEN} </fieldset> @@ -160,8 +160,8 @@ </table> <!-- IF .pagination --> - <div class="action-bar bottom"> - <div class="pagination"> + <div class="action-bar bar-bottom"> + <div class="pagination"> <!-- INCLUDE pagination.html --> </div> </div> @@ -170,7 +170,7 @@ </div> </div> -<fieldset class="display-actions"> +<fieldset class="display-actions"> <select name="action"><option value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select> <input class="button2" type="submit" name="update" value="{L_SUBMIT}" /> <div><a href="#" onclick="marklist('ucp', 'mark', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('ucp', 'mark', false); return false;">{L_UNMARK_ALL}</a></div> @@ -187,7 +187,7 @@ <dl> <dt><label for="default0">{L_USER_GROUP_DEFAULT}{L_COLON}</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt> <dd> - <label for="default1"><input type="radio" name="default" id="default1" value="1" /> {L_YES}</label> + <label for="default1"><input type="radio" name="default" id="default1" value="1" /> {L_YES}</label> <label for="default0"><input type="radio" name="default" id="default0" value="0" checked="checked" /> {L_NO}</label> </dd> </dl> diff --git a/phpBB/styles/prosilver/template/ucp_groups_membership.html b/phpBB/styles/prosilver/template/ucp_groups_membership.html index d7df3b02c2..e824a7b867 100644 --- a/phpBB/styles/prosilver/template/ucp_groups_membership.html +++ b/phpBB/styles/prosilver/template/ucp_groups_membership.html @@ -55,7 +55,7 @@ <!-- BEGIN member --> <!-- IF not member.GROUP_SPECIAL --> <!-- DEFINE $SHOW_BUTTONS = 1 --> - <!-- ENDIF --> + <!-- ENDIF --> <li class="row<!-- IF member.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->"> <dl> <dt> @@ -73,11 +73,11 @@ </ul> <!-- ENDIF --> </div> -</div> +</div> <!-- IF .pending --> <div class="panel"> - <div class="inner"> + <div class="inner"> <ul class="topiclist two-columns"> <li class="header"> <dl> @@ -91,7 +91,7 @@ <!-- BEGIN pending --> <!-- IF not pending.GROUP_SPECIAL --> <!-- DEFINE $SHOW_BUTTONS = 1 --> - <!-- ENDIF --> + <!-- ENDIF --> <li class="row<!-- IF pending.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->"> <dl> <dt> @@ -125,7 +125,7 @@ <!-- BEGIN nonmember --> <!-- IF nonmember.S_CAN_JOIN --> <!-- DEFINE $SHOW_BUTTONS = 1 --> - <!-- ENDIF --> + <!-- ENDIF --> <li class="row<!-- IF nonmember.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->"> <dl> <dt> @@ -143,7 +143,7 @@ </div> </div> <!-- ENDIF --> - + <!-- IF S_CHANGE_DEFAULT or $SHOW_BUTTONS eq 1 --> <fieldset> @@ -156,7 +156,7 @@ <!-- IF $SHOW_BUTTONS eq 1 --> <div class="right-box"> - <label for="action">{L_SELECT}{L_COLON}</label> + <label for="action">{L_SELECT}{L_COLON}</label> <select name="action" id="action"> <option value="join">{L_JOIN_SELECTED}</option> <option value="resign">{L_RESIGN_SELECTED}</option> diff --git a/phpBB/styles/prosilver/template/ucp_header.html b/phpBB/styles/prosilver/template/ucp_header.html index a17f145cbc..98d2eee1a0 100644 --- a/phpBB/styles/prosilver/template/ucp_header.html +++ b/phpBB/styles/prosilver/template/ucp_header.html @@ -2,7 +2,7 @@ <h2 class="ucp-title">{L_UCP}</h2> -<div id="tabs"> +<div id="tabs" class="tabs"> <ul> <!-- BEGIN t_block1 --> <li class="tab<!-- IF t_block1.S_SELECTED --> activetab<!-- ENDIF -->"><a href="{t_block1.U_TITLE}">{t_block1.L_TITLE}</a></li> @@ -19,15 +19,15 @@ <div style="width: 100%;"> - <div id="cp-menu"> - <div id="navigation" role="navigation"> + <div id="cp-menu" class="cp-menu"> + <div id="navigation" class="navigation" role="navigation"> <!-- IF S_PRIVMSGS --> <!-- BEGIN t_block2 --> <!-- IF S_PRIVMSGS and not t_block2.S_LAST_ROW --> <ul> <!-- IF t_block2.S_SELECTED --> - <li id="active-subsection"><a href="{t_block2.U_TITLE}"><span>{t_block2.L_TITLE}</span></a></li> + <li id="active-subsection" class="active-subsection"><a href="{t_block2.U_TITLE}"><span>{t_block2.L_TITLE}</span></a></li> <!-- ELSE --> <li><a href="{t_block2.U_TITLE}"><span>{t_block2.L_TITLE}</span></a></li> <!-- ENDIF --> @@ -39,7 +39,7 @@ <!-- BEGIN folder --> <!-- IF folder.S_FIRST_ROW --><ul><!-- ENDIF --> <!-- IF folder.S_CUR_FOLDER --> - <li id="active-subsection"><a href="{folder.U_FOLDER}"><!-- IF folder.UNREAD_MESSAGES > 0 --><strong>{folder.FOLDER_NAME} ({folder.UNREAD_MESSAGES})</strong><!-- ELSE -->{folder.FOLDER_NAME}<!-- ENDIF --></a></li> + <li id="active-subsection" class="active-subsection"><a href="{folder.U_FOLDER}"><!-- IF folder.UNREAD_MESSAGES > 0 --><strong>{folder.FOLDER_NAME} ({folder.UNREAD_MESSAGES})</strong><!-- ELSE -->{folder.FOLDER_NAME}<!-- ENDIF --></a></li> <!-- ELSE --> <li><a href="{folder.U_FOLDER}"><span><!-- IF folder.UNREAD_MESSAGES > 0 --><strong>{folder.FOLDER_NAME} ({folder.UNREAD_MESSAGES})</strong><!-- ELSE -->{folder.FOLDER_NAME}<!-- ENDIF --></span></a></li> <!-- ENDIF --> @@ -52,7 +52,7 @@ <!-- BEGIN t_block2 --> <!-- IF (S_PRIVMSGS and t_block2.S_LAST_ROW) or not S_PRIVMSGS --> <!-- IF t_block2.S_SELECTED --> - <li id="active-subsection"><a href="{t_block2.U_TITLE}"><span>{t_block2.L_TITLE}</span></a></li> + <li id="active-subsection" class="active-subsection"><a href="{t_block2.U_TITLE}"><span>{t_block2.L_TITLE}</span></a></li> <!-- ELSE --> <li><a href="{t_block2.U_TITLE}"><span>{t_block2.L_TITLE}</span></a></li> <!-- ENDIF --> @@ -98,4 +98,4 @@ </div> - <div id="cp-main" class="ucp-main panel-container"> + <div id="cp-main" class="cp-main ucp-main panel-container"> diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html index f74728bdb3..25647afe1a 100644 --- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html +++ b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html @@ -16,7 +16,7 @@ <!-- IF .topicrow --> <ul class="topiclist missing-column"> <li class="header"> - <dl class="icon"> + <dl class="row-item"> <dt><div class="list-inner">{L_BOOKMARKS}</div></dt> <dd class="lastpost"><span>{L_LAST_POST}</span></dd> <dd class="mark">{L_MARK}</dd> @@ -34,13 +34,26 @@ <dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}" /></dd> </dl> <!-- ELSE --> - <dl class="icon {topicrow.TOPIC_IMG_STYLE}"> + <dl class="row-item {topicrow.TOPIC_IMG_STYLE}"> <dt<!-- IF topicrow.TOPIC_ICON_IMG --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}"> - <!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="icon-link"></a><!-- ENDIF --> + <!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="row-item-link"></a><!-- ENDIF --> <div class="list-inner"> - <!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> - <!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF --> - <!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br /> + <!-- IF topicrow.S_UNREAD_TOPIC --> + <a class="unread" href="{topicrow.U_NEWEST_POST}"> + <i class="icon fa-file fa-fw icon-red icon-md" aria-hidden="true"></i><span class="sr-only">{NEW_POST}</span> + </a> + <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> + <!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --> + <a href="{topicrow.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}"> + <i class="icon fa-question fa-fw icon-blue" aria-hidden="true"></i><span class="sr-only">{L_TOPIC_UNAPPROVED}</span> + </a> + <!-- ENDIF --> + <!-- IF topicrow.S_TOPIC_REPORTED --> + <a href="{topicrow.U_MCP_REPORT}" title="{L_TOPIC_REPORTED}"> + <i class="icon fa-exclamation fa-fw icon-red" aria-hidden="true"></i><span class="sr-only">{L_TOPIC_REPORTED}</span> + </a> + <!-- ENDIF --> + <br /> <!-- IF .topicrow.pagination --> <div class="pagination"> <ul> @@ -56,18 +69,21 @@ </div> <!-- ENDIF --> <div class="responsive-hide"> - <!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> + <!-- IF topicrow.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <!-- ENDIF --> {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} </div> <div class="responsive-show" style="display: none;"> - <!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> + <!-- IF topicrow.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <!-- ENDIF --> {L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} « <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a> </div> </div> </dt> <dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} - <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span> + <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}"> + <i class="icon fa-external-link-square fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{VIEW_LATEST_POST}</span> + </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> @@ -76,12 +92,12 @@ <!-- END topicrow --> </ul> - <div class="action-bar bottom"> + <div class="action-bar bar-bottom"> <div class="pagination"> {TOTAL_TOPICS} - <!-- IF .pagination --> + <!-- IF .pagination --> <!-- INCLUDE pagination.html --> - <!-- ELSE --> + <!-- ELSE --> • {PAGE_NUMBER} <!-- ENDIF --> </div> diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html index 056ea300d8..04b568f623 100644 --- a/phpBB/styles/prosilver/template/ucp_main_front.html +++ b/phpBB/styles/prosilver/template/ucp_main_front.html @@ -13,11 +13,16 @@ <ul class="topiclist cplist two-long-columns"> <!-- BEGIN topicrow --> <li class="row<!-- IF topicrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->"> - <dl class="icon {topicrow.TOPIC_IMG_STYLE}"> + <dl class="row-item {topicrow.TOPIC_IMG_STYLE}"> <dt <!-- IF topicrow.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->> - <!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="icon-link"></a><!-- ENDIF --> + <!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="row-item-link"></a><!-- ENDIF --> <div class="list-inner"> - <!-- IF topicrow.S_UNREAD --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a><br /> + <!-- IF topicrow.S_UNREAD --> + <a class="unread" href="{topicrow.U_NEWEST_POST}"> + <i class="icon fa-file fa-fw icon-red icon-md" aria-hidden="true"></i><span class="sr-only">{NEW_POST}</span> + </a> + <!-- ENDIF --> + <a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a><br /> <!-- IF .topicrow.pagination --> <div class="pagination"> <ul> @@ -33,17 +38,22 @@ </div> <!-- ENDIF --> <div class="responsive-hide"> - <!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> + <!-- IF topicrow.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <!-- ENDIF --> {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} </div> <div class="responsive-show" style="display: none;"> - <!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> + <!-- IF topicrow.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <!-- ENDIF --> {L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} « <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a> </div> </div> </dt> - <dd class="lastpost"><span>{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} - <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span> + <dd class="lastpost"> + <span>{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} + <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}"> + <i class="icon fa-external-link-square fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{VIEW_LATEST_POST}</span> + </a> + <br />{topicrow.LAST_POST_TIME} + </span> </dd> </dl> </li> @@ -61,7 +71,7 @@ <dt>{L_TOTAL_POSTS}{L_COLON}</dt> <dd><!-- IF POSTS_PCT -->{POSTS}<!-- IF S_DISPLAY_SEARCH --> | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></strong><!-- ENDIF --><br />({POSTS_DAY} / {POSTS_PCT})<!-- ELSE -->{POSTS}<!-- ENDIF --></dd> <!-- IF ACTIVE_FORUM != '' --><dt>{L_ACTIVE_IN_FORUM}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF --> <!-- IF ACTIVE_TOPIC != '' --><dt>{L_ACTIVE_IN_TOPIC}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF --> - <!-- IF WARNINGS --><dt>{L_YOUR_WARNINGS}{L_COLON}</dt> <dd class="error">{WARNING_IMG} [{WARNINGS}]</dd><!-- ENDIF --> + <!-- IF WARNINGS --><dt>{L_YOUR_WARNINGS}{L_COLON}</dt> <dd class="error"><i class="icon fa-exclamation-triangle fa-fw icon-red" aria-hidden="true"></i> [{WARNINGS}]</dd><!-- ENDIF --> <!-- EVENT ucp_main_front_user_activity_append --> </dl> <!-- EVENT ucp_main_front_user_activity_after --> diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html index 2d65b800a0..d8de7fd093 100644 --- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html +++ b/phpBB/styles/prosilver/template/ucp_main_subscribed.html @@ -11,7 +11,7 @@ <!-- IF .forumrow --> <ul class="topiclist missing-column"> <li class="header"> - <dl class="icon"> + <dl class="row-item"> <dt><div class="list-inner">{L_WATCHED_FORUMS}</div></dt> <dd class="lastpost"><span>{L_LAST_POST}</span></dd> <dd class="mark">{L_MARK}</dd> @@ -22,9 +22,9 @@ <!-- BEGIN forumrow --> <li class="row<!-- IF forumrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->"> - <dl class="icon {forumrow.FORUM_IMG_STYLE}"> + <dl class="row-item {forumrow.FORUM_IMG_STYLE}"> <dt> - <!-- IF forumrow.S_UNREAD_FORUM --><a href="{forumrow.U_VIEWFORUM}" class="icon-link"></a><!-- ENDIF --> + <!-- IF forumrow.S_UNREAD_FORUM --><a href="{forumrow.U_VIEWFORUM}" class="row-item-link"></a><!-- ENDIF --> <div class="list-inner"> <a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a><br /> {forumrow.FORUM_DESC} @@ -35,9 +35,16 @@ <!-- ENDIF --> </div> </dt> - <dd class="lastpost"><!-- IF forumrow.LAST_POST_TIME --><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {forumrow.LAST_POST_AUTHOR_FULL} - <a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{forumrow.LAST_POST_TIME}</span> - <!-- ELSE -->{L_NO_POSTS}<br /> <!-- ENDIF --> + <dd class="lastpost"> + <!-- IF forumrow.LAST_POST_TIME --> + <span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {forumrow.LAST_POST_AUTHOR_FULL} + <a href="{forumrow.U_LAST_POST}"> + <i class="icon fa-external-link-square fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{VIEW_LATEST_POST}</span> + </a> + <br />{forumrow.LAST_POST_TIME}</span> + <!-- ELSE --> + {L_NO_POSTS}<br /> + <!-- ENDIF --> </dd> <dd class="mark"><input type="checkbox" name="f[{forumrow.FORUM_ID}]" id="f{forumrow.FORUM_ID}" /></dd> </dl> @@ -47,7 +54,7 @@ <!-- ELSEIF S_FORUM_NOTIFY --> <ul class="topiclist"> <li class="header"> - <dl class="icon"> + <dl class="row-item"> <dt>{L_WATCHED_FORUMS}</dt> </dl> </li> @@ -59,7 +66,7 @@ <!-- IF .topicrow --> <ul class="topiclist missing-column"> <li class="header"> - <dl class="icon"> + <dl class="row-item"> <dt><div class="list-inner">{L_WATCHED_TOPICS}</div></dt> <dd class="lastpost"><span>{L_LAST_POST}</span></dd> <dd class="mark">{L_MARK}</dd> @@ -70,13 +77,26 @@ <!-- BEGIN topicrow --> <li class="row<!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ELSEIF topicrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->"> - <dl class="icon {topicrow.TOPIC_IMG_STYLE}"> + <dl class="row-item {topicrow.TOPIC_IMG_STYLE}"> <dt<!-- IF topicrow.TOPIC_ICON_IMG --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}"> - <!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="icon-link"></a><!-- ENDIF --> + <!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="row-item-link"></a><!-- ENDIF --> <div class="list-inner"> - <!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> - <!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF --> - <!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br /> + <!-- IF topicrow.S_UNREAD_TOPIC --> + <a class="unread" href="{topicrow.U_NEWEST_POST}"> + <i class="icon fa-file fa-fw icon-red icon-md" aria-hidden="true"></i><span class="sr-only">{NEW_POST}</span> + </a> + <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> + <!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --> + <a href="{topicrow.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}"> + <i class="icon fa-question fa-fw icon-blue" aria-hidden="true"></i><span class="sr-only">{L_TOPIC_UNAPPROVED}</span> + </a> + <!-- ENDIF --> + <!-- IF topicrow.S_TOPIC_REPORTED --> + <a href="{topicrow.U_MCP_REPORT}" title="{L_TOPIC_REPORTED}"> + <i class="icon fa-exclamation fa-fw icon-red" aria-hidden="true"></i><span class="sr-only">{L_TOPIC_REPORTED}</span> + </a> + <!-- ENDIF --> + <br /> <!-- IF .topicrow.pagination --> <div class="pagination"> <ul> @@ -92,17 +112,20 @@ </div> <!-- ENDIF --> <div class="responsive-hide"> - <!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> + <!-- IF topicrow.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <!-- ENDIF --> {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} </div> <div class="responsive-show" style="display: none;"> - <!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> + <!-- IF topicrow.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <!-- ENDIF --> {L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} « <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a> </div> </div> </dt> <dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} - <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span> + <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}"> + <i class="icon fa-external-link-square fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{VIEW_LATEST_POST}</span> + </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> @@ -110,7 +133,7 @@ <!-- END topicrow --> </ul> - <div class="action-bar bottom"> + <div class="action-bar bar-bottom"> <div class="pagination"> {TOTAL_TOPICS} <!-- IF .pagination --> @@ -124,7 +147,7 @@ <!-- ELSEIF S_TOPIC_NOTIFY --> <ul class="topiclist"> <li class="header"> - <dl class="icon"> + <dl class="row-item"> <dt>{L_WATCHED_TOPICS}</dt> </dl> </li> diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html index 500bae0c47..55e30477d2 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications.html +++ b/phpBB/styles/prosilver/template/ucp_notifications.html @@ -16,7 +16,6 @@ <!-- BEGIN notification_methods --> <th class="mark">{notification_methods.NAME}</th> <!-- END notification_methods --> - <th class="mark">{L_NOTIFICATIONS}</th> </tr> </thead> <tbody> @@ -32,9 +31,8 @@ <!-- IF notification_types.EXPLAIN --><br /> {notification_types.EXPLAIN}<!-- ENDIF --> </td> <!-- BEGIN notification_methods --> - <td class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td> + <td class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_types.notification_methods.METHOD}"<!-- IF notification_types.notification_methods.AVAILABLE and notification_types.notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --><!-- IF not notification_types.notification_methods.AVAILABLE --> disabled="disabled"<!-- ENDIF --> /></td> <!-- END notification_methods --> - <td class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td> </tr> <!-- ENDIF --> <!-- END notification_types --> @@ -42,7 +40,7 @@ </table> <!-- ELSE --> <!-- IF .notification_list --> - <div class="action-bar top"> + <div class="action-bar bar-top"> <div class="pagination"> <!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}" class="mark">{L_NOTIFICATIONS_MARK_ALL_READ}</a> • <!-- ENDIF --> {L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>] @@ -68,12 +66,12 @@ <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"> + <div class="list-inner"> <!-- IF notification_list.AVATAR -->{notification_list.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --> <div class="notifications"> <!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF --> <p class="notifications_title">{notification_list.FORMATTED_TITLE}<!-- IF notification_list.REFERENCE --> {notification_list.REFERENCE}<!-- ENDIF --></p> - <!-- IF notification_list.URL --></a><!-- ENDIF --> + <!-- IF notification_list.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> @@ -88,7 +86,7 @@ </ul> </div> - <div class="action-bar bottom"> + <div class="action-bar bar-bottom"> <div class="pagination"> {L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>] <!-- IF .pagination --> diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html index 28f217ef66..b53eb0c7ec 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_history.html +++ b/phpBB/styles/prosilver/template/ucp_pm_history.html @@ -1,15 +1,13 @@ -<h3 id="review"> +<h3 id="review" class="review"> <span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span> {L_MESSAGE_HISTORY}{L_COLON} </h3> <!-- EVENT ucp_pm_history_review_before --> -<div id="topicreview"> - <script type="text/javascript"> - // <![CDATA[ +<div id="topicreview" class="topicreview"> + <script> bbcodeEnabled = {S_BBCODE_ALLOWED}; - // ]]> </script> <!-- BEGIN history_row --> <div class="post <!-- IF history_row.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> @@ -25,8 +23,8 @@ <!-- EVENT ucp_pm_history_post_buttons_before --> <!-- IF history_row.U_QUOTE or history_row.MESSAGE_AUTHOR_QUOTE --> <li> - <a <!-- IF history_row.U_QUOTE -->href="{history_row.U_QUOTE}"<!-- ELSE -->href="#postingbox" onclick="addquote({history_row.MSG_ID}, '{history_row.MESSAGE_AUTHOR_QUOTE}', '{LA_WROTE}');"<!-- ENDIF --> title="{L_QUOTE} {history_row.MESSAGE_AUTHOR}" class="button icon-button quote-icon"> - <span>{L_QUOTE} {history_row.MESSAGE_AUTHOR}</span> + <a <!-- IF history_row.U_QUOTE -->href="{history_row.U_QUOTE}"<!-- ELSE -->href="#postingbox" onclick="addquote({history_row.MSG_ID}, '{history_row.MESSAGE_AUTHOR_QUOTE}', '{LA_WROTE}', {time:{history_row.MESSAGE_TIME},user_id:{history_row.USER_ID}});"<!-- ENDIF --> title="{L_QUOTE} {history_row.MESSAGE_AUTHOR}" class="button button-icon-only"> + <i class="icon fa-quote-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_QUOTE} {history_row.MESSAGE_AUTHOR}</span> </a> </li> <!-- ENDIF --> @@ -35,8 +33,11 @@ <!-- ENDIF --> <!-- EVENT ucp_pm_history_post_buttons_list_after --> - <p class="author">{history_row.MINI_POST_IMG} {L_SENT_AT}{L_COLON} <strong>{history_row.SENT_DATE}</strong><br /> - {L_MESSAGE_BY_AUTHOR} {history_row.MESSAGE_AUTHOR_FULL}</p> + <p class="author"> + <span><i class="icon fa-file fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{history_row.MINI_POST}</span></span> {L_SENT_AT}{L_COLON} <strong>{history_row.SENT_DATE}</strong> + <br /> + {L_MESSAGE_BY_AUTHOR} <!-- EVENT ucp_pm_history_row_message_author_username_prepend -->{history_row.MESSAGE_AUTHOR_FULL}<!-- EVENT ucp_pm_history_row_message_author_username_append --> + </p> <div class="content"><!-- IF history_row.MESSAGE -->{history_row.MESSAGE}<!-- ELSE --><span class="error">{L_MESSAGE_REMOVED_FROM_OUTBOX}</span><!-- ENDIF --></div> <div id="message_{history_row.MSG_ID}" style="display: none;">{history_row.DECODED_MESSAGE}</div> </div> @@ -48,4 +49,8 @@ <!-- EVENT ucp_pm_history_review_after --> <hr /> -<p><a href="#cp-main" class="top2">{L_BACK_TO_TOP}</a></p> +<p> + <a href="#cp-main" class="top"> + <i class="icon fa-chevron-circle-up fa-fw icon-gray" aria-hidden="true"></i><span>{L_BACK_TO_TOP}</span> + </a> +</p> diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html index 7be51e0034..6ad9e9cab6 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html +++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html @@ -6,38 +6,45 @@ <div class="inner"> <!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF --> - <div class="action-bar top"> + <div class="action-bar bar-top"> <!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM --> - <div class="buttons"> - <!-- IF U_POST_REPLY_PM --> - <a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}" class="button icon-button pmreply-icon"> - {L_BUTTON_PM_REPLY} - </a> - <!-- ELSEIF U_POST_NEW_TOPIC --> - <a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}" class="button icon-button newpm-icon"> - {L_BUTTON_PM_NEW} - </a> - <!-- ENDIF --> - <!-- IF U_FORWARD_PM --> - <a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}" class="button icon-button forwardpm-icon"> - {L_BUTTON_PM_FORWARD} - </a> - <!-- ENDIF --> - <!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 --> - <a title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}" class="button icon-button reply-all"> - {L_BUTTON_PM_REPLY_ALL} - </a> - <!-- ENDIF --> - </div> + <!-- IF U_POST_REPLY_PM --> + <a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}" class="button"> + <span>{L_BUTTON_PM_REPLY}</span> <i class="icon fa-reply fa-fw" aria-hidden="true"></i> + </a> + <!-- ELSEIF U_POST_NEW_TOPIC --> + <a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}" class="button"> + <span>{L_BUTTON_PM_NEW}</span> <i class="icon fa-pencil fa-fw" aria-hidden="true"></i> + </a> + <!-- ENDIF --> + <!-- IF U_FORWARD_PM --> + <a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}" class="button"> + <span>{L_BUTTON_PM_FORWARD}</span> <i class="icon fa-mail-forward fa-fw" aria-hidden="true"></i> + </a> + <!-- ENDIF --> + <!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 --> + <a title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}" class="button"> + <span>{L_BUTTON_PM_REPLY_ALL}</span> <i class="icon fa-pencil fa-fw" aria-hidden="true"></i> + </a> + <!-- ENDIF --> <!-- ENDIF --> <!-- IF not S_IS_BOT and U_PRINT_PM --> <div class="dropdown-container dropdown-button-control topic-tools"> - <span title="{L_PM_TOOLS}" class="dropdown-trigger dropdown-select button icon-button tools-icon"></span> - <div class="dropdown hidden"> + <span title="{L_PM_TOOLS}" class="button button-secondary dropdown-trigger dropdown-select"> + <i class="icon fa-wrench fa-fw" aria-hidden="true"></i> + <span class="caret"><i class="icon fa-sort-down fa-fw" aria-hidden="true"></i></span> + </span> + <div class="dropdown"> <div class="pointer"><div class="pointer-inner"></div></div> <ul class="dropdown-contents"> - <!-- IF U_PRINT_PM --><li class="small-icon icon-print"><a href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p">{L_PRINT_PM}</a></li><!-- ENDIF --> + <!-- IF U_PRINT_PM --> + <li> + <a href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p"> + <i class="icon fa-print fa-fw" aria-hidden="true"></i><span>{L_PRINT_PM}</span> + </a> + </li> + <!-- ENDIF --> </ul> </div> </div> @@ -46,7 +53,9 @@ <!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE --> <div class="pagination"> <!-- IF S_VIEW_MESSAGE --> - <a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO_FOLDER}</a> + <a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}"> + <i class="icon fa-angle-{S_CONTENT_FLOW_BEGIN} fa-fw icon-black" aria-hidden="true"></i><span>{L_RETURN_TO_FOLDER}</span> + </a> <!-- ELSEIF FOLDER_CUR_MESSAGES neq 0 --> <!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}" class="mark">{L_PM_MARK_ALL_READ}</a> • <!-- ENDIF --> {TOTAL_MESSAGES} diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html index 47e4d1c63a..a290313df7 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html @@ -57,9 +57,9 @@ <!-- BEGIN messagerow --> <li class="row<!-- IF messagerow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF messagerow.PM_CLASS --> {messagerow.PM_CLASS}<!-- ENDIF -->"> - <dl class="icon {messagerow.FOLDER_IMG_STYLE}"> + <dl class="row-item {messagerow.FOLDER_IMG_STYLE}"> <dt<!-- IF messagerow.PM_ICON_URL and S_PM_ICONS --> style="background-image: url({messagerow.PM_ICON_URL}); background-repeat: no-repeat;"<!-- ENDIF -->> - <!-- IF messagerow.S_PM_UNREAD and not messagerow.S_PM_DELETED --><a href="{messagerow.U_VIEW_PM}" class="icon-link"></a><!-- ENDIF --> + <!-- IF messagerow.S_PM_UNREAD and not messagerow.S_PM_DELETED --><a href="{messagerow.U_VIEW_PM}" class="row-item-link"></a><!-- ENDIF --> <div class="list-inner"> <!-- IF messagerow.S_PM_DELETED --> @@ -71,8 +71,11 @@ <!-- IF messagerow.S_AUTHOR_DELETED --> <br /><em class="small">{L_PM_FROM_REMOVED_AUTHOR}</em> <!-- ENDIF --> - - <!-- IF messagerow.S_PM_REPORTED --><a href="{messagerow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --> {messagerow.ATTACH_ICON_IMG}<br /> + <!-- IF messagerow.S_PM_REPORTED --> + <a href="{messagerow.U_MCP_REPORT}"> + <i class="icon fa-exclamation fa-fw icon-red" aria-hidden="true"></i><span class="sr-only">{PM_REPORTED}</span> + </a> + <!-- ENDIF --> <!-- IF messagerow.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <!-- ENDIF --><br /> <!-- IF S_SHOW_RECIPIENTS -->{L_MESSAGE_TO} {messagerow.RECIPIENTS}<!-- ELSE -->{L_MESSAGE_BY_AUTHOR} {messagerow.MESSAGE_AUTHOR_FULL} » {messagerow.SENT_TIME}<!-- ENDIF --> </div> @@ -101,15 +104,18 @@ <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"> + <!-- INCLUDE display_options.html --> + <input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" /> + <div class="pagination"> {TOTAL_MESSAGES} - <!-- IF .pagination --> + <!-- IF .pagination --> <!-- INCLUDE pagination.html --> - <!-- ELSE --> + <!-- ELSE --> • {PAGE_NUMBER} <!-- ENDIF --> </div> @@ -119,16 +125,6 @@ </div> </div> - <!-- IF FOLDER_CUR_MESSAGES neq 0 --> - <fieldset class="display-options"> - <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> - <input type="submit" name="sort" value="{L_GO}" class="button2" /> - <input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" /> - </fieldset> - <!-- ENDIF --> - <!-- INCLUDE ucp_pm_message_footer.html --> <!-- ENDIF --> <!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index 009a9bf975..7cb44a0189 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -8,8 +8,16 @@ <!-- IF S_DISPLAY_HISTORY and (U_VIEW_PREVIOUS_HISTORY or U_VIEW_NEXT_HISTORY) --> <fieldset class="display-options clearfix"> - <!-- IF U_VIEW_PREVIOUS_HISTORY --><a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_HISTORY}</a><!-- ENDIF --> - <!-- IF U_VIEW_NEXT_HISTORY --><a href="{U_VIEW_NEXT_HISTORY}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_VIEW_NEXT_HISTORY}</a><!-- ENDIF --> + <!-- IF U_VIEW_PREVIOUS_HISTORY --> + <a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}"> + <i class="icon fa-angle-{S_CONTENT_FLOW_BEGIN} fa-fw icon-black" aria-hidden="true"></i><span>{L_VIEW_PREVIOUS_HISTORY}</span> + </a> + <!-- ENDIF --> + <!-- IF U_VIEW_NEXT_HISTORY --> + <a href="{U_VIEW_NEXT_HISTORY}" class="right-box arrow-{S_CONTENT_FLOW_END}"> + <i class="icon fa-angle-{S_CONTENT_FLOW_END} fa-fw icon-black" aria-hidden="true"></i><span>{L_VIEW_NEXT_HISTORY}</span> + </a> + <!-- ENDIF --> </fieldset> <!-- ENDIF --> @@ -47,8 +55,8 @@ <dd class="profile-contact"> <strong>{L_CONTACT}{L_COLON}</strong> <div class="dropdown-container dropdown-left"> - <a href="#" class="dropdown-trigger"><span class="imageset icon_contact" title="{CONTACT_USER}">{CONTACT_USER}</span></a> - <div class="dropdown hidden"> + <a href="#" class="dropdown-trigger" title="{CONTACT_USER}"><i class="icon fa-commenting-o fa-fw icon-lg" aria-hidden="true"></i><span class="sr-only">{CONTACT_USER}</span></a> + <div class="dropdown"> <div class="pointer"><div class="pointer-inner"></div></div> <div class="dropdown-contents contact-icons"> <!-- BEGIN contact --> @@ -82,22 +90,30 @@ <!-- EVENT ucp_pm_viewmessage_post_buttons_before --> <!-- IF U_EDIT --> <li> - <a href="{U_EDIT}" title="{L_POST_EDIT_PM}" class="button icon-button edit-icon"><span>{L_POST_EDIT_PM}</span></a> + <a href="{U_EDIT}" title="{L_POST_EDIT_PM}" class="button button-icon-only"> + <i class="icon fa-pencil fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_EDIT}</span> + </a> </li> <!-- ENDIF --> <!-- IF U_DELETE --> <li> - <a href="{U_DELETE}" title="{L_DELETE_MESSAGE}" class="button icon-button delete-icon"><span>{L_DELETE_MESSAGE}</span></a> + <a href="{U_DELETE}" title="{L_DELETE_MESSAGE}" class="button button-icon-only"> + <i class="icon fa-times fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_DELETE}</span> + </a> </li> <!-- ENDIF --> <!-- IF U_REPORT --> <li> - <a href="{U_REPORT}" title="{L_REPORT_PM}" class="button icon-button report-icon"><span>{L_REPORT_PM}</span></a> + <a href="{U_REPORT}" title="{L_REPORT_PM}" class="button button-icon-only"> + <i class="icon fa-exclamation fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_REPORT}</span> + </a> </li> <!-- ENDIF --> <!-- IF U_QUOTE --> <li> - <a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}" class="button icon-button quote-icon"><span>{L_POST_QUOTE_PM}</span></a> + <a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}" class="button button-icon-only"> + <i class="icon fa-quote-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_QUOTE}</span> + </a> </li> <!-- ENDIF --> <!-- EVENT ucp_pm_viewmessage_post_buttons_after --> @@ -108,8 +124,8 @@ <p class="author"> <strong>{L_SENT_AT}{L_COLON}</strong> {SENT_DATE} <br /><strong>{L_PM_FROM}{L_COLON}</strong> {MESSAGE_AUTHOR_FULL} - <!-- IF S_TO_RECIPIENT --><br /><strong>{L_TO}{L_COLON}</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}" style="color:<!-- IF to_recipient.COLOUR -->{to_recipient.COLOUR}<!-- ELSEIF to_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{to_recipient.NAME}</a><!-- ENDIF --> <!-- END to_recipient --><!-- ENDIF --> - <!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}{L_COLON}</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}" style="color:<!-- IF bcc_recipient.COLOUR -->{bcc_recipient.COLOUR}<!-- ELSEIF bcc_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{bcc_recipient.NAME}</a><!-- ENDIF --> <!-- END bcc_recipient --><!-- ENDIF --> + <!-- IF S_TO_RECIPIENT --><br /><strong>{L_TO}{L_COLON}</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}"<!-- IF to_recipient.COLOUR --> style="color:{to_recipient.COLOUR};"<!-- ENDIF -->><strong>{to_recipient.NAME}</strong></a><!-- ENDIF --> <!-- END to_recipient --><!-- ENDIF --> + <!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}{L_COLON}</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}"<!-- IF bcc_recipient.COLOUR --> style="color:{bcc_recipient.COLOUR};"<!-- ENDIF -->><strong>{bcc_recipient.NAME}</strong></a><!-- ENDIF --> <!-- END bcc_recipient --><!-- ENDIF --> </p> @@ -141,7 +157,12 @@ <!-- ENDIF --> </div> - <div class="back2top"><a href="#top" class="top" title="{L_BACK_TO_TOP}">{L_BACK_TO_TOP}</a></div> + <div class="back2top"> + <a href="#top" class="top" title="{L_BACK_TO_TOP}"> + <i class="icon fa-chevron-circle-up fa-fw icon-gray" aria-hidden="true"></i> + <span class="sr-only">{L_BACK_TO_TOP}</span> + </a> + </div> </div> </div> @@ -149,10 +170,18 @@ <!-- EVENT ucp_pm_viewmessage_options_before --> <!-- IF S_VIEW_MESSAGE --> <fieldset class="display-options"> - <!-- IF U_PREVIOUS_PM --><a href="{U_PREVIOUS_PM}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_PM}</a><!-- ENDIF --> - <!-- IF U_NEXT_PM --><a href="{U_NEXT_PM}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_VIEW_NEXT_PM}</a><!-- ENDIF --> <!-- IF S_MARK_OPTIONS --><label for="mark_option"><select name="mark_option" id="mark_option">{S_MARK_OPTIONS}</select></label> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" /><!-- ENDIF --> + <!-- IF U_PREVIOUS_PM --> + <a href="{U_PREVIOUS_PM}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}"> + <i class="icon fa-angle-{S_CONTENT_FLOW_BEGIN} fa-fw icon-black" aria-hidden="true"></i><span>{L_VIEW_PREVIOUS_PM}</span> + </a> + <!-- ENDIF --> + <!-- IF U_NEXT_PM --> + <a href="{U_NEXT_PM}" class="right-box arrow-{S_CONTENT_FLOW_END}"> + <i class="icon fa-angle-{S_CONTENT_FLOW_END} fa-fw icon-black" aria-hidden="true"></i><span>{L_VIEW_NEXT_PM}</span> + </a> + <!-- ENDIF --> <!-- IF not S_UNREAD and not S_SPECIAL_FOLDER --><label for="dest_folder"><!-- IF S_VIEW_MESSAGE -->{L_MOVE_TO_FOLDER}{L_COLON} <!-- ELSE -->{L_MOVE_MARKED_TO_FOLDER}<!-- ENDIF --> <select name="dest_folder" id="dest_folder">{S_TO_FOLDER_OPTIONS}</select></label> <input class="button2" type="submit" name="move_pm" value="{L_GO}" /><!-- ENDIF --> <input type="hidden" name="marked_msg_id[]" value="{MSG_ID}" /> <input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" /> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html index d431561834..41ff5b898a 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html @@ -8,11 +8,12 @@ <title>{SITENAME} • {PAGE_TITLE}</title> <link href="{T_THEME_PATH}/print.css" rel="stylesheet"> +<link href="{T_THEME_PATH}/bidi.css" rel="stylesheet"> <!-- EVENT ucp_pm_viewmessage_print_head_append --> </head> <body id="phpbb"> -<div id="wrap"> - <a id="top" class="anchor" accesskey="t"></a> +<div id="wrap" class="wrap"> + <a id="top" class="top-anchor" accesskey="t"></a> <div id="page-header"> <h1>{SITENAME}</h1> @@ -21,7 +22,7 @@ <h2>{L_PRIVATE_MESSAGING}</h2> </div> - <div id="page-body"> + <div id="page-body" class="page-body"> <div class="page-number">{PAGE_NUMBER}</div> <div class="post"> <h3>{SUBJECT}</h3> @@ -39,9 +40,16 @@ <hr /> </div> - <div id="page-footer"> + <div id="page-footer" class="page-footer"> <div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div> - <div class="copyright">Powered by phpBB® Forum Software © phpBB Limited<br />https://www.phpbb.com/</div> + <div class="copyright"> + <p>{{ CREDIT_LINE }} + </p> + {% if TRANSLATION_INFO %} + <p>{{ TRANSLATION_INFO }} + </p> + {% endif %} + </div> </div> </div> diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html index 4cd9f6655b..1650705d4b 100644 --- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html +++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html @@ -85,8 +85,7 @@ </fieldset> </form> -<script type="text/javascript"> -// <![CDATA[ +<script> var date_format = '{A_DATE_FORMAT}'; var default_dateformat = '{A_DEFAULT_DATEFORMAT}'; @@ -118,7 +117,6 @@ } window.onload = customDates; -// ]]> </script> <!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_prefs_post.html b/phpBB/styles/prosilver/template/ucp_prefs_post.html index 891e49af6f..169d41bf72 100644 --- a/phpBB/styles/prosilver/template/ucp_prefs_post.html +++ b/phpBB/styles/prosilver/template/ucp_prefs_post.html @@ -12,39 +12,39 @@ <dl> <dt><label for="bbcode1">{L_DEFAULT_BBCODE}{L_COLON}</label></dt> <dd> - <label for="bbcode1"><input type="radio" name="bbcode" id="bbcode1" value="1"<!-- IF S_BBCODE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> + <label for="bbcode1"><input type="radio" name="bbcode" id="bbcode1" value="1"<!-- IF S_BBCODE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> <label for="bbcode0"><input type="radio" name="bbcode" id="bbcode0" value="0"<!-- IF not S_BBCODE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> </dd> </dl> <dl> <dt><label for="smilies1">{L_DEFAULT_SMILIES}{L_COLON}</label></dt> <dd> - <label for="smilies1"><input type="radio" name="smilies" id="smilies1" value="1"<!-- IF S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> + <label for="smilies1"><input type="radio" name="smilies" id="smilies1" value="1"<!-- IF S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> <label for="smilies0"><input type="radio" name="smilies" id="smilies0" value="0"<!-- IF not S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> </dd> </dl> <dl> <dt><label for="sig1">{L_DEFAULT_ADD_SIG}{L_COLON}</label></dt> <dd> - <label for="sig1"><input type="radio" name="sig" id="sig1" value="1"<!-- IF S_SIG --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> + <label for="sig1"><input type="radio" name="sig" id="sig1" value="1"<!-- IF S_SIG --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> <label for="sig0"><input type="radio" name="sig" id="sig0" value="0"<!-- IF not S_SIG --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> </dd> </dl> <dl> <dt><label for="notify1">{L_DEFAULT_NOTIFY}{L_COLON}</label></dt> <dd> - <label for="notify1"><input type="radio" name="notify" id="notify1" value="1"<!-- IF S_NOTIFY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> + <label for="notify1"><input type="radio" name="notify" id="notify1" value="1"<!-- IF S_NOTIFY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> <label for="notify0"><input type="radio" name="notify" id="notify0" value="0"<!-- IF not S_NOTIFY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> </dd> </dl> <!-- EVENT ucp_prefs_post_append --> </fieldset> - + </div> </div> <fieldset class="submit-buttons"> - {S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" /> + {S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" /> <input type="submit" name="submit" value="{L_SUBMIT}" class="button1" /> {S_FORM_TOKEN} </fieldset> diff --git a/phpBB/styles/prosilver/template/ucp_prefs_view.html b/phpBB/styles/prosilver/template/ucp_prefs_view.html index 7f8d0a344c..4b7142fbea 100644 --- a/phpBB/styles/prosilver/template/ucp_prefs_view.html +++ b/phpBB/styles/prosilver/template/ucp_prefs_view.html @@ -13,35 +13,35 @@ <dl> <dt><label for="images1">{L_VIEW_IMAGES}{L_COLON}</label></dt> <dd> - <label for="images1"><input type="radio" name="images" id="images1" value="1"<!-- IF S_IMAGES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> + <label for="images1"><input type="radio" name="images" id="images1" value="1"<!-- IF S_IMAGES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> <label for="images0"><input type="radio" name="images" id="images0" value="0"<!-- IF not S_IMAGES --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> </dd> </dl> <dl> <dt><label for="flash0">{L_VIEW_FLASH}{L_COLON}</label></dt> <dd> - <label for="flash1"><input type="radio" name="flash" id="flash1" value="1"<!-- IF S_FLASH --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> + <label for="flash1"><input type="radio" name="flash" id="flash1" value="1"<!-- IF S_FLASH --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> <label for="flash0"><input type="radio" name="flash" id="flash0" value="0"<!-- IF not S_FLASH --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> </dd> </dl> <dl> <dt><label for="smilies1">{L_VIEW_SMILIES}{L_COLON}</label></dt> <dd> - <label for="smilies1"><input type="radio" name="smilies" id="smilies1" value="1"<!-- IF S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> + <label for="smilies1"><input type="radio" name="smilies" id="smilies1" value="1"<!-- IF S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> <label for="smilies0"><input type="radio" name="smilies" id="smilies0" value="0"<!-- IF not S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> </dd> </dl> <dl> <dt><label for="sigs1">{L_VIEW_SIGS}{L_COLON}</label></dt> <dd> - <label for="sigs1"><input type="radio" name="sigs" id="sigs1" value="1"<!-- IF S_SIGS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> + <label for="sigs1"><input type="radio" name="sigs" id="sigs1" value="1"<!-- IF S_SIGS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> <label for="sigs0"><input type="radio" name="sigs" id="sigs0" value="0"<!-- IF not S_SIGS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> </dd> </dl> <dl> <dt><label for="avatars1">{L_VIEW_AVATARS}{L_COLON}</label></dt> <dd> - <label for="avatars1"><input type="radio" name="avatars" id="avatars1" value="1"<!-- IF S_AVATARS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> + <label for="avatars1"><input type="radio" name="avatars" id="avatars1" value="1"<!-- IF S_AVATARS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> <label for="avatars0"><input type="radio" name="avatars" id="avatars0" value="0"<!-- IF not S_AVATARS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> </dd> </dl> @@ -49,7 +49,7 @@ <dl> <dt><label for="wordcensor1">{L_DISABLE_CENSORS}{L_COLON}</label></dt> <dd> - <label for="wordcensor1"><input type="radio" name="wordcensor" id="wordcensor1" value="1"<!-- IF S_DISABLE_CENSORS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> + <label for="wordcensor1"><input type="radio" name="wordcensor" id="wordcensor1" value="1"<!-- IF S_DISABLE_CENSORS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> <label for="wordcensor0"><input type="radio" name="wordcensor" id="wordcensor0" value="0"<!-- IF not S_DISABLE_CENSORS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> </dd> </dl> @@ -89,7 +89,7 @@ </div> <fieldset class="submit-buttons"> - {S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" /> + {S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" /> <input type="submit" name="submit" value="{L_SUBMIT}" class="button1" /> {S_FORM_TOKEN} </fieldset> diff --git a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html index 69eda8c42c..ac0cd153c2 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html +++ b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html @@ -13,7 +13,7 @@ <!-- EVENT ucp_profile_profile_info_before --> <!-- IF S_BIRTHDAYS_ENABLED --> <dl> - <dt><label for="bday_day">{L_BIRTHDAY}{L_COLON}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt> + <dt><label for="bday_day">{L_BIRTHDAY}{L_COLON}{% EVENT ucp_profile_profile_info_birthday_label_append %}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt> <dd> <label for="bday_day">{L_DAY}{L_COLON} <select name="bday_day" id="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select></label> <label for="bday_month">{L_MONTH}{L_COLON} <select name="bday_month" id="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select></label> diff --git a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html index 462a7f8f20..f62d3cf37d 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html +++ b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html @@ -31,7 +31,7 @@ <dd><input type="password" name="password_confirm" id="password_confirm" maxlength="255" value="{PASSWORD_CONFIRM}" class="inputbox" title="{L_CONFIRM_PASSWORD}" autocomplete="off" /></dd> </dl> <!-- ENDIF --> - <!-- EVENT ucp_profile_register_details_after --> + <!-- EVENT ucp_profile_register_details_after --> </fieldset> </div> </div> diff --git a/phpBB/styles/prosilver/template/ucp_profile_signature.html b/phpBB/styles/prosilver/template/ucp_profile_signature.html index 614f6f440d..ed28b7ab02 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_signature.html +++ b/phpBB/styles/prosilver/template/ucp_profile_signature.html @@ -24,6 +24,7 @@ <!-- INCLUDE posting_editor.html --> <h3>{L_OPTIONS}</h3> <fieldset> + {% EVENT ucp_profile_signature_posting_editor_options_prepend %} <!-- IF S_BBCODE_ALLOWED --> <div><label for="disable_bbcode"><input type="checkbox" name="disable_bbcode" id="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label></div> <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html index 38413addba..bf39990c35 100644 --- a/phpBB/styles/prosilver/template/ucp_register.html +++ b/phpBB/styles/prosilver/template/ucp_register.html @@ -1,7 +1,6 @@ <!-- INCLUDE overall_header.html --> -<script type="text/javascript"> -// <![CDATA[ +<script> /** * Change language */ @@ -11,7 +10,6 @@ document.forms['register'].change_lang.value = lang_iso; document.forms['register'].submit.click(); } -// ]]> </script> <form id="register" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}> diff --git a/phpBB/styles/prosilver/template/ucp_remind.html b/phpBB/styles/prosilver/template/ucp_remind.html index 0ab1251d9e..8b700de430 100644 --- a/phpBB/styles/prosilver/template/ucp_remind.html +++ b/phpBB/styles/prosilver/template/ucp_remind.html @@ -9,14 +9,19 @@ <h2>{L_SEND_PASSWORD}</h2> <fieldset> + {% if USERNAME_REQUIRED %} + <p class="error">{{ lang('EMAIL_NOT_UNIQUE') }}</p> + {% endif %} <dl> - <dt><label for="username">{L_USERNAME}{L_COLON}</label></dt> - <dd><input class="inputbox narrow" type="text" name="username" id="username" size="25" /></dd> + <dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label><br /><span>{L_EMAIL_REMIND}</span></dt> + <dd><input class="inputbox narrow" type="email" name="email" id="email" size="25" maxlength="100" value="{{ EMAIL }}" autofocus /></dd> </dl> + {% if USERNAME_REQUIRED %} <dl> - <dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label><br /><span>{L_EMAIL_REMIND}</span></dt> - <dd><input class="inputbox narrow" type="email" name="email" id="email" size="25" maxlength="100" /></dd> + <dt><label for="username">{L_USERNAME}{L_COLON}</label></dt> + <dd><input class="inputbox narrow" type="text" name="username" id="username" size="25" /></dd> </dl> + {% endif %} <dl> <dt> </dt> <dd>{S_HIDDEN_FIELDS}<input type="submit" name="submit" id="submit" class="button1" value="{L_SUBMIT}" tabindex="2" /> <input type="reset" value="{L_RESET}" name="reset" class="button2" /></dd> diff --git a/phpBB/styles/prosilver/template/ucp_zebra_foes.html b/phpBB/styles/prosilver/template/ucp_zebra_foes.html index 712479dc18..2a0f6e0dea 100644 --- a/phpBB/styles/prosilver/template/ucp_zebra_foes.html +++ b/phpBB/styles/prosilver/template/ucp_zebra_foes.html @@ -32,7 +32,7 @@ </div> <fieldset class="submit-buttons"> - {S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" /> + {S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" /> <input type="submit" name="submit" value="{L_SUBMIT}" class="button1" /> {S_FORM_TOKEN} </fieldset> diff --git a/phpBB/styles/prosilver/template/ucp_zebra_friends.html b/phpBB/styles/prosilver/template/ucp_zebra_friends.html index fac0a18706..e584d876b8 100644 --- a/phpBB/styles/prosilver/template/ucp_zebra_friends.html +++ b/phpBB/styles/prosilver/template/ucp_zebra_friends.html @@ -34,7 +34,7 @@ </div> <fieldset class="submit-buttons"> - {S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" /> + {S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" /> <input type="submit" name="submit" value="{L_SUBMIT}" class="button1" /> {S_FORM_TOKEN} </fieldset> diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index f6fc07ea55..40beb784d7 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -35,18 +35,19 @@ <!-- ENDIF --> <!-- IF S_DISPLAY_POST_INFO or .pagination or TOTAL_POSTS or TOTAL_TOPICS --> - <div class="action-bar top"> + <div class="action-bar bar-top"> <!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO --> - <div class="buttons"> <!-- EVENT viewforum_buttons_top_before --> - <a href="{U_POST_NEW_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"> - <!-- IF S_IS_LOCKED -->{L_BUTTON_FORUM_LOCKED}<!-- ELSE -->{L_BUTTON_NEW_TOPIC}<!-- ENDIF --> - </a> - + <a href="{U_POST_NEW_TOPIC}" class="button" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"> + <!-- IF S_IS_LOCKED --> + <span>{L_BUTTON_FORUM_LOCKED}</span> <i class="icon fa-lock fa-fw" aria-hidden="true"></i> + <!-- ELSE --> + <span>{L_BUTTON_NEW_TOPIC}</span> <i class="icon fa-pencil fa-fw" aria-hidden="true"></i> + <!-- ENDIF --> + </a> <!-- EVENT viewforum_buttons_top_after --> - </div> <!-- ENDIF --> <!-- IF S_DISPLAY_SEARCHBOX --> @@ -54,8 +55,12 @@ <form method="get" id="forum-search" action="{S_SEARCHBOX_ACTION}"> <fieldset> <input class="inputbox search tiny" type="search" name="keywords" id="search_keywords" size="20" placeholder="{L_SEARCH_FORUM}" /> - <button class="button icon-button search-icon" type="submit" title="{L_SEARCH}">{L_SEARCH}</button> - <a href="{U_SEARCH}" class="button icon-button search-adv-icon" title="{L_SEARCH_ADV}">{L_SEARCH_ADV}</a> + <button class="button button-search" type="submit" title="{L_SEARCH}"> + <i class="icon fa-search fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH}</span> + </button> + <a href="{U_SEARCH}" class="button button-search-end" title="{L_SEARCH_ADV}"> + <i class="icon fa-cog fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH_ADV}</span> + </a> {S_SEARCH_LOCAL_HIDDEN_FIELDS} </fieldset> </form> @@ -109,6 +114,7 @@ <dd><input type="submit" name="login" tabindex="5" value="{L_LOGIN}" class="button1" /></dd> </dl> {S_LOGIN_REDIRECT} + {S_FORM_TOKEN_LOGIN} </fieldset> </div> @@ -136,7 +142,7 @@ <div class="inner"> <ul class="topiclist"> <li class="header"> - <dl class="icon"> + <dl class="row-item"> <dt<!-- IF S_DISPLAY_ACTIVE --> id="active_topics"<!-- ENDIF -->><div class="list-inner"><!-- IF S_DISPLAY_ACTIVE -->{L_ACTIVE_TOPICS}<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH and (topicrow.S_POST_ANNOUNCE or topicrow.S_POST_GLOBAL) -->{L_ANNOUNCEMENTS}<!-- ELSE -->{L_TOPICS}<!-- ENDIF --></div></dt> <dd class="posts">{L_REPLIES}</dd> <dd class="views">{L_VIEWS}</dd> @@ -150,53 +156,84 @@ <!-- EVENT viewforum_body_topicrow_row_before --> <li class="row<!-- IF topicrow.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF topicrow.S_POST_GLOBAL --> global-announce<!-- ENDIF --><!-- IF topicrow.S_POST_ANNOUNCE --> announce<!-- ENDIF --><!-- IF topicrow.S_POST_STICKY --> sticky<!-- ENDIF --><!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ENDIF -->"> <!-- EVENT viewforum_body_topic_row_prepend --> - <dl class="icon {topicrow.TOPIC_IMG_STYLE}"> - <dt<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}"> - <!-- IF topicrow.S_UNREAD_TOPIC and not S_IS_BOT --><a href="{topicrow.U_NEWEST_POST}" class="icon-link"></a><!-- ENDIF --> + <dl class="row-item {topicrow.TOPIC_IMG_STYLE}"> + <dt<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url('{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}'); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}"> + <!-- IF topicrow.S_UNREAD_TOPIC and not S_IS_BOT --><a href="{topicrow.U_NEWEST_POST}" class="row-item-link"></a><!-- ENDIF --> <div class="list-inner"> <!-- EVENT topiclist_row_prepend --> - <!-- IF topicrow.S_UNREAD_TOPIC and not S_IS_BOT --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> - <!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF --> - <!-- IF topicrow.S_TOPIC_DELETED --><a href="{topicrow.U_MCP_QUEUE}">{DELETED_IMG}</a> <!-- ENDIF --> - <!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br /> + <!-- IF topicrow.S_UNREAD_TOPIC and not S_IS_BOT --> + <a class="unread" href="{topicrow.U_NEWEST_POST}"> + <i class="icon fa-file fa-fw icon-red icon-md" aria-hidden="true"></i><span class="sr-only">{NEW_POST}</span> + </a> + <!-- ENDIF --> + <!-- IF topicrow.U_VIEW_TOPIC --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a><!-- ELSE -->{topicrow.TOPIC_TITLE}<!-- ENDIF --> + <!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --> + <a href="{topicrow.U_MCP_QUEUE}" title="<!-- IF topicrow.S_TOPIC_UNAPPROVED -->{L_TOPIC_UNAPPROVED}<!-- ELSE -->{L_POSTS_UNAPPROVED}<!-- ENDIF -->"> + <i class="icon fa-question fa-fw icon-blue" aria-hidden="true"></i><span class="sr-only"><!-- IF topicrow.S_TOPIC_UNAPPROVED -->{L_TOPIC_UNAPPROVED}<!-- ELSE -->{L_POSTS_UNAPPROVED}<!-- ENDIF --></span> + </a> + <!-- ENDIF --> + <!-- IF topicrow.S_TOPIC_DELETED --> + <a href="{topicrow.U_MCP_QUEUE}" title="{L_TOPIC_DELETED}"> + <i class="icon fa-recycle fa-fw icon-green" aria-hidden="true"></i><span class="sr-only">{L_TOPIC_DELETED}</span> + </a> + <!-- ENDIF --> + <!-- IF topicrow.S_TOPIC_REPORTED --> + <a href="{topicrow.U_MCP_REPORT}" title="{L_TOPIC_REPORTED}"> + <i class="icon fa-exclamation fa-fw icon-red" aria-hidden="true"></i><span class="sr-only">{L_TOPIC_REPORTED}</span> + </a> + <!-- ENDIF --> + <br /> <!-- EVENT topiclist_row_topic_title_after --> + <!-- IF not S_IS_BOT --> <div class="responsive-show" style="display: none;"> - {L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} « <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a> + {L_LAST_POST} {L_POST_BY_AUTHOR} <!-- EVENT viewforum_body_last_post_author_username_prepend -->{topicrow.LAST_POST_AUTHOR_FULL}<!-- EVENT viewforum_body_last_post_author_username_append --> « <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}"><time datetime="{topicrow.LAST_POST_TIME_RFC3339}">{topicrow.LAST_POST_TIME}</time></a> <!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --><br />{L_POSTED} {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF --> </div> - <!-- IF topicrow.REPLIES --><span class="responsive-show left-box" style="display: none;">{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong></span><!-- ENDIF --> + <!-- IF topicrow.REPLIES --> + <span class="responsive-show left-box" style="display: none;">{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong></span> + <!-- ENDIF --> <!-- ENDIF --> + <div class="topic-poster responsive-hide left-box"> + <!-- IF topicrow.S_HAS_POLL --><i class="icon fa-bar-chart fa-fw" aria-hidden="true"></i><!-- ENDIF --> + <!-- IF topicrow.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i><!-- ENDIF --> + {% EVENT topiclist_row_topic_by_author_before %} + {L_POST_BY_AUTHOR} <!-- EVENT viewforum_body_topic_author_username_prepend -->{topicrow.TOPIC_AUTHOR_FULL}<!-- EVENT viewforum_body_topic_author_username_append --> » <time datetime="{topicrow.FIRST_POST_TIME_RFC3339}">{topicrow.FIRST_POST_TIME}</time> + {% EVENT topiclist_row_topic_by_author_after %} + <!-- 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 .topicrow.pagination --> <div class="pagination"> + <span><i class="icon fa-clone fa-fw" aria-hidden="true"></i></span> <ul> <!-- BEGIN pagination --> <!-- IF topicrow.pagination.S_IS_PREV --> <!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><li class="active"><span>{topicrow.pagination.PAGE_NUMBER}</span></li> <!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --><li class="ellipsis"><span>{L_ELLIPSIS}</span></li> <!-- ELSEIF topicrow.pagination.S_IS_NEXT --> - <!-- ELSE --><li><a href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a></li> + <!-- ELSE --><li><a class="button" href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a></li> <!-- ENDIF --> <!-- END pagination --> </ul> </div> <!-- ENDIF --> - <div class="responsive-hide"> - <!-- IF topicrow.S_HAS_POLL -->{POLL_IMG} <!-- ENDIF --> - <!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> - {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} - <!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --> » {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF --> - </div> - <!-- EVENT topiclist_row_append --> </div> </dt> <dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd> <dd class="views">{topicrow.VIEWS} <dfn>{L_VIEWS}</dfn></dd> - <dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} - <!-- IF not S_IS_BOT --><a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{topicrow.LAST_POST_TIME}</span> + <dd class="lastpost"> + <span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} <!-- EVENT viewforum_body_last_post_author_username_prepend -->{topicrow.LAST_POST_AUTHOR_FULL}<!-- EVENT viewforum_body_last_post_author_username_append --> + <!-- IF not S_IS_BOT and topicrow.U_LAST_POST --> + <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}"> + <i class="icon fa-external-link-square fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{VIEW_LATEST_POST}</span> + </a> + <!-- ENDIF --> + <br /><time datetime="{topicrow.LAST_POST_TIME_RFC3339}">{topicrow.LAST_POST_TIME}</time> + </span> </dd> </dl> <!-- EVENT viewforum_body_topic_row_append --> @@ -216,35 +253,35 @@ <strong>{L_NO_TOPICS}</strong> </div> </div> + <!-- ELSE IF not S_HAS_SUBFORUM --> + <div class="panel"> + <div class="inner"> + <strong>{L_NO_FORUMS_IN_CATEGORY}</strong> + </div> + </div> <!-- ENDIF --> <!-- END topicrow --> -<!-- IF S_SELECT_SORT_DAYS and not S_DISPLAY_ACTIVE --> - <form method="post" action="{S_FORUM_ACTION}"> - <fieldset class="display-options"> - <!-- 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> - <label>{S_SELECT_SORT_DIR}</label> - <input type="submit" name="sort" value="{L_GO}" class="button2" /> - <!-- ENDIF --> - </fieldset> - </form> - <hr /> -<!-- ENDIF --> - <!-- IF .topicrow and not S_DISPLAY_ACTIVE --> - <div class="action-bar bottom"> + <div class="action-bar bar-bottom"> <!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO --> - <div class="buttons"> - <!-- EVENT viewforum_buttons_bottom_before --> + <!-- EVENT viewforum_buttons_bottom_before --> - <a href="{U_POST_NEW_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"> - <!-- IF S_IS_LOCKED -->{L_BUTTON_FORUM_LOCKED}<!-- ELSE -->{L_BUTTON_NEW_TOPIC}<!-- ENDIF --> - </a> + <a href="{U_POST_NEW_TOPIC}" class="button" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"> + <!-- IF S_IS_LOCKED --> + <span>{L_BUTTON_FORUM_LOCKED}</span> <i class="icon fa-lock fa-fw" aria-hidden="true"></i> + <!-- ELSE --> + <span>{L_BUTTON_NEW_TOPIC}</span> <i class="icon fa-pencil fa-fw" aria-hidden="true"></i> + <!-- ENDIF --> + </a> - <!-- EVENT viewforum_buttons_bottom_after --> - </div> + <!-- EVENT viewforum_buttons_bottom_after --> + <!-- ENDIF --> + + <!-- IF S_SELECT_SORT_DAYS and not S_IS_BOT --> + <form method="post" action="{S_FORUM_ACTION}"> + <!-- INCLUDE display_options.html --> + </form> <!-- ENDIF --> <div class="pagination"> diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html index ee1672c6c9..c019977179 100644 --- a/phpBB/styles/prosilver/template/viewonline_body.html +++ b/phpBB/styles/prosilver/template/viewonline_body.html @@ -3,11 +3,11 @@ <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> -<div class="action-bar top"> +<div class="action-bar bar-top"> <div class="pagination"> - <!-- IF .pagination --> + <!-- IF .pagination --> <!-- INCLUDE pagination.html --> - <!-- ELSE --> + <!-- ELSE --> {PAGE_NUMBER} <!-- ENDIF --> </div> @@ -15,7 +15,7 @@ <div class="forumbg forumbg-table"> <div class="inner"> - + <table class="table1"> <!-- IF .user_row --> @@ -29,7 +29,7 @@ <tbody> <!-- BEGIN user_row --> <tr class="<!-- IF user_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> - <td>{user_row.USERNAME_FULL}<!-- IF user_row.USER_IP --> <span style="float: {S_CONTENT_FLOW_END};">{L_IP}{L_COLON} <a href="{user_row.U_USER_IP}">{user_row.USER_IP}</a> » <a href="{user_row.U_WHOIS}" onclick="popup(this.href, 750, 500); return false;">{L_WHOIS}</a></span><!-- ENDIF --> + <td><!-- EVENT viewonline_body_username_prepend -->{user_row.USERNAME_FULL}<!-- EVENT viewonline_body_username_append --><!-- IF user_row.USER_IP --> <span style="float: {S_CONTENT_FLOW_END};">{L_IP}{L_COLON} <a href="{user_row.U_USER_IP}">{user_row.USER_IP}</a> » <a href="{user_row.U_WHOIS}" onclick="popup(this.href, 750, 500); return false;">{L_WHOIS}</a></span><!-- ENDIF --> <!-- IF user_row.USER_BROWSER --><br />{user_row.USER_BROWSER}<!-- ENDIF --></td> <td class="info"><a href="{user_row.U_FORUM_LOCATION}">{user_row.FORUM_LOCATION}</a></td> <td class="active">{user_row.LASTUPDATE}</td> @@ -43,17 +43,17 @@ <!-- ENDIF --> </tbody> </table> - + </div> </div> <!-- IF LEGEND --><p><em>{L_LEGEND}{L_COLON} {LEGEND}</em></p><!-- ENDIF --> -<div class="action-bar bottom"> +<div class="action-bar bar-bottom"> <div class="pagination"> - <!-- IF .pagination --> + <!-- IF .pagination --> <!-- INCLUDE pagination.html --> - <!-- ELSE --> + <!-- ELSE --> {PAGE_NUMBER} <!-- ENDIF --> </div> diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 22a77779bf..9bfa07e52b 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -1,5 +1,6 @@ <!-- INCLUDE overall_header.html --> +<!-- EVENT viewtopic_topic_title_before --> <h2 class="topic-title"><!-- EVENT viewtopic_topic_title_prepend --><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a><!-- EVENT viewtopic_topic_title_append --></h2> <!-- EVENT viewtopic_topic_title_after --> <!-- NOTE: remove the style="display: none" when you want to have the forum description on the topic body --> @@ -26,20 +27,20 @@ </div> <!-- ENDIF --> -<div class="action-bar top"> - - <div class="buttons"> - <!-- EVENT viewtopic_buttons_top_before --> +<div class="action-bar bar-top"> + <!-- EVENT viewtopic_buttons_top_before --> <!-- 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 -->"> - <!-- IF S_IS_LOCKED -->{L_BUTTON_TOPIC_LOCKED}<!-- ELSE -->{L_BUTTON_POST_REPLY}<!-- ENDIF --> + <a href="{U_POST_REPLY_TOPIC}" class="button" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"> + <!-- IF S_IS_LOCKED --> + <span>{L_BUTTON_TOPIC_LOCKED}</span> <i class="icon fa-lock fa-fw" aria-hidden="true"></i> + <!-- ELSE --> + <span>{L_BUTTON_POST_REPLY}</span> <i class="icon fa-reply fa-fw" aria-hidden="true"></i> + <!-- ENDIF --> </a> <!-- ENDIF --> - <!-- EVENT viewtopic_buttons_top_after --> - </div> - + <!-- EVENT viewtopic_buttons_top_after --> <!-- INCLUDE viewtopic_topic_tools.html --> <!-- EVENT viewtopic_dropdown_top_custom --> @@ -48,8 +49,12 @@ <form method="get" id="topic-search" action="{S_SEARCHBOX_ACTION}"> <fieldset> <input class="inputbox search tiny" type="search" name="keywords" id="search_keywords" size="20" placeholder="{L_SEARCH_TOPIC}" /> - <button class="button icon-button search-icon" type="submit" title="{L_SEARCH}">{L_SEARCH}</button> - <a href="{U_SEARCH}" class="button icon-button search-adv-icon" title="{L_SEARCH_ADV}">{L_SEARCH_ADV}</a> + <button class="button button-search" type="submit" title="{L_SEARCH}"> + <i class="icon fa-search fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH}</span> + </button> + <a href="{U_SEARCH}" class="button button-search-end" title="{L_SEARCH_ADV}"> + <i class="icon fa-cog fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH_ADV}</span> + </a> {S_SEARCH_LOCAL_HIDDEN_FIELDS} </fieldset> </form> @@ -174,8 +179,10 @@ <dd class="profile-contact"> <strong>{L_CONTACT}{L_COLON}</strong> <div class="dropdown-container dropdown-left"> - <a href="#" class="dropdown-trigger"><span class="imageset icon_contact" title="{postrow.CONTACT_USER}">{postrow.CONTACT_USER}</span></a> - <div class="dropdown hidden"> + <a href="#" class="dropdown-trigger" title="{postrow.CONTACT_USER}"> + <i class="icon fa-commenting-o fa-fw icon-lg" aria-hidden="true"></i><span class="sr-only">{postrow.CONTACT_USER}</span> + </a> + <div class="dropdown"> <div class="pointer"><div class="pointer-inner"></div></div> <div class="dropdown-contents contact-icons"> <!-- BEGIN contact --> @@ -217,7 +224,7 @@ <div id="post_content{postrow.POST_ID}"<!-- IF postrow.S_POST_HIDDEN --> style="display: none;"<!-- ENDIF -->> <!-- EVENT viewtopic_body_post_subject_before --> - <h3 <!-- IF postrow.S_FIRST_ROW -->class="first"<!-- ENDIF -->><!-- IF postrow.POST_ICON_IMG --><img src="{T_ICONS_PATH}{postrow.POST_ICON_IMG}" width="{postrow.POST_ICON_IMG_WIDTH}" height="{postrow.POST_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="#p{postrow.POST_ID}">{postrow.POST_SUBJECT}</a></h3> + <h3 <!-- IF postrow.S_FIRST_ROW -->class="first"<!-- ENDIF -->><!-- IF postrow.POST_ICON_IMG --><img src="{T_ICONS_PATH}{postrow.POST_ICON_IMG}" width="{postrow.POST_ICON_IMG_WIDTH}" height="{postrow.POST_ICON_IMG_HEIGHT}" alt="{postrow.POST_ICON_IMG_ALT}" title="{postrow.POST_ICON_IMG_ALT}" /> <!-- ENDIF --><a href="{postrow.U_MINI_POST}">{postrow.POST_SUBJECT}</a></h3> <!-- DEFINE $SHOW_POST_BUTTONS = (postrow.U_EDIT or postrow.U_DELETE or postrow.U_REPORT or postrow.U_WARN or postrow.U_INFO or postrow.U_QUOTE) --> <!-- EVENT viewtopic_body_post_buttons_list_before --> @@ -227,32 +234,44 @@ <!-- EVENT viewtopic_body_post_buttons_before --> <!-- IF postrow.U_EDIT --> <li> - <a href="{postrow.U_EDIT}" title="{L_EDIT_POST}" class="button icon-button edit-icon"><span>{L_BUTTON_EDIT}</span></a> + <a href="{postrow.U_EDIT}" title="{L_EDIT_POST}" class="button button-icon-only"> + <i class="icon fa-pencil fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_EDIT}</span> + </a> </li> <!-- ENDIF --> <!-- IF postrow.U_DELETE --> <li> - <a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" class="button icon-button delete-icon"><span>{L_DELETE_POST}</span></a> + <a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" class="button button-icon-only"> + <i class="icon fa-times fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_DELETE}</span> + </a> </li> <!-- ENDIF --> <!-- IF postrow.U_REPORT --> <li> - <a href="{postrow.U_REPORT}" title="{L_REPORT_POST}" class="button icon-button report-icon"><span>{L_REPORT_POST}</span></a> + <a href="{postrow.U_REPORT}" title="{L_REPORT_POST}" class="button button-icon-only"> + <i class="icon fa-exclamation fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_REPORT}</span> + </a> </li> <!-- ENDIF --> <!-- IF postrow.U_WARN --> <li> - <a href="{postrow.U_WARN}" title="{L_WARN_USER}" class="button icon-button warn-icon"><span>{L_WARN_USER}</span></a> + <a href="{postrow.U_WARN}" title="{L_WARN_USER}" class="button button-icon-only"> + <i class="icon fa-exclamation-triangle fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_WARN}</span> + </a> </li> <!-- ENDIF --> <!-- IF postrow.U_INFO --> <li> - <a href="{postrow.U_INFO}" title="{L_INFORMATION}" class="button icon-button info-icon"><span>{L_INFORMATION}</span></a> + <a href="{postrow.U_INFO}" title="{L_INFORMATION}" class="button button-icon-only"> + <i class="icon fa-info fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_INFORMATION}</span> + </a> </li> <!-- ENDIF --> <!-- IF postrow.U_QUOTE --> <li> - <a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}" class="button icon-button quote-icon"><span>{L_QUOTE}</span></a> + <a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}" class="button button-icon-only"> + <i class="icon fa-quote-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_QUOTE}</span> + </a> </li> <!-- ENDIF --> <!-- EVENT viewtopic_body_post_buttons_after --> @@ -262,12 +281,22 @@ <!-- EVENT viewtopic_body_post_buttons_list_after --> <!-- EVENT viewtopic_body_postrow_post_details_before --> - <p class="author"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><!-- ENDIF --><span class="responsive-hide">{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong> » </span>{postrow.POST_DATE} </p> + <p class="author"> + <!-- IF S_IS_BOT --> + <span><i class="icon fa-file fa-fw <!-- IF postrow.S_UNREAD_POST -->icon-red<!-- ELSE -->icon-lightgray<!-- ENDIF --> icon-md" aria-hidden="true"></i><span class="sr-only">{postrow.MINI_POST}</span></span> + <!-- ELSE --> + <a class="unread" href="{postrow.U_MINI_POST}" title="{postrow.MINI_POST}"> + <i class="icon fa-file fa-fw <!-- IF postrow.S_UNREAD_POST -->icon-red<!-- ELSE -->icon-lightgray<!-- ENDIF --> icon-md" aria-hidden="true"></i><span class="sr-only">{postrow.MINI_POST}</span> + </a> + <!-- ENDIF --> + <span class="responsive-hide">{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong> » </span><time datetime="{postrow.POST_DATE_RFC3339}">{postrow.POST_DATE}</time> + </p> <!-- EVENT viewtopic_body_postrow_post_details_after --> <!-- IF postrow.S_POST_UNAPPROVED --> <form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}"> <p class="post-notice unapproved"> + <span><i class="icon fa-question icon-red fa-fw" aria-hidden="true"></i></span> <strong>{L_POST_UNAPPROVED_ACTION}</strong> <input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" /> <input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" /> @@ -291,12 +320,14 @@ <!-- IF postrow.S_POST_REPORTED --> <p class="post-notice reported"> - <a href="{postrow.U_MCP_REPORT}"><strong>{L_POST_REPORTED}</strong></a> + <a href="{postrow.U_MCP_REPORT}"><i class="icon fa-exclamation fa-fw icon-red" aria-hidden="true"></i><strong>{L_POST_REPORTED}</strong></a> </p> <!-- ENDIF --> <div class="content">{postrow.MESSAGE}</div> + <!-- EVENT viewtopic_body_postrow_content_after --> + <!-- IF postrow.S_HAS_ATTACHMENTS --> <dl class="attachbox"> <dt> @@ -332,7 +363,14 @@ </div> <!-- EVENT viewtopic_body_postrow_back2top_before --> - <div class="back2top"><!-- EVENT viewtopic_body_postrow_back2top_prepend --><a href="#top" class="top" title="{L_BACK_TO_TOP}">{L_BACK_TO_TOP}</a><!-- EVENT viewtopic_body_postrow_back2top_append --></div> + <div class="back2top"> + <!-- EVENT viewtopic_body_postrow_back2top_prepend --> + <a href="#top" class="top" title="{L_BACK_TO_TOP}"> + <i class="icon fa-chevron-circle-up fa-fw icon-gray" aria-hidden="true"></i> + <span class="sr-only">{L_BACK_TO_TOP}</span> + </a> + <!-- EVENT viewtopic_body_postrow_back2top_append --> + </div> <!-- EVENT viewtopic_body_postrow_back2top_after --> </div> @@ -346,39 +384,36 @@ <!-- INCLUDE quickreply_editor.html --> <!-- ENDIF --> -<!-- 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 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="action-bar bottom"> - <div class="buttons"> - <!-- EVENT viewtopic_buttons_bottom_before --> + <div class="action-bar bar-bottom"> + <!-- EVENT viewtopic_buttons_bottom_before --> <!-- 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 -->"> - <!-- IF S_IS_LOCKED -->{L_BUTTON_TOPIC_LOCKED}<!-- ELSE -->{L_BUTTON_POST_REPLY}<!-- ENDIF --> + <a href="{U_POST_REPLY_TOPIC}" class="button" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"> + <!-- IF S_IS_LOCKED --> + <span>{L_BUTTON_TOPIC_LOCKED}</span> <i class="icon fa-lock fa-fw" aria-hidden="true"></i> + <!-- ELSE --> + <span>{L_BUTTON_POST_REPLY}</span> <i class="icon fa-reply fa-fw" aria-hidden="true"></i> + <!-- ENDIF --> </a> <!-- ENDIF --> - - <!-- EVENT viewtopic_buttons_bottom_after --> - </div> + <!-- EVENT viewtopic_buttons_bottom_after --> <!-- INCLUDE viewtopic_topic_tools.html --> + <!-- IF (S_NUM_POSTS > 1 or .pagination) and not S_IS_BOT --> + <form method="post" action="{S_TOPIC_ACTION}"> + <!-- INCLUDE display_options.html --> + </form> + <!-- ENDIF --> + <!-- IF .quickmod --> - <div class="dropdown-container dropdown-container-{S_CONTENT_FLOW_BEGIN} dropdown-up dropdown-{S_CONTENT_FLOW_END} dropdown-button-control" id="quickmod"> - <span title="{L_QUICK_MOD}" class="dropdown-trigger button icon-button modtools-icon dropdown-select">{L_QUICK_MOD}</span> - <div class="dropdown hidden"> + <div class="quickmod dropdown-container dropdown-container-left dropdown-up dropdown-{S_CONTENT_FLOW_END} dropdown-button-control" id="quickmod"> + <span title="{L_QUICK_MOD}" class="button button-secondary dropdown-trigger dropdown-select"> + <i class="icon fa-gavel fa-fw" aria-hidden="true"></i><span class="sr-only">{L_QUICK_MOD}</span> + <span class="caret"><i class="icon fa-sort-down fa-fw" aria-hidden="true"></i></span> + </span> + <div class="dropdown"> <div class="pointer"><div class="pointer-inner"></div></div> <ul class="dropdown-contents"> <!-- BEGIN quickmod --> @@ -389,7 +424,7 @@ </div> </div> <!-- ENDIF --> - + <!-- EVENT viewtopic_dropdown_bottom_custom --> <!-- IF .pagination or TOTAL_POSTS --> @@ -402,7 +437,6 @@ <!-- ENDIF --> </div> <!-- ENDIF --> - <div class="clear"></div> </div> <!-- EVENT viewtopic_body_footer_before --> diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html index 919c9397e1..658062f9fd 100644 --- a/phpBB/styles/prosilver/template/viewtopic_print.html +++ b/phpBB/styles/prosilver/template/viewtopic_print.html @@ -8,11 +8,12 @@ <title>{SITENAME} • {PAGE_TITLE}</title> <link href="{T_THEME_PATH}/print.css" rel="stylesheet"> +<link href="{T_THEME_PATH}/bidi.css" rel="stylesheet"> <!-- EVENT viewtopic_print_head_append --> </head> -<body id="phpbb"> -<div id="wrap"> - <a id="top" class="anchor" accesskey="t"></a> +<body id="phpbb" class="{S_CONTENT_DIRECTION}"> +<div id="wrap" class="wrap"> + <a id="top" class="top-anchor" accesskey="t"></a> <div id="page-header"> <h1>{SITENAME}</h1> @@ -22,7 +23,7 @@ <p><a href="{U_TOPIC}">{U_TOPIC}</a></p> </div> - <div id="page-body"> + <div id="page-body" class="page-body"> <div class="page-number">{PAGE_NUMBER}</div> <!-- BEGIN postrow --> <div class="post"> @@ -35,9 +36,16 @@ <!-- END postrow --> </div> - <div id="page-footer"> + <div id="page-footer" class="page-footer"> <div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div> - <div class="copyright">Powered by phpBB® Forum Software © phpBB Limited<br />https://www.phpbb.com/</div> + <div class="copyright"> + <p>{{ CREDIT_LINE }} + </p> + {% if TRANSLATION_INFO %} + <p>{{ TRANSLATION_INFO }} + </p> + {% endif %} + </div> </div> </div> diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html index 8378e3bcf4..272a434f6a 100644 --- a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html +++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html @@ -1,23 +1,48 @@ <!-- IF not S_IS_BOT and (U_WATCH_TOPIC or U_BOOKMARK_TOPIC or U_BUMP_TOPIC or U_EMAIL_TOPIC or U_PRINT_TOPIC or S_DISPLAY_TOPIC_TOOLS) --> <div class="dropdown-container dropdown-button-control topic-tools"> - <span title="{L_TOPIC_TOOLS}" class="button icon-button tools-icon dropdown-trigger dropdown-select"></span> - <div class="dropdown hidden"> + <span title="{L_TOPIC_TOOLS}" class="button button-secondary dropdown-trigger dropdown-select"> + <i class="icon fa-wrench fa-fw" aria-hidden="true"></i> + <span class="caret"><i class="icon fa-sort-down fa-fw" aria-hidden="true"></i></span> + </span> + <div class="dropdown"> <div class="pointer"><div class="pointer-inner"></div></div> <ul class="dropdown-contents"> <!-- EVENT viewtopic_topic_tools_before --> <!-- IF U_WATCH_TOPIC --> - <li class="small-icon icon-<!-- IF S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->"> - <a href="{U_WATCH_TOPIC}" class="watch-topic-link" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}" data-update-all=".watch-topic-link">{S_WATCH_TOPIC_TITLE}</a> + <li> + <a href="{U_WATCH_TOPIC}" class="watch-topic-link" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="icon <!-- IF S_WATCHING_TOPIC -->fa-check-square-o<!-- ELSE -->fa-square-o<!-- ENDIF --> fa-fw" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}" data-update-all=".watch-topic-link"> + <i class="icon <!-- IF S_WATCHING_TOPIC -->fa-square-o<!-- ELSE -->fa-check-square-o<!-- ENDIF --> fa-fw" aria-hidden="true"></i><span>{S_WATCH_TOPIC_TITLE}</span> + </a> </li> <!-- ENDIF --> <!-- IF U_BOOKMARK_TOPIC --> - <li class="small-icon icon-bookmark"> - <a href="{U_BOOKMARK_TOPIC}" class="bookmark-link" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}" data-update-all=".bookmark-link">{S_BOOKMARK_TOPIC}</a> + <li> + <a href="{U_BOOKMARK_TOPIC}" class="bookmark-link" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}" data-update-all=".bookmark-link"> + <i class="icon fa-bookmark-o fa-fw" aria-hidden="true"></i><span>{S_BOOKMARK_TOPIC}</span> + </a> </li> <!-- ENDIF --> - <!-- IF U_BUMP_TOPIC --><li class="small-icon icon-bump"><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}" data-ajax="true">{L_BUMP_TOPIC}</a></li><!-- ENDIF --> - <!-- IF U_EMAIL_TOPIC --><li class="small-icon icon-sendemail"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}">{L_EMAIL_TOPIC}</a></li><!-- ENDIF --> - <!-- IF U_PRINT_TOPIC --><li class="small-icon icon-print"><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p">{L_PRINT_TOPIC}</a></li><!-- ENDIF --> + <!-- IF U_BUMP_TOPIC --> + <li> + <a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}" data-ajax="true"> + <i class="icon fa-level-up fa-fw" aria-hidden="true"></i><span>{L_BUMP_TOPIC}</span> + </a> + </li> + <!-- ENDIF --> + <!-- IF U_EMAIL_TOPIC --> + <li> + <a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}"> + <i class="icon fa-envelope-o fa-fw" aria-hidden="true"></i><span>{L_EMAIL_TOPIC}</span> + </a> + </li> + <!-- ENDIF --> + <!-- IF U_PRINT_TOPIC --> + <li> + <a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p"> + <i class="icon fa-print fa-fw" aria-hidden="true"></i><span>{L_PRINT_TOPIC}</span> + </a> + </li> + <!-- ENDIF --> <!-- EVENT viewtopic_topic_tools_after --> </ul> </div> diff --git a/phpBB/styles/prosilver/theme/base.css b/phpBB/styles/prosilver/theme/base.css new file mode 100644 index 0000000000..98c57d9264 --- /dev/null +++ b/phpBB/styles/prosilver/theme/base.css @@ -0,0 +1,115 @@ +/* -------------------------------------------------------------- + $Base +-------------------------------------------------------------- */ + +/** { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +*:before, +*:after { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +}*/ + +/* Define your base font-size here; most elements will inherit this. _NO__DOTCOMMA__AFTER__*/ +html { + font-size: 1em; /* Assuming 16px... */ + line-height: 1.5; /* 24px (This is now our magic number; all subsequent margin-bottoms and line-heights want to be a multiple of this number in order to maintain vertical rhythm.) _NO__DOTCOMMA__AFTER__*/ + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); +} + +body { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + color: #333333; + background-color: #ffffff; +} + +input, +button, +select, +textarea { + font-family: inherit; + font-size: inherit; + line-height: inherit; +} + +figure { margin: 0 } +img { vertical-align: middle } + +hr { + margin-top: 20px; + margin-bottom: 20px; + border: 0; + border-top: 1px solid #e5e5e5; +} + +a { + color: #428bca; + text-decoration: none; +} + +a:hover, +a:focus, +a:active { + color: #2a6496; + text-decoration: underline; +} + +blockquote, +dl, +dd, +h1, +h2, +h3, +h4, +h5, +h6, +figure, +p, +pre { margin: 0 } +button { + background: transparent; + border: 0; + padding: 0; +} + +/** + * Work around a Firefox/IE bug where the transparent `button` background + * results in a loss of the default `button` focus styles. + */ +button:focus { + outline: 1px dotted; + outline: 5px auto -webkit-focus-ring-color; +} + +fieldset { + border: 0; + margin: 0; + padding: 0; +} + +iframe { border: 0 } +ol, +ul { + list-style: none; + margin: 0; + padding: 0; +} + +/** + * Suppress the focus outline on links that cannot be accessed via keyboard. + * This prevents an unwanted focus outline from appearing around elements that + * might still respond to pointer events. + */ +[tabindex="-1"]:focus { outline: none !important } + +/** + * Remove double underline from recent version of firefox + */ +abbr[title] { + text-decoration: none; +} + diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index f3468ebcf2..79b769b1e7 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -13,6 +13,10 @@ text-align: left; } +.rtl p.jumpbox-return { + float: right; +} + .rtl div.rules ul { margin-left: 0; margin-right: 20px; @@ -20,6 +24,11 @@ /* Main blocks ---------------------------------------- */ +.rtl .icon { + padding-right: 0; + padding-left: 2px; +} + .rtl .logo { float: right; padding: 10px 10px 0 13px; @@ -27,11 +36,11 @@ /* Site Description --------------------------------------------- */ -.rtl #site-description { +.rtl .site-description { float: right; } -.rtl #site-description h1 { +.rtl .site-description h1 { margin-left: 0; } @@ -81,14 +90,9 @@ padding-right: 0; } -.rtl ul.linklist li.responsive-menu a.responsive-menu-link:before { - left: auto; - right: 0; -} - /* Dropdown menu ---------------------------------------- */ -.rtl .dropdown-container.topic-tools { +.rtl .dropdown-container.topic-tools, .rtl .dropdown-container-left { float: right; } @@ -114,12 +118,17 @@ text-align: right; } -.rtl .dropdown-extended .header .header_settings { +.rtl .dropdown-extended .header .header_settings, .rtl .dropdown-container-right { float: left; } +.rtl .jumpbox .dropdown-contents a { + margin-right: 0; + margin-left: 20px; +} + /* Notifications -----------------------------------------*/ +-----------------------------------------*/ .rtl .notification_list ul li img { float: right; margin-left: 5px; @@ -230,6 +239,10 @@ /* Pagination ---------------------------------------- */ +.rtl .page-number { + float: left; +} + .rtl .pagination { text-align: left; float: left; @@ -261,23 +274,26 @@ 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 +/* Action Bar styles ---------------------------------------- */ -.rtl #forum-permissions { - float: left; - padding-right: 5px; - padding-left: 0; - margin-right: 5px; - margin-left: 0; - text-align: left; +.rtl .action-bar .button { + margin-right: 0; + float: right; } -.rtl #quick-links { +.rtl .action-bar > .button { + margin-left: 5px; + float: right; +} + +.rtl .action-bar .dropdown-button-control .button { + margin-left: 5px; +} + + +/* Miscellaneous styles +---------------------------------------- */ +.rtl .quick-links { margin-left: 7px; margin-right: 0; } @@ -296,11 +312,6 @@ * links.css */ -/* Back to top of page */ -.rtl .back2top { - text-align: left; -} - /* Links adjustment to correctly display an order of rtl/ltr mixed content */ .rtl a { direction: rtl; @@ -309,7 +320,6 @@ li.breadcrumbs span:first-child > a { padding-left: 0; - padding-right: 19px; } /* Notification mark read link */ @@ -319,14 +329,9 @@ li.breadcrumbs span:first-child > a { right: auto; } -.rtl a.top { +.rtl .back2top .top { float: left; -} - -.rtl a.top2 { - background-position: 100% 50%; - padding-left: 0; - padding-right: 15px; + margin-left: -10px; } .rtl .skiplink { @@ -416,26 +421,26 @@ li.breadcrumbs span:first-child > a { padding-right: 1px; } -.rtl dl.icon { +.rtl dl.row-item{ background-position: 99.5% 50%; } -.rtl li.header dl.icon dt .list-inner { +.rtl li.header dl.row-item dt .list-inner { /* Tweak for headers alignment when folder icon used */ padding-right: 0; padding-left: 50px; } -.rtl dl.icon dt { +.rtl dl.row-item dt { background-position: 99.5% 95%; /* Position of topic icon */ } -.rtl dl.icon dt .list-inner { +.rtl dl.row-item dt .list-inner { padding-left: 5px; padding-right: 45px; /* Space for folder icon */ } -.rtl dl a.icon-link { /* topic row icon links */ +.rtl dl a.row-item-link { /* topic row icon links */ display: inline-block; left: auto; right: 0; @@ -450,6 +455,10 @@ li.breadcrumbs span:first-child > a { /* Post body styles ----------------------------------------*/ +.rtl .date { + float: left; +} + .rtl .postbody, .rtl .postbody h3 { float: right; } @@ -461,7 +470,6 @@ li.breadcrumbs span:first-child > a { .rtl p.post-notice { padding-left: 5px; - padding-right: 26px; } .rtl p.post-notice:before { @@ -471,7 +479,7 @@ li.breadcrumbs span:first-child > a { /* Topic review panel ----------------------------------------*/ -.rtl #topicreview { +.rtl .topicreview { padding-right: 0; padding-left: 5px; } @@ -501,7 +509,6 @@ li.breadcrumbs span:first-child > a { /* Quote block */ .rtl blockquote { margin: 0.5em 25px 0 1px; - background-position: 99% 8px; } .rtl blockquote blockquote { @@ -511,10 +518,13 @@ li.breadcrumbs span:first-child > a { .rtl blockquote cite { /* Username/source of quoter */ - margin-right: 20px; margin-left: 0; } +.rtl blockquote cite:before, .rtl .uncited:before { + padding-left: 5px; +} + .rtl blockquote .codebox { margin-right: 0; } @@ -602,48 +612,12 @@ li.breadcrumbs span:first-child > a { /** * buttons.css */ -.rtl .dropdown-select { - padding-left: 24px; - padding-right: 8px; -} - -.rtl .icon-button:before { - float: left; - margin-left: 0; - margin-right: 2px; -} - -.rtl .dropdown-select.icon-button:before { - margin-left: 4px; - margin-right: 0; -} - -.rtl .dropdown-select:after { - border-left: 0; - border-right-style: solid; - border-right-width: 1px; - left: 0; - right: auto; -} - -.rtl .buttons, .rtl .buttons .button { - float: right; -} - -.rtl .buttons .button, .rtl .dropdown-select { - margin-left: 5px; - margin-right: 0; -} - -/* Icon images ----------------------------------------- */ -.rtl .small-icon { - background-position: 100% 50%; -} -.rtl .small-icon > a { - padding-left: 0; - padding-right: 19px; +.rtl .caret { + border-right: 1px solid; + border-right-color: inherit; + border-left: none; + right: 6px; } /* Post control buttons @@ -661,10 +635,6 @@ li.breadcrumbs span:first-child > a { float: right; } -.post-buttons .icon-button:before { - margin-right: 0; -} - /* Poster contact icons ----------------------------------------*/ .rtl .contact-icons a { @@ -687,20 +657,20 @@ li.breadcrumbs span:first-child > a { /* Main CP box ----------------------------------------*/ -.rtl #cp-menu { +.rtl .cp-menu { float: right; } -.rtl #cp-main { +.rtl .cp-main { float: right; } -.rtl #cp-main .panel ol { +.rtl .cp-main .panel ol { margin-right: 2em; margin-left: 0; } -.rtl #cp-main .buttons { +.rtl .cp-main .buttons { margin-right: 0; margin-left: 0; } @@ -711,52 +681,52 @@ li.breadcrumbs span:first-child > a { /* CP tabbed menu ----------------------------------------*/ -.rtl #tabs { +.rtl .tabs { margin-left: 0; margin-right: 7px; } -.rtl #tabs .tab { +.rtl .tabs .tab { float: right; } -.rtl #tabs .tab > a { +.rtl .tabs .tab > a { margin-left: 1px; margin-right: 0; } /* Mini tabbed menu used in MCP ----------------------------------------*/ -.rtl #minitabs { +.rtl .minitabs { float: left; margin-right: 0; margin-left: 7px; } -.rtl #minitabs .tab { +.rtl .minitabs .tab { float: left; } -.rtl #minitabs .tab > a { +.rtl .minitabs .tab > a { margin-right: 2px; margin-left: 0; } /* Responsive tabs ----------------------------------------*/ -.rtl #tabs .dropdown { +.rtl .tabs .dropdown { margin-left: -2px; } -.rtl #tabs .dropdown li { +.rtl .tabs .dropdown li { text-align: left; } -.rtl #minitabs .dropdown { +.rtl .minitabs .dropdown { margin-left: -4px; } -.rtl #minitabs .dropdown li { +.rtl .minitabs .dropdown li { text-align: right; } @@ -764,7 +734,7 @@ li.breadcrumbs span:first-child > a { ----------------------------------------*/ @media only screen and (max-width: 900px), only screen and (max-device-width: 900px) { - .rtl #cp-menu, .rtl #navigation, .rtl #cp-main { + .rtl .cp-menu, .rtl .navigation, .rtl .cp-main { float: none; } } @@ -774,7 +744,7 @@ li.breadcrumbs span:first-child > a { /* Preferences pane layout ----------------------------------------*/ -.rtl #cp-main h2 { +.rtl .cp-main h2 { margin-left: 0; margin-right: 10px; } @@ -815,7 +785,7 @@ li.breadcrumbs span:first-child > a { } /* Avatar gallery */ -.rtl #gallery label { +.rtl .gallery label { float: right; } @@ -823,7 +793,7 @@ li.breadcrumbs span:first-child > a { ----------------------------------------*/ @media only screen and (max-width: 900px), only screen and (max-device-width: 900px) { - .rtl #cp-menu, .rtl #navigation, .rtl #cp-main { + .rtl .cp-menu, .rtl .navigation, .rtl .cp-main { float: none; } } @@ -910,6 +880,10 @@ li.breadcrumbs span:first-child > a { padding-right: 0; } +.rtl .dropdown fieldset.display-options label { + text-align: left; +} + /* Display actions for ucp and mcp pages */ .rtl fieldset.display-actions { text-align: left; @@ -935,7 +909,7 @@ li.breadcrumbs span:first-child > a { ----------------------------------------*/ /* Emoticons panel */ -.rtl #smiley-box { +.rtl .smiley-box { float: left; } @@ -955,16 +929,20 @@ li.breadcrumbs span:first-child > a { padding: 3px; } -.rtl .search-box .button { +.rtl .button-search, +.button-search-end { float: right; } -.rtl .search-box a.button { +.rtl .button-search-end { + border-radius: 4px 0 0 4px; border-left-width: 1px; border-right-width: 0; +} + +.rtl .search-header .button-search-end { + border: 0; border-radius: 4px 0 0 4px; - padding-left: 5px; - padding-right: 3px; } .rtl .search-header { @@ -973,47 +951,14 @@ li.breadcrumbs span:first-child > a { margin-left: 5px; } -.rtl input.search { - background-position: right 1px; - padding-right: 17px; - padding-left: 0; -} - - /* Form button styles ---------------------------------------- */ /** Reference: Bug #27155 */ -.rtl #wrap, .rtl .headerbar, .rtl #site-description, .rtl .navbar { +.rtl .wrap, .rtl .headerbar, .rtl .site-description, .rtl .navbar { position: relative; } -/* Former imageset */ -.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; -} -.rtl .imageset.subforum_read, .rtl .imageset.subforum_unread, .rtl .imageset.icon_post_target, .rtl .imageset.icon_post_target_unread, .rtl .imageset.icon_topic_latest, .rtl .imageset.icon_topic_newest { - padding-right: 11px; - padding-left: 0; -} -.rtl .imageset.icon_back_top { - padding-right: 11px; - padding-left: 0; -} -.rtl .imageset.icon_contact_aim, .rtl .imageset.phpbb_aol-icon, .rtl .imageset.icon_contact_email, .rtl .imageset.icon_contact_icq, .rtl .imageset.phpbb_icq-icon, .rtl .imageset.icon_contact_jabber, .rtl .imageset.icon_contact_msnm, .rtl .imageset.phpbb_wlm-icon, .rtl .imageset.icon_contact_www, .rtl .imageset.phpbb_website-icon, .rtl .imageset.icon_contact_yahoo, .rtl .imageset.phpbb_yahoo-icon, .rtl .imageset.icon_post_delete, .rtl .imageset.icon_post_info, .rtl .imageset.icon_post_report, .rtl .imageset.icon_user_warn { - padding-right: 20px; - padding-left: 0; -} -.rtl .imageset.icon_topic_attach { - padding-right: 7px; - padding-left: 0; -} -.rtl .imageset.icon_topic_reported, .rtl .imageset.icon_topic_unapproved { - padding-right: 16px; - padding-left: 0; -} - /** * plupload.css */ @@ -1136,4 +1081,10 @@ li.breadcrumbs span:first-child > a { .captcha-panel dd.captcha { margin-right: 0; } + + .rtl p.responsive-center { + float: none; + text-align: center; + margin-bottom: 5px; + } } diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index a816c7f7f2..575c41aaef 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -2,125 +2,71 @@ ---------------------------------------- */ .button { - cursor: pointer; display: inline-block; - height: 18px; - font-size: 1.2em; + padding: 2px 8px; + font-size: 13px; + font-weight: 600; + font-family: "Open Sans", "Droid Sans", Verdana, Arial, Helvetica; + line-height: 1.4; + text-align: center; white-space: nowrap; + vertical-align: middle; + -ms-touch-action: manipulation; + touch-action: manipulation; + cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; border: 1px solid transparent; border-radius: 4px; - background: transparent none 0 0 repeat-x; - padding: 2px 8px; - font-family: "Open Sans", "Droid Sans", Verdana, Arial, Helvetica; - position: relative; - text-decoration: none !important; - outline-style: none !important; - vertical-align: bottom; } -.dropdown-select { - padding-right: 24px; +.button:focus, +.button:hover { + text-decoration: none; + outline: none; } -.icon-button:before { - background: transparent 0 0 no-repeat; - content: ''; - display: inline-block; - float: right; - height: 12px; - margin: 3px 0 0 2px; - width: 12px; -} - -.dropdown-select.icon-button:before { - margin-right: 4px; -} - -.dropdown-select:after { - background-position: -103px 10px; +.caret { border-left: 1px solid; - content: ''; - position: absolute; - top: 0; - right: 0; - height: 22px; - width: 16px; + position: relative; + right: -6px; } -.dropdown-visible .dropdown-select:after, .nojs .dropdown-container:hover .dropdown-select:after { - background-position: -103px -10px; +.caret i { + vertical-align: top; } -.buttons, .buttons .button { +/* Posting page styles +----------------------------------------*/ +.button-search, +.button-search-end { float: left; -} - -.buttons .button, .dropdown-select { - margin-right: 5px; -} - -#jumpbox .dropdown-select { + border-radius: 0; margin: 0; + padding: 2px 5px; } -/* Big button images */ -.reply-icon:before, .pmreply-icon:before { background-position: -20px 0; } -.reply-icon:hover:before, .pmreply-icon:hover:before { background-position: -20px -20px; } - -.post-icon:before, .newpm-icon:before, .reply-all:before { background-position: 0 0; } -.post-icon:hover:before, -.newpm-icon:hover:before, -.reply-all:hover:before { background-position: 0 -20px; } - -.locked-icon:before { background-position: -60px 0; } -.locked-icon:hover:before { background-position: -60px -20px; } - -.forwardpm-icon:before { background-position: -40px 0; } -.forwardpm-icon:hover:before { background-position: -40px -20px; } - -.modtools-icon { - font-size: 0; +.button-search-end { + border-left-width: 0; + border-radius: 0 4px 4px 0; } -.tools-icon:before, .modtools-icon:before, .search-icon:before, .search-adv-icon:before { - background-position: -80px 0; - height: 16px; - margin-top: 2px; - width: 16px; +.search-header .button-search, +.search-header .button-search-end { + border-top-width: 0; + border-bottom-width: 0; + padding: 3px 5px; } -.dropdown-visible .tools-icon:before, -.nojs .dropdown-container:hover .tools-icon:before { background-position: -80px -20px; } - -.search-icon:before { background-position: -245px 0; } -.search-icon:hover:before { background-position: -245px -20px; } - -.search-adv-icon:before { background-position: -265px 0; } -.search-adv-icon:hover:before { background-position: -265px -20px; } - -.modtools-icon:before { background-position: -225px 0; } -.dropdown-visible .modtools-icon:before, -.nojs .dropdown-container:hover .modtools-icon:before { background-position: -225px -20px; } - -/* Icon images ----------------------------------------- */ -.small-icon { - background-position: 0 50%; - background-repeat: no-repeat; - background-image: none; +.search-header .button-search-end { + border-right-width: 0; } -.small-icon > a { - display: inline-block; - padding: 0 0 0 18px; -} - -ul.linklist.bulletin > li.small-icon:before { - display: none; -} - -.dropdown .small-icon > a { - display: block; +.button-icon-only { + padding-left: 3px; + padding-right: 3px; } /* Poster contact icons @@ -157,21 +103,6 @@ ul.linklist.bulletin > li.small-icon:before { clear: left; } -/* Profile icons */ -.pm-icon { background-position: 0 0; } -.email-icon { background-position: -21px 0; } -.jabber-icon { background-position: -80px 0; } -.phpbb_icq-icon { background-position: -61px 0 ; } -.phpbb_wlm-icon { background-position: -182px 0; } -.phpbb_aol-icon { background-position: -244px 0; } -.phpbb_website-icon { background-position: -40px 0; } -.phpbb_youtube-icon { background-position: -98px 0; } -.phpbb_facebook-icon { background-position: -119px 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; } - /* Post control buttons --------------------------------------------- */ .post-buttons { @@ -193,41 +124,19 @@ ul.linklist.bulletin > li.small-icon:before { margin-right: 3px; } -.post-buttons .icon-button { - padding: 0 5px; +.post-buttons .button, .format-buttons .button { + padding-left: 3px; + padding-right: 3px; } -.hastouch .post-buttons .icon-button { - padding: 2px 8px; +.hastouch .post-buttons { + margin-right: 10px; } -.post-buttons .icon-button span { - display: block; - height: 0; - overflow: hidden; - position: absolute; - width: 1px; -} - -.post-buttons .icon-button:before { - margin-left: 0; +.post-buttons .button span { + font-size: 0; } -.quote-icon:before { background-position: -122px 0; } -.quote-icon:hover:before { background-position: -122px -21px; } -.edit-icon:before { background-position: -137px 0; } -.edit-icon:hover:before { background-position: -137px -21px; } -.warn-icon:before { background-position: -208px 0; } -.warn-icon:hover:before { background-position: -208px -21px; } -.delete-icon:before { background-position: -152px 0; } -.delete-icon:hover:before { background-position: -152px -21px; } -.report-icon:before { background-position: -165px 0; } -.report-icon:hover:before { background-position: -165px -21px; } -.info-icon:before { background-position: -175px 0; } -.info-icon:hover:before { background-position: -175px -21px; } -.button.responsive-menu-link:before { background-position: -191px 0; } -.button.responsive-menu-link:hover:before { background-position: -191px -21px; } - /* Responsive buttons in post body */ .post-buttons .dropdown { top: 18px; @@ -248,3 +157,37 @@ button::-moz-focus-inner { padding: 0; border: 0 } + +/* Deprecated as of version 3.2 +-------------------------------------------------*/ +.small-icon { + background-position: 0 50%; + background-repeat: no-repeat; + background-image: none; +} + +.dropdown .small-icon { + background-position: 5px 50%; + padding: 5px; +} + +.small-icon > a { + padding: 0 0 0 18px; +} + +ul.linklist.bulletin > li.small-icon:before { + display: none; +} + +.dropdown .small-icon > a { + display: block; +} + +.rtl .small-icon { + background-position: 100% 50%; +} + +.rtl .small-icon > a { + padding-left: 0; + padding-right: 19px; +} diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 9095e61369..ffaa71034f 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -26,45 +26,85 @@ hr { border-top-color: #CCCCCC; } -/* Search box ---------------------------------------------- */ +/* +-------------------------------------------------------------- +Colours and backgrounds for links.css +-------------------------------------------------------------- */ -.search-box .inputbox, -.search-box .inputbox:hover, -.search-box .inputbox:focus, -.search-box .button:hover { - border-color: #C7C3BF; +a { color: #105289; } +a:hover { color: #D31141; } + +/* Links on gradient backgrounds */ +.forumbg .header a, .forabg .header a, th a { + color: #FFFFFF; } -.search-header { - box-shadow: 0 0 10px #0075B0; +.forumbg .header a:hover, .forabg .header a:hover, th a:hover { + color: #A8D8FF; +} + +/* Notification mark read link */ +.dropdown-extended a.mark_read { + background-color: #FFFFFF; +} + +/* Post body links */ +.postlink { + border-bottom-color: #368AD2; + color: #368AD2; +} + +.postlink:visited { + border-bottom-color: #5D8FBD; + color: #5D8FBD; +} + +.postlink:hover { + background-color: #D0E4F6; + color: #0D4473; +} + +.signature a, .signature a:hover { + background-color: transparent; +} + +/* Back to top of page */ +.top i { + color: #999999; +} + +/* Arrow links */ +.arrow-left:hover, .arrow-right:hover { + color: #368AD2; } /* Round cornered boxes and backgrounds ---------------------------------------- */ -#wrap { +.wrap { background-color: #FFF; border-color: #E6E9ED; } .headerbar { - background-color: #12A3EB; - background-image: url("./images/bg_header.gif"); color: #FFFFFF; } -.navbar { - background-color: #cadceb; +.headerbar, .forumbg { + background-color: #12A3EB; + background-image: -webkit-linear-gradient(top, #6ACEFF 0%, #0076B1 2px, #12A3EB 92px, #12A3EB 100%); + background-image: linear-gradient(to bottom, #6ACEFF 0%,#0076B1 2px,#12A3EB 92px,#12A3EB 100%); + background-repeat: repeat-x; } .forabg { - background-color: #0076b1; - background-image: url("./images/bg_list.gif"); + background-color: #0076B1; + background-image: -webkit-linear-gradient(top, #6ACEFF 0%, #12A3EB 2px, #0076B1 92px, #0076B1 100%); + background-image: linear-gradient(to bottom, #6ACEFF 0%,#12A3EB 2px,#0076B1 92px,#0076B1 100%); + background-repeat: repeat-x; } -.forumbg { - background-color: #12A3EB; - background-image: url("./images/bg_header.gif"); +.navbar { + background-color: #CADCEB; } .panel { @@ -89,15 +129,15 @@ table.zebra-list tr:nth-child(odd) td, ul.zebra-list li:nth-child(odd) { } .bg2 { - background-color: #e1ebf2; + background-color: #E1EBF2; } table.zebra-list tr:nth-child(even) td, ul.zebra-list li:nth-child(even) { - background-color: #e1ebf2; + background-color: #E1EBF2; } .bg3 { - background-color: #cadceb; + background-color: #CADCEB; } .ucprowbg { @@ -108,6 +148,10 @@ table.zebra-list tr:nth-child(even) td, ul.zebra-list li:nth-child(even) { background-color: #E7E8EA; } +.site_logo { + background-image: url("./images/site_logo.gif"); +} + /* Horizontal lists ----------------------------------------*/ @@ -162,152 +206,111 @@ dl.details dd { color: #1198D9; } -/* Pagination +/* Icon styles ---------------------------------------- */ - -.pagination li a { - background-color: #ECEDEE; - border-color: #B4BAC0; - color: #5C758C; -} - -.pagination li.ellipsis span { - background-color: transparent; - color: #000000; -} - -.pagination li.active span { - background-color: #4692BF; - border-color: #4692BF; - color: #FFFFFF; +.icon.icon-blue, a:hover .icon.icon-blue { + color: #196db5; } -.pagination li a:hover, .pagination .dropdown-visible a.dropdown-trigger, .nojs .pagination .dropdown-container:hover a.dropdown-trigger { - background-color: #368AD2; - border-color: #368AD2; - color: #FFFFFF; +.icon.icon-green, a:hover .icon.icon-green{ + color: #1b9A1B; } -.pagination li.next a, .pagination li.previous a, .pagination li.page-jump a { - background-image: url("./images/icons_pagination.png"); +.icon.icon-red, a:hover .icon.icon-red{ + color: #BC2A4D; } -/* Pagination in viewforum for multipage topics */ -.row .pagination { - background-image: url("./images/icon_pages.gif"); +.icon.icon-orange, a:hover .icon.icon-orange{ + color: #FF6600; } -/* Miscellaneous styles ----------------------------------------- */ - -.copyright { - color: #555555; +.icon.icon-bluegray, a:hover .icon.icon-bluegray{ + color: #536482; } -.error { - color: #BC2A4D; +.icon.icon-gray, a:hover .icon.icon-gray{ + color: #777777; } -.reported { - background-color: #F7ECEF; +.icon.icon-lightgray, a:hover .icon.icon-lightgray{ + color: #999999; } -li.reported:hover { - background-color: #ECD5D8 !important; -} -.sticky, .announce { - /* you can add a background for stickies and announcements*/ +.icon.icon-black, a:hover .icon.icon-black{ + color: #333333; } -div.rules { - background-color: #ECD5D8; - color: #BC2A4D; +.alert_close .icon:before { + background-color: #FFFFFF; } -p.post-notice { - background-color: #ECD5D8; - background-image: none; +/* Jumpbox */ +.jumpbox .dropdown li { + border-top-color: #CCCCCC; } -p.post-notice.deleted:before { - background-image: url("./images/icon_topic_deleted.png"); +.jumpbox-cat-link { + background-color: #0076b1; + border-top-color: #0076B1; + color: #FFFFFF; } -p.post-notice.unapproved:before { - background-image: url("./images/icon_topic_unapproved.gif"); +.jumpbox-cat-link:hover { + background-color: #12A3EB; + border-top-color: #12A3EB; + color: #FFFFFF; } -p.post-notice.reported:before, p.post-notice.error:before { - background-image: url("./images/icon_topic_reported.gif"); +.jumpbox-forum-link { + background-color: #E1EBF2; } -/* --------------------------------------------------------------- -Colours and backgrounds for links.css --------------------------------------------------------------- */ - -a { color: #105289; } -a:hover { color: #D31141; } - -/* Links on gradient backgrounds */ -.forumbg .header a, .forabg .header a, th a { - color: #FFFFFF; +.jumpbox-forum-link:hover { + background-color: #F6F4D0; } -.forumbg .header a:hover, .forabg .header a:hover, th a:hover { - color: #A8D8FF; +.jumpbox .dropdown .pointer-inner { + border-color: #E1EBF2 transparent; } -/* Notification mark read link */ -.dropdown-extended a.mark_read { - background-color: #FFFFFF; +.jumpbox-sub-link { + background-color: #E1EBF2; } -/* Post body links */ -.postlink { - border-bottom-color: #368AD2; - color: #368AD2; +.jumpbox-sub-link:hover { + background-color: #F1F8FF; } -.postlink:visited { - border-bottom-color: #5D8FBD; - color: #5D8FBD; -} +/* Miscellaneous styles +---------------------------------------- */ -.postlink:hover { - background-color: #D0E4F6; - color: #0D4473; +.copyright { + color: #555555; } -.signature a, .signature a:hover { - background-color: transparent; +.error { + color: #BC2A4D; } -/* Back to top of page */ -a.top { - background-image: url("./images/icon_back_top.gif"); +.reported { + background-color: #F7ECEF; } -a.top2 { - background-image: url("./images/icon_back_top.gif"); +li.reported:hover { + background-color: #ECD5D8 !important; } - -/* Arrow links */ -a.arrow-up { background-image: url("./images/arrow_up.gif"); } -a.arrow-down { background-image: url("./images/arrow_down.gif"); } -a.arrow-left { background-image: url("./images/arrow_left.gif"); } -a.arrow-right { background-image: url("./images/arrow_right.gif"); } - -a.arrow-up:hover { - background-color: transparent; +.sticky, .announce { + /* you can add a background for stickies and announcements*/ } -a.arrow-left:hover { - color: #368AD2; +div.rules { + background-color: #ECD5D8; + color: #BC2A4D; } -a.arrow-right:hover { - color: #368AD2; +p.post-notice { + background-color: #ECD5D8; + background-image: none; } /* @@ -316,8 +319,10 @@ Colours and backgrounds for content.css -------------------------------------------------------------- */ ul.forums { - background-color: #eef5f9; - background-image: url("./images/gradient.gif"); + background-color: #EEF5F9; /* Old browsers */ /* FF3.6+ */ + background-image: -webkit-linear-gradient(top, #D2E0EB 0%, #EEF5F9 100%); + background-image: linear-gradient(to bottom, #D2E0EB 0%,#EEF5F9 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#D2E0EB', endColorstr='#EEF5F9',GradientType=0 ); /* IE6-9 */ } ul.topiclist li { @@ -329,18 +334,10 @@ ul.topiclist dd { } .rtl ul.topiclist dd { - border-right-color: #fff; + border-right-color: #FFFFFF; border-left-color: transparent; } -ul.topiclist li.row dt a.subforum.read { - background-image: url("./images/subforum_read.gif"); -} - -ul.topiclist li.row dt a.subforum.unread { - background-image: url("./images/subforum_unread.gif"); -} - li.row { border-top-color: #FFFFFF; border-bottom-color: #00608F; @@ -412,14 +409,9 @@ dl.faq dt { /* Quote block */ blockquote { background-color: #EBEADD; - background-image: url("./images/quote.gif"); border-color:#DBDBCE; } -.rtl blockquote { - background-image: url("./images/quote_rtl.gif"); -} - blockquote blockquote { /* Nested quotes */ background-color:#EFEED9; @@ -444,13 +436,6 @@ blockquote blockquote blockquote { color: #2E8B57; } -.syntaxbg { color: #FFFFFF; } -.syntaxcomment { color: #FF8000; } -.syntaxdefault { color: #0000BB; } -.syntaxhtml { color: #000000; } -.syntaxkeyword { color: #007700; } -.syntaxstring { color: #DD0000; } - /* Attachments ----------------------------------------*/ .attachbox { @@ -600,130 +585,165 @@ Colours and backgrounds for buttons.css -------------------------------------------------------------- */ .button { border-color: #C7C3BF; - background-color: #FFFFFF; - background-image: -moz-linear-gradient(top, #FFFFFF, #E9E9E9); - background-image: -webkit-linear-gradient(top, #FFFFFF, #E9E9E9); - background-image: -o-linear-gradient(top, #FFFFFF, #E9E9E9); - background-image: linear-gradient(to bottom, #FFFFFF, #E9E9E9); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#FFFFFF', EndColorStr='#E9E9E9')"; + background-color: #E9E9E9; /* Old browsers */ /* FF3.6+ */ + background-image: -webkit-linear-gradient(top, #FFFFFF 0%, #E9E9E9 100%); + background-image: linear-gradient(to bottom, #FFFFFF 0%,#E9E9E9 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#E9E9E9',GradientType=0 ); /* IE6-9 */ box-shadow: 0 0 0 1px #FFFFFF inset; -webkit-box-shadow: 0 0 0 1px #FFFFFF inset; color: #D31141; } -.dropdown-select { - color: #536482; +.button:hover, +.button:focus { + border-color: #0A8ED0; + background-color: #FFFFFF; /* Old browsers */ /* FF3.6+ */ + background-image: -webkit-linear-gradient(top, #E9E9E9 0%, #FFFFFF 100%); + background-image: linear-gradient(to bottom, #E9E9E9 0%,#FFFFFF 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#E9E9E9', endColorstr='#FFFFFF',GradientType=0 ); /* IE6-9 */ + text-shadow: 1px 1px 0 #FFFFFF, -1px -1px 0 #FFFFFF, -1px -1px 0 rgba(188, 42, 77, 0.2); } -.button:hover, .dropdown-visible .dropdown-select, .nojs .dropdown-container:hover .dropdown-select { - border-color: #0a8ed0; - background-image: -moz-linear-gradient(top, #E9E9E9, #FFFFFF); - background-image: -webkit-linear-gradient(top, #E9E9E9, #FFFFFF); - background-image: -o-linear-gradient(top, #E9E9E9, #FFFFFF); - background-image: linear-gradient(to bottom, #E9E9E9, #FFFFFF); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#E9E9E9', EndColorStr='#FFFFFF')"; - text-shadow: 1px 1px 0 #FFFFFF, -1px -1px 0 #FFFFFF, -1px -1px 0 rgba(188, 42, 77, 0.2); + +.button .icon, +.button-secondary { + color: #8f8f8f; } -.dropdown-select:after { border-color: #DADADA; } -.dropdown-select:hover { border-color: #C7C3BF; } +.button-secondary:focus, +.button-secondary:hover, +.button:focus .icon, +.button:hover .icon { + color: #0A8ED0; +} -.dropdown-visible .dropdown-select, .dropdown-visible .dropdown-select:hover, .nojs .dropdown-container:hover .dropdown-select { - border-color: #A6B2BA; - color: #105289; +.button-search:hover, +.button-search-end:hover { + border-color: #C7C3BF; } +.caret { border-color: #DADADA; } +.caret { border-color: #C7C3BF; } + .contact-icons a { border-color: #DCDCDC; } .contact-icons a:hover { background-color: #F2F6F9; } +/* Pagination +---------------------------------------- */ + +.pagination li a { + background: #ECEDEE; + filter: none; + border-color: #B4BAC0; + box-shadow: none; + -webkit-box-shadow: none; + color: #5C758C; +} + +.pagination li.ellipsis span { + background: transparent; + color: #000000; +} + +.pagination li.active span { + background: #4692BF; + border-color: #4692BF; + color: #FFFFFF; +} + +.pagination li a:hover, .pagination li a:hover .icon, .pagination .dropdown-visible a.dropdown-trigger, .nojs .pagination .dropdown-container:hover a.dropdown-trigger { + background: #368AD2; + border-color: #368AD2; + filter: none; + color: #FFFFFF; + text-shadow: none; +} + +/* Search box +--------------------------------------------- */ + +.search-box .inputbox, +.search-box .inputbox:hover, +.search-box .inputbox:focus { + border-color: #C7C3BF; +} + +.search-header { + box-shadow: 0 0 10px #0075B0; +} + /* Icon images ---------------------------------------- */ -.icon-acp { background-image: url("./images/icon_acp.gif"); } -.icon-bookmark { background-image: url("./images/icon_bookmark.gif"); } -.icon-bump { background-image: url("./images/icon_bump.gif"); } -.icon-contact { background-image: url("./images/icon_pm.gif"); } -.icon-delete-cookies { background-image: url("./images/icon_delete_cookies.gif"); } -.icon-download { background-image: url("./images/icon_download.gif"); } -.icon-faq { background-image: url("./images/icon_faq.gif"); } -.icon-home { background-image: url("./images/icon_home.gif"); } -.icon-logout { background-image: url("./images/icon_logout.gif"); } -.icon-mark { background-image: url("./images/icon_mark.gif"); } -.icon-mcp { background-image: url("./images/icon_mcp.gif"); } -.icon-members { background-image: url("./images/icon_members.gif"); } -.icon-notification { background-image: url("./images/icon_notification.gif"); } -.icon-pages { background-image: url("./images/icon_pages.gif"); } -.icon-pm { background-image: url("./images/icon_pm.gif"); } -.icon-print { background-image: url("./images/icon_print.gif"); } -.icon-profile { background-image: url("./images/icon_profile.gif"); } -.icon-register { background-image: url("./images/icon_register.gif"); } -.icon-search, .responsive-search a { background-image: url("./images/icon_search.gif"); } -.icon-search-active { background-image: url("./images/subforum_read.gif"); } -.icon-search-new { background-image: url("./images/subforum_unread.gif"); } -.icon-search-self { background-image: url("./images/icon_topic_latest.gif"); } -.icon-search-unanswered { background-image: url("./images/icon_post_target.gif"); } -.icon-search-unread { background-image: url("./images/subforum_unread.gif"); } -.icon-sendemail { background-image: url("./images/icon_sendemail.gif"); } -.icon-subscribe { background-image: url("./images/icon_subscribe.gif"); } -.icon-team { background-image: url("./images/icon_team.gif"); } -.icon-ucp { background-image: url("./images/icon_ucp.gif"); } -.icon-unsubscribe { background-image: url("./images/icon_unsubscribe.gif"); } + +.contact-icon { background-image: url("./images/icons_contact.png"); } /* Profile & navigation icons */ -.contact-icon { background-image: url("./images/icons_contact.png"); } -.icon-button:before, .dropdown-select:after { background-image: url("./images/icons_button.png"); } +.pm-icon { background-position: 0 0; } +.email-icon { background-position: -21px 0; } +.jabber-icon { background-position: -80px 0; } +.phpbb_icq-icon { background-position: -61px 0 ; } +.phpbb_wlm-icon { background-position: -182px 0; } +.phpbb_aol-icon { background-position: -244px 0; } +.phpbb_website-icon { background-position: -40px 0; } +.phpbb_youtube-icon { background-position: -98px 0; } +.phpbb_facebook-icon { background-position: -119px 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; } /* Forum icons & Topic icons */ -.global_read { background-image: url("./images/announce_read.gif"); } -.global_read_mine { background-image: url("./images/announce_read_mine.gif"); } -.global_read_locked { background-image: url("./images/announce_read_locked.gif"); } -.global_read_locked_mine { background-image: url("./images/announce_read_locked_mine.gif"); } -.global_unread { background-image: url("./images/announce_unread.gif"); } -.global_unread_mine { background-image: url("./images/announce_unread_mine.gif"); } -.global_unread_locked { background-image: url("./images/announce_unread_locked.gif"); } -.global_unread_locked_mine { background-image: url("./images/announce_unread_locked_mine.gif"); } - -.announce_read { background-image: url("./images/announce_read.gif"); } -.announce_read_mine { background-image: url("./images/announce_read_mine.gif"); } -.announce_read_locked { background-image: url("./images/announce_read_locked.gif"); } -.announce_read_locked_mine { background-image: url("./images/announce_read_locked_mine.gif"); } -.announce_unread { background-image: url("./images/announce_unread.gif"); } -.announce_unread_mine { background-image: url("./images/announce_unread_mine.gif"); } -.announce_unread_locked { background-image: url("./images/announce_unread_locked.gif"); } -.announce_unread_locked_mine { background-image: url("./images/announce_unread_locked_mine.gif"); } - -.forum_link { background-image: url("./images/forum_link.gif"); } -.forum_read { background-image: url("./images/forum_read.gif"); } -.forum_read_locked { background-image: url("./images/forum_read_locked.gif"); } -.forum_read_subforum { background-image: url("./images/forum_read_subforum.gif"); } -.forum_unread { background-image: url("./images/forum_unread.gif"); } -.forum_unread_locked { background-image: url("./images/forum_unread_locked.gif"); } -.forum_unread_subforum { background-image: url("./images/forum_unread_subforum.gif"); } - -.sticky_read { background-image: url("./images/sticky_read.gif"); } -.sticky_read_mine { background-image: url("./images/sticky_read_mine.gif"); } -.sticky_read_locked { background-image: url("./images/sticky_read_locked.gif"); } -.sticky_read_locked_mine { background-image: url("./images/sticky_read_locked_mine.gif"); } -.sticky_unread { background-image: url("./images/sticky_unread.gif"); } -.sticky_unread_mine { background-image: url("./images/sticky_unread_mine.gif"); } -.sticky_unread_locked { background-image: url("./images/sticky_unread_locked.gif"); } -.sticky_unread_locked_mine { background-image: url("./images/sticky_unread_locked_mine.gif"); } - -.topic_moved { background-image: url("./images/topic_moved.gif"); } -.topic_read { background-image: url("./images/topic_read.gif"); } -.topic_read_mine { background-image: url("./images/topic_read_mine.gif"); } -.topic_read_hot { background-image: url("./images/topic_read_hot.gif"); } -.topic_read_hot_mine { background-image: url("./images/topic_read_hot_mine.gif"); } -.topic_read_locked { background-image: url("./images/topic_read_locked.gif"); } -.topic_read_locked_mine { background-image: url("./images/topic_read_locked_mine.gif"); } -.topic_unread { background-image: url("./images/topic_unread.gif"); } -.topic_unread_mine { background-image: url("./images/topic_unread_mine.gif"); } -.topic_unread_hot { background-image: url("./images/topic_unread_hot.gif"); } -.topic_unread_hot_mine { background-image: url("./images/topic_unread_hot_mine.gif"); } -.topic_unread_locked { background-image: url("./images/topic_unread_locked.gif"); } -.topic_unread_locked_mine { background-image: url("./images/topic_unread_locked_mine.gif"); } - -.pm_read { background-image: url("./images/topic_read.gif"); } -.pm_unread { background-image: url("./images/topic_unread.gif"); } +.global_read { background-image: url("./images/announce_read.gif"); } +.global_read_mine { background-image: url("./images/announce_read_mine.gif"); } +.global_read_locked { background-image: url("./images/announce_read_locked.gif"); } +.global_read_locked_mine { background-image: url("./images/announce_read_locked_mine.gif"); } +.global_unread { background-image: url("./images/announce_unread.gif"); } +.global_unread_mine { background-image: url("./images/announce_unread_mine.gif"); } +.global_unread_locked { background-image: url("./images/announce_unread_locked.gif"); } +.global_unread_locked_mine { background-image: url("./images/announce_unread_locked_mine.gif"); } + +.announce_read { background-image: url("./images/announce_read.gif"); } +.announce_read_mine { background-image: url("./images/announce_read_mine.gif"); } +.announce_read_locked { background-image: url("./images/announce_read_locked.gif"); } +.announce_read_locked_mine { background-image: url("./images/announce_read_locked_mine.gif"); } +.announce_unread { background-image: url("./images/announce_unread.gif"); } +.announce_unread_mine { background-image: url("./images/announce_unread_mine.gif"); } +.announce_unread_locked { background-image: url("./images/announce_unread_locked.gif"); } +.announce_unread_locked_mine { background-image: url("./images/announce_unread_locked_mine.gif"); } + +.forum_link { background-image: url("./images/forum_link.gif"); } +.forum_read { background-image: url("./images/forum_read.gif"); } +.forum_read_locked { background-image: url("./images/forum_read_locked.gif"); } +.forum_read_subforum { background-image: url("./images/forum_read_subforum.gif"); } +.forum_unread { background-image: url("./images/forum_unread.gif"); } +.forum_unread_locked { background-image: url("./images/forum_unread_locked.gif"); } +.forum_unread_subforum { background-image: url("./images/forum_unread_subforum.gif"); } + +.sticky_read { background-image: url("./images/sticky_read.gif"); } +.sticky_read_mine { background-image: url("./images/sticky_read_mine.gif"); } +.sticky_read_locked { background-image: url("./images/sticky_read_locked.gif"); } +.sticky_read_locked_mine { background-image: url("./images/sticky_read_locked_mine.gif"); } +.sticky_unread { background-image: url("./images/sticky_unread.gif"); } +.sticky_unread_mine { background-image: url("./images/sticky_unread_mine.gif"); } +.sticky_unread_locked { background-image: url("./images/sticky_unread_locked.gif"); } +.sticky_unread_locked_mine { background-image: url("./images/sticky_unread_locked_mine.gif"); } + +.topic_moved { background-image: url("./images/topic_moved.gif"); } +.pm_read, +.topic_read { background-image: url("./images/topic_read.gif"); } +.topic_read_mine { background-image: url("./images/topic_read_mine.gif"); } +.topic_read_hot { background-image: url("./images/topic_read_hot.gif"); } +.topic_read_hot_mine { background-image: url("./images/topic_read_hot_mine.gif"); } +.topic_read_locked { background-image: url("./images/topic_read_locked.gif"); } +.topic_read_locked_mine { background-image: url("./images/topic_read_locked_mine.gif"); } +.pm_unread, +.topic_unread { background-image: url("./images/topic_unread.gif"); } +.topic_unread_mine { background-image: url("./images/topic_unread_mine.gif"); } +.topic_unread_hot { background-image: url("./images/topic_unread_hot.gif"); } +.topic_unread_hot_mine { background-image: url("./images/topic_unread_hot_mine.gif"); } +.topic_unread_locked { background-image: url("./images/topic_unread_locked.gif"); } +.topic_unread_locked_mine { background-image: url("./images/topic_unread_locked_mine.gif"); } + /* -------------------------------------------------------------- @@ -733,7 +753,7 @@ Colours and backgrounds for cp.css /* Main CP box ----------------------------------------*/ -.panel-container h3, .panel-container hr, #cp-menu hr { +.panel-container h3, .panel-container hr, .cp-menu hr { border-color: #A4B3BF; } @@ -755,50 +775,46 @@ ul.cplist { border-bottom-color: #333333; } -#cp-main .pm-message { +.cp-main .pm-message { border-color: #DBDEE2; background-color: #FFFFFF; } /* CP tabbed menu ----------------------------------------*/ -#tabs .tab > a { +.tabs .tab > a { background: #BACCD9; color: #536482; } -#tabs .tab > a:hover { +.tabs .tab > a:hover { background: #DDEDFB; color: #D31141; } -#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 ); +.tabs .activetab > a, +.tabs .activetab > a:hover { + background-color: #CADCEB; /* Old browsers */ /* FF3.6+ */ + background-image: -webkit-linear-gradient(top, #E2F2FF 0%, #CADCEB 100%); + background-image: linear-gradient(to bottom, #E2F2FF 0%,#CADCEB 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#E2F2FF', endColorstr='#CADCEB',GradientType=0 ); /* IE6-9 */ border-color: #CADCEB; box-shadow: 0 1px 1px #F2F9FF inset; color: #333333; } -#tabs .activetab > a:hover { +.tabs .activetab > a:hover { color: #000000; } /* Mini tabbed menu used in MCP ----------------------------------------*/ -#minitabs .tab > a { +.minitabs .tab > a { background-color: #E1EBF2; } -#minitabs .activetab > a, -#minitabs .activetab > a:hover { +.minitabs .activetab > a, +.minitabs .activetab > a:hover { background-color: #F9F9F9; color: #333333; } @@ -817,42 +833,34 @@ ul.cplist { ----------------------------------------*/ /* Link styles for the sub-section links */ -#navigation a { +.navigation a { color: #333; - 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: #CADCEB; /* Old browsers */ /* FF3.6+ */ 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 ); + background: linear-gradient(to right, #B4C4D1 50%,#CADCEB 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#B4C4D1', endColorstr='#CADCEB',GradientType=1 ); /* IE6-9 */ } -.rtl #navigation a { - 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 ); +.rtl .navigation a { + background: #B4C4D1; /* Old browsers */ /* FF3.6+ */ + background: -webkit-linear-gradient(left, #CADCEB 50%, #B4C4D1 100%); + background: linear-gradient(to right, #CADCEB 50%,#B4C4D1 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#CADCEB', endColorstr='#B4C4D1',GradientType=1 ); /* IE6-9 */ } -#navigation a:hover { +.navigation a:hover { background: #AABAC6; color: #BC2A4D; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } -#navigation #active-subsection a { +.navigation .active-subsection a { background: #F9F9F9; color: #D31141; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } -#navigation #active-subsection a:hover { +.navigation .active-subsection a:hover { color: #D31141; } @@ -873,13 +881,13 @@ ul.cplist { background-color: #F9F9F9; } -#cp-main .pm { +.cp-main .pm { background-color: #FFFFFF; } /* Friends list */ .cp-mini { - background-color: #eef5f9; + background-color: #EEF5F9; } dl.mini dt { @@ -916,12 +924,12 @@ dl.mini dt { } /* Avatar gallery */ -#gallery label { +.gallery label { background: #FFFFFF; border-color: #CCC; } -#gallery label:hover { +.gallery label:hover { background-color: #EEE; } @@ -973,15 +981,15 @@ fieldset.quick-login input.inputbox { /* Posting page styles ----------------------------------------*/ -#message-box textarea { +.message-box textarea { color: #333333; } -#message-box textarea.drag-n-drop { +.message-box textarea.drag-n-drop { outline-color: rgba(102, 102, 102, 0.5); } -#message-box textarea.drag-n-drop-highlight { +.message-box textarea.drag-n-drop-highlight { outline-color: rgba(17, 163, 234, 0.5); } @@ -1007,7 +1015,6 @@ fieldset.quick-login input.inputbox { .inputbox:focus { border-color: #11A3EA; - color: #0F4987; } .inputbox:focus:-moz-placeholder { @@ -1024,8 +1031,10 @@ fieldset.quick-login input.inputbox { a.button1, input.button1, input.button3, a.button2, input.button2 { color: #000; - background-color: #FAFAFA; - background-image: url("./images/bg_button.gif"); + background-color: #EFEFEF; /* Old browsers */ /* FF3.6+ */ + background-image: -webkit-linear-gradient(top, #D2D2D2 0%, #EFEFEF 100%); + background-image: linear-gradient(to bottom, #D2D2D2 0%,#EFEFEF 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#D2D2D2', endColorstr='#EFEFEF',GradientType=0 ); /* IE6-9 */ } a.button1, input.button1 { @@ -1048,8 +1057,12 @@ a.button1, a.button2 { /* Hover states */ a.button1:hover, input.button1:hover, a.button2:hover, input.button2:hover, input.button3:hover { - border-color: #BC2A4D; - color: #BC2A4D; + border-color: #D31141; + color: #D31141; + background-color: #D2D2D2; /* Old browsers */ /* FF3.6+ */ + background-image: -webkit-linear-gradient(top, #EFEFEF 0%, #D2D2D2 100%); + background-image: linear-gradient(to bottom, #EFEFEF 0%,#D2D2D2 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#EFEFEF', endColorstr='#D2D2D2',GradientType=0 ); /* IE6-9 */ } /* Focus states */ @@ -1058,10 +1071,6 @@ input.button1:focus, input.button2:focus, input.button3:focus { color: #0F4987; } -input.search { - background-image: url("./images/icon_textbox_search.gif"); -} - input.disabled { color: #666666; } @@ -1072,14 +1081,11 @@ input.disabled { background-color: #FFFFFF; border-color: #999999; } -.phpbb_alert .alert_close { - background-image: url("./images/alert_close.png"); -} -#darken { +.darken { background-color: #000000; } -#loading_indicator { +.loading_indicator { background-color: #000000; background-image: url("./images/loading.gif"); } @@ -1104,13 +1110,10 @@ input.disabled { } .dropdown-extended .header { - background: #F1F8FF; - background: -moz-linear-gradient(top, #F1F8FF 0%, #CADCEB 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #F1F8FF), color-stop(100%, #CADCEB)); - background: -webkit-linear-gradient(top, #F1F8FF 0%, #CADCEB 100%); - background: -o-linear-gradient(top, #F1F8FF 0%, #CADCEB 100%); - background: -ms-linear-gradient(top, #F1F8FF 0%, #CADCEB 100%); - background: linear-gradient(to bottom, #F1F8FF 0%, #CADCEB 100%); + background-color: #F1F8FF; /* Old browsers */ /* FF3.6+ */ + background-image: -webkit-linear-gradient(top, #F1F8FF 0%, #CADCEB 100%); + background-image: linear-gradient(to bottom, #F1F8FF 0%,#CADCEB 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#F1F8FF', endColorstr='#CADCEB',GradientType=0 ); /* IE6-9 */ } .dropdown .pointer { @@ -1125,17 +1128,9 @@ input.disabled { border-color: #F1F8FF transparent; } -ul.linklist li.responsive-menu a.responsive-menu-link:before { - border-color: #105289; -} - -ul.linklist li.responsive-menu a.responsive-menu-link:hover:before, ul.linklist li.responsive-menu.visible a.responsive-menu-link:before { - border-color: #D31141; -} - .dropdown .dropdown-contents { background: #fff; - border-color: #b9b9b9; + border-color: #B9B9B9; box-shadow: 1px 3px 5px rgba(0, 0, 0, 0.2); } diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index df923aa948..a0dc5e043b 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -1,52 +1,3 @@ -/* CSS Reset http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 ----------------------------------------- */ -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -b, u, i, center, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, embed, -figure, figcaption, footer, header, hgroup, -menu, nav, output, ruby, section, summary, -time, mark, audio, video { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font: inherit; - vertical-align: baseline; -} -/* HTML5 display-role reset for older browsers */ -article, aside, details, figcaption, figure, -footer, header, hgroup, menu, nav, section { - display: block; -} -body { - line-height: 1; -} -ol, ul { - list-style: none; -} -blockquote, q { - quotes: none; -} -blockquote:before, blockquote:after, -q:before, q:after { - content: ''; - content: none; -} -table { - border-collapse: collapse; - border-spacing: 0; -} -abbr { - text-decoration: none; -} - /* General Markup Styles ---------------------------------------- */ html { @@ -182,10 +133,11 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul { list-style-type: square; } +a:hover { text-decoration: underline; } /* Main blocks ---------------------------------------- */ -#wrap { +.wrap { border: 1px solid transparent; border-radius: 8px; margin: 0 auto; @@ -195,21 +147,21 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul { } @media only screen and (max-width: 1220px), only screen and (max-device-width: 1220px) { - #wrap { + .wrap { margin: 0 12px; } } -#page-body { +.page-body { margin: 4px 0; clear: both; } -#page-footer { +.page-footer { clear: both; } -#page-footer h3 { +.page-footer h3 { margin-top: 20px; } @@ -223,20 +175,25 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul { text-decoration: none; } +.site_logo { + display: inline-block; + width: 149px; + height: 52px; +} + /* Site description and logo */ -#site-description { +.site-description { float: left; width: 65%; } -#site-description h1 { +.site-description h1 { margin-right: 0; } /* Round cornered boxes and backgrounds ---------------------------------------- */ .headerbar { - background: transparent none repeat-x 0 0; margin-bottom: 4px; padding: 5px; border-radius: 7px; @@ -248,7 +205,6 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul { } .forabg { - background: transparent none repeat-x 0 0; margin-bottom: 4px; padding: 5px; clear: both; @@ -256,7 +212,6 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul { } .forumbg { - background: transparent none repeat-x 0 0; margin-bottom: 4px; padding: 5px; clear: both; @@ -286,6 +241,7 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul { ----------------------------------------*/ .navbar ul.linklist { padding: 2px 0; + list-style-type: none; } ul.linklist { @@ -293,7 +249,7 @@ ul.linklist { margin: 0; } -#cp-main .panel { +.cp-main .panel { padding: 5px 10px; } @@ -334,28 +290,7 @@ ul.rightside { ul.linklist li.responsive-menu { position: relative; - margin: 0 5px; -} - -ul.linklist li.responsive-menu a.responsive-menu-link { - display: inline-block; - margin: 0 5px; - font-size: 1.455em; - position: relative; - width: 16px; - line-height: 1.2em; - text-decoration: none; -} - -ul.linklist li.responsive-menu a.responsive-menu-link:before { - content: ''; - position: absolute; - left: 0; - top: 7px; - height: .125em; - width: 14px; - border-bottom: 0.125em solid transparent; - border-top: 0.375em double transparent; + margin: 0 5px 0 0; } .hasjs ul.linklist.leftside, .hasjs ul.linklist.rightside { @@ -412,24 +347,25 @@ ul.linklist.bulletin > li.no-bulletin:before { vertical-align: top; } -.header-avatar:hover { +a.header-avatar, +a.header-avatar:hover { text-decoration: none; } -.header-avatar img { +a.header-avatar img { margin-bottom: 2px; max-height: 20px; vertical-align: middle; width: auto; } -.header-avatar span:after { - content: '\25BC'; +a.header-avatar span:after { + content: '\f0dd'; display: inline-block; - font-size: 9px; - float: right; - padding-left: 2px; - opacity: 0.7; + font: normal normal normal 14px/1 FontAwesome; + padding-left: 6px; + padding-top: 2px; + vertical-align: top; } /* Dropdown menu @@ -451,6 +387,7 @@ ul.linklist.bulletin > li.no-bulletin:before { } .dropdown { + display: none; position: absolute; left: 0; top: 1.2em; @@ -511,12 +448,12 @@ ul.linklist.bulletin > li.no-bulletin:before { .dropdown .pointer { right: auto; left: 10px; - top: 0; + top: -1px; z-index: 3; } .dropdown-up .pointer { - bottom: 0; + bottom: -1px; top: auto; } @@ -544,22 +481,72 @@ ul.linklist.bulletin > li.no-bulletin:before { border-radius: 5px; padding: 5px; position: relative; - min-width: 40px; max-height: 300px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; +} + +.dropdown-contents a { + display: block; + padding: 5px; +} + +.jumpbox { + margin: 5px 0; +} + +.jumpbox .dropdown li { + border-top: 1px solid transparent; +} + +.jumpbox .dropdown-select { + margin: 0; +} + +.jumpbox .dropdown-contents { + padding: 0; + text-decoration: none; +} + +.jumpbox .dropdown-contents li { + padding: 0; +} + +.jumpbox .dropdown-contents a { + margin-right: 20px; + padding: 5px 10px; + text-decoration: none; + width: 100%; +} + +.jumpbox .spacer { + display: inline-block; + width: 0px; +} + +.jumpbox .spacer + .spacer { + width: 20px; +} + +.dropdown-contents a { + display: block; + padding: 5px; +} + +.jumpbox .dropdown-select { + margin: 0; +} + +.jumpbox .dropdown-contents a { + text-decoration: none; } .dropdown li { + display: list-item; border-top: 1px dotted transparent; float: none !important; line-height: normal !important; font-size: 1em !important; list-style: none; margin: 0; - padding-top: 4px; - padding-bottom: 4px; white-space: nowrap; text-align: left; } @@ -595,7 +582,6 @@ ul.linklist.bulletin > li.no-bulletin:before { .dropdown li.separator { border-top: 1px solid transparent; - margin: 4px 0; padding: 0; } @@ -622,7 +608,6 @@ ul.linklist.bulletin > li.no-bulletin:before { } .breadcrumbs .crumb a { - display: inline-block; white-space: nowrap; text-overflow: ellipsis; vertical-align: bottom; @@ -645,7 +630,7 @@ table.table1 { width: 100%; } -#ucp-main table.table1 { +.ucp-main table.table1 { padding: 2px; } @@ -717,7 +702,7 @@ table.info tbody th { margin: 0 -1px; } -#color_palette_placeholder table { +.color_palette_placeholder table { border-collapse: separate; border-spacing: 1px; } @@ -812,7 +797,7 @@ fieldset.fields1 dl.pmlist dd.recipients { /* Action-bars (container for post/reply buttons, pagination, etc.) ---------------------------------------- */ .action-bar { - font-size: 1.1em; + font-size: 11px; margin: 4px 0; } @@ -820,19 +805,32 @@ fieldset.fields1 dl.pmlist dd.recipients { margin-top: 2em; } +.action-bar .button { + margin-right: 5px; + float: left; +} + +.action-bar .button-search { + margin-right: 0; +} + /* Pagination ---------------------------------------- */ .pagination { float: right; - margin-top: 3px; text-align: right; width: auto; } -.action-bar.bottom .pagination { +.action-bar.bar-bottom .pagination { margin-top: 0; } +.action-bar .pagination .button { + margin-right: 0; + float: none; +} + .pagination > ul { display: inline-block; list-style: none !important; @@ -848,16 +846,20 @@ fieldset.fields1 dl.pmlist dd.recipients { } .pagination li a, .pagination li span { - border: 1px solid transparent; border-radius: 2px; - display: block; - font-size: 0.9em; + padding: 2px 5px; +} + +.pagination li.active span { + display: inline-block; + font-size: 13px; font-weight: normal; - line-height: 1.4em; - min-width: 10px; - padding: 3px; + font-family: "Open Sans", "Droid Sans", Verdana, Arial, Helvetica; + line-height: 1.4; text-align: center; - text-decoration: none; + white-space: nowrap; + vertical-align: middle; + border: 1px solid transparent; } .pagination li.ellipsis span { @@ -869,37 +871,23 @@ fieldset.fields1 dl.pmlist dd.recipients { 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; + padding: 0 8px; } -.pagination li.next a { - background-position: -50px 2px; +.pagination li.page-jump a i { + font-size: 21px; } -.pagination li.previous a { - background-position: -30px 2px; +.pagination .arrow a { + padding: 2px 0; } -.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; - margin-top: 0; - padding: 1px 0 1px 15px; - font-size: 0.9em; - background: none 0 50% no-repeat; + margin-top: 3px; + margin-bottom: 3px; } .row .pagination > ul { @@ -907,8 +895,9 @@ fieldset.fields1 dl.pmlist dd.recipients { } .row .pagination li a, .row .pagination li span { - border-radius: 1px; - padding: 1px; + border-radius: 2px; + padding: 1px 3px; + font-size: 9px; } /* jQuery popups @@ -934,18 +923,9 @@ fieldset.fields1 dl.pmlist dd.recipients { } .phpbb_alert .alert_close { - display: block; float: right; - width: 16px; - height: 16px; - overflow: hidden; - text-decoration: none !important; - background: transparent none 0 0 no-repeat; - margin-top: -7px; - margin-right: -31px; -} -.phpbb_alert .alert_close:hover { - background-position: 0 -16px; + margin-right: -36px; + margin-top: -8px; } .phpbb_alert p { @@ -967,13 +947,13 @@ fieldset.fields1 dl.pmlist dd.recipients { font-size: 1.1em; } -#darkenwrapper { +.darkenwrapper { display: none; position: relative; z-index: 44; } -#darken { +.darken { position: fixed; left: 0; top: 0; @@ -983,7 +963,7 @@ fieldset.fields1 dl.pmlist dd.recipients { z-index: 45; } -#loading_indicator { +.loading_indicator { background: center center no-repeat; border-radius: 5px; display: none; @@ -1000,18 +980,16 @@ fieldset.fields1 dl.pmlist dd.recipients { /* Miscellaneous styles ---------------------------------------- */ -#forum-permissions { - float: right; - width: auto; - padding-left: 5px; - margin-left: 5px; - margin-top: 10px; - text-align: right; -} - .copyright { - padding: 5px; + font-size: 10px; text-align: center; + padding: 10px; +} + +.footer-row { + font-size: 10px; + line-height: 1.8; + margin: 0; } .small { @@ -1045,36 +1023,20 @@ div.rules ul, div.rules ol { p.post-notice { position: relative; padding: 5px; - padding-left: 26px; min-height: 14px; margin-bottom: 1em; } -p.post-notice:before { - content: ''; - display: block; - position: absolute; - top: 0; - bottom: 0; - left: 0; - width: 28px; - background: transparent none 50% 50% no-repeat; - pointer-events: none; -} - form > p.post-notice strong { line-height: 20px; } -#jumpbox { - margin: 5px 0; -} - .stat-block { clear: both; } -#top { +.top-anchor { + display: block; position: absolute; top: -20px; } @@ -1093,16 +1055,19 @@ ul.linklist:after, .action-bar:after, .notification_text:after, .tabs-container:after, -#tabs > ul:after, -#minitabs > ul:after, +.tabs > ul:after, +.minitabs > ul:after, .postprofile .avatar-container:after { clear: both; content: ''; display: block; } -.hidden { - display: none; +.emoji { + min-height: 18px; + min-width: 18px; + height: 1em; + width: 1em; } .smilies { @@ -1183,6 +1148,11 @@ ul.linklist:after, text-transform: none; } +.dropdown-extended .header .header_settings a { + display: inline-block; + padding: 0 5px; +} + .dropdown-extended .header:after { content: ''; display: table; @@ -1284,30 +1254,11 @@ ul.linklist:after, /* Navbar specific list items ----------------------------------------*/ -#quick-links { +.linklist .quick-links { margin: 0 7px 0 0; } -#quick-links a.responsive-menu-link { - display: block; - font-size: inherit; - line-height: inherit; - margin: 0; - width: auto; -} - -#quick-links a.responsive-menu-link:before { - font-size: 1.455em; - line-height: 16.5px; -} - -.compact #quick-links a.responsive-menu-link { - width: 0; - overflow: hidden; - white-space: nowrap; -} - -.compact .icon-notification > a > span, .compact .icon-pm > a > span { +.linklist.compact .rightside > a > span { display: none; } @@ -1323,6 +1274,10 @@ ul.linklist:after, width: 50px; } +.dropdown .clone.hidden { + display: none; +} + .dropdown .clone.hidden + li.separator { display: none; } diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index dfb91891fa..807633864c 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -7,10 +7,6 @@ ul.topiclist { margin: 0; } -ul.forums { - background: transparent none repeat-x 0 0; -} - ul.topiclist li { display: block; list-style-type: none; @@ -22,7 +18,7 @@ ul.topiclist dl { } ul.topiclist li.row dl { - padding: 2px 0; + margin: 2px 0; } ul.topiclist dt, ul.topiclist dd { @@ -74,6 +70,11 @@ ul.topiclist dd { box-sizing: border-box; } +ul.topiclist li.row dd { + padding: 4px 0 999px 0; + margin-bottom: -995px; +} + ul.topiclist dfn { /* Labels for post/view counts */ position: absolute; @@ -81,15 +82,6 @@ ul.topiclist dfn { width: 990px; } -ul.topiclist li.row dt a.subforum { - background-image: none; - background-position: 0 50%; - background-repeat: no-repeat; - position: relative; - white-space: nowrap; - padding: 0 0 0 12px; -} - .forum-image { float: left; padding-top: 5px; @@ -133,36 +125,44 @@ li.header dd { box-sizing: border-box; } -li.header dl.icon dt, li.header dl.icon dd { +li.header dl.row-item dt, li.header dl.row-item dd { min-height: 0; } -li.header dl.icon dt .list-inner { +li.header dl.row-item dt .list-inner { /* Tweak for headers alignment when folder icon used */ padding-left: 0; padding-right: 50px; } /* Forum list column styles */ -dl.icon { +.row .list-inner { padding: 4px 0; } + +dl.row-item { background-position: 10px 50%; /* Position of folder icon */ background-repeat: no-repeat; + background-size: 32px; } -dl.icon dt { +dl.row-item dt { background-repeat: no-repeat; background-position: 5px 95%; /* Position of topic icon */ + background-size: 17px; } -dl.icon dt .list-inner { - padding-left: 45px; /* Space for folder icon */ +dl.row-item dt .list-inner { + padding-left: 52px; /* Space for folder icon */ } -dl.icon dt, dl.icon dd { +dl.row-item dt, dl.row-item dd { min-height: 35px; } -dl a.icon-link { /* topic row icon links */ +dl.row-item dt a { + display: inline; +} + +dl a.row-item-link { /* topic row icon links */ display: block; width: 30px; height: 30px; @@ -186,13 +186,13 @@ dd.posts, dd.topics, dd.views { } /* List in forum description */ -dl.icon dt ol, -dl.icon dt ul { +dl.row-item dt ol, +dl.row-item dt ul { list-style-position: inside; margin-left: 1em; } -dl.icon dt li { +dl.row-item dt li { display: list-item; list-style-type: inherit; } @@ -286,28 +286,28 @@ dd.option { /* Topic review panel ----------------------------------------*/ -#review { +.panel .review { margin-top: 2em; } -#topicreview { +.topicreview { padding-right: 5px; overflow: auto; height: 300px; } -#topicreview .postbody { +.topicreview .postbody { width: auto; float: none; margin: 0; height: auto; } -#topicreview .post { +.topicreview .post { height: auto; } -#topicreview h2 { +.topicreview h2 { border-bottom-width: 0; } @@ -317,7 +317,7 @@ dd.option { /* MCP Post details ----------------------------------------*/ -#post_details { +.post_details { /* This will only work in IE7+, plus the others */ overflow: auto; max-height: 300px; @@ -383,8 +383,7 @@ dl.faq dt { } .content ul, .content ol { - margin-bottom: 1em; - margin-left: 3em; + margin: 0.8em 0 0.9em 3em; } .posthilit { @@ -430,8 +429,7 @@ dd .signature { } .signature ul, .signature ol { - margin-bottom: 1em; - margin-left: 3em; + margin: 0.8em 0 0.9em 3em; } /* Post noticies */ @@ -457,10 +455,9 @@ ul.searchresults { ----------------------------------------*/ /* Quote block */ blockquote { - background: transparent none 6px 8px no-repeat; border: 1px solid transparent; font-size: 0.95em; - margin: 0.5em 1px 0 25px; + margin: 1em 1px 1em 25px; overflow: hidden; padding: 5px; } @@ -468,14 +465,13 @@ blockquote { blockquote blockquote { /* Nested quotes */ font-size: 1em; - margin: 0.5em 1px 0 15px; + margin: 1em 1px 1em 15px; } blockquote cite { /* Username/source of quoter */ font-style: normal; font-weight: bold; - margin-left: 20px; display: block; font-size: 0.9em; } @@ -484,23 +480,33 @@ blockquote cite cite { font-size: 1em; } -blockquote.uncited { - padding-top: 25px; +blockquote cite:before, .uncited:before { + padding-right: 5px; +} + +blockquote cite > div { + float: right; + font-weight: normal; +} + +.postbody .content li blockquote { + overflow: inherit; + margin-left: 0; } /* Code block */ .codebox { - padding: 3px; border: 1px solid transparent; font-size: 1em; - overflow-x: scroll; + margin: 1em 0 1.2em 0; word-wrap: normal; } .codebox p { text-transform: uppercase; border-bottom: 1px solid transparent; - margin-bottom: 3px; + margin-bottom: 0; + padding: 3px; font-size: 0.8em !important; font-weight: bold; display: block; @@ -515,16 +521,15 @@ blockquote .codebox { display: block; height: auto; max-height: 200px; - white-space: normal; - padding-top: 5px; + padding: 5px 3px; font: 0.9em Monaco, "Andale Mono","Courier New", Courier, monospace; line-height: 1.3em; - margin: 2px 0; } /* Attachments ----------------------------------------*/ .attachbox { + font-size: 13px; float: left; width: auto; max-width: 100%; @@ -832,7 +837,7 @@ table.fixed-width-table { /* 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 { +.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 { width: 8px; height: 8px; -webkit-appearance: none; @@ -840,7 +845,7 @@ table.fixed-width-table { border-radius: 3px; } -.postbody .content::-webkit-scrollbar-thumb, #topicreview::-webkit-scrollbar-thumb, #post_details::-webkit-scrollbar-thumb, .codebox code::-webkit-scrollbar-thumb, .attachbox dd::-webkit-scrollbar-thumb, .attach-image::-webkit-scrollbar-thumb, .dropdown-extended ul::-webkit-scrollbar-thumb { +.postbody .content::-webkit-scrollbar-thumb, .topicreview::-webkit-scrollbar-thumb, .post_details::-webkit-scrollbar-thumb, .codebox code::-webkit-scrollbar-thumb, .attachbox dd::-webkit-scrollbar-thumb, .attach-image::-webkit-scrollbar-thumb, .dropdown-extended ul::-webkit-scrollbar-thumb { background: rgba(0, 0, 0, .3); border-radius: 3px; } diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css index 8a223f653f..0041417022 100644 --- a/phpBB/styles/prosilver/theme/cp.css +++ b/phpBB/styles/prosilver/theme/cp.css @@ -4,19 +4,19 @@ /* Main CP box ----------------------------------------*/ -#cp-menu { +.cp-menu { float:left; width: 19%; margin-top: 1em; margin-bottom: 5px; } -#cp-main { +.cp-main { float: left; width: 81%; } -#cp-main .content { +.cp-main .content { padding: 0; } @@ -59,7 +59,7 @@ ul.cplist { border-bottom: none; } -#cp-main .pm-message { +.cp-main .pm-message { border: 1px solid transparent; margin: 10px 0; width: auto; @@ -70,7 +70,7 @@ ul.cplist { padding-bottom: 5px; } -#cp-main .postbody h3, #cp-main .box2 h3 { +.cp-main .postbody h3, .cp-main .box2 h3 { margin-top: 0; } @@ -78,11 +78,11 @@ ul.cplist { font-size: 1.1em; } -#cp-main .buttons { +.cp-main .buttons { margin-left: 0; } -#cp-main ul.linklist { +.cp-main ul.linklist { margin: 0; } @@ -98,18 +98,18 @@ ul.cplist { /* CP tabs shared ----------------------------------------*/ -#tabs, #minitabs { +.tabs, .minitabs { line-height: normal; } -#tabs > ul, #minitabs > ul { +.tabs > ul, .minitabs > ul { list-style: none; margin: 0; padding: 0; position: relative; } -#tabs .tab, #minitabs .tab { +.tabs .tab, .minitabs .tab { display: block; float: left; font-size: 1em; @@ -117,7 +117,7 @@ ul.cplist { line-height: 1.4em; } -#tabs .tab > a, #minitabs .tab > a { +.tabs .tab > a, .minitabs .tab > a { display: block; padding: 5px 9px; position: relative; @@ -128,39 +128,39 @@ ul.cplist { /* CP tabbed menu ----------------------------------------*/ -#tabs { +.tabs { margin: 20px 0 0 7px; } -#tabs .tab > a { +.tabs .tab > a { border: 1px solid transparent; border-radius: 4px 4px 0 0; margin: 1px 1px 0 0; } -#tabs .activetab > a { +.tabs .activetab > a { margin-top: 0; padding-bottom: 7px; } /* Mini tabbed menu used in MCP ----------------------------------------*/ -#minitabs { +.minitabs { float: right; margin: 15px 7px 0 0; max-width: 50%; } -#minitabs .tab { +.minitabs .tab { float: right; } -#minitabs .tab > a { +.minitabs .tab > a { border-radius: 5px 5px 0 0; margin-left: 2px; } -#minitabs .tab > a:hover { +.minitabs .tab > a:hover { text-decoration: none; } @@ -190,44 +190,44 @@ ul.cplist { border-top: 0.375em double transparent; } -#tabs .dropdown, #minitabs .dropdown { +.tabs .dropdown, .minitabs .dropdown { top: 20px; margin-right: -2px; font-size: 1.1em; font-weight: normal; } -#minitabs .dropdown { +.minitabs .dropdown { margin-right: -4px; } -#tabs .dropdown-up .dropdown, #minitabs .dropdown-up .dropdown { +.tabs .dropdown-up .dropdown, .minitabs .dropdown-up .dropdown { bottom: 20px; top: auto; } -#tabs .dropdown li { +.tabs .dropdown li { text-align: right; } -#minitabs .dropdown li { +.minitabs .dropdown li { text-align: left; } /* UCP navigation menu ----------------------------------------*/ /* Container for sub-navigation list */ -#navigation { +.navigation { width: 100%; padding-top: 36px; } -#navigation ul { +.navigation ul { list-style: none; } /* Default list state */ -#navigation li { +.navigation li { display: inline; font-weight: bold; margin: 1px 0; @@ -235,20 +235,20 @@ ul.cplist { } /* Link styles for the sub-section links */ -#navigation a { +.navigation a { display: block; padding: 5px; margin: 1px 0; text-decoration: none; } -#navigation a:hover { +.navigation a:hover { text-decoration: none; } /* Preferences pane layout ----------------------------------------*/ -#cp-main h2 { +.cp-main h2 { border-bottom: none; padding: 0; margin-left: 10px; @@ -281,10 +281,6 @@ dl.mini dd { /* PM Styles ----------------------------------------*/ -#pm-menu { - line-height: 2.5em; -} - /* Defined rules list for PM options */ ol.def-rules { padding-left: 0; @@ -304,11 +300,14 @@ ol.def-rules li { padding: 0 3px; } +/* DEPRECATED 3.2.6 .pmlist li.pm_message_reported_colour, .pm_message_reported_colour { border-left-color: transparent; border-right-color: transparent; } +*/ +.pmlist li.pm_message_reported_colour, .pm_message_reported_colour, .pmlist li.pm_marked_colour, .pm_marked_colour, .pmlist li.pm_replied_colour, .pm_replied_colour, .pmlist li.pm_friend_colour, .pm_friend_colour, @@ -327,7 +326,7 @@ ol.def-rules li { } /* Avatar gallery */ -#gallery label { +.gallery label { position: relative; float: left; margin: 10px; @@ -341,35 +340,35 @@ ol.def-rules li { ----------------------------------------*/ @media only screen and (max-width: 900px), only screen and (max-device-width: 900px) { - .nojs #tabs a span, .nojs #minitabs a span { + .nojs .tabs a span, .nojs .minitabs a span { max-width: 40px; overflow: hidden; text-overflow: ellipsis; letter-spacing: -.5px; } - #cp-menu, #navigation, #cp-main { + .cp-menu, .navigation, .cp-main { float: none; width: auto; margin: 0; } - #navigation { + .navigation { padding: 0; margin: 0 auto; max-width: 320px; } - #navigation a { + .navigation a { background-image: none; } - #navigation li:first-child a { + .navigation li:first-child a { border-top-left-radius: 5px; border-top-right-radius: 5px; } - #navigation li:last-child a { + .navigation li:last-child a { border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; } diff --git a/phpBB/styles/prosilver/theme/en/stylesheet.css b/phpBB/styles/prosilver/theme/en/stylesheet.css index bf4bd31ffc..604b299488 100644 --- a/phpBB/styles/prosilver/theme/en/stylesheet.css +++ b/phpBB/styles/prosilver/theme/en/stylesheet.css @@ -1,8 +1,2 @@ /* Online image */ .online { background-image: url("./icon_user_online.gif"); } - -.imageset.icon_user_online { - background-image: url("./icon_user_online.gif"); - padding-left: 58px; - padding-top: 58px; -} diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css index 235c230ed4..5646a7d6c7 100644 --- a/phpBB/styles/prosilver/theme/forms.css +++ b/phpBB/styles/prosilver/theme/forms.css @@ -96,7 +96,7 @@ fieldset.fields1 div { } /* Set it back to 0px for the reCaptcha divs: PHPBB3-9587 */ -fieldset.fields1 #recaptcha_widget_div div, fieldset.fields1 .live-search div { +fieldset.fields1 .live-search div { margin-bottom: 0; } @@ -138,10 +138,16 @@ dd textarea { } /* Hover effects */ -#timezone { +.timezone { width: 95%; } +/* Browser-specific tweaks */ +button::-moz-focus-inner { + padding: 0; + border: 0 +} + /* Quick-login on index page */ fieldset.quick-login { margin-top: 5px; @@ -177,6 +183,24 @@ fieldset.display-options a { margin-top: 3px; } +.dropdown fieldset.display-options { + font-size: 1em; + margin: 0; + padding: 0; +} + +.dropdown fieldset.display-options label { + display: block; + margin: 4px; + padding: 0; + text-align: right; + white-space: nowrap; +} + +.dropdown fieldset.display-options select { + min-width: 120px; +} + /* Display actions for ucp and mcp pages */ fieldset.display-actions { text-align: right; @@ -214,28 +238,26 @@ fieldset.submit-buttons { fieldset.submit-buttons input { vertical-align: middle; - padding-top: 3px; - padding-bottom: 3px; } /* Posting page styles ----------------------------------------*/ /* Buttons used in the editor */ -#format-buttons { +.format-buttons { margin: 15px 0 2px 0; } -#format-buttons input, #format-buttons select { +.format-buttons input, .format-buttons select { vertical-align: middle; } /* Main message box */ -#message-box { +.message-box { width: 80%; } -#message-box textarea { +.message-box textarea { font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; width: 450px; height: 270px; @@ -245,20 +267,20 @@ fieldset.submit-buttons input { resize: vertical; outline: 3px dashed transparent; outline-offset: -4px; - -webkit-transition: all .5s ease; - -moz-transition: all .5s ease; - -ms-transition: all .5s ease; - -o-transition: all .5s ease; - transition: all .5s ease; + -webkit-transition: all .5s ease, height 1ms linear; + -moz-transition: all .5s ease, height 1ms linear; + -ms-transition: all .5s ease, height 1ms linear; + -o-transition: all .5s ease, height 1ms linear; + transition: all .5s ease, height 1ms linear; } /* Emoticons panel */ -#smiley-box { +.smiley-box { width: 18%; float: right; } -#smiley-box img { +.smiley-box img { margin: 3px; } @@ -316,6 +338,7 @@ a.button1, input.button1, input.button3, a.button2, input.button2 { padding-bottom: 1px; font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; background: transparent none repeat-x top left; + line-height: 1.5; } a.button1, input.button1 { @@ -342,18 +365,15 @@ a.button2, input.button2, input.button3 { } /* <a> button in the style of the form buttons */ -a.button1, a.button1:link, a.button1:visited, a.button1:active, a.button2, a.button2:link, a.button2:visited, a.button2:active { +a.button1, a.button2 { text-decoration: none; - padding: 2px 8px; - line-height: 250%; + padding: 0 3px; vertical-align: text-bottom; - background-position: 0 1px; } /* Hover states */ a.button1:hover, input.button1:hover, a.button2:hover, input.button2:hover, input.button3:hover { border: 1px solid transparent; - background-position: 0 100%; } input.disabled { @@ -382,26 +402,6 @@ input.button1:focus, input.button2:focus, input.button3:focus { box-sizing: border-box; } -.search-box button { - float: left; -} - -.search-box button.search-icon { - border-radius: 0; - font-size: 0; - height: 24px; - margin: 0; - padding: 3px 5px; -} - -.search-box a.button { - border-left-width: 0; - border-radius: 0 4px 4px 0; - font-size: 0; - margin: 0; - padding: 2px 5px 2px 3px; -} - /* Search box (header) --------------------------------------------- */ .search-header { @@ -414,16 +414,7 @@ input.button1:focus, input.button2:focus, input.button3:focus { .search-header .inputbox { border: 0; } -.search-header button { - border-top: 0; - border-bottom: 0; -} - -.search-header a.button { - border: 0; - border-left: 1px; - padding: 3px 5px 3px 4px; -} +.navbar .linklist > li.responsive-search { display: none; } input.search { background-image: none; diff --git a/phpBB/styles/prosilver/theme/icons.css b/phpBB/styles/prosilver/theme/icons.css new file mode 100644 index 0000000000..6643f12d06 --- /dev/null +++ b/phpBB/styles/prosilver/theme/icons.css @@ -0,0 +1,96 @@ +/* -------------------------------------------------------------- + $Icons +-------------------------------------------------------------- */ + +/* Global module setup +--------------------------------*/ + +/* Renamed version of .fa class for agnostic useage of icon fonts. + * Just change the name of the font after the 14/1 to the name of + * the font you wish to use. + */ +.icon, .button .icon, blockquote cite:before, .uncited:before { + display: inline-block; + font-weight: normal; + font-style: normal; + font-variant: normal; + font-family: FontAwesome; + font-size: 14px; + line-height: 1; + text-rendering: auto; /* optimizelegibility throws things off #1094 */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon:before { padding-right: 2px; } + +.button .icon:before { + padding-right: 0; +} + +/* Icon size classes - Default size is 14px, use these for small variations */ + +.icon.icon-xl { + font-size: 20px; +} + +.icon.icon-lg { + font-size: 16px; +} + +.icon.icon-md { + font-size: 10px; +} + +.icon.icon-sm { + font-size: 8px; +} + +/* icon modifiers */ +.icon-tiny { + width: 12px; + transform: scale(0.65, 0.75); + vertical-align: text-bottom; + font-size: 16px; +} + +.arrow-left .icon { + float: left; +} + +.arrow-left:hover .icon { + margin-left: -5px; + margin-right: 5px; +} + +.arrow-right .icon { + float: right; +} + +.arrow-right:hover .icon { + margin-left: 5px; + margin-right: -5px; +} + +.post-buttons .dropdown-contents .icon { + float: right; + margin-left: 5px; +} + +.alert_close .icon:before { + padding: 0; + border-radius: 50%; + width: 11px; + display: block; + line-height: .9; + height: 12px; +} + +blockquote cite:before, .uncited:before { + content: '\f10d'; /* Font Awesome quote-left */ +} + +.rtl blockquote cite:before, .rtl .uncited:before { + content: '\f10e'; /* Font Awesome quote-right */ +} + diff --git a/phpBB/styles/prosilver/theme/images/alert_close.png b/phpBB/styles/prosilver/theme/images/alert_close.png Binary files differdeleted file mode 100644 index 79750a013c..0000000000 --- a/phpBB/styles/prosilver/theme/images/alert_close.png +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/announce_read.gif b/phpBB/styles/prosilver/theme/images/announce_read.gif Binary files differindex 9457870e6f..a3b3d7b234 100644 --- a/phpBB/styles/prosilver/theme/images/announce_read.gif +++ b/phpBB/styles/prosilver/theme/images/announce_read.gif diff --git a/phpBB/styles/prosilver/theme/images/announce_read_locked.gif b/phpBB/styles/prosilver/theme/images/announce_read_locked.gif Binary files differindex 76ead8a02c..0a6cf64341 100644 --- a/phpBB/styles/prosilver/theme/images/announce_read_locked.gif +++ b/phpBB/styles/prosilver/theme/images/announce_read_locked.gif diff --git a/phpBB/styles/prosilver/theme/images/announce_read_locked_mine.gif b/phpBB/styles/prosilver/theme/images/announce_read_locked_mine.gif Binary files differindex 2105d21f10..56af0ab071 100644 --- a/phpBB/styles/prosilver/theme/images/announce_read_locked_mine.gif +++ b/phpBB/styles/prosilver/theme/images/announce_read_locked_mine.gif diff --git a/phpBB/styles/prosilver/theme/images/announce_read_mine.gif b/phpBB/styles/prosilver/theme/images/announce_read_mine.gif Binary files differindex 2c88cacca0..c333e3b124 100644 --- a/phpBB/styles/prosilver/theme/images/announce_read_mine.gif +++ b/phpBB/styles/prosilver/theme/images/announce_read_mine.gif diff --git a/phpBB/styles/prosilver/theme/images/announce_unread.gif b/phpBB/styles/prosilver/theme/images/announce_unread.gif Binary files differindex 33e10b2ccc..9f75cc3e53 100644 --- a/phpBB/styles/prosilver/theme/images/announce_unread.gif +++ b/phpBB/styles/prosilver/theme/images/announce_unread.gif diff --git a/phpBB/styles/prosilver/theme/images/announce_unread_locked.gif b/phpBB/styles/prosilver/theme/images/announce_unread_locked.gif Binary files differindex 76dcc6ca71..4ad85bb684 100644 --- a/phpBB/styles/prosilver/theme/images/announce_unread_locked.gif +++ b/phpBB/styles/prosilver/theme/images/announce_unread_locked.gif diff --git a/phpBB/styles/prosilver/theme/images/announce_unread_locked_mine.gif b/phpBB/styles/prosilver/theme/images/announce_unread_locked_mine.gif Binary files differindex 53782fc3dc..30db89439e 100644 --- a/phpBB/styles/prosilver/theme/images/announce_unread_locked_mine.gif +++ b/phpBB/styles/prosilver/theme/images/announce_unread_locked_mine.gif diff --git a/phpBB/styles/prosilver/theme/images/announce_unread_mine.gif b/phpBB/styles/prosilver/theme/images/announce_unread_mine.gif Binary files differindex bc07df0ce9..3a2cbcac10 100644 --- a/phpBB/styles/prosilver/theme/images/announce_unread_mine.gif +++ b/phpBB/styles/prosilver/theme/images/announce_unread_mine.gif diff --git a/phpBB/styles/prosilver/theme/images/arrow_down.gif b/phpBB/styles/prosilver/theme/images/arrow_down.gif Binary files differdeleted file mode 100644 index b7fbf7e276..0000000000 --- a/phpBB/styles/prosilver/theme/images/arrow_down.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/arrow_left.gif b/phpBB/styles/prosilver/theme/images/arrow_left.gif Binary files differdeleted file mode 100644 index ac92cb4971..0000000000 --- a/phpBB/styles/prosilver/theme/images/arrow_left.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/arrow_right.gif b/phpBB/styles/prosilver/theme/images/arrow_right.gif Binary files differdeleted file mode 100644 index 3a080ffdfe..0000000000 --- a/phpBB/styles/prosilver/theme/images/arrow_right.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/arrow_up.gif b/phpBB/styles/prosilver/theme/images/arrow_up.gif Binary files differdeleted file mode 100644 index 0ff5872182..0000000000 --- a/phpBB/styles/prosilver/theme/images/arrow_up.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/bg_button.gif b/phpBB/styles/prosilver/theme/images/bg_button.gif Binary files differdeleted file mode 100644 index 03172ff5c6..0000000000 --- a/phpBB/styles/prosilver/theme/images/bg_button.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/feed.gif b/phpBB/styles/prosilver/theme/images/feed.gif Binary files differdeleted file mode 100644 index ff19905874..0000000000 --- a/phpBB/styles/prosilver/theme/images/feed.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/forum_link.gif b/phpBB/styles/prosilver/theme/images/forum_link.gif Binary files differindex efeaf0a11f..09f8dfa75a 100644 --- a/phpBB/styles/prosilver/theme/images/forum_link.gif +++ b/phpBB/styles/prosilver/theme/images/forum_link.gif diff --git a/phpBB/styles/prosilver/theme/images/forum_read.gif b/phpBB/styles/prosilver/theme/images/forum_read.gif Binary files differindex 845618c1a2..891fa20c07 100644 --- a/phpBB/styles/prosilver/theme/images/forum_read.gif +++ b/phpBB/styles/prosilver/theme/images/forum_read.gif diff --git a/phpBB/styles/prosilver/theme/images/forum_read_locked.gif b/phpBB/styles/prosilver/theme/images/forum_read_locked.gif Binary files differindex 7afb092a8f..2348240638 100644 --- a/phpBB/styles/prosilver/theme/images/forum_read_locked.gif +++ b/phpBB/styles/prosilver/theme/images/forum_read_locked.gif diff --git a/phpBB/styles/prosilver/theme/images/forum_read_subforum.gif b/phpBB/styles/prosilver/theme/images/forum_read_subforum.gif Binary files differindex 7119486539..5b4d30f7ec 100644 --- a/phpBB/styles/prosilver/theme/images/forum_read_subforum.gif +++ b/phpBB/styles/prosilver/theme/images/forum_read_subforum.gif diff --git a/phpBB/styles/prosilver/theme/images/forum_unread.gif b/phpBB/styles/prosilver/theme/images/forum_unread.gif Binary files differindex 1a397cb216..e925da82bd 100644 --- a/phpBB/styles/prosilver/theme/images/forum_unread.gif +++ b/phpBB/styles/prosilver/theme/images/forum_unread.gif diff --git a/phpBB/styles/prosilver/theme/images/forum_unread_locked.gif b/phpBB/styles/prosilver/theme/images/forum_unread_locked.gif Binary files differindex 34f1d46ad7..5ff59b7421 100644 --- a/phpBB/styles/prosilver/theme/images/forum_unread_locked.gif +++ b/phpBB/styles/prosilver/theme/images/forum_unread_locked.gif diff --git a/phpBB/styles/prosilver/theme/images/forum_unread_subforum.gif b/phpBB/styles/prosilver/theme/images/forum_unread_subforum.gif Binary files differindex e955887020..7d6ddb93be 100644 --- a/phpBB/styles/prosilver/theme/images/forum_unread_subforum.gif +++ b/phpBB/styles/prosilver/theme/images/forum_unread_subforum.gif diff --git a/phpBB/styles/prosilver/theme/images/gradient.gif b/phpBB/styles/prosilver/theme/images/gradient.gif Binary files differdeleted file mode 100644 index 21dc11f13b..0000000000 --- a/phpBB/styles/prosilver/theme/images/gradient.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_acp.gif b/phpBB/styles/prosilver/theme/images/icon_acp.gif Binary files differdeleted file mode 100644 index 3afa98ee8f..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_acp.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_back_top.gif b/phpBB/styles/prosilver/theme/images/icon_back_top.gif Binary files differdeleted file mode 100644 index 4d2b8f3822..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_back_top.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_bookmark.gif b/phpBB/styles/prosilver/theme/images/icon_bookmark.gif Binary files differdeleted file mode 100644 index 2644293f7d..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_bookmark.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_bump.gif b/phpBB/styles/prosilver/theme/images/icon_bump.gif Binary files differdeleted file mode 100644 index 014cd9bd15..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_bump.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_contact.png b/phpBB/styles/prosilver/theme/images/icon_contact.png Binary files differdeleted file mode 100644 index 04e4d9ad17..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_contact.png +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_delete_cookies.gif b/phpBB/styles/prosilver/theme/images/icon_delete_cookies.gif Binary files differdeleted file mode 100644 index f7665ebff8..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_delete_cookies.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_faq.gif b/phpBB/styles/prosilver/theme/images/icon_faq.gif Binary files differdeleted file mode 100644 index 4e26460629..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_faq.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_home.gif b/phpBB/styles/prosilver/theme/images/icon_home.gif Binary files differdeleted file mode 100644 index 8ae9004534..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_home.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_logout.gif b/phpBB/styles/prosilver/theme/images/icon_logout.gif Binary files differdeleted file mode 100644 index b8ad5c4e5c..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_logout.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_mark.gif b/phpBB/styles/prosilver/theme/images/icon_mark.gif Binary files differdeleted file mode 100644 index 1a33fc3264..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_mark.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_mcp.gif b/phpBB/styles/prosilver/theme/images/icon_mcp.gif Binary files differdeleted file mode 100644 index 80de2e53f7..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_mcp.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_members.gif b/phpBB/styles/prosilver/theme/images/icon_members.gif Binary files differdeleted file mode 100644 index 48e3e5f5f3..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_members.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_notification.gif b/phpBB/styles/prosilver/theme/images/icon_notification.gif Binary files differdeleted file mode 100644 index 11092f4dce..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_notification.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_pages.gif b/phpBB/styles/prosilver/theme/images/icon_pages.gif Binary files differdeleted file mode 100644 index 20b2fe9f81..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_pages.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_pm.gif b/phpBB/styles/prosilver/theme/images/icon_pm.gif Binary files differdeleted file mode 100644 index 103421a26f..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_pm.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_post_target.gif b/phpBB/styles/prosilver/theme/images/icon_post_target.gif Binary files differdeleted file mode 100644 index a2bc2a2c47..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_post_target.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_post_target_unread.gif b/phpBB/styles/prosilver/theme/images/icon_post_target_unread.gif Binary files differdeleted file mode 100644 index 65d47bb900..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_post_target_unread.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_print.gif b/phpBB/styles/prosilver/theme/images/icon_print.gif Binary files differdeleted file mode 100644 index e464e304ea..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_print.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_profile.gif b/phpBB/styles/prosilver/theme/images/icon_profile.gif Binary files differdeleted file mode 100644 index a0ec098460..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_profile.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_register.gif b/phpBB/styles/prosilver/theme/images/icon_register.gif Binary files differdeleted file mode 100644 index 9ecf126c4f..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_register.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_search.gif b/phpBB/styles/prosilver/theme/images/icon_search.gif Binary files differdeleted file mode 100644 index 8492cd308c..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_search.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_sendemail.gif b/phpBB/styles/prosilver/theme/images/icon_sendemail.gif Binary files differdeleted file mode 100644 index 92a39c8af9..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_sendemail.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_subscribe.gif b/phpBB/styles/prosilver/theme/images/icon_subscribe.gif Binary files differdeleted file mode 100644 index 5ca18af80a..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_subscribe.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_team.gif b/phpBB/styles/prosilver/theme/images/icon_team.gif Binary files differdeleted file mode 100644 index 613158257b..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_team.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_textbox_search.gif b/phpBB/styles/prosilver/theme/images/icon_textbox_search.gif Binary files differdeleted file mode 100644 index b3b51d8425..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_textbox_search.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_topic_attach.gif b/phpBB/styles/prosilver/theme/images/icon_topic_attach.gif Binary files differdeleted file mode 100644 index 70203124fe..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_topic_attach.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_topic_deleted.png b/phpBB/styles/prosilver/theme/images/icon_topic_deleted.png Binary files differdeleted file mode 100644 index 494b4fb563..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_topic_deleted.png +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_topic_latest.gif b/phpBB/styles/prosilver/theme/images/icon_topic_latest.gif Binary files differdeleted file mode 100644 index 815b26927a..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_topic_latest.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_topic_newest.gif b/phpBB/styles/prosilver/theme/images/icon_topic_newest.gif Binary files differdeleted file mode 100644 index fd6652d957..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_topic_newest.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_topic_poll.gif b/phpBB/styles/prosilver/theme/images/icon_topic_poll.gif Binary files differdeleted file mode 100644 index 1c80ec87c1..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_topic_poll.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_topic_reported.gif b/phpBB/styles/prosilver/theme/images/icon_topic_reported.gif Binary files differdeleted file mode 100644 index 006b1e2291..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_topic_reported.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_topic_unapproved.gif b/phpBB/styles/prosilver/theme/images/icon_topic_unapproved.gif Binary files differdeleted file mode 100644 index 09d8f387a7..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_topic_unapproved.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_ucp.gif b/phpBB/styles/prosilver/theme/images/icon_ucp.gif Binary files differdeleted file mode 100644 index 2a5fcc3f0c..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_ucp.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icon_unsubscribe.gif b/phpBB/styles/prosilver/theme/images/icon_unsubscribe.gif Binary files differdeleted file mode 100644 index 27013fc1cb..0000000000 --- a/phpBB/styles/prosilver/theme/images/icon_unsubscribe.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icons_button.png b/phpBB/styles/prosilver/theme/images/icons_button.png Binary files differdeleted file mode 100644 index 50ac8994de..0000000000 --- a/phpBB/styles/prosilver/theme/images/icons_button.png +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/icons_pagination.png b/phpBB/styles/prosilver/theme/images/icons_pagination.png Binary files differdeleted file mode 100644 index 872b7308c2..0000000000 --- a/phpBB/styles/prosilver/theme/images/icons_pagination.png +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/sticky_read.gif b/phpBB/styles/prosilver/theme/images/sticky_read.gif Binary files differindex e1af585da5..e8142ddb20 100644 --- a/phpBB/styles/prosilver/theme/images/sticky_read.gif +++ b/phpBB/styles/prosilver/theme/images/sticky_read.gif diff --git a/phpBB/styles/prosilver/theme/images/sticky_read_locked.gif b/phpBB/styles/prosilver/theme/images/sticky_read_locked.gif Binary files differindex 79f581be79..fcd8b85e0b 100644 --- a/phpBB/styles/prosilver/theme/images/sticky_read_locked.gif +++ b/phpBB/styles/prosilver/theme/images/sticky_read_locked.gif diff --git a/phpBB/styles/prosilver/theme/images/sticky_read_locked_mine.gif b/phpBB/styles/prosilver/theme/images/sticky_read_locked_mine.gif Binary files differindex ad056086e5..0a8dc2a6c1 100644 --- a/phpBB/styles/prosilver/theme/images/sticky_read_locked_mine.gif +++ b/phpBB/styles/prosilver/theme/images/sticky_read_locked_mine.gif diff --git a/phpBB/styles/prosilver/theme/images/sticky_read_mine.gif b/phpBB/styles/prosilver/theme/images/sticky_read_mine.gif Binary files differindex 8f5f28fe5e..37c4ed01f6 100644 --- a/phpBB/styles/prosilver/theme/images/sticky_read_mine.gif +++ b/phpBB/styles/prosilver/theme/images/sticky_read_mine.gif diff --git a/phpBB/styles/prosilver/theme/images/sticky_unread.gif b/phpBB/styles/prosilver/theme/images/sticky_unread.gif Binary files differindex d62b3c0f3a..88a212d7c0 100644 --- a/phpBB/styles/prosilver/theme/images/sticky_unread.gif +++ b/phpBB/styles/prosilver/theme/images/sticky_unread.gif diff --git a/phpBB/styles/prosilver/theme/images/sticky_unread_locked.gif b/phpBB/styles/prosilver/theme/images/sticky_unread_locked.gif Binary files differindex 5792b8649a..0241da2ab5 100644 --- a/phpBB/styles/prosilver/theme/images/sticky_unread_locked.gif +++ b/phpBB/styles/prosilver/theme/images/sticky_unread_locked.gif diff --git a/phpBB/styles/prosilver/theme/images/sticky_unread_locked_mine.gif b/phpBB/styles/prosilver/theme/images/sticky_unread_locked_mine.gif Binary files differindex 93495770c8..8d69b447b2 100644 --- a/phpBB/styles/prosilver/theme/images/sticky_unread_locked_mine.gif +++ b/phpBB/styles/prosilver/theme/images/sticky_unread_locked_mine.gif diff --git a/phpBB/styles/prosilver/theme/images/sticky_unread_mine.gif b/phpBB/styles/prosilver/theme/images/sticky_unread_mine.gif Binary files differindex e201a9f31f..6529102053 100644 --- a/phpBB/styles/prosilver/theme/images/sticky_unread_mine.gif +++ b/phpBB/styles/prosilver/theme/images/sticky_unread_mine.gif diff --git a/phpBB/styles/prosilver/theme/images/subforum_read.gif b/phpBB/styles/prosilver/theme/images/subforum_read.gif Binary files differdeleted file mode 100644 index 595595c296..0000000000 --- a/phpBB/styles/prosilver/theme/images/subforum_read.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/subforum_unread.gif b/phpBB/styles/prosilver/theme/images/subforum_unread.gif Binary files differdeleted file mode 100644 index b2b661dc78..0000000000 --- a/phpBB/styles/prosilver/theme/images/subforum_unread.gif +++ /dev/null diff --git a/phpBB/styles/prosilver/theme/images/topic_moved.gif b/phpBB/styles/prosilver/theme/images/topic_moved.gif Binary files differindex 3dafa46ed7..8e9c1f41f6 100644 --- a/phpBB/styles/prosilver/theme/images/topic_moved.gif +++ b/phpBB/styles/prosilver/theme/images/topic_moved.gif diff --git a/phpBB/styles/prosilver/theme/images/topic_read.gif b/phpBB/styles/prosilver/theme/images/topic_read.gif Binary files differindex 640d5396f8..5ed739ee9b 100644 --- a/phpBB/styles/prosilver/theme/images/topic_read.gif +++ b/phpBB/styles/prosilver/theme/images/topic_read.gif diff --git a/phpBB/styles/prosilver/theme/images/topic_read_hot.gif b/phpBB/styles/prosilver/theme/images/topic_read_hot.gif Binary files differindex dcb6f3bd60..81a42d0a67 100644 --- a/phpBB/styles/prosilver/theme/images/topic_read_hot.gif +++ b/phpBB/styles/prosilver/theme/images/topic_read_hot.gif diff --git a/phpBB/styles/prosilver/theme/images/topic_read_hot_mine.gif b/phpBB/styles/prosilver/theme/images/topic_read_hot_mine.gif Binary files differindex 1e5498a9be..b98808cadf 100644 --- a/phpBB/styles/prosilver/theme/images/topic_read_hot_mine.gif +++ b/phpBB/styles/prosilver/theme/images/topic_read_hot_mine.gif diff --git a/phpBB/styles/prosilver/theme/images/topic_read_locked.gif b/phpBB/styles/prosilver/theme/images/topic_read_locked.gif Binary files differindex a47affb2f2..61bb1effa2 100644 --- a/phpBB/styles/prosilver/theme/images/topic_read_locked.gif +++ b/phpBB/styles/prosilver/theme/images/topic_read_locked.gif diff --git a/phpBB/styles/prosilver/theme/images/topic_read_locked_mine.gif b/phpBB/styles/prosilver/theme/images/topic_read_locked_mine.gif Binary files differindex d6142f0ea7..dbe901919a 100644 --- a/phpBB/styles/prosilver/theme/images/topic_read_locked_mine.gif +++ b/phpBB/styles/prosilver/theme/images/topic_read_locked_mine.gif diff --git a/phpBB/styles/prosilver/theme/images/topic_read_mine.gif b/phpBB/styles/prosilver/theme/images/topic_read_mine.gif Binary files differindex 18a1245b93..8fb165c46c 100644 --- a/phpBB/styles/prosilver/theme/images/topic_read_mine.gif +++ b/phpBB/styles/prosilver/theme/images/topic_read_mine.gif diff --git a/phpBB/styles/prosilver/theme/images/topic_unread.gif b/phpBB/styles/prosilver/theme/images/topic_unread.gif Binary files differindex 3fa920b6fc..43ea76b4de 100644 --- a/phpBB/styles/prosilver/theme/images/topic_unread.gif +++ b/phpBB/styles/prosilver/theme/images/topic_unread.gif diff --git a/phpBB/styles/prosilver/theme/images/topic_unread_hot.gif b/phpBB/styles/prosilver/theme/images/topic_unread_hot.gif Binary files differindex e712f6e827..a45bc4bc19 100644 --- a/phpBB/styles/prosilver/theme/images/topic_unread_hot.gif +++ b/phpBB/styles/prosilver/theme/images/topic_unread_hot.gif diff --git a/phpBB/styles/prosilver/theme/images/topic_unread_hot_mine.gif b/phpBB/styles/prosilver/theme/images/topic_unread_hot_mine.gif Binary files differindex fa8b167c64..dc673266be 100644 --- a/phpBB/styles/prosilver/theme/images/topic_unread_hot_mine.gif +++ b/phpBB/styles/prosilver/theme/images/topic_unread_hot_mine.gif diff --git a/phpBB/styles/prosilver/theme/images/topic_unread_locked.gif b/phpBB/styles/prosilver/theme/images/topic_unread_locked.gif Binary files differindex 0a9768ba7d..68dd3422d7 100644 --- a/phpBB/styles/prosilver/theme/images/topic_unread_locked.gif +++ b/phpBB/styles/prosilver/theme/images/topic_unread_locked.gif diff --git a/phpBB/styles/prosilver/theme/images/topic_unread_locked_mine.gif b/phpBB/styles/prosilver/theme/images/topic_unread_locked_mine.gif Binary files differindex 916b60517e..4f5a36efe9 100644 --- a/phpBB/styles/prosilver/theme/images/topic_unread_locked_mine.gif +++ b/phpBB/styles/prosilver/theme/images/topic_unread_locked_mine.gif diff --git a/phpBB/styles/prosilver/theme/images/topic_unread_mine.gif b/phpBB/styles/prosilver/theme/images/topic_unread_mine.gif Binary files differindex 4ca8492e74..24e9817ce1 100644 --- a/phpBB/styles/prosilver/theme/images/topic_unread_mine.gif +++ b/phpBB/styles/prosilver/theme/images/topic_unread_mine.gif diff --git a/phpBB/styles/prosilver/theme/imageset.css b/phpBB/styles/prosilver/theme/imageset.css deleted file mode 100644 index 5cd91348be..0000000000 --- a/phpBB/styles/prosilver/theme/imageset.css +++ /dev/null @@ -1,376 +0,0 @@ -/* Former imageset */ -span.imageset { - display: inline-block !important; - background: transparent none 0 0 no-repeat; - margin: 0; - padding: 0; - width: 0; - height: 0; - overflow: hidden; -} - -/* Global imageset items */ -.imageset.site_logo { - background-image: url("./images/site_logo.gif"); - padding-left: 149px; - padding-top: 52px; -} -.imageset.forum_link { - background-image: url("./images/forum_link.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.forum_read { - background-image: url("./images/forum_read.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.forum_read_locked { - background-image: url("./images/forum_read_locked.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.forum_read_subforum { - background-image: url("./images/forum_read_subforum.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.forum_unread { - background-image: url("./images/forum_unread.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.forum_unread_locked { - background-image: url("./images/forum_unread_locked.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.forum_unread_subforum { - background-image: url("./images/forum_unread_subforum.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.topic_moved { - background-image: url("./images/topic_moved.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.topic_read { - background-image: url("./images/topic_read.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.topic_read_mine { - background-image: url("./images/topic_read_mine.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.topic_read_hot { - background-image: url("./images/topic_read_hot.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.topic_read_hot_mine { - background-image: url("./images/topic_read_hot_mine.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.topic_read_locked { - background-image: url("./images/topic_read_locked.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.topic_read_locked_mine { - background-image: url("./images/topic_read_locked_mine.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.topic_unread { - background-image: url("./images/topic_unread.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.topic_unread_mine { - background-image: url("./images/topic_unread_mine.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.topic_unread_hot { - background-image: url("./images/topic_unread_hot.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.topic_unread_hot_mine { - background-image: url("./images/topic_unread_hot_mine.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.topic_unread_locked { - background-image: url("./images/topic_unread_locked.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.topic_unread_locked_mine { - background-image: url("./images/topic_unread_locked_mine.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.sticky_read { - background-image: url("./images/sticky_read.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.sticky_read_mine { - background-image: url("./images/sticky_read_mine.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.sticky_read_locked { - background-image: url("./images/sticky_read_locked.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.sticky_read_locked_mine { - background-image: url("./images/sticky_read_locked_mine.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.sticky_unread { - background-image: url("./images/sticky_unread.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.sticky_unread_mine { - background-image: url("./images/sticky_unread_mine.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.sticky_unread_locked { - background-image: url("./images/sticky_unread_locked.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.sticky_unread_locked_mine { - background-image: url("./images/sticky_unread_locked_mine.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.announce_read { - background-image: url("./images/announce_read.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.announce_read_mine { - background-image: url("./images/announce_read_mine.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.announce_read_locked { - background-image: url("./images/announce_read_locked.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.announce_read_locked_mine { - background-image: url("./images/announce_read_locked_mine.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.announce_unread { - background-image: url("./images/announce_unread.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.announce_unread_mine { - background-image: url("./images/announce_unread_mine.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.announce_unread_locked { - background-image: url("./images/announce_unread_locked.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.announce_unread_locked_mine { - background-image: url("./images/announce_unread_locked_mine.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.global_read { - background-image: url("./images/announce_read.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.global_read_mine { - background-image: url("./images/announce_read_mine.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.global_read_locked { - background-image: url("./images/announce_read_locked.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.global_read_locked_mine { - background-image: url("./images/announce_read_locked_mine.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.global_unread { - background-image: url("./images/announce_unread.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.global_unread_mine { - background-image: url("./images/announce_unread_mine.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.global_unread_locked { - background-image: url("./images/announce_unread_locked.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.global_unread_locked_mine { - background-image: url("./images/announce_unread_locked_mine.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.subforum_read { - background-image: url("./images/subforum_read.gif"); - padding-left: 11px; - padding-top: 9px; -} -.imageset.subforum_unread { - background-image: url("./images/subforum_unread.gif"); - padding-left: 11px; - padding-top: 9px; -} -.imageset.pm_read { - background-image: url("./images/topic_read.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.pm_unread { - background-image: url("./images/topic_unread.gif"); - padding-left: 27px; - padding-top: 27px; -} -.imageset.icon_back_top { - background-image: url("./images/icon_back_top.gif"); - padding-left: 11px; - padding-top: 11px; -} -.imageset.phpbb_aol-icon, .imageset.icon_contact_aim { - background-image: url("./images/icon_contact_aim.gif"); - padding-left: 20px; - padding-top: 20px; -} -.imageset.icon_contact_email { - background-image: url("./images/icon_contact_email.gif"); - padding-left: 20px; - padding-top: 20px; -} -.imageset.icon_contact_icq, .imageset.phpbb_icq-icon { - background-image: url("./images/icon_contact_icq.gif"); - padding-left: 20px; - padding-top: 20px; -} -.imageset.icon_contact_jabber { - background-image: url("./images/icon_contact_jabber.gif"); - padding-left: 20px; - padding-top: 20px; -} -.imageset.phpbb_wlm-icon, .imageset.icon_contact_msnm { - background-image: url("./images/icon_contact_msnm.gif"); - padding-left: 20px; - padding-top: 20px; -} -.imageset.icon_contact_www, .imageset.phpbb_website-icon { - background-image: url("./images/icon_contact_www.gif"); - padding-left: 20px; - padding-top: 20px; -} -.imageset.icon_contact_yahoo, .imageset.phpbb_yahoo-icon { - background-image: url("./images/icon_contact_yahoo.gif"); - padding-left: 20px; - padding-top: 20px; -} -.imageset.icon_post_delete { - background-image: url("./images/icon_post_delete.gif"); - padding-left: 20px; - padding-top: 20px; -} -.imageset.icon_post_info { - background-image: url("./images/icon_post_info.gif"); - padding-left: 20px; - padding-top: 20px; -} -.imageset.icon_post_report { - background-image: url("./images/icon_post_report.gif"); - padding-left: 20px; - padding-top: 20px; -} -.imageset.icon_post_target { - background-image: url("./images/icon_post_target.gif"); - padding-left: 11px; - padding-top: 9px; -} -.imageset.icon_post_target_unread { - background-image: url("./images/icon_post_target_unread.gif"); - padding-left: 11px; - padding-top: 9px; -} -.imageset.icon_topic_attach { - background-image: url("./images/icon_topic_attach.gif"); - padding-left: 7px; - padding-top: 10px; -} -.imageset.icon_topic_latest { - background-image: url("./images/icon_topic_latest.gif"); - padding-left: 11px; - padding-top: 9px; -} -.imageset.icon_topic_newest { - background-image: url("./images/icon_topic_newest.gif"); - padding-left: 11px; - padding-top: 9px; -} -.imageset.icon_topic_reported { - background-image: url("./images/icon_topic_reported.gif"); - padding-left: 16px; - padding-top: 14px; -} -.imageset.icon_topic_deleted { - background-image: url("./images/icon_topic_deleted.png"); - padding-left: 16px; - padding-top: 14px; -} -.imageset.icon_topic_unapproved { - background-image: url("./images/icon_topic_unapproved.gif"); - padding-left: 16px; - padding-top: 14px; -} -.imageset.icon_topic_poll { - background-image: url("./images/icon_topic_poll.gif"); - padding-left: 11px; - padding-top: 10px; -} -.imageset.icon_user_warn { - background-image: url("./images/icon_user_warn.gif"); - padding-left: 20px; - padding-top: 20px; -} - -.imageset.icon_contact { - background-image: url("./images/icon_contact.png"); - padding-left: 16px; - padding-top: 12px; -} - - -/* English images for fallback */ -.imageset.icon_user_online { - background-image: url("./en/icon_user_online.gif"); - padding-left: 58px; - padding-top: 58px; -} diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css index a2f512443c..6a61e9a262 100644 --- a/phpBB/styles/prosilver/theme/links.css +++ b/phpBB/styles/prosilver/theme/links.css @@ -6,9 +6,11 @@ a { direction: ltr; unicode-bidi: embed; text-decoration: none; -} + /* we use links inline more often then not so to address several bugs with + IE and some other browsers we render all links as inlineblock by default */ + display: inline-block; -a:hover { text-decoration: underline; } +} /* Coloured usernames */ .username-coloured { @@ -26,12 +28,6 @@ a:hover { text-decoration: underline; } text-decoration: underline; } -/* Navigation bar links */ -li.breadcrumbs span:first-child > a { - display: inline-block; - padding-left: 17px; -} - /* Notification mark read link */ .dropdown-extended a.mark_read { background-position: center center; @@ -43,8 +39,6 @@ li.breadcrumbs span:first-child > a { z-index: 2; right: 0; top: 50%; - width: 30px; - height: 40px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; @@ -55,9 +49,13 @@ li.breadcrumbs span:first-child > a { } .dropdown-extended a.mark_read:hover { - width: 40px; + width: 50px; } +.jumpbox-cat-link, +.jumpbox-forum-link { font-weight: bold; } + + /* Links for forum/topic lists */ a.forumtitle { font-family: "Trebuchet MS", Helvetica, Arial, Sans-serif; @@ -75,6 +73,7 @@ a.topictitle { font-size: 1.2em; font-weight: bold; text-decoration: none; + display: inline; } a.topictitle:hover { @@ -90,6 +89,17 @@ a.lastsubject:hover { text-decoration: underline; } +.row-item a:hover { + text-decoration: none +} + +.row-item .topictitle:hover, +.row-item .subforum:hover, +.row-item .username:hover, +.row-item .username-coloured:hover { + text-decoration: underline; +} + /* Post body links */ .postlink { text-decoration: none; @@ -126,72 +136,49 @@ a.lastsubject:hover { text-decoration: underline; } +.top { + font-size: 12px; + text-decoration: none; + margin-top: 10px; +} + /* Back to top of page */ .back2top { clear: both; - height: 11px; - text-align: right; } -a.top { - background: none no-repeat top left; - text-decoration: none; - width: 11px; - height: 11px; - display: block; +.back2top .top { float: right; - overflow: hidden; - letter-spacing: 1000px; - text-indent: 11px; -} - -a.top2 { - background: none no-repeat 0 50%; - text-decoration: none; - padding-left: 15px; + margin-right: -10px; + margin-top: 0; } /* Arrow links */ -a.arrow-up { background: none no-repeat left center; } -a.arrow-down { background: none no-repeat right center; } -a.arrow-left { background: none no-repeat 3px 60%; } -a.arrow-right { background: none no-repeat 95% 60%; } -a.arrow-up { +.arrow-up { padding-left: 10px; text-decoration: none; border-bottom-width: 0; } -a.arrow-up:hover { - background-position: left top; +.arrow-up:hover { + } -a.arrow-down { +.arrow-down { padding-right: 10px; } -a.arrow-down:hover { - background-position: right bottom; - text-decoration: none; -} +.arrow-down:hover { -a.arrow-left { - padding-left: 12px; } -a.arrow-left:hover { +.arrow-left:hover { text-decoration: none; - background-position: 0 60%; -} - -a.arrow-right { - padding-right: 12px; } -a.arrow-right:hover { +.arrow-right:hover { text-decoration: none; - background-position: 100% 60%; } /* invisible skip link, used for accessibility */ diff --git a/phpBB/styles/prosilver/theme/normalize.css b/phpBB/styles/prosilver/theme/normalize.css new file mode 100644 index 0000000000..23d84492c8 --- /dev/null +++ b/phpBB/styles/prosilver/theme/normalize.css @@ -0,0 +1,424 @@ +/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ + +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS and IE text size adjust after device orientation change, + * without disabling user zoom. + */ + +html { + font-family: sans-serif; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/** + * Remove default margin. + */ + +body { + margin: 0; +} + +/* HTML5 display definitions + ========================================================================== */ + +/** + * Correct `block` display not defined for any HTML5 element in IE 8/9. + * Correct `block` display not defined for `details` or `summary` in IE 10/11 + * and Firefox. + * Correct `block` display not defined for `main` in IE 11. + */ + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +menu, +nav, +section, +summary { + display: block; +} + +/** + * 1. Correct `inline-block` display not defined in IE 8/9. + * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. + */ + +audio, +canvas, +progress, +video { + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ +} + +/** + * Prevent modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Address `[hidden]` styling not present in IE 8/9/10. + * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22. + */ + +[hidden], +template { + display: none; +} + +/* Links + ========================================================================== */ + +/** + * Remove the gray background color from active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * Improve readability of focused elements when they are also in an + * active/hover state. + */ + +a:active, +a:hover { + outline: 0; +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Address styling not present in IE 8/9/10/11, Safari, and Chrome. + */ + +abbr[title] { + border-bottom: 1px dotted; +} + +/** + * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. + */ + +b, +strong { + font-weight: bold; +} + +/** + * Address styling not present in Safari and Chrome. + */ + +dfn { + font-style: italic; +} + +/** + * Address variable `h1` font-size and margin within `section` and `article` + * contexts in Firefox 4+, Safari, and Chrome. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/** + * Address styling not present in IE 8/9. + */ + +mark { + background: #ff0; + color: #000; +} + +/** + * Address inconsistent and variable font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove border when inside `a` element in IE 8/9/10. + */ + +img { + border: 0; +} + +/** + * Correct overflow not hidden in IE 9/10/11. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* Grouping content + ========================================================================== */ + +/** + * Address margin not present in IE 8/9 and Safari. + */ + +figure { + margin: 1em 40px; +} + +/** + * Address differences between Firefox and other browsers. + */ + +hr { + box-sizing: content-box; + height: 0; +} + +/** + * Contain overflow in all browsers. + */ + +pre { + overflow: auto; +} + +/** + * Address odd `em`-unit font size rendering in all browsers. + */ + +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; +} + +/* Forms + ========================================================================== */ + +/** + * Known limitation: by default, Chrome and Safari on OS X allow very limited + * styling of `select`, unless a `border` property is set. + */ + +/** + * 1. Correct color not being inherited. + * Known issue: affects color of disabled elements. + * 2. Correct font properties not being inherited. + * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. + */ + +button, +input, +optgroup, +select, +textarea { + color: inherit; /* 1 */ + font: inherit; /* 2 */ + margin: 0; /* 3 */ +} + +/** + * Address `overflow` set to `hidden` in IE 8/9/10/11. + */ + +button { + overflow: visible; +} + +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. + * Correct `select` style inheritance in Firefox. + */ + +button, +select { + text-transform: none; +} + +/** + * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` + * and `video` controls. + * 2. Correct inability to style clickable `input` types in iOS. + * 3. Improve usability and consistency of cursor style between image-type + * `input` and others. + */ + +button, +html input[type="button"], /* 1 */ +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; /* 2 */ + cursor: pointer; /* 3 */ +} + +/** + * Re-set default cursor for disabled elements. + */ + +button[disabled], +html input[disabled] { + cursor: default; +} + +/** + * Remove inner padding and border in Firefox 4+. + */ + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +/** + * Address Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ + +input { + line-height: normal; +} + +/** + * It's recommended that you don't attempt to style these elements. + * Firefox's implementation doesn't respect box-sizing, padding, or width. + * + * 1. Address box sizing set to `content-box` in IE 8/9/10. + * 2. Remove excess padding in IE 8/9/10. + */ + +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Fix the cursor style for Chrome's increment/decrement buttons. For certain + * `font-size` values of the `input`, it causes the cursor style of the + * decrement button to change from `default` to `text`. + */ + +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Address `appearance` set to `searchfield` in Safari and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari and Chrome. + */ + +input[type="search"] { + -webkit-appearance: textfield; /* 1 */ + box-sizing: content-box; /* 2 */ +} + +/** + * Remove inner padding and search cancel button in Safari and Chrome on OS X. + * Safari (but not Chrome) clips the cancel button when the search input has + * padding (and `textfield` appearance). + */ + +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * Define consistent border, margin, and padding. + */ + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/** + * 1. Correct `color` not being inherited in IE 8/9/10/11. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + */ + +legend { + border: 0; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Remove default vertical scrollbar in IE 8/9/10/11. + */ + +textarea { + overflow: auto; +} + +/** + * Don't inherit the `font-weight` (applied by a rule above). + * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. + */ + +optgroup { + font-weight: bold; +} + +/* Tables + ========================================================================== */ + +/** + * Remove most spacing between table cells. + */ + +table { + border-collapse: collapse; + border-spacing: 0; +} + +td, +th { + padding: 0; +} diff --git a/phpBB/styles/prosilver/theme/plupload.css b/phpBB/styles/prosilver/theme/plupload.css index b17cca5f25..b1f3ae2da8 100644 --- a/phpBB/styles/prosilver/theme/plupload.css +++ b/phpBB/styles/prosilver/theme/plupload.css @@ -1,9 +1,13 @@ -#attach-panel-multi { +.attach-panel-multi { display: none; margin-bottom: 1em; } -#file-list td { +.attach-row-tpl { + display: none; +} + +.file-list td { vertical-align: middle; } @@ -37,11 +41,11 @@ float: right; } -#attach-row-tpl, .nojs .file-inline-bbcode { +.nojs .file-inline-bbcode { display: none; } -#file-total-progress { +.file-total-progress { height: 2px; display: block; position: relative; @@ -55,7 +59,7 @@ width: 50px; } -.file-progress-bar, #file-total-progress-bar { +.file-progress-bar, .file-total-progress-bar { background-color: green; display: block; height: 100%; diff --git a/phpBB/styles/prosilver/theme/print.css b/phpBB/styles/prosilver/theme/print.css index 34129c92e8..9445279773 100644 --- a/phpBB/styles/prosilver/theme/print.css +++ b/phpBB/styles/prosilver/theme/print.css @@ -19,14 +19,14 @@ a:link { color: #000000; text-decoration: none; } a:visited { color: #000000; text-decoration: none; } a:active { color: #000000; text-decoration: none; } -img, .noprint, #sub-header, #sub-footer, .navbar, .box1, .divider, .signature { display: none; } +img, .noprint, .navbar, .box1, .divider, .signature { display: none; } /* Display smilies (Bug #47265) */ .content img { display: inline; } /* Container for the main body */ -#wrap { +.wrap { margin: 0 2em; } @@ -133,7 +133,18 @@ ol, ul { /* Misc page elements */ div.spacer { clear: both; } +code { display: block; } + /* Accessibility tweaks: Mozilla.org */ .skip_link { display: none; } .codebox p { display: none; } + +/* stylelint-disable declaration-property-unit-whitelist */ +.emoji { + min-height: 18px; + min-width: 18px; + height: 1em; + width: 1em; +} +/* stylelint-enable declaration-property-unit-whitelist */ diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index 8653042a69..ca4054c27f 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -1,167 +1,110 @@ /* Responsive Design ---------------------------------------- */ -.responsive-hide { display: none !important; } -.responsive-show { display: block !important; } -.responsive-show-inline { display: inline !important; } -.responsive-show-inline-block { display: inline-block !important; } - -/* Content wrappers -----------------------------------------*/ -html { - height: auto; -} - -body { - padding: 0; -} - -#wrap { - border: none; - border-radius: 0; - margin: 0; - min-width: 290px; - padding: 0 5px; +@media (max-width: 320px) { + select, .inputbox { + max-width: 240px; + } } -/* Common block wrappers +/* Notifications list ----------------------------------------*/ -.headerbar, .navbar, .forabg, .forumbg, .post, .panel { - border-radius: 0; - margin-left: -5px; - margin-right: -5px; +@media (max-width: 350px) { + .dropdown-extended .dropdown-contents { + width: auto; + } } -#cp-main .forabg, #cp-main .forumdb, #cp-main .post, #cp-main .panel { - border-radius: 7px; -} +@media (max-width: 430px) { + .action-bar .search-box .inputbox { + width: 120px; + } -/* Logo block -----------------------------------------*/ -#site-description { - float: none; - width: auto; - text-align: center; -} + .section-viewtopic .search-box .inputbox { + width: 57px; + } -.logo { - /* change display value to inline-block to show logo */ - display: none; - float: none; - padding: 10px; -} + .action-bar .search-box .inputbox ::-moz-placeholder { + content: "Search..."; + } -#site-description h1, #site-description p { - text-align: inherit; - float: none; - margin: 5px; - line-height: 1.2em; - overflow: hidden; - text-overflow: ellipsis; -} + .action-bar .search-box .inputbox :-ms-input-placeholder { + content: "Search..."; + } -#site-description p, .search-header { - display: none; + .action-bar .search-box .inputbox ::-webkit-input-placeholder { + content: "Search..."; + } } -/* Navigation -----------------------------------------*/ -.headerbar + .navbar { - margin-top: -5px; -} +@media (max-width: 500px) { + dd label { + white-space: normal; + } -/* Search -----------------------------------------*/ -.responsive-search { display: block !important; } -.responsive-search a { - display: block; - width: 16px; - height: 22px; - text-indent: 99px; - overflow: hidden; - background-position: 50% 50%; - background-repeat: no-repeat; - text-decoration: none; -} + select, .inputbox { + max-width: 260px; + } -/* .topiclist lists -----------------------------------------*/ -li.header dt { - text-align: center; - text-transform: none; - line-height: 1em; - font-size: 1.2em; - padding-bottom: 4px; -} + .captcha-panel dd.captcha { + margin-left: 0; + } -ul.topiclist li.header dt, ul.topiclist li.header dt .list-inner { - margin-right: 0 !important; - padding-right: 0; -} + .captcha-panel dd.captcha-image img { + width: 100%; + } -ul.topiclist li.header dd { - display: none !important; -} + dl.details dt, dl.details dd { + width: auto; + float: none; + text-align: left; + } -ul.topiclist dt, ul.topiclist dt .list-inner, -ul.topiclist.missing-column dt, ul.topiclist.missing-column dt .list-inner, -ul.topiclist.two-long-columns dt, ul.topiclist.two-long-columns dt .list-inner, -ul.topiclist.two-columns dt, ul.topiclist.two-columns dt .list-inner { - margin-right: 0; -} + dl.details dd { + margin-left: 20px; + } -ul.topiclist dt .list-inner.with-mark { - padding-right: 34px; -} + p.responsive-center { + float: none; + text-align: center; + margin-bottom: 5px; + } -ul.topiclist dt .list-inner { - min-height: 28px; -} + .action-bar > div { + margin-bottom: 5px; + } -ul.topiclist li.header dt .list-inner { - min-height: 0; -} + .action-bar > .pagination { + float: none; + clear: both; + padding-bottom: 1px; + text-align: center; + } -ul.topiclist dd { - display: none; -} -ul.topiclist dd.mark { - display: block; -} + .action-bar > .pagination li.page-jump { + margin: 0 2px; + } -/* Forums and topics lists -----------------------------------------*/ -ul.topiclist.forums dt { - margin-right: -250px; -} -ul.topiclist.forums dt .list-inner { - margin-right: 250px; -} + p.jumpbox-return { + display: none; + } -ul.topiclist.forums dd.lastpost { - display: block; -} + .display-options > label:nth-child(1) { + display: block; + margin-bottom: 5px; + } -ul.topiclist dd.mark { - display: block; - position: absolute; - right: 5px; - top: 0; - margin: 0; - width: auto; - min-width: 0; - text-align: left; -} + .attach-controls { + margin-top: 5px; + width: 100%; + } -ul.topiclist.forums dd.topics dfn, ul.topiclist.topics dd.posts dfn { - position: relative; - left: 0; - width: auto; - display: inline; - font-weight: normal; + .quick-links .dropdown-trigger span { + display: none; + } } -@media only screen and (max-width: 550px), only screen and (max-device-width: 550px) { +@media (max-width: 550px) { ul.topiclist.forums dt { margin-right: 0; } @@ -175,400 +118,466 @@ ul.topiclist.forums dd.topics dfn, ul.topiclist.topics dd.posts dfn { } } -li.row .responsive-show strong { - font-weight: bold; - color: inherit; -} +@media (max-width: 700px) { + .responsive-hide { display: none !important; } + .responsive-show { display: block !important; } + .responsive-show-inline { display: inline !important; } + .responsive-show-inline-block { display: inline-block !important; } -ul.topiclist li.row dt a.subforum { - display: inline-block; - vertical-align: bottom; - overflow: hidden; - text-overflow: ellipsis; - max-width: 100px; -} + /* Content wrappers + ----------------------------------------*/ + html { + height: auto; + } -/* Notifications list -----------------------------------------*/ -@media only screen and (max-width: 350px), only screen and (max-device-width: 350px) { - .dropdown-extended .dropdown-contents { + body { + padding: 0; + } + + .wrap { + border: none; + border-radius: 0; + margin: 0; + min-width: 290px; + padding: 0 5px; + } + + /* Common block wrappers + ----------------------------------------*/ + .headerbar, .navbar, .forabg, .forumbg, .post, .panel { + border-radius: 0; + margin-left: -5px; + margin-right: -5px; + } + + .cp-main .forabg, .cp-main .forumdb, .cp-main .post, .cp-main .panel { + border-radius: 7px; + } + + /* Logo block + ----------------------------------------*/ + .site-description { + float: none; width: auto; + text-align: center; } -} -/* Pagination -----------------------------------------*/ -.pagination > ul { - margin: 5px 0 0; -} + .logo { + /* change display value to inline-block to show logo */ + display: none; + float: none; + padding: 10px; + } -.row .pagination .ellipsis + li { - display: none !important; -} + .site-description h1, .site-description p { + text-align: inherit; + float: none; + margin: 5px; + line-height: 1.2em; + overflow: hidden; + text-overflow: ellipsis; + } -/* Responsive tables -----------------------------------------*/ -table.responsive, table.responsive tbody, table.responsive tr, table.responsive td { - display: block; -} + .site-description p, .search-header { + display: none; + } -table.responsive thead, table.responsive th { - display: none; -} + /* Navigation + ----------------------------------------*/ + .headerbar + .navbar { + margin-top: -5px; + } -table.responsive.show-header thead, table.responsive.show-header th:first-child { - display: block; - width: auto !important; - text-align: left !important; -} + /* Search + ----------------------------------------*/ + .responsive-search { display: block !important; } -table.responsive.show-header th:first-child span.rank-img { - display: none; -} + /* .topiclist lists + ----------------------------------------*/ + li.header dt { + text-align: center; + text-transform: none; + line-height: 1em; + font-size: 1.2em; + padding-bottom: 4px; + } -table.responsive tr { - margin: 2px 0; -} + ul.topiclist li.header dt, ul.topiclist li.header dt .list-inner { + margin-right: 0 !important; + padding-right: 0; + } -table.responsive td { - width: auto !important; - text-align: left !important; - padding: 4px; -} + ul.topiclist li.header dd { + display: none !important; + } -table.responsive td.empty { - display: none !important; -} + ul.topiclist dt, ul.topiclist dt .list-inner, + ul.topiclist.missing-column dt, ul.topiclist.missing-column dt .list-inner, + ul.topiclist.two-long-columns dt, ul.topiclist.two-long-columns dt .list-inner, + ul.topiclist.two-columns dt, ul.topiclist.two-columns dt .list-inner { + margin-right: 0; + } -table.responsive td > dfn { - display: inline-block !important; -} + ul.topiclist dt .list-inner.with-mark { + padding-right: 34px; + } -table.responsive td > dfn:after { - content: ':'; - padding-right: 5px; -} + ul.topiclist dt .list-inner { + min-height: 28px; + } -table.responsive span.rank-img { - float: none; - padding-right: 5px; -} + ul.topiclist li.header dt .list-inner { + min-height: 0; + } -table.responsive#memberlist td:first-child input[type="checkbox"] { - float: right; -} + ul.topiclist dd { + display: none; + } + ul.topiclist dd.mark { + display: block; + } -/* Forms -----------------------------------------*/ -fieldset dt, fieldset.fields1 dt, fieldset.fields2 dt { - width: auto; - float: none; -} + /* Forums and topics lists + ----------------------------------------*/ + ul.topiclist.forums dt { + margin-right: -250px; + } -fieldset dd, fieldset.fields1 dd, fieldset.fields2 dd { - margin-left: 20px; -} + ul.topiclist dd.mark { + display: block; + position: absolute; + right: 5px; + top: 0; + margin: 0; + width: auto; + min-width: 0; + text-align: left; + } -textarea, dd textarea, #message-box textarea { - width: 100%; - -moz-box-sizing: border-box; - box-sizing: border-box; -} + ul.topiclist.forums dd.topics dfn, ul.topiclist.topics dd.posts dfn { + position: relative; + left: 0; + width: auto; + display: inline; + font-weight: normal; + } -dl.pmlist dt { - width: auto !important; - margin-bottom: 5px; -} + li.row .responsive-show strong { + font-weight: bold; + color: inherit; + } -dl.pmlist dd { - display: inline-block; - margin-left: 0 !important; -} + ul.topiclist li.row dt a.subforum { + vertical-align: bottom; + overflow: hidden; + text-overflow: ellipsis; + max-width: 100px; + } -dl.pmlist dd:first-of-type { - padding-left: 20px; -} + /* Pagination + ----------------------------------------*/ + .pagination > ul { + margin: 5px 0 0; + } -#smiley-box, #message-box { - float: none; - width: auto; -} + .row .pagination .ellipsis + li { + display: none !important; + } -#smiley-box { - margin-top: 5px; -} + /* Responsive tables + ----------------------------------------*/ + table.responsive, table.responsive tbody, table.responsive tr, table.responsive td { + display: block; + } -.bbcode-status { - display: none; -} + table.responsive thead, table.responsive th { + display: none; + } -.colour-palette, .colour-palette tbody, .colour-palette tr { - display: block; -} + table.responsive.show-header thead, table.responsive.show-header th:first-child { + display: block; + width: auto !important; + text-align: left !important; + } -.colour-palette td { - display: inline-block; - margin-right: 2px; -} + table.responsive.show-header th:first-child span.rank-img { + display: none; + } -.horizontal-palette td:nth-child(2n), .vertical-palette tr:nth-child(2n) { - display: none; -} + table.responsive tr { + margin: 2px 0; + } -.colour-palette a { - display: inline-block !important; -} + table.responsive td { + width: auto !important; + text-align: left !important; + padding: 4px; + } -fieldset.quick-login label { - display: block; - margin-bottom: 5px; - white-space: normal; -} + table.responsive td.empty { + display: none !important; + } -fieldset.quick-login label > span { - display: inline-block; - min-width: 100px; -} + table.responsive td > dfn { + display: inline-block !important; + } -fieldset.quick-login input.inputbox { - width: 85%; - max-width: 300px; - margin-left: 20px; -} + table.responsive td > dfn:after { + content: ':'; + padding-right: 5px; + } -fieldset.quick-login label[for="autologin"] { - display: inline-block; - text-align: right; - min-width: 50%; -} + table.responsive span.rank-img { + float: none; + padding-right: 5px; + } -@media only screen and (max-width: 500px), only screen and (max-device-width: 500px) { - dd label { - white-space: normal; + table.responsive.memberlist td:first-child input[type="checkbox"] { + float: right; } - select, .inputbox { - max-width: 260px; + /* Forms + ----------------------------------------*/ + fieldset dt, fieldset.fields1 dt, fieldset.fields2 dt { + width: auto; + float: none; } - .captcha-panel dd.captcha { - margin-left: 0; + fieldset dd, fieldset.fields1 dd, fieldset.fields2 dd { + margin-left: 0px; } - .captcha-panel dd.captcha-image img { + textarea, dd textarea, .message-box textarea { width: 100%; + -moz-box-sizing: border-box; + box-sizing: border-box; } - #recaptcha_challenge_image, - #recaptcha_response_field, - .recaptchatable #recaptcha_image { - width: 100% !important; - height: auto !important; + dl.pmlist dt { + width: auto !important; + margin-bottom: 5px; + } + + dl.pmlist dd { + display: inline-block; + margin-left: 0 !important; + } + + dl.pmlist dd:first-of-type { + padding-left: 20px; + } + + .smiley-box, .message-box { + float: none; + width: auto; } - .recaptchatable tr td:last-child { + .smiley-box { + margin-top: 5px; + } + + .bbcode-status { display: none; } - .captcha-panel .recaptcha-responsive { - display: inline-block !important; - margin-top: 10px; - vertical-align: middle; + .colour-palette, .colour-palette tbody, .colour-palette tr { + display: block; } -} -@media only screen and (max-width: 430px), only screen and (max-device-width: 430px) { - .section-viewtopic .search-box .inputbox { - width: 110px; + .colour-palette td { + display: inline-block; + margin-right: 2px; } -} -@media only screen and (max-width: 320px), only screen and (max-device-width: 320px) { - select, .inputbox { - max-width: 240px; + .horizontal-palette td:nth-child(2n), .vertical-palette tr:nth-child(2n) { + display: none; } -} -/* User profile -----------------------------------------*/ -.column1, .column2, .left-box.profile-details { - float: none; - width: auto; -} + fieldset.quick-login label { + display: block; + margin-bottom: 5px; + white-space: normal; + } -@media only screen and (max-width: 500px), only screen and (max-device-width: 500px) { - dl.details dt, dl.details dd { - width: auto; - float: none; - text-align: left; + fieldset.quick-login label > span { + display: inline-block; + min-width: 100px; } - dl.details dd { + fieldset.quick-login input.inputbox { + width: 85%; + max-width: 300px; margin-left: 20px; } -} -/* Polls -----------------------------------------*/ -fieldset.polls dt { - width: 90%; -} + fieldset.quick-login label[for="autologin"] { + display: inline-block; + text-align: right; + min-width: 50%; + } -fieldset.polls dd.resultbar { - padding-left: 20px; -} + /* User profile + ----------------------------------------*/ + .column1, .column2, .left-box.profile-details { + float: none; + width: auto; + clear: both; + } -fieldset.polls dd.poll_option_percent { - width: 20%; -} + /* Polls + ----------------------------------------*/ + fieldset.polls dt { + width: 90%; + } -fieldset.polls dd.resultbar, fieldset.polls dd.poll_option_percent { - margin-top: 5px; -} + fieldset.polls dd.resultbar { + padding-left: 20px; + } -/* Post -----------------------------------------*/ -.postbody { - position: inherit; -} + fieldset.polls dd.poll_option_percent { + width: 20%; + } -.postprofile, .postbody, .search .postbody { - display: block; - width: auto; - float: none; - padding: 0; - min-height: 0; -} + fieldset.polls dd.resultbar, fieldset.polls dd.poll_option_percent { + margin-top: 5px; + } -.post .postprofile { - width: auto; - border-width: 0 0 1px 0; - padding-bottom: 5px; - margin: 0; - margin-bottom: 5px; - min-height: 40px; - overflow: hidden; -} + /* Post + ----------------------------------------*/ + .postbody { + position: inherit; + } -.postprofile dd { - display: none; -} + .postprofile, .postbody, .search .postbody { + display: block; + width: auto; + float: none; + padding: 0; + min-height: 0; + } -.postprofile dt, .postprofile dd.profile-rank, .search .postprofile dd { - display: block; - margin: 0; -} + .post .postprofile { + width: auto; + border-width: 0 0 1px 0; + padding-bottom: 5px; + margin: 0; + margin-bottom: 5px; + min-height: 40px; + overflow: hidden; + } -.postprofile .has-avatar .avatar-container { - margin: 0; - overflow: inherit; -} + .postprofile dd { + display: none; + } -.postprofile .avatar-container:after { - clear: none; -} + .postprofile dt, .postprofile dd.profile-rank, .search .postprofile dd { + display: block; + margin: 0; + } -.postprofile .avatar { - margin-right: 5px; -} + .postprofile .has-avatar .avatar-container { + margin: 0; + overflow: inherit; + } -.postprofile .avatar img { - width: auto !important; - height: auto !important; - max-height: 32px; -} + .postprofile .avatar-container:after { + clear: none; + } -.has-profile .postbody h3 { - margin-left: 0 !important; - margin-right: 0 !important; -} + .postprofile .avatar { + margin-right: 5px; + } -.has-profile .post-buttons { - right: 20px; - top: 15px; -} + .postprofile .avatar img { + width: auto !important; + height: auto !important; + max-height: 32px; + } -.online { - background-size: 40px; -} + .has-profile .postbody h3 { + margin-left: 0 !important; + margin-right: 0 !important; + } -/* Misc stuff -----------------------------------------*/ -h2 { - margin-top: .5em; -} + .has-profile .post-buttons { + right: 30px; + top: 15px; + } -p { - margin-bottom: .5em; - overflow: hidden; -} + .online { + background-size: 40px; + } -p.rightside { - margin-bottom: 0; -} + /* Misc stuff + ----------------------------------------*/ + h2 { + margin-top: .5em; + } -fieldset.display-options label { - display: block; - clear: both; - margin-bottom: 5px; -} + p { + margin-bottom: .5em; + overflow: hidden; + } -dl.mini dd.pm-legend { - float: left; - min-width: 200px; -} + p.rightside { + margin-bottom: 0; + } -#topicreview { - margin: 0 -5px; - padding: 0 5px; -} + fieldset.display-options label { + display: block; + clear: both; + margin-bottom: 5px; + } -fieldset.display-actions { - white-space: normal; + dl.mini dd.pm-legend { + float: left; + min-width: 200px; + } + + .topicreview { + margin: 0 -5px; + padding: 0 5px; + } + + fieldset.display-actions { + white-space: normal; + } + + .phpbb_alert { + width: auto; + margin: 0 5px; + } + + .attach-comment dfn { + width: 100%; + } } -.phpbb_alert { - width: auto; - margin: 0 5px; +@media (min-width: 700px) { + .postbody { width: 70%; } } -.attach-comment dfn { - width: 100%; +@media (min-width: 850px) { + .postbody { width: 76%; } } -@media only screen and (max-width: 500px), only screen and (max-device-width: 500px) { - p.responsive-center { - float: none; - text-align: center; - margin-bottom: 5px; - } +@media (max-width: 850px) { + .postprofile { width: 28%; } - .action-bar > div { - margin-bottom: 5px; - } - .action-bar > .pagination { - float: none; - clear: both; - padding-bottom: 1px; - text-align: center; - } +} - .action-bar > .pagination li.page-jump { - margin: 0 2px; - } +@media (min-width: 701px) and (max-width: 950px) { - p.jumpbox-return { - display: none; + ul.topiclist dt { + margin-right: -410px; } - .display-options > label:nth-child(1) { - display: block; - margin-bottom: 5px; + ul.topiclist dt .list-inner { + margin-right: 410px; } - .attach-controls { - margin-top: 5px; - width: 100%; + dd.posts, dd.topics, dd.views { + width: 80px; } } diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css index 77c7c88b07..45eb5b6fc9 100644 --- a/phpBB/styles/prosilver/theme/stylesheet.css +++ b/phpBB/styles/prosilver/theme/stylesheet.css @@ -1,17 +1,21 @@ /* phpBB3 Style Sheet -------------------------------------------------------------- - Style name: prosilver (the default phpBB 3.1.x style) - Based on style: + Style name: prosilver (the default phpBB 3.2.x style) + Based on style: Original author: Tom Beddard ( http://www.subblue.com/ ) Modified by: phpBB Limited ( https://www.phpbb.com/ ) -------------------------------------------------------------- */ -@import url("common.css"); -@import url("links.css"); -@import url("content.css"); -@import url("buttons.css"); -@import url("cp.css"); -@import url("forms.css"); -@import url("colours.css"); -@import url("imageset.css"); +@import url("normalize.css?v=3.2"); +@import url("base.css?v=3.2"); +@import url("utilities.css?v=3.2"); +@import url("common.css?v=3.2"); +@import url("links.css?v=3.2"); +@import url("content.css?v=3.2"); +@import url("buttons.css?v=3.2"); +@import url("cp.css?v=3.2"); +@import url("forms.css?v=3.2"); +@import url("icons.css?v=3.2"); +@import url("colours.css?v=3.2"); +@import url("responsive.css?v=3.2"); diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css index d2dad9e299..ba82551f85 100644 --- a/phpBB/styles/prosilver/theme/tweaks.css +++ b/phpBB/styles/prosilver/theme/tweaks.css @@ -27,3 +27,15 @@ dd label input { vertical-align: text-bottom\9; } .search-header, .search-header .inputbox, .search-header a.button { border-radius: 0; } + +.headerbar, .forumbg { + background-image: url("./images/bg_header.gif"); +} + +.forabg { + background-image: url("./images/bg_list.gif"); +} + +.tabs .tab > a { + border-radius: 0; +} diff --git a/phpBB/styles/prosilver/theme/utilities.css b/phpBB/styles/prosilver/theme/utilities.css new file mode 100644 index 0000000000..cbb8127d1c --- /dev/null +++ b/phpBB/styles/prosilver/theme/utilities.css @@ -0,0 +1,66 @@ +/* -------------------------------------------------------------- + $Utilities +-------------------------------------------------------------- */ + +.sr-only { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; +} + +.sr-only-focusable:active, +.sr-only-focusable:focus { + position: static; + width: auto; + height: auto; + margin: 0; + overflow: visible; + clip: auto; +} + +.clearfix:before, +.clearfix:after, +.container:before, +.container:after, +.container-fluid:before, +.container-fluid:after, +.row:before, +.row:after { + content: " "; + display: table; +} +.clearfix:after, +.container:after, +.container-fluid:after, +.row:after { clear: both } + +.center-block { + display: block; + margin-left: auto; + margin-right: auto; +} + +.pull-right { float: right !important } +.pull-left { float: left !important } +.hide { display: none !important } +.show { display: block !important } +.invisible { visibility: hidden } + +.text-hide { + font: 0/0 a; + color: transparent; + text-shadow: none; + background-color: transparent; + border: 0; +} + +.hidden { + display: none ; +} + +.affix { position: fixed } |
