scrivito_section_widgets 0.0.4 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5affc5d46f8c510e4855ba97acf632116f8402a
-  data.tar.gz: 885af4fb52c5d5331ffc97060e67568170bfd608
+  metadata.gz: 616d63e48368d3f48eb4eb38edb6e6fd30dd675c
+  data.tar.gz: 41f608e0eb89408fd25f09f3916c14210fef2791
 SHA512:
-  metadata.gz: fa369024944052c5e720956b6af46f33eca289ae0656069c36f74a554c5122bc1a123925c4564b02774a6f824cd5cf3d2a6f06be7dd1be0b0174fe6357740627
-  data.tar.gz: b5df7e846f02ee924b9095a3d91a173dc7c72244855a60c465af21db986e4a4b0d2e2ec4906028721080405979b876d5211f5c0c5adde4cf0c21feb012ab3c7e
+  metadata.gz: 5771956349f3c1702c3d0c17cad8ae9624da23b251da23047e8c2078d039fd99ea580cf8d345fd3d71b6a41f3be6d743905ee8e8ad6d066cfa2a50cab191a87f
+  data.tar.gz: 9250834f2f8427ad44cceba2c6c6f528a2fd9bef7d83bf56aafae6b9a4464b66c1009aad9b57c52249341e8752c209778487e1f08e848e7109dc8a88198a3999

data/app/assets/javascripts/scrivito_section_widgets/parallax.js

@@ -6,33 +6,36 @@ $(function(){
    || window.msRequestAnimationFrame
    || function(f){setTimeout(f, 1000/60)}
 
-  var elems = [];
+  var elems = $(".parallax-image");
 
   if($('body').width() > 1024) {
-    $(".parallax-image").each(function() {
-      var elem = $(this);
-
-      set_background_position(elem);
-      set_dimension(elems);
-
-      elems.push(elem);
-    });
+    set_background_positions(elems);
 
     $(window).on('scroll', function(event) {
-      window.requestAnimationFrame(function(){ set_background_positions(elems) });
-    });
-
-    $(window).on('resize', function(event) {
-      window.requestAnimationFrame(function(){ set_dimension(elems) });
+      window.requestAnimationFrame(function(){ set_background_positions(elems); });
     });
+  } else {
+    set_dimension(elems);
   }
+
+  $(window).on('resize', function(event) {
+    set_dimension(elems);
+  });
 });
 
 function set_dimension(elems) {
   var height = 0;
+  var container = null;
+
   $.each(elems, function(i, elem) {
-    height = $(elem).parents('.parallax').height();
-    $(elem).css('height', height * 2);
+    container = $(elem).parents('.parallax');
+    height = $(elem).get(0).clientHeight / 1.3;
+
+    if(height > 0) {
+      container.css({
+        'height': height,
+      });
+    }
   });
 }
 
@@ -59,5 +62,5 @@ function calulate_position(elem) {
 }
 
 function caluclate_offset(elem) {
-  return window.pageYOffset - elem.offset().top;
+  return window.pageYOffset - $(elem).offset().top;
 }

data/app/assets/javascripts/scrivito_section_widgets.js

@@ -0,0 +1,13 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require_tree ./scrivito_section_widgets

data/app/assets/stylesheets/scrivito_section_widgets/colors.css

@@ -0,0 +1,65 @@
+/* background colors */
+.transparent {
+  background-color: transparent !important;
+}
+
+.black {
+  background-color: #33312d !important;
+}
+
+.gray {
+  background-color: #a0a0a0 !important;
+}
+
+.light-gray {
+  background-color: #eee !important;
+}
+
+.red {
+  background-color: #c5463f !important;
+}
+
+.green {
+  background-color: #439439 !important;
+}
+
+.blue {
+  background-color: #3f86ac !important;
+}
+
+.yellow {
+  background-color: #e1d00e !important;
+}
+
+/* icon colors */
+i.transparent {
+  color: transparent !important;
+}
+
+i.black {
+  color: #33312d !important;
+}
+
+i.gray {
+  color: #a0a0a0 !important;
+}
+
+i.light-gray {
+  color: #eee !important;
+}
+
+i.red {
+  color: #c5463f !important;
+}
+
+i.green {
+  color: #439439 !important;
+}
+
+i.blue {
+  color: #3f86ac !important;
+}
+
+i.yellow {
+  color: #e1d00e !important;
+}

data/app/assets/stylesheets/scrivito_section_widgets/parallax_section.css

@@ -8,9 +8,7 @@
   position: absolute;
   top: 0;
   width: 100%;
-  height: 100vh;
-  background-size: cover;
-  background-position: center center;
+  height: auto;
 }
 
 .scrivito_section_video_widget video {

data/app/assets/stylesheets/scrivito_section_widgets.css

@@ -0,0 +1,3 @@
+/*
+ *= require_tree ./scrivito_section_widgets
+ */

data/app/models/section_content_widget.rb

@@ -1,2 +1,15 @@
 class SectionContentWidget < Widget
+
+  def selectable_color_classes(class_name, attribute)
+    if Obj.respond_to?('selectable_color_classes')
+      Obj.selectable_color_classes(class_name, attribute)
+    else
+      IconBoxWidget.fallback_colors
+    end
+  end
+
+  private 
+  def self.fallback_colors
+    %w(transparent black gray light-gray red green blue yellow)
+  end
 end

data/app/views/section_content_widget/details.html.erb

@@ -1,6 +1,6 @@
 <div class="details-view" >
   <h4>Background Color</h4>
-  <%= scrivito_toggle_button_editor widget, :background_color, Obj.selectable_color_classes('scrivito_content_widget') do |text| %>
+  <%= scrivito_toggle_button_editor widget, :background_color, widget.selectable_color_classes('scrivito_content_widget', 'background_color') do |text| %>
     <% scrivito_tag(:button, widget, :background_color, class: text, data: {editor: 'scrivito-toggle-button', content: text}) do
         text
       end %>

data/app/views/section_parallax_widget/show.html.erb

@@ -1,4 +1,4 @@
-<section class="parallax scrivito_section_parallax_widget" style="height: <%= widget.height %>">
-  <div class="parallax-image" style="background-image: url(<%= widget.background_image.try(:binary_url) %>)"></div>
+<section class="parallax scrivito_section_parallax_widget" style="height: <%= widget.height %>; max-height: <%= widget.height %>">
+  <%= scrivito_image_tag widget, :background_image, class: "parallax-image" %>
   <%= scrivito_tag(:div, widget, :section_content, class: 'container') %>
 </section>

data/lib/scrivito_section_widgets/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoSectionWidgets
-  VERSION = "0.0.4"
+  VERSION = "0.0.8"
 end

data/scrivito/migrate/0_create_section_widgets.rb

@@ -38,13 +38,15 @@ class CreateSectionWidgets < ::Scrivito::Migration
       ]
     )
 
-    Scrivito::ObjClass.create(
-      name: 'Video',
-      type: 'generic',
-      is_binary: true,
-      title: 'Video',
-      attributes: []
-    )
+    unless Scrivito::ObjClass.all.to_a.select {|a| a.name == "Video"}.empty?
+      Scrivito::ObjClass.create(
+        name: 'Video',
+        type: 'generic',
+        is_binary: true,
+        title: 'Video',
+        attributes: []
+      )
+    end
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_section_widgets
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.8
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -50,11 +50,14 @@ files:
 - app/assets/images/section_content.png
 - app/assets/images/section_parallax.png
 - app/assets/images/section_video.png
+- app/assets/javascripts/scrivito_section_widgets.js
 - app/assets/javascripts/scrivito_section_widgets/parallax.js
 - app/assets/javascripts/scrivito_section_widgets/scripts.js
 - app/assets/javascripts/scrivito_section_widgets/video_content_browser.js
 - app/assets/javascripts/scrivito_section_widgets/video_control.js
+- app/assets/stylesheets/scrivito_section_widgets.css
 - app/assets/stylesheets/scrivito_section_widgets/bootstrap_sectionize.css
+- app/assets/stylesheets/scrivito_section_widgets/colors.css
 - app/assets/stylesheets/scrivito_section_widgets/parallax_section.css
 - app/assets/stylesheets/scrivito_section_widgets/styles.css
 - app/models/section_content_widget.rb