Permalink
Browse files

changes to galleria to work with Rails 3

  • Loading branch information...
1 parent 1dc23ba commit 19ea6de6a5bea72d0650a5d4fb72624a5ccd5d03 @zaiste zaiste committed Mar 22, 2012
View
@@ -7,4 +7,3 @@ tmp/
test
spec
doc
-public/assets/*
View
22 Gemfile
@@ -5,10 +5,7 @@ if RUBY_VERSION =~ /1.9/
Encoding.default_internal = Encoding::UTF_8
end
-gem 'rails', '3.1.1'
-
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
+gem 'rails', '3.2'
gem 'heroku'
gem 'therubyracer'
@@ -29,23 +26,10 @@ group :development, :test do
end
group :assets do
- gem 'sass-rails', '~> 3.1.4'
- gem 'coffee-rails', '~> 3.1.1'
+ gem 'sass-rails', '>= 3.1.4'
+ gem 'coffee-rails', '>= 3.1.1'
gem 'uglifier', '>= 1.0.3'
gem 'twitter-bootstrap-rails'
end
gem 'jquery-rails'
-
-# To use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
-
-# Use unicorn as the web server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'
-
View
@@ -1,123 +1,119 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.1)
- actionpack (= 3.1.1)
- mail (~> 2.3.0)
- actionpack (3.1.1)
- activemodel (= 3.1.1)
- activesupport (= 3.1.1)
+ actionmailer (3.2.0)
+ actionpack (= 3.2.0)
+ mail (~> 2.4.0)
+ actionpack (3.2.0)
+ activemodel (= 3.2.0)
+ activesupport (= 3.2.0)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.2)
+ journey (~> 1.0.0)
+ rack (~> 1.4.0)
rack-cache (~> 1.1)
- rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.2)
- activemodel (3.1.1)
- activesupport (= 3.1.1)
+ sprockets (~> 2.1.2)
+ activemodel (3.2.0)
+ activesupport (= 3.2.0)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.1)
- activemodel (= 3.1.1)
- activesupport (= 3.1.1)
- arel (~> 2.2.1)
+ activerecord (3.2.0)
+ activemodel (= 3.2.0)
+ activesupport (= 3.2.0)
+ arel (~> 3.0.0)
tzinfo (~> 0.3.29)
- activeresource (3.1.1)
- activemodel (= 3.1.1)
- activesupport (= 3.1.1)
- activesupport (3.1.1)
+ activeresource (3.2.0)
+ activemodel (= 3.2.0)
+ activesupport (= 3.2.0)
+ activesupport (3.2.0)
+ i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.2.6)
- arel (2.2.1)
+ addressable (2.2.7)
+ arel (3.0.2)
builder (3.0.0)
- coffee-rails (3.1.1)
+ coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
- railties (~> 3.1.0)
+ railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.3)
- commonjs (0.2.0)
- therubyracer (~> 0.9.9)
- daemons (1.1.4)
- dalli (1.1.4)
+ coffee-script-source (1.2.0)
+ commonjs (0.2.5)
+ daemons (1.1.8)
+ dalli (1.1.5)
erubis (2.7.0)
eventmachine (0.12.10)
- execjs (1.2.9)
+ execjs (1.3.0)
multi_json (~> 1.0)
- heroku (2.14.0)
+ heroku (2.21.3)
launchy (>= 0.3.2)
+ netrc (~> 0.7.1)
rest-client (~> 1.6.1)
rubyzip
- term-ansicolor (~> 1.0.5)
hike (1.2.1)
i18n (0.6.0)
- jquery-rails (1.0.18)
- railties (~> 3.0)
+ journey (1.0.3)
+ jquery-rails (2.0.1)
+ railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
- json (1.6.1)
- launchy (2.0.5)
+ json (1.6.5)
+ launchy (2.1.0)
addressable (~> 2.2.6)
- less (2.0.9)
+ less (2.0.11)
commonjs (~> 0.2.0)
therubyracer (~> 0.9.9)
- less-rails (2.1.6)
+ less-rails (2.1.8)
actionpack (>= 3.1)
less (~> 2.0.7)
libv8 (3.3.10.4)
- mail (2.3.0)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.17.2)
- multi_json (1.0.3)
- mysql2 (0.3.10)
- pg (0.11.0)
+ mime-types (1.18)
+ multi_json (1.1.0)
+ mysql2 (0.3.11)
+ netrc (0.7.1)
+ pg (0.13.2)
polyglot (0.3.3)
- rack (1.3.5)
- rack-cache (1.1)
+ rack (1.4.1)
+ rack-cache (1.2)
rack (>= 0.4)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.1)
- actionmailer (= 3.1.1)
- actionpack (= 3.1.1)
- activerecord (= 3.1.1)
- activeresource (= 3.1.1)
- activesupport (= 3.1.1)
+ rails (3.2.0)
+ actionmailer (= 3.2.0)
+ actionpack (= 3.2.0)
+ activerecord (= 3.2.0)
+ activeresource (= 3.2.0)
+ activesupport (= 3.2.0)
bundler (~> 1.0)
- railties (= 3.1.1)
- railties (3.1.1)
- actionpack (= 3.1.1)
- activesupport (= 3.1.1)
+ railties (= 3.2.0)
+ railties (3.2.0)
+ actionpack (= 3.2.0)
+ activesupport (= 3.2.0)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
- rdoc (3.11)
+ rdoc (3.12)
json (~> 1.4)
rest-client (1.6.7)
mime-types (>= 1.16)
- rubyzip (0.9.4)
- sass (3.1.10)
- sass-rails (3.1.5)
- actionpack (~> 3.1.0)
- railties (~> 3.1.0)
- sass (~> 3.1.10)
- tilt (~> 1.3.2)
- sprockets (2.0.3)
+ rubyzip (0.9.6.1)
+ sass (3.1.15)
+ sass-rails (3.2.5)
+ railties (~> 3.2.0)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
+ sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- term-ansicolor (1.0.7)
- therubyracer (0.9.9)
+ therubyracer (0.9.10)
libv8 (~> 3.3.10)
thin (1.3.1)
daemons (>= 1.0.9)
@@ -128,28 +124,28 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- twitter-bootstrap-rails (2.0.3)
+ twitter-bootstrap-rails (2.0.4)
actionpack (>= 3.1)
- less-rails (~> 2.1.6)
+ less-rails (~> 2.1.8)
railties (>= 3.1)
- tzinfo (0.3.31)
- uglifier (1.1.0)
+ tzinfo (0.3.32)
+ uglifier (1.2.3)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
PLATFORMS
ruby
DEPENDENCIES
- coffee-rails (~> 3.1.1)
+ coffee-rails (>= 3.1.1)
dalli
execjs
heroku
jquery-rails
mysql2
pg
- rails (= 3.1.1)
- sass-rails (~> 3.1.4)
+ rails (= 3.2)
+ sass-rails (>= 3.1.4)
therubyracer
thin
twitter-bootstrap-rails
@@ -20,4 +20,10 @@ jQuery(function($) {
$('nav a[data-type=html]').on('ajax:success', function(event, data, status, xhr) {
$('#content').html(data);
});
+
+ $("#gallery").galleria({
+ width: 984,
+ height: 654,
+ autoplay: 4000
+ });
});

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -2,11 +2,9 @@
$('html').addClass('js-home');
$(document).ready(function() {
- $(".js-home nav").hide();
$('.blueberry').hide();
/* slideshow - fading in the first slide*/
$('.under').delay(3000).fadeOut(1000);
- $(".js-home nav").delay(4000).fadeIn(1500);
$('.blueberry').delay(2200).fadeIn(1500, function() { /* 2200+1800(first transition)=4000) */
$('.blueberry').blueberry({
interval: 3200,
@@ -15,10 +13,4 @@ $(document).ready(function() {
});
});
-
-
-
-/* hiding and shoving the navigation bar */
-
-
});
@@ -3,6 +3,7 @@
* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
* the top of the compiled file, but it's generally better to create a new file per style scope.
*= require_self
+ *= require galleria.classic
*= require_tree .
*/
@@ -63,7 +63,7 @@
right: 10px;
z-index: 2;
display: none;
- background: url(classic-loader.gif) no-repeat 2px 2px;
+ background: image-url("classic-loader.gif") no-repeat 2px 2px;
}
.galleria-info {
display: none;
@@ -230,6 +230,6 @@
.galleria-info-close,
.galleria-image-nav-left,
.galleria-image-nav-right {
- background-image: url(classic-map.png);
+ background-image: image-url("classic-map.png");
background-repeat: no-repeat;
}
@@ -1,16 +1,9 @@
<span id="home">
-<div id="gallery" class="span11" last>
- <%= image_tag("alex7.jpg") %>
- <%= image_tag("alex4.jpg") %>
- <%= image_tag("erika1.jpg") %>
- <%= image_tag("tiberio8.jpg") %>
- <%= image_tag("ali4.jpg") %>
-</div>
-<script type="text/javascript">
- $("#gallery").galleria({
- width: 984,
- height: 654,
- autoplay: 4000
- });
-</script>
+ <div id="gallery" class="span11" last>
+ <%= image_tag("alex7.jpg") %>
+ <%= image_tag("alex4.jpg") %>
+ <%= image_tag("erika1.jpg") %>
+ <%= image_tag("tiberio8.jpg") %>
+ <%= image_tag("ali4.jpg") %>
+ </div>
</span>
@@ -9,7 +9,6 @@
<link href='http://fonts.googleapis.com/css?family=Open+Sans:600' rel='stylesheet' type='text/css'>
<%= stylesheet_link_tag "application" %>
-
<%= javascript_include_tag "application" %>
<%= csrf_meta_tag %>
@@ -27,7 +26,6 @@
<div class="span2">
<nav>
<ul>
-
<li class="top cont-pro" style="display:block;"><span class="sub-level">PROJECTS</span>
<ul class="pro" style="display:block;">
<li><span class="sub-level" style="display:block;">FILM</span>
@@ -18,7 +18,7 @@
config.assets.compress = true
# Don't fallback to assets pipeline if a precompiled asset is missed
- config.assets.compile = false
+ config.assets.compile = true
# Generate digests for assets URLs
config.assets.digest = true

0 comments on commit 19ea6de

Please sign in to comment.