Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Issue 3002, adds alt text display to complement issue 2541 #579

Merged
merged 1 commit into from

2 participants

@mumble
Collaborator

Issue 3002, adds alt text display to complement issue 2541

@elzj elzj merged commit e5bc8cb into otwcode:master
@shalott shalott referenced this pull request from a commit in shalott/otwarchive
@shalott shalott Squashed commit of the following:
commit 59bcba4
Merge: 3016ce0 2544aa9
Author: Cristina <enigel@gmail.com>
Date:   Mon Apr 16 17:41:07 2012 -0700

    Merge pull request #582 from elzj/issue-2943-unwrangleable-tags

    Issue 2943: Unwrangleable tags

commit 3016ce0
Merge: e5bc8cb 1c5436e
Author: Cristina <enigel@gmail.com>
Date:   Sun Apr 15 09:00:17 2012 -0700

    Merge pull request #580 from elzj/series-restricted

    Issue 2169: Series with public works stuck as restricted

commit e5bc8cb
Merge: 2760113 81c54aa
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 15 08:52:05 2012 -0700

    Merge pull request #579 from mumble/issue3002

    Issue 3002, adds alt text display to complement issue 2541

commit 2760113
Merge: 20e1f75 bc7118f
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 15 08:51:28 2012 -0700

    Merge pull request #581 from CristinaRO/tos-feature

    Updating cuke to reflect the changes in class structure

commit 2544aa9
Author: elz <elzj78@gmail.com>
Date:   Sun Apr 15 11:17:18 2012 -0400

    Display unwrangleable tags on wrangle pages and don't include then in unfilterable lists

commit bc7118f
Author: Cristina <cristinar@gmail.com>
Date:   Sun Apr 15 15:13:42 2012 +0100

    Updating cuke to reflect the changes in class structure

commit 67cdc5c
Author: elz <elzj78@gmail.com>
Date:   Sun Apr 15 10:12:14 2012 -0400

    Issue 2943: Allow wranglers to mark tags as unwrangleable

commit 1c5436e
Author: elz <elzj78@gmail.com>
Date:   Sun Apr 15 09:25:11 2012 -0400

    Issue 2169: Series with public works stuck as restricted

commit 81c54aa
Author: mumble <mumble@gmail.com>
Date:   Sat Apr 14 20:52:09 2012 +0000

    Issue 3002, adds alt text display to complement issue 2541

commit 20e1f75
Merge: fd0baf8 108120d
Author: Elz <elzj78@gmail.com>
Date:   Fri Apr 13 20:20:32 2012 -0700

    Merge pull request #576 from sarken/issue_2133

    Fix issue 2133 with pseud works index displaying user instead of pseud

commit 108120d
Author: sarken <sarken@gmail.com>
Date:   Sat Apr 14 01:47:11 2012 +0000

    Fix error when not viewing pseud

commit fd0baf8
Author: Sidra <alice@alum.mit.edu>
Date:   Sat Apr 14 01:28:53 2012 +0000

    rdoc update

commit 93cd7ad
Merge: af7b072 169a8c4
Author: Cristina <enigel@gmail.com>
Date:   Fri Apr 13 17:47:15 2012 -0700

    Merge pull request #575 from elzj/issue-2959-series-edit

    Issues 2959 and 2614: Series edit bugs

commit af7b072
Merge: 54fa4a1 8c2039e
Author: Elz <elzj78@gmail.com>
Date:   Fri Apr 13 17:41:48 2012 -0700

    Merge pull request #574 from sarken/issue_650

    Issue 650 with CSS up/downcasing

commit 54fa4a1
Merge: 1b3d4a2 90f056f
Author: Cristina <enigel@gmail.com>
Date:   Fri Apr 13 17:39:02 2012 -0700

    Merge pull request #572 from elzj/issue-2995-draft-posting

    Issue 2995: drafts not being posted via post without preview

commit 1b3d4a2
Merge: 278ba23 852c048
Author: Cristina <enigel@gmail.com>
Date:   Fri Apr 13 17:34:33 2012 -0700

    Merge pull request #573 from elzj/issue-2999-content-max

    Issue 2999: Increase max chapter length

commit 278ba23
Merge: 70b8ec5 2f4b70b
Author: Cristina <enigel@gmail.com>
Date:   Fri Apr 13 17:30:43 2012 -0700

    Merge pull request #577 from elzj/errbit

    Switching to errbit, taking out piwik

commit 2f4b70b
Author: elz <elzj78@gmail.com>
Date:   Fri Apr 13 20:21:44 2012 -0400

    Adding info for errbit error handling, removing Piwik plugin while I'm at it

commit 8c2039e
Author: sarken <sarken@gmail.com>
Date:   Fri Apr 13 08:59:28 2012 +0000

    Missed a lowercase in mobile

commit 69f8233
Author: sarken <sarken@gmail.com>
Date:   Fri Apr 13 05:46:56 2012 +0000

    Fix issue 2133 with pseud works index displaying user isntead of pseud

commit 169a8c4
Author: elz <elzj78@gmail.com>
Date:   Thu Apr 12 22:41:37 2012 -0400

    Issue 2959: fixing 500 error when series is invalid and live validation doesn't catch it. Also issue 2614: coauthor field on series form was broken.

commit 407e993
Author: sarken <sarken@gmail.com>
Date:   Fri Apr 13 01:42:43 2012 +0000

    Remove a font-variant override that should be unnecessary now

commit 9781455
Author: sarken <sarken@gmail.com>
Date:   Fri Apr 13 01:39:40 2012 +0000

    Fix Issue 650 removing remaining front end up/downcasing

commit 852c048
Author: elz <elzj78@gmail.com>
Date:   Thu Apr 12 21:36:14 2012 -0400

    Issue 2999: Continue to use old max chapter length value for live validation to decrease odds of html formatting validation wackiness

commit 8d4d050
Author: elz <elzj78@gmail.com>
Date:   Thu Apr 12 21:27:59 2012 -0400

    Issue 2999: Increase allowed chapter content length

commit 70b8ec5
Merge: 5614355 d11e0db
Author: Elz <elzj78@gmail.com>
Date:   Thu Apr 12 18:16:33 2012 -0700

    Merge pull request #571 from sarken/issue_2987

    Fix Issue 2987 with typo in password reset email

commit 5614355
Merge: bf47d19 1755c9b
Author: Elz <elzj78@gmail.com>
Date:   Thu Apr 12 18:16:01 2012 -0700

    Merge pull request #570 from sarken/issue_2993

    Fix issue 2993 with broken line break tag in gift notification

commit bf47d19
Merge: 3a157a0 19c7131
Author: Elz <elzj78@gmail.com>
Date:   Thu Apr 12 18:15:33 2012 -0700

    Merge pull request #569 from sarken/issue_2737

    Issue 2737 tidying main classes on site pages

commit 3a157a0
Merge: 60e7ff6 4a73360
Author: Elz <elzj78@gmail.com>
Date:   Thu Apr 12 18:13:23 2012 -0700

    Merge pull request #568 from mumble/issue2579

    Quick fix for the problem with comments getting attached to unposted chapters

commit 60e7ff6
Merge: 5066ae3 71192ac
Author: Elz <elzj78@gmail.com>
Date:   Thu Apr 12 18:12:41 2012 -0700

    Merge pull request #567 from mumble/2064_pagetitles

    2064 pagetitles: take two

commit 5066ae3
Merge: 9f01f88 8612aa8
Author: Elz <elzj78@gmail.com>
Date:   Thu Apr 12 18:11:32 2012 -0700

    Merge pull request #566 from sarken/issue_2994

    Fix issue 2994 with drafts being indistinct from posted works

commit 9f01f88
Merge: 75c5cad 649f5d3
Author: Elz <elzj78@gmail.com>
Date:   Thu Apr 12 18:11:03 2012 -0700

    Merge pull request #565 from CristinaRO/cuke-import-ffn

    updating the import cuke to the new and sad reality

commit 75c5cad
Merge: 5aa3e96 aa72029
Author: Elz <elzj78@gmail.com>
Date:   Thu Apr 12 18:10:42 2012 -0700

    Merge pull request #564 from CristinaRO/pmeme-reloaded

    Pmeme reloaded

commit 5aa3e96
Merge: ad5f588 87356d8
Author: Elz <elzj78@gmail.com>
Date:   Thu Apr 12 18:10:05 2012 -0700

    Merge pull request #481 from cesy/issue2541

    Issue 2541

commit ad5f588
Merge: 8de2c0b 2fde0f5
Author: Elz <elzj78@gmail.com>
Date:   Thu Apr 12 18:09:19 2012 -0700

    Merge pull request #563 from derenrich/master

    Crush the rest of the PNGs

commit 90f056f
Author: elz <elzj78@gmail.com>
Date:   Thu Apr 12 20:56:06 2012 -0400

    Issue 2995: drafts not being posted via post without preview

commit d11e0db
Author: sarken <sarken@gmail.com>
Date:   Fri Apr 13 00:23:21 2012 +0000

    Fix Issue 2987 with typo in password reset email

commit 1755c9b
Author: sarken <sarken@gmail.com>
Date:   Fri Apr 13 00:16:03 2012 +0000

    Fix issue 2993 with typo in gift email br tag

commit 19c7131
Author: sarken <sarken@gmail.com>
Date:   Thu Apr 12 22:51:04 2012 +0000

    Fix classes on TOS FAQ

commit 4a73360
Author: mumble <mumble@gmail.com>
Date:   Thu Apr 12 20:09:08 2012 +0000

    Quick fix for the problem with comments getting attached to unposted chapters

commit d3d7e15
Author: sarken <sarken@gmail.com>
Date:   Thu Apr 12 01:30:31 2012 +0000

    Fix resulting first login help box issue

commit c3fb7a1
Author: sarken <sarken@gmail.com>
Date:   Thu Apr 12 01:06:59 2012 +0000

    Modify helper, change CSS, fix classes

commit 71192ac
Author: mumble <mumble@gmail.com>
Date:   Wed Apr 11 18:53:21 2012 +0000

    Adds subtitles to wrangling area, most importantly to wrangler pages and show/edit/wrangle tags

commit 04ed1c9
Author: mumble <mumble@gmail.com>
Date:   Wed Apr 11 17:59:44 2012 +0000

    Adds subtitle for series index by pseud

commit ac600aa
Author: mumble <mumble@gmail.com>
Date:   Wed Apr 11 17:54:58 2012 +0000

    Adds subtitles for bookmark indices by tag and by pseud

commit ea65845
Author: sarken <sarken@gmail.com>
Date:   Wed Apr 11 03:23:50 2012 +0000

    Make the classes work

commit a00e81d
Author: sarken <sarken@gmail.com>
Date:   Tue Apr 10 03:39:12 2012 +0000

    Add tos, tos faq, donate, and site map

commit 8612aa8
Author: sarken <sarken@gmail.com>
Date:   Mon Apr 9 21:09:00 2012 +0000

    Fix issue 2994 with drafts being indistinct from posted works

commit 649f5d3
Author: Cristina <cristinar@gmail.com>
Date:   Mon Apr 9 21:18:20 2012 +0100

    updating the import cuke to the new and sad reality

commit aa72029
Author: Cristina <cristinar@gmail.com>
Date:   Mon Apr 9 20:58:43 2012 +0100

    oops, removing debug step

commit 6dfa4e6
Author: Cristina <cristinar@gmail.com>
Date:   Mon Apr 9 20:53:45 2012 +0100

    fixing a cuke related to the fix for issue 2876

commit 8de2c0b
Author: Sidra <alice@alum.mit.edu>
Date:   Sat Apr 7 01:28:46 2012 +0000

    rdoc update

commit 97bf62a
Author: sarken <sarken@gmail.com>
Date:   Tue Apr 3 22:06:53 2012 +0000

    Add classes to more areas

commit 3beae0f
Author: sarken <sarken@gmail.com>
Date:   Tue Apr 3 20:44:58 2012 +0000

    Put hyphen back in for most cases

commit 0923dc9
Author: sarken <sarken@gmail.com>
Date:   Tue Apr 3 09:22:34 2012 +0000

    Modify classes for known issues, support, faq

commit 4a8d0ee
Author: sarken <sarken@gmail.com>
Date:   Tue Apr 3 08:36:56 2012 +0000

    Remove hyphen between controller name and action name

commit 2fde0f5
Author: Daniel Erenrich <daniel@erenrich.net>
Date:   Sun Apr 1 10:40:03 2012 -0700

    crush all remaining pngs, saving ~400kB total

commit 5b81cb6
Merge: 189eaee 3cb81bd
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 09:57:43 2012 -0700

    Merge pull request #480 from cesy/issue2876-b

    Issue 2876 view fulfilled claims on user page

commit 189eaee
Merge: fecb91f 0fe77fa
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 09:56:55 2012 -0700

    Merge pull request #559 from derenrich/master

    Apply pngcrush to some of the images

commit fecb91f
Merge: ddd3597 7dff27d
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:39:57 2012 -0700

    Merge pull request #562 from sarken/issue_2837

    Fix issue 2837 with delete series confirmation message

commit ddd3597
Merge: 3758263 d772150
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:38:42 2012 -0700

    Merge pull request #558 from sarken/issue_2983

    Fix issue 2983 with links opening in new window

commit 3758263
Merge: 1761cbe 00a5978
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:38:18 2012 -0700

    Merge pull request #557 from sarken/issue_2985

    Fix issue 2985 with invalid cursor value

commit 1761cbe
Merge: 255421c 539aac3
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:38:01 2012 -0700

    Merge pull request #556 from sarken/issue_2984

    Fix Issue 2984 changing cursor on filter headings

commit 255421c
Merge: 6ea0a28 3bf215a
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:37:46 2012 -0700

    Merge pull request #555 from sarken/issue_2532

    Fix Issue 2532 adding main ARIA landmark to home page

commit 6ea0a28
Merge: 706b1b1 305dfce
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:37:26 2012 -0700

    Merge pull request #554 from sarken/issue_2889

    Issue 2889 stylesheet links do not meet XHTML standards

commit 706b1b1
Merge: d05d548 9e1b034
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:37:07 2012 -0700

    Merge pull request #553 from sarken/issue_1205

    Fix Issue 1205 with styling on error messages for create user page

commit d05d548
Merge: b57ea93 368542f
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:36:48 2012 -0700

    Merge pull request #552 from sarken/issue_2981

    Issue 2981 with missing paragraph tag on canonical field's text on tags edit

commit b57ea93
Merge: 6ac29fc fbf604c
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:36:29 2012 -0700

    Merge pull request #551 from sarken/issue_2906

    Issue 2906 with chapter draft notice text

commit 6ac29fc
Merge: 8603318 a397503
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:35:38 2012 -0700

    Merge pull request #549 from sarken/issue_2597

    Fix Issue 2597 with missing hidden-by-admin icon on bookmarks

commit 8603318
Merge: f47e5a6 0c7a6ad
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:35:19 2012 -0700

    Merge pull request #548 from sarken/issue_2695

    Fix Issue 2695 with comment textarea resizing on edit with error

commit f47e5a6
Merge: cf07999 fc41435
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:34:59 2012 -0700

    Merge pull request #528 from mumble/2064_pagetitles

    Issue 2064 - prettier pagetitles

commit cf07999
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 09:18:03 2012 -0300

    Commenting out after task that was already run

commit 7dff27d
Author: sarken <sarken@gmail.com>
Date:   Sun Apr 1 09:00:54 2012 +0000

    Fix issue 2837 with delete series confirmation message

commit 0370a4d
Merge: a675d3f 10f4e4d
Author: Cristina <enigel@gmail.com>
Date:   Sat Mar 31 15:49:24 2012 -0700

    Merge pull request #561 from elzj/ffnet_import_message

    Adding messages to make it clear why ff.net imports aren't working

commit 10f4e4d
Author: elz <elzj78@gmail.com>
Date:   Sat Mar 31 18:43:17 2012 -0400

    Adding messages to make it clear why ff.net imports aren't working

commit a675d3f
Merge: a4e3050 13744cd
Author: Elz <elzj78@gmail.com>
Date:   Sat Mar 31 14:42:16 2012 -0700

    Merge pull request #560 from CristinaRO/hit_counters_rake

    Updating syntax to get hit counters rake working again

commit 13744cd
Author: Cristina <cristinar@gmail.com>
Date:   Sat Mar 31 21:22:31 2012 +0100

    Updating syntax to get hit counters rake working again

commit a4e3050
Author: Sidra <alice@alum.mit.edu>
Date:   Sat Mar 31 01:28:45 2012 +0000

    rdoc update

commit 0fe77fa
Author: Daniel Erenrich <daniel@erenrich.net>
Date:   Fri Mar 30 17:57:21 2012 -0700

    crush logos

commit 0336220
Author: Daniel Erenrich <daniel@erenrich.net>
Date:   Fri Mar 30 17:49:18 2012 -0700

    crush pngs

commit d772150
Author: sarken <sarken@gmail.com>
Date:   Fri Mar 30 00:28:18 2012 +0000

    Fix issue 2983 with links opening in new window

commit 539aac3
Author: sarken <sarken@gmail.com>
Date:   Fri Mar 30 00:16:01 2012 +0000

    Fix Issue 2984 changing cursor on filter headings

commit 00a5978
Author: sarken <sarken@gmail.com>
Date:   Fri Mar 30 00:05:50 2012 +0000

    Fix issue 2985 with invalid cursor value

commit 4110c79
Merge: 3314051 30fc806
Author: Elz <elzj78@gmail.com>
Date:   Tue Mar 27 19:11:55 2012 -0700

    Merge pull request #550 from CristinaRO/issue-2945-empty-feed-2944-gifts-redirect

    Issues 2944 and 2845 enhancements

commit 3314051
Merge: 109a4bb bf48565
Author: Elz <elzj78@gmail.com>
Date:   Tue Mar 27 19:08:20 2012 -0700

    Merge pull request #454 from cesy/cukes

    Cuke failures in challenge_promptmeme

commit 3bf215a
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 26 07:22:45 2012 +0000

    Fix Issue 2532 adding main ARIA landmark to home page

commit 305dfce
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 26 06:43:47 2012 +0000

    Issue 2889 stylesheet links do not meet XHTML standards

commit 9e1b034
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 26 06:04:30 2012 +0000

    Fix Issue 1205 with create user error styling

commit 0c7a6ad
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 26 05:52:01 2012 +0000

    Apply fix to all span.error

commit 368542f
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 26 03:25:41 2012 +0000

    Fix issue with missing paragraph tags on canonical field's text on tags edit

commit fbf604c
Merge: 73fd4ff a05dd0b
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 26 01:37:20 2012 +0000

    Take the draft notice banner out in preview mode

commit 73fd4ff
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 26 01:35:26 2012 +0000

    Remove draft notice from preview mode

commit d7b682c
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 26 00:22:30 2012 +0000

    Trying a banner for a draft notice

commit a05dd0b
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 26 00:22:30 2012 +0000

    Trying a banner for a draft notice

commit 30fc806
Author: Cristina <cristinar@gmail.com>
Date:   Mon Mar 26 01:06:28 2012 +0100

    Issue 2945: fixing a double render error, rescuing RecordNotFound errors; Issue 2944 enhancement: redirect to collection if available

commit a397503
Author: sarken <sarken@gmail.com>
Date:   Sun Mar 25 23:56:38 2012 +0000

    Fix Issue 2597 with missing hidden-by-admin icon on bookmarks

commit ecbf309
Author: sarken <sarken@gmail.com>
Date:   Sun Mar 25 03:26:57 2012 +0000

    Fix Issue 2695 with comment textarea resizing on edit with error

commit 109a4bb
Merge: 6f21b7f 0391341
Author: Cristina <enigel@gmail.com>
Date:   Sat Mar 24 17:33:32 2012 -0700

    Merge pull request #544 from shalott/tag_set_fix

    Tag set fix

commit 6f21b7f
Merge: 63ecab9 52cb106
Author: shalott <shalott@gmail.com>
Date:   Sat Mar 24 16:41:24 2012 -0700

    Merge pull request #546 from sarken/issue_2689

    Fix Issue 2689 with commas after all items in a comma list

commit 63ecab9
Merge: b9824f6 a99e204
Author: shalott <shalott@gmail.com>
Date:   Sat Mar 24 16:40:25 2012 -0700

    Merge pull request #545 from sarken/issue_2879

    Fix issue 2879 with two New Pseud buttons

commit b9824f6
Merge: b3b69f8 111944e
Author: shalott <shalott@gmail.com>
Date:   Sat Mar 24 16:39:25 2012 -0700

    Merge pull request #547 from sarken/issue_2673

    Fix issue 2673 so clicking the filter name expands the filter list

commit b3b69f8
Author: Sidra <alice@alum.mit.edu>
Date:   Sat Mar 24 01:28:48 2012 +0000

    rdoc update

commit 111944e
Author: sarken <sarken@gmail.com>
Date:   Thu Mar 22 08:44:33 2012 +0000

    Fix issue 2673 so header text expands filters

commit 52cb106
Author: sarken <sarken@gmail.com>
Date:   Thu Mar 22 06:31:18 2012 +0000

    Fix Issue 2689 with commas after all items in a comma list

commit a99e204
Author: sarken <sarken@gmail.com>
Date:   Thu Mar 22 04:08:11 2012 +0000

    Fix issue 2879 with two New Pseud buttons

commit 0391341
Author: shalott <shalott@gmail.com>
Date:   Wed Mar 21 22:55:05 2012 -0400

    fix for issue 2729

    http://code.google.com/p/otwarchive/issues/detail?id=2729

    typo in autocomplete for optional tags

    Signed-off-by: shalott <shalott@gmail.com>

commit fcd43da
Author: shalott <shalott@gmail.com>
Date:   Wed Mar 21 22:54:21 2012 -0400

    fix for issue with optional tag sets in challenge matching

    http://code.google.com/p/otwarchive/issues/detail?id=2980
    Signed-off-by: shalott <shalott@gmail.com>

commit b05f8f0
Merge: d67b692 a3ef914
Author: shalott <shalott@gmail.com>
Date:   Wed Mar 21 19:44:16 2012 -0700

    Merge pull request #538 from sarken/issue_2807

    Modify Issue 2807 fix with meta style that works in IE6 and 7

commit d67b692
Merge: 0ae0b95 912188b
Author: shalott <shalott@gmail.com>
Date:   Wed Mar 21 19:43:35 2012 -0700

    Merge pull request #539 from sarken/issue_2971

    Consolidate fix for issue 2971 with existing code

commit 0ae0b95
Merge: 9d5e8e4 8422c81
Author: shalott <shalott@gmail.com>
Date:   Wed Mar 21 19:42:38 2012 -0700

    Merge pull request #540 from teganm/master

    Issue 2773

commit 9d5e8e4
Merge: a3efce1 17ed9f2
Author: shalott <shalott@gmail.com>
Date:   Wed Mar 21 19:41:16 2012 -0700

    Merge pull request #541 from elzj/comment-index-error

    Fixing 500 error on comments index pages for works

commit a3efce1
Merge: 9f204d7 39aa33d
Author: shalott <shalott@gmail.com>
Date:   Wed Mar 21 19:40:02 2012 -0700

    Merge pull request #542 from sarken/issue_2978

    Fix issue 2978 with wrong text on edit multiple button

commit 9f204d7
Merge: ce650bf c38a9fd
Author: shalott <shalott@gmail.com>
Date:   Wed Mar 21 19:39:24 2012 -0700

    Merge pull request #543 from sarken/issue_2957

    Issue 2957

commit c38a9fd
Merge: 5e3c414 6ab7890
Author: sarken <sarken@gmail.com>
Date:   Wed Mar 21 23:03:48 2012 +0000

    Merge conflicts

commit 5e3c414
Author: sarken <sarken@gmail.com>
Date:   Wed Mar 21 22:44:36 2012 +0000

    Add faq class

commit ca3524e
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 12 04:58:29 2012 +0000

    Add faq class and styling

commit 39aa33d
Author: sarken <sarken@gmail.com>
Date:   Wed Mar 21 21:47:15 2012 +0000

    Fix issue 2978 with wrong text on edit multiple button

commit 17ed9f2
Author: elz <elzj78@gmail.com>
Date:   Wed Mar 21 21:36:59 2012 +0000

    Fixing 500 error on comments index pages for works

commit 8422c81
Author: Tegan Mulholland <teganmulholland@gmail.com>
Date:   Tue Mar 20 03:25:30 2012 +0000

    Change to skins help text, bug 2773

commit 912188b
Author: sarken <sarken@gmail.com>
Date:   Tue Mar 20 00:05:09 2012 +0000

    Consolidate fix for issue 2971

commit fc41435
Author: mumble <mumble@gmail.com>
Date:   Mon Mar 19 23:34:21 2012 +0000

    Fixes display of giftee in case of gift search within collection, and moves subtitle for user display below nil check on home and series page

commit a3ef914
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 19 23:03:29 2012 +0000

    Modify fix for issue 2807 to work in IE6 and 7

commit ce650bf
Merge: 5f0b05b 62e296e
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 19 09:46:23 2012 -0700

    Merge pull request #537 from sarken/issue_2807

    Fix issue 2807 with work meta on static pages

commit 5f0b05b
Merge: 6fff4fc a8bcbd8
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 19 09:46:01 2012 -0700

    Merge pull request #536 from sarken/issue_2833

    Fix issue 2833 with Bookmarked? search help causing 404

commit 6fff4fc
Merge: 82be675 1ac92b3
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 19 09:45:41 2012 -0700

    Merge pull request #535 from sarken/issue_2919

    Issues 2919 and 2952 with Condition on skins show page

commit 82be675
Merge: 0314f08 3693040
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 19 09:43:54 2012 -0700

    Merge pull request #534 from sarken/issue_2971

    Issue 2971 repeated styling on chapter form in secondary navigation

commit 0314f08
Merge: b67044f e9ed05a
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 19 09:42:26 2012 -0700

    Merge pull request #533 from sarken/issue_2932

    Fix issue 2932 with download menu in Opera with JS off

commit b67044f
Merge: 5872331 d57379f
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 19 09:41:42 2012 -0700

    Merge pull request #532 from sarken/issue_2970

    Fix issue 2970 adding navigation to search pages

commit 5872331
Merge: 03968f1 b257283
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 19 09:38:17 2012 -0700

    Merge pull request #531 from sarken/issue_2956

    Fix issue 2956 by adding podfic to front page and invite emails

commit 03968f1
Merge: 9bc471b 00c13fd
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 19 09:37:44 2012 -0700

    Merge pull request #530 from sarken/issue_2963

    Fix issue 2963 with unclickable navigation on mobile dashboard pages

commit 9bc471b
Merge: 81498e8 623991f
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 19 09:37:12 2012 -0700

    Merge pull request #529 from sarken/issue_2962

    Fix issue 2962 with extra Custom Stylesheet on chaptered works form

commit 62e296e
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 19 06:20:53 2012 +0000

    Fix issue 2807 with work meta in static view

commit a8bcbd8
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 19 05:52:35 2012 +0000

    Fix issue 2833 with Bookmarked? search help causing 404

commit 1ac92b3
Author: sarken <sarken@gmail.com>
Date:   Sun Mar 18 22:28:55 2012 +0000

    Issues 2919 and 2952 with Condition on skins show page

commit 3693040
Author: sarken <sarken@gmail.com>
Date:   Sun Mar 18 08:31:40 2012 +0000

    Fix issue with extra styling on chapter form in secondary navigation

commit e9ed05a
Author: sarken <sarken@gmail.com>
Date:   Sun Mar 18 07:25:00 2012 +0000

    Fix issue 2932 with download menu in Opera with JS off

commit d57379f
Author: sarken <sarken@gmail.com>
Date:   Sun Mar 18 04:14:31 2012 +0000

    Fix issue 2970 adding navigation to search pages

commit 81498e8
Author: Sidra <alice@alum.mit.edu>
Date:   Sat Mar 17 01:28:45 2012 +0000

    rdoc update

commit b257283
Author: sarken <sarken@gmail.com>
Date:   Wed Mar 14 01:29:52 2012 +0000

    Fix issue 2956 by adding podfic to front page and invite emails

commit 00c13fd
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 12 20:34:26 2012 +0000

    Fix issue 2963 with unclickable navigation on mobile dashboard pages

commit 623991f
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 12 20:20:48 2012 +0000

    Fix issue 2962 with extra Custom Stylesheet on chaptered works form

commit fc39b53
Author: mumble <mumble@gmail.com>
Date:   Mon Mar 12 17:31:23 2012 +0000

    removes underscoresin page titles, if somewhat awkwardly so

commit 67f9da5
Merge: 8db4de2 2054236
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 12 09:50:40 2012 -0700

    Merge pull request #527 from sarken/issue_2905

    Fix issue 2905 with chapter text escaping draft box

commit 8db4de2
Merge: 71d41f9 b02a12d
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 12 09:47:50 2012 -0700

    Merge pull request #526 from sarken/issue_2960

    Issue 2960 restructuring series edit form

commit 71d41f9
Merge: 56e91f0 c3d85d6
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 12 09:46:28 2012 -0700

    Merge pull request #525 from CristinaRO/Issue_2310_nil_reading_major_version

    Issue 2310 - reading major_version_read can be nil, which causes error 500

commit 56e91f0
Merge: e4c63c5 804fbcf
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 12 09:44:20 2012 -0700

    Merge pull request #524 from sarken/issue_2940

    Issue 2940 changing Mark as Read button position

commit e4c63c5
Merge: b6f1b65 b2e82d4
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 12 09:42:50 2012 -0700

    Merge pull request #523 from CristinaRO/Issues_1883_2847_robots

    Issues 1883 and 2847: robots.txt: disallow indexing downloads and search results

commit b6f1b65
Merge: 900ff40 9cb561d
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 12 09:41:33 2012 -0700

    Merge pull request #522 from CristinaRO/Issue_2948_static_error500

    Issue 2948: static error 500 page should have look and feel of the Archive

commit 900ff40
Merge: fb4af7e 410a751
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 12 09:41:06 2012 -0700

    Merge pull request #521 from CristinaRO/Issue_2947_show_fandom

    Issue 2947: show fandom when fandom doesn't exist

commit fb4af7e
Merge: 0391019 e3e3cbe
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 12 09:40:27 2012 -0700

    Merge pull request #520 from CristinaRO/Issue_2946_profile_no_user

    Issue 2946: loading profile of a non-existent user

commit 2054236
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 12 06:09:23 2012 +0000

    Fix issue 2905 with chapter text escaping draft box

commit 6ab7890
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 12 04:58:29 2012 +0000

    Add faq class and styling

commit b02a12d
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 12 01:23:34 2012 +0000

    Issue 2960 restructuring series edit form

commit a5d25e5
Merge: aed9380 0391019
Author: mumble <mumble@gmail.com>
Date:   Sat Mar 10 12:31:40 2012 +0000

    fixed conflicts with latest master

commit 804fbcf
Merge: c0163f4 9ccb6ed
Author: sarken <sarken@gmail.com>
Date:   Sat Mar 10 01:27:36 2012 +0000

    Fix merge conflicts

commit c0163f4
Author: sarken <sarken@gmail.com>
Date:   Sat Mar 10 01:24:09 2012 +0000

    Shorten fix for issue 2940 and make strings translatable

commit 0391019
Merge: 5af6217 c1ffe14
Author: Cristina <enigel@gmail.com>
Date:   Fri Mar 9 15:44:34 2012 -0800

    Merge pull request #477 from elzj/issue-1404-edit-drafts

    Issue 1404: Allow users to save changes to work and chapter drafts

commit c3d85d6
Author: Cristina <cristinar@gmail.com>
Date:   Thu Mar 8 23:28:59 2012 +0000

    Issue 2310 - reading major_version_read can be nil, which causes error 500 on the user's reading page

    This is a bit of a hot fix, but reading the code, major_version_read
    should never be nil, so it doesn't seem to make sense to add a special
    if case for nil. Only checking if it's different than the work's major
    version seems sufficient - the work's major_version will only go up,
    not down, so the reading's major version can either be the same, or
    lower. Or nil.

commit fa5031a
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 5 05:24:42 2012 +0000

    Mark for Later only appears when work is not already marked for later

commit f60c00c
Author: sarken <sarken@gmail.com>
Date:   Sun Mar 4 05:22:13 2012 +0000

    Split Mark for Later and Mark as Read buttons

commit 9ccb6ed
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 5 05:24:42 2012 +0000

    Mark for Later only appears when work is not already marked for later

commit b2e82d4
Author: Cristina <cristinar@gmail.com>
Date:   Sun Mar 4 23:33:34 2012 +0000

    Issue 2949: disallow indexing of external works

commit d3bef13
Author: Cristina <cristinar@gmail.com>
Date:   Sun Mar 4 23:11:43 2012 +0000

    Issues 1883 and 2847: robots.txt: disallow indexing downloads and search results

commit 9cb561d
Author: Cristina <cristinar@gmail.com>
Date:   Sun Mar 4 22:32:59 2012 +0000

    Issue 2948: static error 500 page should have look and feel of the Archive

    Have copied the layout from the static 502 and the error message from
    the dynamic 500.

commit 5af6217
Merge: 48a9cfb cc56e9e
Author: Enigel <enigel@gmail.com>
Date:   Sun Mar 4 21:29:14 2012 +0000

    Merge pull request #515 from elzj/otwarchive

    ---

    Cleaning up some code in the admin users controller in preparation for doing more work on roles

commit 410a751
Author: Cristina <cristinar@gmail.com>
Date:   Sun Mar 4 17:14:15 2012 +0000

    Issue 2947: show fandom when fandom doesn't exist

commit e3e3cbe
Author: Cristina <cristinar@gmail.com>
Date:   Sun Mar 4 16:49:56 2012 +0000

    Issue 2946: loading profile of a non-existent user

commit 48a9cfb
Merge: 9406fab 2031f50
Author: Elz <elzj78@gmail.com>
Date:   Sun Mar 4 06:59:05 2012 -0800

    Merge pull request #518 from CristinaRO/Issue_2944_gifts

    Issue 2944: error 500 when loading gifts without a user or recipient name

commit 9406fab
Merge: f66a59f 483aab3
Author: Elz <elzj78@gmail.com>
Date:   Sun Mar 4 06:34:14 2012 -0800

    Merge pull request #509 from sarken/issue_2931

    Fix issue 2931 with empty approved children info appearing on preview

commit f66a59f
Merge: c7af15e 731a72d
Author: Elz <elzj78@gmail.com>
Date:   Sun Mar 4 06:33:30 2012 -0800

    Merge pull request #517 from CristinaRO/Issue_2942_set_revised_at

    Fix for the not-reproducible cases when recent_date is nil in set_revise...

commit c7af15e
Merge: 702b04b e537efa
Author: Elz <elzj78@gmail.com>
Date:   Sun Mar 4 06:32:40 2012 -0800

    Merge pull request #516 from CristinaRO/subscriptions_404

    Subscriptions 404

commit 702b04b
Merge: 5b3e4ba 79baa56
Author: Elz <elzj78@gmail.com>
Date:   Sun Mar 4 06:29:40 2012 -0800

    Merge pull request #519 from CristinaRO/Issue_2945_empty_feed

    Issue 2945: empty feed causes error in our error pages

commit 79baa56
Author: Cristina <cristinar@gmail.com>
Date:   Sun Mar 4 12:58:02 2012 +0000

    Issue 2945: empty feed causes error in our error pages

commit 2031f50
Author: Cristina <cristinar@gmail.com>
Date:   Sun Mar 4 12:34:37 2012 +0000

    Issue 2944: error 500 when loading gifts without a user or recipient name

    Having @collection is not a necessary *or* sufficient condition, we
    need either a user or a recipient name for which to load gifts.

commit 00a5812
Author: sarken <sarken@gmail.com>
Date:   Sun Mar 4 05:22:13 2012 +0000

    Split Mark for Later and Mark as Read buttons

commit 5b3e4ba
Merge: 3068169 0fc54ed
Author: Cristina <enigel@gmail.com>
Date:   Sat Mar 3 19:57:49 2012 -0800

    Merge pull request #513 from elzj/issue-2936-more-feeds

    Issue 2936: Expanding tag feeds to include characters and relationships

commit 3068169
Merge: c12b1f0 91c601e
Author: Cristina <enigel@gmail.com>
Date:   Sat Mar 3 18:58:20 2012 -0800

    Merge pull request #510 from shalott/tag_works_fix

    fix for issue 2935

commit c12b1f0
Merge: d54b6d0 1a5307d
Author: Enigel <enigel@gmail.com>
Date:   Sun Mar 4 02:37:33 2012 +0000

    Merge pull request #514 from elzj/otwarchive

    ---

    Issue 2937: Allow searching in a time period thats not a range

    http://code.google.com/p/otwarchive/issues/detail?id=2937

commit d54b6d0
Merge: 4e71a7e 34c71c1
Author: Cristina <enigel@gmail.com>
Date:   Sat Mar 3 18:33:18 2012 -0800

    Merge pull request #512 from elzj/issue-2930-feed-errors

    Issue 2930: fixing tag feed errors

commit 4e71a7e
Merge: 2107429 3838ea6
Author: Enigel <enigel@gmail.com>
Date:   Sun Mar 4 02:25:18 2012 +0000

    Merge pull request #511 from elzj/otwarchive

    ---

    Updating series and icon features to match front-end changes

commit 731a72d
Author: Cristina <cristinar@gmail.com>
Date:   Sun Mar 4 01:01:50 2012 +0000

    Fix for the not-reproducible cases when recent_date is nil in set_revised_at, which causes errors 500

    http://code.google.com/p/otwarchive/issues/detail?id=2942

commit e537efa
Author: Cristina <cristinar@gmail.com>
Date:   Sat Mar 3 21:34:47 2012 +0000

    Adding unsubscribing tests for what page one is returned to after unsubscribing

    Also cleaning up the cuke a bit

commit 33e8136
Author: Cristina <cristinar@gmail.com>
Date:   Sat Mar 3 20:23:45 2012 +0000

    Updating cuke to match the code

commit cc56e9e
Author: elz <elzj78@gmail.com>
Date:   Sat Mar 3 15:16:28 2012 -0500

    Cleaning up some code in the admin users controller in preparation for doing more work on roles

commit 1a5307d
Author: elz <elzj78@gmail.com>
Date:   Sat Mar 3 14:57:00 2012 +0000

    Allow searching in a time period that's not a range

commit 0fc54ed
Author: elz <elzj78@gmail.com>
Date:   Sat Mar 3 09:44:04 2012 -0500

    Issue 2936: Expanding tag feeds to include characters and relationships

commit 34c71c1
Author: elz <elzj78@gmail.com>
Date:   Sat Mar 3 09:33:32 2012 -0500

    Issue 2930: fixing helper method so works without summaries don't cause feed generation to fail

commit 3838ea6
Author: elz <elzj78@gmail.com>
Date:   Sat Mar 3 14:25:03 2012 +0000

    Updating series and icon features to match front-end changes

commit 91c601e
Author: shalott <shalott@gmail.com>
Date:   Fri Mar 2 22:22:39 2012 -0500

    fix for issue 2935

    http://code.google.com/p/otwarchive/issues/detail?id=2935
    Signed-off-by: shalott <shalott@gmail.com>

commit 483aab3
Author: sarken <sarken@gmail.com>
Date:   Sat Mar 3 00:24:59 2012 +0000

    Fix issue 2931 with empty approve children info appearing on preview

commit 3124e9b
Author: Cristina <cristinar@gmail.com>
Date:   Fri Mar 2 23:39:11 2012 +0000

    Fixing subscriptions controller to have a fallback in case the browser didn't send referrer information

    Also fixing it for non-Javascript users, so it wouldn't result in a
    "page not found" error.

    Flip side is that this removes the confirmation dialogue for JS users,
    too, but this looked like a minor downside, considering how easy it is
    to subscribe again.

commit 87356d8
Author: Cesy <cesy.avon@gmail.com>
Date:   Fri Feb 17 11:08:14 2012 +0000

    Fixing based on review comments as Firewolf is busy

commit 9cd1ecd
Merge: 856468d e449316
Author: Cesy <cesy.avon@gmail.com>
Date:   Fri Feb 17 11:05:01 2012 +0000

    Merge branch 'issue2541' of git://github.com/Firewolf13/otwarchive into issue2541

commit 3cb81bd
Author: Cesy <cesy.avon@gmail.com>
Date:   Sun Jan 29 14:38:11 2012 +0000

    Issue 2876 view fulfilled claims on user page

commit bf48565
Author: Cesy <cesy.avon@gmail.com>
Date:   Sun Jan 29 11:26:09 2012 +0000

    Cukes for challenge_promptmeme including bug-fixes

commit c1ffe14
Author: elz <elzj78@gmail.com>
Date:   Wed Feb 15 22:48:43 2012 -0500

    Issue 1404: Allow users to save changes to work and chapter drafts without posting them.

commit f3d84ef
Author: Cesy <cesy.avon@gmail.com>
Date:   Sun Jan 29 09:46:01 2012 +0000

    Cuke failures for challenge_promptmeme

commit 658c35b
Author: Cesy <cesy.avon@gmail.com>
Date:   Sun Jan 29 08:50:46 2012 +0000

    Cuke failures in challenge_promptmeme

commit e449316
Author: Phoenix Wolfe <Phoenix.wolfe@gmail.com>
Date:   Tue Dec 13 17:47:44 2011 +0000

    Validations for comment&alt text

commit 8c9e23f
Author: Phoenix Wolfe <Phoenix.wolfe@gmail.com>
Date:   Tue Dec 6 22:00:24 2011 +0000

    Know it's the wrong branch, start on issue 2508

commit 52b1bae
Author: Phoenix Wolfe <Phoenix.wolfe@gmail.com>
Date:   Tue Dec 6 20:33:02 2011 +0000

    Adding Alt and Comment boxes for collection/challenge icons

commit ca41a16
Author: Phoenix Wolfe <Phoenix.wolfe@gmail.com>
Date:   Tue Dec 6 17:05:04 2011 +0000

    Working on alt text for collections

commit aed9380
Author: mumble <mumble@gmail.com>
Date:   Wed Jun 22 20:25:30 2011 +0000

    Added import subtitle, added subtitles to fandoms and bookmarks in a collection, added subtitle to fandom indexes by media, removed page_title definition from feedback page

commit 8cdcd6d
Author: mumble <mumble@gmail.com>
Date:   Sat Feb 12 22:05:39 2011 +0000

    Added page subtitles to collection index, collection home and profile pages, pseuds and series lists by user

commit 915241c
Author: mumble <mumble@gmail.com>
Date:   Wed Feb 9 23:39:43 2011 +0000

    Added subtitles to user's bookmarks and gifts

commit f457363
Author: mumble <mumble@gmail.com>
Date:   Wed Feb 9 22:08:11 2011 +0000

    Added page subtitles for user and pseud pages and the works index by tag; modified the way page titles are put together in the layout

Signed-off-by: shalott <shalott@gmail.com>
2cf9857
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
3  app/views/collections/_collection_blurb.html.erb
@@ -10,8 +10,7 @@
</h4>
<!--collections header iconised header image-->
<div class="icon">
-<%# don't alt this icon it's currently only decorative%>
- <%= image_tag(collection.icon.url(:standard), :size => "100x100", :alt => "", :class => "icon") %>
+ <%= image_tag(collection.icon.url(:standard), :size => "100x100", :alt => collection.icon_alt_text, :class => "icon") %>
</div>
<p class="datetime" title="updated"><%= set_format_for_date(collection.updated_at) %></p>
<% if collection.all_moderators.length > 0%>
View
4 app/views/collections/_header.html.erb
@@ -3,8 +3,8 @@
<div class="primary header module">
<h2 class="heading"><%= link_to_unless_current(@collection.title, @collection) %></h2>
<div class="icon">
- <% #back end if pos can we make this only print an img if there's one uploaded %>
- <%= image_tag(@collection.icon.url(:standard), :size => "100x100", :alt => "") %></div>
+ <%= image_tag(@collection.icon.url(:standard), :size => "100x100", :alt => collection.icon_alt_text) %>
+ </div>
<!--/descriptions-->
<!--subnav-->
Something went wrong with that request. Please try again.