make nav menu into filter, move new event link to top, make all event…

…s nav link only to logged in users
billward · Dec 4, 2010 · 64ccc02 · 64ccc02
1 parent 762b604
commit 64ccc02
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 7 deletions.
diff --git a/main.py b/main.py
@@ -72,6 +72,8 @@ def post(self):
 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)
         if format == 'ics':
             cal = Calendar()
             for event in events:
@@ -106,6 +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)
         access_rights = UserRights(user, event)
         if access_rights.can_edit:
             logout_url = users.create_logout_url('/')            
@@ -178,6 +181,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)
             event.notes = db.Text(event.notes.replace('\n','<br/>'))
             self.response.out.write(template.render('templates/event.html', locals()))
 
@@ -215,6 +219,7 @@ def get(self):
         else:
             login_url = users.create_login_url('/')
         today = local_today()
+        show_all_nav = (user.nickname)
         events = Event.get_approved_list()
         tomorrow = today + timedelta(days=1)
         whichbase = 'base.html'
@@ -232,6 +237,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)
         today = local_today()
         tomorrow = today + timedelta(days=1)
         self.response.out.write(template.render('templates/myevents.html', locals()))
@@ -245,6 +251,7 @@ def get(self):
         else:
             login_url = users.create_login_url('/')
         today = local_today()
+        show_all_nav = (user.nickname)
         events = Event.all().filter('start_time < ', today).order('-start_time')
         self.response.out.write(template.render('templates/past.html', locals()))
 
@@ -263,6 +270,7 @@ def get(self):
             logout_url = users.create_logout_url('/')
         else:
             login_url = users.create_login_url('/')
+        show_all_nav = (user.nickname)
         events = Event.get_all_future_list()
         today = local_today()
         tomorrow = today + timedelta(days=1)
@@ -277,6 +285,7 @@ def get(self):
         else:
             login_url = users.create_login_url('/')
         events = Event.get_pending_list()
+        show_all_nav = (user.nickname)
         today = local_today()
         tomorrow = today + timedelta(days=1)
         self.response.out.write(template.render('templates/pending.html', locals()))

diff --git a/static/js/hd-events.js b/static/js/hd-events.js
@@ -3,7 +3,7 @@ var rounder = function(elem, sz, allBrowsers) {
   DD_roundies.addRule(elem, sz.toString()+'px', allBrowsers);
 }
 $(function() {
-  var rndrs = ['#primary'];
+  var rndrs = ['#primary', '#new-event-link'];
   for(r in rndrs) {
     rounder(rndrs[r], 8, true);
   }

diff --git a/static/style.css b/static/style.css
@@ -1,5 +1,5 @@
 body { font-family: Verdana,Arial,sans-serif; margin: 0px;}
-#wrapper { margin-left: auto; margin-right: auto; width: 700px; }
+#wrapper { margin-left: auto; margin-right: auto; width: 700px; position: relative;}
 
 #top a:visited { color: blue;}
 #top { height: 20px; border-bottom: 1px solid #ccc; text-align: right; font-size: 12px; padding-right: 5px; padding-top: 4px; }
@@ -8,6 +8,8 @@ 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: 10px; padding: 3px 5px; background-color:#d50025;}
+#new-event-link a {color: #fff; text-decoration: none;}
 
 .step span { color: white; background-color: #b10026; padding: 1px; padding-left: 4px; padding-right: 4px;}
 .step.inactive span { background-color: gray;}
@@ -49,6 +51,8 @@ h4 { font-size: smaller; }
 
 .room-listing {font-size: 90%;}
 
+.clearer {clear: both;}
+
 /* for DatePicker widget */
 a.dp-choose-date {
 	float: left;

diff --git a/templates/approved.html b/templates/approved.html
@@ -18,7 +18,7 @@ <h4>{% ifequal events.grouper today.date %}<span style="text-decoration:underlin
 		<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> | JSON</p>
+    <p style="font-size: x-small;">Alternative formats: <a href="/events.ics">iCal</a> | <a href="/events.rss">RSS</a> | JSON</p>
 
 </div>
 

diff --git a/templates/base.html b/templates/base.html
@@ -15,13 +15,14 @@
 	<body>
 		<div id="top">
 			{% if user %}
-			<span><strong>{{user.email}}</strong> | <a href="/myevents">My Events</a> | <a href="{{logout_url}}">Logout</a></span>
+				<span><strong>{{user.email}}</strong> | <a href="/myevents">My Events</a> | <a href="{{logout_url}}">Logout</a></span>
 			{% else %}
-			<span><a style="font-weight: bold;" href="{{login_url}}">Login</a> | <a href="http://signup.hackerdojo.com/upgrade/needaccount">Need an account?</a></span>
+				<span><a style="font-weight: bold;" href="{{login_url}}">Login</a> | <a href="http://signup.hackerdojo.com/upgrade/needaccount">Need an account?</a></span>
 			{% endif %}
 		</div>
 		<div id="wrapper">
 			<div id="header">
+				<span id='new-event-link'><a href="/new" id="nav_new" class="emph">New Event</a></span>
 				<img src="/static/dojo_icon.png" style="float: left;" />
 				<h1>Events</h1>
 				<h2 style="font-size: x-large;">at Hacker Dojo</h2>

diff --git a/templates/event.html b/templates/event.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% block content %}
-{% include 'nav_menu.html' %}
 
 <div id="primary">
     <h3>{{event.name|title}}</h3>

diff --git a/templates/nav_menu.html b/templates/nav_menu.html
@@ -1,3 +1,3 @@
 <div id="menu">
-	<a href="/" id="nav_approved">Approved</a> | <a href="/all_future" id="nav_all_future">All Future</a> | <a href="/pending" id="nav_pending">Pending</a> | <a href="/new" id="nav_new" class="emph">New Event</a>
+	<strong>Filter:</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>