Browse files

Bug fixes & UI

  • Loading branch information...
1 parent 24616dc commit 736390e19322b5fd61bb933911025085dbb28111 @dustball dustball committed Dec 10, 2010
Showing with 13 additions and 15 deletions.
  1. +9 −9 main.py
  2. +1 −1 static/style.css
  3. +1 −1 templates/base.html
  4. +0 −1 templates/myevents.html
  5. +2 −3 templates/new.html
View
18 main.py
@@ -73,7 +73,7 @@ class EventsHandler(webapp.RequestHandler):
def get(self, format):
events = Event.all().filter('status IN', ['approved', 'canceled']).order('start_time')
access_rights = UserRights(user, event)
- show_all_nav = (user.nickname)
+ show_all_nav = user
if format == 'ics':
cal = Calendar()
for event in events:
@@ -108,7 +108,7 @@ class EditHandler(webapp.RequestHandler):
def get(self, id):
event = Event.get_by_id(int(id))
user = users.get_current_user()
- show_all_nav = (user.nickname)
+ show_all_nav = user
access_rights = UserRights(user, event)
if access_rights.can_edit:
logout_url = users.create_logout_url('/')
@@ -183,7 +183,7 @@ def get(self, id):
else:
login_url = users.create_login_url('/')
event.details = db.Text(event.details.replace('\n','<br/>'))
- show_all_nav = (user.nickname)
+ show_all_nav = user
event.notes = db.Text(event.notes.replace('\n','<br/>'))
self.response.out.write(template.render('templates/event.html', locals()))
@@ -232,7 +232,7 @@ def get(self):
else:
login_url = users.create_login_url('/')
today = local_today()
- show_all_nav = (user.nickname)
+ show_all_nav = user
events = Event.get_approved_list()
tomorrow = today + timedelta(days=1)
whichbase = 'base.html'
@@ -250,7 +250,7 @@ def get(self):
else:
login_url = users.create_login_url('/')
events = Event.all().filter('member = ', user).order('start_time')
- show_all_nav = (user.nickname)
+ show_all_nav = user
today = local_today()
tomorrow = today + timedelta(days=1)
self.response.out.write(template.render('templates/myevents.html', locals()))
@@ -264,7 +264,7 @@ def get(self):
else:
login_url = users.create_login_url('/')
today = local_today()
- show_all_nav = (user.nickname)
+ show_all_nav = user
events = Event.all().filter('start_time < ', today).order('-start_time')
self.response.out.write(template.render('templates/past.html', locals()))
@@ -283,7 +283,7 @@ def get(self):
logout_url = users.create_logout_url('/')
else:
login_url = users.create_login_url('/')
- show_all_nav = (user.nickname)
+ show_all_nav = user
events = Event.get_all_future_list()
today = local_today()
tomorrow = today + timedelta(days=1)
@@ -298,7 +298,7 @@ def get(self):
else:
login_url = users.create_login_url('/')
events = Event.get_pending_list()
- show_all_nav = (user.nickname)
+ show_all_nav = user
today = local_today()
tomorrow = today + timedelta(days=1)
self.response.out.write(template.render('templates/pending.html', locals()))
@@ -399,7 +399,7 @@ def get(self):
logout_url = users.create_logout_url('/')
else:
login_url = users.create_login_url('/')
- show_all_nav = (user.nickname)
+ show_all_nav = user
self.response.out.write(template.render('templates/logs.html', locals()))
class FeedbackHandler(webapp.RequestHandler):
View
2 static/style.css
@@ -8,7 +8,7 @@ body { font-family: Verdana,Arial,sans-serif; margin: 0px;}
#header img { margin-right: 10px;}
#header h1 { font-size: 42px; margin-top: 20px; padding-top: 10px; margin-bottom: 0px; padding-bottom: 0px;}
#header h2 { font-size: x-large; margin: 0px; }
-#new-event-link {position: absolute; right: 0px; padding: 3px 5px; background-color:#d50025;}
+#new-event-link {position: absolute; right: 0px; padding: 2px 2px; background-color:#d50025;}
#new-event-link a {color: #fff; text-decoration: none;}
body.new #new-event-link {display: none;}
View
2 templates/base.html
@@ -24,7 +24,7 @@
</div>
<div id="wrapper">
<div id="header">
- <span id='new-event-link'><form action="/new" method="get"><button type="submit" id="nav_new" class="emph">New Event</button></form></span>
+ <form action="/new" method="get"><div id='new-event-link'><button type="submit" id="nav_new" class="emph">New Event</button></div></form>
<img src="/static/dojo_icon.png" style="float: left;" />
<h1>Events</h1>
<h2 style="font-size: x-large;">at Hacker Dojo</h2>
View
1 templates/myevents.html
@@ -1,6 +1,5 @@
{% extends 'base.html' %}
{% block content %}
-{% include 'nav_menu.html' %}
<div id="primary">
<h3>My Events</h3>
View
5 templates/new.html
@@ -41,12 +41,11 @@
$('#type-select').css('display','inline');$('#type-text').css('display','none');
}
</script>
-{% include 'nav_menu.html' %}
<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.</div>
+ <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">
@@ -55,7 +54,7 @@ <h3 style="margin-top: 0px;">Member Terms as Event Host:</h3>
<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}} must be physically present for the event. You need to be there to ensure the event runs smoothly and the rules are enforced. If the event is cancelled, you are responsible for cancelling the event on this system.<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>
<li><strong>Setup</strong>

0 comments on commit 736390e

Please sign in to comment.