diff --git a/callfortalks.html b/1_callfortalks.html similarity index 97% rename from callfortalks.html rename to 1_callfortalks.html index 125ceac2..439fef36 100644 --- a/callfortalks.html +++ b/1_callfortalks.html @@ -1,6 +1,7 @@ --- layout: page title: Call for talks +icon: sign-in permalink: /call-for-talks/ --- diff --git a/artists.html b/2_artists.html similarity index 99% rename from artists.html rename to 2_artists.html index b8292738..d5d2fb3c 100644 --- a/artists.html +++ b/2_artists.html @@ -1,6 +1,7 @@ --- layout: page title: Artists +icon: user permalink: /artists/ --- diff --git a/about.html b/3_about.html similarity index 99% rename from about.html rename to 3_about.html index 0e8de59c..74f502a4 100644 --- a/about.html +++ b/3_about.html @@ -1,6 +1,7 @@ --- layout: page title: About +icon: info permalink: /about/ --- diff --git a/_config.yml b/_config.yml index a7423363..515fe8f4 100644 --- a/_config.yml +++ b/_config.yml @@ -13,4 +13,4 @@ paginate_path: "page:num/" markdown: kramdown facebook_link: https://www.facebook.com/scopesessions github_link: https://github.com/ScopeSessions -# gems: [unique_array.rb] +# gems: [sort_for.rb] diff --git a/_includes/header.html b/_includes/header.html index b26c0772..699ff50d 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -6,32 +6,51 @@ Logo - -
- -
- -
- + + + + + {% for page in site.pages %} + {% if page.title %} + {{ page.title }} + {% endif %} + {% endfor %} + +
+ + +
+ + {% if page.home == true %} + + {% else %} + Back + {% endif %} + + + + + + {% assign sorted_pages = (site.pages | sort: 'order') %} + {% for page in sorted_pages %} + {% if page.title %} + + {% endif %} + {% endfor %} + +
+ - diff --git a/_layouts/event.html b/_layouts/event.html index 8aa0c3ff..ab69a062 100644 --- a/_layouts/event.html +++ b/_layouts/event.html @@ -64,12 +64,24 @@ layout: default {% endif %} {% if talk.artist_bio %}
About {{talk.artist}}

{{talk.artist_bio}}

- {% endif %} {% if talk.artist_website || talk.video_artist_url || talk.video_url %} {% if talk.artist_website %} - {{talk.artist_website}} {% endif %} {% if talk.video_artist_url %} -
- Artist's Video {% endif %} {% if talk.talk_video_url %} -
- Talk's Video {% endif %} {% endif %} + {% endif %} + {% if talk.artist_website || talk.video_artist_url || talk.video_url %} + {% if talk.artist_website %} + Website + {% endif %} + {% if talk.video_artist_url %} +

Artist's Video

+ + + {% endif %} + {% if talk.talk_video_url %} +

Talk's Video

+ + + {% endif %} + {% endif %} diff --git a/_posts/2015-03-12-Scope040.markdown b/_posts/2015-03-12-Scope040.markdown index 17c0bb25..f5f0ec05 100644 --- a/_posts/2015-03-12-Scope040.markdown +++ b/_posts/2015-03-12-Scope040.markdown @@ -16,7 +16,7 @@ talks: artist_bio: "The Berlin based artists Malte Steiner and Wolfgang Spahn are exploring the artistic potential of embedded open source systems. These small-sized computing platforms gives the possibility to combine a multitude of independent devices to create a more powerful system than most single computers can provide. Based on the idea of free tools for free art, all hard- and software is open source and can be used, modified and improved by all other artists. Instead of using one high tech super computer for multiprojection Spahn and Steiner developed and share a system which allows theoreticaly the connection of thousands of independent embedded platforms for one gigantic multivision show and still keep the costs low by using the cheap mini computer Raspberry Pi, a platform originally designed for eductional purposes." description: "In this talk Spahn and Steiner introduce their open source Embedded Artist System and talk about its capabilities, the motivation behind it and the development process." artist_website: "http://embeddedartist.dernulleffekt.de/doku.php" - media_artist_url: "/images/fetch.php" + media_artist_url: "/images/fetch.png" video_artist_url: "https://vimeo.com/112580876" talk_video_url: - title: "The Sea: Art, Technology and Environment" diff --git a/_posts/2015-03-12-Scope041.markdown b/_posts/2015-03-12-Scope041.markdown index c14a4cc2..6039d60b 100644 --- a/_posts/2015-03-12-Scope041.markdown +++ b/_posts/2015-03-12-Scope041.markdown @@ -17,7 +17,7 @@ talks: description: "EDMT is an interactive audio visual app designed by media artist Fader. He's combining years of his experience as a visual and software designer into one amazing app. It allows you to 'play' with your phone and tablet to create wonderful visuals and make beautiful sounds. There are several engaging scenes to choose from, where you can explore and discover exciting new audio visual environments. In this presentation Tilman and Fader will show the current work-in-progress version of EDMT App for Android and discuss future plans." artist_website: "http://www.vjfader.com/fader-bio/" media_artist_url: "/images/EDMT-Nexus_7-mockup-13.png" - video_artist_url: "/images/EDMT-Nexus_7-mockup-13.png" + video_artist_url: "https://vimeo.com/113488501" talk_video_url: - title: "Intuitive Journeys" topics: "Video,Meditation" diff --git a/_posts/2015-04-09-Scope042.markdown b/_posts/2015-04-09-Scope042.markdown index 57346610..5c5b2bbe 100644 --- a/_posts/2015-04-09-Scope042.markdown +++ b/_posts/2015-04-09-Scope042.markdown @@ -26,7 +26,7 @@ talks: artist_bio: "Nenad Popov is a media anarchist with a focus on live cinema pieces, sound installations, film installations, weird sound making contraptions and occasional parasitism on public cultural funds. He has collaborated with artists such as Daan Brinkmann, Electronic Opera, Erfan Abdi, Klara Ravat, Lillevan and his works have been exhibited at Sonic Acts, Dis-Patch, TodaysArt, E-Pulse, Share and Ars Electronica." description: "Reflection on the State festival. Inspiration through science. Towards embedding citizen science in artistic practice." artist_website: "http://morphogenesis.eu" - media_artist_url: "http://www.morphogenesis.eu/nesolito.jpg" + media_artist_url: "/images/nesolito.jpg" video_artist_url: "https://vimeo.com/35430604" talk_video_url: - title: "19th century maladies vs. 'the wonders of science' calendar syndrome" diff --git a/assets/bgphotos/10.png b/assets/bgphotos/10.png new file mode 100644 index 00000000..98c764d5 Binary files /dev/null and b/assets/bgphotos/10.png differ diff --git a/assets/bgphotos/11.png b/assets/bgphotos/11.png new file mode 100644 index 00000000..4c8f7c2c Binary files /dev/null and b/assets/bgphotos/11.png differ diff --git a/assets/bgphotos/12.png b/assets/bgphotos/12.png new file mode 100644 index 00000000..c9f36f38 Binary files /dev/null and b/assets/bgphotos/12.png differ diff --git a/assets/bgphotos/6.png b/assets/bgphotos/6.png new file mode 100644 index 00000000..b1e83a5f Binary files /dev/null and b/assets/bgphotos/6.png differ diff --git a/assets/bgphotos/7.png b/assets/bgphotos/7.png new file mode 100644 index 00000000..c9db489e Binary files /dev/null and b/assets/bgphotos/7.png differ diff --git a/assets/bgphotos/8.png b/assets/bgphotos/8.png new file mode 100644 index 00000000..90e3b211 Binary files /dev/null and b/assets/bgphotos/8.png differ diff --git a/assets/bgphotos/9.png b/assets/bgphotos/9.png new file mode 100644 index 00000000..def50a35 Binary files /dev/null and b/assets/bgphotos/9.png differ diff --git a/css/custom.css b/css/custom.css index 80e7247a..0790558a 100644 --- a/css/custom.css +++ b/css/custom.css @@ -25,12 +25,28 @@ a:hover { .right{ float:right; } +.menu-icon{ + font-size: 20px; + padding-left: 10px; + padding-right: 10px; +} +.menu-icon-big{ + font-size: 24px; + padding-left: 10px; + padding-right: 10px; +} .top-button { - display: none; + opacity:0.0; + -moz-opacity:0.0 + filter:alpha(opacity=0.0); float: right; + margin-right: 10px; } .navbar-header { - text-align: center; + width: 100%; + font-size: 20px; + margin-left:0px; + margin-right:0px; } .navbar-options { padding: 10px; @@ -158,7 +174,6 @@ a:hover { width: 100%; } .event { - #padding: 10px; margin-bottom: 10px; } .highlight { @@ -167,7 +182,6 @@ a:hover { padding: 2px 10px; } .dark_bg { - #padding: 10px; background: rgb(0, 0, 0) transparent; background: rgba(0, 0, 0, 0.6); filter: progid: DXImageTransform.Microsoft.gradient(startColorstr=#66000000, endColorstr=#66000000); diff --git a/images/fetch.php b/images/fetch.png similarity index 100% rename from images/fetch.php rename to images/fetch.png diff --git a/images/kb_hn13_0029b.jpg b/images/kb_hn13_0029b.jpg index 579ec467..56066352 100644 Binary files a/images/kb_hn13_0029b.jpg and b/images/kb_hn13_0029b.jpg differ diff --git a/images/nesolito.jpg b/images/nesolito.jpg new file mode 100644 index 00000000..9ab6763d Binary files /dev/null and b/images/nesolito.jpg differ diff --git a/index.html b/index.html index 449f1459..f1dbf97c 100644 --- a/index.html +++ b/index.html @@ -66,11 +66,21 @@ home: yes

{{talk.description}}

{% endif%} {% if talk.artist_website %} - {{talk.artist_website}} {% endif %} {% if talk.video_artist_url %} -
- Artist's Video {% endif %} {% if talk.talk_video_url %} -
- Talk's Video {% endif %} + Website + + {% endif %} + {% if talk.video_artist_url %} +
+ Artist video + + {% endif %} + {% if talk.talk_video_url %} +
+ Talk at Scope + + {% endif %} diff --git a/js/custom.js b/js/custom.js index c68b6e21..a1d16e31 100644 --- a/js/custom.js +++ b/js/custom.js @@ -1,6 +1,6 @@ var scrolling = false; var navigatorOpen = false; -var topButtonVisible = true; +var topButtonVisible = false; $(document).ready(function() { @@ -11,7 +11,7 @@ $(document).ready(function() { $(".artist-media img").imagefill(); //$(".upcoming-media img").imagefill(); - var rnd = Math.floor(Math.random() * 6); + var rnd = Math.floor(Math.random() * 13); $(function() { $.vegas({ @@ -28,7 +28,6 @@ $(document).ready(function() { } else { openTopMenu(); } - navigatorOpen = !navigatorOpen; }); $(".topic").click(function() { @@ -36,6 +35,7 @@ $(document).ready(function() { }); function openTopMenu() { + console.log('openTopMenu'); if (!scrolling && !navigatorOpen) { scrolling = true; $(".navigator").slideDown("slow", function() { @@ -46,6 +46,7 @@ $(document).ready(function() { } function closeTopMenu() { + console.log('closeTopMenu'); if (!scrolling && navigatorOpen) { scrolling = true; $('.navigator').slideUp("slow", function() { @@ -58,7 +59,7 @@ $(document).ready(function() { function showTopButton() { console.log('showTopButton'); if (!topButtonVisible) { - $('.top-button').show("slow", function() { + $('.top-button').fadeTo("slow",1.0, function() { topButtonVisible = true; }); } @@ -67,30 +68,39 @@ $(document).ready(function() { function hideTopButton() { console.log('hideTopButton'); if (topButtonVisible) { - $('.top-button').hide("slow", function() { + $('.top-button').fadeTo("slow",0.0, function() { topButtonVisible = false; }); } } var timeout = null; - var navbarHeight = $('.navbar').height(); $(window).scroll(function() { + + var navbarHeight = $('.navbar').height(); + if (navigatorOpen){ + navbarHeight += $('.navigator').height() - 40; + } + + console.log('scroll ' + $(window).scrollTop() + ' ' + navbarHeight); if (!timeout) { timeout = setTimeout(function() { clearTimeout(timeout); timeout = null; if ($(window).scrollTop() >= navbarHeight) { - closeTopMenu(); - showTopButton(); - } else { - hideTopButton(); + if (navigatorOpen) + closeTopMenu(); + if (!topButtonVisible) + showTopButton(); + } else{ + if (topButtonVisible) + hideTopButton(); } }, 250); } }); - + if ( $.cookie('firstVisit') != 'yes' ) { setTimeout( function() { openTopMenu();