makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/ticket_12649' into ticket_12649

Browse source 
PHPBB3-12649
This commit is contained in:
RMcGirr83 2015-11-04 11:05:25 -05:00
parent f518a57d0d
commit de984caf98
13 changed files with 59 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/styles/prosilver/template/mcp_forum.html
View file

@ -108,8 +108,9 @@
</ul> </ul>
<!-- ENDIF --> <!-- ENDIF -->
<div class="action-bar bar-bottom"> <div class="action-bar bottom">
<!-- INCLUDE display_options.html --> <!-- INCLUDE display_options.html -->
<div class="pagination"> <div class="pagination">
{TOTAL_TOPICS} {TOTAL_TOPICS}
<!-- IF .pagination --> <!-- IF .pagination -->

3
phpBB/styles/prosilver/template/mcp_logs.html
View file

@ -51,8 +51,9 @@
</table> </table>
<!-- IF .log --> <!-- IF .log -->
<div class="action-bar bar-bottom"> <div class="action-bar bottom">
<!-- INCLUDE display_options.html --> <!-- INCLUDE display_options.html -->
<div class="pagination"> <div class="pagination">
{TOTAL} {TOTAL}
<!-- IF .pagination --> <!-- IF .pagination -->

3
phpBB/styles/prosilver/template/mcp_notes_user.html
View file

@ -90,8 +90,9 @@
</tbody> </tbody>
</table> </table>
<div class="action-bar bar-bottom"> <div class="action-bar bottom">
<!-- INCLUDE display_options.html --> <!-- INCLUDE display_options.html -->
<div class="pagination"> <div class="pagination">
{TOTAL_REPORTS} {TOTAL_REPORTS}
<!-- IF .pagination --> <!-- IF .pagination -->

3
phpBB/styles/prosilver/template/mcp_queue.html
View file

@ -73,9 +73,10 @@
<!-- END postrow --> <!-- END postrow -->
</ul> </ul>
<div class="action-bar bar-bottom"> <div class="action-bar bottom">
<!-- INCLUDE display_options.html --> <!-- INCLUDE display_options.html -->
<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" onClick="document.getElementById('mcp').submit()" /> <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF --> <!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" onClick="document.getElementById('mcp').submit()" /> <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->
<div class="pagination"> <div class="pagination">
{TOTAL} {TOTAL}
<!-- IF .pagination --> <!-- IF .pagination -->

2
phpBB/styles/prosilver/template/mcp_reports.html
View file

@ -79,7 +79,7 @@
<!-- END postrow --> <!-- END postrow -->
</ul> </ul>
<div class="action-bar bar-bottom"> <div class="action-bar bottom">
<!-- INCLUDE display_options.html --> <!-- INCLUDE display_options.html -->
<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" onClick="document.getElementById('mcp').submit()" /> <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF --> <!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" onClick="document.getElementById('mcp').submit()" /> <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->

3
phpBB/styles/prosilver/template/mcp_warn_list.html
View file

@ -43,8 +43,9 @@
</tbody> </tbody>
</table> </table>
<div class="action-bar bar-bottom"> <div class="action-bar bottom">
<!-- INCLUDE display_options.html --> <!-- INCLUDE display_options.html -->
<div class="pagination"> <div class="pagination">
{TOTAL_USERS} {TOTAL_USERS}
<!-- IF .pagination --> <!-- IF .pagination -->

3
phpBB/styles/prosilver/template/ucp_attachments.html
View file

@ -10,7 +10,7 @@
<p>{L_ATTACHMENTS_EXPLAIN}</p> <p>{L_ATTACHMENTS_EXPLAIN}</p>
<!-- IF .attachrow --> <!-- IF .attachrow -->
<div class="action-bar bar-top"> <div class="action-bar top">
<div class="pagination"> <div class="pagination">
{NUM_ATTACHMENTS} {NUM_ATTACHMENTS}
<!-- IF .pagination --> <!-- IF .pagination -->
@ -52,6 +52,7 @@
<div class="action-bar bottom"> <div class="action-bar bottom">
<!-- INCLUDE display_options.html --> <!-- INCLUDE display_options.html -->
{S_FORM_TOKEN}
<div class="pagination"> <div class="pagination">
{TOTAL_ATTACHMENTS} {L_TITLE} {TOTAL_ATTACHMENTS} {L_TITLE}

3
phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
View file

@ -107,9 +107,10 @@
<hr /> <hr />
<div class="action-bar bar-bottom"> <div class="action-bar bottom">
<!-- INCLUDE display_options.html --> <!-- INCLUDE display_options.html -->
<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" /> <input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
<div class="pagination"> <div class="pagination">
{TOTAL_MESSAGES} {TOTAL_MESSAGES}
<!-- IF .pagination --> <!-- IF .pagination -->

6
phpBB/styles/prosilver/template/viewforum_body.html
View file

@ -270,6 +270,12 @@
</form> </form>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_SELECT_SORT_DAYS and not S_IS_BOT -->
<form method="post" action="{S_FORUM_ACTION}">
<!-- INCLUDE display_options.html -->
</form>
<!-- ENDIF -->
<div class="pagination"> <div class="pagination">
<!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}" data-ajax="mark_topics_read">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF --> <!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}" data-ajax="mark_topics_read">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF -->
{TOTAL_TOPICS} {TOTAL_TOPICS}

40
phpBB/styles/prosilver/theme/buttons.css
View file

@ -53,15 +53,41 @@
border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0;
} }
.search-header .button-search, .tools-icon:before, .modtools-icon:before, .search-icon:before, .search-adv-icon:before, .sort-icon:before {
.search-header .button-search-end { background-position: -80px 0;
border-top-width: 0; height: 16px;
border-bottom-width: 0; margin-top: 2px;
padding: 3px 5px; width: 16px;
} }
.search-header .button-search-end { .dropdown-visible .tools-icon:before,
border-right-width: 0; .nojs .dropdown-container:hover .tools-icon:before { background-position: -80px -20px; }
.sort-icon:before { background-position: -265px 0; }
.dropdown-visible .sort-icon:before,
.nojs .dropdown-container:hover .sort-icon:before { background-position: -265px -20px; }
.search-icon:before { background-position: -245px 0; }
.search-icon:hover:before { background-position: -245px -20px; }
.search-adv-icon:before { background-position: -265px 0; }
.search-adv-icon:hover:before { background-position: -265px -20px; }
.modtools-icon:before { background-position: -225px 0; }
.dropdown-visible .modtools-icon:before,
.nojs .dropdown-container:hover .modtools-icon:before { background-position: -225px -20px; }
/* Icon images
---------------------------------------- */
.small-icon {
background-position: 0 50%;
background-repeat: no-repeat;
background-image: none;
}
.small-icon > a {
display: inline-block;
padding: 0 0 0 18px;
} }
.sort-icon:before { .sort-icon:before {