Show node ID in regular text not disabled control (fixes #162)

cmd/syncthing/gui.go

@@ -5,6 +5,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"io/ioutil"
+	"log"
 	"math/rand"
 	"net/http"
 	"runtime"
@@ -26,7 +27,7 @@ var (
 	guiErrors    = []guiError{}
 	guiErrorsMut sync.Mutex
 	static       = embeddedStatic()
-	staticFunc   = static.(func(http.ResponseWriter, *http.Request))
+	staticFunc   = static.(func(http.ResponseWriter, *http.Request, *log.Logger))
 )
 
 const (
@@ -69,7 +70,7 @@ func startGUI(cfg GUIConfiguration, m *Model) {
 
 func getRoot(w http.ResponseWriter, r *http.Request) {
 	r.URL.Path = "/index.html"
-	staticFunc(w, r)
+	staticFunc(w, r, nil)
 }
 
 func restMiddleware(w http.ResponseWriter, r *http.Request) {

cmd/syncthing/gui_embedded.go

@@ -4,6 +4,7 @@ package main
 
 import (
 	"fmt"
+	"log"
 	"mime"
 	"net/http"
 	"path/filepath"
@@ -15,7 +16,7 @@ import (
 func embeddedStatic() interface{} {
 	var modt = time.Now().UTC().Format(http.TimeFormat)
 
-	return func(res http.ResponseWriter, req *http.Request) {
+	return func(res http.ResponseWriter, req *http.Request, log *log.Logger) {
 		file := req.URL.Path
 
 		if file[0] == '/' {

gui/index.html

@@ -361,8 +361,9 @@
           <form role="form">
             <div class="form-group">
               <label for="nodeID">Node ID</label>
-              <input ng-disabled="editingExisting" id="nodeID" class="form-control" type="text" ng-model="currentNode.NodeID"></input>
-              <p class="help-block">The node ID can be found in the logs or in the "Add Node" dialog on the other node.</p>
+              <input ng-if="!editingExisting" id="nodeID" class="form-control" type="text" ng-model="currentNode.NodeID"></input>
+              <div ng-if="editingExisting" class="well well-sm">{{currentNode.NodeID}}</div>
+              <p class="help-block">The node ID can be found in the "Add Node" dialog on the other node.</p>
             </div>
             <div class="form-group">
               <label for="name">Name</label>