tramway-conference 1.9.4 → 1.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80dad35275e28c7198083c54a0416ab12fa4f8bd52cb7c476c60cbbd20518772
-  data.tar.gz: 83031cef6b14bc24086635d1e6ffe228df353e3c37c0c96050e3a37091b89fee
+  metadata.gz: 4a0454a097c0928c8a7461de7c84125fc4c9ef195aa77fa4ceb3f53eddc90fc3
+  data.tar.gz: 27a52d3547cdf383d728a4d85fe7774a819d195051d22da2adcbd411a6b3abc5
 SHA512:
-  metadata.gz: 8b90b9a0010c7125c8a617479f75122211fdfb3046cb35418ce2c00969716a82910eb96537db5784c70b91ce3fd70ef27370738d6d528364fab8c6b7638c722f
-  data.tar.gz: e86e04e45a6f6c9e43799a585d3e1e216f4168bfc638554b127b815b4249788b9a8983234aa9c81a30bdc75030e1f73079f67e25569181faaf6627c0bcbfcfd8
+  metadata.gz: ed2dc7489fe604be221690b4f66ccea6721c7ffca6dcd95cd90dede638ad59d8574fbc7e25923217a588d69621223cc2f4c524060d14441b4167d0d8e91baff8
+  data.tar.gz: df7903aef714e2f5ac01bceb1e8762a74131002542f66c6d53e704906faaa6f5c64a91ba7c4992adef16cfacb7867b32c38832dfff6898e20140101dac09833d

data/app/decorators/tramway/conference/unity_decorator.rb

@@ -7,15 +7,15 @@ class Tramway::Conference::UnityDecorator < ::Tramway::Core::ApplicationDecorato
     end
 
     def show_attributes
-      [ :title, :tagline, :logo, :address, :phone, :latitude, :longtitude, :url, :found_date, :email]
+      %i[title tagline logo address phone latitude longtitude url found_date email favicon]
     end
 
     def show_associations
-      [ :social_networks ]
+      [:social_networks]
     end
   end
 
-  delegate_attributes :title, :logo, :tagline, :address, :phone, :latitude, :longtitude, :url, :found_date, :email
+  delegate_attributes :title, :logo, :tagline, :address, :phone, :latitude, :longtitude, :url, :found_date, :email, :favicon
 
   decorate_association :social_networks
 end

data/app/forms/admin/tramway/conference/unity_form.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Admin::Tramway::Conference::UnityForm < ::Tramway::Core::ApplicationForm
-  properties :title, :tagline, :logo, :state, :phone, :address, :longtitude, :latitude, :url, :found_date, :email
+  properties :title, :tagline, :logo, :state, :phone, :address, :longtitude, :latitude, :url, :found_date, :email, :favicon
 
   def initialize(object)
     super(object).tap do
@@ -13,7 +13,8 @@ class Admin::Tramway::Conference::UnityForm < ::Tramway::Core::ApplicationForm
                       longtitude: :string,
                       url: :string,
                       found_date: :date_picker,
-                      email: :string
+                      email: :string,
+                      favicon: :file
     end
   end
 end

data/app/models/tramway/conference/unity.rb

@@ -5,5 +5,7 @@ module Tramway::Conference
     has_many :social_networks, as: :record, class_name: 'Tramway::Profiles::SocialNetwork'
 
     include ::Tramway::Partner::Scopes
+
+    uploader :favicon, :ico
   end
 end

data/app/views/tramway/conference/web/welcome/index.html.haml

@@ -28,14 +28,15 @@
 - @collection_news = @news
 
 %br
-.container
-  .row-fluid
-    %h1.text-center
-      Ближайшие мероприятия
-- @close_events.each do |event|
+- if @close_events.any?
   .container
     .row-fluid
-      = render 'tramway/landing/templates/section_with_image_and_text', block: event
+      %h1.text-center
+        Ближайшие мероприятия
+  - @close_events.each do |event|
+    .container
+      .row-fluid
+        = render 'tramway/landing/templates/section_with_image_and_text', block: event
 
 - content_for :main_image do
   = request.protocol + request.host_with_port + @blocks.select { |block| block.model.block_type.header? }.first.background.url

data/config/initializers/tramway.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-::Tramway::Auth.root_path = '/admin'
+::Tramway::Auth.root_path_for Tramway::User::User => '/admin'
 ::Tramway::Admin.set_singleton_models ::Tramway::Conference::Unity, project: :conference
 ::Tramway::Admin.set_available_models(::Tramway::Event::Event,
   ::Tramway::Event::ParticipantFormField,

data/lib/tramway/conference/generates/install_generator.rb

@@ -28,6 +28,9 @@ module Tramway::Conference::Generators
         add_found_date_to_tramway_conference_unities
         add_email_to_tramway_conference_unities
         add_main_image_to_tramway_conference_unities
+        add_favicon_to_tramway_conference_unities
+        add_name_to_tramway_conference_unities
+        add_public_name_to_tramway_conference_unities
       ]
       migrations.each do |migration_name|
         migration_template "#{migration_name}.rb", "db/migrate/#{migration_name}.rb"

data/lib/tramway/conference/generates/templates/add_favicon_to_tramway_conference_unities.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddFaviconToTramwayConferenceUnities < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_conference_unities, :favicon, :text
+  end
+end

data/lib/tramway/conference/generates/templates/add_name_to_tramway_conference_unities.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddNameToTramwayConferenceUnities < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_conference_unities, :name, :text
+  end
+end

data/lib/tramway/conference/generates/templates/add_public_name_to_tramway_conference_unities.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddPublicNameToTramwayConferenceUnities < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_conference_unities, :public_name, :text
+  end
+end

data/lib/tramway/conference/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Conference
-    VERSION = '1.9.4'
+    VERSION = '1.9.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-conference
 version: !ruby/object:Gem::Version
-  version: 1.9.4
+  version: 1.9.5
 platform: ruby
 authors:
 - Dmitry Korotin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies: []
 description: Engine for Conference web sites
 email:
@@ -49,8 +49,11 @@ files:
 - lib/tramway/conference/engine.rb
 - lib/tramway/conference/generates/install_generator.rb
 - lib/tramway/conference/generates/templates/add_email_to_tramway_conference_unities.rb
+- lib/tramway/conference/generates/templates/add_favicon_to_tramway_conference_unities.rb
 - lib/tramway/conference/generates/templates/add_found_date_to_tramway_conference_unities.rb
 - lib/tramway/conference/generates/templates/add_main_image_to_tramway_conference_unities.rb
+- lib/tramway/conference/generates/templates/add_name_to_tramway_conference_unities.rb
+- lib/tramway/conference/generates/templates/add_public_name_to_tramway_conference_unities.rb
 - lib/tramway/conference/generates/templates/add_url_to_tramway_conference_unities.rb
 - lib/tramway/conference/generates/templates/create_tramway_conference_unities.rb
 - lib/tramway/conference/version.rb