mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'Fyorl/feature/attach-dl' into develop

Browse Source 
* Fyorl/feature/attach-dl: (75 commits)
  [feature/attach-dl] Removed the use of some abbreviations
  [feature/attach-dl] Changed $files_added checks
  [feature/attach-dl] Renamed $post_id to $post_msg_id
  [feature/attach-dl] Fixed a comment
  [feature/attach-dl] Optimised an sql query
  [feature/attach-dl] Fixed the logic in an sql statement
  [feature/attch-dl] $forum_id cast to int
  [feature/attach-dl] Fixed $file_added to $files_added
  [feature/attach-dl] Moved definition of $archive_name
  [feature/attach-dl] Swapped the order of an if statement
  [feature/attach-dl] Cast variables to int
  [feature/attach-dl] Added $archive_path
  [feature/attach-dl] Used COMMA_SEPARATOR instead of actual comma
  [feature/attach-dl] Renamed $count to $files_added
  [feature/attach-dl] Removed sprintf() use
  [feature/attach-dl] Removed need for array_keys()
  [feature/attach-dl] Added multiple attachment downloads to PMs
  [feature/attach-dl] Removed reliance on current($row)
  [feature/attach-dl] Renamed to phpbb_download_handle_forum_auth
  [feature/attach-dl] Moved PM authentication handling into own function
  ...
This commit is contained in:
Andreas Fischer
2012-08-26 18:56:09 +02:00
parent 18039cfa6a e1a4aa3ea2
commit d0ce637251
9 changed files with 485 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
View File

@@ -41,12 +41,24 @@
<div class="content">{MESSAGE}</div>
<!-- IF S_HAS_ATTACHMENTS -->
<dl class="attachbox">
<dt>{L_ATTACHMENTS}</dt>
<!-- BEGIN attachment -->
<dd>{attachment.DISPLAY_ATTACHMENT}</dd>
<!-- END attachment -->
</dl>
<dl class="attachbox">
<dt>
{L_ATTACHMENTS}
<!-- IF S_HAS_MULTIPLE_ATTACHMENTS -->
<div class="dl_links">
<strong>{L_DOWNLOAD_ALL}:</strong>
<ul>
<!-- BEGIN dl_method -->
<li>[ <a href="{dl_method.LINK}">{dl_method.TYPE}</a> ]</li>
<!-- END dl_method -->
</ul>
</div>
<!-- ENDIF -->
</dt>
<!-- BEGIN attachment -->
<dd>{attachment.DISPLAY_ATTACHMENT}</dd>
<!-- END attachment -->
</dl>
<!-- ENDIF -->
<!-- IF S_DISPLAY_NOTICE -->

25
phpBB/styles/prosilver/template/viewtopic_body.html
View File

@@ -157,7 +157,19 @@
<!-- IF postrow.S_HAS_ATTACHMENTS -->
<dl class="attachbox">
<dt>{L_ATTACHMENTS}</dt>
<dt>
{L_ATTACHMENTS}
<!-- IF postrow.S_MULTIPLE_ATTACHMENTS -->
<div class="dl_links">
<strong>{L_DOWNLOAD_ALL}:</strong>
<ul>
<!-- BEGIN dl_method -->
<li>[ <a href="{postrow.dl_method.LINK}">{postrow.dl_method.TYPE}</a> ]</li>
<!-- END dl_method -->
</ul>
</div>
<!-- ENDIF -->
</dt>
<!-- BEGIN attachment -->
<dd>{postrow.attachment.DISPLAY_ATTACHMENT}</dd>
<!-- END attachment -->
@@ -256,6 +268,17 @@
<!-- ENDIF -->
</div>
<!-- IF S_HAS_ATTACHMENTS -->
<div class="dl_links">
<strong>{L_DOWNLOAD_ALL_ATTACHMENTS}:</strong>
<ul>
<!-- BEGIN dl_method -->
<li>[ <a href="{dl_method.LINK}">{dl_method.TYPE}</a> ]</li>
<!-- END dl_method -->
</ul>
</div>
<!-- ENDIF -->
<!-- IF .pagination or TOTAL_POSTS -->
<div class="pagination">
{TOTAL_POSTS} &bull;

23
phpBB/styles/prosilver/theme/content.css
View File

@@ -702,3 +702,26 @@ dl.pmlist dd {
margin-left: 61% !important;
margin-bottom: 2px;
}
.topic-actions div.dl_links {
padding: 10px 0 0 10px;
}
div.dl_links {
display: inline-block;
text-transform: none;
}
.dl_links strong {
font-weight: bold;
}
.dl_links ul {
list-style-type: none;
margin: 0;
display: inline-block;
}
.dl_links li {
display: inline-block;
}