lp:~keegan-csmith/umonya-website/application-forms

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:~umonya/umonya-website/umonya-website

Umonya: Pending requested 2011-07-24

Diff: 1809 lines (+1382/-165)

32 files modified

.bzrignore (+1/-0)
README (+28/-0)
misc/db.txt (+93/-0)
misc/history_and_team (+60/-0)
requirements.txt (+3/-0)
umonya/apply/admin.py (+13/-0)
umonya/apply/forms.py (+50/-0)
umonya/apply/models.py (+126/-54)
umonya/apply/static/js/jquery.min.js (+154/-0)
umonya/apply/templates/apply.html (+20/-0)
umonya/apply/templates/events.html (+29/-0)
umonya/apply/tests.py (+0/-23)
umonya/apply/urls.py (+3/-1)
umonya/apply/views.py (+114/-6)
umonya/content/admin.py (+5/-0)
umonya/content/fixtures/initial_data.json (+68/-0)
umonya/content/models.py (+16/-0)
umonya/content/static/css/style.css (+206/-0)
umonya/content/templates/about-us.html (+49/-0)
umonya/content/templates/contact-us.html (+13/-0)
umonya/content/templates/get-involved.html (+55/-0)
umonya/content/templates/home.html (+39/-0)
umonya/content/templates/media.html (+14/-0)
umonya/content/templates/resources.html (+34/-0)
umonya/content/templates/sponsors.html (+28/-0)
umonya/content/urls.py (+16/-0)
umonya/content/views.py (+11/-0)
umonya/form.html (+0/-10)
umonya/manage.py (+1/-1)
umonya/settings.py (+74/-52)
umonya/templates/base.html (+43/-0)
umonya/urls.py (+16/-18)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

45. By Keegan Carruthers-Smith on 2011-07-24

Use uni-form for pretty HTML forms.

44. By Keegan Carruthers-Smith on 2011-07-24

Merged in content branch.

43. By Keegan Carruthers-Smith on 2011-07-24

Added workshop blurb to events page.

42. By Keegan Carruthers-Smith on 2011-07-24

Updated about-us.html

41. By Keegan Carruthers-Smith on 2011-07-24

Commented out boilerplate in media.html

40. By Keegan Carruthers-Smith on 2011-07-24

Updated get-involved.html

39. By Keegan Carruthers-Smith on 2011-07-24

Updated resources.html

38. By Keegan Carruthers-Smith on 2011-07-24

Made sponsor page database backed.

S1 is still missing a logo, and Silicon Cape is missing a description. The CSS
also needs to be fixed to prevent overflow of logo.

37. By Keegan Carruthers-Smith on 2011-07-21

Renamed skeleton.html to the more conventional base.html

36. By Keegan Carruthers-Smith on 2011-07-21

Removed the messages app, since it is unused.