active_scaffold 3.0.12 → 3.0.21

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

@@ -155,6 +155,10 @@ document.observe("dom:loaded", function() {
           csrf_token = $$('meta[name=csrf-token]')[0],
           my_parent = span.up(),
           column_heading = null;
+
+      if(!(my_parent.nodeName.toLowerCase() === 'td' || my_parent.nodeName.toLowerCase() === 'th')){
+          my_parent = span.up('td');
+      }
           
       if (my_parent.nodeName.toLowerCase() === 'td') {
         var heading_selector = '.' + span.up().readAttribute('class').split(' ')[0] + '_heading';
@@ -180,7 +184,7 @@ document.observe("dom:loaded", function() {
 
       if (span.up('div.active-scaffold').readAttribute('data-eid')) {
         if (options['params'].length > 0) {
-          options['params'] += ";";
+          options['params'] += "&";
         }
         options['params'] += ("eid=" + span.up('div.active-scaffold').readAttribute('data-eid'));
       }
@@ -226,7 +230,7 @@ document.observe("dom:loaded", function() {
     if(loading_indicator) loading_indicator.style.visibility = 'hidden';  
     return true;
   });
-  document.on('ajax:before', 'input[type=button].as_add_existing', function(event) {
+  document.on('ajax:before', 'input[type=button].as_add_existing, input[type=button].as_replace_existing', function(event) {
     var button = event.findElement();
     var url =  button.readAttribute('href').sub('--ID--', button.previous().getValue());
     event.memo.url = url;
@@ -234,26 +238,7 @@ 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');
-    
-    new Ajax.Request(element.readAttribute('data-update_url'), {
-      method: 'get',
-      parameters: {value: element.getValue()},
-      onLoading: function(response) {
-        element.next('img.loading-indicator').style.visibility = 'visible';
-        as_form.disable();
-      },
-      onComplete: function(response) {
-        element.next('img.loading-indicator').style.visibility = 'hidden';
-        as_form.enable();
-      },
-      onFailure:  function(request) { 
-        var as_div = event.findElement('div.active-scaffold');
-        if (as_div) {
-          ActiveScaffold.report_500_response(as_div)
-        }
-      }
-    });
+    ActiveScaffold.update_column(element, element.readAttribute('data-update_url'), element.hasAttribute('data-update_send_form'), element.readAttribute('id'), element.getValue());
     return true;
   });
   document.on('change', 'select.as_search_range_option', function(event) {
@@ -276,10 +261,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;
+  });
 });
 
 
@@ -451,6 +453,14 @@ var ActiveScaffold = {
     this.reload_if_empty(tbody, page_reload_url);
   },
 
+  delete_subform_record: function(record) {
+    var errors = $(record).previous();
+    if (errors.hasClassName('association-record-errors')) {
+      this.replace_html(errors, '');
+    }
+    this.remove(record);
+  },
+
   report_500_response: function(active_scaffold_id) {
     server_error = $(active_scaffold_id).down('td.messages-container p.server-error');
     if (server_error.visible()) {
@@ -524,7 +534,7 @@ var ActiveScaffold = {
         element.insert(content);
       }
     } else {
-      var current = $$('#' + element.readAttribute('id') + ' tr.association-record');
+      var current = $$('#' + element.readAttribute('id') + ' .association-record');
       if (current[0]) {
         this.replace(current[0], content);
       } else {
@@ -533,12 +543,20 @@ var ActiveScaffold = {
     }
   },
   
-  render_form_field: function(element, content, options) {
-    var element = $(element);
-    if (options.is_subform == false) {
-      this.replace(element.up('dl'), content);
-    } else {
-      this.replace_html(element, content);
+  render_form_field: function(source, content, options) {
+    var source = $(source);
+    var element = source.up('.association-record');
+    if (typeof(element) === 'undefined') {
+      element = source.up('ol.form');
+    }
+    element = element.down('.' + options.field_class);
+
+    if (element) {
+      if (options.is_subform == false) {
+        this.replace(element.up('dl'), content);
+      } else {
+        this.replace_html(element, content);
+      }
     }
   },
 
@@ -552,6 +570,60 @@ var ActiveScaffold = {
         }
       }
     );
+  },
+
+  // element is tbody id
+  mark_records: function(element, options) {
+    var element = $(element);
+    var mark_checkboxes = $$('#' + element.readAttribute('id') + ' > tr.record td.marked-column input[type="checkbox"]');
+    mark_checkboxes.each(function(item) {
+     if(options.checked === true) {
+       item.writeAttribute({ checked: 'checked' });
+     } else {
+       item.removeAttribute('checked');
+     }
+     item.writeAttribute('value', ('' + !options.checked));
+    });
+    if(options.include_mark_all === true) {
+      var mark_all_checkbox = element.previous('thead').down('th.marked-column_heading span input[type="checkbox"]');
+      if(options.checked === true) {
+        mark_all_checkbox.writeAttribute({ checked: 'checked' }); 
+      } else {
+        mark_all_checkbox.removeAttribute('checked');
+      }
+      mark_all_checkbox.writeAttribute('value', ('' + !options.checked));
+    }
+  },
+
+  update_column: function(element, url, send_form, source_id, val) {
+    var as_form = element.up('form.as_form');
+    var params = null;
+
+    if (send_form) {
+        params = as_form.serialize(true);
+    } else {
+        params = {value: val};
+    }
+    params.source_id = source_id;
+
+    new Ajax.Request(url, {
+      method: 'get',
+      parameters: params,
+      onLoading: function(response) {
+        element.next('img.loading-indicator').style.visibility = 'visible';
+        as_form.disable();
+      },
+      onComplete: function(response) {
+        element.next('img.loading-indicator').style.visibility = 'hidden';
+        as_form.enable();
+      },
+      onFailure:  function(request) { 
+        var as_div = event.findElement('div.active-scaffold');
+        if (as_div) {
+          ActiveScaffold.report_500_response(as_div)
+        }
+      }
+    });
   }
 }
 

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

@@ -35,7 +35,7 @@ text-decoration: none;
 color: #999;
 }
 
-.active-scaffold a:hover, .active-scaffold div.hover {
+.active-scaffold a:hover, .active-scaffold div.hover, .active-scaffold td span.hover {
 background-color: #ff8;
 }
 
@@ -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;
@@ -755,6 +779,7 @@ padding: 6px 0;
 float: left;
 }
 
+.active-scaffold li.form-element dd p,
 .active-scaffold li.form-element dd input[type="checkbox"] {
 margin-top: 6px;
 }
@@ -793,8 +818,11 @@ padding: 2px;
 }
 
 .active-scaffold .fieldWithErrors input,
+.active-scaffold .field_with_errors input,
 .active-scaffold .fieldWithErrors textarea,
-.active-scaffold .fieldWithErrors select {
+.active-scaffold .field_with_errors textarea,
+.active-scaffold .fieldWithErrors select,
+.active-scaffold .field_with_errors select {
 border: solid 1px #f00;
 }
 
@@ -968,3 +996,94 @@ font-size: 100%;
 .active-scaffold-found {
   float:left;
 }
+
+
+.active-scaffold-component > .active-scaffold-header h2 {
+border: none;
+}
+.active-scaffold-component > .active-scaffold-header h2 a,
+.active-scaffold-component > .active-scaffold-header h2 a:active,
+.active-scaffold-component > .active-scaffold-header h2 a:visited {
+text-decoration: none;
+color: inherit;
+}
+
+
+.as_touch a.inline-adapter-close {
+width: 25px;
+height: 27px;
+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;
+}