From 3c920c61e93428a2e1c498c2561573c98a00ecbb Mon Sep 17 00:00:00 2001
From: Audrius Butkevicius <audrius.butkevicius@gmail.com>
Date: Mon, 26 Mar 2018 10:29:06 +0100
Subject: [PATCH] gui: Add folder label to global changes, use bootstrap table
 (fixes #4828) (#4838)

---
 gui/default/assets/css/overrides.css             | 15 ---------------
 .../syncthing/device/globalChangesModalView.html | 16 ++++++++++------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/gui/default/assets/css/overrides.css b/gui/default/assets/css/overrides.css
index 32bef71f3..069cc64c7 100644
--- a/gui/default/assets/css/overrides.css
+++ b/gui/default/assets/css/overrides.css
@@ -271,21 +271,6 @@ ul.three-columns li, ul.two-columns li {
     z-index: 980;
 }
 
-.globalChanges-path-col {
-  /* These are technically the same, but use both */
-  overflow-wrap: break-word;
-  word-wrap: break-word;
-
-  -ms-word-break: break-all;
-  /* This is the dangerous one in WebKit, as it breaks things wherever */
-  word-break: break-all;
-  /* Instead use this non-standard one: */
-  word-break: break-word;
-}
-.globalChanges-time-col {
-    width: 100px;
-}
-
 /** Footer nav on small devices **/
 @media (max-width: 1199px) {
     /* Stay at the end of the page, with space reserved for the footer
diff --git a/gui/default/syncthing/device/globalChangesModalView.html b/gui/default/syncthing/device/globalChangesModalView.html
index bfa3beeb5..60a8960b9 100644
--- a/gui/default/syncthing/device/globalChangesModalView.html
+++ b/gui/default/syncthing/device/globalChangesModalView.html
@@ -1,27 +1,31 @@
 <style> th, td { padding: 6px; } </style>
 <modal id="globalChanges" status="default" icon="{{'info-circle'}}" heading="{{'Recent Changes' | translate}}" large="yes" closeable="yes">
     <div class="modal-body">
-        <table>
-          <thead>          
+      <div class="table-responsive">
+        <table class="table-condensed table-striped table" style="table-layout: auto;">
+          <thead>
             <tr>
               <th translate>Device</th>
               <th translate>Action</th>
               <th translate>Type</th>
+              <th translate>Folder</th>
               <th translate>Path</th>
               <th translate>Time</th>
             </tr>
           </thead>
-          <tbody>          
+          <tbody>
             <tr ng-repeat="changeEvent in globalChangeEvents">
               <td ng-if="changeEvent.data.modifiedBy">{{friendlyNameFromShort(changeEvent.data.modifiedBy)}}</td>
               <td ng-if="!changeEvent.data.modifiedBy"><span translate>Unknown</span></td>
               <td>{{changeEvent.data.action}}</td>
               <td>{{changeEvent.data.type}}</td>
-              <td class="globalChanges-path-col">{{changeEvent.data.path}}</td>
-              <td class="globalChanges-time-col">{{changeEvent.time | date:"yyyy-MM-dd HH:mm:ss"}}</td>
+              <td class="no-overflow-ellipse">{{changeEvent.data.label}}</td>
+              <td class="no-overflow-ellipse">{{changeEvent.data.path}}</td>
+              <td class="no-overflow-ellipse">{{changeEvent.time | date:"yyyy-MM-dd HH:mm:ss"}}</td>
             </tr>
-          </tbody>        
+          </tbody>
         </table>
+      </div>
     </div>
     <div class="modal-footer">
         <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">