From 00e13937ba4113aeef056201099c82b5c33328ce Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Mon, 15 Jul 2013 00:31:58 +0200 Subject: [PATCH] Upgrade to new jquery ui system --- .gitignore | 1 + app/assets/images/cmtool/.DS_Store | Bin 6148 -> 0 bytes app/assets/images/cmtool/flags/.DS_Store | Bin 12292 -> 0 bytes app/assets/javascripts/cmtool/application.js | 2 +- .../cmtool/application_controller.rb | 2 +- 5 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 app/assets/images/cmtool/.DS_Store delete mode 100644 app/assets/images/cmtool/flags/.DS_Store diff --git a/.gitignore b/.gitignore index 3021b7c..4fb0863 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ log/*.log pkg/ *.swp +.DS_Store spec/dummy/db/*.sqlite3 spec/dummy/log/*.log spec/dummy/tmp/ diff --git a/app/assets/images/cmtool/.DS_Store b/app/assets/images/cmtool/.DS_Store deleted file mode 100644 index 4b4a7ab84d37f7e7f555629b8bbf0b3073175602..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOH0E*5Z>)WBP!$~^tgB~()ywY4V;V0!8F#R0z5&Lp76($kiBWut=vtEQ5++ z{-z7Ry~&OyelcI-PG`t2dfEyB5g7Xc#4-T)1+cgz23(kqa*hp8|h& zuk6gv=Bew?ROHsrCJ<5fK*|{Gk;xuLVK#ZNTgzqlwAU8hi@YtsygYA&_dx7V z>*)C8>So}-=5OzX=8pr>N)8Q{@BzlkLSDRC63b)^-m;?1BqRoi0b+m{*m4HU!C>ug zIS;gaVt^RfWB~UE0gC7tEHtXE0~)+OW4wWg0ye%S5QRaQZi=7+jZw zUzj|{V4+c$Gp=Taam>u+@zJqNPDH zAQ_MhNCqSWl7X9n0ot>9Q5Mx8b29@Go%E{ zS~4IRSjYfByC+x+YfVoFQ}fU7LD?viF=kYqJlWjR)|hPGHq)4-=JwXc zWLwkLnHiOeaaLJXx23&zz)ahCAs}Zk!rWa*#rjUXgUQW`S$?Xy9kVuBhX%L*t7mBNy0*Z5rIk z+ubxpU_ezauBfW5+tk>+eaG%OqoVSTm8&%EDDmut&LfVU9h~O$jhI2k_AJLcK9qL? zC+*q;o;hh(pix!lsw*lDtwvv0aH+;S%BV%-AM`Cgh80EVHTrr*ImYc>S(|EM);8!H zRl`&U0!l;-b+@)zH3D_uQF{EM>lUp^F)Ve^HPf~$Ok1^WigCX>lownI<0|bwMIFxg zlauuG17T~|cPYjv%ENr(17;8&nzB8b+emd(ch=~7aegB_uEVlyOHt|z&%Hj?Ae!?m zO~RtmHnNW7+|7pBILoq=>^b%lyTC57%j^n!mwm)OXWy_N*e~oi_B*@EuCYImz%rCW z$8ywQ1Mb2`v|uONu?xG=je~dqeRvQ@FotoYk%5CO0_2d#DLjRz@eE$XIlPSXcolEp z3f{xV_yS+zD}0Zi@GGv0pOz@-cYh%dfw)E(EkV+6yaW^H7twD|@4nUhZ)W{|yF#dT z^_^AgH*Rj)wqtkqbp;eX^!eh8^d7cH@ND=?WP90P0*?kw~hDcnz4j5PfLe_n_D#9SW5C1-tG5lno&af7v7!i zW91URx|0p}axY6m_09|Fv2_V{`1sNU49azfcAZ)u=-QwxA6u zbYc(oqKDLZ7y}rL6l#(_E!gld6{$4D3{K+-oWYZL7SH1>UWnBC3TgEQ1m$*7kqjNGOG(wEmg>t#h|Tq*BGt z|9cky{(tKvEHjY|NCp-#fRgV1?oKin{z55^;Aib5UE_4|!sBKIMqQ|ij^l*Uah&k_ zKMbjzq)^@`72~WxvQYWYKLo6m`~Nw}{hy?F4Ff4*nE(I) diff --git a/app/assets/javascripts/cmtool/application.js b/app/assets/javascripts/cmtool/application.js index a2ce2e1..1d6ef76 100644 --- a/app/assets/javascripts/cmtool/application.js +++ b/app/assets/javascripts/cmtool/application.js @@ -12,7 +12,7 @@ // //= require jquery //= require jquery_ujs -//= require jquery-ui +//= require jquery.ui.all //= require bootstrap //= require tinymce-jquery //= require_directory . diff --git a/app/controllers/cmtool/application_controller.rb b/app/controllers/cmtool/application_controller.rb index c8b66ef..764ebab 100644 --- a/app/controllers/cmtool/application_controller.rb +++ b/app/controllers/cmtool/application_controller.rb @@ -16,7 +16,7 @@ module Cmtool if respond_to? :authorize_cmtool, true authorize_cmtool else - render text: 'Please define authorize_cmtool in your application controller. This area needs to be secured!', status: 403 + render text: 'Please define authorize_cmtool in your application controller. This area needs to be secured!
VisitGitHub for more info', status: 403 end end