Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@marc1706
marc1706 committed Apr 19, 2021
2 parents 5e09e46 + de48b4d commit c093998
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 36 deletions.
19 changes: 11 additions & 8 deletions phpBB/styles/prosilver/template/mcp_forum.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,17 @@ <h2><a href="{U_VIEW_FORUM}">{L_FORUM}{L_COLON} {FORUM_NAME}</a></h2>
<!-- IF .topicrow.pagination -->
<div class="pagination">
<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>
<!-- ENDIF -->
<!-- END pagination -->
<!-- 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>{{ lang('ELLIPSIS') }}</span></li>
<!-- ELSEIF topicrow.pagination.S_IS_NEXT -->
<!-- ELSE -->
<li><a class="button" href="{{ topicrow.pagination.PAGE_URL }}" role="button">{{ topicrow.pagination.PAGE_NUMBER }}</a></li>
<!-- ENDIF -->
<!-- END pagination -->
</ul>
</div>
<!-- ENDIF -->
Expand Down
2 changes: 1 addition & 1 deletion phpBB/styles/prosilver/template/pagination.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ul>
<!-- IF BASE_URL and TOTAL_PAGES > 6 -->
<li class="dropdown-container dropdown-button-control dropdown-page-jump page-jump">
<a class="button button-icon-only dropdown-trigger" href="#" title="{L_JUMP_TO_PAGE_CLICK}" role="button">{{ Icon('iconify', 'ic:outline-directions', PAGE_NUMBER, true, 'c-button-icon c-pagination-icon') }}
<a class="button button-icon-only dropdown-trigger" href="#" title="{L_JUMP_TO_PAGE_CLICK}" role="button">{{ Icon('iconify', 'ic:outline-directions', PAGE_NUMBER, true, 'c-button-icon c-pagination-icon') }}</a>
<div class="dropdown">
<div class="pointer"><div class="pointer-inner"></div></div>
<ul class="dropdown-contents">
Expand Down
19 changes: 11 additions & 8 deletions phpBB/styles/prosilver/template/ucp_main_bookmarks.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,17 @@ <h2>{L_TITLE}</h2>
<!-- IF .topicrow.pagination -->
<div class="pagination">
<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>
<!-- ENDIF -->
<!-- END pagination -->
<!-- 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>{{ lang('ELLIPSIS') }}</span></li>
<!-- ELSEIF topicrow.pagination.S_IS_NEXT -->
<!-- ELSE -->
<li><a class="button" href="{{ topicrow.pagination.PAGE_URL }}" role="button">{{ topicrow.pagination.PAGE_NUMBER }}</a></li>
<!-- ENDIF -->
<!-- END pagination -->
</ul>
</div>
<!-- ENDIF -->
Expand Down
20 changes: 12 additions & 8 deletions phpBB/styles/prosilver/template/ucp_main_front.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,19 @@ <h3>{L_IMPORTANT_NEWS}</h3>
<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a><br />
<!-- IF .topicrow.pagination -->
<div class="pagination">
<span>{{ Icon('iconify', 'fa:clone', '', true) }}</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>
<!-- ENDIF -->
<!-- END pagination -->
<!-- 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>{{ lang('ELLIPSIS') }}</span></li>
<!-- ELSEIF topicrow.pagination.S_IS_NEXT -->
<!-- ELSE -->
<li><a class="button" href="{{ topicrow.pagination.PAGE_URL }}" role="button">{{ topicrow.pagination.PAGE_NUMBER }}</a></li>
<!-- ENDIF -->
<!-- END pagination -->
</ul>
</div>
<!-- ENDIF -->
Expand Down
10 changes: 7 additions & 3 deletions phpBB/styles/prosilver/template/ucp_main_subscribed.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,17 @@ <h2>{L_TITLE}</h2>
<br />
<!-- IF .topicrow.pagination -->
<div class="pagination">
<span>{{ Icon('iconify', 'fa:clone', '', true) }}</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_CURRENT -->
<li class="active"><span>{{ topicrow.pagination.PAGE_NUMBER }}</span></li>
<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS -->
<li class="ellipsis"><span>{{ lang('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 }}" role="button">{{ topicrow.pagination.PAGE_NUMBER }}</a></li>
<!-- ENDIF -->
<!-- END pagination -->
</ul>
Expand Down
19 changes: 11 additions & 8 deletions phpBB/styles/prosilver/template/viewforum_body.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,14 +224,17 @@ <h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED --
<div class="pagination">
<span>{{ Icon('iconify', 'fa:clone', '', true) }}</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 class="button" href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a></li>
<!-- ENDIF -->
<!-- END pagination -->
<!-- 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>{{ lang('ELLIPSIS') }}</span></li>
<!-- ELSEIF topicrow.pagination.S_IS_NEXT -->
<!-- ELSE -->
<li><a class="button" href="{{ topicrow.pagination.PAGE_URL }}" role="button">{{ topicrow.pagination.PAGE_NUMBER }}</a></li>
<!-- ENDIF -->
<!-- END pagination -->
</ul>
</div>
<!-- ENDIF -->
Expand Down

0 comments on commit c093998

Please sign in to comment.