blacklight 3.1.2 → 3.2.0pre1

data/.gitignore

@@ -11,7 +11,10 @@ webrat-*
 config/SolrMarc/*.log*
 rerun.txt
 solr_marc/solrmarc.log
-
+tmp/*
 *.log
 .bundle
-Gemfile.lock
+Gemfile.lock
+tmp/test_app
+.rvmrc
+pkg/*

data/README.md

@@ -1,6 +1,11 @@
 # Blacklight
 
-Blacklight is open source discovery software. Libraries (or anyone else) can use Blacklight to enable searching and browsing of their collections online. Blacklight uses the [Apache SOLR](http://lucene.apache.org/solr) search engine to index and search full text and/or metadata, and Blacklight has a highly configurable Ruby on Rails front-end. Blacklight was originally developed at the University of Virginia Library and is made public under an Apache 2.0 license. 
+Blacklight is an open source Solr user interface discovery platform.
+You can use Blacklight to enable searching and browsing of your collections.
+Blacklight uses the [Apache Solr](http://lucene.apache.org/solr) search engine
+to search full text and/or metadata.  Blacklight has a highly
+configurable Ruby on Rails front-end. Blacklight was originally developed at
+the University of Virginia Library and is made public under an Apache 2.0 license. 
 
 
 ## Documentation, Information and Support
@@ -21,4 +26,4 @@ Blacklight is open source discovery software. Libraries (or anyone else) can use
 In addition, you must have the Bundler and Rails 3.0 gems installed. Other gem dependencies are defined in the blacklight.gemspec file and will be automatically loaded by Bundler.
 
 ## Configuring Apache Solr 
-You'll also want some information about how Blacklight expects [Apache SOLR](http://lucene.apache.org/solr ) to run, which you can find in [README_SOLR](https://github.com/projectblacklight/blacklight/wiki/README_SOLR)
+You'll also want some information about how Blacklight expects [Apache Solr](http://lucene.apache.org/solr ) to run, which you can find in [README_SOLR](https://github.com/projectblacklight/blacklight/wiki/README_SOLR)

data/VERSION

@@ -1 +1 @@
-3.1.2
+3.2.0pre1

data/app/assets/javascripts/blacklight/blacklight.js

@@ -59,6 +59,8 @@ $(document).ready(function() {
   Blacklight.do_folder_toggle_behavior();       
   
   Blacklight.do_facet_expand_contract_behavior();
+
+  Blacklight.do_search_context_behavior();
 });
 
 
@@ -66,7 +68,27 @@ $(document).ready(function() {
 //Note all of these definitions are NOT in document ready, they get defined on
 //page load, and later called on document ready. 
 (function($) {
-    
+    Blacklight.do_search_context_behavior = function() {
+      $('a[data-counter]').click(function() {
+      var f = document.createElement('form'); f.style.display = 'none'; 
+      this.parentNode.appendChild(f); 
+      f.method = 'POST'; 
+      f.action = $(this).attr('href');
+      if(event.metaKey || event.ctrlKey){f.target = '_blank';};
+      var d = document.createElement('input'); d.setAttribute('type', 'hidden'); 
+      d.setAttribute('name', 'counter'); d.setAttribute('value', $(this).data('counter')); f.appendChild(d);
+      var m = document.createElement('input'); m.setAttribute('type', 'hidden'); 
+      m.setAttribute('name', '_method'); m.setAttribute('value', 'put'); f.appendChild(m);
+      var m = document.createElement('input'); m.setAttribute('type', 'hidden'); 
+      m.setAttribute('name', $('meta[name="csrf-param"]').attr('content')); m.setAttribute('value', $('meta[name="csrf-token"]').attr('content')); f.appendChild(m);
+
+      f.submit();
+        
+      return false;
+      });
+
+    };  
+
     // adds classes for zebra striping table rows
     Blacklight.do_zebra_stripe = function() {  
       $(Blacklight.do_zebra_stripe.selector).addClass('zebra_stripe');        

data/app/assets/stylesheets/blacklight/_catalog.css.scss

@@ -0,0 +1,369 @@
+#appliedParams
+{
+	background-color:$search_ui_bg_color;
+	border-bottom:1px solid $search_ui_border_color;
+	border-left:1px solid $search_ui_border_color;
+	border-right:1px solid $search_ui_border_color;
+	margin-bottom:1.5em;
+	padding:1em 0.66em 0 1em;
+
+  .label
+  {
+    left:-100000000px;
+    position:absolute;
+  }
+}
+
+#document
+{
+	margin-top:1em;
+
+
+  h1
+  {
+    margin:0;
+    padding:0 0 1em;
+  }
+}
+
+#documents
+{
+	margin-bottom:1.5em;
+	margin-top:1.5em;
+
+
+  .documentHeader
+  {
+    padding:0;
+  }
+
+  .per_page
+  {
+    padding-right:5px;
+  }
+}
+
+#librarian_view
+{
+	left:-17%;
+	text-align:left;
+	top:10%;
+	width:700px;
+}
+
+#marc_view
+{
+	padding:5px;
+	text-align:left;
+
+  .field
+  {
+    border-bottom: $marc_item_separator;
+    clear:both;
+  }
+
+  .ind1, .ind2
+  {
+    display:inline;
+    padding:0 5px;
+  }
+
+  .subfields
+  {
+    padding-left:5em;
+  }
+
+  .tag_ind
+  {
+    float:left;
+  }
+}
+
+#previousNextDocument
+{
+	background-color:$search_ui_bg_color;
+	border:1px solid $search_ui_border_color;
+	margin-bottom:1.5em;
+	overflow:auto;
+	padding:0.66em;
+
+  .next
+  {
+    float:right;
+  }
+}
+
+#search
+{
+  @include border-radius(4px 4px 0 0);
+	border:1px solid $search_ui_border_color;
+	font-size:120%;
+	padding:0.66em;
+	text-align:left;
+
+  #q
+  {
+    width:200px;
+  }
+
+  .submit
+  {
+    margin:0 0.5em;
+    padding:0 0.25em;
+    text-transform:capitalize;
+  }
+
+  hr
+  {
+    display: none;
+    margin: 2em 0 1em;
+  }
+}
+
+#search h2,.pagination h2,#results_text,.page_links .next_page,.page_links .prev_page
+{
+	display:none;
+}
+
+
+#sortAndPerPage
+{
+	background-color:$search_ui_bg_color;
+	border-color:$search_ui_border_color;
+	border-style:solid;
+	border-width:0 1px 1px 1px;
+	padding:0.66em;
+
+
+  label
+  {
+    font-weight:400;
+  }
+}
+
+#startOverLink
+{
+	background:asset_url('blacklight/start_over.gif', image) no-repeat center center;
+	border-bottom:none;
+	color:#fff;
+	display:block;
+	line-height:22px;
+	margin-top:-12px;
+	padding:0 7px 3px 12px;
+	position:absolute;
+	right:0.66em;
+	text-decoration:none;
+	top:50%;
+}
+
+.appliedFilter
+{
+	background: $constraint_bg_color;
+	border:1px solid $constraint_border_color;
+	display:inline-block;
+	margin-bottom:0.66em;
+	margin-right:0.33em;
+	padding:3px 3px 3px 1.5em;
+	position:relative;
+  @include border-radius(15px 15px 15px 15px);
+
+  .btnRemove
+  {
+    background:asset_url('blacklight/remove.gif', image) no-repeat center center;
+    border-bottom:none;
+    border-left:1px solid $constraint_border_color;
+    display:block;
+    height:100%;
+    outline:none;
+    position:absolute;
+    right:0;
+    text-indent:-99999px;
+    top:0;
+    width:32px;
+    z-index:5;
+  }
+
+  .btnRemove:active,.btnRemove:focus
+  {
+    border:1px dotted $constraint_border_active_color;
+  }
+
+  .queryName,.filterName
+  {
+    background:asset_url('blacklight/separator.gif',image) no-repeat right center;
+    padding-right:14px;
+  }
+}
+
+.constraints,h3.index_title,dl
+{
+	margin:0;
+	padding:0;
+}
+
+.document
+{
+	border-bottom:1px dotted $dotted_border_color; 
+	clear:both;
+	padding:0.5em 0 0;
+}
+
+.documentFunctions
+{
+	float:right;
+	margin-bottom:0.5em;
+	margin-left:1em;
+
+  .folder_toggle,.bookmark_toggle
+  {
+    display:inline;
+  }
+}
+
+
+.filterValue
+{
+	padding-right:37px;
+}
+
+.pageEntriesInfo
+{
+	background-color:$search_ui_bg_color;
+	border-color:$search_ui_border_color;
+	border-style:solid;
+	border-width:1px 1px 0;
+	padding:0.66em;
+	position:relative;
+	text-align:center;
+}
+
+.page_links
+{
+	margin-left:8em;
+	margin-right:8em;
+	text-align:center;
+
+  span.current
+  {
+    background:none repeat scroll 0 0 $page_bg_color;
+    border:1px solid $page_bg_color;
+    color:#FFF;
+    font-weight:700;
+  }
+}
+.pagination
+{
+	background-color:$search_ui_bg_color;
+	border-color:$search_ui_border_color;
+	border-style:solid;
+	border-width:0 1px 1px;
+	line-height:2em;
+	padding:0.66em;
+	position:relative;
+
+  .next_page
+  {
+    border-bottom:none;
+    margin-right:0.66em;
+    position:absolute;
+    right:0;
+  }
+
+  .prev_page
+  {
+    border-bottom:none;
+    left:0;
+    margin-left:0.66em;
+    position:absolute;
+  }
+
+  a
+  {
+    border:1px solid transparent;
+  }
+
+  a:hover,a:focus
+  {
+    border:1px solid #003;
+    text-decoration:none;
+  }
+
+  span.disabled
+  {
+    color:#999;
+  }
+
+}
+.show #appliedParams
+{
+	border-top:1px solid $search_ui_border_color;
+
+  .label
+  {
+    margin-top:0;
+    position:static;
+  }
+}
+
+.solrQuery
+{
+	background-color: $search_ui_bg_color;
+	border:1px dotted $dotted_border_color;
+	font-size:90%;
+	margin:2em;
+	padding:.5em;
+}
+
+dl.defList
+{
+	clear:both;
+	overflow:auto;
+	padding:0.5em 0;
+
+  dd
+  {
+    float:left;
+    margin:0;
+    padding:2px 0;
+    text-align:left;
+    width:450px;
+  }
+
+  dt
+  {
+    clear:both;
+    color: $field_name_color;
+    float:left;
+    margin:0;
+    padding:2px 1em 2px 0;
+    text-align:right;
+    width:20%;
+  }
+}
+
+label.checked
+{
+	font-weight:700;
+}
+
+label.toggle_bookmark,label.toggle_folder
+{
+	color:inherit;
+	display:inline-block;
+	font-weight:inherit;
+	min-width:8.5em;
+	text-align:left;
+}
+
+label.toggle_folder
+{
+	min-width:6em;
+}
+
+span.page a,span.page.current
+{
+	border-bottom:none;
+	margin-right:0.2em;
+	padding:0.2em 0.5em;
+	text-decoration:none;
+}

data/app/assets/stylesheets/blacklight/_facets.css.scss

@@ -0,0 +1,117 @@
+#facets
+{
+	font-size:93%;
+	padding:1em 0 0 1em;
+
+
+  h2
+  {
+    color:#555;
+  }
+
+  h3
+  {
+    color:#555;
+    cursor:pointer;
+    font-weight:400;
+    margin-bottom:0;
+    text-align:justify;
+  }
+
+  li
+    {
+      list-style:none;
+      margin:.3em 0;
+
+    a.remove
+    {
+      color:#666;
+    }
+
+    a:hover
+    {
+      background-color:#eee;
+    }
+
+    &.more_facets_link
+    {
+      text-align:right;
+    }
+  }
+
+  span.selected
+  {
+    color:green;
+  }
+
+  ul,h3 +div
+  {
+    border-bottom:1px dotted $dotted_border_color;
+    margin:0;
+    padding-bottom:1em;
+  }
+}
+
+.facet_extended_list
+{
+  .sort_options 
+  { 
+    text-align:right;
+  }
+
+  .next_page, .sort_options .numeric
+  {
+    @include border-radius(0 4px 4px 0);
+  }
+
+  .prev_next_links
+  {
+    float:left;
+  }
+
+  .prev_next_links .disabled
+  {
+    background:none;
+    color:gray;
+    font-weight:400;
+  }
+
+  .prev_page,.sort_options .az
+  {
+    @include border-radius(4px 0 0 4px);
+  }
+
+  .sort_options .az, .sort_options .numeric, .next_page,.prev_page
+  {
+    background: $facet_extended_button_bg_color;
+    border:1px solid $facet_extended_button_border_color;
+    display:inline-block;
+    font-weight:700;
+    padding:0.2em 1em;
+  }
+
+  .sort_options .disabled
+  {
+    background-color: $facet_extended_disabled_button_bg_color;
+    border:1px solid $facet_extended_disabled_border_color;
+  }
+
+  .sort_options a:hover,.facet_extended_list .prev_next_links a:hover
+  {
+    background: $facet_extended_button_hover_bg_color;
+    border:1px solid $facet_extended_button_hover_border_color;
+    color: $facet_extended_button_hover_color;
+  }
+}
+
+ul.facet_extended_list
+{
+	clear:both;
+	margin:1.5em 0;
+
+  li
+  {
+    list-style:none;
+    margin:0.5em 0;
+  }
+}