added detail model and view

diff --git a/css/front.css b/css/front.css
index 7caf9f3..391503d 100644 (file)
--- a/css/front.css
+++ b/css/front.css
@@ -101,4 +101,29 @@
 .search-container .results-limit-container {
   margin-bottom: 20px;
 }
+.detail-record{
+    padding: 5px 0px;
+
+}
+.detail-label{
+    font-weight: bold;
+    padding: 2px 0;
+}
+
+.detail-value{
+  padding: 2px 0;
+   
+}
+.detail-header{
+    font-size: 24px;
+    padding: 5px 0px;
+    margin-bottom: 15px;
+    text-align: center;
+}
+.detail-wrapper{
+  
+}
+.record-row:nth-child(even){
+    background-color: #eeeeee;
+}
 

diff --git a/js/front.js b/js/front.js
index a718b44..9f8c19f 100644 (file)
--- a/js/front.js
+++ b/js/front.js
@@ -1,5 +1,11 @@
 $(document).ready(function(){
     $(".expand-collapse").on("click", function(e){
+        if( $(this).text() === "Show Options" ){
+           $(this).text("Hide Options");
+        } else if( $(this).text() === "Hide Options" ){
+            $(this).text("Show Options");
+        }
+         
         e.preventDefault();
         $('.options-wrapper').slideToggle(500, function () {});
     });
@@ -14,6 +20,7 @@ $(document).ready(function(){
         console.log("test");
     });
     
+    
     $('#results-limit').on('change', function(){
 //        $('#obits-search').submit(); 
     });

diff --git a/models/admin/management/obitImport.php b/models/admin/management/obitImport.php
index fed623e..c0ab933 100644 (file)
--- a/models/admin/management/obitImport.php
+++ b/models/admin/management/obitImport.php
@@ -172,19 +172,20 @@ class GlmMembersAdmin_management_obitImport
                         if ( !empty($value) ){
                             $imageFullUrl = $img_src . $value;
                  
-                            $fp = fopen( GLM_MEMBERS_PLUGIN_IMAGES_PATH . '/' . $value, 'w+' );
-                            $ch = curl_init( $imageFullUrl );
-                            curl_setopt($ch, CURLOPT_TIMEOUT, 50);
-                            curl_setopt($ch, CURLOPT_FILE, $fp);
-                            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-                            $fileData = curl_exec($ch);
-                            $httpCode = curl_getinfo($ch);
-                            curl_close($ch);
-                            fclose($fp);
-                            // Set correct file permissions
-                            $oldUmask = umask(0);
-                            chmod( GLM_MEMBERS_PLUGIN_IMAGES_PATH_PATH . '/' . $value, 0660 );
-                            umask($oldUmask);
+//                            $fp = fopen( GLM_MEMBERS_PLUGIN_IMAGES_PATH . '/' . $value, 'w+' );
+//                            $ch = curl_init( $imageFullUrl );
+//                            curl_setopt($ch, CURLOPT_TIMEOUT, 50);
+//                            curl_setopt($ch, CURLOPT_FILE, $fp);
+//                            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+//                            $fileData = curl_exec($ch);
+//                            $httpCode = curl_getinfo($ch);
+//                            curl_close($ch);
+//                            fclose($fp);
+//                            // Set correct file permissions
+//                            $oldUmask = umask(0);
+//                            chmod( GLM_MEMBERS_PLUGIN_IMAGES_PATH_PATH . '/' . $value, 0660 );
+//                            umask($oldUmask);
+//                            sleep(1);
                         }  
                     }
 //                    $insert[$key] = $value; 

diff --git a/models/front/obits/detail.php b/models/front/obits/detail.php
new file mode 100644 (file)
index 0000000..ec8a875
--- /dev/null
+++ b/models/front/obits/detail.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Gaslight Media Members Database
+ * Admin Obits Dashboard
+ *
+ * PHP version 5.5
+ *
+ * @category glmWordPressPlugin
+ * @package  glmMembersDatabase
+ * @author   Chuck Scott <cscott@gaslightmedia.com>
+ * @license  http://www.gaslightmedia.com Gaslightmedia
+ * @release  index.php,v 1.0 2014/10/31 19:31:47 cscott Exp $
+ * @link     http://dev.gaslightmedia.com/
+ */
+
+// Load Obits data abstract
+require_once GLM_MEMBERS_OBITS_PLUGIN_CLASS_PATH.'/data/dataObits.php';
+require_once GLM_MEMBERS_OBITS_PLUGIN_CLASS_PATH.'/obitSupportFunctions.php';
+
+class GlmMembersFront_obits_detail extends GlmDataObits
+{
+    public $table;
+    /**
+     * WordPress Database Object
+     *
+     * @var $wpdb
+     * @access public
+     */
+    public $wpdb;
+    /**
+     * Plugin Configuration Data
+     *
+     * @var $config
+     * @access public
+     */
+    public $config;
+    /**
+     * Obit ID
+     *
+     * @var $obitID
+     * @access public
+     */
+    public $obitID = false;
+
+    /**
+     * Constructor
+     *
+     * This contructor performs the work for this model. This model returns
+     * an array containing the following.
+     *
+     * 'status'
+     *
+     * True if successfull and false if there was a fatal failure.
+     *
+     * 'view'
+     *
+     * A suggested view name that the contoller should use instead of the
+     * default view for this model or false to indicate that the default view
+     * should be used.
+     *
+     * 'data'
+     *
+     * Data that the model is returning for use in merging with the view to
+     * produce output.
+     *
+     * @wpdb object WordPress database object
+     *
+     * @return array Array containing status, suggested view, and any data
+     */
+    public function __construct ($wpdb, $config)
+    {
+        // Save WordPress Database object
+        $this->wpdb = $wpdb;
+
+        // Save plugin configuration object
+        $this->config = $config;
+
+        /*
+         * Run constructor for the Obits data class
+         *
+         * Note, the third parameter is a flag that indicates to the Contacts
+         * data class that it should flag a group of fields as 'view_only'.
+         */
+        parent::__construct(false, false, true);
+
+    }
+
+    public function modelAction($actionData = false)
+    {   
+        $article_url = GLM_MEMBERS_PLUGIN_MEDIA_URL;
+        
+        if ( isset( $_GET['obit'] ) ){
+            $obit_id = filter_var( $_GET['obit'], FILTER_SANITIZE_STRING );
+        }
+        $where = "id = $obit_id";
+        
+        $obit = $this->getList($where);
+   
+        $obit = array_values($obit)[0];
+        $article = $article_url . '/files/'.$obit['obit_article'];
+//             echo '<pre>',print_r($obit), '</pre>';
+        
+        // Compile template data
+        $templateData = array(
+            'obit'      => $obit,
+            'article'   => $article
+        );
+             // Return status, any suggested view, and any data to controller
+        return array(
+            'status'        => true,
+            'modelRedirect' => false,
+            'view'          => "front/obits/detail.html",
+            'data'          => $templateData
+        );
+
+    }
+}

diff --git a/setup/shortcodes.php b/setup/shortcodes.php
index 2c41dfb..4f30885 100644 (file)
--- a/setup/shortcodes.php
+++ b/setup/shortcodes.php
@@ -102,6 +102,15 @@ $glmMembersObitsShortcodes = array(
             'current'  => null,
         )
     ),
+    'glm-members-obits-detail' => array(
+        'plugin'     => GLM_MEMBERS_OBITS_PLUGIN_SLUG,
+        'menu'       => 'obits',
+        'action'     => 'detail',
+        'table'      => false,
+        'attributes' => array(
+            'id'         => false,
+        )
+    ),
 );
 $glmMembersObitsShortcodesDescription = '';
 

diff --git a/views/front/obits/detail.html b/views/front/obits/detail.html
new file mode 100644 (file)
index 0000000..ce81a04
--- /dev/null
+++ b/views/front/obits/detail.html
@@ -0,0 +1,80 @@
+<div class="row">
+   <div class="detail-wrapper small-12 small-centered columns">
+        <div class="detail-header small-12 columns small-centered">{$obit.last_name}, {$obit.first_mid}</div>
+        
+        <div class="row record-row">
+            <div class="detail-label small-6 medium-4 large-3 columns">Record ID:</div> 
+            <div class="detail-value small-6 medium-8 large-9 columns">{$obit.id} </div>
+       </div>
+        <div class="row record-row">
+            <div class="detail-label small-6 medium-4 large-3 columns">Last Name:</div>  
+            <div class="detail-value small-6 medium-8 large-9 columns">{$obit.last_name} </div>
+        </div>
+        <div class="row record-row">
+             <div class="detail-label small-6 medium-4 large-3 columns">First , Middle:</div>  
+             <div class="detail-value small-6 medium-8 large-9 columns">{$obit.first_mid} </div>
+        </div>
+        <div class="row record-row">
+             <div class="detail-label small-6 medium-4 large-3 columns">Birth Year:</div>  
+             <div class="detail-value small-6 medium-8 large-9 columns">{$obit.b_year} </div>
+        </div>
+        <div class="row record-row">
+             <div class="detail-label small-6 medium-4 large-3 columns">Birth Year Range:</div>  
+             <div class="detail-value small-6 medium-8 large-9 columns">{$obit.b_yr_range} </div>
+        </div>
+        <div class="row record-row">
+             <div class="detail-label small-6 medium-4 large-3 columns">Death Year:</div>  
+             <div class="detail-value small-6 medium-8 large-9 columns">{$obit.d_year} </div>
+         </div>
+         <div class="row record-row">
+             <div class="detail-label small-6 medium-4 large-3 columns">Death Year Range:</div>  
+             <div class="detail-value small-6 medium-8 large-9 columns">{$obit.d_yr_range} </div>
+        </div>   
+        <div class="row record-row">
+             <div class="detail-label small-6 medium-4 large-3 columns">Maiden Name:</div>  
+             <div class="detail-value small-6 medium-8 large-9 columns">{$obit.maiden_other} </div>
+        </div>
+        <div class="row record-row">
+             <div class="detail-label small-6 medium-4 large-3 columns">Spouse / Partner:</div>  
+             <div class="detail-value small-6 medium-8 large-9 columns">{$obit.spouse_partner} </div>
+        </div>
+        <div class="row record-row">
+             <div class="detail-label small-6 medium-4 large-3 columns">Obituary Article:</div> 
+             <div class="detail-value small-6 medium-8 large-9 columns"><a href="{$article}">{$obit.obit_article} </a> </div> 
+             
+        </div>
+        <div class="row record-row">
+             <div class="detail-label small-6 medium-4 large-3 columns">Article A:</div> 
+             <div class="detail-value small-6 medium-8 large-9 columns">{$obit.article_a} </div>
+        </div>
+        <div class="row record-row">
+             <div class="detail-label small-6 medium-4 large-3 columns">Article B:</div> 
+             <div class="detail-value small-6 medium-8 large-9 columns">{$obit.article_b} </div>
+        </div>
+        <div class="row record-row">
+             <div class="detail-label small-6 medium-4 large-3 columns">Article C:</div> 
+            <div class="detail-value small-6 medium-8 large-9 columns">{$obit.article_c} </div>
+        </div>
+        <div class="row record-row">
+             <div class="detail-label small-6 medium-4 large-3 columns">Newspaper:</div> 
+             <div class="detail-value small-6 medium-8 large-9 columns">{$obit.newspaper} </div>
+        </div>
+        <div class="row record-row">
+             <div class="detail-label small-6 medium-4 large-3 columns">Newspaper Date:</div> 
+             <div class="detail-value small-6 medium-8 large-9 columns">{$obit.newspaper_data} </div>
+        </div>
+        <div class="row record-row">
+            <div class="detail-label small-6 medium-4 large-3 columns">Father Name:</div> 
+            <div class="detail-value small-6 medium-8 large-9 columns">{$obit.father_name} </div>
+        </div>
+        <div class="row record-row">
+            <div class="detail-label small-6 medium-4 large-3 columns">Mother Name:</div> 
+            <div class="detail-value small-6 medium-8 large-9 columns">{$obit.mother_name} </div>
+        </div>
+        <div class="row record-row">
+             <div class="detail-label small-6 medium-4 large-3 columns">Misc Info:</div> 
+             <div class="detail-value small-6 medium-8 large-9 columns">{$obit.misc_info} </div>
+        </div>
+    </div>
+</div>
+

diff --git a/views/front/obits/searchResults.html b/views/front/obits/searchResults.html
index 9e7d7a1..c91ecb2 100644 (file)
--- a/views/front/obits/searchResults.html
+++ b/views/front/obits/searchResults.html
@@ -1,267 +1,267 @@
 <div class="row">
-        <form action="{$thisUrl}" method="post" enctype="multipart/form-data" name="obits-search" id="obits-search">
-            <div class="small-12 large-9 columns results-container">
-                <div class="glm-alpha-links">
-                    {foreach $alphaList as $a}
-                        <a href="{$thisUrl}?alpha={$a.alpha}&pageSelect=Previous&prevStart={$prevStart}&nextStart={$nextStart}&results-limit={$limit}" class="glm-alpha-link{if $a.default} glm-alpha-link-selected{/if}">{$a.alpha}</a>
-                    {/foreach}
-                </div>
-                {if $paging}
-                    <br>
-                    <a href="{$thisUrl}?pageSelect=Previous&prevStart={$prevStart}&nextStart={$nextStart}&results-limit={$limit}{if $alpha_key}&alpha={$alpha_key}{/if}" class="glm-alpha-link obits-link" {if !$prevStart} style="pointer-events: none; opacity: 0.5;"{/if}>Previous page</a>
-                    <a href="{$thisUrl}?pageSelect=Next&prevStart={$prevStart}&nextStart={$nextStart}&results-limit={$limit}{if $alpha_key}&alpha={$alpha_key}{/if}" class="glm-alpha-link obits-link" {if !$nextStart} style="pointer-events: none; opacity: 0.5;"{/if}>Next page</a>
-                    <br>
-                    showing {$start} through {$lastDisplayed} of {$total}
-                {/if}
-                <label class="search-results-label" for="results-limit">Results per page</label>
-                <select id="results-limit" class="results-limit" name="results-limit">
-                    <option value="10">10</option>
-                    <option value="20">20</option>
-                    <option value="30">30</option>
-                    <option value="50">50</option>
-                    <option value="100">100</option>
-                    <option value="500">500</option>
-                </select>
-               <table class="footable results-table" data-paging="false">
-                 <thead>
-                      <tr>
-                        <th>Birth Year Range</th>
-                        <th>Death Year Range</th> 
-                        <th>Last Name</th>
-                        <th>First Name</th>
-                        <th>Birth Year</th>
-                        <th>Death Year</th>
-                        <th>Spouse</th>
-                        <th>Maiden Name</th>
-                      </tr>
-                  </thead>
-                    {foreach from=$obits item=i}
-                        <tr>
-                            <td>{$i.b_yr_range}</td>
-                            <td>{$i.d_yr_range}</td> 
-                            <td>{$i.last_name}</td>
-                            <td>{$i.first_mid}</td>
-                            <td>{$i.b_year}</td>
-                            <td>{$i.d_year}</td>
-                            <td>{$i.spouse_partner}</td>
-                            <td>{$i.maiden_other}</td>
-                        </tr>
-                    {/foreach}
-                </table>
+    <form action="{$thisUrl}" method="post" enctype="multipart/form-data" name="obits-search" id="obits-search">
+        <div class="small-12 large-9 columns results-container">
+            <div class="glm-alpha-links">
+                {foreach $alphaList as $a}
+                    <a href="{$thisUrl}?alpha={$a.alpha}&pageSelect=Previous&prevStart={$prevStart}&nextStart={$nextStart}&results-limit={$limit}" class="glm-alpha-link{if $a.default} glm-alpha-link-selected{/if}">{$a.alpha}</a>
+                {/foreach}
             </div>
-            <div class="small-12 medium-6 large-3 columns small-centered large-uncentered search-sidebar-container">
-                <div class="search-sidebar">
-        <!--            {include file='front/obits/search.html'}-->
-                    <div class="search-container sidebar-container row">
-                        <div class="small-12 columns">
-                            <form action="{$thisUrl}" method="post" enctype="multipart/form-data" name="obits-search" id="obits-search">
-                               <input class="sidebar-criteria" type="radio" checked value="all" name="conditions[]">All 
-                               <input class="sidebar-criteria" type="radio" value="any" name="conditions[]">Any 
-                               <a href="#" class="expand-collapse"> Expand Options </a>
+            {if $paging}
+                <br>
+                <a href="{$thisUrl}?pageSelect=Previous&prevStart={$prevStart}&nextStart={$nextStart}&results-limit={$limit}{if $alpha_key}&alpha={$alpha_key}{/if}" class="glm-alpha-link obits-link" {if !$prevStart} style="pointer-events: none; opacity: 0.5;"{/if}>Previous page</a>
+                <a href="{$thisUrl}?pageSelect=Next&prevStart={$prevStart}&nextStart={$nextStart}&results-limit={$limit}{if $alpha_key}&alpha={$alpha_key}{/if}" class="glm-alpha-link obits-link" {if !$nextStart} style="pointer-events: none; opacity: 0.5;"{/if}>Next page</a>
+                <br>
+                showing {$start} through {$lastDisplayed} of {$total}
+            {/if}
+            <label class="search-results-label" for="results-limit">Results per page</label>
+            <select id="results-limit" class="results-limit" name="results-limit">
+                <option value="10">10</option>
+                <option value="20">20</option>
+                <option value="30">30</option>
+                <option value="50">50</option>
+                <option value="100">100</option>
+                <option value="500">500</option>
+            </select>
+           <table class="footable results-table" data-paging="false">
+             <thead>
+                  <tr>
+                    <th>Birth Year Range</th>
+                    <th>Death Year Range</th> 
+                    <th>Last Name</th>
+                    <th>First Name</th>
+                    <th>Birth Year</th>
+                    <th>Death Year</th>
+                    <th>Spouse</th>
+                    <th>Maiden Name</th>
+                  </tr>
+              </thead>
+                {foreach from=$obits item=i}
+                    <tr>
+                        <td>{$i.b_yr_range}</td>
+                        <td>{$i.d_yr_range}</td> 
+                        <td> <a href="{$thisUrl}/obits-detail/?obit={$i.id}" >{$i.last_name}</a> </td>
+                        <td>{$i.first_mid}</td>
+                        <td>{$i.b_year}</td>
+                        <td>{$i.d_year}</td>
+                        <td>{$i.spouse_partner}</td>
+                        <td>{$i.maiden_other}</td>
+                    </tr>
+                {/foreach}
+            </table>
+        </div>
+        <div class="small-12 medium-6 large-3 columns small-centered large-uncentered search-sidebar-container">
+            <div class="search-sidebar">
+    <!--            {include file='front/obits/search.html'}-->
+                <div class="search-container sidebar-container row">
+                    <div class="small-12 columns">
+                        <form action="{$thisUrl}" method="post" enctype="multipart/form-data" name="obits-search" id="obits-search">
+                           <input class="sidebar-criteria" type="radio" checked value="all" name="conditions[]">All 
+                           <input class="sidebar-criteria" type="radio" value="any" name="conditions[]">Any 
+                           <a href="#" class="expand-collapse">Show Options</a>
 
 
-                                <div class="row search-row">
-                                    <div class="small-12 columns search-label"> 
-                                        Last Name: 
+                            <div class="row search-row">
+                                <div class="small-12 columns search-label"> 
+                                    Last Name: 
+                                </div>
+                                <div class="options-wrapper">
+                                    <div class="small-3 large-3 columns">
+                                       <label for="not-last">Not</label>
+                                       <input type="checkbox" value="not" id="not-last" name="not-last_name">
                                     </div>
-                                    <div class="options-wrapper">
-                                        <div class="small-3 large-3 columns">
-                                           <label for="not-last">Not</label>
-                                           <input type="checkbox" value="not" id="not-last" name="not-last_name">
-                                        </div>
 
-                                        <div class="small-4 medium-3 large-6 columns">
-                                            <select name="last_name-logic" id="last_name-logic">
-                                                {foreach from=$logic key=k item=i}
-                                                    <option value="{$i}">{$k}</option>
-                                                {/foreach}
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="small-12 columns">
-                                        <input type="text" name="last_name" placeholder="Last Name">
+                                    <div class="small-4 medium-3 large-6 columns">
+                                        <select name="last_name-logic" id="last_name-logic">
+                                            {foreach from=$logic key=k item=i}
+                                                <option value="{$i}">{$k}</option>
+                                            {/foreach}
+                                        </select>
                                     </div>
                                 </div>
+                                <div class="small-12 columns">
+                                    <input type="text" name="last_name" placeholder="Last Name">
+                                </div>
+                            </div>
 
 
-                                <div class="row search-row">
-                                    <div class="small-12 columns search-label"> 
-                                        First Name &amp; Middle: 
+                            <div class="row search-row">
+                                <div class="small-12 columns search-label"> 
+                                    First Name &amp; Middle: 
+                                </div>
+                                <div class="options-wrapper">
+                                    <div class="small-3 large-3 columns">
+                                       <label for="not-first_mid">Not</label>
+                                       <input type="checkbox" value="not" id="not-first_mid" name="not-first_mid">
                                     </div>
-                                    <div class="options-wrapper">
-                                        <div class="small-3 large-3 columns">
-                                           <label for="not-first_mid">Not</label>
-                                           <input type="checkbox" value="not" id="not-first_mid" name="not-first_mid">
-                                        </div>
 
-                                        <div class="small-4 medium-3 large-6 columns">
-                                            <select name="first_mid-logic" id="first_mid-logic">
-                                                {foreach from=$logic key=k item=i}
-                                                    <option value="{$i}">{$k}</option>
-                                                {/foreach}
-                                            </select>
-                                        </div>
-                                   </div>     
-                                   <div class="small-12 columns">
-                                       <input type="text" name="first_mid" placeholder="First - Middle Name">
+                                    <div class="small-4 medium-3 large-6 columns">
+                                        <select name="first_mid-logic" id="first_mid-logic">
+                                            {foreach from=$logic key=k item=i}
+                                                <option value="{$i}">{$k}</option>
+                                            {/foreach}
+                                        </select>
                                     </div>
+                               </div>     
+                               <div class="small-12 columns">
+                                   <input type="text" name="first_mid" placeholder="First - Middle Name">
                                 </div>
+                            </div>
 
 
-                                <div class="row search-row">
-                                    <div class="small-12 columns search-label"> 
-                                        Birth Year: 
+                            <div class="row search-row">
+                                <div class="small-12 columns search-label"> 
+                                    Birth Year: 
+                                </div>
+                                <div class="options-wrapper">
+                                    <div class="small-3 large-3 columns">
+                                       <label for="not-b_year">Not</label>
+                                       <input type="checkbox" value="not" id="not-b_year" name="not-b_year">
                                     </div>
-                                    <div class="options-wrapper">
-                                        <div class="small-3 large-3 columns">
-                                           <label for="not-b_year">Not</label>
-                                           <input type="checkbox" value="not" id="not-b_year" name="not-b_year">
-                                        </div>
 
-                                        <div class="small-4 medium-3 large-6 columns">
-                                            <select name="b_year-logic" id="b_year-logic">
-                                                {foreach from=$logic key=k item=i}
-                                                   <option value="{$i}">{$k}</option>
-                                                {/foreach}
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="small-12 columns">
-                                        <input type="text" name="b_year" placeholder="Year of Birth">
+                                    <div class="small-4 medium-3 large-6 columns">
+                                        <select name="b_year-logic" id="b_year-logic">
+                                            {foreach from=$logic key=k item=i}
+                                               <option value="{$i}">{$k}</option>
+                                            {/foreach}
+                                        </select>
                                     </div>
                                 </div>
+                                <div class="small-12 columns">
+                                    <input type="text" name="b_year" placeholder="Year of Birth">
+                                </div>
+                            </div>
 
 
-                                <div class="row search-row">
-                                      <div class="small-12 columns search-label"> 
-                                        Birth Year Range:
+                            <div class="row search-row">
+                                  <div class="small-12 columns search-label"> 
+                                    Birth Year Range:
+                                </div>
+                                <div class="options-wrapper">
+                                    <div class="small-3 large-3 columns">
+                                       <label for="not-b_yr_range">Not</label>
+                                       <input type="checkbox" value="not" id="not-b_yr_range" name="not-b_yr_range">
                                     </div>
-                                    <div class="options-wrapper">
-                                        <div class="small-3 large-3 columns">
-                                           <label for="not-b_yr_range">Not</label>
-                                           <input type="checkbox" value="not" id="not-b_yr_range" name="not-b_yr_range">
-                                        </div>
 
-                                        <div class="small-4 medium-3 large-6 columns">
-                                            <select name="b_yr_range-logic" id="b_yr_range-logic">
-                                                 <option value="=">Equals</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="small-12 columns">
-                                       <select name="b_yr_range" id="">
-                                       <option value="">Select a date range</option>
-                                        {foreach from=$birth_death_range.birth item=r}
-                                           <option value="{$r.start}">{$r.start} - {$r.end}</option>
-                                        {/foreach}
+                                    <div class="small-4 medium-3 large-6 columns">
+                                        <select name="b_yr_range-logic" id="b_yr_range-logic">
+                                             <option value="=">Equals</option>
                                         </select>
                                     </div>
                                 </div>
+                                <div class="small-12 columns">
+                                   <select name="b_yr_range" id="">
+                                   <option value="">Select a date range</option>
+                                    {foreach from=$birth_death_range.birth item=r}
+                                       <option value="{$r.start}">{$r.start} - {$r.end}</option>
+                                    {/foreach}
+                                    </select>
+                                </div>
+                            </div>
 
 
-                                <div class="row search-row">
-                                    <div class="small-12 columns search-label"> 
-                                        Death Year: 
+                            <div class="row search-row">
+                                <div class="small-12 columns search-label"> 
+                                    Death Year: 
+                                </div>
+                                <div class="options-wrapper">
+                                    <div class="small-3 large-3 columns">
+                                       <label for="not-death">Not</label>
+                                       <input type="checkbox" value="not" id="not-death" name="not-d_year">
                                     </div>
-                                    <div class="options-wrapper">
-                                        <div class="small-3 large-3 columns">
-                                           <label for="not-death">Not</label>
-                                           <input type="checkbox" value="not" id="not-death" name="not-d_year">
-                                        </div>
 
-                                        <div class="small-4 medium-3 large-6 columns">
-                                            <select name="d_year-logic" id="d_year-logic">
-                                                {foreach from=$logic key=k item=i}
-                                                    <option value="{$i}">{$k}</option>
-                                                {/foreach}
-                                            </select>
-                                        </div>
-                                    </div>    
-                                   <div class="small-12 columns">
-                                        <input type="text" name="d_year" placeholder="Year of Death">
+                                    <div class="small-4 medium-3 large-6 columns">
+                                        <select name="d_year-logic" id="d_year-logic">
+                                            {foreach from=$logic key=k item=i}
+                                                <option value="{$i}">{$k}</option>
+                                            {/foreach}
+                                        </select>
                                     </div>
+                                </div>    
+                               <div class="small-12 columns">
+                                    <input type="text" name="d_year" placeholder="Year of Death">
                                 </div>
+                            </div>
 
 
-                                <div class="row search-row">
-                                      <div class="small-12 columns search-label"> 
-                                       Death Year Range: 
+                            <div class="row search-row">
+                                  <div class="small-12 columns search-label"> 
+                                   Death Year Range: 
+                                </div>
+                                <div class="options-wrapper">
+                                    <div class="small-3 large-3 columns">
+                                       <label for="not-d_yr_range">Not</label>
+                                       <input type="checkbox" value="not" id="not-d_yr_range" name="not-d_yr_range">
                                     </div>
-                                    <div class="options-wrapper">
-                                        <div class="small-3 large-3 columns">
-                                           <label for="not-d_yr_range">Not</label>
-                                           <input type="checkbox" value="not" id="not-d_yr_range" name="not-d_yr_range">
-                                        </div>
 
-                                        <div class="small-4 medium-3 large-6 columns">
-                                            <select name="d_yr_range-logic" id="d_yr_range-logic">
-                                                <option value="=">Equals</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="small-12 columns">
-                                        <select name="d_yr_range" id="d_yr_range-range">
-                                        <option value="">Select a date range</option>
-                                        {foreach from=$birth_death_range.death item=r}
-                                           <option value="{$r.start}">{$r.start} - {$r.end}</option>
-                                        {/foreach}
+                                    <div class="small-4 medium-3 large-6 columns">
+                                        <select name="d_yr_range-logic" id="d_yr_range-logic">
+                                            <option value="=">Equals</option>
                                         </select>
                                     </div>
                                 </div>
+                                <div class="small-12 columns">
+                                    <select name="d_yr_range" id="d_yr_range-range">
+                                    <option value="">Select a date range</option>
+                                    {foreach from=$birth_death_range.death item=r}
+                                       <option value="{$r.start}">{$r.start} - {$r.end}</option>
+                                    {/foreach}
+                                    </select>
+                                </div>
+                            </div>
 
 
-                                <div class="row search-row">
-                                     <div class="small-12 columns search-label"> 
-                                        Maiden or Other Name:
+                            <div class="row search-row">
+                                 <div class="small-12 columns search-label"> 
+                                    Maiden or Other Name:
+                                </div>
+                                <div class="options-wrapper">
+                                    <div class="small-3 large-3 columns">
+                                       <label for="not-maiden_other">Not</label>
+                                       <input type="checkbox" value="not" id="not-maiden" name="not-maiden_other">
                                     </div>
-                                    <div class="options-wrapper">
-                                        <div class="small-3 large-3 columns">
-                                           <label for="not-maiden_other">Not</label>
-                                           <input type="checkbox" value="not" id="not-maiden" name="not-maiden_other">
-                                        </div>
 
-                                        <div class="small-4 medium-3 large-6 columns">
-                                            <select name="maiden_other-logic" id="maiden_other-logic">
-                                                {foreach from=$logic key=k item=i}
-                                                    <option value="{$i}">{$k}</option>
-                                                {/foreach}
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="small-12 columns">
-                                        <input type="text" name="maiden_other" placeholder="Maiden or Other">
+                                    <div class="small-4 medium-3 large-6 columns">
+                                        <select name="maiden_other-logic" id="maiden_other-logic">
+                                            {foreach from=$logic key=k item=i}
+                                                <option value="{$i}">{$k}</option>
+                                            {/foreach}
+                                        </select>
                                     </div>
                                 </div>
+                                <div class="small-12 columns">
+                                    <input type="text" name="maiden_other" placeholder="Maiden or Other">
+                                </div>
+                            </div>
 
 
-                                <div class="row search-row">
-                                     <div class="small-12 columns search-label"> 
-                                        Spouse / Partner Name: 
+                            <div class="row search-row">
+                                 <div class="small-12 columns search-label"> 
+                                    Spouse / Partner Name:     
+                                </div>
+                                <div class="options-wrapper">
+                                    <div class="small-3 large-3 columns">
+                                       <label for="not-spouse_partner">Not</label>
+                                       <input type="checkbox" value="not" value="not" id="not-spouse" name="not-spouse_partner">
                                     </div>
-                                    <div class="options-wrapper">
-                                        <div class="small-3 large-3 columns">
-                                           <label for="not-spouse_partner">Not</label>
-                                           <input type="checkbox" value="not" value="not" id="not-spouse" name="not-spouse_partner">
-                                        </div>
 
-                                        <div class="small-4 medium-3 large-6 columns">
-                                            <select name="spouse_partner-logic" id="spouse_partner-logic">
-                                                {foreach from=$logic key=k item=i}
-                                                    <option value="{$i}">{$k}</option>
-                                                {/foreach}
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="small-12 columns">
-                                        <input type="text" name="spouse_partner" placeholder="Spouse or Partner">
+                                    <div class="small-4 medium-3 large-6 columns">
+                                        <select name="spouse_partner-logic" id="spouse_partner-logic">
+                                            {foreach from=$logic key=k item=i}
+                                                <option value="{$i}">{$k}</option>
+                                            {/foreach}
+                                        </select>
                                     </div>
                                 </div>
-                                <input id="input" class="search-button" name="searchButton" value="Search" type="submit">
-                        </div>
+                                <div class="small-12 columns">
+                                    <input type="text" name="spouse_partner" placeholder="Spouse or Partner">
+                                </div>
+                            </div>
+                            <input id="input" class="search-button" name="searchButton" value="Search" type="submit">
                     </div>
                 </div>
             </div>
-        </form>
+        </div>
+    </form>
 </div>
 <script type="text/javascript">
     jQuery(document).ready(function($) {