diff options
| -rw-r--r-- | app/assets/images/d2-shop-logo.png | bin | 5820 -> 0 bytes | |||
| -rw-r--r-- | app/presenters/refinery/base_presenter.rb | 32 | ||||
| -rw-r--r-- | app/views/refinery/_header.html.erb | 4 | ||||
| -rw-r--r-- | config/initializers/will_paginate_fix.rb | 27 |
4 files changed, 2 insertions, 61 deletions
diff --git a/app/assets/images/d2-shop-logo.png b/app/assets/images/d2-shop-logo.png Binary files differdeleted file mode 100644 index a39854d..0000000 --- a/app/assets/images/d2-shop-logo.png +++ /dev/null diff --git a/app/presenters/refinery/base_presenter.rb b/app/presenters/refinery/base_presenter.rb deleted file mode 100644 index 2e549fc..0000000 --- a/app/presenters/refinery/base_presenter.rb +++ /dev/null @@ -1,32 +0,0 @@ -module Refinery - class BasePresenter - - DEFAULT_FIELDS = { - :title => proc { |p| (p.model.class.name.titleize if p.model.present?) }, - :path => proc { |p| p.title }, - :browser_title => nil, - :meta_description => nil - } - - attr_reader :model - - def initialize(obj) - @model = obj - end - - def method_missing(method, *args) - if @model.respond_to? method - @model.send method - elsif DEFAULT_FIELDS.has_key? method - (value = DEFAULT_FIELDS[method]).is_a?(Proc) ? value.call(self) : value - else - raise NoMethodError.new("#{self.class.name} doesn't know #{method}. Define or delegate it.", method) - end - end - - def respond_to?(method, include_all=false) - super || @model.respond_to?(method) || DEFAULT_FIELDS.has_key?(method) - end - - end -end diff --git a/app/views/refinery/_header.html.erb b/app/views/refinery/_header.html.erb index fea48c2..ef0253a 100644 --- a/app/views/refinery/_header.html.erb +++ b/app/views/refinery/_header.html.erb @@ -22,6 +22,6 @@ <%= Refinery::Pages::MenuPresenter.new(refinery_menu_pages, self).to_html %> </div> <div id="merchlink"> - <%= link_to image_tag("d2-shop-logo.png", alt: "D2 Shop logo", size: '197x75'), 'https://d2shop.no/' %> - <%= link_to "HMNO Merch!", 'https://d2shop.no/' %> + <%= link_to image_tag("hypestore-logo.png", alt: "Hypestore", size: '197x75'), 'https://hypestore.no/collections/artistmerch-1' %> + <%= link_to "HMNO Merch!", 'https://hypestore.no/collections/artistmerch-1' %> </div> diff --git a/config/initializers/will_paginate_fix.rb b/config/initializers/will_paginate_fix.rb deleted file mode 100644 index b41484a..0000000 --- a/config/initializers/will_paginate_fix.rb +++ /dev/null @@ -1,27 +0,0 @@ -# Monkeypatch will_paginate to work with ruby 2.5.5 -module WillPaginate - module ViewHelpers - class LinkRenderer # < LinkRendererBase - def to_html - html = pagination.map do |item| - item.is_a?(Integer) ? - page_number(item) : - send(item) - end.join(@options[:link_separator]) - - @options[:container] ? html_container(html) : html - end - - private - - def link(text, target, attributes = {}) - if target.is_a? Integer - attributes[:rel] = rel_value(target) - target = url(target) - end - attributes[:href] = target - tag(:a, text, attributes) - end - end - end -end |
