martin/blechreiz-website
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweaks

Browse Source 
- extra column in events grid with location & time
- bugfixes in locationwidget
- prepared email notifications
This commit is contained in:
Martin Bauer
2013-11-01 12:42:57 +01:00
parent cd635aff9b
commit 82de9eaa84
56 changed files with 800 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
eventplanner/templates/eventplanner/event_update_form.html
View File

@@ -69,6 +69,15 @@ $(document).ready(function(){
defaultTime: false
});
$('form').submit(function() {
if ( $("#id_type").val() != "Option" && $("#id_location").val().trim() == "" ) {
alert("Bitte Ort angeben");
return false;
}
else
return true;
});
function onTypeChange( val )
{
if ( val == "Reh") {
@@ -76,6 +85,7 @@ $(document).ready(function(){
$("#div_id_meeting_time").hide();
$("#div_id_map_location").hide();
$("#div_id_end_date").hide();
$("#div_id_location").show();
if ( ! $("#id_time").val() ) {
$("#id_time").val("19:00");
@@ -87,18 +97,36 @@ $(document).ready(function(){
else if ( val == "Conc" ) {
$("#div_id_time").show();
$("#div_id_meeting_time").show();
$("#div_id_location").show();
$("#div_id_map_location").show();
$("#div_id_end_date").hide();
}
else if ( val == "Party") {
$("#div_id_time").show();
$("#div_id_meeting_time").hide();
$("#div_id_meeting_time").hide();
$("#div_id_location").show();
$("#div_id_map_location").show();
$("#div_id_end_date").hide();
}
else if ( val == "Travel") {
$("#div_id_time").hide();
$("#div_id_meeting_time").hide();
$("#div_id_meeting_time").hide();
$("#div_id_location").show();
$("#div_id_map_location").show();
$("#div_id_end_date").show();
}
else if ( val == "Option" ) {
$("#div_id_time").hide();
$("#div_id_meeting_time").hide();
$("#div_id_location").hide();
$("#div_id_map_location").hide();
$("#div_id_end_date").show();
}
else
{
$("#div_id_time").show();
$("#div_id_meeting_time").show();
$("#div_id_location").show();
$("#div_id_map_location").show();
$("#div_id_end_date").show();
}

14
eventplanner/templates/eventplanner/events_grid.html
View File

@@ -16,6 +16,12 @@
{% block content %}
{% addtoblock "css" %}
<style>
.infoColumn {
text-align: center;
font-size: 11px;
}
button.eventButton {
width: 42px;
}
@@ -130,8 +136,8 @@
<thead>
<tr>
<th> Termin </th>
<th> Datum </th>
<th> </th>
<th> </th>
{% for name in usernames %}
<th class='usernameHeader'> {{ name|capfirst }} </th>
{% endfor %}
@@ -143,8 +149,8 @@
{% for event in events %}
<tr class="eventRow">
<td class="center"> <a href="{{ event.pk }}"> {{ event.title }} </a> </td>
<td class="center"> {{ event.date | date:"SHORT_DATE_FORMAT" }} </td>
<td class="center" > <a href="{{ event.pk }}" > {{ event.title }} </a> </td>
<td class="center infoColumn" > {{ event.location }}<br/> {{ event.date | date:"SHORT_DATE_FORMAT" }} </td>
{% for p in event.participation %}