Keine Ahnung / not known

stuff on adminpage
added new page for admistrative purpose
2018-06-22 15:03:25 +02:00 · 2017-10-03 18:31:14 +02:00 · 2017-10-02 18:59:30 +02:00
29 changed files with 859 additions and 903 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ static/
 templates/blogindex.html-media
 tippy/static/
 warnings.txt
+tags
--- a/2
+++ b/2
@@ -1 +1 @@
-Martin Bley <dev@mb-oss.de>
+Martin Bley <martin@mb-oss.de>
--- a/TipPy/init.py
+++ b/TipPy/init.py
--- a/TipPy/asgi.py
+++ b/TipPy/asgi.py
@@ -1,16 +0,0 @@
-"""
-ASGI config for TipPy project.
-
-It exposes the ASGI callable as a module-level variable named ``application``.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/4.0/howto/deployment/asgi/
-"""
-
-import os
-
-from django.core.asgi import get_asgi_application
-
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'TipPy.settings')
-
-application = get_asgi_application()
--- a/TipPy/settings.py
+++ b/TipPy/settings.py
@@ -1,156 +0,0 @@
-"""
-Django settings for TipPy project.
-
-Generated by 'django-admin startproject' using Django 4.0.6.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/4.0/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/4.0/ref/settings/
-"""
-
-from pathlib import Path
-import os
-
-# Build paths inside the project like this: BASE_DIR / 'subdir'.
-BASE_DIR = Path(__file__).resolve().parent.parent
-
-
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/
-
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'django-insecure-jiw8js(^@d)no7tv(oq+ugl3kj=f8@j-kz3bj530&!%!$cjqj9'
-
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-
-ALLOWED_HOSTS = []
-
-
-# Application definition
-
-INSTALLED_APPS = [
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'django.contrib.humanize',
-    'tipp'
-]
-
-MIDDLEWARE = [
-    'django.middleware.security.SecurityMiddleware',
-    '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 = 'TipPy.urls'
-
-TEMPLATES = [
-    {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [BASE_DIR / 'templates']
-        ,
-        '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',
-            ],
-        },
-    },
-]
-
-WSGI_APPLICATION = 'TipPy.wsgi.application'
-WSGI_APPLICATION = 'TipPy.wsgi.application'
-
-
-# Database
-# https://docs.djangoproject.com/en/4.0/ref/settings/#databases
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'tippy',
-        'USER': 'tippy',
-        'PASSWORD': 'tippy',
-        'HOST': 'localhost',
-        'PORT': '5432',
-    }
-}
-
-# Password validation
-# https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators
-
-AUTH_PASSWORD_VALIDATORS = [
-    {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
-    },
-]
-
-# Internationalization
-# https://docs.djangoproject.com/en/4.0/topics/i18n/
-
-LANGUAGE_CODE = 'de-de'
-
-TIME_ZONE = 'Europe/Berlin'
-
-USE_I18N = True
-
-USE_TZ = True
-
-# Absolute filesystem path to the directory that will hold user-uploaded files.
-# Example: "/home/media/media.lawrence.com/media/"
-MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash.
-# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
-MEDIA_URL = '/media/'
-# Absolute path to the directory static files should be collected to.
-# Don't put anything in this directory yourself; store your static files
-# in apps' "static/" subdirectories and in STATICFILES_DIRS.
-# Example: "/home/media/media.lawrence.com/static/"
-MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/4.0/howto/static-files/
-STATIC_URL = 'static/'
-STATIC_ROOT = os.path.join(BASE_DIR, 'static/')
-
-if not DEBUG:
-    STATIC_ROOT = ''
-
-STATICFILES_DIRS = [
-    #os.path.join(BASE_DIR, 'static/'),
-]
-
-# STATIC_ROOT=os.path.join(BASE_DIR,"static/")
-# STATIC_URL = 'static/'
-# STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static'), ]
-
-# Default primary key field type
-# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
-
-DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
-
-# Redirect on logout
-LOGOUT_REDIRECT_URL = "home"
--- a/TipPy/urls.py
+++ b/TipPy/urls.py
@@ -1,8 +0,0 @@
-from django.contrib import admin, auth
-from django.urls import include, path, re_path
-
-urlpatterns = [
-    path('', include('tipp.urls')),
-    path('admin/', admin.site.urls),
-]
-
--- a/TipPy/wsgi.py
+++ b/TipPy/wsgi.py
@@ -1,16 +0,0 @@
-"""
-WSGI config for TipPy 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/4.0/howto/deployment/wsgi/
-"""
-
-import os
-
-from django.core.wsgi import get_wsgi_application
-
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'TipPy.settings')
-
-application = get_wsgi_application()
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +0,0 @@
-Django~=4.0.6
-psycopg2~=2.9.3
-suds~=1.1.2
-Pillow~=9.2.0
-pytz~=2022.1
-urllib3~=1.26.10
--- a/templates/about.html
+++ b/templates/about.html
@@ -2,7 +2,7 @@
 {% load i18n static %}
 {% load humanize %}
 {% block head %}
-  <script type="text/javascript" src="{% static 'javascript/tippy.js' %}"></script>
+  <script type="text/javascript" src="{{ STATIC_URL }}javascript/tippy.js"></script>
 {% endblock %}

 {% block nav %}
--- a/templates/adminpage.html
+++ b/templates/adminpage.html
@@ -0,0 +1,68 @@
+{% extends "base.html" %}
+{% load i18n static %}
+{% load humanize %}
+{% block head %}
+  <script type="text/javascript" src="{{ STATIC_URL }}javascript/tippy.js"></script>
+{% endblock %}
+
+{% block nav %}
+{% include "nav.html" with ls=ls season=season %}
+{% endblock %}
+
+{% block body %}
+<div id="content-main">
+  <div class="row">
+    <div class="col-md-7">
+      <h2>Aktivierte Ligen</h2>
+        <table class="table table-striped">
+              <tr>
+                  <th>Liga</th>
+                  <th>Abkürzung</th>
+              </tr>
+              {% for i in leagues %}
+                  <tr>
+                      <td>{{ i.leagueName }}</td>
+                      <td>{{ i.leagueShortcut }}</td>
+                  </tr>
+              {% endfor %}
+        </table>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-7">
+      <button class="btn btn-primary" type="button" data-toggle="collapse" 
+          data-target="#collapseBeispiel" aria-expanded="false" aria-controls="collapseBeispiel">
+      Liga hinzufügen</button>
+      <div class="collapse" id="collapseBeispiel">
+	  	<form role="form" action="" method="post">{% csrf_token %}
+			<table class="table table-striped">
+				<tr>
+					<th>Liga</th>
+						<th>Abkürzung</th>
+					  	<th>Saison</th>
+					  	<th>ID</th>
+				  	</tr>
+				  	{% for i in avail_leagues %}
+					<tr>
+						<td>{{ i.leagueName }}</td>
+						<td>{{ i.leagueShortcut }}</td>
+						<td>{{ i.leagueSaison }}</td>
+						<td>{{ i.leagueID }}</td>
+					</tr>
+				  	{% endfor %}
+			</table>
+		</form>
+	  </div>
+  </div>
+      </div>
+  {% if debug %}
+  <div class="row">
+    <div class="col-md-7">
+        {% for line in debug %}
+        <p>{{ line }}</p>
+        {% endfor %}
+    </div>
+  </div>
+  {% endif %}
+</div>
+{% endblock %}
--- a/templates/base.html
+++ b/templates/base.html
@@ -16,13 +16,13 @@
  <meta name="viewport" content="width=device-width, initial-scale=1">

  <!-- Bootstrap -->
-  <link href="{% static  'css/bootstrap.min.css' %}" rel="stylesheet">
+  <link href="{{ STATIC_URL }}css/bootstrap.min.css" rel="stylesheet">

  <!-- Bootstrap-Theme -->
-  <link href="{% static  'css/bootstrap-theme.min.css' %}" rel="stylesheet">
+  <link href="{{ STATIC_URL }}css/bootstrap-theme.min.css" rel="stylesheet">

  <!-- Bootstrap-Theme -->
-  <link href="{% static  'css/tippy-bootstrap.css' %}" rel="stylesheet">
+  <link href="{{ STATIC_URL }}css/tippy-bootstrap.css" rel="stylesheet">

  <!-- Unterstützung für Media Queries und HTML5-Elemente im Internet Explorer über HTML5 shim und Respond.js -->
  <!-- ACHTUNG: Respond.js funktioniert nicht, wenn du die Seite über file:// aufrufst -->
@@ -38,7 +38,7 @@
  <!-- jQuery (wird für Bootstrap JavaScript-Plugins benötigt) -->
  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
  <!-- Binde alle kompilierten Plugins zusammen ein (wie hier unten) oder such dir einzelne Dateien nach Bedarf aus -->
-  <script src="{% static 'js/bootstrap.min.js'%}"></script>
+  <script src="{{ STATIC_URL }}js/bootstrap.min.js"></script>

  {% block nav %}{% endblock %}
    
@@ -53,7 +53,7 @@
      <div class="col-md-7">
        <p>
          <div class="pull-left">
-            © Martin Bley, 2014-2022 | Dank an
+            © Martin Bley, 2014-2016 | Dank an 
            <a href="http://openligadb.de">OpenLigaDB</a> für die Bereitstellung der 
            Spielergebnisse.
          </div>
--- a/templates/blogindex.html
+++ b/templates/blogindex.html
@@ -19,29 +19,25 @@
      </p>
    </div>
  </div>
-        <ul class="media-list">
  {% for post, avatar in posts %}
-                <li class="media">
-                    <a href="#" class="pull-left">
-                        {% if avatar %}
-                            <img class="img-circle img-responsive pull-left blog" alt="Profile Pic"
-                                 src="/media/{{ avatar }}"/>
-                        {% else %}
-                            <img class="img-circle img-responsive pull-left blog" alt="Profile Pic"
-                                 src="/media/profiles/dummy.png"/>
-                        {% endif %}
-                    </a>
-                    <div class="media-body">
-            <span class="text-muted pull-right">
-                <small class="text-muted">{{ post.created|naturaltime }}</small>
-            </span>
-                        <strong class="text-success">{{ post.author.first_name }}</strong>
-                        <p>{{ post.content|safe }}</p>
+  <div class="row">
+    <div class="col-md-7">
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          {{post.author.first_name}} schrieb {{post.created|naturaltime}} 
+        </div>
+        <div class="panel-body">
+          {% if avatar %}
+              <img class="img-circle img-responsive pull-left blog" alt="Profile Pic" src="/media/{{avatar}}" /> 
+          {% else %}
+              <img class="img-circle img-responsive pull-left blog" alt="Profile Pic" src="/media/profiles/dummy.png" /> 
+          {% endif %}
+          {{post.content|safe}}
+        </div>
+      </div>
+    </div>
  </div>
-                </li>
  {% endfor %}
-        </ul>
-
  <div class="row">
    <div class="col-md-7">
      <nav>
--- a/templates/chat.xhtml
+++ b/templates/chat.xhtml
@@ -1,28 +0,0 @@
-{% load humanize %}
-<hr>
-    <p class="text-left">
-        <a class="btn btn-default" href="/blog/newpost" role="button">neuer Post</a>
-    </p>
-
-    <ul class="media-list">
-        {% for post, avatar in posts %}
-            <li class="media">
-                <a href="#" class="pull-left">
-                    {% if avatar %}
-                        <img class="img-circle img-responsive pull-left blog" alt="Profile Pic"
-                             src="/media/{{ avatar }}"/>
-                    {% else %}
-                        <img class="img-circle img-responsive pull-left blog" alt="Profile Pic"
-                             src="/media/profiles/dummy.png"/>
-                    {% endif %}
-                </a>
-                <div class="media-body">
-            <span class="text-muted pull-right">
-                <small class="text-muted">{{ post.created|naturaltime }}</small>
-            </span>
-                    <strong class="text-success">{{ post.author.first_name }}</strong>
-                    <p>{{ post.content|safe }}</p>
-                </div>
-            </li>
-        {% endfor %}
-    </ul>
--- a/templates/login.html
+++ b/templates/login.html
@@ -0,0 +1,33 @@
+{% extends "base.html" %}
+{% load url from future %}
+{% comment %}
+  Main page to authenticate users.
+{% endcomment %}
+
+{% block head %}
+  <title>TipPy | Login</title>
+{% endblock %}
+
+{% block nav %}
+{% include "nav_login.html" with ls=ls season=season %}
+{% endblock %}
+
+{% block body %}
+{% if form.errors %}
+<div class="row">
+    <p>Benutzename und Passwort passen nicht zusammen. Bitte versuche es noch einmal.</p>
+</div>
+{% endif %}
+<div class="row">
+    <div class="col-md-3">
+        <form class="form-signin" role="form" method="post" action="{% url 'django.contrib.auth.views.login' %}">
+            <h2 class="form-signin-heading">Bitte melde dich an</h2>
+            {% csrf_token %}
+            <input class="form-control" type="text" autofocus="" required="" name="{{form.username.html_name}}" placeholder="Anmeldename" />
+            <input class="form-control" type="password" required="" placeholder="Passwort" name="{{form.password.html_name}}" />
+            <button class="btn btn-lg btn-primary btn-block" type="submit">Anmelden</button>
+            <input type="hidden" name="next" value="{{ next }}" />
+        </form>
+    </div>
+</div>
+{% endblock %}
--- a/templates/md.html
+++ b/templates/md.html
@@ -2,7 +2,7 @@
 {% load i18n static %}
 {% load humanize %}
 {% block head %}
-    <script type="text/javascript" src="{% static 'javascript/tippy.js' %}"></script>
+  <script type="text/javascript" src="{{ STATIC_URL }}javascript/tippy.js"></script>
 {% endblock %}

 {% block nav %}
@@ -11,18 +11,37 @@

 {% block body %}
 <div id="content-main">
+  <div class="row">
+    <div class="col-md-7">
+      <h2>Neueste Nachrichten</h2>
+      <p class="text-right">
+        <a class="btn btn-default" href="/blog/1" role="button">zum Blog</a>
+      </p>
+      {% for post, avatar in posts %}
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          {{post.author.first_name}} schrieb {{post.created|naturaltime}} 
+        </div>
+        <div class="panel-body">
+          {% if avatar %}
+              <img class="img-circle img-responsive pull-left blog" alt="Profile Pic" src="/media/{{avatar}}" /> 
+          {% else %}
+              <img class="img-circle img-responsive pull-left blog" alt="Profile Pic" src="/media/profiles/dummy.png" /> 
+          {% endif %}
+          {{post.content|safe}}
+        </div>
+      </div>
+      {% endfor %}
+    </div>
+  </div>
  <div class="row">
    <div class="col-md-7">
      <h2>Deine Tipps</h2>
      <nav>
        <ul class="pager">
-                        <li data-toggle="tooltip" title="{% trans 'previous' %}" class="previous"><a
-                                href="/matchday/{{ ls }}/{{ season }}/{{ cur_md|add:"-1"|stringformat:"02i" }}"><span
-                                aria-hidden="true">&larr;</span></a></li>
+          <li data-toggle="tooltip" title="{% trans 'previous' %}" class="previous"><a href="/matchday/{{ ls }}/{{ season }}/{{ cur_md|add:"-1"|stringformat:"02i" }}"><span aria-hidden="true">&larr;</span></a></li>
          {{ md_name }}
-                        <li data-toggle="tooltip" title="{% trans 'next' %}" class="next"><a
-                                href="/matchday/{{ ls }}/{{ season }}/{{ cur_md|add:"1"|stringformat:"02i" }}"><span
-                                aria-hidden="true">&rarr;</span></a></li>
+          <li data-toggle="tooltip" title="{% trans 'next' %}" class="next"><a href="/matchday/{{ ls }}/{{ season }}/{{ cur_md|add:"1"|stringformat:"02i" }}"><span aria-hidden="true">&rarr;</span></a></li>
        </ul>
      </nav>
      <form role="form" action="" method="post">{% csrf_token %}
@@ -37,8 +56,7 @@
            </tr>
            {% for match in matches %}
              {% if match.started and not match.finished %}
-                                    <tr class="danger">{% else %}
-                                    <tr>{% endif %}
+                <tr class="danger">{% else %}<tr>{% endif %}
                <td>{{ match.matchDateTime }}</td> 
                {% if match.iconURLTeam1 != "" %}
                    <td><img src="{{ match.iconURLTeam1 }}" width="20"/>
@@ -57,8 +75,7 @@
                  <span class="visible-xs"> {{ match.abbrTeam2 }}</span>
                </td>
                <td>{{ match.matchResult }}</td>
-                            <td>{{ match.tippFormTeam1 }}</td>
-                            <td>{{ match.tippFormTeam2 }}</td>
+                <td>{{ match.tippFormTeam1 }}</td><td>{{ match.tippFormTeam2 }}</td>
            </tr>
            {% endfor %}
          </table>
@@ -108,13 +125,5 @@
      </div>
    {% endfor %}
  </div>
-        <div class="row">
-            <div class="col-md-7">
-                <h2>Chat</h2>
-                {% block chat %}
-                    {% include "chat.xhtml" with posts=posts %}
-                {% endblock %}
-            </div>
-        </div>
 </div>
 {% endblock %}
--- a/templates/nav.html
+++ b/templates/nav.html
@@ -16,6 +16,9 @@
          <li><a href="/">Tipps</a></li>
          <li><a href="/charts/{{ ls }}/{{ season }}{% if pos %}/{{ pos }}{% endif %}">Bestenliste</a></li>
          <li><a href="/blog/1">Blog</a></li>
+          {% if user.is_superuser %}
+          <li><a href="/adminpage">Admin</a></li>
+          {% endif %}
        </ul>
        <ul class="nav navbar-nav navbar-right">
          {% if has_refresh %}
@@ -32,7 +35,7 @@
            <ul class="dropdown-menu">
              <li><a href="/accounts/profile/{{user.id}}">Profil ändern</a></li>
              <li><a href="/accounts/password_change/">Passwort ändern</a></li>
-              <li><a href="/accounts/logout">Abmelden</a></li>
+              <li><a href="/logout">Abmelden</a></li>
            </ul>
          </li>
        </ul>
--- a/templates/newblogpost.html
+++ b/templates/newblogpost.html
@@ -25,10 +25,10 @@
      <form class="form-horizontal" action="" method="post">{% csrf_token %}
        <div class="form-group">
          {{form_bp.content.errors}}
+          <label for="id_content" class="col-sm-4 control-label required">{% trans 'Content' %}</label>
          <div class="col-sm-5">
-                            <div class="panel-body">
-                                <textarea class="form-control" placeholder="Schreibe einen Kommentar..." id="id_content"
-                                          name="content" maxlength="100" rows="2"></textarea>
+            <textarea class="form-control" maxlength="256" rows="2" 
+                id="id_content" name="content"></textarea>
            {% if cnt_mandants > 1 %}
            {{ form_mandants.mandants.label_tag }}
            {% for choice in form_mandants.mandants %}
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
-{% load admin_urls %}
-
+{% load url from future %}
 {% comment %}
  Main page to authenticate users.
 {% endcomment %}
@@ -21,7 +20,7 @@
 {% endif %}
 <div class="row">
    <div class="col-md-3">
-        <form class="form-signin" role="form" method="post" action="{% url 'login' %}">
+        <form class="form-signin" role="form" method="post" action="{% url 'django.contrib.auth.views.login' %}">
            <h2 class="form-signin-heading">Bitte melde dich an</h2>
            {% csrf_token %}
            <input class="form-control" type="text" autofocus="" required="" name="{{form.username.html_name}}" placeholder="Anmeldename" />
--- a/tipp/forms.py
+++ b/tipp/forms.py
@@ -69,3 +69,9 @@ class UserProfileForm(forms.ModelForm):
        model = UserProfile
        fields = ['avatar']

+class LeagueImportForm(forms.Form):
+    leagues = forms.ChoiceField(
+            widget=forms.RadioSelect()
+            )
+
+
--- a/tipp/migrations/0001_initial.py
+++ b/tipp/migrations/0001_initial.py
@@ -1,146 +0,0 @@
-# Generated by Django 4.0.6 on 2022-07-14 15:15
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Competition',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('leagueShortcut', models.CharField(max_length=32)),
-                ('leagueName', models.CharField(max_length=128)),
-                ('season', models.CharField(max_length=4)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Mandant',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=32, unique=True)),
-                ('description', models.CharField(max_length=255)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Post',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('content', models.TextField()),
-                ('published', models.BooleanField(default=True)),
-                ('created', models.DateTimeField(auto_now_add=True)),
-                ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'ordering': ['-created'],
-            },
-        ),
-        migrations.CreateModel(
-            name='Team',
-            fields=[
-                ('teamID', models.IntegerField(primary_key=True, serialize=False, unique=True)),
-                ('name', models.CharField(max_length=200)),
-                ('icon', models.FileField(upload_to='images/team_logos/')),
-                ('abbr', models.CharField(max_length=3)),
-                ('iconURL', models.CharField(max_length=2000)),
-            ],
-            options={
-                'managed': True,
-            },
-        ),
-        migrations.CreateModel(
-            name='UserProfile',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('avatar', models.ImageField(blank=True, upload_to='profiles/')),
-                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Score',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('exact_high', models.PositiveSmallIntegerField()),
-                ('exact', models.PositiveSmallIntegerField()),
-                ('diff', models.PositiveSmallIntegerField()),
-                ('tendency', models.PositiveSmallIntegerField()),
-                ('client', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tipp.mandant')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Match',
-            fields=[
-                ('matchID', models.IntegerField(primary_key=True, serialize=False, unique=True)),
-                ('matchDateTime', models.DateTimeField()),
-                ('group', models.IntegerField()),
-                ('matchday', models.IntegerField()),
-                ('matchday_name', models.CharField(max_length=128)),
-                ('pointsTeam1', models.SmallIntegerField()),
-                ('pointsTeam2', models.SmallIntegerField()),
-                ('finished', models.BooleanField()),
-                ('season', models.CharField(max_length=4)),
-                ('leagueShortcut', models.CharField(max_length=12)),
-                ('idTeam1', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='tipp.team')),
-                ('idTeam2', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='tipp.team')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Tipp',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('pointsTeam1', models.PositiveSmallIntegerField()),
-                ('pointsTeam2', models.PositiveSmallIntegerField()),
-                ('score', models.PositiveIntegerField(blank=True, null=True)),
-                ('matchID', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tipp.match')),
-                ('tipperID', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'unique_together': {('matchID', 'tipperID')},
-            },
-        ),
-        migrations.CreateModel(
-            name='RelUserMandant',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('mandant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tipp.mandant')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'unique_together': {('user', 'mandant')},
-            },
-        ),
-        migrations.CreateModel(
-            name='RelPostMandant',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('mandant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tipp.mandant')),
-                ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tipp.post')),
-            ],
-            options={
-                'unique_together': {('post', 'mandant')},
-            },
-        ),
-        migrations.CreateModel(
-            name='chart',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('points', models.PositiveSmallIntegerField()),
-                ('diff', models.SmallIntegerField()),
-                ('games', models.PositiveSmallIntegerField()),
-                ('competition', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tipp.competition')),
-                ('team', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tipp.team')),
-            ],
-            options={
-                'unique_together': {('team', 'competition')},
-            },
-        ),
-    ]
--- a/tipp/migrations/init.py
+++ b/tipp/migrations/init.py
--- a/tipp/models.py
+++ b/tipp/models.py
@@ -19,13 +19,11 @@ along with TipPy.  If not, see <http://www.gnu.org/licenses/>.

 """    
 from django.db import models
+from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User

 class UserProfile(models.Model):
-    user = models.OneToOneField(
-        User,
-        on_delete=models.CASCADE
-    )
+    user = models.OneToOneField(User)
    avatar = models.ImageField(upload_to="profiles/", blank=True)

    def __unicode__(self):
@@ -60,32 +58,21 @@ class Match(models.Model):
    group = models.IntegerField()
    matchday = models.IntegerField()
    matchday_name = models.CharField(max_length=128)
-    idTeam1 = models.ForeignKey(
-        Team, related_name='+',
-        on_delete=models.CASCADE
-    )
-    idTeam2 = models.ForeignKey(
-        Team, related_name='+',
-        on_delete=models.CASCADE
-    )
+    idTeam1 = models.ForeignKey(Team, related_name='+')
+    idTeam2 = models.ForeignKey(Team, related_name='+')
    pointsTeam1 = models.SmallIntegerField()
    pointsTeam2 = models.SmallIntegerField()
    finished = models.BooleanField()
    season = models.CharField(max_length=4)
+    #leagueShortcut = models.ForeignKey(Competition)
    leagueShortcut = models.CharField(max_length=12)

    def __unicode__(self):
        return (str(self.matchID))

 class Tipp(models.Model):
-    matchID = models.ForeignKey(
-        Match,
-        on_delete=models.CASCADE
-    )
-    tipperID = models.ForeignKey(
-        User,
-        on_delete=models.CASCADE
-    )
+    matchID = models.ForeignKey(Match)
+    tipperID = models.ForeignKey(User)
    pointsTeam1 = models.PositiveSmallIntegerField()
    pointsTeam2 = models.PositiveSmallIntegerField()
    score = models.PositiveIntegerField(
@@ -102,10 +89,7 @@ class Mandant(models.Model):
        return self.name

 class Score(models.Model):
-    client = models.ForeignKey(
-        Mandant,
-        on_delete=models.CASCADE
-    )
+    client = models.ForeignKey(Mandant)
    exact_high = models.PositiveSmallIntegerField()
    exact = models.PositiveSmallIntegerField()
    diff = models.PositiveSmallIntegerField()
@@ -114,14 +98,8 @@ class Score(models.Model):
        return str(self.client)

 class chart(models.Model):
-    team = models.ForeignKey(
-        Team,
-        on_delete=models.CASCADE
-    )
-    competition = models.ForeignKey(
-        Competition,
-        on_delete=models.CASCADE
-    )
+    team = models.ForeignKey(Team)
+    competition = models.ForeignKey(Competition)
    points = models.PositiveSmallIntegerField()
    diff = models.SmallIntegerField()
    games = models.PositiveSmallIntegerField()
@@ -130,14 +108,8 @@ class chart(models.Model):
        unique_together = ("team", "competition")
    
 class RelUserMandant(models.Model):
-    user = models.ForeignKey(
-        User,
-        on_delete=models.CASCADE
-    )
-    mandant = models.ForeignKey(
-        Mandant,
-        on_delete=models.CASCADE
-    )
+    user = models.ForeignKey(User)
+    mandant = models.ForeignKey(Mandant)

    class Meta:
        unique_together = ("user", "mandant")
@@ -148,10 +120,7 @@ class Post(models.Model):
    content = models.TextField()
    published = models.BooleanField(default=True)
    created = models.DateTimeField(auto_now_add=True)
-    author = models.ForeignKey(
-        User,
-        on_delete=models.CASCADE
-    )
+    author = models.ForeignKey(User)
 
    class Meta:
        ordering = ['-created']
@@ -160,14 +129,8 @@ class Post(models.Model):
        return u'%s' % self.created

 class RelPostMandant(models.Model):
-    post = models.ForeignKey(
-        Post,
-        on_delete=models.CASCADE
-    )
-    mandant = models.ForeignKey(
-        Mandant,
-        on_delete=models.CASCADE
-    )
+    post = models.ForeignKey(Post)
+    mandant = models.ForeignKey(Mandant)

    class Meta:
        unique_together = ("post", "mandant")
--- a/tipp/openliga.py
+++ b/tipp/openliga.py
@@ -18,13 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with TipPy.  If not, see <http://www.gnu.org/licenses/>.
 # 
-import sys
-import locale
-from suds.client import Client
-import urllib.request
-import urllib.error
-import urllib.parse
-import psycopg2
+import sys, locale, suds, urllib2, psycopg2

 class OpenLiga(object):
    version     =  "0.1"
@@ -43,21 +37,21 @@ class OpenLiga(object):
        # get a SUDS client object
        if self.proxyurl is None:
            try:
-                self.client = Client(
+                self.client = suds.client.Client(
                    'http://www.openligadb.de/' 
                        + 'Webservices/Sportsdata.asmx?WSDL')
-            except (urllib.error.URLError): 
+            except (urllib2.URLError): 
                self.error += "Connect to webservice failed."
        else:
            try:
                t = suds.transport.http.HttpTransport()
-                proxy = urllib.request.ProxyHandler({'http':proxyurl})
-                opener = urllib.request.build_opener(proxy)
+                proxy = urllib2.ProxyHandler({'http':proxyurl})
+                opener = urllib2.build_opener(proxy)
                t.urlopener = opener
                self.client = suds.client.Client(
                    'http://www.openligadb.de/Webservices/' 
                        + 'Sportsdata.asmx?WSDL', transport=t)
-            except urllib.error.URLError as e: 
+            except urllib2.URLError as e: 
                self.error += "Connect to webservice failed " \
                    + "(via proxy " + proxyurl + "): " + str(e) + "\n"

@@ -92,5 +86,7 @@ class OpenLiga(object):
            leagueShortcut=league)
        )

+    def getAvailLeagues(self):
+        return(self.client.service.GetAvailLeaguesBySports(1))


--- a/tipp/urls.py
+++ b/tipp/urls.py
@@ -1,32 +0,0 @@
-from django.contrib.auth import views as auth_views
-from django.urls import re_path
-from django.conf.urls import include
-from django.conf import settings
-from django.conf.urls.static import static
-from . import views
-
-urlpatterns = [
-    re_path(r'^$', views.home, name='home'),
-    re_path(r'^getSeason/(?P<ls>.*)/(?P<season>\d{4})$',
-            views.getSeason),
-    re_path(r'^update/(?P<ls>.*)/(?P<season>\d{4})/(?P<cur_md>\d{2})$',
-            views.update, name='update'),
-    re_path(r'^matchday/(?P<ls>.{3,})/(?P<season>\d{4})/(?P<matchday>\d{2})$',
-            views.matchday, name='matchday'),
-    re_path(r'^charts/(?P<ls>\w{3,})/(?P<season>\d{4})$', views.charts,
-            name='charts'),
-    re_path(r'^charts/(?P<ls>\w{3,})/(?P<season>\d{4})/(?P<pos>\w{1,})$',
-            views.charts, name='charts'),
-    re_path(r'^accounts/profile/(\d+)', views.profile),
-    re_path(r'^accounts/', include('django.contrib.auth.urls')),
-    re_path(r'^blog/newpost$', views.newBlogpost),
-    re_path(r'^blog/(?P<page>\d)$', views.blogindex),
-    re_path(r'^about$', views.about),
-    re_path(r'^accounts/login/', auth_views.LoginView.as_view()),
-    re_path(r'^accounts/logout/', auth_views.LogoutView.as_view())
-]
-# Redirect on logout
-LOGOUT_REDIRECT_URL = "home"
-if settings.DEBUG is True:
-    urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
-    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
--- a/tipp/views.py
+++ b/tipp/views.py
@@ -18,29 +18,40 @@ You should have received a copy of the GNU General Public License
 along with TipPy.  If not, see <http://www.gnu.org/licenses/>.

 """    
-import django.shortcuts
-from django.contrib.auth.decorators import login_required
+from django.http import HttpResponse
+from django.shortcuts import render_to_response, redirect, render, \
+    get_object_or_404
+from django.contrib.auth import authenticate, login
+from django.contrib.auth.models import User
+from django.contrib.auth.decorators import login_required, user_passes_test
+from django.contrib.auth.views import password_reset, \
+    password_reset_confirm
+from django.core.context_processors import csrf
 from django.core.exceptions import ObjectDoesNotExist
-from django.core.paginator import Paginator, EmptyPage, \
+from django.core.urlresolvers import reverse
+from django.core.paginator import Paginator, InvalidPage, EmptyPage, \
    PageNotAnInteger
-from django.http import HttpResponseRedirect
 from django.utils import timezone
-from django.db.models import Sum
+from django.utils.text import slugify
+from django.db.models import Sum, Max
 from django.conf import settings
 from os.path import join as pjoin
 from tipp.models import *
 from tipp.forms import *
-from tipp.openliga import *
+from openliga import *
 from datetime import datetime
 from PIL import Image as PImage
-import pytz
-import os
+import urllib2, pytz, os, sys
+
+# setting utf-8 as default encoding to avoid errors in file 
+# uploads and form data
+reload(sys)
+sys.setdefaultencoding('utf8')

 timezoneLocal = pytz.timezone('Europe/Berlin')

-
 def about(request):
-    return django.shortcuts.render(request, 'about.html')
+    return render(request, 'about.html')


@login_required
@@ -49,13 +60,12 @@ def home(request):
    season = get_current_season()
    md = get_current_md(ls)

-    return django.shortcuts.redirect("matchday",
+    return redirect("matchday", 
        ls = ls,
        season = season,
        matchday=str(md).zfill(2)
    )

-
@login_required
 def profile(request, pk):
    user = User.objects.get(id=pk)
@@ -114,12 +124,9 @@ def profile(request, pk):
        # Print problems to the terminal.
        # They'll also be shown to the user.
        else:
-            print(
-                user_form.errors,
-                profile_form.errors
-            )
+            print user_form.errors, profile_form.errors

-        return django.shortcuts.redirect('/accounts/profile/' + str(user.id))
+        return redirect( '/accounts/profile/' + str(user.id) )

    # Not a HTTP POST, so we render our form using two ModelForm 
    # instances. These forms will be blank, ready for user input.
@@ -132,19 +139,48 @@ def profile(request, pk):
        )
        profile_form = UserProfileForm(instance=profile)

-    return django.shortcuts.render(request, 'registration/profile.html', {
+    return render(request, 'registration/profile.html', {
        'user_form': user_form, 
        'profile_form': profile_form,
-        'debug': debug,
+        #'debug': debug,
        'img': img}
    )

+@user_passes_test(lambda u: u.is_superuser)
+def adminpage(request, pos='default', template_name='adminpage.html'):
+    debug = []
+    lss = Match.objects.values('leagueShortcut').distinct(). \
+        values_list('leagueShortcut', flat=True)
+    leagues = Competition.objects.values('leagueShortcut', 'leagueName').\
+            filter(leagueShortcut__in=lss)
+
+    ol = OpenLiga()
+
+    avail_leagues = []
+    for l in ol.getAvailLeagues()[0]:
+        if int(l["leagueSaison"]) >= int(get_current_season()):
+            avail_leagues.append({
+                'leagueID'       : l["leagueID"],
+                'leagueShortcut' : l["leagueShortcut"],
+                'leagueName'     : l["leagueName"],
+                'leagueSaison'   : l["leagueSaison"]
+            })
+    
+    form_leagues = LeagueImportForm()
+    form_leagues.fields["leagues"].choices = avail_leagues
+
+    return render(request, template_name, { 
+        'debug': debug, 
+        'leagues': leagues,
+        'avail_leagues': avail_leagues
+    })
+

-@login_required
 def getSeason(request, ls, season):
    ol = OpenLiga()
    teams = ol.getTeams(str(season), ls)
    season = ol.getSeason(str(season), ls)
+    md = get_current_md(ls)

    return_vals = []
    for team in teams[0]:
@@ -159,17 +195,20 @@ def getSeason(request, ls, season):
        """
        try:
            to = Team.objects.get(teamID=int(t.teamID))
-            if to.iconURL is None:
-                t.save(update_fields=['iconURL'])
        except Team.DoesNotExist:
            t.save()

+        if to.iconURL is None:
+            t.save(update_fields=['iconURL'])
+
+
    for match in season[0]:
-        m = Match(matchID=match['matchID'],
-                  matchDateTime=match['matchDateTime'],
+        m = Match(matchID=unicode(match['matchID']),
+            matchDateTime=datetime.strptime(
+                unicode(match['matchDateTime']), '%Y-%m-%d %H:%M:%S'),
            group=int(match['groupID']),
            matchday=int(match['groupOrderID']),
-                  matchday_name=match['groupName'],
+            matchday_name=unicode(match['groupName']),
            idTeam1=Team.objects.get(teamID=int(match['idTeam1'])),
            idTeam2=Team.objects.get(teamID=int(match['idTeam2'])),
            pointsTeam1=match['pointsTeam1'],
@@ -180,13 +219,12 @@ def getSeason(request, ls, season):
        )
        m.save()

-    return django.shortcuts.redirect("matchday",
+    return redirect("matchday", 
        ls=ls, 
        season=get_current_season(), 
        matchday=str(get_current_md(ls)).zfill(2)
    )
    
-
@login_required
 def update(request, ls, season, cur_md):
    """
@@ -209,7 +247,6 @@ def update(request, ls, season, cur_md):
                elif result['resultName'] == "Endergebnis":
                    pointsTeam1=int(result['pointsTeam1'])
                    pointsTeam2=int(result['pointsTeam2'])
-                    break
                elif str(result['resultName']) == u"nach Verlängerung":
                    pointsTeam1=int(result['pointsTeam1'])
                    pointsTeam2=int(result['pointsTeam2'])
@@ -221,7 +258,8 @@ def update(request, ls, season, cur_md):
            pointsTeam1=-1
            pointsTeam2=-1
            
-        m = Match(matchID=match['matchID'],
+
+        m = Match(matchID=unicode(match['matchID']),
            matchDateTime=match['matchDateTime'],
            pointsTeam1=pointsTeam1,
            pointsTeam2=pointsTeam2,
@@ -232,13 +270,7 @@ def update(request, ls, season, cur_md):
        pointsTeam2=-1

    # evaluate scores 
-    """ get mandants current user is related """
-    mandants = RelUserMandant.objects.filter(user=request.user). \
-        values_list('mandant', flat=True)
-
-    # scores = Score.objects.get(client=Mandant.objects.get(name='huse'))
-    scores = Score.objects.get(client=mandants[0])
-
+    scores = Score.objects.get(client=Mandant.objects.get(name='huse'))
    finished_matches=Match.objects.filter(
        finished=True, 
        leagueShortcut=ls,
@@ -267,24 +299,24 @@ def update(request, ls, season, cur_md):
            winnerReal = None
            if match.pointsTeam1 > match.pointsTeam2:
                winnerReal = 1
-            elif match.pointsTeam2 > match.pointsTeam1:
+            elif (match.pointsTeam2 > match.pointsTeam1):
                winnerReal = 2
-            elif match.pointsTeam1 == match.pointsTeam2:
+            elif (match.pointsTeam1 == match.pointsTeam2):
                winnerReal = 0

            winnerTipp = None
            if tipp.pointsTeam1 > tipp.pointsTeam2:
                winnerTipp = 1
-            elif tipp.pointsTeam2 > tipp.pointsTeam1:
+            elif (tipp.pointsTeam2 > tipp.pointsTeam1):
                winnerTipp = 2
-            elif tipp.pointsTeam1 == tipp.pointsTeam2:
+            elif (tipp.pointsTeam1 == tipp.pointsTeam2):
                winnerTipp = 0
            
            diffReal = match.pointsTeam1 - match.pointsTeam2
            diffTipp = tipp.pointsTeam1 - tipp.pointsTeam2

-            if winnerTipp == winnerReal:
-                if diffTipp == diffReal:
+            if ( winnerTipp == winnerReal ):
+                if ( diffTipp == diffReal ):
                    score = scores.diff
                else:
                    score = scores.tendency
@@ -297,13 +329,12 @@ def update(request, ls, season, cur_md):
            tipp.save()
            continue

-    return django.shortcuts.redirect("matchday",
+    return redirect("matchday", 
        ls=ls, 
        season=season, 
        matchday=cur_md
    )

-
@login_required
 def matchday(request, ls, season, matchday, template_name='md.html'):
    debug = ''
@@ -386,16 +417,16 @@ def matchday(request, ls, season, matchday, template_name='md.html'):
            f = TippForm(prefix=str(match.matchID))

        item = {}
-        item['matchDateTime'] = (match.matchDateTime.
+        item['matchDateTime'] = (match.matchDateTime. \
            astimezone(timezoneLocal).strftime('%a %d.%m, %H:%M'))

        item['iconTeam1']= str(match.idTeam1.icon)
        item['iconURLTeam1'] = str(match.idTeam1.iconURL)
-        item['nameTeam1'] = str(match.idTeam1.name)
+        item['nameTeam1']= str(match.idTeam1)
        item['abbrTeam1']= str(match.idTeam1.abbr)
        item['iconTeam2'] = str(match.idTeam2.icon)
        item['iconURLTeam2'] = str(match.idTeam2.iconURL)
-        item['nameTeam2'] = str(match.idTeam2.name)
+        item['nameTeam2'] = str(match.idTeam2)
        item['abbrTeam2']= str(match.idTeam2.abbr)
        item['started'] = match_started
        item['finished'] = match.finished
@@ -440,13 +471,14 @@ def matchday(request, ls, season, matchday, template_name='md.html'):
            mandant_dict[mandant] = sorted(mandant_dict[mandant], 
                key=lambda k: k['sum_score'], reverse=True)

+
        matches.append(item)

    # get the newest blogposts 
    pm = RelPostMandant.objects.filter(mandant__in=mandants). \
        values_list('post', flat=True)
    posts = []
-    for post in Post.objects.filter(id__in=pm, published=True)[:5]:
+    for post in Post.objects.filter(id__in=pm, published=True)[:1]:
        try:
            avatar = UserProfile.objects.get(user_id=post.author_id). \
                avatar.name
@@ -461,7 +493,7 @@ def matchday(request, ls, season, matchday, template_name='md.html'):

    debug += str(mandant_dict)

-    return django.shortcuts.render(request, 'md.html', {
+    return render(request, 'md.html', { 
        'debug': debug, 
        #'mds_season': mds_in_season,
        'cur_md': matchday,
@@ -477,10 +509,10 @@ def matchday(request, ls, season, matchday, template_name='md.html'):
        'has_refresh': has_refresh
    })

-
@login_required
 def charts(request, ls, season, pos='default', 
    template_name='charts.html'):
+
    debug = ''

    if pos == 'default':
@@ -518,7 +550,7 @@ def charts(request, ls, season, pos='default',
        for userid in users:
            # get user object, then fetch matches for user
            user = User.objects.get(id=userid)
-            score = Tipp.objects.filter(matchID__in=matches,
+            score = Tipp.objects.filter(matchID__in=matches, \
                tipperID=user).aggregate(Sum('score'))
            
            if score['score__sum'] is None:
@@ -529,7 +561,7 @@ def charts(request, ls, season, pos='default',
        mandant_dict[mandant.name] = sorted(user_dict.items(), 
            key=lambda x: x[1], reverse=True)

-    return django.shortcuts.render(request, template_name, {
+    return render(request, template_name, { 
        #'debug': debug, 
        'mandant_dict': mandant_dict,
        'season': season,
@@ -537,7 +569,6 @@ def charts(request, ls, season, pos='default',
        'pos': pos
    })

-
@login_required
 def blogindex(request, page):
    # get the blog posts that are published
@@ -565,14 +596,13 @@ def blogindex(request, page):
    except EmptyPage:
        posts = p.page(p.num_pages)

-    return django.shortcuts.render(request, 'blogindex.html', {
+    return render(request, 'blogindex.html', {
        'posts': posts,
        'ls': get_current_ls(),
        'season': get_current_season(),
        'page': page
    })
 
-
@login_required
 def newBlogpost(request):
    debug = ''
@@ -581,7 +611,7 @@ def newBlogpost(request):
    mandants = RelUserMandant.objects.filter(user=request.user). \
        values_list('mandant', flat=True)
    choices = []
-    if mandants.count() > 1:
+    if mandants.count > 1:
        has_mandant = True
        for m in Mandant.objects.filter(id__in=mandants):
            choices.append( (m.name, m.description) )
@@ -609,14 +639,14 @@ def newBlogpost(request):
                    mandant=Mandant.objects.get(id=mandants[0]))
                m.save()

-            return django.shortcuts.redirect('/blog/1')
+            return redirect( '/blog/1')

    blogpostForm = BlogpostForm()
    form_mandant = MandantsForm()
    form_mandant.fields["mandants"].choices = choices
    cnt_mandants = len(choices)

-    return django.shortcuts.render(request, 'newblogpost.html', {
+    return render(request, 'newblogpost.html', {
        'debug': debug, 
        'form_bp': blogpostForm,
        'form_mandants': form_mandant,
@@ -625,7 +655,6 @@ def newBlogpost(request):
        'season': get_current_season()
    })

-
 def logout(request):
    """
    Log users out and re-direct them to the main page.
@@ -633,7 +662,6 @@ def logout(request):
    logout(request)
    return HttpResponseRedirect('/')

-
 def get_current_md(ls):
    """ 
        get current matchday()
@@ -651,10 +679,9 @@ def get_current_md(ls):

    return(cur_md['groupOrderID'])

-
 def get_current_ls():
    return("bl1")

-
 def get_current_season():
-    return ("2022")
+    return("2016")
+
--- a/tippy/init.py
+++ b/tippy/init.py
@@ -0,0 +1 @@
+__version__ = '1.0.1'
--- a/tippy/settings.py
+++ b/tippy/settings.py
@@ -0,0 +1,188 @@
+"""
+Django settings for tippy project.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.7/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/1.7/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__))
+
+# Django settings for tippy project.
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+
+ADMINS = (
+    ('Martin Bley', 'martin@mb-oss.de'),
+)
+
+MANAGERS = ADMINS
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'tippy',
+        'USER': 'tippy', 
+        'PASSWORD': 'tippy', 
+        'HOST': 'localhost',
+        'PORT': '5432',
+    }
+}
+
+# Hosts/domain names that are valid for this site; required if DEBUG is False
+# See https://docs.djangoproject.com/en/1.4/ref/settings/#allowed-hosts
+ALLOWED_HOSTS = ['*']
+
+# Local time zone for this installation. Choices can be found here:
+# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
+# although not all choices may be available on all operating systems.
+# In a Windows environment this must be set to your system time zone.
+TIME_ZONE = 'Europe/Berlin'
+
+# Language code for this installation. All choices can be found here:
+# http://www.i18nguy.com/unicode/language-identifiers.html
+LANGUAGE_CODE = 'de-de'
+
+SITE_ID = 1
+
+# If you set this to False, Django will make some optimizations so as not
+# to load the internationalization machinery.
+USE_I18N = True
+
+# If you set this to False, Django will not format dates, numbers and
+# calendars according to the current locale.
+USE_L10N = True
+
+# If you set this to False, Django will not use timezone-aware datetimes.
+USE_TZ = True
+
+# Absolute filesystem path to the directory that will hold user-uploaded files.
+# Example: "/home/media/media.lawrence.com/media/"
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
+
+# URL that handles the media served from MEDIA_ROOT. Make sure to use a
+# trailing slash.
+# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
+MEDIA_URL = '/media/'
+
+# Absolute path to the directory static files should be collected to.
+# Don't put anything in this directory yourself; store your static files
+# in apps' "static/" subdirectories and in STATICFILES_DIRS.
+# Example: "/home/media/media.lawrence.com/static/"
+STATIC_ROOT = '/home/martin/dev/TipPy/src/static/'
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
+
+# URL prefix for static files.
+# Example: "http://media.lawrence.com/static/"
+STATIC_URL = '/static/'
+
+# Additional locations of static files
+STATICFILES_DIRS = (
+    # Put strings here, like "/home/html/static" or "C:/www/django/static".
+    # Always use forward slashes, even on Windows.
+    # Don't forget to use absolute paths, not relative paths.
+    '/home/martin/dev/TipPy/src/tippy/static/',
+)
+
+# List of finder classes that know how to find static files in
+# various locations.
+STATICFILES_FINDERS = (
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+)
+
+# Make this unique, and don't share it with anybody.
+SECRET_KEY = '-7%ge^nl1b0t0694%ws&amp;0$ft_lo)j4l1f-qv#ku^=$)s(sw6us'
+
+# List of callables that know how to import templates from various sources.
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.Loader',
+    'django.template.loaders.app_directories.Loader',
+#     'django.template.loaders.eggs.Loader',
+)
+
+MIDDLEWARE_CLASSES = (
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    # Uncomment the next line for simple clickjacking protection:
+    # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
+)
+
+ROOT_URLCONF = 'tippy.urls'
+
+# Python dotted path to the WSGI application used by Django's runserver.
+WSGI_APPLICATION = 'tippy.wsgi.application'
+
+TEMPLATE_DIRS = (
+    [os.path.join(BASE_DIR, 'templates')]
+)
+
+INSTALLED_APPS = (
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'django.contrib.humanize',
+    # Uncomment the next line to enable the admin:
+    'django.contrib.admin',
+    # Uncomment the next line to enable admin documentation:
+    'django.contrib.admindocs',
+    'tipp',
+)
+
+# URL of the login page.
+LOGIN_URL = '/login'
+
+# A sample logging configuration. The only tangible logging
+# performed by this configuration is to send an email to
+# the site admins on every HTTP 500 error when DEBUG=False.
+# See http://docs.djangoproject.com/en/dev/topics/logging for
+# more details on how to customize your logging configuration.
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'filters': {
+        'require_debug_false': {
+            '()': 'django.utils.log.RequireDebugFalse'
+        }
+    },
+    'handlers': {
+        'mail_admins': {
+            'level': 'ERROR',
+            'filters': ['require_debug_false'],
+            'class': 'django.utils.log.AdminEmailHandler'
+        }
+    },
+    'loggers': {
+        'django.request': {
+            'handlers': ['mail_admins'],
+            'level': 'ERROR',
+            'propagate': True,
+        },
+    }
+}
+
+EMAIL_USE_TLS = True
+EMAIL_HOST = 'hermes.mb-oss.de'
+EMAIL_PORT = 25
+EMAIL_HOST_USER = 'tippy@mb-oss.de'
+#EMAIL_HOST_PASSWORD = 'p@ssword'
+ 
+DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
+SERVER_EMAIL = EMAIL_HOST_USER
+
+SESSION_COOKIE_AGE = 7200
+
+AUTH_PROFILE_MODULE = 'tippy.UserProfile'
+
+
--- a/tippy/urls.py
+++ b/tippy/urls.py
@@ -0,0 +1,46 @@
+from django.conf.urls import patterns, include, url
+from django.conf import settings
+
+# Uncomment the next two lines to enable the admin:
+from django.contrib import admin
+admin.autodiscover()
+
+urlpatterns = patterns('',
+    # Examples:
+    url(r'^$', 'tipp.views.home', name='home'),
+    url(r'^login$', 'django.contrib.auth.views.login', {
+        'template_name': 'login.html'}),
+    url(r'^logout$', 'django.contrib.auth.views.logout', {
+        'next_page': '/'}),
+    url(r'^getSeason/(?P<ls>.*)/(?P<season>\d{4})$', 
+        'tipp.views.getSeason'),
+    url(r'^update/(?P<ls>.*)/(?P<season>\d{4})/(?P<cur_md>\d{2})$', 
+        'tipp.views.update', name='update'),
+    url(r'^matchday/(?P<ls>.{3,})/(?P<season>\d{4})/(?P<matchday>\d{2})$', 
+        'tipp.views.matchday', name='matchday'),
+    url(r'^charts/(?P<ls>\w{3,})/(?P<season>\d{4})$', 'tipp.views.charts', 
+        name='charts'),
+    url(r'^charts/(?P<ls>\w{3,})/(?P<season>\d{4})/(?P<pos>\w{1,})$', 
+        'tipp.views.charts', name='charts'),
+    url(r'^accounts/profile/(\d+)', 'tipp.views.profile'),
+    url(r'^accounts/', include('django.contrib.auth.urls')),
+    url(r'^blog/newpost$', 'tipp.views.newBlogpost'),
+    url(r'^blog/(?P<page>\d)$', 'tipp.views.blogindex'),
+    url(r'^adminpage$', 'tipp.views.adminpage'),
+    url(r'^about$', 'tipp.views.about'),
+
+    # Uncomment the admin/doc line below to enable admin documentation:
+    # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
+
+    # Uncomment the next line to enable the admin:
+    url(r'^admin/', include(admin.site.urls)),
+)
+
+if settings.DEBUG:
+    urlpatterns += patterns('',
+        url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+            'document_root': settings.MEDIA_ROOT,
+        }),
+)
+
+
--- a/tippy/wsgi.py
+++ b/tippy/wsgi.py
@@ -0,0 +1,28 @@
+"""
+WSGI config for tippy project.
+
+This module contains the WSGI application used by Django's development server
+and any production WSGI deployments. It should expose a module-level variable
+named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
+this application via the ``WSGI_APPLICATION`` setting.
+
+Usually you will have the standard Django WSGI application here, but it also
+might make sense to replace the whole Django WSGI application with a custom one
+that later delegates to the Django one. For example, you could introduce WSGI
+middleware here, or combine a Django application with an application of another
+framework.
+
+"""
+import os
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "tippy.settings")
+
+# This application object is used by any WSGI server configured to use this
+# file. This includes Django's development server, if the WSGI_APPLICATION
+# setting points here.
+from django.core.wsgi import get_wsgi_application
+application = get_wsgi_application()
+
+# Apply WSGI middleware here.
+# from helloworld.wsgi import HelloWorldApplication
+# application = HelloWorldApplication(application)
Author	SHA1	Message	Date
Martin Bley	2fa6dd0709	Keine Ahnung / not known	2018-06-22 15:03:25 +02:00
Martin Bley	91f210883f	stuff on adminpage	2017-10-03 18:31:14 +02:00
Martin Bley	c21e0d3292	added new page for admistrative purpose	2017-10-02 18:59:30 +02:00