active_scaffold 3.0.26 → 3.1.3

data/{frontends/default/javascripts/prototype/active_scaffold.js → app/assets/javascripts/prototype/active_scaffold.js~}

@@ -596,6 +596,7 @@ var ActiveScaffold = {
   },
 
   update_column: function(element, url, send_form, source_id, val) {
+    if (!element) element = $(source_id);
     var as_form = element.up('form.as_form');
     var params = null;
 

data/{frontends/default/stylesheets/stylesheet.css → app/assets/stylesheets/active_scaffold.css.erb}

@@ -5,6 +5,7 @@
  ActiveScaffold is freely distributable under the terms of an MIT-style license.
 
  For details, see the ActiveScaffold web site: http://www.activescaffold.com/
+
 */
 
 .active-scaffold form,
@@ -63,6 +64,10 @@ padding: 5px 20px 5px 5px;
 color: #333;
 }
 
+.active-scaffold .mark_record_column {
+  width: 1px;
+}
+
 /* Header
    ======================== */
 
@@ -171,20 +176,21 @@ background-repeat: no-repeat;
 }
 
 .active-scaffold-header div.actions div.action_group div {
-  background-image: url(../../../images/active_scaffold/default/gears.png); /* default icon for actions or override with css */
+  background-image: url(<%= asset_path 'gears.png' %>); /* default icon for actions or override with css */
 }
 
 .active-scaffold-header div.actions a.show_config_list {
-  background-image: url(../../../images/active_scaffold/default/config.png);
+  background-image: url(<%= asset_path 'config.png' %>);
 }
 
 .active-scaffold-header div.actions a.new,
 .active-scaffold-header div.actions a.new_existing {
-background-image: url(../../../images/active_scaffold/default/add.gif);
+background-image: url(<%= asset_path 'add.gif' %>);
 }
 
 .active-scaffold-header div.actions a.show_search {
-background-image: url(../../../images/active_scaffold/default/magnifier.png);
+
+background-image: url(<%= asset_path 'magnifier.png' %>);
 }
 
 .blue-theme .active-scaffold-header div.actions a:hover {
@@ -243,17 +249,17 @@ padding-right: 18px;
 
 .active-scaffold th.asc a,
 .active-scaffold th.asc a:hover {
-background: #333 url(../../../images/active_scaffold/default/arrow_up.gif) right 50% no-repeat;
+background: #333 url(<%= asset_path 'arrow_up.gif' %>) right 50% no-repeat;
 }
 
 .active-scaffold th.desc a,
 .active-scaffold th.desc a:hover {
-background: #333 url(../../../images/active_scaffold/default/arrow_down.gif) right 50% no-repeat;
+background: #333 url(<%= asset_path 'arrow_down.gif' %>) right 50% no-repeat;
 }
 
 .active-scaffold th.loading a,
 .active-scaffold th.loading a:hover {
-background: #333 url(../../../images/active_scaffold/default/indicator-small.gif) right 50% no-repeat;
+background: #333 url(<%= asset_path 'indicator-small.gif' %>) right 50% no-repeat;
 }
 
 .active-scaffold th .mark_heading {
@@ -436,7 +442,7 @@ float: right;
 text-indent: -4000px;
 width: 16px;
 height: 17px;
-background: url(../../../images/active_scaffold/default/close.gif) 0 0 no-repeat;
+background: url(<%= asset_path 'close.gif' %>) 0 0 no-repeat;
 }
 
 /* Nested
@@ -450,7 +456,7 @@ background: transparent;
 }
 
 .active-scaffold .active-scaffold .active-scaffold-header {
-margin-right: 15px;
+margin-right: 25px;
 }
 
 .active-scaffold .active-scaffold .active-scaffold-header h2 {
@@ -680,7 +686,7 @@ margin: 0;
 }
 
 .active-scaffold .active-scaffold-header .loading-indicator {
-margin-bottom: 3px;
+margin-top: 3px;
 }
 
 /* Show
@@ -689,6 +695,9 @@ margin-bottom: 3px;
 .active-scaffold .show-view dl {
 margin-left: 5px;
 }
+.active-scaffold .show-view dl dl {
+margin-left: 0px;
+}
 
 .active-scaffold .show-view dt {
 width: 12em;
@@ -709,6 +718,10 @@ margin-bottom: 5px;
 /* Form
    ============================== */
 
+.active-scaffold dl {
+margin: 0;
+}
+
 .active-scaffold .submit {
 font-weight: bold;
 font-size: 14px;
@@ -959,7 +972,7 @@ height: 16px;
 padding: 0;
 width: 16px;
 text-indent: -4000px;
-background: url(../../../images/active_scaffold/default/cross.png) 0 0 no-repeat;
+background: url(<%= asset_path 'cross.png' %>) 0 0 no-repeat;
 }
 
 .active-scaffold .sub-form .locked a.destroy {
@@ -1001,22 +1014,10 @@ font-size: 100%;
   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;
+background: url(<%= asset_path 'close_touch.png' %>) 0 0 no-repeat;
 }
 
 .as_touch .as_paginate {
@@ -1091,3 +1092,7 @@ padding: 5px 2px 5px 5px;
 .as_touch tr.record td {
 padding: 5px 10px;
 }
+
+<% require_asset "jquery-ui" %>
+<% ActiveScaffold.stylesheets.each {|css| require_asset css} %>
+<% ActiveScaffold::Bridges.all_stylesheets.each {|css| require_asset css} %>

data/{lib/active_scaffold/locale → config/locales}/de.yml

@@ -1,4 +1,7 @@
 de:
+  time:
+    formats:
+      picker: "%a, %d %b %Y %H:%M:%S"
   active_scaffold:
     add: 'Hinzufügen'
     add_existing: 'Existierenden Eintrag hinzufügen'

data/{lib/active_scaffold/locale → config/locales}/en.yml

@@ -1,4 +1,7 @@
 en:
+  time:
+    formats:
+      picker: "%a, %d %b %Y %H:%M:%S"
   active_scaffold:
     add: 'Add'
     add_existing: 'Add Existing'

data/{lib/active_scaffold/locale → config/locales}/es.yml

@@ -1,4 +1,7 @@
 es:
+  time:
+    formats:
+      picker: "%a, %d %b %Y %H:%M:%S"
   active_scaffold:
     add: 'Añadir'
     add_existing: 'Añadir Existente'
@@ -64,6 +67,8 @@ es:
     '<': '<'
     '!=': '!='
     between: 'Entre'
+    is_null: 'Es nulo'
+    is_not_null: 'No es nulo'
     contains: 'Contiene'
     begins_with: 'Empieza con'
     ends_with: 'Termina con'

data/{lib/active_scaffold/locale → config/locales}/fr.yml

@@ -1,4 +1,7 @@
 fr: 
+  time:
+    formats:
+      picker: "%a, %d %b %Y %H:%M:%S"
   active_scaffold: 
     add: 'Ajouter'
     add_existing: 'Ajouter un(e) existant(e)'

data/{lib/active_scaffold/locale → config/locales}/hu.yml

@@ -1,4 +1,7 @@
 hu:
+  time:
+    formats:
+      picker: "%a, %d %b %Y %H:%M:%S"
   active_scaffold:
     add: 'Hozzáadás'
     add_existing: 'Meglevő hozzáadása'
@@ -6,6 +9,7 @@ hu:
     are_you_sure_to_delete: 'Biztos vagy benne?'
     cancel: 'Mégse'
     click_to_edit: 'Kattints a szerkesztéshez'
+    click_to_reset: 'Kattints az alapállapothoz'
     close: 'Bezárás'
     create: 'Létrehozás'
     create_model: '%{model} létrehozása'
@@ -28,8 +32,8 @@ hu:
     loading: 'Betöltés…'
     next: 'Következő'
     no_entries: 'Nincs elem'
-    no_options: 'nincsenek'
-    omit_header: 'Fejléc nélkül'
+    no_options: 'nincsenek opciók'
+    omit_header: 'Fejléc mellőzése'
     options: 'Opciók'
     pdf: 'PDF'
     previous: 'Előző'
@@ -57,7 +61,14 @@ hu:
     '<': '<'
     '!=': '!='
     between: 'Között'
+    is_null: 'Is null'
+    is_not_null: 'Is not null'
+    contains: 'Contains'
+    begins_with: 'Begins with'
+    ends_with: 'Ends with'
     
     # error_messages
+    cant_destroy_record: "nem törölhető: %{record}"
     internal_error: 'A lekérés sikertelen (code 500, Internal Error)'
     version_inconsistency: 'Verzió ütközés - ezt a rekordot módosították mióta elkezdted szerkeszteni.'
+    failed_to_save_record: 'Failed to save record cause of an unknown error'

data/{lib/active_scaffold/locale → config/locales}/ja.yml

@@ -1,4 +1,7 @@
 ja:
+  time:
+    formats:
+      picker: "%a, %d %b %Y %H:%M:%S"
   active_scaffold:
     add: '追加'
     add_existing: '既存のものを追加'
@@ -57,8 +60,14 @@ ja:
     '<': '<'
     '!=': '!='
     between: 'Between' # needed?
+    is_null: 'Is null'
+    is_not_null: 'Is not null'
+    contains: 'Contains'
+    begins_with: 'Begins with'
+    ends_with: 'Ends with'
 
    # error_messages
     cant_destroy_record: "%{record}を削除で来ません"
     internal_error: 'リクエストが失敗しました（コード500: 内部エラー）'
     version_inconsistency: 'バージョンが一致しません - あなたが編集している間にこのレコードが変更されました。'
+    failed_to_save_record: 'Failed to save record cause of an unknown error'

data/{lib/active_scaffold/locale → config/locales}/ru.yml

@@ -1,4 +1,7 @@
 ru:
+  time:
+    formats:
+      picker: "%a, %d %b %Y %H:%M:%S"
   active_scaffold:
     add: 'Добавить запись'
     add_existing: 'Добавить существующую запись'

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

@@ -6,7 +6,7 @@
   <% renders_as = column_renders_as(column) %>
   <% if renders_as == :subsection -%>
     <% subsection_id = sub_section_id(:sub_section => column.label) %>
-  <li class="sub-section">
+  <li class="sub-section <%= column.css_class %>">
     <h5><%= column.label %></h5>
     <%= render :partial => 'form', :locals => { :columns => column, :subsection_id => subsection_id, :form_action => form_action } %>
     <%= link_to_visibility_toggle(subsection_id, {:default_visible => !column.collapsed}) -%>

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

@@ -3,11 +3,7 @@ parent_record = @record
 associated = column.singular_association? ? [parent_record.send(column.name)].compact : parent_record.send(column.name).to_a
 associated = associated.sort_by {|r| r.new_record? ? 99999999999 : r.id} unless column.association.options.has_key?(:order)
 if show_blank_record = column.show_blank_record?(associated)
-  associated << if column.singular_association?
-    parent_record.send("build_#{column.name}".to_sym)
-  else
-    parent_record.send(column.name).build
-  end
+  associated << build_associated(column, parent_record)
 end
 subform_div_id = "#{sub_form_id({:association => column.name, :id => parent_record.id || 99999999999})}-div" 
 -%>

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

@@ -1,16 +1,16 @@
 <table cellpadding="0" cellspacing="0">
   <%
-    if associated.empty?
-      @record = if column.singular_association?
+    record = if associated.empty?
+      if column.singular_association?
         parent_record.send("build_#{column.name}".to_sym)
       else
         parent_record.send(column.name).build
       end
     else
-      @record = associated.last
+      associated.last
     end
   -%>
-  <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record} %>
+  <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record, :record => record} %>
 
   <tbody id="<%= sub_form_list_id(:association => column.name) %>">
     <% associated.each_index do |index| %>
@@ -25,5 +25,8 @@
     <%= render :partial => 'horizontal_subform_record', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column, :locked => show_blank_record && @record.new_record? && @record == associated.last} %>
     <% end -%>
   </tbody>
+  <tfooter>
+    <%= render :partial => 'horizontal_subform_footer', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column} %>
+  </tfooter>
 </table>
 <%= render :partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated} -%>

data/frontends/default/views/_horizontal_subform.html.erb~

@@ -1,6 +1,6 @@
 <table cellpadding="0" cellspacing="0">
   <%
-    @record = if associated.empty?
+    record = if associated.empty?
       if column.singular_association?
         parent_record.send("build_#{column.name}".to_sym)
       else
@@ -10,7 +10,7 @@
       associated.last
     end
   -%>
-  <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record, :record => @record} %>
+  <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record, :record => record} %>
 
   <tbody id="<%= sub_form_list_id(:association => column.name) %>">
     <% associated.each_index do |index| %>
@@ -25,8 +25,5 @@
     <%= render :partial => 'horizontal_subform_record', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column, :locked => show_blank_record && @record.new_record? && @record == associated.last} %>
     <% end -%>
   </tbody>
-  <tfooter>
-    <%= render :partial => 'horizontal_subform_footer', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column} %>
-  </tfooter>
 </table>
 <%= render :partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated} -%>

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

@@ -1,7 +1,7 @@
 <thead>
   <tr>
     <%
-    active_scaffold_config_for(@record.class).subform.columns.each :for => @record.class, :flatten => true do |column|
+    active_scaffold_config_for(record.class).subform.columns.each :for => record.class, :flatten => true do |column|
       hidden = column_renders_as(column) == :hidden
       next unless in_subform?(column, parent_record)
       -%>

data/frontends/default/views/_horizontal_subform_header.html.erb~

@@ -1,7 +1,7 @@
 <thead>
   <tr>
     <%
-    active_scaffold_config_for(record.class).subform.columns.each :for => record.class, :flatten => true do |column|
+    active_scaffold_config_for(@record.class).subform.columns.each :for => @record.class, :flatten => true do |column|
       hidden = column_renders_as(column) == :hidden
       next unless in_subform?(column, parent_record)
       -%>

data/frontends/default/views/_horizontal_subform_record.html.erb~

@@ -15,7 +15,7 @@
   column = column.clone
   column.form_ui ||= :select if column.association
 -%>
-  <td<%= ' class="hidden"'.html_safe if column_renders_as(column) == :hidden %>>
+  <td class="<%= 'hidden' if column_renders_as(column) == :hidden %>">
     <% unless readonly and not @record.new_record? or not @record.authorized_for?(:crud_type => crud_type, :column => column.name) -%>
       <%= render :partial => form_partial_for_column(column), :locals => { :column => column, :scope => scope } -%>
     <% else -%>

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

@@ -6,7 +6,7 @@
       <%= render :partial => 'action_group', :locals => {:action_links => action_links || active_scaffold_config.action_links.member,
                                                          :url_options => url_options,
                                                          :record => record,
-                                                         :traverse_options => {:for => record},
+                                                         :traverse_options => {:for => record.persisted? ? record : record.class},
                                                          :start_level_0_tag => '<td>',
                                                          :end_level_0_tag => '</td>'} %>
   </tr>

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

@@ -18,10 +18,8 @@
     <% if active_scaffold_config.list.show_search_reset && @filtered -%>
       <% search_link = ActiveScaffold::DataStructures::ActionLink.new('index', :label => :click_to_reset, :type => :member, :position => false)
       action_links = ActiveScaffold::DataStructures::ActionLinks.new
-      record = new_model
-      record.id = 0
       action_links.add(search_link)  -%>
-      <%= render :partial => 'list_actions', :locals => {:record => record, :url_options => params_for(:escape => false, :search => ''), :action_links => action_links.member} %>
+      <%= render :partial => 'list_actions', :locals => {:record => new_model, :url_options => params_for(:escape => false, :search => ''), :action_links => action_links.member} %>
     <% else %>
       <td class='actions'><%= '<p class="empty-message">&nbsp;</p>'.html_safe if @page.items.empty? %></td>
     <% end -%>

data/frontends/default/views/_render_field.js.erb

@@ -0,0 +1,20 @@
+<%
+  column = if render_field.is_a? ActiveScaffold::DataStructures::Column
+    render_field
+  else
+    active_scaffold_config.columns[render_field.to_sym] unless render_field.is_a? ActiveScaffold::DataStructures::Column
+  end
+  @rendered ||= Set.new
+  return if @rendered.include? column.name
+  @rendered << column.name
+  if column_renders_as(column) == :subform
+    options = {:is_subform => true, :field_class => "#{column.name}-sub-form"}
+  else
+    options = {:is_subform => false, :field_class => "#{column.name}-input"}
+  end
+-%>
+
+ActiveScaffold.render_form_field('<%= source_id %>','<%= escape_javascript(render(:partial => form_partial_for_column(column), :locals => { :column => column, :scope => scope })) %>', <%= options.to_json.html_safe %>);
+<%if column.update_columns && !column.update_columns.empty?%>
+  <%=  render(:partial => "render_field", :collection => column.update_columns, :locals => {:source_id => source_id, :scope => scope})%>
+<%end%>

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

@@ -1,12 +1,6 @@
 <%= render :partial => 'list_record', :locals => {:record => record}%>
-<% if active_scaffold_config.list.columns.any? {|c| c.calculation?} %>
-<script type="text/javascript">
-//<![CDATA[
-  <%= update_page do |page|
-    page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations')
-  end %>
-//]]>
-</script>
-<% end %>
+<%= javascript_tag do %>
+ActiveScaffold.replace('<%= active_scaffold_calculations_id %>', '<%= escape_javascript render(:partial => 'list_calculations') %>');
+<% end if active_scaffold_config.list.columns.any? {|c| c.calculation?} %>