diff --git a/Gemfile b/Gemfile index 4996dfc6..23dfdcc6 100644 --- a/Gemfile +++ b/Gemfile @@ -22,14 +22,12 @@ end gem 'paperclip', '~> 3.0' gem 'jquery-rails' -gem 'jquery_datepicker' gem 'jquery-fileupload-rails' gem 'devise' gem 'cancan' gem "haml" gem 'bcrypt-ruby', '~> 3.0.0' gem 'node' -gem 'twitter-bootstrap-rails' gem 'paper_trail' gem 'formtastic-bootstrap' gem 'cocoon' diff --git a/Gemfile.lock b/Gemfile.lock index 216098db..d9eb6af0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,7 +74,6 @@ GEM jquery-rails (2.1.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - jquery_datepicker (0.4) json (1.7.6) mail (2.4.4) i18n (>= 0.4.0) @@ -151,10 +150,6 @@ GEM polyglot polyglot (>= 0.3.1) ttfunk (1.0.3) - twitter-bootstrap-rails (2.2.0) - actionpack (>= 3.1) - execjs - railties (>= 3.1) tzinfo (0.3.35) uglifier (1.3.0) execjs (>= 0.3.0) @@ -176,7 +171,6 @@ DEPENDENCIES haml jquery-fileupload-rails jquery-rails - jquery_datepicker node paper_trail paperclip (~> 3.0) @@ -186,5 +180,4 @@ DEPENDENCIES sass-rails (~> 3.2.3) sqlite3 transitions - twitter-bootstrap-rails uglifier (>= 1.0.3) diff --git a/app/assets/images/ui-bg_flat_0_aaaaaa_40x100.png b/app/assets/images/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from app/assets/images/ui-bg_flat_0_aaaaaa_40x100.png rename to app/assets/images/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/app/assets/images/ui-bg_flat_55_fbec88_40x100.png b/app/assets/images/images/ui-bg_flat_55_fbec88_40x100.png similarity index 100% rename from app/assets/images/ui-bg_flat_55_fbec88_40x100.png rename to app/assets/images/images/ui-bg_flat_55_fbec88_40x100.png diff --git a/app/assets/images/ui-bg_glass_75_d0e5f5_1x400.png b/app/assets/images/images/ui-bg_glass_75_d0e5f5_1x400.png similarity index 100% rename from app/assets/images/ui-bg_glass_75_d0e5f5_1x400.png rename to app/assets/images/images/ui-bg_glass_75_d0e5f5_1x400.png diff --git a/app/assets/images/ui-bg_glass_85_dfeffc_1x400.png b/app/assets/images/images/ui-bg_glass_85_dfeffc_1x400.png similarity index 100% rename from app/assets/images/ui-bg_glass_85_dfeffc_1x400.png rename to app/assets/images/images/ui-bg_glass_85_dfeffc_1x400.png diff --git a/app/assets/images/ui-bg_glass_95_fef1ec_1x400.png b/app/assets/images/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from app/assets/images/ui-bg_glass_95_fef1ec_1x400.png rename to app/assets/images/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/app/assets/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png b/app/assets/images/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png similarity index 100% rename from app/assets/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png rename to app/assets/images/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png diff --git a/app/assets/images/ui-bg_inset-hard_100_f5f8f9_1x100.png b/app/assets/images/images/ui-bg_inset-hard_100_f5f8f9_1x100.png similarity index 100% rename from app/assets/images/ui-bg_inset-hard_100_f5f8f9_1x100.png rename to app/assets/images/images/ui-bg_inset-hard_100_f5f8f9_1x100.png diff --git a/app/assets/images/ui-bg_inset-hard_100_fcfdfd_1x100.png b/app/assets/images/images/ui-bg_inset-hard_100_fcfdfd_1x100.png similarity index 100% rename from app/assets/images/ui-bg_inset-hard_100_fcfdfd_1x100.png rename to app/assets/images/images/ui-bg_inset-hard_100_fcfdfd_1x100.png diff --git a/app/assets/images/ui-icons_217bc0_256x240.png b/app/assets/images/images/ui-icons_217bc0_256x240.png similarity index 100% rename from app/assets/images/ui-icons_217bc0_256x240.png rename to app/assets/images/images/ui-icons_217bc0_256x240.png diff --git a/app/assets/images/ui-icons_2e83ff_256x240.png b/app/assets/images/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from app/assets/images/ui-icons_2e83ff_256x240.png rename to app/assets/images/images/ui-icons_2e83ff_256x240.png diff --git a/app/assets/images/ui-icons_469bdd_256x240.png b/app/assets/images/images/ui-icons_469bdd_256x240.png similarity index 100% rename from app/assets/images/ui-icons_469bdd_256x240.png rename to app/assets/images/images/ui-icons_469bdd_256x240.png diff --git a/app/assets/images/ui-icons_6da8d5_256x240.png b/app/assets/images/images/ui-icons_6da8d5_256x240.png similarity index 100% rename from app/assets/images/ui-icons_6da8d5_256x240.png rename to app/assets/images/images/ui-icons_6da8d5_256x240.png diff --git a/app/assets/images/ui-icons_cd0a0a_256x240.png b/app/assets/images/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from app/assets/images/ui-icons_cd0a0a_256x240.png rename to app/assets/images/images/ui-icons_cd0a0a_256x240.png diff --git a/app/assets/images/ui-icons_d8e7f3_256x240.png b/app/assets/images/images/ui-icons_d8e7f3_256x240.png similarity index 100% rename from app/assets/images/ui-icons_d8e7f3_256x240.png rename to app/assets/images/images/ui-icons_d8e7f3_256x240.png diff --git a/app/assets/images/ui-icons_f9bd01_256x240.png b/app/assets/images/images/ui-icons_f9bd01_256x240.png similarity index 100% rename from app/assets/images/ui-icons_f9bd01_256x240.png rename to app/assets/images/images/ui-icons_f9bd01_256x240.png diff --git a/public/assets/twitter/bootstrap/glyphicons-halflings-white.png b/app/assets/images/img/glyphicons-halflings-white.png similarity index 100% rename from public/assets/twitter/bootstrap/glyphicons-halflings-white.png rename to app/assets/images/img/glyphicons-halflings-white.png diff --git a/public/assets/twitter/bootstrap/glyphicons-halflings.png b/app/assets/images/img/glyphicons-halflings.png similarity index 100% rename from public/assets/twitter/bootstrap/glyphicons-halflings.png rename to app/assets/images/img/glyphicons-halflings.png diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index fd02cdb0..3dbfef84 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,76 +14,6 @@ //= require jquery_ujs //= require jquery-ui //= require jquery-fileupload -//= require twitter/bootstrap //= require cocoon - -$(function() { - - $('.dropdown-toggle').dropdown(); - $("#conference-start-datepicker").datepicker({ - dateFormat: 'yy/mm/dd', - numberOfMonths: 2, - onSelect: function(selected) { - $("#conference-end-datepicker").datepicker("option","minDate", selected) - } - }); - $("#conference-end-datepicker").datepicker({ - dateFormat: 'yy/mm/dd', - numberOfMonths: 2, - onSelect: function(selected) { - $("#conference-start-datepicker").datepicker("option","maxDate", selected) - $("#cfp-hard-datepicker").datepicker("option","minDate", selected) - - } - }); - - $("#cfp-hard-datepicker").datepicker({ - dateFormat: 'yy/mm/dd', - numberOfMonths: 2, - onSelect: function(selected) { - $("#conference-end-datepicker").datepicker("option","maxDate", selected) - $("#conference-start-datepicker").datepicker("option","maxDate", selected) - - } - }); - - $("#conference-reg-start-datepicker").datepicker({ - dateFormat: 'yy/mm/dd', - numberOfMonths: 2, - onSelect: function(selected) { - $("#conference-reg-end-datepicker").datepicker("option","minDate", selected) - } - }); - $("#conference-reg-end-datepicker").datepicker({ - dateFormat: 'yy/mm/dd', - numberOfMonths: 2, - onSelect: function(selected) { - $("#conference-reg-start-datepicker").datepicker("option","maxDate", selected) - } - }); - - $(".comment-reply-link").click(function(){ - $(".comment-reply", $(this).parent()).toggle(); - return false; - }); - - $("#event-comment-link").click(function(){ - $("#comments-div").toggle(); - return false; - }); - - $(".comment-reply").hide(); - $(".user-details-popover").popover(); - $("#comments-div").hide(); -}); - -function word_count(text, divId){ - var r = 0; - var input = text.value.replace(/\s/g,' '); - var word_array = input.split(' '); - for (var i=0; i < word_array.length; i++) { - if (word_array[i].length > 0) r++; - } - - $('#' + divId).text(r); -} \ No newline at end of file +//= require bootstrap.min +//= require osem diff --git a/app/assets/javascripts/bootstrap.min.js b/app/assets/javascripts/bootstrap.min.js new file mode 100644 index 00000000..e4679604 --- /dev/null +++ b/app/assets/javascripts/bootstrap.min.js @@ -0,0 +1,7 @@ +/** +* Bootstrap.js by @fat & @mdo +* plugins: bootstrap-transition.js, bootstrap-modal.js, bootstrap-dropdown.js, bootstrap-scrollspy.js, bootstrap-tab.js, bootstrap-tooltip.js, bootstrap-popover.js, bootstrap-affix.js, bootstrap-alert.js, bootstrap-button.js, bootstrap-collapse.js, bootstrap-carousel.js, bootstrap-typeahead.js +* Copyright 2012 Twitter, Inc. +* http://www.apache.org/licenses/LICENSE-2.0.txt +*/ +!function(a){a(function(){a.support.transition=function(){var a=function(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},c;for(c in b)if(a.style[c]!==undefined)return b[c]}();return a&&{end:a}}()})}(window.jQuery),!function(a){var b=function(b,c){this.options=c,this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this,c=a.Event("show");this.$element.trigger(c);if(this.isShown||c.isDefaultPrevented())return;this.isShown=!0,this.escape(),this.backdrop(function(){var c=a.support.transition&&b.$element.hasClass("fade");b.$element.parent().length||b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in").attr("aria-hidden",!1),b.enforceFocus(),c?b.$element.one(a.support.transition.end,function(){b.$element.focus().trigger("shown")}):b.$element.focus().trigger("shown")})},hide:function(b){b&&b.preventDefault();var c=this;b=a.Event("hide"),this.$element.trigger(b);if(!this.isShown||b.isDefaultPrevented())return;this.isShown=!1,this.escape(),a(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),a.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var b=this;a(document).on("focusin.modal",function(a){b.$element[0]!==a.target&&!b.$element.has(a.target).length&&b.$element.focus()})},escape:function(){var a=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(b){b.which==27&&a.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),b.hideModal()},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),b.hideModal()})},hideModal:function(a){this.$element.hide().trigger("hidden"),this.backdrop()},removeBackdrop:function(){this.$backdrop.remove(),this.$backdrop=null},backdrop:function(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('