diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 743e49b..2246e35 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -8,7 +8,8 @@ %meta(name='copyright' content='Copyright 2011 J.Infield, all rights reserved') != stylesheet_links %script(src='javascripts/jquery.min.js') - = yield :head + %script(src='javascripts/jquery.ugallery-min.js') + %script(src='javascripts/application.js') %body #container #header @@ -23,6 +24,7 @@ %ul#nav %li %a(href='/')>Home + %a(href='/soon')>Soon #content = yield / id='content' diff --git a/app/views/pages/home.html.haml b/app/views/pages/home.html.haml index 380a4c6..16672e4 100644 --- a/app/views/pages/home.html.haml +++ b/app/views/pages/home.html.haml @@ -1,19 +1,3 @@ -- content_for :head do - %script(src='javascripts/jquery.ugallery-min.js') - %script - :plain - $(document).ready(function() { - $("#gallery").ugallery({ - play_btn : "images/play.png", - stop_btn : "images/stop.png", - forward_btn : "images/right.gif", - backward_btn : "images/left.gif", - controls_vpos : 100, - fade_duration : 300, - autostart : true - }); - }); - #main :customtextile h1. Welcome to Air-one Services diff --git a/config/routes.rb b/config/routes.rb index 36e76a3..12e0f22 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,8 @@ Aironeac::Application.routes.draw do match '/home' => 'pages#home' + match '/soon' => 'pages#soon' - root :to => 'pages#soon' + root :to => 'pages#home' # The priority is based upon order of creation: # first created -> highest priority. diff --git a/public/images/left.gif b/public/images/left.gif index b8158b4..dfbc334 100644 Binary files a/public/images/left.gif and b/public/images/left.gif differ diff --git a/public/images/office.png b/public/images/office.png index 9c38ef2..7ed5bcc 100644 Binary files a/public/images/office.png and b/public/images/office.png differ diff --git a/public/images/play.png b/public/images/play.png index c0d7d39..883e167 100644 Binary files a/public/images/play.png and b/public/images/play.png differ diff --git a/public/images/right.gif b/public/images/right.gif index d654683..7253286 100644 Binary files a/public/images/right.gif and b/public/images/right.gif differ diff --git a/public/images/sprinter.1.png b/public/images/sprinter.1.png index dadce0b..b3609a7 100644 Binary files a/public/images/sprinter.1.png and b/public/images/sprinter.1.png differ diff --git a/public/images/sprinter.2.png b/public/images/sprinter.2.png index c823be1..76d95e3 100644 Binary files a/public/images/sprinter.2.png and b/public/images/sprinter.2.png differ diff --git a/public/images/sprinter.3.png b/public/images/sprinter.3.png index 1e2e46b..d69db6b 100644 Binary files a/public/images/sprinter.3.png and b/public/images/sprinter.3.png differ diff --git a/public/images/stop.png b/public/images/stop.png index f3655e8..3118f51 100644 Binary files a/public/images/stop.png and b/public/images/stop.png differ diff --git a/public/images/vans.png b/public/images/vans.png index 69098f2..2ff2df0 100644 Binary files a/public/images/vans.png and b/public/images/vans.png differ diff --git a/public/javascripts/application.js b/public/javascripts/application.js index e69de29..70b16dc 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -0,0 +1,13 @@ +$(document).ready(function() { + $("#gallery").ugallery({ + play_btn : "images/play.png", + stop_btn : "images/stop.png", + forward_btn : "images/right.gif", + backward_btn : "images/left.gif", + controls_vpos : 83, + controls_fade_from : 0.6, + controls_fade_to : 0.9, + fade_duration : 300, + autostart : true + }); +}); diff --git a/public/stylesheets/layout.css b/public/stylesheets/layout.css index e3d87ac..6997adc 100644 --- a/public/stylesheets/layout.css +++ b/public/stylesheets/layout.css @@ -40,6 +40,13 @@ blockquote p { list-style: none; } +#gallery { + width: 42.308em; + height: 15.385em; + float: right; + margin-top: 0.077em; +} + #menu { margin: 0 auto; overflow: hidden; @@ -95,13 +102,6 @@ blockquote p { display: none; } -#gallery { - width: 42.308em; - height: 15.385em; - float: right; - padding-right: 0.154em; -} - .caps { font-size: 123%; font-variant: small-caps;