scrivito_sdk 0.18.1 → 0.30.0.rc1

data/lib/assets/stylesheets/{scrivito_editing.css → scrivito_sdk.css}

@@ -325,7 +325,7 @@ html.scrivito_bottombar_on {
 .scrivito_menu_box:after,
 .scrivito_menu_box:before {
   bottom: 100%;
-  border: solid transparent;
+  border: solid #222;
   content: " ";
   height: 0;
   width: 0;
@@ -334,7 +334,7 @@ html.scrivito_bottombar_on {
 }
 .scrivito_menu_box:after {
   border-color: rgba(0, 0, 0, 0);
-  border-bottom-color: #3a3a3a;
+  border-bottom-color: rgba(34, 34, 34, 0.9);
   border-width: 7px;
   left: 5px;
   margin-right: -7px;
@@ -382,8 +382,15 @@ html.scrivito_bottombar_on {
   border-top: 1px solid #222;
 }
 .scrivito_menu_separator {
-  height: 2px;
-  background: #222;
+  min-height: 4px;
+  background: rgba(0, 0, 0, 0.4);
+}
+.scrivito_menu_separator span {
+  display: block;
+  font-size: 10px;
+  padding: 3px 4px 2px;
+  color: #aaa;
+  text-shadow: 0 1px 1px #000;
 }
 .scrivito_menu_box .scrivito_menu_item:first-child {
   border-top: none;
@@ -456,6 +463,9 @@ html.scrivito_bottombar_on {
   color: #696969!important;
   cursor: help;
 }
+.scrivito_menu_box .scrivito_menu_item.scrivito_highlight {
+  background: rgba(192, 175, 62, 0.4);
+}
 body.scrivito_editing_active {
   padding-top: 45px;
 }
@@ -622,6 +632,23 @@ body.scrivito_editing_active {
 .scrivito_topbar .scrivito_button_label:first-child {
   padding: 0;
 }
+.scrivito_topbar .scrivito_button_notice {
+  display: block;
+  padding: 0 0 0 3px;
+  margin: -2px 0 0 30px;
+  color: #d3dade;
+  font-size: 9px;
+  line-height: 13px;
+  max-height: 14px;
+  max-width: 180px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+.scrivito_topbar .scrivito_button_notice .scrivito_icon {
+  font-size: 9px;
+  padding: 0 3px 0 0;
+}
 .scrivito_topbar .scrivito_button_bar.scrivito_right {
   float: right;
 }
@@ -938,6 +965,13 @@ body.scrivito_editing_active {
   color: #eee;
   text-shadow: 0 1px 0 #333;
 }
+.scrivito_editing_marker,
+.scrivito_icon,
+.scrivito_editing_marker_title {
+  webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
 .scrivito_editing_marker {
   display: block;
   position: absolute;
@@ -1011,6 +1045,8 @@ body.scrivito_editing_active {
   cursor: move;
 }
 .scrivito_editing_marker .scrivito_editing_marker_title {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-weight: normal;
   display: block;
   position: absolute;
   top: 0;
@@ -2274,9 +2310,10 @@ a.scrivito_button:active {
   text-align: center;
   background: #fff;
 }
-.scrivito_editing_widget_preview .scrivito_editing_widget_visualization i.scrivito_icon {
-  font-size: 80px;
+.scrivito_editing_widget_preview .scrivito_editing_widget_visualization > * {
+  font-size: 110px;
   color: #666;
+  vertical-align: middle;
 }
 .scrivito_editing_widget_preview .scrivito_editing_widget_title {
   font-size: 14px;
@@ -2907,3 +2944,202 @@ html[dir="rtl"] .select2-container-multi .select2-search-choice-close {
   top: 16px;
   right: 0px;
 }
+/*
+
+ */
+
+
+[data-scrivito-field-type="widget"] { min-height: 25px;}
+
+.scrivito_empty_widget_field {
+  -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3) inset;
+  background: rgba(0,0,0,.05);
+  box-shadow: 0 0 5px rgba(0,0,0,.3) inset;
+  min-height: 50px;
+  visibility: visible!important;
+}
+
+.scrivito_widget_drop_placeholder,
+.scrivito_empty_widget_field.scrivito_widget_drop_allowed {
+  -webkit-box-shadow: 0 0 5px rgba(152,187,225,.9) inset;
+  background: rgba(152,187,225,.3);
+  box-shadow: 0 0 5px rgba(152,187,225,.9) inset;
+  max-height: 150px;
+  min-height: 100px;
+  visibility: visible!important;
+}
+
+body.scrivito_editing_active .scrivito_empty_widget_field.scrivito_widget_drop_allowed {
+  max-height: 200px;
+  min-height: 100px;
+}
+
+[data-scrivito-private-widget-id] .scrivito_empty_widget_field { min-height: 100px; }
+
+.ui-sortable-helper { opacity:0.5;}
+
+/* widgets */
+[data-scrivito-display-mode="editing"] *[data-scrivito-widget-obj-class] {
+  -webkit-box-shadow:0 0 0 2px transparent;
+  box-shadow:0 0 0 2px transparent;
+  -webkit-transition: box-shadow linear .3s;
+  transition: box-shadow linear .3s;
+}
+body.scrivito_widget_dragging_active[data-scrivito-display-mode="editing"] *[data-scrivito-widget-obj-class],
+body.scrivito_widget_dragging_active[data-scrivito-display-mode="editing"] *[data-scrivito-widget-obj-class] *[data-scrivito-field-type="widget"],
+[data-scrivito-display-mode="editing"] *[data-scrivito-widget-obj-class]:hover,
+[data-scrivito-display-mode="editing"] *[data-scrivito-widget-obj-class]:hover *[data-scrivito-field-type="widget"] {
+  -webkit-box-shadow:0 0 0 2px #439439;
+  box-shadow:0 0 0 2px #439439;
+  }
+
+body.scrivito_widget_dragging_active[data-scrivito-display-mode="editing"] *[data-scrivito-widget-obj-class] *[data-scrivito-field-type="widget"]:not(.scrivito_empty_widget_field) {
+  min-height: 100px;
+}
+
+/* margin for nested widgets */
+[data-scrivito-display-mode="editing"] *[data-scrivito-widget-obj-class] *[data-scrivito-field-type="widget"],
+[data-scrivito-display-mode="added"] *[data-scrivito-widget-obj-class] *[data-scrivito-field-type="widget"],
+[data-scrivito-display-mode="diff"] [data-scrivito-widget-obj-class] *[data-scrivito-field-type="widget"],
+[data-scrivito-display-mode="deleted"] *[data-scrivito-widget-obj-class] *[data-scrivito-field-type="widget"] { margin-top: 35px;}
+
+/* highlight cms fields */
+[data-scrivito-display-mode="editing"] *[data-scrivito-field-type="string"],
+[data-scrivito-display-mode="editing"] *[data-scrivito-field-type="text"],
+[data-scrivito-display-mode="editing"] *[data-scrivito-field-type="html"],
+[data-scrivito-display-mode="editing"] *[data-scrivito-field-type="reference"],
+[data-scrivito-display-mode="editing"] *[data-scrivito-field-type="referencelist"],
+[data-scrivito-display-mode="editing"] *[data-scrivito-field-type="linklist"],
+[data-scrivito-display-mode="editing"] *[data-scrivito-field-type="enum"],
+[data-scrivito-display-mode="editing"] *[data-scrivito-field-type="multienum"],
+[data-scrivito-display-mode="editing"] *[data-scrivito-field-type="date"] {
+  outline: 2px dotted transparent;
+  -webkit-transition: outline-color linear .3s;
+  transition: outline-color linear .3s;
+}
+
+/* highlight cms fields on hover */
+[data-scrivito-display-mode="editing"] *[data-scrivito-field-type="string"]:hover,
+[data-scrivito-display-mode="editing"] *[data-scrivito-field-type="text"]:hover,
+[data-scrivito-display-mode="editing"] *[data-scrivito-field-type="html"]:hover,
+[data-scrivito-display-mode="editing"] *[data-scrivito-field-type="reference"]:hover,
+[data-scrivito-display-mode="editing"] *[data-scrivito-field-type="referencelist"]:hover,
+[data-scrivito-display-mode="editing"] *[data-scrivito-field-type="linklist"]:hover,
+[data-scrivito-display-mode="editing"] *[data-scrivito-field-type="enum"]:hover,
+[data-scrivito-display-mode="editing"] *[data-scrivito-field-type="multienum"]:hover,
+[data-scrivito-display-mode="editing"] *[data-scrivito-field-type="date"]:hover {
+  outline: 2px dotted #439439;
+}
+
+/* highlight unmodified but moved widgets */
+[data-scrivito-private-widget-placement-modification="deleted"] {
+  -webkit-box-shadow:0 0 0 2px #808080;
+  box-shadow:0 0 0 2px #808080;
+  }
+
+[data-scrivito-private-widget-placement-modification="deleted"] * {
+  opacity:.7;
+}
+
+[data-scrivito-private-widget-placement-modification="deleted"] .scrivito_editing_marker,
+[data-scrivito-private-widget-placement-modification="deleted"] .scrivito_editing_marker .scrivito_icon,
+[data-scrivito-private-widget-modification="edited"][data-scrivito-private-widget-placement-modification="deleted"] * {
+  opacity:1;
+}
+
+/* highlight modified "edited" cms widget */
+[data-scrivito-private-widget-modification="edited"],
+[data-scrivito-private-child-list-modification="edited"],
+[data-scrivito-private-widget-placement-modification="new"] {
+  -webkit-box-shadow:0 0 0 2px #4f749d;
+  box-shadow:0 0 0 2px #4f749d;
+  }
+/* highlight modified "added" cms widget */
+[data-scrivito-private-widget-modification="new"], [data-scrivito-private-obj-modification="new"] {
+  -webkit-box-shadow:0 0 0 2px #4c8c07;
+  box-shadow:0 0 0 2px #4c8c07;
+  }
+/* highlight modified "deleted" cms widget */
+[data-scrivito-private-widget-modification="deleted"], [data-scrivito-private-obj-modification="deleted"] {
+  -webkit-box-shadow:0 0 0 2px #ff1f01;
+  box-shadow:0 0 0 2px #ff1f01;
+  }
+
+
+/* highlight modified "edited" cms fields */
+[data-scrivito-field-type="widget"] *[data-scrivito-field-modification="edited"],
+[data-scrivito-field-type="widget"] *[data-scrivito-field-modification="new"] ,
+[data-scrivito-field-type="widget"] *[data-scrivito-field-modification="deleted"] {
+  outline: 2px dotted transparent;
+  -webkit-transition: outline-color linear .3s;
+  transition: outline-color linear .3s;
+}
+
+*[data-scrivito-field-modification="edited"],
+[data-scrivito-field-type="widget"]:hover *[data-scrivito-field-modification="edited"],
+.scrivito_details_dialog *[data-scrivito-field-modification="edited"] {
+  outline: 2px dotted #4f749d;
+  outline: 2px dotted rgba(79, 116, 157, 1);
+}
+/* highlight modified "added" cms fields */
+[data-scrivito-field-type="widget"]:hover *[data-scrivito-field-modification="new"],
+.scrivito_details_dialog *[data-scrivito-field-modification="new"]{
+  outline: 2px dotted #4c8c07;
+  outline: 2px dotted rgba(76, 140, 7, 1);
+}
+/* highlight modified "deleted" cms fields */
+[data-scrivito-field-type="widget"]:hover *[data-scrivito-field-modification="deleted"],
+.scrivito_details_dialog *[data-scrivito-field-modification="deleted"]{
+  outline: 2px dotted #ff1f01;
+  outline: 2px dotted rgba(255, 31, 1, 1);
+}
+
+/* highlight ins and del tags in cms fields with textual diff */
+[data-scrivito-field-type="string"] .scrivito_insertion,
+[data-scrivito-field-type="html"] .scrivito_insertion,
+[data-scrivito-field-type="text"] .scrivito_insertion {
+  background-color: rgba(76, 140, 7, 0.3);
+}
+[data-scrivito-field-type="string"] .scrivito_deletion,
+[data-scrivito-field-type="html"] .scrivito_deletion,
+[data-scrivito-field-type="text"] .scrivito_deletion {
+  background-color: rgba(255, 31, 1, 0.3);
+}
+
+/* scrivito_editing_marker edit colors */
+.scrivito_editing_marker {background: #439439; background:rgba(67, 148, 57, .5);}
+.scrivito_editing_marker:hover,
+.scrivito_editing_marker:active { background: #439439; background: rgba(67, 148, 57, 1); }
+
+[data-scrivito-display-mode="editing"] [data-scrivito-private-child-list-path]:hover > .scrivito_editing_marker,
+[data-scrivito-display-mode="editing"] [data-scrivito-widget-obj-class]:hover > .scrivito_editing_marker {
+  background: #439439; background: rgba(67, 148, 57, 1);
+}
+
+/* scrivito_editing_marker edited/new/deleted colors */
+[data-scrivito-private-widget-modification="edited"] .scrivito_editing_marker,
+[data-scrivito-private-widget-modification="edited"] .scrivito_editing_marker .scrivito_editing_marker_title,
+[data-scrivito-field-modification="edited"] .scrivito_editing_marker,
+[data-scrivito-private-widget-modification="edited"][data-scrivito-private-widget-placement-modification="new"] .scrivito_editing_marker,
+[data-scrivito-private-widget-modification="edited"][data-scrivito-private-widget-placement-modification="deleted"] .scrivito_editing_marker {
+  background: #4f749d;
+}
+
+[data-scrivito-private-widget-modification="new"] .scrivito_editing_marker,
+[data-scrivito-private-widget-modification="new"] .scrivito_editing_marker .scrivito_editing_marker_title,
+[data-scrivito-field-modification="new"] .scrivito_editing_marker,
+[data-scrivito-private-widget-modification="new"][data-scrivito-private-widget-placement-modification="new"] .scrivito_editing_marker {
+  background: #4c8c07;
+}
+[data-scrivito-private-widget-modification="deleted"] .scrivito_editing_marker,
+[data-scrivito-private-widget-modification="deleted"] .scrivito_editing_marker .scrivito_editing_marker_title,
+[data-scrivito-field-modification="deleted"] .scrivito_editing_marker,
+[data-scrivito-private-widget-modification="deleted"][data-scrivito-private-widget-placement-modification="deleted"] .scrivito_editing_marker {
+  background: #ff1f01;
+}
+
+/* scrivito_editing_marker colors for unmodified but moved widgets */
+:not([data-scrivito-private-widget-modification])[data-scrivito-private-widget-placement-modification="deleted"] .scrivito_editing_marker,
+:not([data-scrivito-private-widget-modification])[data-scrivito-private-widget-placement-modification="deleted"] .scrivito_editing_marker .scrivito_editing_marker_title {
+  background: #808080;
+}

data/lib/generators/scrivito/install/install_generator.rb

@@ -0,0 +1,62 @@
+module Scrivito
+  module Generators
+    class InstallGenerator < ::Rails::Generators::Base
+      include ::Rails::Generators::Migration
+
+      source_root File.expand_path('../templates', __FILE__)
+
+      def self.next_migration_number(dirname)
+        migration_number = current_migration_number(dirname) + 1
+        [Time.now.utc.strftime('%Y%m%d%H%M%S'), '%.14d' % migration_number].max
+      end
+
+      def copy_initializer
+        copy_file 'config/initializers/scrivito.rb'
+      end
+
+      def copy_obj_and_widget_model
+        copy_file 'app/models/obj.rb'
+        copy_file 'app/models/widget.rb'
+      end
+
+      def copy_cms_controller
+        copy_file 'app/controllers/cms_controller.rb'
+      end
+
+      def copy_migration
+        destination_path = File.join(Scrivito::Configuration.migration_path, 'install_scrivito.rb')
+        migration_template 'scrivito/migrate/install_scrivito.rb', destination_path
+      end
+
+      def copy_page_resources
+        copy_file 'app/models/page.rb'
+        copy_file 'app/controllers/page_controller.rb'
+        copy_file 'app/views/page/details.html.erb'
+        copy_file 'app/views/page/index.html.erb'
+        copy_file 'app/views/page/thumbnail.html.erb'
+      end
+
+      def copy_image_resources
+        copy_file 'app/models/image.rb'
+      end
+
+      def copy_headline_widget_resources
+        copy_file 'app/models/headline_widget.rb'
+        copy_file 'app/views/headline_widget/show.html.erb'
+        copy_file 'app/views/headline_widget/thumbnail.html.erb'
+      end
+
+      def copy_text_widget_resources
+        copy_file 'app/models/text_widget.rb'
+        copy_file 'app/views/text_widget/show.html.erb'
+        copy_file 'app/views/text_widget/thumbnail.html.erb'
+      end
+
+      def copy_image_widget_resources
+        copy_file 'app/models/image_widget.rb'
+        copy_file 'app/views/image_widget/show.html.erb'
+        copy_file 'app/views/image_widget/thumbnail.html.erb'
+      end
+    end
+  end
+end

data/lib/generators/scrivito/install/templates/app/controllers/cms_controller.rb

@@ -0,0 +1,3 @@
+class CmsController < ApplicationController
+  include Scrivito::ControllerActions
+end

data/lib/generators/scrivito/install/templates/app/controllers/page_controller.rb

@@ -0,0 +1,2 @@
+class PageController < CmsController
+end

data/lib/generators/scrivito/install/templates/app/models/headline_widget.rb

@@ -0,0 +1,7 @@
+class HeadlineWidget < Widget
+  #
+  # HeadlineWidget (not binary)
+  #
+  #   headline :string
+  #
+end

data/lib/generators/scrivito/install/templates/app/models/image.rb

@@ -0,0 +1,5 @@
+class Image < Obj
+  #
+  # Image (binary)
+  #
+end

data/lib/generators/scrivito/install/templates/app/models/image_widget.rb

@@ -0,0 +1,7 @@
+class ImageWidget < Widget
+  #
+  # ImageWidget (not binary)
+  #
+  #   image  :reference
+  #
+end

data/lib/generators/scrivito/install/templates/app/models/obj.rb

@@ -0,0 +1,2 @@
+class Obj < Scrivito::BasicObj
+end

data/lib/generators/scrivito/install/templates/app/models/page.rb

@@ -0,0 +1,8 @@
+class Page < ::Obj
+  #
+  # Page (not binary)
+  #
+  #   title   :string
+  #   content :widgets
+  #
+end

data/lib/generators/scrivito/install/templates/app/models/text_widget.rb

@@ -0,0 +1,7 @@
+class TextWidget < Widget
+  #
+  # TextWidget (not binary)
+  #
+  #   content :html
+  #
+end

data/lib/generators/scrivito/install/templates/app/models/widget.rb

@@ -0,0 +1,2 @@
+class Widget < Scrivito::BasicWidget
+end

data/lib/generators/scrivito/install/templates/app/views/headline_widget/show.html.erb

@@ -0,0 +1 @@
+<%= scrivito_tag :h2, widget, :headline %>

data/lib/generators/scrivito/install/templates/app/views/headline_widget/thumbnail.html.erb

@@ -0,0 +1,3 @@
+<%= scrivito_thumbnail 'Headline Widget', :headline do %>
+  A headline widget.
+<% end %>

data/lib/generators/scrivito/install/templates/app/views/image_widget/show.html.erb

@@ -0,0 +1 @@
+<%= scrivito_image_tag widget, :image %>

data/lib/generators/scrivito/install/templates/app/views/image_widget/thumbnail.html.erb

@@ -0,0 +1,3 @@
+<%= scrivito_thumbnail 'Image Widget', :image do %>
+  A widget with an image.
+<% end %>

data/lib/generators/scrivito/install/templates/app/views/page/details.html.erb

@@ -0,0 +1 @@
+<%= scrivito_tag :div, @obj, :title %>

data/lib/generators/scrivito/install/templates/app/views/page/index.html.erb

@@ -0,0 +1,16 @@
+<div>
+  <p><%= link_to 'Home', scrivito_path(Obj.homepage) %></p>
+
+  <%= scrivito_tag_list :ul, Obj.homepage, :toclist do |list, page| %>
+    <%= list.tag :li do %>
+      <%= link_to page[:title].presence || '(Untitled)', scrivito_path(page) %>
+    <% end %>
+  <% end %>
+
+  <% if Obj.homepage.toclist.empty? && scrivito_in_editable_view? %>
+    <p>(Hint: Click on the Scrivito icon to the right to create the first subpage.)</p>
+  <% end %>
+</div>
+
+<%= scrivito_tag :h1, @obj, :title %>
+<%= scrivito_tag :div, @obj, :body %>