Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

grab only the registrants from given session #123

Open
wants to merge 371 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
371 commits
Select commit Hold shift + click to select a range
75012a8
Revert "Registration copy"
adavidramos Dec 20, 2012
85d120f
Revert "Revert "Revert "Revert "Add past sessions from old site""""
adavidramos Dec 20, 2012
7466c49
Revert "Revert "Revert "Add past sessions from old site"""
adavidramos Dec 20, 2012
80919d1
Revert "Revert "Add past sessions from old site""
adavidramos Dec 20, 2012
13a0ce3
Revert "Add past sessions from old site"
adavidramos Dec 20, 2012
ef99768
Revert "Spacing around accessibility form"
adavidramos Dec 20, 2012
14257d9
Revert "Fix for accessibility email"
adavidramos Dec 20, 2012
6b8b038
Revert "reversed order of sessions in local nav"
adavidramos Dec 20, 2012
11a1dfa
Revert "Fix for local nav in events"
adavidramos Dec 20, 2012
710e33f
Revert "Fix for archive display"
adavidramos Dec 20, 2012
f9a3ae2
Revert "merge event_archives"
adavidramos Dec 20, 2012
ad015dd
Commit for the email issue
bradfordbarr Dec 21, 2012
21025a5
Fixed waitlist issue again...
bradfordbarr Dec 21, 2012
316c034
In event detail view, don't show waitlist notice if registration is c…
adavidramos Dec 21, 2012
182fc51
Missed some parens. Made things work poorly.
bradfordbarr Dec 21, 2012
ed35ab8
Content – registration info
adavidramos Dec 21, 2012
157c5b5
Bring in new CSS, scripts, and images from redesign branch; remove un…
adavidramos Dec 23, 2012
bdc1cc6
Migrate templates
adavidramos Dec 23, 2012
7a2bcf5
Adapt templates to Django site; CSS tweaks
adavidramos Dec 24, 2012
26479d0
Fix name display for teachers
adavidramos Dec 24, 2012
02bec9e
Turn off CC in confirmation email
adavidramos Dec 24, 2012
14f0d94
Fix accommodation request form
adavidramos Dec 24, 2012
84564c9
Remove debug code
adavidramos Dec 24, 2012
1cb587d
Never mind; accommodations requests still don't work on the server
adavidramos Dec 24, 2012
fca19b6
Put accommodations form back in the template because it works
adavidramos Dec 24, 2012
20f8b39
Remove SymbolSet fonts from source control
adavidramos Dec 25, 2012
75f267a
Ignore SymbolSet fonts
adavidramos Dec 25, 2012
1213f39
Add space to sidebar for mobile layout; fix sidebar positioning in Fi…
adavidramos Dec 25, 2012
887862c
Separate out past sessions into archival pages
adavidramos Dec 26, 2012
de05e10
Show registration indicators for upcoming classes, even in archive view
adavidramos Dec 26, 2012
7308bfa
Local nav wording improvement
adavidramos Dec 26, 2012
9905468
Add a new "Pinata" app to manage static content
adavidramos Dec 26, 2012
12793d5
Fix up local navigation for Pinata
adavidramos Dec 26, 2012
b8ab450
Improve path handling
adavidramos Dec 26, 2012
71c6d60
Add staff bio handling
adavidramos Dec 26, 2012
95d109a
Add admin-specified sort order for Pinata pages
adavidramos Dec 26, 2012
bcd3662
Publish blog posts using the Pigeon app
adavidramos Dec 27, 2012
0907b92
Merge master into integrated_site
adavidramos Feb 13, 2013
4bea9d3
Fix migrations; add file upload field to bios
adavidramos Feb 13, 2013
44dece1
Add department labels to blog
adavidramos Feb 16, 2013
eb03d14
Basic staff bios
adavidramos Feb 16, 2013
eb9abad
Author lists now support Oxford commas
adavidramos Feb 16, 2013
fca1ff4
Publish blog posts through an RSS feed
adavidramos Feb 16, 2013
ae32923
Add labels for blog posts
adavidramos Feb 16, 2013
bd56b31
Improve blog appearance
adavidramos Feb 16, 2013
4cd2276
More details and additional desc field for staff bios
adavidramos Feb 16, 2013
d0d9212
Spacing around bios and H3s
adavidramos Feb 16, 2013
18c8a17
Fine-tune spacing
adavidramos Feb 16, 2013
1409ba0
Add basic front page functions
adavidramos Feb 18, 2013
9c8b285
Pass user data to Pinata templates
adavidramos Feb 18, 2013
edccd5f
Pinata: fix sidebar on static pages and fix user login status in menu…
adavidramos Feb 18, 2013
379f058
Add content to front
adavidramos Feb 18, 2013
c847d91
Use human-readable model names
adavidramos Feb 18, 2013
626cad0
These names are better
adavidramos Feb 18, 2013
c033520
Put titles on blog posts and on Pinata pages
adavidramos Feb 18, 2013
4398890
Integrate Wufoo forms for contributions and course proposals
adavidramos Feb 19, 2013
d68fb9c
Improve front page layout
adavidramos Feb 19, 2013
051a0e6
Adjust front
adavidramos Feb 19, 2013
b50889a
Housekeeping and editorializing re: special template views
adavidramos Feb 20, 2013
3d5beda
Provide facilities to import and display classes from csv
adavidramos Feb 24, 2013
a049dd0
Remove "More sessions" link
adavidramos Feb 24, 2013
0e6cd21
Use temporary URLs
adavidramos Feb 24, 2013
1d872d2
Fix inconsistent South DB migrations
adavidramos Feb 24, 2013
791e59f
Show teachers for legacy classes when using event_archive template
adavidramos Feb 24, 2013
988f642
Git insists on tracking mode changes to lots of files
adavidramos Feb 24, 2013
496d80b
Clean up buttons for TinyMCE
adavidramos Feb 24, 2013
844c93b
Add currently-untracked files
adavidramos Feb 24, 2013
6f8ca82
Fix image display for front page
adavidramos Feb 24, 2013
eecc644
Fix dojo thumbnail display
adavidramos Feb 25, 2013
3eed3ae
Remove extra "join" link in navbar and make footer links root-relative
adavidramos Feb 25, 2013
878e6fb
Add models and admin for Pinata Sponsor and Press Clippings
adavidramos Mar 3, 2013
d76c392
Press clippings, sponsors, and pinata improvements
adavidramos Mar 4, 2013
8e3c350
Styles for sponsors
adavidramos Mar 4, 2013
2c8319e
Make name of press clipping model conform to coding style
adavidramos Mar 6, 2013
c376b31
Bio.name should be unique
adavidramos Mar 13, 2013
3316f0c
We don't need to show that much text in a press clipping
adavidramos Mar 16, 2013
90bc93d
Add HTTP error codes to 404 and 500 pages
adavidramos Mar 16, 2013
2336aba
Add dates to blog detail view, and show years on all posts in blog li…
adavidramos Mar 16, 2013
b426595
Restore Google Analytics tracking code
adavidramos Mar 16, 2013
aa1bbbc
handle media files
adavidramos Mar 16, 2013
55d0fcd
Add press clippings
adavidramos Mar 16, 2013
91f5d0d
Improve admin for staff bios
adavidramos Mar 17, 2013
b8a830c
Remove press section from nav
adavidramos Mar 25, 2013
af9dbb9
Return Press section to nav
adavidramos Mar 30, 2013
cb376ba
Fix line break in press section
adavidramos Mar 30, 2013
f73746e
Improve display of press items
adavidramos Mar 30, 2013
4e438c1
Further adjustments to press display
adavidramos Mar 30, 2013
2b53304
Set min height on press clippings
adavidramos Mar 30, 2013
1a67467
Add more space around press clippings
adavidramos Mar 30, 2013
a3200fe
Simplify staff emeritus and at-large
adavidramos Apr 4, 2013
197156a
Create wide page template
adavidramos Apr 6, 2013
f91b7ea
Wide page template
adavidramos Apr 8, 2013
1e88e39
Improve local nav for wide pages
adavidramos Apr 8, 2013
c867988
Automatically open registration on specified dates
adavidramos Apr 24, 2013
eddcc29
Add more info for image labels
adavidramos Apr 24, 2013
55d4da8
Improve registration indicators
adavidramos Apr 24, 2013
ed2cd1f
Change About front to use normal template
adavidramos Apr 24, 2013
c1a5e71
Fix waitlist badge display
adavidramos Apr 26, 2013
3e78ed3
Fix blog post display
adavidramos Apr 30, 2013
c1e7013
ignore more statically-served media files
adavidramos Apr 30, 2013
1825bc1
Clean up SASS
adavidramos May 3, 2013
e718b2d
Add print styles
adavidramos May 3, 2013
58751e9
Adjust sidebar for print
adavidramos May 3, 2013
2a508c6
Account for two-column pages for print
adavidramos May 3, 2013
b36765e
Account for wide pages for print
adavidramos May 3, 2013
30cda92
Cleanup
adavidramos May 4, 2013
6b7e817
Remove superfluous template code
adavidramos May 4, 2013
6404c72
Refine pinata templates and add no_sidebar template
adavidramos May 4, 2013
7c608ac
Improve wide page display and add body type info
adavidramos May 4, 2013
3738a0a
Show no more than four featured events
adavidramos May 4, 2013
c2c0a61
Specify sort order for featured events
adavidramos May 4, 2013
683b681
Set up basic, static contribute page
adavidramos May 4, 2013
7cadcbd
Mobile version of contribute
adavidramos May 5, 2013
a95a18d
Fix line breaks in front MOTD
adavidramos May 5, 2013
e893a4a
Clean up spacing of featured classes, front page
adavidramos May 5, 2013
ee8d35e
Create Snippets
adavidramos May 5, 2013
f54f8e5
Make additional welcome email text field more prominent
adavidramos May 5, 2013
c779199
Update hostname in email templates
adavidramos May 5, 2013
d499494
Try safe output for additional info text
adavidramos May 10, 2013
0a60889
adding requirements for the kcdc3 project
bradfordbarr May 22, 2013
6958d79
Getting rid of some unused third party code
bradfordbarr May 22, 2013
0189d2e
pulling manage outside of the kcdc3 project directory
bradfordbarr May 22, 2013
4848a23
moving all apps into their own app directory to keep things more tidy.
bradfordbarr May 22, 2013
35da90a
moved all of the account templates into the application folder
bradfordbarr May 22, 2013
e2c82b0
moved all of the classes templates into the classes app folder.
bradfordbarr May 22, 2013
9178aa8
moved all pinata templates to the pinata app folder.
bradfordbarr May 22, 2013
c27d7bf
moving all pigeon templates to the pigeon app folder
bradfordbarr May 22, 2013
4699360
more updates to gitignore
bradfordbarr May 22, 2013
9205d3f
New style of doing settings stuff. It'll check for the hostname of th…
bradfordbarr May 22, 2013
078a17f
more cleanup. settings stuff works, apps directorys don't complain an…
bradfordbarr May 22, 2013
5d48745
More gitignore updates
bradfordbarr May 24, 2013
6d58499
Fixing all sorts of path issues. Boo.
bradfordbarr May 24, 2013
bdd898e
Test for hidden/removed classes
adavidramos May 25, 2013
e6aa849
Reverse order of posts in Pigeon admin
adavidramos May 28, 2013
16afcff
If there are not authors, hide bylines in blog
adavidramos May 28, 2013
76b65ff
Fix blog authors on front page too
adavidramos May 28, 2013
989b95c
Fix "take a class" link on front page
adavidramos May 28, 2013
261e45c
RSS shows a more limited set of posts
adavidramos May 30, 2013
54de3cb
Return date to Pigeon post detail template
adavidramos May 30, 2013
d8ac8e3
Override image dimensions
adavidramos May 30, 2013
bce88d0
Output comprssed CSS
adavidramos May 30, 2013
58ded82
adjust front page
adavidramos May 30, 2013
bc0b9c4
Changing template directories again. We need the app name in the temp…
bradfordbarr Jun 9, 2013
8e9273b
Fixing some silly path issues.
bradfordbarr Jun 9, 2013
bd55339
fixed up path issues pertaning to admin stuff.
bradfordbarr Jun 9, 2013
65b3fc1
Provide more text areas for sessions
adavidramos Jun 11, 2013
0bba52c
Fixing template paths.
bradfordbarr Jun 18, 2013
e2fd2ed
Update contribute text
adavidramos Jun 26, 2013
3f53b99
More contribute text updates
adavidramos Jun 26, 2013
737996e
Final bugfixes, next merge.
bradfordbarr Jul 2, 2013
ea5f72e
Change to redrawn logo
adavidramos Jul 2, 2013
8cfd26c
Merge branch 'master' into reorg
bradfordbarr Jul 21, 2013
185d5b5
Forgot some production requirements.
bradfordbarr Jul 29, 2013
56d46d6
Delete stray file
adavidramos Jul 29, 2013
2766a86
Ignore SymbolSet JavaScript files
adavidramos Jul 31, 2013
c27b57f
Improve mobile navbar
adavidramos Jul 31, 2013
f733397
Fix front buttons on mobile
adavidramos Jul 31, 2013
9080fa9
Add teacher reporting
adavidramos Aug 15, 2013
99b7a7c
Make registration reports filterable and harmonize URL
adavidramos Aug 15, 2013
636c0e9
Add more dashboard
adavidramos Aug 15, 2013
02d52a1
Organize the staff reporting area
adavidramos Aug 15, 2013
6c48b19
Remove border from logo
adavidramos Aug 18, 2013
4f3f628
Add alternative bio text for individual classes
adavidramos Aug 18, 2013
78f4a9f
Show thumbnails for courses
adavidramos Aug 18, 2013
011beab
Simplify header
adavidramos Aug 18, 2013
72291ad
Allow sorting by event type
adavidramos Aug 18, 2013
bdd65f0
Distinguish events and partner events from classes
adavidramos Aug 18, 2013
7e3b226
Add name text for signup
adavidramos Aug 20, 2013
d304cf5
fix thumbnails and class images
adavidramos Aug 30, 2013
7ba6fbc
Partners page
adavidramos Sep 1, 2013
692d714
Make partner display more compact
adavidramos Sep 2, 2013
f99e23a
show user phone numbers in registration lists
adavidramos Sep 9, 2013
5efd607
Make Contribute a regular page
adavidramos Sep 11, 2013
559987b
Fix paragraph space in contribute
adavidramos Sep 11, 2013
8499c2a
added djrill to required modules
kennonlee Oct 7, 2013
fdb9e55
added filter for converting apostrophes and quotes to smartquotes
kennonlee Oct 8, 2013
9569f99
Two required modules. Added/Commited by Lesko
Oct 10, 2013
cf0a936
Required for wsgi usage.
Oct 10, 2013
6bd14d3
Returning /static/ to service
Oct 20, 2013
bc29a09
Merge remote-tracking branch 'github/master'
nyetsche Oct 20, 2013
b7d8b5d
A copy of the nginx configuration
nyetsche Oct 20, 2013
81a635d
A copy of the kcdc3 post-receive hook
nyetsche Oct 20, 2013
646c2ea
Ignore kcdc3/public, it contains multimedia files
Oct 20, 2013
76923a1
Commiting my work for vagrant based dev boxes. Has my puppet work in …
bradfordbarr Oct 24, 2013
8f15a2c
Fix typo in emails
adavidramos Oct 29, 2013
034d40f
Clean up .gitignore - only ignore kcdc3/media
Oct 29, 2013
72b4434
also ignore the .prod file
Oct 29, 2013
7557e42
Merge branch 'master' of github.com:knowledgecommonsdc/kcdc3
nyetsche Oct 29, 2013
b206f74
Merge branch 'master' of https://github.com/knowledgecommonsdc/kcdc3
Oct 29, 2013
adb50c9
Merge branch 'master' of /srv/www/production/kcdc/kcdc3
nyetsche Oct 29, 2013
58d544e
Merge pull request #102 from kennonlee/master
adavidramos Nov 12, 2013
325605c
Ignore webfonts, tmproj, and SASS cache
adavidramos Dec 23, 2013
c4277a0
fix static files for localhost dev
adavidramos Dec 23, 2013
288a407
Add partner fields for events
adavidramos Dec 23, 2013
c997953
Change name of class partner organizations
adavidramos Dec 25, 2013
25da3f4
Fix upload path for class partner images
adavidramos Dec 25, 2013
535e42e
Improve display of class partners
adavidramos Dec 25, 2013
121169b
Randomize order of front slides
adavidramos Dec 25, 2013
2d9d0d5
Make volunteer bios match the Dojo bios
adavidramos Dec 25, 2013
d002aa3
Sort bios by name
adavidramos Dec 25, 2013
cecaddb
Show more teacher info in bios
adavidramos Dec 25, 2013
3064183
For bio websites, use a plain CharField rather than URLField
adavidramos Dec 25, 2013
1a84823
Allow admins to search locations by name
adavidramos Dec 25, 2013
dd6e27f
Permit admins to filter in the related ID popups as well
adavidramos Dec 25, 2013
9a2ce1d
Add visual details for bio contact info
adavidramos Dec 27, 2013
fa9bea3
Remove border from link in partner logos
adavidramos Dec 27, 2013
5d4deb0
Add/remove protocol to URLs in bios
adavidramos Dec 27, 2013
5c40f0f
Change name of shuffle filter
adavidramos Dec 27, 2013
9d7ea12
Event description text: remove linebreaks, add smart quotes
adavidramos Dec 27, 2013
d033e25
Apply filter to enforce house typographical style
adavidramos Dec 27, 2013
479c49c
Gosh, those little quote marks are everywhere
adavidramos Dec 27, 2013
414de6c
When running text through safestring filter, mark it as safe
adavidramos Dec 27, 2013
5dc5b54
Improve staff bios
adavidramos Dec 27, 2013
6018ba4
Show more staff/author bio info
adavidramos Dec 27, 2013
d4caf26
Add photos to teacher bios; clarify bio HTML namespaces
adavidramos Dec 27, 2013
06f1588
We can do 160x160px bio photos, sure
adavidramos Dec 27, 2013
edf8dc4
Fix staff bio classname
adavidramos Dec 27, 2013
46f13a7
Fix upload paths; reqiure account verification
adavidramos Dec 29, 2013
21228f5
Fix conf file; add default email addresses
adavidramos Dec 30, 2013
13ab2bf
Once again require account verification
adavidramos Dec 30, 2013
1cd51b8
Show registrations as a model in the backend
adavidramos Jan 5, 2014
d6d19ac
Add search fields for registrations
adavidramos Jan 5, 2014
65f271d
Registration admin - revise field order for easier visual scanning
adavidramos Jan 5, 2014
b14ec1e
Issue #118, remove extra classes directory
Jan 10, 2014
a31aab9
Revert "Issue #118, remove extra classes directory"
adavidramos Jan 12, 2014
137b73c
grab only the registrants from given session
Jan 13, 2014
733585d
Revert "grab only the registrants from given session"
Jan 13, 2014
814b9bc
grab only the registrants from given session
Jan 13, 2014
996feb7
Add thumbnails to blog post list
adavidramos Jan 13, 2014
9fdd3ab
Adjust spacing for blog thumbnails
adavidramos Jan 13, 2014
190f195
More CSS changes for thumbnails
adavidramos Jan 13, 2014
981adaa
fix event thumbnails
adavidramos Jan 17, 2014
a986385
Add date filter to Registration admin
adavidramos Jan 17, 2014
3509902
Fix static files on localhost
adavidramos Feb 9, 2014
d1576ab
Add latitude and longitude fields for Locations
adavidramos Feb 9, 2014
4c9407b
Add access status info to Locations
adavidramos Feb 9, 2014
b92695b
Add to volunteer text in email
adavidramos Feb 14, 2014
b8f0c9b
Update readme
adavidramos Feb 14, 2014
fcb74f8
Add Squirrel app with basic meeting RSVP features
adavidramos Feb 15, 2014
7800f43
Hide sensitive information from non-staff users
adavidramos Feb 15, 2014
7a67f38
Use Django permissions model
adavidramos Feb 15, 2014
eb8b1e9
Change RSVPs to yes/maybe/no
adavidramos Feb 15, 2014
933e80a
#91 first pass cmd that sends email reminders based on cmdline arg nu…
kennonlee Mar 28, 2014
29853ea
#91 base test case for sending email reminders
kennonlee Mar 30, 2014
a24e183
Add caption to class detail pages
adavidramos Apr 19, 2014
1fa6b58
Choose layouts for event images
adavidramos Apr 19, 2014
d40374e
Add list thumbnail control to archive template
adavidramos Apr 19, 2014
bd8ddd1
Add "My Schedule" page
adavidramos Apr 19, 2014
10d2316
Change name of "My Schedule"
adavidramos Apr 19, 2014
a2bf865
Comment and reorganize Event model
adavidramos Apr 24, 2014
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
41 changes: 17 additions & 24 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,32 +1,25 @@
www/static
www/uploads
*.tmproj
*.pyc
kcdc3/django.db
kcdc3/settings.py
kcdc3/kcdc3/settings.py
kcdc3/settings/prod.py
# as per dave:
# Matt Lesko wrote:
# 1) Clean up what's kept in git vs. what isn't. Right now I think static
# content /isn't/, but it probably should be.
# My suggestion: put static/ under Git, and media/ not. After the move, I'll fix file locations so that media/ is just user data.
# ergo, track kcdc3/public/static
kcdc3/public/media

kcdc3/kcdc3/settings.py
*.scssc
.sass-cache/

*.tmproj

kcdc3/tmp/django.db

kcdc3/public/static/fonts/ss-standard/
kcdc3/public/static/fonts/ss-social/

kcdc3/public/media/event_images
kcdc3/public/media/mugshots

codekit-config.json
.sass-cache
kcdc3/public/media/uploads/event_images/IMG_5082a.jpg
kcdc3/public/static/fonts/ss-social/ss-social-circle.eot
kcdc3/public/static/fonts/ss-social/ss-social-circle.svg
kcdc3/public/static/fonts/ss-social/ss-social-circle.ttf
kcdc3/public/static/fonts/ss-social/ss-social-circle.woff
kcdc3/public/static/fonts/ss-social/ss-social-regular.eot
kcdc3/public/static/fonts/ss-social/ss-social-regular.svg
kcdc3/public/static/fonts/ss-social/ss-social-regular.ttf
kcdc3/public/static/fonts/ss-social/ss-social-regular.woff
kcdc3/public/static/fonts/ss-social/ss-social.css
kcdc3/public/static/fonts/ss-social/ss-social.js
kcdc3/public/static/fonts/ss-standard/ss-standard.css
kcdc3/public/static/fonts/ss-standard/ss-standard.eot
kcdc3/public/static/fonts/ss-standard/ss-standard.js
kcdc3/public/static/fonts/ss-standard/ss-standard.svg
kcdc3/public/static/fonts/ss-standard/ss-standard.ttf
kcdc3/public/static/fonts/ss-standard/ss-standard.woff
2 changes: 1 addition & 1 deletion config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
sass_dir = "kcdc3/public/static/sass"
images_dir = "kcdc3/public/static/images"
javascripts_dir = "kcdc3/public/static/assets/js"
output_style = :expanded
output_style = :compressed
css_dir = "kcdc3/public/static/css"

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
17 changes: 17 additions & 0 deletions kcdc3/apps/accounts/templates/disabled.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{% extends 'userena/base_userena.html' %}
{% load i18n %}

{% block title %}{% trans "Disabled account" %}{% endblock %}
{% block content_title %}<h2>{% trans "Your account has been disabled" %}</h2>{% endblock %}
{% block content %}

<p>Your account is currently disabled.</p>
<p>If you just signed up, you still need to active your account.
Please check your email and find the activation message that we sent you. (Your mail provider may have wrongly marked it as spam.)
You'll need to click on the link in that message to activate your account.</p>
<p><strong>Check your spam folder</strong>; your mail provider may have wrongly marked the message as spam.</p>
<p>If you're still having problems, please email us at
<a href="mailto:[email protected]">[email protected]</a>.
</p>

{% endblock %}
60 changes: 60 additions & 0 deletions kcdc3/apps/accounts/templates/profile_detail.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{% extends 'userena/base_userena.html' %}
{% load i18n %}
{% load url from future %}

{% block title %}{% blocktrans with profile.user.username as username %}{{ username }}'s profile.{% endblocktrans %}{% endblock %}
{% block content_title %}<h2>{{ profile.user.username }} {% if profile.user.get_full_name %}({{ profile.user.get_full_name }}){% endif %}</h2>{% endblock %}

{% block content %}
<div class="white-box">
{% block profile_navigation %}
{% comment %}Dirty hack. Will use django-guardian in the future.{% endcomment %}
{% if user.username == profile.user.username %}
<ul id="box-nav">
{% block profile_navigation_items %}
<li><a href="{% url 'userena_profile_edit' user.username %}">{% trans "Edit details" %}</a></li>
<li><a href="{% url 'userena_password_change' user.username %}">{% trans "Change password" %}</a></li>
<li><a href="{% url 'userena_email_change' user.username %}">{% trans "Change email" %}</a></li>
{% endblock %}
</ul>
{% endif %}
{% endblock %}

<div id="details">

{% comment %}
{% block profile_details %}
<img class="mugshot" src="{{ profile.get_mugshot_url }}" alt="{% trans "Your mugshot" %}" />
<dl>
{% block profile_definition_list %}
{% if profile.user.get_full_name %}
<dt>{% trans "Name" %}</dt>
<dd>{{ profile.user.get_full_name }}</dd>
{% endif %}
{% if profile.user.email and not hide_email %}
<dt>{% trans "Email" %}</dt>
<dd>{{ profile.user.email }}</dd>
{% endif %}
{% if profile.age %}
<dt>{% trans "Age" %}</dt>
<dd>{{ profile.age }}</dd>
{% endif %}
{% if profile.website %}
<dt>{% trans "Website" %}</dt>
<dd>{{ profile.website|urlize }}</dd>
{% endif %}
{% if profile.location %}
<dt>{% trans "Location" %}</dt>
<dd>{{ profile.location }}</dd>
{% endif %}
{% if profile.about_me %}
<dt>{% trans "About me" %}</dt>
<dd>{{ profile.about_me }}</dd>
{% endif %}
{% endblock %}
</dl>
{% endblock %}
{% endcomment %}
</div>
</div>
{% endblock %}
45 changes: 45 additions & 0 deletions kcdc3/apps/accounts/templates/signin_form.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{% extends 'userena/base_userena.html' %}
{% load i18n %}
{% load url from future %}

{% block title %}{% trans "Signin" %}{% endblock %}

{% block content %}

<h1>Log in</h1>

<p>
We've moved to a new registration system.
If you created your account before August 24, 2012, we'll need you
to <a href="/accounts/signup/">register a new account</a>.
</p>

<p>Our new registration system lets us: give you more information about
class locations, makes it easier for you to update your class signups,
and features real-time, automatic waitlists.</p>

<form action="" method="post">
{% csrf_token %}
<fieldset>
<legend>{% trans "Signin" %}</legend>
{{ form.non_field_errors }}
{% for field in form %}
{{ field.errors }}
{% comment %} Displaying checkboxes differently {% endcomment %}
{% if field.name == 'remember_me' %}
<p class="checkbox">
<label for="id_{{ field.name }}">{{ field }} {{ field.label }}</label>
</p>
{% else %}
<p>
{{ field.label_tag }}
{{ field }}
</p>
{% endif %}
{% endfor %}
</fieldset>
<input type="submit" value="{% trans "Signin" %}" />
<p class="forgot-password"><a href="{% url 'userena_password_reset' %}" title="{% trans 'Forgot your password?' %}">{% trans "Forgot your password?" %}</a></p>
{% if next %}<input type="hidden" name="next" value="{{ next }}" />{% endif %}
</form>
{% endblock %}
16 changes: 16 additions & 0 deletions kcdc3/apps/accounts/templates/signup_complete.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{% extends 'userena/base_userena.html' %}
{% load i18n %}

{% block title %}{% trans "Signup almost done!" %}{% endblock %}

{% block content_title %}<h2>{% trans "Signup" %}</h2>{% endblock %}

{% block content %}
<p>{% trans "Thank you for signing up with us!" %}</p>

{% if userena_activation_required %}
<p>{% blocktrans %}Next, you need to active your account. We've just sent you an email message with an activation link. <strong>Check your spam folder for the message.</strong>{% endblocktrans %}</p>
{% else %}
<p>{% blocktrans %}You can now use the supplied credentials to signin.{% endblocktrans %}</p>
{% endif %}
{% endblock %}
36 changes: 36 additions & 0 deletions kcdc3/apps/accounts/templates/signup_form.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{% extends 'userena/base_userena.html' %}
{% load i18n %}

{% block title %}{% trans "Signup" %}{% endblock %}

{% block content %}

<h1>Create a new account</h1>

<form action="" method="post">
{% csrf_token %}

<fieldset>
{% comment %}<legend>{% trans "Signup" %}</legend>{% endcomment %}
{{ form.non_field_errors }}
{% for field in form %}
{{ field.errors }}
{% comment %} Displaying checkboxes differently {% endcomment %}
{% if field.name == 'tos' %}
<p class="checkbox">
<label for="id_{{ field.name }}">{{ field }} {{ field.label }}</label>
</p>
{% else %}
<p>
{{ field.label_tag }}
{{ field }}
</p>
{% endif %}
{% endfor %}
</fieldset>

<p>When you create an account, we will add you to the Knowledge Commons DC mailing list. (That takes time, though, so if you want to receive updates immediately, sign up for the list yourself &ndash; the form is in the footer.)</p>

<input type="submit" value="{% trans "Signup"%}" />
</form>
{% endblock %}
File renamed without changes.
2 changes: 1 addition & 1 deletion kcdc3/accounts/views.py → kcdc3/apps/accounts/views.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from django import forms
from django.utils.translation import ugettext_lazy as _
from userena.forms import SignupForm
from accounts.models import ExtendedProfile
from models import ExtendedProfile

class SignupFormExtra(SignupForm):
"""
Expand Down
File renamed without changes.
Loading