scrivito_sdk 0.40.0 → 0.41.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f47f2f02b39eb33fc827fe70fc6e8811176d223
-  data.tar.gz: 01f242b21b1009bb2eb015926fafa41c6213e65c
+  metadata.gz: 89a64283aa9e79b8a6c8ced8a53b72a081935820
+  data.tar.gz: 2ed35eb7b75e516209295ea0178c424e2e9cdd1e
 SHA512:
-  metadata.gz: 8e7bccf5971954d0949156785a15f2c502d9f046859acb284fe4005ed285f80113d89d55cb43f29d505e658e3d46eaf12bae80fa0d0d8cd9991f4fb041be4fb4
-  data.tar.gz: 30ed9d04932dd45eda4e6e7b9b9760fb54c78049007372ea7989dbeb6ae236c737782f9d7e0bd0dedd4619d6b1a78748d4cc7f8008e6f2af18fc26675c9e0872
+  metadata.gz: e1f36dfc18acfdf77dd15ab6ea51dee7b9958fdf04517207e2735532b3dc4c5352cd58926bf612a25ba760c7e4f543cb36ee89d4aec25362fc9b4e04060511c6
+  data.tar.gz: 66b0024d79000f5966cd3c6aa0bb337f0ee0ca4018d4e751aa0ff93719e6f131748f4ebacbfffdf41740224ac127becd1ba592db19333a24395083ca7f2eca4f

data/app/controllers/scrivito/objs_controller.rb

@@ -189,7 +189,7 @@ module Scrivito
     end
 
     def valid_widget_classes
-      (widget_classes_from_widget || widget_classes_from_obj || Widget.descendants).map(&:to_s)
+      (widget_classes_from_widget || widget_classes_from_obj || widget_descendants).map(&:to_s)
     end
 
     def widget_classes_from_widget
@@ -202,6 +202,10 @@ module Scrivito
       current_obj.valid_widget_classes_for(params[:field_name])
     end
 
+    def widget_descendants
+      Widget.descendants.reject(&:hide_from_widget_class_selection?)
+    end
+
     def assert_dialog_layout
       view_context.lookup_context.find('layouts/scrivito_dialog')
     rescue ActionView::MissingTemplate

data/app/helpers/scrivito_helper.rb

@@ -8,32 +8,42 @@ module ScrivitoHelper
   include Scrivito::RoutingHelper
 
   #
-  # Returns an HTML block tag containing content from an Obj.
-  # Add HTML attributes by passing an attributes hash to options.
-  # The helper method is somewhat similar to (and internally uses)
+  # Renders a field within the given HTML tag.
+  #
+  # This method also renders additional attributes, which are needed for in-place editing.
+  # These attributes are only rendered when appropriate, i.e. not for a regular visitor.
+  #
+  # The helper is similar to (and internally uses)
   # http://api.rubyonrails.org/classes/ActionView/Helpers/TagHelper.html#method-i-content_tag.
+  # You can add additional HTML attributes by passing them in +html_options+.
   #
   # @api public
   #
-  # This helper method also renders additional data attributes, which are needed for inplace editing.
-  # These attributes are only rendered when appropriate, i.e. not for a regular visitor.
+  # @note If the param +field_name+ is of type +widget+, then +tag_name+ must be a block tag,
+  #   like +div+ or +h1+. An inline tag like +p+ or +span+ could result in broken HTML output, since
+  #   the widgets are rendered within block tags.
   #
-  # @param tag_name [String, Symbol] Name of the html tag (e.g. +:h1+ or +:div+).
+  # @param tag_name [String, Symbol] Name of the HTML tag (e.g. +:h1+ or +:div+).
+  #   If the param +field_name+ is of type +widget+, then +tag_name+ must be a block tag,
+  #   like +div+ or +h1+. An inline tag like +p+ or +span+ could result in broken HTML output, since
+  #   the widgets are rendered within block tags.
   # @param obj_or_widget [Scrivito::BasicObj, Scrivito::BasicWidget] A {Scrivito::BasicObj}
   #   or {Scrivito::BasicWidget} from which the +field_name+ is read.
   # @param field_name [String, Symbol] Which field of the Obj should be rendered.
   # @param html_options [Hash] HTML options to be passed to +content_tag+.
   # @param block [Proc] Optional block to render inner HTML. If none given the value of attribute
   #   will be rendered instead. +block+ is not allowed for fields of type +widget+.
+  #
   # @raise ArgumentError if the field behind +field_name+ is of type +widget+ and a +block+ is given.
-  # @return [String] The rendered html tag
   #
-  # @example Renders an <h2> tag containing the text of the +headline+ attribute of +@obj+ and assigns the tag a css class called +very_important+.
+  # @return [String] The rendered HTML tag.
+  #
+  # @example Renders an <h2> tag containing the text of the +headline+ attribute of +@obj+ and assigns the tag a css class called +very_important+
   #     <%= scrivito_tag :h2, @obj, :headline, class: "very_important" %>
   #
-  # @example Renders an <h2> tag containing an escaped +headline+.
-  #     <%= scrivito_tag :h2, @obj, :headline do %>
-  #       <%= strip_tags @obj.headline %>
+  # @example Renders an <h2> tag containing a truncated +headline+ of the +widget+
+  #     <%= scrivito_tag :h2, widget, :headline do %>
+  #       <%= truncate widget.headline %>
   #     <% end %>
   #
   # @example Render a download link for a PDF document
@@ -44,6 +54,7 @@ module ScrivitoHelper
   #         Drop PDF here to upload
   #       <% end %>
   #     <% end %>
+  #
   def scrivito_tag(tag_name, obj_or_widget, field_name, html_options = {}, &block)
     Scrivito::CmsFieldTag.new(
       self, tag_name, obj_or_widget, field_name.to_s

data/app/models/scrivito/content_widget.rb

@@ -0,0 +1,11 @@
+module Scrivito
+  class ContentWidget < ::Widget
+    def self.hide_from_widget_class_selection?
+      true
+    end
+
+    def description_for_editor
+      content.try(:description_for_editor).presence || 'Content Widget'
+    end
+  end
+end

data/app/views/scrivito/content_widget/show.html.erb

@@ -0,0 +1,7 @@
+<% if content = widget.content %>
+  <% if lookup_context.exists?(content.embed_view_path) %>
+    <%= render template: content.embed_view_path, locals: {obj: content} %>
+  <% else %>
+    <%= content.display_title %>
+  <% end %>
+<% end %>

data/config/ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Mon Jan 26 18:22:57 2015
+## Certificate data from Mozilla as of: Thu Feb  5 15:33:13 2015
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates

data/config/cms_routes.rb

@@ -4,7 +4,9 @@ Rails.application.routes.draw do
   get '__scrivito/render_widget/:id/show_widget/:widget_id' => 'scrivito/cms_dispatch#show_widget'
   get '__scrivito/render_widget/:id/widget_details/:widget_id' => 'scrivito/cms_dispatch#widget_details'
 
-  get '/__scrivito/details_page/:resource_id' => 'scrivito/cms_dispatch#details_page'
+  get '__scrivito/page_details/:id' => 'scrivito/cms_dispatch#page_details'
+
+  get '/__scrivito/resource_details/:resource_id' => 'scrivito/cms_dispatch#resource_details'
 
   match ':id(/*slug)',
     to: 'scrivito/cms_dispatch#index',

data/config/routes.rb

@@ -7,7 +7,6 @@ Rails.application.routes.draw do
     end
 
     member do
-      get :details
       get :widget_class_selection
       get :modification
       get :widget_modification

data/lib/assets/javascripts/scrivito_sdk.js

@@ -11,7 +11,7 @@
         if (scrivito_ui.is_inited()) {
           if (!dom_config) {
             // UI is already running, but editing is not allowed: reload UI to make it disappear.
-            window.parent.location.reload();
+            window.parent.location = window.location;
           }
         } else {
           if (!dom_config) {