Skip to content
This repository was archived by the owner on Dec 22, 2022. It is now read-only.

Commit 3d4e7b6

Browse files
nnunnnnunn
committed
fixing the eresources holdings bug. Updating logos
1 parent 26d2c07 commit 3d4e7b6

File tree

2 files changed

+54
-52
lines changed

2 files changed

+54
-52
lines changed

‎app/assets/images/macewanuniversity.jpg

-544 KB
Loading

‎app/views/catalog/_symphony_holdings.html.erb

+54-52
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<div id="holdings">
2+
3+
<div class="numb"></div>
24
<table>
35
<tr>
46
<th>Where is this?</th>
@@ -26,72 +28,72 @@
2628
<% if @current_loc.include? "Free" then @current_loc = "free" end %>
2729
<% if @current_loc.include? "University of Alberta" then @current_loc = "universityofalberta" end %>
2830
<% if @current_loc.include? "Covenant" then @current_loc = "covenant" end %>
29-
<% if @current_loc.include? "Innovates" then @current_loc = "innovates" end %>
30-
<% @library = @libraries[@current_loc.downcase.gsub(/\s+/, "")] %>
31-
<% @proxy = @library['proxy'] %>
31+
<% if @current_loc.include? "Innovates" then @current_loc = "innovates" end %>
32+
<% @library = @libraries[@current_loc.downcase.gsub(/\s+/, "")] %>
33+
<% @proxy = @library['proxy'] %>
3234

3335
<% @unavailable = true if @statuses[item[:status].to_s.downcase] == "unavailable" %>
3436
<tr>
3537
<td>
36-
<p class="lib-loc"><%= @locationname %>
37-
<% if @locationurl %>
38-
<a href="<%= @locationurl %>" target="_blank"><span class="glyphicon glyphicon-info-sign"></span></a>
39-
<% end %>
40-
</p>
41-
42-
<% if @links %>
43-
<% @links.each{|name,link| %>
44-
<% if (name.include?(@library["name"])) then %> <%#or (name.include?("Free")) or (name.include?("NEOS")) then %>
45-
<% @current_link = "#{@proxy}#{link}" %>
46-
<% if item[:call] == "Internet Access" %>
47-
48-
<strong><a href="<%= @current_link %>" target="_blank" class="loc-call"><span class="glyphicon glyphicon-share-alt"></span> Click here for Internet Access</a></strong><p style="font-size:10pt;">(<%= name %>)</p></td>
49-
<% else %>
50-
<span class="loc-call"><span class="a-label">call number: </span><%= item[:call] %></span>
51-
<% end %>
38+
<p class="lib-loc">
39+
<%= @locationname %>
40+
<% if @locationurl %>
41+
<a href="<%= @locationurl %>" target="_blank">
42+
<span class="glyphicon glyphicon-info-sign">
43+
</span>
44+
</a>
5245
<% end %>
53-
<% } %>
54-
<% @links.each{|name,link| %>
55-
<% if (name.include?("NEOS")) then %> <%#or (name.include?("Free")) or (name.include?("NEOS")) then %>
56-
<% @current_link = "#{@proxy}#{link}" %>
57-
<% if item[:call] == "Internet Access" %>
58-
59-
<strong><a href="<%= @current_link %>" target="_blank" class="loc-call"><span class="glyphicon glyphicon-share-alt"></span> Click here for Internet Access</a></strong><p style="font-size:10pt;">(<%= name %>)</p></td>
60-
<%# @links.delete(name) %>
61-
<% else %>
62-
<span class="loc-call"><span class="a-label">call number: </span><%= item[:call] %></span>
46+
</p>
47+
<% if @links %>
48+
<% @links.each{|name,link| %>
49+
<% if (name.include?(@library["name"])) %>
50+
<% @current_link = "#{@proxy}#{link}" %>
51+
<% if item[:call] == "Internet Access" %>
52+
<strong><a href="<%= @current_link %>" target="_blank" class="loc-call"><span class="glyphicon glyphicon-share-alt"></span> Click here for Internet Access</a></strong><p style="font-size:10pt;">(<%= name %>)</p>
53+
<% else %>
54+
<span class="loc-call"><span class="a-label">call number: </span><%= item[:call] %></span>
55+
<% end %>
6356
<% end %>
64-
<% end %>
65-
<% } %>
57+
<% } %>
58+
<% @links.each{|name,link| %>
59+
<% if (name.include?("NEOS")) or (name.include?("Free")) or (name.include?("NEOS")) then %>
60+
<% @current_link = "#{@proxy}#{link}" %>
61+
<% if item[:call] == "Internet Access" %>
62+
<strong><a href="<%= @current_link %>" target="_blank" class="loc-call"><span class="glyphicon glyphicon-share-alt"></span> Click here for Internet Access</a></strong><p style="font-size:10pt;">(<%= name %>)</p></td>
63+
<%# @links.delete(name) %>
64+
<% else %>
65+
<span class="loc-call"><span class="a-label">call number: </span><%= item[:call] %></span>
66+
<% end %>
67+
<% end %>
68+
<% } %>
6669
<% else %>
67-
<% if item[:call] == "Internet Access" %>
68-
69-
<strong><a href="<%= @current_link %>" target="_blank" class="loc-call"><span class="glyphicon glyphicon-share-alt"></span> Click here for Internet Access</a></strong></td>
70-
<% else %>
70+
<% if item[:call] == "Internet Access" %>
71+
<strong><a href="<%= @current_link %>" target="_blank" class="loc-call"><span class="glyphicon glyphicon-share-alt"></span> Click here for Internet Access</a></strong></td>
72+
<% else %>
7173
<span class="loc-call"><span class="a-label">call number: </span><%= item[:call] %></span>
72-
<% end %>
74+
<% end %>
7375
<% end %>
7476

7577
<div class="statuses">
7678
<span class="a-label">status: </span>
77-
<% if item[:status] == "CHECKEDOUT" %>
78-
<% if item[:due] %>
79-
Due: <%= Date.parse(item[:due]) %>
79+
<% if item[:status] == "CHECKEDOUT" %>
80+
<% if item[:due] %>
81+
Due: <%= Date.parse(item[:due]) %>
82+
<% else %>
83+
Unknown/Never
84+
<% end %>
8085
<% else %>
81-
Unknown/Never
82-
<% end %>
83-
<% else %>
84-
<%= @statuses[item[:status].to_s.downcase] %>
85-
<% if @unavailable %>
86-
<p style="font-size: small"><strong>Note: For access, please contact <%= link_to $libraryname+" Library", $homeurl %></strong></p>
87-
<% end %>
88-
<% if item[:public_note] %>
89-
<p style="font-size:small"><strong>Note: <%= item[:public_note] %></strong></p>
86+
<%= @statuses[item[:status].to_s.downcase] %>
87+
<% if @unavailable %>
88+
<p style="font-size: small"><strong>Note: For access, please contact <%= link_to $libraryname+" Library", $homeurl %></strong></p>
89+
<% end %>
90+
<% if item[:public_note] %>
91+
<p style="font-size:small"><strong>Note: <%= item[:public_note] %></strong></p>
92+
<% end %>
9093
<% end %>
91-
<% end %>
92-
</div>
93-
</td>
94-
</tr>
94+
</div>
95+
</td>
96+
</tr>
9597
<% @unavailable = false %>
9698
<% end %>
9799
</table>

0 commit comments

Comments
 (0)