xeniac/kasu
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

Vereinfachung Membership ist nun ein custom login model, keine Abhängikeiten mehr zu auth.User.

Browse Source 
absofort können alle Benutzer ins Ranking eingetragen werden und nicht mehr nur "zahlende Mitglieder".
This commit is contained in:
Christian Berg
2015-08-10 20:49:07 +02:00
committed by Christian Berg
parent 37d3cb78c1
commit 617b7131fe
100 changed files with 3857 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/events/migrations/0001_initial.py Normal file
View File

File diff suppressed because one or more lines are too long

0
src/events/migrations/__init__.py Normal file
View File

24
src/events/templates/events/event_archive.html
View File

@@ -38,7 +38,7 @@
<div class="grid_4">
<h4><a href="{{ event.get_absolute_url }}">{{ event.name }}</a></h4>
<p><img src="{{ STATIC_URL }}/icons/date.png" alt="{% trans 'Start' %}:" title="{% trans 'Start' %}">
<p><span class="fa fa-calendar-o" title="{% trans 'Start' %}"></span>
{{ event.start|date }}
{% if event.end %}
{% trans "from" %} {{ event.start|time:'H:i' }} {% trans "to" %} {{ event.end|time:'H:i' }}
@@ -49,25 +49,13 @@
<p>{{event.description|truncatewords_html:20}}</p>
<ul class="info">
<li><img src="{{ STATIC_URL }}/icons/map.png" alt="{% trans 'Location' %}" title="{% trans 'Location' %}">
{{ event.location }}
</li>
<li><a href="{{event.get_absolute_url}}#comments"><img src="{{ STATIC_URL }}/icons/comments.png"
alt="{% trans 'Comments' %}"
title="{% trans 'Comments' %}"> {{ comment_count }}</a>
</li>
<li><a href="{% url 'event-photo-list' event.pk %}"><img src="{{ STATIC_URL }}/icons/camera.png"
alt="{% trans 'Photos' %}"
title="{% trans 'Photos' %}">
{{ event.photo_count }}</a></li>
<li><a href="{% url 'event-hanchan-list' event.pk %}"><img src="{{ STATIC_URL }}/icons/table.png"
alt="{% trans 'Hanchans' %}"
title="{% trans 'Hanchans' %}">
{{ event.hanchan_set.count }} {% trans 'Hanchans' %}</a></li>
<li><span class="fa fa-map-marker" title="{% trans 'Location' %}"></span> {{ event.location }}</li>
<li><a href="{{event.get_absolute_url}}#comments"><span class="fa fa-comments" title="{% trans 'Comments' %}"></span> {{ comment_count }}</a></li>
<li><a href="{% url 'event-photo-list' event.pk %}"><span class="fa fa-picture-o" title="{% trans 'Photos' %}"></span> {{ event.photo_count }}</a></li>
<li><a href="{% url 'event-hanchan-list' event.pk %}"><span class="fa fa-table" title="{% trans 'Hanchans' %}"></span> {{ event.hanchan_set.count }} {% trans 'Hanchans' %}</a></li>
</ul>
{% if perms.events.change_event %}
<p class="right"><a href="{{ event.get_edit_url }}" class="button"><img src="{{ STATIC_URL }}icons/page_edit.png"
alt="{%trans " Edit" %}"></a></p>
<p class="right"><a href="{{ event.get_edit_url }}" class="button"><span class="fa fa-pencil"></span></a></p>
{% endif %}
</div>
{% if forloop.counter|divisibleby:2 %}<br class="clear"/>{% endif %}

31
src/events/templates/events/event_detail.html
View File

@@ -27,17 +27,16 @@
{% block redbox %}
<h2>Info</h2>
<p>&nbsp;</p>
<ul>
<li class="date"><strong>{% trans "Start" %}:</strong> {{ event.start }}</li>
{% if event.end %}<li class="date"><strong>{% trans "End" %}:</strong> {{ event.end }}</li>{% endif %}
<li class="location">
{% if event.location.url %}<a href="{{ event.location.url }}">{% else %}<a href="http://maps.google.com/maps?q={{event.location.address|urlencode}}&amp;z=16">{% endif %}
<strong>{% trans "Location" %}:</strong> {{event.location.name}}</a>
<ul class="fa-ul">
<li><span class="fa-li fa fa-hourglass-start"></span> <strong>{% trans "Start" %}:</strong> {{ event.start }}</li>
{% if event.end %}<li><span class="fa-li fa fa-hourglass-end"></span> <strong>{% trans "End" %}:</strong> {{ event.end }}</li>{% endif %}
<li><span class="fa-li fa fa-map-marker"></span> <strong>{% trans "Location" %}:</strong>
<a href="{% if event.location.url %}{{ event.location.url }}{% else %}http://maps.google.com/maps?q={{event.location.address|urlencode}}&amp;z=16{% endif %}">{{event.location.name}}</a>
</li>
{% if event.url %}<li><a href="{{ event.url }}"><strong>{% trans "Homepage" %}:</strong> {{ event.url }}</a></li>{% endif %}
<li class="hanchan"><a href="{% url 'event-hanchan-list' event.pk %}" ><strong>{% trans "Hanchans" %}:</strong> {{ event.hanchan_set.count }}</a></li>
<li class="photo"><a href="{% url 'event-photo-list' event.pk %}"><strong>{% trans 'Photos' %}:</strong> {{ event.photo_count }}</a></li>
{% if event.is_tournament %}<li class="season"><a href="{% url 'event-ranking' event.pk %}"><strong>{% trans "tourney" %}:</strong> {% trans "other rules apply here" %}</a></li>{% endif%}
{% if event.url %}<li><span class="fa-li fa fa-globe"></span> <strong>{% trans "Homepage" %}:</strong> <a href="{{ event.url }}">{{ event.url }}</a></li>{% endif %}
<li><span class="fa-li fa fa-table"></span> <strong>{% trans "Hanchans" %}:</strong> <a href="{% url 'event-hanchan-list' event.pk %}" >{{ event.hanchan_set.count }}</a></li>
<li><span class="fa-li fa fa-camera-retro"></span> <strong>{% trans 'Photos' %}:</strong> <a href="{% url 'event-photo-list' event.pk %}">{{ event.photo_count }}</a></li>
{% if event.is_tournament %}<li><span class="fa-li fa fa-trophy"></span> <strong>{% trans "tourney" %}:</strong> <a href="{% url 'event-ranking' event.pk %}">{% trans "other rules apply here" %}</a></li>{% endif%}
</ul>
{% endblock %}
@@ -45,13 +44,13 @@
{% block navigation %}
<code>{{ event. }}</code>
<ul id="navigation">
<li><a href="{{ event.get_absolute_url }}"><img src="{{ STATIC_URL }}icons/information.png" alt="{% trans 'Hanchans' %}" /> {% trans 'Info' %}</a></li>
<li><a href="{% url 'event-photo-list' event.pk %}"><img src="{{ STATIC_URL }}icons/camera.png" alt="{% trans 'Photos' %}" /> {{ event.photo_count }} {% trans 'Photos' %}</a></li>
<li><a href="{% url 'event-hanchan-list' event.pk %}" ><img src="{{ STATIC_URL }}icons/table.png" alt="{% trans 'Hanchans' %}" /> {{ event.hanchan_set.count }} {% trans "Hanchans" %}</a></li>
<li><a href="{% url 'maistar-game-list' event.pk %}" ><img src="{{ STATIC_URL }}icons/drink.png" alt="{% trans 'Mai-Star Games' %}" /> {{ event.maistargame_set.count }} {% trans "Mai-Star Games" %}</a></li>
<li><a href="{{ event.get_absolute_url }}"><span class="fa fa-info-circle"></span> {% trans 'Info' %}</a></li>
<li><a href="{% url 'event-photo-list' event.pk %}"><span class="fa fa-camera-retro"></span> {{ event.photo_count }} {% trans 'Photos' %}</a></li>
<li><a href="{% url 'event-hanchan-list' event.pk %}" ><span class="fa fa-table"></span> {{ event.hanchan_set.count }} {% trans "Hanchans" %}</a></li>
<li><a href="{% url 'maistar-game-list' event.pk %}" ><span class="fa fa-glass"></span> {{ event.maistargame_set.count }} {% trans "Mai-Star Games" %}</a></li>
{% if event.is_tournament %}
<li><a href="{% url 'event-ranking' event.id %}"><img src="{{ STATIC_URL }}icons/medal_gold_1.png" alt="{% trans "Tournament Ranking" %}" /> {% trans "Tournament Ranking" %}</a></li>
<li><a href="{% url 'event-ranking' event.id %}"><span class="fa fa-trophy"></span> {% trans "Tournament Ranking" %}</a></li>
{% endif %}
</ul>
{% endblock %}
@@ -107,7 +106,7 @@
{% block buttonbar %}
{% if perms.events.change_event %}
<a class="button" href="{{ event.get_edit_url }}"><img src="{{ STATIC_URL }}icons/page_edit.png" alt="" /> {% trans "Edit Event" %}</a>
<a class="button" href="{{ event.get_edit_url }}"><span class="fa fa-pencil"></span> {% trans "Edit Event" %}</a>
{% endif %}
{% endblock %}

4
src/events/templates/events/event_form.html
View File

@@ -16,8 +16,8 @@
</p>
{% endif %}
<p class="buttonbar">
<button type="reset"><img src="{{STATIC_URL}}icons/arrow_undo.png" alt="{% trans 'reset' %}" /> {% trans 'reset' %}</button>
<button type="submit"><img src="{{STATIC_URL}}icons/disk.png" alt="{% trans 'save' %}" /> {% trans 'save' %}</button>
<button type="reset"><span class="fa fa-undo"></span> {% trans 'reset' %}</button>
<button type="submit"><span class="fa fa-hdd-o"></span> {% trans 'save' %}</button>
</p>
</fieldset>

21
src/events/templates/events/event_list.html
View File

@@ -8,37 +8,36 @@
{% for event in event_list %}
{% ifchanged %}<h3 class="grid_12">{{ event.start|date:'F Y' }}</h3>{% endifchanged %}
{% get_comment_count for event as comment_count %}
<a href="{{ event.get_absolute_url }}" class="grid_2"><img src="{{ event.get_thumbnail.url }}" alt=" {% trans 'Event Image' %}"
<a href="{{ event.get_absolute_url }}" class="grid_2"><img src="{{ event.get_thumbnail.url }}" alt=" {% trans 'Event Image' %}"
class="thumbnail"/></a>
<div class="grid_4">
<h4><a href="{{ event.get_absolute_url }}">{{ event.name }}</a></h4>
<p class="strong"><img src="{{ STATIC_URL }}/icons/date.png" alt="{% trans 'Start' %}:" title="{% trans 'Start' %}">
<div class="grid_4" style="min-height:160px">
<h4><a href="{{ event.get_absolute_url }}">{{ event.name }}</a>
<sup>
{{ event.start|date:'SHORT_DATE_FORMAT' }}
{% if event.end %}
{% trans "from" %} {{ event.start|time:'H:i' }} {% trans "to" %} {{ event.end|time:'H:i' }}
{% else %}
{{ event.start|time:'H:i' }}
{% endif %}
</p>
</sup>
</h4>
<p>{{event.description|truncatewords_html:20}}</p>
<ul class="info">
<li>
<img src="{{ STATIC_URL }}/icons/map.png" alt="{% trans 'Location' %}" title="{% trans 'Location' %}">
<span class="fa fa-map-marker" title="{% trans 'Location' %}"></span>
{{ event.location }}
</li>
<li>
<img src="{{ STATIC_URL }}/icons/comments.png" alt="{% trans 'Comments' %}" title="{% trans 'Comments' %}">
<span class="fa fa-comments" title="{% trans 'Comments' %}"></span>
<a href="{{event.get_absolute_url}}#comments">{{ comment_count }}</a>
</li>
</ul>
<p class="right">
{% if perms.events.change_event %}
<a href="{{ event.get_edit_url }}" class="button"><img src="{{ STATIC_URL }}icons/page_edit.png" alt="{%trans "
Edit" %}"></a>
<a href="{{ event.get_edit_url }}" class="button"><span class="fa fa-pencil"></span></a>
{% endif %}
{% if perms.events.add_photo %}
<a href="{% url 'event-photo-list' event.pk %}" class="button"><img src="{{ STATIC_URL }}icons/image_add.png"
alt="{%trans " Upload" %}"></a>
<a href="{% url 'event-photo-list' event.pk %}" class="button"><span class="fa fa-file-picture-o"></span></a>
{% endif %}
</p>
</div>

5
src/events/templates/events/page.html
View File

@@ -5,14 +5,15 @@
{% block sidebar %}
<a href="http://www.google.com/calendar/render?cid=http%3A%2F%2Fwww.kasu.at%2Fevents.ics"
<a href="http://www.google.com/calendar/render?cid=https%3A%2F%2Fkasu.at%2Fevents.ics"
target="_blank"><img src="http://www.google.com/calendar/images/ext/gc_button6.gif"
alt="{% trans 'Add to Google Calendar' %}"></a>
{% endblock %}
{% block additional_buttonbar %}
{% if perms.events.add_event %}
<a href="{% url 'event-form' %}" class="button"><img src="{{ STATIC_URL }}icons/calendar_add.png" alt=""/> {% trans 'Add Event' %}</a>
<a href="{% url 'event-form' %}" class="button">
<span class="fa fa-calendar-plus-o"></span> {% trans 'Add Event' %}</a>
{% endif %}
{% endblock %}

2
src/events/views.py
View File

@@ -148,7 +148,7 @@ class EventListIcal(generic.View):
self.calendar.add_component(ics_event)
def get(self, request, *args, **kwargs):
response = HttpResponse(mimetype="text/calendar; charset=UTF-8")
response = HttpResponse(content_type="text/calendar; charset=UTF-8")
self.calendar = Calendar()
self.calendar.add('prodid', 'http://www.kasu.at/')
self.calendar.add('version', '2.0')