Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Integrate 08 changes from Juri

  • Loading branch information...
commit 86051007e59b6718c6a5e12a832f209498962c28 2 parents 4450c1e + eaa5f63
@johnf johnf authored
Showing with 274 additions and 523 deletions.
  1. +12 −0 CHANGES
  2. +1 −0  COPYING
  3. +2 −0  TODO
  4. +1 −1  setup.py
  5. +2 −0  test.ini
  6. +3 −0  zookeepr.egg-info/paste_deploy_config.ini_tmpl
  7. +0 −30 zookeepr/config.ini
  8. +0 −4 zookeepr/config/routing.py
  9. +1 −1  zookeepr/config/wikiconfig.py
  10. +0 −13 zookeepr/controllers/about.py
  11. +1 −1  zookeepr/controllers/account.py
  12. +2 −1  zookeepr/controllers/cfp.py
  13. +0 −2  zookeepr/controllers/profile.py
  14. +1 −2  zookeepr/controllers/registration.py
  15. +11 −0 zookeepr/lib/helpers.py
  16. +11 −4 zookeepr/lib/wiki.py
  17. BIN  zookeepr/public/favicon.png
  18. +0 −199 zookeepr/public/lca2007.css
  19. BIN  zookeepr/public/mel8-logo.png
  20. +0 −2  zookeepr/public/print.css
  21. +204 −3 zookeepr/public/zookeepr.css
  22. +0 −29 zookeepr/templates/about/contact.myt
  23. +0 −59 zookeepr/templates/about/index.myt
  24. +0 −39 zookeepr/templates/about/openday.myt
  25. +0 −35 zookeepr/templates/about/partners.myt
  26. +0 −29 zookeepr/templates/about/press.myt
  27. +0 −15 zookeepr/templates/about/programme.myt
  28. +0 −7 zookeepr/templates/about/sponsors.myt
  29. +0 −7 zookeepr/templates/about/sydney.myt
  30. +1 −1  zookeepr/templates/account/expired.myt
  31. +1 −1  zookeepr/templates/account/in_progress.myt
  32. +1 −1  zookeepr/templates/account/password_confirmation_sent.myt
  33. +1 −1  zookeepr/templates/account/thankyou.myt
  34. +3 −3 zookeepr/templates/autohandler
  35. +1 −1  zookeepr/templates/cfp/thankyou.myt
  36. +1 −1  zookeepr/templates/error/500.myt
  37. +4 −8 zookeepr/templates/header.myt
  38. +1 −1  zookeepr/templates/openday/new.myt
  39. +1 −1  zookeepr/templates/payment/view.myt
  40. +1 −1  zookeepr/templates/registration/new.myt
  41. +1 −1  zookeepr/templates/registration/thankyou.myt
  42. +0 −11 zookeepr/tests/functional/test_about.py
  43. +1 −1  zookeepr/tests/functional/test_account.py
  44. +4 −1 zookeepr/tests/functional/test_profile.py
  45. +0 −6 zookeepr/tests/functional/test_routing.py
View
12 CHANGES
@@ -1,6 +1,18 @@
Changes for Zookeepr
====================
+0.3.19
+------
+
+ * Added license info (Jiri Baum)
+ * Added mel8 logos (Jiri Baum)
+ * Remove deprecated about controller (Jiri Baum)
+ * Integrated lca200[78].css (John Ferlito)
+ * Removed config.ini (John Ferlito)
+ * Added contact email address into config (Jiri Baum)
+ * Wiki UTF8 Fix (Jiri Baum)
+ * Bump version
+
0.3.18
------
View
1  COPYING
@@ -0,0 +1 @@
+Zookeepr is licensed under the GNU GPL version 2 only.
View
2  TODO
@@ -27,3 +27,5 @@ displayname can't be 'new', can't be all numbers, must be urlable, hsouldnt have
* When someone registers we should generate an invoice
* It should be due in two weeks
* If they don't pay in two weeks they loose there accomodation and it goes back into the pool
+
+ * Generalise templates so they aren't lca specific. Move stuff into a config file eg conference name
View
2  setup.py
@@ -2,7 +2,7 @@
setup(
name='zookeepr',
- version="0.3.18",
+ version="0.3.19",
#description="",
#author="",
#author_email="",
View
2  test.ini
@@ -29,6 +29,8 @@ dynamic_html_dir = %(here)s/dynamic_html
commsecure_secret = foo
commsecure_merchantid = bar
+contact_email = contact@yourdomain.com
+
# We're using SQLAlchemy, the database is initialised in
# `Globals.__init__()`, and connected to per thread/request in
# `BaseController.__call__()`. Note the URL syntax depends
View
3  zookeepr.egg-info/paste_deploy_config.ini_tmpl
@@ -40,3 +40,6 @@ dburi = sqlite://filename=%(here)s/somedb.db
# and a shared secret
commsecure_merchantid = TestZookeeprMerchantID
commsecure_secret = zing
+
+# Contact email for the committee
+contact_email = contact@yourdomain.com
View
30 zookeepr/config.ini
@@ -1,30 +0,0 @@
-[DEFAULT]
-debug = true
-email_to = you@yourdomain.com
-smtp_server = localhost
-error_email_from = paste@exceptions.com
-
-[server:main]
-use = egg:PasteScript#wsgiutils
-host = 0.0.0.0
-port = 5000
-
-[app:main]
-use = egg:zookeepr
-cache_dir = %(here)s/cache
-app_instance_uuid = {aa5109d1-b668-4a21-9a70-ad15316b1b38}
-session_key = zookeepr
-session_secret = +faGdXY9RZsRRGe0phmwcn7ID
-
-# We're using SQLAlchemy, the database is initialised in
-# `Globals.__init__()`, and connected to per thread/request in
-# `BaseController.__call__()`. Note the URL syntax depends
-# on the SQLAlchemy documentation for `global_connect`.
-dburi = sqlite://filename=%(here)s/somedb.db
-
-# Do not set debug to true or uncomment the line below
-# on a production environment otherwise in the event of
-# an error occurring the visitor will be presented with
-# interactive debugging tools and these could be used to
-# execute malicious code.
-set debug = false
View
4 zookeepr/config/routing.py
@@ -43,10 +43,6 @@ def make_map():
m.connect('/account/:action', controller='account')
m.connect('/account/reset_password/:url_hash', controller='account', action='reset_password')
- # special case for the about controller
- m.connect('/about/', controller='about', action='view', id='index')
- m.connect('/about/:id', controller='about', action='view')
-
# OpenDay
m.connect('openday', '/OpenDay', controller='openday', action='new')
m.connect('/Openday', controller='openday', action='new')
View
2  zookeepr/config/wikiconfig.py
@@ -38,7 +38,7 @@ class Config(DefaultConfig):
# Wiki identity ----------------------------------------------------
# Site name, used by default for wiki name-logo [Unicode]
- sitename = u'linux.conf.au 2007'
+ sitename = u'linux.conf.au 2008'
# Wiki logo. You can use an image, text or both. [Unicode]
# For no logo or text, use '' - the default is to show the sitename.
View
13 zookeepr/controllers/about.py
@@ -1,13 +0,0 @@
-from zookeepr.lib.base import *
-
-class AboutController(BaseController):
- """Display information about a specific part of the conference.
- """
- def view(self, id):
- """View the information.
-
- ``view`` is the primary action associated with this controller.
- It does no processing of information, only returns a response
- from the templates.
- """
- return render_response("about/%s.myt" % id)
View
2  zookeepr/controllers/account.py
@@ -273,7 +273,7 @@ def new(self):
# generate welcome message
body = render('account/new_account_email.myt',
fragment=True)
- s.sendmail("seven-contact@lca2007.linux.org.au",
+ s.sendmail(request.environ['paste.config']['app_conf'].get('contact_email'),
c.person.email_address,
body)
s.quit()
View
3  zookeepr/controllers/cfp.py
@@ -64,7 +64,8 @@ def submit(self):
s = smtplib.SMTP(request.environ['paste.config']['app_conf'].get('app_smtp_server'))
# generate the message from a template
body = render('cfp/submission_response.myt', id=c.registration.url_hash, fragment=True)
- s.sendmail("seven-contact@lca2007.linux.org.au", c.registration.email_address, body)
+ s.sendmail(request.environ['paste.config']['app_conf'].get('contact_email'),
+ c.registration.email_address, body)
s.quit()
return render_response('cfp/thankyou.myt')
View
2  zookeepr/controllers/profile.py
@@ -31,5 +31,3 @@ def view(self):
return super(ProfileController, self).view()
-
-
View
3  zookeepr/controllers/registration.py
@@ -153,7 +153,6 @@ class RegistrationController(BaseController, Create, Update, List):
permissions = { 'remind': [AuthRole('organiser')],
}
-
def is_same_person(self):
return c.signed_in_person == c.registration.person
@@ -212,7 +211,7 @@ def new(self):
try:
s = smtplib.SMTP(request.environ['paste.config']['app_conf'].get('app_smtp_server'))
body = render('registration/response.myt', id=c.person.url_hash, fragment=True)
- s.sendmail("seven-contact@lca2007.linux.org.au", c.person.email_address, body)
+ s.sendmail(request.environ['paste.config']['app_conf'].get('contact_email'), c.person.email_address, body)
s.quit()
except:
pass
View
11 zookeepr/lib/helpers.py
@@ -72,3 +72,14 @@ def radio(name, value, label=None):
else:
lab = '<label for="%s">%s</label>' % (id_str, label)
return i + lab
+
+def contact_email(text=None):
+ """ E-mail link for the conference contact.
+
+ Renders a link to the committee; optionally takes a text, which will be
+ the text of the anchor (defaults to the e-mail address).
+ """
+ email = request_config().environ['paste.config']['app_conf']['contact_email']
+ if text==None:
+ text = '<tt>'+email+'</tt>'
+ return '<a href="mailto:'+email+'">'+text+'</a>'
View
15 zookeepr/lib/wiki.py
@@ -65,7 +65,10 @@ def get_wiki_response(request, start_response):
moinReq.run()
start_response(moinReq.status, moinReq.headers)
dbsession.close()
- return [moinReq.output()]
+ res = ''.join(moinReq.output())
+ if type(res)==str:
+ res = res.decode('utf8', 'replace')
+ return res
def wiki_here():
from zookeepr.lib.base import request
@@ -73,7 +76,7 @@ def start_response(status, headers, exc_info=None):
pass
try:
- wiki_content = ''.join(get_wiki_response(request, start_response))
+ wiki_content = get_wiki_response(request, start_response)
match = cleaner_regexp.search(wiki_content)
if match:
return match.groups()[0]
@@ -87,9 +90,13 @@ def start_response(status, headers, exc_info=None):
pass
request.environ['PATH_INFO'] = '/' + page_name
- soup = BeautifulSoup(''.join(get_wiki_response(request, start_response)))
+ soup = BeautifulSoup(get_wiki_response(request, start_response))
try:
- content = soup.findAll('div', id='content')[0]
+ content = soup.findAll('div', id='content')
+ if len(content)==0:
+ content = '(no content)'
+ else:
+ content = content[0]
return '<div class="wiki">\n%s\n</div>' % (content,)
except IndexError:
print "soup is: %r" % (soup.prettify(),)
View
BIN  zookeepr/public/favicon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
199 zookeepr/public/lca2007.css
@@ -1,199 +0,0 @@
-body {
- max-width: 760px !important;
- width: 760px !important;
-}
-
-ul li {
- list-style: disc;
-}
-
-#body {
- margin: 0 !important;
-}
-
-#header {
- position: relative;
-}
-
-#header h2 {
- position: absolute;
- bottom: 0;
- right: 0;
- font-size: medium;
- font-weight: bold;
- text-transform: none;
- text-align: right;
- color: #a04700;
-}
-
-#menus {
- width: 50%;
- right: 0 !important;
-}
-
-#secondarymenu, #locationline, p.table-of-contents-heading {
- display: none;
-}
-
-#flickr {
- text-align: center;
- padding: 0 !important;
- margin: 0 !important;
-}
-
-#flickr a img {
- padding: 2px !important;
- margin: 0 1px 0 1px !important;
- border: 1px solid #cccccc;
-}
-
-#flickr a:hover img {
- padding: 0 !important;
- border: 3px solid #cccccc;
-}
-
-table.regologo {
- float: right;
- border: 0;
- padding: 0 0 1em 1em;
-}
-
-div.inner ul {
- margin: 0;
- padding: 0;
-}
-
-div.inner ul li ul {
- margin-left: 1em;
-}
-
-div.planet {
- background-color: #eeeeee;
- padding: 1em;
- -moz-border-radius: 1em;
-}
-
-div.planet div.feeds {
- margin: 1em 0 0 0;
- font-weight: bold;
- text-align: right;
-}
-
-div.planet li img {
- vertical-align: middle;
-}
-
-div.planet a {
- text-decoration: none;
-}
-
-div.planet h3 {
- margin-top: 0 !important;
-}
-
-/* headings */
-
-h2, h3, h4 {
- color: #ce5c00 !important;
- margin: 1.5em 0 1em 0 !important;
-}
-
-/* programme */
-
-table tr td p {
- margin: 0;
-}
-
-table.programme {
- border-collapse: collapse;
- border: 1px solid #cccccc;
- width: 100%;
-}
-table.programme td {
- border: 1px solid #cccccc;
- padding: 0.5em;
- font-size: small;
-}
-tr.rooms td {
- font-weight: bold;
- text-align: center;
-}
-td.deepkernel { background-color: #FFFFCC; }
-td.programmer { background-color: #FFEECC; }
-td.sysadmin { background-color: #CCFFFF; }
-td.widekernel { background-color: #CCFFCC; }
-td.coolshit { background-color: #FFCCFF; }
-td.userexperience { background-color: #FFCCCC; }
-td.freeculture { background-color: #CCCCFF; }
-td.tutorial { background-color: #EEEEEE; }
-
-#body.planet {
- position: relative;
- background: transparent;
- padding: 0 !important;
-}
-
-#body.planet div.channelgroup, #body.planet div.entrygroup {
- margin-left: 2em;
- margin-right: 2em;
-}
-
-#body.planet div.entry p.date {
- text-align: right;
-}
-
-#body.planet h3 {
- vertical-align: middle;
- background-color: #eeeeee;
- -moz-border-radius: 0.5em;
- padding: 0.5em;
- width: 40%;
-}
-
-#body.planet h4 {
- text-transform: none;
-}
-
-#body.planet img.face {
- float: left;
- margin-right: 0.5em;
-}
-
-#sidebar {
- float: right;
- width: 140px;
- padding: 1em 1em 0 1em;
- margin: 0 0 2em 2em;
- border: 0;
- -moz-border-radius: 1em;
- background-color: #eeeeee;
-}
-
-#sidebar div.section {
- margin-bottom: 1em;
-}
-
-#sidebar h3 {
- text-transform: none;
- margin: 0 0 0.5em 0 !important;
- padding: 0;
-}
-
-#sidebar ul {
- padding-left: 0;
-}
-
-#sidebar ul li a {
- color: black;
- text-decoration: underline;
-}
-
-/**
- * columns
-#column-a {
- width: 65% !important;
-}
-#column-b {
- margin-left: 67% !important;
-}
- */
View
BIN  zookeepr/public/mel8-logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
2  zookeepr/public/print.css
@@ -2,8 +2,6 @@
* layout
*/
-@import url("/lca2007.css");
-
@import url("/zookeepr.css");
#menus {
View
207 zookeepr/public/zookeepr.css
@@ -2,9 +2,211 @@
* layout
*/
-@import url("/lca2007.css");
body {
+ max-width: 760px !important;
+ width: 760px !important;
+}
+
+ul li {
+ list-style: disc;
+}
+
+#body {
+ margin: 0 !important;
+}
+
+#header {
+ position: relative;
+}
+
+#header h1 {
+ text-align: right;
+}
+#header h2 {
+ position: absolute;
+ bottom: 0;
+ right: 190px;
+ font-size: medium;
+ font-weight: bold;
+ text-transform: none;
+ text-align: right;
+ /* color: #a04700; */
+}
+
+#menus {
+ width: 50%;
+ position: absolute;
+ left: 0px;
+}
+
+/* #secondarymenu, */ #locationline, p.table-of-contents-heading {
+ display: none;
+}
+
+#flickr {
+ text-align: center;
+ padding: 0 !important;
+ margin: 0 !important;
+}
+
+#flickr a img {
+ padding: 2px !important;
+ margin: 0 1px 0 1px !important;
+ border: 1px solid #cccccc;
+}
+
+#flickr a:hover img {
+ padding: 0 !important;
+ border: 3px solid #cccccc;
+}
+
+table.regologo {
+ float: right;
+ border: 0;
+ padding: 0 0 1em 1em;
+}
+
+div.inner ul {
+ margin: 0;
+ padding: 0;
+}
+
+div.inner ul li ul {
+ margin-left: 1em;
+}
+
+div.planet {
+ background-color: #eeeeee;
+ padding: 1em;
+ -moz-border-radius: 1em;
+}
+
+div.planet div.feeds {
+ margin: 1em 0 0 0;
+ font-weight: bold;
+ text-align: right;
+}
+
+div.planet li img {
+ vertical-align: middle;
+}
+
+div.planet a {
+ text-decoration: none;
+}
+
+div.planet h3 {
+ margin-top: 0 !important;
+}
+
+/* headings */
+
+h2, h3, h4 {
+ /* color: #ce5c00 !important; */
+ margin: 1.5em 0 1em 0 !important;
+}
+
+/* programme */
+
+table tr td p {
+ margin: 0;
+}
+
+table.programme {
+ border-collapse: collapse;
+ border: 1px solid #cccccc;
+ width: 100%;
+}
+table.programme td {
+ border: 1px solid #cccccc;
+ padding: 0.5em;
+ font-size: small;
+}
+tr.rooms td {
+ font-weight: bold;
+ text-align: center;
+}
+td.deepkernel { background-color: #FFFFCC; }
+td.programmer { background-color: #FFEECC; }
+td.sysadmin { background-color: #CCFFFF; }
+td.widekernel { background-color: #CCFFCC; }
+td.coolshit { background-color: #FFCCFF; }
+td.userexperience { background-color: #FFCCCC; }
+td.freeculture { background-color: #CCCCFF; }
+td.tutorial { background-color: #EEEEEE; }
+
+#body.planet {
+ position: relative;
+ background: transparent;
+ padding: 0 !important;
+}
+
+#body.planet div.channelgroup, #body.planet div.entrygroup {
+ margin-left: 2em;
+ margin-right: 2em;
+}
+
+#body.planet div.entry p.date {
+ text-align: right;
+}
+
+#body.planet h3 {
+ vertical-align: middle;
+ background-color: #eeeeee;
+ -moz-border-radius: 0.5em;
+ padding: 0.5em;
+ width: 40%;
+}
+
+#body.planet h4 {
+ text-transform: none;
+}
+
+#body.planet img.face {
+ float: left;
+ margin-right: 0.5em;
+}
+
+#sidebar {
+ float: right;
+ width: 140px;
+ padding: 1em 1em 0 1em;
+ margin: 0 0 2em 2em;
+ border: 0;
+ -moz-border-radius: 1em;
+ background-color: #eeeeee;
+}
+
+#sidebar div.section {
+ margin-bottom: 1em;
+}
+
+#sidebar h3 {
+ text-transform: none;
+ margin: 0 0 0.5em 0 !important;
+ padding: 0;
+}
+
+#sidebar ul {
+ padding-left: 0;
+}
+
+#sidebar ul li a {
+ color: black;
+ text-decoration: underline;
+}
+
+/**
+ * columns
+#column-a {
+ width: 65% !important;
+}
+#column-b {
+ margin-left: 67% !important;
+}
+ */
+body {
font-family: sans-serif;
color: #333;
background: url("/greydient-top.png") top left repeat-x white;
@@ -25,7 +227,7 @@ body {
#menus {
position: absolute;
top: 20px;
- right: 20px;
+ /* right: 20px; */
}
#body {
@@ -426,4 +628,3 @@ table.rego td.non {
text-align: center;
}
-
View
29 zookeepr/templates/about/contact.myt
@@ -1,29 +0,0 @@
-<h2>Contact Us</h2>
-
-<p><strong>Contact us</strong> at <a href="mailto:seven-contact@lca2007.linux.org.au">seven-contact@lca2007.linux.org.au</a> for <em>all</em> your linux.conf.au 2007 inquiries and the appropriate person will be in contact with you.
-</p>
-
-<p>
-You can also <strong>join</strong> the <a href="http://lists.linux.org.au/listinfo/lca-announce/">lca-announce</a> mailing list to keep up with news and information about linux.conf.au 2007.</p>
-
-#<p><strong>Speakers</strong> can contact our speaker liason at <a href="mailto:seven-speakers@lca2007.linux.org.au">seven-speakers@lca2007.linux.org.au</a> for <em>speaker specific information</em>.</p>
-
-<p>Meet the team!</p>
-<ul>
-<li>Jeff Waugh - Sponsors</li>
-<li>Pia Waugh - <a href="/about/press">Press</a></li>
-<li>Sara Kaan - <a href="/about/partners">Partners Programme</a></li>
-<li>Jamie Wilkinson - <a href="/cfp">CFP</a> and Miniconfs</li>
-<li>Ben Leslie - Venue Management</li>
-<li>Lindsay Holmwood - Website</li>
-<li>John Ferlito - Infrastructure</li>
-</li>
-</ul>
-<p>And the helpers!</p>
-<ul>
-<li>Alison Russell - Speaker liason</li>
-</ul>
-
-<%method title>
-Contact Us - <& PARENT:title &>
-</%method>
View
59 zookeepr/templates/about/index.myt
@@ -1,59 +0,0 @@
-#<div id="column-a" class="column"><div class="inner">
-
-#<p id="cfpbutton" class="right"><% h.link_to('<img src="/cfp.png" alt="Call for Papers" /><br />The linux.conf.au 2007 Call for Participation is open!', url=h.url_for('cfp')) %></p>
-
-<blockquote>
-<p><i>
-You know how it goes.
-</i>
-</p>
-
-<p>
-<i>You spend a few days immersed in talks about clusters
-and networking, laptops and video drivers, surrounded by the hackers who
-inspired you to start coding in the first place, getting three hours sleep
-per night and living on pizza and caffeine. You return home only to spend the
-next few weeks in a nocturnal daze of debugging symbols as you flitter
-between purging your email backlog and coding up that long, inspired list of
-new features you jotted down on the return journey.
-</i></p>
-<p class="endquote"><i>
-A few weeks later, over breakfast, you suddenly realise what the heck Van Jacobson was going on about in his talk...
-</i></p>
-
-</blockquote>
-
-<p>linux.conf.au is a five day conference in January 2007, and one of the
-best technical Linux and FOSS conferences in the world! It has been hosted
-around Australia, and has returned to Sydney for the first time in 6 years.
-linux.conf.au attracts some of the best FOSS minds in the world, so make sure
-you don't miss the chance to hang out and learn with the best.</p>
-
-<p>The conference includes a range of community-driven miniconfs, two days of
-planned talks, a tutorials day and many excellent social events to bring the
-community together. It also includes <a href="/about/openday">Open Day</a>, a
-community outreach event for high school students, young people, our families
-and friends to come along and find out about our world through some of the
-coolest technology available.</p>
-
-<p>linux.conf.au 2007 will be held at the <a
-href="http://www.unsw.edu.au/">University of New South Wales</a> in Sydney,
-Australia. Sydney is a beautiful place to visit, and we look forward to
-showing our speakers and attendees some of the sights. We have an excellent
-<a href="/about/partners">partners programme</a> that caters to kids and
-partners of all ages.</p>
-
-#</div></div>
-
-
-#<div id="column-b" class="column"><div class="inner">
-
-#<ul id="aboutlinks">
-#<li>The <a href="/cfp">call for papers</a> is currently open!</li>
-#<li>Find out about <a href="/about/sponsors">sponsorship</a> opportunities</li>
-#<li>Information for the <a href="/about/press">press</a></li>
-#<li>The <a href="/about/partners">partners programme</a></li>
-#<li>Travel and accommodation in <a href="/about/sydney">Sydney</a></li>
-#</ul>
-
-#</div></div>
View
39 zookeepr/templates/about/openday.myt
@@ -1,39 +0,0 @@
-<h2>Open Day</h2>
-
-<h3>experience &middot; learn &middot; participate</h3>
-
-<p>Open Day is the perfect holiday event for students and young people to
-learn about Open Source. You'll discover why technology freedom is important
-and meet some great people and projects along the way. We have a wonderful
-line-up of technologies including movie making, 3D virtual gaming, robots,
-solar panel cars and digital music exhibitions just to name a few. This is a
-day for you to get your hands dirty with some of the best technologies around
-today!</p>
-
-<p><b>experience</b> the wonder of Linux and Open Source</p>
-
-<p><b>learn</b> about robots, music, movies, gaming and more</p>
-
-<p><b>participate</b> in the greatest technical community on the planet</p>
-
-<p>Most importantly, <b>meet the people behind the technology</b></p>
-
-
-<h2>Where, when, how?!</h2>
-
-<p><b>Where:</b> Mathews Pavilions (E24) - University of NSW, Kensington</p>
-
-<p><b>When:</b> 2pm - 8pm Thursday the 18th January, 2007</p>
-
-<p><b>Cost:</b> Free</p>
-
-<p><b>Food:</b> A sausage sizzle and drinks will be available</p>
-
-<p><b>Pamphlet:</b> Download the <a href="/lca2007-open-day.pdf">event pamphlet</a></p>
-
-<p><b>Contact:</b> Pia Waugh on <a href="mailto:pia@linux.org.au">pia@linux.org.au</a> or call for details at 0400 966 453</p>
-
-
-<%method title>
-Open Day - <& PARENT:title &>
-</%method>
View
35 zookeepr/templates/about/partners.myt
@@ -1,35 +0,0 @@
-<h2>Partners Programme</h2>
-
-<p>Whether you are visiting Sydney or live here, you'll know that Sydney is
-an exciting city with an endless amount of attractions and things to do. To
-make the linux.conf.au 2007 partners programme more memorable and enjoyable
-for partners, children and couples, we're asking your input for what you
-would like to see and do during your stay in this great city.</p>
-
-<p>We have devised a plan to focus on destinations and their surroundings for
-a day. For example, visit attractions like the Aquarium, Chinese Gardens,
-Paddy's Markets or the Powerhouse Museum around Darling Harbour. For the
-adventurous, a thrilling jet boat ride through the waters of Cockle Bay might
-be your cup of tea. We are also able to provide some children's activities,
-but <a href="/about/contact">let us know</a> well in advance about the
-children you are bringing. It's your choice, and the organisers of
-linux.conf.au 2007 want to ensure you have a fun and relaxing time while your
-geek is doing their thing! Here are some of the more famous Sydney
-attractions:</p>
-
-<ul>
-<li>Darling Harbour and China Town</li>
-<li>Circular Quay, the Rocks, Manly and Taronga Zoo</li>
-<li>Beaches - Bondi, Coogee and surrounds</li>
-<li>Fox Studios and Centennial Park</li>
-<li>Shopping - The Queen Victoria Building, Strand Arcade and Paddy's Markets or maybe you'd like to jump on a shop-till-you-drop bus to a stream of Sydney's wholesale outlets.</li>
-<li>Thrillseekers - Jet boats, rock climbing, Luna Park</li>
-<li>Culture tour - museums, art galleries, historic buildings</li>
-</ul>
-
-<p>Let us know what interests you most, and leave the rest to us! Feel free
-to send a special request or suggestion for anything not listed here.</p>
-
-<%method title>
-Partners Programme - <& PARENT:title &>
-</%method>
View
29 zookeepr/templates/about/press.myt
@@ -1,29 +0,0 @@
-<h2>Press</h2>
-
-<p>We welcome members of the press to participate and capture the spirit of
-linux.conf.au. We have complimentary media passes available so please <a
-href="mailto:seven-contact@lca2007.linux.org.au">contact us</a> while we still have
-some left. Simply let us know which publication you are from and we'll sort
-it out from there. Media passes include access to all talks, keynotes,
-tutorials, miniconfs and the Professional Delegates Networking Session. If
-you would like to attend the Penguin Dinner, it will be $60.</p>
-
-<p>We'll have a press conference during linux.conf.au and we can also set up
-personal interviews for you. Just let us know who you are interested in
-chatting to and we'll make sure it happens. We ask that you respect that some
-speakers may not be willing or available to speak or be photographed at any
-particular time. We will provide a dedicated press room for interviews and
-such to take place.</p>
-
-<p><b>Contact us</b> by <a
-href="mailto:seven-contact@lca2007.linux.org.au">email</a> or call our press
-officer, Pia Waugh, for details on +61 400 966 453.</p>
-
-<p>We highly recommend joining the lca-announce mailing list in order to keep
-up with latest announcements about the conference. You can subscribe to it on
-the <a href="http://lists.linux.org.au/">Linux Australia mailing lists</a>
-page.</p>
-
-<%method title>
-Press - <& PARENT:title &>
-</%method>
View
15 zookeepr/templates/about/programme.myt
@@ -1,15 +0,0 @@
-<h2>Programme</h2>
-
-<p>10am: conference open</p>
-
-<p>11am: asterisk talk</p>
-
-<p>3pm: coffee</p>
-
-<p>11pm: beer</p>
-
-<p>4am: bedtime</p>
-
-<%method title>
-Programme - <& PARENT:title &>
-</%method>
View
7 zookeepr/templates/about/sponsors.myt
@@ -1,7 +0,0 @@
-<h2>Sponsors</h2>
-
-<p>ka-ching!</p>
-
-<%method title>
-Sponsors - <& PARENT:title &>
-</%method>
View
7 zookeepr/templates/about/sydney.myt
@@ -1,7 +0,0 @@
-<h2>Sydney</h2>
-
-<p>stick in an embedded Google map of sydney here i guess</p>
-
-<%method title>
-Sydney - <& PARENT:title &>
-</%method>
View
2  zookeepr/templates/account/expired.myt
@@ -5,7 +5,7 @@ This password recovery session has expired. Please send in another request to ha
</p>
<p>
-If you believe this to be an error, please contact <em>seven-contact@lca2007.linux.org.au</em>.
+If you believe this to be an error, please contact <% h.contact_email() %>.
</p>
<p><a href="<% h.url_for('home') %>">Return to login page</a>
View
2  zookeepr/templates/account/in_progress.myt
@@ -3,5 +3,5 @@ A password recovery process is already in progress for this account.
</p>
<p>
-If you have not received an email to this address within a reasonable timeframe, please contact us on <em>seven-contact@lca2007.linux.org.au</em> and we can sort this out.
+If you have not received an email to this address within a reasonable timeframe, please contact us on <% h.contact_email() %> and we can sort this out.
</p>
View
2  zookeepr/templates/account/password_confirmation_sent.myt
@@ -4,5 +4,5 @@ To complete the password reset process please follow the instructions sent to yo
</p>
<p>
-If you do not receive this email within a reasonable timeframe, please contact us at <em>seven-contact@lca2007.linux.org.au</em>.
+If you do not receive this email within a reasonable timeframe, please contact us at <% h.contact_email() %>.
</p>
View
2  zookeepr/templates/account/thankyou.myt
@@ -8,7 +8,7 @@ Please follow the instructions in that message.
</p>
<p>
-If you do not receive this message in a reasonable timeframe, please contact us at <a href="mailto:seven-contact@lca2007.linux.org.au">seven-contact@lca2007.linux.org.au</a>
+If you do not receive this message in a reasonable timeframe, please contact us at <% h.contact_email() %>.
</p>
<p>
View
6 zookeepr/templates/autohandler
@@ -4,7 +4,7 @@
<title><& SELF:title &></title>
<link rel="stylesheet" media="screen" href="/zookeepr.css" type="text/css"/>
<link rel="stylesheet" media="print" href="/print.css" type="text/css"/>
-<link rel="icon" type="image/png" href="/seven-favicon-earthy.png" />
+<link rel="icon" type="image/png" href="/favicon.png" />
</head>
<body>
@@ -24,12 +24,12 @@
<hr />
<div id="footer">
-<p>Copyright &copy; 2006-2007, <a href="/Contact">The Seven Team</a></p>
+<p>Copyright &copy; 2006-2007, <a href="/Contact">conference organisers</a></p>
</div>
</body>
</html>
<%method title>
-linux.conf.au 2007
+linux.conf.au 2008
</%method>
View
2  zookeepr/templates/cfp/thankyou.myt
@@ -15,7 +15,7 @@ If you wish to make a second proposal, or modify the one you have just made, ple
</p>
<p>
-If you do not receive this message in a reasonable timeframe, please contact us at <a href="mailto:seven-contact@lca2007.linux.org.au">seven-contact@lca2007.linux.org.au</a>
+If you do not receive this message in a reasonable timeframe, please contact us at <% h.contact_email() %>
</p>
<p>
View
2  zookeepr/templates/error/500.myt
@@ -5,7 +5,7 @@ There was an internal server error dealing with your request!
</p>
<p>
-The site admins and their team of monkeys have been mailed a traceback and session data, and will get right on solving your problem. If it's critical, <a href="mailto:seven-contact@lca2007.linux.org.au">send us an email</a> and we'll help you out.
+The site admins and their team of monkeys have been mailed a traceback and session data, and will get right on solving your problem. If it's critical, <% h.contact_email("send us an email") %> and we'll help you out.
</p>
<p>
View
12 zookeepr/templates/header.myt
@@ -1,13 +1,9 @@
<%init>
-if c.signed_in_person and c.signed_in_person.email_address == 'erikd@mega-nerd.com':
- logo = '/sicktux.png'
-else:
- logo = '/lca2007-header.png'
+logo = '/mel8-logo.png'
</%init>
-<h1><% h.link_to(h.image_tag(logo, alt="linux.conf.au 2007"), url=h.url('home')) %></h1>
+<h1><% h.link_to(h.image_tag(logo, alt="linux.conf.au 2008"), url=h.url('home')) %></h1>
<h2>
-January 15th - 20th, 2007
-<br />
-University of New South Wales, Australia
+January 2008<br />
+Melbourne, Australia
</h2>
View
2  zookeepr/templates/openday/new.myt
@@ -52,7 +52,7 @@ Other: <% h.text_field('openday.heardfromtext') %>
<% h.submit("Submit!") %>
<span class="fielddesc">
-If you encounter any problems signing up please email <a href="mailto:seven-contact@lca2007.linux.org.au">seven-contact@lca2007.linux.org.au</a>
+If you encounter any problems signing up please email <% h.contact_email() %>
</span>
View
2  zookeepr/templates/payment/view.myt
@@ -2,7 +2,7 @@
<p>
% if c.payment.result != 'OK':
-This is an invalid payment. Please contact seven-contact@lca2007.linux.org.au
+This is an invalid payment. Please contact <% h.contact_email() %>
% elif c.payment.Status == 'Accepted':
Your payment was successful. Your receipt number is <% c.payment.id %>
% else:
View
2  zookeepr/templates/registration/new.myt
@@ -93,7 +93,7 @@ Your display name will be used to identify you on the website.
<% h.submit("Register me!") %>
<span class="fielddesc">
-If you encounter any problems signing up please email <a href="mailto:seven-contact@lca2007.linux.org.au">seven-contact@lca2007.linux.org.au</a>
+If you encounter any problems signing up please email <% h.contact_email() %>
</span>
View
2  zookeepr/templates/registration/thankyou.myt
@@ -12,7 +12,7 @@ An email has been sent to you at <em><% c.person.email_address | h %></em> with
</p>
<p>
-If you do not receive this message in a reasonable timeframe, please contact us at <a href="mailto:seven-contact@lca2007.linux.org.au">seven-contact@lca2007.linux.org.au</a>
+If you do not receive this message in a reasonable timeframe, please contact us at <% h.contact_email() %>
</p>
<p>
View
11 zookeepr/tests/functional/test_about.py
@@ -1,11 +0,0 @@
-from zookeepr.tests.functional import *
-
-class TestAboutController(ControllerTest):
- def test_index(self):
- response = self.app.get(url_for(controller='/about'))
- # Test response...
-
- def test_view_contact(self):
- response = self.app.get(url_for(controller='about',
- action='view',
- id='contact'))
View
2  zookeepr/tests/functional/test_account.py
@@ -60,7 +60,7 @@ def test_signin_signout(self):
self.assertSignedIn(resp.session, p.id)
# see if we're still logged in when we go to another page
- resp = self.app.get(url_for(controller='about', action='view'))
+ resp = self.app.get(url_for(controller='home', action='view'))
self.assertSignedIn(resp.session, p.id)
View
5 zookeepr/tests/functional/test_profile.py
@@ -11,9 +11,10 @@ def test_profile_view(self):
self.dbsession.flush()
pid = p.id
-
+
resp = self.app.get('/profile/%d' % p.id)
+ print resp
resp.mustcontain("Testguy McTest")
# clean up
@@ -28,3 +29,5 @@ def test_profile_list(self):
resp = resp.follow()
resp.mustcontain("Testguy McTest")
+
+
View
6 zookeepr/tests/functional/test_routing.py
@@ -28,12 +28,6 @@ def test_default_controller_action_url(self):
self.assertEqual('/c/1/%s' % action,
url_for(controller='c', action=action, id=1))
- def test_about_controller_id_url(self):
- self.assertEqual('/about/programme',
- url_for(controller='about',
- action='view',
- id='programme'))
-
def test_home_routing(self):
"""Test the routing of the home controller"""
self.assertEqual(dict(controller='home',
Please sign in to comment.
Something went wrong with that request. Please try again.