tramway-conference 1.9.3.1 → 1.9.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d94f3fe1fd805bcf35a898a49efbf7b39a6125a78e94834ceedccb21ddbb656
-  data.tar.gz: c2835b7acb38e5530fa32f4a8fa29eda5116481d0f22df39e6cf380438f7a415
+  metadata.gz: c1d6d0f12b768d54e0c51d3ecfc949b4cc5c9229ebc20f6ffe117f2da61fe15d
+  data.tar.gz: 2bf31b0cdf14bb21cb695b70d16c2a6ea80b45657a263ebda2b0f86aaf2989bb
 SHA512:
-  metadata.gz: 5cac62266aa8b9c2b20fcce1026205bff1a06b07abbb57206d63d4ed196a780edfd0d86afceac889ba2b6a75c0af173cad56205fe93419e951f0d2d0fb360777
-  data.tar.gz: 8b7c8804b1acb4e4f970908c560246acfc1f2fb23ba96a295bb13dd76b089105c8bf41856c8448290e1cc96f5ac3c45b399afab3dabfc0d592d67f87c8fc5f0a
+  metadata.gz: 7103fe737f20b6be1a04bb77898bce61431a755395bf68e3c4c875cbf9b0b4b72ab20de75c4b1290213dfd6dd91298b20c7155dcd23f805af121ac194ddac192
+  data.tar.gz: 2fecac16606e15eada41a86f2091213b34959d97e7b7ac3fa9f8b7ad46dcb0b86e8d76bc8f6c38628444416d1d09f7137d0b2a0ac33da1421f0baf008d167e3c

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

@@ -7,11 +7,11 @@ 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]
     end
 
     def show_associations
-      [ :social_networks ]
+      [:social_networks]
     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

@@ -27,6 +27,10 @@ module Tramway::Conference::Generators
         add_url_to_tramway_conference_unities
         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_main_image_to_tramway_conference_unities.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddMainImageToTramwayConferenceUnities < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_conference_unities, :main_image, :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.3.1'
+    VERSION = '1.9.4.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-conference
 version: !ruby/object:Gem::Version
-  version: 1.9.3.1
+  version: 1.9.4.4
 platform: ruby
 authors:
 - Dmitry Korotin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-28 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies: []
 description: Engine for Conference web sites
 email:
@@ -49,7 +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