From 9be44b3fa9985b8a93160434ce9f6dc922ec4387 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 17 Dec 2017 11:36:55 +0100 Subject: New extension GalleryLinks --- .../admin/gallery_links_controller.rb | 12 +++++ .../gallery_links/gallery_links_controller.rb | 34 +++++++++++++++ .../models/refinery/gallery_links/gallery_link.rb | 11 +++++ .../admin/gallery_links/_actions.html.erb | 25 +++++++++++ .../admin/gallery_links/_form.html.erb | 45 +++++++++++++++++++ .../admin/gallery_links/_gallery_link.html.erb | 20 +++++++++ .../admin/gallery_links/_gallery_links.html.erb | 2 + .../admin/gallery_links/_records.html.erb | 16 +++++++ .../admin/gallery_links/_sortable_list.html.erb | 5 +++ .../admin/gallery_links/edit.html.erb | 1 + .../admin/gallery_links/index.html.erb | 7 +++ .../gallery_links/admin/gallery_links/new.html.erb | 1 + .../gallery_links/gallery_links/index.html.erb | 11 +++++ .../gallery_links/gallery_links/show.html.erb | 51 ++++++++++++++++++++++ 14 files changed, 241 insertions(+) create mode 100644 vendor/extensions/gallery_links/app/controllers/refinery/gallery_links/admin/gallery_links_controller.rb create mode 100644 vendor/extensions/gallery_links/app/controllers/refinery/gallery_links/gallery_links_controller.rb create mode 100644 vendor/extensions/gallery_links/app/models/refinery/gallery_links/gallery_link.rb create mode 100644 vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_actions.html.erb create mode 100644 vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_form.html.erb create mode 100644 vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_gallery_link.html.erb create mode 100644 vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_gallery_links.html.erb create mode 100644 vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_records.html.erb create mode 100644 vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_sortable_list.html.erb create mode 100644 vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/edit.html.erb create mode 100644 vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/index.html.erb create mode 100644 vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/new.html.erb create mode 100644 vendor/extensions/gallery_links/app/views/refinery/gallery_links/gallery_links/index.html.erb create mode 100644 vendor/extensions/gallery_links/app/views/refinery/gallery_links/gallery_links/show.html.erb (limited to 'vendor/extensions/gallery_links/app') diff --git a/vendor/extensions/gallery_links/app/controllers/refinery/gallery_links/admin/gallery_links_controller.rb b/vendor/extensions/gallery_links/app/controllers/refinery/gallery_links/admin/gallery_links_controller.rb new file mode 100644 index 0000000..89c5a66 --- /dev/null +++ b/vendor/extensions/gallery_links/app/controllers/refinery/gallery_links/admin/gallery_links_controller.rb @@ -0,0 +1,12 @@ +module Refinery + module GalleryLinks + module Admin + class GalleryLinksController < ::Refinery::AdminController + + crudify :'refinery/gallery_links/gallery_link', + :xhr_paging => true + + end + end + end +end diff --git a/vendor/extensions/gallery_links/app/controllers/refinery/gallery_links/gallery_links_controller.rb b/vendor/extensions/gallery_links/app/controllers/refinery/gallery_links/gallery_links_controller.rb new file mode 100644 index 0000000..c6a4e7e --- /dev/null +++ b/vendor/extensions/gallery_links/app/controllers/refinery/gallery_links/gallery_links_controller.rb @@ -0,0 +1,34 @@ +module Refinery + module GalleryLinks + class GalleryLinksController < ::ApplicationController + + before_filter :find_all_gallery_links + before_filter :find_page + + def index + # you can use meta fields from your model instead (e.g. browser_title) + # by swapping @page for @gallery_link in the line below: + present(@page) + end + + def show + @gallery_link = GalleryLink.find(params[:id]) + + # you can use meta fields from your model instead (e.g. browser_title) + # by swapping @page for @gallery_link in the line below: + present(@page) + end + + protected + + def find_all_gallery_links + @gallery_links = GalleryLink.order('position ASC') + end + + def find_page + @page = ::Refinery::Page.where(:link_url => "/gallery_links").first + end + + end + end +end diff --git a/vendor/extensions/gallery_links/app/models/refinery/gallery_links/gallery_link.rb b/vendor/extensions/gallery_links/app/models/refinery/gallery_links/gallery_link.rb new file mode 100644 index 0000000..b83cdd1 --- /dev/null +++ b/vendor/extensions/gallery_links/app/models/refinery/gallery_links/gallery_link.rb @@ -0,0 +1,11 @@ +module Refinery + module GalleryLinks + class GalleryLink < Refinery::Core::BaseModel + self.table_name = 'refinery_gallery_links' + + attr_accessible :title, :url, :photographer, :description, :image_id, :position + + validates :title, :presence => true, :uniqueness => true + end + end +end diff --git a/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_actions.html.erb b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_actions.html.erb new file mode 100644 index 0000000..31a33b9 --- /dev/null +++ b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_actions.html.erb @@ -0,0 +1,25 @@ + diff --git a/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_form.html.erb b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_form.html.erb new file mode 100644 index 0000000..0692e6c --- /dev/null +++ b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_form.html.erb @@ -0,0 +1,45 @@ +<%= form_for [refinery, :gallery_links_admin, @gallery_link] do |f| -%> + <%= render '/refinery/admin/error_messages', + :object => @gallery_link, + :include_object_name => true %> + +
+ <%= f.label :title -%> + <%= f.text_field :title, :class => 'larger widest' -%> +
+ +
+ <%= f.label :url -%> + <%= f.text_field :url -%> +
+ +
+ <%= f.label :photographer -%> + <%= f.text_field :photographer -%> +
+ +
+ <%= render '/refinery/admin/wysiwyg', + :f => f, + :fields => [:description], + :object => "gallery_links/gallery_link" -%> +
+ +
+ <%= f.label :image_id -%> + <%= f.text_field :image_id -%> +
+ + <%= render '/refinery/admin/form_actions', :f => f, + :continue_editing => false, + :delete_title => t('delete', :scope => 'refinery.gallery_links.admin.gallery_links.gallery_link'), + :delete_confirmation => t('message', :scope => 'refinery.admin.delete', :title => @gallery_link.title) -%> +<% end -%> + +<% content_for :javascripts do -%> + +<% end -%> diff --git a/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_gallery_link.html.erb b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_gallery_link.html.erb new file mode 100644 index 0000000..7ad61a0 --- /dev/null +++ b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_gallery_link.html.erb @@ -0,0 +1,20 @@ +
  • + + <%= gallery_link.title %> + + + + + <%= link_to refinery_icon_tag("application_go.png"), refinery.gallery_links_gallery_link_path(gallery_link), + :title => t('.view_live_html'), + :target => "_blank" %> + + <%= link_to refinery_icon_tag("application_edit.png"), refinery.edit_gallery_links_admin_gallery_link_path(gallery_link), + :title => t('.edit') %> + <%= link_to refinery_icon_tag("delete.png"), refinery.gallery_links_admin_gallery_link_path(gallery_link), + :class => "cancel confirm-delete", + :title => t('.delete'), + :confirm => t('message', :scope => 'refinery.admin.delete', :title => gallery_link.title), + :method => :delete %> + +
  • diff --git a/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_gallery_links.html.erb b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_gallery_links.html.erb new file mode 100644 index 0000000..4d7ef99 --- /dev/null +++ b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_gallery_links.html.erb @@ -0,0 +1,2 @@ +<%= will_paginate @gallery_links if Refinery::GalleryLinks::Admin::GalleryLinksController.pageable? %> +<%= render 'sortable_list' %> diff --git a/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_records.html.erb b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_records.html.erb new file mode 100644 index 0000000..7ec7a2a --- /dev/null +++ b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_records.html.erb @@ -0,0 +1,16 @@ +<%= render 'refinery/admin/search_header', :url => refinery.gallery_links_admin_gallery_links_path %> +
    + <% if @gallery_links.any? %> + <%= render 'gallery_links' %> + <% else %> +

    + <% unless searching? %> + + <%= t('.no_items_yet') %> + + <% else %> + <%= t('no_results', :scope => 'refinery.admin.search') %> + <% end %> +

    + <% end %> +
    diff --git a/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_sortable_list.html.erb b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_sortable_list.html.erb new file mode 100644 index 0000000..b7489c3 --- /dev/null +++ b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_sortable_list.html.erb @@ -0,0 +1,5 @@ + +<%= render '/refinery/admin/sortable_list', + :continue_reordering => (local_assigns.keys.include?(:continue_reordering)) ? continue_reordering : true %> diff --git a/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/edit.html.erb b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/edit.html.erb new file mode 100644 index 0000000..2d34363 --- /dev/null +++ b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/edit.html.erb @@ -0,0 +1 @@ +<%= render 'form' %> diff --git a/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/index.html.erb b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/index.html.erb new file mode 100644 index 0000000..55fcbb8 --- /dev/null +++ b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/index.html.erb @@ -0,0 +1,7 @@ +
    + <%= render 'records' %> +
    + +<%= render '/refinery/admin/make_sortable', :tree => false if !searching? and ::Refinery::GalleryLinks::Admin::GalleryLinksController.sortable? and ::Refinery::GalleryLinks::GalleryLink.many? %> diff --git a/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/new.html.erb b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/new.html.erb new file mode 100644 index 0000000..2d34363 --- /dev/null +++ b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/new.html.erb @@ -0,0 +1 @@ +<%= render 'form' %> diff --git a/vendor/extensions/gallery_links/app/views/refinery/gallery_links/gallery_links/index.html.erb b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/gallery_links/index.html.erb new file mode 100644 index 0000000..684af05 --- /dev/null +++ b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/gallery_links/index.html.erb @@ -0,0 +1,11 @@ +<% content_for :body do %> + +<% end %> + +<%= render '/refinery/content_page' %> diff --git a/vendor/extensions/gallery_links/app/views/refinery/gallery_links/gallery_links/show.html.erb b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/gallery_links/show.html.erb new file mode 100644 index 0000000..5496612 --- /dev/null +++ b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/gallery_links/show.html.erb @@ -0,0 +1,51 @@ +<% content_for :body_content_title do %> + <%= @gallery_link.title %> +<% end %> + +<% content_for :body do %> +
    +

    Title

    +

    + <%=raw @gallery_link.title %> +

    +
    +
    +

    Url

    +

    + <%=raw @gallery_link.url %> +

    +
    +
    +

    Photographer

    +

    + <%=raw @gallery_link.photographer %> +

    +
    +
    +

    Description

    +

    + <%=raw @gallery_link.description %> +

    +
    +
    +

    Image

    +

    + <%=raw @gallery_link.image_id %> +

    +
    +<% end %> + +<% content_for :side_body do %> + +<% end %> + +<%= render '/refinery/content_page' %> -- cgit v1.2.3 From c9c1d27ae1de01e4fcf07f2c72042b471784260a Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 17 Dec 2017 14:36:47 +0100 Subject: GalleryLinks: Update index view. --- .../gallery_links/gallery_links/index.html.erb | 38 ++++++++++++++++++---- 1 file changed, 32 insertions(+), 6 deletions(-) (limited to 'vendor/extensions/gallery_links/app') diff --git a/vendor/extensions/gallery_links/app/views/refinery/gallery_links/gallery_links/index.html.erb b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/gallery_links/index.html.erb index 684af05..e9121d6 100644 --- a/vendor/extensions/gallery_links/app/views/refinery/gallery_links/gallery_links/index.html.erb +++ b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/gallery_links/index.html.erb @@ -1,11 +1,37 @@ <% content_for :body do %> - + <% end %> <%= render '/refinery/content_page' %> -- cgit v1.2.3 From 9a5008f1b3ed11f3e052d156d1879cbb429106f8 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 17 Dec 2017 14:37:39 +0100 Subject: GalleryLinks: Fix image upload --- .../app/models/refinery/gallery_links/gallery_link.rb | 2 ++ .../refinery/gallery_links/admin/gallery_links/_form.html.erb | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'vendor/extensions/gallery_links/app') diff --git a/vendor/extensions/gallery_links/app/models/refinery/gallery_links/gallery_link.rb b/vendor/extensions/gallery_links/app/models/refinery/gallery_links/gallery_link.rb index b83cdd1..e275fb2 100644 --- a/vendor/extensions/gallery_links/app/models/refinery/gallery_links/gallery_link.rb +++ b/vendor/extensions/gallery_links/app/models/refinery/gallery_links/gallery_link.rb @@ -3,6 +3,8 @@ module Refinery class GalleryLink < Refinery::Core::BaseModel self.table_name = 'refinery_gallery_links' + belongs_to :image, class_name: ::Refinery::Image + attr_accessible :title, :url, :photographer, :description, :image_id, :position validates :title, :presence => true, :uniqueness => true diff --git a/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_form.html.erb b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_form.html.erb index 0692e6c..1ec8b93 100644 --- a/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_form.html.erb +++ b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_form.html.erb @@ -27,7 +27,12 @@
    <%= f.label :image_id -%> - <%= f.text_field :image_id -%> + <%#= f.text_field :image_id -%> + <%= render '/refinery/admin/image_picker', + :f => f, + :field => :image_id, + :image => @gallery_link.image, + :toggle_image_display => false -%>
    <%= render '/refinery/admin/form_actions', :f => f, -- cgit v1.2.3 From e1b7c417707c656c5bd2a41c6fa426e7dc94e97d Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 6 Jan 2018 18:13:29 +0100 Subject: Consider relative root when matching gallery_links url to page. --- .../controllers/refinery/gallery_links/gallery_links_controller.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'vendor/extensions/gallery_links/app') diff --git a/vendor/extensions/gallery_links/app/controllers/refinery/gallery_links/gallery_links_controller.rb b/vendor/extensions/gallery_links/app/controllers/refinery/gallery_links/gallery_links_controller.rb index c6a4e7e..8fcbdbe 100644 --- a/vendor/extensions/gallery_links/app/controllers/refinery/gallery_links/gallery_links_controller.rb +++ b/vendor/extensions/gallery_links/app/controllers/refinery/gallery_links/gallery_links_controller.rb @@ -23,10 +23,13 @@ module Refinery def find_all_gallery_links @gallery_links = GalleryLink.order('position ASC') + logger.debug "Found #{@gallery_links.length} galleries..." end def find_page - @page = ::Refinery::Page.where(:link_url => "/gallery_links").first + @page = ::Refinery::Page.where( + :link_url => "#{ENV['RAILS_RELATIVE_URL_ROOT']}/gallery_links") + .first end end -- cgit v1.2.3 From 41b0d6bc69e3b0f751290b442e2f171a0ae8090d Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 7 Jan 2018 17:12:47 +0100 Subject: Split GalleryLink header into date, venue and bands. --- .../app/models/refinery/gallery_links/gallery_link.rb | 9 +++++++-- .../gallery_links/admin/gallery_links/_form.html.erb | 14 ++++++++++++-- .../refinery/gallery_links/gallery_links/index.html.erb | 14 ++++++++++++-- 3 files changed, 31 insertions(+), 6 deletions(-) (limited to 'vendor/extensions/gallery_links/app') diff --git a/vendor/extensions/gallery_links/app/models/refinery/gallery_links/gallery_link.rb b/vendor/extensions/gallery_links/app/models/refinery/gallery_links/gallery_link.rb index e275fb2..0c7a204 100644 --- a/vendor/extensions/gallery_links/app/models/refinery/gallery_links/gallery_link.rb +++ b/vendor/extensions/gallery_links/app/models/refinery/gallery_links/gallery_link.rb @@ -5,9 +5,14 @@ module Refinery belongs_to :image, class_name: ::Refinery::Image - attr_accessible :title, :url, :photographer, :description, :image_id, :position + attr_accessible :date, :bands, :venue, :url, :photographer, :description, :image_id, :position - validates :title, :presence => true, :uniqueness => true + validates :date, :presence => true + validates :bands, :presence => true + + def title + "#{date.try(:strftime, '%d/%m/%y')}: #{bands} @ #{venue}" + end end end end diff --git a/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_form.html.erb b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_form.html.erb index 1ec8b93..ba872b7 100644 --- a/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_form.html.erb +++ b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/admin/gallery_links/_form.html.erb @@ -4,8 +4,18 @@ :include_object_name => true %>
    - <%= f.label :title -%> - <%= f.text_field :title, :class => 'larger widest' -%> + <%= f.label :date -%> + <%= f.date_select :date -%> +
    + +
    + <%= f.label :bands -%> + <%= f.text_field :bands, class: 'larger wider' -%> +
    + +
    + <%= f.label :venue -%> + <%= f.text_field :venue -%>
    diff --git a/vendor/extensions/gallery_links/app/views/refinery/gallery_links/gallery_links/index.html.erb b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/gallery_links/index.html.erb index e9121d6..baad049 100644 --- a/vendor/extensions/gallery_links/app/views/refinery/gallery_links/gallery_links/index.html.erb +++ b/vendor/extensions/gallery_links/app/views/refinery/gallery_links/gallery_links/index.html.erb @@ -3,11 +3,21 @@ <% @gallery_links.each do |g| %>