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

[ticket/12332] Fix displaying attachments with long file names

Browse source 
PHPBB3-12332
This commit is contained in:
Matt Friedman 2014-04-25 11:26:49 -07:00
parent fe768d460d
commit 770ab13cb0
8 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/adm/style/acp_logs.html
View file

@ -22,15 +22,15 @@
<div><br style="clear: both;" /></div>
<!-- IF .log -->
<table class="table1 zebra-table">
<table class="table1 zebra-table fixed-width-table">
<thead>
<tr>
<th>{L_USERNAME}</th>
<th>{L_IP}</th>
<th>{L_TIME}</th>
<th style="width: 15%;">{L_USERNAME}</th>
<th style="width: 15%;">{L_IP}</th>
<th style="width: 20%;">{L_TIME}</th>
<th>{L_ACTION}</th>
<!-- IF S_CLEARLOGS -->
<th>{L_MARK}</th>
<th style="width: 10%;">{L_MARK}</th>
<!-- ENDIF -->
</tr>
</thead>

5
phpBB/adm/style/admin.css
View file

@ -911,6 +911,11 @@ table.styles td.users, table td.mark {
text-align: center;
}
table.fixed-width-table {
table-layout: fixed;
width: 100%;
}
@media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
{
table.responsive, table.responsive tbody, table.responsive tr, table.responsive td {

2
phpBB/includes/acp/acp_attachments.php
View file

@ -1058,7 +1058,7 @@ class acp_attachments
$template->assign_block_vars('orphan', array(
'FILESIZE' => get_formatted_filesize($row['filesize']),
'FILETIME' => $user->format_date($row['filetime']),
'REAL_FILENAME' => utf8_basename($row['real_filename']),
'REAL_FILENAME' => utf8_wordwrap(utf8_basename((string) $row['real_filename']), 40, '<br />', true),
'PHYSICAL_FILENAME' => utf8_basename($row['physical_filename']),
'ATTACH_ID' => $row['attach_id'],
'POST_IDS' => (!empty($post_ids[$row['attach_id']])) ? $post_ids[$row['attach_id']] : '',

2
phpBB/includes/acp/acp_users.php
View file

@ -2082,7 +2082,7 @@ class acp_users
}
$template->assign_block_vars('attach', array(
'REAL_FILENAME' => $row['real_filename'],
'REAL_FILENAME' => utf8_wordwrap(utf8_basename((string) $row['real_filename']), 40, '<br />', true),
'COMMENT' => nl2br($row['attach_comment']),
'EXTENSION' => $row['extension'],
'SIZE' => get_formatted_filesize($row['filesize']),

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

@ -35,7 +35,7 @@
<tbody class="responsive-skip-empty" id="file-list">
<tr class="attach-row" id="attach-row-tpl">
<td class="attach-name">
<span class="file-name"></span>
<span class="file-name ellipsis-text"></span>
<span class="attach-controls">
<input type="button" value="{L_PLACE_INLINE}" class="button2 hidden file-inline-bbcode" />&nbsp;
<input type="button" value="{L_DELETE_FILE}" class="button2 file-delete" />
@ -58,7 +58,7 @@
<!-- BEGIN attach_row -->
<tr class="attach-row" data-attach-id="{attach_row.ATTACH_ID}">
<td class="attach-name">
<span class="file-name"><a href="{attach_row.U_VIEW_ATTACHMENT}">{attach_row.FILENAME}</a></span>
<span class="file-name ellipsis-text"><a href="{attach_row.U_VIEW_ATTACHMENT}">{attach_row.FILENAME}</a></span>
<span class="attach-controls">
<!-- IF S_INLINE_ATTACHMENT_OPTIONS --><input type="button" value="{L_PLACE_INLINE}" class="button2 file-inline-bbcode" />&nbsp; <!-- ENDIF -->
<input type="submit" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" class="button2 file-delete" />

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

@ -38,7 +38,7 @@
<dl>
<dt>
<div class="list-inner">
<a href="{attachrow.U_VIEW_ATTACHMENT}" class="topictitle">{attachrow.FILENAME}</a> ({attachrow.SIZE})<br />
<a href="{attachrow.U_VIEW_ATTACHMENT}" class="topictitle attachment-filename ellipsis-text" title="{attachrow.FILENAME}">{attachrow.FILENAME}</a> ({attachrow.SIZE})<br />
<!-- IF attachrow.S_IN_MESSAGE -->{L_PM}{L_COLON} <!-- ELSE -->{L_TOPIC}{L_COLON} <!-- ENDIF --><a href="{attachrow.U_VIEW_TOPIC}">{attachrow.TOPIC_TITLE}</a>
</div>
</dt>

11
phpBB/styles/prosilver/theme/content.css
View file

@ -779,6 +779,17 @@ div.dl_links {
display: inline-block;
}
.attachment-filename {
width: 100%;
}
.ellipsis-text {
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
/* Show scrollbars for items with overflow on iOS devices
----------------------------------------*/
.postbody .content::-webkit-scrollbar, #topicreview::-webkit-scrollbar, #post_details::-webkit-scrollbar, .codebox code::-webkit-scrollbar, .attachbox dd::-webkit-scrollbar, .attach-image::-webkit-scrollbar, .dropdown-extended ul::-webkit-scrollbar {

5
phpBB/styles/prosilver/theme/plupload.css
View file

@ -74,3 +74,8 @@
height: 16px;
width: 16px;
}
.file-name {
max-width: 65%;
vertical-align: bottom;
}