From 107fe0bce11cba3a5995ec75e203c78a59602cd3 Mon Sep 17 00:00:00 2001 From: steflewandowski Date: Sun, 23 Jan 2011 14:29:49 +0000 Subject: [PATCH] clean up and add a page --- lib/23hq.rb | 2 +- public/js/application.js | 321 ---------------------------- public/js/jquery.backstretch.min.js | 11 - public/js/script.js | 24 ++- public/js/supersized.2.0.js | 284 ------------------------ public/stylesheets/screen.css | 2 +- sass/screen.scss | 2 +- views/layout.haml | 42 +++- 8 files changed, 61 insertions(+), 627 deletions(-) delete mode 100644 public/js/application.js delete mode 100755 public/js/jquery.backstretch.min.js delete mode 100644 public/js/supersized.2.0.js diff --git a/lib/23hq.rb b/lib/23hq.rb index 0e00ec0..7eb0b92 100644 --- a/lib/23hq.rb +++ b/lib/23hq.rb @@ -9,7 +9,7 @@ def self.photos d = Dalli::Client.new p = d.get("photos") return p unless p.nil? - r = Nokogiri::XML(open("http://www.23hq.com/services/rest/?api_key=mydemo&method=people.getPublicPhotos&user_id=6421827&per_page=500&extras=url_o&username=#{ENV["TWENTY_THREE_HQ_USERNAME"]}&password=#{ENV["TWENTY_THREE_HQ_PASSWORD"]}")).css("photo").collect{|a| "http://www.23hq.com/23666/#{a.attributes["id"]}_#{a.attributes["secret"]}_large1k.jpg" } + r = Nokogiri::XML(open("http://www.23hq.com/services/rest/?api_key=mydemo&method=people.getPublicPhotos&user_id=#{ENV["TWENTY_THREE_HQ_USERID"]}&per_page=500&extras=url_o&username=#{ENV["TWENTY_THREE_HQ_USERNAME"]}&password=#{ENV["TWENTY_THREE_HQ_PASSWORD"]}")).css("photo").collect{|a| "http://www.23hq.com/23666/#{a.attributes["id"]}_#{a.attributes["secret"]}_large1k.jpg" } d.set("photos",r) r end diff --git a/public/js/application.js b/public/js/application.js deleted file mode 100644 index a932a91..0000000 --- a/public/js/application.js +++ /dev/null @@ -1,321 +0,0 @@ -$(document).ready(function(){ - //set default view mode - $defaultViewMode="fit"; //full (fullscreen background), fit (fit to window), original (no scale) - //cache vars - $bg=$("#bg"); - $bgimg=$("#bg #bgimg"); - $preloader=$("#preloader"); - $outer_container=$("#outer_container"); - $outer_container_a=$("#outer_container a.photo"); - $toolbar=$("#toolbar"); - $nextimage_tip=$("#nextimage_tip"); - -$(window).load(function() { - $toolbar.data("imageViewMode",$defaultViewMode); //default view mode - ImageViewMode($toolbar.data("imageViewMode")); - //cache vars - $customScrollBox=$("#customScrollBox"); - $customScrollBox_container=$("#customScrollBox .container"); - $customScrollBox_content=$("#customScrollBox .content"); - $dragger_container=$("#dragger_container"); - $dragger=$("#dragger"); - - CustomScroller(); - - function CustomScroller(){ - outerMargin=0; - innerMargin=20; - $customScrollBox.height($(window).height()-outerMargin); - $dragger_container.height($(window).height()-innerMargin); - visibleHeight=$(window).height()-outerMargin; - if($customScrollBox_container.height()>visibleHeight){ //custom scroll depends on content height - $dragger_container,$dragger.css("display","block"); - totalContent=$customScrollBox_content.height(); - draggerContainerHeight=$(window).height()-innerMargin; - animSpeed=400; //animation speed - easeType="easeOutCirc"; //easing type - bottomSpace=1.05; //bottom scrolling space - targY=0; - draggerHeight=$dragger.height(); - $dragger.draggable({ - axis: "y", - containment: "parent", - drag: function(event, ui) { - Scroll(); - }, - stop: function(event, ui) { - DraggerOut(); - } - }); - - //scrollbar click - $dragger_container.click(function(e) { - var mouseCoord=(e.pageY - $(this).offset().top); - var targetPos=mouseCoord+$dragger.height(); - if(targetPosdraggerContainerHeight-$dragger.height()){ - $dragger.css("top", draggerContainerHeight-$dragger.height()); - $customScrollBox_container.stop(); - Scroll(); - } - return false; - }); - }); - - function Scroll(){ - var scrollAmount=(totalContent-(visibleHeight/bottomSpace))/(draggerContainerHeight-draggerHeight); - var draggerY=$dragger.position().top; - targY=-draggerY*scrollAmount; - var thePos=$customScrollBox_container.position().top-targY; - $customScrollBox_container.stop().animate({top: "-="+thePos}, animSpeed, easeType); //with easing - } - - //dragger hover - $dragger.mouseup(function(){ - DraggerOut(); - }).mousedown(function(){ - DraggerOver(); - }); - - function DraggerOver(){ - $dragger.css("background", "url(round_custom_scrollbar_bg_over.png)"); - } - - function DraggerOut(){ - $dragger.css("background", "url(round_custom_scrollbar_bg.png)"); - } - } else { //hide custom scrollbar if content is short - $dragger,$dragger_container.css("display","none"); - } - } - - //resize browser window functions - $(window).resize(function() { - FullScreenBackground("#bgimg"); //scale bg image - $dragger.css("top",0); //reset content scroll - $customScrollBox_container.css("top",0); - $customScrollBox.unbind("mousewheel"); - CustomScroller(); - }); - - LargeImageLoad($bgimg); -}); - - //loading bg image - $bgimg.load(function() { - LargeImageLoad($(this)); - }); - - function LargeImageLoad($this){ - $preloader.fadeOut("fast"); //hide preloader - $this.removeAttr("width").removeAttr("height").css({ width: "", height: "" }); //lose all previous dimensions in order to rescale new image data - $bg.data("originalImageWidth",$this.width()).data("originalImageHeight",$this.height()); - if($bg.data("newTitle")){ - $this.attr("title",$bg.data("newTitle")); //set new image title attribute - } - FullScreenBackground($this); //scale new image - $bg.data("nextImage",$($outer_container.data("selectedThumb")).next().attr("href")); //get and store next image - if(typeof itemIndex!="undefined"){ - if(itemIndex==lastItemIndex){ //check if it is the last image - $bg.data("lastImageReached","Y"); - $bg.data("nextImage",$outer_container_a.first().attr("href")); //get and store next image - } else { - $bg.data("lastImageReached","N"); - } - } else { - $bg.data("lastImageReached","N"); - } - $this.fadeIn("slow"); //fadein background image - if($bg.data("nextImage") || $bg.data("lastImageReached")=="Y"){ //don't close thumbs pane on 1st load - SlidePanels("close"); //close the left pane - } - NextImageTip(); - } - - //slide in/out left pane - $outer_container.hover( - function(){ //mouse over - SlidePanels("open"); - }, - function(){ //mouse out - SlidePanels("close"); - } - ); - - //Clicking on thumbnail changes the background image - $outer_container_a.click(function(event){ - event.preventDefault(); - var $this=this; - $bgimg.css("display","none"); - $preloader.fadeIn("fast"); //show preloader - //style clicked thumbnail - $outer_container_a.each(function() { - $(this).children(".selected").css("display","none"); - }); - $(this).children(".selected").css("display","block"); - //get and store next image and selected thumb - $outer_container.data("selectedThumb",$this); - $bg.data("nextImage",$(this).next().attr("href")); - $bg.data("newTitle",$(this).children("img").attr("title")); //get and store new image title attribute - itemIndex=getIndex($this); //get clicked item index - lastItemIndex=($outer_container_a.length)-1; //get last item index - $bgimg.attr("src", "").attr("src", $this); //switch image - }); - - //clicking on large image loads the next one - $bgimg.click(function(event){ - var $this=$(this); - if($bg.data("nextImage")){ //if next image data is stored - $this.css("display","none"); - $preloader.fadeIn("fast"); //show preloader - $($outer_container.data("selectedThumb")).children(".selected").css("display","none"); //deselect thumb - if($bg.data("lastImageReached")!="Y"){ - $($outer_container.data("selectedThumb")).next().children(".selected").css("display","block"); //select new thumb - } else { - $outer_container_a.first().children(".selected").css("display","block"); //select new thumb - first - } - //store new selected thumb - var selThumb=$outer_container.data("selectedThumb"); - if($bg.data("lastImageReached")!="Y"){ - $outer_container.data("selectedThumb",$(selThumb).next()); - } else { - $outer_container.data("selectedThumb",$outer_container_a.first()); - } - $bg.data("newTitle",$($outer_container.data("selectedThumb")).children("img").attr("title")); //get and store new image title attribute - if($bg.data("lastImageReached")!="Y"){ - itemIndex++; - } else { - itemIndex=0; - } - $this.attr("src", "").attr("src", $bg.data("nextImage")); //switch image - } - }); - - //function to get element index (fuck you IE!) - function getIndex(theItem){ - for ( var i = 0, length = $outer_container_a.length; i < length; i++ ) { - if ( $outer_container_a[i] === theItem ) { - return i; - } - } - } - - //toolbar (image view mode button) hover - $toolbar.hover( - function(){ //mouse over - $(this).stop().fadeTo("fast",1); - }, - function(){ //mouse out - $(this).stop().fadeTo("fast",0.8); - } - ); - $toolbar.stop().fadeTo("fast",0.8); //set its original state - - //Clicking on toolbar changes the image view mode - $toolbar.click(function(event){ - if($toolbar.data("imageViewMode")=="full"){ - ImageViewMode("fit"); - } else if($toolbar.data("imageViewMode")=="fit") { - ImageViewMode("original"); - } else if($toolbar.data("imageViewMode")=="original"){ - ImageViewMode("full"); - } - }); - - //next image balloon tip - function NextImageTip(){ - if($bg.data("nextImage")){ //check if this is the first image - $nextimage_tip.stop().css("right",20).fadeIn("fast").fadeOut(2000,"easeInExpo",function(){$nextimage_tip.css("right",$(window).width());}); - } - } - - //slide in/out left pane function - function SlidePanels(action){ - var speed=900; - var easing="easeInOutExpo"; - if(action=="open"){ - $("#arrow_indicator").fadeTo("fast",0); - $outer_container.stop().animate({left: 0}, speed,easing); - $bg.stop().animate({left: 585}, speed,easing); - } else { - $outer_container.stop().animate({left: -710}, speed,easing); - $bg.stop().animate({left: 0}, speed,easing,function(){$("#arrow_indicator").fadeTo("fast",1);}); - } - } - -//Image scale function -function FullScreenBackground(theItem){ - var winWidth=$(window).width(); - var winHeight=$(window).height(); - var imageWidth=$(theItem).width(); - var imageHeight=$(theItem).height(); - if($toolbar.data("imageViewMode")!="original"){ //scale - $(theItem).removeClass("with_border").removeClass("with_shadow"); //remove extra styles of original view mode - var picHeight = imageHeight / imageWidth; - var picWidth = imageWidth / imageHeight; - if($toolbar.data("imageViewMode")!="fit"){ //image view mode: full - if ((winHeight / winWidth) < picHeight) { - $(theItem).css("width",winWidth).css("height",picHeight*winWidth); - } else { - $(theItem).css("height",winHeight).css("width",picWidth*winHeight); - }; - } else { //image view mode: fit - if ((winHeight / winWidth) > picHeight) { - $(theItem).css("width",winWidth).css("height",picHeight*winWidth); - } else { - $(theItem).css("height",winHeight).css("width",picWidth*winHeight); - }; - } - //center it - $(theItem).css("margin-left",((winWidth - $(theItem).width())/2)).css("margin-top",((winHeight - $(theItem).height())/2)); - } else { //no scale - //add extra styles for orininal view mode - $(theItem).addClass("with_border").addClass("with_shadow"); - //set original dimensions - $(theItem).css("width",$bg.data("originalImageWidth")).css("height",$bg.data("originalImageHeight")); - //center it - $(theItem).css("margin-left",((winWidth-$(theItem).outerWidth())/2)).css("margin-top",((winHeight-$(theItem).outerHeight())/2)); - } -} - -//image view mode function - full or fit -function ImageViewMode(theMode){ - $toolbar.data("imageViewMode", theMode); //store new mode - FullScreenBackground($bgimg); //scale bg image - //re-style button - if(theMode=="full"){ - $toolbar.html("IMAGE VIEW MODE › FULL"); - } else if(theMode=="fit") { - $toolbar.html("IMAGE VIEW MODE › FIT"); - } else { - $toolbar.html("IMAGE VIEW MODE › ORIGINAL"); - } -} - -//preload script images -var images=["ajax-loader_dark.gif","round_custom_scrollbar_bg_over.png"]; -$.each(images, function(i) { - images[i] = new Image(); - images[i].src = this; -}); - -}); \ No newline at end of file diff --git a/public/js/jquery.backstretch.min.js b/public/js/jquery.backstretch.min.js deleted file mode 100755 index 47d637c..0000000 --- a/public/js/jquery.backstretch.min.js +++ /dev/null @@ -1,11 +0,0 @@ -/* - * jQuery Backstretch - * Version 1.1.2 - * http://srobbin.com/jquery-plugins/jquery-backstretch/ - * - * Add a dynamically-resized background image to the page - * - * Copyright (c) 2010 Scott Robbin (srobbin.com) - * Dual licensed under the MIT and GPL licenses. -*/ -(function(a){a.backstretch=function(k,i,l){function m(c){try{f={left:0,top:0};d=e.width();b=d/j;if(b>=e.height()){g=(b-e.height())/2;h.centeredY&&a.extend(f,{top:"-"+g+"px"})}else{b=e.height();d=b*j;g=(d-e.width())/2;h.centeredX&&a.extend(f,{left:"-"+g+"px"})}a("#backstretch img").width(d).height(b).css(f)}catch(n){}typeof c=="function"&&c()}var h={centeredX:true,centeredY:true,speed:0},e="onorientationchange"in window?a(document):a(window),j,d,b,g,f;i&&typeof i=="object"&&a.extend(h,i);a(document).ready(function(){if(k){var c= a("
").attr("id","backstretch").css({left:0,top:0,position:"fixed",overflow:"hidden",zIndex:-9999}),n=a("").css({position:"relative",display:"none"}).bind("load",function(o){var p=a(this);j=a(o.target).width()/a(o.target).height();m(function(){p.fadeIn(h.speed,function(){typeof l=="function"&&l()})})}).appendTo(c);a("body").prepend(c);n.attr("src",k);a(window).resize(m)}});return this}})(jQuery); \ No newline at end of file diff --git a/public/js/script.js b/public/js/script.js index 2b1a316..f3e6ed1 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -27,6 +27,14 @@ $(document).ready(function() { parent.location.hash = '!/home'; }); + $("#left").bind('mousemove', function(event) { + Photos.leftIndicator(); + }); + + $("#right").bind('mousemove', function(event) { + Photos.rightIndicator(); + }); + $("#right").bind('click', function(event) { Photos.next(); parent.location.hash = '!/home'; @@ -109,6 +117,12 @@ $(document).ready(function() { Photos.prev(); } } + }, + leftIndicator: function() { + + }, + rightIndicator: function() { + }, resize: function() { var imagewidth = this.img.naturalWidth; @@ -133,16 +147,19 @@ $(document).ready(function() { routes: { "!/home": "home", "!/about": "about", - "!/pricing": "pricing", + "!/pricing": "pricing", + "!/where": "where", "!/contact": "contact" }, hide: function(callback) { - $(".page").animate({opacity: 0},250, callback).css({display: "none"}); + $(".page").animate({opacity: 0},250, callback); }, swap: function(page_id) { var p = page_id; this.hide( function() { + console.log("none"); + $(this).css({display: "none"}); $(p).css({display: "block"}).animate({opacity: 1}, 250); }); }, @@ -158,6 +175,9 @@ $(document).ready(function() { contact: function() { this.swap("#contact"); }, + where: function() { + this.swap("#where"); + }, }); $.getJSON("/photos", diff --git a/public/js/supersized.2.0.js b/public/js/supersized.2.0.js deleted file mode 100644 index bfe6eee..0000000 --- a/public/js/supersized.2.0.js +++ /dev/null @@ -1,284 +0,0 @@ -/* -Supersized - Fullscreen Slideshow jQuery Plugin -By Sam Dunn (www.buildinternet.com // www.onemightyroar.com) -Version: supersized.2.0.js // Relase Date: 5/7/09 -Website: www.buildinternet.com/project/supersized -Thanks to Aen for preloading, fade effect, & vertical centering -*/ - -(function($){ - - //Resize image on ready or resize - $.fn.supersized = function() { - $.inAnimation = false; - $.paused = false; - var options = $.extend($.fn.supersized.defaults, $.fn.supersized.options); - - $(window).bind("load", function(){ - $('#loading').hide(); - $('#supersize').fadeIn('fast'); - $('#content').show(); - if ($('#slideshow .activeslide').length == 0) $('#supersize a:first').addClass('activeslide'); - if (options.slide_captions == 1) $('#slidecaption').html($('#supersize .activeslide').find('img').attr('title')); - if (options.navigation == 0) $('#navigation').hide(); - //Slideshow - if (options.slideshow == 1){ - if (options.slide_counter == 1){ //Initiate slide counter if active - $('#slidecounter .slidenumber').html(1); - $('#slidecounter .totalslides').html($("#supersize > *").size()); - } - slideshow_interval = setInterval("nextslide()", options.slide_interval); - if (options.navigation == 1){ //Skip if no navigation - $('#navigation a').click(function(){ - $(this).blur(); - return false; - }); - //Slide Navigation - $('#nextslide').click(function() { - if($.paused) return false; if($.inAnimation) return false; - clearInterval(slideshow_interval); - nextslide(); - slideshow_interval = setInterval(nextslide, options.slide_interval); - return false; - }); - $('#prevslide').click(function() { - if($.paused) return false; if($.inAnimation) return false; - clearInterval(slideshow_interval); - prevslide(); - slideshow_interval = setInterval(nextslide, options.slide_interval); - return false; - }); - $('#nextslide img').hover(function() { - if($.paused == true) return false; - $(this).attr("src", "images/forward.gif"); - }, function(){ - if($.paused == true) return false; - $(this).attr("src", "images/forward_dull.gif"); - }); - $('#prevslide img').hover(function() { - if($.paused == true) return false; - $(this).attr("src", "images/back.gif"); - }, function(){ - if($.paused == true) return false; - $(this).attr("src", "images/back_dull.gif"); - }); - - //Play/Pause Button - $('#pauseplay').click(function() { - if($.inAnimation) return false; - var src = ($(this).find('img').attr("src") === "images/play.gif") ? "images/pause.gif" : "images/play.gif"; - if (src == "images/pause.gif"){ - $(this).find('img').attr("src", "images/play.gif"); - $.paused = false; - slideshow_interval = setInterval(nextslide, options.slide_interval); - }else{ - $(this).find('img').attr("src", "images/pause.gif"); - clearInterval(slideshow_interval); - $.paused = true; - } - $(this).find('img').attr("src", src); - return false; - }); - $('#pauseplay').mouseover(function() { - var imagecheck = ($(this).find('img').attr("src") === "images/play_dull.gif"); - if (imagecheck){ - $(this).find('img').attr("src", "images/play.gif"); - }else{ - $(this).find('img').attr("src", "images/pause.gif"); - } - }); - - $('#pauseplay').mouseout(function() { - var imagecheck = ($(this).find('img').attr("src") === "images/play.gif"); - if (imagecheck){ - $(this).find('img').attr("src", "images/play_dull.gif"); - }else{ - $(this).find('img').attr("src", "images/pause_dull.gif"); - } - return false; - }); - } - } - }); - - $(document).ready(function() { - $('#supersize').resizenow(); - }); - - //Pause when hover on image - $('#supersize > *').hover(function() { - if (options.slideshow == 1 && options.pause_hover == 1){ - if(!($.paused) && options.navigation == 1){ - $('#pauseplay > img').attr("src", "images/pause.gif"); - clearInterval(slideshow_interval); - } - } - original_title = $(this).find('img').attr("title"); - if($.inAnimation) return false; else $(this).find('img').attr("title",""); - }, function() { - if (options.slideshow == 1 && options.pause_hover == 1){ - if(!($.paused) && options.navigation == 1){ - $('#pauseplay > img').attr("src", "images/pause_dull.gif"); - slideshow_interval = setInterval(nextslide, options.slide_interval); - } - } - $(this).find('img').attr("title", original_title); - }); - - $(window).bind("resize", function(){ - $('#supersize').resizenow(); - }); - - $('#supersize').hide(); - $('#content').hide(); - }; - - //Adjust image size - $.fn.resizenow = function() { - var options = $.extend($.fn.supersized.defaults, $.fn.supersized.options); - return this.each(function() { - - //Define image ratio - var ratio = options.startheight/options.startwidth; - - //Gather browser and current image size - var imagewidth = $(this).width(); - var imageheight = $(this).height(); - var browserwidth = $(window).width(); - var browserheight = $(window).height(); - var offset; - - //Resize image to proper ratio - if ((browserheight/browserwidth) > ratio){ - $(this).height(browserheight); - $(this).width(browserheight / ratio); - $(this).children().height(browserheight); - $(this).children().width(browserheight / ratio); - } else { - $(this).width(browserwidth); - $(this).height(browserwidth * ratio); - $(this).children().width(browserwidth); - $(this).children().height(browserwidth * ratio); - } - if (options.vertical_center == 1){ - $(this).children().css('left', (browserwidth - $(this).width())/2); - $(this).children().css('top', (browserheight - $(this).height())/2); - } - return false; - }); - }; - - $.fn.supersized.defaults = { - startwidth: 4, - startheight: 3, - vertical_center: 1, - slideshow: 1, - navigation:1, - transition: 1, //0-None, 1-Fade, 2-slide top, 3-slide right, 4-slide bottom, 5-slide left - pause_hover: 0, - slide_counter: 1, - slide_captions: 1, - slide_interval: 5000 - }; - -})(jQuery); - - //Slideshow Next Slide - function nextslide() { - if($.inAnimation) return false; - else $.inAnimation = true; - var options = $.extend($.fn.supersized.defaults, $.fn.supersized.options); - var currentslide = $('#supersize .activeslide'); - currentslide.removeClass('activeslide'); - - if ( currentslide.length == 0 ) currentslide = $('#supersize a:last'); - - var nextslide = currentslide.next().length ? currentslide.next() : $('#supersize a:first'); - var prevslide = nextslide.prev().length ? nextslide.prev() : $('#supersize a:last'); - - - //Display slide counter - if (options.slide_counter == 1){ - var slidecount = $('#slidecounter .slidenumber').html(); - currentslide.next().length ? slidecount++ : slidecount = 1; - $('#slidecounter .slidenumber').html(slidecount); - } - - $('.prevslide').removeClass('prevslide'); - prevslide.addClass('prevslide'); - - //Captions require img in - if (options.slide_captions == 1) $('#slidecaption').html($(nextslide).find('img').attr('title')); - - nextslide.hide().addClass('activeslide') - if (options.transition == 0){ - nextslide.show(); $.inAnimation = false; - } - if (options.transition == 1){ - nextslide.fadeIn(750, function(){$.inAnimation = false;}); - } - if (options.transition == 2){ - nextslide.show("slide", { direction: "up" }, 'slow', function(){$.inAnimation = false;}); - } - if (options.transition == 3){ - nextslide.show("slide", { direction: "right" }, 'slow', function(){$.inAnimation = false;}); - } - if (options.transition == 4){ - nextslide.show("slide", { direction: "down" }, 'slow', function(){$.inAnimation = false;}); - } - if (options.transition == 5){ - nextslide.show("slide", { direction: "left" }, 'slow', function(){$.inAnimation = false;}); - } - - $('#supersize').resizenow();//Fix for resize mid-transition - - } - - //Slideshow Previous Slide - function prevslide() { - if($.inAnimation) return false; - else $.inAnimation = true; - var options = $.extend($.fn.supersized.defaults, $.fn.supersized.options); - var currentslide = $('#supersize .activeslide'); - currentslide.removeClass('activeslide'); - - if ( currentslide.length == 0 ) currentslide = $('#supersize a:first'); - - var nextslide = currentslide.prev().length ? currentslide.prev() : $('#supersize a:last'); - var prevslide = nextslide.next().length ? nextslide.next() : $('#supersize a:first'); - - //Display slide counter - if (options.slide_counter == 1){ - var slidecount = $('#slidecounter .slidenumber').html(); - currentslide.prev().length ? slidecount-- : slidecount = $("#supersize > *").size(); - $('#slidecounter .slidenumber').html(slidecount); - } - - $('.prevslide').removeClass('prevslide'); - prevslide.addClass('prevslide'); - - //Captions require img in - if (options.slide_captions == 1) $('#slidecaption').html($(nextslide).find('img').attr('title')); - - nextslide.hide().addClass('activeslide') - if (options.transition == 0){ - nextslide.show(); $.inAnimation = false; - } - if (options.transition == 1){ - nextslide.fadeIn(750, function(){$.inAnimation = false;}); - } - if (options.transition == 2){ - nextslide.show("slide", { direction: "down" }, 'slow', function(){$.inAnimation = false;}); - } - if (options.transition == 3){ - nextslide.show("slide", { direction: "left" }, 'slow', function(){$.inAnimation = false;}); - } - if (options.transition == 4){ - nextslide.show("slide", { direction: "up" }, 'slow', function(){$.inAnimation = false;}); - } - if (options.transition == 5){ - nextslide.show("slide", { direction: "right" }, 'slow', function(){$.inAnimation = false;}); - } - - $('#supersize').resizenow();//Fix for resize mid-transition - } \ No newline at end of file diff --git a/public/stylesheets/screen.css b/public/stylesheets/screen.css index 6e9f553..cc985f1 100644 --- a/public/stylesheets/screen.css +++ b/public/stylesheets/screen.css @@ -631,7 +631,7 @@ nav ul li a:hover { .page p, .page li { font-size: 14px; margin-bottom: 1.5em; - line-height: 16px; + line-height: 18px; } /* line 94, ../../sass/screen.scss */ .page a { diff --git a/sass/screen.scss b/sass/screen.scss index 23eafe5..0fc5ed3 100644 --- a/sass/screen.scss +++ b/sass/screen.scss @@ -89,7 +89,7 @@ nav { p, li { font-size: 14px; margin-bottom: 1.5em; - line-height: 16px; + line-height: 18px; } a { color: black; diff --git a/views/layout.haml b/views/layout.haml index f5d5833..6359031 100644 --- a/views/layout.haml +++ b/views/layout.haml @@ -33,6 +33,9 @@ %li %a#show_pricing{:href=>"#!/pricing"} Pricing + %li + %a#show_where{:href=>"#!/where"} + Where? %li %a#show_contact{:href=>"#!/contact"} Contact @@ -40,6 +43,21 @@ #preload #left.pager #right.pager + #where.page + %h1 + Where + + %p + Stef has a home in Harpenden, Hertfordshire near the Bedfordshire border, and an office in Central London at Leicester Square tube. + + %p + He is available for weddings in the London and the South East of England. + + %p + Thinking further afield? Please + = succeed(".") do + %a{:href=>"#!/contact"}= "get in touch" + #pricing.page %h1 Simple pricing @@ -68,15 +86,18 @@ #contact.page %h1 Yes! I'd like to hear from you + %p - I'm represented by - %a{:href=>"http://emilyquinton.com"} - Emily Quinton Photography - and the best way to reach me is by email. + The best way to reach me is by email. %h2 %a{:href=>"mailto:stef@emilyquinton.com"} stef@emilyquinton.com + + %p + For existing clients, you can also contact + %a{:href=>"http://emilyquinton.com"}="Emily Quinton" + who handles post-production and after care for special purchases. #about.page %h1 @@ -84,8 +105,17 @@ %p Stef has won a clutch of awards for his creative work, and took to photography out of the love of making beautiful images. %p - When his parter, Emily Quinton's wedding business took off he found himself increasingly being involved both on the day and in dealing with the digital side of the business. - + When his parter, Emily Quinton's wedding business took off he found himself increasingly being involved as 'second shooter' at the larger weddings she was asked to photograph. It seemed to come naturally! + + %h1 + It's all about capturing the spirit of the event. + + %p + You'll hear people talking about 'reportage' and 'vintage' and what's currently in fashion, but the real thing that matters is that the feeling of the big is captured for posterity. That's what Stef focusses on. Sometimes it's the little details that do it, sometimes it's an unexpected joke between friends, a teary eye or a look from father to daughter. + + %p + Stef tries to be there, anticipating when these small, fleeting things happen and to open and close the camera shutter just in time. + %p Stef is represented by %a{:href=>"http://emilyquinton.com"}