diff --git a/app/views/admin/announcements/_index.html.erb b/app/views/admin/announcements/_index.html.erb index 80c80ea..8e1d396 100644 --- a/app/views/admin/announcements/_index.html.erb +++ b/app/views/admin/announcements/_index.html.erb @@ -20,29 +20,29 @@ if(window.scroll_top){ $(window).scrollTop(window.scroll_top); } - window.archive_delete_ids = []; - $(".delete_archives_btn").addClass('hide'); + window.anncs_delete_ids = []; + $(".delete_anncs_btn").addClass('hide'); }); } $(document).on("click", ".select_delete", function(){ var that = $(this); var id = that.data("id"); - if(window.archive_delete_ids == undefined){ - window.archive_delete_ids = []; + if(window.anncs_delete_ids == undefined){ + window.anncs_delete_ids = []; } if(that.prop("checked")){ - window.archive_delete_ids.push(id); + window.anncs_delete_ids.push(id); }else{ - window.archive_delete_ids.delete(id); + window.anncs_delete_ids.delete(id); } - if(window.archive_delete_ids.length == 0){ - $(".delete_archives_btn").addClass('hide'); + if(window.anncs_delete_ids.length == 0){ + $(".delete_anncs_btn").addClass('hide'); }else{ - $(".delete_archives_btn").removeClass('hide'); + $(".delete_anncs_btn").removeClass('hide'); } }) - function delete_archives(){ - if(!window.archive_delete_ids || window.archive_delete_ids.length == 0){ + function delete_anncs(){ + if(!window.anncs_delete_ids || window.anncs_delete_ids.length == 0){ return null; } var data = new FormData(); @@ -55,7 +55,7 @@ if (csrf_token && csrf_param) { data.append(csrf_param, csrf_token); } - window.archive_delete_ids.forEach(function(val){ + window.anncs_delete_ids.forEach(function(val){ data.append('ids[]', val); }); $.ajax({ @@ -78,10 +78,10 @@ } }) } - $(document).on("click", ".delete_archives_btn", function(){ + $(document).on("click", ".delete_anncs_btn", function(){ if(window.confirm("<%=t(:sure?)%>")){ if(window.confirm("<%=t(:sure?)%>")){ - delete_archives(); + delete_anncs(); } } }) @@ -187,7 +187,7 @@ <%= content_tag :div, class: "bottomnav clearfix" do content_tag(:div, paginate(@bulletins), class: "pagination pagination-centered") + - content_tag(:div, link_to(t("archive.delete_selected"), "javascript:void(0)", :class=>"btn btn-primary"), class: "pull-right hide delete_archives_btn") + + content_tag(:div, link_to(t("announcement.delete_selected"), "javascript:void(0)", :class=>"btn btn-primary"), class: "pull-right hide delete_anncs_btn") + content_tag(:div, link_to(t(:new_),new_admin_announcement_path, :class=>"btn btn-primary"), class: "pull-right") end %> \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 731544e..873c229 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3,6 +3,7 @@ en: feed: Feed import: Import announcement: + delete_selected: "Delete Selected" expired: This announcement has been expired. go_back: Go back to the list of announcements. annc_dept: Department diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 8c89a4b..bd302e9 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -4,6 +4,7 @@ zh_tw: import: 匯入 get_all_anncs_without_subannc: "選擇相關公告" announcement: + delete_selected: "刪除所選" expired: 此則公告已過期 go_back: 回到公告列表 annc_dept: 公告單位 diff --git a/config/routes.rb b/config/routes.rb index 61007aa..58fa275 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -32,7 +32,7 @@ Rails.application.routes.draw do patch 'announcement/updatesettings', to: 'announcements#updatesettings' post 'announcement/import_from_wp', to: 'announcements#import_from_wp' post 'announcement/generate_iframe_url' => 'announcements#generate_iframe_url' - delete 'announcement/delete', to: 'announcements#delete' + delete 'announcements/delete', to: 'announcements#delete' resources :announcements get 'announcements/:id/comment'=> 'announcements#comment' get 'annc-comment-hidden/:id' => 'announcements#comment_hidden'