From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 6 Jul 2014 12:04:06 +0000 (+0300)
Subject: wireless settings are hidden unless enabled in settings
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=3f311c997013e29d041ebfbd27f798b0d9c3c801;p=motioneye-debian

wireless settings are hidden unless enabled in settings
---

diff --git a/src/handlers.py b/src/handlers.py
index 9ad5c81..404be43 100644
--- 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 3c09b8d..e766816 100644
--- 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 7030d22..f414881 100644
--- 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>