active_scaffold_vho 3.0.18 → 3.0.19

data/active_scaffold_vho.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_scaffold_vho}
-  s.version = "3.0.18"
+  s.version = "3.0.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Many, see README"]
-  s.date = %q{2011-03-27}
+  s.date = %q{2011-04-18}
   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 = [
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "frontends/default/images/arrow_down.gif",
     "frontends/default/images/arrow_up.gif",
     "frontends/default/images/close.gif",
+    "frontends/default/images/close_touch.png",
     "frontends/default/images/config.png",
     "frontends/default/images/cross.png",
     "frontends/default/images/gears.png",

data/frontends/default/javascripts/jquery/active_scaffold.js

@@ -128,69 +128,7 @@ $(document).ready(function() {
     return true;
   });
   $('span.in_place_editor_field').live('click', function(event) {
-    var span = $(this);
-    span.data(); // jquery 1.4.2 workaround
-    if (typeof(span.data('editInPlace')) === 'undefined') {
-      var options = {show_buttons: true,
-                     hover_class: 'hover',
-                     element_id: 'editor_id',
-                     ajax_data_type: "script",
-                     update_value: 'value'},
-          csrf_param = $('meta[name=csrf-param]').first(),
-          csrf_token = $('meta[name=csrf-token]').first(),
-          my_parent = span.parent(),
-          column_heading = null;
-
-      if(!(my_parent.is('td') || my_parent.is('th'))){
-          my_parent = span.parents('td').eq(0);
-      }
-
-      if (my_parent.is('td')) {
-        var column_no = my_parent.prevAll('td').length;
-        column_heading = my_parent.closest('.active-scaffold').find('th:eq(' + column_no + ')');
-      } else if (my_parent.is('th')) {
-        column_heading = my_parent;
-      }
-        
-      var render_url = column_heading.attr('data-ie_render_url'),
-          mode = column_heading.attr('data-ie_mode'),
-          record_id = span.attr('data-ie_id');
-          
-      ActiveScaffold.read_inplace_edit_heading_attributes(column_heading, options);
-      
-      if (span.attr('data-ie_url')) { 
-        options.url = span.attr('data-ie_url').replace(/__id__/, record_id);
-      } else { 
-        options.url = column_heading.attr('data-ie_url').replace(/__id__/, record_id);
-      }
-      
-      if (csrf_param) options['params'] = csrf_param.attr('content') + '=' + csrf_token.attr('content');
-
-      if (span.closest('div.active-scaffold').attr('data-eid')) {
-        if (options['params'].length > 0) {
-          options['params'] += "&";
-        }
-        options['params'] += ("eid=" + span.closest('div.active-scaffold').attr('data-eid'));
-      }
-
-      if (mode === 'clone') {
-        options.clone_id_suffix = record_id;
-        options.clone_selector = '#' + column_heading.attr('id') + ' .as_inplace_pattern';
-        options.field_type = 'clone';
-      }
-      
-      if (render_url) {
-        var plural = false;
-        if (column_heading.attr('data-ie_plural')) plural = true;
-        options.field_type = 'remote';
-        options.editor_url = render_url.replace(/__id__/, record_id) 
-      }
-      if (mode === 'inline_checkbox') {
-        ActiveScaffold.process_checkbox_inplace_edit(span.find('input:checkbox'), options);
-      } else {
-        ActiveScaffold.create_inplace_editor(span, options);
-      }
-    }
+    ActiveScaffold.in_place_editor_field_clicked($(this));
   });
   $('a.as_paginate').live('ajax:before',function(event) {
     var as_paginate = $(this);
@@ -216,10 +154,19 @@ $(document).ready(function() {
   $('input.update_form, select.update_form').live('change', function(event) {
       var element = $(this);
       var as_form = element.closest('form.as_form');
+      var params = null;
+
+      if (element.attr('data-update_send_form')) {
+        params = as_form.serialize();
+        params += '&' + $.param({source_id: element.attr('id')});
+      } else {
+        params = {value: element.val()};
+        params.source_id = element.attr('id');
+      }
+
       $.ajax({
         url: element.attr('data-update_url'),
-        data: {value: element.val(),
-               source_id: element.attr('id')},
+        data: params,
         beforeSend: function(event) {
           element.nextAll('img.loading-indicator').css('visibility','visible');
           ActiveScaffold.disable_form(as_form)
@@ -258,10 +205,27 @@ $(document).ready(function() {
   });
 
   $('a[data-popup]').live('click', function(e) {
-      window.open($(this).attr('href'));
-      e.preventDefault();
-   });
-  
+    window.open($(this).attr('href'));
+    e.preventDefault();
+  });
+
+  $('.hover_click').live("click", function(event) {
+    var element = $(this);
+    var ul_element = element.children('ul').first();
+    if (ul_element.is(':visible')) {
+      element.find('ul').hide();
+    } else {
+      ul_element.show();
+    }
+    return false;
+  });
+  $('.hover_click a.as_action').live('click', function(event) {
+    var element = $(this).closest('.hover_click');
+    if (element) {
+      element.find('ul').hide();
+    }
+    return true;
+  });
 });
 
 /* Simple Inheritance
@@ -731,6 +695,71 @@ var ActiveScaffold = {
       }
       mark_all_checkbox.attr('value', ('' + !options.checked));
     }
+  },
+
+  in_place_editor_field_clicked: function(span) {
+    span.data(); // jquery 1.4.2 workaround
+    if (typeof(span.data('editInPlace')) === 'undefined') {
+      var options = {show_buttons: true,
+                     hover_class: 'hover',
+                     element_id: 'editor_id',
+                     ajax_data_type: "script",
+                     update_value: 'value'},
+          csrf_param = $('meta[name=csrf-param]').first(),
+          csrf_token = $('meta[name=csrf-token]').first(),
+          my_parent = span.parent(),
+          column_heading = null;
+
+      if(!(my_parent.is('td') || my_parent.is('th'))){
+          my_parent = span.parents('td').eq(0);
+      }
+
+      if (my_parent.is('td')) {
+        var column_no = my_parent.prevAll('td').length;
+        column_heading = my_parent.closest('.active-scaffold').find('th:eq(' + column_no + ')');
+      } else if (my_parent.is('th')) {
+        column_heading = my_parent;
+      }
+
+      var render_url = column_heading.attr('data-ie_render_url'),
+          mode = column_heading.attr('data-ie_mode'),
+          record_id = span.attr('data-ie_id');
+
+      ActiveScaffold.read_inplace_edit_heading_attributes(column_heading, options);
+
+      if (span.attr('data-ie_url')) {
+        options.url = span.attr('data-ie_url').replace(/__id__/, record_id);
+      } else {
+        options.url = column_heading.attr('data-ie_url').replace(/__id__/, record_id);
+      }
+
+      if (csrf_param) options['params'] = csrf_param.attr('content') + '=' + csrf_token.attr('content');
+
+      if (span.closest('div.active-scaffold').attr('data-eid')) {
+        if (options['params'].length > 0) {
+          options['params'] += "&";
+        }
+        options['params'] += ("eid=" + span.closest('div.active-scaffold').attr('data-eid'));
+      }
+
+      if (mode === 'clone') {
+        options.clone_id_suffix = record_id;
+        options.clone_selector = '#' + column_heading.attr('id') + ' .as_inplace_pattern';
+        options.field_type = 'clone';
+      }
+
+      if (render_url) {
+        var plural = false;
+        if (column_heading.attr('data-ie_plural')) plural = true;
+        options.field_type = 'remote';
+        options.editor_url = render_url.replace(/__id__/, record_id)
+      }
+      if (mode === 'inline_checkbox') {
+        ActiveScaffold.process_checkbox_inplace_edit(span.find('input:checkbox'), options);
+      } else {
+        ActiveScaffold.create_inplace_editor(span, options);
+      }
+    }
   }
 }
 

data/frontends/default/javascripts/prototype/active_scaffold.js

@@ -239,10 +239,18 @@ document.observe("dom:loaded", function() {
   document.on('change', 'input.update_form, select.update_form', function(event) {
     var element = event.findElement();
     var as_form = element.up('form.as_form');
-    
+    var params = null;
+
+    if (element.hasAttribute('data-update_send_form')) {
+        params = as_form.serialize(true);
+    } else {
+        params = {value: element.getValue()};
+    }
+    params.source_id = element.readAttribute('id');
+
     new Ajax.Request(element.readAttribute('data-update_url'), {
       method: 'get',
-      parameters: {value: element.getValue(), source_id: element.readAttribute('id')},
+      parameters: params,
       onLoading: function(response) {
         element.next('img.loading-indicator').style.visibility = 'visible';
         as_form.disable();
@@ -280,10 +288,27 @@ document.observe("dom:loaded", function() {
     return true;
   });
   document.on("click", "a[data-popup]", function(event, element) {
-     if (event.stopped) return;
-     window.open($(element).href);
-     event.stop();
-   });
+    if (event.stopped) return;
+    window.open($(element).href);
+    event.stop();
+  });
+  document.on("click", ".hover_click", function(event, element) {
+    var ul_element = element.down('ul');
+    if (ul_element.getStyle('display') === 'none') {
+      ul_element.style.display = 'block';
+    } else {
+      ul_element.style.display = 'none';
+    }
+     
+    return true;
+  });
+  document.on("click", ".hover_click a.as_action", function(event, element) {
+    var element = element.up('.hover_click').down('ul');
+    if (element) {
+      element.style.display = 'none';
+    }
+    return true;
+  });
 });
 
 

data/frontends/default/javascripts/prototype/dhtml_history.js

@@ -53,18 +53,6 @@ window.dhtmlHistory = {
 
                var that = this;
                
-               /*Set up the historyStorage object; pass in options bundle*/
-               window.historyStorage.setup(options);
-               
-               /*Set up our base title if one is passed in*/
-               if (options && options.baseTitle) {
-                       if (options.baseTitle.indexOf("@@@") < 0 && historyStorage.debugMode) {
-                               throw new Error("Programmer error: options.baseTitle must contain the replacement parameter"
-                               + " '@@@' to be useful.");
-                       }
-                       this.baseTitle = options.baseTitle;
-               }
-               
                /*set user-agent flags*/
                var UA = navigator.userAgent.toLowerCase();
                var platform = navigator.platform.toLowerCase();
@@ -80,77 +68,92 @@ window.dhtmlHistory = {
                        this.isSupported = true;
                } else if (vendor.indexOf("Apple Computer, Inc.") > -1) {
                        this.isSafari = true;
-                       this.isSupported = (platform.indexOf("mac") > -1);
+                       //this.isSupported = (platform.indexOf("mac") > -1);
+                       this.isSupported = false;
                } else if (UA.indexOf("gecko") != -1) {
                        this.isGecko = true;
                        this.isSupported = true;
                }
 
-               /*Create Safari/Opera-specific code*/
-               if (this.isSafari) {
-                       this.createSafari();
-               } else if (this.isOpera) {
-                       this.createOpera();
-               }
-               
-               /*Get our initial location*/
-               var initialHash = this.getCurrentLocation();
-
-               /*Save it as our current location*/
-               this.currentLocation = initialHash;
-
-               /*Now that we have a hash, create IE-specific code*/
-               if (this.isIE) {
-                       /*Optionally override the URL of IE's blank HTML file*/
-                       if (options && options.blankURL) {
-                               var u = options.blankURL;
-                               /*assign the value, adding the trailing ? if it's not passed in*/
-                               this.blankURL = (u.indexOf("?") != u.length - 1
-                                       ? u + "?"
-                                       : u
-                               );
-                       }
-                       this.createIE(initialHash);
-               }
-
-               /*Add an unload listener for the page; this is needed for FF 1.5+ because this browser caches all dynamic updates to the
-               page, which can break some of our logic related to testing whether this is the first instance a page has loaded or whether
-               it is being pulled from the cache*/
-
-               var unloadHandler = function() {
-                       that.firstLoad = null;
-               };
-               
-               this.addEventListener(window,'unload',unloadHandler);          
-
-               /*Determine if this is our first page load; for IE, we do this in this.iframeLoaded(), which is fired on pageload. We do it
-               there because we have no historyStorage at this point, which only exists after the page is finished loading in IE*/
-               if (this.isIE) {
-                       /*The iframe will get loaded on page load, and we want to ignore this fact*/
-                       this.ignoreLocationChange = true;
-               } else {
-                       if (!historyStorage.hasKey(this.PAGELOADEDSTRING)) {
-                               /*This is our first page load, so ignore the location change and add our special history entry*/
-                               this.ignoreLocationChange = true;
-                               this.firstLoad = true;
-                               historyStorage.put(this.PAGELOADEDSTRING, true);
-                       } else {
-                               /*This isn't our first page load, so indicate that we want to pay attention to this location change*/
-                               this.ignoreLocationChange = false;
-                               this.firstLoad = false;
-                               /*For browsers other than IE, fire a history change event; on IE, the event will be thrown automatically when its
-                               hidden iframe reloads on page load. Unfortunately, we don't have any listeners yet; indicate that we want to fire
-                               an event when a listener is added.*/
-                               this.fireOnNewListener = true;
-                       }
+               if (this.isSupported) {
+                   /*Set up the historyStorage object; pass in options bundle*/
+                   window.historyStorage.setup(options);
+
+                   /*Set up our base title if one is passed in*/
+                   if (options && options.baseTitle) {
+                           if (options.baseTitle.indexOf("@@@") < 0 && historyStorage.debugMode) {
+                                   throw new Error("Programmer error: options.baseTitle must contain the replacement parameter"
+                                   + " '@@@' to be useful.");
+                           }
+                           this.baseTitle = options.baseTitle;
+                   }
+
+                   /*Create Safari/Opera-specific code*/
+                   if (this.isSafari && this.isSupported) {
+                           this.createSafari();
+                   } else if (this.isOpera) {
+                           this.createOpera();
+                   }
+
+                   /*Get our initial location*/
+                   var initialHash = this.getCurrentLocation();
+
+                   /*Save it as our current location*/
+                   this.currentLocation = initialHash;
+
+                   /*Now that we have a hash, create IE-specific code*/
+                   if (this.isIE) {
+                           /*Optionally override the URL of IE's blank HTML file*/
+                           if (options && options.blankURL) {
+                                   var u = options.blankURL;
+                                   /*assign the value, adding the trailing ? if it's not passed in*/
+                                   this.blankURL = (u.indexOf("?") != u.length - 1
+                                           ? u + "?"
+                                           : u
+                                   );
+                           }
+                           this.createIE(initialHash);
+                   }
+
+                   /*Add an unload listener for the page; this is needed for FF 1.5+ because this browser caches all dynamic updates to the
+                   page, which can break some of our logic related to testing whether this is the first instance a page has loaded or whether
+                   it is being pulled from the cache*/
+
+                   var unloadHandler = function() {
+                           that.firstLoad = null;
+                   };
+
+                   this.addEventListener(window,'unload',unloadHandler);
+
+                   /*Determine if this is our first page load; for IE, we do this in this.iframeLoaded(), which is fired on pageload. We do it
+                   there because we have no historyStorage at this point, which only exists after the page is finished loading in IE*/
+                   if (this.isIE) {
+                           /*The iframe will get loaded on page load, and we want to ignore this fact*/
+                           this.ignoreLocationChange = true;
+                   } else if (this.isSupported) {
+                           if (!historyStorage.hasKey(this.PAGELOADEDSTRING)) {
+                                   /*This is our first page load, so ignore the location change and add our special history entry*/
+                                   this.ignoreLocationChange = true;
+                                   this.firstLoad = true;
+                                   historyStorage.put(this.PAGELOADEDSTRING, true);
+                           } else {
+                                   /*This isn't our first page load, so indicate that we want to pay attention to this location change*/
+                                   this.ignoreLocationChange = false;
+                                   this.firstLoad = false;
+                                   /*For browsers other than IE, fire a history change event; on IE, the event will be thrown automatically when its
+                                   hidden iframe reloads on page load. Unfortunately, we don't have any listeners yet; indicate that we want to fire
+                                   an event when a listener is added.*/
+                                   this.fireOnNewListener = true;
+                           }
+                   }
+
+                   /*Other browsers can use a location handler that checks at regular intervals as their primary mechanism; we use it for IE as
+                   well to handle an important edge case; see checkLocation() for details*/
+                   var locationHandler = function() {
+                           that.checkLocation();
+                   };
+                   setInterval(locationHandler, 100);
                }
-
-               /*Other browsers can use a location handler that checks at regular intervals as their primary mechanism; we use it for IE as
-               well to handle an important edge case; see checkLocation() for details*/
-               var locationHandler = function() {
-                       that.checkLocation();
-               };
-               setInterval(locationHandler, 100);
        },      
        
        /*Public: Initialize our DHTML history. You must call this after the page is finished loading. Optionally, you can pass your listener in

data/frontends/default/stylesheets/stylesheet.css

@@ -99,6 +99,15 @@ background-position: 1px 50%;
 background-repeat: no-repeat;
 }
 
+.active-scaffold-header div.actions a {
+padding: 5px 5px;
+margin-left: 0px;
+}
+
+.active-scaffold .active-scaffold .active-scaffold-header div.actions > a {
+padding: 1px 5px;
+}
+
 .active-scaffold-header div.actions div.action_group {
 display: inline;
 float: right;
@@ -112,6 +121,10 @@ margin: 0;
 
 .active-scaffold-header div.actions .action_group ul {
 line-height: 130%;
+top: 19px;
+}
+
+.active-scaffold .active-scaffold .active-scaffold-header div.actions .action_group ul {
 top: 14px;
 }
 
@@ -141,6 +154,17 @@ opacity: 0.5;
 .active-scaffold-header div.actions a.show_config_list,
 .active-scaffold-header div.actions div.action_group div {
 margin:0;  
+padding: 5px 5px 5px 25px;
+background-position: 5px 50%;
+background-repeat: no-repeat;
+}
+
+.active-scaffold .active-scaffold .active-scaffold-header div.actions > a.new,
+.active-scaffold .active-scaffold .active-scaffold-header div.actions > a.new_existing,
+.active-scaffold .active-scaffold .active-scaffold-header div.actions > a.show_search,
+.active-scaffold .active-scaffold .active-scaffold-header div.actions > a.show_config_list,
+.active-scaffold .active-scaffold .active-scaffold-header div.actions div.action_group > div {
+margin:0;
 padding: 1px 5px 1px 20px;
 background-position: 1px 50%;
 background-repeat: no-repeat;
@@ -971,3 +995,82 @@ font-size: 100%;
 .active-scaffold-found {
   float:left;
 }
+
+.as_touch a.inline-adapter-close {
+width: 32px;
+height: 34px;
+background: url(../../../images/active_scaffold/default/close_touch.png) 0 0 no-repeat;
+}
+
+.as_touch .as_paginate {
+font-size: 20px;
+padding: 3px 10px;
+}
+
+.as_touch .active-scaffold-header div.actions a {
+padding: 7px 5px;
+}
+
+.as_touch .active-scaffold .active-scaffold-header div.actions a {
+padding: 7px 5px;
+}
+
+.as_touch .active-scaffold-header div.actions .action_group ul {
+line-height: 130%;
+top: 23px;
+}
+
+.as_touch .active-scaffold .active-scaffold-header div.actions .action_group ul {
+top: 23px;
+}
+
+.as_touch .active-scaffold-header div.actions a.new,
+.as_touch .active-scaffold-header div.actions a.new_existing,
+.as_touch .active-scaffold-header div.actions a.show_search,
+.as_touch .active-scaffold-header div.actions a.show_config_list,
+.as_touch .active-scaffold-header div.actions div.action_group div {
+padding: 7px 5px 7px 25px;
+}
+
+.as_touch .active-scaffold .active-scaffold-header div.actions > a.new,
+.as_touch .active-scaffold .active-scaffold-header div.actions > a.new_existing,
+.as_touch .active-scaffold .active-scaffold-header div.actions > a.show_search,
+.as_touch .active-scaffold .active-scaffold-header div.actions > a.show_config_list,
+.as_touch .active-scaffold .active-scaffold-header div.actions div.action_group > div {
+padding: 7px 5px 7px 25px;
+background-position: 5px 50%;
+}
+
+.as_touch .actions .action_group ul li div {
+padding: 7px 5px 7px 25px;
+}
+
+.as_touch .actions .action_group ul li a {
+padding: 7px 5px 7px 25px;
+}
+
+.as_touch .active-scaffold-header h2 {
+padding: 4px 0px;
+}
+
+.as_touch .active-scaffold .active-scaffold-header div.actions a,
+.as_touch .active-scaffold .active-scaffold-header div.actions div {
+  font: bold 14px arial;
+}
+
+.as_touch .active-scaffold .active-scaffold-header div.actions {
+  right: 15px;
+}
+
+.as_touch tr.record {
+line-height: 130%;
+}
+
+.as_touch th a, .as_touch th a:visited {
+color: #fff;
+padding: 5px 2px 5px 5px;
+}
+
+.as_touch tr.record td {
+padding: 5px 10px;
+}

data/frontends/default/views/_action_group.html.erb

@@ -5,10 +5,14 @@
   <% if (options[:node] == :finished_traversing) -%>
     <%= "</ul>#{(options[:level] == 0 ? "</div>#{end_level_0_tag}": '</li>')}".html_safe %>
   <% elsif (options[:node] == :start_traversing) -%>
+        <% html_classes = []
+           html_classes << 'hover_click' if hover_via_click? %>
 	<% if options[:level] == 0 %>
-	   <%= "#{start_level_0_tag}<div class=\"action_group\"> #{content_tag(:div, as_(parent.name), :class => (parent.name.to_s).downcase)}<ul>".html_safe %>
+           <% html_classes << 'action_group' %>
+	   <%= "#{start_level_0_tag}<div class=\"#{html_classes.join(' ')}\" #{"onclick=\"\"" if hover_via_click?}> #{content_tag(:div, as_(parent.name), :class => (parent.name.to_s).downcase)}<ul>".html_safe %>
 	<% else %>
-	   <%= "<li #{"class=\"top\"" if options[:first_action]}>#{content_tag(:div, as_(parent.name), :class => (parent.name.to_s).downcase)}<ul>".html_safe %>
+           <% html_classes << 'top' if options[:first_action] %>
+	   <%= "<li #{"class=\"#{html_classes.join(' ')}\"" unless html_classes.empty?} #{"onclick=\"\"" if hover_via_click?}>#{content_tag(:div, as_(parent.name), :class => (parent.name.to_s).downcase)}<ul>".html_safe %>
 	<% end %>
   <% else -%>
     <% if options[:level] == 0 %>

data/frontends/default/views/_list_with_header.html.erb

@@ -1,4 +1,4 @@
-<div id="<%= active_scaffold_id -%>" class="active-scaffold active-scaffold-<%= controller_id %> <%= "#{params[:controller]}-view" %> <%= active_scaffold_config.theme %>-theme" <%= "data-eid=#{id_from_controller(params[:eid])}" if params[:eid]%>>
+<div id="<%= active_scaffold_id -%>" class="<%= as_main_div_class %>" <%= "data-eid=#{id_from_controller(params[:eid])}" if params[:eid]%>>
   <div class="active-scaffold-header">
     <%= render :partial => 'list_header' %>
   </div>

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

@@ -1,6 +1,6 @@
 column_span_id ||= element_cell_id(:id => @record.id.to_s, :action => 'update_column', :name => params[:column])
 unless controller.send :successful?
-  page.call 'alert', @record.errors.full_messages(active_scaffold_config).join("\n")
+  page.call 'alert', @record.errors.full_messages.join("\n")
   @record.reload
 end
 column = active_scaffold_config.columns[params[:column]]

data/lib/active_scaffold/actions/core.rb

@@ -32,8 +32,12 @@ module ActiveScaffold::Actions
       @record = new_model
       column = active_scaffold_config.columns[params[:column]]
       unless column.nil?
-        value = column_value_from_param_value(@record, column, params[:value])
-        @record.send "#{column.name}=", value
+        if column.send_form_on_update_column
+          @record = update_record_from_params(@record, active_scaffold_config.update.columns, params[:record])
+        else
+          value = column_value_from_param_value(@record, column, params[:value])
+          @record.send "#{column.name}=", value
+        end
         after_render_field(@record, column)
         source_id = params.delete(:source_id)
         render :partial => "render_field", :collection => Array(params[:update_columns]), :content_type => 'text/javascript', :locals => {:source_id => source_id}

data/lib/active_scaffold/data_structures/column.rb

@@ -62,6 +62,10 @@ module ActiveScaffold::DataStructures
       @update_columns = Array(column_names)
     end
 
+    # send all the form instead of only new value when this column change
+    cattr_accessor :send_form_on_update_column
+    attr_accessor :send_form_on_update_column
+
     # sorting on a column can be configured four ways:
     #   sort = true               default, uses intelligent sorting sql default
     #   sort = false              sometimes sorting doesn't make sense

data/lib/active_scaffold/extensions/action_controller_rendering.rb

@@ -5,8 +5,9 @@ module ActionController #:nodoc:
       if self.class.uses_active_scaffold? and params[:adapter] and @rendering_adapter.nil?
         @rendering_adapter = true # recursion control
         # if we need an adapter, then we render the actual stuff to a string and insert it into the adapter template
+        opts = args.blank? ? Hash.new : args.first
         render :partial => params[:adapter][1..-1],
-        :locals => {:payload => render_to_string(args.first.merge(:layout => false), &block)},
+        :locals => {:payload => render_to_string(opts.merge(:layout => false), &block)},
                :use_full_path => true, :layout => false
         @rendering_adapter = nil # recursion control
       else
@@ -18,3 +19,4 @@ module ActionController #:nodoc:
     # Rails 2.x implementation is post-initialization on :active_scaffold method
   end
 end
+

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -86,6 +86,7 @@ module ActiveScaffold
 
           options[:class] = "#{options[:class]} update_form".strip
           options['data-update_url'] = url_for(url_params)
+          options['data-update_send_form'] = true if column.send_form_on_update_column
         end
         options
       end

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -316,7 +316,7 @@ module ActiveScaffold
         all_marked = (marked_records.length >= @page.pager.count)
         tag_options = {:id => "#{controller_id}_mark_heading", :class => "mark_heading in_place_editor_field"}
         tag_options['data-ie_url'] = url_for({:controller => params_for[:controller], :action => 'mark_all', :eid => params[:eid]})
-        content_tag(:span, check_box_tag(nil, !all_marked, all_marked), tag_options)
+        content_tag(:span, check_box_tag("#{controller_id}_mark_heading_span_input", !all_marked, all_marked), tag_options)
       end
 
       def render_column_heading(column, sorting, sort_direction)

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -132,10 +132,16 @@ module ActiveScaffold
 
       def active_scaffold_search_range(column, options)
         opt_value, from_value, to_value = field_search_params_range_values(column)
-        
-        select_options = active_scaffold_search_range_comparator_options(column)
-        text_field_size = ((column.column && column.column.text?) ? 15 : 10)
 
+        select_options = active_scaffold_search_range_comparator_options(column)
+        if column.column && column.column.text?
+          text_field_size = 15
+          opt_value ||= '%?%'
+        else
+          text_field_size = 10
+          opt_value ||= '='
+        end
+        
         from_value = controller.class.condition_value_for_numeric(column, from_value)
         to_value = controller.class.condition_value_for_numeric(column, to_value)
         from_value = format_number_value(from_value, column.options) if from_value.is_a?(Numeric)

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -190,10 +190,11 @@ module ActiveScaffold
         id = url_options[:id] || url_options[:parent_id]
         id = "#{column.association.name}-#{record.id}" if column && column.plural_association?
         if record.try(column.association.name.to_sym).present?
-          id = "#{column.association.name}-#{record.send(column.association.name).id}"
+          id = "#{column.association.name}-#{record.send(column.association.name).id}-#{record.id}"
         else
           id = "#{column.association.name}-#{record.id}" unless record.nil?
         end if column && column.singular_association?
+        id = "#{id}-#{url_options[:batch_scope].downcase}" if url_options[:batch_scope]
         action_id = "#{id_from_controller(url_options[:controller]) + '-' if url_options[:parent_controller]}#{url_options[:action].to_s}"
         action_link_id(action_id, id)
       end
@@ -258,6 +259,12 @@ module ActiveScaffold
         classes.join(' ')
       end
 
+      def as_main_div_class
+        classes = ["active-scaffold", "active-scaffold-#{controller_id}", "#{params[:controller]}-view", "#{active_scaffold_config.theme}-theme"]
+        classes << "as_touch" if touch_device?
+        classes.join(' ')
+      end
+
       def column_empty?(column_value)
         empty = column_value.nil?
         empty ||= column_value.empty? if column_value.respond_to? :empty?

data/lib/active_scaffold/locale/de.rb

@@ -30,7 +30,7 @@
       :hide => 'Verstecken',
       :live_search => 'Live-Suche',
       :loading => 'Lade…',
-      :next => 'Vorwärts',
+      :next => 'Vor',
       :no_entries => 'Keine Einträge',
       :no_options => 'Keine Optionen',
       :omit_header => 'Lasse Header weg',

data/lib/active_scaffold/version.rb

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

data/lib/active_scaffold.rb

@@ -66,7 +66,11 @@ module ActiveScaffold
     base.module_eval do
       # TODO: these should be in actions/core
       before_filter :handle_user_settings
+      before_filter :check_input_device
     end
+
+    base.helper_method :touch_device?
+    base.helper_method :hover_via_click?
   end
 
   def self.set_defaults(&block)
@@ -98,6 +102,24 @@ module ActiveScaffold
       end
     end
   end
+
+  def check_input_device
+    if request.env["HTTP_USER_AGENT"] && request.env["HTTP_USER_AGENT"][/(iPhone|iPod|iPad)/i]
+      session[:input_device_type] = 'TOUCH'
+      session[:hover_supported] = false
+    else
+      session[:input_device_type] = 'MOUSE'
+      session[:hover_supported] = true
+    end if session[:input_device_type].nil?
+   end
+
+  def touch_device?
+    session[:input_device_type] == 'TOUCH'
+  end
+
+  def hover_via_click?
+    session[:hover_supported] == false
+  end
   
   def self.js_framework=(framework)
     @@js_framework = framework

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 33
   prerelease: false
   segments: 
   - 3
   - 0
-  - 18
-  version: 3.0.18
+  - 19
+  version: 3.0.19
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-27 00:00:00 +01:00
+date: 2011-04-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -144,6 +144,7 @@ files:
 - frontends/default/images/arrow_down.gif
 - frontends/default/images/arrow_up.gif
 - frontends/default/images/close.gif
+- frontends/default/images/close_touch.png
 - frontends/default/images/config.png
 - frontends/default/images/cross.png
 - frontends/default/images/gears.png