removes admin.js manifest and favors forms.js
This commit is contained in:
committed by
Juanjo Bazán
parent
310217d65f
commit
bc0a8542c2
@@ -1,15 +0,0 @@
|
|||||||
// This is a manifest file that'll be compiled into admin.js
|
|
||||||
// It will be included in the admin layout
|
|
||||||
// and will require all the files listed below.
|
|
||||||
//
|
|
||||||
//= require admin_valuators_forms
|
|
||||||
|
|
||||||
var initialize_admin_modules = function() {
|
|
||||||
App.AdminValuatorsForms.initialize();
|
|
||||||
};
|
|
||||||
|
|
||||||
$(function(){
|
|
||||||
$(document).ready(initialize_admin_modules);
|
|
||||||
$(document).on('page:load', initialize_admin_modules);
|
|
||||||
$(document).on('ajax:complete', initialize_admin_modules);
|
|
||||||
});
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
App.AdminValuatorsForms =
|
|
||||||
|
|
||||||
initialize: ->
|
|
||||||
$('#spending_proposal_administrator_id').unbind('change').on('change', ->
|
|
||||||
$('#administrator_assignment_form').submit()
|
|
||||||
false
|
|
||||||
)
|
|
||||||
|
|
||||||
$('#assign-valuators-link').unbind('click').on('click', ->
|
|
||||||
$('#valuators-assign-list').toggle("down")
|
|
||||||
false
|
|
||||||
)
|
|
||||||
|
|
||||||
$('.js-assign-valuators-check').unbind('change').on('change', ->
|
|
||||||
$('#valuators_assignment_form').submit()
|
|
||||||
false
|
|
||||||
)
|
|
||||||
@@ -40,6 +40,7 @@
|
|||||||
//= require advanced_search
|
//= require advanced_search
|
||||||
//= require registration_form
|
//= require registration_form
|
||||||
//= require suggest
|
//= require suggest
|
||||||
|
//= require forms
|
||||||
|
|
||||||
var initialize_modules = function() {
|
var initialize_modules = function() {
|
||||||
App.Comments.initialize();
|
App.Comments.initialize();
|
||||||
@@ -55,6 +56,7 @@ var initialize_modules = function() {
|
|||||||
App.AdvancedSearch.initialize();
|
App.AdvancedSearch.initialize();
|
||||||
App.RegistrationForm.initialize();
|
App.RegistrationForm.initialize();
|
||||||
App.Suggest.initialize();
|
App.Suggest.initialize();
|
||||||
|
App.Forms.initialize();
|
||||||
};
|
};
|
||||||
|
|
||||||
$(function(){
|
$(function(){
|
||||||
|
|||||||
12
app/assets/javascripts/forms.js.coffee
Normal file
12
app/assets/javascripts/forms.js.coffee
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
App.Forms =
|
||||||
|
|
||||||
|
initialize: ->
|
||||||
|
$('.js-submit-on-change').unbind('change').on('change', ->
|
||||||
|
$(this).closest('form').submit()
|
||||||
|
false
|
||||||
|
)
|
||||||
|
|
||||||
|
$('.js-toggle-link').unbind('click').on('click', ->
|
||||||
|
$($(this).data('toggle-selector')).toggle("down")
|
||||||
|
false
|
||||||
|
)
|
||||||
@@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
<p><strong><%= t("admin.spending_proposals.show.assigned_admin") %>:</strong>
|
<p><strong><%= t("admin.spending_proposals.show.assigned_admin") %>:</strong>
|
||||||
<%= form_for(@spending_proposal, url: assign_admin_admin_spending_proposal_path(@spending_proposal), remote: true, html: {id: 'administrator_assignment_form'}) do |f| %>
|
<%= form_for(@spending_proposal, url: assign_admin_admin_spending_proposal_path(@spending_proposal), remote: true, html: {id: 'administrator_assignment_form'}) do |f| %>
|
||||||
<%= f.select :administrator_id, @admins.collect { |a| [ "#{a.name} (#{a.email})", a.id ] }, {include_blank: t("admin.spending_proposals.show.undefined"), label: false} %>
|
<%= f.select :administrator_id, @admins.collect { |a| [ "#{a.name} (#{a.email})", a.id ] }, {include_blank: t("admin.spending_proposals.show.undefined"), label: false}, class: "js-submit-on-change" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
@@ -40,7 +40,7 @@
|
|||||||
<%= render "assigned_valuators" %>
|
<%= render "assigned_valuators" %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h3><%= link_to t("admin.spending_proposals.show.assign_valuators"), "", id: "assign-valuators-link" %></h3>
|
<h3><%= link_to t("admin.spending_proposals.show.assign_valuators"), "", class: "js-toggle-link", data: {"toggle-selector" => "#valuators-assign-list"} %></h3>
|
||||||
|
|
||||||
<div style="display:none" id="valuators-assign-list">
|
<div style="display:none" id="valuators-assign-list">
|
||||||
<%= form_for(@spending_proposal, url: assign_valuators_admin_spending_proposal_path(@spending_proposal), remote: true, html: {id: 'valuators_assignment_form'}) do |f| %>
|
<%= form_for(@spending_proposal, url: assign_valuators_admin_spending_proposal_path(@spending_proposal), remote: true, html: {id: 'valuators_assignment_form'}) do |f| %>
|
||||||
@@ -48,7 +48,7 @@
|
|||||||
<div>
|
<div>
|
||||||
<%= check_box_tag "valuator_ids_#{valuator.id}", valuator.id, @spending_proposal.valuators.include?(valuator),
|
<%= check_box_tag "valuator_ids_#{valuator.id}", valuator.id, @spending_proposal.valuators.include?(valuator),
|
||||||
name: 'spending_proposal[valuator_ids][]',
|
name: 'spending_proposal[valuator_ids][]',
|
||||||
class: "js-assign-valuators-check" %>
|
class: "js-submit-on-change" %>
|
||||||
<%= label_tag "valuator_ids_#{valuator.id}", valuator.name %>
|
<%= label_tag "valuator_ids_#{valuator.id}", valuator.name %>
|
||||||
</div>
|
</div>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<title><%= content_for?(:title) ? yield(:title) : "Admin" %></title>
|
<title><%= content_for?(:title) ? yield(:title) : "Admin" %></title>
|
||||||
<%= stylesheet_link_tag "application" %>
|
<%= stylesheet_link_tag "application" %>
|
||||||
<%= javascript_include_tag "vendor/modernizr" %>
|
<%= javascript_include_tag "vendor/modernizr" %>
|
||||||
<%= javascript_include_tag "application", "admin", 'data-turbolinks-track' => true %>
|
<%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
|
||||||
<%= content_for :head %>
|
<%= content_for :head %>
|
||||||
<%= csrf_meta_tags %>
|
<%= csrf_meta_tags %>
|
||||||
<%= favicon_link_tag "favicon.ico" %>
|
<%= favicon_link_tag "favicon.ico" %>
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ Rails.application.config.assets.version = '1.0'
|
|||||||
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
|
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
|
||||||
# Rails.application.config.assets.precompile += %w( search.js )
|
# Rails.application.config.assets.precompile += %w( search.js )
|
||||||
Rails.application.config.assets.precompile += %w( ckeditor/* )
|
Rails.application.config.assets.precompile += %w( ckeditor/* )
|
||||||
Rails.application.config.assets.precompile += %w( admin.js )
|
|
||||||
Rails.application.config.assets.precompile += %w( ie_lt9.js )
|
Rails.application.config.assets.precompile += %w( ie_lt9.js )
|
||||||
Rails.application.config.assets.precompile += %w( stat_graphs.js )
|
Rails.application.config.assets.precompile += %w( stat_graphs.js )
|
||||||
Rails.application.config.assets.precompile += %w( print.css )
|
Rails.application.config.assets.precompile += %w( print.css )
|
||||||
|
|||||||
Reference in New Issue
Block a user