Skip to content

Commit

Permalink
Update resolve styles and include bootstrap-sass in Umlaut::Engine.
Browse files Browse the repository at this point in the history
  • Loading branch information
@scotdalton
scotdalton committed Oct 1, 2012
1 parent 25b2732 commit e18f8cc
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 56 deletions.
11 changes: 3 additions & 8 deletions app/assets/stylesheets/umlaut/_resolve.scss
View file
Expand Up @@ -5,9 +5,9 @@
}
}

.umlaut-permalink-bar {
border-bottom: 1px solid $umlautPermalinkBorderColor;
background-color: $umlautPermalinkBackgroundColor;
.umlaut-resolve-nav {
border-bottom: 1px solid $umlautResolveNavBorderColor;
background-color: $umlautResolveNavBackgroundColor;
padding: .25em;
text-align: right;
}
Expand Down Expand Up @@ -241,11 +241,6 @@
margin-bottom: 6px;
}

.edition_warning > .label {
font-style: normal;
font-weight: bold;
}

.debug_info {
@extend .well;
@extend .well-small;
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/umlaut/_variables.scss
View file
Expand Up @@ -23,8 +23,8 @@ $umlautAutoCompleteBackgroundColor: $umlautGrey !default;
$umlautResultsBorderColor: $umlautGrey !default;
$umlautResultsBackgroundColor: $umlautBackgroundColor !default;
// Permalink
$umlautPermalinkBorderColor: $umlautBorderColor !default;
$umlautPermalinkBackgroundColor: #FCF1D4 !default;
$umlautResolveNavBorderColor: $umlautBorderColor !default;
$umlautResolveNavBackgroundColor: #FCF1D4 !default;
// Resolve
$umlautMainBackgroundColor: $umlautBackgroundColor !default;
$umlautSidebarBorderColor: $umlautBorderColor !default;
Expand Down
4 changes: 2 additions & 2 deletions app/views/layouts/umlaut.html.erb
View file
Expand Up @@ -15,9 +15,9 @@
<h1><%= umlaut_config.app_name %></h1>
</header>
<% if permalink = current_permalink_url() %>
<div class="umlaut-permalink-bar">
<nav class="umlaut-resolve-nav">
URL: <%= link_to current_permalink_url, current_permalink_url %>
</div>
</nav>
<% end %>
<div class="container-fluid <%= "umlaut-#{params[:controller]}-container" %>">
<%= yield %>
Expand Down
86 changes: 44 additions & 42 deletions app/views/resolve/_holding.html.erb
View file
Expand Up @@ -12,49 +12,51 @@ unless holdings.empty? %>
# Process each holding.
holdings.each do |p|
target = p.view_data %>
<div class="row-fluid umlaut-holding">
<div class="span3"><%= target[:collection_str] %></div>
<div class="span4"><%= target[:call_number]%></div><%
# Set status class based on configured available statuses
status_class = umlaut_config.holdings.available_statuses.include?(target[:status]) ? 'available' : '' %>
<div class="span3 <%= status_class %>"><%= target[:status] %></div>
<div class="span2">
<%= link_to("More Info", {:controller=>"link_router", :id=>p.id}, :target => "_blank", :class=>"btn btn-success") %>
<% if target[:request_url] %>
<%= link_to("Request", target[:request_url], :target => "_blank", :class=>"btn btn-primary") %><br />
<% end %>
</div>
</div><%
# Display edition info
if (!target[:match_reliability].blank?) && target[:match_reliability] != ServiceResponse::MatchExact %>
<div class="row-fluid">
<div class="span12">
<div class="umlaut-content-indent edition_warning">
<% unless target[:edition_str].blank? %>
<em class="note">Edition information</em> <%= target[:edition_str] %>
<% else %>
<em class="note">May be alternate edition.</em>
<% end %>
<div>
<div class="umlaut-holding">
<div class="row-fluid ">
<div class="span3"><%= target[:collection_str] %></div>
<div class="span4"><%= target[:call_number]%></div><%
# Set status class based on configured available statuses
status_class = umlaut_config.holdings.available_statuses.include?(target[:status]) ? 'available' : '' %>
<div class="span3 <%= status_class %>"><%= target[:status] %></div>
<div class="span2">
<%= link_to("More Info", {:controller=>"link_router", :id=>p.id}, :target => "_blank", :class=>"btn btn-success") %>
<% if target[:request_url] %>
<%= link_to("Request", target[:request_url], :target => "_blank", :class=>"btn btn-primary") %><br />
<% end %>
</div>
</div><%
end
# Display notes
unless target[:notes].blank? %>
<div class="row-fluid">
<div class="span12 umlaut-content-indent"><%= target[:notes] %></div>
</div><%
end
# Display coverage
unless target[:coverage_str_array].blank? %>
<div class="row-fluid">
<div class="span12"><%=
list_with_limit("copies_#{p.id}", target[:coverage_str_array]) do |item, index| %>
<li><%= item %></li><%
end %>
</div>
</div><%
end
</div><%
# Display edition info
if (!target[:match_reliability].blank?) && target[:match_reliability] != ServiceResponse::MatchExact %>
<div class="row-fluid">
<div class="span11 offset1">
<div class="edition_warning">
<% unless target[:edition_str].blank? %>
<em class="note">Edition information</em> <%= target[:edition_str] %>
<% else %>
<em class="note">May be alternate edition.</em>
<% end %>
<div>
</div>
</div><%
end
# Display notes
unless target[:notes].blank? %>
<div class="row-fluid">
<div class="span11 offset1"><%= target[:notes] %></div>
</div><%
end
# Display coverage
unless target[:coverage_str_array].blank? %>
<div class="row-fluid">
<div class="span11 offset1"><%=
list_with_limit("copies_#{p.id}", target[:coverage_str_array]) do |item, index| %>
<li><%= item %></li><%
end %>
</div>
</div><%
end %>
</div><%
end %>
</div><%
end
Expand Down
4 changes: 2 additions & 2 deletions app/views/resolve/_standard_response_item.html.erb
View file
Expand Up @@ -37,8 +37,8 @@
:class => "response_authentication_instructions") unless view_data[:authentication].blank? %>
<%= (content_tag(:div, :class => "edition_warning") {
(return content = (view_data[:edition_str].blank?) ?
(content_tag(:em, "May be alternate edition.", :class => ["note", "label"])) :
(content_tag(:em, "Edition information",:class => ["note", "label"]) + " #{view_data[:edition_str]}"))
(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.
Expand Down

0 comments on commit e18f8cc

Please sign in to comment.