sunrise-cms 1.0.0.rc3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f16976245e13fe93bc1c0de8d3f07e0925dea26e
-  data.tar.gz: b973a2726856b5732fef592accf355a1aaaf9b6e
+  metadata.gz: 2819a7488e62a5f523822bdca65a69cb2f5fd6e7
+  data.tar.gz: 0bec11e0682db1e225acc930db2c9d51ebfa4d5f
 SHA512:
-  metadata.gz: 4fd90d5b0a8d6139fc3f3a69ca1c6a65b72edc728755a4bdefb27383fbeb3327ef197632534a6b95536374da21b68fa5cd5d4b284219700cdab30386c7ebf41a
-  data.tar.gz: dd1b9a847686bc41a4e415b2fc92989a150c9be553036096aeeea70623819743fec770876d99e18f6ceb0fb0f7e815ef4df5c1cfeded121395079ca22f3c8f9c
+  metadata.gz: 86b59f3ff4fc1276e849d80e19afe0b5b03d54caf5c414fd2f06d2b4e5ce69900495b4f0e89a2b813cc4a889e6fd6d9a4a457798963fb80632cf68af38931b9c
+  data.tar.gz: 2bad669260567f6e11729ffeca563e55da0e5270ece2cfec22138a9d34e96e1e923fe893db96382820e2c82112aca271c09ea92795768ddae1d9da8aa56cfee8

data/README.md

@@ -99,6 +99,11 @@ class SunriseProduct < Sunrise::AbstractModel
         field :total_stock, :html => { :style => 'width:100%;clear:both;' }
         field :item_model_id, :collection => lambda { ItemModel.all }, :include_blank => false
       end
+
+      nested_attributes :project_fields, multiply: true, sort: true do
+        field :name
+        field :value
+      end
     
       field :picture, :as => :uploader
     end

data/app/assets/javascripts/sunrise/manage.js.coffee

@@ -166,6 +166,26 @@ class Sunrise
 
     $(link).closest("div.nested_item").hide()
 
+  initSortFields: (dom_id) ->
+    container = $(dom_id)
+
+    container.sortable
+      cursor: 'move'
+      handle: '.nested_input_handle'
+      items: '.nested_item'
+      opacity: 0.8
+      update: (event, ui) => 
+        this.updateSortField(event, ui)
+
+    container.disableSelection()
+
+  updateSortField: (event, ui) ->
+    element = $(ui.item)
+    container = element.parents('div.nested')
+
+    container.find(".nested_item").each (index, item) ->
+      $(item).find(".nested_input_sort").val(index)
+
 $(document).ready ->
   window['sunrise'] ?= new Sunrise(window.location.pathname)
   window['sunrise'].setup()

data/app/assets/stylesheets/sunrise/customize.css

@@ -285,3 +285,8 @@ div.input.boolean input {
 .uploader-button span {
   line-height: 30px;
 }
+
+.nested_input_handle {
+  float: left;
+  cursor: move;
+}

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

@@ -14,6 +14,14 @@
             <%= manage_add_child_link t('manage.buttons.add_nested_field'), form, field, {:partial=>"nested_field"} %>
           </div>
         <% end -%>
+
+        <% if field.sort? %>
+          <script type="text/javascript">
+            $(document).ready(function(){
+              window['sunrise'].initSortFields("#<%= field.dom_id %>");
+            });
+          </script>
+        <% end -%>
       </div>
     <% elsif field.association? -%>
       <%= form.association field.name.to_sym, field.input_options.merge(options) %>

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

@@ -1,4 +1,10 @@
 <div class="nested_item">
   <%= manage_remove_child_link('', form, :class => "close-but") if field.multiply? %>
+  
+  <% if field.sort? %>
+    <%= image_tag 'sunrise/tree_dnd1.png', :class => "nested_input_handle" %>
+    <%= form.hidden_field field.sort_column, :class => "nested_input_sort" if field.sort_hidden_field? %>
+  <% end -%>
+
   <%= render :partial => 'field', :collection => field.fields, :locals => {:form => form} %>
 </div>

data/lib/sunrise/config/field.rb

@@ -12,6 +12,8 @@ module Sunrise
       attr_reader :unless_condition
       
       def initialize(abstract_model, parent, options = {})
+        options = {:multiply => false, :sort => false}.merge(options)
+
         super(abstract_model, parent, options)
         
         # Build conditionals
@@ -36,7 +38,7 @@ module Sunrise
         css << "grey-but" if input_options[:boolean]
         css << "tags-edit" if association?
         
-        {:class => css}.merge(input_options[:html] || {})
+        {:class => css, :id => dom_id}.merge(input_options[:html] || {})
       end
       
       def association?
@@ -50,7 +52,11 @@ module Sunrise
       def nested?
         false
       end
-      
+
+      def dom_id
+        @dom_id ||= "#{name}_field"
+      end
+
       protected
       
         # Verifies that the conditionals for this field evaluate to true for the

data/lib/sunrise/config/nested_field.rb

@@ -22,6 +22,33 @@ module Sunrise
       def multiply?
         @config_options[:multiply] != false
       end
+
+      def sort?
+        @config_options[:sort] != false
+      end
+
+      def sort_hidden_field?
+        sort? && sort_options[:hidden_field]
+      end
+
+      def sort_column
+        sort_options[:column]
+      end
+
+      def sort_options
+        @sort_options ||= build_sort_options
+      end
+
+      protected
+
+        def build_sort_options
+          options = (@config_options[:sort].is_a?(Hash) ? @config_options[:sort] : {}).symbolize_keys
+          
+          {
+            :column => :sort_order, 
+            :hidden_field => true
+          }.merge(options)
+        end
     end
   end
 end

data/lib/sunrise/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunrise-cms
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0
 platform: ruby
 authors:
 - Igor Galeta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -722,9 +722,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: sunrise-cms
 rubygems_version: 2.1.11