fullstack-admin 0.1.19 → 0.1.20

data/VERSION

@@ -1 +1 @@
-0.1.19
+0.1.20

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

@@ -3,7 +3,6 @@
 #= require jquery-ui
 #= require notify
 #= require jquery.sticky
-#= require angular
 
 $(document).ready ->
   $(".btn.toggle-delete").on "click", (e) ->

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

@@ -20,5 +20,6 @@ $(document).ready ->
   $("[data-dismiss='modal']").live 'click', ->
     ($ @).closest('.modal').modal('hide')
 
-  $("[rel='popover']").popover()
+  $("[data-toggle='popover']").popover()
+  
   $('.carousel').carousel()

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

@@ -10,7 +10,7 @@
 #= require jquery.remotipart
 #= require jquery.validate
 #= require ckeditor/init
-
+#= require support/nested_forms
 ## require jquery.form
 
 

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

@@ -0,0 +1,29 @@
+$(document).ready ->
+  $('a.btn-delete-associated-resource').live 'click', ->
+    self = $(@)
+    associated_resource = $(@).closest(".associated-resource")
+    
+    if !self.hasClass("active")
+      associated_resource.removeClass("deleted");
+      associated_resource.find("input.destroy-associated-resource").val('0')
+    else
+      associated_resource.addClass("deleted");
+      associated_resource.find("input.destroy-associated-resource").val('1')
+
+  autoupdate_labels = (associated_resources) ->
+    associated_resources.each ->
+      associated_resource = $(@)
+      label_input_id = associated_resource.data("label-input")
+      label_input = $("#" + label_input_id)
+      label_input.change ->
+        associated_resource.find(".associated-resource-label").text(label_input.val())
+
+  $(".btn-add-associated-resource").click ->
+    associated_resources        = $(@).closest(".associated-resources")
+    associated_resources_index  = associated_resources.find(".associated-resources-index")
+    resource_fields_template    = associated_resources.find(".resource-fields-template")
+    new_id = new Date().getTime()
+    template_instance           = $(resource_fields_template.html().replace(/___index___/g, new_id))
+    associated_resources_index.append(template_instance)
+    autoupdate_labels(associated_resources_index.find('.associated-resource:last'))
+    

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

@@ -167,4 +167,19 @@ select,
 
 .input {
   margin-bottom: 18px;
-}
+}
+
+
+.resource_updated_at {
+  font: italic 12px/36px Arial, Helvetica, sans-serif;
+  color: #888;
+}  
+
+.associated-resource.deleted .fade-if-deleted {
+  opacity: 0.5;
+}
+
+.associated-resource.deleted .hide-if-deleted {
+  display: none
+}
+

data/app/helpers/admin_form_helper.rb

@@ -36,12 +36,13 @@ module AdminFormHelper
     end
 
 
-    def resource_inputs(res, *args)
-      model = res.class
+    def resource_inputs(*args)
+      model = @target.object.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)
+      
+      except_attributes = options[:except] || model.protected_attributes.to_a + %W(created_at updated_at slug slugs lat lng position)
       
       only_attributes.map! {|a| :"#{a}"}
       except_attributes.map! {|a| :"#{a}"}
@@ -57,11 +58,22 @@ module AdminFormHelper
 
       buff = ""
       
+      attachment_definitions = (model.attachment_definitions || {}).keys
+      attachment_columns = attachment_definitions.map {|a|
+        [:"#{a}_file_name", :"#{a}_file_size", :"#{a}_content_type", :"#{a}_updated_at"]
+        }.flatten
+      
+      columns -= attachment_columns
+      columns += attachment_definitions
+            
+      
       columns.each {|k|
-        k = "#{k}".gsub(/_ids?$/, "").to_sym
+        k = "#{k}".gsub(/_ids?$/, "").gsub(/_type$/, "").to_sym
         assoc = model.reflect_on_association(k) 
         if assoc && assoc.belongs_to?
-          buff << @target.input(k, :as => :select)
+          unless assoc.options[:polymorphic]
+            buff << @target.input(k, :as => :select)
+          end
         else
           buff << @target.input(k)
         end
@@ -71,8 +83,8 @@ module AdminFormHelper
       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")),
+    def resource_submit
+       @target.template.button (@target.object.persisted? ? I18n.t('fullstack.admin.update', :default => "Update") : I18n.t('fullstack.admin.create', :default => "Create")),
         :type => :primary, 
         :size => :large
     end
@@ -81,6 +93,43 @@ module AdminFormHelper
       @target.template.form_actions(&block)
     end
 
+    def admin_fields_for(*args)
+      @target.semantic_fields_for(*args) do |f|
+        yield(FormBuilderDecorator.new(f))
+      end
+    end
+
+    def association_inputs(association)
+      @target.template.content_tag :div,:class => "well" do
+      admin_fields_for(association) do |f|
+        
+        partial_name = association.to_s.singularize + "_fields"
+        
+        if @target.template.partial?(partial_name)
+           @target.template.render(:partial => partial_name, :f => f)
+        else
+          f.resource_inputs
+        end
+      
+      end
+      end
+    end
+
+    # def link_to_remove_fields(name)
+    #   @target.hidden_field(:_destroy) + link_to_function(name, "remove_fields(this)")
+    # end
+    #   
+    # def link_to_add_fields(name, association)
+    #   new_object = @target.object.class.reflect_on_association(association).klass.new
+    #   
+    #   partial_name = association.to_s.singularize + "_fields"
+    #   fields = admin_fields_for(association, new_object, :child_index => "new_#{association}") do |builder|        
+    #     
+    #   end
+    #   @target.template.link_to_function(name, "add_fields(this, \"#{association}\", \"#{escape_javascript(fields)}\")")
+    # end
+
+
   end # ~
    
   def admin_form_for(record_or_name_or_array, *args)

data/app/helpers/scaffold_helper.rb

@@ -3,27 +3,30 @@ module ScaffoldHelper
       buttons = []
 
       if subject.can_show?(content) && lookup_context.exists?('show', lookup_context.prefixes, false)
-        buttons << link_to(t('fullstack.admin.show', :default => "Show"), self.send(:"#{scope}_#{controller_name.singularize}_path", content), :class => "btn")
+        buttons << link_to(t('fullstack.admin.show', :default => "Show"), self.send(:"#{scope}_#{resource_name}_path", content), :class => "btn")
       end
 
       if subject.can_edit?(content)
-        buttons << link_to(t('fullstack.admin.edit', :default => "Edit"), self.send(:"edit_#{scope}_#{controller_name.singularize}_path", content), :class => "btn")
+        buttons << link_to(t('fullstack.admin.edit', :default => "Edit"), self.send(:"edit_#{scope}_#{resource_name}_path", content), :class => "btn")
       end
 
       if subject.can_destroy?(content)
         buttons << link_to(t('fullstack.admin.delete', :default => "Delete"),
-                self.send(:"#{scope}_#{controller_name.singularize}_path", content),
+                self.send(:"#{scope}_#{resource_name}_path", content),
                 :confirm => t('fullstack.admin.are_you_sure', :default => "Are you sure?"), :method => "delete",
                 :remote => true,  :class => "btn hide btn-danger"
-
                 )
       end
       "#{buttons.join('&nbsp;')}".html_safe
     end
 
+    def labelize_attribute_name(method)
+      label(:object, method).gsub("<label for=\"object_#{method}\">", "").gsub("</label>", "")
+    end
+
     def sort_link(method)
       method = "#{method}"
-      super(@search, method, I18n.t(method, :scope => 'fullstack.admin.form.labels', :default => method.humanize))
+      super(@search, method, labelize_attribute_name(method))
     end
     
     def app_name
@@ -35,7 +38,8 @@ module ScaffoldHelper
     end
       
     def title_column(model)
-      ( model.column_names & %W(title name label browser_title seo_title seo_name key claim email) ).first
+      @_title_columns ||= {}
+      @_title_columns[model] ||= ( model.column_names.map{ |c| c.to_s } & %W(title name label browser_title seo_title seo_name key claim email) ).first
     end
     
     

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

@@ -20,10 +20,10 @@
 
     <% Fullstack::Admin.resources.each do |rog| %>
         <% if rog.type == :group %> 
-          <%= nav_header rog.name %>
+        <%= nav_header t(rog.name, :scope => 'fullstack.admin.groups', :default => rog.name.to_s.humanize) %>
           
         <% elsif rog.type == :resource %>
-          <%= nav_item rog.name, [:admin, rog.name] %>
+          <%= nav_item t(rog.name, :scope => 'fullstack.admin.resources', :default => rog.name.to_s.humanize), [:admin, rog.name] %>
         <% end %>
     <% end %>
 

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

@@ -0,0 +1,21 @@
+<% association_class = f.object.class.reflect_on_association(association).klass %>
+<%= f.inputs t(association, :scope => 'activerecord.models', :default => association.to_s.humanize), :class => "associated-resources" do %>
+
+  <table class="table table-bordered table-striped index-table associated-resources-index">
+    <tr><th><%= labelize_attribute_name(title_column(association_class)) %></th><th style="width:30%;"><%= t('fullstack.admin.actions', :default => "Actions") %></th></tr>
+    <% i = 0 %>
+    <%= f.admin_fields_for association do |f| %>
+    <%= render :partial => "nested_form", :locals => {:index => i, :f => f, :resource_name => resource_name, :association => association} %>
+      <% i += 1 %>
+    <% end %>    
+  </table>
+  
+  <script type="text/html" charset="utf-8" class="resource-fields-template">
+    <%= f.admin_fields_for(association, association_class.new, :child_index => "___index___") do |f| %>
+      <%= render :partial => "nested_form", :locals => {:index => "___index___", :f => f, :resource_name => resource_name, :association => association} %>
+    <% end %>
+  </script>
+
+  <%= button t('fullstack.admin.add', :default => "Add"), "javascript:void(0);", :class => "btn-add-associated-resource" %>
+  
+<% end %>

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

@@ -3,11 +3,11 @@
   <%= f.errors %>
   
   <%= f.inputs do %>
-    <%= f.resource_inputs(current_resource) %>
+  <%= f.resource_inputs %>
   <% end -%> 
 
   <%= f.actions do %>
-    <%= f.resource_submit(current_resource) %>
+  <%= f.resource_submit %>
   <% end %>
   
 <% end -%>

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

@@ -0,0 +1,63 @@
+<% title_column_or_id = title_column(f.object.class) || "id" %>
+<% resource_title     =  f.object.send(title_column_or_id) %> 
+
+<tr <%= 'data-new-record' if f.object.new_record? %> class="associated-resource" data-label-input="menu_links_attributes_<%= index %>_<%= title_column_or_id  %>">
+  <td>
+    <div class="fade-if-deleted">
+      <% if f.object.persisted? %>
+        <span class='associated-resource-label'><%= resource_title %></span>
+      <% else %>
+        <span class='associated-resource-label'><i>[ <%= t('fullstack.admin.new_record', :default => "new record") %> ]</i></span>
+      <% end %>
+    </div>
+  </td>
+  <td>
+  
+    <div class="modal hide" id="<%= resource_name %>_<%= association %>_fields_<%= index %>">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal">×</button>
+        <h3>
+        <%= t('fullstack.admin.edit', :default => "Edit") %>
+        
+        <% if f.object.persisted? %>
+          "<span class='associated-resource-label'><%= resource_title %></span>"
+        <% else %>
+          "<span class='associated-resource-label'>[ <%= t('fullstack.admin.new_record', :default => "new record") %> ]</span>"
+        <% end %>
+        
+        </h3>
+      </div>
+      <div class="modal-body">
+        <%= f.resource_inputs %>
+        <%= f.hidden_field(:_destroy, :class => "destroy-associated-resource") %>
+      </div>
+      <div class="modal-footer">
+        <a href="#" class="btn" data-dismiss="modal"><%= t('fullstack.admin.ok', :default => "Ok") %></a>
+      </div>
+    </div>
+  
+  <span class="hide-if-deleted">
+    <% if f.object.errors.any? %>
+    <span data-toggle="popover" title="Your association contains some errors" data-content='<%= h("#{f.errors}") %>' ><%= icon :"warning-sign"  %></span>
+    <% end %>
+    
+    <% if subject.can_edit?(f.object) %>
+    <%=  button t('fullstack.admin.edit', :default => "Edit"), "##{resource_name}_#{association}_fields_#{index}", :data => {:toggle => :modal} %>        
+    <% end %>
+  </span>
+  
+  <% if subject.can_destroy?(f.object) %>
+    <%= button(
+            t('fullstack.admin.delete', :default => "Delete"),
+            "javascript:void(0)",
+            :type => :danger, :class => "btn-delete-associated-resource", :"data-toggle" => :button
+            )
+    %>
+  <% end %>
+
+    
+    
+  </td>
+</tr>
+
+

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

@@ -3,12 +3,14 @@
   <% if content_for? :title -%>
     <%= yield :title %>
   <% else -%>
-    <%= t('fullstack.admin.edit', :default => "Edit") %> `<%= title_for(current_resource) %>`
+    <%= 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>
+  <% if current_resource.respond_to?(:updated_at) %>
+  <div  class="resource_updated_at">
+      <%= t('fullstack.admin.last_updated', :default => "Last updated") %>: <%= distance_of_time_in_words_to_now(current_resource.updated_at) %> <%= t('fullstack.admin.ago', :default => "ago") %>
   </div>
+  <% end %>
 </div>
 
 

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

@@ -39,7 +39,7 @@
       </tr>
     <% end -%>
   </tbody>
-  <%=  paginate current_collection, :window => 4, :outer_window => 3 %>
+  <%= paginate current_collection, :window => 4, :outer_window => 3 %>
 </table>
 
 <% end %>

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

@@ -45,7 +45,7 @@
 
       <% if flash[sym].present? %>
         <%= javascript_tag do %>
-        $.notify.notice('<%= j "#{flash[sym]}" %>');
+          $.notify.<%= "#{sym}" %>('<%= j "#{flash[sym]}" %>');
         <% end %>
 
         <% flash.discard(sym) %>

data/{locales → config/locales}/en.yml

@@ -14,6 +14,9 @@ en:
       actions: "Actions"
       info: "Info"
       are_you_sure: "Are you sure?"
+      last_updated: "Last updated"
+      ago: "ago"
+      ok: "Ok"
       
       form:
         correct_these_errors_and_retry: "Correct these errors and retry"

data/{locales → config/locales}/it.yml

@@ -15,6 +15,10 @@ it:
       actions: "Azioni"
       
       are_you_sure: "Sei sicuro?"
+      last_updated: "Ultimo aggiornamento"
+      ago: "fa"
+      ok: "Ok"
+      new_record: "nuovo"
       
       form:
         correct_these_errors_and_retry: "Correggi questi errori e riprova"

data/fullstack-admin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-admin"
-  s.version = "0.1.19"
+  s.version = "0.1.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2012-08-15"
+  s.date = "2012-08-17"
   s.description = "Administration interface framework for fullstack"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [
@@ -931,6 +931,7 @@ Gem::Specification.new do |s|
     "app/assets/javascripts/support/facebox.js.coffee",
     "app/assets/javascripts/support/forms.js.coffee",
     "app/assets/javascripts/support/gmap.js.coffee",
+    "app/assets/javascripts/support/nested_forms.js.coffee",
     "app/assets/javascripts/support/pickers.js.coffee",
     "app/assets/javascripts/support/plupload.js.coffee",
     "app/assets/javascripts/support/uploads.js.coffee",
@@ -974,8 +975,10 @@ Gem::Specification.new do |s|
     "app/models/suspendable.rb",
     "app/models/trackable.rb",
     "app/views/admin/_nav.html.erb",
+    "app/views/admin/base/_associated_resources_table.html.erb",
     "app/views/admin/base/_form.html.erb",
     "app/views/admin/base/_index.html.erb",
+    "app/views/admin/base/_nested_form.html.erb",
     "app/views/admin/base/destroy.js.coffee",
     "app/views/admin/base/edit.html.erb",
     "app/views/admin/base/index.html.erb",
@@ -983,6 +986,8 @@ Gem::Specification.new do |s|
     "app/views/admin/base/update.js.coffee",
     "app/views/layouts/admin.html.erb",
     "config/initializers/formtastic_bootstrap_timeish_hack.rb",
+    "config/locales/en.yml",
+    "config/locales/it.yml",
     "config/routes.rb",
     "fullstack-admin.gemspec",
     "lib/fullstack-admin.rb",
@@ -1003,8 +1008,6 @@ Gem::Specification.new do |s|
     "lib/generators/fullstack/admin/templates/scaffold/controller.rb",
     "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",
-    "locales/it.yml",
     "vendor/assets/javascripts/ajax-chosen.js",
     "vendor/assets/javascripts/angular.js",
     "vendor/assets/javascripts/bootstrap.js",

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

@@ -4,7 +4,7 @@ module Fullstack
       source_root File.expand_path('../../../../../locales', __FILE__)
     
       def install
-        copy_file "#{name}.yml", Rails.root.join("config", "locales", "fullstack.admin.#{name}.yml")
+        create_file Rails.root.join("config", "locales", "fullstack.admin.#{name}.yml")
       end
     
     end

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

@@ -86,7 +86,7 @@ str
       end
       
       def title_column
-        ( model.column_names & %W(title name label browser_title seo_title seo_name key claim email) ).first
+        ( model.column_names.map {|c| } & %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/root/app/assets/stylesheets/admin/admin.css

@@ -12,6 +12,3 @@
     padding-top: 68px;
   }
 }
-
-
-

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

@@ -3,11 +3,11 @@
   <%%= f.errors %>
   
   <%%= f.inputs do %>
-    <%%= f.resource_inputs(current_resource) %>
+  <%%= f.resource_inputs %>
   <%% end -%> 
 
   <%%= f.actions do %>
-    <%%= f.resource_submit(current_resource) %>
+  <%%= f.resource_submit %>
   <%% end %>
   
 <%% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2012-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1189,6 +1189,7 @@ files:
 - app/assets/javascripts/support/facebox.js.coffee
 - app/assets/javascripts/support/forms.js.coffee
 - app/assets/javascripts/support/gmap.js.coffee
+- app/assets/javascripts/support/nested_forms.js.coffee
 - app/assets/javascripts/support/pickers.js.coffee
 - app/assets/javascripts/support/plupload.js.coffee
 - app/assets/javascripts/support/uploads.js.coffee
@@ -1232,8 +1233,10 @@ files:
 - app/models/suspendable.rb
 - app/models/trackable.rb
 - app/views/admin/_nav.html.erb
+- app/views/admin/base/_associated_resources_table.html.erb
 - app/views/admin/base/_form.html.erb
 - app/views/admin/base/_index.html.erb
+- app/views/admin/base/_nested_form.html.erb
 - app/views/admin/base/destroy.js.coffee
 - app/views/admin/base/edit.html.erb
 - app/views/admin/base/index.html.erb
@@ -1241,6 +1244,8 @@ files:
 - app/views/admin/base/update.js.coffee
 - app/views/layouts/admin.html.erb
 - config/initializers/formtastic_bootstrap_timeish_hack.rb
+- config/locales/en.yml
+- config/locales/it.yml
 - config/routes.rb
 - fullstack-admin.gemspec
 - lib/fullstack-admin.rb
@@ -1261,8 +1266,6 @@ files:
 - lib/generators/fullstack/admin/templates/scaffold/controller.rb
 - 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
-- locales/it.yml
 - vendor/assets/javascripts/ajax-chosen.js
 - vendor/assets/javascripts/angular.js
 - vendor/assets/javascripts/bootstrap.js
@@ -1299,7 +1302,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2930398911678922489
+      hash: 1912159518853261136
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: