sufia 3.7.2 → 4.0.0.beta1

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

@@ -1,19 +1,18 @@
-  <% 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>
+    <li>
     <% if facet_in_params?( solr_field, item.value ) %>              
-        <%= render_selected_facet_value(solr_field, item).split("(").join('(<small>').split(")").join("</small>)").html_safe %>              
+        <%= render_selected_facet_value(solr_field, item) %>              
       <% else %>              
-        <%= render_facet_value(solr_field, item).split("(").join('(<small>').split(")").join("</small>)").html_safe %>              
+        <%= render_facet_value(solr_field, item) %>              
     <% end -%>
-</li> 
+    </li>
   <% end %>
 
-  <% if(paginator.has_next?)  %>
-    <li class="more_facets_link"><%= link_to 'more ' + facet_field.label.pluralize + '»', params.merge(:id => solr_field, :action=>"facet"), :class => "more_facets_link" %></li>
+  <% if paginator.has_next? and params[:action] != "facet" %>
+    <li class="more_facets_link"><%= link_to('more '+ facet_field.label.pluralize + '»', params.merge(:id => solr_field, :action=>"facet", :page => nil), :class => "more_facets_link") %></li>
   <% end %>
-</ul> <!-- /slide-list -->
+
+</ul>

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

@@ -0,0 +1,2 @@
+<h2>Featured Researcher</h2>
+<%= editable_content_block @featured_researcher %>

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

@@ -1,2 +1,6 @@
-<%# render :partial=>'search_form' %>
-<%= render :partial=>'home_text' %>
+<div id="home_header" class="row">
+  <%= render partial: 'home_header' %>
+</div>
+<div id="home_content" class="row">
+  <%= render partial: 'home_content' %>
+</div>

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

@@ -0,0 +1,36 @@
+<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="#recently_uploaded" data-toggle="tab">Recently Uploaded</a></li>
+  </ul>
+  <div class="tab-content">
+    <div class="tab-pane fade in" id="highlighted_resources">
+      <%= render :partial=>'/homepage/featured_works' %>
+    </div>
+     <div class="tab-pane fade" id="recently_uploaded">
+       <%= render :partial=>'/catalog/recents', :locals => {:recent_documents=>@recent_documents, :msg=>"No public work has been contributed.", :display_thumbs=>true, :display_access=>false} %>
+     </div>
+  </div>
+</div><!-- /.col-xs-6 -->
+<div class="col-xs-12 col-sm-6">
+  <div>
+    <%- if blacklight_config.respond_to?(:tag_cloud_field_name) && blacklight_config.tag_cloud_field_name %>
+        <div class="row">
+          <h2 class="heading1 pull-left">Explore</h2>
+          <%= render partial:'catalog/tagcloud', locals:{tag_cloud_field_name:blacklight_config.tag_cloud_field_name}%>
+        </div>
+    <%- end %>
+  </div>
+  <div>
+    <%= render :partial=>'/catalog/featured_researcher' %>
+  </div>
+</div>
+<script>
+    $('#homeTabs a').click(function (e) {
+        e.preventDefault()
+        $(this).tab('show')
+    })
+</script>
+<script>
+    $('#homeTabs a:first').tab('show') // Select first tab
+</script>

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

@@ -0,0 +1,15 @@
+<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" %>
+    <p class="text-center"><a href="/terms/">Terms of Use</a></p>
+  </div><!-- /.home_share_work -->
+</div><!-- /.col-xs-3 -->
+<div class="col-xs-12 col-sm-8">
+  <div class="col-sm-offset-2 col-sm-9 col-md-offset-1  home_marketing_text">
+      <h2>Share. Manage. Preserve.</h2>
+      <p>Raise the profile of your research and boost its impact with Sufia!</p>
+  </div>
+</div>
+
+
+

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

@@ -1,6 +1,6 @@
     <tr>
       <% if display_thumbs %>
-        <td class="span10"><%= link_to_profile recent_document.depositor("no depositor value") %> <%= render :partial => 'dashboard/_index_partials/thumbnail_display', :locals => {:document=>recent_document, :height=>60, :width=>45} %> </td>
+        <td class="span10"><%= link_to_profile recent_document.depositor("no depositor value") %> <%= render partial: 'dashboard/_index_partials/thumbnail_display', locals: {document: recent_document, width: 45} %> </td>
       <% end %>
       <td>
         <h3>

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

@@ -1,11 +1,10 @@
 <% msg = 'Login to see your recently added documents' if msg.blank? and current_user.blank? %>
 <% msg = 'You have no documents to display. Contribute some of your documents!' if msg.blank? %>
 <div>
-  <div class='hide'>
-    <%= link_to "Recent", sufia.catalog_recent_path, :remote => true, :id => 'recent_doc_link' %>
-  </div>
   <% if recent_documents.blank? %>
-      <h3>  <%= msg %> </h3>
+    <% msg = 'Login to see your recently added documents' if msg.blank? and current_user.blank? %>
+    <% msg = 'You have no documents to display. Contribute some of your documents!' if msg.blank? %>
+    <h3><%= msg %></h3>
   <% else %>
 
       <div id="recent_docs">

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

@@ -1,12 +1,16 @@
 <%# only display the q parameter if the controller is not the dashboard.  If they are in the dashboard controller, then the search is of the dashboard. %>
 <% q = params[:controller] == 'dashboard' ? nil : params[:q] %>
+    <%= form_tag catalog_index_path, :method => :get, :id => "search-form-header", :class => "col-xs-12", :role => "search" do %>
+      <%= render_hash_as_hidden_fields(params_for_search().except(:q, :search_field, :qt, :page, :utf8)) %>
+      <div class="input-group">
+        <label class="sr-only" for="search-field-header"><%= t('sufia.search.form.q.label') %></label>
+        <%= text_field_tag :q, q, :class => "q form-control", :id => "search-field-header", :placeholder => t('sufia.search.form.q.placeholder') %>
+        <span class="input-group-btn">
+          <button type="submit" class="btn btn-default" id="search-submit-header">
+            <i class="glyphicon glyphicon-search"></i> Go
+          </button>
+        </span>
+      </div>
+    <% end %>
 
-<%= form_tag catalog_index_path, :method => :get, :id => "search-form-header" do %>
-  <%= render_hash_as_hidden_fields(params_for_search().except(:q, :search_field, :qt, :page, :utf8)) %>
-  <div class="controls">
-    <div class="input-append">
-    <label class="accessible-hidden"><%= t('sufia.search.form.q.label') %></label> 
-    <%= text_field_tag :q, q, :class => "q span50", :id => "search-field-header", :placeholder => t('sufia.search.form.q.placeholder') %><button type="submit" class="btn btn-info" id="search-submit-header"><i class="icon-search"></i> Go</button>
-    </div>
-  </div>
-<% end %>
+  

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

@@ -0,0 +1,7 @@
+<a role="button" class="btn btn-default tag-toggle-list">List</a>
+<ul class="tagcloud" data-facet="<%= tag_cloud_field_name %>"></ul>
+<div class="btn-group btn-group-justified tag-sort">
+  <a role="button" class="btn btn-default tag-sort-za">Z-A</a>
+  <a role="button" class="btn btn-default tag-sort-az">A-Z</a>
+  <a role="button" class="btn btn-default tag-sort-numerical">Rank</a>
+</div>

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

@@ -1,16 +1,10 @@
-<% content_for :local_js do %>
-    // setting a fixed height so that the dialog does not hop around when you get to the last small page
-    //$.ui.dialog.prototype.options["height"]=window.innerHeight  *0.75
-<% end %>
-
-<% content_for :sidebar do %>
-  <%= render :partial=>'facets' %>
-<% end %>
-
 <% unless has_search_parameters? %>
 	<%# if there are no input/search related params, display the "home" partial -%>
 	<%= render 'home' %>
 <% else %>
+    <% content_for :sidebar do %>
+        <%= render :partial=>'facets' %>
+    <% end %>
 
 	<% @page_title = application_name + " Search Results" %>
 
@@ -22,7 +16,7 @@
   
   <div class="row"> 
     <%= render 'sort_and_per_page' %>
-    <div class="row offset80">
+    <div class="row">
       <%= link_to "New Search", catalog_index_path, :id=>"startOverLink", :class=>"btn btn-info btn-medium" %>
     </div>
   </div>

data/app/views/contact_form/create.html.erb

@@ -1,17 +1 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <h1>Contact Form</h1>

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

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <h1>Contact</h1>
 <div class="alert">
   <%= render partial: 'directions' %>

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

@@ -1,22 +1,6 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
-<!-- 
+<!--
 <div id="appliedParams">
-	<h3 class="label">You searched for:</h3>
-  <%# render_constraints(localized_params) %>  
+  <h3 class="label">You searched for:</h3>
+  <%# render_constraints(localized_params) %>
 </div>
 -->

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

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <% if @response.response[:numFound] <= spell_check_max and @response.spelling.words.size > 0 %>
   <div id="spell">
     <h4 class="suggest"><i>Did you mean to type

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

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <% # container for all documents in index view -%>
 <div id="documents" class="clear">
   <%= render :partial => 'dashboard/_index_partials/default_group', :locals => {:docs => @response.docs.map { |x| SolrDocument.new(x) }, :facet_value => nil} %>

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

@@ -1,24 +1,8 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <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="icon-chevron-right grey"></i>
+      <%= facet_field.label %> <i class="glyphicon glyphicon-chevron-right grey"></i>
     </a>
 
   <div id="collapse_<%= id%>" class="accordion-body collapse">

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

@@ -2,11 +2,11 @@
         limit: facet_limit_for(solr_field)) %>
 <ul class="slide-list">
   <% paginator.items.each do |item| -%>
-    <li>
-    <% if facet_in_params?( solr_field, item.value ) %>              
-        <%= render_selected_facet_value(solr_field, item).split("(").join('(<small>').split(")").join("</small>)").html_safe %>              
-      <% else %>              
-        <%= render_facet_value(solr_field, item).split("(").join('(<small>').split(")").join("</small>)").html_safe %>              
+<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 %>

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

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <%# there has got to be a hipster ruby way to do this better %>
 <% if params[:f] %>
   <% params[:f].each do |k,v| %>
@@ -21,7 +5,7 @@ limitations under the License.
       <% link_options = remove_facet_params(k, selected_facet, params).merge!Hash["controller" => "dashboard", :action=> "index"] %>
       <div class="alert alert-warning">
         <%= link_to 'X', sufia.url_for(link_options), {:class=>'close', :'data-dismiss' => "alert" } %>
-        <i class="icon-ok icon-large"></i> <strong><%= selected_facet %></strong>
+        <i class="glyphicon glyphicon-ok"></i> <strong><%= selected_facet %></strong>
       </div>
     <% end %>
   <% end %>

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

@@ -1,23 +1,5 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <% # main container for facets/limits menu -%>
 <div>
-  <%= link_to '<i class="icon-upload-alt"></i> Upload File(s)'.html_safe, sufia.new_generic_file_path, {:class => "btn btn-primary"}  %><br />
-  <div class="row">&nbsp;</div>
   <h2>Browse By</h2>
   <ul class="nav nav-list" id="facets">
     <%= render_facet_partials %>

data/app/views/dashboard/_heading.html.erb

@@ -1 +1 @@
-<h2 class="heading1">My Dashboard</h2>
+<div class="col-sm-12 col-md-6 col-lg-6"><h1>My Dashboard</h1></div>

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

@@ -1,36 +1,20 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
-<table class="table table-striped dashboard">
-  <caption class="accessible-hidden">Listing of files you have deposited in <%= t('sufia.product_name') %></caption>
+<table class="table table-zebra-striped table-bordered">
+  <caption class="sr-only">Listing of files you have deposited in <%= t('sufia.product_name') %></caption>
 <% unless params[:display_type] == 'list' %>
-  <thead> 
+  <thead>
   <tr>
     <th class="sm"><%= render :partial => 'batch_edits/check_all' %></th>
     <th>&nbsp;</th>
     <th class="center">Title</th>
-    <th class="sorts-dash"><i id="desc_metadata__date_uploaded_dt" class="<%=params[:sort]== "desc_metadata__date_uploaded_dt desc" ? 'icon-caret-down' : params[:sort]== "desc_metadata__date_uploaded_dt asc" ? 'icon-caret-up' : ''%>"></i>Date Uploaded</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>
   </tr>
-  </thead> 
+  </thead>
   <% end %>
-  <tbody> 
+  <tbody>
   <% docs.each_with_index do |document,counter| %>
     <%= render :partial => 'dashboard/_index_partials/list_files', :locals => {:document => document, :counter => counter} %>
   <% end %>
-  </tbody> 
+  </tbody>
 </table>