From ea70810a2f1e5e999f2907b69efbc41481344b7a Mon Sep 17 00:00:00 2001
From: "S. Andrew Sheppard" <andrew@wq.io>
Date: Thu, 25 May 2017 21:51:12 -0400
Subject: [PATCH] customize category display

---
 .../migrations/0002_auto_20170517_1648.py     | 29 +++++++++++++++++++
 db/category/models.py                         | 16 +++++++++-
 templates/category_detail.html                | 11 +++----
 templates/category_edit.html                  | 16 ++++++++--
 templates/category_list.html                  |  6 ++--
 5 files changed, 66 insertions(+), 12 deletions(-)
 create mode 100644 db/category/migrations/0002_auto_20170517_1648.py

diff --git a/db/category/migrations/0002_auto_20170517_1648.py b/db/category/migrations/0002_auto_20170517_1648.py
new file mode 100644
index 0000000..d2248f5
--- /dev/null
+++ b/db/category/migrations/0002_auto_20170517_1648.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.1 on 2017-05-17 16:48
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('category', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='category',
+            options={'ordering': ('order', 'name'), 'verbose_name': 'category', 'verbose_name_plural': 'categories'},
+        ),
+        migrations.AddField(
+            model_name='category',
+            name='description',
+            field=models.TextField(blank=True, null=True, verbose_name='Description'),
+        ),
+        migrations.AddField(
+            model_name='category',
+            name='order',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Order'),
+        ),
+    ]
diff --git a/db/category/models.py b/db/category/models.py
index 5c8dafe..d5dc52e 100644
--- a/db/category/models.py
+++ b/db/category/models.py
@@ -18,7 +18,21 @@ class Category(models.Model):
         blank=True,
         verbose_name="Wikipedia Link",
     )
+    description = models.TextField(
+        null=True,
+        blank=True,
+        verbose_name="Description",
+    )
+    order = models.IntegerField(
+        null=True,
+        blank=True,
+        verbose_name="Order",
+    )
+
+    def __str__(self):
+        return self.name
 
     class Meta:
         verbose_name = "category"
-        verbose_name_plural = "categorys"
+        verbose_name_plural = "categories"
+        ordering = ('order', 'name',)
diff --git a/templates/category_detail.html b/templates/category_detail.html
index bd80616..c396626 100644
--- a/templates/category_detail.html
+++ b/templates/category_detail.html
@@ -10,7 +10,7 @@
         {{>home}}
         <h1>{{label}}</h1>
         {{#page_config.can_change}}
-        <a href="{{rt}}/categorys/{{id}}/edit" data-icon="edit" data-transition="flip">
+        <a href="{{rt}}/categories/{{id}}/edit" data-icon="edit" data-transition="flip">
           Edit
         </a>
         {{/page_config.can_change}}
@@ -23,12 +23,13 @@ <h1>{{label}}</h1>
               <td>{{name}}</td>
             </tr>
             <tr>
-              <th>Wikipedia Link</th>
-              <td>{{link}}</td>
+              <th>Description</th>
+              <td>{{description}}</td>
             </tr>
           </table>
-        <h3>Photo</h3>
-        <img src="{{photo}}" alt="Photo - {{label}}" style="max-width:100%">
+          <ul data-role="listview" data-inset="true">
+            <li data-icon="bullets"><a href="{{rt}}/categories/{{id}}/observations">View Observations</a></li>
+          </ul>
       </div>
     </div>
   </body>
diff --git a/templates/category_edit.html b/templates/category_edit.html
index d672099..db2014a 100644
--- a/templates/category_edit.html
+++ b/templates/category_edit.html
@@ -11,7 +11,7 @@
         <h1>{{^id}}Add{{/id}}{{#id}}Edit{{/id}} category</h1>
         {{#id}}
         {{#page_config.can_delete}}
-        <form action="{{svc}}/categorys/{{id}}" method="post" data-ajax="false"
+        <form action="{{svc}}/categories/{{id}}" method="post" data-ajax="false"
           data-wq-json="true" data-wq-background-sync="false"
           onsubmit="return require('wq/app').confirmSubmit(this, 'Are you sure you want to delete this record?');">
           {{>csrf}}
@@ -24,7 +24,7 @@ <h1>{{^id}}Add{{/id}}{{#id}}Edit{{/id}} category</h1>
         {{/id}}
       </div>
       <div role="main" class="ui-content">
-        <form action="{{svc}}/categorys/{{id}}" method="post" data-ajax="false"
+        <form action="{{svc}}/categories/{{id}}" method="post" data-ajax="false"
             data-wq-json="true"
             {{#outbox_id}}
               data-wq-outbox-id="{{outbox_id}}"
@@ -82,10 +82,20 @@ <h1>{{^id}}Add{{/id}}{{#id}}Edit{{/id}} category</h1>
               <textarea id='category-link' name='link' data-xform-type="text">{{link}}</textarea>
               <p class='error category-link-errors'></p>
             </li>
+            <li class="ui-field-contain">
+              <label for='category-description'>Description</label>
+              <textarea id='category-description' name='description' data-xform-type="text">{{description}}</textarea>
+              <p class='error category-description-errors'></p>
+            </li>
+            <li class="ui-field-contain">
+              <label for='category-order'>Order</label>
+              <input id='category-order' type='number' data-xform-type='int' name='order' value="{{order}}">
+              <p class='error category-order-errors'></p>
+            </li>
             <li>
               <div class="ui-grid-a">
                 <div class="ui-block-a">
-                  <a href="{{rt}}/categorys/{{id}}" data-role="button" data-icon="back" data-direction="reverse">
+                  <a href="{{rt}}/categories/{{id}}" data-role="button" data-icon="back" data-direction="reverse">
                     Back
                   </a>
                 </div>
diff --git a/templates/category_list.html b/templates/category_list.html
index 54e0d22..8d3bb8a 100644
--- a/templates/category_list.html
+++ b/templates/category_list.html
@@ -10,7 +10,7 @@
         {{>home}}
         <h1>category List{{#parent_id}} for {{parent_label}}{{/parent_id}}</h1>
         {{#page_config.can_add}}
-        <a href="{{rt}}/categorys/new{{#parent_id}}?{{parent_page}}_id={{parent_id}}{{/parent_id}}" data-icon="plus">
+        <a href="{{rt}}/categories/new{{#parent_id}}?{{parent_page}}_id={{parent_id}}{{/parent_id}}" data-icon="plus">
           Add New
         </a>
         {{/page_config.can_add}}
@@ -57,12 +57,12 @@ <h1>category List{{#parent_id}} for {{parent_label}}{{/parent_id}}</h1>
             {{/unsynced}}
             {{#list}}
             <li>
-              <a href="{{rt}}/categorys/{{id}}">{{label}}</a>
+              <a href="{{rt}}/categories/{{id}}">{{label}}</a>
             </li>
             {{/list}}
             {{#page_config.can_add}}
             <li data-icon="plus" data-theme="b">
-              <a href="{{rt}}/categorys/new{{#parent_id}}?{{parent_page}}_id={{parent_id}}{{/parent_id}}">Add category</a>
+              <a href="{{rt}}/categories/new{{#parent_id}}?{{parent_page}}_id={{parent_id}}{{/parent_id}}">Add category</a>
             </li>
             {{/page_config.can_add}}
           </ul>