diff options
Diffstat (limited to 'phpBB/styles/prosilver/template')
41 files changed, 850 insertions, 347 deletions
diff --git a/phpBB/styles/prosilver/template/faq_body.html b/phpBB/styles/prosilver/template/faq_body.html index 53205d14e9..34e594cd3e 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"></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 8e5b257ba4..13a10c8cc0 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -362,13 +362,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 @@ -489,7 +489,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"></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) @@ -578,8 +578,9 @@ 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'); + $('.js-responsive-menu-link').addClass('button'); + $('.js-responsive-menu-link .icon').removeClass('fa-bars').addClass('fa-ellipsis-h'); } copied1 = true; } @@ -633,7 +634,7 @@ 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 diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html index f8d6e36c8c..876f8d883a 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,12 +31,17 @@ <!-- 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 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"></i><span class="sr-only">{L_FEED} - {forumrow.FORUM_NAME}</span> + </a> + --> + <!-- ENDIF --> <!-- IF forumrow.FORUM_IMAGE --><span class="forum-image">{forumrow.FORUM_IMAGE}</span><!-- ENDIF --> <a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a> <!-- IF forumrow.FORUM_DESC --><br />{forumrow.FORUM_DESC}<!-- ENDIF --> @@ -47,7 +52,10 @@ <!-- EVENT forumlist_body_subforums_before --> <br /><strong>{forumrow.L_SUBFORUM_STR}{L_COLON}</strong> <!-- BEGIN subforum --> - <a href="{forumrow.subforum.U_SUBFORUM}" class="subforum<!-- IF forumrow.subforum.S_UNREAD --> unread<!-- ELSE --> read<!-- ENDIF -->" title="<!-- IF forumrow.subforum.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 --> + <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 fa-file-o fa-fw <!-- IF forumrow.subforum.S_UNREAD --> icon-red<!-- ELSE --> icon-blue<!-- ENDIF --> icon-md"></i>{forumrow.subforum.SUBFORUM_NAME} + </a> + <!-- IF not forumrow.subforum.S_LAST_ROW -->{L_COMMA_SEPARATOR}<!-- ENDIF --> <!-- END subforum --> <!-- EVENT forumlist_body_subforums_after --> <!-- ENDIF --> @@ -68,19 +76,34 @@ <!-- 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="{TOPICS_UNAPPROVED}"> + <i class="icon fa-question fa-fw icon-blue"></i><span class="sr-only">{TOPICS_UNAPPROVED}</span> + </a> + <!-- ELSEIF forumrow.U_UNAPPROVED_POSTS --> + <a href="{forumrow.U_UNAPPROVED_POSTS}" title="{POSTS_UNAPPROVED_FORUM}"> + <i class="icon fa-question fa-fw icon-blue"></i><span class="sr-only">{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} {forumrow.LAST_POSTER_FULL} + <!-- IF not S_IS_BOT --> + <a href="{forumrow.U_LAST_POST}" title="{VIEW_LATEST_POST}"> + <i class="icon fa-external-link-square fa-fw icon-lightgray icon-md"></i><span class="sr-only">{VIEW_LATEST_POST}</span> + </a> + <!-- ENDIF --> + <br />{forumrow.LAST_POST_TIME} + <!-- ELSE --> + {L_NO_POSTS}<br /> + <!-- ENDIF --> + </span> </dd> <!-- ELSE --> <dd> </dd> diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html index 5053c9a55f..f76c8e82f5 100644 --- a/phpBB/styles/prosilver/template/jumpbox.html +++ b/phpBB/styles/prosilver/template/jumpbox.html @@ -1,21 +1,38 @@ <!-- 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"></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"></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"></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"></i><span>{L_GO_TO_SEARCH_ADV}</span> + </a> + </p> <!-- ENDIF --> <!-- IF S_DISPLAY_JUMPBOX --> <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="dropdown-trigger button dropdown-select"> - <!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF --> + <span 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 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"></i></span> </span> - <div class="dropdown hidden"> + <div class="dropdown"> <div class="pointer"><div class="pointer-inner"></div></div> <ul class="dropdown-contents"> <!-- BEGIN jumpbox_forums --> diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html index 0758dd6f27..c1e3cc3497 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="{TOPIC_UNAPPROVED}"> + <i class="icon fa-question fa-fw icon-blue"></i><span class="sr-only">{TOPIC_UNAPPROVED}</span> + </a> + <!-- ENDIF --> + <!-- IF topicrow.S_TOPIC_DELETED or topicrow.S_POSTS_DELETED --> + <a href="{topicrow.U_MCP_QUEUE}" title="{TOPIC_DELETED"> + <i class="icon fa-recycle fa-fw icon-green"></i><span class="sr-only">{TOPIC_DELETED}</span> + </a> + <!-- ENDIF --> + <!-- IF topicrow.S_TOPIC_REPORTED --> + <a href="{topicrow.U_MCP_REPORT}" title="{TOPIC_REPORTED}"> + <i class="icon fa-exclamation fa-fw icon-red"></i><span class="sr-only">{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 /> <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"></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,14 @@ <!-- 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"></i> <!-- ENDIF --> {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} </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 --> @@ -106,7 +117,7 @@ <hr /> - <div class="action-bar bottom"> + <div class="action-bar bar-bottom"> <div class="pagination"> {TOTAL_TOPICS} <!-- IF .pagination --> diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html index 8fe7dfdf65..1a6e478287 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> <i class="icon fa-paperclip fa-fw"></i> <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> <i class="icon fa-paperclip fa-fw"></i> <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} <i class="icon fa-paperclip fa-fw"></i> <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> <i class="icon fa-paperclip fa-fw"></i> <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_logs.html b/phpBB/styles/prosilver/template/mcp_logs.html index 4f74085968..9b4c4c786f 100644 --- a/phpBB/styles/prosilver/template/mcp_logs.html +++ b/phpBB/styles/prosilver/template/mcp_logs.html @@ -7,7 +7,7 @@ <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} @@ -60,7 +60,7 @@ <hr /> - <div class="action-bar bottom"> + <div class="action-bar bar-bottom"> <div class="pagination"> {TOTAL} <!-- IF .pagination --> diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html index 3e8d47eb9d..a9c1e49360 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_user.html +++ b/phpBB/styles/prosilver/template/mcp_notes_user.html @@ -50,7 +50,7 @@ <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} @@ -100,7 +100,7 @@ <hr /> - <div class="action-bar bottom"> + <div class="action-bar bar-bottom"> <div class="pagination"> {TOTAL_REPORTS} <!-- IF .pagination --> diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html index 0354cdd3ca..e1e4ff4732 100644 --- a/phpBB/styles/prosilver/template/mcp_post.html +++ b/phpBB/styles/prosilver/template/mcp_post.html @@ -58,8 +58,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"></i><span>{L_EDIT_POST}</span> </a> </li> <!-- ENDIF --> @@ -73,7 +73,7 @@ <!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}{L_COLON}</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}" style="color:<!-- IF bcc_recipient.COLOUR -->{bcc_recipient.COLOUR}<!-- ELSEIF bcc_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{bcc_recipient.NAME}</a><!-- ENDIF --> <!-- END bcc_recipient --><!-- ENDIF --> </p> <!-- ELSE --> - <p class="author">{MINI_POST_IMG} {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} » {POST_DATE}</p> + <p class="author"><span><i class="icon fa-file fa-fw icon-lightgray icon-md"></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,7 +102,7 @@ <!-- 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"></i><span class="sr-only">{TOPIC_REPORTED}</span> <a href="{U_MCP_REPORT}"><strong>{L_MESSAGE_REPORTED}</strong></a> </p> <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/mcp_queue.html b/phpBB/styles/prosilver/template/mcp_queue.html index 864b231142..e6ce134794 100644 --- a/phpBB/styles/prosilver/template/mcp_queue.html +++ b/phpBB/styles/prosilver/template/mcp_queue.html @@ -16,7 +16,7 @@ <p>{L_EXPLAIN}</p> <!-- IF .postrow --> - <div class="action-bar top"> + <div class="action-bar bar-top"> <div class="pagination"> {TOTAL} <!-- IF .pagination --> @@ -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> <i class="icon fa-paperclip fa-fw"></i> <br /> <span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} » {postrow.POST_TIME}</span> </div> </dt> @@ -82,7 +82,7 @@ <hr /> - <div class="action-bar bottom"> + <div class="action-bar bar-bottom"> <div class="pagination"> {TOTAL} <!-- IF .pagination --> diff --git a/phpBB/styles/prosilver/template/mcp_reports.html b/phpBB/styles/prosilver/template/mcp_reports.html index 24c0479f63..10023f395b 100644 --- a/phpBB/styles/prosilver/template/mcp_reports.html +++ b/phpBB/styles/prosilver/template/mcp_reports.html @@ -18,7 +18,7 @@ <p>{L_EXPLAIN}</p> <!-- IF .postrow --> - <div class="action-bar top"> + <div class="action-bar bar-top"> <div class="pagination"> {TOTAL_REPORTS} <!-- IF .pagination --> @@ -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"></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"></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 /> @@ -88,7 +88,7 @@ <hr /> - <div class="action-bar bottom"> + <div class="action-bar bar-bottom"> <div class="pagination"> {TOTAL_REPORTS} <!-- IF .pagination --> diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index 5a6922858a..0398b773c7 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -100,8 +100,8 @@ <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"> + <i class="icon fa-info fa-fw"></i><span>{L_POST_DETAILS}</span> </a> </li> <li> @@ -112,8 +112,11 @@ </ul> <h3><a href="{postrow.U_POST_DETAILS}">{postrow.POST_SUBJECT}</a></h3> - <p class="author"><a href="#pr{postrow.POST_ID}">{postrow.MINI_POST_IMG}</a> {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong><!-- IF postrow.U_MCP_DETAILS --> [ <a href="{postrow.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --></p> - + <p class="author"> + <a href="#pr{postrow.POST_ID}" title="{postrow.MINI_POST}"> + <i class="icon fa-file fa-fw icon-lightgray icon-tiny"></i><span class="sr-only">{postrow.MINI_POST}</span> + </a> {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong><!-- IF postrow.U_MCP_DETAILS --> [ <a href="{postrow.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --> + </p> <!-- IF postrow.S_POST_UNAPPROVED --> <p class="post-notice unapproved"> <a href="{postrow.U_MCP_APPROVE}"><strong>{L_POST_UNAPPROVED}</strong></a> @@ -152,7 +155,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_list.html b/phpBB/styles/prosilver/template/mcp_warn_list.html index d0e80a1479..568705e7d0 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_list.html +++ b/phpBB/styles/prosilver/template/mcp_warn_list.html @@ -10,7 +10,7 @@ <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 --> @@ -51,7 +51,7 @@ <hr /> - <div class="action-bar bottom"> + <div class="action-bar bar-bottom"> <div class="pagination"> {TOTAL_USERS} <!-- IF .pagination --> diff --git a/phpBB/styles/prosilver/template/mcp_whois.html b/phpBB/styles/prosilver/template/mcp_whois.html index 41a825458d..bb11e86b2d 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"></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"></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 20f46af90d..0ba945b933 100644 --- a/phpBB/styles/prosilver/template/memberlist_body.html +++ b/phpBB/styles/prosilver/template/memberlist_body.html @@ -23,7 +23,7 @@ <!-- ELSE --> <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="{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> @@ -141,7 +141,7 @@ </form> -<div class="action-bar bottom"> +<div class="action-bar bar-bottom"> <div class="pagination"> {TOTAL_USERS} <!-- IF .pagination --> diff --git a/phpBB/styles/prosilver/template/message_body.html b/phpBB/styles/prosilver/template/message_body.html index 71eca203bc..d05d07ec40 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"></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..5ea8fd80c8 100644 --- a/phpBB/styles/prosilver/template/navbar_footer.html +++ b/phpBB/styles/prosilver/template/navbar_footer.html @@ -1,26 +1,64 @@ <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 --> + <span class="crumb"> + <a href="{U_SITE_HOME}" data-navbar-reference="home"> + <i class="icon fa-home fa-fw"></i><span>{L_SITE_HOME}</span> + </a> + </span> + <!-- ENDIF --> <!-- EVENT overall_footer_breadcrumb_prepend --> - <span class="crumb"><a href="{U_INDEX}" data-navbar-reference="index">{L_INDEX}</a></span> + <span class="crumb"> + <a href="{U_INDEX}" data-navbar-reference="index"> + <i class="icon fa-home fa-fw"></i><span>{L_INDEX}</span> + </a> + </span> <!-- EVENT overall_footer_breadcrumb_append --> </li> - <!-- IF U_WATCH_FORUM_LINK and not S_IS_BOT --><li class="small-icon icon-<!-- IF S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-last-responsive="true"><a href="{U_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_FORUM_TOGGLE}" data-toggle-url="{U_WATCH_FORUM_TOGGLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF --> + <!-- 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"></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"></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"></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"></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"></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 b2dd87d1c8..ab3dbc80aa 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="quick-links 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<!-- 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"></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"></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"></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"></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"></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"></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"></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"></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"></i><span>{L_THE_TEAM}</span> + </a> + </li> + <!-- ENDIF --> <!-- ENDIF --> <li class="separator"></li> @@ -40,65 +78,113 @@ </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"></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"></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"></i><span>{L_MCP_SHORT}</span> + </a> + </li> + <!-- ENDIF --> <!-- IF S_REGISTERED_USER --> <li id="username_logged_in" class="rightside <!-- IF CURRENT_USER_AVATAR --> no-bulletin<!-- ENDIF -->" data-skip-responsive="true"> <!-- EVENT navbar_header_username_prepend --> <div class="header-profile dropdown-container"> - <a href="{U_PROFILE}" class="header-avatar dropdown-trigger"><!-- IF CURRENT_USER_AVATAR -->{CURRENT_USER_AVATAR} <!-- ENDIF -->{CURRENT_USERNAME_SIMPLE}</a> - <div class="dropdown hidden"> + <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 --> - - <!-- EVENT navbar_header_profile_list_before --> + <!-- IF U_RESTORE_PERMISSIONS --> + <li> + <a href="{U_RESTORE_PERMISSIONS}"> + <i class="icon fa-refresh fa-fw"></i><span>{L_RESTORE_PERMISSIONS}</span> + </a> + </li> + <!-- ENDIF --> - <li class="small-icon icon-ucp"><a href="{U_PROFILE}" title="{L_PROFILE}" role="menuitem">{L_PROFILE}</a></li> - <li class="small-icon icon-profile"><a href="{U_USER_PROFILE}" title="{L_READ_PROFILE}" role="menuitem">{L_READ_PROFILE}</a></li> + <!-- EVENT navbar_header_profile_list_before --> + + <li> + <a href="{U_PROFILE}" title="{L_PROFILE}" role="menuitem"> + <i class="icon fa-sliders fa-fw"></i><span>{L_PROFILE}</span> + </a> + </li> + <li> + <a href="{U_USER_PROFILE}" title="{L_READ_PROFILE}" role="menuitem"> + <i class="icon fa-user fa-fw"></i><span>{L_READ_PROFILE}</span> + </a> + </li> <!-- EVENT navbar_header_profile_list_after --> <li class="separator"></li> - <li class="small-icon icon-logout"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x" role="menuitem">{L_LOGIN_LOGOUT}</a></li> + <li> + <a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x" role="menuitem"> + <i class="icon fa-power-off fa-fw"></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>{PRIVATE_MESSAGE_COUNT}</strong><span>]</span></a> + <li class="rightside" data-skip-responsive="true"> + <a href="{U_PRIVATEMSGS}" role="menuitem"> + <i class="icon fa-inbox fa-fw"></i><span><span>{L_PRIVATE_MESSAGES} [</span><strong>{PRIVATE_MESSAGE_COUNT}</strong><span>]</span></span> + </a> </li> <!-- ENDIF --> <!-- IF S_NOTIFICATIONS_DISPLAY --> - <li class="small-icon icon-notification dropdown-container dropdown-{S_CONTENT_FLOW_END} rightside" data-skip-responsive="true"> - <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" class="dropdown-trigger"><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></a> + <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"></i><span><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></span> + </a> <!-- INCLUDE notification_dropdown.html --> </li> <!-- ENDIF --> <!-- ELSE --> - <li class="small-icon icon-logout rightside" data-skip-responsive="true"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x" role="menuitem">{L_LOGIN_LOGOUT}</a></li> + <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"></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"></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"> + <ul id="nav-breadcrumbs" class="nav-breadcrumbs linklist navlinks" role="menubar"> <!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' --> <!-- EVENT overall_header_breadcrumbs_before --> - <li class="small-icon icon-home breadcrumbs"> - <!-- IF U_SITE_HOME --><span class="crumb"{$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"> + <!-- IF U_SITE_HOME --> + <span class="crumb" {$MICRODATA}><a href="{U_SITE_HOME}" data-navbar-reference="home"><i class="icon fa-home fa-fw"></i><span>{L_SITE_HOME}</span></a></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}" accesskey="h" data-navbar-reference="index"><i class="icon fa-home fa-fw"></i><span>{L_INDEX}</span></a></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}" itemprop="url"><span itemprop="title">{navlinks.FORUM_NAME}</span></a></span> <!-- EVENT overall_header_navlink_append --> <!-- END navlinks --> <!-- EVENT overall_header_breadcrumb_append --> @@ -106,7 +192,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"></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..68cbcc4ccb 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"></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 a90aad15f2..270be898c8 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -20,11 +20,15 @@ </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"></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"></i> + </a> <div class="alert_text"></div> </div> </div> @@ -41,6 +45,19 @@ <script type="text/javascript" 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 type="text/javascript"> + (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 --> <!-- EVENT overall_footer_after --> diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index e7c3ac753b..deb8daf83a 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -44,6 +44,7 @@ })(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)" /> @@ -78,7 +79,7 @@ <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 -->">{SITE_LOGO_IMG}</a> + <a id="logo" class="logo" href="<!-- IF U_SITE_HOME -->{U_SITE_HOME}<!-- ELSE -->{U_INDEX}<!-- ENDIF -->" title="<!-- IF U_SITE_HOME -->{L_SITE_HOME}<!-- ELSE -->{L_INDEX}<!-- ENDIF -->"><span class="site_logo"></span></a> <h1>{SITENAME}</h1> <p>{SITE_DESCRIPTION}</p> <p class="skiplink"><a href="#start_here">{L_SKIP}</a></p> @@ -90,8 +91,12 @@ <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> + <button class="button" type="submit" title="{L_SEARCH}"> + <i class="icon fa-search fa-fw"></i><span>{L_SEARCH}</span> + </button> + <a href="{U_SEARCH}" class="button" title="{L_SEARCH_ADV}"> + <i class="icon fa-cog fa-fw"></i><span>{L_SEARCH_ADV}</span> + </a> {S_SEARCH_HIDDEN_FIELDS} </fieldset> </form> diff --git a/phpBB/styles/prosilver/template/pagination.html b/phpBB/styles/prosilver/template/pagination.html index 4680eaa175..4351b1bdd7 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" href="#" class="dropdown-trigger" title="{L_JUMP_TO_PAGE_CLICK}" role="button"><i class="icon fa-level-down fa-rotate-270"></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" href="{pagination.PAGE_URL}" rel="prev" role="button"><i class="icon fa-chevron-left fa-fw"></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" href="{pagination.PAGE_URL}" rel="next" role="button"><i class="icon fa-chevron-right fa-fw"></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/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html index e357a56494..9e78005c63 100644 --- a/phpBB/styles/prosilver/template/posting_buttons.html +++ b/phpBB/styles/prosilver/template/posting_buttons.html @@ -61,25 +61,50 @@ <!-- EVENT posting_editor_buttons_before --> <div id="format-buttons" class="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}" /> + <button type="button" class="button bbcode-b" accesskey="b" name="addbbcode0" value=" B " onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}"> + <i class="icon fa-bold fa-fw"></i> + </button> + <button type="button" class="button bbcode-i" accesskey="i" name="addbbcode2" value=" i " onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}"> + <i class="icon fa-italic fa-fw"></i> + </button> + <button type="button" class="button bbcode-u" accesskey="u" name="addbbcode4" value=" u " onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}"> + <i class="icon fa-underline fa-fw"></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 bbcode-quote" accesskey="q" name="addbbcode6" value="Quote" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}"> + <i class="icon fa-quote-left fa-fw"></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 bbcode-code" accesskey="c" name="addbbcode8" value="Code" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}"> + <i class="icon fa-code fa-fw"></i> + </button> + <button type="button" class="button bbcode-list" accesskey="l" name="addbbcode10" value="List" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}"> + <i class="icon fa-list fa-fw"></i> + </button> + <button type="button" class="button bbcode-list-" accesskey="o" name="addbbcode12" value="List=" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}"> + <i class="icon fa-list-ol fa-fw"></i> + </button> + <button type="button" class="button bbcode-asterisk" accesskey="y" name="addlistitem" value="[*]" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}"> + <i class="icon fa-asterisk fa-fw"></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 bbcode-img" accesskey="p" name="addbbcode14" value="Img" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}"> + <i class="icon fa-image fa-fw"></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 bbcode-url" accesskey="w" name="addbbcode16" value="URL" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}"> + <i class="icon fa-link fa-fw"></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 bbcode-flash" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}"> + <i class="icon fa-flash fa-fw"></i> + </button> <!-- ENDIF --> + <button type="button" class="button 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"></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 +116,11 @@ <!-- 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 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> <!-- END custom_tags --> </div> <!-- EVENT posting_editor_buttons_after --> diff --git a/phpBB/styles/prosilver/template/posting_review.html b/phpBB/styles/prosilver/template/posting_review.html index 25b719420b..3093630461 100644 --- a/phpBB/styles/prosilver/template/posting_review.html +++ b/phpBB/styles/prosilver/template/posting_review.html @@ -14,7 +14,16 @@ <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> + <p class="author"> + <!-- IF S_IS_BOT --> + <span><i class="icon fa-file fa-fw icon-lightgray icon-md"></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"></i><span class="sr-only">{post_review_row.MINI_POST}</span> + </a> + <!-- ENDIF --> + {L_POST_BY_AUTHOR}<strong> {post_review_row.POST_AUTHOR_FULL}</strong> » {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_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html index 9016e40ded..803de267ac 100644 --- a/phpBB/styles/prosilver/template/posting_topic_review.html +++ b/phpBB/styles/prosilver/template/posting_topic_review.html @@ -28,22 +28,31 @@ <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"> + <i class="icon fa-info fa-fw"></i><span>{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}', {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 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"> + <i class="icon fa-quote-left fa-fw"></i><span>{L_QUOTE} {topic_review_row.POST_AUTHOR}</span> </a> </li> <!-- ENDIF --> </ul> <!-- ENDIF --> - <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"></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"></i><span class="sr-only">{topic_review_row.MINI_POST}</span> + </a> + <!-- ENDIF --> + {L_POST_BY_AUTHOR} <strong>{topic_review_row.POST_AUTHOR_FULL}</strong> » {topic_review_row.POST_DATE} + </p> <div class="content">{topic_review_row.MESSAGE}</div> <!-- IF topic_review_row.S_HAS_ATTACHMENTS --> @@ -66,8 +75,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"></i><span>{L_BACK_TO_TOP}</span> + </a> +</p> diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index f76afe3767..47ce0de4dd 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"></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"></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" type="submit" title="{L_SEARCH}"> + <i class="icon fa-search fa-fw"></i><span>{L_SEARCH}</span> + </button> + <a href="{U_SEARCH}" class="button" title="{L_SEARCH_ADV}"> + <i class="icon fa-cog fa-fw"></i><span>{L_SEARCH_ADV}</span> + </a> </fieldset> </form> </div> @@ -51,7 +63,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> @@ -64,17 +76,35 @@ <!-- 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}"> + <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="icon-link"></a><!-- ENDIF --> + <!-- 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 href="{searchresults.U_NEWEST_POST}"> + <i class="icon fa-file fa-fw icon-red icon-md"></i><span class="sr-only">{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="{TOPIC_UNAPPROVED}"> + <i class="icon fa-question fa-fw icon-blue"></i><span class="sr-only">{TOPIC_UNAPPROVED}</span> + </a> + <!-- ENDIF --> + <!-- IF searchresults.S_TOPIC_DELETED --> + <a href="{searchresults.U_MCP_QUEUE}" title="{TOPIC_DELETED}"> + <i class="icon fa-recycle fa-fw icon-green"></i><span class="sr-only">{TOPIC_DELETED}</span> + </a> + <!-- ENDIF --> + <!-- IF searchresults.S_TOPIC_REPORTED --> + <a href="{searchresults.U_MCP_REPORT}" title="{TOPIC_REPORTED}"> + <i class="icon fa-exclamation fa-fw icon-red"></i><span class="sr-only">{TOPIC_REPORTED}</span> + </a> + <!-- ENDIF --> + <br /> <!-- IF .searchresults.pagination --> <div class="pagination"> <ul> @@ -83,13 +113,14 @@ <!-- 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 --> + <!-- IF searchresults.S_HAS_POLL --><i class="icon fa-bar-chart fa-fw"></i> <!-- ENDIF --> + <!-- IF searchresults.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw"></i><!-- 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 --> @@ -97,9 +128,18 @@ </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="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}"> + <i class="icon fa-external-link-square fa-fw icon-lightgray icon-md"></i><span class="sr-only">{VIEW_LATEST_POST}</span> + </a> + <!-- ENDIF --> + <br /> + {searchresults.LAST_POST_TIME} + <br /> + </span> </dd> </dl> </li> @@ -148,7 +188,11 @@ <!-- 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"></i><span>{L_JUMP_TO_POST}</span> + </a> + </li> </ul> <!-- ENDIF --> @@ -181,7 +225,7 @@ <!-- ENDIF --> <!-- IF .pagination or .searchresults or PAGE_NUMBER --> -<div class="action-bar bottom"> +<div class="action-bar bar-bottom"> <div class="pagination"> {SEARCH_MATCHES} <!-- IF .pagination --> diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html index fd7bf0c6bd..defe2c9456 100644 --- a/phpBB/styles/prosilver/template/simple_footer.html +++ b/phpBB/styles/prosilver/template/simple_footer.html @@ -11,11 +11,15 @@ <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"></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"></i> + </a> <div class="alert_text"></div> </div> </div> diff --git a/phpBB/styles/prosilver/template/ucp_attachments.html b/phpBB/styles/prosilver/template/ucp_attachments.html index 1d4963273c..0ea0661c37 100644 --- a/phpBB/styles/prosilver/template/ucp_attachments.html +++ b/phpBB/styles/prosilver/template/ucp_attachments.html @@ -10,7 +10,7 @@ <p>{L_ATTACHMENTS_EXPLAIN}</p> <!-- IF .attachrow --> - <div class="action-bar top"> + <div class="action-bar bar-top"> <div class="pagination"> {NUM_ATTACHMENTS} <!-- IF .pagination --> @@ -59,7 +59,7 @@ <hr /> - <div class="action-bar bottom"> + <div class="action-bar bar-bottom"> <div class="pagination"> {TOTAL_ATTACHMENTS} {L_TITLE} <!-- IF .pagination --> diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html index b5e8eaf1e8..223493ff38 100644 --- a/phpBB/styles/prosilver/template/ucp_groups_manage.html +++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html @@ -160,7 +160,7 @@ </table> <!-- IF .pagination --> - <div class="action-bar bottom"> + <div class="action-bar bar-bottom"> <div class="pagination"> <!-- INCLUDE pagination.html --> </div> diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html index f74728bdb3..7aa4313910 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 href="{topicrow.U_NEWEST_POST}"> + <i class="icon fa-file fa-fw icon-red icon-md"></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="{TOPIC_UNAPPROVED}"> + <i class="icon fa-question fa-fw icon-blue"></i><span class="sr-only">{TOPIC_UNAPPROVED}</span> + </a> + <!-- ENDIF --> + <!-- IF topicrow.S_TOPIC_REPORTED --> + <a href="{topicrow.U_MCP_REPORT}" title="{TOPIC_REPORTED}"> + <i class="icon fa-exclamation fa-fw icon-red"></i><span class="sr-only">{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"></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"></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"></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,7 +92,7 @@ <!-- END topicrow --> </ul> - <div class="action-bar bottom"> + <div class="action-bar bar-bottom"> <div class="pagination"> {TOTAL_TOPICS} <!-- IF .pagination --> diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html index 7bc8d40078..d5eb6f91a7 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 href="{topicrow.U_NEWEST_POST}"> + <i class="icon fa-file fa-fw icon-red icon-md"></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"></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"></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"></i><span class="sr-only">{VIEW_LATEST_POST}</span> + </a> + <br />{topicrow.LAST_POST_TIME} + </span> </dd> </dl> </li> @@ -60,7 +70,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"></i> [{WARNINGS}]</dd><!-- ENDIF --> </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 ef03317578..332330c5b1 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"></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 href="{topicrow.U_NEWEST_POST}"> + <i class="icon fa-file fa-fw icon-red icon-md"></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="{TOPIC_UNAPPROVED}"> + <i class="icon fa-question fa-fw icon-blue"></i><span class="sr-only">{TOPIC_UNAPPROVED}</span> + </a> + <!-- ENDIF --> + <!-- IF topicrow.S_TOPIC_REPORTED --> + <a href="{topicrow.U_MCP_REPORT}" title="{TOPIC_REPORTED}"> + <i class="icon fa-exclamation fa-fw icon-red"></i><span class="sr-only">{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"></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"></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"></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 1255d7a0d0..a7eb7fc8fb 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications.html +++ b/phpBB/styles/prosilver/template/ucp_notifications.html @@ -40,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>] @@ -86,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 8ecded85ca..5500b6924c 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_history.html +++ b/phpBB/styles/prosilver/template/ucp_pm_history.html @@ -25,8 +25,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}', {time:{history_row.MESSAGE_TIME},user_id:{history_row.USER_ID}});"<!-- 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"> + <i class="icon fa-quote-left fa-fw"></i><span>{L_QUOTE} {history_row.MESSAGE_AUTHOR}</span> </a> </li> <!-- ENDIF --> @@ -35,8 +35,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"></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} {history_row.MESSAGE_AUTHOR_FULL} + </p> <div class="content"><!-- IF history_row.MESSAGE -->{history_row.MESSAGE}<!-- ELSE --><span class="error">{L_MESSAGE_REMOVED_FROM_OUTBOX}</span><!-- ENDIF --></div> <div id="message_{history_row.MSG_ID}" style="display: none;">{history_row.DECODED_MESSAGE}</div> </div> @@ -48,4 +51,9 @@ <!-- 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"></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..f629c3d5f1 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"></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"></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"></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"></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 dropdown-trigger dropdown-select"> + <i class="icon fa-wrench fa-fw"></i> + <span class="caret"><i class="icon fa-sort-down fa-fw"></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"></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"></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..6f62066d4c 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"></i><span class="sr-only">{PM_REPORTED}</span> + </a> + <!-- ENDIF --> <!-- IF messagerow.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw"></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> @@ -104,7 +107,7 @@ <hr /> - <div class="action-bar bottom"> + <div class="action-bar bar-bottom"> <div class="pagination"> {TOTAL_MESSAGES} <!-- IF .pagination --> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index d92b90a045..230759aa9e 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"></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_BEGIN} fa-fw icon-black"></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"></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"> + <i class="icon fa-pencil fa-fw"></i><span>{L_POST_EDIT_PM}</span> + </a> </li> <!-- ENDIF --> <!-- IF U_DELETE --> <li> - <a href="{U_DELETE}" title="{L_DELETE_MESSAGE}" class="button icon-button delete-icon"><span>{L_DELETE_MESSAGE}</span></a> + <a href="{U_DELETE}" title="{L_DELETE_MESSAGE}" class="button"> + <i class="icon fa-times fa-fw"></i><span>{L_DELETE_MESSAGE}</span> + </a> </li> <!-- ENDIF --> <!-- IF U_REPORT --> <li> - <a href="{U_REPORT}" title="{L_REPORT_PM}" class="button icon-button report-icon"><span>{L_REPORT_PM}</span></a> + <a href="{U_REPORT}" title="{L_REPORT_PM}" class="button"> + <i class="icon fa-exclamation fa-fw"></i><span>{L_REPORT_PM}</span> + </a> </li> <!-- ENDIF --> <!-- IF U_QUOTE --> <li> - <a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}" class="button icon-button quote-icon"><span>{L_POST_QUOTE_PM}</span></a> + <a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}" class="button"> + <i class="icon fa-quote-left fa-fw"></i><span>{L_POST_QUOTE_PM}</span> + </a> </li> <!-- ENDIF --> <!-- EVENT ucp_pm_viewmessage_post_buttons_after --> @@ -141,17 +157,30 @@ <!-- 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"></i> + <span class="sr-only">{L_BACK_TO_TOP}</span> + </a> + </div> </div> </div> <!-- 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"></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_BEGIN} fa-fw icon-black"></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/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index 2679a2cd29..4689909b28 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"></i> + <!-- ELSE --> + <span>{L_BUTTON_NEW_TOPIC}</span> <i class="icon fa-pencil fa-fw"></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" type="submit" title="{L_SEARCH}"> + <i class="icon fa-search fa-fw"></i><span>{L_SEARCH}</span> + </button> + <a href="{U_SEARCH}" class="button" title="{L_SEARCH_ADV}"> + <i class="icon fa-cog fa-fw"></i><span>{L_SEARCH_ADV}</span> + </a> {S_SEARCH_LOCAL_HIDDEN_FIELDS} </fieldset> </form> @@ -134,8 +139,8 @@ <div class="inner"> <ul class="topiclist"> <li class="header"> - <dl class="icon"> <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> + <dl class="row-item"> <dd class="posts">{L_REPLIES}</dd> <dd class="views">{L_VIEWS}</dd> <dd class="lastpost"><span>{L_LAST_POST}</span></dd> @@ -146,15 +151,33 @@ <!-- ENDIF --> <li class="row<!-- IF topicrow.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF topicrow.S_POST_GLOBAL --> global-announce<!-- ENDIF --><!-- IF topicrow.S_POST_ANNOUNCE --> announce<!-- ENDIF --><!-- IF topicrow.S_POST_STICKY --> sticky<!-- ENDIF --><!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ENDIF -->"> - <dl class="icon {topicrow.TOPIC_IMG_STYLE}"> + <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="icon-link"></a><!-- ENDIF --> + <!-- 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 href="{topicrow.U_NEWEST_POST}"> + <i class="icon fa-file fa-fw icon-red icon-md"></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="{TOPIC_UNAPPROVED}"> + <i class="icon fa-question fa-fw icon-blue"></i><span class="sr-only">{TOPIC_UNAPPROVED}</span> + </a> + <!-- ENDIF --> + <!-- IF topicrow.S_TOPIC_DELETED --> + <a href="{topicrow.U_MCP_QUEUE}" title="{TOPIC_DELETED"> + <i class="icon fa-recycle fa-fw icon-green"></i><span class="sr-only">{TOPIC_DELETED}</span> + </a> + <!-- ENDIF --> + <!-- IF topicrow.S_TOPIC_REPORTED --> + <a href="{topicrow.U_MCP_REPORT}" title="{TOPIC_REPORTED}"> + <i class="icon fa-exclamation fa-fw icon-red"></i><span class="sr-only">{TOPIC_REPORTED}</span> + </a> + <!-- ENDIF --> + <br /> <!-- IF not S_IS_BOT --> <div class="responsive-show" style="display: none;"> @@ -166,13 +189,14 @@ <!-- IF .topicrow.pagination --> <div class="pagination"> + <span><i class="icon fa-clone fa-fw"></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> @@ -180,8 +204,8 @@ <!-- ENDIF --> <div class="responsive-hide"> - <!-- IF topicrow.S_HAS_POLL -->{POLL_IMG} <!-- ENDIF --> - <!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> + <!-- IF topicrow.S_HAS_POLL --><i class="icon fa-bar-chart fa-fw"></i><!-- ENDIF --> + <!-- IF topicrow.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw"></i><!-- 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> @@ -191,8 +215,15 @@ </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} {topicrow.LAST_POST_AUTHOR_FULL} + <!-- IF not S_IS_BOT --> + <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}"> + <i class="icon fa-external-link-square fa-fw icon-lightgray icon-md"></i><span class="sr-only">{VIEW_LATEST_POST}</span> + </a> + <!-- ENDIF --> + <br />{topicrow.LAST_POST_TIME} + </span> </dd> </dl> </li> @@ -228,17 +259,19 @@ <!-- 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"></i> + <!-- ELSE --> + <span>{L_BUTTON_NEW_TOPIC}</span> <i class="icon fa-pencil fa-fw"></i> + <!-- ENDIF --> + </a> - <!-- EVENT viewforum_buttons_bottom_after --> - </div> + <!-- EVENT viewforum_buttons_bottom_after --> <!-- ENDIF --> <div class="pagination"> diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html index ee1672c6c9..52733afbcf 100644 --- a/phpBB/styles/prosilver/template/viewonline_body.html +++ b/phpBB/styles/prosilver/template/viewonline_body.html @@ -3,7 +3,7 @@ <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 --> <!-- INCLUDE pagination.html --> @@ -49,7 +49,7 @@ <!-- 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 --> <!-- INCLUDE pagination.html --> diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 05a643482f..94486ef8a5 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -26,20 +26,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"></i> + <!-- ELSE --> + <span>{L_BUTTON_POST_REPLY}</span> <i class="icon fa-reply fa-fw"></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 +48,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" type="submit" title="{L_SEARCH}"> + <i class="icon fa-search fa-fw"></i><span>{L_SEARCH}</span> + </button> + <a href="{U_SEARCH}" class="button" title="{L_SEARCH_ADV}"> + <i class="icon fa-cog fa-fw"></i><span>{L_SEARCH_ADV}</span> + </a> {S_SEARCH_LOCAL_HIDDEN_FIELDS} </fieldset> </form> @@ -174,8 +178,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"></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 --> @@ -226,32 +232,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 icon-button"> + <i class="icon fa-pencil fa-fw"></i><span>{L_BUTTON_EDIT}</span> + </a> </li> <!-- ENDIF --> <!-- IF postrow.U_DELETE --> <li> - <a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" class="button icon-button delete-icon"><span>{L_DELETE_POST}</span></a> + <a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" class="button icon-button"> + <i class="icon fa-times fa-fw"></i><span>{L_DELETE_POST}</span> + </a> </li> <!-- ENDIF --> <!-- IF postrow.U_REPORT --> <li> - <a href="{postrow.U_REPORT}" title="{L_REPORT_POST}" class="button icon-button report-icon"><span>{L_REPORT_POST}</span></a> + <a href="{postrow.U_REPORT}" title="{L_REPORT_POST}" class="button icon-button"> + <i class="icon fa-exclamation fa-fw"></i><span>{L_REPORT_POST}</span> + </a> </li> <!-- ENDIF --> <!-- IF postrow.U_WARN --> <li> - <a href="{postrow.U_WARN}" title="{L_WARN_USER}" class="button icon-button warn-icon"><span>{L_WARN_USER}</span></a> + <a href="{postrow.U_WARN}" title="{L_WARN_USER}" class="button icon-button"> + <i class="icon fa-exclamation-triangle fa-fw"></i><span>{L_WARN_USER}</span> + </a> </li> <!-- ENDIF --> <!-- IF postrow.U_INFO --> <li> - <a href="{postrow.U_INFO}" title="{L_INFORMATION}" class="button icon-button info-icon"><span>{L_INFORMATION}</span></a> + <a href="{postrow.U_INFO}" title="{L_INFORMATION}" class="button icon-button"> + <i class="icon fa-info fa-fw"></i><span>{L_INFORMATION}</span> + </a> </li> <!-- ENDIF --> <!-- IF postrow.U_QUOTE --> <li> - <a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}" class="button icon-button quote-icon"><span>{L_QUOTE}</span></a> + <a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}" class="button icon-button"> + <i class="icon fa-quote-left fa-fw"></i><span>{L_QUOTE}</span> + </a> </li> <!-- ENDIF --> <!-- EVENT viewtopic_body_post_buttons_after --> @@ -261,7 +279,16 @@ <!-- 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 icon-lightgray icon-md"></i><span class="sr-only">{postrow.MINI_POST}</span></span> + <!-- ELSE --> + <a href="{postrow.U_MINI_POST}" title="{postrow.MINI_POST}"> + <i class="icon fa-file fa-fw icon-lightgray icon-md"></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>{postrow.POST_DATE} + </p> <!-- EVENT viewtopic_body_postrow_post_details_after --> <!-- IF postrow.S_POST_UNAPPROVED --> @@ -328,7 +355,12 @@ </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"></i> + <span class="sr-only">{L_BACK_TO_TOP}</span> + </a> + </div> </div> </div> @@ -355,25 +387,29 @@ <!-- 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"></i> + <!-- ELSE --> + <span>{L_BUTTON_POST_REPLY}</span> <i class="icon fa-reply fa-fw"></i> + <!-- ENDIF --> </a> <!-- ENDIF --> - - <!-- EVENT viewtopic_buttons_bottom_after --> - </div> + <!-- EVENT viewtopic_buttons_bottom_after --> <!-- INCLUDE viewtopic_topic_tools.html --> <!-- IF .quickmod --> - <div class="dropdown-container dropdown-container-left 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 dropdown-trigger dropdown-select"> + <i class="icon fa-gavel fa-fw"></i><span class="sr-only">{L_QUICK_MOD}</span> + <span class="caret"><i class="icon fa-sort-down fa-fw"></i></span> + </span> + <div class="dropdown"> <div class="pointer"><div class="pointer-inner"></div></div> <ul class="dropdown-contents"> <!-- BEGIN quickmod --> diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html index 8378e3bcf4..55f742e944 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_PM_TOOLS}" class="button dropdown-trigger dropdown-select"> + <i class="icon fa-wrench fa-fw"></i> + <span class="caret"><i class="icon fa-sort-down fa-fw"></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_FORUM -->fa-square-o<!-- ELSE -->fa-check-square-o<!-- ENDIF --> fa-fw"></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"></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"></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"></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"></i><span>{L_PRINT_TOPIC}</span> + </a> + </li> + <!-- ENDIF --> <!-- EVENT viewtopic_topic_tools_after --> </ul> </div> |