fullstack-admin 0.1.18 → 0.1.19

data/Gemfile

@@ -13,6 +13,8 @@ gem "therubyracer"
 gem "meta_search"
 gem "plupload-rails"
 gem "fullstack"
+gem 'bootstrap-datepicker-rails'
+gem "select2-rails"
 
 group :development do
   gem "jeweler"

data/Gemfile.lock

@@ -34,6 +34,8 @@ GEM
     auto_strip_attributes (2.0.2)
       activerecord (>= 3.0)
     bcrypt-ruby (3.0.1)
+    bootstrap-datepicker-rails (0.6.16)
+      railties (>= 3.0)
     bootstrap-helpers (0.1.1)
       rails
     bootstrap-wysihtml5-rails (0.3.0)
@@ -195,6 +197,8 @@ GEM
       net-ssh
       rails (~> 3.0)
     remotipart (1.0.2)
+    select2-rails (3.0.0)
+      thor (~> 0.14)
     sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -218,6 +222,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bootstrap-datepicker-rails
   bootstrap-helpers
   bootstrap-wysihtml5-rails
   chosen-rails
@@ -231,4 +236,5 @@ DEPENDENCIES
   meta_search
   plupload-rails
   rails (~> 3.2)
+  select2-rails
   therubyracer

data/VERSION

@@ -1 +1 @@
-0.1.18
+0.1.19

data/app/assets/javascripts/support/forms.js.coffee

@@ -17,12 +17,27 @@
 $(document).ready ->
 
   $("input[data-limit],textarea[data-limit]").limit()
-  $("select:not([data-remote])").chosen()
+  $("select:not([data-remote]):not(.datetime-selector)").chosen()
 
   $("select[data-remote]").each ->
     $(this).ajaxChosen {method: "GET", url:$(this).data('remote'), dataType: 'json'}, (data) ->
       data
 
+  # $("select:not([data-remote]):not(.datetime-selector)").select2()
+  # 
+  # $("select[data-remote]").each ->    
+  #   $(@).select2
+  #     placeholder: $(@).data('placeholder')
+  #     minimumInputLength: 3
+  #     ajax:
+  #       url: $(@).data('remote')
+  #       dataType: "json"
+  #       data: (term) ->
+  #         q: term
+  # 
+  #       results: (data) -> 
+  #         results: data
+
   $("input.taglist").each ->
     taglist = $(this)
     autocomplete_url = taglist.data("autocomplete")

data/app/assets/stylesheets/support/forms.css

@@ -130,12 +130,14 @@ input.datepicker {
   background-position: 5px center;
   cursor: pointer;
   background-color: white;
+  width: auto;
 }
 
 a.close.datepicker-cancel {
   float: none;
   margin-left: -18px;
   margin-right: 5px;
+  vertical-align: top;
 }
 
 .daterange input.datepicker {
@@ -159,3 +161,10 @@ select,
 	padding: 4px 0.5%;
 }
 
+.datetime > .input > select, .time > .input > select, .date > .input > select {
+	width: auto;
+}
+
+.input {
+  margin-bottom: 18px;
+}

data/app/controllers/admin/base_controller.rb

@@ -20,5 +20,37 @@ class Admin::BaseController < ApplicationController
     end
   end
   
+  helper_method :singular_name,
+                :plural_name,
+                :resource_name,
+                :collection_name,
+                :current_resource_class,
+                :current_resource, 
+                :current_collection
+
+
+  def current_resource_class
+    @current_resource_class ||= controller_name.singularize.camelize.constantize
+  end
+  
+  def resource_name
+    current_resource_class.name.demodulize.underscore
+  end
+  
+  def collection_name
+    resource_name.pluralize
+  end
+
+  alias :singular_name :resource_name
+  alias :plural_name :collection_name
+  
+
+  def current_resource
+    instance_variable_get("@#{resource_name}")
+  end
+
+  def current_collection
+    instance_variable_get("@#{collection_name}")
+  end
   
-end
+end

data/app/controllers/admin/scaffold_controller.rb

@@ -0,0 +1,63 @@
+class Admin::ScaffoldController < Admin::BaseController
+  respond_to :html, :js
+    
+  def index
+    @search = current_resource_class.search(params[:search])
+    set_collection @search.page(params[:page] || 1)
+  end
+
+  def new
+     set_object current_resource_class.new  
+  end
+  
+  def edit
+  end
+  
+  def create
+      set_object current_resource_class.new(params[:"#{resource_name}"])
+      
+      if current_resource.respond_to?(:author)
+        current_resource.author ||= current_user
+      end
+      
+      current_resource.save
+      respond_with(current_resource)
+  end
+  
+  def update
+    current_resource.attributes = params[:"#{resource_name}"]
+    current_resource.save
+    respond_with(current_resource)
+  end
+  
+  def destroy
+    current_resource.destroy
+    respond_with(current_resource)
+  end
+  
+  protected
+  
+  # overrides checkin default
+  def fetch_object
+    if params[:id]
+      set_object(current_resource_class.find(params[:id]))
+    end
+  end
+    
+  # helpers overrides
+  def current_resource_class
+    @current_resource_class ||= params[:_admin_resource_type].classify.constantize
+  end
+
+  private 
+
+  def set_object(value)
+    instance_variable_set("@#{resource_name}", value)    
+  end
+  
+  def set_collection(value)
+    instance_variable_set("@#{collection_name}", value)
+  end
+  
+  
+end

data/app/helpers/admin_form_helper.rb

@@ -34,8 +34,54 @@ module AdminFormHelper
       options[:type] ||= !!options[:primary] ? :primary : nil
       @target.template.button((options.delete(:label) || default_label), options)
     end
+
+
+    def resource_inputs(res, *args)
+      model = res.class
+      options = args.extract_options!
+      
+      only_attributes = options[:only] || []
+      except_attributes = options[:except] || model.protected_attributes.to_a + %W(created_at updated_at slug slugs lat lng)
+      
+      only_attributes.map! {|a| :"#{a}"}
+      except_attributes.map! {|a| :"#{a}"}
+              
+      columns = model.attribute_names.map! {|a| :"#{a}"}
+      
+      if only_attributes.any?
+        columns = columns.select {|k| only_attributes.include?(k)}
+      elsif except_attributes.any?
+        columns = columns.delete_if {|k| except_attributes.include?(k)}
+      end
+
+
+      buff = ""
+      
+      columns.each {|k|
+        k = "#{k}".gsub(/_ids?$/, "").to_sym
+        assoc = model.reflect_on_association(k) 
+        if assoc && assoc.belongs_to?
+          buff << @target.input(k, :as => :select)
+        else
+          buff << @target.input(k)
+        end
+        
+      }
+      
+      buff.html_safe
+    end
+ 
+    def resource_submit(res)
+       @target.template.button (res.persisted? ? I18n.t('fullstack.admin.update', :default => "Update") : I18n.t('fullstack.admin.create', :default => "Create")),
+        :type => :primary, 
+        :size => :large
+    end
     
-  end
+    def actions(&block)
+      @target.template.form_actions(&block)
+    end
+
+  end # ~
    
   def admin_form_for(record_or_name_or_array, *args)
     options = args.extract_options!

data/app/helpers/scaffold_helper.rb

@@ -29,5 +29,22 @@ module ScaffoldHelper
     def app_name
       Rails.application.class.to_s.split("::").first.underscore.humanize
     end
-
-end
+    
+    def has_timestamps?(model)
+      model.columns_hash["created_at"]
+    end
+      
+    def title_column(model)
+      ( model.column_names & %W(title name label browser_title seo_title seo_name key claim email) ).first
+    end
+    
+    
+    def skip_filter!
+      @skip_filter = true
+    end
+    
+    def skip_filter
+      @skip_filter
+    end
+    
+end

data/app/inputs/boolean_input.rb

@@ -1,3 +1,112 @@
-class BooleanInput < CheckboxInput
+class BooleanInput
+  
+  
+  include Formtastic::Inputs::Base
+  include FormtasticBootstrap::Inputs::Base::Labelling
+  include FormtasticBootstrap::Inputs::Base::Wrapping
+  include FormtasticBootstrap::Inputs::Base::Errors
+  include FormtasticBootstrap::Inputs::Base::Hints
+  
+
+  def wrapper_html_options
+    super.merge(:class => "mb1")
+  end
+      
+  
+  def to_html
+  
+      generic_input_wrapping do
+      
+     hidden_field_html <<
+          check_box_html   
+      end
+
+  
+  end
+
+      def hidden_field_html
+        template.hidden_field_tag(input_html_options[:name], unchecked_value, :id => nil, :disabled => input_html_options[:disabled] )
+      end
+
+      def label_with_nested_checkbox
+        builder.label(
+          method,
+          label_text_with_embedded_checkbox,
+          label_html_options
+        )
+      end
+
+      def label_html_options
+        prev = super
+        prev[:class] = prev[:class] - ['label']
+        
+        input_html_options.merge(
+          prev.merge(
+            :id   => nil,
+            :name => nil,
+            :for  => input_html_options[:id]
+          )
+        )
+      end
+
+      def label_text_with_embedded_checkbox
+        check_box_html << "" << label_text
+      end
+
+      def check_box_html
+        template.check_box_tag("#{object_name}[#{method}]", checked_value, checked?, input_html_options)
+      end
+
+      def unchecked_value
+        options[:unchecked_value] || '0'
+      end
+
+      def checked_value
+        options[:checked_value] || '1'
+      end
+
+      def responds_to_global_required?
+        false
+      end
+
+      def input_html_options
+        {:name => input_html_options_name}.merge(super)
+      end
+      
+      def input_html_options_name
+        if builder.options.key?(:index)
+          "#{object_name}[#{builder.options[:index]}][#{method}]"
+        else
+          "#{object_name}[#{method}]"
+        end
+      end
+
+      def checked?
+        if defined? ActionView::Helpers::InstanceTag
+          object && ActionView::Helpers::InstanceTag.check_box_checked?(object.send(method), checked_value)
+        else
+          object && boolean_checked?(object.send(method), checked_value) 
+        end
+      end
+      
+      private 
+
+      def boolean_checked?(value, checked_value)
+        case value
+        when TrueClass, FalseClass
+          value
+        when NilClass
+          false
+        when Integer
+          value != 0
+        when String
+          value == checked_value
+        when Array
+          value.include?(checked_value)
+        else
+          value.to_i != 0
+        end
+      end
+  
   
 end

data/app/inputs/daterange_input.rb

@@ -3,7 +3,7 @@ class DaterangeInput < FormtasticBootstrap::Inputs::StringInput
   def to_html
     generic_input_wrapping do
       [ builder.text_field(gt_input_name, input_html_options(gt_input_name)),
-        template.content_tag(:span, "-", :class => "seperator"),
+        template.content_tag(:span, "-", :class => "date-range-input-separator"),
         builder.text_field(lt_input_name, input_html_options(lt_input_name)),
       ].join("\n").html_safe
     end

data/app/inputs/datetime_input.rb

@@ -5,14 +5,10 @@ class DatetimeInput
   include FormtasticBootstrap::Inputs::Base::Errors
   include FormtasticBootstrap::Inputs::Base::Hints
   
-#   def wrapper_html_options
-# #    super.merge(:class => "mb1")
-#   end
-    
   def to_html
-    generic_input_wrapping do
-       builder.datetime_select(method)
+    generic_input_wrapping do      
+       builder.datetime_select(method, {}, {:class => "datetime-selector"})
     end
   end
   
-end
+end

data/app/inputs/image_input.rb

@@ -1,10 +1,11 @@
 class ImageInput < Formtastic::Inputs::FileInput
-  include Base
+  
 
   def to_html
-    generic_input_wrapping do
-      builder.file_field(method, input_html_options)
-    end
+    raise "not implemented yet"
+    # generic_input_wrapping do
+    #   builder.file_field(method, input_html_options)
+    # end
   end
 
 end

data/{lib/generators/fullstack/admin/templates/root/app/views/admin/shared → app/views/admin}/_nav.html.erb

@@ -17,12 +17,16 @@
 
   <div class="tabbable tabs-left float right">
     <%= nav_list :class => "nav-tabs" do %>
-      <!-- FULLSTACK_PLACEHOLDER -->
-    
-      <!-- Please do not delete the comment above. 
-           It is used by fullstack generators
-           to attach new items to this menu.
-        -->
+
+    <% Fullstack::Admin.resources.each do |rog| %>
+        <% if rog.type == :group %> 
+          <%= nav_header rog.name %>
+          
+        <% elsif rog.type == :resource %>
+          <%= nav_item rog.name, [:admin, rog.name] %>
+        <% end %>
+    <% end %>
+
     <% end %>
   </div>
 

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

@@ -0,0 +1,13 @@
+<%= admin_form_for [:"admin", current_resource], :html => {:multipart => true} do |f| -%>
+
+  <%= f.errors %>
+  
+  <%= f.inputs do %>
+    <%= f.resource_inputs(current_resource) %>
+  <% end -%> 
+
+  <%= f.actions do %>
+    <%= f.resource_submit(current_resource) %>
+  <% end %>
+  
+<% end -%>

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

@@ -0,0 +1,21 @@
+<% title_column_or_id = title_column(current_resource_class) || "id" %>
+
+<% if thead -%>
+    <th><%= sort_link title_column_or_id %></th>
+
+<% if has_timestamps?(current_resource_class) %>
+    <th><%= sort_link :created_at %></th>
+<% end %>
+
+    <th><%= t('fullstack.admin.actions', :default => "Actions") %></th>
+<% end -%>
+
+<% if tbody -%>
+    <td><%= link_to (content.send(title_column_or_id)), [:edit,  :admin, content]  %></td>
+
+<% if has_timestamps?(current_resource_class) %>
+    <td><%= l content.created_at.to_date, :format => :long %></td>
+<% end %>
+
+    <td><%= default_collection_actions_for(content) %></td>
+<% end -%>

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

@@ -1,8 +1,16 @@
-<% if content_for? :title -%>
-  <div class="page-header"><h1><%= yield :title %></h1></div>
-<% else -%>
-  <div class="page-header"><h1><%= t('fullstack.admin.edit', :default => "Edit") %> `<%= title_for(current_resource) %>`</h1></div>
-<% end -%>
+<div class="page-header">
+  <h1>
+  <% if content_for? :title -%>
+    <%= yield :title %>
+  <% else -%>
+    <%= t('fullstack.admin.edit', :default => "Edit") %> `<%= title_for(current_resource) %>`
+  <% end -%>
+  </h1>
+  <div>
+    <i><%= current_resource.respond_to?(:updated_at) ? l(current_resource.updated_at, :format => :long) : "" %></i>
+  </div>
+</div>
+
 
 <%= render :partial => 'form' %>
 

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

@@ -1,22 +1,22 @@
 <% if content_for? :title -%>
   <div class="page-header"><h1><%= yield :title %></h1></div>
 <% else -%>
-  <div class="page-header"><h1><%= t(plural_name, :scope => "activerecord.models") %></h1></div>
+  <div class="page-header"><h1><%= t(collection_name, :scope => "activerecord.models") %></h1></div>
 <% end -%>
 
 <% if partial?('collection') %>
   <%= render :partial => "collection", 
   :locals => { 
-    :collection => instance_variable_get("@#{controller_name}"),
-    :"#{controller_name}" => instance_variable_get("@#{controller_name}")
+    :collection => current_collection,
+    :"#{controller_name}" => current_collection
   } 
   %>
 <% else %>
 
 <div class="mb1">
-	<% if subject.can_create?(controller_name) && controller.action_methods.include?("new") %>
+	<% if subject.can_create?(collection_name) && controller.action_methods.include?("new") %>
     <%= button t('fullstack.admin.new', :default => "New"), 
-               send("new_admin_#{controller_name.singularize}_path"),
+               send("new_admin_#{resource_name}_path"),
                :type => :primary, :icon => :plus, :icon_color => :white %>
 	<% end %>
 
@@ -46,18 +46,36 @@
 
 <% content_for :aside do -%>
 
-<% if partial?('filter') %>
+<% if (!@skip_filter) && (partial?('filter') || title_column(current_resource_class) || has_timestamps?(current_resource_class)) %>
   	<div class="well">
       <div class="mb1">
         <h4><%= t('fullstack.admin.filter', :default => "Filter") %></h4>
       </div>
   		<%= admin_form_for @search, :url => self.send("admin_#{collection_name}_path") , :html => {:method => :get} do |f| %>
+
+      <% if partial?('filter') %>
         <%= render :partial => "filter", :locals => {:f => f} %>
+      <% else %>
+        <%= f.inputs do %>
+
+        <% if tc = title_column(current_resource_class) %>
+            <%=  f.input :"#{tc}_contains" %>
+          <% end %>
+
+          <% if has_timestamps?(current_resource_class) %>
+            <%=  f.input :created_at, :as => :daterange %>
+          <% end %>
+          
+        <% end %>
+
+      <% end %>
+      
         <%= f.buttons do %>
         <%= f.commit_button t('fullstack.admin.filter', :default => "Filter") %>
         <% end %>
   		<% end %>
   	</div>
   <% end %>
+  
 <% end -%>
 

data/app/views/layouts/admin.html.erb

@@ -9,7 +9,7 @@
 </head>
 
 <body>
-  <%= render :partial => 'admin/shared/nav' %>
+  <%= render :partial => 'admin/nav' %>
 
   <%= navbar :fluid => true, :fixed => :top do %>
     <%= brand "#{app_name} Admin", admin_root_path %>

data/config/initializers/formtastic_bootstrap_timeish_hack.rb

@@ -0,0 +1,35 @@
+#timeish.rb
+module FormtasticBootstrap
+  module Inputs
+    module Base
+      module Timeish
+
+        def date_input_html
+          current_value = @object.send(method)
+          opts = input_html_options.merge({ :size => 24,
+             :class => "datepicker",
+             :max => 10,
+             :readonly => 'readonly',
+             :value => current_value.respond_to?(:strftime) ? current_value.strftime("%Y-%m-%d") : ""
+             })
+           builder.text_field(method, opts)
+        end
+
+        def time_input_html
+           time_fragments.map do |fragment|
+              fragment_input_html(fragment, "mini")
+            end.join.html_safe
+        end
+
+        def fragment_input_html(fragment, klass)
+          klass ||= ""
+          klass += " datetime-selector"
+          
+          opts = input_options.merge(:prefix => fragment_prefix, :field_name => fragment_name(fragment), :default => value, :include_blank => include_blank?)
+          template.send(:"select_#{fragment}", value, opts, input_html_options.merge(:id => fragment_id(fragment), :class => klass.strip))
+        end
+
+      end
+    end
+  end
+end

data/config/routes.rb

@@ -1,3 +1,18 @@
 Rails.application.routes.draw do
   mount Ckeditor::Engine => '/ckeditor'
+  
+  namespace :admin do
+    
+    Fullstack::Admin.resources.each do |r|
+      if r.type == :resource
+        if "Admin::#{r.name.to_s.pluralize.camelize}Controller".safe_constantize
+          resources r.name, :except => [:show]    
+        else
+          resources r.name, :except => [:show], :controller => :scaffold, :_admin_resource_type => r.name
+        end
+      end
+    end
+    
+  end
+  
 end

data/fullstack-admin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-admin"
-  s.version = "0.1.18"
+  s.version = "0.1.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2012-08-13"
+  s.date = "2012-08-15"
   s.description = "Administration interface framework for fullstack"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [
@@ -948,17 +948,14 @@ Gem::Specification.new do |s|
     "app/assets/stylesheets/support/uploads.css",
     "app/controllers/admin/base_controller.rb",
     "app/controllers/admin/responder.rb",
+    "app/controllers/admin/scaffold_controller.rb",
     "app/helpers/admin_form_helper.rb",
-    "app/helpers/resources_helper.rb",
     "app/helpers/scaffold_helper.rb",
     "app/inputs/boolean_input.rb",
-    "app/inputs/checkbox_input.rb",
-    "app/inputs/datepicker_input.rb",
     "app/inputs/daterange_input.rb",
     "app/inputs/datetime_input.rb",
     "app/inputs/image_input.rb",
     "app/inputs/markup_input.rb",
-    "app/inputs/photo_chooser_input.rb",
     "app/inputs/simple_markup_input.rb",
     "app/inputs/string_input.rb",
     "app/inputs/tag_list_input.rb",
@@ -976,17 +973,22 @@ Gem::Specification.new do |s|
     "app/models/roleable.rb",
     "app/models/suspendable.rb",
     "app/models/trackable.rb",
+    "app/views/admin/_nav.html.erb",
+    "app/views/admin/base/_form.html.erb",
+    "app/views/admin/base/_index.html.erb",
     "app/views/admin/base/destroy.js.coffee",
     "app/views/admin/base/edit.html.erb",
     "app/views/admin/base/index.html.erb",
     "app/views/admin/base/new.html.erb",
     "app/views/admin/base/update.js.coffee",
     "app/views/layouts/admin.html.erb",
+    "config/initializers/formtastic_bootstrap_timeish_hack.rb",
     "config/routes.rb",
     "fullstack-admin.gemspec",
     "lib/fullstack-admin.rb",
     "lib/fullstack/admin.rb",
     "lib/fullstack/admin/engine.rb",
+    "lib/fullstack/admin/resources.rb",
     "lib/generators/fullstack/admin/install_generator.rb",
     "lib/generators/fullstack/admin/locale_generator.rb",
     "lib/generators/fullstack/admin/scaffold_generator.rb",
@@ -995,11 +997,10 @@ Gem::Specification.new do |s|
     "lib/generators/fullstack/admin/templates/root/app/controllers/admin/dashboard_controller.rb",
     "lib/generators/fullstack/admin/templates/root/app/models/user.rb",
     "lib/generators/fullstack/admin/templates/root/app/views/admin/dashboard/show.html.erb",
-    "lib/generators/fullstack/admin/templates/root/app/views/admin/shared/_nav.html.erb",
     "lib/generators/fullstack/admin/templates/root/db/migrate/%migration_timestamp%_create_ckeditor_assets.rb",
     "lib/generators/fullstack/admin/templates/root/lib/support/user_subject.rb",
+    "lib/generators/fullstack/admin/templates/scaffold/_filter.html.erb",
     "lib/generators/fullstack/admin/templates/scaffold/controller.rb",
-    "lib/generators/fullstack/admin/templates/scaffold/views/_filter.html.erb.tt",
     "lib/generators/fullstack/admin/templates/scaffold/views/_form.html.erb.tt",
     "lib/generators/fullstack/admin/templates/scaffold/views/_index.html.erb.tt",
     "locales/en.yml",
@@ -1049,6 +1050,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<meta_search>, [">= 0"])
       s.add_runtime_dependency(%q<plupload-rails>, [">= 0"])
       s.add_runtime_dependency(%q<fullstack>, [">= 0"])
+      s.add_runtime_dependency(%q<bootstrap-datepicker-rails>, [">= 0"])
+      s.add_runtime_dependency(%q<select2-rails>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<rails>, ["~> 3.2"])
@@ -1064,6 +1067,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<meta_search>, [">= 0"])
       s.add_dependency(%q<plupload-rails>, [">= 0"])
       s.add_dependency(%q<fullstack>, [">= 0"])
+      s.add_dependency(%q<bootstrap-datepicker-rails>, [">= 0"])
+      s.add_dependency(%q<select2-rails>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
@@ -1080,6 +1085,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<meta_search>, [">= 0"])
     s.add_dependency(%q<plupload-rails>, [">= 0"])
     s.add_dependency(%q<fullstack>, [">= 0"])
+    s.add_dependency(%q<bootstrap-datepicker-rails>, [">= 0"])
+    s.add_dependency(%q<select2-rails>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end

data/lib/fullstack/admin.rb

@@ -32,8 +32,12 @@ require "less-rails-bootstrap"
 require "meta_search"
 require "plupload-rails"
 require "fullstack"
+require "bootstrap-datepicker-rails"
+require "select2-rails"
 
 require 'fullstack/admin/engine'
+require 'fullstack/admin/resources'
+
 
 module Fullstack
   module Admin

data/lib/fullstack/admin/resources.rb

@@ -0,0 +1,133 @@
+module Fullstack
+  module Admin
+    
+    class Entity
+      # leaf?
+      # parent
+      # children
+      # entity_type
+      
+      def leaf?
+        self.children.empty?
+      end
+      
+      def traverse_top_down(&block)
+        res = block.call(self)
+        children.each do |c|
+          c.traverse_top_down(&block)
+        end
+        res
+      end
+      alias :each :traverse_top_down
+      
+      def traverse_bottom_up(&block)
+        children.each do |c|
+          c.traverse_bottom_up(&block)
+        end
+        block.call(self)
+      end
+      alias :reverse_each :traverse_bottom_up
+      
+      
+    end
+  
+    # =============
+    # = Resources =
+    # =============
+    
+    class Resources < Entity
+
+      attr_accessor :children
+
+      def initialize        
+        @children = []
+      end
+      
+      def group(name)
+        g = Group.new(name)
+        @children << g
+        yield(g) 
+      end
+      
+      def resource(name)
+        @children << Resource.new(name)
+      end
+    
+      def type
+        :resources
+      end
+    
+    end 
+    
+    # Group
+    class Group < Entity      
+      attr_accessor :children, :name
+      
+      def initialize(name)
+        @name = "#{name}"
+        @children = []
+      end
+      
+      def resource(name)
+        @children << Resource.new(name)
+      end
+      
+      def type
+        :group
+      end
+      
+    end
+    
+
+    # Resource    
+    class Resource < Entity
+
+      attr_accessor :name
+      
+      def initialize(name)
+        if name.is_a?(Class)
+          name = name.name
+        end
+        @name = "#{name}"
+      end
+      
+      def type
+        :resource
+      end
+      
+      def children
+        @children ||= [].freeze
+      end
+      
+    end
+
+    # Fullstack::Admin.resources do |admin|
+    #     
+    #   admin.group :website do |g|
+    #     g.resource :pages
+    #     g.resource :menus
+    #     g.resource :settings
+    #   end
+    # 
+    #   admin.group :contents do |g|
+    #     g.resource :posts        
+    #   end
+    #     
+    #   admin.group :users do |g|
+    #     g.resource :users
+    #   end
+    #     
+    # end
+    
+    def resources
+      @resources ||= Resources.new
+      if block_given?
+        yield(@resources)
+      end
+      @resources
+    end
+    
+    module_function :resources
+  end
+end
+

data/lib/generators/fullstack/admin/scaffold_generator.rb

@@ -37,12 +37,11 @@ module Fullstack
       def create_views
         if options[:views]
           directory('views', Rails.root.join('app', 'views', scope, plural_name))
+          if has_timestamps? || title_column
+            template "_filter.html.erb", Rails.root.join('app', 'views', scope, plural_name, "_filter.html.erb")
+          end
         end
       end
-
-      # def generate_inputs
-      #   generate("inputs #{name.singularize} --scope #{scope}")
-      # end
       
       def append_to_menu
         placeholder_text = "FULLSTACK_PLACEHOLDER"
@@ -87,7 +86,7 @@ str
       end
       
       def title_column
-        ( model.column_names & %W(title name label claim) ).first
+        ( model.column_names & %W(title name label browser_title seo_title seo_name key claim email) ).first
       end
       
       def controller_class_name

data/lib/generators/fullstack/admin/templates/scaffold/views/_form.html.erb.tt

@@ -3,14 +3,11 @@
   <%%= f.errors %>
   
   <%%= f.inputs do %>
-
+    <%%= f.resource_inputs(current_resource) %>
   <%% end -%> 
 
-  <%%= form_actions do %>
-  <%%= button (current_resource.persisted? ? t('fullstack.admin.update', :default => "Update") : t('fullstack.admin.create', :default => "Create")),
-    :type => :primary, 
-    :size => :large %>
+  <%%= f.actions do %>
+    <%%= f.resource_submit(current_resource) %>
   <%% end %>
   
-
 <%% end -%>

data/lib/generators/fullstack/admin/templates/scaffold/views/_index.html.erb.tt

@@ -1,18 +1,19 @@
-<%% if thead -%>
-    <th><%%= sort_link title_method_for(current_collection.klass) %></th>
-    <% if has_timestamps? %>
-      <th><%%= sort_link :created_at %></th>
-    <% end %>
-    
-    <th><%%= t('fullstack.admin.actions', :default => "Actions") %></th>
-<%% end -%>
+<% if thead -%>
+    <th><%= sort_link title_column(current_resource_class) %></th>
 
-<%% if tbody -%>
-    <td><%%= link_to title_for(content), [:edit,  :<%= scope %>, content]  %></td>
-    
-    <% if has_timestamps? %>
-    <td><%%= l content.created_at.to_date, :format => :long %></td>
-    <% end %>
-    
-    <td><%%= default_collection_actions_for(content) %></td>
-<%% end -%>
+<% if has_timestamps?(current_resource_class) %>
+    <th><%= sort_link :created_at %></th>
+<% end %>
+
+    <th><%= t('fullstack.admin.actions', :default => "Actions") %></th>
+<% end -%>
+
+<% if tbody -%>
+    <td><%= link_to (content.send(title_column(current_resource_class))), [:edit,  :admin, content]  %></td>
+
+<% if has_timestamps?(current_resource_class) %>
+    <td><%= l content.created_at.to_date, :format => :long %></td>
+<% end %>
+
+    <td><%= default_collection_actions_for(content) %></td>
+<% end -%>

data/locales/en.yml

@@ -12,6 +12,7 @@ en:
       create: "Create"
       filter: "Filter"
       actions: "Actions"
+      info: "Info"
       are_you_sure: "Are you sure?"
       
       form:

data/locales/it.yml

@@ -6,6 +6,7 @@ it:
       dashboard: "Dashboard"
       logout: "Logout"
       new: "Crea"
+      update: "Invia"
       show: "Visualizza"
       edit: "Modifica"
       delete: "Elimina"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000 Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -219,6 +219,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bootstrap-datepicker-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: select2-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -1174,17 +1206,14 @@ files:
 - app/assets/stylesheets/support/uploads.css
 - app/controllers/admin/base_controller.rb
 - app/controllers/admin/responder.rb
+- app/controllers/admin/scaffold_controller.rb
 - app/helpers/admin_form_helper.rb
-- app/helpers/resources_helper.rb
 - app/helpers/scaffold_helper.rb
 - app/inputs/boolean_input.rb
-- app/inputs/checkbox_input.rb
-- app/inputs/datepicker_input.rb
 - app/inputs/daterange_input.rb
 - app/inputs/datetime_input.rb
 - app/inputs/image_input.rb
 - app/inputs/markup_input.rb
-- app/inputs/photo_chooser_input.rb
 - app/inputs/simple_markup_input.rb
 - app/inputs/string_input.rb
 - app/inputs/tag_list_input.rb
@@ -1202,17 +1231,22 @@ files:
 - app/models/roleable.rb
 - app/models/suspendable.rb
 - app/models/trackable.rb
+- app/views/admin/_nav.html.erb
+- app/views/admin/base/_form.html.erb
+- app/views/admin/base/_index.html.erb
 - app/views/admin/base/destroy.js.coffee
 - app/views/admin/base/edit.html.erb
 - app/views/admin/base/index.html.erb
 - app/views/admin/base/new.html.erb
 - app/views/admin/base/update.js.coffee
 - app/views/layouts/admin.html.erb
+- config/initializers/formtastic_bootstrap_timeish_hack.rb
 - config/routes.rb
 - fullstack-admin.gemspec
 - lib/fullstack-admin.rb
 - lib/fullstack/admin.rb
 - lib/fullstack/admin/engine.rb
+- lib/fullstack/admin/resources.rb
 - lib/generators/fullstack/admin/install_generator.rb
 - lib/generators/fullstack/admin/locale_generator.rb
 - lib/generators/fullstack/admin/scaffold_generator.rb
@@ -1221,11 +1255,10 @@ files:
 - lib/generators/fullstack/admin/templates/root/app/controllers/admin/dashboard_controller.rb
 - lib/generators/fullstack/admin/templates/root/app/models/user.rb
 - lib/generators/fullstack/admin/templates/root/app/views/admin/dashboard/show.html.erb
-- lib/generators/fullstack/admin/templates/root/app/views/admin/shared/_nav.html.erb
 - lib/generators/fullstack/admin/templates/root/db/migrate/%migration_timestamp%_create_ckeditor_assets.rb
 - lib/generators/fullstack/admin/templates/root/lib/support/user_subject.rb
+- lib/generators/fullstack/admin/templates/scaffold/_filter.html.erb
 - lib/generators/fullstack/admin/templates/scaffold/controller.rb
-- lib/generators/fullstack/admin/templates/scaffold/views/_filter.html.erb.tt
 - lib/generators/fullstack/admin/templates/scaffold/views/_form.html.erb.tt
 - lib/generators/fullstack/admin/templates/scaffold/views/_index.html.erb.tt
 - locales/en.yml
@@ -1266,7 +1299,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2117914633197908610
+      hash: 2930398911678922489
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/helpers/resources_helper.rb

@@ -1,21 +0,0 @@
-module ResourcesHelper
-
-  def singular_name
-    controller_name.singularize
-  end
-  alias :resource_name :singular_name
-
-  def plural_name
-    controller_name
-  end
-  alias :collection_name :plural_name
-
-  def current_resource
-    instance_variable_get("@#{resource_name}")
-  end
-
-  def current_collection
-    instance_variable_get("@#{collection_name}")
-  end
-  
-end

data/app/inputs/checkbox_input.rb

@@ -1,109 +0,0 @@
-class CheckboxInput 
-  include Formtastic::Inputs::Base
-  include FormtasticBootstrap::Inputs::Base::Labelling
-  include FormtasticBootstrap::Inputs::Base::Wrapping
-  include FormtasticBootstrap::Inputs::Base::Errors
-  include FormtasticBootstrap::Inputs::Base::Hints
-  
-
-  def wrapper_html_options
-    super.merge(:class => "mb1")
-  end
-      
-  
-  def to_html
-  
-      generic_input_wrapping do
-      
-     hidden_field_html <<
-          check_box_html   
-      end
-
-  
-  end
-
-      def hidden_field_html
-        template.hidden_field_tag(input_html_options[:name], unchecked_value, :id => nil, :disabled => input_html_options[:disabled] )
-      end
-
-      def label_with_nested_checkbox
-        builder.label(
-          method,
-          label_text_with_embedded_checkbox,
-          label_html_options
-        )
-      end
-
-      def label_html_options
-        prev = super
-        prev[:class] = prev[:class] - ['label']
-        
-        input_html_options.merge(
-          prev.merge(
-            :id   => nil,
-            :name => nil,
-            :for  => input_html_options[:id]
-          )
-        )
-      end
-
-      def label_text_with_embedded_checkbox
-        check_box_html << "" << label_text
-      end
-
-      def check_box_html
-        template.check_box_tag("#{object_name}[#{method}]", checked_value, checked?, input_html_options)
-      end
-
-      def unchecked_value
-        options[:unchecked_value] || '0'
-      end
-
-      def checked_value
-        options[:checked_value] || '1'
-      end
-
-      def responds_to_global_required?
-        false
-      end
-
-      def input_html_options
-        {:name => input_html_options_name}.merge(super)
-      end
-      
-      def input_html_options_name
-        if builder.options.key?(:index)
-          "#{object_name}[#{builder.options[:index]}][#{method}]"
-        else
-          "#{object_name}[#{method}]"
-        end
-      end
-
-      def checked?
-        if defined? ActionView::Helpers::InstanceTag
-          object && ActionView::Helpers::InstanceTag.check_box_checked?(object.send(method), checked_value)
-        else
-          object && boolean_checked?(object.send(method), checked_value) 
-        end
-      end
-      
-      private 
-
-      def boolean_checked?(value, checked_value)
-        case value
-        when TrueClass, FalseClass
-          value
-        when NilClass
-          false
-        when Integer
-          value != 0
-        when String
-          value == checked_value
-        when Array
-          value.include?(checked_value)
-        else
-          value.to_i != 0
-        end
-      end
-      
-end

data/app/inputs/datepicker_input.rb

@@ -1,9 +0,0 @@
-class DatepickerInput < FormtasticBootstrap::Inputs::StringInput
-  def input_html_options
-    options = super
-    options[:class] = [options[:class], "datepicker"].compact.join(' ')
-    options[:readonly] = 'readonly'
-    options
-  end
-end
-

data/app/inputs/photo_chooser_input.rb

@@ -1,8 +0,0 @@
-class PhotoChooserInput < FormtasticBootstrap::Inputs::HiddenInput
-
-  def to_html
-    template.after_current_form(:photo_chooser, :replace => true) << template.render(:partial => "support/photos/chooser")
-    super << template.render(:partial => "support/photos/input")
-  end
-  
-end