Skip to content

Commit

Permalink
more on #87 - had to update some config with gem libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
rahulbot committed Feb 25, 2013
1 parent f453b81 commit fdebdfb
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 20 deletions.
8 changes: 3 additions & 5 deletions Gemfile
Expand Up @@ -21,12 +21,12 @@ end
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'
gem 'therubyracer' # See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'less-rails'
gem 'uglifier', '>= 1.0.3'
end
gem "twitter-bootstrap-rails"
gem "jquery-rails"
gem "jquery-ui-rails"

group :development, :test do
Expand All @@ -49,8 +49,6 @@ end

# gem install imgkit

gem 'jquery-rails'

gem 'awesome_print'

gem 'devise'
Expand Down
11 changes: 11 additions & 0 deletions Gemfile.lock
Expand Up @@ -50,6 +50,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.5.0)
commonjs (0.2.6)
daemons (1.1.9)
devise (2.2.3)
bcrypt-ruby (~> 3.0)
Expand Down Expand Up @@ -92,6 +93,12 @@ GEM
json (1.7.7)
launchy (2.2.0)
addressable (~> 2.3)
less (2.2.2)
commonjs (~> 0.2.6)
less-rails (2.2.6)
actionpack (>= 3.1)
less (~> 2.2.0)
libv8 (3.3.10.4)
listen (0.7.3)
lumberjack (1.0.2)
mail (2.4.4)
Expand Down Expand Up @@ -168,6 +175,8 @@ GEM
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7)
terminal-table (1.4.5)
therubyracer (0.10.2)
libv8 (~> 3.3.10)
thin (1.5.0)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
Expand Down Expand Up @@ -206,11 +215,13 @@ DEPENDENCIES
jquery-rails
jquery-ui-rails
launchy
less-rails
pg
rails (= 3.2.11)
rspec-rails
sass-rails (~> 3.2.3)
sqlite3
therubyracer
thin
twitter-bootstrap-rails
uglifier (>= 1.0.3)
30 changes: 15 additions & 15 deletions app/assets/javascripts/application.js
Expand Up @@ -36,21 +36,21 @@
//= require jquery.ui.datepicker-en-AU
// require jquery.ui.progressbar

// require jquery.effects.all
//= require jquery.effects.core
// require jquery.effects.blind
// require jquery.effects.bounce
// require jquery.effects.clip
// require jquery.effects.drop
// require jquery.effects.explode
// require jquery.effects.fade
// require jquery.effects.fold
// require jquery.effects.highlight
// require jquery.effects.pulsate
// require jquery.effects.scale
// require jquery.effects.shake
// require jquery.effects.slide
// require jquery.effects.transfer
// require jquery.ui.effect.all
//= require jquery.ui.effect
// require jquery.ui.effect-blind
// require jquery.ui.effect-bounce
// require jquery.ui.effect-clip
// require jquery.ui.effect-drop
// require jquery.ui.effect-explode
// require jquery.ui.effect-fade
// require jquery.ui.effect-fold
// require jquery.ui.effect-highlight
// require jquery.ui.effect-pulsate
// require jquery.ui.effect-scale
// require jquery.ui.effect-shake
// require jquery.ui.effect-slide
// require jquery.ui.effect-transfer

//= require twitter/bootstrap/bootstrap-transition
//= require twitter/bootstrap/bootstrap-alert
Expand Down
17 changes: 17 additions & 0 deletions config/locales/en.bootstrap.yml
@@ -0,0 +1,17 @@
# Sample localization file for English. Add more files in this directory for other locales.
# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.

en:
helpers:
actions: "Actions"
links:
back: "Back"
cancel: "Cancel"
confirm: "Are you sure?"
destroy: "Delete"
new: "New"
titles:
edit: "Edit"
save: "Save"
new: "New"
delete: "Delete"

4 comments on commit fdebdfb

@numeroteca
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this rails update (updates to rails 3.2.11 at f453b81) breaks several things. Among others:
-not displaying drop down menus while creating thread
-not able to code (draw rectangles on an image)
-not displaying the data visualization, css not properly working, etc

@rahulbot
Copy link
Collaborator Author

@rahulbot rahulbot commented on fdebdfb Feb 26, 2013 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rahulbot
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pushed some fixes - still not sure why the Google visualization library isn't loading - the url works fine if I fetch it by hand in another window, but sits there not loading forever when I look at the Firebug Net log on our show thread page.

@numeroteca
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested your changes and now it seems that everything works fine (bar chart and url included) except css visualization problems:

  • alignment of the bar chart
  • colors and sizes in top menu

Please sign in to comment.