Skip to content
Browse files

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

* 'master' of github.com:sebastiandeutsch/digital-media-map:
  imprint links
  Switches better aligned
  Filtering
  • Loading branch information...
2 parents a111305 + 1941494 commit b3dcae3bff17d49679f0023cd63e00ca951ae769 @bumi bumi committed Apr 29, 2012
View
1 app/assets/stylesheets/application/filter_panel.css.sass
@@ -29,6 +29,7 @@
background: transparent url(asset_path('indicator-open.png', image)) 0 50% no-repeat
a
float: right
+ margin-right: 10px
h4
float: left
margin: 0
View
3 app/assets/stylesheets/application/layout.css
@@ -74,6 +74,9 @@ header h1 {
padding:0 0 0 10px;
float:left;
}
+.imprint a {
+ color:#13a2df;
+}
ul#nav {
float:left;
margin-left: 20px;
View
23 app/views/home/index.html.haml
@@ -26,6 +26,27 @@
%a.switch{ :href => '#', :'data-value' => 'on', :'data-target' => "#search_tag_id_#{tag.id}" }
= image_tag 'switch-on.png'
%h2
+ Filter
+ %ul#switches
+ %li.category
+ .padding
+ %h3
+ Has funding
+ %a.switch{ :href => '#', :'data-value' => 'off', :'data-target' => "#search_has_funding_search_filter" }
+ = image_tag 'switch-off.png'
+ %li.category
+ .padding
+ %h3
+ Searches for funding
+ %a.switch{ :href => '#', :'data-value' => 'off', :'data-target' => "#search_searches_for_funding_search_filter" }
+ = image_tag 'switch-off.png'
+ %li.category
+ .padding
+ %h3
+ Is hiring
+ %a.switch{ :href => '#', :'data-value' => 'off', :'data-target' => "#search_is_hiring_search_filter" }
+ = image_tag 'switch-off.png'
+ %h2
Company Size
%ul#company-sizes
%li#startup
@@ -40,7 +61,7 @@
%li#large
%a{ :href => '#', :'data-value' => 'on', :'data-target' => '#company_size_4', :'data-on-image' => '/assets/company-size-large-selected.png', :'data-off-image' => '/assets/company-size-large.png' }
= image_tag 'company-size-large-selected.png'
- %ul
+ %ul.hide
- Category.all.each do |category|
%li
= category.name
View
7 app/views/pages/about.html.haml
@@ -9,10 +9,13 @@
%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
+ Digital Media Map NRW was created and realized during
+ %a{ :href => "http://www.hackathon.advance-conference.com/en"}„ADVANCE HACKATHON“,
+ 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
- %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.
+ %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.
View
52 app/views/pages/imprint.html.haml
@@ -3,36 +3,68 @@
%h2
Imprint
.clearfix
- #content
+ #content.imprint
%p Openness: By contributing your data to Digital Media Map NRW you automatically agree to subsequent use by third parties under the Creative Commons licence (CC BY-SA).
%h4
Copyright and License
- %p Digital Media Map NRW is open data, licensed under the Creative Commons Attribution-ShareAlike 2.0 licence (CC BY-SA).
- %p You are free to copy, distribute, transmit and adapt our maps and data, as long as you credit Digital Media Map NRW and its contributors. If you alter or build upon our maps or data, you may distribute the result only under the same licence. The full legal code explains your rights and responsibilities.
+ %p
+ Digital Media Map NRW is open data, licensed under the
+ %a{ :href => "http://creativecommons.org/licenses/by-sa/2.0/"} Creative Commons Attribution-ShareAlike 2.0
+ licence (CC BY-SA).
+ %p
+ You are free to copy, distribute, transmit and adapt our maps and data, as long as you credit Digital Media Map NRW and its contributors. If you alter or build upon our maps or data, you may distribute the result only under the same licence. The full
+ %a{ :href => "http://creativecommons.org/licenses/by-sa/2.0/legalcode"} legal code
+ explains your rights and responsibilities.
%h4
How to credit Digital Media Map NRW
%p If you are using Digital Media Map NRW images, we request that your credit reads at least “© Digital Media Map NRW contributors, CC BY-SA”. If you are using map data only, we request “Map data © Digital Media Map NRW contributors, CC BY-SA”.
- %p Where possible, Digital Media Map NRW should be hyperlinked to http://www.dmm-NRW.org and CC BY-SA to http://creativecommons.org/licenses/by-sa/2.0/. If you are using a medium where links are not possible (e.g. a printed work), we suggest you direct your readers to www.dmm-NRW.org (perhaps by expanding ‘Digital Media Map NRW’ to this full address) and to www.creativecommons.org.
+ %p
+ Where possible, Digital Media Map NRW should be hyperlinked to http://www.dmm-NRW.org and CC BY-SA to
+ %a{ :href => "http://creativecommons.org/licenses/by-sa/2.0/"}http://creativecommons.org/licenses/by-sa/2.0/.
+ If you are using a medium where links are not possible (e.g. a printed work), we suggest you direct your readers to www.dmm-NRW.org (perhaps by expanding ‘Digital Media Map NRW’ to this full address) and to
+ %a{ :href => "http://creativecommons.org"}www.creativecommons.org.
%h4
Finding out more
- %p Read more about using our data at the Legal FAQ.
+ %p
+ Read more about using our data at the
+ %a{ :href => "http://wiki.openstreetmap.org/wiki/Legal_FAQ"}Legal FAQ.
%p DMM NRW contributors are reminded never to add data from any copyrighted sources (e.g. Google Maps or printed maps) without explicit permission from the copyright holders.
- %p Although DMM NRW is open data, we cannot provide a free-of-charge map API for third-party developers. See our API Usage Policy, Tile Usage Policy and Nominatim Usage Policy.
+ %p
+ Although DMM NRW is open data, we cannot provide a free-of-charge map API for third-party developers. See our
+ %a{ :href => "http://wiki.openstreetmap.org/wiki/API_usage_policy"}API Usage Policy,
+ %a{ :href => "http://wiki.openstreetmap.org/wiki/Tile_usage_policy"}Tile Usage Policy
+ and
+ %a{ :href => "http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy"}Nominatim Usage Policy.
%h4
Our contributors
%p Our CC BY-SA licence requires you to “give the Original Author credit reasonable to the medium or means You are utilising”. Individual DMM NRW mappers do not request a credit over and above that to “Digital Media Map NRW contributors”, but where data from a national mapping agency or other major source has been included in Digital Media Map NRW, it may be reasonable to credit them by directly reproducing their credit or by linking to it on this page.
%p.br Australia: Contains suburb data based on Australian Bureau of Statistics data.
- %p.br Austria: Contains data from Stadt Wien (under CC BY) and Land Vorarlberg.
+ %p.br
+ Austria: Contains data from
+ %a{ :href => "http://data.wien.gv.at/"}Stadt Wien
+ (under
+ %a{ :href => "http://creativecommons.org/licenses/by/3.0/at/deed.de"}CC BY
+ ) and
+ %a{ :href => "http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm"}Land Vorarlberg.
%p.br Canada: Contains data from GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), and StatCan (Geography Division, Statistics Canada).
%p.br France: Contains data sourced from Direction Générale des Impôts.
- %p.br Netherlands: Contains © AND data, 2007 (www.and.com)
+ %p.br
+ Netherlands: Contains © AND data, 2007 (
+ %a{ :href => "http://www.and.com/"}www.and.com
+ )
%p.br New Zealand: Contains data sourced from Land Information New Zealand. Crown Copyright reserved.
- %p.br Poland: Contains data from UMP-pcPL maps. Copyright UMP-pcPL contributors. More about OSM's use of UMP data
- %p.br South Africa: Contains data sourced from Chief Directorate: National Geo-Spatial Information, State copyright reserved.
+ %p.br
+ Poland: Contains data from
+ %a{ :href => "http://ump.waw.pl/"}UMP-pcPL maps.
+ Copyright UMP-pcPL contributors.
+ %a{ :href => "http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing"}More about OSM's use of UMP data
+ %p.br
+ South Africa: Contains data sourced from
+ %a{ :href => "http://www.ngi.gov.za/"}Chief Directorate: National Geo-Spatial Information, State copyright reserved.
%p.br United Kingdom: Contains Ordnance Survey data © Crown copyright and database right 2010.
%p.br Inclusion of data in Digital Media Map NRW does not imply that the original data provider endorses Digital Media Map NRW, provides any warranty, or accepts any liability.

0 comments on commit b3dcae3

Please sign in to comment.
Something went wrong with that request. Please try again.