redmine_extensions 0.1.05 → 0.1.06

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5db9a307843534efd5b78eb74983f18ed76bb6e4
-  data.tar.gz: b4d307b3969ea6ba5d8f9547054ed5e3dda480b2
+  metadata.gz: 3e093b401bd8e9030fb667cc3ee17f32d7b204ae
+  data.tar.gz: 2c03e7b6d5233b7804a511a44f3ad8833815baf3
 SHA512:
-  metadata.gz: f60499c0b0c62af6d2964afdb42a543dd3095bcb50fe8b936fcfa15a1e7f02a5f41da520577d736e27bf8c8b7a873cd1a769fe9b76d01674725792baf8aa00cb
-  data.tar.gz: 3ce2eb9ca5e081fd5f4da418c365ba1aae7c3b1c52aae0d36affd15a9622d4b70b77cd9fb2aa5631ac575edc49bb581341a396684f4454847873722d5335d882
+  metadata.gz: 3c2af4a97686848fa68fee1c1838ce1336b286199743628d6e36a255a12766bb288f84630058e01a9e7b172ec870f743e4e275d700c7fcc1f217caa98ba51f00
+  data.tar.gz: faeabac2e260c99131f41788900206736b680936358c253d4ef488f467cfa1c24ed33a127055761af881d82583acaabd3a23dd664b485280424523763a597f3e

data/app/assets/javascripts/redmine_extensions/easy_togglers.js

@@ -0,0 +1,64 @@
+var EasyToggler = new function() {
+  // EasyToggler storage store object where key is ID of container and value is 0 - for hidden default state or 1 - for shown default state
+  // Example:
+  // localStorage # => {"easy-toggle-state": {myDiv: 0, history: 1}} # where myDiv is by default hidden, and now will be shown as visible and history is vice versa
+
+  var storage = JSON.parse(localStorage.getItem('easy-toggle-state') || "{}");
+
+  var save = function() {
+    localStorage.setItem('easy-toggle-state', JSON.stringify(storage));
+    return storage;
+  };
+
+  var isHidden = function(el) {
+    return (el && el.style.display === 'none')
+  };
+
+  var toggle = function(el) {
+    var parent = el.parentNode;
+
+    if (parent.classList.contains("collapsed")) {
+      parent.classList.remove("collapsed");
+    } else {
+      parent.classList.add("collapsed");
+    }
+    el.style.display = isHidden(el) ? 'block' : 'none';
+    !!parent.dataset.toggle && save();
+    $( document ).trigger( "erui_interface_change_vertical" ); // <> !#@!
+    return el;
+  };
+
+  // Toggle specify element OR this - which is toggler button so toggle element is sibling
+  this.toggle = function(id_or_el, event) {
+    if (event && event.target.tagName === "A")
+      return;
+
+    var el = (typeof(id_or_el) === "object") ? id_or_el : document.getElementById(id_or_el);
+    var id = el.id;
+    if (id) {
+      if (!!storage[id]) {
+        delete storage[id];
+      } else {
+        storage[id] = isHidden(el) ? 0 : 1;
+      }
+      toggle(el);
+    } else {
+      console.warn('Could not toggle this element', el);
+    }
+
+  };
+
+  this.ensureToggle = function() {
+    var list = document.querySelectorAll('*[data-toggle]');
+    for (var i = 0; i < list.length; ++i) {
+      var item = list.item(i);
+      var container = document.getElementById(item.dataset.toggle);
+      if (!!storage[item.dataset.toggle]) {
+        toggle(container);
+      }
+    }
+    return this;
+  };
+};
+
+$(document).ready(EasyToggler.ensureToggle);

data/app/assets/javascripts/redmine_extensions/redmine_extensions.js

@@ -494,7 +494,7 @@ window.closeFlashMessage = (function($element){
         },
 
         _initData: function(data) {
-            this.possibleValues = this._formatData(data)
+            this.possibleValues = this._formatData(data);
             this.valuesLoaded = true;
 
             this.selectedValues = this.selectedValues ? this.selectedValues : [];

data/app/helpers/redmine_extensions/application_helper.rb

@@ -116,7 +116,7 @@ module RedmineExtensions
     # ** Aliases for this options are: wrapping_heading_element, header_tag
     # * <tt>toggle: false</tt> - This disable toggle function (collapsible and remember)
     # ** Aliases for this options are: collapsible, no_expander
-    # * <tt>remember: false</tt> - This disable remember function of toggle conatiner
+    # * <tt>remember: false</tt> - This disable remember function of toggle container
     # ** Aliases for this options are: ajax_call
     #
     def render_module_easy_box(id, heading, options = {}, &block) # with fallback to old
@@ -220,7 +220,7 @@ module RedmineExtensions
 
       content_tag(:span, :class => 'easy-multiselect-tag-container') do
         text_field_tag('', '', (options[:html_options] || {}).merge(id: options[:id])) +
-          javascript_tag("$('##{options[:id]}').easymultiselect({multiple: true, rootElement: #{options[:rootElement]}, inputName: '#{name}', preload: true, source: #{source}, selected: #{selected_values.to_json}, show_toggle_button: #{options[:show_toggle_button]}, select_first_value: #{options[:select_first_value]}, load_immediately: #{options[:load_immediately]}, autocomplete_options: #{(options[:jquery_auto_complete_options]||{}).to_json} });")
+          javascript_tag("$('##{options[:id]}').easymultiselect({multiple: true, rootElement: #{options[:rootElement].to_json}, inputName: '#{name}', preload: true, source: #{source}, selected: #{selected_values.to_json}, show_toggle_button: #{options[:show_toggle_button]}, select_first_value: #{options[:select_first_value]}, load_immediately: #{options[:load_immediately]}, autocomplete_options: #{(options[:jquery_auto_complete_options]||{}).to_json} });")
       end
     end
 

data/app/views/common/_closing_modal.html.erb

@@ -1,3 +1,3 @@
-<p>
-  <%= l(:text_modal_is_closing) %>
+<p>
+  <%= l(:text_modal_is_closing) %>
 </p>

data/app/views/common/_collapsible_module_layout.html.erb

@@ -1,5 +1,5 @@
-<div class="module box <%= renderer.container_class %>"<%=raw renderer.collapsible? && %Q{ data-toggle="#{renderer.id}"} || nil %>>
-  <%= content_tag(:div, class: 'module-heading ' + renderer.heading_class, onclick: (renderer.saving_state_enabled? && 'EasyToggler.toggle(this.nextElementSibling, event)' || nil)) do %>
+<div class="module box <%= renderer.container_class %>"<%=raw renderer.saving_state_enabled? && %Q{ data-toggle="#{renderer.id}"} || nil %>>
+  <%= content_tag(:div, class: 'module-heading ' + renderer.heading_class, onclick: (renderer.collapsible? && 'EasyToggler.toggle(this.nextElementSibling, event)' || nil)) do %>
     <%= content_tag(:span, ' ', class: 'expander module-toggler') if renderer.collapsible? %>
     <%= content_tag(renderer.heading_tag, renderer.heading, class: renderer.icon) %>
     <%= content_tag(:span, renderer.heading_links, class: 'module-heading-links') if renderer.heading_links %>

data/app/views/common/close_modal.js.erb

@@ -1,5 +1,5 @@
-$("#ajax-modal").html("<%= j render(:partial => 'common/closing_modal', :formats => [:html]) %>");
-$("#ajax-modal").dialog('option', {
-  buttons: []
-});
+$("#ajax-modal").html("<%= j render(:partial => 'common/closing_modal', :formats => [:html]) %>");
+$("#ajax-modal").dialog('option', {
+  buttons: []
+});
 window.location = "<%= j params[:back_url] %>";

data/config/locales/en.yml

@@ -1,4 +1,5 @@
 en:
   nothing: Nothing
   button_update_easy_settings: Update settings
+  label_no_output: No output has been selected
   text_modal_is_closing: This modal dialog will be closed automatically, please wait.

data/lib/generators/redmine_extensions/entity/entity_generator.rb

@@ -44,6 +44,7 @@ module RedmineExtensions
       template 'controller.rb.erb', "#{plugin_path}/app/controllers/#{model_name_pluralize_underscored}_controller.rb"
       template('custom_field.rb.erb', "#{plugin_path}/app/models/#{model_name_underscored}_custom_field.rb") if acts_as_customizable?
       template 'edit.html.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/edit.html.erb"
+      template 'edit.js.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/edit.js.erb"
 
       if File.exists?("#{plugin_path}/config/locales/en.yml")
         append_to_file "#{plugin_path}/config/locales/en.yml" do
@@ -71,6 +72,7 @@ module RedmineExtensions
       template 'hooks.rb.erb', "#{plugin_path}/lib/#{plugin_name_underscored}/#{model_name_underscored}_hooks.rb"
       template 'index.api.rsb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/index.api.rsb"
       template 'index.html.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/index.html.erb"
+      template 'index.js.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/index.js.erb"
 
       if mail?
         template 'mailer.rb.erb', "#{plugin_path}/app/models/#{model_name_underscored}_mailer.rb"
@@ -83,6 +85,7 @@ module RedmineExtensions
       template 'migration.rb.erb', "#{plugin_path}/db/migrate/#{Time.now.strftime('%Y%m%d%H%M%S')}_create_#{@model_name_pluralize_underscored}.rb"
       template 'model.rb.erb', "#{plugin_path}/app/models/#{model_name_underscored}.rb"
       template 'new.html.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/new.html.erb"
+      template 'new.js.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/new.js.erb"
       template 'query.rb.erb', "#{plugin_path}/app/models/#{model_name_underscored}_query.rb"
 
       if File.exists?("#{plugin_path}/config/routes.rb")
@@ -145,6 +148,7 @@ module RedmineExtensions
 
       template 'show.api.rsb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/show.api.rsb"
       template 'show.html.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/show.html.erb"
+      template 'show.js.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/show.js.erb"
     end
 
     private

data/lib/generators/redmine_extensions/entity/templates/_sidebar.html.erb.erb

@@ -1,9 +1,9 @@
-<ul>
-<%% if @<%= model_name_underscored %> && !@<%= model_name_underscored %>.new_record? %>
-  <li><%%= link_to l(:button_edit), edit_polymorphic_path([@project, @<%= model_name_underscored %>]), title: l(:button_edit), class: 'icon icon-edit' %></li>
-<%% end %>
-<%% if @<%= model_name_underscored %>.nil? %>
-  <li><%%= link_to l(:button_<%= model_name_underscored %>_new), new_polymorphic_path([@project, :<%= model_name_underscored %>]), title: l(:title_<%= model_name_underscored %>_new), class: 'icon icon-add button button-positive' %></li>
-<%% end %>
-  <li><%%= link_to l(:label_<%= model_name_pluralize_underscored %>), polymorphic_path([@project, :<%= model_name_pluralize_underscored %>], set_filter: '1'), title: l(:label_<%= model_name_pluralize_underscored %>), class: 'icon icon-folder button' %></li>
+<ul>
+<%% if @<%= model_name_underscored %> && !@<%= model_name_underscored %>.new_record? %>
+  <li><%%= link_to l(:button_edit), edit_polymorphic_path([@project, @<%= model_name_underscored %>]), title: l(:button_edit), class: 'icon icon-edit' %></li>
+<%% end %>
+<%% if @<%= model_name_underscored %>.nil? %>
+  <li><%%= link_to l(:button_<%= model_name_underscored %>_new), new_polymorphic_path([@project, :<%= model_name_underscored %>]), title: l(:title_<%= model_name_underscored %>_new), class: 'icon icon-add button button-positive' %></li>
+<%% end %>
+  <li><%%= link_to l(:label_<%= model_name_pluralize_underscored %>), polymorphic_path([@project, :<%= model_name_pluralize_underscored %>], set_filter: '1'), title: l(:label_<%= model_name_pluralize_underscored %>), class: 'icon icon-folder button' %></li>
 </ul>

data/lib/generators/redmine_extensions/entity/templates/context_menu.html.erb.erb

@@ -1,8 +1,8 @@
-<ul>
-<%% if @<%= model_name_underscored %> -%>
-  <li><%%= context_menu_link l(:button_edit), edit_<%= model_name_underscored %>_path(@<%= model_name_underscored %>), class: 'icon icon-edit', disabled: !@can[:edit] %></li>
-<%% end %>
-  <li><%%= context_menu_link l(:button_delete), <%= model_name_pluralize_underscored %>_path(ids: @<%= model_name_underscored %>_ids, back_url: @back), method: :delete, data: {confirm: l(:text_are_you_sure)}, class: 'icon icon-del', disabled: !@can[:delete] %></li>
-
-  <%%= call_hook(:view_<%= model_name_pluralize_underscored %>_context_menu_end, {<%= model_name_underscored %>: @<%= model_name_underscored %>, <%= model_name_pluralize_underscored %>: @<%= model_name_pluralize_underscored %>, can: @can, back: @back, project: @project}) %>
+<ul>
+<%% if @<%= model_name_underscored %> -%>
+  <li><%%= context_menu_link l(:button_edit), edit_<%= model_name_underscored %>_path(@<%= model_name_underscored %>), class: 'icon icon-edit', disabled: !@can[:edit] %></li>
+<%% end %>
+  <li><%%= context_menu_link l(:button_delete), <%= model_name_pluralize_underscored %>_path(ids: @<%= model_name_underscored %>_ids, back_url: @back), method: :delete, data: {confirm: l(:text_are_you_sure)}, class: 'icon icon-del', disabled: !@can[:delete] %></li>
+
+  <%%= call_hook(:view_<%= model_name_pluralize_underscored %>_context_menu_end, {<%= model_name_underscored %>: @<%= model_name_underscored %>, <%= model_name_pluralize_underscored %>: @<%= model_name_pluralize_underscored %>, can: @can, back: @back, project: @project}) %>
 </ul>

data/lib/generators/redmine_extensions/entity/templates/controller.rb.erb

@@ -25,6 +25,7 @@ class <%= controller_class %>Controller < ApplicationController
     respond_to do |format|
       format.html
       format.api
+      format.js
     end
   end
 

data/lib/generators/redmine_extensions/entity/templates/custom_field.rb.erb

@@ -1,7 +1,7 @@
-class <%= model_name %>CustomField < CustomField
-
-  def type_name
-    :label_<%= @model_name_pluralize_underscored %>
-  end
-
-end
+class <%= model_name %>CustomField < CustomField
+
+  def type_name
+    :label_<%= @model_name_pluralize_underscored %>
+  end
+
+end

data/lib/generators/redmine_extensions/entity/templates/edit.html.erb.erb

@@ -1,19 +1,19 @@
-<%%= title l(:heading_<%= model_name_underscored %>_edit) %>
-
-<%%= form_for([@project, @<%= model_name_underscored %>], html: {multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular', remote: request.xhr?}) do |f| %>
-  <%%= error_messages_for @<%= model_name_underscored %> %>
-
-  <div class="box">
-    <%%= render partial: 'form', locals: {<%= model_name_underscored %>: @<%= model_name_underscored %>} %>
-  </div>
-
-  <%% if !request.xhr? %>
-  <p>
-    <%%= submit_tag l(:button_update), title: l(:button_update) %>
-  </p>
-  <%% end %>
-<%% end %>
-<%% ### PAGE CUSTOMS ########################################################## %>
-<%% content_for :sidebar do %>
-  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
+<%%= title l(:heading_<%= model_name_underscored %>_edit) %>
+
+<%%= form_for([@project, @<%= model_name_underscored %>], html: {multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular', remote: request.xhr?}) do |f| %>
+  <%%= error_messages_for @<%= model_name_underscored %> %>
+
+  <div class="box">
+    <%%= render partial: 'form', locals: {<%= model_name_underscored %>: @<%= model_name_underscored %>} %>
+  </div>
+
+  <%% if !request.xhr? %>
+  <p>
+    <%%= submit_tag l(:button_update), title: l(:button_update) %>
+  </p>
+  <%% end %>
+<%% end %>
+<%% ### PAGE CUSTOMS ########################################################## %>
+<%% content_for :sidebar do %>
+  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
 <%% end %>

data/lib/generators/redmine_extensions/entity/templates/edit.js.erb.erb

@@ -1,17 +1,17 @@
-$("#ajax-modal").html("<%%= j render(:template => '<%= model_name_pluralize_underscored %>/edit', :formats => [:html]) %>");
-showModal('ajax-modal', '60%');
-var submitButton = {
-  text:"<%=j l(:button_update) -%>",
-  title:"<%=j l(:button_update) -%>",
-  click: function() {$(this).find('form').submit()},
-  'class': 'button-positive'
-}
-var closeButton = {
-  text: "<%=j l(:button_close) -%>",
-  title: "<%=j l(:button_close) -%>",
-  click: function() {$(this).dialog('close');},
-  'class': 'button'
-}
-$("#ajax-modal").dialog('option', {
-  buttons: [closeButton, submitButton]
+$("#ajax-modal").html("<%%= j render(:template => '<%= model_name_pluralize_underscored %>/edit', :formats => [:html]) %>");
+showModal('ajax-modal');
+var submitButton = {
+  text:"<%=j l(:button_update) -%>",
+  title:"<%=j l(:button_update) -%>",
+  click: function() {$(this).find('form').submit()},
+  'class': 'button-positive'
+}
+var closeButton = {
+  text: "<%=j l(:button_close) -%>",
+  title: "<%=j l(:button_close) -%>",
+  click: function() {$(this).dialog('close');},
+  'class': 'button'
+}
+$("#ajax-modal").dialog('option', {
+  buttons: [closeButton, submitButton]
 });

data/lib/generators/redmine_extensions/entity/templates/index.api.rsb.erb

@@ -1,5 +1,5 @@
-api.array :<%= model_name_pluralize_underscored %>, api_meta(total_count: @entity_count, offset: @offset, limit: @limit) do
-  @entities.each do |<%= model_name_underscored %>|
-    render_api_<%= model_name_underscored %>(api, <%= model_name_underscored %>)
-  end
-end
+api.array :<%= model_name_pluralize_underscored %>, api_meta(total_count: @entity_count, offset: @offset, limit: @limit) do
+  @entities.each do |<%= model_name_underscored %>|
+    render_api_<%= model_name_underscored %>(api, <%= model_name_underscored %>)
+  end
+end

data/lib/generators/redmine_extensions/entity/templates/index.html.erb.erb

@@ -1,5 +1,5 @@
-<%%= render @query %>
-<%% ### PAGE CUSTOMS ########################################################## %>
-<%% content_for :sidebar do %>
-  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
+<%%= render @query %>
+<%% ### PAGE CUSTOMS ########################################################## %>
+<%% content_for :sidebar do %>
+  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
 <%% end %>

data/lib/generators/redmine_extensions/entity/templates/index.js.erb.erb

@@ -0,0 +1,11 @@
+$("#ajax-modal").html("<%%= j render(:template => '<%= model_name_pluralize_underscored %>/index', :formats => [:html]) %>");
+showModal('ajax-modal');
+var closeButton = {
+  text: "<%=j l(:button_close) -%>",
+  title: "<%=j l(:button_close) -%>",
+  click: function() {$(this).dialog('close');},
+  'class': 'button'
+}
+$("#ajax-modal").dialog('option', {
+  buttons: [closeButton, submitButton]
+});

data/lib/generators/redmine_extensions/entity/templates/mail_added.html.erb.erb

@@ -1 +1 @@
-<h1><%%= link_to(@<%= model_name_underscored %>.to_s, @<%= model_name_underscored %>_url) %></h1>
+<h1><%%= link_to(@<%= model_name_underscored %>.to_s, @<%= model_name_underscored %>_url) %></h1>

data/lib/generators/redmine_extensions/entity/templates/mail_added.text.erb.erb

@@ -1,2 +1,2 @@
-<%%= @<%= model_name_underscored %>.to_s %>
-<%%= @<%= model_name_underscored %>_url %>
+<%%= @<%= model_name_underscored %>.to_s %>
+<%%= @<%= model_name_underscored %>_url %>

data/lib/generators/redmine_extensions/entity/templates/mail_updated.text.erb.erb

@@ -1,2 +1,2 @@
-<%%= @<%= model_name_underscored %>.to_s %>
-<%%= @<%= model_name_underscored %>_url %>
+<%%= @<%= model_name_underscored %>.to_s %>
+<%%= @<%= model_name_underscored %>_url %>

data/lib/generators/redmine_extensions/entity/templates/migration.rb.erb

@@ -1,9 +1,9 @@
-class Create<%= model_name_pluralize_underscored.camelize %> < ActiveRecord::Migration
-  def change
-    create_table :<%= model_name_pluralize_underscored %>, force: true do |t|
-      <%- db_columns.each do |column_name, column_attrs| -%>
-      t.<%= column_attrs[:type] %> :<%= column_name %>, null: <%= column_attrs[:null] %>
-      <%- end -%>
-    end
-  end
-end
+class Create<%= model_name_pluralize_underscored.camelize %> < ActiveRecord::Migration
+  def change
+    create_table :<%= model_name_pluralize_underscored %>, force: true do |t|
+      <%- db_columns.each do |column_name, column_attrs| -%>
+      t.<%= column_attrs[:type] %> :<%= column_name %>, null: <%= column_attrs[:null] %>
+      <%- end -%>
+    end
+  end
+end

data/lib/generators/redmine_extensions/entity/templates/new.html.erb.erb

@@ -1,19 +1,19 @@
-<%%= title l(:heading_<%= model_name_underscored %>_new) %>
-
-<%%= form_for([@project, @<%= model_name_underscored %>], html: {multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular', remote: request.xhr?}) do |f| %>
-  <%%= error_messages_for @<%= model_name_underscored %> %>
-
-  <div class="box">
-    <%%= render partial: 'form', locals: {<%= model_name_underscored %>: @<%= model_name_underscored %>} %>
-  </div>
-
-  <%% if !request.xhr? %>
-  <p>
-    <%%= submit_tag l(:button_create), title: l(:button_create) %>
-  </p>
-  <%% end %>
-<%% end %>
-<%% ### PAGE CUSTOMS ########################################################## %>
-<%% content_for :sidebar do %>
-  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
+<%%= title l(:heading_<%= model_name_underscored %>_new) %>
+
+<%%= form_for([@project, @<%= model_name_underscored %>], html: {multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular', remote: request.xhr?}) do |f| %>
+  <%%= error_messages_for @<%= model_name_underscored %> %>
+
+  <div class="box">
+    <%%= render partial: 'form', locals: {<%= model_name_underscored %>: @<%= model_name_underscored %>} %>
+  </div>
+
+  <%% if !request.xhr? %>
+  <p>
+    <%%= submit_tag l(:button_create), title: l(:button_create) %>
+  </p>
+  <%% end %>
+<%% end %>
+<%% ### PAGE CUSTOMS ########################################################## %>
+<%% content_for :sidebar do %>
+  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
 <%% end %>

data/lib/generators/redmine_extensions/entity/templates/new.js.erb.erb

@@ -1,17 +1,17 @@
-$("#ajax-modal").html("<%%= j render(:template => '<%= model_name_pluralize_underscored %>/new', :formats => [:html]) %>");
-showModal('ajax-modal', '60%');
-var submitButton = {
-  text:"<%=j l(:button_create) -%>",
-  title:"<%=j l(:button_create) -%>",
-  click: function() {$(this).find('form').submit()},
-  'class': 'button-positive'
-}
-var closeButton = {
-  text: "<%=j l(:button_close) -%>",
-  title: "<%=j l(:button_close) -%>",
-  click: function() {$(this).dialog('close');},
-  'class': 'button'
-}
-$("#ajax-modal").dialog('option', {
-  buttons: [closeButton, submitButton]
+$("#ajax-modal").html("<%%= j render(:template => '<%= model_name_pluralize_underscored %>/new', :formats => [:html]) %>");
+showModal('ajax-modal');
+var submitButton = {
+  text:"<%=j l(:button_create) -%>",
+  title:"<%=j l(:button_create) -%>",
+  click: function() {$(this).find('form').submit()},
+  'class': 'button-positive'
+}
+var closeButton = {
+  text: "<%=j l(:button_close) -%>",
+  title: "<%=j l(:button_close) -%>",
+  click: function() {$(this).dialog('close');},
+  'class': 'button'
+}
+$("#ajax-modal").dialog('option', {
+  buttons: [closeButton, submitButton]
 });