Merge branch 'iss07' (about)

templates/about.html

@@ -0,0 +1,29 @@
+{% 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>Über TipPy</h2>
+         <p>TipPy ist eine responsive Web-Applikation für Tippspiele mit 
+         einem "Mobile-First-Ansatz" . Unterstützt werden alle auf 
+         <a href="http://www.OpenLigaDB.de">OpenLigaDB</a> bereitgestellten 
+         Sportarten und Ligen.
+
+         TipPy wurde in <a href="http://www.python.org">Python</a> umgesetzt 
+         und benutzt die Frameworks <a href="http://www.django.org">Django</a>
+         als Web Application Framework, und Twitters <a href="www.getbootstrap.com">
+         Bootstrap</a> für CSS.</p>
+    </div>
+  </div>
+</div>
+{% endblock %}

templates/nav.html

@@ -9,7 +9,7 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <span class="navbar-brand">TipPy 1.0</span>
+        <a class="navbar-brand" href="/about">TipPy 1.0</a>
       </div>
       <div class="navbar-collapse collapse">
         <ul class="nav navbar-nav">

tipp/views.py

@@ -50,6 +50,10 @@ sys.setdefaultencoding('utf8')
 
 timezoneLocal = pytz.timezone('Europe/Berlin')
 
+def about(request):
+    return render(request, 'about.html')
+
+
 @login_required
 def home(request):
     ls = get_current_ls()
@@ -431,6 +435,11 @@ def matchday(request, ls, season, matchday, template_name='md.html'):
                 except Exception as e:
                     mate['tipps'].append(u'\u2717') 
                 
+            """ sort items in mandant_dict by score """            
+            mandant_dict[mandant] = sorted(mandant_dict[mandant], 
+                key=lambda k: k['sum_score'], reverse=True)
+
+
         matches.append(item)
 
     # get the newest blogposts 

tippy/__init__.py

@@ -0,0 +1 @@
+__version__ = '1.0.1'

tippy/urls.py

@@ -26,6 +26,7 @@ urlpatterns = patterns('',
     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'^about$', 'tipp.views.about'),
 
     # Uncomment the admin/doc line below to enable admin documentation:
     # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),