blacklight 4.0.0.rc2 → 4.0.0

data/VERSION

@@ -1 +1 @@
-4.0.0.rc2
+4.0.0

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

@@ -11,14 +11,12 @@
 //= require blacklight/search_context
 //= require blacklight/select_submit
 //= require blacklight/zebra_stripe
-//= require blacklight/bootstrap_dropdowns
 //= require blacklight/css_dropdowns
 //
 //Bootstrap JS for providing collapsable tablet/mobile menu/alert boxes
 //= require bootstrap-transition
 //= require bootstrap-collapse
 //= require bootstrap-alert
-//= require bootstrap-dropdown
 //= require improved-modal/bootstrap-modalmanager.js
 //= require improved-modal/bootstrap-modal.js
 

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

@@ -1,24 +1,5 @@
-#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 0 0em;
-
-  .label
-  {
- position: absolute !important;
-  height: 1px; width: 1px;
-  overflow: hidden;
-  clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
-  clip: rect(1px, 1px, 1px, 1px);
-  }
-}
-
 .catalog_startOverLink {
-  padding-top: 0.5em;
+  padding-top: 0.3em;
   float: right;
 }
 
@@ -34,7 +15,7 @@
   h1
   {
     margin:0;
-    padding:0 0 1em;
+    padding:0 0 0.4em;
   }
 }
 
@@ -47,12 +28,8 @@
   {
      padding: 5px 0 0;
   }
-
-  .per_page-form
-  {
-    padding-right:5px;
-  }
 }
+
 .ajax_form
 {
   margin-bottom: 0;
@@ -99,38 +76,10 @@
   padding-bottom: 9px;
 }
 
-.constraints-row {
-  margin-top:1em;
-  margin-bottom:1em;
-}
 span.constraints-label {
   font-weight:bold;
 }
 
-li.pill-with-label {
-  padding-top: 3px;
-  padding-right: 6px;
-  padding-left: 6px;
-  padding-bottom: 3px;
-  a.dropdown-toggle {
-    padding-left: 3px;
-    padding-right: 3px;
-    display: inline;
-
-  }
-}
-
-.show-document-title
-{
-  padding-top: 0.5em;
-
-}
-
-.show-document > #document
-{
-  margin-top: 0;
-}
-
 .appliedFilter
 {
 	background: $constraint_bg_color;
@@ -139,6 +88,7 @@ li.pill-with-label {
 	margin-bottom:0.66em;
 	margin-right:0.33em;
 	padding:3px 3px 3px 1.5em;
+  padding-right:50px;
 	position:relative;
   @include border-radius(15px 15px 15px 15px);
 
@@ -163,19 +113,13 @@ li.pill-with-label {
     border:1px dotted $constraint_border_active_color;
   }
 
-  .queryName,.filterName
+  .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;
@@ -202,36 +146,9 @@ li.pill-with-label {
   margin: 0;
 }
 
-.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 0.66em 0.66em 0;
-	position:relative;
-}
-
-
 .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;
-  }
+	display: inline-block;
 }
 
 .pagination {
@@ -239,17 +156,6 @@ li.pill-with-label {
 }
 
 
-.show #appliedParams
-{
-	border-top:1px solid $search_ui_border_color;
-
-  .label
-  {
-    margin-top:0;
-    position:static;
-  }
-}
-
 .solrQuery
 {
 	background-color: $search_ui_bg_color;
@@ -259,6 +165,11 @@ li.pill-with-label {
 	padding:.5em;
 }
 
+.document dl {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
 .dl-invert {
   dt {
     font-weight: normal;
@@ -337,5 +248,3 @@ span.page a,span.page.current
 #email_form {
   @extend .span6;
 }
-
-

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

@@ -46,7 +46,7 @@
     color:green;
   }
 
-  ul,h3 +div
+  ul,h5 +div
   {
     padding-bottom:1em;
   }

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

@@ -1,20 +0,0 @@
-/* This ensures that any tool pop-up goes infront of the header */
-.navbar-fixed-bottom {
- z-index:1000;
-}
-
-.navbar-fixed-bottom {
-  margin-right:0px;
-  position: relative;
-  margin-top: 0;
-}
-
-
-
-#footer-title {
-  padding-bottom:10px;
-}
-
-#footer-row {
-  margin-top: 1em;
-}

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

@@ -1,17 +1,3 @@
-.first h1
-{
-	margin:0;
-	padding:0;
-}
-
-h2.search
-{
-	display:inline;
-	margin:0;
-}
-
-
-
 /*
  The main logo image for the Blacklight instance
 */
@@ -78,28 +64,6 @@ h2.search
   margin-right: 0.5em;
 }
 
-.user-util-links {
-  text-align: right;
+.util-links-login, .util-links-other {
   font-size: 0.9em;
 }
-
-
-/*
-  Selected items needs special css to deal with number of selected items
-*/
-#selected-items {
-  #desktop-folder-link { 
-      float:left;
-      padding-right:5px;
-  }
-  #folder  {
-    float: right;
-    padding: 9px 10px 0 0;
- }
-}
- 
-
-
-
-
-

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

@@ -1,19 +1,10 @@
-
 /* Generic layout stuff */
 .hide 
 {
   display:none
 }
   
-
 /* This provides a fixed distance between the header and the main content */
 body {
   padding-top: 6em;
 }
-
-/* prevent search bar space from collapsing when there's no search bar */
-.desktop-search-bar, .tablet-search-bar {
-  min-height: 1em
-}
-
-

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

@@ -1,47 +0,0 @@
-@media print  {
-	#bd
-	{
-		padding:0;
-		position:relative;
-		width:100%;
-	}
-
-	#hd
-	{
-		margin:0;
-		padding:0 0 2em;
-	}
-
-	#page
-	{
-		background:none;
-		border:0;
-		margin:0;
-		padding:0;
-		width:100%;
-	}
-
-	* html #documents
-	{
-		width:75%;
-	}
-
-	* html #page
-	{
-		left:0;
-		position:absolute;
-		top:0;
-	}
-
-	body
-	{
-		background:none;
-		margin:0;
-		padding:0;
-	}
-
-	html
-	{
-		background:#fff;
-	}
-}

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -152,8 +152,8 @@ module Blacklight::BlacklightHelperBehavior
     @document[blacklight_config.show.heading] || @document.id
   end
 
-  def render_document_heading
-    content_tag(:h4, render_field_value(document_heading), :class => "show-document-title")
+  def render_document_heading(tag = :h4)
+    content_tag(tag, render_field_value(document_heading))
   end
 
   # Used in the show view for setting the main html document title

data/app/views/_user_util_links.html.erb

@@ -1,4 +1,3 @@
-<small>
   <% if has_user_authentication_provider? %>
     <div class="util-links-login">
       <% if current_user %>
@@ -21,4 +20,3 @@
     |
     <%= link_to t('blacklight.header_links.search_history'), search_history_path %>
   </div>
-</small>

data/app/views/catalog/_constraints.html.erb

@@ -1,5 +1,5 @@
 <% if query_has_constraints? %>
-      <div class="constraints-container">
+      <div id="appliedParams" class="constraints-container">
         <span class="constraints-label"><%= t('blacklight.search.filters.title') %></span>
   
         <%=link_to t('blacklight.search.start_over'), url_for(:action=>'index'), :class => "catalog_startOverLink", :id=>"startOverLink" %>

data/app/views/catalog/_facet_layout.html.erb

@@ -1,4 +1,4 @@
 <div class="facet_limit blacklight-<%= facet_field.field.parameterize %>">
-  <h5><%= facet_field.label -%> <i class="icon-chevron"></i></h3>
+  <h5><%= facet_field.label -%> <i class="icon-chevron"></i></h5>
   <%= yield %>
 </div>

data/app/views/catalog/_home_text.html.erb

@@ -1,4 +1,4 @@
-<h4><%= t('blacklight.welcome') %></h3>
+<h4><%= t('blacklight.welcome') %></h4>
 <p>&nbsp;</p>
 <p>To modify this text to your specifications, copy this file located in the blacklight plugin directory:<br/>
 &nbsp;&nbsp;&nbsp;<%= Blacklight.root %>/app/views/catalog/_home_text.html.erb</p>

data/app/views/catalog/_show_sidebar.html.erb

@@ -1,7 +1,5 @@
 <div class="well" id="sidebar-nav">
-  <ul class="nav nav-list">
-    <%= render :partial => 'show_tools' %>
-  </ul>
+  <%= render :partial => 'show_tools' %>
 </div><!--/well -->
   
 <% unless @document.more_like_this.empty? %>

data/app/views/catalog/_show_tools.html.erb

@@ -8,13 +8,14 @@
 
   #Added Bootstrap class well and 'hidden-phone' for the tools-bar 
 -%>
+  <ul class="nav nav-list">
       <li class="nav-header"><%= t('blacklight.tools.title') %></li>
       <li>
         <%= render_show_doc_actions @document %>
       </li>
       <% if (@document.respond_to?(:export_as_mla_citation_txt) || @document.respond_to?(:export_as_apa_citation_txt)) %>
         <li class="cite">
-         <%= link_to t('blacklight.tools.cite'), citation_catalog_path(:id => @document), {:id => 'citeLink', :name => 'citation', :class => 'lightboxLink'} %></i>
+         <%= link_to t('blacklight.tools.cite'), citation_catalog_path(:id => @document), {:id => 'citeLink', :name => 'citation', :class => 'lightboxLink'} %>
         </li>
       <% end %>
       <% if @document.export_formats.keys.include?( :refworks_marc_txt ) %>
@@ -43,4 +44,4 @@
         <%= link_to t('blacklight.tools.librarian_view'), librarian_view_catalog_path(@document), {:id => 'librarianLink', :name => 'librarian_view', :class => 'lightboxLink'} %>
       </li>
     <% end %>
-    </ul>
+  </ul>

data/app/views/catalog/_sort_and_per_page.html.erb

@@ -1,7 +1,7 @@
 <div id="sortAndPerPage">
-
-    <%= render :partial => "paginate_compact" %>
-
+   <div class="page_links">
+     <%= render :partial => "paginate_compact" %>
+   </div>
     <%= render :partial => 'sort_widget' %>
 
     <%= render :partial => 'per_page_widget' %>

data/app/views/catalog/email.html.erb

@@ -1,5 +1,5 @@
 <div class="modal-header">
-<h1><%= t('blacklight.email.form.title') %></h1>
 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+<h1><%= t('blacklight.email.form.title') %></h1>
   </div>
 <%= render :partial => 'email_form' %>

data/app/views/catalog/show.html.erb

@@ -15,7 +15,7 @@
     
 
       <% # bookmark/folder functions -%>
-      <%= render_document_heading.html_safe %>
+      <%= render_document_heading(:h1).html_safe %>
 
       <div class="document">
         <%= render_document_partial @document, :show %>

data/app/views/catalog/sms.html.erb

@@ -1,5 +1,5 @@
 <div class="modal-header">
-	<h1><%= t('blacklight.sms.form.title') %></h1>
 	<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+	<h1><%= t('blacklight.sms.form.title') %></h1>
 </div>
 <%= render :partial => 'sms_form' %>

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc2
-  prerelease: 6
+  version: 4.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -183,7 +183,6 @@ files:
 - app/assets/images/favicon.ico
 - app/assets/javascripts/blacklight/blacklight.js
 - app/assets/javascripts/blacklight/bookmark_toggle.js
-- app/assets/javascripts/blacklight/bootstrap_dropdowns.js
 - app/assets/javascripts/blacklight/checkbox_submit.js
 - app/assets/javascripts/blacklight/core.js
 - app/assets/javascripts/blacklight/css_dropdowns.js
@@ -467,13 +466,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1208323938627486571
+      hash: 2075279285300653487
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 2075279285300653487
 requirements: []
 rubyforge_project: blacklight
 rubygems_version: 1.8.23

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

@@ -1,3 +0,0 @@
-$(document).ready(function() {
-  $('.dropdown-toggle').dropdown();
-});