af8c3ff1fd
merge from master
2013-03-19 10:02:06 -04:00
e2ab3d75a8
Big merge from master
2013-03-19 09:40:18 -04:00
bd9a746422
merge in master
2013-03-18 21:50:22 -04:00
26848b1774
Nudge up the button text size AMAP
2013-03-18 17:04:00 -04:00
f3b48fa9a9
Merge pull request #142 from Gluejar/fix_stripe_spinny_thing
...
one line js fix to stop the spinny thing when stripe reports an error
2013-03-15 12:55:41 -07:00
dc8dea0768
moving countdown out of context to models.py, standardizing button appearance
2013-03-15 15:51:17 -04:00
28045aed77
merge master into improve_registration
2013-03-13 10:40:20 -04:00
2da23dbd64
Merge branch 'master' into work_page_CTAs
...
Conflicts:
frontend/templates/work.html
frontend/views.py
static/css/campaign.css
2013-03-12 15:59:24 -04:00
7dc1f4cba3
Merge pull request #129 from Gluejar/manager_supporter_msgs
...
Managers and staff can send messages to supporters [#36991391 ]
2013-03-12 11:52:43 -07:00
fae6c8f3a9
reverting to earlir add-wishlist functionality
2013-03-12 14:48:20 -04:00
57ebbc087e
merge master into work_page_CTAs
2013-03-11 22:39:48 -04:00
4e8f1b2fdc
reshuffle back of bookpanel to allow front bottom buttons to be clicked
2013-03-11 15:38:04 -04:00
303c53c82e
While I'm looking at this, make the cvc input a password [ #41678953 ]
2013-03-08 18:50:35 -05:00
800d0ffdeb
cleanup of css and js imports, also mapping
2013-03-08 14:16:24 -05:00
62627a80cf
fix "next" behavior, poor sign-up/pledge flow [ #40841931 ]
...
Sign In lightbox had broken cookie pusher on reg/auth pages.
Many holes had developed that broke return-to-page-after-auth (for
example, sign-in from pledge page).
Sporadic encoding issues.
2013-03-08 02:43:11 -05:00
90d15b5c9b
modify .errorlist style to round both corners- more flexible
2013-03-07 21:54:32 -05:00
339d4653ab
migrate and clean urls
2013-03-07 21:53:32 -05:00
80536a491a
superlogin- failed logins check for socialauth and if so, as user to use it
...
superlogin injects extra_context into regular login method
2013-03-07 21:48:56 -05:00
2153a6c589
added hover to message icon, moved css and js to files
2013-03-04 23:25:22 -05:00
14a6803b9f
mailchimp integration [finish #37732465 ]
...
need to pip install postmonkey
2013-03-04 17:01:33 -05:00
989fff8926
Added unglue.it search at top of search page [finish #37199475 ]
2013-03-01 12:07:15 -05:00
7e6efeda7c
pledge buttons have embiggened border and color change on hover
2013-02-18 12:08:35 -05:00
f674278b02
mouseover shows exact percent of goal
2013-02-18 11:58:38 -05:00
f23ad3a9cb
oh, so that's how this works! [ fix #44116341 ]
2013-02-08 18:21:16 -05:00
61b2859a02
testing all the edge cases and editing accordingly
2013-02-08 15:55:43 -05:00
ffe4ea2943
needs to bind to actions on big green button. also, streamliniing
2013-02-08 15:55:28 -05:00
a060cf0f51
improving gradient
2013-02-07 14:10:00 -05:00
cf58570c2e
moving informational and call-to-action elements of work page
2013-02-07 13:37:54 -05:00
145ba865db
fade back in feedback div, streamline syntax, make sure to bind to hijax links in footer too
2013-02-07 09:10:46 -05:00
c761d5819d
first pass at moving big button
2013-02-06 16:26:07 -05:00
1afdd5e21f
bugfixing
2013-02-04 12:09:38 -05:00
b952bbb897
now can bind to download links not present at page creation, so needs delegated event handling
2013-02-04 12:09:29 -05:00
8c07df1fb1
making load of books ajaxy to spare reload of rest of page
2013-02-04 11:28:58 -05:00
028e16866c
resolve conflicts for merge master into libraries
2013-01-24 17:08:40 -05:00
b895b86d21
libraries page has content
2013-01-21 12:02:35 -05:00
95ae064e81
also need some content
2013-01-21 10:33:25 -05:00
a870408d68
we need this in the refactor too
2013-01-16 13:42:39 -05:00
ed28106a1e
factoring out some shared css
2013-01-16 13:08:37 -05:00
e00b43870c
it would be great if the embed thing actually worked
2013-01-16 13:08:21 -05:00
5fb880c9da
sharing options on download page
2013-01-16 12:50:20 -05:00
db8977ca16
Merge pull request #107 from Gluejar/book_panel_nits
...
Book panel nits
2013-01-10 06:36:56 -08:00
9b2928bd0a
moar tutorials
2013-01-09 13:07:03 -05:00
869d89b7ad
for coordinating Less settings
2013-01-04 16:18:51 -05:00
6285f3e286
why were these not minified
2013-01-03 16:33:35 -05:00
8ec5f7e2a2
one more tutorial while I'm at it
2013-01-03 13:58:17 -05:00
c2bc4f6b68
tidying visibly wrong things
2013-01-02 16:10:32 -05:00
8d321d46dc
final incorporation of all stray CSS changes
2013-01-02 15:55:10 -05:00
0a86448d98
addressing CSS comments and also fixing some invalid html
...
Conflicts:
frontend/templates/unglued_list.html
static/css/book_panel.css
static/css/lists.css
static/less/lists.less
2013-01-02 15:51:21 -05:00
b7ae54948e
line up icons better and more clearly indicate status of books with successful campaigns
...
Conflicts:
frontend/templates/book_panel.html
static/css/book_panel.css
2013-01-02 15:50:13 -05:00
4ac487a7c9
unwinding useful changes from discarded two-tab model
2013-01-02 15:48:49 -05:00
26b2f0c00f
Merge branch 'master' into list_tab_vertical_centering
2013-01-02 15:36:10 -05:00
cc4f748e36
update all list pages to have two-line tab content
2013-01-02 15:35:42 -05:00
a6186e3bc6
Merge pull request #90 from Gluejar/prettier_acks
...
prettifying acks page, make it easier to read
2013-01-02 10:54:24 -08:00
e305a1ee74
Merge branch 'master' into prettier_acks
2013-01-02 10:53:05 -05:00
4c1b64c154
update successful books in unglued tab on other tabbed pages
2012-12-31 14:57:01 -05:00
83d3e5ba82
position lightbox relative to top of viewport, allow for scrolling
2012-12-31 09:49:09 -05:00
7a0e2bfbd8
addressing ul, li, dt, dd comments
2012-12-19 10:22:11 -05:00
4a307a1e00
addressing CSS comments and also fixing some invalid html
2012-12-17 14:23:23 -05:00
ab2d3d51b6
Merge branch 'master' into unglued_books_tab
2012-12-14 10:46:11 -05:00
73266f07eb
line up icons better and more clearly indicate status of books with successful campaigns
2012-12-14 10:45:16 -05:00
b001aefeeb
separating unglued and PD works on ready-to-read page
2012-12-13 15:25:01 -05:00
658783306c
Merge branch 'master' into prettier_acks
...
Conflicts:
frontend/templates/front_matter.html
2012-12-11 13:18:57 -05:00
f2b715f3e8
syntax error
2012-12-11 13:06:45 -05:00
3dfc81dd5e
fix [ #40374577 ]
2012-11-30 12:28:45 -05:00
37bc427a75
prettifying acks page, make it easier to read
2012-11-30 10:20:13 -05:00
6098940970
this should have made it in to the loader graphic branch and didn't somehow...
2012-11-29 10:54:28 -05:00
1cd50d716f
display submit buttons as loading gifs for transactions that might take a while
2012-11-27 13:32:25 -05:00
54a8a31c8c
Merge branch 'master' into pledge_sidebar
2012-11-21 17:00:33 -05:00
e1c2862f1a
prevent line break in user_menu
2012-11-21 16:58:10 -05:00
b615a7598d
fix CSS in case of short usernames
2012-11-20 16:05:52 -05:00
7fcd0ba3af
change css filenames so that we can force user refresh
2012-11-20 14:26:06 -05:00
a2abb92038
makes pledge action clearer by describing in more contexts and using Pledge rather than Support
2012-11-20 09:56:04 -05:00
570394aa3d
Merge pull request #81 from Gluejar/clarify_acks_more
...
Clarify acks more -- looks good
2012-11-19 10:17:11 -08:00
b6fa40a281
fixing errors in display of underlying page elements when lightboxed
2012-11-19 13:03:21 -05:00
e5edbd1897
all a font sizes should now be inherited
2012-11-19 11:23:44 -05:00
5af0adcc01
desuckify other line spacing
2012-11-16 15:54:05 -05:00
34fad5bc11
increase line spacing for things with lots of text
2012-11-16 15:48:58 -05:00
1ff7b5be58
standardize appearance of login/account forms
2012-11-16 15:47:19 -05:00
bc56a1b56b
making signin box prettier
2012-11-14 10:32:03 -05:00
5056396b86
addressing comments, checking all /accounts/ urls for styling
2012-11-12 10:39:33 -05:00
2dc20d18ec
Merge branch 'master' into hijaxify_signin
2012-11-12 10:10:59 -05:00
097241493c
separating out rest of hijax vs non-hijax styling
2012-11-07 15:56:37 -05:00
c5ed14b6dc
further rectifying css
2012-11-07 15:34:10 -05:00
67ab8a8729
embiggening google signin
2012-11-07 15:11:13 -05:00
0e0b81808c
prettifying google signup handling
2012-11-07 15:03:27 -05:00
d9905df303
first pass at hijaxifying signin link
2012-11-07 14:58:40 -05:00
affa8239c3
more prettifying
2012-11-07 13:45:19 -05:00
929c4d1a13
now the nav menu is prettier
2012-11-07 13:40:05 -05:00
304ddb6bdc
add badge to avatar when there are unseen notifications
2012-11-06 10:06:10 -05:00
2d4740f037
round user avatar corners sitewide, not just on pages with supporter layout
2012-11-06 09:53:56 -05:00
30b4381cf0
don't set font size for a if you want it to inherit
2012-11-06 09:36:09 -05:00
9b1b968ac2
font-size: inherit, it is the best
2012-11-06 09:34:50 -05:00
f4505ca561
embiggen header font
2012-11-06 09:30:41 -05:00
1a83b6cfc4
Merge pull request #73 from Gluejar/clarify_acknowledgements
...
Clarify acknowledgements
2012-10-24 09:14:12 -07:00
08e49036d1
Merge pull request #74 from Gluejar/fix_nav_menu
...
Fix nav menu
2012-10-24 09:13:43 -07:00
89b92b4dba
add acknowledgements to support menu
2012-10-24 11:25:17 -04:00
a8727c6612
css tweaks
2012-10-19 16:29:37 -04:00
104992612b
first pass at making things visually distinct if there are notifications
2012-10-19 15:01:06 -04:00
1bf4743667
making notifications prettier
2012-10-19 12:19:56 -04:00
11aac359e6
adding drop-down menu
2012-10-19 12:01:28 -04:00
15367a8b54
syntax error
2012-10-19 12:01:18 -04:00
17bfb3c58c
remove no-longer=used ack_link, get data from form values
2012-10-18 14:17:11 -04:00
02145b22b5
feedback button obscures useful things like profile add, is less important now anyway
2012-10-16 10:20:58 -04:00
82e0e17017
stopgap for [ #37714043 ]
2012-10-14 15:20:55 -04:00
1a5d28369b
this was only meant to hit input textboxes, not submit button
2012-10-14 11:36:31 -04:00
82a35d0ec2
simplified reconcile_pledge javascript a bit
...
I went over this with a fine-tooth comb looking for a bug that wasn't
there
2012-10-12 22:31:18 -04:00
dd7334b54b
explanation of CVC [ #36797599 ]
2012-10-12 14:57:38 -04:00
f98fc0b7a6
widening CC number box, rounding all corners on error display [ #36797599 ]
2012-10-12 14:23:54 -04:00
cc4c190d73
adding address collection to fund_the_pledge
2012-10-11 13:49:56 -04:00
6893b549a2
first pass at adding address collection
2012-10-10 14:23:02 -04:00
839ce0496f
Merge branch 'master' into collect_address_info
...
Conflicts:
static/css/sitewide.css
static/less/sitewide.less
2012-10-10 10:26:48 -04:00
5b1f673a6f
deactivate pledge box, handle nonprofit.is_on better
2012-10-09 16:11:57 -04:00
2bea7e89f4
Merge branch 'master' into pledge_pretty_stick
...
Conflicts:
frontend/templates/pledge.html
static/css/pledge.css
static/less/pledge.less
2012-10-05 15:06:37 -04:00
920f856bcd
prettifying
2012-10-05 15:05:15 -04:00
b9ac8523d2
Merge pull request #36 from Gluejar/new_rh_instructions
...
New rh instructions
2012-10-05 09:20:31 -07:00
bc87b559fc
adding value to pledge box by clicking on premium needs to also activate acknowledgements
2012-10-05 12:00:20 -04:00
dc268bd217
if pledge box is empty, clicking on nontrivial pledge will fill [ #36325899 ]
2012-10-05 11:53:58 -04:00
487724dc91
improving campaign launch instructions
2012-10-05 11:30:49 -04:00
5ca4d5c4c8
improving layout of premium addition
2012-10-04 12:08:40 -04:00
e99a88c103
Merge branch 'pledged_badges' of github.com:Gluejar/regluit into pledged_badges
2012-10-03 16:28:51 -04:00
d439106cf4
badge outline to thin gray
2012-10-03 16:20:43 -04:00
4ea8dbdfac
anonymity needs to adhere to whole pledge and be communicated clearly regardless of amount if we're doing badges
2012-10-03 16:02:51 -04:00
2cdb945812
finishing new layout
2012-10-03 13:44:33 -04:00
757a3469b5
let's use css for borders
2012-10-03 13:15:46 -04:00
113148d6a9
swapped badges, deleted empty badge, added title to edit icon
2012-10-03 12:17:23 -04:00
ae857b3c8f
restyle badges and edit profile function
2012-10-03 10:59:57 -04:00
deb67de0b8
Revert "try this placement of the star"
...
This reverts commit e4cccc277f
2012-10-03 08:57:35 -04:00
e4cccc277f
try this placement of the star
2012-10-02 14:17:26 -04:00
2371aad994
update FAQ to reflect new payment system
2012-10-02 09:18:44 -04:00
d54f45d511
further aesthetic refinements
2012-10-01 15:53:41 -04:00
33e652881c
Merge branch 'master' into pledged_badges
2012-10-01 15:38:52 -04:00
6a6045e9ab
first pass at prettifying stripe process
2012-10-01 15:31:17 -04:00
bf212ed165
prettier stars matching site colors
2012-10-01 15:10:45 -04:00
8cb4586f78
Merge pull request #20 from Gluejar/relaunch
...
Relaunch
2012-09-28 07:55:07 -07:00
f327db6efd
Merge pull request #19 from Gluejar/improvify_download_page
...
Improvify download page with readmill [finish #36156381 ]
2012-09-26 13:04:39 -07:00
0f546f50a3
invoke target script directly rather than invoking script that (inconsistently) invokes it
2012-09-25 10:54:31 -04:00
ccc082545a
[ #32289887 ] add worldcat learn more...
...
test it on /work/82838/
2012-09-24 15:36:39 -04:00
a91a70e6ef
Merge pull request #12 from Gluejar/master
...
merge all the mester into relaunch
2012-09-24 09:07:44 -07:00
4b49b1df4b
display badges on user profiles [ #29340547 ]
2012-09-22 23:55:07 -04:00
5419c869ed
now the readmill script works on the lightbox too
2012-09-19 12:08:27 -04:00
da2f1e0665
Merge branch 'master' into relaunch
2012-09-14 17:05:29 -07:00
a3390b88bb
Merge pull request #2 from Gluejar/fix_wishlist_js
...
adding functionality erroneously removed, plus updating to use recent jq...[#35857177 ]
2012-09-14 07:07:17 -07:00
6a2efa9c68
adding functionality erroneously removed, plus updating to use recent jquery function
2012-09-14 09:21:05 -04:00
b08643a0ac
Merge branch 'master' into relaunch
2012-09-13 10:50:43 -07:00
fdf27c4029
make work title on download page a link
2012-09-13 11:14:32 -04:00
de78548a32
list press releases on press page
2012-09-12 11:31:22 -04:00
5fa34858df
download button overlapped with some titles
2012-09-11 14:12:00 -04:00
0773a10d16
streamlining
2012-09-11 13:57:00 -04:00
deee2ab75a
Merge branch 'master' into relaunch
...
Conflicts:
core/signals.py
frontend/views.py
2012-09-10 14:25:43 -07:00
7398fdf161
unglued property should adhere to editions, not ebooks
2012-09-10 15:18:40 -04:00
3a0d09db33
edition-adding on rights tab was hard to read with multiple editions
2012-09-10 14:37:37 -04:00
f596a7fd21
Merge branch 'master' into newpayment
2012-08-29 15:43:02 -07:00
d00e434d41
Merge branch 'master' into newpayment
...
Conflicts:
frontend/views.py
2012-08-29 08:10:49 -07:00
bd48fdb437
Adding stripe payment tag use
2012-08-29 07:34:20 -07:00
863bfe5856
/about/ pages need appropriate styling and should not conflict if user clicks on About in header
2012-08-28 13:47:29 -04:00
13171f6472
making sure the styling works no matter where download link is clicked from
2012-08-28 10:22:47 -04:00
48e20a7cdd
bringing all the lightboxes under the hijax.js system
2012-08-27 15:35:29 -04:00
af8bb1ab6d
replaced with better hijax.js
2012-08-27 15:34:42 -04:00
a258660138
moving to ajax system means these files should live in templates/
2012-08-27 15:26:40 -04:00
981790883e
Merge branch 'master' into newpayment
...
Conflicts:
frontend/views.py
2012-08-27 07:59:12 -07:00
cc70ff1765
adding download instructions
2012-08-24 18:48:28 -04:00
a6e034a36a
rudimentary download page plus logic to serve it
2012-08-24 15:14:32 -04:00
07a50bfa45
we should have non-input-buttons that are styled the same for calls to action
2012-08-24 15:14:08 -04:00
4643bf4ac5
tweak to be compatible with download page
2012-08-24 15:13:29 -04:00
adef29f536
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
...
Conflicts:
core/signals.py
2012-08-16 17:11:12 -04:00
28670ed01a
building LOCKSS manifest page
2012-08-15 09:40:37 -04:00
2a008416b9
now minified
2012-08-14 14:53:56 -04:00
2c555ef98d
widths of ack boxes should add up to 100
2012-08-14 14:53:28 -04:00
da0f4970c2
improving data flow of acks throughout system
2012-08-06 15:44:43 -04:00
270a686049
Merge branch 'master' of github.com:Gluejar/regluit into mandatory_premiums
...
Conflicts:
static/css/lists.css
2012-08-06 09:37:09 -04:00
94d3b724a3
tweaks
2012-08-03 15:25:42 -04:00
4a63b21124
making a style element more specific so it doesn't inadvertently apply to the book panel on the pledge page
2012-08-02 11:25:00 -04:00
6ddb6ba4e2
fixing display of number of wishers when not on supporter or search page - make sure all needed styling is in book_panel.css
2012-08-02 11:13:03 -04:00
a41c0235c7
merging
2012-08-02 11:12:37 -04:00
6a70f80bd6
Merge branch 'master' of github.com:Gluejar/regluit
2012-08-02 11:05:31 -04:00
5d923174b6
correcting display of number of wishers
2012-08-02 11:05:18 -04:00
9d584a873e
font size tweaks
2012-08-01 12:08:57 -04:00
9c3871d7b1
clarifying supporter vs benefactor vs bibliophile
2012-08-01 12:08:31 -04:00
86f87d9b80
no longer actually using this anywhere
2012-08-01 10:56:49 -04:00
19b71222fa
more post-testing fixes
2012-08-01 09:08:07 -04:00
5f373fb289
taking care of some edge cases after testing
2012-08-01 08:52:53 -04:00
b041430731
front end for new pledge page, plus just enough back end that it displays
2012-08-01 08:52:39 -04:00
05ae85a32d
intermediate state
2012-07-31 07:46:09 -04:00
c59b96a137
A temporary fix to slidesjs to keep it from marking the first image url in a slideshow.
...
inspiration: https://groups.google.com/forum/?fromgroups#!searchin/slidesjs/img/slidesjs/uqGYOQuDLJM/t6xli3ypyCkJ
2012-07-25 16:46:49 -07:00
fdce89d17b
Added language filtering [finish #24232285 ]
2012-07-21 16:26:16 -04:00
ac72d2a4c7
addressing IE8 bug with feedback button, I hope
2012-07-18 15:10:29 -04:00
c9871b29a2
Merge branch 'wishlist_tabs'
...
Conflicts:
frontend/templates/base.html
2012-07-17 08:53:28 -04:00
f32cb39d9a
added conditionals to make sure phrasing made sense for empty wishlists, and clarified who chooses the ungluing fee
2012-07-17 08:47:53 -04:00
362a4d2b85
Merge branch 'master' of github.com:Gluejar/regluit
2012-07-16 14:52:38 -04:00
abdb4ddfc7
adding separator between headline and notification text
2012-07-16 14:46:45 -04:00
36c6a5614e
[finish #27011135 ] fixed "login to pledge" trapped in iframe
2012-07-11 21:06:12 -04:00
a41178d53c
increasing spacing between comments
2012-07-09 10:57:36 -04:00
ac2763eac9
increasing line height to make premiums more readable after font size increase
2012-07-09 10:37:08 -04:00
e2962e1075
[finish #30516251 ] supporter acknowledgement page basic version
2012-07-07 18:13:05 -04:00
9152655587
list ungluers in two-column format by reverse of date wished [ #32289815 ]
2012-07-05 11:33:57 -04:00
3ce4db8e9a
change support to premiums and make it clickable [ #32289833 ]
2012-07-05 10:39:19 -04:00
1bf0fe8d26
moving notification alert inline [ #32289941 ]
2012-07-05 10:30:26 -04:00
86a9fc5039
first draft customized for each
2012-06-14 17:15:32 -03:00
2beb4e5dbb
commenting
2012-06-14 17:15:11 -03:00
7a11e822d8
new about lightboxes for wishlist tabs; need to be in /static/ so they can be found by .js ajax call
2012-06-13 16:50:44 -03:00
eric
thatandromeda
Raymond Yee