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

Merge remote-tracking branch 'VSEphpbb/ticket/12332' into develop-ascraeus

Browse source 
* VSEphpbb/ticket/12332:
  [ticket/12332] Add missing semicolon to inline styling
  [ticket/12332] Adjust size of mark column where too wide
  [ticket/12332] Adjust column widths for responsive changes
  [ticket/12332] Restore some changes back to original state
  [ticket/12332] Add break-word to fixed width table CSS
  [ticket/12332] Accomplish all word creaking in template and CSS
  [ticket/12332] Remove width sizing, as it is already set
  [ticket/12332] Fix displaying attachments with long file names
This commit is contained in:
Cesar G 2014-05-05 16:51:29 -07:00
commit 71379c3a0f
9 changed files with 46 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
phpBB/adm/style/acp_attachments.html
View file

@ -331,15 +331,15 @@
<fieldset class="tabulated"> <fieldset class="tabulated">
<legend>{L_TITLE}</legend> <legend>{L_TITLE}</legend>
<table class="table1 zebra-table"> <table class="table1 zebra-table fixed-width-table">
<thead> <thead>
<tr> <tr>
<th>{L_FILENAME}</th> <th>{L_FILENAME}</th>
<th>{L_FILEDATE}</th> <th style="width: 15%;">{L_FILEDATE}</th>
<th>{L_FILESIZE}</th> <th style="width: 15%;">{L_FILESIZE}</th>
<th>{L_ATTACH_POST_ID}</th> <th style="width: 15%;">{L_ATTACH_POST_ID}</th>
<th>{L_ATTACH_TO_POST}</th> <th style="width: 15%;">{L_ATTACH_TO_POST}</th>
<th>{L_DELETE}</th> <th style="width: 15%;">{L_DELETE}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -348,7 +348,7 @@
<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td> <td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>
<td>{orphan.FILETIME}</td> <td>{orphan.FILETIME}</td>
<td>{orphan.FILESIZE}</td> <td>{orphan.FILESIZE}</td>
<td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="number" name="post_id[{orphan.ATTACH_ID}]" size="7" maxlength="10" value="{orphan.POST_ID}" /></td> <td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="number" name="post_id[{orphan.ATTACH_ID}]" maxlength="10" value="{orphan.POST_ID}" style="width: 75%;" /></td>
<td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]" /></td> <td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]" /></td>
<td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]" /></td> <td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]" /></td>
</tr> </tr>
@ -390,13 +390,13 @@
</div> </div>
<!-- IF .attachments --> <!-- IF .attachments -->
<table class="table1 zebra-table"> <table class="table1 zebra-table fixed-width-table">
<thead> <thead>
<tr> <tr>
<th>{L_FILENAME}</th> <th>{L_FILENAME}</th>
<th>{L_POSTED}</th> <th style="width: 15%;">{L_POSTED}</th>
<th class="centered-text">{L_FILESIZE}</th> <th style="width: 15%;" class="centered-text">{L_FILESIZE}</th>
<th class="centered-text">{L_MARK}</th> <th style="width: 10%;" class="centered-text">{L_MARK}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

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

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

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

@ -164,14 +164,14 @@
</div> </div>
<!-- IF .attach --> <!-- IF .attach -->
<table class="table1 zebra-table"> <table class="table1 zebra-table fixed-width-table">
<thead> <thead>
<tr> <tr>
<th>{L_FILENAME}</th> <th>{L_FILENAME}</th>
<th>{L_POST_TIME}</th> <th style="width: 20%;">{L_POST_TIME}</th>
<th>{L_FILESIZE}</th> <th style="width: 20%;">{L_FILESIZE}</th>
<th>{L_DOWNLOADS}</th> <th style="width: 20%;">{L_DOWNLOADS}</th>
<th>{L_MARK}</th> <th style="width: 50px;">{L_MARK}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

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

@ -911,6 +911,11 @@ table.styles td.users, table td.mark {
text-align: center; text-align: center;
} }
table.fixed-width-table {
table-layout: fixed;
word-break: break-word;
}
@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) @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 { table.responsive, table.responsive tbody, table.responsive tr, table.responsive td {

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

@ -1222,7 +1222,7 @@ class acp_attachments
'ATTACHMENT_POSTER' => get_username_string('full', (int) $row['poster_id'], (string) $row['username'], (string) $row['user_colour'], (string) $row['username']), 'ATTACHMENT_POSTER' => get_username_string('full', (int) $row['poster_id'], (string) $row['username'], (string) $row['user_colour'], (string) $row['username']),
'FILESIZE' => get_formatted_filesize((int) $row['filesize']), 'FILESIZE' => get_formatted_filesize((int) $row['filesize']),
'FILETIME' => $user->format_date((int) $row['filetime']), 'FILETIME' => $user->format_date((int) $row['filetime']),
'REAL_FILENAME' => (!$row['in_message']) ? utf8_wordwrap(utf8_basename((string) $row['real_filename']), 40, '<br />', true) : '', 'REAL_FILENAME' => (!$row['in_message']) ? utf8_basename((string) $row['real_filename']) : '',
'PHYSICAL_FILENAME' => utf8_basename((string) $row['physical_filename']), 'PHYSICAL_FILENAME' => utf8_basename((string) $row['physical_filename']),
'EXT_GROUP_NAME' => (!empty($extensions[$row['extension']]['group_name'])) ? $user->lang['EXT_GROUP_' . $extensions[$row['extension']]['group_name']] : '', 'EXT_GROUP_NAME' => (!empty($extensions[$row['extension']]['group_name'])) ? $user->lang['EXT_GROUP_' . $extensions[$row['extension']]['group_name']] : '',
'COMMENT' => $comment, 'COMMENT' => $comment,

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

@ -35,7 +35,7 @@
<tbody class="responsive-skip-empty" id="file-list"> <tbody class="responsive-skip-empty" id="file-list">
<tr class="attach-row" id="attach-row-tpl"> <tr class="attach-row" id="attach-row-tpl">
<td class="attach-name"> <td class="attach-name">
<span class="file-name"></span> <span class="file-name ellipsis-text"></span>
<span class="attach-controls"> <span class="attach-controls">
<input type="button" value="{L_PLACE_INLINE}" class="button2 hidden file-inline-bbcode" />&nbsp; <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" /> <input type="button" value="{L_DELETE_FILE}" class="button2 file-delete" />
@ -58,7 +58,7 @@
<!-- BEGIN attach_row --> <!-- BEGIN attach_row -->
<tr class="attach-row" data-attach-id="{attach_row.ATTACH_ID}"> <tr class="attach-row" data-attach-id="{attach_row.ATTACH_ID}">
<td class="attach-name"> <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"> <span class="attach-controls">
<!-- IF S_INLINE_ATTACHMENT_OPTIONS --><input type="button" value="{L_PLACE_INLINE}" class="button2 file-inline-bbcode" />&nbsp; <!-- ENDIF --> <!-- 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" /> <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> <dl>
<dt> <dt>
<div class="list-inner"> <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> <!-- 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> </div>
</dt> </dt>

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

@ -793,6 +793,17 @@ div.dl_links {
display: inline-block; 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 /* 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 { .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; height: 16px;
width: 16px; width: 16px;
} }
.file-name {
max-width: 65%;
vertical-align: bottom;
}