sunrise-cms 1.0.0 → 1.0.1

data/app/views/sunrise/manager/_field.html.erb

@@ -1,7 +1,9 @@
 <% options ||= {} %>
 <%= content_tag :div, field.html_options do -%>
   <% if field.visible?(form.object) -%>
-    <% if field.nested? -%>
+    <% if field.block_given? %>
+      <%= field.block.call(form, @record) %>
+    <% elsif field.nested? -%>
       <div class="nested">
         <div class="title-switcher up"><%= form.label field.name %></div>
         

data/lib/generators/sunrise/templates/config/seeds.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 def insert_user  
-  User.truncate!
+  User.delete_all
   password = Rails.env.production? ? Devise.friendly_token : (1..9).to_a.join
   
   admin = User.new do |u|
@@ -20,7 +20,7 @@ def insert_user
 end
 
 def insert_structures
-  Structure.truncate!
+  Structure.delete_all
   
   main_page = Structure.create!(title: "Главная страница", slug: "main-page", structure_type: StructureType.main, parent: nil)
   # Structure.create!(title: "Трансляции", slug: "broadcasts", structure_type: StructureType.broadcasts, parent: main_page)

data/lib/sunrise/config/field.rb

@@ -10,8 +10,11 @@ module Sunrise
       
       # The condition that must *not* be met on an object
       attr_reader :unless_condition
+
+      # Store form block
+      attr_reader :block
       
-      def initialize(abstract_model, parent, options = {})
+      def initialize(abstract_model, parent, options = {}, &block)
         options = {:multiply => false, :sort => false}.merge(options)
 
         super(abstract_model, parent, options)
@@ -19,6 +22,11 @@ module Sunrise
         # Build conditionals
         @if_condition = options.delete(:if)
         @unless_condition = options.delete(:unless)
+        @block = block
+      end
+
+      def block_given?
+        !block.nil?
       end
       
       def visible?(object = nil)

data/lib/sunrise/config/has_fields.rb

@@ -12,9 +12,9 @@ module Sunrise
       end
       
       # Defines a configuration for a field.
-      def field(name, options = {})
+      def field(name = :custom, options = {}, &block)
         options = { :name => name.to_sym }.merge(options)
-        fields << Field.new(abstract_model, self, options)
+        fields << Field.new(abstract_model, self, options, &block)
       end
 
       # Defines a configuration for a nested attributes

data/lib/sunrise/config/nested_field.rb

@@ -10,9 +10,9 @@ module Sunrise
       end
       
       # Defines a configuration for a field.
-      def field(name, options = {})
+      def field(name = :custom, options = {}, &block)
         options = { :name => name.to_sym }.merge(options)
-        fields << Field.new(abstract_model, self, options)
+        fields << Field.new(abstract_model, self, options, &block)
       end
 
       def nested?

data/lib/sunrise/version.rb

@@ -1,3 +1,3 @@
 module Sunrise
-  VERSION = "1.0.0".freeze
+  VERSION = "1.0.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunrise-cms
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Igor Galeta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -415,7 +415,6 @@ files:
 - app/assets/images/sunrise/vline.gif
 - app/assets/javascripts/sunrise/application.js
 - app/assets/javascripts/sunrise/chosen.jquery.js
-- app/assets/javascripts/sunrise/chosen.overflow.fix.js
 - app/assets/javascripts/sunrise/jquery-ui-timepicker-addon.js
 - app/assets/javascripts/sunrise/jquery.cookie.js
 - app/assets/javascripts/sunrise/jquery.ddmenu.js.coffee

data/app/assets/javascripts/sunrise/chosen.overflow.fix.js

@@ -1,66 +0,0 @@
-/* 
-  Chosen gets "cut" when placed in area with "overflow:hidden".
-  https://github.com/harvesthq/chosen/issues/86#issuecomment-11632999 
-*/
-Chosen.prototype.results_reposition = function() {
-  var dd_top, offset, scrolly, toppy;
-
-  dd_top = this.is_multiple ? this.container.height() : this.container.height() - 1;
-
-  // when in a modal get the scroll distance and apply to top of .chzn-drop
-  offset = this.container.offset();
-  scrolly = parseInt($(window).scrollTop(), 10);
-  scrolly = scrolly < 0 ? 0 : scrolly;
-  toppy = offset.top+ dd_top - scrolly;
-
-  this.dropdown.css({
-    "top": toppy + "px",
-    "left": offset.left + "px"
-  });
-};
-
-Chosen.prototype.results_show = function() {
-  var dd_top;
-  var self = this;
-
-  // hide .chzn-drop when the window resizes else it will stay fixed with previous top and left coordinates
-  $(window).resize(function() {
-    self.results_hide();
-  });
-
-  if (!this.is_multiple) {
-    this.selected_item.addClass("chzn-single-with-drop");
-    if (this.result_single_selected) {
-      this.result_do_highlight(this.result_single_selected);
-    }
-  } else if (this.max_selected_options <= this.choices) {
-    this.form_field_jq.trigger("liszt:maxselected", {
-      chosen: this
-    });
-    return false;
-  }
-  dd_top = this.is_multiple ? this.container.height() : this.container.height() - 1;
-  this.form_field_jq.trigger("liszt:showing_dropdown", {
-    chosen: this
-  });
-
-  if($('.post-edit-holder').length) {
-    this.results_reposition();
-
-    $(window).scroll(function() {
-      if (self.results_showing) {
-        self.results_reposition();
-      }
-    });
-  } else {
-    this.dropdown.css({
-      "top": dd_top + "px",
-      "left": 0
-    });
-  }
-
-  this.results_showing = true;
-  this.search_field.focus();
-  this.search_field.val(this.search_field.val());
-  return this.winnow_results();
-};