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

applied smartquote filter to event titles in details and list page #126

Open
wants to merge 298 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
298 commits
Select commit Hold shift + click to select a range
8425a73
Layout: import SASS, CSS, and images from current KCDC site
adavidramos Aug 20, 2012
87629ab
templates: basic content
adavidramos Aug 20, 2012
cb0431b
ignore user uploads
adavidramos Aug 20, 2012
968cd7c
mark up class list, class detail; add more location structure
adavidramos Aug 20, 2012
3b58169
fix event upload location
adavidramos Aug 20, 2012
4999264
template details
adavidramos Aug 20, 2012
64f1dda
Event registration
adavidramos Aug 20, 2012
a7edd30
event location display
adavidramos Aug 20, 2012
5644f7a
create teacher bios that are separate from users
adavidramos Aug 20, 2012
9b0189d
make friendlier admin for bios
adavidramos Aug 20, 2012
ae65ca9
show class list at root level URL too
adavidramos Aug 20, 2012
aa03883
improve facilitator view
adavidramos Aug 20, 2012
aaae8cb
hide currently-unimplemented email reminder fields in admin; show mor…
adavidramos Aug 20, 2012
0592117
move neighborhood to a more self-evident place in the address block
adavidramos Aug 20, 2012
95936c7
revise wiki explanation and clarify release
adavidramos Aug 21, 2012
dbda4de
Update readme.md
adavidramos Aug 21, 2012
f276c79
facilitator: add default address to lists; make more registration fie…
adavidramos Aug 21, 2012
8467f7f
add end times to events; add URL field for teacher bios; improve date…
adavidramos Aug 21, 2012
ccc718a
clarify registration settings
adavidramos Aug 21, 2012
57be25a
Update readme.md
adavidramos Aug 21, 2012
36d272c
allow phone and zip to be empty
adavidramos Aug 21, 2012
3e0401b
form should not expect phone or zip
adavidramos Aug 21, 2012
467570b
add confirmation emails with more extensive information
adavidramos Aug 22, 2012
ee3d5e0
edit text on confirmation email templates
adavidramos Aug 24, 2012
287b8b6
add more text to login and signup forms
adavidramos Aug 24, 2012
03b480c
add error 404 and 500 pages with fail pets
adavidramos Aug 24, 2012
d7c1eed
pull modernizr and add cross-subdomain Google Analytics tracking
adavidramos Aug 24, 2012
7f84ecc
edit event list copy
adavidramos Aug 24, 2012
9226d41
fix bg img
adavidramos Aug 26, 2012
8e5b806
fix path to image
adavidramos Aug 26, 2012
056e762
fix image path
adavidramos Aug 26, 2012
6f0e3dc
improve wording for account forms
adavidramos Aug 27, 2012
fcd7b80
improve signin wording
adavidramos Aug 27, 2012
f8acbfe
add registration status info that takes into account dates
adavidramos Aug 27, 2012
dd34277
adjust registration status info on list page
adavidramos Aug 27, 2012
d45a82f
let admins edit waitlist status for registrations
adavidramos Sep 3, 2012
9f1aba9
add email prompt to promotion mail template
adavidramos Sep 8, 2012
5d31c1b
explain purpose of ruby file
adavidramos Sep 8, 2012
caa35f7
add titles to page heads (issue #12)
adavidramos Sep 8, 2012
ae69682
show teacher bios on event detail pages
adavidramos Sep 11, 2012
5b57a8d
pluralize instructor text on event list page
adavidramos Sep 11, 2012
5f294d0
Break up Events into past/future, and hide unpublished courses
adavidramos Sep 15, 2012
d135cd9
Restore pluralized instructors on Event list page
adavidramos Sep 15, 2012
fcadd1c
Change title
adavidramos Sep 15, 2012
60afd2f
Pluralize instructor text on event list page
adavidramos Sep 16, 2012
9205cab
working on cleaning the code
bradfordbarr Sep 22, 2012
4d23f91
Merge branch 'master' of github.com:knowledgecommonsdc/kcdc3
bradfordbarr Sep 22, 2012
337f68d
updating the fixtures for faster testing.
bradfordbarr Oct 16, 2012
fc3b00f
Created an email wrapping framework, it clears up a lot of redundancy…
bradfordbarr Oct 16, 2012
3d7e0df
First pass at decoupling the registration helpers from the views.
bradfordbarr Oct 17, 2012
0060cbd
Update config.rb
adavidramos Nov 13, 2012
9954fe5
Major code cleanage. Fixed issues #8 and #21
bradfordbarr Nov 17, 2012
e3b2385
Merge branch 'master' of github.com:knowledgecommonsdc/kcdc3
bradfordbarr Nov 17, 2012
bced07c
Event detail template: remove headers w instructor names
adavidramos Nov 19, 2012
e25e299
Admin: change event sort order
adavidramos Nov 20, 2012
e4f3244
reverse order of classes in list
adavidramos Nov 29, 2012
8a5bc84
update text description for class list
adavidramos Nov 29, 2012
5047cde
Class email confirmations: add special accommodations note
adavidramos Dec 2, 2012
fbb7372
Registration confirmation email
adavidramos Dec 2, 2012
466ae25
Adding a field when registering for folks to let us know any special …
bradfordbarr Dec 16, 2012
b9b3820
merge event_archives
adavidramos Dec 20, 2012
fe28048
Fix for archive display
adavidramos Dec 20, 2012
efe097d
Fix for local nav in events
adavidramos Dec 20, 2012
148173b
reversed order of sessions in local nav
adavidramos Dec 20, 2012
79b30f9
Fix for accessibility email
adavidramos Dec 20, 2012
25a3763
Spacing around accessibility form
adavidramos Dec 20, 2012
6902818
Add past sessions from old site
adavidramos Dec 20, 2012
9ee0f21
Revert "Add past sessions from old site"
adavidramos Dec 20, 2012
9c6cfeb
Revert "Revert "Add past sessions from old site""
adavidramos Dec 20, 2012
b9d804d
Revert "Revert "Revert "Add past sessions from old site"""
adavidramos Dec 20, 2012
04b1fd8
Registration copy
adavidramos Dec 20, 2012
703999b
Improve error message
adavidramos Dec 20, 2012
dfaf041
Revert "Improve error message"
adavidramos Dec 20, 2012
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
b83a4c2
applied smartquote filter to event titles in details and list page
kennonlee Jan 26, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Improve wide page display and add body type info
adavidramos committed May 4, 2013
commit 7c608acdaa64d3c564fddd234c9df07b01e3de28
15 changes: 12 additions & 3 deletions kcdc3/public/static/css/style.css
Original file line number Diff line number Diff line change
@@ -1664,22 +1664,31 @@ p.indicators > .registration_indicator {

/* line 6, ../sass/_page_wide.sass */
.hed_wide {
width: 100%;
max-width: 960px;
margin-top: 4em;
padding-left: 10%;
}

/* line 11, ../sass/_page_wide.sass */
.main_wide {
width: 60%;
margin: 0 30% 0 10%;
width: 100%;
max-width: 960px;
margin-top: 4em;
}
/* line 15, ../sass/_page_wide.sass */
.main_wide p {
margin-left: 20%;
}
@media screen and (max-width: 680px) {
/* line 11, ../sass/_page_wide.sass */
.main_wide {
width: 100%;
margin: 0;
}
/* line 20, ../sass/_page_wide.sass */
.main_wide p {
margin-left: 0;
}
}

/* ----- START PROJECT STYLES -------------------------------------------- */
12 changes: 8 additions & 4 deletions kcdc3/public/static/sass/_page_wide.sass
Original file line number Diff line number Diff line change
@@ -4,14 +4,18 @@
max-width: 960px

.hed_wide
width: 100%
max-width: 960px
margin-top: 4em
padding-left: 10%

.main_wide
width: 60%
margin: 0 30% 0 10%
width: 100%
max-width: 960px
margin-top: 4em
p
margin-left: 20%
@media screen and (max-width: 680px)
width: 100%
margin: 0

p
margin-left: 0
2 changes: 1 addition & 1 deletion kcdc3/templates/base.html
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@

<link rel="alternate" type="application/rss+xml" title="Blog RSS feed" href="/blog/rss" />
</head>
<body>
<body class="{% block body_class %}{% endblock %}">

<div id="skip">
<h1>Knowledge Commons DC</h1>
2 changes: 2 additions & 0 deletions kcdc3/templates/pinata/contribute.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{% extends "pinata/page_wide.html" %}

{% block body_class %}s_contribute p_contribute{% endblock %}



{% block content %}
1 change: 1 addition & 0 deletions kcdc3/templates/pinata/pressclippings.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{% extends "pinata/page.html" %}


{% block body_class %}s_press p_press{% endblock %}


{% block content %}