pageflow 15.8.0 → 16.1.0

data/app/views/components/pageflow/admin/entry_templates_tab.rb

@@ -1,9 +1,8 @@
 module Pageflow
   module Admin
     class EntryTemplatesTab < ViewComponent
-      def build(theming)
-        account = theming.account
-        table_subjects = account.existing_and_potential_entry_templates
+      def build(site)
+        table_subjects = site.existing_and_potential_entry_templates
 
         table_for(table_subjects, i18n: Pageflow::EntryTemplate) do
           column do |entry_template|
@@ -15,30 +14,30 @@ module Pageflow
           end
           column do |entry_template|
             if entry_template.id
-              edit_link(entry_template, account)
+              edit_link(entry_template, site)
             else
-              new_link(entry_template, account)
+              new_link(entry_template, site)
             end
           end
         end
       end
 
-      def new_link(entry_template, account)
+      def new_link(entry_template, site)
         link_to(
           I18n.t('active_admin.new'),
-          new_admin_account_entry_template_path(
-            account,
+          new_admin_site_entry_template_path(
+            site,
             entry_template,
             entry_type_name: entry_template.entry_type_name
           )
         )
       end
 
-      def edit_link(entry_template, account)
+      def edit_link(entry_template, site)
         link_to(
           I18n.t('active_admin.edit'),
-          edit_admin_account_entry_template_path(
-            account,
+          edit_admin_site_entry_template_path(
+            site,
             entry_template
           )
         )

data/app/views/components/pageflow/admin/extensible_attributes_table.rb

@@ -78,8 +78,14 @@ module Pageflow
         #
         # This is also the reason we can not use SimpleDelegator here
         # and also delegate_missing in Rails 5 would not work.
-        def method_missing(method, *args, &block)
-          @context.public_send(method, *args, &block)
+        def method_missing(method, *args, **kwargs, &block)
+          # Required for Ruby 2.6. Remove together with
+          # Pageflow::RailsVersion.experimental? conditionals.
+          if kwargs.present?
+            @context.public_send(method, *args, **kwargs, &block)
+          else
+            @context.public_send(method, *args, &block)
+          end
         end
         # rubocop:enable Style/MethodMissing
       end

data/app/views/components/pageflow/admin/features_tab.rb

@@ -2,7 +2,7 @@ module Pageflow
   module Admin
     class FeaturesTab < ViewComponent
       def build(resource)
-        feature_target = resource.is_a?(Theming) ? resource.account : resource
+        feature_target = resource.is_a?(Site) ? resource.account : resource
         render('admin/features/form', resource: feature_target)
       end
     end

data/app/views/components/pageflow/admin/sites_tab.rb

@@ -0,0 +1,35 @@
+module Pageflow
+  module Admin
+    class SitesTab < ViewComponent
+      def build(account)
+        embedded_index_table(account.sites,
+                             blank_slate_text: I18n.t('pageflow.admin.accounts.no_sites')) do
+          table_for_collection class: 'sites', i18n: Pageflow::Site do
+            column :name do |site|
+              link_to(site.display_name,
+                      admin_account_site_path(site.account, site))
+            end
+            column :title do |site|
+              site.title.presence || '-'
+            end
+            column :host do |site|
+              site.host.presence || '-'
+            end
+          end
+        end
+
+        add_button(account)
+      end
+
+      private
+
+      def add_button(account)
+        return unless authorized?(:create, Site)
+
+        text_node(link_to(t('pageflow.admin.sites.add'),
+                          new_admin_account_site_path(account),
+                          class: 'button'))
+      end
+    end
+  end
+end

data/app/views/components/pageflow/admin/users_tab.rb

@@ -1,8 +1,7 @@
 module Pageflow
   module Admin
     class UsersTab < ViewComponent
-      def build(theming)
-        account = theming.account
+      def build(account)
         embedded_index_table(account.memberships.on_accounts.includes(:user)
                               .accessible_by(current_ability, :index)
                                             .where('pageflow_memberships.user_id IS NOT NULL'),

data/app/views/pageflow/editor/config/_seeds.json.jbuilder

@@ -1,6 +1,7 @@
 json.key_format!(camelize: :lower)
 json.call(Pageflow.config,
           :confirm_encoding_jobs,
+          :default_published_until_duration_in_months,
           :available_locales,
           :available_public_locales,
           :available_text_track_kinds,

data/app/views/pageflow/editor/entries/seed.json.erb

@@ -12,7 +12,7 @@
   "files": <%= editor_files_json_seed(@entry) %>,
 
   "account": <%= render_json_seed(@entry.account) %>,
-  "theming": <%= render_json_seed(@entry.theming) %>,
+  "site": <%= render_json_seed(@entry.site) %>,
   "widget_types": <%= widget_types_json_seeds(@entry_config) %>,
   "page_types": <%= page_type_json_seeds(@entry_config) %>,
   "themes": <%= theme_json_seeds(@entry_config) %>,

data/app/views/pageflow/editor/sites/_site.json.jbuilder

@@ -0,0 +1 @@
+json.pretty_url pretty_site_url(site)

data/app/views/pageflow/entries/stylesheet.css.erb

@@ -6,5 +6,5 @@
   <% end %>
 
   <%= file_thumbnails_css(@entry) %>
-  <%= render 'pageflow/entries/theming' %>
+  <%= render 'pageflow/entries/site' %>
 <% end %>

data/app/views/pageflow/feeds/index.atom.builder

@@ -0,0 +1,20 @@
+atom_feed language: @feed.locale,
+          root_url: @feed.root_url,
+          url: @feed.custom_url do |feed|
+  feed.title(@feed.title)
+  feed.updated(@feed.updated_at&.utc)
+
+  @feed.entries.each do |entry|
+    feed.entry(entry,
+               url: social_share_entry_url(entry),
+               published: entry.first_published_at.utc,
+               updated: entry.published_at.utc) do |feed_entry|
+      feed_entry.title(entry.title)
+      feed_entry.content(feed_entry_content(entry), type: 'html')
+
+      feed_entry.author do |author|
+        author.name(entry.author)
+      end
+    end
+  end
+end

data/app/views/pageflow/sitemaps/index.xml.builder

@@ -0,0 +1,9 @@
+xml.instruct!
+xml.urlset xmlns: 'http://www.sitemaps.org/schemas/sitemap/0.9' do
+  @entries.each do |entry|
+    xml.url do
+      xml.loc(social_share_entry_url(entry))
+      xml.lastmod(entry.published_at.utc.xmlschema)
+    end
+  end
+end

data/app/views/pageflow/social_share/_entry_meta_tags.html.erb

@@ -5,7 +5,7 @@
 <%= tag :meta, property: "og:title", content: pretty_entry_title(entry) %>
 <%= tag :meta, property: "og:description", name: "description", content: social_share_entry_description(entry) %>
 <%= tag :meta, property: "og:url", content: social_share_entry_url(entry) %>
-<%= tag :meta, property: "og:site_name", content: entry.theming.cname_domain %>
+<%= tag :meta, property: "og:site_name", content: entry.site.cname_domain %>
 <%= tag :meta, property: "og:type", content: "website" %>
 
 <%= tag :meta, name: "twitter:card", content: "summary_large_image" %>

data/app/views/pageflow/social_share/_page_meta_tags.html.erb

@@ -5,7 +5,7 @@
 <%= tag :meta, property: "og:title", content: social_share_page_title(page) %>
 <%= tag :meta, property: "og:description", name: "description", content: social_share_page_description(entry, page) %>
 <%= tag :meta, property: "og:url", content: social_share_page_url(entry, page) %>
-<%= tag :meta, property: "og:site_name", content: entry.theming.cname_domain %>
+<%= tag :meta, property: "og:site_name", content: entry.site.cname_domain %>
 <%= tag :meta, property: "og:type", content: "website" %>
 
 <%= tag :meta, name: "twitter:card", content: "summary_large_image" %>

data/config/initializers/admin_resource_tabs.rb

@@ -1,17 +1,34 @@
 Pageflow.configure do |config|
-  config.admin_resource_tabs.register(:entry, name: :members, component: Pageflow::Admin::MembersTab)
-  config.admin_resource_tabs.register(:entry, name: :revisions, component: Pageflow::Admin::RevisionsTab)
+  config.admin_resource_tabs.register(:entry,
+                                      name: :members,
+                                      component: Pageflow::Admin::MembersTab)
+  config.admin_resource_tabs.register(:entry,
+                                      name: :revisions,
+                                      component: Pageflow::Admin::RevisionsTab)
+
+  config.admin_resource_tabs.register(:user,
+                                      name: :accounts,
+                                      component: Pageflow::Admin::UserAccountsTab)
+  config.admin_resource_tabs.register(:user,
+                                      name: :entries,
+                                      component: Pageflow::Admin::UserEntriesTab)
 
-  config.admin_resource_tabs.register(:user, name: :accounts, component: Pageflow::Admin::UserAccountsTab)
-  config.admin_resource_tabs.register(:user, name: :entries, component: Pageflow::Admin::UserEntriesTab)
+  config.admin_resource_tabs.register(:account,
+                                      name: :entries,
+                                      component: Pageflow::Admin::EntriesTab)
+  config.admin_resource_tabs.register(:account,
+                                      name: :users,
+                                      component: Pageflow::Admin::UsersTab)
+  config.admin_resource_tabs.register(:account,
+                                      name: :sites,
+                                      component: Pageflow::Admin::SitesTab)
 
-  config.admin_resource_tabs.register(:theming, name: :entries, component: Pageflow::Admin::EntriesTab)
-  config.admin_resource_tabs.register(:theming, name: :users, component: Pageflow::Admin::UsersTab)
-  config.admin_resource_tabs.register(
-    :theming,
-    name: :entry_templates,
-    component: Pageflow::Admin::EntryTemplatesTab
-  )
+  config.admin_resource_tabs.register(:site,
+                                      name: :entries,
+                                      component: Pageflow::Admin::EntriesTab)
+  config.admin_resource_tabs.register(:site,
+                                      name: :entry_templates,
+                                      component: Pageflow::Admin::EntryTemplatesTab)
 end
 
 Pageflow.after_configure do |config|
@@ -27,7 +44,7 @@ Pageflow.after_configure do |config|
                                       component: Pageflow::Admin::FeaturesTab,
                                       **features_tab_permissions)
 
-  config.admin_resource_tabs.register(:theming,
+  config.admin_resource_tabs.register(:account,
                                       name: :features,
                                       component: Pageflow::Admin::FeaturesTab,
                                       **features_tab_permissions)

data/config/initializers/features.rb

@@ -1,4 +1,5 @@
 Pageflow.configure do |config|
   config.features.register('highdef_video_encoding')
+  config.features.register('force_fullhd_video_quality')
   config.features.register('selectable_themes')
 end

data/config/initializers/paperclip.rb

@@ -1,3 +1,7 @@
+require 'pageflow/paperclip_processors/vtt'
+require 'pageflow/paperclip_processors/audio_waveform'
+require 'pageflow/paperclip_processors/noop'
+
 Paperclip.interpolates(:pageflow_s3_root) do |_attachment, _style|
   Pageflow.config.paperclip_s3_root
 end

data/config/locales/de.yml

@@ -161,7 +161,7 @@ de:
       pageflow/account:
         created_at: Erstellt am
         default_file_rights: Standard Urheber
-        default_theming: Standard-Theming
+        default_site: Standard-Site
         entries_count: "# Beiträge"
         landing_page_name: Einstiegsseite
         name: Name
@@ -265,20 +265,24 @@ de:
         published_at: Publiziert am
         published_until: Publiziert bis
         updated_at: Geändert am
-      pageflow/text_track_file:
-        kind: Art
-        label: Label
-        srclang: Sprache
-      pageflow/theming:
+      pageflow/site:
+        account: Konto
         additional_cnames: Zusätzliche CNAMES
         cname: CNAME
         copyright_link_label: Copyright-Link Text
         copyright_link_url: Copyright-Link URL
+        feeds_enabled: Atom-Feeds
         home_url: Redirect URL
         imprint_link_label: Impressum-Link Text
         imprint_link_url: Impressum-Link URL
         privacy_link_url: Datenschutz-Link URL
         share_providers: Standard Share Links
+        sitemap_enabled: XML-Sitemap
+        title: Titel
+      pageflow/text_track_file:
+        kind: Art
+        label: Label
+        srclang: Sprache
       pageflow/video_file:
         dimensions: Maße
         duration: Länge
@@ -403,24 +407,27 @@ de:
       pageflow/membership:
         one: Mitgliedschaft
         other: Mitgliedschaften
+      pageflow/other_file:
+        many: Unbekannte Dateien
+        one: Unbekannte Datei
       pageflow/revision:
         one: Revision
         other: Revisionen
+      pageflow/site:
+        one: Site
+        other: Sites
       pageflow/text_track_file:
         one: Textspur-Datei
         other: Textspur-Dateien
-      pageflow/theming:
-        one: Theming
-        other: Themings
       pageflow/video_file:
         one: Videodatei
         other: Videodateien
       revision:
         one: Revision
         other: Revisionen
-      theming:
-        one: Theming
-        other: Themings
+      site:
+        one: Site
+        other: Sites
       user:
         one: Nutzer
         other: Nutzer
@@ -798,10 +805,9 @@ de:
         cannot_add: Was Sie tun möchten, ist nicht möglich.
         none_addable_tooltip: Kein Konto verfügbar
       accounts:
-        entry_template_hint: Einige Formularfelder sind ab sofort im Beitragsvorlagen-Tab auf der Informations-Seite dieses Kontos zu finden.
         no_entries: Keine Beiträge
         no_members: Keine Benutzer
-        theming_defaults_inline_help: Die folgenden Einstellungen werden als Standard für neue Beiträge des Kontos verwendet. Änderungen wirken sich nicht auf existierende Beiträge aus.
+        site_defaults_inline_help: Die folgenden Einstellungen werden als Standard für neue Beiträge des Kontos verwendet. Änderungen wirken sich nicht auf existierende Beiträge aus.
       entries:
         add_folder: Ordner hinzufügen
         confirm_depublish: Soll der Beitrag wirklich depubliziert werden?
@@ -881,21 +887,38 @@ de:
         features: Features
         members: Mitglieder
         revisions: Revisionen
+        sites: Sites
         users: Benutzer
       revisions:
         published_until_hint: Freilassen, um Beitrag unbegrenzt zu veröffentlichen.
         restored: Revision wiederhergestellt
-      themings:
+      sites:
+        add: Site hinzufügen
         additional_cnames_hint: Kommaseparierte Liste von weiteren CNAMES. Ausschließlich zur Auswahl der Redirect URL genutzt.
         cname_hint: Wird in Share Links verwendet.
         default_author_hint: Voreinstellung 'author' Meta-Feld für Eintrage
         default_keywords_hint: Voreinstellung 'keywords' Meta-Feld für Eintrage
         default_locale_hint: Voreinstellung Sprache für Einträge
+        default_name: "(Standard)"
         default_publisher_hint: Voreinstellung 'publisher' Meta-Feld für Eintrage
+        feeds_hint: |-
+          Wenn diese Option aktiviert ist, stehen Feeds mit allen
+          veröffentlichten Beiträgen der Site über URLs der Form
+          https://%{site_host}/feeds/de.atom zu Verfügung, wobei "en"
+          durch ein beliebiges Sprachkürzel ersetzt werden kann, nach
+          dem gefiltert werden soll.
         home_url_hint: Wird einer der obigen CNAMES ohne Pfad in der URL verwendet, wird zu dieser URL umgeleitet. Standard Link Ziel des Home Buttons.
         name: "%{account_name}"
         remove_logo: Logo entfernen
         show: Anzeigen
+        sitemap_hint: |-
+          Wenn diese Option aktiviert ist, steht eine Sitemap mit
+          allen veröffentlichten Einträgen der Site unter
+          https://%{site_host}/sitemap.xml zur Verfügung. Registriere
+          die URL in Google Search Console oder ähnlichen Tools.
+        title_hint: |-
+          Wird in Titeln der Beiträge und als Titel für den Atom-Feed
+          verwendet.
       user:
         cannot_add: Was Sie tun möchten, ist nicht möglich. Sie müssen aktualisieren.
         none_addable_tooltip: Kein Benutzer verfügbar
@@ -1146,6 +1169,7 @@ de:
         tabs:
           audio_files: Audios
           image_files: Bilder
+          other_files: Andere
           video_files: Videos
       media_loading_spinner:
         widget_type_info_box_text: Dies ist eine Vorschau der Lade-Ansicht von 'Bild'. Die Animation wird ausgeführt, während die Seite geladen wird.
@@ -1288,7 +1312,7 @@ de:
           close: Schließen
           title: Hilfe
         help_button:
-          open_help: Hilfe anzeigen
+          open_help: Hilfe
         list_blank_slate:
           text: "(Keine Einträge)"
         list_item:
@@ -1802,9 +1826,7 @@ de:
           publisher: Name oder Firmenname des Herausgeber.
           share_providers: Social Media Plattformen, die unter dem Menüpunkt "Teilen" des Beitrags angezeigt werden sollen
           share_url: URL, die geteilt werden soll, wenn der Benutzer auf einen der Social Media Buttons klickt. Feld frei lassen, um URL des veröffentlichten Beitrags zu verwenden.
-          summary: 'Trage hier ein, welcher Beschreibungstext beim Teilen in sozialen Netzwerken angezeigt wird.
-
-'
+          summary: Trage hier ein, welcher Beschreibungstext beim Teilen in sozialen Netzwerken angezeigt wird.
           title: Hier kannst Du Deinem Pageflow einen Titel geben, der in der Titelleiste des Browserfensters angezeigt wird. Unter diesem Titel wird Dein Pageflow nach der Veröffentlichung auch in Suchmaschinen indiziert werden
         pageflow/page:
           additional_title: Die Infobox wird über den Steuerelementen zum Starten und Stoppen der Wiedegabe angezeigt.
@@ -1903,6 +1925,7 @@ de:
       roles:
         analytics: Zählpixel
         background_media_control: Hintergrund-Media-Control
+        consent: Privatsphäre-Einstellungen
         cookie_notice: Privatsphäre-Einstellungen
         loading_spinner: Lade-Ansicht
         mobile_navigation: Mobile Navigation

data/config/locales/en.yml

@@ -161,7 +161,7 @@ en:
       pageflow/account:
         created_at: Created at
         default_file_rights: Default file credits
-        default_theming: Default theming
+        default_site: Default site
         entries_count: "# Stories"
         landing_page_name: Landing page
         name: Name
@@ -265,20 +265,24 @@ en:
         published_at: Published at
         published_until: Published until
         updated_at: Updated at
-      pageflow/text_track_file:
-        kind: Kind
-        label: Label
-        srclang: Language
-      pageflow/theming:
+      pageflow/site:
+        account: Account
         additional_cnames: Additional CNAMES
         cname: CNAME
         copyright_link_label: Copyright link Text
         copyright_link_url: Copyright link URL
+        feeds_enabled: Atom feeds
         home_url: Redirect URL
         imprint_link_label: Legal notice link label
         imprint_link_url: Legal notice link URL
         privacy_link_url: Privacy link URL
         share_providers: Default Share Links
+        sitemap_enabled: XML sitemap
+        title: Title
+      pageflow/text_track_file:
+        kind: Kind
+        label: Label
+        srclang: Language
       pageflow/video_file:
         dimensions: Dimensions
         duration: Duration
@@ -403,24 +407,27 @@ en:
       pageflow/membership:
         one: Membership
         other: Memberships
+      pageflow/other_file:
+        many: Unknown files
+        one: Unknown file
       pageflow/revision:
         one: Version
         other: Versions
+      pageflow/site:
+        one: Site
+        other: Sites
       pageflow/text_track_file:
         one: Text Track File
         other: Text Track Files
-      pageflow/theming:
-        one: Theming
-        other: Themings
       pageflow/video_file:
         one: Video File
         other: Video Files
       revision:
         one: Version
         other: Versions
-      theming:
-        one: Theming
-        other: Themings
+      site:
+        one: Site
+        other: Sites
       user:
         one: User
         other: Users
@@ -732,6 +739,12 @@ en:
       create: Create %{model}
       submit: Save %{model}
       update: Update %{model}
+  i18n:
+    transliterate:
+      rule:
+        ä: 
+        ö: 
+        ü: 
   language: English
   number:
     currency:
@@ -792,10 +805,9 @@ en:
         cannot_add: What you want to do is not possible at the moment.
         none_addable_tooltip: No account available
       accounts:
-        entry_template_hint: Some of the form fields can now be found in the story template tab on the info page for this account
         no_entries: No Stories
         no_members: No members
-        theming_defaults_inline_help: The following settings will be used as defaults for new stories in this account. Changes do not affect existing stories.
+        site_defaults_inline_help: The following settings will be used as defaults for new stories in this account. Changes do not affect existing stories.
       entries:
         add_folder: Add folder
         confirm_depublish: Depublish this story?
@@ -875,21 +887,35 @@ en:
         features: Features
         members: Members
         revisions: Versions
+        sites: Sites
         users: User
       revisions:
         published_until_hint: Leave blank to publish indefinitely.
         restored: Version restored
-      themings:
+      sites:
+        add: Add site
         additional_cnames_hint: Comma separated list of additional CNAMES. Used only to select the correct redirect URL.
         cname_hint: Used in public sharing URLs.
         default_author_hint: Default 'author' meta field for stories
         default_keywords_hint: Default 'keywords' meta field for stories
         default_locale_hint: Default language for stories
+        default_name: "(Default)"
         default_publisher_hint: Default 'publisher' meta field for stories
+        feeds_hint: |-
+          When enabled, feeds containing all published entries of the
+          site are available via URLs of the form
+          https://%{site_host}/feeds/en.atom where "en" can be
+          replaced with any locale you want to filter by.
         home_url_hint: Used for requests to the root path with one of the above CNAMES. Default target location for the home button.
         name: "%{account_name}"
         remove_logo: Remove logo
         show: View
+        sitemap_hint: |-
+          When enabled, a sitemap with all published entries of the
+          site is available at
+          https://%{site_host}/sitemap.xml. Register the URL in Google
+          Search Console or similar tools.
+        title_hint: Used in entry titles and as title for the atom feed.
       user:
         cannot_add: What you want to do is not possible. You need to upgrade.
         none_addable_tooltip: No user available
@@ -1141,6 +1167,7 @@ en:
         tabs:
           audio_files: Audios
           image_files: Images
+          other_files: Other
           video_files: Videos
       media_loading_spinner:
         widget_type_info_box_text: This is a preview of the 'Image' loading view. The animation runs while the page is loading.
@@ -1283,7 +1310,7 @@ en:
           close: Close
           title: Help
         help_button:
-          open_help: Open help
+          open_help: Help
         list_blank_slate:
           text: "(No items)"
         list_item:
@@ -1814,7 +1841,7 @@ en:
             The text-block can be formatted with the buttons underneath the input field. [B= bold / I=italic / U=underlined / infinity symbol= Link/URL to an external website]
 
             All changes are visible in the left front-end-view as soon as you leave the appropriate input field in the editor.
-          thumbnail_image_id: 'The thumbnail replaces the automatically generated preview-picture in the navigation and overview.'
+          thumbnail_image_id: The thumbnail replaces the automatically generated preview-picture in the navigation and overview.
           transition: Choose the animation, that will be used when users scroll to this page.
       templates:
         inputs:
@@ -1894,6 +1921,7 @@ en:
       roles:
         analytics: Tracking
         background_media_control: Background media control
+        consent: Privacy settings
         cookie_notice: Privacy settings
         loading_spinner: Loading View
         mobile_navigation: Mobile navigation

data/config/routes.rb

@@ -88,6 +88,9 @@ Pageflow::Engine.routes.draw do
   # Authentication provider call back
   get '/auth/:provider/callback', to: 'users/omniauth_callbacks#auth_callback'
 
+  get 'feeds/:locale', to: 'feeds#index', as: :feed
+  get 'sitemap', to: 'sitemaps#index', as: :sitemap
+
   get ':id/manifest', to: 'entries#manifest', as: :entry_manifest
   get ':id/embed', to: 'entries#show', defaults: {embed: '1'}, as: :entry_embed
 

data/config/spring.rb

@@ -1,2 +1,2 @@
-require File.expand_path('../spec/support/pageflow/rails_version', File.dirname(__FILE__))
+require File.expand_path('../lib/pageflow/rails_version', File.dirname(__FILE__))
 Spring.application_root = File.join(__FILE__, "../../spec/dummy/rails-#{Pageflow::RailsVersion.detect}")

data/db/migrate/20221215101134_rename_theming_to_site.rb

@@ -0,0 +1,9 @@
+class RenameThemingToSite < ActiveRecord::Migration[5.2]
+  def change
+    rename_table :pageflow_themings, :pageflow_sites
+
+    rename_column :pageflow_accounts, :default_theming_id, :default_site_id
+    rename_column :pageflow_entries, :theming_id, :site_id
+    rename_column :pageflow_permalink_directories, :theming_id, :site_id
+  end
+end