fullstack-admin 0.1.52 → 0.1.53

data/Gemfile

@@ -7,7 +7,7 @@ source "http://rubygems.org"
 gem 'rails', "~> 3.2"
 gem "fullstack", '~> 0.1.26'
 gem "bootstrap-wysihtml5-rails"
-gem "bootstrap-helpers"
+gem "bootstrap-helpers", '~> 0.1.7'
 gem "chosen-rails"
 gem "ckeditor", :git => "git://github.com/paranoida/ckeditor.git"
 gem "facebox-rails"

data/Gemfile.lock

@@ -57,7 +57,7 @@ GEM
     bcrypt-ruby (3.0.1)
     bootstrap-datepicker-rails (0.6.16)
       railties (>= 3.0)
-    bootstrap-helpers (0.1.1)
+    bootstrap-helpers (0.1.8)
       rails
     bootstrap-wysihtml5-rails (0.3.0)
       railties (>= 3.0)
@@ -245,7 +245,7 @@ PLATFORMS
 
 DEPENDENCIES
   bootstrap-datepicker-rails
-  bootstrap-helpers
+  bootstrap-helpers (~> 0.1.7)
   bootstrap-wysihtml5-rails
   chosen-rails
   ckeditor!

data/TODO.tasks

@@ -2,6 +2,18 @@
 = Fullstack Admin Roadmap =
 ===========================
 
+- Fix positionable/_collection.html.erb not working
+
+- Has many nested:
+  has_many_nested = has_many + accepts_nested_attributes_for + :allow_destroy => true [CORE]
+  
+- Fix problem that prevent link to be inserted in sequence [CMS]
+- Remove Jquery datepiker and UI [ADMIN]
+
+- Add shorthands scopes for ordering: desc, asc [CORE]
+
+- Better navigation interface/ More similar to wordpress
+
 ✓ fix delete not removing rows/thumbnails on success
 
 ✓ Better rendering for boolean input

data/VERSION

@@ -1 +1 @@
-0.1.52
+0.1.53

data/app/controllers/admin/positionables_controller.rb

@@ -27,7 +27,7 @@ class Admin::PositionablesController < Admin::BaseController
     
     raise "NotFound" unless @positionable_class && @positionable_class.columns_hash["position"]
     
-    @positionables = ::Admin::Positionable.new(@positionable_class.order("position"))
+    @positionables = ::Admin::Positionable.new(@positionable_class.unscoped.order("position"))
     @skip_filter = true
     @title = t('fullstack.admin.sort', :default => "Sort") + " - " + t("fullstack.admin.resources.#{@positionable_class.name.underscore.pluralize}", :default => @positionable_class.name.humanize)
   end

data/app/helpers/admin_form_helper.rb

@@ -179,33 +179,40 @@ module AdminFormHelper
         yield(FormBuilderDecorator.new(f))
       end
     end
+    
+    def sort_association(association, options = {})
+       assoc_str = association.to_s
+       @target.template.render :partial => "sort", :locals => { 
+        :association => association, :f => self, :options => options }
+       
+    end
 
-    def association_inputs(association)
+    def association_inputs(association, options = {})
+      
       assoc_str = association.to_s
       is_singular = assoc_str.pluralize != assoc_str and assoc_str.singularize == assoc_str
       
       if is_singular
         if @target.template.partial?("nested_belongs_to_#{assoc_str}_fields")
           @target.template.render :partial => "nested_belongs_to_#{assoc_str}_fields", :locals => { 
-           :association => association, :f => self }         
+           :association => association, :f => self, :options => options }
         else
           @target.template.render :partial => "nested_belongs_to_fields", :locals => { 
-           :association => association, :f => self }         
+           :association => association, :f => self, :options => options }
         end
 
       else
         
         if @target.template.partial?("associated_#{assoc_str}_table")
           @target.template.render :partial => "associated_#{assoc_str}_table", :locals => { 
-           :association => association, :f => self }
+           :association => association, :f => self, :options => options }
         else
           @target.template.render :partial => "associated_resources_table", :locals => { 
-           :association => association, :f => self }         
+           :association => association, :f => self, :options => options }         
         end
-  
-        
-      end
 
+      end
+ 
     end
 
   end # ~

data/app/views/admin/base/_associated_resources_table.html.erb

@@ -1,5 +1,7 @@
 <% association_class = f.object.class.reflect_on_association(association).klass %>
 <% resource_name = f.object.class.name.demodulize.underscore %>
+
+
 <%= f.inputs t(association, :scope => 'fullstack.admin.resources', :default => association.to_s.humanize), :class => "associated-resources" do %>
 
 <table class="table table-bordered table-striped index-table <%= 'positionable' if positionable?(association_class) %>" >
@@ -14,7 +16,7 @@
       
       <% i = 0 %>
       <%= f.admin_fields_for association do |f| %>
-      <%= render :partial => "nested_form", :locals => {:index => i, :f => f, :resource_name => resource_name, :association => association} %>
+      <%= render :partial => "nested_form", :locals => { :index => i, :f => f, :resource_name => resource_name, :association => association } %>
         <% i += 1 %>
       <% end %>    
       

data/app/views/admin/base/_nested_form.html.erb

@@ -40,7 +40,8 @@
         <% begin %>
         <%= render :partial => "admin/#{association}/associated_fields", :locals => {:f => f} %>
         <% rescue ActionView::MissingTemplate %>
-          <%= f.resource_inputs :except => [resource_name] %>
+
+          <%= f.resource_inputs :except => [ resource_name ] %>
         <% end %>
         
         <%= f.hidden_field(:_destroy, :class => "destroy-associated-resource") %>

data/app/views/admin/base/_sort.html.erb

@@ -0,0 +1,36 @@
+<% association_class = f.object.class.reflect_on_association(association).klass %>
+<% resource_name = f.object.class.name.demodulize.underscore %>
+
+
+<%= f.inputs t(association, :scope => 'fullstack.admin.resources', :default => association.to_s.humanize), :class => "associated-resources" do %>
+
+<table class="table table-bordered table-striped index-table <%= 'positionable' if positionable?(association_class) %>" >
+    <thead>
+      <tr>        
+        <th style="width:20px"><%= tag :i,  :class => "icon icon-th-list", :"data-toggle" => "tooltip", :title => t('fullstack.admin.drag_to_sort_items', :default => "Drag to sort items") %></th>
+        <th><%= labelize_attribute_name(title_column(association_class)) %></th>
+      </tr>
+    </thead>
+    <tbody class="associated-resources-index <%= 'sortable' if positionable?(association_class) %>">
+      <% f.object.send(association).each do |item| %>
+      <% title_column_or_id = title_column(item.class) || "id" %>
+      <% resource_title     =  item.send(title_column_or_id) %>
+
+      <tr class="associated-resource">
+        <td>
+          <%= image_tag "drag-handle.png", :class => "handle" %>
+        </td>
+        <td>
+        <span class='associated-resource-label'><%= resource_title %></span>
+        <%= f.admin_fields_for association, item do |f| %>
+          <%= f.hidden_field(:position, :class => "associated-resource-position") %>
+        <% end %>
+      </td>
+      </tr>
+      <% end %>
+    </tbody> 
+  </table>
+  
+<% end %>
+
+

data/app/views/admin/positionables/_collection.html.erb

@@ -36,11 +36,14 @@
 <% content_for :javascripts do -%>
   <%= javascript_tag do  %>
     <%= coffee_script do  %>
-
+      console.log("fasasf")
       $(document).ready ->
         $('.positionable .sortable').live 'sortupdate', ->
+          console.log('ok')
           $(@).find('input.positionable-position-input').each (i, e) ->
+            console.log('pos' + i)
             $(@).val(i)
+            
 
     <% end %>
   <% end %>

data/fullstack-admin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-admin"
-  s.version = "0.1.52"
+  s.version = "0.1.53"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2012-09-25"
+  s.date = "2012-10-03"
   s.description = "Administration interface framework for fullstack"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [
@@ -984,6 +984,7 @@ Gem::Specification.new do |s|
     "app/views/admin/base/_index.html.erb",
     "app/views/admin/base/_nested_belongs_to_fields.html.erb",
     "app/views/admin/base/_nested_form.html.erb",
+    "app/views/admin/base/_sort.html.erb",
     "app/views/admin/base/destroy.js.coffee",
     "app/views/admin/base/edit.html.erb",
     "app/views/admin/base/index.html.erb",
@@ -1077,7 +1078,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rails>, ["~> 3.2"])
       s.add_runtime_dependency(%q<fullstack>, ["~> 0.1.26"])
       s.add_runtime_dependency(%q<bootstrap-wysihtml5-rails>, [">= 0"])
-      s.add_runtime_dependency(%q<bootstrap-helpers>, [">= 0"])
+      s.add_runtime_dependency(%q<bootstrap-helpers>, ["~> 0.1.7"])
       s.add_runtime_dependency(%q<chosen-rails>, [">= 0"])
       s.add_runtime_dependency(%q<ckeditor>, [">= 0"])
       s.add_runtime_dependency(%q<facebox-rails>, [">= 0"])
@@ -1091,7 +1092,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rails>, ["~> 3.2"])
       s.add_dependency(%q<fullstack>, ["~> 0.1.26"])
       s.add_dependency(%q<bootstrap-wysihtml5-rails>, [">= 0"])
-      s.add_dependency(%q<bootstrap-helpers>, [">= 0"])
+      s.add_dependency(%q<bootstrap-helpers>, ["~> 0.1.7"])
       s.add_dependency(%q<chosen-rails>, [">= 0"])
       s.add_dependency(%q<ckeditor>, [">= 0"])
       s.add_dependency(%q<facebox-rails>, [">= 0"])
@@ -1106,7 +1107,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rails>, ["~> 3.2"])
     s.add_dependency(%q<fullstack>, ["~> 0.1.26"])
     s.add_dependency(%q<bootstrap-wysihtml5-rails>, [">= 0"])
-    s.add_dependency(%q<bootstrap-helpers>, [">= 0"])
+    s.add_dependency(%q<bootstrap-helpers>, ["~> 0.1.7"])
     s.add_dependency(%q<chosen-rails>, [">= 0"])
     s.add_dependency(%q<ckeditor>, [">= 0"])
     s.add_dependency(%q<facebox-rails>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.52
+  version: 0.1.53
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -64,17 +64,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.7
 - !ruby/object:Gem::Dependency
   name: chosen-rails
   requirement: !ruby/object:Gem::Requirement
@@ -1194,6 +1194,7 @@ files:
 - app/views/admin/base/_index.html.erb
 - app/views/admin/base/_nested_belongs_to_fields.html.erb
 - app/views/admin/base/_nested_form.html.erb
+- app/views/admin/base/_sort.html.erb
 - app/views/admin/base/destroy.js.coffee
 - app/views/admin/base/edit.html.erb
 - app/views/admin/base/index.html.erb
@@ -1288,7 +1289,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1059440588059914485
+      hash: -3238499166189108078
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: