Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gui: Prevent text overflow in file lists (fixes #6268) (#6292)

This commit is contained in:
Tomasz Wilczyński 2020-05-03 02:34:28 +09:00 committed by GitHub
parent 2e3975e956
commit f560e8c850
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gui/default/assets/css/overrides.css
View File

@ -136,6 +136,11 @@ table.table-auto td {
max-width: 0px; max-width: 0px;
} }
/* Wrap long file paths to prevent text overflow. See issue #6268. */
.file-path {
word-break: break-all;
}
.folder-advanced { .folder-advanced {
padding: 1rem; padding: 1rem;
margin-bottom: 15px; margin-bottom: 15px;

2
gui/default/syncthing/device/globalChangesModalView.html
View File

@ -20,7 +20,7 @@
<td>{{changeEvent.data.action}}</td> <td>{{changeEvent.data.action}}</td>
<td>{{changeEvent.data.type}}</td> <td>{{changeEvent.data.type}}</td>
<td class="no-overflow-ellipse">{{folderLabel(changeEvent.data.folder)}}</td> <td class="no-overflow-ellipse">{{folderLabel(changeEvent.data.folder)}}</td>
<td class="no-overflow-ellipse">{{changeEvent.data.path}}</td> <td class="file-path no-overflow-ellipse">{{changeEvent.data.path}}</td>
<td class="no-overflow-ellipse">{{changeEvent.time | date:"yyyy-MM-dd HH:mm:ss"}}</td> <td class="no-overflow-ellipse">{{changeEvent.time | date:"yyyy-MM-dd HH:mm:ss"}}</td>
</tr> </tr>
</tbody> </tbody>

2
gui/default/syncthing/transfer/localChangedFilesModalView.html
View File

@ -11,7 +11,7 @@
</tr> </tr>
</thead> </thead>
<tr dir-paginate="file in localChanged.files | itemsPerPage: localChanged.perpage" current-page="localChanged.page" total-items="model[localChangedFolder].receiveOnlyTotalItems" pagination-id="localChanged"> <tr dir-paginate="file in localChanged.files | itemsPerPage: localChanged.perpage" current-page="localChanged.page" total-items="model[localChangedFolder].receiveOnlyTotalItems" pagination-id="localChanged">
<td>{{file.name}}</td> <td class="file-path">{{file.name}}</td>
<td><span ng-hide="file.type == 'DIRECTORY'">{{file.size | binary}}B</span></td> <td><span ng-hide="file.type == 'DIRECTORY'">{{file.size | binary}}B</span></td>
</tr> </tr>
</table> </table>

2
gui/default/syncthing/transfer/remoteNeededFilesModalView.html
View File

@ -22,7 +22,7 @@
</tr> </tr>
</thead> </thead>
<tr dir-paginate="file in remoteNeed[folder].files | itemsPerPage: remoteNeed[folder].perpage" current-page="remoteNeed[folder].page" total-items="completion[remoteNeedDevice.deviceID][folder].needItems" pagination-id="'remoteNeed-' + folder"> <tr dir-paginate="file in remoteNeed[folder].files | itemsPerPage: remoteNeed[folder].perpage" current-page="remoteNeed[folder].page" total-items="completion[remoteNeedDevice.deviceID][folder].needItems" pagination-id="'remoteNeed-' + folder">
<td>{{file.name}}</td> <td class="file-path">{{file.name}}</td>
<td><span ng-hide="file.type == 'DIRECTORY'">{{file.size | binary}}B</span></td> <td><span ng-hide="file.type == 'DIRECTORY'">{{file.size | binary}}B</span></td>
<td>{{file.modified | date:"yyyy-MM-dd HH:mm:ss"}}</td> <td>{{file.modified | date:"yyyy-MM-dd HH:mm:ss"}}</td>
<td ng-if="file.modifiedBy">{{friendlyNameFromShort(file.modifiedBy)}}</td> <td ng-if="file.modifiedBy">{{friendlyNameFromShort(file.modifiedBy)}}</td>