sufia 3.7.2 → 4.0.0.beta1

data/app/views/generic_files/edit_fields/_resource_type.html.erb

@@ -1,9 +1,8 @@
 <%# convert class variable to a local variable if the local hasn't been set %>
 <% generic_file = @generic_file unless generic_file  %>
 
-        <div class="controls">
-          <p class="help-block">You may select multiple types to apply<p>
+        <div class="col-sm-9">
           <%= f.select "resource_type", options_for_select(Sufia.config.resource_types.keys, generic_file.resource_type), {}, {:multiple=>true, :size=>7} %>
-          <%= help_icon(:resource_type) %>
+          <p class="help-block">You may select multiple types to apply <%= help_icon(:resource_type) %><p>
         </div>
 

data/app/views/generic_files/edit_fields/_rights.html.erb

@@ -1,4 +1,4 @@
-      <div class="controls" <% if index == 0%> id="additional_<%= key.to_s %>_clone" <% end %>>
+      <div class="col-sm-9" <% if index == 0%> id="additional_<%= key.to_s %>_clone" <% end %>>
               <% choices = Sufia.config.cc_licenses %>
               <% choices = {""=>""}.merge(choices) %>
               <%= f.select "rights", options_for_select(choices, v) %>

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

@@ -1,28 +1,12 @@
-<%#
-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.
-%>
-
 <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> My Computer</a></li>
-  <% if Sufia.config.dropbox_api_key %>
-    <li><a href="#dropbox" data-toggle="tab"><i class="icon-inbox"></i> Dropbox</a></li>
+  <li class="active"><a href="#local" data-toggle="tab"><i class="icon-desktop"></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>
   <% end %>
   <% if Sufia.config.enable_local_ingest %>
-    <li><a href="#ingest" data-toggle="tab"><i class="icon-hdd"></i> Network/Server Location</a></li>
+    <li><a href="#ingest" data-toggle="tab"><i class="icon-hdd"></i> <%= t('sufia.upload.local_ingest.tab_label')%></a></li>
   <% end %>
 </ul>
 
@@ -31,16 +15,17 @@ limitations under the License.
     <%= render partial: 'multiple_upload' %>
   </div>
 
-  <% if Sufia.config.dropbox_api_key %>
-    <div class="tab-pane" id="dropbox">
-      <%= render partial: 'dropbox_import' %>
+  <% if Sufia.config.browse_everything %>
+    <div class="tab-pane" id="browse_everything">
+      <%= render partial: 'browse_everything' %>
     </div>
   <% end %>
-  
+
+
   <% if Sufia.config.enable_local_ingest %>
     <div class="tab-pane" id="ingest">
       <%= render partial: 'generic_files/local_file_import' %>
     </div>
   <% end %>
-  
-</div>
+
+</div>

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

@@ -1,20 +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.
-%>
-
-
 <% content_for :js_head do  %>
   <% javascript_include_tag 'https://s7.addthis.com/js/250/addthis_widget.js#pubid=ra-4ff1d986721ebb24' %>
   <script type="text/javascript">
@@ -27,18 +10,17 @@ limitations under the License.
 <% end %>
 
 <%= render :partial => 'generic_files/breadcrumbs' %>
-
-<h1 class="lower"><%= @generic_file %></h1>
-
+<div class="container-fluid">
 <div class="row">
-  <div class="span40">
+  <div class="col-xs-12 col-sm-4">
     <%= render :partial => 'generic_files/media_display' %>
-  </div>
-  <div class="span2">&nbsp;</div>
-  <div itemscope itemtype="http://schema.org/CreativeWork" class="span68"><!-- class="column second"> -->
     <%= render partial: 'show_actions' %>
+  </div>
+  <div itemscope itemtype="http://schema.org/CreativeWork" class="col-xs-12 col-sm-8">
+    <h1><%= @generic_file %></h1>
     <%= render partial: 'show_descriptions' %>
     <%= render partial: 'show_details' %>
     <%= render :partial => 'users/activity_log', :locals => {:events => @events} %>
   </div><!-- /columns second -->
-</div> <!-- /columns two-b -->
+</div> <!-- /.row -->
+</div><!-- /.container-fluid -->

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

@@ -0,0 +1,141 @@
+<%= render :partial => 'generic_files/breadcrumbs' %>
+
+<!-- Adapted from jquery-flot examples https://github.com/flot/flot/blob/master/examples/visitors/index.html -->
+<!--[if lte IE 8]><%= javascript_include_tag 'excanvas' %><![endif]-->
+<script type="text/javascript">
+$(function() {
+
+  var d = <%= @stats_json.html_safe %>;
+
+  function weekendAreas(axes) {
+      var markings = [],
+        d = new Date(axes.xaxis.min);
+
+      // go to the first Saturday
+
+      d.setUTCDate(d.getUTCDate() - ((d.getUTCDay() + 1) % 7))
+      d.setUTCSeconds(0);
+      d.setUTCMinutes(0);
+      d.setUTCHours(0);
+
+      var i = d.getTime();
+
+      // when we don't set yaxis, the rectangle automatically
+      // extends to infinity upwards and downwards
+
+      do {
+        markings.push({ xaxis: { from: i, to: i + 2 * 24 * 60 * 60 * 1000 } });
+        i += 7 * 24 * 60 * 60 * 1000;
+      } while (i < axes.xaxis.max);
+
+      return markings;
+  }
+
+  var options = {
+    xaxis: {
+      mode: "time",
+      tickLength: 5
+    },
+    yaxis: {
+      tickDecimals: 0,
+      min: 0
+    },
+    series: {
+      lines: {
+        show: true,
+        fill: true
+      },
+      points: {
+        show: true,
+        fill: true
+      }
+    },
+    selection: {
+      mode: "x"
+    },
+    grid: {
+      hoverable: true,
+      clickable: true,
+      markings: weekendAreas
+    }
+  };
+
+  var plot = $.plot("#usage-stats", [d], options);
+
+  $("<div id='tooltip'></div>").css({
+    position: "absolute",
+    display: "none",
+    border: "1px solid #bce8f1",
+    padding: "2px",
+    "background-color": "#d9edf7",
+    opacity: 0.80
+  }).appendTo("body");
+
+  $("#usage-stats").bind("plothover", function (event, pos, item) {
+    if (item) {
+      date = new Date(item.datapoint[0]);
+      months = ["January", "February", "March", "April", "May", "June",
+        "July", "August", "September", "October", "November", "December"]
+      $("#tooltip").html("<strong>Views: " + item.datapoint[1] + "</strong><br/>" + months[date.getMonth()] + " " + date.getDate() + ", " + date.getFullYear())
+            .css({top: item.pageY+5, left: item.pageX+5})
+            .fadeIn(200);
+    } else {
+      $("#tooltip").fadeOut(100)
+    }
+  });
+
+  var overview = $.plot("#overview", [d], {
+    series: {
+      lines: {
+        show: true,
+        lineWidth: 1
+      },
+      shadowSize: 0
+    },
+    xaxis: {
+      ticks: [],
+      mode: "time",
+      minTickSize: [1, "day"]
+    },
+    yaxis: {
+      ticks: [],
+      min: 0,
+      autoscaleMargin: 0.1
+    },
+    selection: {
+      mode: "x"
+    }
+  });
+
+  $("#usage-stats").bind("plotselected", function(event, ranges) {
+    plot = $.plot("#usage-stats", [d], $.extend(true, {}, options, {
+      xaxis: {
+        min: ranges.xaxis.from,
+        max: ranges.xaxis.to
+      }
+    }));
+    overview.setSelection(ranges, true);
+  });
+
+  $("#overview").bind("plotselected", function(event, ranges) {
+    plot.setSelection(ranges);
+  });
+});
+</script>
+
+<h1 class="lower"><%= @generic_file %></h1>
+
+<div class="row">
+  <div class="span110">
+    <h2>Usage Statistics</h2>
+    <div class="alert alert-info">
+      <i class="icon-bar-chart icon-large"></i> <strong><%= @pageviews %></strong> views since <%= @created.strftime("%B %-d, %Y") %>
+    </div>
+    <div class="stats-container">
+        <div id="usage-stats" class="stats-placeholder"></div>
+    </div>
+    <div class="stats-container" style="height:150px;">
+        <div id="overview" class="stats-placeholder"></div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,11 @@
+<% solr_document = featured.generic_file_solr_document %>
+<li class="featured-item" data-id="<%= solr_document.noid %>">
+  <div class="main row">
+    <div class="col-sm-3">
+      <%= render partial: 'dashboard/_index_partials/thumbnail_display', locals: {document: solr_document, width: 90} %>
+    </div>
+    <div class="col-sm-9">
+      <%= render partial: 'homepage/featured_fields', locals: {featured: solr_document} %>
+    </div>
+  </div>
+</li>

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

@@ -0,0 +1,18 @@
+      <h3>
+        <%= link_to truncate(featured.title_or_label, length: 28, separator: ' '),
+          sufia.generic_file_path(featured), title: featured.title_or_label  %>
+      </h3>
+      <div> 
+        <%= link_to_profile featured.depositor("no depositor value") %>
+      </div>
+      <div> 
+        <%= link_to truncate(featured.label, length: 25),
+            sufia.generic_file_path(featured), title: featured.label %>
+      </div>
+      <div> 
+        <%= link_to_facet_list(featured.resource_type, 'desc_metadata__resource_type', 'no resource specified') %>
+      </div>
+      <div> 
+        <%= link_to_facet_list(featured.tags, 'desc_metadata__tag', 'no keywords specified') %>
+      </div>
+

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

@@ -0,0 +1,17 @@
+<h2>Featured Works</h2>
+<% if can? :update, FeaturedWork %>
+  <%= form_for [sufia, @featured_work_list] do |f| %>
+    <div class="panel-group dd" id="dd">
+      <ol id="featured_works">
+        <%= f.fields_for :featured_works do |featured| %>
+          <%= render partial: 'homepage/sortable_featured', locals: {f: featured} %>
+        <% end %>
+      </ol>
+    </div>
+    <%= f.submit "Save order", class: 'btn btn-default' %>
+  <% end %>
+<% else %>
+  <ol id="featured_works">
+    <%= render partial: 'homepage/featured', collection: @featured_work_list.featured_works %>
+  </ol>
+<% end %>

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

@@ -0,0 +1,26 @@
+<% featured = f.object.generic_file_solr_document %>
+<li class="dd-item dd3-item featured-item" data-id="<%= featured.noid %>">
+  <div class="dd-handle dd3-handle"><%= t :drag %></div>
+  <div class="dd3-content panel panel-default">
+    <%= f.hidden_field :id %>
+    <%= f.hidden_field :order, data: {property: "order"} %>
+    <div class="main row">
+      <div class="col-sm-3">
+        <%= render partial: 'dashboard/_index_partials/thumbnail_display', locals: {document: featured, width: 90} %>
+      </div>
+      <div class="col-sm-9">
+        <% if can? :destroy, FeaturedWork %>
+          <h3 class="pull-right">
+            <%= link_to sufia.featured_work_path(featured, format: :json),
+              title: "Remove work from feature section",
+              data: {behavior: 'unfeature'} do %>
+              <i class='icon-remove'></i>
+            <% end %>
+          </h3>
+        <% end %>
+        <%= render partial: 'homepage/featured_fields', locals: {featured: featured} %>
+      </div>
+    </div>
+  </div>
+</li>
+

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

@@ -1,5 +1,5 @@
 <%= csrf_meta_tag %>
-
+<link href='http://fonts.googleapis.com/css?family=Lato:300,400' rel='stylesheet' type='text/css'>
 <meta charset="utf-8" />
 
 <title><%= h(@page_title || application_name) %></title>

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

@@ -0,0 +1,14 @@
+<h2 class="heading1">Contribute</h2>
+<%= link_to "<i class=\"icon-file\"></i> #{t('sufia.share_button')}".html_safe, sufia.new_generic_file_path, :class => "btn btn-primary btn-large", :id => "contribute_link" %>
+<div class="row center"> <a href="/terms/">Terms of Use</a></div><br />
+<%- 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 class="row">&nbsp;</div>
+<div class="row">
+  <h2 class="heading1">My Latest</h2>
+  <%= render :partial=>'/catalog/recents', :locals => {:recent_documents=>@recent_user_documents, :display_thumbs=>false, :display_access=>true} %>
+</row>

data/app/views/layouts/error.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.
-%>
-
 <!DOCTYPE html>
 <html>
   <head>
@@ -41,22 +25,20 @@ limitations under the License.
 
 <body>
 <div  id="wrapper">
-  <div class="container">
+  <div class="container-fluid">
     <div id="page-positioner">
       <%= render :partial => '/masthead', :formats => [:html] %>
       <div id="content-wrapper">
         <div id="content" class="row">
-          <!-- 110 rows -->
-            <div class="span110">
+            <div class="col-sm-8 col-md-8 col-lg-8">
               <%= yield %>
             </div>
         </div><!-- /#content -->
       </div><!-- /#content-wrapper -->
+      <%= render partial: '/footer' %>
     </div><!-- /#page-positioner -->
   </div><!-- /.container -->
 </div><!-- /#wrapper -->
-<%= render partial: '/footer' %>
-      
 </body>
 
 </html>

data/app/views/layouts/homepage.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.
-%>
-
 <!DOCTYPE html>
 <html>
   <head>
@@ -22,35 +6,22 @@ limitations under the License.
 
 <body> 
 <div  id="wrapper"> 
-  <div class="container">
+  <div class="container-fluid">
     <div id="page-positioner">
-      <%= render :partial => '/masthead', :formats => [:html] %>
+      <%= render :partial => '/masthead' %>
+      <%= render :partial => '/controls' %>
       <%= render :partial => '/flash_msg' %>
       <div id="content-wrapper"> 
-        <div id="content" class="row">
-          <!-- 110 rows -->
-            <div class="span17">
-              <%= yield :sidebar %>
-            </div><!-- /.span17 -->
-              <div class="span63">
-                <%= yield %>
-              </div><!-- /.span63 -->
-
-              <div class="span30 offset2">
-                <h2 class="heading1">Contribute</h2> 
-                <%= link_to "<i class=\"icon-file\"></i> #{t('sufia.share_button')}".html_safe, sufia.new_generic_file_path, :class => "btn btn-primary btn-large", :id => "contribute_link" %>
-                <div class="row center"> <a href="/terms/">Terms of Use</a></div><br />                
-                <div class="row">&nbsp;</div>
-                <h2 class="heading1">My Latest</h2> 
-                <%= render :partial=>'/catalog/recents', :locals => {:recent_documents=>@recent_user_documents, :display_thumbs=>false, :display_access=>true} %>
-              </div> <!-- /.span30 -->
-              
+        <div id="content">
+          <div class="col-xs-12">
+            <%= yield %>
+          </div>
         </div><!-- /#content -->
       </div><!-- /#content-wrapper -->
+      <%= render partial: '/footer' %>
     </div><!-- /#page-positioner -->
   </div><!-- /.container -->
 </div><!-- /#wrapper -->
-<%= render partial: '/footer' %>
 <div id="ajax-modal" class="modal hide" tabindex="-1"></div>
 </body>
 </html>