From d155cf406401f1b17368f41ff13f11887f346ada Mon Sep 17 00:00:00 2001 From: Avetis Navasardyan Date: Sat, 14 Jan 2023 17:34:37 +0100 Subject: [PATCH 1/5] refac & feat: now there is only one item details view instead of two, also design adjusted --- Gemfile | 2 + app/assets/stylesheets/application.scss | 6 +- app/assets/stylesheets/item-show.scss | 81 +++++++- app/components/infobox_component.html.erb | 2 +- app/components/infobox_component.rb | 2 +- .../item_availability_badge_component.rb | 2 +- app/components/item_borrow_button.rb | 2 +- app/components/item_borrow_buttons.html.erb | 28 +++ app/components/item_borrow_buttons.rb | 22 ++ .../owner_component.html.erb} | 2 +- app/components/owner_component.rb | 6 + app/models/item.rb | 2 +- app/views/items/_item_largescreen.html.erb | 117 ----------- app/views/items/_item_screen.html.erb | 188 ++++++++++++++++++ app/views/items/_item_smallscreen.html.erb | 95 --------- app/views/items/new.html.erb | 2 +- app/views/items/show.html.erb | 6 +- app/views/layouts/_footer.html.erb | 2 +- app/views/layouts/_navbar.html.erb | 4 +- app/views/layouts/application.html.erb | 11 +- config/locales/views/landing_page/de.yml | 2 + config/locales/views/landing_page/en.yml | 2 + 22 files changed, 351 insertions(+), 235 deletions(-) create mode 100644 app/components/item_borrow_buttons.html.erb create mode 100644 app/components/item_borrow_buttons.rb rename app/{views/items/_owner_component.html.erb => components/owner_component.html.erb} (64%) create mode 100644 app/components/owner_component.rb delete mode 100644 app/views/items/_item_largescreen.html.erb create mode 100644 app/views/items/_item_screen.html.erb delete mode 100644 app/views/items/_item_smallscreen.html.erb diff --git a/Gemfile b/Gemfile index 5f276880..0a111089 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,8 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } +gem "font-awesome-sass", "~> 6.2.1" + ruby "2.7.4" # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index a193f9d3..5239a743 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -33,7 +33,7 @@ $warning: $hpi-orange; $danger: $hpi-red; $light: #BDBDBD; $dark: black; -$lightGrey: rgb(211, 211, 211); +$lightGrey: #eee; $btn-border-radius: 5px; $btn-font-weight: 600; // semibold @@ -52,6 +52,8 @@ $mobileDeviceCutoff: 992px; @import "flag-icon"; +@import "font-awesome"; + @media (max-width: $mobileDeviceCutoff) { .navbar-collapse { position: fixed; @@ -111,4 +113,4 @@ footer { #navbarToggle { width: auto; padding-right: 30px; -} +} \ No newline at end of file diff --git a/app/assets/stylesheets/item-show.scss b/app/assets/stylesheets/item-show.scss index a4d74493..debce06d 100644 --- a/app/assets/stylesheets/item-show.scss +++ b/app/assets/stylesheets/item-show.scss @@ -16,8 +16,7 @@ } } -.item-action-button -{ +.item-action-button { position: fixed; margin-top: auto; bottom: 0px; @@ -27,6 +26,82 @@ border-radius: 0px; height: 4rem; } -.button-blocker{ +.button-blocker { height: 4rem; +} + +body { + background-color: #000; +} +.card { + border: none; +} +.product { + background-color: $lightGrey; +} +.brand { + font-size: 13px; +} +.act-price { + color: $primary; + font-weight: 700; +} +.dis-price { + text-decoration: line-through; +} +.about { + font-size: 14px; +} +.color { + margin-bottom: 10px; +} +label.radio { + cursor: pointer; +} +label.radio input { + position: absolute; + top: 0; + left: 0; + visibility: hidden; + pointer-events: none; +} +label.radio span { + padding: 2px 9px; + border: 2px solid $primary; + display: inline-block; + color: $primary; + border-radius: 3px; + text-transform: uppercase; +} +label.radio input:checked + span { + border-color: $primary; + background-color: $primary; + color: #fff; +} +.btn-danger { + background-color: $primary !important; + border-color: $primary !important; +} +.btn-danger:hover { + background-color: $primary !important; + border-color: $primary !important; +} +.btn-danger:focus { + box-shadow: none; +} +.cart i { + margin-right: 10px; +} + +.btn-group-stretch { + width: 100%; + display: flex; + justify-content: space-between +} + +.btn-center { + width: 100%; + display: flex; + justify-content: center; + align-items: center; } \ No newline at end of file diff --git a/app/components/infobox_component.html.erb b/app/components/infobox_component.html.erb index efd39dc3..9e4b3b94 100644 --- a/app/components/infobox_component.html.erb +++ b/app/components/infobox_component.html.erb @@ -1,4 +1,4 @@ -
" style="text-align: center"> +
m-0" style="text-align: center">
<%= @heading %>
diff --git a/app/components/infobox_component.rb b/app/components/infobox_component.rb index 314ff83b..244387ab 100644 --- a/app/components/infobox_component.rb +++ b/app/components/infobox_component.rb @@ -2,7 +2,7 @@ class InfoboxComponent < ViewComponent::Base def initialize(heading:, body:, bootstrap_classes:) - super() + super @heading = heading @body = body @bootstrap_classes = bootstrap_classes diff --git a/app/components/item_availability_badge_component.rb b/app/components/item_availability_badge_component.rb index 7e64002d..339066cf 100644 --- a/app/components/item_availability_badge_component.rb +++ b/app/components/item_availability_badge_component.rb @@ -2,7 +2,7 @@ class ItemAvailabilityBadgeComponent < ViewComponent::Base def initialize(item:, user:) - super() + super @item = item @user = user end diff --git a/app/components/item_borrow_button.rb b/app/components/item_borrow_button.rb index f606ea44..4f906c06 100644 --- a/app/components/item_borrow_button.rb +++ b/app/components/item_borrow_button.rb @@ -1,6 +1,6 @@ class ItemBorrowButton < ViewComponent::Base def initialize(text:, action:, bootstrap_classes:) - super() + super @text = text @action = action @bootstrap_classes = bootstrap_classes diff --git a/app/components/item_borrow_buttons.html.erb b/app/components/item_borrow_buttons.html.erb new file mode 100644 index 00000000..c239e848 --- /dev/null +++ b/app/components/item_borrow_buttons.html.erb @@ -0,0 +1,28 @@ +<% if @item.reservable_by?(@current_user) && !@src_is_qrcode %> + <%= render(ItemBorrowButton.new( + text: I18n.t("items.buttons.reserve"), + action: item_reserve_path(@item), + bootstrap_classes: "mx-auto btn btn-primary") + )%> + <% end %> + <% if @item.borrowable_by?(@current_user) && @src_is_qrcode %> + <%= render(ItemBorrowButton.new( + text: I18n.t("items.buttons.borrow"), + action: item_borrow_path(@item), + bootstrap_classes: "mx-auto btn btn-primary") + )%> + <% end %> + <% if @current_user.can_return_as_owner?(@item)%> + <%= render(ItemBorrowButton.new( + text: I18n.t("items.buttons.owner-return"), + action: item_give_back_path(@item), + bootstrap_classes: "mx-auto btn btn-primary") + )%> + <% end %> + <% if @item.borrowed_by?(@current_user) && @src_is_qrcode %> + <%= render(ItemBorrowButton.new( + text: I18n.t("items.buttons.return"), + action: item_give_back_path(@item), + bootstrap_classes: "mx-auto btn btn-primary") + )%> + <% end %> \ No newline at end of file diff --git a/app/components/item_borrow_buttons.rb b/app/components/item_borrow_buttons.rb new file mode 100644 index 00000000..573f889d --- /dev/null +++ b/app/components/item_borrow_buttons.rb @@ -0,0 +1,22 @@ +class ItemBorrowButtons < ViewComponent::Base + def initialize(item:, src_is_qrcode:, current_user:) + super + @item = item + @src_is_qrcode = src_is_qrcode + @current_user = current_user + end + + def before_render + @item_reserve_path = item_reserve_path(@item) + @item_borrow_path = item_borrow_path(@item) + @item_give_back_path = item_give_back_path(@item) + end + + def render? + (@item.reservable_by?(@current_user) && !@src_is_qrcode) || + (@item.borrowable_by?(@current_user) && @src_is_qrcode) || + @current_user.can_return_as_owner?(@item) || + (@item.borrowed_by?(@current_user) && @src_is_qrcode) + end + +end \ No newline at end of file diff --git a/app/views/items/_owner_component.html.erb b/app/components/owner_component.html.erb similarity index 64% rename from app/views/items/_owner_component.html.erb rename to app/components/owner_component.html.erb index c3c503c9..0c1073f2 100644 --- a/app/views/items/_owner_component.html.erb +++ b/app/components/owner_component.html.erb @@ -3,6 +3,6 @@ <% owner_groups = Group.owner_groups(@item.id) %>

<%= I18n.t("items.card_text.owner") %> - <%=owner_groups.map{|owner| owner.name}.join(", ").html_safe%> + <%=owner_groups.map(&:name).join(", ").html_safe%>

\ No newline at end of file diff --git a/app/components/owner_component.rb b/app/components/owner_component.rb new file mode 100644 index 00000000..10c343b3 --- /dev/null +++ b/app/components/owner_component.rb @@ -0,0 +1,6 @@ +class OwnerComponent < ViewComponent::Base + def initialize(item:) + super + @item = item + end +end diff --git a/app/models/item.rb b/app/models/item.rb index 9f700afd..02747179 100644 --- a/app/models/item.rb +++ b/app/models/item.rb @@ -4,7 +4,7 @@ class Item < ApplicationRecord validates :name, presence: true validates :max_reservation_days, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 365 } - validates :max_borrowing_days, numericality: { greater_than_or_equal_to: 0 } + validates :max_borrowing_days, numericality: { greater_than: 0 } validates :number_of_pages, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true diff --git a/app/views/items/_item_largescreen.html.erb b/app/views/items/_item_largescreen.html.erb deleted file mode 100644 index 10022819..00000000 --- a/app/views/items/_item_largescreen.html.erb +++ /dev/null @@ -1,117 +0,0 @@ -<%# The main show page for large screens %> -
-
-
- <%# Image card, contains attributes if screen is big enough %> -
-
- <%# Image slider%> - <%= image_tag "dummy_image.png", class: "card-img-top"%> -
- <%# Attributes if small enough arranged as grid%> -
- - - <% @item.attributes.each do |attr_name, attr_value| %> -
    - <% if @item.common_attributes.include? attr_name %> -
  • <%= I18n.t("items.form." + "all" + "." + attr_name.to_s)%>
    • -
  • <%= @item.send(attr_name) %>
    • - <% else %> -
  • <%= I18n.t("items.form." + @item.item_type.to_s + "." + attr_name.to_s)%>
    • -
  • <%= @item.send(attr_name) %>
    • - <% end %> -
- <% end %> - -
-
-
-
- -
- <%# Description Card%> - <%# Name and Description card, contains attributes if screen is small enough %> -
-
- <%# Attributes if screen is small enough%> -
-
-
- <%# name%> -

<%= @item.name %>

- <%# available badge%> -
- <%= render(ItemAvailabilityBadgeComponent.new(item: @item, user: current_user)) %> -
-
- <%= render 'owner_component', item: @item %> -
- - <%# Button %> - <% if current_user.can_manage?(@item) %> -
- - <%= button_to I18n.t("items.buttons.edit"), edit_item_path(@item), method: :get, class: "mx-auto btn btn-primary"%> - <%= button_to I18n.t("items.buttons.delete"), item_path(@item), method: :delete, data: { turbo_confirm: I18n.t("items.messages.deletion_confirmation")}, class: "mx-auto btn btn-primary"%> - <%= link_to "#{I18n.t("items.buttons.download_qrcode")}".html_safe, download_path(@item),class: "btn btn-primary" %> - -
- <% end %> - - <%# Description%> -

<%= @item.description %>

- <%# Infobox%> - <% if current_user.can_borrow?(@item) %> - <% if @item.reserved_by?(current_user) and @item.borrowable_by?(current_user) and !@src_is_qrcode %> - <%= render(InfoboxComponent.new(heading: I18n.t("items.infobox.borrow.heading"), body: I18n.t("items.infobox.borrow.body"), bootstrap_classes: "border-secondary mx-5"))%> - <% end %> - <% if @item.borrowed_by?(current_user) and !@src_is_qrcode %> - <%= render(InfoboxComponent.new(heading: I18n.t("items.infobox.return.heading"), body: I18n.t("items.infobox.return.body"), bootstrap_classes: "border-secondary mx-5"))%> - <% end %> - <% else %> - <%= render(InfoboxComponent.new(heading: I18n.t("items.infobox.missing_borrowing_permissions.heading"), body: I18n.t("items.infobox.missing_borrowing_permissions.body"), bootstrap_classes: "border-secondary mx-5"))%> - <% end %> - <%# Map%> -
-
- <%= button_to I18n.t("items.buttons.back"), items_path, method: :get, class: "mx-auto btn btn-primary"%> -
- - <% if @item.reservable_by?(current_user) && !@src_is_qrcode %> - <%= render(ItemBorrowButton.new( - text: I18n.t("items.buttons.reserve"), - action: item_reserve_path(@item), - bootstrap_classes: "mx-auto btn btn-primary") - )%> - <% end %> - - <% if @item.borrowable_by?(current_user) && @src_is_qrcode %> - <%= render(ItemBorrowButton.new( - text: I18n.t("items.buttons.borrow"), - action: item_borrow_path(@item), - bootstrap_classes: "mx-auto btn btn-primary") - )%> - <% end %> - - <% if current_user.can_return_as_owner?(@item)%> - <%= render(ItemBorrowButton.new( - text: I18n.t("items.buttons.owner-return"), - action: item_give_back_path(@item), - bootstrap_classes: "mx-auto btn btn-primary") - )%> - <% end %> - - <% if @item.borrowed_by?(current_user) && @src_is_qrcode %> - <%= render(ItemBorrowButton.new( - text: I18n.t("items.buttons.return"), - action: item_give_back_path(@item), - bootstrap_classes: "mx-auto btn btn-primary") - )%> - <% end %> -
-
-
-
-
-
diff --git a/app/views/items/_item_screen.html.erb b/app/views/items/_item_screen.html.erb new file mode 100644 index 00000000..fb17be85 --- /dev/null +++ b/app/views/items/_item_screen.html.erb @@ -0,0 +1,188 @@ +
+
+
+
+
+
+
+ <%= image_tag "dummy_image.png", class: "card-img-top"%>
+
+
+
+
+
+ <%= link_to items_path, class: "btn btn-primary" do %> + + Back + <% end %> +
+ <%= render(ItemAvailabilityBadgeComponent.new(item: @item, user: current_user)) %> +
+
<%= @item.item_type %> +
<%= @item.name %>
+
+
<%= render(OwnerComponent.new(item: @item)) %>
+
+
+

+ <%= @item.description %> +

+
+ <%= link_to I18n.t("items.buttons.edit"), edit_item_path(@item), method: :get, class: "btn btn-primary btn-sm"%> + <%= button_to I18n.t("items.buttons.delete"), item_path(@item), method: :delete, data: { turbo_confirm: I18n.t("items.messages.deletion_confirmation")}, class: "btn btn-primary btn-sm rounded-0"%> + <%= link_to "#{I18n.t("items.buttons.download_qrcode")}".html_safe, download_path(@item),class: "btn btn-primary btn-sm" %> +
+ <% if current_user.can_borrow?(@item) %> + <% if @item.reserved_by?(current_user) and @item.borrowable_by?(current_user) and !@src_is_qrcode %> + <%= render(InfoboxComponent.new(heading: I18n.t("items.infobox.borrow.heading"), body: I18n.t("items.infobox.borrow.body"), bootstrap_classes: "border-secondary mx-2"))%> + <% end %> + <% if @item.borrowed_by?(current_user) and !@src_is_qrcode %> + <%= render(InfoboxComponent.new(heading: I18n.t("items.infobox.return.heading"), body: I18n.t("items.infobox.return.body"), bootstrap_classes: "border-secondary mx-2"))%> + <% end %> + <% else %> + <%= render(InfoboxComponent.new(heading: I18n.t("items.infobox.missing_borrowing_permissions.heading"), body: I18n.t("items.infobox.missing_borrowing_permissions.body"), bootstrap_classes: "border-secondary mx-2"))%> + <% end %> + <%#
+
Size
+ +
%> +
+ <% if @item.reservable_by?(current_user) && !@src_is_qrcode %> + <%= render(ItemBorrowButton.new( + text: I18n.t("items.buttons.reserve"), + action: item_reserve_path(@item), + bootstrap_classes: "mx-auto btn btn-success btn-center") + )%> + <% end %> + <% if @item.borrowable_by?(current_user) && @src_is_qrcode %> + <%= render(ItemBorrowButton.new( + text: I18n.t("items.buttons.borrow"), + action: item_borrow_path(@item), + bootstrap_classes: "mx-auto btn btn-success btn-center") + )%> + <% end %> + <% if current_user.can_return_as_owner?(@item)%> + <%= render(ItemBorrowButton.new( + text: I18n.t("items.buttons.owner-return"), + action: item_give_back_path(@item), + bootstrap_classes: "mx-auto btn btn-success btn-center") + )%> + <% end %> + <% if @item.borrowed_by?(current_user) && @src_is_qrcode %> + <%= render(ItemBorrowButton.new( + text: I18n.t("items.buttons.return"), + action: item_give_back_path(@item), + bootstrap_classes: "mx-auto btn btn-success btn-center") + )%> + <% end %> +
+ <%#
+

%> +

+
+
+
+
+
+ +
+
+ + + <% @item.attributes.each do |attr_name, attr_value| %> +
    + <% if @item.common_attributes.include? attr_name %> +
  • <%= I18n.t("items.form." + "all" + "." + attr_name.to_s)%>
    • +
  • <%= @item.send(attr_name) %>
    • + <% else %> +
  • <%= I18n.t("items.form." + @item.item_type.to_s + "." + attr_name.to_s)%>
    • +
  • <%= @item.send(attr_name) %>
    • + <% end %> +
+ <% end %> + +
+
+
+
+
+
<%= I18n.t("items.location")%>
+
+
+
+
+ <% if @item.reservable_by?(current_user) && !@src_is_qrcode %> + <%= render(ItemBorrowButton.new( + text: I18n.t("items.buttons.reserve"), + action: item_reserve_path(@item), + bootstrap_classes: "btn btn-success item-action-button") + )%> + <% end %> + <% if current_user.can_return_as_owner?(@item)%> + <%= render(ItemBorrowButton.new( + text: I18n.t("items.buttons.owner-return"), + action: item_give_back_path(@item), + bootstrap_classes: "mx-auto btn btn-success") + )%> + <% end %> + <% if @item.borrowable_by?(current_user) && @src_is_qrcode %> + <%= render(ItemBorrowButton.new( + text: I18n.t("items.buttons.borrow"), + action: item_borrow_path(@item), + bootstrap_classes: "btn btn-success item-action-button") + )%> + <% end %> + <% if @item.borrowed_by?(current_user) && @src_is_qrcode %> + <%= render(ItemBorrowButton.new( + text: I18n.t("items.buttons.return"), + action: item_give_back_path(@item), + bootstrap_classes: "btn btn-success item-action-button") + )%> + <% end %> +
+
+
+ diff --git a/app/views/items/_item_smallscreen.html.erb b/app/views/items/_item_smallscreen.html.erb deleted file mode 100644 index f04a8ff6..00000000 --- a/app/views/items/_item_smallscreen.html.erb +++ /dev/null @@ -1,95 +0,0 @@ -<%# The main show page for small screens %> -
- <%# Image slider%> - <%= image_tag "dummy_image.png", class: "card-img-top"%> -
- -
-
- <%# name%> -

<%= @item.name %>

- <%# available badge%> -
- <%= render(ItemAvailabilityBadgeComponent.new(item: @item, user: current_user)) %> -
-
- <%= render 'owner_component', item: @item %> -
- <%# Button %> - <% if current_user.can_manage?(@item) %> -
- - <%= button_to I18n.t("items.buttons.edit"), edit_item_path(@item), method: :get, class: "mx-auto btn btn-primary"%> - <%= button_to I18n.t("items.buttons.delete"), item_path(@item), method: :delete, data: { turbo_confirm: I18n.t("items.messages.deletion_confirmation")}, class: "mx-auto btn btn-primary"%> - <%= link_to "#{I18n.t("items.buttons.download_qrcode")}".html_safe, download_path(@item),class: "btn btn-primary" %> - - <% end %> -
- <%# Description%> -

<%= @item.description %>

- <%# Infobox%> - <% if current_user.can_borrow?(@item) %> - <% if @item.reserved_by?(current_user) and @item.borrowable_by?(current_user) and !@src_is_qrcode %> - <%= render(InfoboxComponent.new(heading: I18n.t("items.infobox.borrow.heading"), body: I18n.t("items.infobox.borrow.body"), bootstrap_classes: "border-secondary mx-5"))%> - <% end %> - <% if @item.borrowed_by?(current_user) and !@src_is_qrcode %> - <%= render(InfoboxComponent.new(heading: I18n.t("items.infobox.return.heading"), body: I18n.t("items.infobox.return.body"), bootstrap_classes: "border-secondary mx-5"))%> - <% end %> - <% else %> - <%= render(InfoboxComponent.new(heading: I18n.t("items.infobox.missing_borrowing_permissions.heading"), body: I18n.t("items.infobox.missing_borrowing_permissions.body"), bootstrap_classes: "border-secondary mx-5"))%> - <% end %> - <%# Map %> -
- <%# Attributes %> - - - <% @item.attributes.each do |attr_name, attr_value| %> -
    - <% if @item.common_attributes.include? attr_name %> -
  • <%= I18n.t("items.form." + "all" + "." + attr_name.to_s)%>
    • -
  • <%= @item.send(attr_name) %>
    • - <% else %> -
  • <%= I18n.t("items.form." + @item.item_type.to_s + "." + attr_name.to_s)%>
    • -
  • <%= @item.send(attr_name) %>
    • - <% end %> -
- <% end %> - -
-
-
- -
- <% if @item.reservable_by?(current_user) && !@src_is_qrcode %> - <%= render(ItemBorrowButton.new( - text: I18n.t("items.buttons.reserve"), - action: item_reserve_path(@item), - bootstrap_classes: "btn btn-secondary item-action-button") - )%> - <% end %> - - <% if current_user.can_return_as_owner?(@item)%> - <%= render(ItemBorrowButton.new( - text: I18n.t("items.buttons.owner-return"), - action: item_give_back_path(@item), - bootstrap_classes: "mx-auto btn btn-primary") - )%> - <% end %> - - <% if @item.borrowable_by?(current_user) && @src_is_qrcode %> - <%= render(ItemBorrowButton.new( - text: I18n.t("items.buttons.borrow"), - action: item_borrow_path(@item), - bootstrap_classes: "btn btn-secondary item-action-button") - )%> - <% end %> - - <% if @item.borrowed_by?(current_user) && @src_is_qrcode %> - <%= render(ItemBorrowButton.new( - text: I18n.t("items.buttons.return"), - action: item_give_back_path(@item), - bootstrap_classes: "btn btn-secondary item-action-button") - )%> - <% end %> -
-
diff --git a/app/views/items/new.html.erb b/app/views/items/new.html.erb index f49bbdb1..1d69ea16 100644 --- a/app/views/items/new.html.erb +++ b/app/views/items/new.html.erb @@ -5,5 +5,5 @@
- ><%=I18n.t("items.buttons.back")%> + <%= link_to I18n.t("items.buttons.back"), items_path, class: "mx-auto btn btn-primary" %>
diff --git a/app/views/items/show.html.erb b/app/views/items/show.html.erb index cd70fdb2..b518268b 100644 --- a/app/views/items/show.html.erb +++ b/app/views/items/show.html.erb @@ -25,8 +25,7 @@ function saveUserPositionInHiddenForm(position) { document.getElementById('lng').value = position.coords.longitude; } - <%= render "item_largescreen" %> - <%= render "item_smallscreen" %> + <%= render "item_screen" %>
@@ -56,6 +55,5 @@ function saveUserPositionInHiddenForm(position) { var marker = L.marker(itemCoordinates).addTo(map); } } - renderMap('item-location-small'); - renderMap('item-location-large'); + renderMap('item-location'); diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index c9b403e8..91e5ad63 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -1,4 +1,4 @@ -