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

Merge pull request #2783 from hanakin/ticket/12862

Browse source 
[ticket/12862] Fix pop-up box wraps

* hanakin/ticket/12862:
  [ticket/12862] Remove remaining simple-wrap id
  [ticket/12862] Resize popups consistently
  [ticket/12862] Add Border
This commit is contained in:
Andreas Fischer 2014-08-23 11:40:37 +02:00
commit a79da361ee
8 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
<!-- INCLUDE simple_header.html --> <!-- INCLUDE simple_header.html -->
<h2 class="solo">{L_SEND_IM}</h2> <h2>{L_SEND_IM}</h2>
<form method="post" action="{S_IM_ACTION}"> <form method="post" action="{S_IM_ACTION}">

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

@ -65,7 +65,7 @@
<dl class="details"> <dl class="details">
<!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}{L_COLON}</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER}</a></dd><!-- ENDIF --> <!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}{L_COLON}</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER}</a></dd><!-- ENDIF -->
<!-- IF U_PM --><dt>{L_PM}{L_COLON}</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd><!-- ENDIF --> <!-- IF U_PM --><dt>{L_PM}{L_COLON}</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd><!-- ENDIF -->
<!-- IF U_JABBER and S_JABBER_ENABLED --><dt>{L_JABBER}{L_COLON}</dt> <dd><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_JABBER_MESSAGE}</a></dd><!-- ELSEIF USER_JABBER --><dt>{L_JABBER}{L_COLON}</dt> <dd>{USER_JABBER}</dd><!-- ENDIF --> <!-- IF U_JABBER and S_JABBER_ENABLED --><dt>{L_JABBER}{L_COLON}</dt> <dd><a href="{U_JABBER}" onclick="popup(this.href, 750, 320); return false;">{L_SEND_JABBER_MESSAGE}</a></dd><!-- ELSEIF USER_JABBER --><dt>{L_JABBER}{L_COLON}</dt> <dd>{USER_JABBER}</dd><!-- ENDIF -->
<!-- BEGIN custom_fields --> <!-- BEGIN custom_fields -->
<!-- IF custom_fields.S_PROFILE_CONTACT --> <!-- IF custom_fields.S_PROFILE_CONTACT -->
<dt>{custom_fields.PROFILE_FIELD_NAME}{L_COLON}</dt> <dt>{custom_fields.PROFILE_FIELD_NAME}{L_COLON}</dt>

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

@ -43,7 +43,7 @@
<!-- END smiley --> <!-- END smiley -->
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_SHOW_SMILEY_LINK and S_SMILIES_ALLOWED--> <!-- IF S_SHOW_SMILEY_LINK and S_SMILIES_ALLOWED-->
<br /><a href="{U_MORE_SMILIES}" onclick="popup(this.href, 300, 350, '_phpbbsmilies'); return false;">{L_MORE_SMILIES}</a> <br /><a href="{U_MORE_SMILIES}" onclick="popup(this.href, 750, 350, '_phpbbsmilies'); return false;">{L_MORE_SMILIES}</a>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF BBCODE_STATUS --> <!-- IF BBCODE_STATUS -->
@ -107,7 +107,7 @@
<a href="#tabs" data-subpanel="attach-panel" role="tab" aria-controls="attach-panel"> <a href="#tabs" data-subpanel="attach-panel" role="tab" aria-controls="attach-panel">
{L_ATTACHMENTS} <strong id="file-total-progress"><strong id="file-total-progress-bar"></strong></strong> {L_ATTACHMENTS} <strong id="file-total-progress"><strong id="file-total-progress-bar"></strong></strong>
</a> </a>
</li> </li>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_SHOW_POLL_BOX || S_POLL_DELETE --> <!-- IF S_SHOW_POLL_BOX || S_POLL_DELETE -->
<li id="poll-panel-tab" class="tab"> <li id="poll-panel-tab" class="tab">

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

@ -36,6 +36,6 @@
<!-- EVENT simple_header_body_before --> <!-- EVENT simple_header_body_before -->
<div id="simple-wrap"> <div id="wrap">
<a id="top" class="anchor" accesskey="t"></a> <a id="top" class="anchor" accesskey="t"></a>
<div id="page-body"> <div id="page-body">

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

@ -55,7 +55,7 @@
<!-- IF REMAINDER eq 0 --> <!-- IF REMAINDER eq 0 -->
<div> <div>
<!-- ENDIF --> <!-- ENDIF -->
<a href="<!-- IF contact.U_CONTACT -->{contact.U_CONTACT}<!-- ELSE -->{contact.U_PROFILE_AUTHOR}<!-- ENDIF -->" title="{contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF contact.ID eq 'jabber' --> onclick="popup(this.href, 550, 320); return false;"<!-- ENDIF -->> <a href="<!-- IF contact.U_CONTACT -->{contact.U_CONTACT}<!-- ELSE -->{contact.U_PROFILE_AUTHOR}<!-- ENDIF -->" title="{contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF contact.ID eq 'jabber' --> onclick="popup(this.href, 750, 320); return false;"<!-- ENDIF -->>
<span class="contact-icon {contact.ID}-icon">{contact.NAME}</span> <span class="contact-icon {contact.ID}-icon">{contact.NAME}</span>
</a> </a>
<!-- IF REMAINDER eq 3 or contact.S_LAST_ROW --> <!-- IF REMAINDER eq 3 or contact.S_LAST_ROW -->

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

@ -1,14 +1,10 @@
<!-- INCLUDE simple_header.html --> <!-- INCLUDE simple_header.html -->
<h2 class="whois-title">{L_WHOIS}</h2> <h2>{L_WHOIS}</h2>
<div class="panel"> <div class="panel">
<div class="inner"> <div class="inner">
<pre>{WHOIS}</pre>
<div class="postbody"><div class="content">
<pre>{WHOIS}</pre>
</div></div>
</div> </div>
</div> </div>
<a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a> <a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>

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

@ -51,7 +51,7 @@
<!-- IF .pagination or TOTAL_POSTS --> <!-- IF .pagination or TOTAL_POSTS -->
<div class="pagination"> <div class="pagination">
<!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}" class="mark">{L_VIEW_UNREAD_POST}</a> &bull; <!-- ENDIF -->{TOTAL_POSTS} <!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}" class="mark">{L_VIEW_UNREAD_POST}</a> &bull; <!-- ENDIF -->{TOTAL_POSTS}
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
@ -169,7 +169,7 @@
<!-- IF REMAINDER eq 0 --> <!-- IF REMAINDER eq 0 -->
<div> <div>
<!-- ENDIF --> <!-- ENDIF -->
<a href="<!-- IF postrow.contact.U_CONTACT -->{postrow.contact.U_CONTACT}<!-- ELSE -->{postrow.contact.U_PROFILE_AUTHOR}<!-- ENDIF -->" title="{postrow.contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF postrow.contact.ID eq 'jabber' --> onclick="popup(this.href, 550, 320); return false;"<!-- ENDIF -->> <a href="<!-- IF postrow.contact.U_CONTACT -->{postrow.contact.U_CONTACT}<!-- ELSE -->{postrow.contact.U_PROFILE_AUTHOR}<!-- ENDIF -->" title="{postrow.contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF postrow.contact.ID eq 'jabber' --> onclick="popup(this.href, 750, 320); return false;"<!-- ENDIF -->>
<span class="contact-icon {postrow.contact.ID}-icon">{postrow.contact.NAME}</span> <span class="contact-icon {postrow.contact.ID}-icon">{postrow.contact.NAME}</span>
</a> </a>
<!-- IF REMAINDER eq 3 or postrow.contact.S_LAST_ROW --> <!-- IF REMAINDER eq 3 or postrow.contact.S_LAST_ROW -->
@ -361,7 +361,7 @@
<!-- IF .pagination or TOTAL_POSTS --> <!-- IF .pagination or TOTAL_POSTS -->
<div class="pagination"> <div class="pagination">
{TOTAL_POSTS} {TOTAL_POSTS}
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->

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

@ -189,10 +189,6 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul {
} }
} }
#simple-wrap {
padding: 6px 0;
}
#page-body { #page-body {
margin: 4px 0; margin: 4px 0;
clear: both; clear: both;