umlaut 3.0.5 → 3.1.0.pre1

data/app/views/resolve/_section_display.html.erb

@@ -1,49 +1,37 @@
-<% # You generally shoudln't call this partial directly, it's called through
-   # the render_section helper method in resolve_helper.rb
-%>
-
-<% if presenter.visible? %>
-
-  <% unless presenter.show_partial_only? %>
-    <div class="umlaut_section <%= presenter.div_id %>">
-  <% end %>
-
+<% 
+# You generally shoudln't call this partial directly, it's called through
+# the render_section helper method in resolve_helper.rb
+if presenter.visible?
+  unless presenter.show_partial_only? %>
+    <div class="<%= section_css_classes(@user_request, presenter.div_id, []).join(" ") %>">
+<% end %>
 
-      <% if presenter.show_heading? %>
-        <%= presenter.render_heading %>
-      <% end %>
+  <%= render :partial => 'section_heading', :locals => {:presenter => presenter} %>
 
-      <% unless presenter.show_partial_only? %>
-      <div class="umlaut_section_content">
-      <% end %>
-  
-        <% if presenter.custom_partial? %>
-          <%= render( presenter.content_render_hash ) %>
-        <% elsif presenter.list_visible_limit %>          
-  
-            <%= list_with_limit("#{presenter.div_id}_list_with_limit", presenter.responses_list, :limit => presenter.list_visible_limit, :ul_class => "response_list #{presenter.div_id}") do |item, index| %>
-               <%= render( presenter.item_render_hash(item) ) %>
-            <% end %>          
-        <% elsif presenter.responses_list.length == 0 && ! presenter.services_in_progress?%>
-        <ul class="response_list">
-          <li>
-            None available.
-          </li>
-         </ul>
-        <% else %>
-          <ul class="response_list <%= presenter.div_id %>">
-            <%= render( presenter.content_render_hash ) %>
-          </ul>
-        <% end %>
-        
-        <% if presenter.show_spinner? %>
-          <%= render(presenter.spinner_render_hash) %>
-        <% end %>
-      
-  <% unless presenter.show_partial_only? %>
-      </div>
+  <%  unless presenter.show_partial_only? %>
+  <div class="umlaut_section_content"><%
+  end
+  if presenter.custom_partial? %><%= 
+    render(presenter.content_render_hash) %><%
+  elsif presenter.list_visible_limit %><%= 
+    list_with_limit("#{presenter.div_id}_list_with_limit", presenter.responses_list, 
+      :limit => presenter.list_visible_limit, :ul_class => "response_list #{presenter.div_id}") do |item, index| %><%= 
+        render(presenter.item_render_hash(item)) %><% 
+      end 
+  elsif presenter.responses_list.length == 0 && ! presenter.services_in_progress?%>
+    <ul class="response_list">
+      <li>None available.</li>
+    </ul><%
+  else %>
+    <ul class="response_list <%= presenter.div_id %>"><%= 
+      render( presenter.content_render_hash ) %>
+    </ul><%
+  end 
+  if presenter.show_spinner? %><%= 
+    render(presenter.spinner_render_hash) %><%
+  end 
+  unless presenter.show_partial_only? %>
     </div>
-  <% end %>
-  
-  
-<% end %>
+</div><% 
+  end
+end %>

data/app/views/resolve/_section_heading.html.erb

@@ -0,0 +1,17 @@
+<%# requires local :presenter with a SectionRenderer 
+    optional local :force_render=> true to ignore presentation logic. legacy. %>
+
+<% if presenter.show_heading? || local_assigns[:force_render] == true %>
+
+    <div class="section_heading">
+      <% if presenter.section_title %>
+        <h3><%= presenter.section_title %></h3>
+        <% if presenter.section_prompt %>
+          <p class="section_prompt">
+            <%= presenter.section_prompt %>
+          </p>
+        <% end %>
+      <% end %>
+    </div>
+
+<% end  %>

data/app/views/resolve/_service_errors.html.erb

@@ -1,29 +1,28 @@
-
 <% 
-         failed_dispatches = failed_service_dispatches()
-         unless ( failed_dispatches.nil? || failed_dispatches.empty? ) %>
-         <div id="service_errors_content" class="small_right_box">
-
-
-               <span class="error_icon">(!)</span><span class="smallText">Some content may not be included due to errors:</span>
-        <ul>
-          <% failed_dispatches.each do | dispatch | %>
-            <li class="smallText">           
-            Some <i><%= dispatch.service.service_types_generated.collect { |type|
-               type.display_name_pluralize.downcase}.join(",") %></i>
-             from <a class="simple_visible_toggle"><strong><%= dispatch.service.display_name %>  </strong> </a>
-              <% exception_info = dispatch.exception_info %>
-                <div style="display: none;">
-                technical error information
-                <ul>
-                   <li> <%= exception_info[:class_name] if exception_info %> </li>
-                   <li> <%= exception_info[:message] if exception_info %> </li>
-                   <li> dispatched service id: <%= dispatch.id %>  </li>                    
-                </ul>
-                </div>
-            </li>
-          <% end %>
-        </ul>
-       <span class="clear"></span>
-       </div>
-       <% end %>
+failed_dispatches = failed_service_dispatches()
+unless ( failed_dispatches.nil? || failed_dispatches.empty? ) %>
+  <div id="service_errors_content">
+    <h5 class="warning"><i class="umlaut_icons-famfamfam-error"></i> Some content may not be included due to errors:</h5>
+    <ul>
+      <% failed_dispatches.each do | dispatch | %>
+        <li class="text-small">
+          Some <strong><%= dispatch.service.service_types_generated.collect { |type|
+            type.display_name_pluralize.downcase}.join(",") %></strong>
+          from <a class="collapse-toggle" data-target="<%= "#failed_dispatch_#{dispatch.id}"%>" data-toggle="collapse"><strong><%= dispatch.service.display_name %></strong></a>
+          <% exception_info = dispatch.exception_info %>
+          <div id="<%= "failed_dispatch_#{dispatch.id}"%>" class="collapse">
+            <ul class="nav nav-list">
+              <li class="nav-header">Technical Error Information</li>
+              <%= content_tag("li") do
+                content_tag("pre", :class=>"pre-scrollable") do
+                  error_message = (exception_info) ? "#{exception_info[:class_name]}: #{exception_info[:message]}\n" : ""
+                  error_message + "dispatched service id: #{dispatch.id}"
+                end
+              end %>
+            </ul>
+          </div>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>

data/app/views/resolve/_standard_response_item.html.erb

@@ -2,88 +2,58 @@
    # Displays a typical Umlaut response element in typical markup.
    # Pass in a ServiceType object for the response using Rails partial
    # :object or :collection convention
-   
    #optional argument, :locals => 
    #    :show_source => default false, if true display the source of the link
    show_source ||= false
-   
    service_response = standard_response_item # passed in via :object or :collection
    # passed in in :object or :collection 
    view_data = service_response.view_data
 %>
-
-<li class="response_item"> 
-
-  <!-- fancy schmancy ajax? But not if we're generating embed partials,
-       won't work. -->
-  <% if view_data[:link_supports_ajax_call]  
+<li class="response_item">
+  <%= content_tag :i, nil %>
+  <% 
+  # Fancy schmancy ajax? But not if we're generating embed partials, won't work.
   # Generate a hyperlink that will call our standard service action
   # due to special class for unobtrusive JS. 
-  %>
-      <%= link_to(view_data[:display_text], 
-              {:controller=>'link_router', 
-              :id=>service_response.id},
-              {:id => "svctype_link_#{service_response.id}",                
-              :target => "_blank",
-              :class => "ajax_window"}) %>
-  <% elsif (content = response_content(view_data )) 
-     #collapsible content on page
-  %>
-    <%= expand_contract_section(view_data[:display_text], "svc_id_#{service_response.id}") do %>
-      <div class="section_content_indent">
-        <%= content %>
-      </div>
-    <% end %>
-  
-  
-  <% else 
-    # Ordinary href link. 
-  %>      
-    <%= link_to view_data[:display_text], {:controller=>'link_router', :id=>service_response.id}, 'target'=>"_blank", 'id' => "svctype_link_#{service_response.id}" %>
-  <% end %>
-
-<% if show_source %>
-  <div class="link_source">from <%= view_data[:source] || service_response.service.display_name %></div>
-<% end %>
-
-<% unless view_data[:coverage].blank? %>
-  <div class="response_coverage_statement">
-  <%= view_data[:coverage] %>
-  </div>
-<% end
-%>
-<% unless view_data[:notes].blank? %>
+  if view_data[:link_supports_ajax_call] %>
+    <%= link_to(view_data[:display_text], {:controller=>'link_router', :id=>service_response.id},
+          {:id => "svctype_link_#{service_response.id}", :target => "_blank", :class => "response_link ajax_window"}) %>
+  <% #Collapsible content on page 
+  elsif (content = response_content(view_data )) %>
+    <%= expand_contract_section(view_data[:display_text], 
+          "svc_id_#{service_response.id}") { content_tag(:div, content, :class => "umlaut-content-indent") } %>
+  <% # Ordinary href link
+  else %>      
+    <%= link_to({:controller=>'link_router', :id=>service_response.id}, 
+          {:id => "svctype_link_#{service_response.id}", :target=>"_blank", :class => "response_link"}) do %>
+      <%= coverage_summary(view_data) %>
+      <%= view_data[:display_text] %><%
+    end
+  end %>
+  <%= content_tag(:div, "from #{view_data[:source] || service_response.service.display_name}", :class => "response_source") if show_source %>
+  <%= content_tag(:div, view_data[:coverage], :class => "response_coverage_statement") unless view_data[:coverage].blank? %>
   <%-
     # legacy, the 'notes' field can take raw html, we need to leave it that way for
-    #now, but it's not great.
-    -%>
-  <div class="response_notes"><%= view_data[:notes].html_safe %></div>
-<% end %>
-<% unless view_data[:authentication].blank? %>
-  <div class="response_authentication_instructions"><strong>Authentication:</strong> <%= view_data[:authentication] %></div>
-<% end %>
-
-
-<% if (!view_data[:match_reliability].blank?) && view_data[:match_reliability] != ServiceResponse::MatchExact %>
-  <div class="edition_warning">
-    <% unless view_data[:edition_str].blank? %>
-      <em class="note label">Edition information</em> <%= view_data[:edition_str] %>
-    <% else %>
-      <em class="note label">May be alternate edition.</em>
-    <% end %>
-    
+    # now, but it's not great.
+  -%>
+  <%= content_tag(:div, view_data[:notes].html_safe, :class => "response_notes") unless view_data[:notes].blank? %>
+  <%= content_tag(:div, content_tag(:strong, "Authentication:") + " #{view_data[:authentication]}", 
+        :class => "response_authentication_instructions") unless view_data[:authentication].blank? %>
+  <%-
+    # If we're unsure if this is a match, show an edition "warning".
+    # If we have edition info from the service response, show that,
+    # otherwise, plainly state that this may be an alternate edition.
+  -%>
+  <%= (content_tag(:div, :class => "edition_warning") {
+        (view_data[:edition_str].blank?) ? 
+          content_tag(:em, "May be alternate edition.", :class => ["note"]) : 
+            (content_tag(:em, "Edition information",:class => ["note"]) + " #{view_data[:edition_str]}")
+        }) if ((not view_data[:match_reliability].blank?) && view_data[:match_reliability] != ServiceResponse::MatchExact) %>
+  <%-
+  # Debug info, hidden with explicit style, can be made visible with javascript.
+  -%>
+  <div class="debug_info" style="display:none">
+    <strong>Debug info:</strong> <%= service_response.service.service_id %>
+    <%= "; #{view_data[:debug_info]}" unless view_data[:debug_info].blank? %>
   </div>
-<% end %>
-
-<!-- debug info, hidden with CSS, can be made visible with javascript. -->
-<div class="debug_info" style="display:none">
-  <b>Debug info:</b> <%= service_response.service.service_id %>
-  
-  <% unless view_data[:debug_info].blank? %>
-    ; <%= view_data[:debug_info] %>
-  <% end %>
-
-</div>
-
-
 </li>

data/app/views/resolve/background_status.html.erb

@@ -1,26 +1,22 @@
-<div class="content">
-<h1>Loading complete information</h1>
-<p>Please wait, the following information is still loading. You will be automatically returned to the <%= app_name %> screen when finished.  
-  <div class="small_right_box">
-  <table>
-  <tr><th>Source</th><th>Content type</th></tr>
-    <% @user_request.services_in_progress.each do |service|  %>
-       <tr><td style="padding-right: 10px; vertical-align: top;"><strong><%= service.display_name %></strong></td>
-           <td> <%= service.service_types_generated.collect {|st| html_escape(st.display_name_pluralize) }.join('<br/>').html_safe %> </td>
-       </tr>
-    <% end %>
-  </table>
+<div>
+  <h1>Loading complete information</h1>
+  <p>Please wait, the following information is still loading. You will be automatically returned to the <%= app_name %> screen when finished.</p>
+  <div>
+    <table class="table table-bordered table-striped">
+      <tr>
+        <th>Source</th>
+        <th>Content type</th>
+      </tr>
+      <% @user_request.services_in_progress.each do |service|  %>
+        <tr>
+          <td><strong><%= service.display_name %></strong></td>
+          <td><%= service.service_types_generated.collect {|st| html_escape(st.display_name_pluralize) }.join('<br/>').html_safe %></td>
+        </tr>
+      <% end %>
+    </table>
   </div>
-  
   <%= 
-    link_to( "View Current Results", url_for_with_co( 
-      {:action => 'index', 
-      :'umlaut.skip_resolve_menu' => 'false', 
-      'umlaut.request_id' => @user_request.id}, 
-      @user_request.to_context_object)
-    )
-   %>
+    link_to( "View Current Results", url_for_with_co(
+      {:action => 'index',:'umlaut.skip_resolve_menu' => 'false', 
+        'umlaut.request_id' => @user_request.id}, @user_request.to_context_object)) %>
 </div>
-
-                
-

data/app/views/resolve/get_permalink.html.erb

@@ -0,0 +1,6 @@
+<dl class="permalink">
+	<dt>Short link:</dt>
+	<dd><%= link_to current_permalink_url, current_permalink_url %></dd>
+</dl>
+
+<%= link_to 'Back', :back %>

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

@@ -1,73 +1,47 @@
-
-<%= render :partial=>'background_updater' %>
-
- 
-<div class="umlaut_resolve"> <!-- actual wrapper for both columns -->
-  <div class="main_column"> 
-
-  
-    <h1>Find <%=@user_request.referent.type_of_thing.titlecase %></h1>
-    
-    <div class="resource_info">
-      <table width="100%" cellpadding="3" cellspacing="0">
-        <tr>
-          <td>      
-            <%= render :partial=>'citation' %>
-  
-            <div class="resource_info_sections">
-              <% html_sections(:resource_info).each do |section|
-              %>
-                <%= content_tag "div", :id => section[:div_id] do %>
-                  <%= render_section(section) %>
-                <% end %>
-              <% end %>
-            </div>
-            
-          </td>
-          
-          <td align='right'>
-            <div id="cover_image">
-              <%= render_section(html_section_by_div_id("cover_image")) %>
-            </div>
-          </td>
-        </tr>
-      </table>
-    </div>  
-    
-    
-    <div class="main_response_list">
-      <% html_sections(:main).each do |section|
-      %>
-        <%= content_tag "div", :id => section[:div_id] do %>
-          <%= render_section(section) %>
-        <% end %>
-      <% end %>
-    </div>
-  
-  <!--close mainColumn-->
-  </div>
-  
-  <div id="rightColumn" class="sidebar">
-  
-      <% html_sections(:sidebar).each do |section|
-      %>
-        <%= content_tag "div", :id => section[:div_id] do %>
-          <%= render_section(section) %>
-        <% end %>
-      <% end %>
-  
-    <!-- service errors -->
-    <div id="service_errors">
-      <% html_sections(:service_errors).each do |section| %>
-        <%= render_section(section) %>
-      <% end %>
-    </div>
-    
-  </div>
-  
-
-<!-- close bothColumns --> 
-</div> 
-
-
-
+<%= render :partial=>'background_updater' %>
+<div class="row-fluid">
+
+  <div class="span8 umlaut-main"> 
+    
+    <div class="umlaut-resource-info">
+          <div class="resource_info_sections">
+            <%= render :partial=> "manually_entered_warning" %>
+
+            <%= render :partial=>'citation' %>
+            <% html_sections(:resource_info).each do |section| %>
+              <%= content_tag "div", :id => section[:div_id] do %>
+                <%= render_section(section) %>
+              <% end %>
+            <% end %>
+          </div>
+          
+          <%# need a div here for ajax bg loader to put bg loaded cover into %>
+          <div id="cover_image">
+            <%= render_section(html_section_by_div_id("cover_image")) %>
+          </div>
+
+    </div>
+
+    <div class="main_response_list">
+      <% html_sections(:main).each do |section| %>
+        <%= content_tag "div", :id => section[:div_id] do %>
+          <%= render_section(section) %>
+        <% end %>
+      <% end %>
+    </div>
+</div>
+
+  <div class="span4 umlaut-sidebar">
+    <% html_sections(:sidebar).each do |section| %>
+      <%= content_tag "div", :id => section[:div_id] do %>
+        <%= render_section(section) %>
+      <% end %>
+    <% end %>
+    <div id="service_errors">
+      <% html_sections(:service_errors).each do |section| %>
+        <%= render_section(section) %>
+      <% end %>
+    </div>
+  </div>
+  <%= render :partial=>"modal" %>
+</div>