@@ -9,4 +9,7 @@ easier commuting commute (maybe other cities later?)</p> <p><strong>yourmuni</strong> is currently totally in beta, so expect things to be broken frequently :)</p> -{% endblock %} \ No newline at end of file +<h2>Instant Lookup</h2> +{{ list }} + +{% endblock %} tpl/splash.html @@ -18,4 +18,6 @@ home {% endfor %} </ul> -{% endblock %} \ No newline at end of file +<h2>Instant Lookup</h2> +{{ list }} +{% endblock %} tpl/user/home.html @@ -1,29 +1,47 @@ from google.appengine.api import users from django.shortcuts import render_to_response from django.http import HttpResponseRedirect +from django.template import loader, Context from models import * from forms import * import google.appengine.ext.db import nextbus from shared import userRequired, render_with_user +from nextbus.views import getDefaultRegion, getDefaultAgency + defaultSource='nb' def getDefaultSource(): """return the default source site for user (nextbus for now)""" return defaultSource -def home(r): +def home(r): + re = getDefaultRegion() + agency = getDefaultAgency() user = users.get_current_user() + data = nextbus.getRoutes(agency) + prefix = '/nb/catchstop/%s/%s' % (re, agency) + instructions = 'pick a route' + items = [] + if not (data): + pass + for key, value in data: + items.append({'url_piece': key, 'title': value}) + + t = loader.get_template('listoflinks.html') + c = Context({ 'items':items, 'prefix': prefix }) + items_t = t.render(c) + if (user): q = db.Query(Bmark) q.filter('user = ', user) bmarks = q.fetch(limit=200) links = [ { 'url':'/addbmark', 'title':'add a bookmark' } ] - param = { 'bmarks': bmarks, 'links': links } + param = { 'bmarks': bmarks, 'links': links, 'list': items_t } return render_with_user('user/home.html', param) else: - return render_to_response('splash.html'); + return render_to_response('splash.html', { 'list': items_t }); def login(r): return HttpResponseRedirect(users.create_login_url('/')) views.py 00bae8be014628b79a4e017b0619074fa3a584d3 mihasya m@mihasya.com http://github.com/mihasya/yourmuni/commit/dad5371a0efcb52fd0f98c69c44ba7cac28101be dad5371a0efcb52fd0f98c69c44ba7cac28101be 2009-01-27T19:13:12-08:00 2009-01-27T19:13:12-08:00 instant lookup now on homepage for both authed and non-authed users aaba0b3c3038acdb88d1070b12453d27219bb188 mihasya m@mihasya.com