RubyGems - umlaut - Versions diffs - 3.0.5 → 3.1.0.pre1 - Mend

umlaut 3.0.5 → 3.1.0.pre1

Files changed (385) hide show

data/app/views/layouts/umlaut.html.erb CHANGED Viewed

@@ -1,49 +1,29 @@
-<!DOCTYPE html>
-<html lang="EN">
-<head>
-  <meta charset="utf-8">
-  <%= csrf_meta_tags %>
-  <%= stylesheet_link_tag 'application' %>
-  <%= javascript_include_tag 'application' %>
-  <title>
-    <%= umlaut_title_text %>
-  </title>
-  <%= render_umlaut_head_content %>
-</head>
-<body>
-  <div class="umlaut container">
-     <div id="header" class="header">
-        <h1><%= umlaut_config.app_name %></h1>
-     </div>
-     <% if permalink = current_permalink_url() %>
-       <div class="permalink_bar">
-         URL: <%= link_to current_permalink_url, current_permalink_url %>
-       </div>
-     <% end %>
-      <%= yield %>
-      <!-- even with nothing in it, footer neccesary for CSS clear=both -->
-     <div id="footer" class="footer">
-        <%= render_service_credits %>
-        <!-- links to aid in debugging openurls gone wrong when in production -->
-        <%= link_to_test_resolve %>
-        <%= link_to_direct_sfx %>
-        <%= link_to_toggle_debug_info %>
-     </div>
-  </div>
-</body>
-</html>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <%= csrf_meta_tags %>
+    <%= stylesheet_link_tag 'application' %>
+    <%= javascript_include_tag 'application' %>
+    <title><%= umlaut_title_text %></title>
+    <%= render_umlaut_head_content %>
+  </head>
+  <body class="umlaut no-js">
+    <div class="umlaut-container">
+      <%= render :partial => "umlaut/header" %>
+      <div class="umlaut-main-container-fluid container-fluid <%= "umlaut-#{params[:controller]}-container" %>">
+        <%= yield %>
+      </div>
+      <div id="footer" class="footer">
+        <%= render_service_credits %>
+        <!-- links to aid in debugging openurls gone wrong when in production -->
+        <%= link_to_test_resolve %>
+        <%= link_to_direct_sfx %>
+        <%= link_to_toggle_debug_info %>
+      </div>
+    </div>
+  </body>
+</html>

data/app/views/resolve/_background_progress.html.erb CHANGED Viewed

@@ -1,51 +1,44 @@
-<%   # Partial to display spinner for background services in progress.
-     # Also degrades fairly nicely to non-javascript.
-     #
-     # Pass in local variables as arguments (:locals param to render method):
-     #
-     # svc_type : String or ServiceTypeValue that we should be
-     #    paying attention to. This or service_types is required.
-     #
-     # svc_types: Array of Strings or ServiceTypeValue for multiple.
-     #
-     # div_id: id of div that progress content is put in. Optional, defaults
-     #   to "progress_#{svc_type.name}", good idea especially if it won't be
-     #   unique otherwise.
-     #
-     # current_set_empty: optional. defaults to false. If true, then
-     #   the word 'more' won't be used in note to user, since it's not 'more'!
-     # Strategy of this output: We start out outputting our non-js
-     # version. Then we immediately use js to over-write it with our
-     # js version. So js people get js, non get non, everyone is happy.
-     # Further investigation may need to be done to optimize specifically
-     # for JAWS (which is neither full js nor non js, but some js--right
-     # now I think they'll just get the non-js version, but we can do better.)
-  svc_types = [] if svc_types.nil?
-  svc_types.push(svc_type).uniq! if defined?(svc_type) && ! svc_type.nil?
-  # convert any Strings to ServiceTypeValues.
-  svc_types = svc_types.collect { |t| t.kind_of?(ServiceTypeValue) ? t : ServiceTypeValue[t] }
-  div_id = "progress_#{svc_types[0].name}" unless div_id
-  current_set_empty = false if current_set_empty.nil?
-  item_name ||= svc_types[0].display_name_pluralize
-  progress_message ||= "Searching for #{current_set_empty ? "" : "more "} #{item_name}"
-%>
-<% # only display if there are more!
- if service_types_in_progress?(svc_types) %>
-  <div id="<%= div_id %>" class="background_progress_spinner" >
-      <%=
-      image_tag('spinner.gif', :alt =>"") %>
-      <span class="message"><%= progress_message %></span>
-      <noscript>
+<%
+# Partial to display spinner for background services in progress.
+# Also degrades fairly nicely to non-javascript.
+#
+# Pass in local variables as arguments (:locals param to render method):
+#
+# svc_type : String or ServiceTypeValue that we should be
+#    paying attention to. This or service_types is required.
+#
+# svc_types: Array of Strings or ServiceTypeValue for multiple.
+#
+# div_id: id of div that progress content is put in. Optional, defaults
+#   to "progress_#{svc_type.name}", good idea especially if it won't be
+#   unique otherwise.
+#
+# current_set_empty: optional. defaults to false. If true, then
+#   the word 'more' won't be used in note to user, since it's not 'more'!
+#
+# Strategy of this output: We start out outputting our non-js
+# version. Then we immediately use js to over-write it with our
+# js version. So js people get js, non get non, everyone is happy.
+# Further investigation may need to be done to optimize specifically
+# for JAWS (which is neither full js nor non js, but some js--right
+# now I think they'll just get the non-js version, but we can do better.)
+svc_types = [] if svc_types.nil?
+svc_types.push(svc_type).uniq! if defined?(svc_type) && ! svc_type.nil?
+# convert any Strings to ServiceTypeValues.
+svc_types = svc_types.collect { |t| t.kind_of?(ServiceTypeValue) ? t : ServiceTypeValue[t] }
+div_id = "progress_#{svc_types[0].name}" unless div_id
+current_set_empty = false if current_set_empty.nil?
+item_name ||= svc_types[0].display_name_pluralize
+progress_message ||= "Searching for #{current_set_empty ? "" : "more "} #{item_name}"
+# only display if there are more!
+if service_types_in_progress?(svc_types) %>
+  <div id="<%= div_id %>" class="background_progress_spinner">
+    <%= image_tag('spinner.gif', :alt =>"") %>
+    <span class="message"><%= progress_message %></span>
+    <noscript>
+      <div>
         <%= link_to "Load #{current_set_empty ? "" : "more"} #{item_name}.", {:action => "background_status", :"umlaut.request_id" => @user_request.id, :"umlaut.skip_resolve_menu" => params['umlaut.skip_resolve_menu']} %>
-      </noscript>
-  </div>
-<% end %>
+      </div>
+    </noscript>
+  </div><%
+end %>

data/app/views/resolve/_background_updater.html.erb CHANGED Viewed

@@ -1,38 +1,25 @@
 <%-
-#   Include this partial to put the background updater device on your page.
-#   This actually just sets up the Umlaut JQuery background updater, for
-#   unobtrusive adding of background html content to menu page.
--%>
-<%
-   # only include if we have any background services. We could check to make
-   # sure we only have background services we care about, but it's more work--
-   # the updater will only run ONCE at most wrongly, then the
-   # background_update action will stop it.
-   if (  any_services_in_progress? )
+# Include this partial to put the background updater device on your page.
+# This actually just sets up the Umlaut JQuery background updater, for
+# unobtrusive adding of background html content to menu page.
+-%><%
+# only include if we have any background services. We could check to make
+# sure we only have background services we care about, but it's more work--
+# the updater will only run ONCE at most wrongly, then the
+# background_update action will stop it.
+if (any_services_in_progress?) %>
+  <script type="text/javascript">
+    //<![CDATA[
+    jQuery(document).ready(function($) {
+      var updater = new Umlaut.HtmlUpdater("<%= root_url %>",  "umlaut.request_id=<%= @user_request.id %>");<%
+      bg_update_sections.collect do |section| %>
+        updater.add_section_target({ umlaut_section_id: "<%= section[:div_id]  %>"  });<%
+      end
+      # Wait the designated number of seconds before kicking off the first bg
+      # update request. Future requests will be automatically made with delay.
 %>
-<script type="text/javascript">
-//<![CDATA[
-jQuery(document).ready( function($) {
-  var updater = new Umlaut.HtmlUpdater("<%= root_url %>"  ,  "umlaut.request_id=<%= @user_request.id %>"  );
-  <% bg_update_sections.collect do |section| %>
-    updater.add_section_target({ umlaut_section_id: "<%= section[:div_id]  %>"  });
-  <% end %>
-  //Wait the designated number of seconds before kicking off the first bg
-  //update request. Future requests will be automatically made with delay..
-  setTimeout(function() { updater.update(); },
-             <%= umlaut_config.lookup!("poll_wait_seconds", 4)*1000 %>
-             );
-});
-//]]>
-</script>
-<% end %>
+      setTimeout(function() { updater.update(); }, <%= umlaut_config.lookup!("initial_poll_wait_seconds", 4)*1000 %>);
+    });
+    //]]>
+  </script><%
+end %>

data/app/views/resolve/_citation.html.erb CHANGED Viewed

@@ -1,87 +1,63 @@
-<table id="citation" width="100%" cellpadding="3" cellspacing="0">
-<%
-cite = @user_request.referent.to_citation
-#rft_metadata = @user_request.referent.metadata
-%>
-    <tr>
-      <td class="largeTextb" width="90" valign="TOP"><div align="right"><%= cite[:title_label] %>:</div></td>
-      <td class="largeText"><%= cite[:title] %></td>
-   </tr>
-<% # Try to warn if this could be a typo. If we have an rft.object_id, then
-   # SFX recognized it as an actually existing journal. If not, then it
-   # might be a typo. If it came from a manually entered citation, warn them.
-   if display_not_found_warning?(@user_request)
-%>
-  <tr><td class="largeTextb notice"><div align="right">(!) Warning:</div></td><td class="largeText notice"><%= umlaut_config.app_name %> does not know about a <%= (@user_request.referent.format).downcase %> with this name. Please check your entry.</td></tr>
-<%   end %>
-<%
-@page_title = cite[:title]
-if cite[:author]
-%>
-<tr>
-  <td width="90" class="largeTextb"><div align="right">Author:</div></td>
-  <td class="largeText"><%= cite[:author] %></td>
- </tr>
-<%
-end
-if cite[:subtitle] %>
- <tr>
- <td width="90"><div align="right" class="smallTextb"><strong><%= cite[:subtitle_label] %>:</strong></div></td>
- <td><span class="smallText"><%= cite[:subtitle] %></span></td>
- </tr>
-<%
-end
-if (cite[:issn] && ! cite[:issn].empty?)  %>
-<tr>
-  <td><div align="right" class="smallTextb"><strong>ISSN:</strong></div></td>
-  <td><span class="smallText"><%= cite[:issn] %></span></td>
-</tr>
-<%
-end
-if (cite[:isbn] && ! cite[:isbn].empty? ) %>
-<tr>
-  <td><div align="right" class="smallTextb">ISBN:</strong></div></td>
-  <td><span class="smallText"><%= cite[:isbn] %></span></td>
-</tr>
-<%
-end %>
-<% unless cite[:pub].blank?  %>
-<tr>
-  <td><div align="right" class="smallTextb">Publisher:</div></td>
-  <td><span class="smallText"><%= cite[:pub] %> <td></tr>
-<% end %>
-<% unless cite[:date].blank? && cite[:volume].blank? && cite[:issue].blank? && cite[:page].blank? %>
- <tr>
-  <td><div align="right" class="smallTextb">Published:</div></td>
-  <td><span class="smallText">
-    <%= date_format(cite[:date]) %>&nbsp;&nbsp;
-    <% unless cite[:volume].blank? %>
-      Volume:&nbsp;&nbsp;<%= cite[:volume] %>&nbsp;&nbsp;
-    <% end %>
-    <% unless cite[:issue].blank? %>
-      Issue:&nbsp;&nbsp;<%= cite[:issue] %>&nbsp;&nbsp;
-    <% end %>
-    <% unless cite[:page].blank? %>
-      Page:&nbsp;&nbsp;<%= cite[:page] %>&nbsp;&nbsp;
-    <% end %>
-  </span></td>
- </tr>
-<% end %>
-</table>
+<%
+cite = @user_request.referent.to_citation
+@page_title = cite[:title] %>
+<% if @user_request.referent.type_of_thing.present? %>
+  <p class="resource-type"><%=@user_request.referent.type_of_thing.titlecase %></p>
+<% end %>
+<h2 class="title"><%= cite[:title] %></h2>
+<% if cite[:author].present? || cite[:date].present? %>
+  <p class="author-and-date">
+    <% if cite[:author].present? %>
+      <span class="author"><%= cite[:author] %></span>
+    <% end %>
+    <% if cite[:author].present? && cite[:date].present? %>
+      <span class="sep">•</span>
+    <% end %>
+    <% if cite[:date].present? %>
+      <span class="date"><%= date_format(cite[:date]) %></span>
+    <% end %>
+  </p>
+<% end %>
+<p class="published_in">
+  <% if [:container_title, :volume, :issue, :page].find {|k| cite[k].present? } %>
+    <span class="published-label">Published in <%= cite[:container_label] %></span> <span class="container-title">
+      <%= cite[:container_title] %></span>.
+  <% end %>
+  <% if cite[:volume].present? %>
+      <span class="volume">Volume <%= cite[:volume] %></span>.
+  <% end %>
+  <% if cite[:issue].present? %>
+      <span class="issue">Issue <%= cite[:issue] %></span>.
+  <% end %>
+  <% if cite[:page].present? %>
+      <span class="page">Page <%= cite[:page] %></span>.
+  <% end %>
+</p>
+<dl class="citation-info">
+  <%= if cite[:pub].present?
+    content_tag(:dt, "Publisher:", :class => "publisher") +
+      content_tag(:dd, cite[:pub], :class => "publisher")
+  end %>
+  <%= if cite[:issn].present?
+    content_tag(:dt, "ISSN:", :class => "issn") +
+      content_tag(:dd, cite[:issn], :class => "issn")
+  end %>
+  <%= if cite[:isbn].present?
+    content_tag(:dt, "ISBN:", :class => "isbn") +
+      content_tag(:dd, cite[:isbn], :class => "isbn")
+  end %>
+  <%# todo, doi %>
+</dl>

data/app/views/resolve/_compact_citation.html.erb CHANGED Viewed

@@ -1,33 +1,15 @@
-<% # When you need a citation in a tiny amount of space, just the
-   # most important info, displayed compactly.
-%>
-<%
-cite = @user_request.referent.to_citation
-%>
-<%
-if cite[:author]
-%><span class="smallText"><%= h(cite[:author].chomp) -%>.</span>
-<% end %>
-<span class="smallText">"<%= h(truncate(cite[:title], :length => 70, :seperator => '...')) %>"
-<%
-if cite[:subtitle] %>
- <%= content_tag( ((@user_request.referent.format =~ /article|journal|issue|report/i) ? 'i' : 'span'), cite[:subtitle]) %>
-<% end %>
-<%
-pub = []
-pub << '.' << date_format(cite[:date]) unless cite[:date].blank?
-pub << '. Volume:&nbsp;'+cite[:volume] unless cite[:volume].blank?
-pub << '. Issue:&nbsp;'+cite[:issue] unless cite[:issue].blank?
-pub << '. Page:&nbsp;'+cite[:page] unless cite[:page].blank?
-if pub.length > 0
-%>
-<%= pub.join(' ')%>.
-<% end %>
-</span>
+<%
+  # When you need a citation in a tiny amount of space, just the
+  # most important info, displayed compactly.
+  cite = @user_request.referent.to_citation
+  pub = []
+  pub << '.' << date_format(cite[:date]) unless cite[:date].blank?
+  pub << '. Volume:&nbsp;'+cite[:volume] unless cite[:volume].blank?
+  pub << '. Issue:&nbsp;'+cite[:issue] unless cite[:issue].blank?
+  pub << '. Page:&nbsp;'+cite[:page] unless cite[:page].blank? %>
+<%= content_tag(:span, h(cite[:author].chomp), :class => "text-small") if cite[:author] %>
+<%= content_tag(:span, h(truncate(cite[:title], :length => 70, :seperator => '...'), :class => "text-small") %>
+<%= content_tag(((@user_request.referent.format =~ /article|journal|issue|report/i) ? 'em' : 'span'), cite[:subtitle], :class => "text-small") if cite[:subtitle] %>
+<%= content_tag(:span, pub.join(' '), :class => "text-small") if pub.length > 0 %>

data/app/views/resolve/_cover_image.html.erb CHANGED Viewed

@@ -1,46 +1,37 @@
 <%=
-    # Set parameter for size, small|medium|large if you like
-  size ||= "medium"
-  fix_size ||= true
+# Set parameter for size, small|medium|large if you like
+size ||= "medium"
+fix_size ||= true
-  # small med and x-large correspond roughly to amazon sm, med and lg.
-  # large corresponds roughly to google medium. Just one dimension to
-  # prevent disproportionate scaling. We use CSS so we can set maximums
-  # in BOTH dimensions but let aspect ratio remain the same. We put it
-  # inline so HTML Snippet API clients get images constrained to reasonable
-  # sizes without extra CSS. IE6 won't do max-height/max-width, sorry IE6, no
-  # way to accomodate you (trying to put a width and a max-width triggers
-  # weird IE8 bugs!). Best we can do.
-  #
-  # generally the 'max-height' is our operative maximum for ordinary ratios,
-  # but we let the width be more than the height for weird ratio'd covers
-  # that are wider than square.
-  dimensions_style = {
-            "small"       => "max-height: 80px; max-width: 100px;",
-            "medium"      => "max-height: 160px; max-width: 200px;",
-            "large"       => "max-height: 200px; max-width: 240px;",
-            "extra-large" => "max-height: 475px; max-width: 570px;"
-  }
+# small med and x-large correspond roughly to amazon sm, med and lg.
+# large corresponds roughly to google medium. Just one dimension to
+# prevent disproportionate scaling. We use CSS so we can set maximums
+# in BOTH dimensions but let aspect ratio remain the same. We put it
+# inline so HTML Snippet API clients get images constrained to reasonable
+# sizes without extra CSS. IE6 won't do max-height/max-width, sorry IE6, no
+# way to accomodate you (trying to put a width and a max-width triggers
+# weird IE8 bugs!). Best we can do.
+#
+# generally the 'max-height' is our operative maximum for ordinary ratios,
+# but we let the width be more than the height for weird ratio'd covers
+# that are wider than square.
+dimensions_style = {
+          "small"       => "max-height: 80px; max-width: 100px;",
+          "medium"      => "max-height: 160px; max-width: 200px;",
+          "large"       => "max-height: 200px; max-width: 240px;",
+          "extra-large" => "max-height: 475px; max-width: 570px;" }
-  img_st = cover_image_response(size)
-  if img_st
-      img_data = img_st.view_data
-      img_params = {'src'=>img_data[:url],
-      'class'=>'cover_image',
-      'alt'=>h(img_data[:display_text])}
-      # If we're in https mode, and the original url is http, use
-      # Umlaut proxy to avoid browser security warning.
-      if (request.protocol != img_params['src'][0..6])
-        img_params['src'] = url_for(:controller => "resource", :action => "proxy", :id => img_st.id )
-      end
-      img_params.merge!( "style" => dimensions_style[size]) if fix_size
-      tag('img', img_params )
- end %>
+img_st = cover_image_response(size)
+if img_st
+  img_data = img_st.view_data
+  img_params = {'src'=>img_data[:url],
+  'class'=>'cover_image',
+  'alt'=>h(img_data[:display_text])}
+  # If we're in https mode, and the original url is http, use
+  # Umlaut proxy to avoid browser security warning.
+  if (request.protocol != img_params['src'][0..6])
+    img_params['src'] = url_for(:controller => "resource", :action => "proxy", :id => img_st.id )
+  end
+  img_params.merge!( "style" => dimensions_style[size]) if fix_size
+  tag('img', img_params )
+end %>