makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 19:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12613] Remove unnecessary checks and clean up CSS

Browse source 
PHPBB3-12613
This commit is contained in:
PayBas 2014-06-13 12:21:04 +02:00
parent 86a320ff5c
commit 7c527adee8
16 changed files with 62 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,10 +10,9 @@
<div class="panel">
<div class="inner">
<!-- IF .pagination or TOTAL_TOPICS -->
<div class="action-bar">
<div class="pagination">
<!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF -->
{TOTAL_TOPICS}
<!-- IF .pagination -->
<!-- INCLUDE pagination.html -->
<!-- ELSE -->
@ -21,7 +20,6 @@
<!-- ENDIF -->
</div>
</div>
<!-- ENDIF -->
<!-- IF .topicrow -->
<ul class="topiclist<!-- IF S_MERGE_SELECT --> missing-column<!-- ENDIF -->">
@ -103,10 +101,9 @@
<hr />
<!-- IF .pagination or TOTAL_TOPICS -->
<div class="action-bar">
<div class="pagination">
<!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF -->
{TOTAL_TOPICS}
<!-- IF .pagination -->
<!-- INCLUDE pagination.html -->
<!-- ELSE -->
@ -114,7 +111,6 @@
<!-- ENDIF -->
</div>
</div>
<!-- ENDIF -->
</div>
</div>

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

@ -9,16 +9,14 @@
<div class="action-bar">
{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
<!-- IF .pagination or TOTAL -->
<div class="pagination">
<!-- IF TOTAL -->{TOTAL}<!-- ENDIF -->
{TOTAL}
<!-- IF .pagination -->
<!-- INCLUDE pagination.html -->
<!-- ELSE -->
&bull; {PAGE_NUMBER}
<!-- ENDIF -->
</div>
<!-- ENDIF -->
</div>
<table class="table1">
@ -62,10 +60,9 @@
<hr />
<!-- IF .pagination or TOTAL -->
<div class="action-bar">
<div class="pagination">
<!-- IF TOTAL -->{TOTAL}<!-- ENDIF -->
{TOTAL}
<!-- IF .pagination -->
<!-- INCLUDE pagination.html -->
<!-- ELSE -->
@ -73,7 +70,6 @@
<!-- ENDIF -->
</div>
</div>
<!-- ENDIF -->
{S_FORM_TOKEN}
</div>

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

@ -52,16 +52,14 @@
<div class="action-bar">
{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
<!-- IF .pagination or TOTAL_REPORTS -->
<div class="pagination">
<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS}<!-- ENDIF -->
{TOTAL_REPORTS}
<!-- IF .pagination -->
<!-- INCLUDE pagination.html -->
<!-- ELSE -->
&bull; {PAGE_NUMBER}
<!-- ENDIF -->
</div>
<!-- ENDIF -->
</div>
<table class="table1">
@ -102,10 +100,9 @@
<hr />
<!-- IF .pagination or TOTAL_REPORTS -->
<div class="action-bar">
<div class="pagination">
<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS}<!-- ENDIF -->
{TOTAL_REPORTS}
<!-- IF .pagination -->
<!-- INCLUDE pagination.html -->
<!-- ELSE -->
@ -113,7 +110,6 @@
<!-- ENDIF -->
</div>
</div>
<!-- ENDIF -->
</div>
</div>

4
phpBB/styles/prosilver/template/mcp_topic.html
View file

@ -150,10 +150,9 @@
<hr />
<!-- IF .pagination or TOTAL_POSTS -->
<div class="action-bar">
<div class="pagination">
<!-- IF TOTAL_POSTS -->{TOTAL_POSTS}<!-- ENDIF -->
{TOTAL_POSTS}
<!-- IF .pagination -->
<!-- INCLUDE pagination.html -->
<!-- ELSE -->
@ -161,7 +160,6 @@
<!-- ENDIF -->
</div>
</div>
<!-- ENDIF -->
</div>
</div>

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

@ -148,7 +148,6 @@
</form>
<!-- IF .pagination or TOTAL_USERS -->
<div class="action-bar">
<div class="pagination">
{TOTAL_USERS}
@ -159,7 +158,6 @@
<!-- ENDIF -->
</div>
</div>
<!-- ENDIF -->
<!-- IF S_IN_SEARCH_POPUP -->
<!-- INCLUDE simple_footer.html -->

8
phpBB/styles/prosilver/template/posting_smilies.html
View file

@ -17,11 +17,11 @@
</div>
</div>
<div class="pagination">
<!-- IF .pagination -->
<!-- IF .pagination -->
<div class="pagination">
<!-- INCLUDE pagination.html -->
<!-- ENDIF -->
</div>
</div>
<!-- ENDIF -->
<a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>
<!-- INCLUDE simple_footer.html -->

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

@ -10,11 +10,9 @@
<p>{L_ATTACHMENTS_EXPLAIN}</p>
<!-- IF .attachrow -->
<!-- IF .pagination or TOTAL_ATTACHMENTS -->
<div class="action-bar">
<div class="pagination">
<!-- IF TOTAL_ATTACHMENTS -->{TOTAL_ATTACHMENTS} {L_TITLE}<!-- ENDIF -->
{TOTAL_ATTACHMENTS} {L_TITLE}
<!-- IF .pagination -->
<!-- INCLUDE pagination.html -->
<!-- ELSE -->
@ -22,7 +20,6 @@
<!-- ENDIF -->
</div>
</div>
<!-- ENDIF -->
<ul class="topiclist">
<li class="header">
@ -61,11 +58,10 @@
</fieldset>
<hr />
<!-- IF .pagination or TOTAL_ATTACHMENTS -->
<div class="action-bar">
<div class="pagination">
<!-- IF TOTAL_ATTACHMENTS -->{TOTAL_ATTACHMENTS} {L_TITLE}<!-- ENDIF -->
{TOTAL_ATTACHMENTS} {L_TITLE}
<!-- IF .pagination -->
<!-- INCLUDE pagination.html -->
<!-- ELSE -->
@ -73,7 +69,6 @@
<!-- ENDIF -->
</div>
</div>
<!-- ENDIF -->
<!-- ELSE -->
<p><strong>{L_UCP_NO_ATTACHMENTS}</strong></p>

4
phpBB/styles/prosilver/template/ucp_main_bookmarks.html
View file

@ -76,10 +76,9 @@
<!-- END topicrow -->
</ul>
<!-- IF .pagination or TOTAL_TOPICS -->
<div class="action-bar">
<div class="pagination">
<!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF -->
{TOTAL_TOPICS}
<!-- IF .pagination -->
<!-- INCLUDE pagination.html -->
<!-- ELSE -->
@ -87,7 +86,6 @@
<!-- ENDIF -->
</div>
</div>
<!-- ENDIF -->
<!-- ELSE -->
<p><strong>{L_NO_BOOKMARKS}</strong></p>

4
phpBB/styles/prosilver/template/ucp_main_subscribed.html
View file

@ -110,10 +110,9 @@
<!-- END topicrow -->
</ul>
<!-- IF .pagination or TOTAL_TOPICS -->
<div class="action-bar">
<div class="pagination">
<!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF -->
{TOTAL_TOPICS}
<!-- IF .pagination -->
<!-- INCLUDE pagination.html -->
<!-- ELSE -->
@ -121,7 +120,6 @@
<!-- ENDIF -->
</div>
</div>
<!-- ENDIF -->
<!-- ELSEIF S_TOPIC_NOTIFY -->
<ul class="topiclist">

24
phpBB/styles/prosilver/template/ucp_notifications.html
View file

@ -42,11 +42,10 @@
</table>
<!-- ELSE -->
<!-- IF .notification_list -->
<!-- IF .pagination or TOTAL_COUNT -->
<div class="topic-actions">
<div class="pagination">
<!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}">{L_NOTIFICATIONS_MARK_ALL_READ}</a> &bull; <!-- ENDIF -->
<!-- IF TOTAL_COUNT -->{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>]<!-- ENDIF -->
{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>]
<!-- IF .pagination -->
<!-- INCLUDE pagination.html -->
<!-- ELSE -->
@ -54,7 +53,6 @@
<!-- ENDIF -->
</div>
</div>
<!-- ENDIF -->
<div class="notification_list">
<ul class="topiclist two-columns">
@ -91,18 +89,16 @@
</ul>
</div>
<!-- IF .pagination or TOTAL_COUNT -->
<div class="topic-actions">
<div class="pagination">
<!-- IF TOTAL_COUNT -->{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>]<!-- ENDIF -->
<!-- IF .pagination -->
<!-- INCLUDE pagination.html -->
<!-- ELSE -->
&bull; {PAGE_NUMBER}
<!-- ENDIF -->
</div>
<div class="topic-actions">
<div class="pagination">
{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>]
<!-- IF .pagination -->
<!-- INCLUDE pagination.html -->
<!-- ELSE -->
&bull; {PAGE_NUMBER}
<!-- ENDIF -->
</div>
<!-- ENDIF -->
</div>
<!-- ELSE -->
<p><strong>{L_NO_NOTIFICATIONS}</strong></p>

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

@ -48,7 +48,7 @@
<!-- IF S_VIEW_MESSAGE -->
<a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO_FOLDER}</a>
<!-- ELSEIF FOLDER_CUR_MESSAGES neq 0 -->
<!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES}<!-- ENDIF -->
{TOTAL_MESSAGES}
<!-- IF .pagination -->
<!-- INCLUDE pagination.html -->
<!-- ELSE -->

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

@ -104,10 +104,9 @@
<hr />
<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
<div class="action-bar">
<div class="pagination">
<!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES}<!-- ENDIF -->
{TOTAL_MESSAGES}
<!-- IF .pagination -->
<!-- INCLUDE pagination.html -->
<!-- ELSE -->
@ -115,7 +114,6 @@
<!-- ENDIF -->
</div>
</div>
<!-- ENDIF -->
<!-- ENDIF -->
</div>

15
phpBB/styles/prosilver/theme/bidi.css
View file

@ -208,7 +208,7 @@
float: left;
}
.rtl .pagination ul {
.rtl .pagination > ul {
margin-left: 0;
margin-right: 5px;
}
@ -217,19 +217,18 @@
.rtl .row .pagination {
background-position: 100% 50%;
float: left;
padding: 1px 15px 1px 0;
padding-left: 0;
padding-right: 15px;
}
.rtl .row .pagination > ul {
margin: 0;
}
.rtl .pagination span {
direction: ltr;
}
.rtl .pagination span.page-sep {
display: inline;
visibility: hidden;
position: absolute;
}
.pagination li.page-jump {
margin-left: 5px;
margin-right: 0;

13
phpBB/styles/prosilver/theme/colours.css
View file

@ -159,7 +159,7 @@ dl.details dd {
/* Pagination
---------------------------------------- */
.pagination li a, li .pagination li a {
.pagination li a {
color: #5C758C;
background-color: #ECEDEE;
border-color: #B4BAC0;
@ -176,8 +176,7 @@ dl.details dd {
border-color: #4692BF;
}
.pagination li a:hover, .pagination .active a:hover,
.pagination .dropdown-visible a.dropdown-trigger, .nojs .pagination .dropdown-container:hover a.dropdown-trigger {
.pagination li a:hover, .pagination .dropdown-visible a.dropdown-trigger, .nojs .pagination .dropdown-container:hover a.dropdown-trigger {
border-color: #368AD2;
background-color: #368AD2;
color: #FFFFFF;
@ -192,14 +191,6 @@ dl.details dd {
background-image: url("./images/icon_pages.gif");
}
.row .pagination span a, li.pagination span a {
background-color: #FFFFFF;
}
.row .pagination span a:hover, li.pagination span a:hover {
background-color: #368AD2;
}
/* Miscellaneous styles
---------------------------------------- */

56
phpBB/styles/prosilver/theme/common.css
View file

@ -812,33 +812,25 @@ fieldset.fields1 dl.pmlist dd.recipients {
width: auto;
}
li.pagination {
margin-top: 0;
}
.pagination img {
vertical-align: middle;
}
.pagination ul {
.pagination > ul {
display: inline-block;
list-style: none !important;
margin-left: 5px;
}
li.pagination ul {
margin-top: -2px;
vertical-align: middle;
}
.pagination ul li, dl .pagination ul li, dl.icon .pagination ul li {
display: inline-block;
.pagination > ul > li {
display: inline-block !important;
padding: 0;
font-size: 100%;
line-height: normal;
vertical-align: middle;
}
.pagination li a, .pagination li span, li .pagination li a, li .pagination li span, .pagination li.active span, .pagination li.ellipsis span {
.pagination li a, .pagination li span {
border: 1px solid transparent;
border-radius: 2px;
display: block;
@ -861,6 +853,7 @@ li.pagination ul {
}
.pagination li.page-jump a, .pagination li.next a, .pagination li.previous a {
background-repeat: no-repeat;
font-size: 0;
height: 13px;
width: 11px;
@ -868,36 +861,45 @@ li.pagination ul {
.pagination li.page-jump a {
background-position: 0 2px;
background-repeat: no-repeat;
width: 24px;
}
.pagination li.next a {
background-position: -50px 2px;
background-repeat: no-repeat;
}
.pagination li.previous a {
background-position: -30px 2px;
background-repeat: no-repeat;
}
.pagination li.page-jump a:hover, .pagination .dropdown-visible a.dropdown-trigger, .nojs .pagination .dropdown-container:hover a.dropdown-trigger { background-position: 0 -18px; }
.pagination li.next a:hover { background-position: -50px -18px; }
.pagination li.previous a:hover { background-position: -30px -18px; }
/* Memberlist search */
li.pagination {
margin-top: 0;
}
li.pagination > ul {
margin-top: -2px;
vertical-align: middle;
}
/* Pagination in viewforum for multipage topics */
.row .pagination {
display: block;
float: right;
width: auto;
margin-top: 0;
padding: 1px 0 1px 8px;
padding: 1px 0 1px 15px;
font-size: 0.9em;
background: none 0 50% no-repeat;
}
li .pagination li a, li .pagination li span {
.row .pagination > ul {
margin: 0;
}
.row .pagination li a, .row .pagination li span {
border-radius: 1px;
padding: 1px;
}
@ -1207,20 +1209,6 @@ form > p.post-notice strong {
bottom: 20px;
}
.dropdown-page-jump .dropdown-contents {
margin: 0;
}
.dropdown-page-jump ul.dropdown-contents {
display: inherit;
}
.dropdown-page-jump .dropdown-contents li {
display: list-item;
padding-bottom: 4px;
padding-top: 4px;
}
.dropdown-page-jump input.tiny {
width: 50px;
}

6
phpBB/styles/prosilver/theme/responsive.css
View file

@ -201,11 +201,11 @@ ul.topiclist li.row dt a.subforum {
margin: 5px 0;
}
.pagination ul {
margin-top: 5px;
.pagination > ul {
margin: 5px 0 0;
}
.row .pagination ul {
.row .pagination > ul {
margin-top: 0;
}