Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added content of 15MMM Toolkit to activities. #9

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion docpad.coffee
Expand Up @@ -99,7 +99,7 @@ docpadConfig = {

plugins:
ghpages:
deployRemote: 'origin'
deployRemote: 'target'
deployBranch: 'master'
downloader:
downloads: [
Expand Down
26 changes: 14 additions & 12 deletions package.json
@@ -1,27 +1,29 @@
{
"name": "twitter-bootstrap.docpad",
"version": "0.10.0",
"description": "Bootstrap skeleton for DocPad. Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.",
"homepage": "https://github.com/bevry/twitter-bootstrap.docpad",
"name": "transformap",
"version": "0.1.0",
"description": "TransforMap is a techno-social architecture to visualise the commons transition.",
"homepage": "http://transformap.co/",
"keywords": [
"docpad-skeleton",
"docpad",
"transition",
"transformation",
"website",
"bootstrap"
"commons"
],
"author": "Bevry Pty Ltd <us@bevry.me> (http://bevry.me)",
"author": "Proximity Ltd <prox@imity.io> (http://imity.io/)",
"maintainers": [
"Benjamin Lupton <b@lupton.cc> (https://github.com/balupton)"
"Thomas Kalka <thomas.kalka@gmail.com> (https://github.com/thoka)",
"Michael Maier <michael.maier@stud.unigraz.at> (https://github.com/species)",
"Jon Richter <jon@allmende.io> (https://github.com/almereyda)"
],
"contributors": [
"Benjamin Lupton <b@lupton.cc> (https://github.com/balupton)"
"Kei Kreutler <kei@ourmachine.net> (https://github.com/keikreutler)"
],
"bugs": {
"url": "https://github.com/docpad/twitter-bootstrap.docpad/issues"
"url": "https://github.com/TransforMap/transformap.github.io/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/docpad/twitter-bootstrap.docpad.git"
"url": "https://github.com/TransforMap/transformap.github.io.git"
},
"engines": {
"node": "0.10",
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/default.html.eco
Expand Up @@ -64,7 +64,7 @@
<% end %>
<li>
<a href="//discourse.transformap.co">
Forum
Agora
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be changed to Discourse or Community (at will) in following the unrepresentative survey at http://discourse.transformap.co/t/domain-name-for-this-discourse-forum/383/11

Forum is just out, sorry.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was a 4:4:4 EQUAL vote for Forum, Discourse and Community. Forum isn't out, so who is about to decide?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm using my veto against Forum. Maybe we should escalate this question to Loomio or DemocracyOS.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

</a>
</li>
</ul>
Expand Down
2 changes: 0 additions & 2 deletions src/partials/map-1.html.md
@@ -1,7 +1,5 @@
<a href="http://demo.transformap.co/greenmap.html#16/48.2084/16.3733">
# Green Map #

<figure>![Green Map](/images/map-green.png)</figure>

View map
</a>
2 changes: 0 additions & 2 deletions src/partials/map-2.html.md
@@ -1,7 +1,5 @@
<a href="http://demo.transformap.co/identities.html#12/47.0782/15.4385">
# Political map #

<figure>![Political Map](/images/map-identities.png)</figure>

View map
</a>
2 changes: 0 additions & 2 deletions src/partials/map-3.html.md
@@ -1,7 +1,5 @@
<a href="http://demo.transformap.co/regional.html#13/47.0721/15.4506">
# Regional Map #

<figure>![Needs-Based Map](/images/map-needs.png)</figure>

View map
</a>
2 changes: 0 additions & 2 deletions src/partials/map-4.html.md
@@ -1,7 +1,5 @@
<a href="http://demo.transformap.co/organic.html#12/48.1373/11.5755">
# Organic Map #

<figure>![Organic Map](/images/map-organic.png)</figure>

View map
</a>
47 changes: 40 additions & 7 deletions src/partials/text-15mmm.html.md
@@ -1,14 +1,47 @@
# 15MMM #

------------------------------
---------

In May 2015, the first TransforMap **global** test mapping “15MMM” (2015 Mapping Month May) is bringing together selected communities from different parts of the world, who partner through TransforMap to meet two goals:
15MMM (#15mmm) is an abbreviation for "Mapping Month May 2015", and consists of a month-long series of mapping events, aimed at testing the current state of development of tools, as well as improving the [community-sourced OpenStreetMap taxonomy](http://wiki.openstreetmap.org/wiki/Proposed_features/TransforMap) of [TransforMap](http://discourse.transformap.co/t/transformap-a-short-introduction/289).

- Contribute their views, experiences and needs to the collective mapping effort of TransforMap to map alternative economies and social innovation.
- Test at a global level and provide feedback about the various TransforMap elements: [taxonomy](http://discourse.transformap.co/t/what-is-the-current-status-of-openstreetmap-proposal/338), development of the [tools](http://discourse.transformap.co/t/which-tools-are-available-for-mapping-month-march/265) we offer so far, communication processes, and more.
With 15MMM, we are inviting local initiatives and networks to come together in different places, and contribute points of interest that are already known or even presenting in different maps.

Read our detailed motivations [here](http://discourse.transformap.co/t/what-is-the-motivation-behind-mapping-month-may/264).
15MMM events will provide the first community-sourced open pool of data, helping to optimize the common taxonomy and build up interoperability between existing mapping sites.

Check the [list of locations](http://discourse.transformap.co/t/list-of-test-mapping-locations/174) where test mappings happen.
We also expect these events to provide an opportunity to bring together and involve various communities of practice and interest towards local mapping in different continents, therefore growing the network around TransforMap and promoting collective action across movements.

If you have questions, check our [FAQ](http://discourse.transformap.co/c/mapping-month-may-2015/faq), maybe it's already answered. If not, create a new topic with your question!
Read our detailed motivations [here](http://discourse.transformap.co/t/what-is-the-motivation-behind-mapping-month-may/264)

Check the [list of locations](http://discourse.transformap.co/t/list-of-test-mapping-locations/174) where test mappings are taking place.

### Tools
15MMM is providing two basic tools for submitting points of interest. You should decide what better fits your mapping event, by understanding the type of participants you expect and the data you want to submit. You can get

| [Semantic Mediawiki](http://mmm.3oe.de/wiki/Main_Page) | [OpenStreetMap id](http://editor.transformap.co) |
| --- | --- |
| *form based* | *map based* |

### Feedback
We welcome all feedback on TransforMap, the tools and the taxonomy. This feedback is what helps us gear our development towards the interest of the growing number of communities involved.

Clicking the links below will open your e-mail program to submit questions or issues to the project developers.

* [Ask a question](mailto:questions@transformap.co)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

* [Submit an issue](mailto:issues%40transformap.co?subject=REPLACE%20with%20your%20issue%20subject&body=%3E%20Please%20describe%20your%20issue%20below%0A%0A%0A%3E%20If%20you%20want%20to%20get%20contacted%20by%20us%2C%20write%20your%20e-mail%20address%20below%3A%0Ayourmail%40yourserver.org%0A%0A%3E%20You%20can%20follow%20your%20and%20other%20submitted%20issues%20by%20visiting%20https%3A%2F%2Ftrello.com%2Fb%2F9R9eccaK%2F15mmm)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/issues/questions/ same reason as above



### Contact
If you don't find your questions answered in the [15MMM FAQ](http://discourse.transformap.co/c/mapping-month-may-2015/faq), or need further immediate support, don't hesitate to contact the regional coordinator for your area:

|Country|Contact person|[Forum handle](http://discourse.transformap.co)|Skype|XMPP|Phone|
|-------|--------------|----------|-----|
|Austria, Germany (Saxony)|Josef Kreitmayer|@josefkreitmayer| - | - | - |
|Canada, France, India|Adrien Labaye|@alabaye| - | - | - |
|Finland, Canada, Greece, India|Silke Helfrich|@silke| - | - | - |
|Italy|Giuliana|@giuliana| - | - | - |
|Germany (Hessen), Hungary, Portugal, Slovenia |Gualter Baptista|@gandhiano|gandhiano|gandhiano@gnulogy.org|+49-151-41251126|
|USA|Thomas Kalka|@toka|-|-|-|


=======
<!-- List of locations should be a map with contact information from below -->
25 changes: 25 additions & 0 deletions src/partials/text-feedback.html.md
@@ -0,0 +1,25 @@

## Feedback

We welcome all feedback on TransforMap, the tools and the taxonomy. This feedback is what helps us gear our development towards the interest of the growing number of communities involved.

Clicking the links below will open your e-mail program to submit questions or issues to the project developers.

* [Ask a question](mailto:questions@transformap.co)
* [Submit an issue](mailto:issues%40transformap.co?subject=REPLACE%20with%20your%20issue%20subject&body=%3E%20Please%20describe%20your%20issue%20below%0A%0A%0A%3E%20If%20you%20want%20to%20get%20contacted%20by%20us%2C%20write%20your%20e-mail%20address%20below%3A%0Ayourmail%40yourserver.org%0A%0A%3E%20You%20can%20follow%20your%20and%20other%20submitted%20issues%20by%20visiting%20https%3A%2F%2Ftrello.com%2Fb%2F9R9eccaK%2F15mmm)

<!-- This email interface is just ugly -->

## Contact

If you don't find your questions answered in the [15MMM FAQ](http://discourse.transformap.co/c/mapping-month-may-2015/faq), or need further immediate support, don't hesitate to contact the regional coordinator for your area:

Country | Contact | [on Discourse](http://discourse.transformap.co/)
--- | --- | ---
Austria, Germany (Saxony) | Josef Kreitmayer | @josefkreitmayer
Canada, France, India | Adrien Labaye | @alabaye
Finland, Canada, Greece | Silke Helfrich | @silke
Italy | Giuliana Giorgi | @giuliana
Germany (Hessen), Hungary, Portugal, Slovenia | Gualter Baptista | @gandhiano
Greece | Dominik Reusser | @dreusser
USA | Thomas Kalka | @toka
9 changes: 9 additions & 0 deletions src/partials/text-toolkit.html.md
@@ -0,0 +1,9 @@

## Toolkit

We are providing you with tools and support to add Points of Interest (POIs) and even more alternative maps to the TransforMap data scape. Consider your participants and their data to decide which of these tools fits best for your mapping event:

[TransforMap&nbsp;Editor](http://editor.transformap.co/) | [MMM&nbsp;Datawiki](http://mmm.3oe.de/) | [uMap](https://umap.openstreetmap.fr/)
--- | --- | ---
*Map the alternatives!* | *Mapping of Mappings.* | *Your own map?*
Directly save to OpenStreetMap (OSM) and strengthen their global knowledge commons. | Forms, tables and lists for Non-OSM data, i.e. hypothetical or non-permanent records. | Create a custom map in five minutes, including im- & export, layers plus styling.
4 changes: 2 additions & 2 deletions src/partials/updates-discourse.html.md
@@ -1,13 +1,13 @@
## **TransforMap Updates** ##

--------------------------------------
-----------------------------

### **[Mapping Month May 2015](http://discourse.transformap.co/t/read-this-first/281)** ###

In May 2015, the first TransforMap global test mapping “15MMM” (2015 Mapping Month May) is bringing together selected communities from different parts of the world, who partner through TransforMap to meet two goals... [Read more](http://discourse.transformap.co/t/read-this-first/281)
*Apr 7, 3:47 PM, [Adrien Labaeye](http://discourse.transformap.co/users/alabaeye/activity)*

--------------------------------------
---

### **[Critical Geographies of the sharing economy at RGS Conference](http://discourse.transformap.co/t/paper-writing-for-critical-geographies-of-the-sharing-economy-at-rgs-conf/158)** ###

Expand Down
36 changes: 33 additions & 3 deletions src/render/activities.html.eco
Expand Up @@ -6,9 +6,39 @@ pageOrder: 2
---

<div id="page-activities">
<section>
<section id="activities">
<div class="container">
<%- @partial('text-15mmm') %>
<div class="row">
<div class="col-sm-12">
<div id="15mmm-activities">
<%- @partial('text-15mmm') %>
</div>
</div>
</div>
</div>
</section>

<section id="toolkit" class="accent">
<div class="container">
<div class="row accent">
<div class="col-sm-12">
<div id="15mmm-toolkit">
<%- @partial('text-toolkit') %>
</div>
</div>
</div>
</div>
</section>

<section id="feedback">
<div class="container">
<div class="row">
<div class="col-sm-12">
<div id="15mmm-feedback">
<%- @partial('text-feedback') %>
</div>
</div>
</div>
</div>
</section>

Expand All @@ -23,4 +53,4 @@ pageOrder: 2
</div>
</div>
</section>
</div>
</div>
32 changes: 20 additions & 12 deletions src/render/index.html.eco
Expand Up @@ -16,24 +16,32 @@ tags: ['news','blog','overview']
</div>
<div class="row">
<div class="col-sm-3">
<div class="map-card">
<%- @partial('map-1') %>
</div>
<a href="http://demo.transformap.co/greenmap.html#16/48.2084/16.3733" target="_blank">
<div class="map-card">
<%- @partial('map-1') %>
</div>
</a>
</div>
<div class="col-sm-3">
<div class="map-card">
<%- @partial('map-2') %>
</div>
<a href="http://demo.transformap.co/identities.html#12/47.0782/15.4385">
<div class="map-card">
<%- @partial('map-2') %>
</div>
</a>
</div>
<div class="col-sm-3">
<div class="map-card">
<%- @partial('map-3') %>
</div>
<a href="http://demo.transformap.co/regional.html#13/47.0721/15.4506">
<div class="map-card">
<%- @partial('map-3') %>
</div>
</a>
</div>
<div class="col-sm-3">
<div class="map-card">
<%- @partial('map-4') %>
</div>
<a href="http://demo.transformap.co/organic.html#12/48.1373/11.5755">
<div class="map-card">
<%- @partial('map-4') %>
</div>
</a>
</div>
</div>
<p class="attribution">
Expand Down
29 changes: 23 additions & 6 deletions src/render/styles/style.css.less
Expand Up @@ -23,6 +23,20 @@ h1, h2, h3, h4, h5, h6 {
hr {
border-color: #6374A6;
}
table {
thead {
font-size: 120%;
}
td, th {
padding-bottom: 0.5em;
}
td {
vertical-align: top;
padding-right: 1em;
}
width: 90%;
margin: auto;
}
footer {
background: #6374A6;
text-align: center;
Expand Down Expand Up @@ -138,11 +152,6 @@ section#about {
}
}
}
section#15mmm-about {
p {
text-align: left !important;
}
}
#about-who-we-are {
background: #6374A6;
padding-bottom: 10px;
Expand All @@ -151,6 +160,12 @@ section#15mmm-about {
background: #51A65E;
}

section#activities, section#toolkit, section#feedback {
a {
font-weight: 700;
}
}

section#updates {
h1, h2, h3, h4, h5, h6 {
text-align: left;
Expand Down Expand Up @@ -192,6 +207,8 @@ Page Styles
text-align: left;
}
}


/*****************
Media Styles
*****************/
Expand Down Expand Up @@ -248,4 +265,4 @@ Media Styles
margin: 25px auto;
width: 70%;
}
}
}