Permalink
Browse files

Merge branch 'develop' of github.com:dblaichinger/jacob_joins into de…

…velop
  • Loading branch information...
Martina Edelhofer
Martina Edelhofer committed May 25, 2012
2 parents a170fc0 + 2ab250a commit cbb84d2df33f575bea60509d31d52befc11f0f41
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -31,10 +31,13 @@ loaderMsg = '<img alt="Ajax-loader" src="/assets/ajax-loader.gif"><h1>Loading...
$ ->
$(".scroll").click ->
newsbar = $("#newsbar")
- newsbar.visibleAfter "destroy"
+ newsbar.executeAt "destroy"
$('.stories').fancyStoryEffect 'scrollTo', $('#story_1'), 800,
onAfter: ->
- newsbar.visibleAfter $("#start")
+ newsbar.executeAt $("#start"), ->
+ newsbar.fadeOut 500
+ , ->
+ newsbar.fadein 500
newsbar.fadeIn 500
false
@@ -147,14 +147,13 @@ function slide_newsbar(){
return false;
});
- var event_set = false;
$(document).ready(function(){
$("#newsbar").hover(
function(){
- if(event_set) { event_set = false; showClickAndSee(); }
+ showClickAndSee();
},
function(){
- if(!event_set) { event_set = true; hideClickAndSee(); }
+ hideClickAndSee();
}
);
});
@@ -36,7 +36,7 @@ validateType = (input) ->
when "numerical"
return not isNaN input.val()
when "text"
- regex = /[^a-zß-ü_\s-]/i
+ regex = /[^a-zß-ü_\s-().,]/i
return not regex.test input.val()
fieldIsValid = (input) ->
@@ -1,26 +1,26 @@
$ = jQuery
publicMethods =
- init: (checkPointCharlie) ->
+ init: (checkPointCharlie, onAbove, onBeneath) ->
this.each ->
element = $(this)
- $(window).bind 'scroll.visibleAfter', (event) ->
+ $(window).bind 'scroll.executeAt', (event) ->
if $(window).scrollTop() >= (checkPointCharlie.position().top + checkPointCharlie.height())
- if element.is ":hidden"
- element.fadeIn 500
+ if onBeneath?
+ onBeneath()
else
- if element.is ":visible"
- element.fadeOut 500
+ if onAbove?
+ onAbove()
destroy: ->
this.each ->
- $(window).unbind "scroll.visibleAfter"
+ $(window).unbind "scroll.executeAt"
-$.fn.visibleAfter = (method) ->
+$.fn.executeAt = (method) ->
if publicMethods[method]
publicMethods[method].apply this, Array.prototype.slice.call arguments, 1
else if typeof method is "object" or not method
publicMethods.init.apply this, arguments
else
- $.error "Method " + method + " does not exist on jQuery.visibleAfter"
+ $.error "Method " + method + " does not exist on jQuery.executeAt"
@@ -1,7 +1,7 @@
.aboutcontent
width: 1000px
margin: 0 auto
- padding: 80px 20px 50px 20px
+ padding: 100px 20px 50px 20px
#teamvorstellung
overflow: hidden
@@ -41,6 +41,12 @@
font-size: 14px
margin-bottom: 5px
text-transform: uppercase
+ a
+ text-decoration: none
+ color: #531E09
+ a:hover
+ color: #E2001A
+
p
font-family: Pluto-CondensedItalic
@@ -84,23 +90,34 @@
border: 2px solid #fff
width: 1000px
-h4
- font-family: Sanches-SemiBold
- text-transform: uppercase
- margin-bottom: 5px
- color: #531E09
- font-size: 14px
- margin-top: 15px
+#projektarbeiten
+ li
+ margin-bottom: 20px
.brief
-
- #lightbox_brief
+ .projektinfo
+ float: left
+ width: 446px
+ margin-right: 50px
+
+ h4
+ font-family: Sanches-SemiBold
+ text-transform: uppercase
+ margin-bottom: 10px
+ color: #531E09
+ font-size: 20px
+ padding-top: 10px
+
+ #lightbox_container
width: 500px
- height: 240px
+ height: 140px
overflow: hidden
text-align: center
border: 2px solid #fff
+.lightbox_first
+ margin: -50%
+
.uebergang4
background-image: url(image_path('pattern_uebergang4.png'))
background-repeat: repeat-x
@@ -23,10 +23,22 @@
:javascript
$(document).ready(function(){
+ var passCount = 0;
$('#fancy_counter').tzineClock();
slide_newsbar();
- $("#newsbar").visibleAfter($("#start"));
-
+ $("#newsbar").executeAt($("#start"), function(){
+ $("#newsbar").fadeOut(500);
+ },
+ function(){
+ $("#newsbar").fadeIn(500);
+
+ if(passCount == 0){
+ showClickAndSee();
+ setTimeout("hideClickAndSee()", 2000);
+ passCount++;
+ }
+ });
+
#{growl_flash_messages}
});
@@ -8,9 +8,19 @@
imageBtnPrev: '#{image_path("lightbox/btn-prev.gif")}',
imageBtnNext: '#{image_path("lightbox/btn-next.gif")}',
imageBlank: '#{image_path("lightbox/blank.gif")}',
- containerResizeSpeed: 350,
- txtImage: 'Imagem',
- txtOf: 'de'
+ containerResizeSpeed: 350
+ });
+ });
+ $(function() {
+ $('a.lightbox.bierdeckel').lightBox({
+ overlayBgColor: '#FFF',
+ overlayOpacity: 0.6,
+ imageLoading: '#{image_path("ajax-loader.gif")}',
+ imageBtnClose: '#{image_path("lightbox/btn-close.gif")}',
+ imageBtnPrev: '#{image_path("lightbox/btn-prev.gif")}',
+ imageBtnNext: '#{image_path("lightbox/btn-next.gif")}',
+ imageBlank: '#{image_path("lightbox/blank.gif")}',
+ containerResizeSpeed: 350
});
});
@@ -19,7 +29,7 @@
.aboutcontent
#teamvorstellung
%h1
- It´s a pleasure to introduce you to our
+ Its a pleasure to introduce you to our
%span
great team!
%hr
@@ -29,15 +39,17 @@
%li#isi
.member
%h5
- Ismail Hanli
+ = link_to 'Ismail Hanli', "http://ismailhanli.multimediatechnology.at/"
%p
Webdeveloper
%li#marta
.member
%h5
- Marta Janosz
+ = link_to 'Marta Janosz', "http://www.martajanosz.com/"
%p
- Webdeveloper
+ Webdesigner
+ %br
+ Project leader
%li#alex
.member
%h5
@@ -47,33 +59,35 @@
%li#martina
.member
%h5
- Martina Edelhofer
+ = link_to 'Martina Edelhofer', "http://edelhofer.multimediaart.at/"
%p
- Webdeveloper
+ Webdesigner
%li#doris
.member
%h5
- Doris Wimmer
+ = link_to 'Doris Wimmer', "http://www.doris-wimmer.com/"
%p
- Webdeveloper
+ Advertising & Promotion
%li#tina
.member
%h5
- Kristina Fallenegger
+ = link_to 'Kristina Fallenegger', "http://www.kristina-fallenegger.at/"
%p
- Webdeveloper
+ Sponsoring
%li#daniel
.member
%h5
- Daniel Blaichinger
+ = link_to 'Daniel Blaichinger', "http://dblaichinger.multimediatechnology.at/"
%p
Webdeveloper
%li#daniela
.member
%h5
- Daniela Rieser
+ = link_to 'Daniela Rieser', "http://www.danielarieser.com/"
%p
- Webdeveloper
+ Corporate Design
+ %br
+ Project leader
%p.aboutteam
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
@@ -90,15 +104,78 @@
%ul#projektarbeiten
%li.brief
- %h4
- 100 Letters
- %p
- Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.
-
- #lightbox_brief
- = link_to image_tag('briefe/02-tisch.jpg'), image_path('daniela.jpg'), class:"lightbox brief"
- = link_to "", image_path('isi.jpg'), class:"lightbox brief"
- = link_to "", image_path('doris.jpg'), class:"lightbox brief"
-
+ .projektinfo
+ %h4
+ 100 Letters
+ %p
+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.
+
+ #lightbox_container
+ = link_to image_tag('briefe/02-tisch.jpg', class:"lightbox_first"), image_path('briefe/02-tisch.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1029.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1035.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1045.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1050.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1066.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1071.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1078.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1269.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/01-briefe.jpg'), class:"lightbox brief", title:"table bla"
+
+ %li.brief
+ .projektinfo
+ %h4
+ Letterpress coasters
+ %p
+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.
+
+ #lightbox_container
+ = link_to image_tag('bierdeckel/IMG_5039.jpg', class:"lightbox_first"), image_path('bierdeckel/IMG_5039.jpg'), class:"lightbox bierdeckel", title:"table bla"
+ = link_to "", image_path('bierdeckel/IMG_4989.jpg'), class:"lightbox bierdeckel", title:"table bla"
+ = link_to "", image_path('bierdeckel/IMG_4993.jpg'), class:"lightbox bierdeckel", title:"table bla"
+ = link_to "", image_path('bierdeckel/IMG_5023.jpg'), class:"lightbox bierdeckel", title:"table bla"
+ = link_to "", image_path('bierdeckel/IMG_5035.jpg'), class:"lightbox bierdeckel", title:"table bla"
+ = link_to "", image_path('bierdeckel/IMG_4994.jpg'), class:"lightbox bierdeckel", title:"table bla"
+ = link_to "", image_path('bierdeckel/IMG_5028.jpg'), class:"lightbox bierdeckel", title:"table bla"
+ = link_to "", image_path('bierdeckel/IMG_5037.jpg'), class:"lightbox bierdeckel", title:"table bla"
+ = link_to "", image_path('bierdeckel/IMG_5067.jpg'), class:"lightbox bierdeckel", title:"table bla"
+ %li.brief
+ .projektinfo
+ %h4
+ Food Lettering
+ %p
+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.
+
+ #lightbox_container
+ = link_to image_tag('briefe/02-tisch.jpg', class:"lightbox_first"), image_path('briefe/02-tisch.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1029.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1035.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1045.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1050.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1066.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1071.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1078.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1269.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/01-briefe.jpg'), class:"lightbox brief", title:"table bla"
+
+
+ %li.brief
+ .projektinfo
+ %h4
+ Sponsoring
+ %p
+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.
+
+ #lightbox_container
+ = link_to image_tag('briefe/02-tisch.jpg', class:"lightbox_first"), image_path('briefe/02-tisch.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1029.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1035.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1045.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1050.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1066.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1071.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1078.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/DSC_1269.jpg'), class:"lightbox brief", title:"table bla"
+ = link_to "", image_path('briefe/01-briefe.jpg'), class:"lightbox brief", title:"table bla"
= render "footer"
@@ -38,5 +38,5 @@
%p.disabled-send-button-text
- The button is still inactive! Please check the form for missing entries (»!«) and make sure you also completed the about you section.
+ The button is still inactive! Please check the form for missing entries "!" and make sure you also completed the "About you" section.
= link_to "", "#", id:"send", class:"disabled"
@@ -105,4 +105,17 @@
#lightbox-secNav-btnClose
width: 66px
float: right
- padding-bottom: 0.7em
+ padding-bottom: 0.7em
+
+#lightbox-image-details-caption
+ font-family: "PlutoCondensed"
+ font-size: 14px
+ line-height: 1.4em
+ color: #531E09
+ font-weight: normal
+
+#lightbox-image-details-currentNumber
+ font-family: "Pluto-CondensedItalic"
+ font-size: 12px
+ line-height: 1.4em
+ color: #531E09

0 comments on commit cbb84d2

Please sign in to comment.