goldencobra 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a7506a4a06dc132eb931fb028862864a5df3be4
-  data.tar.gz: 9c33b84b3d287e9c1eec51c12cc44fad3d1ac31c
+  metadata.gz: 17da51b19ac22211cb5695562c4b927c28aef7f8
+  data.tar.gz: dcfcb4852f66167c1ef574b5f750abf91a40d73a
 SHA512:
-  metadata.gz: df19ff989c6d6282a3ec7b6b0de752e9393aa17fa8135dfd7ac383075934b6b73ba73982e8ab5a725a6128e46ecbe441d03bb30a6fa262bf641fdaef3e855364
-  data.tar.gz: d265f253c3900b0160cfa20e44feac3b31743fdc23c18fffb193a693e6b36d6a734b88d69a07fb28841f02de46ebc718d7f72b952e6459cdfb3c722a0af0e26f
+  metadata.gz: 46f4a9edefd0fa2b510e170408d14ea47a57572e8bba9081c816503d1ae4978344b3d81f3289f6c4d5de8946231b9e3b1bd3991e95cb98fcc42e7dbda0078ff1
+  data.tar.gz: 2d654e0cf2120c8312de826f02c7069cec902334d0b58df37983b49fa4d8122e14c4d69f19ff4d3f9feb85ab98edce19983175031108f851397d4102a343a4d5

data/app/models/goldencobra/article.rb

@@ -3,47 +3,64 @@
 #
 # Table name: goldencobra_articles
 #
-#  id                               :integer          not null, primary key
-#  title                            :string(255)
-#  created_at                       :datetime         not null
-#  updated_at                       :datetime         not null
-#  url_name                         :string(255)
-#  slug                             :string(255)
-#  content                          :text
-#  teaser                           :text
-#  ancestry                         :string(255)
-#  startpage                        :boolean          default(FALSE)
-#  active                           :boolean          default(TRUE)
-#  subtitle                         :string(255)
-#  summary                          :text
-#  context_info                     :text
-#  canonical_url                    :string(255)
-#  robots_no_index                  :boolean          default(FALSE)
-#  breadcrumb                       :string(255)
-#  template_file                    :string(255)
-#  article_for_index_id             :integer
-#  article_for_index_levels         :integer          default(0)
-#  article_for_index_count          :integer          default(0)
-#  article_for_index_images         :boolean          default(FALSE)
-#  enable_social_sharing            :boolean
-#  cacheable                        :boolean          default(TRUE)
-#  image_gallery_tags               :string(255)
-#  article_type                     :string(255)
-#  external_url_redirect            :string(255)
-#  index_of_articles_tagged_with    :string(255)
-#  sort_order                       :string(255)
-#  reverse_sort                     :boolean
-#  author_backup                    :string(255)
-#  sorter_limit                     :integer
-#  not_tagged_with                  :string(255)
-#  use_frontend_tags                :boolean          default(FALSE)
-#  dynamic_redirection              :string(255)      default("false")
-#  redirection_target_in_new_window :boolean          default(FALSE)
-#  commentable                      :boolean          default(FALSE)
-#  active_since                     :datetime         default(2012-09-30 12:53:13 UTC)
-#  redirect_link_title              :string(255)
-#  display_index_types              :string(255)      default("show")
-#  author_id                        :integer
+#  id                                  :integer          not null, primary key
+#  title                               :string(255)
+#  created_at                          :datetime         not null
+#  updated_at                          :datetime         not null
+#  url_name                            :string(255)
+#  slug                                :string(255)
+#  content                             :text(65535)
+#  teaser                              :text(65535)
+#  ancestry                            :string(255)
+#  startpage                           :boolean          default(FALSE)
+#  active                              :boolean          default(TRUE)
+#  subtitle                            :string(255)
+#  summary                             :text(65535)
+#  context_info                        :text(65535)
+#  canonical_url                       :string(255)
+#  robots_no_index                     :boolean          default(FALSE)
+#  breadcrumb                          :string(255)
+#  template_file                       :string(255)
+#  article_for_index_id                :integer
+#  article_for_index_levels            :integer          default(0)
+#  article_for_index_count             :integer          default(0)
+#  enable_social_sharing               :boolean
+#  article_for_index_images            :boolean          default(FALSE)
+#  cacheable                           :boolean          default(TRUE)
+#  image_gallery_tags                  :string(255)
+#  article_type                        :string(255)
+#  external_url_redirect               :string(255)
+#  index_of_articles_tagged_with       :string(255)
+#  sort_order                          :string(255)
+#  reverse_sort                        :boolean
+#  sorter_limit                        :integer
+#  not_tagged_with                     :string(255)
+#  use_frontend_tags                   :boolean          default(FALSE)
+#  dynamic_redirection                 :string(255)      default("false")
+#  redirection_target_in_new_window    :boolean          default(FALSE)
+#  commentable                         :boolean          default(FALSE)
+#  active_since                        :datetime         default(Fri, 03 Oct 2014 09:43:07 CEST +02:00)
+#  redirect_link_title                 :string(255)
+#  display_index_types                 :string(255)      default("all")
+#  creator_id                          :integer
+#  external_referee_id                 :string(255)
+#  external_referee_ip                 :string(255)
+#  external_updated_at                 :datetime
+#  image_gallery_type                  :string(255)      default("lightbox")
+#  url_path                            :text(65535)
+#  global_sorting_id                   :integer          default(0)
+#  display_index_articletypes          :string(255)      default("all")
+#  index_of_articles_descendents_depth :string(255)      default("1")
+#  ancestry_depth                      :integer          default(0)
+#  metatag_title_tag                   :string(255)
+#  metatag_meta_description            :string(255)
+#  metatag_open_graph_title            :string(255)
+#  metatag_open_graph_description      :string(255)
+#  metatag_open_graph_type             :string(255)      default("website")
+#  metatag_open_graph_url              :string(255)
+#  metatag_open_graph_image            :string(255)
+#  state                               :integer          default(0)
+#  display_index_articles              :boolean          default(FALSE)
 #
 
 # For article rendering to string (:render_html) needed
@@ -846,12 +863,6 @@ module Goldencobra
       return results
     end
 
-    def self.templates_for_select
-      Dir.glob(File.join(::Rails.root, "app", "views", "layouts", "*.html.erb"))
-         .map { |a| File.basename(a, ".html.erb") }
-         .delete_if { |a| a =~ /^_/ }
-    end
-
     def self.simple_search(q)
       active.search(title_or_subtitle_or_url_name_or_content_or_summary_or_teaser_contains: q).relation.map do |article|
         {

data/app/models/goldencobra/article_url.rb

@@ -52,3 +52,14 @@ module Goldencobra
     end
   end
 end
+
+# == Schema Information
+#
+# Table name: goldencobra_article_urls
+#
+#  id         :integer          not null, primary key
+#  article_id :integer
+#  url        :text(65535)
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#

data/app/models/goldencobra/articletype.rb

@@ -1,10 +1,11 @@
 module Goldencobra
   class Articletype < ActiveRecord::Base
-    attr_accessible :default_template_file, :name, :fieldgroups_attributes
+    attr_accessible :default_template_file, :name, :fieldgroups_attributes, :template_ids
 
     has_many :articles, class_name: Goldencobra::Article, foreign_key: :article_type, primary_key: :name
     has_many :fieldgroups, class_name: Goldencobra::ArticletypeGroup, dependent: :destroy
-
+    has_many :articletype_templates
+    has_many :templates, through: :articletype_templates
     accepts_nested_attributes_for :fieldgroups, allow_destroy: true
 
     validates_uniqueness_of :name
@@ -115,3 +116,14 @@ module Goldencobra
     end
   end
 end
+
+# == Schema Information
+#
+# Table name: goldencobra_articletypes
+#
+#  id                    :integer          not null, primary key
+#  name                  :string(255)
+#  default_template_file :string(255)
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#

data/app/models/goldencobra/articletype_field.rb

@@ -10,3 +10,16 @@ module Goldencobra
     default_scope { order(:sorter) }
   end
 end
+
+# == Schema Information
+#
+# Table name: goldencobra_articletype_fields
+#
+#  id                   :integer          not null, primary key
+#  articletype_group_id :integer
+#  fieldname            :string(255)
+#  sorter               :integer          default(0)
+#  class_name           :string(255)
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
+#

data/app/models/goldencobra/articletype_group.rb

@@ -11,3 +11,19 @@ module Goldencobra
     default_scope { order(:sorter) }
   end
 end
+
+# == Schema Information
+#
+# Table name: goldencobra_articletype_groups
+#
+#  id             :integer          not null, primary key
+#  title          :string(255)
+#  expert         :boolean          default(FALSE)
+#  foldable       :boolean          default(TRUE)
+#  closed         :boolean          default(TRUE)
+#  sorter         :integer          default(0)
+#  articletype_id :integer
+#  created_at     :datetime         not null
+#  updated_at     :datetime         not null
+#  position       :string(255)      default("first_block")
+#

data/app/models/goldencobra/articletype_template.rb

@@ -0,0 +1,17 @@
+module Goldencobra
+  class ArticletypeTemplate < ActiveRecord::Base
+    belongs_to :template
+    belongs_to :articletype
+  end
+end
+
+# == Schema Information
+#
+# Table name: goldencobra_articletype_templates
+#
+#  id             :integer          not null, primary key
+#  articletype_id :integer
+#  template_id    :integer
+#  created_at     :datetime         not null
+#  updated_at     :datetime         not null
+#

data/app/models/goldencobra/author.rb

@@ -14,3 +14,16 @@ module Goldencobra
 		end
 	end
 end
+
+# == Schema Information
+#
+# Table name: goldencobra_authors
+#
+#  id         :integer          not null, primary key
+#  firstname  :string(255)
+#  lastname   :string(255)
+#  email      :string(255)
+#  googleplus :string(255)
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#

data/app/models/goldencobra/comment.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 # == Schema Information
 #
 # Table name: goldencobra_comments
@@ -8,7 +7,7 @@
 #  article_id       :integer
 #  commentator_id   :integer
 #  commentator_type :string(255)
-#  content          :text
+#  content          :text(65535)
 #  active           :boolean          default(TRUE)
 #  approved         :boolean          default(FALSE)
 #  reported         :boolean          default(FALSE)

data/app/models/goldencobra/domain.rb

@@ -36,3 +36,17 @@ module Goldencobra
 
   end
 end
+
+# == Schema Information
+#
+# Table name: goldencobra_domains
+#
+#  id         :integer          not null, primary key
+#  hostname   :string(255)
+#  title      :string(255)
+#  client     :string(255)
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#  url_prefix :string(255)
+#  main       :boolean          default(FALSE)
+#

data/app/models/goldencobra/help.rb

@@ -1,12 +1,11 @@
 # encoding: utf-8
-
 # == Schema Information
 #
 # Table name: goldencobra_helps
 #
 #  id          :integer          not null, primary key
 #  title       :string(255)
-#  description :text
+#  description :text(65535)
 #  url         :string(255)
 #  created_at  :datetime         not null
 #  updated_at  :datetime         not null

data/app/models/goldencobra/import.rb

@@ -1,22 +1,21 @@
 # encoding: utf-8
-
 # == Schema Information
 #
 # Table name: goldencobra_imports
 #
 #  id                :integer          not null, primary key
-#  assignment        :text
-#  assignment_groups :text
+#  assignment        :text(65535)
 #  target_model      :string(255)
 #  successful        :boolean
 #  upload_id         :integer
 #  separator         :string(255)      default(",")
-#  result            :text
+#  result            :text(65535)
 #  created_at        :datetime         not null
 #  updated_at        :datetime         not null
+#  encoding_type     :string(255)
+#  assignment_groups :text(65535)
 #
 
-
 # Dynamische Importfunktionen:
 # Jedes Model welches eigene Importfunktionen anbieten will muss lediglich eine liste der verfügbaren funktionen ImportDataFunctions = [] haben
 # und die entsprechenden parameterized.underscored klassenfunktionenen bereithalten

data/app/models/goldencobra/import_metadata.rb

@@ -11,3 +11,20 @@ module Goldencobra
     belongs_to :importmetatagable, polymorphic: true
   end
 end
+
+# == Schema Information
+#
+# Table name: goldencobra_import_metadata
+#
+#  id                        :integer          not null, primary key
+#  database_owner            :string(255)
+#  exported_at               :datetime
+#  database_admin_first_name :string(255)
+#  database_admin_last_name  :string(255)
+#  database_admin_phone      :string(255)
+#  database_admin_email      :string(255)
+#  importmetatagable_id      :integer
+#  importmetatagable_type    :string(255)
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
+#

data/app/models/goldencobra/link_checker.rb

@@ -75,3 +75,18 @@ module Goldencobra
 
   end
 end
+
+# == Schema Information
+#
+# Table name: goldencobra_link_checkers
+#
+#  id             :integer          not null, primary key
+#  article_id     :integer
+#  target_link    :text(65535)
+#  position       :text(65535)
+#  response_code  :string(255)
+#  response_time  :string(255)
+#  response_error :text(65535)
+#  created_at     :datetime         not null
+#  updated_at     :datetime         not null
+#

data/app/models/goldencobra/location.rb

@@ -1,23 +1,23 @@
 # encoding: utf-8
-
 # == Schema Information
 #
 # Table name: goldencobra_locations
 #
-#  id              :integer          not null, primary key
-#  lat             :string(255)
-#  lng             :string(255)
-#  street          :string(255)
-#  city            :string(255)
-#  zip             :string(255)
-#  region          :string(255)
-#  country         :string(255)
-#  created_at      :datetime         not null
-#  updated_at      :datetime         not null
-#  title           :string(255)
-#  street_number   :string(255)
-#  locateable_type :string(255)
-#  locateable_id   :integer
+#  id               :integer          not null, primary key
+#  lat              :string(255)
+#  lng              :string(255)
+#  street           :string(255)
+#  city             :string(255)
+#  zip              :string(255)
+#  region           :string(255)
+#  country          :string(255)
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#  title            :string(255)
+#  locateable_type  :string(255)
+#  locateable_id    :integer
+#  street_number    :string(255)
+#  manual_geocoding :boolean          default(FALSE)
 #
 
 module Goldencobra

data/app/models/goldencobra/menue.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 # == Schema Information
 #
 # Table name: goldencobra_menues
@@ -13,10 +12,12 @@
 #  updated_at          :datetime         not null
 #  ancestry            :string(255)
 #  sorter              :integer          default(0)
-#  description         :text
+#  description         :text(65535)
 #  call_to_action_name :string(255)
 #  description_title   :string(255)
 #  image_id            :integer
+#  ancestry_depth      :integer          default(0)
+#  remote              :boolean          default(FALSE)
 #
 
 module Goldencobra

data/app/models/goldencobra/permission.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 # == Schema Information
 #
 # Table name: goldencobra_permissions
@@ -9,10 +8,11 @@
 #  subject_class :string(255)
 #  subject_id    :string(255)
 #  role_id       :integer
-#  domain_id     :integer
+#  sorter_id     :integer          default(0)
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
-#  sorter_id     :integer          default(0)
+#  operator_id   :integer
+#  domain_id     :integer
 #
 
 module Goldencobra

data/app/models/goldencobra/redirector.rb

@@ -129,3 +129,17 @@ module Goldencobra
     end
   end
 end
+
+# == Schema Information
+#
+# Table name: goldencobra_redirectors
+#
+#  id                :integer          not null, primary key
+#  source_url        :text(65535)
+#  target_url        :text(65535)
+#  redirection_code  :integer          default(301)
+#  active            :boolean          default(TRUE)
+#  ignore_url_params :boolean          default(TRUE)
+#  created_at        :datetime         not null
+#  updated_at        :datetime         not null
+#

data/app/models/goldencobra/role.rb

@@ -1,12 +1,11 @@
 # encoding: utf-8
-
 # == Schema Information
 #
 # Table name: goldencobra_roles
 #
 #  id                   :integer          not null, primary key
 #  name                 :string(255)
-#  description          :text
+#  description          :text(65535)
 #  created_at           :datetime         not null
 #  updated_at           :datetime         not null
 #  redirect_after_login :string(255)      default("reload")

data/app/models/goldencobra/role_user.rb

@@ -1,13 +1,10 @@
 # encoding: utf-8
-
 # == Schema Information
 #
 # Table name: goldencobra_roles_users
 #
 #  operator_id   :integer
 #  role_id       :integer
-#  created_at    :datetime         not null
-#  updated_at    :datetime         not null
 #  operator_type :string(255)      default("User")
 #
 

data/app/models/goldencobra/template.rb

@@ -0,0 +1,25 @@
+module Goldencobra
+  class Template < ActiveRecord::Base
+    attr_accessible :title, :layout_file_name
+
+    # List all layout files found in folder /app/views/layouts
+    #
+    # @return [Array] List of file names
+    def self.layouts_for_select
+      Dir.glob(File.join(::Rails.root, "app", "views", "layouts", "*.html.erb"))
+         .map { |a| File.basename(a, ".html.erb") }
+         .delete_if { |a| a =~ /^_/ }
+    end
+  end
+end
+
+# == Schema Information
+#
+# Table name: goldencobra_templates
+#
+#  id               :integer          not null, primary key
+#  title            :string(255)
+#  layout_file_name :string(255)
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#

data/app/models/goldencobra/tracking.rb

@@ -1,11 +1,10 @@
 # encoding: utf-8
-
 # == Schema Information
 #
 # Table name: goldencobra_trackings
 #
 #  id             :integer          not null, primary key
-#  request        :text
+#  request        :text(65535)
 #  session_id     :string(255)
 #  referer        :string(255)
 #  url            :string(255)
@@ -18,7 +17,7 @@
 #  page_duration  :string(255)
 #  view_duration  :string(255)
 #  db_duration    :string(255)
-#  url_paremeters :string(255)
+#  url_paremeters :text(65535)
 #  utm_source     :string(255)
 #  utm_medium     :string(255)
 #  utm_term       :string(255)

data/app/models/goldencobra/upload.rb

@@ -5,7 +5,7 @@
 #  id                 :integer          not null, primary key
 #  source             :string(255)
 #  rights             :string(255)
-#  description        :text
+#  description        :text(65535)
 #  image_file_name    :string(255)
 #  image_content_type :string(255)
 #  image_file_size    :integer
@@ -15,6 +15,7 @@
 #  attachable_type    :string(255)
 #  alt_text           :string(255)
 #  sorter_number      :integer
+#  image_remote_url   :string(255)
 #
 
 module Goldencobra

data/app/models/goldencobra/vita.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 # == Schema Information
 #
 # Table name: goldencobra_vita
@@ -9,10 +8,10 @@
 #  loggable_type :string(255)
 #  user_id       :integer
 #  title         :string(255)
-#  description   :text
+#  description   :text(65535)
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
-#  status_cd     :integer          default 0
+#  status_cd     :integer          default(0)
 #
 
 module Goldencobra

data/app/models/goldencobra/widget.rb

@@ -1,31 +1,29 @@
 #encoding: utf-8
-
 # == Schema Information
 #
 # Table name: goldencobra_widgets
 #
 #  id                          :integer          not null, primary key
 #  title                       :string(255)
-#  content                     :text
+#  content                     :text(65535)
 #  css_name                    :string(255)
 #  active                      :boolean
 #  created_at                  :datetime         not null
 #  updated_at                  :datetime         not null
 #  id_name                     :string(255)
 #  sorter                      :integer
-#  mobile_content              :text
+#  mobile_content              :text(65535)
 #  teaser                      :string(255)
 #  default                     :boolean
-#  description                 :text
+#  description                 :text(65535)
 #  offline_days                :string(255)
 #  offline_time_active         :boolean
-#  alternative_content         :text
+#  alternative_content         :text(65535)
 #  offline_date_start          :date
 #  offline_date_end            :date
-#  offline_time_week_start_end :text
+#  offline_time_week_start_end :text(65535)
 #
 
-
 module Goldencobra
   class Widget < ActiveRecord::Base
     attr_accessible :title, :content, :css_name, :active, :id_name, :sorter, :teaser, :default,

data/app/models/translation.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 # == Schema Information
 #
 # Table name: translations
@@ -7,8 +6,8 @@
 #  id             :integer          not null, primary key
 #  locale         :string(255)
 #  key            :string(255)
-#  value          :text
-#  interpolations :text
+#  value          :text(65535)
+#  interpolations :text(65535)
 #  is_proc        :boolean          default(FALSE)
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null

data/app/models/user.rb

@@ -36,7 +36,7 @@
 #  linkedin               :string(255)
 #  xing                   :string(255)
 #  googleplus             :string(255)
-#  enable_expert_mode     :boolean          default(FALSE)
+#  enable_expert_mode     :boolean          default(TRUE)
 #
 
 class User < ActiveRecord::Base

data/app/serializers/goldencobra/article_serializer.rb

@@ -24,3 +24,67 @@ module Goldencobra
     end
   end
 end
+
+# == Schema Information
+#
+# Table name: goldencobra_articles
+#
+#  id                                  :integer          not null, primary key
+#  title                               :string(255)
+#  created_at                          :datetime         not null
+#  updated_at                          :datetime         not null
+#  url_name                            :string(255)
+#  slug                                :string(255)
+#  content                             :text(65535)
+#  teaser                              :text(65535)
+#  ancestry                            :string(255)
+#  startpage                           :boolean          default(FALSE)
+#  active                              :boolean          default(TRUE)
+#  subtitle                            :string(255)
+#  summary                             :text(65535)
+#  context_info                        :text(65535)
+#  canonical_url                       :string(255)
+#  robots_no_index                     :boolean          default(FALSE)
+#  breadcrumb                          :string(255)
+#  template_file                       :string(255)
+#  article_for_index_id                :integer
+#  article_for_index_levels            :integer          default(0)
+#  article_for_index_count             :integer          default(0)
+#  enable_social_sharing               :boolean
+#  article_for_index_images            :boolean          default(FALSE)
+#  cacheable                           :boolean          default(TRUE)
+#  image_gallery_tags                  :string(255)
+#  article_type                        :string(255)
+#  external_url_redirect               :string(255)
+#  index_of_articles_tagged_with       :string(255)
+#  sort_order                          :string(255)
+#  reverse_sort                        :boolean
+#  sorter_limit                        :integer
+#  not_tagged_with                     :string(255)
+#  use_frontend_tags                   :boolean          default(FALSE)
+#  dynamic_redirection                 :string(255)      default("false")
+#  redirection_target_in_new_window    :boolean          default(FALSE)
+#  commentable                         :boolean          default(FALSE)
+#  active_since                        :datetime         default(Fri, 03 Oct 2014 09:43:07 CEST +02:00)
+#  redirect_link_title                 :string(255)
+#  display_index_types                 :string(255)      default("all")
+#  creator_id                          :integer
+#  external_referee_id                 :string(255)
+#  external_referee_ip                 :string(255)
+#  external_updated_at                 :datetime
+#  image_gallery_type                  :string(255)      default("lightbox")
+#  url_path                            :text(65535)
+#  global_sorting_id                   :integer          default(0)
+#  display_index_articletypes          :string(255)      default("all")
+#  index_of_articles_descendents_depth :string(255)      default("1")
+#  ancestry_depth                      :integer          default(0)
+#  metatag_title_tag                   :string(255)
+#  metatag_meta_description            :string(255)
+#  metatag_open_graph_title            :string(255)
+#  metatag_open_graph_description      :string(255)
+#  metatag_open_graph_type             :string(255)      default("website")
+#  metatag_open_graph_url              :string(255)
+#  metatag_open_graph_image            :string(255)
+#  state                               :integer          default(0)
+#  display_index_articles              :boolean          default(FALSE)
+#

data/app/serializers/goldencobra/upload_serializer.rb

@@ -20,3 +20,23 @@ module Goldencobra
       end
   end
 end
+
+# == Schema Information
+#
+# Table name: goldencobra_uploads
+#
+#  id                 :integer          not null, primary key
+#  source             :string(255)
+#  rights             :string(255)
+#  description        :text(65535)
+#  image_file_name    :string(255)
+#  image_content_type :string(255)
+#  image_file_size    :integer
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
+#  attachable_id      :integer
+#  attachable_type    :string(255)
+#  alt_text           :string(255)
+#  sorter_number      :integer
+#  image_remote_url   :string(255)
+#

data/app/views/goldencobra/admin/articles/_layout_sidebar.html.erb

@@ -21,7 +21,7 @@
     <h5>
       <%= I18n.t(@article.article_type.split(' ').first.to_s.strip, :scope => [:activerecord, :models, "goldencobra/article"], :default => "Layout der Seite") %>
     </h5>
-    <%= f.select :template_file, Goldencobra::Article.templates_for_select, :include_blank => false %>
+    <%= f.select :template_file, @article.articletype.templates.map { |t| [t.title, t.layout_file_name]}, :include_blank => false %>
     <br/><br/>
     <%= f.submit t("submit_layout", :scope => [:active_admin, :sidebars]) %>
   <% end %>

data/config/initializers/templates.rb

@@ -0,0 +1,15 @@
+Rails.application.config.to_prepare do
+  if ActiveRecord::Base.connection.table_exists?("goldencobra_templates")
+    # Beim starten der Application wird das Verzeichnis /app/views/layouts durchsucht nach
+    # neuen Templatefiles und erzeugt für diese dann eine Goldencobra::Template
+    Goldencobra::Template.layouts_for_select.each do |template_file_name|
+      template = Goldencobra::Template.where(layout_file_name: template_file_name).first
+      unless template
+        template = Goldencobra::Template.create(layout_file_name: template_file_name, title: template_file_name)
+        Goldencobra::Articletype.all.each do |at|
+          at.templates << template
+        end
+      end
+    end
+  end
+end

data/config/locales/active_admin.de.yml

@@ -44,6 +44,8 @@ de:
       div: "Ich akzeptiere die AGB & Datenschutzbestimmungen *"
       submit: "Registrieren"
   active_admin:
+    template:
+      as: "Templates"
     redirector:
       as: "Weiterleitungen"
     article_url:
@@ -629,6 +631,8 @@ de:
       as: "Artikeltypen"
       general: "Allgemein"
       article_fields: "Artikelfelder"
+      default_template: "Standard Layout"
+      templates: "Verfügbare Templates"
       position_hint: "Zwischen dem ersten und dem letzten Block kommen die speziellen Feldoptionen eines Artikeltypen"
       foldable_hint: "Kann man den Bereich auf und zu klappen?"
       closed_hint: "Ist der Bereich beim Laden geschlossen?"

data/config/locales/active_admin.en.yml

@@ -44,6 +44,8 @@ en:
       div: "I accept AGB & Privacy Policy *"
       submit: "Sign-up"
   active_admin:
+    template:
+      as: "Templates"
     redirector:
       as: "Redirections"
     article_url:
@@ -629,6 +631,8 @@ en:
       as: "Article types"
       general: "General"
       article_fields: "Article fields"
+      default_template: "Default Layout"
+      templates: "Available Templates"
       position_hint: "Field options of article type between first and last block"
       foldable_hint: "Is this part foldable?"
       closed_hint: "Is this part closed on load?"

data/db/migrate/20180308124139_create_goldencobra_templates.rb

@@ -0,0 +1,10 @@
+class CreateGoldencobraTemplates < ActiveRecord::Migration
+  def change
+    create_table :goldencobra_templates do |t|
+      t.string :title
+      t.string :layout_file_name
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20180308124302_create_goldencobra_articletype_templates.rb

@@ -0,0 +1,10 @@
+class CreateGoldencobraArticletypeTemplates < ActiveRecord::Migration
+  def change
+    create_table :goldencobra_articletype_templates do |t|
+      t.integer :articletype_id
+      t.integer :template_id
+
+      t.timestamps null: false
+    end
+  end
+end

data/lib/goldencobra/version.rb

@@ -1,3 +1,3 @@
 module Goldencobra
-  VERSION = "2.3.3".freeze
+  VERSION = "2.3.4".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goldencobra
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Marco Metz
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -2603,6 +2603,7 @@ files:
 - app/models/goldencobra/articletype.rb
 - app/models/goldencobra/articletype_field.rb
 - app/models/goldencobra/articletype_group.rb
+- app/models/goldencobra/articletype_template.rb
 - app/models/goldencobra/author.rb
 - app/models/goldencobra/comment.rb
 - app/models/goldencobra/domain.rb
@@ -2617,6 +2618,7 @@ files:
 - app/models/goldencobra/role.rb
 - app/models/goldencobra/role_user.rb
 - app/models/goldencobra/setting.rb
+- app/models/goldencobra/template.rb
 - app/models/goldencobra/tracking.rb
 - app/models/goldencobra/upload.rb
 - app/models/goldencobra/vita.rb
@@ -2694,6 +2696,7 @@ files:
 - config/initializers/sass_load_path.rb
 - config/initializers/settings.rb
 - config/initializers/sidekiq.rb.tmpl
+- config/initializers/templates.rb
 - config/locales/active_admin.de.yml
 - config/locales/active_admin.en.yml
 - config/locales/active_admin.zh-CN.yml
@@ -2717,6 +2720,8 @@ files:
 - db/migrate/20160527083745_add_state_to_goldencobra_articles.rb
 - db/migrate/20160614074840_create_goldencobra_article_urls.rb
 - db/migrate/20160704070529_add_showindexarticles_to_goldencobra_articles.rb
+- db/migrate/20180308124139_create_goldencobra_templates.rb
+- db/migrate/20180308124302_create_goldencobra_articletype_templates.rb
 - db/seeds.rb
 - lib/generators/goldencobra/articletype/USAGE
 - lib/generators/goldencobra/articletype/articletype_generator.rb
@@ -2772,7 +2777,8 @@ files:
 homepage: https://github.com/ikusei/Goldencobra
 licenses:
 - Lizenz CC BY-NC-SA 3.0
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/ikuseiGmbH/Goldencobra/blob/master/doc/versionhistory
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -2790,7 +2796,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Basic CMS based on Rails engines