import other kontor repos into directories

django/.gitignore

@@ -0,0 +1,16 @@
+bin/
+include/
+lib/
+lib64/
+lib64
+pip-selfcheck.json
+<<<<<<< HEAD
+<<<<<<< HEAD
+*.pyc
+kontor/db.sqlite3
+.idea/
+=======
+>>>>>>> initial setup
+=======
+*.pyc
+>>>>>>> ignore compiled scripts

django/Jenkinsfile

@@ -0,0 +1,13 @@
+node {
+    stage "Checkout"
+    checkout scm
+    stage "make migrations"
+    sh "python kontor/manage.py makemigrations"
+    stage "execute tests"
+<<<<<<< HEAD
+    sh "python kontor/manage.py test comics library medien tradingcards homeoffice"
+=======
+    sh "python kontor/manage.py test commics library medien tradingcards homeoffice"
+>>>>>>> add tests
+}
+

django/README.md

@@ -0,0 +1,2 @@
+# Kontor Django
+

django/kontor/comics/admin.py

@@ -0,0 +1,86 @@
+from django.contrib import admin
+
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> add Comic models
+from .models import Publisher
+from .models import Artist
+from .models import Issue
+from .models import StoryArc
+from .models import Comic
+from .models import TradePaperback
+from .models import Volume
+
+<<<<<<< HEAD
+# Register your models here.
+
+
+class IssueInline(admin.StackedInline):
+    model = Issue
+    extra = 1
+
+
+class IssueAdmin(admin.ModelAdmin):
+    fields = ['comic', 'number', 'is_read', 'in_stock']
+
+
+class ComicAdmin(admin.ModelAdmin):
+    fields = ['title', 'publisher', 'writer', 'current_order', 'completed']
+    inlines = [IssueInline]
+
+
+class ComicInline(admin.StackedInline):
+    model = Comic
+    extra = 1
+
+
+class PublisherAdmin(admin.ModelAdmin):
+    inlines = [ComicInline]
+
+
+admin.site.register(Publisher, PublisherAdmin)
+admin.site.register(Artist)
+admin.site.register(Issue, IssueAdmin)
+admin.site.register(Volume)
+admin.site.register(StoryArc)
+admin.site.register(Comic, ComicAdmin)
+admin.site.register(TradePaperback)
+=======
+# Register your models here.
+>>>>>>> initial setup
+=======
+# Register your models here.
+
+
+class IssueInline(admin.StackedInline):
+    model = Issue
+    extra = 1
+
+
+class IssueAdmin(admin.ModelAdmin):
+    fields = ['comic', 'number', 'is_read', 'in_stock']
+
+
+class ComicAdmin(admin.ModelAdmin):
+    fields = ['title', 'publisher', 'writer', 'artist', 'current_order', 'completed']
+    inlines = [IssueInline]
+
+
+class ComicInline(admin.StackedInline):
+    model = Comic
+    extra = 1
+
+
+class PublisherAdmin(admin.ModelAdmin):
+    inlines = [ComicInline]
+
+
+admin.site.register(Publisher, PublisherAdmin)
+admin.site.register(Artist)
+admin.site.register(Issue, IssueAdmin)
+admin.site.register(Volume)
+admin.site.register(StoryArc)
+admin.site.register(Comic, ComicAdmin)
+admin.site.register(TradePaperback)
+>>>>>>> add Comic models

django/kontor/comics/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class ComicsConfig(AppConfig):
+    name = 'comics'

django/kontor/comics/migrations/0001_initial.py

@@ -0,0 +1,105 @@
+# -*- coding: utf-8 -*-
+<<<<<<< HEAD
+# Generated by Django 1.9.6 on 2016-06-13 15:33
+=======
+# Generated by Django 1.9.5 on 2016-04-10 20:23
+>>>>>>> ignore compiled scripts
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Artist',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Comic',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=40)),
+                ('current_order', models.BooleanField()),
+                ('completed', models.BooleanField()),
+<<<<<<< HEAD
+                ('artist', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='artist', to='comics.Artist')),
+=======
+>>>>>>> ignore compiled scripts
+            ],
+        ),
+        migrations.CreateModel(
+            name='Issue',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('number', models.CharField(max_length=4)),
+                ('is_read', models.BooleanField(default=False)),
+                ('in_stock', models.BooleanField(default=False)),
+                ('comic', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='comics.Comic')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Publisher',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='StoryArc',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+                ('comic', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='comics.Comic')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='TradePaperback',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=40)),
+                ('issue_start', models.IntegerField()),
+                ('issue_end', models.IntegerField()),
+                ('comic', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='comics.Comic')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Volume',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=40)),
+                ('comic', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='comics.Comic')),
+            ],
+        ),
+        migrations.AddField(
+<<<<<<< HEAD
+            model_name='issue',
+            name='volume',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='comics.Volume'),
+        ),
+        migrations.AddField(
+=======
+>>>>>>> ignore compiled scripts
+            model_name='comic',
+            name='publisher',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='comics.Publisher'),
+        ),
+<<<<<<< HEAD
+        migrations.AddField(
+            model_name='comic',
+            name='writer',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='writer', to='comics.Artist'),
+        ),
+=======
+>>>>>>> ignore compiled scripts
+    ]

django/kontor/comics/migrations/0002_auto_20160620_1405.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-06-20 14:05
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('comics', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='comic',
+            name='artist',
+            field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='artist', to='comics.Artist'),
+        ),
+        migrations.AlterField(
+            model_name='comic',
+            name='writer',
+            field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='writer', to='comics.Artist'),
+        ),
+    ]

django/kontor/comics/migrations/0003_auto_20160620_1410.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-06-20 14:10
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('comics', '0002_auto_20160620_1405'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='comic',
+            name='artist',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='artist', to='comics.Artist'),
+        ),
+        migrations.AlterField(
+            model_name='comic',
+            name='writer',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='writer', to='comics.Artist'),
+        ),
+    ]

django/kontor/comics/migrations/0004_auto_20160622_1122.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-06-22 11:22
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('comics', '0003_auto_20160620_1410'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='issue',
+            name='volume',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='comics.Volume'),
+        ),
+    ]

django/kontor/comics/migrations/0005_auto_20160622_1146.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-06-22 11:46
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('comics', '0004_auto_20160622_1122'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='comic',
+            name='title',
+            field=models.CharField(max_length=60),
+        ),
+    ]

django/kontor/comics/models.py

@@ -0,0 +1,101 @@
+from __future__ import unicode_literals
+
+from django.db import models
+
+# Create your models here.
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+=======
+>>>>>>> add Comic models
+
+
+class Publisher(models.Model):
+    name = models.CharField(max_length=100)
+
+    def __str__(self):
+        return self.name
+
+
+class Artist(models.Model):
+    name = models.CharField(max_length=100)
+
+    def __str__(self):
+        return self.name
+
+
+class Comic(models.Model):
+<<<<<<< HEAD
+    title = models.CharField(max_length=60)
+    publisher = models.ForeignKey(Publisher)
+    current_order = models.BooleanField()
+    completed = models.BooleanField()
+    writer = models.ForeignKey(Artist, blank=True, null=True, related_name='writer')
+    artist = models.ForeignKey(Artist, blank=True, null=True, related_name='artist')
+=======
+    title = models.CharField(max_length=40)
+    publisher = models.ForeignKey(Publisher)
+    current_order = models.BooleanField()
+    completed = models.BooleanField()
+<<<<<<< HEAD
+>>>>>>> add Comic models
+=======
+    writer = models.ForeignKey(Artist, null=True, related_name='writer')
+    artist = models.ForeignKey(Artist, null=True, related_name='artist')
+>>>>>>> backup
+
+    def __str__(self):
+        return self.title
+
+
+class Volume(models.Model):
+    name = models.CharField(max_length=40)
+    comic = models.ForeignKey(Comic)
+
+    def __str__(self):
+        return self.comic.title + ' ' + self.name
+
+
+class Issue(models.Model):
+    number = models.CharField(max_length=4)
+    is_read = models.BooleanField(default=False)
+    in_stock = models.BooleanField(default=False)
+    comic = models.ForeignKey(Comic, null=True)
+<<<<<<< HEAD
+<<<<<<< HEAD
+    volume = models.ForeignKey(Volume, blank=True, null=True)
+=======
+>>>>>>> add Comic models
+=======
+    volume = models.ForeignKey(Volume, null=True)
+>>>>>>> backup
+
+    def __str__(self):
+        return self.comic.title + ' #' + self.number
+
+
+class StoryArc(models.Model):
+    name = models.CharField(max_length=100)
+    comic = models.ForeignKey(Comic, null=True)
+
+    def __str__(self):
+        return self.name
+
+
+class TradePaperback(models.Model):
+    name = models.CharField(max_length=40)
+    comic = models.ForeignKey(Comic, null=True)
+    issue_start = models.IntegerField()
+    issue_end = models.IntegerField()
+
+    def __str__(self):
+<<<<<<< HEAD
+        return self.comic.title + ' TP ' + self.name
+<<<<<<< HEAD
+=======
+>>>>>>> initial setup
+=======
+>>>>>>> add Comic models
+=======
+        return self.comic.title + ' TP ' + self.name
+>>>>>>> backup

django/kontor/comics/static/comics/style.css

@@ -0,0 +1,6 @@
+li a {
+    color: green;
+}
+td a {
+    color: green;
+}

django/kontor/comics/templates/comics/detail.html

@@ -0,0 +1,28 @@
+<<<<<<< HEAD
+{% extends "kontor/base.html" %}
+{% block title %}Comic Details{% endblock %}
+{% block content %}
+=======
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Comic Details</title>
+</head>
+<body>
+>>>>>>> backup
+    <table>
+        <thead><td>Name</td><td>current Order</td><td>completed</td></thead>
+        <tr>
+            <td>{{ comic.title }}</td>
+            <td>{{ comic.current_order }}</td>
+            <td>{{ comic.completed }}</td>
+        </tr>
+    </table>
+<<<<<<< HEAD
+{% endblock %}
+=======
+
+</body>
+</html>
+>>>>>>> backup

django/kontor/comics/templates/comics/index.html

@@ -0,0 +1,34 @@
+<<<<<<< HEAD
+{% extends "kontor/base.html" %}
+{% block title %}Comic Overview{% endblock %}
+{% block content %}
+=======
+{% load staticfiles %}
+
+<link rel="stylesheet" type="text/css" href="{% static 'comics/style.css' %}" />
+
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Comic Overview</title>
+</head>
+<body>
+>>>>>>> backup
+    <table>
+        <thead><td>Name</td><td>current Order</td><td>completed</td></thead>
+        {% for comic in comic_list %}
+        <tr>
+            <td><a href="{% url 'comics:detail' comic.id %}">{{ comic.title }}</a></td>
+            <td>{{ comic.current_order }}</td>
+            <td>{{ comic.completed }}</td>
+        </tr>
+        {% endfor %}
+    </table>
+<<<<<<< HEAD
+{% endblock %}
+=======
+</body>
+</html>
+>>>>>>> backup

django/kontor/comics/tests.py

@@ -0,0 +1,8 @@
+from django.test import TestCase
+
+# Create your tests here.
+
+class ComicsViewsTestCase(TestCase):
+    def test_index(self):
+        resp = self.client.get('/comics/')
+        self.assertEqual(resp.status_code, 200)

django/kontor/comics/urls.py

@@ -0,0 +1,10 @@
+from django.conf.urls import url
+
+from . import views
+
+app_name = 'comics'
+urlpatterns = [
+    url(r'^$', views.IndexView.as_view(), name='index'),
+    url(r'^(?P<pk>[0-9]+)/$', views.DetailView.as_view(), name='detail'),
+]
+

django/kontor/comics/views.py

@@ -0,0 +1,51 @@
+<<<<<<< HEAD
+from django.shortcuts import render
+<<<<<<< HEAD
+from django.http import HttpResponseRedirect
+from django.core.urlresolvers import reverse
+from django.views import generic
+ 
+from .models import Comic
+# Create your views here.
+
+
+class IndexView(generic.ListView):
+    template_name = 'comics/index.html'
+    context_object_name = 'comic_list'
+
+    def get_queryset(self):
+        """Return the list of comics."""
+        return Comic.objects.all()
+
+
+class DetailView(generic.DetailView):
+    model = Comic
+    template_name = 'comics/detail.html'
+=======
+=======
+from django.shortcuts import get_object_or_404, render
+from django.http import HttpResponseRedirect
+from django.core.urlresolvers import reverse
+from django.views import generic
+>>>>>>> backup
+
+from .models import Comic
+# Create your views here.
+<<<<<<< HEAD
+>>>>>>> initial setup
+=======
+
+
+class IndexView(generic.ListView):
+    template_name = 'comics/index.html'
+    context_object_name = 'comic_list'
+
+    def get_queryset(self):
+        """Return the list of comics."""
+        return Comic.objects.all()
+
+
+class DetailView(generic.DetailView):
+    model = Comic
+    template_name = 'comics/detail.html'
+>>>>>>> backup

django/kontor/homeoffice/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

django/kontor/homeoffice/apps.py

@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+
+from django.apps import AppConfig
+
+
+class HomeOfficeConfig(AppConfig):
+    name = 'homeoffice'

django/kontor/homeoffice/migrations/0001_initial.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-06-20 16:58
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Expense',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Travel',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+            ],
+        ),
+    ]

django/kontor/homeoffice/models.py

@@ -0,0 +1,10 @@
+from __future__ import unicode_literals
+
+from django.db import models
+
+# Create your models here.
+class Travel(models.Model):
+    pass
+
+class Expense(models.Model):
+    pass

django/kontor/homeoffice/templates/homeoffice/index.html

@@ -0,0 +1,2 @@
+{% extends "kontor/base.html" %}
+{% block title %}HomeOffice{% endblock %}

django/kontor/homeoffice/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

django/kontor/homeoffice/urls.py

@@ -0,0 +1,8 @@
+from django.conf.urls import url
+
+from . import views
+
+app_name = 'homeoffice'
+urlpatterns = [
+    url(r'^$', views.index, name='index'),
+]

django/kontor/homeoffice/views.py

@@ -0,0 +1,5 @@
+from django.shortcuts import render
+
+# Create your views here.
+def index(request):
+    return render(request, 'homeoffice/index.html')

django/kontor/kontor/settings.py

@@ -0,0 +1,166 @@
+"""
+Django settings for kontor project.
+
+<<<<<<< HEAD
+<<<<<<< HEAD
+Generated by 'django-admin startproject' using Django 1.9.6.
+=======
+Generated by 'django-admin startproject' using Django 1.9.5.
+>>>>>>> initial setup
+
+=======
+>>>>>>> backup
+For more information on this file, see
+https://docs.djangoproject.com/en/1.6/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/1.6/ref/settings/
+"""
+
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+import os
+BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+<<<<<<< HEAD
+<<<<<<< HEAD
+SECRET_KEY = '8s-(!r%0yu)b(hdkes_v#g8kp7)0ma851j+&43cds#duk!s-_c'
+=======
+SECRET_KEY = 'c)&86w07k)091bgi1llt+aol5$8in8g=n#+iba4784cdw$#h)^'
+>>>>>>> initial setup
+=======
+SECRET_KEY = 'i5qx(%mex)4ovh#y4m94b1(3xiw4%8+rx-!kpw9v4q*@0v6pd2'
+>>>>>>> backup
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+TEMPLATE_DEBUG = True
+
+ALLOWED_HOSTS = []
+
+
+# Application definition
+
+<<<<<<< HEAD
+INSTALLED_APPS = [
+<<<<<<< HEAD
+<<<<<<< HEAD
+    'comics.apps.ComicsConfig',
+	'library.apps.LibraryConfig',
+    'tysc.apps.TyscConfig',
+    'tradingcards.apps.TradingCardsConfig',
+    'homeoffice.apps.HomeOfficeConfig',
+    'medien.apps.MedienConfig',
+=======
+>>>>>>> initial setup
+=======
+    'comics.apps.ComicsConfig',
+>>>>>>> add admin site for Comics
+=======
+INSTALLED_APPS = (
+    'comics.apps.ComicsConfig',
+    'tysc.apps.TyscConfig',
+    'library.apps.LibraryConfig',
+>>>>>>> backup
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+)
+
+MIDDLEWARE_CLASSES = (
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+)
+
+ROOT_URLCONF = 'kontor.urls'
+
+<<<<<<< HEAD
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+<<<<<<< HEAD
+        'DIRS': [os.path.join(BASE_DIR, 'templates')],
+=======
+        'DIRS': [],
+>>>>>>> initial setup
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+<<<<<<< HEAD
+                'django.template.context_processors.i18n',
+                'django.template.context_processors.media',
+                'django.template.context_processors.static',
+                'django.template.context_processors.tz',
+=======
+>>>>>>> initial setup
+            ],
+        },
+    },
+]
+
+=======
+>>>>>>> backup
+WSGI_APPLICATION = 'kontor.wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/1.6/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+#        'ENGINE': 'django.db.backends.dummy',
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    }
+}
+
+#from mongoengine import connect
+#connect('kontor')
+
+#SESSION_ENGINE = 'mongoengine.django.sessions'
+#SESSION_SERIALIZER = 'mongoengine.django.sessions.BSONSerializer'
+
+# Internationalization
+# https://docs.djangoproject.com/en/1.6/topics/i18n/
+
+<<<<<<< HEAD
+LANGUAGE_CODE = 'de-de'
+=======
+LANGUAGE_CODE = 'en-us'
+>>>>>>> initial setup
+
+TIME_ZONE = 'UTC'
+
+USE_I18N = True
+
+USE_L10N = True
+
+USE_TZ = True
+
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/1.6/howto/static-files/
+
+STATIC_URL = '/static/'
+<<<<<<< HEAD
+
+STATICFILES_DIRS = [
+    os.path.join(BASE_DIR, "static"),
+]
+=======
+>>>>>>> initial setup

django/kontor/kontor/urls.py

@@ -0,0 +1,61 @@
+from django.conf.urls import patterns, include, url
+
+<<<<<<< HEAD
+The `urlpatterns` list routes URLs to views. For more information please see:
+    https://docs.djangoproject.com/en/1.9/topics/http/urls/
+Examples:
+Function views
+    1. Add an import:  from my_app import views
+    2. Add a URL to urlpatterns:  url(r'^$', views.home, name='home')
+Class-based views
+    1. Add an import:  from other_app.views import Home
+    2. Add a URL to urlpatterns:  url(r'^$', Home.as_view(), name='home')
+Including another URLconf
+    1. Import the include() function: from django.conf.urls import url, include
+    2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
+"""
+<<<<<<< HEAD
+from django.conf.urls import url, include
+from django.contrib import admin
+from django.contrib.auth import views as auth_views
+
+from . import views
+
+admin.autodiscover()
+
+urlpatterns = [
+    #url(r'^admin/', admin.site.urls),
+    url('^', include('django.contrib.auth.urls')),
+    url(r'^$', views.index, name='index'),
+    #url(r'^accounts/login/$', auth_views.login),
+    url(r'^accounts/login/$', auth_views.login, {'template_name': 'kontor/login.html'}),
+    url(r'^accounts/logout/$', auth_views.logout ),
+    url(r'^admin/', include(admin.site.urls)),
+    url(r'^comics/', include('comics.urls')),
+    url(r'^office/', include('homeoffice.urls')),
+    url(r'^tradingcards/', include('tradingcards.urls')),
+    url(r'^tysc/', include('tysc.urls')),
+    url(r'^library/', include('library.urls')),
+    url(r'^medien/', include('medien.urls')),
+=======
+from django.conf.urls import url
+=======
+>>>>>>> backup
+from django.contrib import admin
+admin.autodiscover()
+
+<<<<<<< HEAD
+urlpatterns = [
+    url(r'^admin/', admin.site.urls),
+>>>>>>> initial setup
+]
+=======
+urlpatterns = patterns('',
+    # Examples:
+    #url(r'^$', 'kontor.views.home', name='home'),
+    # url(r'^blog/', include('blog.urls')),
+    url(r'^comics/', include('comics.urls')),
+    url(r'^tysc/', include('tysc.urls')),
+    url(r'^admin/', include(admin.site.urls)),
+)
+>>>>>>> backup

django/kontor/kontor/views.py

@@ -0,0 +1,14 @@
+from django.shortcuts import render
+from django.http import HttpResponse
+
+
+def index(request):
+<<<<<<< HEAD
+    return render(request, 'kontor/index.html')
+=======
+    return HttpResponse('You are in the Kontor application')
+>>>>>>> backup
+
+
+def home(request):
+    return HttpResponse('You are in the Kontor application')

django/kontor/kontor/wsgi.py

@@ -0,0 +1,14 @@
+"""
+WSGI config for kontor project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.6/howto/deployment/wsgi/
+"""
+
+import os
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "kontor.settings")
+
+from django.core.wsgi import get_wsgi_application
+application = get_wsgi_application()

django/kontor/library/admin.py

@@ -0,0 +1,20 @@
+from django.contrib import admin
+
+from .models import Author
+from .models import Book
+<<<<<<< HEAD
+from .models import Category
+from .models import Edition
+from .models import Publisher
+=======
+>>>>>>> backup
+
+# Register your models here.
+admin.site.register(Author)
+admin.site.register(Book)
+<<<<<<< HEAD
+admin.site.register(Category)
+admin.site.register(Edition)
+admin.site.register(Publisher)
+=======
+>>>>>>> backup

django/kontor/library/apps.py

@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+
+from django.apps import AppConfig
+
+
+class LibraryConfig(AppConfig):
+    name = 'library'

django/kontor/library/fixtures/books.yaml

@@ -0,0 +1,473 @@
+- model: library.author
+  pk: 1
+  fields: {name: Terry Pratchett}
+- model: library.author
+  pk: 2
+  fields: {name: Colin Forbes}
+- model: library.author
+  pk: 3
+  fields: {name: Markus Heitz}
+- model: library.author
+  pk: 4
+  fields: {name: Ralf Kuehnel}
+- model: library.author
+  pk: 5
+  fields: {name: Richard Murch}
+- model: library.author
+  pk: 6
+  fields: {name: Gunter Saake}
+- model: library.author
+  pk: 7
+  fields: {name: Kai-Uwe Sattler}
+- model: library.author
+  pk: 8
+  fields: {name: Joerg Thadeusz}
+- model: library.author
+  pk: 9
+  fields: {name: Stephan Burgdorff}
+- model: library.author
+  pk: 10
+  fields: {name: Christian Habbe}
+- model: library.author
+  pk: 11
+  fields: {name: Stephen Kenson}
+- model: library.author
+  pk: 12
+  fields: {name: Martin Fowler}
+- model: library.author
+  pk: 13
+  fields: {name: Ramnivas Laddad}
+- model: library.author
+  pk: 14
+  fields: {name: Thomas Gifford}
+- model: library.author
+  pk: 15
+  fields: {name: Rene Goscinny}
+- model: library.author
+  pk: 16
+  fields: {name: Albert Uderzo}
+- model: library.author
+  pk: 17
+  fields: {name: Mel Odem}
+- model: library.author
+  pk: 18
+  fields: {name: Harri Assmann}
+- model: library.author
+  pk: 19
+  fields: {name: Harald Schmidt}
+- model: library.author
+  pk: 20
+  fields: {name: Bruce Tate}
+- model: library.author
+  pk: 21
+  fields: {name: Mike Clark}
+- model: library.author
+  pk: 22
+  fields: {name: Bob Lee}
+- model: library.author
+  pk: 23
+  fields: {name: Patrick Linskey}
+- model: library.author
+  pk: 24
+  fields: {name: Jim Knipfel}
+- model: library.author
+  pk: 25
+  fields: {name: Carl Sargent}
+- model: library.author
+  pk: 26
+  fields: {name: Beate Sauer}
+- model: library.author
+  pk: 27
+  fields: {name: Kent Beck}
+- model: library.author
+  pk: 28
+  fields: {name: Erich Gamma}
+- model: library.author
+  pk: 29
+  fields: {name: Ilko-Sascha Kowalczuk}
+- model: library.author
+  pk: 30
+  fields: {name: Dalai Lama}
+- model: library.author
+  pk: 31
+  fields: {name: Horst Saecker}
+- model: library.author
+  pk: 32
+  fields: {name: Romain Sardou}
+- model: library.author
+  pk: 33
+  fields: {name: Berthold Daum}
+- model: library.author
+  pk: 34
+  fields: {name: Javier Sierra}
+- model: library.author
+  pk: 35
+  fields: {name: Dieter Hesselberger}
+- model: library.author
+  pk: 36
+  fields: {name: Anette Baecker}
+- model: library.author
+  pk: 37
+  fields: {name: Paul Baecker}
+- model: library.author
+  pk: 38
+  fields: {name: Lisa Smedmann}
+- model: library.author
+  pk: 39
+  fields: {name: Michael Cordy}
+- model: library.author
+  pk: 40
+  fields: {name: Stephen Fry}
+- model: library.author
+  pk: 41
+  fields: {name: Jonathan Bond}
+- model: library.author
+  pk: 42
+  fields: {name: Vince Flynn}
+- model: library.author
+  pk: 43
+  fields: {name: Eric-Emmanuel Schmitt}
+- model: library.author
+  pk: 44
+  fields: {name: Jak Koke}
+- model: library.author
+  pk: 45
+  fields: {name: Nigel Findley}
+- model: library.author
+  pk: 46
+  fields: {name: Edgar Noske}
+- model: library.author
+  pk: 47
+  fields: {name: Hannes Wertheim}
+- model: library.author
+  pk: 48
+  fields: {name: Frank Schaetzing}
+- model: library.author
+  pk: 49
+  fields: {name: Frank Pilz}
+- model: library.author
+  pk: 50
+  fields: {name: Frederick Forsyth}
+- model: library.author
+  pk: 51
+  fields: {name: Chris Kubasik}
+- model: library.author
+  pk: 52
+  fields: {name: Jordan K. Weisman}
+- model: library.author
+  pk: 53
+  fields: {name: Hans Georg Lehmann}
+- model: library.author
+  pk: 54
+  fields: {name: Nyx Smith}
+- model: library.author
+  pk: 55
+  fields: {name: Ferdinand Seibt}
+- model: library.author
+  pk: 56
+  fields: {name: Christopher Moore}
+- model: library.author
+  pk: 57
+  fields: {name: Jens Gieseke}
+- model: library.author
+  pk: 58
+  fields: {name: Bernd Lindner}
+- model: library.author
+  pk: 59
+  fields: {name: Horst Poetzsch}
+- model: library.author
+  pk: 60
+  fields: {name: Caroline Spector}
+- model: library.author
+  pk: 61
+  fields: {name: Peter Godman}
+- model: library.author
+  pk: 62
+  fields: {name: Hans Joachim Alpers}
+- model: library.author
+  pk: 63
+  fields: {name: Bernhard Schlink}
+- model: library.author
+  pk: 64
+  fields: {name: Rebecca Gable}
+- model: library.author
+  pk: 65
+  fields: {name: Douglas Adams}
+- model: library.author
+  pk: 66
+  fields: {name: Susan Cooper}
+- model: library.author
+  pk: 67
+  fields: {name: Donna W. Cross}
+- model: library.author
+  pk: 68
+  fields: {name: Peter Prange}
+- model: library.author
+  pk: 69
+  fields: {name: Tanja Kinkel}
+- model: library.author
+  pk: 70
+  fields: {name: Ken Follett}
+- model: library.author
+  pk: 71
+  fields: {name: Minette Walters}
+- model: library.author
+  pk: 72
+  fields: {name: Peter Tremayne}
+- model: library.author
+  pk: 73
+  fields: {name: Marion Zimmer Bradley}
+- model: library.author
+  pk: 74
+  fields: {name: Wolfgang Hohlbein}
+- model: library.author
+  pk: 75
+  fields: {name: Friedrich Wilhelm Graf}
+- model: library.author
+  pk: 76
+  fields: {name: Nyx Smith}
+- model: library.author
+  pk: 78
+  fields: {name: Ferdinand Seibt}
+- model: library.author
+  pk: 79
+  fields: {name: Christopher Moore}
+- model: library.author
+  pk: 80
+  fields: {name: Jens Gieseke}
+- model: library.author
+  pk: 81
+  fields: {name: Bernd Lindner}
+- model: library.author
+  pk: 82
+  fields: {name: Horst Poetzsch}
+- model: library.author
+  pk: 84
+  fields: {name: Caroline Spector}
+- model: library.author
+  pk: 85
+  fields: {name: Peter Godman}
+- model: library.author
+  pk: 86
+  fields: {name: Hans Joachim Alpers}
+- model: library.author
+  pk: 87
+  fields: {name: Bernhard Schlink}
+- model: library.author
+  pk: 89
+  fields: {name: Rebecca Gable}
+- model: library.author
+  pk: 90
+  fields: {name: Douglas Adams}
+- model: library.author
+  pk: 91
+  fields: {name: Susan Cooper}
+- model: library.author
+  pk: 93
+  fields: {name: Donna W. Cross}
+- model: library.author
+  pk: 94
+  fields: {name: Peter Prange}
+- model: library.author
+  pk: 95
+  fields: {name: Tanja Kinkel}
+- model: library.author
+  pk: 96
+  fields: {name: Ken Follett}
+- model: library.author
+  pk: 97
+  fields: {name: Minette Walters}
+- model: library.author
+  pk: 99
+  fields: {name: Peter Tremayne}
+- model: library.author
+  pk: 101
+  fields: {name: Marion Zimmer Bradley}
+- model: library.author
+  pk: 102
+  fields: {name: Wolfgang Hohlbein}
+- model: library.author
+  pk: 103
+  fields: {name: Friedrich Wilhelm Graf}
+- model: library.author
+  pk: 104
+  fields: {name: Terry Pratchett}
+- model: library.author
+  pk: 105
+  fields: {name: Daniel Suarez}
+- model: library.category
+  pk: 1
+  fields: {name: Science Fiction}
+- model: library.category
+  pk: 2
+  fields: {name: Roman}
+- model: library.category
+  pk: 3
+  fields: {name: Reference}
+- model: library.category
+  pk: 4
+  fields: {name: Fantasy}
+- model: library.category
+  pk: 5
+  fields: {name: Comics}
+- model: library.category
+  pk: 6
+  fields: {name: Satire}
+- model: library.category
+  pk: 7
+  fields: {name: Thriller}
+- model: library.edition
+  pk: 1
+  fields: {name: Paperback}
+- model: library.edition
+  pk: 2
+  fields: {name: Hardcover}
+- model: library.edition
+  pk: 3
+  fields: {name: Softcover}
+- model: library.publisher
+  pk: 1
+  fields: {name: Addison-Wesley Verlag}
+- model: library.publisher
+  pk: 2
+  fields: {name: O'Reilly Media}
+- model: library.publisher
+  pk: 3
+  fields: {name: O'Reilly & Associates}
+- model: library.publisher
+  pk: 4
+  fields: {name: Klett-Cotta}
+- model: library.publisher
+  pk: 5
+  fields: {name: Diogenes}
+- model: library.publisher
+  pk: 6
+  fields: {name: Jaron Verlag}
+- model: library.publisher
+  pk: 7
+  fields: {name: Merkur Verlag Rinteln}
+- model: library.publisher
+  pk: 8
+  fields: {name: Ehapa Verlag}
+- model: library.publisher
+  pk: 9
+  fields: {name: Markt+Technik Verlag}
+- model: library.publisher
+  pk: 10
+  fields: {name: Kiepenheuer & Witsch}
+- model: library.publisher
+  pk: 11
+  fields: {name: Goldmann Verlag}
+- model: library.publisher
+  pk: 12
+  fields: {name: Sams Publishing}
+- model: library.publisher
+  pk: 13
+  fields: {name: Wilhelm Heyne Verlag}
+- model: library.publisher
+  pk: 14
+  fields: {name: Amman Verlag & Co.}
+- model: library.publisher
+  pk: 15
+  fields: {name: Fischer Verlag}
+- model: library.publisher
+  pk: 16
+  fields: {name: BestBook}
+- model: library.publisher
+  pk: 17
+  fields: {name: List Verlag}
+- model: library.publisher
+  pk: 18
+  fields: {name: dpunkt.verlag GmbH}
+- model: library.publisher
+  pk: 19
+  fields: {name: Ullstein Verlag}
+- model: library.publisher
+  pk: 20
+  fields: {name: Piper Verlag}
+- model: library.publisher
+  pk: 21
+  fields: {name: Knaur Verlag}
+- model: library.publisher
+  pk: 22
+  fields: {name: Heyne Fantasy}
+- model: library.publisher
+  pk: 23
+  fields: {name: Manning Publications Co.}
+- model: library.publisher
+  pk: 24
+  fields: {name: ADAC Verlag}
+- model: library.publisher
+  pk: 25
+  fields: {name: dpunkt-Verlag}
+- model: library.publisher
+  pk: 26
+  fields: {name: Verlag Kiepenheuer & Witsch}
+- model: library.publisher
+  pk: 27
+  fields: {name: Hanser Wirtschaft}
+- model: library.publisher
+  pk: 28
+  fields: {name: Droemersche Verlagsanstalt}
+- model: library.publisher
+  pk: 29
+  fields: {name: Fischer Buecherei GmbH}
+- model: library.publisher
+  pk: 30
+  fields: {name: rororo Verlag}
+- model: library.publisher
+  pk: 31
+  fields: {name: Hoffmann und Campe}
+- model: library.publisher
+  pk: 32
+  fields: {name: Heyne Verlag}
+- model: library.publisher
+  pk: 33
+  fields: {name: dpunkt.verlag}
+- model: library.publisher
+  pk: 34
+  fields: {name: Dorling Kindersley}
+- model: library.publisher
+  pk: 35
+  fields: {name: Ammann Verlag}
+- model: library.publisher
+  pk: 36
+  fields: {name: Addison-Wesley}
+- model: library.publisher
+  pk: 37
+  fields: {name: Ueberreuter}
+- model: library.publisher
+  pk: 38
+  fields: {name: Bertelsmann Club}
+- model: library.publisher
+  pk: 39
+  fields: {name: Harriet Eder Verlag}
+- model: library.publisher
+  pk: 40
+  fields: {name: Marix Verlag}
+- model: library.publisher
+  pk: 41
+  fields: {name: Aufbau Taschenbuch Verlag}
+- model: library.publisher
+  pk: 42
+  fields: {name: Rowohlt Taschenbuch Verlag}
+- model: library.book
+  pk: 1
+  fields:
+    title: 2XS
+    publisher: null
+    isbn: ''
+    edition: 1
+    pages: null
+    category: 1
+    authors: [58]
+- model: library.book
+  pk: 2
+  fields:
+    title: Daemon
+    publisher: 42
+    isbn: 978 3 499 25643 1
+    edition: 1
+    pages: 639
+    category: 7
+    authors: [105]

django/kontor/library/migrations/0001_initial.py

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+<<<<<<< HEAD
+# Generated by Django 1.9.6 on 2016-05-31 08:57
+=======
+# Generated by Django 1.9.2 on 2016-02-16 19:01
+>>>>>>> backup
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Author',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=40)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Book',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=40)),
+            ],
+        ),
+    ]

django/kontor/library/migrations/0002_auto_20160624_1230.py

@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-06-24 12:30
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Category',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=40)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Edition',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=40)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Publisher',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=40)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='book',
+            name='authors',
+            field=models.ManyToManyField(blank=True, to='library.Author'),
+        ),
+        migrations.AddField(
+            model_name='book',
+            name='isbn',
+            field=models.CharField(max_length=20, null=True),
+        ),
+        migrations.AddField(
+            model_name='book',
+            name='pages',
+            field=models.IntegerField(null=True),
+        ),
+        migrations.AddField(
+            model_name='book',
+            name='category',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='library.Category'),
+        ),
+        migrations.AddField(
+            model_name='book',
+            name='edition',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='library.Edition'),
+        ),
+        migrations.AddField(
+            model_name='book',
+            name='publisher',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='library.Publisher'),
+        ),
+    ]

django/kontor/library/migrations/0003_auto_20160624_1240.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-06-24 12:40
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0002_auto_20160624_1230'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='book',
+            name='isbn',
+            field=models.CharField(blank=True, max_length=20, null=True),
+        ),
+        migrations.AlterField(
+            model_name='book',
+            name='pages',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+    ]

django/kontor/library/models.py

@@ -0,0 +1,51 @@
+from __future__ import unicode_literals
+
+from django.db import models
+
+# Create your models here.
+
+
+class Author(models.Model):
+    name = models.CharField(max_length=40)
+
+    def __str__(self):
+        return self.name
+
+
+<<<<<<< HEAD
+class Category(models.Model):
+    name = models.CharField(max_length=40)
+
+    def __str__(self):
+        return self.name
+
+
+class Edition(models.Model):
+    name = models.CharField(max_length=40)
+
+    def __str__(self):
+        return self.name
+
+
+class Publisher(models.Model):
+    name = models.CharField(max_length=40)
+
+    def __str__(self):
+        return self.name
+
+
+class Book(models.Model):
+    title = models.CharField(max_length=40)
+    authors = models.ManyToManyField(Author, blank=True)
+    publisher = models.ForeignKey(Publisher, null=True, blank=True)
+    isbn = models.CharField(max_length=20, null=True, blank=True)
+    edition = models.ForeignKey(Edition, null=True, blank=True)
+    pages = models.IntegerField(null=True, blank=True)
+    category = models.ForeignKey(Category, null=True, blank=True)
+=======
+class Book(models.Model):
+    title = models.CharField(max_length=40)
+>>>>>>> backup
+
+    def __str__(self):
+        return self.title

django/kontor/library/templates/library/author_list.html

@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+{% block title %}HomeOffice{% endblock %}
+{% block content %}
+    <table>
+        <thead><td>Name</td></thead>
+        {% for author in author_list %}
+        <tr>
+            <td><a href="{% url 'autor:detail' author.id %}">{{ autor.name }}</a></td>
+        </tr>
+        {% endfor %}
+    </table>
+{% endblock %}

django/kontor/library/templates/library/index.html

@@ -0,0 +1,2 @@
+{% extends "kontor/base.html" %}
+{% block title %}Bücher{% endblock %}

django/kontor/library/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

django/kontor/library/urls.py

@@ -0,0 +1,9 @@
+from django.conf.urls import url
+
+from . import views
+
+app_name = 'library'
+urlpatterns = [
+    url(r'^$', views.index, name='index'),
+    url(r'^author/$', views.AuthorIndexView.as_view(), name='author_list'),
+]

django/kontor/library/views.py

@@ -0,0 +1,46 @@
+from django.shortcuts import render
+<<<<<<< HEAD
+from django.http import HttpResponse
+from django.views import generic
+from django.contrib.auth.decorators import login_required
+=======
+from django.views import generic
+>>>>>>> backup
+
+from .models import Author
+from .models import Book
+# Create your views here.
+
+<<<<<<< HEAD
+@login_required
+def index(request):
+    return render(request, 'library/index.html')
+=======
+>>>>>>> backup
+
+class AuthorIndexView(generic.ListView):
+    template_name = 'library/authorindex.html'
+    context_object_name = 'author_list'
+
+    def get_queryset(self):
+        """Return the list of authors."""
+        return Author.objects.all()
+
+
+class AuthorDetailView(generic.DetailView):
+    model = Author
+    template_name = 'library/authordetail.html'
+
+
+class BookIndexView(generic.ListView):
+    template_name = 'library/bookindex.html'
+    context_object_name = 'book_list'
+
+    def get_queryset(self):
+        """Return the list of books."""
+        return Book.objects.all()
+
+
+class BookDetailView(generic.DetailView):
+    model = Book
+    template_name = 'library/bookdetail.html'

django/kontor/manage.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "kontor.settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)

django/kontor/medien/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

django/kontor/medien/apps.py

@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+
+from django.apps import AppConfig
+
+
+class MedienConfig(AppConfig):
+    name = 'medien'

django/kontor/medien/templates/medien/index.html

@@ -0,0 +1,2 @@
+{% extends "kontor/base.html" %}
+{% block title %}Medien{% endblock %}

django/kontor/medien/urls.py

@@ -0,0 +1,8 @@
+from django.conf.urls import url
+
+from . import views
+
+app_name = 'medien'
+urlpatterns = [
+    url(r'^$', views.index, name='index'),
+]

django/kontor/medien/views.py

@@ -0,0 +1,5 @@
+from django.shortcuts import render
+
+# Create your views here.
+def index(request):
+    return render(request, 'medien/index.html')

django/kontor/static/kontor.css

@@ -0,0 +1,109 @@
+body {
+	font-family: sans-serif;
+	color: #333333;
+	padding: 3em 0 4em;
+}
+
+body,
+.wrapper {
+	margin: 10px auto;
+	/*max-width: 60em;*/
+}
+ 
+header, main, section, footer {
+	border-radius: 0px 0.5em 0.5em;
+	border: 1px solid;
+	padding: 10px;
+	margin: 10px;
+}
+ 
+header {
+	position:fixed;
+	top:0px;
+	left:0px;
+	right:0px;
+	text-align:center;
+	padding: 10px;
+	background: lightgrey;
+	/*border-bottom: 1px solid #d5d5d5;*/
+}
+
+nav {
+	/*position: fixed;*/
+	/*padding-top: 10em;	*/
+	
+	border-radius: 0px 0.5em 0.5em;
+	border: 1px solid;
+
+	padding: 0;
+	margin: 10px;
+
+	font-size: 0.91em;
+	float: left;
+	width: 15em;
+	background: lightskyblue;
+	border-color: skyblue;
+}
+
+nav ul {
+	padding: 0;
+}
+
+nav li {
+	list-style: none;
+	margin: 0.4em;
+	padding: 0;
+}
+
+nav ul ul {
+	margin: 0 0 0 2em;
+	padding: 0;
+	border: none;
+}
+
+nav ul ul li {
+	margin: 0.3em 0;
+}
+
+nav a {
+	display: block;
+	padding: 0.4em;
+	text-decoration: none;
+	font-weight: bold;
+	border: 1px solid blue;
+	border-radius: 10px;
+	box-shadow: 0px 5px 10px white inset;
+	background-color: skyblue;
+	color: #333;
+
+}
+
+nav a:focus,
+nav a:hover {
+	color: royalblue;
+	background-color: gold;
+}
+
+main {
+	display: block;
+	background: lightblue;
+	border-color: #8a9da8;
+	margin-left: 15em;
+	min-width: 16em; /* Mindestbreite (der Überschrift) verhindert Anzeigefehler in modernen Browsern */
+}
+ 
+footer {
+	position:fixed;
+	padding: 10px;
+	margin-top: 10px;
+	bottom:0;
+	left: 0;
+	right:0;
+	background: lightgrey;
+	border-color: grey;
+}
+ 
+footer p {
+	float:right;
+	margin: 0;
+}

django/kontor/templates/admin/base_site.html

@@ -0,0 +1,9 @@
+{% extends "admin/base.html" %}
+
+{% block title %}{{ title }} | {{ site_title|default:_('Django site admin') }}{% endblock %}
+
+{% block branding %}
+<h1 id="site-name"><a href="{% url 'admin:index' %}">Kontor administration</a></h1>
+{% endblock %}
+
+{% block nav-global %}{% endblock %}

django/kontor/templates/kontor/base.html

@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>{% block title %}Kontor{% endblock %}</title>
+{% load staticfiles %}
+<link rel="stylesheet" type="text/css" href="{% static 'kontor.css' %}" />
+</head>
+<body>
+  <header>Kontor</header>
+  {% block navigation %}
+  <nav><ul>
+    <li><a href="/">Kontor</a></li>
+    <li><a href="/office">HomeOffice</a></li>
+    <li><a href="/comics">Comics</a></li>
+    <li><a href="/library">B&uuml;cher</a></li>
+    <li><a href="/medien">Medien</a></li>
+    <li><a href="/tradingcards">Trading Cards</a></li>
+    <li><a href="/tysc">TradeYourSportsCards</a></li>
+  </ul></nav>
+  {% endblock %}
+  <main role="main">
+    <details>
+      {% block content %}{% endblock %}
+    </details>
+  </main>
+  {% if user.is_authenticated %}
+    <footer><a href="/accounts/logout">{{ user }}</a><p>Ingenieurb&uuml;ro Thomas Peetz</p></footer>
+  {% else %}
+    <footer><a href="/accounts/login">Login</a><p>Ingenieurb&uuml;ro Thomas Peetz</p></footer>
+  {% endif %}
+</body>
+</html>

django/kontor/templates/kontor/index.html

@@ -0,0 +1 @@
+{% extends "kontor/base.html" %}

django/kontor/templates/kontor/login.html

@@ -0,0 +1,33 @@
+{% extends "kontor/base.html" %}
+
+{% block content %}
+{% if form.errors %}
+<p>Your username and password didn't match. Please try again.</p>
+{% endif %}
+
+{% if next %}
+    {% if user.is_authenticated %}
+    <p>Your account doesn't have access to this page. To proceed,
+    please login with an account that has access.</p>
+    {% else %}
+    <p>Please login to see this page.</p>
+    {% endif %}
+{% endif %}
+
+<form method="post" action="{% url 'login' %}">
+{% csrf_token %}
+<table>
+<tr>
+    <td>{{ form.username.label_tag }}</td>
+    <td>{{ form.username }}</td>
+</tr>
+<tr>
+    <td>{{ form.password.label_tag }}</td>
+    <td>{{ form.password }}</td>
+</tr>
+</table>
+
+<input type="submit" value="login" />
+<input type="hidden" name="next" value="{{ next }}" />
+</form>
+{% endblock %}

django/kontor/tradingcards/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

django/kontor/tradingcards/apps.py

@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+
+from django.apps import AppConfig
+
+
+class TradingCardsConfig(AppConfig):
+    name = 'tradingcards'

django/kontor/tradingcards/models.py

@@ -0,0 +1,5 @@
+from __future__ import unicode_literals
+
+from django.db import models
+
+# Create your models here.

django/kontor/tradingcards/templates/tradingcards/index.html

@@ -0,0 +1,2 @@
+{% extends "kontor/base.html" %}
+{% block title %}Trading Cards{% endblock %}

django/kontor/tradingcards/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

django/kontor/tradingcards/urls.py

@@ -0,0 +1,7 @@
+from django.conf.urls import url
+
+from . import views
+
+urlpatterns = [
+    url(r'^$', views.index, name='index'),
+]

django/kontor/tradingcards/views.py

@@ -0,0 +1,5 @@
+from django.shortcuts import render
+
+# Create your views here.
+def index(request):
+    return render(request, 'tradingcards/index.html')

django/kontor/tysc/admin.py

@@ -0,0 +1,22 @@
+from django.contrib import admin
+
+from .models import Sport
+from .models import Team
+from .models import Position
+from .models import Player
+from .models import Manufacturer
+from .models import Serie
+from .models import InsertSet
+from .models import ParallelSet
+from .models import SportCard
+# Register your models here.
+
+admin.site.register(Sport)
+admin.site.register(Team)
+admin.site.register(Position)
+admin.site.register(Player)
+admin.site.register(Manufacturer)
+admin.site.register(Serie)
+admin.site.register(InsertSet)
+admin.site.register(ParallelSet)
+admin.site.register(SportCard)

django/kontor/tysc/apps.py

@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+
+from django.apps import AppConfig
+
+
+class TyscConfig(AppConfig):
+    name = 'tysc'

django/kontor/tysc/fixtures/teams.yaml

@@ -0,0 +1,561 @@
+- model: tysc.sport
+  pk: 1
+  fields: {name: Football}
+- model: tysc.sport
+  pk: 2
+  fields: {name: Baseball}
+- model: tysc.sport
+  pk: 3
+  fields: {name: Basketball}
+- model: tysc.sport
+  pk: 4
+  fields: {name: Hockey}
+- model: tysc.team
+  pk: 1
+  fields: {name: Buffalo Bills, shortname: Bills, sport: 1}
+- model: tysc.team
+  pk: 2
+  fields: {name: Indianapolis Colts, shortname: Colts, sport: 1}
+- model: tysc.team
+  pk: 3
+  fields: {name: Miami Dolphins, shortname: Dolphins, sport: 1}
+- model: tysc.team
+  pk: 4
+  fields: {name: New England Patriots, shortname: Patriots, sport: 1}
+- model: tysc.team
+  pk: 5
+  fields: {name: New York Jets, shortname: Jets, sport: 1}
+- model: tysc.team
+  pk: 6
+  fields: {name: Baltimore Ravens, shortname: Ravens, sport: 1}
+- model: tysc.team
+  pk: 7
+  fields: {name: Cincinnati Bengals, shortname: Bengals, sport: 1}
+- model: tysc.team
+  pk: 8
+  fields: {name: Cleveland Browns, shortname: Browns, sport: 1}
+- model: tysc.team
+  pk: 9
+  fields: {name: Jacksonville Jaguars, shortname: Jaguars, sport: 1}
+- model: tysc.team
+  pk: 10
+  fields: {name: Pittsburgh Steelers, shortname: Steelers, sport: 1}
+- model: tysc.team
+  pk: 11
+  fields: {name: Tennessee Titans, shortname: Titans, sport: 1}
+- model: tysc.team
+  pk: 12
+  fields: {name: Denver Broncos, shortname: Broncos, sport: 1}
+- model: tysc.team
+  pk: 13
+  fields: {name: Kansas City Chiefs, shortname: Chiefs, sport: 1}
+- model: tysc.team
+  pk: 14
+  fields: {name: Oakland Raiders, shortname: Raiders, sport: 1}
+- model: tysc.team
+  pk: 15
+  fields: {name: San Diego Chargers, shortname: Chargers, sport: 1}
+- model: tysc.team
+  pk: 16
+  fields: {name: Seattle Seahawks, shortname: Seahawks, sport: 1}
+- model: tysc.team
+  pk: 17
+  fields: {name: Arizona Cardinals, shortname: Cardinals, sport: 1}
+- model: tysc.team
+  pk: 18
+  fields: {name: Dallas Cowboys, shortname: Cowboys, sport: 1}
+- model: tysc.team
+  pk: 19
+  fields: {name: New York Giants, shortname: Giants, sport: 1}
+- model: tysc.team
+  pk: 20
+  fields: {name: Philadelphia Eagles, shortname: Eagles, sport: 1}
+- model: tysc.team
+  pk: 21
+  fields: {name: Washington Redskins, shortname: Redskins, sport: 1}
+- model: tysc.team
+  pk: 22
+  fields: {name: Chicago Bears, shortname: Bears, sport: 1}
+- model: tysc.team
+  pk: 23
+  fields: {name: Detroit Lions, shortname: Lions, sport: 1}
+- model: tysc.team
+  pk: 24
+  fields: {name: Green Bay Packers, shortname: Packers, sport: 1}
+- model: tysc.team
+  pk: 25
+  fields: {name: Minnesota Vikings, shortname: Vikings, sport: 1}
+- model: tysc.team
+  pk: 26
+  fields: {name: Tampa Bay Buccaneers, shortname: Buccaneers, sport: 1}
+- model: tysc.team
+  pk: 27
+  fields: {name: Atlanta Falcons, shortname: Falcons, sport: 1}
+- model: tysc.team
+  pk: 28
+  fields: {name: Carolina Panthers, shortname: Panthers, sport: 1}
+- model: tysc.team
+  pk: 29
+  fields: {name: New Orleans Saints, shortname: Saints, sport: 1}
+- model: tysc.team
+  pk: 30
+  fields: {name: St.Louis Rams, shortname: Rams, sport: 1}
+- model: tysc.team
+  pk: 31
+  fields: {name: San Francisco 49ers, shortname: 49ers, sport: 1}
+- model: tysc.team
+  pk: 32
+  fields: {name: Baltimore Orioles, shortname: Orioles, sport: 2}
+- model: tysc.team
+  pk: 33
+  fields: {name: Boston Red Sox, shortname: Red Sox, sport: 2}
+- model: tysc.team
+  pk: 34
+  fields: {name: New York Yankees, shortname: Yankees, sport: 2}
+- model: tysc.team
+  pk: 35
+  fields: {name: Tampa Bay Devil Rays, shortname: Devil Rays, sport: 2}
+- model: tysc.team
+  pk: 36
+  fields: {name: Toronto Blue Jays, shortname: Blue Jays, sport: 2}
+- model: tysc.team
+  pk: 37
+  fields: {name: Chicago White Sox, shortname: White Sox, sport: 2}
+- model: tysc.team
+  pk: 38
+  fields: {name: Cleveland Indians, shortname: Indians, sport: 2}
+- model: tysc.team
+  pk: 39
+  fields: {name: Detroit Tigers, shortname: Tigers, sport: 2}
+- model: tysc.team
+  pk: 40
+  fields: {name: Kansas City Royals, shortname: Royals, sport: 2}
+- model: tysc.team
+  pk: 41
+  fields: {name: Minnesota Twins, shortname: Twins, sport: 2}
+- model: tysc.team
+  pk: 42
+  fields: {name: Anaheim Angels, shortname: Angels, sport: 2}
+- model: tysc.team
+  pk: 43
+  fields: {name: Oakland Athletics, shortname: Athletics, sport: 2}
+- model: tysc.team
+  pk: 44
+  fields: {name: Seattle Mariners, shortname: Mariners, sport: 2}
+- model: tysc.team
+  pk: 45
+  fields: {name: Texas Rangers, shortname: Rangers, sport: 2}
+- model: tysc.team
+  pk: 46
+  fields: {name: Atlanta Braves, shortname: Braves, sport: 2}
+- model: tysc.team
+  pk: 47
+  fields: {name: Florida Marlins, shortname: Marlins, sport: 2}
+- model: tysc.team
+  pk: 48
+  fields: {name: Montreal Expos, shortname: Expos, sport: 2}
+- model: tysc.team
+  pk: 49
+  fields: {name: New York Mets, shortname: Mets, sport: 2}
+- model: tysc.team
+  pk: 50
+  fields: {name: Philadelphia Phillies, shortname: Phillies, sport: 2}
+- model: tysc.team
+  pk: 51
+  fields: {name: Chicago Cubs, shortname: Cubs, sport: 2}
+- model: tysc.team
+  pk: 52
+  fields: {name: Cincinnati Reds, shortname: Reds, sport: 2}
+- model: tysc.team
+  pk: 53
+  fields: {name: Houston Astros, shortname: Astros, sport: 2}
+- model: tysc.team
+  pk: 54
+  fields: {name: Milwaukee Brewers, shortname: Brewers, sport: 2}
+- model: tysc.team
+  pk: 55
+  fields: {name: Pittsburgh Pirates, shortname: Pirates, sport: 2}
+- model: tysc.team
+  pk: 56
+  fields: {name: St.Louis Cardinals, shortname: Cardinals, sport: 2}
+- model: tysc.team
+  pk: 57
+  fields: {name: Arizona Diamondbacks, shortname: Diamondbacks, sport: 2}
+- model: tysc.team
+  pk: 58
+  fields: {name: Colorado Rockies, shortname: Rockies, sport: 2}
+- model: tysc.team
+  pk: 59
+  fields: {name: Los Angeles Dodgers, shortname: Dodgers, sport: 2}
+- model: tysc.team
+  pk: 60
+  fields: {name: San Diego Padres, shortname: Padres, sport: 2}
+- model: tysc.team
+  pk: 61
+  fields: {name: San Francisco Giants, shortname: Giants, sport: 2}
+- model: tysc.team
+  pk: 62
+  fields: {name: Boston Celtics, shortname: Celtics, sport: 3}
+- model: tysc.team
+  pk: 63
+  fields: {name: Miami Heat, shortname: Heat, sport: 3}
+- model: tysc.team
+  pk: 64
+  fields: {name: New Jersey Nets, shortname: Mets, sport: 3}
+- model: tysc.team
+  pk: 65
+  fields: {name: New York Knicks, shortname: Knicks, sport: 3}
+- model: tysc.team
+  pk: 66
+  fields: {name: Orlando Magic, shortname: Magic, sport: 3}
+- model: tysc.team
+  pk: 67
+  fields: {name: Philadelphia 76ers, shortname: 76ers, sport: 3}
+- model: tysc.team
+  pk: 68
+  fields: {name: Washington Wizards, shortname: Wizards, sport: 3}
+- model: tysc.team
+  pk: 69
+  fields: {name: Atlanta Hawks, shortname: Hawks, sport: 3}
+- model: tysc.team
+  pk: 70
+  fields: {name: Charlotte Hornets, shortname: Hornets, sport: 3}
+- model: tysc.team
+  pk: 71
+  fields: {name: Chicago Bulls, shortname: Bulls, sport: 3}
+- model: tysc.team
+  pk: 72
+  fields: {name: Cleveland Cavaliers, shortname: Cavaliers, sport: 3}
+- model: tysc.team
+  pk: 73
+  fields: {name: Detroit Pistons, shortname: Pistons, sport: 3}
+- model: tysc.team
+  pk: 74
+  fields: {name: Indiana Pacers, shortname: Pacers, sport: 3}
+- model: tysc.team
+  pk: 75
+  fields: {name: Milwaukee Bucks, shortname: Bucks, sport: 3}
+- model: tysc.team
+  pk: 76
+  fields: {name: Toronto Raptors, shortname: Raptors, sport: 3}
+- model: tysc.team
+  pk: 77
+  fields: {name: Dallas Mavericks, shortname: Mavericks, sport: 3}
+- model: tysc.team
+  pk: 78
+  fields: {name: Denver Nuggets, shortname: Nuggets, sport: 3}
+- model: tysc.team
+  pk: 79
+  fields: {name: Houston Rockets, shortname: Rockets, sport: 3}
+- model: tysc.team
+  pk: 80
+  fields: {name: Minnesota Timberwolves, shortname: Timberwolves, sport: 3}
+- model: tysc.team
+  pk: 81
+  fields: {name: San Antonio Spurs, shortname: Spurs, sport: 3}
+- model: tysc.team
+  pk: 82
+  fields: {name: Utah Jazz, shortname: Jazz, sport: 3}
+- model: tysc.team
+  pk: 83
+  fields: {name: Vancouver Grizzlies, shortname: Grizzlies, sport: 3}
+- model: tysc.team
+  pk: 84
+  fields: {name: Golden State Warriors, shortname: Warriors, sport: 4}
+- model: tysc.team
+  pk: 85
+  fields: {name: Los Angeles Clippers, shortname: Clippers, sport: 3}
+- model: tysc.team
+  pk: 86
+  fields: {name: Los Angeles Lakers, shortname: Lakers, sport: 3}
+- model: tysc.team
+  pk: 87
+  fields: {name: Phoenix Suns, shortname: Suns, sport: 3}
+- model: tysc.team
+  pk: 88
+  fields: {name: Portland Trail Blazers, shortname: Blazers, sport: 3}
+- model: tysc.team
+  pk: 89
+  fields: {name: Sacramento Kings, shortname: Kings, sport: 3}
+- model: tysc.team
+  pk: 90
+  fields: {name: Seattle SuperSonics, shortname: SuperSonics, sport: 3}
+- model: tysc.team
+  pk: 91
+  fields: {name: Boston Bruins, shortname: Bruins, sport: 4}
+- model: tysc.team
+  pk: 92
+  fields: {name: Buffalo Sabres, shortname: Sabres, sport: 4}
+- model: tysc.team
+  pk: 93
+  fields: {name: Montreal Canadiens, shortname: Canadiens, sport: 4}
+- model: tysc.team
+  pk: 94
+  fields: {name: Ottawa Senators, shortname: Senators, sport: 4}
+- model: tysc.team
+  pk: 95
+  fields: {name: Toronto Maple Leafs, shortname: Maple Leafs, sport: 4}
+- model: tysc.team
+  pk: 96
+  fields: {name: New Jersey Devils, shortname: Devils, sport: 4}
+- model: tysc.team
+  pk: 97
+  fields: {name: New York Islander, shortname: Islander, sport: 4}
+- model: tysc.team
+  pk: 98
+  fields: {name: New York Rangers, shortname: Rangers, sport: 4}
+- model: tysc.team
+  pk: 99
+  fields: {name: Philadelphia Flyers, shortname: Flyers, sport: 4}
+- model: tysc.team
+  pk: 100
+  fields: {name: Pittsburgh Penguins, shortname: Penguins, sport: 4}
+- model: tysc.team
+  pk: 101
+  fields: {name: Atlanta Trashers, shortname: Trashers, sport: 4}
+- model: tysc.team
+  pk: 102
+  fields: {name: Carolina Hurricanes, shortname: Hurricanes, sport: 4}
+- model: tysc.team
+  pk: 103
+  fields: {name: Florida Panthers, shortname: Panthers, sport: 4}
+- model: tysc.team
+  pk: 104
+  fields: {name: Tampa Bay Lightnings, shortname: Lightnings, sport: 4}
+- model: tysc.team
+  pk: 105
+  fields: {name: Washington Capitals, shortname: Capitals, sport: 4}
+- model: tysc.team
+  pk: 106
+  fields: {name: Chicago Blackhawks, shortname: Blackhawks, sport: 4}
+- model: tysc.team
+  pk: 107
+  fields: {name: Columbo Blue Jackets, shortname: Blue Jackets, sport: 4}
+- model: tysc.team
+  pk: 108
+  fields: {name: Detroit Red Wings, shortname: Red Wings, sport: 4}
+- model: tysc.team
+  pk: 109
+  fields: {name: Nashville Predators, shortname: Predators, sport: 4}
+- model: tysc.team
+  pk: 110
+  fields: {name: St.Louis Blues, shortname: Blues, sport: 4}
+- model: tysc.team
+  pk: 111
+  fields: {name: Calgary Flames, shortname: Flames, sport: 4}
+- model: tysc.team
+  pk: 112
+  fields: {name: Colorado Avalanche, shortname: Avalanche, sport: 4}
+- model: tysc.team
+  pk: 113
+  fields: {name: Edmonton Oilers, shortname: Oilers, sport: 4}
+- model: tysc.team
+  pk: 114
+  fields: {name: Minnesota Wild, shortname: Wild, sport: 4}
+- model: tysc.team
+  pk: 115
+  fields: {name: Vancouver Canucks, shortname: Canucks, sport: 4}
+- model: tysc.team
+  pk: 116
+  fields: {name: Anaheim Mighty Ducks, shortname: Mighty Ducks, sport: 4}
+- model: tysc.team
+  pk: 117
+  fields: {name: Dallas Stars, shortname: Stars, sport: 4}
+- model: tysc.team
+  pk: 118
+  fields: {name: Los Angeles Kings, shortname: Kings, sport: 4}
+- model: tysc.team
+  pk: 119
+  fields: {name: Phoenix Coyotes, shortname: Coyotes, sport: 4}
+- model: tysc.team
+  pk: 120
+  fields: {name: San Jose Sharks, shortname: Sharks, sport: 4}
+- model: tysc.team
+  pk: 121
+  fields: {name: Houston Texans, shortname: Texans, sport: 1}
+- model: tysc.team
+  pk: 122
+  fields: {name: Houston Oilers, shortname: Oilers, sport: 1}
+- model: tysc.position
+  pk: 1
+  fields: {name: QB, description: Quarterback, sport: 1}
+- model: tysc.position
+  pk: 2
+  fields: {name: WR, description: Wide Receiver, sport: 1}
+- model: tysc.position
+  pk: 3
+  fields: {name: RB, description: Running Back, sport: 1}
+- model: tysc.position
+  pk: 4
+  fields: {name: LB, description: Linebacker, sport: 1}
+- model: tysc.position
+  pk: 5
+  fields: {name: TE, description: Tight End, sport: 1}
+- model: tysc.position
+  pk: 6
+  fields: {name: FB, description: Fullback, sport: 1}
+- model: tysc.position
+  pk: 7
+  fields: {name: SS, description: Strong Safety, sport: 1}
+- model: tysc.position
+  pk: 8
+  fields: {name: DE, description: Defensive End, sport: 1}
+- model: tysc.position
+  pk: 9
+  fields: {name: K, description: Kicker, sport: 1}
+- model: tysc.position
+  pk: 10
+  fields: {name: P, description: Punter, sport: 1}
+- model: tysc.position
+  pk: 11
+  fields: {name: LG, description: Left Guard, sport: 1}
+- model: tysc.position
+  pk: 12
+  fields: {name: RG, description: Right Guard, sport: 1}
+- model: tysc.position
+  pk: 13
+  fields: {name: OF, description: OF, sport: 1}
+- model: tysc.position
+  pk: 14
+  fields: {name: DB, description: Defensive Back, sport: 1}
+- model: tysc.position
+  pk: 15
+  fields: {name: CB, description: Corner Back, sport: 1}
+- model: tysc.position
+  pk: 16
+  fields: {name: C, description: Center, sport: 2}
+- model: tysc.position
+  pk: 17
+  fields: {name: 1B, description: First Base, sport: 2}
+- model: tysc.position
+  pk: 18
+  fields: {name: 2B, description: Second Base, sport: 2}
+- model: tysc.position
+  pk: 19
+  fields: {name: 3B, description: Third Base, sport: 2}
+- model: tysc.position
+  pk: 20
+  fields: {name: SS, description: SS, sport: 2}
+- model: tysc.position
+  pk: 21
+  fields: {name: LF, description: Left Field, sport: 2}
+- model: tysc.position
+  pk: 22
+  fields: {name: CF, description: Center Field, sport: 2}
+- model: tysc.position
+  pk: 23
+  fields: {name: RF, description: Right Field, sport: 2}
+- model: tysc.position
+  pk: 24
+  fields: {name: DH, description: DH, sport: 2}
+- model: tysc.position
+  pk: 25
+  fields: {name: P, description: Pitcher, sport: 2}
+- model: tysc.player
+  pk: 1
+  fields: {name: 'Pathon, Jerome'}
+- model: tysc.player
+  pk: 2
+  fields: {name: 'Bruschi, Tedy'}
+- model: tysc.player
+  pk: 3
+  fields: {name: 'Couch, Tim'}
+- model: tysc.player
+  pk: 4
+  fields: {name: 'Shea, Aaron'}
+- model: tysc.player
+  pk: 5
+  fields: {name: 'Lewis, Jamal'}
+- model: tysc.player
+  pk: 6
+  fields: {name: 'Lewis, Jermaine'}
+- model: tysc.player
+  pk: 7
+  fields: {name: 'Banks, Tony'}
+- model: tysc.player
+  pk: 8
+  fields: {name: "Fuamatu-Ma'Afala, Chris"}
+- model: tysc.player
+  pk: 9
+  fields: {name: 'Bettis, Jerome'}
+- model: tysc.player
+  pk: 10
+  fields: {name: 'Stewart, Kordell'}
+- model: tysc.player
+  pk: 11
+  fields: {name: 'Moon, Warren'}
+- model: tysc.player
+  pk: 12
+  fields: {name: 'Lockett, Kevin'}
+- model: tysc.player
+  pk: 13
+  fields: {name: 'Gannon, Rich'}
+- model: tysc.player
+  pk: 14
+  fields: {name: 'Jett, James'}
+- model: tysc.player
+  pk: 15
+  fields: {name: 'Strong, Mack'}
+- model: tysc.player
+  pk: 16
+  fields: {name: 'Huard, Brock'}
+- model: tysc.player
+  pk: 17
+  fields: {name: 'Watters, Ricky'}
+- model: tysc.player
+  pk: 18
+  fields: {name: 'Aikman, Troy'}
+- model: tysc.player
+  pk: 19
+  fields: {name: 'LaFleur, David'}
+- model: tysc.player
+  pk: 20
+  fields: {name: 'Brazzell, Chris'}
+- model: tysc.player
+  pk: 21
+  fields: {name: 'Dayne, Ron'}
+- model: tysc.player
+  pk: 22
+  fields: {name: 'Brown, Na'}
+- model: tysc.player
+  pk: 23
+  fields: {name: 'Small, Torrance'}
+- model: tysc.player
+  pk: 24
+  fields: {name: 'Lewis, Chad'}
+- model: tysc.player
+  pk: 25
+  fields: {name: 'Murrell, Adrian'}
+- model: tysc.player
+  pk: 26
+  fields: {name: 'Smith, Maurice'}
+- model: tysc.player
+  pk: 27
+  fields: {name: 'Chandler, Chris'}
+- model: tysc.player
+  pk: 28
+  fields: {name: 'Kanell, Danny'}
+- model: tysc.player
+  pk: 29
+  fields: {name: 'Williams, Ricky'}
+- model: tysc.player
+  pk: 30
+  fields: {name: 'Garcia, Jeff'}
+- model: tysc.player
+  pk: 31
+  fields: {name: 'Streets, Tai'}
+- model: tysc.player
+  pk: 32
+  fields: {name: 'Garner, Charlie'}
+- model: tysc.player
+  pk: 33
+  fields: {name: 'Rice, Jerry'}
+- model: tysc.player
+  pk: 34
+  fields: {name: 'Owens, Terrell'}
+- model: tysc.player
+  pk: 35
+  fields: {name: 'Bruce, Isaac'}
+- model: tysc.player
+  pk: 36
+  fields: {name: 'Canidate, Trung'}

django/kontor/tysc/migrations/0001_initial.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.2 on 2016-02-15 09:56
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Sport',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=40)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Team',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=60)),
+                ('shortname', models.CharField(max_length=30)),
+                ('sport', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tysc.Sport')),
+            ],
+        ),
+    ]

django/kontor/tysc/migrations/0002_auto_20160216_2201.py

@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.2 on 2016-02-16 22:01
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tysc', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='InsertSet',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=40)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Manufacturer',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=40)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ParallelSet',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=40)),
+                ('manufacturer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tysc.Manufacturer')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Player',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=40)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Position',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=4)),
+                ('description', models.CharField(max_length=30)),
+                ('sport', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tysc.Sport')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Serie',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=40)),
+                ('manufacturer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tysc.Manufacturer')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='SportCard',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('rookie', models.BooleanField()),
+                ('year', models.IntegerField()),
+                ('number', models.IntegerField()),
+                ('insert_set', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='tysc.InsertSet')),
+                ('manufacturer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tysc.Manufacturer')),
+                ('parallel_set', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='tysc.ParallelSet')),
+                ('player', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tysc.Player')),
+                ('serie', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='tysc.Serie')),
+                ('team', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tysc.Team')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='insertset',
+            name='manufacturer',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tysc.Manufacturer'),
+        ),
+    ]

django/kontor/tysc/models.py

@@ -0,0 +1,83 @@
+from __future__ import unicode_literals
+
+from django.db import models
+
+# Create your models here.
+
+
+class Sport(models.Model):
+    name = models.CharField(max_length=40)
+
+    def __str__(self):
+        return self.name
+
+
+class Position(models.Model):
+    name = models.CharField(max_length=4)
+    description = models.CharField(max_length=30)
+    sport = models.ForeignKey(Sport)
+
+    def __str__(self):
+        return self.name + '(' + self.description + ')'
+
+
+class Team(models.Model):
+    name = models.CharField(max_length=60)
+    shortname = models.CharField(max_length=30)
+    sport = models.ForeignKey(Sport)
+
+    def __str__(self):
+        return self.name
+
+
+class Player(models.Model):
+    name = models.CharField(max_length=40)
+
+    def __str__(self):
+        return self.name
+
+
+class Manufacturer(models.Model):
+    name = models.CharField(max_length=40)
+
+    def __str__(self):
+        return self.name
+
+
+class Serie(models.Model):
+    name = models.CharField(max_length=40)
+    manufacturer = models.ForeignKey(Manufacturer)
+
+    def __str__(self):
+        return self.name
+
+
+class InsertSet(models.Model):
+    name = models.CharField(max_length=40)
+    manufacturer = models.ForeignKey(Manufacturer)
+
+    def __str__(self):
+        return self.name
+
+
+class ParallelSet(models.Model):
+    name = models.CharField(max_length=40)
+    manufacturer = models.ForeignKey(Manufacturer)
+
+    def __str__(self):
+        return self.name
+
+
+class SportCard(models.Model):
+    player = models.ForeignKey(Player)
+    team = models.ForeignKey(Team)
+    manufacturer = models.ForeignKey(Manufacturer)
+    serie = models.ForeignKey(Serie, null=True)
+    parallel_set = models.ForeignKey(ParallelSet, null=True)
+    insert_set = models.ForeignKey(InsertSet, null=True)
+    rookie = models.BooleanField()
+    year = models.IntegerField()
+    number = models.IntegerField()
+
+    def __str__(self):
+        return str(self.number)

django/kontor/tysc/templates/tysc/index.html

@@ -0,0 +1,2 @@
+{% extends "kontor/base.html" %}
+{% block title %}TradeYourSportsCards{% endblock %}

django/kontor/tysc/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

django/kontor/tysc/urls.py

@@ -0,0 +1,11 @@
+from django.conf.urls import url
+
+from . import views
+
+urlpatterns = [
+    url(r'^$', views.index, name='index'),
+]
+<<<<<<< HEAD
+=======
+
+>>>>>>> backup

django/kontor/tysc/views.py

@@ -0,0 +1,13 @@
+from django.shortcuts import render
+from django.http import HttpResponse
+
+# Create your views here.
+
+<<<<<<< HEAD
+def index(request):
+    return render(request, 'tysc/index.html')
+=======
+
+def index(request):
+    return HttpResponse('You are in the TYSC application')
+>>>>>>> backup