Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Changed tabs to 2 spaces #19

Merged
9 commits merged into from

1 participant

@billward

I changed all the hard tab characters to 2 spaces, using the command "unexpand | expand --tabs=2"

William R. Ward added some commits
William R. Ward changed hard tabs to 2 spaces e4bc944
William R. Ward Adjust indentation c3371e7
William R. Ward Adjust indentation 840a64b
William R. Ward Adjust indentation 7b2f691
William R. Ward Adjust indentation 2bb531b
William R. Ward Adjust indentation a631968
William R. Ward Adjust indentation 82bf669
William R. Ward Adjust indentation d16c9da
William R. Ward Adjust indentation 5e20498
This issue was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 1, 2011
  1. changed hard tabs to 2 spaces

    William R. Ward authored
  2. Adjust indentation

    William R. Ward authored
  3. Adjust indentation

    William R. Ward authored
  4. Adjust indentation

    William R. Ward authored
  5. Adjust indentation

    William R. Ward authored
  6. Adjust indentation

    William R. Ward authored
  7. Adjust indentation

    William R. Ward authored
  8. Adjust indentation

    William R. Ward authored
  9. Adjust indentation

    William R. Ward authored
This page is out of date. Refresh to see the latest.
View
28 templates/all_future.html
@@ -3,21 +3,21 @@
{% include 'nav_menu.html' %}
<div id="primary">
- {% ifnotequal whichbase "mini.html" %}<h3>All Events</h3>{% endifnotequal %}
+ {% ifnotequal whichbase "mini.html" %}<h3>All Events</h3>{% endifnotequal %}
- {% regroup events by start_date as grouped_events %}
- {% for events in grouped_events %}
- <h4>{% ifequal events.grouper today.date %}<span style="text-decoration:underline;">Today</span> - {% endifequal %}{% ifequal events.grouper tomorrow.date %}<span style="text-decoration:underline;">Tomorrow</span> - {% endifequal %}{{events.grouper|date:"l, F j"}}</h4>
- <table>
- {% for event in events.list %}
- {% include 'list_event.html' %}
- {% endfor %}
- </table>
- {% endfor %}
-
- <p><a href="/past" style="font-size: smaller;">&larr; Past Events</a></p>
-
- <div style="font-size: x-small; float: right; color: gray;">{{ today }}</div>
+ {% regroup events by start_date as grouped_events %}
+ {% for events in grouped_events %}
+ <h4>{% ifequal events.grouper today.date %}<span style="text-decoration:underline;">Today</span> - {% endifequal %}{% ifequal events.grouper tomorrow.date %}<span style="text-decoration:underline;">Tomorrow</span> - {% endifequal %}{{events.grouper|date:"l, F j"}}</h4>
+ <table>
+ {% for event in events.list %}
+ {% include 'list_event.html' %}
+ {% endfor %}
+ </table>
+ {% endfor %}
+
+ <p><a href="/past" style="font-size: smaller;">&larr; Past Events</a></p>
+
+ <div style="font-size: x-small; float: right; color: gray;">{{ today }}</div>
</div>
View
30 templates/approved.html
@@ -3,22 +3,22 @@
{% include 'nav_menu.html' %}
<div id="primary">
- {% ifnotequal whichbase "mini.html" %}<h3>Upcoming Events</h3>{% endifnotequal %}
+ {% ifnotequal whichbase "mini.html" %}<h3>Upcoming Events</h3>{% endifnotequal %}
- {% regroup events by start_date as grouped_events %}
- {% for events in grouped_events %}
- <h4>{% ifequal events.grouper today.date %}<span style="text-decoration:underline;">Today</span> - {% endifequal %}{% ifequal events.grouper tomorrow.date %}<span style="text-decoration:underline;">Tomorrow</span> - {% endifequal %}{{events.grouper|date:"l, F j"}}</h4>
- <table>
- {% for event in events.list %}
- {% include 'list_event.html' %}
- {% endfor %}
- </table>
- {% endfor %}
-
- <p><a href="/past" style="font-size: smaller;">&larr; Past Events</a></p>
-
- <div style="font-size: x-small; float: right; color: gray;">{{ today }}</div>
- <p style="font-size: x-small;">Alternative formats: <a href="/events.ics">iCal</a> | <a href="/events.rss">RSS</a> | <a href="/events.json">JSON</a></p>
+ {% regroup events by start_date as grouped_events %}
+ {% for events in grouped_events %}
+ <h4>{% ifequal events.grouper today.date %}<span style="text-decoration:underline;">Today</span> - {% endifequal %}{% ifequal events.grouper tomorrow.date %}<span style="text-decoration:underline;">Tomorrow</span> - {% endifequal %}{{events.grouper|date:"l, F j"}}</h4>
+ <table>
+ {% for event in events.list %}
+ {% include 'list_event.html' %}
+ {% endfor %}
+ </table>
+ {% endfor %}
+
+ <p><a href="/past" style="font-size: smaller;">&larr; Past Events</a></p>
+
+ <div style="font-size: x-small; float: right; color: gray;">{{ today }}</div>
+ <p style="font-size: x-small;">Alternative formats: <a href="/events.ics">iCal</a> | <a href="/events.rss">RSS</a> | <a href="/events.json">JSON</a></p>
</div>
View
76 templates/base.html
@@ -1,41 +1,41 @@
<html>
- <head>
- <title>Events at Hacker Dojo</title>
- <link href="/static/style.css" type="text/css" rel="stylesheet" />
- {% block feed %}
- <link rel="alternate" type="application/xml" title="Hacker Dojo events feed" href="/events.rss" />
- {% endblock %}
- <link type="text/css" href="/static/css/blitzer/jquery-ui-1.8.1.custom.css" rel="stylesheet" />
- <script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script>
- <script type="text/javascript" src="/static/js/jquery.cookies.js"></script>
- <script type="text/javascript" src="/static/js/jquery-ui-1.8.1.custom.min.js"></script>
- <script type="text/javascript" src="/static/js/DD_roundies_0.0.2a-min.js"></script>
- <script type="text/javascript" src="/static/js/hd-events.js"></script>
- </head>
- <body>
- <div id="top">
- <div>
- <span id="contact-link"><a href="mailto:events@hackerdojo.com">Contact Events Team</a></span>
- {% if user %}
- <strong>{{user.email}}</strong> | <a href="/myevents">My Events</a> | <a href="{{logout_url}}">Logout</a>
- {% else %}
- <a style="font-weight: bold;" href="{{login_url}}">Login</a> | <a href="http://signup.hackerdojo.com/upgrade/needaccount">Need an account?</a>
- {% endif %}
- </div>
- </div>
- <div id="wrapper">
- <div id="header">
- <form action="/new" method="get"><div id='new-event-link'><button type="submit" id="nav_new" class="emph">New Event</button></div></form>
- <div onclick="document.location.href='/';" style="cursor:pointer">
- <img src="/static/dojo_icon.png" style="float: left;" />
- <h1>Events</h1>
- <h2 style="font-size: x-large;">at Hacker Dojo</h2>
- </div>
- </div>
- <div id="content">
- {% block content %}{% endblock %}
- </div>
- </div>
+ <head>
+ <title>Events at Hacker Dojo</title>
+ <link href="/static/style.css" type="text/css" rel="stylesheet" />
+ {% block feed %}
+ <link rel="alternate" type="application/xml" title="Hacker Dojo events feed" href="/events.rss" />
+ {% endblock %}
+ <link type="text/css" href="/static/css/blitzer/jquery-ui-1.8.1.custom.css" rel="stylesheet" />
+ <script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script>
+ <script type="text/javascript" src="/static/js/jquery.cookies.js"></script>
+ <script type="text/javascript" src="/static/js/jquery-ui-1.8.1.custom.min.js"></script>
+ <script type="text/javascript" src="/static/js/DD_roundies_0.0.2a-min.js"></script>
+ <script type="text/javascript" src="/static/js/hd-events.js"></script>
+ </head>
+ <body>
+ <div id="top">
+ <div>
+ <span id="contact-link"><a href="mailto:events@hackerdojo.com">Contact Events Team</a></span>
+ {% if user %}
+ <strong>{{user.email}}</strong> | <a href="/myevents">My Events</a> | <a href="{{logout_url}}">Logout</a>
+ {% else %}
+ <a style="font-weight: bold;" href="{{login_url}}">Login</a> | <a href="http://signup.hackerdojo.com/upgrade/needaccount">Need an account?</a>
+ {% endif %}
+ </div>
+ </div>
+ <div id="wrapper">
+ <div id="header">
+ <form action="/new" method="get"><div id='new-event-link'><button type="submit" id="nav_new" class="emph">New Event</button></div></form>
+ <div onclick="document.location.href='/';" style="cursor:pointer">
+ <img src="/static/dojo_icon.png" style="float: left;" />
+ <h1>Events</h1>
+ <h2 style="font-size: x-large;">at Hacker Dojo</h2>
+ </div>
+ </div>
+ <div id="content">
+ {% block content %}{% endblock %}
+ </div>
+ </div>
- </body>
+ </body>
</html>
View
154 templates/edit.html
@@ -1,90 +1,90 @@
{% extends 'base.html' %}
{% block content %}
<style>
- .b-block input, .b-block textarea {width:75%}
- .checklist input {width: 20px;}
+ .b-block input, .b-block textarea {width:75%}
+ .checklist input {width: 20px;}
</style>
<script type="text/javascript">
- $(function() {
- $("#datepicker").datepicker({minDate: 0});
- $('#datepicker, #roomlist input, #start_time_hour, #start_time_minute, #start_time_ampm, #end_time_hour, #end_time_minute, #end_time_ampm').blur(checkDup);
- });
-
- function checkDup() {
- $.post("/check_conflict", function(responseText){ if(responseText=="yes") $("#message").html("Sorry, another event is already using the room(s) at the time you requested"); });
- }
+ $(function() {
+ $("#datepicker").datepicker({minDate: 0});
+ $('#datepicker, #roomlist input, #start_time_hour, #start_time_minute, #start_time_ampm, #end_time_hour, #end_time_minute, #end_time_ampm').blur(checkDup);
+ });
+
+ function checkDup() {
+ $.post("/check_conflict", function(responseText){ if(responseText=="yes") $("#message").html("Sorry, another event is already using the room(s) at the time you requested"); });
+ }
</script>
<form method=POST>
<div id="primary">
- <h3>Edit: {{event.name|title}}</h3>
- <div class='b-block'><div class='b-label'>Title:</div><div class='b-data'><input type="text" name="name" value="{{event.name|title}}"/></div></div>
- <div class='b-block' id="message">
- </div>
- <div class='b-block'>
- <div class='b-label'>When:</div>
- <table style="margin: 0px;" class='b-data'>
- <tr>
- <td class="first"><label for="date">Date:</label>
- <input name="date" id="datepicker" value="{{event.start_time}}" readonly="readonly"/></td>
- <td><label for="start_time">Start Time:</label>
- <select name="start_time_hour" id="start_time_hour">
- {% for hour in hours %}
- <option {{event.start_time|select_hour:hour}}>{{hour}}</option>
- {% endfor %}
- </select>:
- <select name="start_time_minute" id="start_time_minute">
- <option {{event.start_time|select_minute:0}}>00</option>
- <option {{event.start_time|select_minute:15}}>15</option>
- <option {{event.start_time|select_minute:30}}>30</option>
- <option {{event.start_time|select_minute:45}}>45</option>
- </select>
- <select name="start_time_ampm" id="start_time_ampm">
- <option {{event.start_time|select_ampm:"pm"}}>pm</option>
- <option {{event.start_time|select_ampm:"am"}}>am</option>
- </select>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td><label for="end_time">End Time:</label>
- <select name="end_time_hour" id="end_time_hour">
- {% for hour in hours %}
- <option {{event.end_time|select_hour:hour}}>{{hour}}</option>
- {% endfor %}
- </select>:
- <select name="end_time_minute" id="end_time_minute">
- <option {{event.end_time|select_minute:0}}>00</option>
- <option {{event.end_time|select_minute:15}}>15</option>
- <option {{event.end_time|select_minute:30}}>30</option>
- <option {{event.end_time|select_minute:45}}>45</option>
- </select>
- <select name="end_time_ampm" id="end_time_ampm">
- <option {{event.end_time|select_ampm:"pm"}}>pm</option>
- <option {{event.end_time|select_ampm:"am"}}>am</option>
- </select>
- </td>
- </tr>
- </table>
- </div>
+ <h3>Edit: {{event.name|title}}</h3>
+ <div class='b-block'><div class='b-label'>Title:</div><div class='b-data'><input type="text" name="name" value="{{event.name|title}}"/></div></div>
+ <div class='b-block' id="message">
+ </div>
+ <div class='b-block'>
+ <div class='b-label'>When:</div>
+ <table style="margin: 0px;" class='b-data'>
+ <tr>
+ <td class="first"><label for="date">Date:</label>
+ <input name="date" id="datepicker" value="{{event.start_time}}" readonly="readonly"/></td>
+ <td><label for="start_time">Start Time:</label>
+ <select name="start_time_hour" id="start_time_hour">
+ {% for hour in hours %}
+ <option {{event.start_time|select_hour:hour}}>{{hour}}</option>
+ {% endfor %}
+ </select>:
+ <select name="start_time_minute" id="start_time_minute">
+ <option {{event.start_time|select_minute:0}}>00</option>
+ <option {{event.start_time|select_minute:15}}>15</option>
+ <option {{event.start_time|select_minute:30}}>30</option>
+ <option {{event.start_time|select_minute:45}}>45</option>
+ </select>
+ <select name="start_time_ampm" id="start_time_ampm">
+ <option {{event.start_time|select_ampm:"pm"}}>pm</option>
+ <option {{event.start_time|select_ampm:"am"}}>am</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><label for="end_time">End Time:</label>
+ <select name="end_time_hour" id="end_time_hour">
+ {% for hour in hours %}
+ <option {{event.end_time|select_hour:hour}}>{{hour}}</option>
+ {% endfor %}
+ </select>:
+ <select name="end_time_minute" id="end_time_minute">
+ <option {{event.end_time|select_minute:0}}>00</option>
+ <option {{event.end_time|select_minute:15}}>15</option>
+ <option {{event.end_time|select_minute:30}}>30</option>
+ <option {{event.end_time|select_minute:45}}>45</option>
+ </select>
+ <select name="end_time_ampm" id="end_time_ampm">
+ <option {{event.end_time|select_ampm:"pm"}}>pm</option>
+ <option {{event.end_time|select_ampm:"am"}}>am</option>
+ </select>
+ </td>
+ </tr>
+ </table>
+ </div>
- <div class='b-block'>
- <div class='b-label'>Rooms:<br /><span style="font-size:10; font-weight: normal;">(Capacity in<br/>parentheses)</span></div>
- <div class='b-data checklist' id="roomlist">
- {% for room in rooms %}
- <nobr><input type="checkbox" id="room-{{room.0}}" name="rooms" value="{{room.0}}" {{event.rooms|check_filter:room.0}} /><label for="room-{{room.0}}">{{room.0|title}} ({{room.1}})</label></nobr>
- {% endfor %}
- </div>
- </div>
- <div class='b-block'><div class='b-label'>More Info:</div><div class='b-data'><textarea rows=4 name="details">{{event.details}}</textarea></div></div>
- <div class='b-block'><div class='b-label'>Notes:</div><div class='b-data'><textarea rows=3 name="notes">{{event.notes}}</textarea></div></div>
- <div class='b-block'><div class='b-label'>Estimated Size:</div><div class='b-data'><input type="text" name="estimated_size" value="{{event.estimated_size|title}}"/></div></div>
- <div class='b-block'><div class='b-label'>Contact Name:</div><div class='b-data'><input type="text" name="contact_name" value="{{event.contact_name|title}}"/></div></div>
- <div class='b-block'><div class='b-label'>Contact Phone:</div><div class='b-data'><input type="text" name="contact_phone" value="{{event.contact_phone|title}}"/></div></div>
- <div class='b-block'><div class='b-label'>URL:</div><div class='b-data'><input type="text" name="url" value="{{event.url|title}}"/></div></div>
- <div class='b-block'><div class='b-label'>Fee:</div><div class='b-data'><input type="text" name="fee" value="{{event.fee|title}}"/></div></div>
- <br/>
- <input type=submit value="Save">
+ <div class='b-block'>
+ <div class='b-label'>Rooms:<br /><span style="font-size:10; font-weight: normal;">(Capacity in<br/>parentheses)</span></div>
+ <div class='b-data checklist' id="roomlist">
+ {% for room in rooms %}
+ <nobr><input type="checkbox" id="room-{{room.0}}" name="rooms" value="{{room.0}}" {{event.rooms|check_filter:room.0}} /><label for="room-{{room.0}}">{{room.0|title}} ({{room.1}})</label></nobr>
+ {% endfor %}
+ </div>
+ </div>
+ <div class='b-block'><div class='b-label'>More Info:</div><div class='b-data'><textarea rows=4 name="details">{{event.details}}</textarea></div></div>
+ <div class='b-block'><div class='b-label'>Notes:</div><div class='b-data'><textarea rows=3 name="notes">{{event.notes}}</textarea></div></div>
+ <div class='b-block'><div class='b-label'>Estimated Size:</div><div class='b-data'><input type="text" name="estimated_size" value="{{event.estimated_size|title}}"/></div></div>
+ <div class='b-block'><div class='b-label'>Contact Name:</div><div class='b-data'><input type="text" name="contact_name" value="{{event.contact_name|title}}"/></div></div>
+ <div class='b-block'><div class='b-label'>Contact Phone:</div><div class='b-data'><input type="text" name="contact_phone" value="{{event.contact_phone|title}}"/></div></div>
+ <div class='b-block'><div class='b-label'>URL:</div><div class='b-data'><input type="text" name="url" value="{{event.url|title}}"/></div></div>
+ <div class='b-block'><div class='b-label'>Fee:</div><div class='b-data'><input type="text" name="fee" value="{{event.fee|title}}"/></div></div>
+ <br/>
+ <input type=submit value="Save">
</div>
{% endblock %}
View
93 templates/event.html
@@ -2,62 +2,61 @@
{% block content %}
<div id="primary">
- <h3>{{event.name|title}}</h3>
- {% if not event.is_past %}<p>
- <form method="post" style="display: inline;">
- {% if event.is_deleted %}
- {% if access_rights.is_admin %}<input type="submit" name="state" value="Undelete" />{% endif %}
- (This will return the event to the &ldquo;pending&rdquo; status.)
- {% else %}
- {% if access_rights.can_approve %}<input type="submit" name="state" value="Approve" />{% endif %}
- {% if access_rights.can_cancel and not event.is_onhold %}<input type="submit" name="state" value="OnHold" />{% endif %}
- {% if access_rights.can_cancel and not event.is_canceled %}<input type="submit" name="state" value="Cancel" />{% endif %}
- {% if access_rights.is_admin %}<input type="submit" name="state" value="Delete" />{% endif %}
- {% if access_rights.can_edit %}<input type="button" value="Edit" onclick="document.location.href='/edit/{{event.key.id}}';" />{% endif %}
- <!--{% if access_rights.can_staff %}<input type="submit" name="state" value="Staff" />{% endif %}
- {% if access_rights.can_unstaff %}<input type="submit" name="state" value="Unstaff" />{% endif %}-->
- {% endif %}
- </form>
- </p>{% endif %}
+ <h3>{{event.name|title}}</h3>
+ {% if not event.is_past %}<p>
+ <form method="post" style="display: inline;">
+ {% if event.is_deleted %}
+ {% if access_rights.is_admin %}<input type="submit" name="state" value="Undelete" />{% endif %}
+ (This will return the event to the &ldquo;pending&rdquo; status.)
+ {% else %}
+ {% if access_rights.can_approve %}<input type="submit" name="state" value="Approve" />{% endif %}
+ {% if access_rights.can_cancel and not event.is_onhold %}<input type="submit" name="state" value="OnHold" />{% endif %}
+ {% if access_rights.can_cancel and not event.is_canceled %}<input type="submit" name="state" value="Cancel" />{% endif %}
+ {% if access_rights.is_admin %}<input type="submit" name="state" value="Delete" />{% endif %}
+ {% if access_rights.can_edit %}<input type="button" value="Edit" onclick="document.location.href='/edit/{{event.key.id}}';" />{% endif %}
+ <!--{% if access_rights.can_staff %}<input type="submit" name="state" value="Staff" />{% endif %}
+ {% if access_rights.can_unstaff %}<input type="submit" name="state" value="Unstaff" />{% endif %}-->
+ {% endif %}
+ </form>
+ </p>{% endif %}
- {% if not event.is_staffed %}<p>
- <span style="color: red; font-weight: bold">This event is currently understaffed.</span><br/>
- Due to this size of the event, at least {{ event.staff_needed }} more Dojo member{{ event.staff_needed|pluralize }} must volunteer to staff it. It will not appear on the public calendar until {% if not event.is_approved %}it has been approved and {% endif %}enough people volunteer.
- </p>{% else %}{% if not event.is_approved %}<p>
- <span style="color: red; font-weight: bold">This event is not yet visible.</span><br/>
- This event will not appear on the public calendar until it has been approved. If this does not happen soon, contact <a href="email:events@hackerdojo.com">events@hackerdojo.com</a> for assistance.
- </p>{% endif %}{% endif %}
+ {% if not event.is_staffed %}<p>
+ <span style="color: red; font-weight: bold">This event is currently understaffed.</span><br/>
+ Due to this size of the event, at least {{ event.staff_needed }} more Dojo member{{ event.staff_needed|pluralize }} must volunteer to staff it. It will not appear on the public calendar until {% if not event.is_approved %}it has been approved and {% endif %}enough people volunteer.
+ </p>{% else %}{% if not event.is_approved %}<p>
+ <span style="color: red; font-weight: bold">This event is not yet visible.</span><br/>
+ This event will not appear on the public calendar until it has been approved. If this does not happen soon, contact <a href="email:events@hackerdojo.com">events@hackerdojo.com</a> for assistance.
+ </p>{% endif %}{% endif %}
- <div class='b-block'><div class='b-label'>Status:</div><div class='b-data'>{{event.status|title}}</div></div>
- <div class='b-block'><div class='b-label'>Date:</div><div class='b-data'>{{event.start_time|date:"l, F j Y"}}</div></div>
- <div class='b-block'><div class='b-label'>Time:</div><div class='b-data'>{{event.start_time|date:"g:iA"|lower}} to {{event.end_time|date:"g:iA"|lower}}</div></div>
- <div class='b-block'><div class='b-label'>Member:</div><div class='b-data'>{{event.member}}</div></div>
- <div class='b-block'><div class='b-label'>Type:</div><div class='b-data'>{{event.type}}</div></div>
- <div class='b-block'><div class='b-label'>Estimated size:</div><div class='b-data'>{{event.estimated_size}}</div></div>
- {% if event.contact_name %}
+ <div class='b-block'><div class='b-label'>Status:</div><div class='b-data'>{{event.status|title}}</div></div>
+ <div class='b-block'><div class='b-label'>Date:</div><div class='b-data'>{{event.start_time|date:"l, F j Y"}}</div></div>
+ <div class='b-block'><div class='b-label'>Time:</div><div class='b-data'>{{event.start_time|date:"g:iA"|lower}} to {{event.end_time|date:"g:iA"|lower}}</div></div>
+ <div class='b-block'><div class='b-label'>Member:</div><div class='b-data'>{{event.member}}</div></div>
+ <div class='b-block'><div class='b-label'>Type:</div><div class='b-data'>{{event.type}}</div></div>
+ <div class='b-block'><div class='b-label'>Estimated size:</div><div class='b-data'>{{event.estimated_size}}</div></div>
+ {% if event.contact_name %}
<div class='b-block'><div class='b-label'>Contact:</div><div class='b-data'>{{event.contact_name}}{% if user %}, {{event.contact_phone}}{% endif %}</div></div>
- {% endif %}
- <div class='b-block'><div class='b-label'>URL:</div><div class='b-data'><a href='{{event.url}}'>{{event.url}}</a></div></div>
- <div class='b-block'><div class='b-label'>Fee:</div><div class='b-data'>{{event.fee}}</div></div>
- <div class='b-block'><div class='b-label'>Rooms:</div><div class='b-data'>{{event.roomlist}}</div></div>
- <!--<div class='b-block'><div class='b-label'>Staff:</div><div class='b-data'>{{event.stafflist}}</div></div>-->
- <div class='thin-border'></div>
- <div class='b-block'><div class='b-label'>Details:</div><div class='b-data'>{{event.details}}</div></div>
- <br />
- <div class='b-block'><div class='b-label'>Notes:</div><div class='b-data'>{{event.notes}}</div></div>
- {% if event.feedback_set.count %}
+ {% endif %}
+ <div class='b-block'><div class='b-label'>URL:</div><div class='b-data'><a href='{{event.url}}'>{{event.url}}</a></div></div>
+ <div class='b-block'><div class='b-label'>Fee:</div><div class='b-data'>{{event.fee}}</div></div>
+ <div class='b-block'><div class='b-label'>Rooms:</div><div class='b-data'>{{event.roomlist}}</div></div>
+ <!--<div class='b-block'><div class='b-label'>Staff:</div><div class='b-data'>{{event.stafflist}}</div></div>-->
+ <div class='thin-border'></div>
+ <div class='b-block'><div class='b-label'>Details:</div><div class='b-data'>{{event.details}}</div></div>
+ <br />
+ <div class='b-block'><div class='b-label'>Notes:</div><div class='b-data'>{{event.notes}}</div></div>
+ {% if event.feedback_set.count %}
<div class='thin-border'></div>
<div id='secondary'>
<h3>Feedback</h3>
{% for feedback in event.feedback_set %}
- <div class='b-block'><div class='b-label'>Submitted by:</div><div class='b-data'>{{feedback.user}} on {{feedback.created|date:"F j"}} at {{feedback.created|date:"g:iA"|lower}}</div></div>
- <div class='b-block'><div class='b-label'>Rating:</div><div class='b-data'>{{feedback.rating}}</div></div>
- <div class='b-block'><div class='b-label'>Comment:</div><div class='b-data'>{{feedback.comment}}</div></div>
- <div class='thinner-border'></div>
- {% endfor %}
+ <div class='b-block'><div class='b-label'>Submitted by:</div><div class='b-data'>{{feedback.user}} on {{feedback.created|date:"F j"}} at {{feedback.created|date:"g:iA"|lower}}</div></div>
+ <div class='b-block'><div class='b-label'>Rating:</div><div class='b-data'>{{feedback.rating}}</div></div>
+ <div class='b-block'><div class='b-label'>Comment:</div><div class='b-data'>{{feedback.comment}}</div></div>
+ <div class='thinner-border'></div>
+ {% endfor %}
</div>
{% endif %}
</div>
-
{% endblock %}
View
34 templates/feedback.html
@@ -3,23 +3,23 @@
<div id="primary">
<a style="float: right;" href="/event/{{event.key.id}}-{{event.name|slugify}}">&larr; Back to event page</a>
- <h3>Feedback for {{event.name}}</h3>
-
- <form method="post" style="width: 80%;">
- <p>Your feedback helps us improve the quality of events at Hacker Dojo. This data will go to the event organizer and Dojo staff.</p>
- <strong>Rating:</strong>
- <select name="rating">
- <option></option>
- <option value="5">5 - Great</option>
- <option value="4">4</option>
- <option value="3">3 - Average</option>
- <option value="2">2</option>
- <option value="1">1 - Terrible</option>
- </select><br />
- <strong>Comments:</strong><br />
- <textarea rows="5" style="width: 300px;" name="comment" id="comment"></textarea><br />
- <input id='new_feedback' type="submit" value="Submit your feedback" style="font-size: larger; margin: 5px;" />
- </form>
+ <h3>Feedback for {{event.name}}</h3>
+
+ <form method="post" style="width: 80%;">
+ <p>Your feedback helps us improve the quality of events at Hacker Dojo. This data will go to the event organizer and Dojo staff.</p>
+ <strong>Rating:</strong>
+ <select name="rating">
+ <option></option>
+ <option value="5">5 - Great</option>
+ <option value="4">4</option>
+ <option value="3">3 - Average</option>
+ <option value="2">2</option>
+ <option value="1">1 - Terrible</option>
+ </select><br />
+ <strong>Comments:</strong><br />
+ <textarea rows="5" style="width: 300px;" name="comment" id="comment"></textarea><br />
+ <input id='new_feedback' type="submit" value="Submit your feedback" style="font-size: larger; margin: 5px;" />
+ </form>
</div>
View
18 templates/list_event.html
@@ -1,11 +1,11 @@
<tr>
- <td width="75">{{event.start_time|date:"g:iA"|lower}}</td>
- <td>
- <a {% if event.is_canceled %}style="text-decoration: line-through;"{% endif %} href="/event/{{event.key.id}}-{{event.name|slugify}}">
- {{event.name}}
- </a>
- {% ifnotequal event.status "approved" %}<span style="color: white; font-size: x-small; padding: 2px; background: gray">{{event.status}}</span>{% endifnotequal %}
- {% if event.is_past %}(<a href="/feedback/new/{{event.key.id}}">Give your feedback</a>){% endif %}
- <div style="font-size:80%">Hosted by <a href="mailto:{{event.member.email}}">{{event.owner}}</a>
- {% if event.roomlist %}in {{event.roomlist}}{% endif %}</div></td>
+ <td width="75">{{event.start_time|date:"g:iA"|lower}}</td>
+ <td>
+ <a {% if event.is_canceled %}style="text-decoration: line-through;"{% endif %} href="/event/{{event.key.id}}-{{event.name|slugify}}">
+ {{event.name}}
+ </a>
+ {% ifnotequal event.status "approved" %}<span style="color: white; font-size: x-small; padding: 2px; background: gray">{{event.status}}</span>{% endifnotequal %}
+ {% if event.is_past %}(<a href="/feedback/new/{{event.key.id}}">Give your feedback</a>){% endif %}
+ <div style="font-size:80%">Hosted by <a href="mailto:{{event.member.email}}">{{event.owner}}</a>
+ {% if event.roomlist %}in {{event.roomlist}}{% endif %}</div></td>
</tr>
View
44 templates/logs.html
@@ -3,28 +3,28 @@
{% include 'nav_menu.html' %}
<div id="primary">
- <h3>Event App Logs</h3>
+ <h3>Event App Logs</h3>
- <table id='log-list'>
- <tr>
- <th style='width:30%;'>Timestamp</th>
- <th style='width:30%;'>Member</th>
- <th>Event</th>
- </tr>
- {% for log in logs %}
- <tr>
- <td>{{log.created|date:"b j Y"|title}} {{log.created|date:"g:i A"|lower}}</td>
- <td><a href="mailto:{{log.user.nickname}}?subject={{log.event.name}}">{{log.user.nickname}}</a></td>
- <td><a href="/event/{{log.event.key.id}}-{{log.event.name|slugify}}">{{log.event.name}}</a></td>
- </tr>
- <tr>
- <td colspan='3'>{{log.description}}</td>
- </tr>
- <tr class='desc-line'><td colspan='3'>&nbsp;</td>
- </tr>
- {% endfor %}
- </table>
- {% if false %}
- {% endif %}
+ <table id='log-list'>
+ <tr>
+ <th style='width:30%;'>Timestamp</th>
+ <th style='width:30%;'>Member</th>
+ <th>Event</th>
+ </tr>
+ {% for log in logs %}
+ <tr>
+ <td>{{log.created|date:"b j Y"|title}} {{log.created|date:"g:i A"|lower}}</td>
+ <td><a href="mailto:{{log.user.nickname}}?subject={{log.event.name}}">{{log.user.nickname}}</a></td>
+ <td><a href="/event/{{log.event.key.id}}-{{log.event.name|slugify}}">{{log.event.name}}</a></td>
+ </tr>
+ <tr>
+ <td colspan='3'>{{log.description}}</td>
+ </tr>
+ <tr class='desc-line'><td colspan='3'>&nbsp;</td>
+ </tr>
+ {% endfor %}
+ </table>
+ {% if false %}
+ {% endif %}
</div>
{% endblock %}
View
8 templates/menu.html
@@ -1,6 +1,6 @@
<div id="menu" style="float: right; margin: 10px; font-size: smaller;">
- <a href="/">Approved</a> |
- <a href="/past">Event Feedback</a> |
- <a href="/pending">Pending</a> |
- <a href="/new" style="font-weight: bold;">New Event</a>
+ <a href="/">Approved</a> |
+ <a href="/past">Event Feedback</a> |
+ <a href="/pending">Pending</a> |
+ <a href="/new" style="font-weight: bold;">New Event</a>
</div>
View
2  templates/mini.html
@@ -12,7 +12,7 @@
<body>
<div id="wrapper">
<div id="content">
- {% block content %}{% endblock %}
+ {% block content %}{% endblock %}
</div>
</div>
</body>
View
12 templates/myevents.html
@@ -2,18 +2,18 @@
{% block content %}
<div id="primary">
- <h3>My Events</h3>
- <a href="/" style="font-size: smaller; margin-top: -20px; display: block;">&larr; All Events</a>
+ <h3>My Events</h3>
+ <a href="/" style="font-size: smaller; margin-top: -20px; display: block;">&larr; All Events</a>
- {% regroup events by start_date as grouped_events %}
- {% for events in grouped_events %}
+ {% regroup events by start_date as grouped_events %}
+ {% for events in grouped_events %}
<h4>{% ifequal events.grouper today.date %}<span style="text-decoration:underline;">Today</span> - {% endifequal %}{% ifequal events.grouper tomorrow.date %}<span style="text-decoration:underline;">Tomorrow</span> - {% endifequal %}{{events.grouper|date:"l, F j"}}</h4>
<table>
{% for event in events.list %}
- {% include 'list_event.html' %}
+ {% include 'list_event.html' %}
{% endfor %}
</table>
- {% endfor %}
+ {% endfor %}
</div>
View
2  templates/nav_menu.html
@@ -1,3 +1,3 @@
<div id="menu">
- <strong>Filter Events:</strong> <a href="/" id="nav_approved">Approved</a> | <a href="/pending" id="nav_pending">Pending</a> {% if show_all_nav %}| <a href="/all_future" id="nav_all_future">All</a> {% endif %}
+ <strong>Filter Events:</strong> <a href="/" id="nav_approved">Approved</a> | <a href="/pending" id="nav_pending">Pending</a> {% if show_all_nav %}| <a href="/all_future" id="nav_all_future">All</a> {% endif %}
</div>
View
256 templates/new.html
@@ -1,25 +1,25 @@
{% extends 'base.html' %}
{% block content %}
<script type="text/javascript" charset="utf-8">
-
+
$(function() {
$("#datepicker").datepicker({minDate: 0});
-
+
try {
var formvalues = $.cookie('formvalues');
if (formvalues) {
formvalues = JSON.parse(formvalues);
$('#type-select').append('<option>'+formvalues['type']+'</option>');
for (var key in formvalues) {
- if (key!="rooms") {
- $('[name='+key+']').val(formvalues[key]);
- }
+ if (key!="rooms") {
+ $('[name='+key+']').val(formvalues[key]);
+ }
}
- $.each($('[name=rooms]'), function(key, value) {
- if ($(value).val()==formvalues["rooms"]) {
- $(value).attr("checked", "checked");
- }
- });
+ $.each($('[name=rooms]'), function(key, value) {
+ if ($(value).val()==formvalues["rooms"]) {
+ $(value).attr("checked", "checked");
+ }
+ });
}
var formerror = $.cookie('formerror');
if (formerror) {
@@ -43,106 +43,107 @@
</script>
<div id="primary">
- <h3>New Event</h3>
-
- <div id="warn" style="margin:4px; margin-bottom:1.5em; padding:8px; border:1px solid #ffe7af; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; background:#fffaed"><b>{{human}}</b> will be held personally responsible for this event. You must show up and ensure the rules below are followed. Failure to make a good faith effort will result in suspension of event hosting privileges for 45 days.</div>
+ <h3>New Event</h3>
+
+ <div id="warn" style="margin:4px; margin-bottom:1.5em; padding:8px; border:1px solid #ffe7af; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; background:#fffaed"><b>{{human}}</b> will be held personally responsible for this event. You must show up and ensure the rules below are followed. Failure to make a good faith effort will result in suspension of event hosting privileges for 45 days.</div>
<div style="margin:4px; margin-bottom:1.5em; padding:8px; color: black; display:none; border:1px solid red; background:#fee; " id="error"></div>
-
- <div style="width: 46%; float: right; font-size: smaller; padding: 8px; -moz-border-radius: 8px; -webkit-border-radius: 8px; background: #eee; line-height: normal;" id="terms">
- <h3 style="margin-top: 0px;">Member Terms as Event Host:</h3>
- <ol>
- <li><strong>Schedule</strong>
- <div>Dojo resources are allocated on a first come, first serve basis. Avoid scheduling major events on the same day. Otherwise, expect an Events Coordinator to suggest an alternate time or room.</div></li>
+
+ <div style="width: 46%; float: right; font-size: smaller; padding: 8px; -moz-border-radius: 8px; -webkit-border-radius: 8px; background: #eee; line-height: normal;" id="terms">
+ <h3 style="margin-top: 0px;">Member Terms as Event Host:</h3>
+ <ol>
+ <li><strong>Schedule</strong>
+ <div>Dojo resources are allocated on a first come, first serve basis. Avoid scheduling major events on the same day. Otherwise, expect an Events Coordinator to suggest an alternate time or room.</div></li>
<li><strong>Presence</strong>
- <div>{{human}} or one of your delegates must be physically present to host the entire event. Delegates must also be members of Hacker Dojo, and must be arranged prior to the event's submission. As event host, you take full responsibility for ensuring the event runs smoothly and the rules are enforced. If the event is cancelled, you are responsible for cancelling the event on this system and posting notice to all forums in which you advertised the event. <p>If you are submitting this application on behalf of someone else, you will still be held responsible.</div></li>
+ <div>{{human}} or one of your delegates must be physically present to host the entire event. Delegates must also be members of Hacker Dojo, and must be arranged prior to the event's submission. As event host, you take full responsibility for ensuring the event runs smoothly and the rules are enforced. If the event is cancelled, you are responsible for cancelling the event on this system and posting notice to all forums in which you advertised the event. <p>If you are submitting this application on behalf of someone else, you will still be held responsible.</div></li>
<li><strong>Approval</strong>
- <div>The event must be approved by Event Coordinators. We reserve the right to refuse approval of events that are not considered in the spirit of Hacker Dojo.</div></li>
+ <div>The event must be approved by Event Coordinators. We reserve the right to refuse approval of events that are not considered in the spirit of Hacker Dojo.</div></li>
<li><strong>Setup</strong>
- <div>You are responsible for your event setup. This may require setting up a day early (or at least an hour or two early!), finding projectors, moving furniture, etc.<p>In order to prepare you may book a separate event for the same space, just create a new event and select Setup Time as the event type.</div></li>
+ <div>You are responsible for your event setup. This may require setting up a day early (or at least an hour or two early!), finding projectors, moving furniture, etc.<p>In order to prepare you may book a separate event for the same space, just create a new event and select Setup Time as the event type.</div></li>
<li><strong>Parking</strong>
- <div>We have <a href="http://wiki.hackerdojo.com/Directions#Parking" target="_blank">strict parking rules</a> that you need to convey to guests. If large enough, you may need a staff member to direct parking.</div></li>
+ <div>We have <a href="http://wiki.hackerdojo.com/Directions#Parking" target="_blank">strict parking rules</a> that you need to convey to guests. If large enough, you may need a staff member to direct parking.</div></li>
<li><strong>Sign-in</strong>
- <div>We require your guests to sign in with our sign-in kiosks for liability reasons. This information also helps support the Dojo by giving insight into member conversions from your event.</div></li>
+ <div>We require your guests to sign in with our sign-in kiosks for liability reasons. This information also helps support the Dojo by giving insight into member conversions from your event.</div></li>
<li><strong>Blurb</strong>
- <div>You or another member should give an introduction to Hacker Dojo before the event starts. This may include mentioning Hacker Dojo sponsors but shouldn't be longer than a couple minutes.</div></li>
+ <div>You or another member should give an introduction to Hacker Dojo before the event starts. This may include mentioning Hacker Dojo sponsors but shouldn't be longer than a couple minutes.</div></li>
<li><strong>Cleanup</strong>
- <div>Please clean up after your event! Return it to the way you found it at the very least. Consider getting guests to pitch in.</div></li>
+ <div>Please clean up after your event! Return it to the way you found it at the very least. Consider getting guests to pitch in.</div></li>
<li><strong>Supplies</strong>
- <div>Please refill supplies consumed. If you have a large event, your guests will consume shared resources such as snacks, toilet paper and other consumables.</div></li>
+ <div>Please refill supplies consumed. If you have a large event, your guests will consume shared resources such as snacks, toilet paper and other consumables.</div></li>
<li><strong>Damages</strong>
- <div>You are held responsible for damages to Dojo facilities and equipment during your event.</div></li>
+ <div>You are held responsible for damages to Dojo facilities and equipment during your event.</div></li>
</ol>
- </div>
-
- <form method="post" style="width: 49%;">
- <h4>Event Name</h4>
- <input type="text" name="name" style="width: 300px; margin-left: 4px;" />
- <h4>When</h4>
- <table style="margin: 0px;">
- <tr>
- <td class="first"><label for="date">Date:</label>
- <input name="date" id="datepicker" readonly="readonly"/></td>
- <td><label for="start_time">Start Time:</label>
+ </div>
+
+ <form method="post" style="width: 49%;">
+ <h4>Event Name</h4>
+ <input type="text" name="name" style="width: 300px; margin-left: 4px;" />
+ <h4>When</h4>
+ <table style="margin: 0px;">
+ <tr>
+ <td class="first"><label for="date">Date:</label>
+ <input name="date" id="datepicker" readonly="readonly"/></td>
+ <td><label for="start_time">Start Time:</label>
<select name="start_time_hour">
- <option>1</option>
- <option>2</option>
- <option>3</option>
- <option>4</option>
- <option>5</option>
- <option>6</option>
- <option>7</option>
- <option>8</option>
- <option>9</option>
- <option>10</option>
- <option>11</option>
- <option>12</option>
- </select>:
- <select name="start_time_minute">
+ <option>1</option>
+ <option>2</option>
+ <option>3</option>
+ <option>4</option>
+ <option>5</option>
+ <option>6</option>
+ <option>7</option>
+ <option>8</option>
+ <option>9</option>
+ <option>10</option>
+ <option>11</option>
+ <option>12</option>
+ </select>:
+ <select name="start_time_minute">
<option>00</option>
- <option>15</option>
+ <option>15</option>
<option>30</option>
- <option>45</option>
- </select>
- <select name="start_time_ampm">
- <option>pm</option>
- <option>am</option>
+ <option>45</option>
</select>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td><label for="end_time">End Time:</label>
- <select name="end_time_hour">
- <option>1</option>
- <option>2</option>
- <option>3</option>
- <option>4</option>
- <option>5</option>
- <option>6</option>
- <option>7</option>
- <option>8</option>
- <option>9</option>
- <option>10</option>
- <option>11</option>
- <option>12</option>
- </select>:
- <select name="end_time_minute">
- <option>00</option>
- <option>15</option>
- <option>30</option>
- <option>45</option>
- </select>
- <select name="end_time_ampm">
- <option>pm</option>
- <option>am</option>
- </select>
- </td>
- </tr>
- </table>
+ <select name="start_time_ampm">
+ <option>pm</option>
+ <option>am</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><label for="end_time">End Time:</label>
+ <select name="end_time_hour">
+ <option>1</option>
+ <option>2</option>
+ <option>3</option>
+ <option>4</option>
+ <option>5</option>
+ <option>6</option>
+ <option>7</option>
+ <option>8</option>
+ <option>9</option>
+ <option>10</option>
+ <option>11</option>
+ <option>12</option>
+ </select>:
+ <select name="end_time_minute">
+ <option>00</option>
+ <option>15</option>
+ <option>30</option>
+ <option>45</option>
+ </select>
+ <select name="end_time_ampm">
+ <option>pm</option>
+ <option>am</option>
+ </select>
+ </td>
+ </tr>
+ </table>
+
<h4>Type of Event</h4>
- <table style="margin: 0px;"><tr>
- <td class="first"><label for="type">Category:</label>
- <select name="type" id="type-select" onchange="if(this.value=='Other...'){showOther();$('#type-text').focus()}">
+ <table style="margin: 0px;"><tr>
+ <td class="first"><label for="type">Category:</label>
+ <select name="type" id="type-select" onchange="if(this.value=='Other...'){showOther();$('#type-text').focus()}">
<option>Meetup</option>
<option>Hackathon</option>
<option>Conference</option>
@@ -150,41 +151,44 @@ <h3 style="margin-top: 0px;">Member Terms as Event Host:</h3>
<option>Lecture</option>
<option>Social</option>
<option>Setup Time</option>
- <option>Dojo Admin</option>
+ <option>Dojo Admin</option>
<option>Other...</option>
- </select><input type="text" id="type-text" onblur="$('#type-select').append('<option>'+this.value+'</option>');$('#type-select').val(this.value);hideOther();" style="display: none;" size="15"></td>
- <td><label for="estimated_size">Expected Size:</label>
- <input type="text" name="estimated_size" size="4" style="text-align: right;" /> <span>people</span></td>
- </tr></table>
+ </select>
+ <input type="text" id="type-text" onblur="$('#type-select').append('<option>'+this.value+'</option>');$('#type-select').val(this.value);hideOther();" style="display: none;" size="15"></td>
+ <td><label for="estimated_size">Expected Size:</label>
+ <input type="text" name="estimated_size" size="4" style="text-align: right;" /> <span>people</span></td>
+ </tr></table>
+
<h4>External Contact (if applicable)</h4>
- <table style="margin: 0px;"><tr>
- <td class="first"><label for="contact_name">Name:</label>
- <input type="text" name="contact_name" size="16" /></td>
- <td><label for="contact_phone">Phone Number:</label>
- <input type="text" name="contact_phone" size="16" /></td>
- </tr></table>
- <h4>More Info (optional)</h4>
- <table style="margin: 0px;">
- <tr><td><label for="details">Event details:</label>
- <textarea rows="5" style="width: 300px;" name="details"></textarea></td></tr>
- <tr><td><label for="url">Event URL:</label>
- <input type="text" name="url" style="width: 300px;" /></td></tr>
- <tr><td><label for="fee">Entry Fee:</label>
- <input type="text" name="fee" size="8"/> <span style="color: gray; font-size: x-small;">Leave blank if free</span></td></tr>
- <tr><td><label for="details">Requested Rooms:</label>
- <span style="font-size:10;">(Capacity in parentheses)</span><br />
- {% for room in rooms %}
- <nobr><input type="checkbox" id="room-{{room.0}}" name="rooms" value="{{room.0}}" /><label for="room-{{room.0}}">{{room.0|title}} ({{room.1}})</label></nobr>{% endfor %}
- </td></tr>
- <tr><td style="padding-top: 8px;"><label for="details">Special notes:</label>
- <textarea rows="3" style="width: 300px;" name="notes"></textarea></td></tr>
- </tr></table>
- <p style="font-size:smaller;">You have 30 days for approval before your event application expires. The primary bottleneck to quick approval is getting staff to opt in. You will be notified either way.</p>
- <p style="font-size:smaller; font-weight: bold;">By submitting this event, you agree to the responsibilities listed to the right.</p>
- <input type="submit" value="I agree, submit event for approval" style="font-size: larger; margin: 5px;" />
- </form>
+ <table style="margin: 0px;"><tr>
+ <td class="first"><label for="contact_name">Name:</label>
+ <input type="text" name="contact_name" size="16" /></td>
+ <td><label for="contact_phone">Phone Number:</label>
+ <input type="text" name="contact_phone" size="16" /></td>
+ </tr></table>
-</div>
+ <h4>More Info (optional)</h4>
+ <table style="margin: 0px;">
+ <tr><td><label for="details">Event details:</label>
+ <textarea rows="5" style="width: 300px;" name="details"></textarea></td></tr>
+ <tr><td><label for="url">Event URL:</label>
+ <input type="text" name="url" style="width: 300px;" /></td></tr>
+ <tr><td><label for="fee">Entry Fee:</label>
+ <input type="text" name="fee" size="8"/> <span style="color: gray; font-size: x-small;">Leave blank if free</span></td></tr>
+ <tr><td><label for="details">Requested Rooms:</label>
+ <span style="font-size:10;">(Capacity in parentheses)</span><br />
+ {% for room in rooms %}
+ <nobr><input type="checkbox" id="room-{{room.0}}" name="rooms" value="{{room.0}}" /><label for="room-{{room.0}}">{{room.0|title}} ({{room.1}})</label></nobr>{% endfor %}
+ </td></tr>
+ <tr><td style="padding-top: 8px;"><label for="details">Special notes:</label>
+ <textarea rows="3" style="width: 300px;" name="notes"></textarea></td></tr>
+ </tr></table>
+
+ <p style="font-size:smaller;">You have 30 days for approval before your event application expires. The primary bottleneck to quick approval is getting staff to opt in. You will be notified either way.</p>
+ <p style="font-size:smaller; font-weight: bold;">By submitting this event, you agree to the responsibilities listed to the right.</p>
+ <input type="submit" value="I agree, submit event for approval" style="font-size: larger; margin: 5px;" />
+ </form>
+</div>
{% endblock %}
View
12 templates/past.html
@@ -2,18 +2,18 @@
{% block content %}
<div id="primary">
- <h3>Past Events</h3>
- <a href="/" style="font-size: smaller; margin-top: -20px; display: block;">&larr; Upcoming Events</a>
+ <h3>Past Events</h3>
+ <a href="/" style="font-size: smaller; margin-top: -20px; display: block;">&larr; Upcoming Events</a>
- {% regroup events by start_date as grouped_events %}
- {% for events in grouped_events %}
+ {% regroup events by start_date as grouped_events %}
+ {% for events in grouped_events %}
<h4>{% ifequal events.grouper today.date %}<span style="text-decoration:underline;">Today</span> - {% endifequal %}{{events.grouper|date:"l, F j"}}</h4>
<table>
{% for event in events.list %}
- {% include 'list_event.html' %}
+ {% include 'list_event.html' %}
{% endfor %}
</table>
- {% endfor %}
+ {% endfor %}
</div>
View
22 templates/pending.html
@@ -3,16 +3,16 @@
{% include 'nav_menu.html' %}
<div id="primary">
- <h3>Pending Events</h3>
- {% regroup events by start_date as grouped_events %}
- {% for events in grouped_events %}
- <h4>{% ifequal events.grouper today.date %}<span style="text-decoration:underline;">Today</span> - {% endifequal %}{% ifequal events.grouper tomorrow.date %}<span style="text-decoration:underline;">Tomorrow</span> - {% endifequal %}{{events.grouper|date:"l, F j"}}</h4>
- <table>
- {% for event in events.list %}
- {% include 'list_event.html' %}
- {% endfor %}
- </table>
- {% endfor %}
+ <h3>Pending Events</h3>
+ {% regroup events by start_date as grouped_events %}
+ {% for events in grouped_events %}
+ <h4>{% ifequal events.grouper today.date %}<span style="text-decoration:underline;">Today</span> - {% endifequal %}{% ifequal events.grouper tomorrow.date %}<span style="text-decoration:underline;">Tomorrow</span> - {% endifequal %}{{events.grouper|date:"l, F j"}}</h4>
+ <table>
+ {% for event in events.list %}
+ {% include 'list_event.html' %}
+ {% endfor %}
+ </table>
+ {% endfor %}
</div>
-{% endblock %}
+{% endblock %}
Something went wrong with that request. Please try again.