Permalink
Browse files

Merge branch 'master' of github.com:sebastiandeutsch/digital-media-map

* 'master' of github.com:sebastiandeutsch/digital-media-map:
  Enabled sass
  Select logic for categories
  Changed gemset
  about us text
  • Loading branch information...
2 parents e56ac2f + 9faeaf3 commit 307fa659d5b05d0cd89378537004369f4f6addbd @bumi bumi committed Apr 29, 2012
View
2 .rvmrc
@@ -1 +1 @@
-rvm 1.9.3@digital-media-map
+rvm 1.9.3@dmm
View
27 app/assets/javascripts/application.js.coffee
@@ -18,6 +18,33 @@ jQuery ($) ->
return false
+ $('.category-switch').on "click", (event) ->
+ data_target = $(this).attr('data-target')
+ if $(this).attr('data-value') == 'on'
+ $('img', $(this)).attr('src', '/assets/switch-off.png')
+ $(this).attr('data-value', 'off')
+ state = off
+ else
+ $('img', $(this)).attr('src', '/assets/switch-on.png')
+ $(this).attr('data-value', 'on')
+ state = on
+
+ $('.switch', data_target).each (i, el) ->
+ link = $(el)
+ data_target = $(link).attr('data-target')
+ if state == on
+ $('img', link).attr('src', '/assets/switch-on.png')
+ $(link).attr('data-value', 'on')
+ $(data_target).attr('checked', true);
+ else
+ $('img', link).attr('src', '/assets/switch-off.png')
+ $(link).attr('data-value', 'off')
+ $(data_target).attr('checked', false);
+
+ return
+
+ return false
+
$('.switch').on "click", (event) ->
data_target = $(this).attr('data-target')
View
2 app/assets/stylesheets/application.css.sass
@@ -5,4 +5,4 @@
@import "application/layout"
@import "application/header"
@import "application/google_maps"
-
+@import "application/filter_panel"
View
2 app/views/home/index.html.haml
@@ -9,7 +9,7 @@
%h3
%a.menu{ :href => '#', :'data-target' => "#category_#{category.id}" }
= category.name
- %a.switch{ :href => '#', :'data-value' => 'on' }
+ %a.category-switch{ :href => '#', :'data-value' => 'on', :'data-target' => "#category_#{category.id}" }
= image_tag 'switch-on.png'
%li{ :id => "category_#{category.id}", :style => 'display:none' }
%ul
View
23 app/views/pages/about.html.haml
@@ -6,20 +6,13 @@
Wer wir sind, was wir machen blabla
.clearfix
#content
- %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. 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. 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.
- %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. 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. 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.
- %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. 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. 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.
-
+ %p Digital Media Map NRW is a joint project of MEDIEN.NRW – The Media Cluster of North Rhine-Westphalia, 9elements, Railslove and Coworking Cologne.
+ %p Presenting digital media industry in the region of North Rhine-Westphalia (NRW) by a web-based service tool, the Digital Media Map NRW aims at visualizing and networking companies from all media branches as well as bolt-on services for the first time.
+ %p Filter functionalities guarantee quickly accessible information, e.g. for companies searching for business partners, investors looking for startups or firms from other countries monitoring media industry clusters and eliciting on where to settle in NRW, Germany´s biggest regions with regards to population and economic power.
+ %p Digital Media Map NRW was created and realized during „ADVANCE HACKATHON“ (link to http://www.hackathon.advance-conference.com/en), an 48 hour coding event that took place April 27-29, 2012. The event featured over 80 of the finest coders from NRW and beyond, assembling at Coworkingspace Gasmotorenfabrik in Cologne. The objective: networking the most talented web & app developers and designers for kicking-off own or others projects, refine or complete code collaboratively or: just to experiment along - preferably open source. The participants joined in from all over NRW and beyond - from Cologne, Düsseldorf, Bochum, Dortmund, Aachen but also from Luxembourg or Serbia.
+ %p Filter functionalities guarantee quickly accessible information, e.g. for companies searching for business partners, investors looking for startups or firms from other countries monitoring media industry clusters and eliciting on where to settle in NRW, Germany´s biggest regions with regards to population and economic power.
+ %p The projects featured a wide variety of projects, from open data and crowdfunding services over games to open source photo sharing site or a lego step sequenzer (for a full list of projects and their outcomes see www.bit.ly/ADVANCE-github).
+
%ul.sidebar
%li
- %h4
- Überschrift 1
- %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. At vero eos et accusam et justo duo dolores et ea rebum.
- %li
- %h4
- Überschrift 2
- %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. At vero eos et accusam et justo duo dolores et ea rebum.
- %li
- %h4
- Überschrift 3
- %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. At vero eos et accusam et justo duo dolores et ea rebum.
+ %p The ADVANCE HACKATHON was hosted by MEDIEN.NRW - The Media Cluster of North Rhine-Westphalia in close cooperation with partners 9elements, Railslove and Coworking Cologne.

0 comments on commit 307fa65

Please sign in to comment.