Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

Commit

Permalink
Merge pull request #562 from zooniverse/about-group-link
Browse files Browse the repository at this point in the history
add link to group page from mark interface
  • Loading branch information
nonword committed Jan 12, 2016
2 parents 2d08686 + e6042d1 commit fd42227
Show file tree
Hide file tree
Showing 17 changed files with 40 additions and 26 deletions.
Binary file removed app/assets/images/anzac/1_part_att_q.gif
Binary file not shown.
Binary file removed app/assets/images/anzac/att_chest_mesurement.gif
Binary file not shown.
Binary file removed app/assets/images/anzac/att_hearing.gif
Binary file not shown.
Binary file removed app/assets/images/anzac/att_height.gif
Binary file not shown.
Binary file removed app/assets/images/anzac/att_sight.gif
Binary file not shown.
Binary file removed app/assets/images/anzac/background.png
Binary file not shown.
Binary file removed app/assets/images/anzac/hs_mark_help.gif
Binary file not shown.
Binary file removed app/assets/images/anzac/hs_transfer_row.gif
Binary file not shown.
Binary file removed app/assets/images/anzac/logo.png
Binary file not shown.
1 change: 0 additions & 1 deletion app/assets/images/anzac/logo.svg

This file was deleted.

Binary file removed app/assets/images/anzac/sa_att_ex.jpeg
Binary file not shown.
8 changes: 8 additions & 0 deletions app/assets/javascripts/components/mark/index.cjsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ module.exports = React.createClass # rename to Classifier
componentDidMount: ->
@getCompletionAssessmentTask()
@fetchSubjectSetsBasedOnProps()
@fetchGroups()

componentWillMount: ->
@setState taskKey: @getActiveWorkflow().first_task
Expand Down Expand Up @@ -286,6 +287,13 @@ module.exports = React.createClass # rename to Classifier
</p>
}

{
if @getActiveWorkflow()? and @state.groups?.length > 1
<p>
<Link to="/groups/#{@getCurrentSubjectSet().group_id}" className="about-link">About this {@props.project.term('group')}.</Link>
</p>
}

<div className="forum-holder">
<ForumSubjectWidget subject={@getCurrentSubject()} subject_set={@getCurrentSubjectSet()} project={@props.project} />
</div>
Expand Down
7 changes: 7 additions & 0 deletions app/assets/javascripts/lib/fetch-subject-sets-mixin.cjsx
Original file line number Diff line number Diff line change
Expand Up @@ -121,3 +121,10 @@ module.exports =
API.type('subjects').get(params).then (subjects) =>
@_subject_queries[params] = subjects
process_subjects subjects


# used by "About this {group}" link on Mark interface
fetchGroups: ->
API.type("groups").get(project_id: @props.project.id).then (groups)=>
group.showButtons = false for group in groups # hide buttons by default
@setState groups: groups
2 changes: 1 addition & 1 deletion project/whale_tales/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"feedback_form_url": "https://docs.google.com/forms/d/12FTryz5oTuzJE-UtbuMYCH5M77lLo-H74wiN35ORc8U/viewform",
"terms_map": {
"group": "ship",
"subject set": "logbook",
"subject set": "page",
"subject": "page"
}

Expand Down
23 changes: 22 additions & 1 deletion project/whale_tales/subjects/groups.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,23 @@
order,key,name,mss_number,date_span,description,external_url,cover_image_url
1,congress_short,Congress 1864,KWM 55,"May 31, 1864 - May 15, 1867","Whaling vessel, out of New Bedford, Massachusetts, mastered by John A. Castino, on voyage from May 31, 1864 - May 13, 1867; owner-agent: Edward C. Jones; built at Mattapoisett, Massachusetts, 1823; formerly of the Nantucket fleet; sold to New Bedford in 1843.",http://www.whalingmuseum.org/explore/library/logbooks/congress-kwm_55,http://whaling-data.oldweather.org/images/placeholder.jpg
1,congress,Congress 1864,KWM 55,"May 31, 1864 - May 15, 1867","Whaling vessel, out of New Bedford, Massachusetts, mastered by John A. Castino, on voyage from May 31, 1864 - May 13, 1867; owner-agent: Edward C. Jones; built at Mattapoisett, Massachusetts, 1823; formerly of the Nantucket fleet; sold to New Bedford in 1843.",http://www.whalingmuseum.org/explore/library/logbooks/congress-kwm_55,http://whaling-data.oldweather.org/images/placeholder.jpg
2,eliza_adams,Eliza Adams 1863,KWM 74,"October 19, 1863 - April 22, 1867","Whaling vessel, out of New Bedford, Massachusetts, mastered by Coddington P. Fish and then John Keenan (Captain Fish became inn in Hawaii and first mate John Keene was appointed relief master, Nov. 1866), on voyage from October 20, 1863 - April 22, 1867; owner-agent: Edward C. Jones; built at Fairhaven, Mass., 1835; abandoned 1879.",http://www.whalingmuseum.org/explore/library/logbooks/eliza_adams-kwm_74,http://whaling-data.oldweather.org/images/Eliza_Adams_KWM74.jpg
3,horatio,Horatio 1896,KWM 104,"March 17, 1896 - November 1, 1896",,http://www.whalingmuseum.org/explore/library/logbooks/digitized-logbook-horatio-kwm_104,http://whaling-data.oldweather.org/images/Horatio_KWM104.jpg
4,milo,Milo 1863,KWM 147,"November 26, 1863 - April 2, 1868","Whaling vessel, out of New Bedford, Mass., mastered by Jonathan Capen Hawes, on voyage from November 26, 1863 - May 7, 1869; owner-agent: E.C. Jones; built at Newburyport in 1811; captured and bonded by the Shenandoah, 1865; sold out, 1872.",http://www.whalingmuseum.org/explore/library/logbooks/milo-kwm_147,http://whaling-data.oldweather.org/images/Milo_rightmost_ODHS_147.jpg
5,saratoga,Saratoga 1857,KWM 180,"April 23, 1857 - December 12, 1858","Whaling vessel, out of New Bedford, Massachusetts, mastered by Frederick Slocum, on voyage from November 3, 1856 - June 1, 1860; owner-agent: Abraham Ashley; built at New York, N.Y., 1832.",http://www.whalingmuseum.org/explore/library/logbooks/saratoga-kwm_180,http://whaling-data.oldweather.org/images/Saratoga_KWM180.jpg
6,trident,Trident 1869,KWM 192,"December 10, 1869 - November 4, 1870","Whaling vessel, out of New Bedford, Mass., mastered by Samuel Green, on voyage from November 16, 1869 - June 10, 1871; owner-agent: Swift & Perry; built at New York, N.Y., 1824.",http://www.whalingmuseum.org/explore/library/logbooks/trident-kwm_192,http://whaling-data.oldweather.org/images/placeholder.jpg
7,betsey_williams,Betsey Williams 1851,KWM 370,"July 23, 1851 - April 20, 1854","Whaling vessel, out of Stonington, Connecticut, mastered by Gilbert Pendleton Jr., on voyage July 24, 1851 - April 20, 1854 to the River Plate, Coast of Chile, Juan Fernandez, Off Shore, Hawaiian Islands, Northwest Coast, Anadyr Sea, and Arctic Ocean whaling grounds; owner-agent: Charles Phelps Williams.",http://www.whalingmuseum.org/explore/library/logbooks/betsey_williams-kwm_370,http://whaling-data.oldweather.org/images/placeholder.jpg
8,helen_snow,Helen Snow 1871,ODHS 6,"October 17, 1871 - August 21, 1872","Whaling vessel (ca. 215 tons), out of New Bedford, Mass., mastered by George H. Macomber, on voyage October 17, 1871 - August 19, 1872 (abandoned in Arctic); owner-agent: Loum Snow & Son; built at Bath, Me., 1851.",http://www.whalingmuseum.org/explore/library/logbooks/helen_snow-odhs_6,http://whaling-data.oldweather.org/images/Helen_Snow_ODHS_6.jpg
9,seneca,Seneca 1869,ODHS 7,"October 16, 1869 - September 14, 1871","Whaling vessel (ca. 328 tons), out of New Bedford, Mass., mastered by Edmund Kelley, on voyage October 16, 1869 - September 14, 1871; owner-agent: Loum Snow & Son, built at Baltimore, Md., 1847, bought from Baltimore and rebuilt at New Bedford, 1869.",http://www.whalingmuseum.org/explore/library/logbooks/seneca-odhs_7,http://whaling-data.oldweather.org/images/placeholder.jpg
10,rosario,Rosario 1891,ODHS 654B,"March 24, 1891 - October 3, 1891","Whaling vessel, out of San Francisco, California, mastered by Edward Coffin, on voyage from March 24, 1891 - November 6, 1891; owner-agent: Bowne Wright.",http://www.whalingmuseum.org/explore/library/logbooks/rosario-odhs_654B,http://whaling-data.oldweather.org/images/Rosario_ODHS_654B.jpg
11,john_wells,John Wells 1869,ODHS 769,"November 9, 1869 - November 11, 1871","Whaling vessel, out of New Bedford Massachusetts, mastered by Aaron Dean, on voyage Novemebr 9, 1869 - September 12, 1871; owner-agent: William O. Brownell; built at New York, N.Y., 1822; altered from a ship in 1857; lost in the Arctic 1871 (this voyage).",http://www.whalingmuseum.org/explore/library/logbooks/john_wells-odhs_769,http://whaling-data.oldweather.org/images/John_Wells_leftmost_ship_ODHS_769.jpg
12,progress,Progress ,ODHS 938B,,"Whaling vessel, out of San Francisco, California, on voyage December 16, 1880 - May 28, 1881 to the Off Shore, On the Line, and Western Arctic whaling grounds, mastered by Frederick A. Barker; owner-agent: I.H. Bartlett & Sons.",,http://whaling-data.oldweather.org/images/Progress_ODHS_938B.jpg
13,grampus_1,Grampus 1888,ODHS 948A,"February 11, 1888 - November 5, 1888","Whaling vessel, out of San Francisco, California, mastered by Henry G. Dexter, on voyage February 11, 1888 - November 5, 1888, to the Arctic Ocean whaling grounds; owner-agent: Pacific Steam Whaling Co.; built at East Boston, Massachusetts, 1874.",http://www.whalingmuseum.org/explore/library/logbooks/grampus-odhs_948A,http://whaling-data.oldweather.org/images/Grampus_ODHS948.jpg
14,grampus_2,Grampus 1889,ODHS 948B,"February 26, 1889 - November 12, 1889","Whaling vessel, out of San Francisco, California, mastered by Henry G. Dexter, on voyage February 26, 1889 - November 12, 1889 to the Arctic Ocean whaling grounds; owner-agent: Pacific Steam Whaling Co.; built at East Boston, Massachusetts, 1874.",http://www.whalingmuseum.org/explore/library/logbooks/grampus-odhs_948B,http://whaling-data.oldweather.org/images/Grampus_ODHS948.jpg
15,mary_hume,Mary D. Hume 1890,ODHS 949,"April 19, 1890 - September 30, 1892","Whaling vessel, out of San Francisco, Calif., mastered by James A. Tilton, on voyage April 19, 1890 - September 29, 1892 to the Herschel Island whaling grounds; owner-agent: Josiah N. Knowles; built at Ellensburg, Oregon, 1881.",http://www.whalingmuseum.org/explore/library/logbooks/mary_d_hume-odhs_949,http://whaling-data.oldweather.org/images/Mary_D_Hume_ODHS_949.jpg
16,newport,Newport 1893,ODHS 950,"August 21, 1893 - September 4, 1896","Whaling vessel, out of San Francisco, Calif., mastered by William P. Porter, James Tilton, Hartson H. Bodfish and G.B. Levitt, on whaling voyaged from 1 June 1892-26 Sept. 1898, to the Herschel Island, 20/24, and Fathom whaling grounds; owner-agent: Pacific Steam Whaling Co.; built at San Francisco, Calif., 1875.",http://www.whalingmuseum.org/explore/library/logbooks/newport-odhs_950,http://whaling-data.oldweather.org/images/Newport_ODHS_950.jpg
17,beluga,Beluga 1897,ODHS 951A,"March 30, 1897 - August 31, 1898","Whaling vessel, out of San Francisco, California, mastered by Hartson H. Bodfish, on voyage from March 30, 1897 - March 4, 1899 to the Fathom whaling ground; owner-agent: Edwin L. Griffith; built at Bath, Maine, 1882.",http://www.whalingmuseum.org/explore/library/logbooks/beluga-odhs_951A,http://whaling-data.oldweather.org/images/Beluga_ODHS951.jpg
18,william_baylies_1,William Baylies 1905,ODHS 955,"March 1, 1905 - November 3, 1905","Whaling vessel, out of San Francisco, California, mastered by Hartson Hartlett Bodfish, on voyage from March 1, 1905 - November 3, 1905; owner-agent: William Lewis & Son; built at Bath, Maine in 1886.",http://www.whalingmuseum.org/explore/library/logbooks/william_baylies-odhs_955,http://whaling-data.oldweather.org/images/William_Baylies_ODHS955.jpg
19,william_baylies_2,William Baylies 1906,ODHS 956A,"March 10, 1906 - November 6, 1906","Whaling vessel, out of San Francisco, California, mastered by Hartson H. Bodfish, on voyage from March 10, 1906 - November 7, 1906 to the Northwest Coast whaling grounds; owner-agent: William Lewis & Son; built at Bath, Maine, 1886.",http://www.whalingmuseum.org/explore/library/logbooks/william_baylies-odhs_956A,http://whaling-data.oldweather.org/images/William_Baylies_ODHS955.jpg
20,william_baylies_3,William Baylies 1907,ODHS 956B,"March 10, 1907 - November 7, 1907","Whaling vessel, out of San Francisco, California, mastered by Hartson H. Bodfish, on voyage from March 11, 1907 - November 8, 1907, to the Artic Ocean whaling grounds; owner-agent: William Lewis & Son; built at Bath, Maine, 1886.",http://www.whalingmuseum.org/explore/library/logbooks/william_baylies-odhs_956B,http://whaling-data.oldweather.org/images/William_Baylies_ODHS955.jpg
21,herman_1,Herman 1910,ODHS 958,"May 1, 1910 - October 25, 1910","Whaling vessel, out of San Francisco, California, mastered by Hartson H. Bodfish, on voyage from April 30, 1910 - November 2, 1910, to the Artcic whaling grounds; owner-agent: H. Liebes & Co.; built at Bath, Maine, 1884.",http://www.whalingmuseum.org/explore/library/logbooks/herman-odhs_958,http://whaling-data.oldweather.org/images/Herman_ODHS958.jpg
22,herman_2,Herman 1911,ODHS 959,"March 22, 1911 - November 9, 1911","Whaling vessel, out of San Francisco, California, mastered by Hartson H. Bodfish, on voyage from March 22, 1911 - November 10, 1911 to the Artcic whaling grounds; owner-agent: H. Liebes & Co.; built at Bath, Maine, 1884.",http://www.whalingmuseum.org/explore/library/logbooks/herman-odhs_959,http://whaling-data.oldweather.org/images/Herman_ODHS958.jpg
Loading

0 comments on commit fd42227

Please sign in to comment.