README.md

@@ -24,34 +24,13 @@ For development, install `dev.txt` instead:
 Set up configuration
 ====================
 
-You may want to create and edit configuration file
-`wifiwithme/settings/local.py` (no setting is mandatory at the
-moment):
+Then create and edit a `wifiwithme/settings/local.py` configuration file
+`wifiwithme/settings/local.py`.
 
-URL Prefix
-----------
+Mandatory settings
+------------------
 
-Optionaly, you can define an url prefix (ex: `/foo/`) so that wifi-with-me is
-accessible under *http://example.com/foo/* :
-
-    URL_PREFIX='foo/'
-
-Notifications
--------------
-
-If you to receive notifications on each new contrib, customize those :
-
-List of notification recipients:
-
-    NOTIFICATION_EMAILS=['admin@example.tld']
-
-Notification sender address:
-
-    DEFAULT_FROM_EMAIL='notifier@example.tld'
-
-The wifi-with-me website URL (for links included in emails :)
-
-    SITE_URL="http://example.tld"
+You **must** Define some details about your ISP in the ISP variable, eg:
 
     ISP={
         'NAME':'FAIMAISON',
@@ -70,6 +49,35 @@ The wifi-with-me website URL (for links included in emails :)
         }
     }
 
+Optional settings
+-----------------
+
+### Website URL
+
+The wifi-with-me website URL (for links included in emails :)
+
+    SITE_URL="http://example.tld"
+
+
+## URL Prefix
+
+Optionaly, you can define an url prefix (ex: `/foo/`) so that wifi-with-me is
+accessible under *http://example.com/foo/* :
+
+    URL_PREFIX='foo/'
+
+### Notifications
+
+If you to receive notifications on each new contrib, customize those :
+
+List of notification recipients:
+
+    NOTIFICATION_EMAILS=['admin@example.tld']
+
+Notification sender address:
+
+    DEFAULT_FROM_EMAIL='notifier@example.tld'
+
 Migrate from bottle version (optional)
 ======================================
 

requirements/base.txt

@@ -1,4 +1,4 @@
-Django>=1.9.3<1.10
-PyYAML>=3.11<4.0
+Django>=1.9.3,<1.10
+PyYAML>=3.11,<4.0
 pytz
 sqlparse

wifiwithme/apps/contribmap/admin.py

@@ -26,10 +26,6 @@ class ContribAdmin(admin.ModelAdmin):
                 ('floor', 'floor_total'),
                 'orientations', 'roof']
         }],
-        ['Raccordement au réseau', {
-            'fields': ['connect_type'],
-            'classes': ['collapse'],
-        }],
         ['Partage de connexion', {
             'fields': ['access_type'],
             'classes': ['collapse'],

wifiwithme/apps/contribmap/templates/base.html

@@ -30,7 +30,7 @@
     <div class="container">
     <h1>
     {% block title %}
-    <a href="{% url 'home' %}">{{ isp.TITLE }}</a>
+    <a href="{% url 'home' %}">{{ isp.TITLE|default:"Réseau wifi expérimental" }}</a>
     {% endblock %}
     </h1>
     </div>

wifiwithme/apps/contribmap/templates/contribmap/wifi-form.html

@@ -11,7 +11,7 @@
 
   <header class="jumbotron">
     <div class="container">
-        {% include "welcome_speech.html" %}
+        {% include "core/welcome_speech.html" %}
     </div>
   </header>
 
@@ -82,7 +82,7 @@
       <div class="form-group col-sm-6">
         <div class="form-group form-group-lg form-inline">
           <input type="text" name="search"
-                 id="search" placeholder="{{ isp.ADDRESS_EXAMPLE }}" class="form-control" />
+                 id="search" placeholder="{{ isp.ADDRESS_EXAMPLE|default:"rue du calvaire, nantes" }}" class="form-control" />
           <span id="search-btn" class="btn btn-default btn-lg" data-loading-text="...">Recherche</span>
 
           <div id="search-results" class=""></div>

wifiwithme/apps/pages/templates/pages/home.html

@@ -6,7 +6,7 @@
 
   <header class="jumbotron">
     <div class="container">
-      {% include "welcome_speech.html" %}
+      {% include "core/welcome_speech.html" %}
 
       <p style="text-align:center">
         <a href="{% url 'add_contrib' %}" class="btn btn-lg btn-primary btn-default">