Pull updated raspiwifi.conf values for display on WPA settings confir…

…mation page. Also some cosmetic changes
jasbur · Jan 24, 2019 · c253923 · c253923
1 parent d55675b
commit c253923
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/libs/configuration_app/app.py b/libs/configuration_app/app.py
@@ -61,6 +61,7 @@ def sleep_and_reboot_for_wpa():
     t = Thread(target=sleep_and_reboot_for_wpa)
     t.start()
 
+    config_hash = config_file_hash()
     return render_template('save_wpa_credentials.html', wpa_enabled = config_hash['wpa_enabled'], wpa_key = config_hash['wpa_key'])
 
 

diff --git a/libs/configuration_app/templates/save_wpa_credentials.html b/libs/configuration_app/templates/save_wpa_credentials.html
@@ -3,8 +3,14 @@
 {% block body %}
   <div id="saveCredentialsOutput">
     <p>WPA in Confirguration Mode set to:</p>
-    <span class="saveCredentialsSSID">WPA Enabled: {{wpa_enabled}}</span></br>
-    <span class="saveCredentialsSSID">WPA Key: {{wpa_key}}</span>
-    <p>Your device will now reboot and should be connected to your access point soon.</p>
+    <span class="saveCredentialsSSID">WPA Enabled: 
+      {% if wpa_enabled == '1': %}
+        Yes</span></br>
+        <span class="saveCredentialsSSID">WPA Key: {{wpa_key}}</span>
+        <p>Your device will now reboot. You can connect to it using the WPA Key above for further configuration.</p>
+      {% else: %}
+        No</span></br>
+        <p>Your device will now reboot. A WPA Key will NOT be required for further configuration.</p>
+      {% endif %}
   </div>
 {% endblock %}