Add missing files

src/tixlbase/migrations/0012_auto_20140929_1935.py

@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import django.db.models.deletion
+
+def setposition(apps, schema_editor):
+    ItemCategory = apps.get_model("tixlbase", "ItemCategory")
+    for cat in ItemCategory.objects.all():
+        cat.position = 0
+        cat.save()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tixlbase', '0011_auto_20140927_1013'),
+    ]
+
+    operations = [
+        migrations.RunPython(setposition),
+        migrations.AlterField(
+            model_name='item',
+            name='active',
+            field=models.BooleanField(default=True, verbose_name='Active'),
+        ),
+        migrations.AlterField(
+            model_name='item',
+            name='category',
+            field=models.ForeignKey(blank=True, null=True, verbose_name='Category', related_name='items', to='tixlbase.ItemCategory', on_delete=django.db.models.deletion.PROTECT),
+        ),
+        migrations.AlterField(
+            model_name='item',
+            name='event',
+            field=models.ForeignKey(to='tixlbase.Event', related_name='items', verbose_name='Event', on_delete=django.db.models.deletion.PROTECT),
+        ),
+        migrations.AlterField(
+            model_name='item',
+            name='properties',
+            field=models.ManyToManyField(to='tixlbase.Property', help_text="The selected properties will be available for the user to select. After saving this field, move to the 'Variations' tab to configure the details.", blank=True, verbose_name='Properties', related_name='items'),
+        ),
+        migrations.AlterField(
+            model_name='item',
+            name='tax_rate',
+            field=models.DecimalField(max_digits=7, verbose_name='Taxes included in percent', blank=True, null=True, decimal_places=2),
+        ),
+        migrations.AlterField(
+            model_name='itemcategory',
+            name='event',
+            field=models.ForeignKey(related_name='categories', to='tixlbase.Event'),
+        ),
+        migrations.AlterField(
+            model_name='itemcategory',
+            name='position',
+            field=models.IntegerField(default=0),
+        ),
+        migrations.AlterField(
+            model_name='itemvariation',
+            name='active',
+            field=models.BooleanField(default=True, verbose_name='Active'),
+        ),
+        migrations.AlterField(
+            model_name='property',
+            name='event',
+            field=models.ForeignKey(related_name='properties', to='tixlbase.Event'),
+        ),
+    ]

src/tixlbase/models.py

@@ -455,6 +455,7 @@ class Item(models.Model):
         Property,
         related_name='items',
         verbose_name=_("Properties"),
+        blank=True,
         help_text=_(
             'The selected properties will be available for the user '
             + 'to select. After saving this field, move to the '

src/tixlcontrol/templates/tixlcontrol/items/categories.html

@@ -0,0 +1,42 @@
+{% extends "tixlcontrol/items/base.html" %}
+{% load i18n %}
+{% block title %}{% trans "Item categories" %}{% endblock %}
+{% block inside %}
+	<h1>{% trans "Item categories" %}</h1>
+	{% if "updated" in request.GET %}
+		<div class="alert alert-success">
+			{% trans "Your changes have been saved." %}
+		</div>
+	{% elif "created" in request.GET %}
+		<div class="alert alert-success">
+			{% trans "A new category has been created." %}
+		</div>
+	{% elif "deleted" in request.GET %}
+		<div class="alert alert-success">
+			{% trans "The category has been deleted." %}
+		</div>
+	{% endif %}
+	<p>
+		<a href="{% url "control:event.items.categories.add" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create new category" %}</a>
+	</p>
+	<table class="table table-hover">
+		<thead>
+			<tr>
+				<th>{% trans "Item categories" %}</th>
+				<th></th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for c in categories %}
+			<tr>
+				<td><strong><a href="{% url "control:event.items.categories.edit" organizer=request.event.organizer.slug event=request.event.slug category=c.pk %}">{{ c.name }}</a></strong></td>
+				<td>
+					<a href="{% url "control:event.items.categories.up" organizer=request.event.organizer.slug event=request.event.slug category=c.pk %}" class="btn btn-default btn-sm {% if forloop.counter0 == 0 %}disabled{% endif %}"><i class="fa fa-arrow-up"></i></a>
+					<a href="{% url "control:event.items.categories.down" organizer=request.event.organizer.slug event=request.event.slug category=c.pk %}" class="btn btn-default btn-sm {% if forloop.revcounter0 == 0 %}disabled{% endif %}"><i class="fa fa-arrow-down"></i></a>
+				</td>
+				<td class="text-right"><a href="{% url "control:event.items.categories.delete" organizer=request.event.organizer.slug event=request.event.slug category=c.pk %}"" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a></td>
+			</tr>
+			{% endfor %}
+		</tbody>
+	</table>
+{% endblock %}

src/tixlcontrol/templates/tixlcontrol/items/category.html

@@ -0,0 +1,26 @@
+{% extends "tixlcontrol/items/base.html" %}
+{% load i18n %}
+{% load bootstrap3 %}
+{% block title %}{% trans "Item category" %}{% endblock %}
+{% block inside %}
+	<h1>{% trans "Item category" %}</h1>
+	<form action="" method="post" class="form-horizontal">
+		{% csrf_token %}
+		{% if "success" in request.GET %}
+			<div class="alert alert-success">
+				{% trans "Your changes have been saved." %}
+			</div>
+		{% endif %}
+		<fieldset>
+			<legend>{% trans "General information" %}</legend>
+			{% bootstrap_field form.name layout="horizontal" %}
+		</fieldset>
+		<div class="form-group">
+			<div class="col-sm-offset-2 col-sm-10">
+				<button type="submit" class="btn btn-primary">
+					{% trans "Save" %}
+				</button>
+			</div>
+		</div>
+	</form>
+{% endblock %}

src/tixlcontrol/templates/tixlcontrol/items/category_delete.html

@@ -0,0 +1,21 @@
+{% extends "tixlcontrol/items/base.html" %}
+{% load i18n %}
+{% load bootstrap3 %}
+{% block title %}{% trans "Delete item category" %}{% endblock %}
+{% block inside %}
+	<h1>{% trans "Delete item category" %}</h1>
+	<form action="" method="post" class="form-horizontal">
+		{% csrf_token %}
+		<p>{% blocktrans %}Are you sure you want to the category <strong>{{ category.name }}</strong>?{% endblocktrans %}</p>
+		<div class="form-group">
+			<div class="col-sm-offset-2 col-sm-10">
+				<button type="submit" class="btn btn-primary">
+					{% trans "Confirm" %}
+				</button>
+				<a href="{% url "control:event.items.categories" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default">
+					{% trans "Cancel" %}
+				</a>
+			</div>
+		</div>
+	</form>
+{% endblock %}