sufia 4.0.0.beta4 → 4.0.0.rc1

data/app/views/generic_files/new.html.erb

@@ -1,12 +1,12 @@
 <h2>Upload</h2>
 <%# using partials rather than inlining, so implementers can add or change stuff on this page without much duplication %>
 <ul class="nav nav-tabs">
-  <li class="active"><a href="#local" data-toggle="tab"><i class="icon-desktop"></i> <%= t('sufia.upload.my_computer.tab_label')%></a></li>
+  <li class="active"><a href="#local" data-toggle="tab"><i class="glyphicon glyphicon-folder-open"></i> <%= t('sufia.upload.my_computer.tab_label')%></a></li>
   <% if Sufia.config.browse_everything %>
-    <li><a href="#browse_everything" data-toggle="tab"><i class="icon-cloud"></i> <%= t('sufia.upload.browse_everything.tab_label')%></a></li>
+    <li><a href="#browse_everything" data-toggle="tab"><i class="glyphicon glyphicon-cloud-download"></i> <%= t('sufia.upload.browse_everything.tab_label')%></a></li>
   <% end %>
   <% if Sufia.config.enable_local_ingest %>
-    <li><a href="#ingest" data-toggle="tab"><i class="icon-hdd"></i> <%= t('sufia.upload.local_ingest.tab_label')%></a></li>
+    <li><a href="#ingest" data-toggle="tab"><i class="glyphicon glyphicon-hdd"></i> <%= t('sufia.upload.local_ingest.tab_label')%></a></li>
   <% end %>
 </ul>
 

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

@@ -1,11 +1,7 @@
-<% content_for :js_head do  %>
-  <% javascript_include_tag 'https://s7.addthis.com/js/250/addthis_widget.js#pubid=ra-4ff1d986721ebb24' %>
-  <script type="text/javascript">
-    var addthis_config = {"data_track_addressbar":true};
-  </script>
-<% end %>
+<%= javascript_include_tag 'https://s7.addthis.com/js/250/addthis_widget.js#pubid=ra-4ff1d986721ebb24' %>
 
-<% content_for :local_js do %>
+<%= javascript_tag do %>
+  var addthis_config = {"data_track_addressbar":true};
   initialize_audio();
 <% end %>
 

data/app/views/generic_files/stats.html.erb

@@ -12,7 +12,7 @@
   <div class="span110">
     <%= content_tag :h2, "Analytics" %>
     <div class="alert alert-info">
-      <i class="icon-bar-chart icon-large"></i>
+      <i class="glyphicon glyphicon-signal large-icon"></i>
       <%= content_tag :strong, @stats.total_pageviews %> views and <%= content_tag :strong, @stats.total_downloads %> downloads since <%= @stats.created.strftime("%B %-d, %Y") %>
     </div>
     <div class="stats-container">

data/app/views/generic_files/upload/_form_fields.html.erb

@@ -9,26 +9,26 @@
             <div class="col-md-7">
                 <!-- The fileinput-button span is used to style the file input field as button -->
                 <span class="btn btn-success fileinput-button">
-                    <i class="icon-plus icon-white"></i>
+                    <i class="glyphicon glyphicon-plus"></i>
                     <span>Select files...</span>
                     <input type="file" name="files[]" multiple />
                 </span>
                 <% ua = request.env['HTTP_USER_AGENT'] %>
                 <% if !!(ua =~ /Chrome/) %>
                 <span class="btn btn-success fileinput-button">
-                    <i class="icon-plus icon-white"></i>
+                    <i class="glyphicon glyphicon-plus"></i>
                     <span>Select folder...</span>
                     <input type="file" name="files[]" directory webkitdirectory mozdirectory />
                 </span>
                 <% end %>
                 <span id="main_upload_start_span" class="activate-container" data-toggle="tooltip" data-title="<%= t('sufia.upload_tooltip') %>">
                   <button type="submit" class="activate-submit btn btn-primary start" id="main_upload_start">
-                    <i class="icon-upload icon-white"></i>
+                    <i class="glyphicon glyphicon-upload"></i>
                     <span>Start upload</span>
                 </button>
                 </span>
                 <button type="reset" class="btn btn-warning cancel">
-                    <i class="icon-ban-circle icon-white"></i>
+                    <i class="glyphicon glyphicon-ban-circle"></i>
                     <span>Cancel upload</span>
                 </button>
             </div>

data/app/views/generic_files/upload/_local_file_import_chooser.html.erb

@@ -11,7 +11,7 @@
         <%current_user.files.each do |f| %>
           <tr>
             <td>
-              <label><%= check_box_tag 'local_file[]', f[:name] %> <%= f[:directory] ? '<i class="icon-folder-close"></i>'.html_safe : '<i class="icon-file"></i>'.html_safe %> <%= f[:name] %></label>
+              <label><%= check_box_tag 'local_file[]', f[:name] %> <%= f[:directory] ? '<i class="glyphicon glyphicon-folder-close"></i>'.html_safe : '<i class="icon-file"></i>'.html_safe %> <%= f[:name] %></label>
             </td>
           </tr>
         <%end%>
@@ -19,7 +19,7 @@
       </table>
       <%= hidden_field_tag(:batch_id, @batch_noid) %>
       <button type="submit" class="activate-submit btn btn-primary start" id="main_upload_start">
-        <i class="icon-upload icon-white"></i>
+        <i class="glyphicon glyphicon-upload"></i>
         <span>Deposit Selected Files</span>
       </button>
     <% end %>

data/app/views/generic_files/upload/_script_templates.html.erb

@@ -19,7 +19,7 @@
             </td>
             <td class="start">{% if (!o.options.autoUpload) { %}
               <button class="btn btn-primary hide">
-                    <i class="icon-upload icon-white"></i>
+                    <i class="glyphicon glyphicon-upload"></i>
                     <span>{%=locale.fileupload.start%}</span>
               </button>
             {% } %}</td>
@@ -28,7 +28,7 @@
         {% } %}
         <td class="cancel">{% if (!i) { %}
             <button class="btn btn-warning">
-                <i class="icon-ban-circle icon-white"></i>
+                <i class="glyphicon glyphicon-ban-circle"></i>
                 <span>{%=locale.fileupload.cancel%}</span>
             </button>
         {% } %}</td>

data/app/views/homepage/_home_content.html.erb

@@ -1,10 +1,10 @@
 <div class="col-xs-12 col-sm-6">
   <ul id="homeTabs" class="nav nav-tabs">
-    <li><a href="#highlighted_resources" data-toggle="tab">Highlighted Resources</a></li>
+    <li><a href="#featured_container" data-toggle="tab"><%= t('sufia.homepage.featured_works') %></a></li>
     <li><a href="#recently_uploaded" data-toggle="tab">Recently Uploaded</a></li>
   </ul>
   <div class="tab-content">
-    <div class="tab-pane fade in" id="highlighted_resources">
+    <div class="tab-pane fade in" id="featured_container">
       <%= render partial: '/homepage/featured_works' %>
     </div>
      <div class="tab-pane fade" id="recently_uploaded">

data/app/views/homepage/_home_header.html.erb

@@ -1,6 +1,6 @@
 <div class="home_call_action col-xs-12 col-sm-4 pull-right">
   <div class="home_share_work">
-    <%= link_to "<i class=\"icon-file\"></i> #{t('sufia.share_button')}".html_safe, sufia.new_generic_file_path, class: "btn btn-primary btn-lg btn-block", id: "contribute_link" %>
+    <%= link_to "<i class=\"glyphicon glyphicon-file\"></i> #{t('sufia.share_button')}".html_safe, sufia.new_generic_file_path, class: "btn btn-primary btn-lg btn-block", id: "contribute_link" %>
     <p class="text-center"><a href="/terms/">Terms of Use</a></p>
   </div><!-- /.home_share_work -->
 </div><!-- /.col-xs-3 -->

data/app/views/homepage/_sortable_featured.html.erb

@@ -16,7 +16,7 @@
             <%= link_to sufia.featured_work_path(featured, format: :json),
               title: "Remove work from feature section",
               data: {behavior: 'unfeature'} do %>
-              <i class='icon-remove'></i>
+              <i class='glyphicon glyphicon-remove'></i>
             <% end %>
           </h3>
         <% end %>

data/app/views/layouts/_head_tag_content.html.erb

@@ -10,13 +10,4 @@
 <!-- application js -->
 <%= javascript_include_tag 'application' %>
 
-<!-- controller specific uploader -->
-<%= yield(:js_head) %>
-
-<script type="text/javascript">
-  $(function() {
-    <%= yield(:local_js) %>
-  });
-</script>
-
-<%= render partial: '/ga', formats: [:html] %>
+<%= render partial: '/ga', formats: [:html] %>

data/app/views/layouts/error.html.erb

@@ -11,15 +11,6 @@
     <!-- application js -->
     <%= javascript_include_tag 'application' %>
 
-    <!-- controller specific uploader -->
-    <%= yield(:js_head) %>
-
-    <script type="text/javascript">
-      $(function() {
-        <%= yield(:local_js) %>
-      });
-    </script>
-
     <%= render partial: '/ga', formats: [:html] %>
   </head>
 

data/app/views/layouts/homepage.html.erb

@@ -22,6 +22,6 @@
     </div><!-- /#page-positioner -->
   </div><!-- /.container -->
 </div><!-- /#wrapper -->
-<div id="ajax-modal" class="modal hide" tabindex="-1"></div>
+<%= render 'shared/ajax_modal' %>
 </body>
 </html>

data/app/views/layouts/sufia-dashboard.html.erb

@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
-<head><%= render partial: "layouts/head_tag_content" %></head>
+<head><%= render partial: 'layouts/head_tag_content' %></head>
 <body> 
 <div id="wrapper"> 
   <div class="container-fluid">
     <div id="page-positioner">
 
-      <%= render partial: "/masthead" %>
-      <%= render partial: "/controls" %>
-      <%= render partial: "/flash_msg" %>
+      <%= render partial: '/masthead' %>
+      <%= render partial: '/controls' %>
+      <%= render partial: '/flash_msg' %>
       
       <div id="content-wrapper">
         <div class="container-fluid">
@@ -22,11 +22,11 @@
         </div>
       </div>
       
-      <%= render partial: "/footer" %>
+      <%= render partial: '/footer' %>
     
     </div><!-- /#page-positioner -->
   </div><!-- /.container -->
 </div><!-- /#wrapper -->
-<div id="ajax-modal" class="modal hide" tabindex="-1"></div>
+<%= render 'shared/ajax_modal' %>
 </body>
 </html>

data/app/views/layouts/sufia-one-column.html.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <%= render partial: "layouts/head_tag_content"%>
+    <%= render partial: 'layouts/head_tag_content' %>
   </head>
 
 <body>
@@ -22,6 +22,6 @@
     </div><!-- /#page-positioner -->
   </div><!-- /.container -->
 </div><!-- /#wrapper -->
-<div id="ajax-modal" class="modal hide" tabindex="-1"></div>
+<%= render 'shared/ajax_modal' %>
 </body>
 </html>

data/app/views/layouts/sufia-two-column.html.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <%= render partial: "layouts/head_tag_content"%>
+    <%= render partial: 'layouts/head_tag_content' %>
   </head>
 
 <body> 
@@ -25,6 +25,6 @@
     </div><!-- /#page-positioner -->
   </div><!-- /.container -->
 </div><!-- /#wrapper -->
-<div id="ajax-modal" class="modal hide" tabindex="-1"></div>
+<%= render 'shared/ajax_modal' %>
 </body>
 </html>

data/app/views/mailbox/_notifications.html.erb

@@ -13,7 +13,7 @@
         <td><%= msg.last_message.subject.html_safe %></td> 
         <td><%= msg.last_message.body.html_safe %></td> 
         <td>
-          <%= link_to raw('<i class="icon-trash icon-large"></i>'), sufia.notification_path(msg.id), class: "itemicon itemtrash", title: "Delete File", method: :delete %>
+          <%= link_to raw('<i class="glyphicon glyphicon-trash"></i>'), sufia.notification_path(msg.id), class: "itemicon itemtrash", title: "Delete File", method: :delete %>
         </td>
       <% end %>
     <% end %> 

data/app/views/mailbox/index.html.erb

@@ -1,5 +1,5 @@
 <h1>User Notifications</h1>
-<%= link_to raw('<i class="icon-trash icon-large">&nbsp;</i>Delete All'),
+<%= link_to raw('<i class="glyphicon glyphicon-trash">&nbsp;</i>Delete All'),
     sufia.delete_all_notifications_path, method: :delete, class: 'btn',
     title: 'Delete all user notifications' %>
 <div id="Data">

data/app/views/my/_batch_edits_actions.html.erb

@@ -1,2 +1,2 @@
-<li data-behavior="batch-edit-select-none" data-state="on"><a href="#"><i class="icon-ok"></i> Select None</a></li>
+<li data-behavior="batch-edit-select-none" data-state="on"><a href="#"><i class="glyphicon glyphicon-ok"></i> Select None</a></li>
 <li data-behavior="batch-edit-select-page" data-state="off"><a href="#"><i class=""></i> Select Current Page</a></li>

data/app/views/my/_collection_action_menu.html.erb

@@ -1,13 +1,13 @@
 <div class="btn-group">
-  <button class="btn btn-small" href="#"><i class="icon-wrench"></i> Select an action</button>
-  <button class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><span class="icon-caret-down"></span></button>
+  <button class="btn btn-small" href="#"><i class="glyphicon glyphicon-wrench"></i> Select an action</button>
+  <button class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><span class="glyphicon glyphicon-chevron-down"></span></button>
   <ul class="dropdown-menu">
    <li>
-   <%= link_to raw('<i class="icon-pencil"></i> Edit Collection'), collections.edit_collection_path(noid),
+   <%= link_to raw('<i class="glyphicon glyphicon-pencil"></i> Edit Collection'), collections.edit_collection_path(noid),
      class: 'itemicon itemedit', title: 'Edit Collection' %>
    </li>
    <li>
-   <%= link_to raw('<i class="icon-trash"></i> Delete Collection'), collections.collection_path(noid),
+   <%= link_to raw('<i class="glyphicon glyphicon-trash"></i> Delete Collection'), collections.collection_path(noid),
      class: 'itemicon itemtrash', title: 'Delete Collection', method: :delete, data: {
      confirm: "Deleting a collection from #{t('sufia.product_name')} is permanent. Click OK to delete this collection from #{t('sufia.product_name')}, or Cancel to cancel this operation" } %>
    </li>

data/app/views/my/_did_you_mean.html.erb

@@ -1,10 +1,5 @@
-<% if @response.response[:numFound] <= spell_check_max and @response.spelling.words.size > 0 %>
+<% if should_show_spellcheck_suggestions? @response %>
   <div id="spell">
-    <h4 class="suggest"><i>Did you mean to type
-      <% @response.spelling.words.each_with_index do |word,index| -%>
-        <% if index > 0 -%>, or <% end -%>
-        <%= link_to_query(word) -%>
-      <% end -%>
-      ?</i></h4>
+    <h4 class="suggest"><em><%= t('blacklight.did_you_mean', options: safe_join(@response.spelling.words.map { |word| link_to_query(word) }, " #{t('blacklight.or')} ")).html_safe %></em></h4>
   </div>
 <% end %>

data/app/views/my/_document_list.html.erb

@@ -1,4 +1,4 @@
 <% # container for all documents in index view -%>
-<div id="documents" class="clear">
+<div id="documents">
   <%= render partial: 'my/_index_partials/default_group', locals: {docs: @response.docs.map { |x| SolrDocument.new(x) }, facet_value: nil} %>
 </div>

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

@@ -1,11 +1,12 @@
-<li class="expandable_new  grey">
-   <% id = facet_field.label.gsub(" ","_")+"_db" %>
-
-    <a class="accordion-toggle grey" data-toggle="collapse" data-parent="#facet_group" data-target="#collapse_<%= id%>">
-      <%= facet_field.label %> <i class="glyphicon glyphicon-chevron-right grey"></i>
-    </a>
-
-  <div id="collapse_<%= id%>" class="accordion-body collapse">
+<div class="panel panel-default facet_limit blacklight-<%= facet_field.field.parameterize %> <%= 'facet_limit-active' if facet_field_in_params?(facet_field.field) %>">
+  <div class="<%= "collapsed" if should_collapse_facet?(facet_field) %> collapse-toggle panel-heading" data-toggle="collapse" data-target="#<%= facet_field_id(facet_field) %>">
+    <h5 class="panel-title">
+      <%= link_to facet_field_label(facet_field.field), "#", :"data-no-turbolink" => true %>
+    </h5>
+  </div>
+  <div id="<%= facet_field_id(facet_field) %>" class="panel-collapse facet-content <%= should_collapse_facet?(facet_field) ? 'collapse' : 'in' %>">
+    <div class="panel-body">
       <%= yield %>
+    </div>
   </div>
-</li>
+</div>

data/app/views/my/_facet_limit.html.erb

@@ -1,12 +1,11 @@
-<% paginator = Blacklight::Solr::FacetPaginator.new(display_facet.items,
-        limit: facet_limit_for(solr_field)) %>
-<ul class="slide-list">
+<ul class="facet-values list-unstyled">
+  <% paginator = facet_paginator(facet_field, display_facet) %>
   <% paginator.items.each do |item| -%>
-<li>
-    <% if facet_in_params?( solr_field, item.value ) %>
-      <%= render_selected_facet_value(solr_field, item) %>
-    <% else %>
-      <%= render_facet_value(solr_field, item) %>
+    <li>
+    <% if facet_in_params?(solr_field, item.value) %>
+        <%= render_selected_facet_value(solr_field, item) %>
+      <% else %>
+        <%= render_facet_value(solr_field, item) %>
     <% end -%>
     </li>
   <% end %>
@@ -14,4 +13,5 @@
   <% if(paginator.has_next?)  %>
     <li class="more_facets_link"><%= link_to 'more ' + facet_field.label.pluralize + '»', sufia.url_for(params.merge(id: solr_field, action: "facet", path_only: true)), class: "more_facets_link" %></li>
   <% end %>
-</ul> <!-- /slide-list -->
+
+</ul>

data/app/views/my/_facet_pagination.html.erb

@@ -1,25 +1,22 @@
-<!-- This was copied from https://github.com/projectblacklight/blacklight/blob/master/app/views/catalog/_facet_pagination.html.erb
- It implements the facets in the same manner as blacklight does for the main catalog for the individual's dashbord
--->
     <div class="prev_next_links btn-group pull-left">
-      <%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), route_set: sufia, params: params, param_name: Blacklight::Solr::FacetPaginator.request_keys[:page], class: 'btn' do %>
-       <span class="disabled btn"><%= raw(t('views.pagination.previous')) %></span>
+      <%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), route_set: sufia, params: params, param_name: Blacklight::Solr::FacetPaginator.request_keys[:page], class: 'btn btn-link', data: {ajax_modal: "preserve"} do %>
+       <span class="disabled btn btn-disabled"><%= raw(t('views.pagination.previous')) %></span>
      <% end %>
-     <%= link_to_next_page @pagination, raw(t('views.pagination.next')), route_set: sufia, params: params, param_name: Blacklight::Solr::FacetPaginator.request_keys[:page], class: 'btn' do %>
-
-       <span class="disabled btn"><%= raw(t('views.pagination.next')) %></span>
+      <%= link_to_next_page @pagination, raw(t('views.pagination.next')), route_set: sufia, params: params, param_name: Blacklight::Solr::FacetPaginator.request_keys[:page], class: 'btn btn-link',  data: {ajax_modal: "preserve"} do %>
+       
+       <span class="disabled btn  btn-disabled"><%= raw(t('views.pagination.next')) %></span>
       <% end %>
-
+     
     </div>
-
+ 
   <div class="sort_options btn-group pull-right">
     <% if @pagination.sort == 'index' -%>
-      <span class="active az btn"><%= t('blacklight.search.facets.sort.index') %></span><%= link_to_unless(@pagination.sort == 'count', t('blacklight.search.facets.sort.count'),
-        Sufia::Engine.routes.url_for(@pagination.params_for_resort_url('count', params).symbolize_keys.merge(only_path: true)),
-        class: "sort_change numeric btn") %>
+      <span class="active az btn btn-default"><%= t('blacklight.search.facets.sort.index') %></span><%= link_to_unless(@pagination.sort == 'count', t('blacklight.search.facets.sort.count'), 
+        Sufia::Engine.routes.url_for(@pagination.params_for_resort_url('count', params).symbolize_keys.merge(only_path: true)), 
+        class: "sort_change numeric btn btn-default",  
+        data: {ajax_modal: "preserve"}) %>
     <% elsif @pagination.sort == 'count' -%>
-      <%=  link_to(t('blacklight.search.facets.sort.index'),
-        Sufia::Engine.routes.url_for(@pagination.params_for_resort_url('index', params).symbolize_keys.merge(only_path: true)),
-        class: "sort_change az btn") %><span class="active numeric btn"><%= t('blacklight.search.facets.sort.count') %></span>
-    <% end -%>
+      <%=  link_to(t('blacklight.search.facets.sort.index'), Sufia::Engine.routes.url_for(@pagination.params_for_resort_url('index', params).symbolize_keys.merge(only_path: true)), 
+        class: "sort_change az btn btn-default",  data: {ajax_modal: "preserve"}) %><span class="active numeric btn btn-default"><%= t('blacklight.search.facets.sort.count') %></span>
+    <% end -%>    
   </div>

data/app/views/my/_facet_selected.html.erb

@@ -4,7 +4,7 @@
     <% v.each do |selected_facet| %>
       <% link_options = remove_facet_params(k, selected_facet, params).merge(action: :index) %>
       <div class="alert alert-warning">
-        <%= link_to 'X', sufia.url_for(link_options), {class: 'close', :'data-dismiss' => "alert" } %>
+        <%= link_to "X", sufia.url_for(link_options), { class: "close", data: { dismiss: "alert" } } %>
         <i class="glyphicon glyphicon-ok"></i> <strong><%= selected_facet %></strong>
       </div>
     <% end %>

data/app/views/my/_facets.html.erb

@@ -1,9 +1,22 @@
 <% # main container for facets/limits menu -%>
-<div>
-  <%= render partial: 'collections/button_for_creating_empty_collection', locals: {label: 'Create Collection'} %>
-  <div class="row">&nbsp;</div>
-  <h2>Browse By</h2>
-  <ul class="nav nav-list" id="facets">
-    <%= render_facet_partials %>
-  </ul>
+<% if has_facet_values?  %>
+<div id="facets" class="facets sidenav">
+
+  <div class="top-panel-heading panel-heading">
+    <button type="button" class="facets-toggle" data-toggle="collapse" data-target="#facet-panel-collapse">
+      <span class="sr-only">Toggle facets</span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+
+  <h4>
+  	<%= t('blacklight.search.facets.title') %>
+  </h4>
+    </div>
+
+  <div id="facet-panel-collapse" class="collapse panel-group">
+  <%= render_facet_partials %>
 </div>
+</div>
+<% end %>

data/app/views/my/_index_partials/_default_group.html.erb

@@ -1,14 +1,14 @@
 <table class="table table-zebra-striped table-bordered">
-  <caption class="sr-only">Listing of files you have deposited in <%= t('sufia.product_name') %></caption>
+  <caption class="sr-only">Listing of items you have deposited in <%= t('sufia.product_name') %></caption>
 <% unless params[:display_type] == 'list' %>
   <thead>
   <tr>
-    <th class="sm"><%= render partial: 'batch_edits/check_all' %></th>
+    <th><%= render partial: 'batch_edits/check_all' %></th>
     <th>&nbsp;</th>
-    <th class="center">Title</th>
+    <th>Title</th>
     <th class="sorts-dash"><i id="desc_metadata__date_uploaded_dtsi" class="<%=params[:sort]== "desc_metadata__date_uploaded_dtsi desc" ? 'caret' : params[:sort]== "desc_metadata__date_uploaded_dtsi asc" ? 'caret up' : ''%>"></i>Date Uploaded</th>
     <th>Visibility</th>
-    <th class="center">Action</th>
+    <th>Action</th>
   </tr>
   </thead>
   <% end %>