umlaut 3.0.5 → 3.1.0.pre1

data/app/views/search/_a_to_z.html.erb

@@ -1,6 +1,9 @@
-  <p class="azNav">
-  <% group_list.each { | letter |%>
-  <%= link_to letter, :action=>"journal_list", :id=>letter%>
-  <%}%>
-  </p>
-
+<div class="umlaut-az">
+  <% group_list.each do |letter| %>
+  	<% if params[:id] == letter %>
+  		<%= content_tag "span", letter, :class => "active" %>
+  	<% else %>
+  		<%= link_to letter, {:action=>"journal_list", :id=>letter}  %>
+  	<% end %>
+  <% end %>
+</div>

data/app/views/search/_citation.html.erb

@@ -1,94 +1,73 @@
-<% 
-  # save the conversion to hash on every call!
-  ref_meta = @current_context_object.referent.metadata  
-  labels = referent_labels
-%>
-<div class="search_citation">
-  <ul class="citation">
-
-          <% if ! ref_meta["atitle"].blank? %>
-            <li class="atitle">
-                <span class="label"><%= labels.atitle %>:</span>
-                <span class="value"><%= ref_meta["atitle"] %></span>               
-            </li>              
-         <% end %>
-         
-         <% unless ref_meta["au"].nil? and ref_meta['aulast'].nil? %>
-           <li class="au">
-            <span class="label">Author:</span>
-            <span class="value">
-              <%= ref_meta["au"] || ref_meta["aulast"] %>         
-              <% if ref_meta["aufirst"] || ref_meta["auinit"] || ref_meta["auinit1"]%>
-              ,	<%= ref_meta["aufirst"] || ref_meta["auinit"] || ref_meta["auinit1"] %>
-              <% end %>
-            </span>
-          </li>
-        <% end %>
-        
-        <% if ref_meta.has_key?("jtitle")  or ref_meta.has_key?("title") or ref_meta.has_key?("btitle") %>
-          <li class="title">
-            <span class="label">            
-              <%= labels.title %>:
-            </span>
-            <span class="value">                 
-              <%= link_to(ref_meta["title"] || ref_meta["btitle"] || ref_meta["jtitle"], 
-                url_for_with_co({:controller => 'resolve'}, @current_context_object), 
-                {:target => search_result_target_window}) 
-               %>
-            </span>
-           </li>
-         <% end %>
-     
-        <% if ref_meta.has_key?("issn") %>
-          <li class="issn">
-            <span class="label">ISSN:</span>
-            <span class="value"><%=ref_meta["issn"] %></span>
-          </li>      
-        <% end %>
-    
-        <% if ref_meta.has_key?("isbn") %>
-          <ul class="isbn">
-            <span class="label">ISBN:</span>
-            <span class="value"><%=ref_meta["isbn"] %></span>
-          </ul>      
-        <% end %>
-    
-    
-        <% if ( ref_meta.has_key?("date") || ref_meta.has_key?("volume") || ref_meta.has_key?("issue") || ref_meta.has_key?("spage")) %>
-          <li class="cite">
-            <%=  date_format(ref_meta["date"].to_s) %>    
-            <% if ref_meta.has_key?("volume") %> 
-              Volume:&nbsp;&nbsp; <%= ref_meta["volume"] %>&nbsp;&nbsp;
-            <% end %>    
-            <% if ref_meta.has_key?("issue") %>
-              Issue:&nbsp;&nbsp; <%= ref_meta["issue"]  %>&nbsp;&nbsp;
-            <% end %>    
-            <% if ref_meta.has_key?("spage") %> 
-              Page:&nbsp;&nbsp; <%= ref_meta["spage"] %>&nbsp;&nbsp;
-            <% end %>    
-            <% if ref_meta.has_key?("epage") %>
-              -  <%= ref_meta["epage"] %>
-            <% end %>
-          </li>
-        <% end %>
-
-        <% unless ref_meta['pub'].blank? && ref_meta['place'].blank? %>
-          <li class="pub">
-            <span class="label" >Publisher:</span>
-            <span class="value">
-              <% unless ref_meta['place'].blank?  %>
-                <%= ref_meta['place'] %> :
-              <% end %>
-              <%= ref_meta['pub'] %>
-            </span>
-          </li>
-         <% end %>
-   </ul>
-
-  <div class="citation_link">
-    <%= resolver_link(@current_context_object, {:target => search_result_target_window}) %>
-  </div>
-</div>
-
-
-
+<% 
+  # save the conversion to hash on every call!
+  ref_meta = @current_context_object.referent.metadata  
+  labels = referent_labels
+%>
+<div class="row-fluid">
+  <dl class="dl-horizontal span8">
+    <%= # Article Title
+    if ref_meta.has_key?("atitle") and (not ref_meta["atitle"].blank?)
+      content_tag(:dt, "#{labels.atitle}:", :class => "atitle") +
+        content_tag(:dd, ref_meta["atitle"], :class => "atitle")
+    end %>
+    <%= # Author
+    if ref_meta.has_key?("au") or ref_meta.has_key?("aulast")
+      author = (ref_meta["au"] || ref_meta["aulast"])
+      if ref_meta["aufirst"] || ref_meta["auinit"] || ref_meta["auinit1"]
+        author << ", #{(ref_meta["aufirst"] || ref_meta["auinit"] || ref_meta["auinit1"])}"
+      end
+      content_tag(:dt, "Author:", :class => "author") +
+        content_tag(:dd, author, :class => "author")
+    end %>
+    <%=# Journal/Book Title
+    if ref_meta.has_key?("jtitle")  or ref_meta.has_key?("title") or ref_meta.has_key?("btitle")
+      content_tag(:dt, "#{labels.title}:", :class => "title") +
+        content_tag(:dd, :class => "title") {
+          link_to(ref_meta["title"] || ref_meta["btitle"] || ref_meta["jtitle"], 
+            url_for_with_co({:controller => 'resolve'}, @current_context_object), 
+              {:target => search_result_target_window}) }
+    end %>
+    <%= # ISSN
+    if ref_meta.has_key?("issn") and (not ref_meta["issn"].blank?)
+      content_tag(:dt, "ISSN:", :class => "issn") +
+        content_tag(:dd, ref_meta["issn"], :class => "issn")
+    end %>
+    <%= # ISBN
+    if ref_meta.has_key?("isbn") and (not ref_meta["isbn"].blank?)
+      content_tag(:dt, "ISBN:", :class => "isbn") +
+        content_tag(:dd, ref_meta["isbn"], :class => "isbn")
+    end %>
+    <%= # Publisher
+    if ref_meta.has_key?("pub") and (not ref_meta["pub"].blank?)
+      publisher = (ref_meta.has_key?("place") and (not ref_meta["place"].blank?)) ? "#{ref_meta['place']} : " : ""
+      publisher << ref_meta["pub"]
+      content_tag(:dt, "Publisher", :class => "publisher") +
+        content_tag(:dd, publisher, :class => "publisher")
+    end %>
+    <%= # Publishing info, etc.
+    if ref_meta.has_key?("date") and (not ref_meta["date"].blank?)
+      content_tag(:dt, "Published:", :class => "published") +
+        content_tag(:dd, date_format(ref_meta["date"]), :class => "published")
+    end %>
+    <%= # Volume
+    if ref_meta.has_key?("volume")
+      content_tag(:dt, "Volume:", :class => "volume") +
+        content_tag(:dd, ref_meta["volume"], :class => "volume")
+    end %>
+    <%= # Issue
+    if ref_meta.has_key?("issue")
+      content_tag(:dt, "Issue:", :class => "issue") +
+        content_tag(:dd, ref_meta["issue"], :class => "issue")
+    end %>
+    <%= # Pages
+    if ref_meta.has_key?("spage")
+      page = ref_meta["spage"]
+      page << " - #{ref_meta["epage"]}" if ref_meta.has_key?("epage")
+      content_tag(:dt, "Page:", :class => "page") +
+        content_tag(:dd, pages, :class => "page")
+    end %>
+  </dl>
+  <div class="umlaut-citation-link span3">
+    <%= resolver_link(@current_context_object, {:target => search_result_target_window}) %>
+  </div>
+</div>

data/app/views/search/_pager.html.erb

@@ -37,23 +37,23 @@
       unless n - prev > 1
         prev = n
         if ( n != @page )
-           links << ( link_to n, args.merge({'page' => n }) )
+           links << (content_tag :li, (link_to n, args.merge({'page' => n })), :class => "hidden-phone")
         else
-           links << ( content_tag :span, n )
+           links << (content_tag :li, (content_tag :span, n) )
         end
       else
         # ellipsis represents the gap between windows
         prev = n - 1
-        links << '...'
+        links <<  (content_tag :li, (content_tag :span, "&hellip;".html_safe), :class => "hidden-phone")
         redo
       end
     end
     
     # Next and previous buttons
-    links.unshift(link_to('Previous', args.merge({'page' => @page -1 }))) if @page > 1
-    links.push(link_to('Next', args.merge({'page' => @page + 1}))) if @page < total_pages
+    links.unshift( content_tag :li, (link_to('Previous', args.merge({'page' => @page -1 })))) if @page > 1
+    links.push( content_tag :li, (link_to('Next', args.merge({'page' => @page + 1})))) if @page < total_pages
 %>
-<%= content_tag :div, links.join(' ').html_safe %>
+<%= content_tag :ul, links.join(' ').html_safe %>
 <%
   end
 %>

data/app/views/search/books.html.erb

@@ -1,103 +1,35 @@
-  <div class="oneColumn">
-  <h1>Books</h1>
-
-<%= form_tag({:controller=>'resolve', :action=>@submit_action}, {:method=>'get'}) %>
-  <div class="citationLinker">                                      
-
-<input type=hidden name="url_ver" value="Z39.88-2004">
-<input type=hidden name="url_ctx_fmt" value="info:ofi/fmt:kev:mtx:ctx">
-<input type=hidden name="ctx_ver" value="Z39.88-2004">
-<input type=hidden name="rfr_id" value="info:sid/umlaut.code4lib.org:citation">
-<input type=hidden name="rft_val_fmt" value="info:ofi/fmt:kev:mtx:book">
-<input type=hidden name="rft.genre" value="book">
-
-<table>
-                                </tr>
-                                    <td align="right" >book title</td>
-
-                                    <td><input
-                                            type=text
-                                            name="rft.btitle"
-                                            size="33"
-                                            value=""></td>
-                                </tr>
-                                <tr>
-                                    <td align="right" >year</td>
-                                    <td>
-                                        <input type=text name="rft.date" size="10" value="">
-                                                                            </td>
-                                </tr>
-
-                                <tr>
-                                    <td align="right" >volume</td>
-                                    <td>
-                                        <input
-                                            type=text
-                                            name="rft.volume"
-                                            size="5"
-                                            maxlength="5"
-                                            value="">
-                                        part <input
-                                                type=text
-                                                name="rft.part"
-                                                size="5"
-                                                value="">
-
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td align="right" >isbn</td>
-                                    <td>
-                                        <input
-                                            type=text
-                                            name="rft.isbn"
-                                            size="17"
-                                            maxlength="17"
-                                            value="">
-                                    </td>
-                                </tr>
-
-                                <tr>
-                                    <td align="right" >author</td>
-                                    <td>
-                                        <table border="0" cellspacing="0" cellpadding="0">
-                                            <tr>
-                                                <td >last name</td>
-                                                <td >first name</td>
-
-                                                <td >initials</td>
-                                            </tr>
-                                            <tr>
-                                                <td><input
-                                                        type=text
-                                                        name="rft.aulast"
-                                                        size="12"
-                                                        value=""></td>
-                                                <td><input
-                                                        type=text
-                                                        name="rft.aufirst"
-                                                        size="10"
-                                                        value=""></td>
-                                                <td><input
-                                                        type=text
-                                                        name="rft.auinit"
-                                                        size="4"
-                                                        value=""></td>
-                                            </tr>
-                                        </table>
-
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="80%" align="right">
-                                      &nbsp;               
-                                    </td>
-                                    <td colspan="20%" align="right">
-                                        <input type="submit"  value="search"></td>
-                                    </td>
-
-                                </tr>
-                            </table>
-</div>                        
-</form>
+<div class="oneColumn">
+  <h2>Books</h2>
+  <%= form_tag({:controller=>'resolve', :action=>@submit_action}, {:method=>'get'}) %>
+    <fieldset class="citationLinker">                                      
+      <%= hidden_field_tag "rfr_id", "info:sid/umlaut.code4lib.org:citation" %> 
+      <%= hidden_field_tag "url_ver", "Z39.88-2004" %> 
+      <%= hidden_field_tag "url_ctx_fmt", "info:ofi/fmt:kev:mtx:ctx" %> 
+      <%= hidden_field_tag "ctx_ver", "Z39.88-2004" %> 
+      <%= hidden_field_tag "rft_val_fmt", "info:ofi/fmt:kev:mtx:book" %> 
+      <%= hidden_field_tag "rft.genre", "book" %> 
+      <%= label :book, :title, "Book Title:" %>
+      <%= text_field :book, :title, {:name=>'rft.btitle', :class=>"title_search"} %>
+      <%= label :book, :date, "Year:" %>
+      <%= text_field :book, :date, {:name=>'rft.date', :class=>"date"} %>
+      <%= label :book, :volume, "Volume:" %>
+      <%= text_field :book, :volume, {:name=>'rft.volume', :max_length => "5", :class=>"volume"} %>
+      <%= label :book, :part, "Part:" %>
+      <%= text_field :book, :part, {:name=>'rft.part', :class=>"part"} %>
+      <%= label :book, :isbn, "ISBN:" %>
+      <%= text_field :book, :isbn, {:name=>'rft.isbn', :max_length => "17", :class=>"isbn"} %>
+    </fieldset>
+    <fieldset class="citationLinker">                                      
+      <legend>Author</legend>
+      <%= label :book, :aulast, "Last Name:" %>
+      <%= text_field :book, :aulast, {:name=>'rft.aulast', :class=>"aulast"} %>
+      <%= label :book, :aufirst, "First Name:" %>
+      <%= text_field :book, :aufirst, {:name=>'rft.aufirst', :class=>"aufirst"} %>
+      <%= label :book, :auinit, "Initials:" %>
+      <%= text_field :book, :auinit, {:name=>'rft.auinit', :class=>"auinit"} %>
+    </fieldset>
+    <fieldset>                                      
+      <%= submit_tag "Search", :class => "btn" %>
+    </fieldset>
+  </form>
 </div>

data/app/views/search/journal_search.html.erb

@@ -1,90 +1,53 @@
-<% 
-if (params["action"] == "journal_list")
-  @page_title = "Browse by Journal Title: #{params['id']}"
-else
-  @page_title = 'Journal titles that '
-
-  @page_title +=
-  (params["umlaut.title_search_type"] == "begins") ?
-  'begin with ' : 'contain '
-
-  @page_title += "'" + params['rft.jtitle'] + "'"
-end
-
-%>
-
-<div class="oneColumn">
-<h1><%= @page_title %>
-</h1>
-
-<div class="citationLinker" style="margin-bottom: 8px">                                                                        
-  <%= form_tag({:controller=>'search', :action=>'journal_search'}, {:method=>'get', :name=>'OpenURL', :id=>'OpenURL'})  %>
-      <input type=hidden name="rfr_id" value="info:sid/sfxit.com:citation"> 
-      <!-- <input type=hidden name="rfr_id" value="info:sid/umlaut.code4lib.org:citation"> -->
-
-      <input type="hidden" class="rft_title" name="rft.title">
-      <input type="hidden" class="rft_object_id" name="rft.object_id">
-
-      <%-
-      # specific article fields from prior form may be present, if the user is now choosing from
-      # amongst serveral possible title matches. Preserve them on refinement of search terms.  
-      -%>
-      <% params.slice("rft.date", "__year", "__month", "__day", "rft.volume", "rft.issue", "rft.spage").each_pair do |key, value| %>
-        <%= hidden_field_tag key, value %>
-      <% end %>
-      
-          
-      Journal Title:
-      <%= text_field :journal, :title, {:name=>'rft.jtitle', :autocomplete=>'off', :size=>'40', :value=>params['rft.jtitle'], :class=>"title_search"}
-      %>
-                                                                             
-      <select name="umlaut.title_search_type" class="sfx_title_search">
-          <option value="contains" <%= "SELECTED" if params["umlaut.title_search_type"] == "contains" %>>contains</option>
-          <option value="begins" <%= "SELECTED" if params["umlaut.title_search_type"] == "begins" %> >begins
-          with</option>
-          <option value="exact">exact match</option>
-      </select>
-      
-      <input type=hidden name="rft.issn">
-      <input type="submit" name="Generate_OpenURL2" value="Search">
-      <%= link_to('More search options', :controller=>'search') %>
-  </form>
-</div>
-                                      
-<% if params["action"] == "journal_list" %> 
-  <%= render :partial=>"a_to_z" %>
-  <div class="line2"></div>
-<% end %>
-
-
-<% unless @hits == 0%>
-<h3>Showing results <%= @start_result_num %> through <%= @end_result_num %> of <%= @hits %></h3>
-<% end %>
-<% if params["rft.jtitle"] %>
-  <div class="note"><em><strong>Note:</strong> Alternate titles might have matched your search terms</em></div>
-<% end %>
-
-<div class='pagination'>
-  <%= render :partial=>'pager' %>
-</div>
-
-<div class="list">
-<% @display_results.each do | co | 
-@current_context_object = co
-%>
-  <% partial_name = @citation_partial || 'citation' %>
-  <%= render :partial=>partial_name %>
- 
-<% end %>
-</div>
-
-<div class='pagination'>
-  <%= render :partial=>'pager' %>
-</div>
-
-<% if params["action"] == "journal_list" %> 
-  <div class="line2"></div>
-  <%= render :partial=>"a_to_z" %>
-<% end %>
- <!--close oneColumn-->
-</div>  
+<h2><%= @page_title %></h2>
+<%= form_tag({:controller=>'search', :action=>'journal_search'}, {:method=>'get', :name=>'OpenURL', :id=>'OpenURL', :class => "form-inline form-very-inline"})  %>
+  <div class="umlaut-search-form">
+    <fieldset>
+      <%= hidden_field_tag "rfr_id", "info:sid/sfxit.com:citation" %> 
+      <%= hidden_field_tag "rft.title", "", {:class => "rft_title"} %> 
+      <%= hidden_field_tag "rft.object_id", "", {:class => "rft_object_id"} %> 
+      <%= hidden_field_tag "rft.issn", "" %> 
+      <%-
+      # specific article fields from prior form may be present, if the user is now choosing from
+      # amongst serveral possible title matches. Preserve them on refinement of search terms.  
+      -%>
+      <% params.slice("rft.date", "__year", "__month", "__day", "rft.volume", "rft.issue", "rft.spage").each_pair do |key, value| %>
+        <%= hidden_field_tag key, value %>
+      <% end %>
+      <div class="control-group">
+        <%= label :journal, :title, "Journal Title:" %>
+        <%= text_field :journal, :title, {:name=>'rft.jtitle', :value=>params['rft.jtitle'], :class=>"title_search input-xlarge", :autocomplete => "off"} %>
+        <select name="umlaut.title_search_type" class="title_search_type input-medium">
+          <%= options_for_select({"contains" => "contains", "begins with" => "begins", "exact match" => "exact"}, params["umlaut.title_search_type"])  %>
+        </select>
+      </div>
+      <div class="control-group">
+        <%= submit_tag "Search", {:name=>"Generate_OpenURL2", :class => "btn"} %>
+        <%= link_to('More search options', {:controller=>'search'}, :class => "inline-help") %>
+      </div>
+    </fieldset>
+  </div>
+</form>
+<% if params["action"] == "journal_list" %>
+  <%= render :partial=>"a_to_z" %>
+<% end %>
+<% unless @hits == 0%>
+  <h3>Showing results <%= @start_result_num %> through <%= @end_result_num %> of <%= @hits %></h3>
+<% end %>
+<% if params["rft.jtitle"] %>
+  <div class="note"><em><strong>Note:</strong> Alternate titles might have matched your search terms</em></div>
+<% end %>
+<div class='umlaut-pagination pagination'>
+  <%= render :partial=>'pager' %>
+</div>
+<div class="umlaut-results">
+  <% @display_results.each do | co | 
+    @current_context_object = co
+    partial_name = @citation_partial || 'citation' %>
+    <div class="umlaut-result well well-small">
+      <%= render :partial=>partial_name %>
+    </div>
+  <% end %>
+</div>
+<div class='umlaut-pagination pagination'>
+  <%= render :partial=>'pager' %>
+</div>