Browse Source

Update ugallery content

- resize gallery controls
  - rework image viginettes
  - move ugallery jquery to application.js
alt_logo
jimi 14 years ago
parent
commit
c58ae78acb
  1. 4
      app/views/layouts/application.html.haml
  2. 16
      app/views/pages/home.html.haml
  3. 3
      config/routes.rb
  4. BIN
      public/images/left.gif
  5. BIN
      public/images/office.png
  6. BIN
      public/images/play.png
  7. BIN
      public/images/right.gif
  8. BIN
      public/images/sprinter.1.png
  9. BIN
      public/images/sprinter.2.png
  10. BIN
      public/images/sprinter.3.png
  11. BIN
      public/images/stop.png
  12. BIN
      public/images/vans.png
  13. 13
      public/javascripts/application.js
  14. 14
      public/stylesheets/layout.css

4
app/views/layouts/application.html.haml

@ -8,7 +8,8 @@
%meta(name='copyright' content='Copyright 2011 J.Infield, all rights reserved') %meta(name='copyright' content='Copyright 2011 J.Infield, all rights reserved')
!= stylesheet_links != stylesheet_links
%script(src='javascripts/jquery.min.js') %script(src='javascripts/jquery.min.js')
= yield :head
%script(src='javascripts/jquery.ugallery-min.js')
%script(src='javascripts/application.js')
%body %body
#container #container
#header #header
@ -23,6 +24,7 @@
%ul#nav %ul#nav
%li %li
%a(href='/')>Home %a(href='/')>Home
%a(href='/soon')>Soon
#content #content
= yield = yield
/ id='content' / id='content'

16
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 #main
:customtextile :customtextile
h1. Welcome to Air-one Services h1. Welcome to Air-one Services

3
config/routes.rb

@ -1,7 +1,8 @@
Aironeac::Application.routes.draw do Aironeac::Application.routes.draw do
match '/home' => 'pages#home' match '/home' => 'pages#home'
match '/soon' => 'pages#soon'
root :to => 'pages#soon'
root :to => 'pages#home'
# The priority is based upon order of creation: # The priority is based upon order of creation:
# first created -> highest priority. # first created -> highest priority.

BIN
public/images/left.gif

Before

Width: 35  |  Height: 45  |  Size: 413 B

After

Width: 23  |  Height: 29  |  Size: 377 B

BIN
public/images/office.png

Before

Width: 550  |  Height: 200  |  Size: 210 KiB

After

Width: 550  |  Height: 200  |  Size: 212 KiB

BIN
public/images/play.png

Before

Width: 55  |  Height: 55  |  Size: 1.1 KiB

After

Width: 40  |  Height: 40  |  Size: 1.1 KiB

BIN
public/images/right.gif

Before

Width: 35  |  Height: 45  |  Size: 407 B

After

Width: 23  |  Height: 29  |  Size: 378 B

BIN
public/images/sprinter.1.png

Before

Width: 550  |  Height: 200  |  Size: 230 KiB

After

Width: 550  |  Height: 200  |  Size: 228 KiB

BIN
public/images/sprinter.2.png

Before

Width: 550  |  Height: 200  |  Size: 227 KiB

After

Width: 550  |  Height: 200  |  Size: 226 KiB

BIN
public/images/sprinter.3.png

Before

Width: 550  |  Height: 200  |  Size: 225 KiB

After

Width: 550  |  Height: 200  |  Size: 224 KiB

BIN
public/images/stop.png

Before

Width: 55  |  Height: 55  |  Size: 1021 B

After

Width: 40  |  Height: 40  |  Size: 949 B

BIN
public/images/vans.png

Before

Width: 550  |  Height: 200  |  Size: 224 KiB

After

Width: 550  |  Height: 200  |  Size: 224 KiB

13
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
});
});

14
public/stylesheets/layout.css

@ -40,6 +40,13 @@ blockquote p {
list-style: none; list-style: none;
} }
#gallery {
width: 42.308em;
height: 15.385em;
float: right;
margin-top: 0.077em;
}
#menu { #menu {
margin: 0 auto; margin: 0 auto;
overflow: hidden; overflow: hidden;
@ -95,13 +102,6 @@ blockquote p {
display: none; display: none;
} }
#gallery {
width: 42.308em;
height: 15.385em;
float: right;
padding-right: 0.154em;
}
.caps { .caps {
font-size: 123%; font-size: 123%;
font-variant: small-caps; font-variant: small-caps;