spina 0.6.24 → 0.6.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbb84309c7f7cd8d4f1b3ce8940ec7c05050a7c9
-  data.tar.gz: 476d8ec138843a8ea38370e036a4f2b62ea8ecb0
+  metadata.gz: 0dba11434b63231bd7423f3cd70209d664e27a43
+  data.tar.gz: 42a15b70212fa5dab06d369d85750fc4b4673126
 SHA512:
-  metadata.gz: 1efb7e782267ad8961bb50aea1589d80e55924fb6f28c2d66e69c7ab2247c0489c2bfbf84254e3cd874ee6ed562ad04f68d0e2eb5ff796d0ead796ba57455374
-  data.tar.gz: 667d4a7df15b6b51158780bfdafdda4b84b60e9e196c7074e250c78325ac77dc8f1e69b5958882f6734ef4d7715806bfa5a8f24a0a24b8ccd1ea5f74d4575043
+  metadata.gz: 00675875c5691dc833731cce8ea1361af878556f9f6d4813e8f288b6db59a771f22a5d8039466cd787415878f02568b89079e41bd01da9ab8275e8cfa9b95b2c
+  data.tar.gz: 5112e63861f9c03dd19eebb4d550afa68f53666658ffef5731843c35096fa45a9b429f86a5d899e3db19fb6355263e69fdb5432f75e291b5bd7c144c5f898e4a

data/app/assets/javascripts/spina/admin/pages.js.coffee

@@ -70,12 +70,12 @@ $(document).on 'click', 'form .remove-structure-item-fields', (event) ->
 # Sort pages
 $(document).on 'click', '.sort-switch', (event) ->
   $($(this).attr('href') + ' .dd-item-inner').toggleClass('dd-handle')
-  if $(this).attr('data-icon') == 'j'
-    $(this).attr('data-icon', '8')
+  if $(this).hasClass('button-success')
     $(this).removeClass('button-success')
     $(this).text($(this).data('change-order'))
+    $(this).prepend('<i class="fa fa-random"></i>')
   else
-    $(this).attr('data-icon', 'j')
     $(this).addClass('button-success')
     $(this).text($(this).data('done-changing-order'))
+    $(this).prepend('<i class="fa fa-check"></i>')
   return false

data/app/views/layouts/spina/admin/application.html.haml

@@ -25,7 +25,9 @@
       %header#main_content_header
         = yield(:permanent_notice) if content_for?(:permanent_notice)
         .pull-right
-          = link_to t('spina.preview_website'), "/", class: 'button button-hollow button-round button-small', data: {:"no-turbolink" => true, icon: "W"}
+          = link_to "/", class: 'button button-hollow button-round button-small', target: :blank, data: {:"no-turbolink" => true} do
+            = icon('desktop')
+            = t('spina.preview_website')
         .breadcrumbs= render_breadcrumbs separator: '<div class="divider"></div>'
         = yield(:tertiary_navigation) if content_for?(:tertiary_navigation)
 

data/app/views/layouts/spina/admin/messages.html.haml

@@ -4,7 +4,8 @@
 
     %ul
       %li{class: ('active' if ["inbox", "inbox_show"].include? action_name )}
-        = link_to spina.inbox_admin_inquiries_path, data: {icon: 'b'} do
+        = link_to spina.inbox_admin_inquiries_path do
+          = icon('comment-o')
           - if @new_messages.present?
             = "#{t('spina.inquiries.inbox')} (#{@new_messages.size})"
           - else
@@ -12,7 +13,8 @@
           %small= t('spina.inquiries.inbox_description')
           
       %li{class: ('active' if ["index", "spam", "show"].include? action_name )}
-        = link_to spina.admin_inquiries_path, data: {icon: 'z'} do
+        = link_to spina.admin_inquiries_path do
+          = icon('comments-o')
           = t('spina.inquiries.all')
           %small= t('spina.inquiries.all_description')
 

data/app/views/layouts/spina/admin/settings.html.haml

@@ -4,23 +4,27 @@
 
     %ul
       %li{class: ('active' if params[:action] == 'edit' && params[:controller] == 'spina/admin/accounts')}
-        = link_to spina.edit_admin_account_path, data: {icon: 'J'} do
+        = link_to spina.edit_admin_account_path do
+          = icon('cog')
           = t('spina.preferences.account')
           %small= t('spina.preferences.account_description')
 
       - if can? :manage, Spina::User
         %li{class: ('active' if %w[users].include? controller_name)}
-          = link_to spina.admin_users_path, data: {icon: 'K'} do
+          = link_to spina.admin_users_path do
+            = icon('street-view')
             = t('spina.preferences.users')
             %small= t('spina.preferences.users_description')
 
       %li{class: ('active' if params[:action] == 'social')}
-        = link_to spina.social_admin_account_path, data: {icon: 'D'} do
+        = link_to spina.social_admin_account_path do
+          = icon('facebook-square')
           = t('spina.preferences.social_media')
           %small= t('spina.preferences.social_media_description')
 
       %li{class: ('active' if params[:action] == 'analytics')}
-        = link_to spina.analytics_admin_account_path, data: {icon: 'E'} do
+        = link_to spina.analytics_admin_account_path do
+          = icon('search')
           = t('spina.preferences.analytics')
           %small= t('spina.preferences.analytics_description')
 

data/app/views/layouts/spina/admin/website.html.haml

@@ -4,12 +4,14 @@
 
     %ul
       %li{class: ('active' if params[:controller] == "spina/admin/pages")}
-        = link_to spina.admin_pages_path, data: {icon: 'B'} do
+        = link_to spina.admin_pages_path do
+          = icon('file-o')
           = t('spina.website.pages')
           %small= t('spina.website.pages_description')
 
       %li{class: ('active' if params[:controller] == "spina/admin/photos" || params[:controller] == "spina/admin/attachments")}
-        = link_to spina.admin_photos_path, data: {icon: 'N'} do
+        = link_to spina.admin_photos_path do
+          = icon('file-image-o')
           = t('spina.website.media_library')
           %small= t('spina.website.media_library_description')
 

data/app/views/spina/admin/accounts/_form.html.haml

@@ -51,5 +51,6 @@
         %td
           = f.text_field :vat_identifier, placeholder: Spina::Account.human_attribute_name(:vat_identifier)
 
-  %button.button.button-primary{type: 'submit', data: {icon: 'o'}}
+  %button.button.button-primary{type: 'submit'}
+    = icon('check')
     = t('spina.preferences.account_save')

data/app/views/spina/admin/accounts/analytics.html.haml

@@ -17,5 +17,6 @@
         %td
           = f.text_field :google_site_verification, placeholder: Spina::Account.human_attribute_name(:google_site_verification)
 
-  %button.button.button-primary{type: 'submit', data: {icon: 'o'}}
+  %button.button.button-primary{type: 'submit'}
+    = icon('check')
     = t('spina.preferences.analytics_save')

data/app/views/spina/admin/accounts/social.html.haml

@@ -19,5 +19,6 @@
         %td
           = f.text_field :google_plus, placeholder: Spina::Account.human_attribute_name(:google_plus)
 
-  %button.button.button-primary{type: 'submit', data: {icon: 'o'}}
+  %button.button.button-primary{type: 'submit'}
+    = icon('check')
     = t('spina.preferences.social_media_save')

data/app/views/spina/admin/attachments/_attachment.html.haml

@@ -5,4 +5,4 @@
     %small= l attachment.created_at, format: '%d %B %Y %H:%M'
   %td= attachment.file.try(:url)
   %td.nowrap
-    = link_to t('spina.delete'), "#", class: 'button button-link button-danger button-small', data: {confirm: t('spina.delete_confirmation', subject: attachment.name)}
+    = link_to t('spina.delete'), admin_attachment_path(attachment), method: :delete, class: 'button button-link button-danger button-small', data: {confirm: t('spina.delete_confirmation', subject: attachment.name)}

data/app/views/spina/admin/attachments/index.html.haml

@@ -1,7 +1,8 @@
 .table-container
   .search-input.pull-right
     = text_field_tag :search, nil, placeholder: t('spina.search'), class: 'input-search input-rounded'
-    .clear-input{data: {icon: 'm'}}
+    .clear-input
+      = icon('times-circle')
 
   %table.table.datatable
     %thead

data/app/views/spina/admin/page_partables/_structure_form.html.haml

@@ -12,14 +12,14 @@
         - structure_form.object.page_partable.structure_items.sorted_by_structure.each_with_index do |structure_item, index|
           %li{class: ('active' if index == 0), data: {structure_item_id: structure_item.id}}
             = link_to "#structure_form_pane_#{structure_item.id}" do
-              %i.sortable-handle{data: {icon: '7'}}
+              %i.sortable-handle.fa.fa-bars
               = structure_item.structure_parts.first.try(:structure_partable).try(:content)
 
 
       = structure_form.fields_for :page_partable do |form|
         - form.object.page_part = structure_form.object
         = link_to_add_fields form, :structure_items do
-          %i{data: {icon: 't'}}
+          = icon('plus')
 
     .structure-form-content
       = structure_form.fields_for :page_partable do |form|

data/app/views/spina/admin/page_partables/_text_form.html.haml

@@ -9,11 +9,16 @@
   = text_form.fields_for :page_partable, text_form.object.page_partable do |form|
     .wysihtml5-container{data: {:"object-id" => text_form.object.object_id}}
       .toolbar{id: "wysihtml5-toolbar-#{text_form.object.object_id}"}
-        = link_to "", "#", class: 'command command-bold', title: "CTRL+B", data: {:"wysihtml5-command" => "bold", icon: 'H'}
-        = link_to "", "#", class: 'command command-italic', title: "CTRL+I", data: {:"wysihtml5-command" => "italic", icon: 'G'}
-        = link_to "", "#", class: 'command command-insert-unordered-list', data: {:"wysihtml5-command" => "insertUnorderedList", icon: 'F'}
-        = link_to "", spina.wysihtml5_link_admin_page_parts_path(text_form.object.object_id), class: 'command', data: {icon: 'Y'}, remote: true
-        = link_to "", spina.wysihtml5_select_admin_photos_path(text_form.object.object_id), class: 'command', data: {icon: 'V'}, remote: true
+        = link_to "#", class: 'command command-bold', title: "CTRL+B", data: {:"wysihtml5-command" => "bold"} do
+          = icon('bold')
+        = link_to "#", class: 'command command-italic', title: "CTRL+I", data: {:"wysihtml5-command" => "italic"} do
+          = icon('italic')
+        = link_to "#", class: 'command command-insert-unordered-list', data: {:"wysihtml5-command" => "insertUnorderedList"} do
+          = icon('list-ul')
+        = link_to spina.wysihtml5_link_admin_page_parts_path(text_form.object.object_id), class: 'command', remote: true do
+          = icon('link')
+        = link_to spina.wysihtml5_select_admin_photos_path(text_form.object.object_id), class: 'command', remote: true do
+          = icon('picture-o')
 
         .pull-right
           .choose-text-type
@@ -24,6 +29,7 @@
               %li= link_to t('spina.wysiwyg.heading_3'), "#", data: {:"wysihtml5-command" => "formatBlock", :"wysihtml5-command-value" => "h3"}
               %li= link_to t('spina.wysiwyg.quote'), "#", data: {:"wysihtml5-command" => "formatBlock", :"wysihtml5-command-value" => "blockquote"}
 
-          = link_to "", "#", class: 'command action-change-view', data: {:"wysihtml5-action" => "change_view", icon: 'I'}
+          = link_to "#", class: 'command action-change-view', data: {:"wysihtml5-action" => "change_view"} do
+            = icon('code')
 
       = form.text_area :content, placeholder: "#{t 'spina.pages.page_part'} #{text_form.object.name.downcase}", class: 'wysihtml5'

data/app/views/spina/admin/pages/_form.html.haml

@@ -66,7 +66,8 @@
               - options = options_for_select(current_theme.config.view_templates.map { |template| [template[1][:title], template[0], {'data-page-parts' => template[1][:page_parts]}] }, @page.view_template)
               = f.select :view_template, options
 
-  %button.button.button-primary{type: 'submit', data: {icon: 'o'}}
+  %button.button.button-primary{type: 'submit'}
+    = icon('check')
     =t 'spina.pages.save'
 
   = link_to t('spina.cancel'), spina.admin_pages_path, class: 'button button-link'

data/app/views/spina/admin/pages/_page.html.haml

@@ -10,7 +10,10 @@
       - if page.skip_to_first_child
         %small (#{raw t('spina.pages.skip_to_first_child')})
 
-    %span.pull-right= link_to t('spina.edit'), spina.edit_admin_page_path(page), class: 'button button-small button-link dd-nodrag', data: {icon: 'q'}
+    %span.pull-right
+      = link_to spina.edit_admin_page_path(page), class: 'button button-small button-link dd-nodrag' do
+        = icon('pencil')
+        = t('spina.edit')
 
   - if page.children.active.present?
     %ol.dd-list

data/app/views/spina/admin/pages/index.html.haml

@@ -1,13 +1,16 @@
 - content_for(:permanent_notice) do
   - unless current_account.robots_allowed?
-    .permanent-notice.permanent-notice-info{data: {icon: 'k'}}
+    .permanent-notice.permanent-notice-info
+      = icon('search')
       %p
         =t 'spina.pages.invisible_to_search_engines'
         %small=t 'spina.pages.invisible_to_search_engines_description'
 
 .filters
   %span{data: {dropdown: true}}
-    = link_to t('spina.pages.new'), spina.new_admin_page_path, class: 'button button-primary', data: {icon: 't', trigger: ('dropdown' if current_theme.new_page_templates.size > 1), target: '#create_page_dropdown'}
+    = link_to spina.new_admin_page_path, class: 'button button-primary', data: {trigger: ('dropdown' if current_theme.new_page_templates.size > 1), target: '#create_page_dropdown'} do
+      = icon('plus')
+      = t('spina.pages.new')
 
     .sliding-dropdown#create_page_dropdown
       .slide-controls
@@ -28,9 +31,13 @@
             - current_theme.new_page_templates.each_with_index do |template2, index2|
               .slide-dot{class: ('active' if index2 == index)}
 
-          = link_to t('spina.pages.create_page', template: template[1]), spina.new_admin_page_path(params: {view_template: template[0]}), class: 'button button-primary', data: {icon: 'q'}
+          = link_to spina.new_admin_page_path(params: {view_template: template[0]}), class: 'button button-primary' do
+            = icon('pencil')
+            = t('spina.pages.create_page', template: template[1])
 
-  = link_to t('spina.pages.change_order'), '#pages_list', class: 'button sort-switch', data: {icon: '8', change_order: t('spina.pages.change_order'), done_changing_order: t('spina.pages.done_changing_order')}
+  = link_to '#pages_list', class: 'button sort-switch', data: {change_order: t('spina.pages.change_order'), done_changing_order: t('spina.pages.done_changing_order')} do
+    = icon('random')
+    = t('spina.pages.change_order')
 
 .dd#pages_list{data: {:"sort-url" => spina.sort_admin_pages_url }}
   %ol.dd-list

data/app/views/spina/admin/photos/_photo.html.haml

@@ -2,6 +2,8 @@
   .overlay
     = radio_button_tag :photo_id, photo.id
     = check_box_tag 'photo_ids[]', photo.id
-    = link_to '', admin_photo_path(photo), class: 'icon-only', data: {icon: 'Z', aviary: true}
-    = link_to '', spina.admin_photo_path(photo), method: :delete, class: 'icon-only', data: {icon: 'Q', confirm: t('spina.photos.delete_confirmation')}
+    = link_to admin_photo_path(photo), class: 'icon-only', data: {aviary: true} do
+      = icon('paint-brush')
+    = link_to spina.admin_photo_path(photo), method: :delete, class: 'icon-only', data: {confirm: t('spina.photos.delete_confirmation')} do
+      = icon('times')
   = image_tag photo.file.thumb.url, id: "photo_#{photo.id}", data: {posturl: spina.enhance_admin_photo_path(photo), image: photo.file.url}

data/app/views/spina/admin/shared/_navigation.html.haml

@@ -1,16 +1,26 @@
 %nav#primary
   %ul
     %li{class: ('active' if (%w[pages photos attachments] + Spina.plugins(:website_resource).map { |plugin| plugin.config.controller if current_theme.config.plugins.include?(plugin.name.downcase) }).include? controller_name)}
-      = link_to t('spina.website.title'), spina.admin_pages_path, data: {icon: 'y'}
+      = link_to spina.admin_pages_path do
+        = icon('home')
+        = t('spina.website.title')
 
     %li{class: ('active' if %w[inquiries].include? controller_name)}
       - if @new_messages.present?
-        = link_to t('spina.inquiries.title'), spina.inbox_admin_inquiries_path, data: {icon: 'A', badge: "#{@new_messages.size}"}
+        = link_to spina.inbox_admin_inquiries_path, data: {badge: "#{@new_messages.size}"} do
+          = icon('comment')
+          = t('spina.inquiries.title')
       - else
-        = link_to t('spina.inquiries.title'), spina.admin_inquiries_path, data: {icon: 'A'}
+        = link_to spina.admin_inquiries_path do
+          = icon('comment')
+          = t('spina.inquiries.title')
 
     %li{class: ('active' if %w[accounts users tenants].include? controller_name)}
-      = link_to t('spina.preferences.title'), spina.edit_admin_account_path, data: {icon: 'f'}
+      = link_to spina.edit_admin_account_path do
+        = icon('gear')
+        = t('spina.preferences.title')
 
     %li.bottom
-      = link_to t('spina.logout'), spina.admin_logout_path, data: {icon: 'h', :"no-turbolink" => true}
+      = link_to spina.admin_logout_path, data: {no_turbolink: true} do
+        = icon('power-off')
+        = t('spina.logout')

data/app/views/spina/admin/structure_partables/_text_form.html.haml

@@ -1,11 +1,16 @@
 = text_form.fields_for :structure_partable, text_form.object.structure_partable do |form|
   .wysihtml5-container{data: {:"object-id" => text_form.object.object_id}}
     .toolbar{id: "wysihtml5-toolbar-#{text_form.object.object_id}"}
-      = link_to "", "#", class: 'command command-bold', title: "CTRL+B", data: {:"wysihtml5-command" => "bold", icon: 'H'}
-      = link_to "", "#", class: 'command command-italic', title: "CTRL+I", data: {:"wysihtml5-command" => "italic", icon: 'G'}
-      = link_to "", "#", class: 'command command-insert-unordered-list', data: {:"wysihtml5-command" => "insertUnorderedList", icon: 'F'}
-      = link_to "", spina.wysihtml5_link_admin_page_parts_path(text_form.object.object_id), class: 'command', data: {icon: 'Y'}, remote: true
-      = link_to "", spina.wysihtml5_select_admin_photos_path(text_form.object.object_id), class: 'command', data: {icon: 'V'}, remote: true
+      = link_to "#", class: 'command command-bold', title: "CTRL+B", data: {:"wysihtml5-command" => "bold"} do
+        = icon('bold')
+      = link_to "#", class: 'command command-italic', title: "CTRL+I", data: {:"wysihtml5-command" => "italic"} do
+        = icon('italic')
+      = link_to "#", class: 'command command-insert-unordered-list', data: {:"wysihtml5-command" => "insertUnorderedList"} do
+        = icon('list-ul')
+      = link_to spina.wysihtml5_link_admin_page_parts_path(text_form.object.object_id), class: 'command', remote: true do
+        = icon('link')
+      = link_to spina.wysihtml5_select_admin_photos_path(text_form.object.object_id), class: 'command', remote: true do
+        = icon('picture-o')
 
       .pull-right
         .choose-text-type
@@ -16,6 +21,7 @@
             %li= link_to t('spina.wysiwyg.heading_3'), "#", data: {:"wysihtml5-command" => "formatBlock", :"wysihtml5-command-value" => "h3"}
             %li= link_to t('spina.wysiwyg.quote'), "#", data: {:"wysihtml5-command" => "formatBlock", :"wysihtml5-command-value" => "blockquote"}
 
-        = link_to "", "#", class: 'command action-change-view', data: {:"wysihtml5-action" => "change_view", icon: 'I'}
+        = link_to "#", class: 'command action-change-view', data: {:"wysihtml5-action" => "change_view"} do
+          = icon('code')
 
     = form.text_area :content, placeholder: "#{t 'spina.pages.page_part'} #{text_form.object.name.downcase}", class: 'wysihtml5'

data/app/views/spina/admin/users/_form.html.haml

@@ -44,7 +44,8 @@
         %td
           = f.check_box :admin, data: {switch: 'true'}
 
-  %button.button.button-primary{type: 'submit', data: {icon: 'o'}}
+  %button.button.button-primary{type: 'submit'}
+    = icon('check')
     =t('spina.users.save')
 
   = link_to t('spina.cancel'), spina.admin_users_path, class: 'button button-link'

data/app/views/spina/admin/users/index.html.haml

@@ -1,5 +1,7 @@
 .filters
-  = link_to t('spina.users.new'), spina.new_admin_user_path, class: 'button button-primary', data: {icon: 't'}
+  = link_to spina.new_admin_user_path, class: 'button button-primary' do
+    = icon('plus')
+    = t('spina.users.new')
 
 .table-container
   %table.table
@@ -18,4 +20,7 @@
           %td
             - if user.last_logged_in.present?
               = time_ago_in_words(user.last_logged_in) + " #{t('spina.ago')}"
-          %td= link_to t('spina.edit'), spina.edit_admin_user_path(user), class: 'button button-small', data: {icon: 'q'}
+          %td
+            = link_to spina.edit_admin_user_path(user), class: 'button button-small' do
+              = icon('pencil')
+              = t('spina.edit')

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "0.6.24"
+  VERSION = "0.6.25"
 end

data/test/dummy/app/views/default/pages/homepage.html.erb

@@ -0,0 +1,3 @@
+<h1><%= @page.title %></h1>
+
+<%= @page.content(:content).try(:html_safe) %>

data/test/dummy/app/views/default/pages/show.html.erb

@@ -0,0 +1,3 @@
+<h1><%= @page.title %></h1>
+
+<%= @page.content(:content).try(:html_safe) %>

data/test/dummy/app/views/layouts/default/application.html.erb

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title><%= current_account.name %></title>
+  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
+  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= render 'spina/shared/navigation' %>
+
+<%= yield %>
+
+</body>
+</html>

data/test/dummy/config/initializers/spina.rb

@@ -1,3 +1,3 @@
 Spina::Engine.configure do
-  config.NEGATIVE_CAPTCHA_SECRET = '3f4539dc9dd9352a98acac830c2c006ef2b804c3d8936fdd332dea67f1389e005c0a4caab6f2058873c2a2501b114710d0082f0844eaa5e04f82d7e1ab6915c0'
+  config.NEGATIVE_CAPTCHA_SECRET = '29996c25326cca2a250b561ba1f0bd2f190b7dbe0dfec8be0c593b3f90010f36fccb8ebbf8bd7f9b4ea8c14ebdd84e28f40dda1d05b77de5feb789c9cf108c23'
 end

data/test/dummy/config/initializers/themes/default.rb

@@ -9,10 +9,28 @@ module Spina
     self.page_parts = [{ 
       name: 'content', 
       title: 'Content', 
-      page_partable_type: "Spina::Text" 
+      page_partable_type: "Spina::Text"
+    }, {
+      name: 'structure',
+      title: 'Structuur',
+      page_partable_type: "Spina::Structure"
     }]
 
-    self.structures = []
+    self.structures = {
+      'structure' => [{
+        name: 'name',
+        title: 'Naam',
+        structure_partable_type: "Spina::Line"  
+      }, {
+        name: 'role',
+        title: 'Rol',
+        structure_partable_type: "Spina::Line"
+      }, {
+        name: 'description',
+        title: 'Beschrijving',
+        structure_partable_type: "Spina::Text"
+      }]
+    }
     self.layout_parts = []
     self.custom_pages = []
     self.plugins = []
@@ -26,13 +44,17 @@ module Spina
         title: 'Default',
         description: 'A simple page',
         usage: 'Use for your content',
-        page_parts: ['content']
+        page_parts: ['content', 'structure']
       }
     }
+
+    self.custom_pages = [
+      { name: 'homepage', title: 'Homepage', deletable: false, view_template: 'homepage' }
+    ]
   end
 end
 
 theme = Spina::Theme.new
-theme.name = "Default"
+theme.name = "default"
 theme.config = Spina::DefaultTheme.config
 Spina.register_theme(theme)