Merge pull request #18 from iz1kga/webInterfaceStyle

Web interface optimizations

iMeshDashboard/__init__.py

@@ -211,16 +211,19 @@ def sendMessage():
 @basic_auth.required
 def setNode():
     if request.method == 'POST':
-        print(request.form)
         interface.setOwner(request.form['flongName'])
         prefs = interface.radioConfig.preferences
         alt = int(request.form['faltitude'])
         lat = float(request.form['flatitude'])
         lon = float(request.form['flongitude'])
         ts = int(time.time())
-        prefs.fixed_position = True
-        interface.sendPosition(lat, lon, alt, ts)
-        interface.writeConfig()
+        if not interface.myInfo.has_gps and not (config['Position']['enabled']=='True'):
+            prefs.fixed_position = True
+            interface.sendPosition(lat, lon, alt, ts)
+            interface.writeConfig()
+        else:
+            print("Cannot set node parameters beacuse has gps: %s or has fixed position config in config file: %s" % 
+                   (interface.myInfo.has_gps, (config['Position']['enabled']=='True'),))
     return redirect(url_for('configPage'))
 
 @app.route('/login', methods=['GET', 'POST'])

iMeshDashboard/templates/config.html

@@ -32,6 +32,7 @@
           <input type="text" id="faltitude" name="faltitude" value="{{ nodeInfo['position']['altitude'] }}"><br><br>
           <input type="submit" value="SET">
         </form>
+        Position and Altitude can be set if device dosn't have GPS and no fixed position is set in config file
       </div>
     </div>
   </div>

iMeshDashboard/templates/index.html

@@ -9,9 +9,12 @@
                     <span id="nodeInfo">Node Info</span>
                 </div>
                 <div class="card-body">
-                    Hardware:{{ info['hw_model']}}<br>
-                    Firmware:{{ info['firmware_version']}}<br>
-                    Region:{{ info['region']}}<br>
+                    <b>Hardware:</b> {{ info['hw_model'] | safe }}<br>
+                    <b>Firmware:</b> {{ info['firmware_version'] | safe }}<br>
+                    <b>Region:</b> {{ info['region'] | safe }}<br>
+                    <b>nodeId:</b> {{ nodeInfo['user']['id'] | safe }}<br>
+                    <b>longName:</b> {{ nodeInfo['user']['longName'] | safe }}<br>
+                    <b>shortName:</b> {{ nodeInfo['user']['shortName'] | safe }}<br>
                 </div>
             </div>
         </div>