brisk-bills 0.7.0 → 0.8.1

data/vendor/plugins/active_scaffold/frontends/default/javascripts/dhtml_history.js

@@ -858,7 +858,7 @@ var handleHistoryChange = function(pageId, pageData) {
   var info = pageId.split(':');
   var id = info[0];
   pageData += '&_method=get';
-  new Ajax.Updater(id+'-content', pageData, {asynchronous:true, evalScripts:true, onLoading:function(request){Element.show(id+'-pagination-loading-indicator');}});
+  new Ajax.Request(pageData, {asynchronous:true, evalScripts:true, method: 'get', onLoading:function(request){Element.show(id+'-pagination-loading-indicator');}});
 }
 
 window.onload = function() {

data/vendor/plugins/active_scaffold/frontends/default/javascripts/form_enhancements.js

@@ -10,7 +10,12 @@ TextFieldWithExample.prototype = {
 		this.defaultText = defaultText;
 		this.createHiddenInput();
 
+		if (options.focus) this.input.focus();
 		this.checkAndShowExample();
+		if (options.focus) {
+			this.input.selectionStart = 0;
+			this.input.selectionEnd = 0;
+		}
 
 		Event.observe(this.input, "blur", this.onBlur.bindAsEventListener(this));
 		Event.observe(this.input, "focus", this.onFocus.bindAsEventListener(this));
@@ -39,9 +44,7 @@ TextFieldWithExample.prototype = {
 		this.checkAndShowExample();
 	},
 	onFocus: function(event) {
-		if (this.exampleShown()) {
-		    this.removeExample();
-	  	}
+		this.removeExample();
 	},
 	onClick: function(event) {
 		this.removeExample();
@@ -57,7 +60,7 @@ TextFieldWithExample.prototype = {
 			Element.addClassName(this.input, this.options.exampleClassName);
 		}
 	},
-  removeExample: function() {
+	removeExample: function() {
 		if (this.exampleShown()) {
 			this.input.value = '';
 			this.input.name = this.name;

data/vendor/plugins/active_scaffold/frontends/default/stylesheets/stylesheet-ie.css

@@ -11,14 +11,14 @@ zoom: 1;
 border-top: solid 1px #DAFFCD;
 }
 
-.active-scaffold-header div.actions a.show_search {
+* html .active-scaffold-header div.actions a.show_search {
 background-image: none;
-filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/active_scaffold/default/magnifier.png', sizingMethod='crop');
+filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../../../images/active_scaffold/default/magnifier.png', sizingMethod='crop');
 }
 
-.active-scaffold .sub-form .association-record a.destroy {
+* html .active-scaffold .sub-form .association-record a.destroy {
 background-image: none;
-filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/active_scaffold/default/cross.png', sizingMethod='crop');
+filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../../../images/active_scaffold/default/cross.png', sizingMethod='crop');
 }
 
 .active-scaffold-header div.actions a.disabled {
@@ -32,4 +32,4 @@ float: none;
 
 .active-scaffold li.form-element dt {
 padding: 4px 0;
-}
+}

data/vendor/plugins/active_scaffold/frontends/default/stylesheets/stylesheet.css

@@ -52,6 +52,10 @@ padding: 5px 20px 5px 5px;
 color: #333;
 }
 
+.active-scaffold .mark_record_column {
+  width: 1px;
+}
+
 /* Header
    ======================== */
 
@@ -87,10 +91,6 @@ background-position: 1px 50%;
 background-repeat: no-repeat;
 }
 
-.view .active-scaffold-header div.actions a {
-float: left;
-}
-
 .blue-theme .active-scaffold-header div.actions a {
 color: #fff;
 }
@@ -153,7 +153,7 @@ display: block;
 background-color: #555;
 }
 
-.active-scaffold th a {
+.active-scaffold th a, .active-scaffold th a:visited {
 color: #fff;
 padding: 2px 15px 2px 5px;
 }
@@ -190,29 +190,33 @@ background: #333 url(../../../images/active_scaffold/default/indicator-small.gif
 /* Table :: Record Rows
    ============================= */
 
+.active-scaffold tr.record {
+  background-color: #E6F2FF;
+}
 .active-scaffold tr.record td {
 padding: 5px 4px;
 color: #333;
 font-family: Verdana, sans-serif;
 font-size: 11px;
-background-color: #E6F2FF;
 border-bottom: solid 1px #C5DBF7;
 border-left: solid 1px #C5DBF7;
 }
 
-.active-scaffold tr.even-record td {
+.active-scaffold tr.even-record {
 background-color: #fff;
-border-left: solid 1px #ddd;
+}
+.active-scaffold tr.even-record td {
+border-left-color: #ddd;
 }
 
 .active-scaffold tr.record td.sorted {
 background-color: #B9DCFF;
-border-bottom: solid 1px #AFD0F5;
+border-bottom-color: #AFD0F5;
 }
 
 .active-scaffold tr.even-record td.sorted {
 background-color: #E6F2FF;
-border-bottom: solid 1px #AFD0F5;
+border-bottom-color: #AFD0F5;
 }
 
 .active-scaffold tbody.records td.empty {
@@ -290,6 +294,10 @@ background-color: #1F7F00;
 background: transparent;
 }
 
+.active-scaffold .active-scaffold .active-scaffold-header {
+margin-right: 25px;
+}
+
 .active-scaffold .active-scaffold .active-scaffold-header h2 {
 font-size: 12px;
 font-weight: bold;
@@ -300,12 +308,17 @@ font-weight: bold;
 color: #444;
 }
 
+.active-scaffold .active-scaffold .active-scaffold-header div.actions {
+top: 0px;
+right: 0px;
+}
+
 .active-scaffold .active-scaffold .active-scaffold-header div.actions a {
 font: bold 11px verdana, sans-serif;
-padding: 0 2px 1px 17px;
 }
 
-.blue-theme .active-scaffold .active-scaffold-header div.actions a {
+.blue-theme .active-scaffold .active-scaffold-header div.actions a,
+.blue-theme .active-scaffold .active-scaffold-header div.actions a:visited {
 color: #06c;
 }
 
@@ -313,6 +326,12 @@ color: #06c;
 background-color: #ff8;
 }
 
+.active-scaffold .active-scaffold .view {
+background-color: transparent;
+padding: 0px;
+border: none;
+}
+
 .active-scaffold .active-scaffold  td {
 background-color: #ECFFE7;
 border-bottom: solid 1px #CDF7C5;
@@ -326,6 +345,13 @@ border: solid 1px #DDDF37;
 border-top: none;
 }
 
+.active-scaffold .active-scaffold .active-scaffold td.inline-adapter-cell {
+background-color: #DAFFCD;
+padding: 4px;
+border: solid 1px #7FcF00;
+border-top: none;
+}
+
 .active-scaffold .active-scaffold .active-scaffold-footer {
 font-size: 11px;
 }
@@ -368,7 +394,8 @@ margin: 0 -2px;
 font: bold 12px arial, sans-serif;
 }
 
-.blue-theme .active-scaffold-footer a {
+.blue-theme .active-scaffold-footer a,
+.blue-theme .active-scaffold-footer a:visited {
 color: #fff;
 }
 
@@ -491,13 +518,13 @@ background-color: transparent;
    ============================== */
 
 .active-scaffold .loading-indicator {
-vertical-align: bottom;
+vertical-align: text-bottom;
 width: 16px;
 margin: 0;
 }
 
 .active-scaffold .active-scaffold-header .loading-indicator {
-margin-bottom: 3px;
+margin-top: 3px;
 }
 
 /* Show
@@ -506,6 +533,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;
@@ -526,6 +556,10 @@ margin-bottom: 5px;
 /* Form
    ============================== */
 
+.active-scaffold dl {
+margin: 0;
+}
+
 .active-scaffold .submit {
 font-weight: bold;
 font-size: 14px;
@@ -633,7 +667,8 @@ border: solid 1px #1F7F00;
 padding: 2px;
 }
 
-.active-scaffold .fieldWithErrors input.text-input,
+.active-scaffold .fieldWithErrors input,
+.active-scaffold .fieldWithErrors textarea,
 .active-scaffold .fieldWithErrors select {
 border: solid 1px #f00;
 }
@@ -732,7 +767,7 @@ padding: 0 5px 0 1px;
 background: none;
 }
 
-.active-scaffold .sub-form label {
+.active-scaffold .horizontal-sub-form td label {
 display: none;
 }
 
@@ -754,9 +789,10 @@ vertical-align: top;
 color: #999;
 }
 
-.active-scaffold .sub-form table td.actions {
+.active-scaffold .sub-form .actions {
 vertical-align: middle;
 background-color: transparent;
+clear: left;
 }
 
 .active-scaffold .sub-form .association-record a.destroy {

data/vendor/plugins/active_scaffold/frontends/default/views/_add_existing_form.html.erb

@@ -21,16 +21,12 @@
     <%= render :partial => 'form_messages' %>
   <% end -%>
 
-  <label for="<%= "record_#{active_scaffold_config.model}" %>"><%= active_scaffold_config.model %></label>
-  <%# select_options = options_for_select(options_for_association(nested_association)) unless column.through_association? -%>
-  <% select_options ||= options_for_select(active_scaffold_config.model.find(:all).collect {|c| [h(c.to_label), c.id]}) -%>
-  <% unless select_options.empty? -%>
-    <%= select_tag 'associated_id', '<option value="">' + as_(:_select_) + '</option>' + select_options %>
-  <% end -%>
+  <label for="<%= "record_#{active_scaffold_config.model}" %>"><%= active_scaffold_add_existing_label %></label>
+  <%= active_scaffold_add_existing_input(:name => 'associated_id', :url_options => url_options) %>
 
   <p class="form-footer">
     <%= submit_tag as_(:add), :class => "submit" %>
-    <%= link_to as_(:cancel), params_for(:action => 'list'), :class => 'cancel' %>
+    <%= link_to as_(:cancel), main_path_to_return, :class => 'cancel' %>
     <%= loading_indicator_tag(:action => :add_existing, :id => params[:id]) %>
   </p>
 

data/vendor/plugins/active_scaffold/frontends/default/views/_create_form.html.erb

@@ -1,6 +1,7 @@
 <% url_options = params_for(:action => :create) -%>
+<% xhr ||= request.xhr? -%>
 <%=
-if request.xhr?
+if xhr
   if active_scaffold_config.create.multipart? # file_uploads
     form_remote_upload_tag url_options.merge({:iframe => true}),
                            :onsubmit => onsubmit,
@@ -27,19 +28,21 @@ else
            :class => 'create'
 end -%>
 
-  <h4><%= active_scaffold_config.create.label -%></h4>
+  <h4><%= active_scaffold_config.create.label(active_scaffold_config.sti_create_links ? @record.class.human_name(:count => 1) : nil) -%></h4>
 
-  <% if request.xhr? -%>
-    <div id="<%= element_messages_id(:action => :create) %>" class="messages-container"><%= error_messages_for :record, :object_name => @record.class.human_name.downcase %></div>
-  <% else -%>
+  <div id="<%= element_messages_id(:action => :create) %>" class="messages-container">
+<% if request.xhr? -%>
+    <%= error_messages_for :record, :object_name => @record.class.human_name.downcase %>
+<% else -%>
     <%= render :partial => 'form_messages' %>
-  <% end -%>
+<% end -%>
+  </div>
 
   <%= render :partial => 'form', :locals => { :columns => active_scaffold_config.create.columns } %>
 
   <p class="form-footer">
     <%= submit_tag as_(:create), :class => "submit" %>
-    <%= link_to as_(:cancel), params_for(:controller => params[:parent_controller] ? params[:parent_controller] : params[:controller], :action => 'list', :eid => params[:parent_controller] ? params[:parent_controller] : params[:eid]), :class => 'cancel' %>
+    <%= link_to as_(:cancel), main_path_to_return, :class => 'cancel' %>
     <%= loading_indicator_tag(:action => :create, :id => params[:id]) %>
   </p>
 

data/vendor/plugins/active_scaffold/frontends/default/views/_field_search.html.erb

@@ -1,24 +1,17 @@
-<%
-# We have to remove search form params before the url_for method call, otherwise it throughs it on
-search_params = params[:search]
-params.merge!(:search => nil)
-href = url_for(params_for(:action => :update_table, :escape => false).delete_if{|k,v| k == 'search'})
--%>
+<% href_params = params_for(:action => :index, :escape => false, :search => nil) -%>
+<% href = url_for(href_params) -%>
 <%= form_remote_tag :url => href,
                     :method => :get,
                     :before => "addActiveScaffoldPageToHistory('#{href}', '#{params[:controller]}')",
                     :after => "$('#{loading_indicator_id(:action => :search, :id => params[:id])}').style.visibility = 'visible'; Form.disable('#{search_form_id}');",
                     :complete => "$('#{loading_indicator_id(:action => :search, :id => params[:id])}').style.visibility = 'hidden'; Form.enable('#{search_form_id}');",
                     :failure => "ActiveScaffold.report_500_response('#{active_scaffold_id}')",
-                    :update => active_scaffold_content_id,
-                    :html => { :href => href, :id => search_form_id, :class => 'search', :method => :get } %>
+                    :html => { :action => href, :id => search_form_id, :class => 'search', :method => :get } %>
 
   <ol class="form">
     <% active_scaffold_config.field_search.columns.each do |column| -%>
       <% next unless column.search_sql -%>
       <% name = "search[#{column.name}]" %>
-      <% value = nil %>
-      <% value = search_params[column.name] if search_params %>
       <li class="form-element">
         <dl>
           <dt>
@@ -33,7 +26,9 @@ href = url_for(params_for(:action => :update_table, :escape => false).delete_if{
   </ol>
   <p class="form-footer">
     <%= submit_tag as_(:search), :class => "submit" %>
-    <a href="javascript:void(0)" class="cancel" onclick="f = this.up('form'); f.reset(); f.onsubmit();"><%= as_(:reset) -%></a>
+    <% href = url_for(href_params.merge(:search => '')) -%>
+    <%= link_to_remote as_(:reset), {:url => href, :with => "'search='", :method => :get,
+          :failure => "ActiveScaffold.report_500_response('#{active_scaffold_id}')"}, :class => 'cancel', :href => href %>
     <%= loading_indicator_tag(:action => :search) %>
   </p>
 </form>
@@ -42,4 +37,4 @@ href = url_for(params_for(:action => :update_table, :escape => false).delete_if{
 //<![CDATA[
   Form.focusFirstElement('<%= search_form_id -%>');
 //]]>
-</script>
+</script>

data/vendor/plugins/active_scaffold/frontends/default/views/_form.html.erb

@@ -6,13 +6,13 @@
     <%= render :partial => 'form', :locals => { :columns => column } %>
   </li>
   <% elsif is_subform? column and !override_form_field?(column) -%>
-  <li class="sub-form" id="<%= sub_form_id(:association => column.name) %>">
+  <li class="sub-form <%= active_scaffold_config_for(column.association.klass).subform.layout %>-sub-form <%= column.css_class unless column.css_class.nil? %>" id="<%= sub_form_id(:association => column.name) %>">
     <%= render :partial => form_partial_for_column(column), :locals => { :column => column } -%>
   </li>
   <% else -%>
-  <li class="form-element <%= 'required' if column.required? %>">
+  <li class="form-element <%= 'required' if column.required? %> <%= column.css_class unless column.css_class.nil? %>">
     <%= render :partial => form_partial_for_column(column), :locals => { :column => column } -%>
   </li>
   <% end -%>
   <% end -%>
-</ol>
+</ol>

data/vendor/plugins/active_scaffold/frontends/default/views/_form_association.html.erb

@@ -1,20 +1,15 @@
-<%
-parent_record = @record
-associated = column.singular_association? ? [parent_record.send(column.name)].compact : parent_record.send(column.name)
-associated = associated.sort_by {|r| r.new_record? ? 99999999999 : r.id} unless column.association.options.has_key?(:order)
-
-if column.show_blank_record
-  show_blank_record = (column.plural_association? or (column.singular_association? and associated.empty?))
-  show_blank_record = false if column.through_association?
-  show_blank_record = false unless column.association.klass.authorized_for?(:action => :create)
-else
-  show_blank_record = false
-end
-
-associated << column.association.klass.new if show_blank_record
--%>
-<h5><%= column.label -%> (<%= link_to_visibility_toggle(:default_visible => !column.collapsed) -%>)</h5>
-<div <%= 'style="display: none;"' if column.collapsed -%>>
-<%= render :partial => subform_partial_for_column(column), :locals => {:column => column, :parent_record => parent_record, :associated => associated} %>
-</div>
-<% @record = parent_record -%>
+<%
+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 column.show_blank_record? associated
+  associated << column.association.klass.new
+  locked = associated.last
+end
+-%>
+<h5><%= column.label -%> (<%= link_to_visibility_toggle(:default_visible => !column.collapsed) -%>)</h5>
+<div <%= 'style="display: none;"' if column.collapsed -%>>
+<%= render :partial => subform_partial_for_column(column), :locals => {:column => column, :parent_record => parent_record, :associated => associated, :locked => locked} %>
+</div>
+<% @record = parent_record -%>

data/vendor/plugins/active_scaffold/frontends/default/views/_form_association_footer.html.erb

@@ -5,21 +5,19 @@ rescue ActiveScaffold::ControllerNotFound
   remote_controller = nil
 end
 
-show_add_existing = (!column.through_association? and options_for_association_count(column.association) > 0)
-
-show_add_new = !column.through_association? and (column.plural_association? or (column.singular_association? and not associated.empty?))
-show_add_new = false unless @record.class.authorized_for?(:action => :create)
-
-edit_associated_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :associated_id => '--ID--', :escape => false, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id])
-add_new_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :escape => false, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]);
+show_add_existing = column_show_add_existing(column)
+show_add_new = column_show_add_new(column, associated, @record)
 
 return unless show_add_new or show_add_existing
 
+edit_associated_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :associated_id => '--ID--', :escape => false, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]) if show_add_existing
+add_new_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :escape => false, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]) if show_add_new
+
 -%>
 <div class="footer-wrapper">
   <div class="footer">
     <% if show_add_new -%>
-    <% add_label = column.plural_association? ? as_(:create_another) : as_(:replace_with_new) -%>
+    <% add_label = column.plural_association? ? as_(:create_another, :model => column.association.klass.human_name) : as_(:replace_with_new) -%>
     <%= button_to_function add_label, "new Ajax.Request(#{add_new_url.to_json}, {asynchronous: true, method: 'get', evalScripts: true, onFailure: function(){ActiveScaffold.report_500_response(#{active_scaffold_id.to_json})}})" %>
     <% end -%>
 
@@ -27,9 +25,9 @@ return unless show_add_new or show_add_existing
 
     <% if show_add_existing -%>
       <% if remote_controller and remote_controller.respond_to? :uses_record_select? and remote_controller.uses_record_select? -%>
-        <%= link_to_record_select as_(:add_existing), remote_controller.controller_path, :onselect => "new Ajax.Request(#{edit_associated_url.to_json}.sub('--ID--', id), {asynchronous: true, evalScripts: true, onFailure: function(){ActiveScaffold.report_500_response(#{active_scaffold_id.to_json})}});" -%>
+        <%= link_to_record_select as_(:add_existing), remote_controller.controller_path, :onselect => "new Ajax.Request(#{edit_associated_url.to_json}.sub('--ID--', id), {asynchronous: true, method: 'get', evalScripts: true, onFailure: function(){ActiveScaffold.report_500_response(#{active_scaffold_id.to_json})}});" -%>
       <% else -%>
-        <% select_options = options_for_select(options_for_association(column.association)) unless column.through_association? -%>
+        <% select_options = options_for_select(options_for_association(column.association)) -%>
         <%= select_tag 'associated_id', '<option value="">' + as_(:_select_) + '</option>' + select_options %>
         <%= button_to_function as_(:add_existing), "new Ajax.Request(#{edit_associated_url.to_json}.sub('--ID--', Element.previous(this).value), {asynchronous: true, method: 'get', evalScripts: true, onFailure: function(){ActiveScaffold.report_500_response(#{active_scaffold_id.to_json})}})" %>
       <% end -%>