From 16c3d39fd244a27d0d66273518b6e0508da6f755 Mon Sep 17 00:00:00 2001 From: "Lars K.W. Gohlke" Date: Fri, 11 Mar 2016 09:48:46 +0000 Subject: [PATCH] Add folder label in addition to ID (fixes #966) An auto generated ID is suggested on folder creation to reduce conflicts with folders created on other devices. --- gui/default/assets/css/overrides.css | 4 + gui/default/index.html | 16 +- gui/default/syncthing/app.js | 17 ++- .../syncthing/core/syncthingController.js | 138 +++++++++--------- .../syncthing/device/editDeviceModalView.html | 7 +- .../syncthing/folder/editFolderModalView.html | 11 +- .../settings/advancedSettingsModalView.html | 7 +- .../angular-translate-handler-log.min.js | 6 + lib/auto/gui.files.go | 21 +-- lib/config/folderconfiguration.go | 1 + lib/model/model.go | 24 +-- lib/protocol/message.go | 1 + lib/protocol/message_xdr.go | 11 ++ 13 files changed, 160 insertions(+), 104 deletions(-) create mode 100644 gui/default/vendor/angular/angular-translate-handler-log.min.js diff --git a/gui/default/assets/css/overrides.css b/gui/default/assets/css/overrides.css index 7dca8a17..6b454127 100644 --- a/gui/default/assets/css/overrides.css +++ b/gui/default/assets/css/overrides.css @@ -141,6 +141,10 @@ table.table-condensed td { white-space: nowrap; } +table.table-condensed td.no-overflow-ellipse { + white-space: normal; +} + .folder-advanced{ background-color: hsla(0,0%,99%,1); border: 1px solid hsla(0, 0%, 95%, 1); diff --git a/gui/default/index.html b/gui/default/index.html index 74865654..ce87bd4a 100755 --- a/gui/default/index.html +++ b/gui/default/index.html @@ -165,16 +165,19 @@

- + {%device%} wants to share folder "{%folder%}". + + {%device%} wants to share folder "{%folderLabel%}" ({%folder%}). + Share this folder? Add new folder?