From 78f51115942b31df57672eaffa1486681cba9956 Mon Sep 17 00:00:00 2001
From: Juhana <juhana.luomanen@aalto.fi>
Date: Wed, 1 Mar 2017 17:11:58 +0200
Subject: [PATCH] Add display type and sort by name to info items

---
 infoscreen/models.py                       | 3 ++-
 infoscreen/templates/infoscreen_admin.html | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/infoscreen/models.py b/infoscreen/models.py
index 3051a78..7304b56 100644
--- a/infoscreen/models.py
+++ b/infoscreen/models.py
@@ -51,6 +51,7 @@ class InfoItem(models.Model):
             'name': self.name,
             'item_type': ContentType.objects.get_for_model(self).id,
             'template_url': self.get_template_url(),
+            'display_name': self.display_name,
             'create_template_url': self.get_create_template_url(),
             'options': {}
         }
@@ -99,7 +100,7 @@ class SossoInfoItem(InfoItem):
 
 
 class ImageInfoItem(InfoItem):
-    display_name = _("Image upload")
+    display_name = _("Image")
     img = models.ImageField(upload_to="infoimages/")
 
     def get_template_url(self):
diff --git a/infoscreen/templates/infoscreen_admin.html b/infoscreen/templates/infoscreen_admin.html
index 394b02c..8ca1205 100644
--- a/infoscreen/templates/infoscreen_admin.html
+++ b/infoscreen/templates/infoscreen_admin.html
@@ -36,12 +36,14 @@
                     <table class="table table-striped">
                         <tr>
                             <th>{% trans "Item" %}</th>
+                            <th>{% trans "Type" %}</th>
                             <th>{% trans "Set duration" %}</th>
                             <th>{% trans "Add to rotation" %}</th>
                             <th>{% trans "Delete" %}</th>
                         </tr>
-                        <tr ng-repeat="i in infoitems">
+                        <tr ng-repeat="i in infoitems | orderBy:['display_name','name']">
                             <td>{$ i.name $}</td>
+                            <td>{$ i.display_name $}</td>
                             <td><input type="text" class="form-control" ng-model="i.duration"></input></td>
                             <td><input type="button" class="btn btn-success" ng-click="createInstance(selected_rot.id, i.id, i.item_type, i.duration);" value="{% trans "Add" %}"></input></td>
                             <td><input type="button" class="btn btn-danger" ng-click="deleteItem(i.item_type, i.id);" value="{% trans "Delete" %}"></input></td>