wireless settings are hidden unless enabled in settings

diff --git a/src/handlers.py b/src/handlers.py
index 9ad5c819fe0f6d0337e07c4c489cd6033adcd3f6..404be43450c55bc1d614318ca3fe927ad060154f 100644 (file)
--- a/src/handlers.py
+++ b/src/handlers.py
@@ -146,6 +146,7 @@ class MainHandler(BaseHandler):
     @BaseHandler.auth()
     def get(self):
         self.render('main.html',
+                wpa_supplicant=settings.WPA_SUPPLICANT_CONF,
                 hostname=socket.gethostname())
 
 

diff --git a/src/remote.py b/src/remote.py
index 3c09b8de425225e3fbb3da1160d6dac2353f2953..e766816faabfec5caf3088420e5a21de753768f3 100644 (file)
--- a/src/remote.py
+++ b/src/remote.py
@@ -37,7 +37,7 @@ def _make_request(host, port, username, password, uri, method='GET', data=None,
         timeout = settings.REMOTE_REQUEST_TIMEOUT
         
     request = HTTPRequest(url, method, body=data, auth_username=username, auth_password=password,
-            request_timeout=timeout)
+            connect_timeout=timeout, request_timeout=timeout)
     
     return request
 

diff --git a/templates/main.html b/templates/main.html
index 7030d221badcd49916f60520a81a8a7ebf974829..f41488166d1c50f46d94c0ce16aadce998174cfa 100644 (file)
--- a/templates/main.html
+++ b/templates/main.html
@@ -77,8 +77,8 @@
                     </tr>
                 </table>
                 
-                <div class="settings-section-title advanced-setting"><input type="checkbox" class="styled section wifi" id="wifiSwitch">Wireless Network</div>
-                <table class="settings advanced-setting">
+                <div class="settings-section-title advanced-setting{% if not wpa_supplicant %} hidden{% endif %}"><input type="checkbox" class="styled section wifi" id="wifiSwitch">Wireless Network</div>
+                <table class="settings advanced-setting{% if not wpa_supplicant %} hidden{% endif %}">
                     <tr class="settings-item advanced-setting">
                         <td class="settings-item-label"><span class="settings-item-label">Network Name</span></td>
                         <td class="settings-item-value"><input type="text" class="styled wifi" id="wifiNameEntry" placeholder="name..."></td>