diff --git a/app/views/admin/web_resources/order.html.erb b/app/views/admin/web_resources/order.html.erb index 4d52ca7..4b527a6 100644 --- a/app/views/admin/web_resources/order.html.erb +++ b/app/views/admin/web_resources/order.html.erb @@ -1,21 +1,36 @@ <% content_for :page_specific_css do %> <%= stylesheet_link_tag "admin/web_links" %> <% end %> +
<%= t("web_link.please_save") %>
+ <% @links.each_with_index do |link,i| %> - + + <% end %> @@ -74,10 +89,10 @@ allRows = table_element.rows; for(i = 1; i < allRows.length; i++){ var thisRow = allRows[i], - text = thisRow.cells[0].textContent.trim(), + text = thisRow.cells[1].textContent.trim(), hash = {}; hash.index = parseInt(text); - text = thisRow.cells[1].innerHTML.trim(); + text = thisRow.cells[2].innerHTML.trim(); if(text != " "){ hash.link = text; } @@ -92,8 +107,8 @@ for(i = 0;i < data.length; i++){ var thisRow = allRows[i + 1], current_value = i + 1; - thisRow.cells[0].innerHTML = "
" + current_value + "
"; - thisRow.cells[1].innerHTML = data[i].link; + thisRow.cells[1].innerHTML = "
" + current_value + "
"; + thisRow.cells[2].innerHTML = data[i].link; } $("#web_resource_order_table div.position-text-div").on("click",makeEditable); } @@ -119,4 +134,66 @@ $("#web_resource_order_table div.position-text-div").on("click",makeEditable); + + \ No newline at end of file diff --git a/web_resource.gemspec b/web_resource.gemspec index ba45dbd..6fc284d 100644 --- a/web_resource.gemspec +++ b/web_resource.gemspec @@ -2,18 +2,21 @@ $:.push File.expand_path("../lib", __FILE__) # Maintain your gem's version: require "web_resource/version" -app_path = File.expand_path(__dir__) -template_path = ENV['PWD'] + '/app/templates' -all_template = Dir.glob(template_path+'/*/') -puts 'copying module' -all_template.each do |folder| - if !folder.include?('mobile') - if folder.split('/')[-1] != 'mobile' - begin - system ('cp -r '+ app_path + '/modules/. ' + folder+'/modules/.') - puts "Updating websource to #{folder}" - rescue - puts "error updating websource in #{folder}" +bundle_update_flag = ARGV[0]=='update' || ARGV[0]=='install' +if bundle_update_flag + app_path = File.expand_path(__dir__) + template_path = ENV['PWD'] + '/app/templates' + all_template = Dir.glob(template_path+'/*/') + puts 'copying module' + all_template.each do |folder| + if !folder.include?('mobile') + if folder.split('/')[-1] != 'mobile' + begin + system ('cp -r '+ app_path + '/modules/. ' + folder+'/modules/.') + puts "Updating websource to #{folder}" + rescue + puts "error updating websource in #{folder}" + end end end end
<%= t("web_link.position") %> <%= t("web_link.link") %>
<%= (i + 1).to_s %>
- +