split example into two models, better default styles

__init__.py

@@ -21,9 +21,9 @@ def start(project_name, destination):
     want to do the following:
 
     \b
-        chmod +x deploy.sh db/manage.py
         sudo chown www-data media/
-        cd app; wq init
+        cd app
+        wq init
 
     See https://wq.io/docs/setup for more tips on getting started with wq.
     """
@@ -32,5 +32,5 @@ def start(project_name, destination):
         project_name,
         destination,
         template=template,
-        extensions=["py", "yml", "conf", "html", "sh", "js"],
+        extensions=["py", "yml", "conf", "html", "sh", "js", "css", "json"],
     )

django_project/app/css/project_name.css

@@ -2,3 +2,6 @@
 @import url("lib/jquery.mobile.icons.css");
 @import url("lib/jquery.mobile.structure.css");
 @import url("lib/leaflet.css");
+@import url("lib/leaflet.draw.css");
+@import url("{{ project_name }}/main.css");
+@import url("{{ project_name }}/responsive.css");

django_project/app/css/project_name/main.css

@@ -0,0 +1,25 @@
+.error {
+    color: red;
+    clear: both;
+}
+
+.footer {
+    text-align: center;
+    font-size: 0.8em;
+}
+.footer, .footer a, .footer a:visited {
+    color: #999;
+}
+
+.map {
+    border: 1px solid #999;
+}
+.map.list-map {
+    height: 500px;
+}
+.map.detail-map {
+    height: 300px;
+}
+.map.edit-map {
+    height: 400px;
+}

django_project/app/css/project_name/responsive.css

@@ -0,0 +1,11 @@
+@media screen and (min-width: 60em) {
+    .ui-mobile [data-role="page"], .ui-page {
+        width: 80%;
+        max-width: 60em;
+        margin-left: auto;
+        margin-right: auto;
+        position: relative;
+        border-left: 1px solid #999;
+        border-right: 1px solid #999;
+    }
+}

django_project/app/js/project_name/main.js

@@ -1,9 +1,30 @@
-define(['wq/app', 'wq/map', './config'],
-function(app, map, config) {
+define(['wq/app', 'wq/map', 'wq/photos',
+        './config',
+        'leaflet.draw'],
+function(app, map, photos, config) {
 
+app.use(map);
+app.use(photos);
+
+config.presync = presync;
+config.postsync = postsync;
 app.init(config).then(function() {
-    map.init(config.map);
     app.jqmInit();
+    app.prefetchAll();
 });
 
+// Sync UI
+function presync() {
+    $('button.sync').html("Syncing...");
+    $('li a.ui-icon-minus, li a.ui-icon-alert')
+       .removeClass('ui-icon-minus')
+       .removeClass('ui-icon-alert')
+       .addClass('ui-icon-refresh');
+}
+
+function postsync(items) {
+    $('button.sync').html("Sync Now");
+    app.syncRefresh(items);
+}
+
 });

django_project/app/manifest.json

@@ -0,0 +1,6 @@
+{
+    "name": "{{ project_name }} Project",
+    "start_url": "index.html",
+    "display": "fullscreen"
+}
+

django_project/app/wq.yml

@@ -41,6 +41,10 @@ appcache:
     css-ignore: "css/lib/images/icons-png/.*"
     cache:
          - js/lib/require.js
+         - css/lib/images/marker-icon.png
+         - css/lib/images/marker-icon-2x.png
+         - css/lib/images/marker-shadow.png
+         - images/empty.png
     network:
          - "*"
          - "http://*"

django_project/conf/project_name.conf

@@ -22,6 +22,7 @@
     Alias /media       {{ project_directory }}/media/
     Alias /{{ project_name }}.appcache {{ project_directory }}/htdocs/{{ project_name }}.appcache
     Alias /favicon.ico {{ project_directory }}/htdocs/favicon.ico
+    Alias /manifest.json /var/www/trywq/htdocs/manifest.json
     Alias /robots.txt {{ project_directory }}/htdocs/robots.txt
 
     # Uncomment the following line to use a static front page

django_project/db/exampleapp/maps.py

@@ -0,0 +1,32 @@
+place_map = {
+    'list': {'autoLayers': True},
+    'detail': {'autoLayers': True},
+    'edit': {
+        'layers': [{
+            'name': 'Place Location(s)',
+            'type': 'geojson',
+            'url': 'places/{% templatetag openvariable %}id{% templatetag closevariable %}/edit.geojson',
+            'geometryField': 'locations',
+
+            # Leaflet.draw options
+            'draw': {
+                'circle': False,
+                'marker': {},
+                'polygon': {},
+                'polyline': False,
+                'rectangle': {},
+            }
+        }]
+    }
+}
+
+index_map = {
+    'defaults': {
+        'layers': [{
+            'name': 'Places',
+            'type': 'geojson',
+            'url': 'places.geojson',
+            'popup': 'place',
+        }]
+    }
+}

django_project/db/exampleapp/migrations/0001_initial.py

@@ -11,15 +11,27 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='Example',
+            name='Observation',
             fields=[
-                ('id', models.AutoField(primary_key=True, serialize=False, auto_created=True, verbose_name='ID')),
+                ('id', models.AutoField(verbose_name='ID', serialize=False, primary_key=True, auto_created=True)),
+                ('date', models.DateField()),
+                ('photo', models.ImageField(upload_to='')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Place',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, primary_key=True, auto_created=True)),
                 ('name', models.CharField(max_length=255)),
                 ('description', models.TextField()),
             ],
             options={
                 'abstract': False,
             },
-            bases=(models.Model,),
+        ),
+        migrations.AddField(
+            model_name='observation',
+            name='place',
+            field=models.ForeignKey(to='exampleapp.Place'),
         ),
     ]

django_project/db/exampleapp/models.py

@@ -2,6 +2,15 @@
 from wq.db.patterns import models as patterns
 
 
-class Example(patterns.IdentifiedModel):
+class Place(patterns.IdentifiedLocatedModel):
     name = models.CharField(max_length=255)
     description = models.TextField()
+
+
+class Observation(models.Model):
+    place = models.ForeignKey(Place)
+    date = models.DateField()
+    photo = models.ImageField()
+
+    def __str__(self):
+        return "%s on %s" % (self.place, self.date)

django_project/db/exampleapp/rest.py

@@ -1,10 +1,17 @@
 from wq.db import rest
 from wq.db.patterns import rest as patterns
-from .models import Example
+from .models import Place, Observation
+from .maps import place_map, index_map
 
+rest.router.register_model(Observation)
 
 rest.router.register_model(
-    Example,
-    serializer=patterns.IdentifiedModelSerializer
+    Place,
+    serializer=patterns.IdentifiedLocatedModelSerializer,
+    map=place_map
 )
-rest.router.add_page('index', {'url': '', 'map': True})
+
+rest.router.add_page('index', {
+    'url': '',
+    'map': index_map
+})

django_project/db/project_name/settings.py

@@ -41,6 +41,7 @@
     'rest_framework',
 
     'wq.db.patterns.identify',
+    'wq.db.patterns.locate',
     'wq.db.rest',
     'wq.db.rest.auth',
 
@@ -75,7 +76,7 @@
 
 # wq: Social auth (see http://psa.matiasaguirre.net/docs/backends/)
 AUTHENTICATION_BACKENDS = (
-     # 'social.backends.google.GoogleOpenId',
+    # 'social.backends.google.GoogleOpenId',
     'django.contrib.auth.backends.ModelBackend',
 )