active_scaffold_vho 3.0.8 → 3.0.9

data/active_scaffold_vho.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_scaffold_vho}
-  s.version = "3.0.8"
+  s.version = "3.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Many, see README"]
-  s.date = %q{2011-01-26}
+  s.date = %q{2011-01-27}
   s.description = %q{Save time and headaches, and create a more easily maintainable set of pages, with ActiveScaffold. ActiveScaffold handles all your CRUD (create, read, update, delete) user interface needs, leaving you more time to focus on more challenging (and interesting!) problems.}
   s.email = %q{activescaffold@googlegroups.com}
   s.extra_rdoc_files = [

data/frontends/default/stylesheets/stylesheet.css

@@ -107,7 +107,7 @@ float: right;
 .active-scaffold-header div.actions div.action_group li a,
 .active-scaffold-header div.actions div.action_group li div {
 float: none;
-margin: 0 2px;
+margin: 0;
 }
 
 .active-scaffold-header div.actions .action_group ul {
@@ -140,16 +140,13 @@ opacity: 0.5;
 .active-scaffold-header div.actions a.show_search,
 .active-scaffold-header div.actions a.show_config_list,
 .active-scaffold-header div.actions div.action_group div {
-padding-left: 19px;
+margin:0;  
+padding: 1px 5px 1px 20px;
 background-position: 1px 50%;
 background-repeat: no-repeat;
 }
 
 .active-scaffold-header div.actions div.action_group div {
-  padding: 1px 2px 1px 19px;
-  background-position: 1px 50%;
-  background-repeat: no-repeat;
-  margin-left: 5px;
   background-image: url(../../../images/active_scaffold/default/gears.png); /* default icon for actions or override with css */
 }
 
@@ -346,23 +343,31 @@ right: 150px;
 
 .active-scaffold .actions .action_group ul li {
 background: none repeat scroll 0 0 #EEE;
-border-bottom: 1px dashed #222;
+border-top: 1px dashed #222;
 display: block;
-padding-bottom: 5px;
 position: relative;
 width: auto;
 z-index: 2;
 }
 
-.active-scaffold .actions .action_group ul li.top {
-border-top: 1px solid #005CB8;
+.active-scaffold .actions .action_group ul li div {
+  margin: 0;
+  padding: 5px 5px 5px 25px;
+  background-position: 5px 50%;
+  background-repeat: no-repeat;
 }
 
 .active-scaffold .actions .action_group ul li a {
   display: block;
   color: #333;
   margin: 0;
-  padding: 3px 5px 3px 25px;
+  padding: 5px 5px 5px 25px;
+  background-position: 5px 50%;
+  background-repeat: no-repeat;
+}
+
+.active-scaffold .actions .action_group ul li.top {
+border-top: 0px solid #005CB8;
 }
 
 .active-scaffold .actions .action_group:hover ul ul,
@@ -376,9 +381,6 @@ display: none;
 display: block;
 }
 
-
-
-
 /* Table :: Inline Adapter
    ============================= */
 

data/frontends/default/views/on_update.js.rjs

@@ -3,8 +3,8 @@ form_selector = "#{element_form_id(:action => :update)}"
 page << "var action_link = ActiveScaffold.find_action_link('#{form_selector}');"
 page << "action_link.update_flash_messages('#{escape_javascript(render(:partial => 'messages').strip)}');"
 if controller.send :successful?
-  if render_parent? && respond_to?(:render_component)
-    parent_rendered = render_component(render_parent_options)
+  if render_parent? && controller.respond_to?(:render_component_into_view)
+    parent_rendered = controller.send(:render_component_into_view, render_parent_options)
     if nested?
       page << "action_link.close('#{escape_javascript(parent_rendered)}');"
     else

data/lib/active_scaffold/actions/update.rb

@@ -49,7 +49,7 @@ module ActiveScaffold::Actions
       end
     end
     def update_respond_to_js
-      if active_scaffold_config.update.refresh_list && successful?
+      if successful? && active_scaffold_config.update.refresh_list && !render_parent?
         do_search if respond_to? :do_search
         do_list
       end

data/lib/active_scaffold/bridges/carrierwave/bridge.rb

@@ -2,6 +2,8 @@ ActiveScaffold::Bridges.bridge "CarrierWave" do
   install do
     require File.join(File.dirname(__FILE__), "lib/form_ui")
     require File.join(File.dirname(__FILE__), "lib/list_ui")
+    require File.join(File.dirname(__FILE__), "lib/carrierwave_bridge_helpers")
+    require File.join(File.dirname(__FILE__), "lib/carrierwave_bridge")
     ActiveScaffold::Config::Core.send :include, ActiveScaffold::Bridges::Carrierwave::Lib::CarrierwaveBridge
   end
 end

data/lib/active_scaffold/bridges/paperclip/bridge.rb

@@ -5,6 +5,8 @@ ActiveScaffold::Bridges.bridge "Paperclip" do
     end
     require File.join(File.dirname(__FILE__), "lib/form_ui")
     require File.join(File.dirname(__FILE__), "lib/list_ui")
+    require File.join(File.dirname(__FILE__), "lib/paperclip_bridge_helpers")
+    require File.join(File.dirname(__FILE__), "lib/paperclip_bridge")
     ActiveScaffold::Config::Core.send :include, ActiveScaffold::Bridges::Paperclip::Lib::PaperclipBridge
   end
 end

data/lib/active_scaffold/helpers/controller_helpers.rb

@@ -55,7 +55,7 @@ module ActiveScaffold
       end
 
       def render_parent_options
-        if nested?
+        if nested? && (nested.belongs_to? || nested.has_one?)
           {:controller => nested.parent_scaffold.controller_path, :action => :row, :id => nested.parent_id}
         elsif params[:parent_sti]
           options = {:controller => params[:parent_sti], :action => render_parent_action(params[:parent_sti])}

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -251,7 +251,7 @@ module ActiveScaffold
         classes = []
         classes << "#{column.name}-column_heading"
         classes << "sorted #{sorting.direction_of(column).downcase}" if sorting.sorts_on? column
-        classes << column.css_class unless column.css_class.nil?
+        classes << column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc)
         classes.join(' ')
       end
 

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 0
-    PATCH = 8
+    PATCH = 9
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 3
   - 0
-  - 8
-  version: 3.0.8
+  - 9
+  version: 3.0.9
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 +01:00
+date: 2011-01-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency