fullstack-admin 0.1.17 → 0.1.18

data/VERSION

@@ -1 +1 @@
-0.1.17
+0.1.18

data/app/assets/stylesheets/support/bootstrap-workarounds.css

@@ -33,3 +33,7 @@
 .tab-content {
 overflow: visible;
 }
+
+.tabs-left .nav-list.nav-tabs {
+  padding-right: 0;
+}

data/app/helpers/admin_form_helper.rb

@@ -5,10 +5,6 @@ module AdminFormHelper
        @target = decorated
     end
     
-    def errors(*args)
-      @target.template.form_errors(@target, *args)
-    end
-    
     def method_missing(method, *args, &block)
       @target.send(method, *args, &block)
     end
@@ -22,42 +18,32 @@ module AdminFormHelper
     end
     
     def form_errors(options = {:exclude => [:slug]})
-      f = this
+      f = @target
       unless f.object.errors.empty?
-        content_tag :div, :class => "alert alert-block" do
-          link_to "×", :class => "close", :data => {:dismiss => "alert"}
-          content_tag(:h4, t('fullstack.admin.form.correct_these_errors_and_retry', :default => "Correct these errors and retry"), :class => "alert-heading")
+        @target.template.content_tag :div, :class => "alert alert-block" do
+          @target.template.link_to "×", :class => "close", :data => {:dismiss => "alert"}
+          @target.template.content_tag(:h4, I18n.t('fullstack.admin.form.correct_these_errors_and_retry', :default => "Correct these errors and retry"), :class => "alert-heading")
           f.semantic_errors *(f.object.errors.keys - (options[:exclude] || []))
         end
       end
     end
+    alias :errors :form_errors
     
     def action(method, options = {})
       default_label = I18n.t("fullstack.admin_form.labels.#{method}", :default => "#{method}".humanize)
       options[:type] ||= !!options[:primary] ? :primary : nil
       @target.template.button((options.delete(:label) || default_label), options)
     end
-
-  end
-  
-  def after_current_form(key = :default, options = {:replace => false})
-    reset_after_current_form_hash! if @after_current_form.nil?
-    if options[:replace]
-      @after_current_form[key] = ""
-    end
     
-    @after_current_form[key]
   end
-  
-  def reset_after_current_form_hash!
-    @after_current_form = ActiveSupport::OrderedHash.new
-    @after_current_form[:default] = ""
-  end
-  
+   
   def admin_form_for(record_or_name_or_array, *args)
-     semantic_form_for(record_or_name_or_array, *args) do |f|
-       yield(FormBuilderDecorator.new(f)) << @after_current_form.map { |k, v| v }.join().html_safe
-     end
+    options = args.extract_options!
+    options[:builder] ||= FormtasticBootstrap::FormBuilder
+    
+    semantic_form_for(record_or_name_or_array, *(args << options)) do |f|
+      yield(FormBuilderDecorator.new(f))
+    end
   end
   
 end

data/app/helpers/resources_helper.rb

@@ -0,0 +1,21 @@
+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/views/admin/base/edit.html.erb

@@ -1,7 +1,7 @@
 <% 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(resource) %>`</h1></div>
+  <div class="page-header"><h1><%= t('fullstack.admin.edit', :default => "Edit") %> `<%= title_for(current_resource) %>`</h1></div>
 <% end -%>
 
 <%= render :partial => 'form' %>

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

@@ -1,26 +1,28 @@
 <% if content_for? :title -%>
   <div class="page-header"><h1><%= yield :title %></h1></div>
 <% else -%>
-  <div class="page-header"><h1><%= t(plural_name, :scope => "active_record.plurals") %></h1></div>
+  <div class="page-header"><h1><%= t(plural_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}")} %>
+  <%= render :partial => "collection", 
+  :locals => { 
+    :collection => instance_variable_get("@#{controller_name}"),
+    :"#{controller_name}" => instance_variable_get("@#{controller_name}")
+  } 
+  %>
 <% else %>
 
-
-
 <div class="mb1">
 	<% if subject.can_create?(controller_name) && controller.action_methods.include?("new") %>
-	  <%= link_to send("new_admin_#{controller_name.singularize}_path"), :class => "btn btn-primary" do %>
-	  <i class="icon icon-plus icon-white"></i> <%= _("New") %>
-	  <% end -%>
+    <%= button t('fullstack.admin.new', :default => "New"), 
+               send("new_admin_#{controller_name.singularize}_path"),
+               :type => :primary, :icon => :plus, :icon_color => :white %>
 	<% end %>
-	
-	  <%= link_to 'javascript:void(0)', :class => "btn toggle-delete" do  %>
-    <i class="icon icon-trash"></i> <%= _("Delete") %>
-	  <% end -%>
 
+  <%= button t('fullstack.admin.delete', :default => "Delete"), 
+             'javascript:void(0)', :class => "toggle-delete",
+             :icon => :trash %>
 </div>
 
 
@@ -31,14 +33,13 @@
   </tr>
   </thead>
   <tbody>
-    <% instance_variable_get("@#{controller_name}").each do |item| -%>
+    <% current_collection.each do |item| -%>
       <tr>
-     <%= render :partial => 'index', :locals => {:thead => false, :tbody => true, :content =>  item} %>
+        <%= render :partial => 'index', :locals => {:thead => false, :tbody => true, :content =>  item} %>
       </tr>
     <% end -%>
   </tbody>
-  <%=  paginate instance_variable_get("@#{controller_name}"), :window => 4, :outer_window => 3 %>
-
+  <%=  paginate current_collection, :window => 4, :outer_window => 3 %>
 </table>
 
 <% end %>
@@ -48,12 +49,12 @@
 <% if partial?('filter') %>
   	<div class="well">
       <div class="mb1">
-        <h4>Filtra</h4>
+        <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| %>
         <%= render :partial => "filter", :locals => {:f => f} %>
         <%= f.buttons do %>
-        <%= f.commit_button _("Filter") %>
+        <%= f.commit_button t('fullstack.admin.filter', :default => "Filter") %>
         <% end %>
   		<% end %>
   	</div>

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

@@ -1,7 +1,7 @@
 <% if content_for? :title -%>
   <div class="page-header"><h1><%= yield :title %></h1></div>
 <% else -%>
-  <div class="page-header"><h1><%= _("New") %> <%= t(singular_name, :scope => "active_record.models") %></h1></div>
+  <div class="page-header"><h1><%= t('fullstack.admin.new', :default => "New") %> <%= t(singular_name, :scope => "activerecord.models") %></h1></div>
 <% end -%>
 
 <%= render :partial => 'form' %>

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

@@ -11,14 +11,14 @@
 <body>
   <%= render :partial => 'admin/shared/nav' %>
 
-  <%= navbar :fixed => :top do %>
+  <%= navbar :fluid => true, :fixed => :top do %>
     <%= brand "#{app_name} Admin", admin_root_path %>
     <%= yield :menu %>
   <% end %>
 
   <%= yield :crumbs %>
   
-  <%= container :fluid, :class => "main" do %>
+  <%= container :fluid => true, :class => "main" do %>
     <%= row do %>
       
       <%= span(2, :id => "left-aside") do %>
@@ -31,7 +31,7 @@
       
       <% if content_for?(:aside) %>
         <%= span(4, :id => "left-aside") do %>
-            <%= yield :nav %>
+            <%= yield :aside %>
         <% end %>
       <% end %>
     

data/fullstack-admin.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-admin"
-  s.version = "0.1.17"
+  s.version = "0.1.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
@@ -949,6 +949,7 @@ Gem::Specification.new do |s|
     "app/controllers/admin/base_controller.rb",
     "app/controllers/admin/responder.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",
@@ -997,6 +998,10 @@ Gem::Specification.new do |s|
     "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/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",
     "locales/it.yml",
     "vendor/assets/javascripts/ajax-chosen.js",

data/lib/fullstack/admin/engine.rb

@@ -1,5 +1,6 @@
 require 'rails'
 require "ckeditor"
+require 'fullstack'
 
 module Fullstack
   module Admin
@@ -14,8 +15,12 @@ module Fullstack
             require "ckeditor/orm/active_record"
           end
 
-          Ckeditor::ApplicationController.class_eval do
-            authorize(:scope => :admin)
+          if Object.const_defined?("UserSubject")
+
+            Ckeditor::ApplicationController.class_eval do
+              authorize(:scope => :admin)
+            end
+
           end
         end
                 

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

@@ -30,18 +30,6 @@ eos
         end
       end
       
-      def append_routes
-        src = <<-eos
-
-  namespace :admin do
-    root :to => "dashboard#show"
-  end
-  
-eos
-        route(src)
-        
-        route("\n  devise_for :users\n")
-      end
 
       def users
         generate "migration:from user"
@@ -68,6 +56,20 @@ eos
         generate "fullstack:admin:locale en"
       end
 
+
+      def append_routes
+        src = <<-eos
+
+  namespace :admin do
+    root :to => "dashboard#show"
+  end
+  
+eos
+        route(src)
+        
+        route("\n  devise_for :users\n")
+      end
+
       protected
       
       def migration_timestamp

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

@@ -48,7 +48,7 @@ module Fullstack
         placeholder_text = "FULLSTACK_PLACEHOLDER"
         gsub_file(Rails.root.join('app', 'views', scope, "shared", "_nav.html.erb"), /\<\!-- #{placeholder_text} --\>\n/) do
 <<-str
-      <%= nav_item _("#{controller_class_name}"), #{scope}_#{plural_name}_path %>
+      <%= nav_item t('active_record.models.#{plural_name}', :default => "#{controller_class_name}"), #{scope}_#{plural_name}_path %>
       <!-- #{placeholder_text} -->
           
 str
@@ -57,6 +57,10 @@ str
       
       protected
       
+      def class_name
+        name.singularize.camelize
+      end
+      
       def scope
         @scope ||= "admin"
       end

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

@@ -14,9 +14,9 @@
 <% end -%>
 
 <% content_for :nav do -%>
-  
-  <div class="well">
-    <%= nav_list do %>
+
+  <div class="tabbable tabs-left float right">
+    <%= nav_list :class => "nav-tabs" do %>
       <!-- FULLSTACK_PLACEHOLDER -->
     
       <!-- Please do not delete the comment above. 
@@ -26,5 +26,4 @@
     <% end %>
   </div>
 
-
 <% end -%>

data/lib/generators/fullstack/admin/templates/scaffold/controller.rb

@@ -0,0 +1,43 @@
+class <%= scope_class %>::<%= controller_class_name %>Controller < <%= scope_class %>::BaseController
+  respond_to :html, :js
+  
+  def index
+    @search = <%= resource_class_name %>.search(params[:search])
+    @<%= collection_name %> = @search.page(params[:page] || 1)
+  end
+
+  def new
+    <%- if content? -%>
+    @<%= resource_name %> = <%= resource_class_name %>.new(:author_id => current_user._id)
+    <%- else -%>
+    @<%= resource_name %> = <%= resource_class_name %>.new  
+    <%- end -%>
+  end
+  
+  def edit
+  end
+  
+  def create
+      @<%= resource_name %> = <%= resource_class_name %>.new(params[:<%= resource_name %>])
+      
+      if @<%= resource_name %>.respond_to?(:author)
+        @<%= resource_name %>.author ||= current_user
+      end
+      
+      @<%= resource_name %>.save
+      respond_with(@<%= resource_name %>)
+  end
+
+  def update
+    @<%= resource_name %>.attributes = params[:<%= resource_name %>]
+    @<%= resource_name %>.save
+    respond_with(@<%= resource_name %>)
+  end
+
+  def destroy
+    @<%= resource_name %>.destroy
+    respond_with(@<%= resource_name %>)
+  end
+end
+
+

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

@@ -0,0 +1,14 @@
+<!-- https://github.com/ernie/meta_search -->
+<!-- 
+ f.input :title_contains
+ f.input :created_at, :as => :daterange
+-->
+
+<% if title_column %>
+<%%=  f.input :<%= title_column %>_contains %>
+<% end %>
+
+<% if has_timestamps? %>
+  <%%=  f.input :created_at, :as => :daterange %>
+<% end %>
+

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

@@ -0,0 +1,16 @@
+<%%= admin_form_for [:"<%= scope %>", current_resource], :html => {:multipart => true} do |f| -%>
+
+  <%%= f.errors %>
+  
+  <%%= f.inputs do %>
+
+  <%% end -%> 
+
+  <%%= form_actions do %>
+  <%%= button (current_resource.persisted? ? t('fullstack.admin.update', :default => "Update") : t('fullstack.admin.create', :default => "Create")),
+    :type => :primary, 
+    :size => :large %>
+  <%% end %>
+  
+
+<%% end -%>

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

@@ -0,0 +1,18 @@
+<%% 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 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 -%>

data/locales/en.yml

@@ -1,9 +1,17 @@
 en:
   fullstack:
     admin:
+      homepage: "Homepage"
+      account: "Account"
+      dashboard: "Dashboard"
+      logout: "Logout"
+      new: "New"
       show: "Show"
       edit: "Edit"
       delete: "Delete"
+      create: "Create"
+      filter: "Filter"
+      actions: "Actions"
       are_you_sure: "Are you sure?"
       
       form:

data/locales/it.yml

@@ -1,10 +1,20 @@
 it:
   fullstack:
     admin:
+      homepage: "Homepage"
+      account: "Account"
+      dashboard: "Dashboard"
+      logout: "Logout"
+      new: "Crea"
       show: "Visualizza"
       edit: "Modifica"
       delete: "Elimina"
+      filter: "Filtra"
+      create: "Crea"
+      actions: "Azioni"
+      
       are_you_sure: "Sei sicuro?"
+      
       form:
         correct_these_errors_and_retry: "Correggi questi errori e riprova"
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
   prerelease: 
 platform: ruby
 authors:
@@ -1175,6 +1175,7 @@ files:
 - app/controllers/admin/base_controller.rb
 - app/controllers/admin/responder.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
@@ -1223,6 +1224,10 @@ files:
 - 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/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
 - locales/it.yml
 - vendor/assets/javascripts/ajax-chosen.js
@@ -1261,7 +1266,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2814705488529212827
+      hash: 2117914633197908610
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: