Przeglądaj źródła

Merge branch 'pr/875'

* pr/875:
  Make folder path selectable in FireFox
Jakob Borg 11 lat temu
rodzic
commit
bc3b7401a1
3 zmienionych plików z 6 dodań i 4 usunięć
  1. 1 0
      CONTRIBUTORS
  2. 4 3
      gui/index.html
  3. 1 1
      internal/auto/gui.files.go

+ 1 - 0
CONTRIBUTORS

@@ -9,6 +9,7 @@ Caleb Callaway <[email protected]>
 Chris Joel <[email protected]>
 Daniel Martí <[email protected]>
 Felix Ableitner <[email protected]>
+Felix Unterpaintner <[email protected]>
 Gilli Sigurdsson <[email protected]>
 James Patterson <[email protected]> <[email protected]>
 Jens Diemer <[email protected]> <[email protected]>

+ 4 - 3
gui/index.html

@@ -448,7 +448,7 @@
               <div class="col-md-12">
                 <div class="form-group" ng-class="{'has-error': folderEditor.folderID.$invalid && folderEditor.folderID.$dirty}">
                   <label for="folderID"><span translate>Folder ID</span></label>
-                  <input name="folderID" ng-disabled="editingExisting" id="folderID" class="form-control" type="text" ng-model="currentFolder.ID" required unique-folder ng-pattern="/^[a-zA-Z0-9-_.]{1,64}$/"></input>
+                  <input name="folderID" ng-readonly="editingExisting" id="folderID" class="form-control" type="text" ng-model="currentFolder.ID" required unique-folder ng-pattern="/^[a-zA-Z0-9-_.]{1,64}$/"></input>
                   <p class="help-block">
                     <span translate ng-if="folderEditor.folderID.$valid || folderEditor.folderID.$pristine">Short identifier for the folder. Must be the same on all cluster devices.</span>
                     <span translate ng-if="folderEditor.folderID.$error.uniqueFolder">The folder ID must be unique.</span>
@@ -458,7 +458,7 @@
                 </div>
                 <div class="form-group" ng-class="{'has-error': folderEditor.folderPath.$invalid && folderEditor.folderPath.$dirty}">
                   <label translate for="folderPath">Folder Path</label>
-                  <input name="folderPath" ng-disabled="editingExisting" id="folderPath" class="form-control" type="text" ng-model="currentFolder.Path" required></input>
+                  <input name="folderPath" ng-readonly="editingExisting" id="folderPath" class="form-control" type="text" ng-model="currentFolder.Path" required></input>
                   <p class="help-block">
                     <span translate ng-if="folderEditor.folderPath.$valid || folderEditor.folderPath.$pristine">Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for</span> <code>{{system.tilde}}</code>.
                     <span translate ng-if="folderEditor.folderPath.$error.required && folderEditor.folderPath.$dirty">The folder path cannot be blank.</span>
@@ -788,11 +788,12 @@
           <li>Chris Joel</li>
           <li>Daniel Martí</li>
           <li>Felix Ableitner</li>
-          <li>Gilli Sigurdsson</li>
+          <li>Felix Unterpaintner</li>
         </ul>
       </div>
       <div class="col-md-6">
         <ul>
+          <li>Gilli Sigurdsson</li>
           <li>James Patterson</li>
           <li>Jens Diemer</li>
           <li>Jochen Voss</li>

Plik diff jest za duży
+ 1 - 1
internal/auto/gui.files.go


Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików