From 18e18a4add1d83f64e03a422ba779a836bbf5232 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Mon, 13 Aug 2012 15:10:53 +0800 Subject: [PATCH 1/7] Fix for banner on ie --- .../javascripts/lib/jquery.preload-min.js | 9 ++++++ app/helpers/application_helper.rb | 1 + lib/parsers/parser_common.rb | 28 +++++++++++-------- 3 files changed, 27 insertions(+), 11 deletions(-) create mode 100755 app/assets/javascripts/lib/jquery.preload-min.js diff --git a/app/assets/javascripts/lib/jquery.preload-min.js b/app/assets/javascripts/lib/jquery.preload-min.js new file mode 100755 index 00000000..cf3a0f1f --- /dev/null +++ b/app/assets/javascripts/lib/jquery.preload-min.js @@ -0,0 +1,9 @@ +/** + * jQuery.Preload - Multifunctional preloader + * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com + * Dual licensed under MIT and GPL. + * Date: 3/25/2009 + * @author Ariel Flesler + * @version 1.0.8 + */ +;(function($){var h=$.preload=function(c,d){if(c.split)c=$(c);d=$.extend({},h.defaults,d);var f=$.map(c,function(a){if(!a)return;if(a.split)return d.base+a+d.ext;var b=a.src||a.href;if(typeof d.placeholder=='string'&&a.src)a.src=d.placeholder;if(b&&d.find)b=b.replace(d.find,d.replace);return b||null}),data={loaded:0,failed:0,next:0,done:0,total:f.length};if(!data.total)return finish();var g=$(Array(d.threshold+1).join('')).load(handler).error(handler).bind('abort',handler).each(fetch);function handler(e){data.element=this;data.found=e.type=='load';data.image=this.src;data.index=this.index;var a=data.original=c[this.index];data[data.found?'loaded':'failed']++;data.done++;if(d.enforceCache)h.cache.push($('').attr('src',data.image)[0]);if(d.placeholder&&a.src)a.src=data.found?data.image:d.notFound||a.src;if(d.onComplete)d.onComplete(data);if(data.done\n" javascripts << "\n" end + javascripts << "\n" javascripts << "\n" javascripts << "\n" # javascripts << "\n" diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb index 8bfedfe8..56dcd480 100644 --- a/lib/parsers/parser_common.rb +++ b/lib/parsers/parser_common.rb @@ -44,17 +44,23 @@ module ParserCommon ad_banner = AdBanner.find(banner["id"]) rescue nil if ad_banner res << "" res << "" res << "
" @@ -74,7 +80,7 @@ module ParserCommon res << "link_open='#{ad_image.link_open}' " # res << "link_url='#{(ad_image.direct_to_after_click?? ad_image.out_link : ad_banner.context) || ' '}' " res << "link_url='#{(ad_image.out_link)}' " - res << "style='cursor:pointer'" if !ad_image.out_link.blank? + res << "style='cursor:pointer; visibility='hidden'" if !ad_image.out_link.blank? res << "/>" end res << "
" From 895918dfff4cfb87e40e53ba702d002270b627f0 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 13 Aug 2012 18:31:50 +0800 Subject: [PATCH 2/7] form validation --- app/assets/javascripts/ajax_form.js | 59 ++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/ajax_form.js b/app/assets/javascripts/ajax_form.js index 35834c96..f627ac85 100644 --- a/app/assets/javascripts/ajax_form.js +++ b/app/assets/javascripts/ajax_form.js @@ -23,17 +23,29 @@ $(document).on('click', '#ajax_form_submit', function(){ // dataType: 'script', dataType: 'html', url:$("#ajaxForm").attr("action"), + beforeSubmit: function(){ + var sub = true; + $("span.error").remove(); + $("#ajaxForm input").each(function(){ + if($(this).val() == ""){ + $("Cannot be empty.").insertAfter($(this)); + sub = false; + } + }) + if(!sub) + return false; + }, success: function(response,status,xhr){ if(typeof tinyMCEPopup != "undefined"){ - var x = response.split("#"); + var x = response.split("#"); var returnurl = x[0], - returntitle = x[1], - returndescription = x[2]; - var win = tinyMCEPopup.getWindowArg("window"); - win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = returnurl; - win.document.getElementById(tinyMCEPopup.getWindowArg("alt")).value = returndescription; - win.document.getElementById(tinyMCEPopup.getWindowArg("title")).value = returntitle; - if (typeof(win.ImageDialog) != "undefined") { + returntitle = x[1], + returndescription = x[2]; + var win = tinyMCEPopup.getWindowArg("window"); + win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = returnurl; + win.document.getElementById(tinyMCEPopup.getWindowArg("alt")).value = returndescription; + win.document.getElementById(tinyMCEPopup.getWindowArg("title")).value = returntitle; + if (typeof(win.ImageDialog) != "undefined") { // we are, so update image dimensions... if (win.ImageDialog.getImageData) win.ImageDialog.getImageData(); @@ -41,22 +53,41 @@ $(document).on('click', '#ajax_form_submit', function(){ // ... and preview if necessary if (win.ImageDialog.showPreviewImage) win.ImageDialog.showPreviewImage(returnurl); - } - tinyMCEPopup.close(); + } + tinyMCEPopup.close(); }else{ //incase if we want to do something for quick edit file upload - // $("#modal-file").modal('hide'); + // var modalvalues = ""; // var r = ""; // if(rcom.getInternetExplorerVersion() > -1){ // r = "" + response + ""; - // r = r.replace(""); + // r = r.replace("**",""); // r = $(r); + // modalvalues = r.find("span").attr("data-content").split("#"); // r.attr("id",r.find("span").attr("for")); - // alert(r.html()) + // var table=document.getElementById(modalvalues[0]); + // //var tbody = table.getElementsByTagName("tbody"); + // var row = table.insertRow(table.rows.length-1); + // var c1 = row.insertCell(0), + // c2 = row.insertCell(1), + // c3 = row.insertCell(2); + // c1.innerHTML = r.find("td").eq(0).html(); + // c2.innerHTML = r.find("td").eq(1).html(); + // c3.innerHTML = r.find("td").eq(2).html(); + // var trow = $("#bulletin_files tfoot").find("tr").eq(0); + // $("#bulletin_files tbody").append(trow); // }else{ + + // response = response.replace("**",""); + // response = response.replace("**",""); // r = $(response); + // modalvalues = r.find("span").attr("data-content").split("#"); + // $('#' + modalvalues[0]+ ' tbody').append(r); // } - // $('#bulletin_files tbody').append(r); + // console.log(modalvalues[1]); + // $("#"+modalvalues[1]).modal('hide'); + //$('#bulletin_files tbody').append(r); //$(response).fadeIn(); } }, From 134f49359dcf36b0e313e80a4fc487ccdebdc167 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 13 Aug 2012 18:45:02 +0800 Subject: [PATCH 3/7] form validation again --- app/assets/javascripts/ajax_form.js | 7 +++++-- app/assets/stylesheets/message.css | 4 ++++ app/views/admin/assets/file_upload.html.erb | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/ajax_form.js b/app/assets/javascripts/ajax_form.js index f627ac85..065e09fd 100644 --- a/app/assets/javascripts/ajax_form.js +++ b/app/assets/javascripts/ajax_form.js @@ -26,14 +26,17 @@ $(document).on('click', '#ajax_form_submit', function(){ beforeSubmit: function(){ var sub = true; $("span.error").remove(); + $("#dyn_error").empty(); $("#ajaxForm input").each(function(){ if($(this).val() == ""){ - $("Cannot be empty.").insertAfter($(this)); + $(" *").insertAfter($(this)); sub = false; } }) - if(!sub) + if(!sub){ + $("#dyn_error").text("Cannot be empty."); return false; + } }, success: function(response,status,xhr){ if(typeof tinyMCEPopup != "undefined"){ diff --git a/app/assets/stylesheets/message.css b/app/assets/stylesheets/message.css index 7206bd72..ffa954f1 100644 --- a/app/assets/stylesheets/message.css +++ b/app/assets/stylesheets/message.css @@ -11,3 +11,7 @@ .warning{ color:orange; } +label#dyn_error { + + margin-left: 50%; +} \ No newline at end of file diff --git a/app/views/admin/assets/file_upload.html.erb b/app/views/admin/assets/file_upload.html.erb index 06141117..c954624b 100644 --- a/app/views/admin/assets/file_upload.html.erb +++ b/app/views/admin/assets/file_upload.html.erb @@ -9,6 +9,7 @@

<%= t 'admin.file_upload' %>

+
From c32b0dd4b4c466bf213c8ce896d194e676091073 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Tue, 14 Aug 2012 00:59:01 +0800 Subject: [PATCH 4/7] Move delete checkboxes to js --- app/assets/javascripts/sort_header.js | 11 +++++- app/controllers/admin/assets_controller.rb | 4 +-- app/controllers/admin/designs_controller.rb | 4 +-- app/helpers/orbit_backend_helper.rb | 4 +-- app/views/admin/assets/_sort_headers.html.erb | 3 +- app/views/admin/assets/index.html.erb | 36 +++++++++---------- .../admin/designs/_sort_headers.html.erb | 3 +- app/views/admin/designs/index.html.erb | 10 +++--- config/routes.rb | 4 +-- .../back_end/bulletins_controller.rb | 4 +-- .../back_end/bulletins/_sort_headers.html.erb | 3 +- .../back_end/bulletins/index.html.erb | 10 +++--- .../announcement/config/routes.rb | 2 +- .../back_end/news_bulletins_controller.rb | 4 +-- .../news_bulletins/_sort_headers.html.erb | 3 +- .../back_end/news_bulletins/index.html.erb | 10 +++--- vendor/built_in_modules/news/config/routes.rb | 2 +- .../page_contexts/_sort_headers.html.erb | 2 +- .../back_end/web_links_controller.rb | 4 +-- .../back_end/web_links/_sort_headers.html.erb | 3 +- .../back_end/web_links/index.html.erb | 32 ++++++++--------- .../web_resource/config/routes.rb | 2 +- 22 files changed, 82 insertions(+), 78 deletions(-) diff --git a/app/assets/javascripts/sort_header.js b/app/assets/javascripts/sort_header.js index 25a16344..ef0f5a9c 100644 --- a/app/assets/javascripts/sort_header.js +++ b/app/assets/javascripts/sort_header.js @@ -1,5 +1,14 @@ $(document).on('click', '.list-remove', function(){ - $('#delete_all').submit(); + var a = []; + $('.checkbox_in_list').each(function(){ + if (this.checked) a.push("ids[]=" + this.value); + }); + var url = $(this).attr('rel'); + if (url.indexOf('?') > -1){ + $.getScript(url + '&' + a.join('&')); + }else{ + $.getScript(url + '?' + a.join('&')); + } }); $(document).on('click', '#check_all', function(){ diff --git a/app/controllers/admin/assets_controller.rb b/app/controllers/admin/assets_controller.rb index 092cb971..6a847a12 100644 --- a/app/controllers/admin/assets_controller.rb +++ b/app/controllers/admin/assets_controller.rb @@ -87,8 +87,8 @@ class Admin::AssetsController < OrbitBackendController end def delete - if params[:to_delete] - asset = Asset.any_in(:_id => params[:to_delete]).delete_all + if params[:ids] + asset = Asset.any_in(:_id => params[:ids]).delete_all end redirect_to assets_url(:filter => params[:filter], :direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) end diff --git a/app/controllers/admin/designs_controller.rb b/app/controllers/admin/designs_controller.rb index 84f2b770..9d434ff8 100644 --- a/app/controllers/admin/designs_controller.rb +++ b/app/controllers/admin/designs_controller.rb @@ -86,8 +86,8 @@ class Admin::DesignsController < OrbitBackendController end def delete - if params[:to_delete] - designs = Design.any_in(:_id => params[:to_delete]).delete_all + if params[:ids] + designs = Design.any_in(:_id => params[:ids]).delete_all end redirect_to admin_designs_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) end diff --git a/app/helpers/orbit_backend_helper.rb b/app/helpers/orbit_backend_helper.rb index e2865b9f..3bc4d31b 100644 --- a/app/helpers/orbit_backend_helper.rb +++ b/app/helpers/orbit_backend_helper.rb @@ -20,13 +20,13 @@ module OrbitBackendHelper ' active' if (@filter[type].include?(id.to_s) rescue nil) end - def render_sort_bar(delete_all, *titles) + def render_sort_bar(delete_all, url, *titles) content_tag :table, :class => "table main-list" do content_tag :thead do content_tag :tr, :class => "sort-header" do concat (content_tag :th, :class => "span1 strong" do concat check_box_tag :check_all - concat link_to content_tag(:i, nil, :class => "icon-trash"), '#', :class => "list-remove" + concat link_to content_tag(:i, nil, :class => "icon-trash"), '#', :class => "list-remove", :rel => url end) if (delete_all && (is_admin? || (is_manager? rescue nil))) titles.each do |title| concat render_title(title[0], title[1], title[2], title[3]) diff --git a/app/views/admin/assets/_sort_headers.html.erb b/app/views/admin/assets/_sort_headers.html.erb index 43cb5927..d266a086 100644 --- a/app/views/admin/assets/_sort_headers.html.erb +++ b/app/views/admin/assets/_sort_headers.html.erb @@ -1,4 +1,5 @@ -<%= render_sort_bar(true, ['title', 'title','span4', 'admin.title'], +<%= render_sort_bar(true, delete_admin_assets_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]), + ['title', 'title','span4', 'admin.title'], ['description', 'description', 'span1-2', 'admin.data'], ['intro', 'intro', 'span1-2', 'admin.file_type'], ['intro', 'intro', 'span1-2', 'admin.file_length'], diff --git a/app/views/admin/assets/index.html.erb b/app/views/admin/assets/index.html.erb index 394e18e8..38ec6b5e 100644 --- a/app/views/admin/assets/index.html.erb +++ b/app/views/admin/assets/index.html.erb @@ -1,22 +1,20 @@ -<%= form_for :assets, :url => delete_admin_assets_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]), :html => {:id => 'delete_all'}, :remote => true do %> - <%= render 'filter' %> - - - - - - - - - - - - - - <%= render :partial => 'asset', :collection => @assets %> - -
-<% end %> +<%= render 'filter' %> + + + + + + + + + + + + + + <%= render :partial => 'asset', :collection => @assets %> + +
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_admin_asset_path, :remote => true, :class => 'btn btn-primary pull-right' %> diff --git a/app/views/admin/designs/_sort_headers.html.erb b/app/views/admin/designs/_sort_headers.html.erb index 15f5481f..fb697143 100644 --- a/app/views/admin/designs/_sort_headers.html.erb +++ b/app/views/admin/designs/_sort_headers.html.erb @@ -1,3 +1,4 @@ -<%= render_sort_bar(true, ['title', 'title','span7', 'admin.title'], +<%= render_sort_bar(true, delete_admin_designs_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), + ['title', 'title','span7', 'admin.title'], ['author', 'author', 'span2', 'admin.author'], ['intro', 'intro', 'span2', 'admin.intro']).html_safe %> diff --git a/app/views/admin/designs/index.html.erb b/app/views/admin/designs/index.html.erb index 968b1914..a25b6d7f 100644 --- a/app/views/admin/designs/index.html.erb +++ b/app/views/admin/designs/index.html.erb @@ -2,12 +2,10 @@ <%= render 'admin/sites/side_bar' %> <% end %> -<%= form_for :news_bulletins, :url => delete_admin_designs_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), :html => {:id => 'delete_all'}, :remote => true do %> - <%= render 'filter' %> - - <%= render 'designs' %> -
-<% end %> +<%= render 'filter' %> + + <%= render 'designs' %> +
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_admin_design_path, :class => 'btn btn-primary' %> diff --git a/config/routes.rb b/config/routes.rb index 91a28d60..6f5dbd92 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -17,7 +17,7 @@ Orbit::Application.routes.draw do resources :assets do collection do get 'file_upload' - post 'delete' + get 'delete' end end resources :asset_categories @@ -53,7 +53,7 @@ Orbit::Application.routes.draw do resources :designs do collection do get 'upload_package' - post 'delete' + get 'delete' post 'upload_package' end member do diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index 60784f05..5018b264 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -292,8 +292,8 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController end def delete - if params[:to_delete] - bulletins = Bulletin.any_in(:_id => params[:to_delete]).delete_all + if params[:ids] + bulletins = Bulletin.any_in(:_id => params[:ids]).delete_all end redirect_to panel_announcement_back_end_bulletins_url(:filter => params[:filter], :direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) end diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb index f0d41dea..59606c64 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb @@ -1,4 +1,5 @@ -<%= render_sort_bar(true, ['status', ['is_top', 'is_hot', 'is_hidden', 'is_pending', 'is_checked', 'is_rejected'], 'span1-2', 'bulletin.status'], +<%= render_sort_bar(true, delete_panel_announcement_back_end_bulletins_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]), + ['status', ['is_top', 'is_hot', 'is_hidden', 'is_pending', 'is_checked', 'is_rejected'], 'span1-2', 'bulletin.status'], ['category', 'bulletin_category', 'span1-2', 'bulletin.category'], ['title', 'title','span7', 'bulletin.title'], ['start_date', 'postdate', 'span1-2', 'bulletin.start_date'], diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb index 51dd07b7..c5a367fc 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb @@ -1,9 +1,7 @@ -<%= form_for :bulletins, :url => delete_panel_announcement_back_end_bulletins_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]), :html => {:id => 'delete_all'}, :remote => true do %> - <%= render 'filter' %> - - <%= render 'bulletins' %> -
-<% end %> +<%= render 'filter' %> + + <%= render 'bulletins' %> +
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary pull-right' %> diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb index 0640a1f0..b2d8d161 100644 --- a/vendor/built_in_modules/announcement/config/routes.rb +++ b/vendor/built_in_modules/announcement/config/routes.rb @@ -15,7 +15,7 @@ Rails.application.routes.draw do get 'load_quick_edit' end collection do - post 'delete' + get 'delete' end match "file_quick_add/:bulletin_id" => "bulletins#file_quick_add" ,:as => :file_quick_add match "file_quick_edit/:bulletin_id" => "bulletins#file_quick_edit" ,:as => :file_quick_edit diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb index fa08cac1..a0765e55 100644 --- a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb +++ b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb @@ -329,8 +329,8 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController end def delete - if params[:to_delete] - news_bulletins = NewsBulletin.any_in(:_id => params[:to_delete]).delete_all + if params[:ids] + news_bulletins = NewsBulletin.any_in(:_id => params[:ids]).delete_all end redirect_to panel_news_back_end_news_bulletins_url(:filter => params[:filter], :direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) end diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_sort_headers.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_sort_headers.html.erb index d91134b6..66d3269b 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_sort_headers.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_sort_headers.html.erb @@ -1,4 +1,5 @@ -<%= render_sort_bar(true, ['status', ['is_top', 'is_hot', 'is_hidden', 'is_pending', 'is_checked', 'is_rejected'], 'span1-2', 'news_bulletin.status'], +<%= render_sort_bar(true, delete_panel_news_back_end_news_bulletins_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]), + ['status', ['is_top', 'is_hot', 'is_hidden', 'is_pending', 'is_checked', 'is_rejected'], 'span1-2', 'news_bulletin.status'], ['category', 'news_bulletin_category', 'span1-2', 'news_bulletin.category'], ['title', 'title','span7', 'news_bulletin.title'], ['start_date', 'postdate', 'span1-2', 'news_bulletin.start_date'], diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb index 3f889a99..d16bb55c 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb @@ -1,9 +1,7 @@ -<%= form_for :news_bulletins, :url => delete_panel_news_back_end_news_bulletins_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]), :html => {:id => 'delete_all'}, :remote => true do %> - <%= render 'filter' %> - - <%= render 'news_bulletins' %> -
-<% end %> +<%= render 'filter' %> + + <%= render 'news_bulletins' %> +
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_news_back_end_news_bulletin_path, :class => 'btn btn-primary' %> diff --git a/vendor/built_in_modules/news/config/routes.rb b/vendor/built_in_modules/news/config/routes.rb index 701136e5..5220248c 100644 --- a/vendor/built_in_modules/news/config/routes.rb +++ b/vendor/built_in_modules/news/config/routes.rb @@ -15,7 +15,7 @@ Rails.application.routes.draw do get 'load_quick_edit' end collection do - post 'delete' + get 'delete' end match "file_quick_add/:news_bulletin_id" => "news_bulletins#file_quick_add" ,:as => :file_quick_add match "file_quick_edit/:news_bulletin_id" => "news_bulletins#file_quick_edit" ,:as => :file_quick_edit diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_sort_headers.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_sort_headers.html.erb index 7a37d4a7..0c15e3e1 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_sort_headers.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_sort_headers.html.erb @@ -1,4 +1,4 @@ -<%= render_sort_bar(false, ['name', 'page','span7', 'page_context.name'], +<%= render_sort_bar(false, nil, ['name', 'page','span7', 'page_context.name'], ['version', 'version', 'span2', 'page_context.version'], ['update_time', 'updated_at', 'span2', 'page_context.update_time'], ['last_modified', 'update_user_id', 'span2', 'page_context.last_modified']).html_safe %> diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb index ef96e7d3..1f2263d3 100644 --- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb +++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb @@ -124,8 +124,8 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController end def delete - if params[:to_delete] - web_links = WebLink.any_in(:_id => params[:to_delete]).delete_all + if params[:ids] + web_links = WebLink.any_in(:_id => params[:ids]).delete_all end redirect_to panel_web_resource_back_end_web_links_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) end diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_sort_headers.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_sort_headers.html.erb index a53e38bd..4d3bc2d3 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_sort_headers.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_sort_headers.html.erb @@ -1,4 +1,5 @@ -<%= render_sort_bar(true, ['status', ['is_top', 'is_hot', 'is_hidden', 'is_pending', 'is_checked', 'is_rejected'], 'span1', 'bulletin.status'], +<%= render_sort_bar(true, delete_panel_web_resource_back_end_web_links_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), + ['status', ['is_top', 'is_hot', 'is_hidden', 'is_pending', 'is_checked', 'is_rejected'], 'span1', 'bulletin.status'], ['category', 'bulletin_category', 'span2', 'bulletin.category'], ['title', 'title','span3', 'bulletin.title'], ['tags', 'tags', 'span2', 'bulletin.tags']).html_safe %> \ No newline at end of file diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb index 8a300f7a..d8215e9d 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb @@ -1,20 +1,18 @@ -<%= form_for :news_bulletins, :url => delete_panel_web_resource_back_end_web_links_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), :html => {:id => 'delete_all'}, :remote => true do %> - <%= render 'filter' %> - - - - - - - - - - - - <%= render :partial => 'web_link', :collection => @web_links %> - -
-<% end %> +<%= render 'filter' %> + + + + + + + + + + + + <%= render :partial => 'web_link', :collection => @web_links %> + +
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_web_resource_back_end_web_link_path, :class => 'btn btn-primary pull-right' %> diff --git a/vendor/built_in_modules/web_resource/config/routes.rb b/vendor/built_in_modules/web_resource/config/routes.rb index 02c81a82..d585c6b3 100644 --- a/vendor/built_in_modules/web_resource/config/routes.rb +++ b/vendor/built_in_modules/web_resource/config/routes.rb @@ -6,7 +6,7 @@ Rails.application.routes.draw do root :to => "web_links#index" resources :web_links do collection do - post 'delete' + get 'delete' end end resources :web_link_categorys From ffa49fd0926dd997995acfce5b04b2820084177e Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 13 Aug 2012 18:31:50 +0800 Subject: [PATCH 5/7] form validation --- app/assets/javascripts/ajax_form.js | 59 ++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/ajax_form.js b/app/assets/javascripts/ajax_form.js index 35834c96..f627ac85 100644 --- a/app/assets/javascripts/ajax_form.js +++ b/app/assets/javascripts/ajax_form.js @@ -23,17 +23,29 @@ $(document).on('click', '#ajax_form_submit', function(){ // dataType: 'script', dataType: 'html', url:$("#ajaxForm").attr("action"), + beforeSubmit: function(){ + var sub = true; + $("span.error").remove(); + $("#ajaxForm input").each(function(){ + if($(this).val() == ""){ + $("Cannot be empty.").insertAfter($(this)); + sub = false; + } + }) + if(!sub) + return false; + }, success: function(response,status,xhr){ if(typeof tinyMCEPopup != "undefined"){ - var x = response.split("#"); + var x = response.split("#"); var returnurl = x[0], - returntitle = x[1], - returndescription = x[2]; - var win = tinyMCEPopup.getWindowArg("window"); - win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = returnurl; - win.document.getElementById(tinyMCEPopup.getWindowArg("alt")).value = returndescription; - win.document.getElementById(tinyMCEPopup.getWindowArg("title")).value = returntitle; - if (typeof(win.ImageDialog) != "undefined") { + returntitle = x[1], + returndescription = x[2]; + var win = tinyMCEPopup.getWindowArg("window"); + win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = returnurl; + win.document.getElementById(tinyMCEPopup.getWindowArg("alt")).value = returndescription; + win.document.getElementById(tinyMCEPopup.getWindowArg("title")).value = returntitle; + if (typeof(win.ImageDialog) != "undefined") { // we are, so update image dimensions... if (win.ImageDialog.getImageData) win.ImageDialog.getImageData(); @@ -41,22 +53,41 @@ $(document).on('click', '#ajax_form_submit', function(){ // ... and preview if necessary if (win.ImageDialog.showPreviewImage) win.ImageDialog.showPreviewImage(returnurl); - } - tinyMCEPopup.close(); + } + tinyMCEPopup.close(); }else{ //incase if we want to do something for quick edit file upload - // $("#modal-file").modal('hide'); + // var modalvalues = ""; // var r = ""; // if(rcom.getInternetExplorerVersion() > -1){ // r = "" + response + ""; - // r = r.replace(""); + // r = r.replace("**",""); // r = $(r); + // modalvalues = r.find("span").attr("data-content").split("#"); // r.attr("id",r.find("span").attr("for")); - // alert(r.html()) + // var table=document.getElementById(modalvalues[0]); + // //var tbody = table.getElementsByTagName("tbody"); + // var row = table.insertRow(table.rows.length-1); + // var c1 = row.insertCell(0), + // c2 = row.insertCell(1), + // c3 = row.insertCell(2); + // c1.innerHTML = r.find("td").eq(0).html(); + // c2.innerHTML = r.find("td").eq(1).html(); + // c3.innerHTML = r.find("td").eq(2).html(); + // var trow = $("#bulletin_files tfoot").find("tr").eq(0); + // $("#bulletin_files tbody").append(trow); // }else{ + + // response = response.replace("**",""); + // response = response.replace("**",""); // r = $(response); + // modalvalues = r.find("span").attr("data-content").split("#"); + // $('#' + modalvalues[0]+ ' tbody').append(r); // } - // $('#bulletin_files tbody').append(r); + // console.log(modalvalues[1]); + // $("#"+modalvalues[1]).modal('hide'); + //$('#bulletin_files tbody').append(r); //$(response).fadeIn(); } }, From 9ff60d2ba4abfb7798ba4a01eab43ff889afe444 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 13 Aug 2012 18:45:02 +0800 Subject: [PATCH 6/7] form validation again --- app/assets/javascripts/ajax_form.js | 7 +++++-- app/assets/stylesheets/message.css | 4 ++++ app/views/admin/assets/file_upload.html.erb | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/ajax_form.js b/app/assets/javascripts/ajax_form.js index f627ac85..065e09fd 100644 --- a/app/assets/javascripts/ajax_form.js +++ b/app/assets/javascripts/ajax_form.js @@ -26,14 +26,17 @@ $(document).on('click', '#ajax_form_submit', function(){ beforeSubmit: function(){ var sub = true; $("span.error").remove(); + $("#dyn_error").empty(); $("#ajaxForm input").each(function(){ if($(this).val() == ""){ - $("Cannot be empty.").insertAfter($(this)); + $(" *").insertAfter($(this)); sub = false; } }) - if(!sub) + if(!sub){ + $("#dyn_error").text("Cannot be empty."); return false; + } }, success: function(response,status,xhr){ if(typeof tinyMCEPopup != "undefined"){ diff --git a/app/assets/stylesheets/message.css b/app/assets/stylesheets/message.css index 7206bd72..ffa954f1 100644 --- a/app/assets/stylesheets/message.css +++ b/app/assets/stylesheets/message.css @@ -11,3 +11,7 @@ .warning{ color:orange; } +label#dyn_error { + + margin-left: 50%; +} \ No newline at end of file diff --git a/app/views/admin/assets/file_upload.html.erb b/app/views/admin/assets/file_upload.html.erb index f1313eeb..5e19a1ad 100644 --- a/app/views/admin/assets/file_upload.html.erb +++ b/app/views/admin/assets/file_upload.html.erb @@ -9,6 +9,7 @@

<%= t 'admin.file_upload' %>

+
From ab1c457a5158465929f463f83347d63c80f57eb7 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Tue, 14 Aug 2012 01:19:27 +0800 Subject: [PATCH 7/7] Add i18n for message in editor pop-up --- app/assets/javascripts/{ajax_form.js => ajax_form.js.erb} | 2 ++ config/locales/en.yml | 1 + config/locales/zh_tw.yml | 1 + 3 files changed, 4 insertions(+) rename app/assets/javascripts/{ajax_form.js => ajax_form.js.erb} (97%) diff --git a/app/assets/javascripts/ajax_form.js b/app/assets/javascripts/ajax_form.js.erb similarity index 97% rename from app/assets/javascripts/ajax_form.js rename to app/assets/javascripts/ajax_form.js.erb index 065e09fd..917c352d 100644 --- a/app/assets/javascripts/ajax_form.js +++ b/app/assets/javascripts/ajax_form.js.erb @@ -1,3 +1,4 @@ +<%#= encoding: utf-8 %> $(document).on('click', '#ajax_form_submit', function(){ // $('#ajaxForm').ajaxSubmit({ // beforeSubmit: function(a,f,o) { @@ -35,6 +36,7 @@ $(document).on('click', '#ajax_form_submit', function(){ }) if(!sub){ $("#dyn_error").text("Cannot be empty."); + $("#dyn_error").text("<%= I18n.t('cant_empty_star') %>"); return false; } }, diff --git a/config/locales/en.yml b/config/locales/en.yml index 68222292..e2d199d4 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -11,6 +11,7 @@ en: back: Back browse: Browse cancel: Cancel + cant_empty_star: Cannot be empty (*) create_fail: Creation failed create: Create delete: Delete diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 443eb35d..08e4aebb 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -8,6 +8,7 @@ zh_tw: back: 回上一步 browse: 選擇檔案 cancel: 取消 + cant_empty_star: 不能為空 (*) create: 新增 create_fail: 創建失敗 delete: 刪除