Text and layout tweaks

gui/app.js

@@ -896,6 +896,8 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
         $('#editIgnoresButton').attr('disabled', 'disabled');
         $http.get(urlbase + '/ignores?repo=' + encodeURIComponent($scope.currentRepo.ID))
             .success(function (data) {
+                data.ignore = data.ignore || [];
+
                 $('#editRepo').modal('hide');
                 var textArea = $('#editIgnores textarea');
 

gui/index.html

@@ -522,7 +522,7 @@
           <button type="button" class="btn btn-primary btn-sm" ng-click="saveRepo()" ng-disabled="repoEditor.$invalid"><span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>Save</span></button>
           <button type="button" class="btn btn-default btn-sm" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span>&emsp;<span translate>Close</span></button>
           <button ng-if="editingExisting" type="button" class="btn btn-danger pull-left btn-sm" ng-click="deleteRepo()"><span class="glyphicon glyphicon-minus"></span>&emsp;<span translate>Delete</span></button>
-          <button id="editIgnoresButton" ng-if="editingExisting" type="button" class="btn btn-default pull-left btn-sm" ng-click="editIgnores()"><span class="glyphicon glyphicon-pencil"></span>&emsp;<span translate>Edit ignored files and directories</span></button>
+          <button id="editIgnoresButton" ng-if="editingExisting" type="button" class="btn btn-default pull-left btn-sm" ng-click="editIgnores()"><span class="glyphicon glyphicon-eye-close"></span>&emsp;<span translate>Ignore Patterns</span></button>
         </div>
       </div>
     </div>
@@ -534,21 +534,24 @@
     <div class="modal-dialog modal-lg">
       <div class="modal-content">
         <div class="modal-header">
-          <h4 translate class="modal-title">Ignored files and directories</h4>
+          <h4 class="modal-title" translate>Ignore Patterns</h4>
         </div>
         <div class="modal-body">
-          <p translate>Supported patterns:</p>
-          <ul>
-            <li><code>*</code> - <span translate>Single-level wildcard (matches anything within a single directory)</span>
-            <li><code>**</code> - <span translate>Multi-level wildcard (matches anything within all directories at any depth)</span>
-            <li><code>!</code> - <span translate>Inversion of the given condition, which excludes the given pattern from any previous matches</span>
-            <li><code>#include</code> - <span translate>Including ignores from another file</span>
-            <li><code>//</code> - <span translate>Comment</span>
-          </ul>
+          <p translate>Enter ignore patterns, one per line.</p>
           <textarea class="form-control" rows="15"></textarea>
+
+          <hr/>
+
+          <p class="small"><span translate>Quick guide to supported patterns</span> (<a href="https://discourse.syncthing.net/t/80" translate>full documentation</a>):</p>
+          <dl class="dl-horizontal dl-narrow small">
+            <dt><code>!</code></dt> <dd><span translate>Inversion of the given condition (i.e. do not exclude)</span></dd>
+            <dt><code>*</code></dt> <dd><span translate>Single level wildcard (matches within a directory only)</span></dd>
+            <dt><code>**</code></dt> <dd><span translate>Multi level wildcard (matches multiple directory levels)</span></dd>
+            <dt><code>//</code></dt> <dd><span translate>Comment, when used at the start of a line</span></dd>
+          </dl>
         </div>
         <div class="modal-footer">
-          <div class="pull-left"><span translate >Ignore file location</span>:<code>{{ currentRepo.Directory }}/.stignore</code></div>
+          <div class="pull-left"><span translate>Editing</span> <code>{{currentRepo.Directory}}/.stignore</code></div>
           <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="saveIgnores()"><span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>Save</span></button>
           <button type="button" class="btn btn-default btn-sm" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span>&emsp;<span translate>Close</span></button>
         </div>

gui/lang/lang-en.json

@@ -11,7 +11,7 @@
    "Bugs": "Bugs",
    "CPU Utilization": "CPU Utilization",
    "Close": "Close",
-   "Comment": "Comment",
+   "Comment, when used at the start of a line": "Comment, when used at the start of a line",
    "Connection Error": "Connection Error",
    "Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg and the following Contributors:",
    "Delete": "Delete",
@@ -21,9 +21,10 @@
    "Edit": "Edit",
    "Edit Node": "Edit Node",
    "Edit Repository": "Edit Repository",
-   "Edit ignored files and directories": "Edit ignored files and directories",
+   "Editing": "Editing",
    "Enable UPnP": "Enable UPnP",
    "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.",
+   "Enter ignore patterns, one per line.": "Enter ignore patterns, one per line.",
    "Error": "Error",
    "File Versioning": "File Versioning",
    "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "File permission bits are ignored when looking for changes. Use on FAT filesystems.",
@@ -38,12 +39,10 @@
    "Global Discovery Server": "Global Discovery Server",
    "Global Repository": "Global Repository",
    "Idle": "Idle",
+   "Ignore Patterns": "Ignore Patterns",
    "Ignore Permissions": "Ignore Permissions",
-   "Ignore file location": "Ignore file location",
-   "Ignored files and directories": "Ignored files and directories",
-   "Including ignores from another file": "Including ignores from another file",
    "Incoming Rate Limit (KiB/s)": "Incoming Rate Limit (KiB/s)",
-   "Inversion of the given condition, which excludes the given pattern from any previous matches": "Inversion of the given condition, which excludes the given pattern from any previous matches",
+   "Inversion of the given condition (i.e. do not exclude)": "Inversion of the given condition (i.e. do not exclude)",
    "Keep Versions": "Keep Versions",
    "Last seen": "Last seen",
    "Latest Release": "Latest Release",
@@ -54,7 +53,7 @@
    "Max File Change Rate (KiB/s)": "Max File Change Rate (KiB/s)",
    "Max Outstanding Requests": "Max Outstanding Requests",
    "Maximum Age": "Maximum Age",
-   "Multi-level wildcard (matches anything within all directories at any depth)": "Multi-level wildcard (matches anything within all directories at any depth)",
+   "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
    "Never": "Never",
    "No": "No",
    "No File Versioning": "No File Versioning",
@@ -73,6 +72,7 @@
    "Please wait": "Please wait",
    "Preview": "Preview",
    "Preview Usage Report": "Preview Usage Report",
+   "Quick guide to supported patterns": "Quick guide to supported patterns",
    "RAM Utilization": "RAM Utilization",
    "Reconnect Interval (s)": "Reconnect Interval (s)",
    "Repository ID": "Repository ID",
@@ -97,13 +97,12 @@
    "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.": "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.",
    "Shutdown": "Shutdown",
    "Simple File Versioning": "Simple File Versioning",
-   "Single-level wildcard (matches anything within a single directory)": "Single-level wildcard (matches anything within a single directory)",
+   "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
    "Source Code": "Source Code",
    "Staggered File Versioning": "Staggered File Versioning",
    "Start Browser": "Start Browser",
    "Stopped": "Stopped",
    "Support / Forum": "Support / Forum",
-   "Supported patterns:": "Supported patterns:",
    "Sync Protocol Listen Addresses": "Sync Protocol Listen Addresses",
    "Synchronization": "Synchronization",
    "Syncing": "Syncing",
@@ -145,5 +144,6 @@
    "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.",
    "Yes": "Yes",
    "You must keep at least one version.": "You must keep at least one version.",
+   "full documentation": "full documentation",
    "items": "items"
 }

gui/overrides.css

@@ -87,3 +87,11 @@ table.table-condensed td {
 .panel-body .table-condensed {
     margin-bottom: 0;
 }
+
+.dl-horizontal.dl-narrow dt {
+    width: 40px;
+}
+
+.dl-horizontal.dl-narrow dd {
+    margin-left: 60px;
+}