Index: web/conf/searches.ini
===================================================================
--- web/conf/searches.ini	(revision 3801)
+++ web/conf/searches.ini	(working copy)
@@ -8,6 +8,10 @@
 ; below.
 default_sort         = relevance
 
+; This setting controls the default view for search results; the selected option
+; should be one of the options present in the [Views] section below.
+default_view         = list
+
 ; If this setting is true, boolean operators in searches (AND/OR/NOT) will only
 ; be recognized if they are ALL UPPERCASE.  If set to false, they will be
 ; recognized regardless of case.
@@ -305,3 +309,11 @@
 ; Put in the fields to strip here in the following format:
 ; shard name = fieldname,another fieldname,...
 [StripFields]
+
+; This section defines the view options available on standard search results.
+; If only one view is required, set default_view under [General] above, and
+; leave this section commented out.
+[Views]
+list = List
+grid = Grid
+
Index: web/interface/themes/blueprint/css/styles.css
===================================================================
--- web/interface/themes/blueprint/css/styles.css	(revision 3801)
+++ web/interface/themes/blueprint/css/styles.css	(working copy)
@@ -336,9 +336,9 @@
     font-size: 90%;
 }
 .resulthead {
-    padding:.4em;
-    margin-bottom:.5em;
+    padding:.4em .4em 0em .4em;
     border-bottom: 1px #eee solid;
+    position: relative;
 }
 .savedLists { 
     margin-top: .4em; 
@@ -1150,3 +1150,56 @@
     text-align:right;
     text-decoration:none;
 }
+
+/* Grid View */
+
+.hitCount {
+    position: absolute;
+    bottom: 0px;
+}
+
+.viewButtons {
+     text-align: right;
+}
+
+.gridImageBox {
+    text-align:center; 
+    width:155px; 
+    height:130px; 
+    overflow:hidden; 
+    display:block;
+}
+
+.gridImage{
+    height:130px;
+}
+
+.gridTitleBox {
+    height:55px; 
+    display:block; 
+    text-align:center; 
+    font-size:86%;
+    width:155px;
+}
+
+.gridTitle {
+    display:block;
+    height:40px;
+    overflow:hidden;
+    line-height:1.2em;
+}
+
+td.gridCell {
+    width: 25%;
+}
+
+tr:nth-child(even) td.gridCell {background-color:white;}
+
+/* These two separate styles cannot be combined; they are both needed for
+   cross-browser support. */
+tr:nth-child(even) td.gridMouseOver {
+    background-color:#f5f5f5;
+}
+.gridMouseOver {
+    background-color:#f5f5f5;
+}
Index: web/interface/themes/blueprint/js/common.js
===================================================================
--- web/interface/themes/blueprint/js/common.js	(revision 3801)
+++ web/interface/themes/blueprint/js/common.js	(working copy)
@@ -53,6 +53,16 @@
     $('input[type="checkbox"].selectAllCheckboxes').change(function(){
         $(this.form).find('input[type="checkbox"]').attr('checked', $(this).attr('checked'));
     });
+    
+    // attach mouseover event to grid view records
+    $('.gridCellHover').mouseover(function() {
+        $(this).addClass('gridMouseOver')
+    });
+    
+    // attach mouseout event to grid view records
+    $('.gridCellHover').mouseout(function() {
+        $(this).removeClass('gridMouseOver')
+    });  
 });
 
 function toggleMenu(elemId) {
Index: web/interface/themes/blueprint/RecordDrivers/Index/result-grid.tpl
===================================================================
--- web/interface/themes/blueprint/RecordDrivers/Index/result-grid.tpl	(revision 0)
+++ web/interface/themes/blueprint/RecordDrivers/Index/result-grid.tpl	(revision 0)
@@ -0,0 +1,32 @@
+<div id="record{$summId|escape}" class="gridRecordBox recordId" >
+    <span class="gridImageBox" >
+    <a href="{$url}/Record/{$summId|escape:"url"}">
+    {if $summThumbLarge}
+    <img src="{$summThumbLarge|escape}" class="gridImage" alt="{translate text='Cover Image'}" />
+    {elseif $summThumb}
+    <img src="{$summThumb|escape}" class="gridImage" alt="{translate text='Cover Image'}" />
+    {else}
+    <img src="{$path}/bookcover.php" class="gridImage" alt="{translate text='No Cover Image'}"/>
+    {/if}
+    </a>
+    </span>
+    <div class="gridTitleBox" >
+      <a class="gridTitle" href="{$url}/Record/{$summId|escape:"url"}" >
+        {if !$summTitle}{translate text='Title not available'}{elseif !empty($summHighlightedTitle)}{$summHighlightedTitle|addEllipsis:$summTitle|highlight}{else}{$summTitle|truncate:80:"..."|escape}{/if}
+      </a>
+      {if $summOpenUrl || !empty($summURLs)}
+        {if $summOpenUrl}
+          {include file="Search/openurl.tpl" openUrl=$summOpenUrl}
+        {/if}
+        {foreach from=$summURLs key=recordurl item=urldesc}
+          <a href="{$recordurl|escape}" class="fulltext" target="new">{if $recordurl == $urldesc}{translate text='Get full text'}{else}{$urldesc|escape}{/if}</a><br/>
+        {/foreach}
+      {else}
+        <div class="status">
+            <span class="ajax_availability hide" id="status{$summId|escape}">{translate text='Loading'}...</span>
+        </div>
+      {/if}
+    </div>
+</div>
+
+{if $summCOinS}<span class="Z3988" title="{$summCOinS|escape}"></span>{/if}
Index: web/interface/themes/blueprint/RecordDrivers/Index/result-list.tpl
===================================================================
--- web/interface/themes/blueprint/RecordDrivers/Index/result-list.tpl	(revision 0)
+++ web/interface/themes/blueprint/RecordDrivers/Index/result-list.tpl	(revision 0)
@@ -0,0 +1,99 @@
+<div class="result recordId" id="record{$summId|escape}">
+  {* hide until complete
+  <label for="checkbox_{$summId|regex_replace:'/[^a-z0-9]/':''|escape}" class="offscreen">{translate text="Select this record"}</label>
+  <input id="checkbox_{$summId|regex_replace:'/[^a-z0-9]/':''|escape}" type="checkbox" name="id[]" value="{$summId|escape}" class="checkbox addToCartCheckbox"/>
+   *}
+  <div class="span-2">
+  {if $summThumb}
+    <img src="{$summThumb|escape}" class="summcover" alt="{translate text='Cover Image'}"/>
+    {else}
+    <img src="{$path}/bookcover.php" class="summcover" alt="{translate text='No Cover Image'}"/>
+  {/if}
+  </div>
+  <div class="span-9">
+    <div class="resultItemLine1">
+      <a href="{$url}/Record/{$summId|escape:"url"}" class="title">{if !empty($summHighlightedTitle)}{$summHighlightedTitle|addEllipsis:$summTitle|highlight}{elseif !$summTitle}{translate text='Title not available'}{else}{$summTitle|truncate:180:"..."|escape}{/if}</a>
+    </div>
+
+    <div class="resultItemLine2">
+      {if !empty($summAuthor)}
+      {translate text='by'}
+      <a href="{$url}/Author/Home?author={$summAuthor|escape:"url"}">{if !empty($summHighlightedAuthor)}{$summHighlightedAuthor|highlight}{else}{$summAuthor|escape}{/if}</a>
+      {/if}
+
+      {if $summDate}{translate text='Published'} {$summDate.0|escape}{/if}
+    </div>
+
+    <div class="span-6 last">
+      {if !empty($summSnippetCaption)}<strong>{translate text=$summSnippetCaption}:</strong>{/if}
+      {if !empty($summSnippet)}<span class="quotestart">&#8220;</span>...{$summSnippet|highlight}...<span class="quoteend">&#8221;</span><br/>{/if}
+      {if $summAjaxStatus}
+        <strong>{translate text='Call Number'}:</strong> <span class="ajax_availability hide" id="callnumber{$summId|escape}">{translate text='Loading'}...</span><br/>
+        <strong>{translate text='Located'}:</strong> <span class="ajax_availability hide" id="location{$summId|escape}">{translate text='Loading'}...</span>
+      {elseif !empty($summCallNo)}
+        <strong>{translate text='Call Number'}:</strong> {$summCallNo|escape}
+      {/if}
+      
+      {if $summOpenUrl || !empty($summURLs)}
+        {if $summOpenUrl}
+          <br/>
+          {include file="Search/openurl.tpl" openUrl=$summOpenUrl}
+        {/if}
+        {foreach from=$summURLs key=recordurl item=urldesc}
+          <br/><a href="{$recordurl|escape}" class="fulltext" target="new">{if $recordurl == $urldesc}{translate text='Get full text'}{else}{$urldesc|escape}{/if}</a>
+        {/foreach}
+      {/if}
+      
+      <br/>
+      {foreach from=$summFormats item=format}
+        <span class="iconlabel {$format|lower|regex_replace:"/[^a-z0-9]/":""}">{translate text=$format}</span>
+      {/foreach}
+      
+      {if !$summOpenUrl && empty($summURLs)}
+      <span class="ajax_availability hide" id="status{$summId|escape}">{translate text='Loading'}...</span>
+      {/if}     
+    </div>
+
+    {if $showPreviews}
+      {if (!empty($summLCCN)|!empty($summISBN)|!empty($summOCLC))}
+      <div class="span-3 last">
+        {if $showGBSPreviews}      
+          <div class="previewDiv"> 
+            <a title="{translate text='Preview from'} Google Books" class="hide previewGBS{if $summISBN} ISBN{$summISBN}{/if}{if $summLCCN} LCCN{$summLCCN}{/if}{if $summOCLC} OCLC{$summOCLC|@implode:' OCLC'}{/if}" target="_blank">
+              <img src="https://www.google.com/intl/en/googlebooks/images/gbs_preview_button1.png" alt="{translate text='Preview'}"/>
+            </a>
+          </div>
+        {/if}
+        {if $showOLPreviews}
+          <div class="previewDiv">
+            <a title="{translate text='Preview from'} Open Library" class="hide previewOL{if $summISBN} ISBN{$summISBN}{/if}{if $summLCCN} LCCN{$summLCCN}{/if}{if $summOCLC} OCLC{$summOCLC|@implode:' OCLC'}{/if}" target="_blank">
+              <img src="{$path}/images/preview_ol.gif" alt="{translate text='Preview'}"/>
+            </a>
+          </div> 
+        {/if}
+        {if $showHTPreviews}
+          <div class="previewDiv">
+            <a title="{translate text='Preview from'} HathiTrust" class="hide previewHT{if $summISBN} ISBN{$summISBN}{/if}{if $summLCCN} LCCN{$summLCCN}{/if}{if $summOCLC} OCLC{$summOCLC|@implode:' OCLC'}{/if}" target="_blank">
+              <img src="{$path}/images/preview_ht.gif" alt="{translate text='Preview'}"/>
+            </a>
+          </div> 
+        {/if}
+        <span class="previewBibkeys{if $summISBN} ISBN{$summISBN}{/if}{if $summLCCN} LCCN{$summLCCN}{/if}{if $summOCLC} OCLC{$summOCLC|@implode:' OCLC'}{/if}"></span>
+      </div>
+      {/if}
+    {/if}     
+  </div>
+
+  <div class="span-4 last">
+    <a id="saveRecord{$summId|escape}" href="{$url}/Record/{$summId|escape:"url"}/Save" class="fav tool saveRecord" title="{translate text='Add to favorites'}">{translate text='Add to favorites'}</a>
+    
+    {* Display the lists that this record is saved to *}
+    <div class="savedLists info hide" id="savedLists{$summId|escape}">
+      <strong>{translate text="Saved in"}:</strong>
+    </div>
+  </div>
+  
+  <div class="clear"></div>
+</div>
+
+{if $summCOinS}<span class="Z3988" title="{$summCOinS|escape}"></span>{/if}
Index: web/interface/themes/blueprint/Search/list-grid.tpl
===================================================================
--- web/interface/themes/blueprint/Search/list-grid.tpl	(revision 0)
+++ web/interface/themes/blueprint/Search/list-grid.tpl	(revision 0)
@@ -0,0 +1,33 @@
+{js filename="check_item_statuses.js"}
+{js filename="check_save_statuses.js"}
+{js filename="jquery.cookie.js"}
+{js filename="cart.js"}
+{js filename="openurl.js"}
+{if $showPreviews}
+{js filename="preview.js"}
+{/if}
+
+<form method="post" name="addForm" action="{$url}/Cart/Home">
+  {* hide until complete
+  <div class="bulkActionButtons">
+    <noscript>
+      <input type="submit" class="cartAdd" name="add" value="{translate text='Add selected items to cart'}"/>
+    </noscript>
+    <div id="cartSummary">
+      <a title="{translate text='View cart'}" class="cart viewCart" href="{$url}/Cart/Home"><strong><span id="cartSize">0</span></strong> {translate text='items'}</a>
+    </div>
+    <div class="clear"></div>
+  </div>
+  *}
+<table>
+  <tr>
+  {foreach from=$recordSet item=record name="recordLoop"}
+   <td class="gridCell gridCellHover">
+       <span class="recordNumber">{$recordStart+$smarty.foreach.recordLoop.iteration-1}</span>
+       {* This is raw HTML -- do not escape it: *}{$record}
+   </td>
+   {if (($smarty.foreach.recordLoop.iteration % 4) == 0) && (!$smarty.foreach.recordLoop.last)}</tr><tr>{/if}
+  {/foreach}
+  </tr>
+</table>
+</form>
Index: web/interface/themes/blueprint/Search/list.tpl
===================================================================
--- web/interface/themes/blueprint/Search/list.tpl	(revision 3801)
+++ web/interface/themes/blueprint/Search/list.tpl	(working copy)
@@ -9,7 +9,7 @@
 
   {* Listing Options *}
   <div class="resulthead">
-    <div class="floatleft">
+    <div class="floatleft hitCount">
       {if $recordCount}
         {translate text="Showing"}
         <strong>{$recordStart}</strong> - <strong>{$recordEnd}</strong>
@@ -28,6 +28,12 @@
     </div>
 
     <div class="floatright">
+      <div class="viewButtons">
+      {if $viewList|@count gt 1}
+        {foreach from=$viewList item=viewData key=viewLabel}
+          {if !$viewData.selected}<a href="{$viewData.viewUrl|escape}" title="{translate text='Switch view to'} {translate text=$viewData.desc}" >{/if}<img src="{$path}/images/view_{$viewData.viewType}.png" {if $viewData.selected}title="{translate text=$viewData.desc} {translate text='view already selected'}"{/if}/>{if !$viewData.selected}</a>{/if}
+        {/foreach}
+      {/if}</div>
       <form action="{$path}/Search/SortResults" method="post">
         <label for="sort_options_1">{translate text='Sort'}</label>
         <select id="sort_options_1" name="sort" class="jumpMenu">
Index: web/interface/themes/classic/css/styles.css
===================================================================
--- web/interface/themes/classic/css/styles.css	(revision 3801)
+++ web/interface/themes/classic/css/styles.css	(working copy)
@@ -195,10 +195,15 @@
     background-color:#fff;
 }
 .toggle {
+    position: absolute;
+    bottom: 0px;
+    right: 0px;
+    margin-bottom: 1px;
     text-align:right;
 }
 .toggle img {
     vertical-align:text-bottom;
+    margin: 0px 0px 3px 2px;
 }
 .resultitem {
     margin-left:100px;
@@ -207,7 +212,9 @@
     padding:10px 10px 5px 10px;
     margin-bottom:1.5em;
     border-bottom: 1px solid #eee;
+    position: relative;
 }
+
 .searchbox {
     padding:15px 20px;
 }
@@ -625,10 +632,9 @@
 
 .pagination {
     font-size:90%;
-    padding:1.5em 0 1.5em 0;
+    padding:0.5em 0 1.5em 0;
     margin:1.5em 0;
     text-align:center;
-    border-top: 1px solid #eee;
 }
 .pagination a {
     padding: .2em .3em;
@@ -1228,3 +1234,40 @@
     text-align:right;
     text-decoration:none;
 }
+
+/* Grid View */
+.gridRecordBox {
+    margin: 0px 3px 3px 3px; 
+    padding: 5px 1px 3px 3px
+}
+
+.gridImageBox {
+    text-align:center; 
+    width:155px; 
+    height:130px; 
+    overflow:hidden; 
+    display:block; 
+}
+
+.gridImage{
+    height:130px;
+}
+
+.gridTitleBox {
+    height:55px; 
+    display:block; 
+    text-align:center; 
+    font-size:86%;
+    width:155px;
+}
+
+.gridTitle {
+    display:block;
+    height:40px;
+    overflow:hidden;
+}
+
+.gridMouseOver {
+    background-color:#f5f5f5;
+}
+
Index: web/interface/themes/classic/RecordDrivers/Index/result-grid.tpl
===================================================================
--- web/interface/themes/classic/RecordDrivers/Index/result-grid.tpl	(revision 0)
+++ web/interface/themes/classic/RecordDrivers/Index/result-grid.tpl	(revision 0)
@@ -0,0 +1,50 @@
+<div id="record{$summId|escape}" class="gridRecordBox" onmouseover="YAHOO.util.Dom.addClass(this, 'gridMouseOver');" onmouseout="YAHOO.util.Dom.removeClass(this, 'gridMouseOver');">
+    <span class="gridImageBox" >
+    <a href="{$url}/Record/{$summId|escape:"url"}">
+    {if $summThumbLarge}
+    <img src="{$summThumbLarge|escape}" class="gridImage" alt="{translate text='Cover Image'}" />
+    {elseif $summThumb}
+    <img src="{$summThumb|escape}" class="gridImage" alt="{translate text='Cover Image'}" />
+    {else}
+    <img src="{$path}/bookcover.php" class="gridImage" alt="{translate text='No Cover Image'}"/>
+    {/if}
+    </a>
+    </span>
+    <div class="gridTitleBox" >
+      <a class="gridTitle" href="{$url}/Record/{$summId|escape:"url"}" >
+        {if !$summTitle}{translate text='Title not available'}{elseif !empty($summHighlightedTitle)}{$summHighlightedTitle|addEllipsis:$summTitle|highlight}{else}{$summTitle|truncate:80:"..."|escape}{/if}
+      </a>
+      {if $summOpenUrl || !empty($summURLs)}
+        {if $summOpenUrl}
+          {include file="Search/openurl.tpl" openUrl=$summOpenUrl}
+        {/if}
+        {foreach from=$summURLs key=recordurl item=urldesc}
+        <div>
+          <a href="{$recordurl|escape}"  target="new">{if $recordurl == $urldesc}{translate text='Get full text'}{else}{$urldesc|escape}{/if}</a>
+        </div>
+        {/foreach}
+      {else}
+        <div class="status" id="status{$summId|escape}">
+          <span class="unknown" style="font-size: 8pt;">{translate text='Loading'}...</span>
+        </div>
+      {/if}
+    </div>
+</div>
+
+{if $summCOinS}<span class="Z3988" title="{$summCOinS|escape}"></span>{/if}
+
+{if $summAjaxStatus}
+<script type="text/javascript">
+  getStatuses('{$summId|escape:"javascript"}');
+</script>
+{/if}
+{if $showPreviews}
+<script type="text/javascript">
+  {if $summISBN}getExtIds('ISBN{$summISBN|escape:"javascript"}');{/if}
+  {if $summLCCN}getExtIds('LCCN{$summLCCN|escape:"javascript"}');{/if}
+  {if $summOCLC}{foreach from=$summOCLC item=OCLC}getExtIds('OCLC{$OCLC|escape:"javascript"}');{/foreach}{/if}
+  {if (!empty($summLCCN)|!empty($summISBN)|!empty($summOCLC))}
+    getHTIds('id:HT{$summId|escape:"javascript"};{if $summISBN}isbn:{$summISBN|escape:"javascript"}{/if}{if $summLCCN}{if $summISBN};{/if}lccn:{$summLCCN|escape:"javascript"}{/if}{if $summOCLC}{if $summISBN|$summLCCN};{/if}{foreach from=$summOCLC item=OCLC name=oclcLoop}oclc:{$OCLC|escape:"javascript"}{if !$smarty.foreach.oclcLoop.last};{/if}{/foreach}{/if}')
+  {/if}
+</script>
+{/if}
Index: web/interface/themes/classic/RecordDrivers/Index/result-list.tpl
===================================================================
--- web/interface/themes/classic/RecordDrivers/Index/result-list.tpl	(revision 0)
+++ web/interface/themes/classic/RecordDrivers/Index/result-list.tpl	(revision 0)
@@ -0,0 +1,104 @@
+<div id="record{$summId|escape}" class="yui-ge">
+  <div class="yui-u first">
+    {if $summThumb}
+    <img src="{$summThumb|escape}" class="alignleft" alt="{translate text='Cover Image'}"/>
+    {else}
+    <img src="{$path}/bookcover.php" class="alignleft" alt="{translate text='No Cover Image'}"/>
+    {/if}
+    <div class="resultitem">
+      <div class="resultItemLine1">
+      <a href="{$url}/Record/{$summId|escape:"url"}" class="title">{if !empty($summHighlightedTitle)}{$summHighlightedTitle|addEllipsis:$summTitle|highlight}{elseif !$summTitle}{translate text='Title not available'}{else}{$summTitle|truncate:180:"..."|escape}{/if}</a>
+      </div>
+
+      <div class="resultItemLine2">
+      {if !empty($summAuthor)}
+      {translate text='by'}
+      <a href="{$url}/Author/Home?author={$summAuthor|escape:"url"}">{if !empty($summHighlightedAuthor)}{$summHighlightedAuthor|highlight}{else}{$summAuthor|escape}{/if}</a>
+      {/if}
+
+      {if $summDate}{translate text='Published'} {$summDate.0|escape}{/if}
+      </div>
+
+      <div class="resultItemLine3">
+      {if !empty($summSnippetCaption)}<b>{translate text=$summSnippetCaption}:</b>{/if}
+      {if !empty($summSnippet)}<span class="quotestart">&#8220;</span>...{$summSnippet|highlight}...<span class="quoteend">&#8221;</span><br>{/if}
+      {if $summAjaxStatus}
+      <b>{translate text='Call Number'}:</b> <span id="callnumber{$summId|escape}">{translate text='Loading'}</span><br>
+      <b>{translate text='Located'}:</b> <span id="location{$summId|escape}">{translate text='Loading'}</span>
+      {elseif !empty($summCallNo)}
+      <b>{translate text='Call Number'}:</b> {$summCallNo|escape}
+      {/if}
+
+      {if $summOpenUrl || !empty($summURLs)}
+        {if $summOpenUrl}
+          <br>
+          {include file="Search/openurl.tpl" openUrl=$summOpenUrl}
+        {/if}
+        {foreach from=$summURLs key=recordurl item=urldesc}
+          <br><a href="{$recordurl|escape}" class="fulltext" target="new">{if $recordurl == $urldesc}{translate text='Get full text'}{else}{$urldesc|escape}{/if}</a>
+        {/foreach}
+      {elseif $summAjaxStatus}
+        <div class="status" id="status{$summId|escape}">
+          <span class="unknown" style="font-size: 8pt;">{translate text='Loading'}...</span>
+        </div>
+      {/if}
+      </div>
+      {foreach from=$summFormats item=format}
+        <span class="iconlabel {$format|lower|regex_replace:"/[^a-z0-9]/":""}">{translate text=$format}</span>
+      {/foreach}
+    </div>
+  </div>
+
+  <div class="yui-u">
+    <div id="saveLink{$summId|escape}">
+      <a href="{$url}/Record/{$summId|escape:"url"}/Save" onClick="getLightbox('Record', 'Save', '{$summId|escape}', '', '{translate text='Add to favorites'}', 'Record', 'Save', '{$summId|escape}'); return false;" class="fav tool">{translate text='Add to favorites'}</a>
+      <ul id="lists{$summId|escape}"></ul>
+      <script language="JavaScript" type="text/javascript">
+        getSaveStatuses('{$summId|escape:"javascript"}');
+      </script>
+    </div>
+    {if $showPreviews}
+      {if (!empty($summLCCN)|!empty($summISBN)|!empty($summOCLC))}
+        {if $showGBSPreviews}      
+          <div class="previewDiv"> 
+            <a class="{if $summISBN}gbsISBN{$summISBN}{/if}{if $summLCCN}{if $summISBN} {/if}gbsLCCN{$summLCCN}{/if}{if $summOCLC}{if $summISBN|$summLCCN} {/if}{foreach from=$summOCLC item=OCLC name=oclcLoop}gbsOCLC{$OCLC}{if !$smarty.foreach.oclcLoop.last} {/if}{/foreach}{/if}" style="display:none" target="_blank">
+              <img src="https://www.google.com/intl/en/googlebooks/images/gbs_preview_button1.png" border="0" style="width: 70px; margin: 0; padding-bottom:5px;"/>
+            </a>    
+          </div>
+        {/if}
+        {if $showOLPreviews}
+          <div class="previewDiv">
+            <a class="{if $summISBN}olISBN{$summISBN}{/if}{if $summLCCN}{if $summISBN} {/if}olLCCN{$summLCCN}{/if}{if $summOCLC}{if $summISBN|$summLCCN} {/if}{foreach from=$summOCLC item=OCLC name=oclcLoop}olOCLC{$OCLC}{if !$smarty.foreach.oclcLoop.last} {/if}{/foreach}{/if}" style="display:none" target="_blank">
+              <img src="{$path}/images/preview_ol.gif" border="0" style="width: 70px; margin: 0"/>
+            </a>
+          </div> 
+        {/if}
+        {if $showHTPreviews}
+          <div class="previewDiv">
+            <a id="HT{$summId|escape}" style="display:none"  target="_blank">
+              <img src="{$path}/images/preview_ht.gif" border="0" style="width: 70px; margin: 0" title="{translate text='View online: Full view Book Preview from the Hathi Trust'}"/>
+            </a>
+          </div> 
+        {/if}
+      {/if}
+     {/if}
+  </div>
+</div>
+
+{if $summCOinS}<span class="Z3988" title="{$summCOinS|escape}"></span>{/if}
+
+{if $summAjaxStatus}
+<script type="text/javascript">
+  getStatuses('{$summId|escape:"javascript"}');
+</script>
+{/if}
+{if $showPreviews}
+<script type="text/javascript">
+  {if $summISBN}getExtIds('ISBN{$summISBN|escape:"javascript"}');{/if}
+  {if $summLCCN}getExtIds('LCCN{$summLCCN|escape:"javascript"}');{/if}
+  {if $summOCLC}{foreach from=$summOCLC item=OCLC}getExtIds('OCLC{$OCLC|escape:"javascript"}');{/foreach}{/if}
+  {if (!empty($summLCCN)|!empty($summISBN)|!empty($summOCLC))}
+    getHTIds('id:HT{$summId|escape:"javascript"};{if $summISBN}isbn:{$summISBN|escape:"javascript"}{/if}{if $summLCCN}{if $summISBN};{/if}lccn:{$summLCCN|escape:"javascript"}{/if}{if $summOCLC}{if $summISBN || $summLCCN};{/if}{foreach from=$summOCLC item=OCLC name=oclcLoop}oclc:{$OCLC|escape:"javascript"}{if !$smarty.foreach.oclcLoop.last};{/if}{/foreach}{/if}')
+  {/if}
+</script>
+{/if}
Index: web/interface/themes/classic/Search/list-grid.tpl
===================================================================
--- web/interface/themes/classic/Search/list-grid.tpl	(revision 0)
+++ web/interface/themes/classic/Search/list-grid.tpl	(revision 0)
@@ -0,0 +1,22 @@
+<form name="addForm" action="">
+<table style="width:670px;">
+  <tr>
+  {foreach from=$recordSet item=record name="recordLoop"}
+   <td width="25%" style="border-bottom: 1px solid #EEEEEE;">{* This is raw HTML -- do not escape it: *}{$record}</td>
+    {if (($smarty.foreach.recordLoop.iteration % 4) == 0) && (!$smarty.foreach.recordLoop.last)}</tr><tr>{/if}
+  {/foreach}
+  </tr>
+</table>
+</form>
+
+<script type="text/javascript">
+  doGetStatuses({literal}{{/literal}
+    available: '<span class="available">{translate text='Available'}<\/span>',
+    unavailable: '<span class="checkedout">{translate text='Checked Out'}<\/span>',
+    unknown: '<span class="unknown">{translate text='Unknown'}<\/span>',
+    reserve: '{translate text='on_reserve'}'
+  {literal}}{/literal});
+  {if $user}
+  doGetSaveStatuses();
+  {/if}
+</script>
Index: web/interface/themes/classic/Search/list-list.tpl
===================================================================
--- web/interface/themes/classic/Search/list-list.tpl	(revision 3801)
+++ web/interface/themes/classic/Search/list-list.tpl	(working copy)
@@ -4,6 +4,7 @@
       {* This is raw HTML -- do not escape it: *}
       {$record}
     </div>
+    {if $smarty.foreach.recordLoop.last}<div class="gridline"></div>{/if}
   {/foreach}
 </form>
 
Index: web/interface/themes/classic/Search/list.tpl
===================================================================
--- web/interface/themes/classic/Search/list.tpl	(revision 3801)
+++ web/interface/themes/classic/Search/list.tpl	(working copy)
@@ -33,6 +33,13 @@
         </div>
 
         <div class="yui-u toggle">
+          {if $viewList|@count gt 1}
+            {foreach from=$viewList item=viewData key=viewLabel}
+              {if !$viewData.selected}<a href="{$viewData.viewUrl|escape}" title="{translate text='Switch view to'} {translate text=$viewData.desc}" >{/if}
+              <img src="{$path}/images/view_{$viewData.viewType}.png" {if $viewData.selected}title="{translate text=$viewData.desc} {translate text='view already selected'}"{/if}/>
+              {if !$viewData.selected}</a>{/if}
+            {/foreach}
+          {/if}<br />
           <form action="{$path}/Search/SortResults" method="post">
             <label for="sort">{translate text='Sort'}</label>
             <select id="sort" name="sort" onChange="document.location.href = this.options[this.selectedIndex].value;">
Index: web/interface/themes/default/css/styles.css
===================================================================
--- web/interface/themes/default/css/styles.css	(revision 3801)
+++ web/interface/themes/default/css/styles.css	(working copy)
@@ -282,10 +282,15 @@
     background-color:#fff;
 }
 .toggle {
+    position: absolute;
+    bottom: 0px;
+    right: 5px;
+    margin-bottom: 1px;
     text-align:right;
 }
 .toggle img {
     vertical-align:text-bottom;
+    margin: 0px 0px 3px 2px;
 }
 .authorbox {
     padding:0 0 1em 1em;
@@ -301,9 +306,10 @@
 
 }
 .resulthead {
-    padding:0px 10px 0 10px;
+    padding:25px 10px 0 10px;
     margin-bottom:.5em;
     border-bottom: 1px #eee solid;
+    position: relative;
 }
 
 .searchtools {
@@ -1300,3 +1306,44 @@
     text-align:right;
     text-decoration:none;
 }
+
+/* Grid View */
+.gridRecordBox {
+    margin: 0px 3px 3px 3px; 
+    padding: 5px 1px 3px 15px;
+}
+
+.gridImageBox {
+    text-align:center; 
+    width:155px; 
+    height:130px; 
+    overflow:hidden; 
+    display:block;
+}
+
+.gridImage{
+    height:130px;
+}
+
+.gridTitleBox {
+    height:55px; 
+    display:block; 
+    text-align:center; 
+    font-size:86%;
+    width:155px;
+}
+
+.gridTitle {
+    display:block;
+    height:40px;
+    overflow:hidden;
+    line-height:1.1em;
+}
+
+.gridMouseOver {
+    background-color:#f5f5f5;
+}
+
+.gridline {
+    border-bottom: 1px solid #EEEEEE;
+}
Index: web/interface/themes/default/RecordDrivers/Index/result-grid.tpl
===================================================================
--- web/interface/themes/default/RecordDrivers/Index/result-grid.tpl	(revision 0)
+++ web/interface/themes/default/RecordDrivers/Index/result-grid.tpl	(revision 0)
@@ -0,0 +1,50 @@
+<div id="record{$summId|escape}" class="gridRecordBox" onmouseover="YAHOO.util.Dom.addClass(this, 'gridMouseOver');" onmouseout="YAHOO.util.Dom.removeClass(this, 'gridMouseOver');">
+    <span class="gridImageBox" >
+    <a href="{$url}/Record/{$summId|escape:"url"}">
+    {if $summThumbLarge}
+    <img src="{$summThumbLarge|escape}" class="gridImage" alt="{translate text='Cover Image'}" />
+    {elseif $summThumb}
+    <img src="{$summThumb|escape}" class="gridImage" alt="{translate text='Cover Image'}" />
+    {else}
+    <img src="{$path}/bookcover.php" class="gridImage" alt="{translate text='No Cover Image'}"/>
+    {/if}
+    </a>
+    </span>
+    <div class="gridTitleBox" >
+      <a class="gridTitle" href="{$url}/Record/{$summId|escape:"url"}" >
+        {if !$summTitle}{translate text='Title not available'}{elseif !empty($summHighlightedTitle)}{$summHighlightedTitle|addEllipsis:$summTitle|highlight}{else}{$summTitle|truncate:80:"..."|escape}{/if}
+      </a>
+      {if $summOpenUrl || !empty($summURLs)}
+        {if $summOpenUrl}
+          {include file="Search/openurl.tpl" openUrl=$summOpenUrl}
+        {/if}
+        {foreach from=$summURLs key=recordurl item=urldesc}
+        <div>
+          <a href="{$recordurl|escape}"  target="new">{if $recordurl == $urldesc}{translate text='Get full text'}{else}{$urldesc|escape}{/if}</a>
+        </div>
+        {/foreach}
+      {else}
+        <div class="status" id="status{$summId|escape}">
+          <span class="unknown" style="font-size: 8pt;">{translate text='Loading'}...</span>
+        </div>
+      {/if}
+    </div>
+</div>
+
+{if $summCOinS}<span class="Z3988" title="{$summCOinS|escape}"></span>{/if}
+
+{if $summAjaxStatus}
+<script type="text/javascript">
+  getStatuses('{$summId|escape:"javascript"}');
+</script>
+{/if}
+{if $showPreviews}
+<script type="text/javascript">
+  {if $summISBN}getExtIds('ISBN{$summISBN|escape:"javascript"}');{/if}
+  {if $summLCCN}getExtIds('LCCN{$summLCCN|escape:"javascript"}');{/if}
+  {if $summOCLC}{foreach from=$summOCLC item=OCLC}getExtIds('OCLC{$OCLC|escape:"javascript"}');{/foreach}{/if}
+  {if (!empty($summLCCN)|!empty($summISBN)|!empty($summOCLC))}
+    getHTIds('id:HT{$summId|escape:"javascript"};{if $summISBN}isbn:{$summISBN|escape:"javascript"}{/if}{if $summLCCN}{if $summISBN};{/if}lccn:{$summLCCN|escape:"javascript"}{/if}{if $summOCLC}{if $summISBN|$summLCCN};{/if}{foreach from=$summOCLC item=OCLC name=oclcLoop}oclc:{$OCLC|escape:"javascript"}{if !$smarty.foreach.oclcLoop.last};{/if}{/foreach}{/if}')
+  {/if}
+</script>
+{/if}
Index: web/interface/themes/default/RecordDrivers/Index/result-list.tpl
===================================================================
--- web/interface/themes/default/RecordDrivers/Index/result-list.tpl	(revision 0)
+++ web/interface/themes/default/RecordDrivers/Index/result-list.tpl	(revision 0)
@@ -0,0 +1,104 @@
+<div id="record{$summId|escape}" class="yui-ge">
+  <div class="yui-u first">
+    {if $summThumb}
+    <img src="{$summThumb|escape}" class="alignleft" alt="{translate text='Cover Image'}"/>
+    {else}
+    <img src="{$path}/bookcover.php" class="alignleft" alt="{translate text='No Cover Image'}"/>
+    {/if}
+    <div class="resultitem">
+      <div class="resultItemLine1">
+      <a href="{$url}/Record/{$summId|escape:"url"}" class="title">{if !empty($summHighlightedTitle)}{$summHighlightedTitle|addEllipsis:$summTitle|highlight}{elseif !$summTitle}{translate text='Title not available'}{else}{$summTitle|truncate:180:"..."|escape}{/if}</a>
+      </div>
+
+      <div class="resultItemLine2">
+      {if !empty($summAuthor)}
+      {translate text='by'}
+      <a href="{$url}/Author/Home?author={$summAuthor|escape:"url"}">{if !empty($summHighlightedAuthor)}{$summHighlightedAuthor|highlight}{else}{$summAuthor|escape}{/if}</a>
+      {/if}
+
+      {if $summDate}{translate text='Published'} {$summDate.0|escape}{/if}
+      </div>
+
+      <div class="resultItemLine3">
+      {if !empty($summSnippetCaption)}<b>{translate text=$summSnippetCaption}:</b>{/if}
+      {if !empty($summSnippet)}<span class="quotestart">&#8220;</span>...{$summSnippet|highlight}...<span class="quoteend">&#8221;</span><br>{/if}
+      {if $summAjaxStatus}
+      <b>{translate text='Call Number'}:</b> <span id="callnumber{$summId|escape}">{translate text='Loading'}</span><br>
+      <b>{translate text='Located'}:</b> <span id="location{$summId|escape}">{translate text='Loading'}</span>
+      {elseif !empty($summCallNo)}
+      <b>{translate text='Call Number'}:</b> {$summCallNo|escape}
+      {/if}
+
+      {if $summOpenUrl || !empty($summURLs)}
+        {if $summOpenUrl}
+          <br>
+          {include file="Search/openurl.tpl" openUrl=$summOpenUrl}
+        {/if}
+        {foreach from=$summURLs key=recordurl item=urldesc}
+          <br><a href="{$recordurl|escape}" class="fulltext" target="new">{if $recordurl == $urldesc}{translate text='Get full text'}{else}{$urldesc|escape}{/if}</a>
+        {/foreach}
+      {elseif $summAjaxStatus}
+        <div class="status" id="status{$summId|escape}">
+          <span class="unknown" style="font-size: 8pt;">{translate text='Loading'}...</span>
+        </div>
+      {/if}
+      </div>
+      {foreach from=$summFormats item=format}
+        <span class="iconlabel {$format|lower|regex_replace:"/[^a-z0-9]/":""}">{translate text=$format}</span>
+      {/foreach}
+    </div>
+  </div>
+
+  <div class="yui-u">
+    <div id="saveLink{$summId|escape}">
+      <a href="{$url}/Record/{$summId|escape:"url"}/Save" onClick="getLightbox('Record', 'Save', '{$summId|escape}', '', '{translate text='Add to favorites'}', 'Record', 'Save', '{$summId|escape}'); return false;" class="fav tool">{translate text='Add to favorites'}</a>
+      <ul id="lists{$summId|escape}"></ul>
+      <script language="JavaScript" type="text/javascript">
+        getSaveStatuses('{$summId|escape:"javascript"}');
+      </script>
+    </div>
+    {if $showPreviews}
+      {if (!empty($summLCCN)|!empty($summISBN)|!empty($summOCLC))}
+        {if $showGBSPreviews}      
+          <div class="previewDiv"> 
+            <a class="{if $summISBN}gbsISBN{$summISBN}{/if}{if $summLCCN}{if $summISBN} {/if}gbsLCCN{$summLCCN}{/if}{if $summOCLC}{if $summISBN|$summLCCN} {/if}{foreach from=$summOCLC item=OCLC name=oclcLoop}gbsOCLC{$OCLC}{if !$smarty.foreach.oclcLoop.last} {/if}{/foreach}{/if}" style="display:none" target="_blank">
+              <img src="https://www.google.com/intl/en/googlebooks/images/gbs_preview_button1.png" border="0" style="width: 70px; margin: 0; padding-bottom:5px;"/>
+            </a>    
+          </div>
+        {/if}
+        {if $showOLPreviews}
+          <div class="previewDiv">
+            <a class="{if $summISBN}olISBN{$summISBN}{/if}{if $summLCCN}{if $summISBN} {/if}olLCCN{$summLCCN}{/if}{if $summOCLC}{if $summISBN|$summLCCN} {/if}{foreach from=$summOCLC item=OCLC name=oclcLoop}olOCLC{$OCLC}{if !$smarty.foreach.oclcLoop.last} {/if}{/foreach}{/if}" style="display:none" target="_blank">
+              <img src="{$path}/images/preview_ol.gif" border="0" style="width: 70px; margin: 0"/>
+            </a>
+          </div> 
+        {/if}
+        {if $showHTPreviews}
+          <div class="previewDiv">
+            <a id="HT{$summId|escape}" style="display:none"  target="_blank">
+              <img src="{$path}/images/preview_ht.gif" border="0" style="width: 70px; margin: 0" title="{translate text='View online: Full view Book Preview from the Hathi Trust'}"/>
+            </a>
+          </div> 
+        {/if}
+      {/if}
+     {/if}
+  </div>
+</div>
+
+{if $summCOinS}<span class="Z3988" title="{$summCOinS|escape}"></span>{/if}
+
+{if $summAjaxStatus}
+<script type="text/javascript">
+  getStatuses('{$summId|escape:"javascript"}');
+</script>
+{/if}
+{if $showPreviews}
+<script type="text/javascript">
+  {if $summISBN}getExtIds('ISBN{$summISBN|escape:"javascript"}');{/if}
+  {if $summLCCN}getExtIds('LCCN{$summLCCN|escape:"javascript"}');{/if}
+  {if $summOCLC}{foreach from=$summOCLC item=OCLC}getExtIds('OCLC{$OCLC|escape:"javascript"}');{/foreach}{/if}
+  {if (!empty($summLCCN)|!empty($summISBN)|!empty($summOCLC))}
+    getHTIds('id:HT{$summId|escape:"javascript"};{if $summISBN}isbn:{$summISBN|escape:"javascript"}{/if}{if $summLCCN}{if $summISBN};{/if}lccn:{$summLCCN|escape:"javascript"}{/if}{if $summOCLC}{if $summISBN || $summLCCN};{/if}{foreach from=$summOCLC item=OCLC name=oclcLoop}oclc:{$OCLC|escape:"javascript"}{if !$smarty.foreach.oclcLoop.last};{/if}{/foreach}{/if}')
+  {/if}
+</script>
+{/if}
Index: web/interface/themes/default/Search/list-grid.tpl
===================================================================
--- web/interface/themes/default/Search/list-grid.tpl	(revision 0)
+++ web/interface/themes/default/Search/list-grid.tpl	(revision 0)
@@ -0,0 +1,22 @@
+<form name="addForm" action="">
+<table style="width:752px;">
+  <tr>
+  {foreach from=$recordSet item=record name="recordLoop"}
+   <td width="25%">{* This is raw HTML -- do not escape it: *}{$record}</td>
+    {if (($smarty.foreach.recordLoop.iteration % 4) == 0) && (!$smarty.foreach.recordLoop.last)}</tr><tr>{/if}
+  {/foreach}
+  </tr>
+</table>
+</form>
+
+<script type="text/javascript">
+  doGetStatuses({literal}{{/literal}
+    available: '<span class="available">{translate text='Available'}<\/span>',
+    unavailable: '<span class="checkedout">{translate text='Checked Out'}<\/span>',
+    unknown: '<span class="unknown">{translate text='Unknown'}<\/span>',
+    reserve: '{translate text='on_reserve'}'
+  {literal}}{/literal});
+  {if $user}
+  doGetSaveStatuses();
+  {/if}
+</script>
Index: web/interface/themes/default/Search/list-list.tpl
===================================================================
--- web/interface/themes/default/Search/list-list.tpl	(revision 3801)
+++ web/interface/themes/default/Search/list-list.tpl	(working copy)
@@ -4,6 +4,7 @@
       {* This is raw HTML -- do not escape it: *}
       {$record}
     </div>
+    {if $smarty.foreach.recordLoop.last}<div class="gridline"></div>{/if}
   {/foreach}
 </form>
 
Index: web/interface/themes/default/Search/list.tpl
===================================================================
--- web/interface/themes/default/Search/list.tpl	(revision 3801)
+++ web/interface/themes/default/Search/list.tpl	(working copy)
@@ -34,6 +34,13 @@
         </div>
 
         <div class="yui-u toggle">
+          {if $viewList|@count gt 1}
+            {foreach from=$viewList item=viewData key=viewLabel}
+              {if !$viewData.selected}<a href="{$viewData.viewUrl|escape}" title="{translate text='Switch view to'} {translate text=$viewData.desc}" >{/if}
+              <img src="{$path}/images/view_{$viewData.viewType}.png" {if $viewData.selected}title="{translate text=$viewData.desc} {translate text='view already selected'}"{/if}/>
+              {if !$viewData.selected}</a>{/if}
+            {/foreach}
+          {/if}<br />
           <form action="{$path}/Search/SortResults" method="post">
             <label for="sort">{translate text='Sort'}</label>
             <select id="sort" name="sort" onChange="document.location.href = this.options[this.selectedIndex].value;">
Index: web/lang/en.ini
===================================================================
--- web/lang/en.ini	(revision 3801)
+++ web/lang/en.ini	(working copy)
@@ -137,6 +137,7 @@
 Get full text = "Get full text"
 Globe = Globe
 Go to Standard View = "Go to Standard View"
+Grid = Grid
 Group = Group
 Has Illustrations = "Has Illustrations"
 Hebrew = עברית
@@ -321,6 +322,7 @@
 Summary = Summary
 Summon Results = "Summon Results"
 Supplied by Amazon = "Supplied by Amazon"
+Switch view to = "Switch view to"
 System Unavailable = "System Unavailable"
 Table of Contents = "Table of Contents"
 Table of Contents unavailable = "Table of Contents unavailable"
@@ -547,6 +549,7 @@
 summon_database_recommendations = "You may find additional resources here:"
 top_facet_additional_prefix  = "Additional "
 top_facet_suffix             = "... within your search."
+view already selected = "view already selected"
 wcterms_broader = "Broader Subjects"
 wcterms_exact = "Related Subjects"
 wcterms_narrower = "Narrower Subjects"
Index: web/RecordDrivers/IndexRecord.php
===================================================================
--- web/RecordDrivers/IndexRecord.php	(revision 3801)
+++ web/RecordDrivers/IndexRecord.php	(working copy)
@@ -661,10 +661,12 @@
      * load in order to display a summary of the item suitable for use in
      * search results.
      *
+     * @param  string  $view       The current view.
+     * 
      * @return string Name of Smarty template file to display.
      * @access public
      */
-    public function getSearchResult()
+    public function getSearchResult($view = 'list')
     {
         global $configArray;
         global $interface;
@@ -678,6 +680,7 @@
         $interface->assign('summDate', $this->getPublicationDates());
         $interface->assign('summISBN', $this->getCleanISBN());
         $interface->assign('summThumb', $this->getThumbnail());
+        $interface->assign('summThumbLarge', $this->getThumbnail('large'));
         $issn = $this->getCleanISSN();
         $interface->assign('summISSN', $issn);
         $interface->assign('summLCCN', $this->getLCCN());
@@ -718,7 +721,7 @@
         $interface->assign('summAjaxStatus', false);
 
         // Send back the template to display:
-        return 'RecordDrivers/Index/result.tpl';
+        return 'RecordDrivers/Index/result-' . $view . '.tpl';
     }
 
     /**
Index: web/RecordDrivers/Interface.php
===================================================================
--- web/RecordDrivers/Interface.php	(revision 3801)
+++ web/RecordDrivers/Interface.php	(working copy)
@@ -210,14 +210,16 @@
     public function getReviews();
 
     /**
-     * Assign necessary Smarty variables and return a template name to
+     * Assign necessary Smarty variables and return a template name for the current view to
      * load in order to display a summary of the item suitable for use in
      * search results.
      *
+     * @param   string  $view       The current view.
+     * 
      * @return string Name of Smarty template file to display.
      * @access public
      */
-    public function getSearchResult();
+    public function getSearchResult($view = 'list');
 
     /**
      * Assign necessary Smarty variables and return a template name to 
Index: web/RecordDrivers/MarcRecord.php
===================================================================
--- web/RecordDrivers/MarcRecord.php	(revision 3801)
+++ web/RecordDrivers/MarcRecord.php	(working copy)
@@ -190,21 +190,23 @@
     }
 
     /**
-     * Assign necessary Smarty variables and return a template name to
+     * Assign necessary Smarty variables and return a template name for the current view to
      * load in order to display a summary of the item suitable for use in
      * search results.
      *
+     * @param   string  $view       The current view.
+     * 
      * @return string Name of Smarty template file to display.
      * @access public
      */
-    public function getSearchResult()
+    public function getSearchResult($view = 'list')
     {
         global $interface;
 
         // MARC results work just like index results, except that we want to
         // enable the AJAX status display since we assume that MARC records
         // come from the ILS:
-        $template = parent::getSearchResult();
+        $template = parent::getSearchResult($view);
         $interface->assign('summAjaxStatus', true);
         return $template;
     }
Index: web/services/Search/Results.php
===================================================================
--- web/services/Search/Results.php	(revision 3801)
+++ web/services/Search/Results.php	(working copy)
@@ -103,6 +103,7 @@
             (empty($displayQuery) ? '' : ' - ' . htmlspecialchars($displayQuery))
         );
         $interface->assign('sortList',   $searchObject->getSortList());
+        $interface->assign('viewList',   $searchObject->getViewList());
         $interface->assign('rssLink',    $searchObject->getRSSUrl());
 
         // Process Search
@@ -180,7 +181,10 @@
             $interface->assign('recordSet', $searchObject->getResultRecordHTML());
 
             // Setup Display
-            $interface->assign('subpage', 'Search/list-list.tpl');
+            
+            //Get view & load template
+            $currentView  = $searchObject->getView();
+            $interface->assign('subpage', 'Search/list-' . $currentView .'.tpl');
             $interface->setTemplate('list.tpl');
 
             // Process Paging
Index: web/sys/SearchObject/Base.php
===================================================================
--- web/sys/SearchObject/Base.php	(revision 3801)
+++ web/sys/SearchObject/Base.php	(working copy)
@@ -46,6 +46,7 @@
     // SEARCH PARAMETERS
     // RSS feed?
     protected $view = null;
+    protected $defaultView = 'list';
     // Search terms
     protected $searchTerms = array();
     // Sorting
@@ -77,6 +78,8 @@
     protected $defaultIndex = null;
     // Available sort options
     protected $sortOptions = array();
+    // Available view options
+    protected $viewOptions = array();
     // An ID number for saving/retrieving search
     protected $searchId    = null;
     protected $savedSearch = false;
@@ -551,10 +554,28 @@
      */
     protected function initView()
     {
-        //********************
-        // RSS feed? We should only see this in GET from a url.
-        if (isset($_REQUEST['view']) && ($_REQUEST['view'] == 'rss')) {
-            $this->view = 'rss';
+        // Check for a view parameter in the url.
+        if (isset($_REQUEST['view'])) {
+            if ($_REQUEST['view'] == 'rss') {
+                // we don't want to store rss in the Session variable
+                $this->view = 'rss';
+            } else {
+                // store non-rss views in Session for persistence
+                $validViews = $this->getViewOptions();
+                // make sure the url parameter is a valid view
+                if (in_array($_REQUEST['view'], array_keys($validViews))) {
+                    $this->view = $_REQUEST['view'];
+                    $_SESSION['lastView'] = $this->view;	
+                } else {
+                	$this->view = $this->defaultView;
+                }
+            }
+        } else if (isset($_SESSION['lastView'])) {
+            // if there is nothing in the URL, check the Session variable
+            $this->view = $_SESSION['lastView'];
+        } else {
+            // otherwise load the default
+            $this->view = $this->defaultView;
         }
     }
 
@@ -815,8 +836,51 @@
         }
         return $list;
     }
+    /**
+     * Return a url for the current search with a new view
+     *
+     * @param   string   $newView   The new view
+     * 
+     * @return  string   URL of a new search
+     * @access  public
+     */
+    public function renderLinkWithView($newView)
+    {
+        // Stash our old data for a minute
+        $oldView = $this->view;
+        // Add the new sort
+        $this->view = $newView;
+        // Get the new url
+        $url = $this->renderSearchUrl();
+        // Restore the old data
+        $this->view = $oldView;
+        // Return the URL
+        return $url;
+    }
 
     /**
+     * Return a list of urls for possible views, along with which option
+     *    should be currently selected.
+     *
+     * @access  public
+     * @return  array    View urls, descriptions and selected flags
+     */
+    public function getViewList()
+    {
+        // Loop through all the current filter fields
+        $valid = $this->getViewOptions();
+        $list = array();
+        foreach ($valid as $view => $desc) {
+            $list[$view] = array(
+                'viewType' => $view,
+                'viewUrl'  => $this->renderLinkWithView($view),
+                'desc' => $desc,
+                'selected' => ($view == $this->view)
+            );
+        }
+        return $list;
+    }
+    /**
      * Basic 'getter' for advanced types.
      *
      * @return array
@@ -1003,8 +1067,19 @@
     {
         return $this->sortOptions;
     }
-
     /**
+     * Get an array of view options; protected since this should not be used
+     * outside of the class.
+     *
+     * @access protected
+     * @return array
+     */
+    protected function getViewOptions()
+    {
+        return $this->viewOptions;
+    }
+       
+    /**
      * Reset a simple query against the default index.
      *
      * @param string $query Query string
Index: web/sys/SearchObject/Solr.php
===================================================================
--- web/sys/SearchObject/Solr.php	(revision 3801)
+++ web/sys/SearchObject/Solr.php	(working copy)
@@ -115,9 +115,11 @@
         if (isset($searchSettings['General']['default_sort'])) {
             $this->defaultSort = $searchSettings['General']['default_sort'];
         }
-        if (isset($searchSettings['DefaultSortingByType'])
-            && is_array($searchSettings['DefaultSortingByType'])
-        ) {
+        if (isset($searchSettings['General']['default_view'])) {
+            $this->defaultView = $searchSettings['General']['default_view'];
+        }
+        if (isset($searchSettings['DefaultSortingByType']) && 
+            is_array($searchSettings['DefaultSortingByType'])) {
             $this->defaultSortByType = $searchSettings['DefaultSortingByType'];
         }
         if (isset($searchSettings['Basic_Searches'])) {
@@ -139,6 +141,15 @@
                 'callnumber' => 'sort_callnumber', 'author' => 'sort_author',
                 'title' => 'sort_title');
         }
+        
+        // Load view preferences (or defaults if none in .ini file):
+        if (isset($searchSettings['Views'])) {
+            $this->viewOptions = $searchSettings['Views'];
+        } elseif (isset($searchSettings['General']['default_view'])) {
+            $this->viewOptions = array($this->defaultView => $this->defaultView);
+        } else {
+            $this->viewOptions = array('list' => 'List');
+        }
 
         // Load Spelling preferences
         $this->spellcheck    = $configArray['Spelling']['enabled'];
@@ -476,12 +487,13 @@
     public function getResultRecordHTML()
     {
         global $interface;
-
+        
+        $currentView = $this->getView();
         $html = array();
         for ($x = 0; $x < count($this->indexResult['response']['docs']); $x++) {
             $current = & $this->indexResult['response']['docs'][$x];
             $record = RecordDriverFactory::initRecordDriver($current);
-            $html[] = $interface->fetch($record->getSearchResult());
+            $html[] = $interface->fetch($record->getSearchResult($currentView));
         }
         return $html;
     }