confusing merge

app/assets/stylesheets/hypertree.css

@@ -188,7 +188,7 @@ h4 {
 
 }
 
-#key ul li.rtype_kinship {
+#key ul li.rtype_family {
 	border-color: #a51400;
 }
 

app/controllers/kinship_controller.rb → app/controllers/family_controller.rb

@@ -1,11 +1,11 @@
-class KinshipController < ApplicationController
+class FamilyController < ApplicationController
   def index
-    @page_class = "kinship"
+    @page_class = "family"
   end
 
 
   def sub
-    @page_class = "kinship"
+    @page_class = "family"
     # in the URL there will be an ID
     # either a number or a string
     # and that will determine which template to

app/views/family/sub.html.erb

@@ -0,0 +1,10 @@
+<!-- family -->
+
+<ol class="breadcrumb">
+  <li><%= link_to "Back to Families", family_path %></li>
+</ol>
+
+
+<%= render @sub_name %>
+
+

app/views/layouts/application.html.erb

@@ -58,7 +58,7 @@
         <ul class="nav navbar-nav">
           <li ><%= link_to "Cases", cases_path %></li>
           <li ><%= link_to "People", people_path %></li>
-          <li ><%= link_to "Families", kinship_path %></li>
+          <li ><%= link_to "Families", family_path %></li>
           <li><%= link_to "Stories", stories_path %></li>
         </ul>
         <ul class="nav navbar-nav navbar-right">

app/views/people/network.html.erb

@@ -86,7 +86,7 @@
         <div id="key">
           <h4>Relationship Types</h4>
           <ul>
-            <li class="rtype_kinship"><span>Kinship</span></li>
+            <li class="rtype_family"><span>Family</span></li>
             <li class="rtype_legal"><span>Legal</span></li>
             <li class="rtype_acquaintance"><span>Social</span></li>
             <li class="rtype_employment"><span>Work</span></li>

app/views/static/index.html.erb

@@ -32,7 +32,7 @@
 		</div><!-- /home_cases -->
 		<% end %>
 		
-		<%= link_to kinship_path do %>
+		<%= link_to family_path do %>
 		<div class="home_families home_section">
 			<div class="home_info">
 			<h2>Families</h2>

app/views/stories/_queen_v_hepburn.html.erb

@@ -13,7 +13,7 @@
 
 <h3>Venues for Freedom</h3>
 
-<p>But on Monday, January 8, 1810 when Key filed the Queen cases, this outcome was far from determined. The Queen family had created a <!--vibrant network--> <%= link_to "vibrant network", { :controller => "kinship", :action => "sub", :name => "queen" } %> of free and enslaved branches in Maryland, and in the 1790s, they had won a series of petition cases in Prince George's County and in the General Court of the Western Shore. Their success had prompted the Maryland General Assembly to revise its slave laws in 1796 in ways that made petitions for freedom much more difficult for the enslaved. The act required that petitions be heard in the local county courts rather than in the higher appellate General Court, making it more likely that white planters at the local level would serve on juries hearing these cases. The new law also required that plaintiff's attorneys bear the costs of the litigation if the case was decided for the defendant slaveholder. Scholars have suggested that these more restrictive acts in 1796 effectively blunted petitions for freedom in Maryland.</p>
+<p>But on Monday, January 8, 1810 when Key filed the Queen cases, this outcome was far from determined. The Queen family had created a <!--vibrant network--> <%= link_to "vibrant network", { :controller => "family", :action => "sub", :name => "queen" } %> of free and enslaved branches in Maryland, and in the 1790s, they had won a series of petition cases in Prince George's County and in the General Court of the Western Shore. Their success had prompted the Maryland General Assembly to revise its slave laws in 1796 in ways that made petitions for freedom much more difficult for the enslaved. The act required that petitions be heard in the local county courts rather than in the higher appellate General Court, making it more likely that white planters at the local level would serve on juries hearing these cases. The new law also required that plaintiff's attorneys bear the costs of the litigation if the case was decided for the defendant slaveholder. Scholars have suggested that these more restrictive acts in 1796 effectively blunted petitions for freedom in Maryland.</p>
 
 <p>But in 1800, a new jurisdiction opened with the creation of a national capital city in Washington, D.C. The District of Columbia incorporated the law of Maryland on its Maryland side and the law of Virginia on its Virginia side. The D.C. Circuit Court was a federal bench, but acted both as a lower court and an appellate court. It therefore could serve as the court of original jurisdiction for petitions for freedom under the Maryland 1796 act that operated within the Maryland parts of the District.</p> 
 
@@ -46,7 +46,7 @@
 <figcaption>Philip Barton Key [<a href="https://commons.wikimedia.org/wiki/File:PBkey.jpg">Public domain, from Wikimedia Commons</a>]</figcaption>
 </figure>
 
-<p>One reason for the Queens's solidarity in these years had to do with the circumstances of their enslavement. Beginning in the late 1720s, they had been held as slaves primarily by Jesuit priests who managed multiple tobacco plantations in Maryland, most of them inherited from one of the wealthiest planters in eighteenth-century Maryland, <!--James Carroll--><%= link_to "James Carroll", { :controller => "kinship", :action => "sub", :name => "carroll" } %>. After the American Revolution, some of the Queens, led by <!--Edward "Ned" Queen--><%= link_to "Edward 'Ned' Queen", person_path("per.000078") %>, obtained their freedom in the 1790s through petitions for freedom filed in the Maryland courts against one of Jesuit priests, Rev. <!--John Ashton--><%= link_to "John Ashton", person_path("per.000215") %>. Philip Barton Key, Frank's uncle, and Gabriel Duvall, another Prince George's County attorney, represented Ned Queen. Petition cases were tried in the General Court of the Western Shore of Maryland, which had original jurisdiction over all petitions for freedom until 1796, when the law was changed to make petitions more difficult by requiring them to be tried in the county courts first. Ned Queen's case affected over twenty other Queen family members who had brought petitions against Ashton. Simon Queen secured his freedom in these years as well, and he was called to serve as a witness in both <!--Priscilla Queen's--><%= link_to "Priscilla Queen's", case_path("oscys.caseid.0025") %> and <!--Mina Queen's--><%= link_to "Mina Queen's", case_path("oscys.caseid.0011") %> 1810 case.<span class="foot"><a href="#footn7" id="bodyn7">(7)</a></span></p> 
+<p>One reason for the Queens's solidarity in these years had to do with the circumstances of their enslavement. Beginning in the late 1720s, they had been held as slaves primarily by Jesuit priests who managed multiple tobacco plantations in Maryland, most of them inherited from one of the wealthiest planters in eighteenth-century Maryland, <!--James Carroll--><%= link_to "James Carroll", { :controller => "family", :action => "sub", :name => "carroll" } %>. After the American Revolution, some of the Queens, led by <!--Edward "Ned" Queen--><%= link_to "Edward 'Ned' Queen", person_path("per.000078") %>, obtained their freedom in the 1790s through petitions for freedom filed in the Maryland courts against one of Jesuit priests, Rev. <!--John Ashton--><%= link_to "John Ashton", person_path("per.000215") %>. Philip Barton Key, Frank's uncle, and Gabriel Duvall, another Prince George's County attorney, represented Ned Queen. Petition cases were tried in the General Court of the Western Shore of Maryland, which had original jurisdiction over all petitions for freedom until 1796, when the law was changed to make petitions more difficult by requiring them to be tried in the county courts first. Ned Queen's case affected over twenty other Queen family members who had brought petitions against Ashton. Simon Queen secured his freedom in these years as well, and he was called to serve as a witness in both <!--Priscilla Queen's--><%= link_to "Priscilla Queen's", case_path("oscys.caseid.0025") %> and <!--Mina Queen's--><%= link_to "Mina Queen's", case_path("oscys.caseid.0011") %> 1810 case.<span class="foot"><a href="#footn7" id="bodyn7">(7)</a></span></p> 
 
 <p class="pullquote">The account book for St. Thomas Manor included the following entry: "To . . . retain or stop the mouth of lawyer Key from speaking in favor of the Negroes who have sued for their freedom."</p>
 

app/views/stories/index.html.erb

@@ -9,7 +9,7 @@
   </div>
 
   <div class="media-right">
-    <%= story_img("http://jetson.unl.edu/oscys_figures/stories/queen_v_hepburn.00.jpg", "early_dc_court_history") %>
+    <%= story_img("http://jetson.unl.edu/oscys_figures/stories/queen_v_hepburn.00.jpg", "queen_v_hepburn") %>
   </div>
 
   <div class="media-body">

config/routes.rb

@@ -42,9 +42,9 @@
   get 'people/:id', to: 'people#show', :constraints => { :id => with_period_ext}
   get 'people/:id', to: 'people#show', as: :person, :constraints => { :id => with_period }
 
-  # kinship
-  get 'kinship', to: 'kinship#index', as: :kinship
-  get 'kinship/:name', to: 'kinship#sub', as: :kinshipSub, :constraints => { :name => with_period }
+  # family
+  get 'family', to: 'family#index', as: :family
+  get 'family/:name', to: 'family#sub', as: :familySub, :constraints => { :name => with_period }
 
   # stories
   get 'stories', to: 'stories#index', as: :stories

docs/story_family_page.md

@@ -1,8 +1,8 @@
 ## Create a Story or Family Page
 
-Let's add a new story.  The procedure should be very similar for kinship and about pages.
+Let's add a new story.  The procedure should be very similar for family and about pages.
 
-The stories are located in `app/views/stories`.  In `app/views` there are other directories like about and kinship.  If you wish to add a page to something like `app/views/static` you will need to ask a programmer / sysadmin, as those pieces were not set up in such a way to allow easy adding of new pages.
+The stories are located in `app/views/stories`.  In `app/views` there are other directories like about and family.  If you wish to add a page to something like `app/views/static` you will need to ask a programmer / sysadmin, as those pieces were not set up in such a way to allow easy adding of new pages.
 
 `app/views/stories` should look something like this: