bootstrap_admin 0.0.9 → 0.0.10

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+nbproject

data/app/assets/stylesheets/bootstrap_admin.css

@@ -5,8 +5,29 @@
  *= require_self
  *= require_tree .
  */
+
 form.search{
   float:right;
   margin-top: -45px;
 }
+
 .clear_both{clear:both;}
+
+
+.checkbox .icon {
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  background: url(/assets/jquery.checkbox.png) no-repeat blue;
+}
+
+.checkbox {
+  display: inline-block; }
+  .checkbox .icon {
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+    background: url(/assets/jquery.checkbox.png) no-repeat; }
+  .checkbox.checked .icon, .checkbox.true .icon {
+    background-position: -16px 0px; }
+

data/app/helpers/bootstrap_admin_helper.rb

@@ -129,31 +129,63 @@ module BootstrapAdminHelper
     bootstrap_admin_config.available_actions
   end
 
+
+  def bootstrap_url_for options = {}
+    defaults = {:controller => params[:controller]}.merge options
+    url_for(defaults)
+  end
+  alias_method :bootstrap_url, :bootstrap_url_for
+
+  def bootstrap_form_url item
+    [item, :url => bootstrap_url_for(:action => (item.new_record? ? :create : :update), :id => item.id)]
+  end
+
   # =============================================================================
   def index_actions_for item
     actions = []
 
     if available_actions.include? :show
-      actions << link_to(:show, [BootstrapAdmin.admin_namespace, item], class: 'btn')
+      actions << link_to(:show, bootstrap_url_for(:action => :show, :id => item.id), class: 'btn')
     end
 
     if available_actions.include? :edit
-      actions << link_to(:edit, [:edit, BootstrapAdmin.admin_namespace, item], class: 'btn')
+      actions << link_to(:edit, bootstrap_url_for(:action => :edit, :id => item.id), class: 'btn')
     end
 
     if available_actions.include? :destroy
-      actions << link_to(:destroy, [BootstrapAdmin.admin_namespace, item], confirm: t(:confirm), method: :delete, class: 'btn btn-danger')
+      actions << link_to(:destroy, bootstrap_url_for(:action => :show, :id => item.id), confirm: t(:confirm), method: :delete, class: 'btn btn-danger')
     end
 
     actions.join("\n").html_safe
   end
 
+  # =====
+  def index_default_actions 
+    if available_actions.include? :new
+      model_klass = model_for controller
+      link_to([:new, model_klass], bootstrap_url_for(:action => :new), :class => 'btn btn-primary').html_safe
+    end
+  end
+
+  def show_default_actions
+    model_instance = model_instance_for controller
+    str = if available_actions.include? :edit
+      link_to :edit, bootstrap_url_for(:action => :edit, :id => model_instance.id), :class => 'btn'
+    end || ""
+    str += link_to :back, bootstrap_url, :class => 'btn'
+    str.html_safe
+  end
+
 
   # =============================================================================
   # @param controller [ActionController::Base]
   # @return [Class] the model class for the current controller
   def model_for controller
-    collection_name_for(controller).classify.constantize
+    if bootstrap_admin_config.model_name.blank?
+      collection_name_for(controller).classify.constantize
+    else
+      bootstrap_admin_config.model_name.constantize
+    end
   end
 
   # =============================================================================

data/app/views/defaults/_form.html.haml

@@ -1,9 +1,9 @@
 - model_instance = model_instance_for(controller)
-= simple_form_for [BootstrapAdmin.admin_namespace, model_instance] do |f|
+= simple_form_for *bootstrap_form_url(model_instance) do |f|
   = f.error_notification
 
   = render "form_fields", :form => f
 
   .actions
     = yield :actions
-    = link_to :back, [BootstrapAdmin.admin_namespace, collection_name_for(controller)], :class => 'btn'
+    = link_to :back, bootstrap_url, :class => 'btn'

data/app/views/defaults/_index.html.haml

@@ -5,8 +5,7 @@
     %tr
       - attributes.each do |attribute|
         %th= attribute.human_name
-      %th= t(:actions)
-
+      %th.actions= t(:actions)
   %tbody
     - collection.each do |item|
       %tr

data/app/views/defaults/_search_box.html.haml

@@ -1,4 +1,4 @@
-= form_tag url_for(:controller => params[:controller]), :method => :get, :class=>"search bootstrap_admin" do
+= form_tag bootstrap_url, :method => :get, :class=>"search bootstrap_admin" do
   .input-append{:class => params[:q].blank? ? "" : "input-prepend"}
     - unless params[:q].blank?
       .add-on.prepend.btn.reset= image_tag "cross.gif"

data/app/views/defaults/index.html.haml

@@ -10,5 +10,4 @@
 .clear_both
 
 .actions
-  - if available_actions.include? :new
-    = link_to [:new, model_klass], [:new, BootstrapAdmin.admin_namespace, model_name], :class => 'btn btn-primary'
+  = index_default_actions

data/app/views/defaults/show.html.haml

@@ -6,6 +6,4 @@
 = render "show"
 
 .actions
-  - if available_actions.include? :edit
-    = link_to :edit, [:edit, BootstrapAdmin.admin_namespace, model_instance], :class => 'btn'
-  = link_to :back, [BootstrapAdmin.admin_namespace, collection_name], :class => 'btn'
+  = show_default_actions

data/lib/bootstrap_admin/actions.rb

@@ -28,7 +28,7 @@ module BootstrapAdmin
       # =============================================================================
       # Creates a new item
       def create
-        instance model_class.create(params[model_name])
+        instance model_class.new(params[model_name])
         instance.save
         namespaced_response instance
       end
@@ -58,14 +58,18 @@ module BootstrapAdmin
           if bootstrap_admin_config.model_name.blank?
             collection_name.singularize
           else
-            bootstrap_admin_config.model_name
+            bootstrap_admin_config.model_name.underscore.gsub("/","_")
           end
         end
 
         # =============================================================================
         # @return [ActiveRecord::Base] model class based on the controller's name
         def model_class
-          model_name.classify.constantize
+          if bootstrap_admin_config.model_name.blank?
+            collection_name.singularize.classify.constantize
+          else
+            bootstrap_admin_config.model_name.constantize
+          end
         end
 
         # =============================================================================
@@ -75,7 +79,11 @@ module BootstrapAdmin
             instance_variable_set "@#{collection_name.singularize}", instance_var
           else
             unless ivar = instance_variable_get("@#{collection_name.singularize}")
-              ivar = model_class.find params[:id]
+              ivar = if ["new", "create"].include? params[:action]
+                model_class.new
+              else
+                model_class.find params[:id]
+              end
               instance_variable_set "@#{collection_name.singularize}", ivar
             end
             ivar

data/lib/bootstrap_admin/responder.rb

@@ -29,7 +29,7 @@ module BootstrapAdmin
                     'helpers.messages.update.success'
                   end
         controller.flash[:success] = I18n.t(message, :model => resource.class.model_name.human)
-        redirect_to @resources
+        redirect_to :controller => controller.controller_name, :action => :show, :id => resource.id
 
       else
         if delete?

data/lib/bootstrap_admin/version.rb

@@ -1,3 +1,3 @@
 module BootstrapAdmin
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_admin
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -106,6 +106,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/images/cross.gif
+- app/assets/images/jquery.checkbox.png
 - app/assets/images/search_btn.png
 - app/assets/javascripts/bootstrap_admin.js
 - app/assets/javascripts/bootstrap_admin/bootstrap_admin.js.coffee