run bundle update and make it work again

This commit is contained in:
wvengen 2013-07-08 14:32:24 +02:00
parent d397132f7b
commit e9e7135639
5 changed files with 103 additions and 86 deletions

27
Gemfile
View file

@ -4,28 +4,29 @@ ruby "1.9.3"
gem "rails", '~> 3.2.9' gem "rails", '~> 3.2.9'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'therubyracer', platforms: :ruby
gem 'uglifier', '>= 1.0.3'
end
gem 'jquery-rails' gem 'jquery-rails'
gem 'bootstrap-datepicker-rails' gem 'bootstrap-datepicker-rails'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'therubyracer', platforms: :ruby
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
gem 'less-rails-bootstrap'
gem 'uglifier', '>= 1.0.3'
end
gem 'mysql2' gem 'mysql2'
gem 'prawn' gem 'prawn'
gem 'haml-rails' gem 'haml-rails'
gem 'kaminari' gem 'kaminari'
gem 'client_side_validations'
gem 'simple_form' gem 'simple_form'
gem 'client_side_validations'
gem 'client_side_validations-simple_form'
gem 'inherited_resources' gem 'inherited_resources'
gem 'localize_input', git: "git://github.com/bennibu/localize_input.git" gem 'localize_input', git: "git://github.com/bennibu/localize_input.git"
gem 'wikicloth' gem 'wikicloth'

View file

@ -49,17 +49,19 @@ GEM
activesupport (3.2.13) activesupport (3.2.13)
i18n (= 0.6.1) i18n (= 0.6.1)
multi_json (~> 1.0) multi_json (~> 1.0)
acts_as_tree (1.2.0) acts_as_tree (1.4.0)
activerecord (>= 3.0.0) activerecord (>= 3.0.0)
afm (0.2.0)
arel (3.0.2) arel (3.0.2)
better_errors (0.2.0) better_errors (0.9.0)
coderay (>= 1.0.0) coderay (>= 1.0.0)
erubis (>= 2.7.0) erubis (>= 2.6.6)
binding_of_caller (0.6.8) binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-datepicker-rails (1.1.1.1) bootstrap-datepicker-rails (1.1.1.1)
railties (>= 3.0) railties (>= 3.0)
builder (3.0.4) builder (3.0.4)
bullet (4.3.0) bullet (4.6.0)
uniform_notifier uniform_notifier
capistrano (2.13.5) capistrano (2.13.5)
highline highline
@ -69,58 +71,65 @@ GEM
net-ssh-gateway (>= 1.1.0) net-ssh-gateway (>= 1.1.0)
capistrano-ext (1.2.1) capistrano-ext (1.2.1)
capistrano (>= 1.0.0) capistrano (>= 1.0.0)
chronic (0.9.0) chronic (0.9.1)
client_side_validations (3.1.4) client_side_validations (3.2.5)
coderay (1.0.8) client_side_validations-simple_form (2.1.0)
client_side_validations (~> 3.2.5)
simple_form (~> 2.1.0)
coderay (1.0.9)
coffee-rails (3.2.2) coffee-rails (3.2.2)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (~> 3.2.0) railties (~> 3.2.0)
coffee-script (2.2.0) coffee-script (2.2.0)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.3.3) coffee-script-source (1.6.3)
commonjs (0.2.6) commonjs (0.2.6)
daemons (1.1.9) daemons (1.1.9)
debug_inspector (0.0.2)
erubis (2.7.0) erubis (2.7.0)
eventmachine (1.0.3) eventmachine (1.0.3)
exception_notification (2.6.1) exception_notification (4.0.0)
actionmailer (>= 3.0.4) actionmailer (>= 3.0.4)
activesupport (>= 3.0.4)
execjs (1.4.0) execjs (1.4.0)
multi_json (~> 1.0) multi_json (~> 1.0)
expression_parser (0.9.0) expression_parser (0.9.0)
haml (3.1.7) haml (4.0.3)
haml-rails (0.3.5) tilt
haml-rails (0.4)
actionpack (>= 3.1, < 4.1) actionpack (>= 3.1, < 4.1)
activesupport (>= 3.1, < 4.1) activesupport (>= 3.1, < 4.1)
haml (~> 3.1) haml (>= 3.1, < 4.1)
railties (>= 3.1, < 4.1) railties (>= 3.1, < 4.1)
has_scope (0.5.1) has_scope (0.5.1)
hashery (2.0.1) hashery (2.1.0)
highline (1.6.19) highline (1.6.19)
hike (1.2.1) hike (1.2.3)
i18n (0.6.1) i18n (0.6.1)
inherited_resources (1.3.1) inherited_resources (1.4.0)
has_scope (~> 0.5.0) has_scope (~> 0.5.0)
responders (~> 0.6) responders (~> 0.9)
journey (1.0.4) journey (1.0.4)
jquery-rails (2.1.3) jquery-rails (3.0.2)
railties (>= 3.1.0, < 5.0) railties (>= 3.0, < 5.0)
thor (~> 0.14) thor (>= 0.14, < 2.0)
json (1.7.7) json (1.8.0)
kaminari (0.14.1) kaminari (0.14.1)
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
less (2.2.2) less (2.3.2)
commonjs (~> 0.2.6) commonjs (~> 0.2.6)
less-rails (2.2.3) less-rails (2.3.3)
actionpack (>= 3.1) actionpack (>= 3.1)
less (~> 2.2.0) less (~> 2.3.1)
libv8 (3.3.10.4) less-rails-bootstrap (2.3.3)
mail (2.5.3) less-rails (~> 2.3.1)
i18n (>= 0.4.0) libv8 (3.11.8.17)
mail (2.5.4)
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
mailcatcher (0.5.11) mailcatcher (0.5.12)
activesupport (~> 3.0) activesupport (~> 3.0)
eventmachine (~> 1.0.0) eventmachine (~> 1.0.0)
haml (>= 3.1, < 5) haml (>= 3.1, < 5)
@ -134,21 +143,23 @@ GEM
activerecord (~> 3.1) activerecord (~> 3.1)
activesupport (~> 3.1) activesupport (~> 3.1)
polyamorous (~> 0.5.0) polyamorous (~> 0.5.0)
mime-types (1.21) mime-types (1.23)
mono_logger (1.1.0) mono_logger (1.1.0)
multi_json (1.7.3) multi_json (1.7.7)
mysql2 (0.3.11) mysql2 (0.3.11)
net-scp (1.1.1) net-scp (1.1.2)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-sftp (2.1.2) net-sftp (2.1.2)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-ssh (2.6.7) net-ssh (2.6.8)
net-ssh-gateway (1.2.0) net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
pdf-reader (1.2.0) pdf-reader (1.3.3)
Ascii85 (~> 1.0.0) Ascii85 (~> 1.0.0)
afm (~> 0.2.0)
hashery (~> 2.0) hashery (~> 2.0)
ruby-rc4 ruby-rc4
ttfunk
polyamorous (0.5.0) polyamorous (0.5.0)
activerecord (~> 3.0) activerecord (~> 3.0)
polyglot (0.3.3) polyglot (0.3.3)
@ -181,12 +192,13 @@ GEM
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0) thor (>= 0.14.6, < 2.0)
rake (10.0.3) rake (10.1.0)
rdoc (3.12.2) rdoc (3.12.2)
json (~> 1.4) json (~> 1.4)
redis (3.0.4) redis (3.0.4)
redis-namespace (1.3.0) redis-namespace (1.3.0)
redis (~> 3.0.0) redis (~> 3.0.0)
ref (1.0.5)
responders (0.9.3) responders (0.9.3)
railties (~> 3.1) railties (~> 3.1)
resque (1.24.1) resque (1.24.1)
@ -195,24 +207,25 @@ GEM
redis-namespace (~> 1.2) redis-namespace (~> 1.2)
sinatra (>= 0.9.2) sinatra (>= 0.9.2)
vegas (~> 0.1.2) vegas (~> 0.1.2)
ruby-prof (0.11.2) ruby-prof (0.13.0)
ruby-rc4 (0.1.5) ruby-rc4 (0.1.5)
sass (3.2.1) sass (3.2.9)
sass-rails (3.2.5) sass-rails (3.2.6)
railties (~> 3.2.0) railties (~> 3.2.0)
sass (>= 3.1.10) sass (>= 3.1.10)
tilt (~> 1.3) tilt (~> 1.3)
simple-navigation (3.9.0) simple-navigation (3.11.0)
activesupport (>= 2.3.2) activesupport (>= 2.3.2)
simple-navigation-bootstrap (0.0.4) simple-navigation-bootstrap (1.0.0)
railties (>= 3.1)
simple-navigation (>= 3.7.0) simple-navigation (>= 3.7.0)
simple_form (2.0.3) simple_form (2.1.0)
actionpack (~> 3.0) actionpack (~> 3.0)
activemodel (~> 3.0) activemodel (~> 3.0)
sinatra (1.3.6) sinatra (1.4.3)
rack (~> 1.4) rack (~> 1.4)
rack-protection (~> 1.3) rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.3) tilt (~> 1.3, >= 1.3.4)
skinny (0.2.3) skinny (0.2.3)
eventmachine (~> 1.0.0) eventmachine (~> 1.0.0)
thin (~> 1.5.0) thin (~> 1.5.0)
@ -221,33 +234,34 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6) sqlite3 (1.3.7)
test-unit (2.5.3) test-unit (2.5.5)
therubyracer (0.10.2) therubyracer (0.11.4)
libv8 (~> 3.3.10) libv8 (~> 3.11.8.12)
ref
thin (1.5.1) thin (1.5.1)
daemons (>= 1.0.9) daemons (>= 1.0.9)
eventmachine (>= 0.12.6) eventmachine (>= 0.12.6)
rack (>= 1.0.0) rack (>= 1.0.0)
thor (0.17.0) thor (0.18.1)
tilt (1.4.1) tilt (1.4.1)
treetop (1.4.12) treetop (1.4.14)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
ttfunk (1.0.3) ttfunk (1.0.3)
twitter-bootstrap-rails (2.1.3) twitter-bootstrap-rails (2.2.7)
actionpack (>= 3.1) actionpack (>= 3.1)
less-rails (~> 2.2.3) execjs
rails (>= 3.1)
railties (>= 3.1) railties (>= 3.1)
therubyracer (~> 0.10.2)
tzinfo (0.3.37) tzinfo (0.3.37)
uglifier (1.3.0) uglifier (2.1.1)
execjs (>= 0.3.0) execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2) multi_json (~> 1.0, >= 1.0.2)
uniform_notifier (1.1.1) uniform_notifier (1.2.0)
vegas (0.1.11) vegas (0.1.11)
rack (>= 1.0.0) rack (>= 1.0.0)
whenever (0.8.1) whenever (0.8.2)
activesupport (>= 2.3.4) activesupport (>= 2.3.4)
chronic (>= 0.6.3) chronic (>= 0.6.3)
wikicloth (0.8.0) wikicloth (0.8.0)
@ -268,6 +282,7 @@ DEPENDENCIES
capistrano (= 2.13.5) capistrano (= 2.13.5)
capistrano-ext capistrano-ext
client_side_validations client_side_validations
client_side_validations-simple_form
coffee-rails (~> 3.2.1) coffee-rails (~> 3.2.1)
daemons daemons
exception_notification exception_notification
@ -275,6 +290,7 @@ DEPENDENCIES
inherited_resources inherited_resources
jquery-rails jquery-rails
kaminari kaminari
less-rails-bootstrap
localize_input! localize_input!
mailcatcher mailcatcher
meta_search meta_search

View file

@ -1,5 +1,4 @@
//= require jquery //= require jquery
//= require jquery-ui
//= require jquery_ujs //= require jquery_ujs
//= require twitter/bootstrap //= require twitter/bootstrap
//= require jquery.tokeninput //= require jquery.tokeninput
@ -8,6 +7,7 @@
//= require bootstrap-datepicker/locales/bootstrap-datepicker.nl //= require bootstrap-datepicker/locales/bootstrap-datepicker.nl
//= require jquery.observe_field //= require jquery.observe_field
//= require rails.validations //= require rails.validations
//= require rails.validations.simple_form
//= require_self //= require_self
//= require ordering //= require ordering
@ -28,19 +28,19 @@ $.fn.extend({
$(function() { $(function() {
// Show/Hide a specific DOM element // Show/Hide a specific DOM element
$('a[data-toggle-this]').live('click', function() { $('a[data-toggle-this]').on('click', function() {
$($(this).data('toggle-this')).toggle(); $($(this).data('toggle-this')).toggle();
return false; return false;
}); });
// Remove this item from DOM // Remove this item from DOM
$('a[data-remove-this]').live('click', function() { $('a[data-remove-this]').on('click', function() {
$($(this).data('remove-this')).remove(); $($(this).data('remove-this')).remove();
return false; return false;
}); });
// Check/Uncheck a single checkbox // Check/Uncheck a single checkbox
$('[data-check-this]').live('click', function() { $('[data-check-this]').on('click', function() {
var checkbox = $($(this).data('check-this')); var checkbox = $($(this).data('check-this'));
checkbox.attr('checked', !checkbox.is(':checked')); checkbox.attr('checked', !checkbox.is(':checked'));
highlightRow(checkbox); highlightRow(checkbox);
@ -48,7 +48,7 @@ $(function() {
}); });
// Check/Uncheck all checkboxes for a specific form // Check/Uncheck all checkboxes for a specific form
$('input[data-check-all]').live('click', function() { $('input[data-check-all]').on('click', function() {
var status = $(this).is(':checked'); var status = $(this).is(':checked');
var context = $(this).data('check-all'); var context = $(this).data('check-all');
var elms = $('input[type="checkbox"]', context); var elms = $('input[type="checkbox"]', context);
@ -60,7 +60,7 @@ $(function() {
}); });
// Submit form when changing a select menu. // Submit form when changing a select menu.
$('form[data-submit-onchange] select').live('change', function() { $('form[data-submit-onchange] select').on('change', function() {
var confirmMessage = $(this).children(':selected').data('confirm'); var confirmMessage = $(this).children(':selected').data('confirm');
if (confirmMessage) { if (confirmMessage) {
if (confirm(confirmMessage)) { if (confirm(confirmMessage)) {
@ -93,7 +93,7 @@ $(function() {
}); });
// Remote paginations // Remote paginations
$('div.pagination[data-remote] a').live('click', function() { $('div.pagination[data-remote] a').on('click', function() {
$.getScript($(this).attr('href')); $.getScript($(this).attr('href'));
return false; return false;
}); });

View file

@ -10,15 +10,12 @@ body {
@iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png'); @iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png');
// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines) // Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
// Note: If you use asset_path() here, your compiled boostrap_and_overrides.css will not @fontAwesomeEotPath: asset-url('fontawesome-webfont.eot');
// have the proper paths. So for now we use the absolute path. @fontAwesomeEotPath_iefix: asset-url('fontawesome-webfont.eot?#iefix');
@fontAwesomeEotPath: '/assets/fontawesome-webfont.eot'; @fontAwesomeWoffPath: asset-url('fontawesome-webfont.woff');
@fontAwesomeWoffPath: '/assets/fontawesome-webfont.woff'; @fontAwesomeTtfPath: asset-url('fontawesome-webfont.ttf');
@fontAwesomeTtfPath: '/assets/fontawesome-webfont.ttf'; @fontAwesomeSvgPath: asset-url('fontawesome-webfont.svg#fontawesomeregular');
@fontAwesomeSvgPath: '/assets/fontawesome-webfont.svg'; @import 'fontawesome/font-awesome';
// Font Awesome
@import "fontawesome";
// Your custom LESS stylesheets goes here // Your custom LESS stylesheets goes here
// //

View file

@ -1,7 +1,10 @@
# ClientSideValidations Initializer # ClientSideValidations Initializer
require 'client_side_validations/simple_form' if defined?(::SimpleForm) # Uncomment to disable uniqueness validator, possible security issue
require 'client_side_validations/formtastic' if defined?(::Formtastic) # ClientSideValidations::Config.disabled_validators = [:uniqueness]
# Uncomment to validate number format with current I18n locale
# ClientSideValidations::Config.number_format_with_locale = true
# Uncomment the following block if you want each input field to have the validation messages attached. # Uncomment the following block if you want each input field to have the validation messages attached.
# ActionView::Base.field_error_proc = Proc.new do |html_tag, instance| # ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|