Skip to content

Commit b466898

Browse files
gandhianogandhiano
committed
Merge pull request #12 from TransforMap/updates
Updates - scrum post
2 parents babeb3e + 49324e2 commit b466898

14 files changed

+177
-54
lines changed

‎docpad.coffee

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ docpadConfig = {
9999

100100
plugins:
101101
ghpages:
102-
deployRemote: 'origin'
102+
deployRemote: 'target'
103103
deployBranch: 'master'
104104
downloader:
105105
downloads: [

‎package.json

+14-12
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
{
2-
"name": "twitter-bootstrap.docpad",
3-
"version": "0.10.0",
4-
"description": "Bootstrap skeleton for DocPad. Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.",
5-
"homepage": "https://github.com/bevry/twitter-bootstrap.docpad",
2+
"name": "transformap",
3+
"version": "0.1.0",
4+
"description": "TransforMap is a techno-social architecture to visualise the commons transition.",
5+
"homepage": "http://transformap.co/",
66
"keywords": [
7-
"docpad-skeleton",
8-
"docpad",
7+
"transition",
8+
"transformation",
99
"website",
10-
"bootstrap"
10+
"commons"
1111
],
12-
"author": "Bevry Pty Ltd <us@bevry.me> (http://bevry.me)",
12+
"author": "Proximity Ltd <prox@imity.io> (http://imity.io/)",
1313
"maintainers": [
14-
"Benjamin Lupton <b@lupton.cc> (https://github.com/balupton)"
14+
"Thomas Kalka <thomas.kalka@gmail.com> (https://github.com/thoka)",
15+
"Michael Maier <michael.maier@stud.unigraz.at> (https://github.com/species)",
16+
"Jon Richter <jon@allmende.io> (https://github.com/almereyda)"
1517
],
1618
"contributors": [
17-
"Benjamin Lupton <b@lupton.cc> (https://github.com/balupton)"
19+
"Kei Kreutler <kei@ourmachine.net> (https://github.com/keikreutler)"
1820
],
1921
"bugs": {
20-
"url": "https://github.com/docpad/twitter-bootstrap.docpad/issues"
22+
"url": "https://github.com/TransforMap/transformap.github.io/issues"
2123
},
2224
"repository": {
2325
"type": "git",
24-
"url": "https://github.com/docpad/twitter-bootstrap.docpad.git"
26+
"url": "https://github.com/TransforMap/transformap.github.io.git"
2527
},
2628
"engines": {
2729
"node": "0.10",

‎src/layouts/default.html.eco

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<% end %>
6565
<li>
6666
<a href="//discourse.transformap.co">
67-
Forum
67+
Agora
6868
</a>
6969
</li>
7070
</ul>

‎src/partials/map-1.html.md

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
<a href="http://demo.transformap.co/greenmap.html#16/48.2084/16.3733">
21
# Green Map #
32

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

65
View map
7-
</a>

‎src/partials/map-2.html.md

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
<a href="http://demo.transformap.co/identities.html#12/47.0782/15.4385">
21
# Political map #
32

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

65
View map
7-
</a>

‎src/partials/map-3.html.md

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
<a href="http://demo.transformap.co/regional.html#13/47.0721/15.4506">
21
# Regional Map #
32

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

65
View map
7-
</a>

‎src/partials/map-4.html.md

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
<a href="http://demo.transformap.co/organic.html#12/48.1373/11.5755">
21
# Organic Map #
32

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

65
View map
7-
</a>

‎src/partials/text-15mmm.html.md

+40-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,47 @@
11
# 15MMM #
22

3-
------------------------------
3+
---------
44

5-
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:
5+
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).
66

7-
- Contribute their views, experiences and needs to the collective mapping effort of TransforMap to map alternative economies and social innovation.
8-
- 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.
7+
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.
98

10-
Read our detailed motivations [here](http://discourse.transformap.co/t/what-is-the-motivation-behind-mapping-month-may/264).
9+
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.
1110

12-
Check the [list of locations](http://discourse.transformap.co/t/list-of-test-mapping-locations/174) where test mappings happen.
11+
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.
1312

14-
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!
13+
Read our detailed motivations [here](http://discourse.transformap.co/t/what-is-the-motivation-behind-mapping-month-may/264)
14+
15+
Check the [list of locations](http://discourse.transformap.co/t/list-of-test-mapping-locations/174) where test mappings are taking place.
16+
17+
### Tools
18+
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
19+
20+
| [Semantic Mediawiki](http://mmm.3oe.de/wiki/Main_Page) | [OpenStreetMap id](http://editor.transformap.co) |
21+
| --- | --- |
22+
| *form based* | *map based* |
23+
24+
### Feedback
25+
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.
26+
27+
Clicking the links below will open your e-mail program to submit questions or issues to the project developers.
28+
29+
* [Ask a question](mailto:questions@transformap.co)
30+
* [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)
31+
32+
33+
### Contact
34+
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:
35+
36+
|Country|Contact person|[Forum handle](http://discourse.transformap.co)|Skype|XMPP|Phone|
37+
|-------|--------------|----------|-----|
38+
|Austria, Germany (Saxony)|Josef Kreitmayer|@josefkreitmayer| - | - | - |
39+
|Canada, France, India|Adrien Labaye|@alabaye| - | - | - |
40+
|Finland, Canada, Greece, India|Silke Helfrich|@silke| - | - | - |
41+
|Italy|Giuliana|@giuliana| - | - | - |
42+
|Germany (Hessen), Hungary, Portugal, Slovenia |Gualter Baptista|@gandhiano|gandhiano|gandhiano@gnulogy.org|+49-151-41251126|
43+
|USA|Thomas Kalka|@toka|-|-|-|
44+
45+
46+
=======
47+
<!-- List of locations should be a map with contact information from below -->

‎src/partials/text-feedback.html.md

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
## Feedback
3+
4+
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.
5+
6+
Clicking the links below will open your e-mail program to submit questions or issues to the project developers.
7+
8+
* [Ask a question](mailto:questions@transformap.co)
9+
* [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)
10+
11+
<!-- This email interface is just ugly -->
12+
13+
## Contact
14+
15+
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:
16+
17+
Country | Contact | [on Discourse](http://discourse.transformap.co/)
18+
--- | --- | ---
19+
Austria, Germany (Saxony) | Josef Kreitmayer | @josefkreitmayer
20+
Canada, France, India | Adrien Labaye | @alabaye
21+
Finland, Canada, Greece | Silke Helfrich | @silke
22+
Italy | Giuliana Giorgi | @giuliana
23+
Germany (Hessen), Hungary, Portugal, Slovenia | Gualter Baptista | @gandhiano
24+
Greece | Dominik Reusser | @dreusser
25+
USA | Thomas Kalka | @toka

‎src/partials/text-toolkit.html.md

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
## Toolkit
3+
4+
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:
5+
6+
[TransforMap&nbsp;Editor](http://editor.transformap.co/) | [MMM&nbsp;Datawiki](http://mmm.3oe.de/) | [uMap](https://umap.openstreetmap.fr/)
7+
--- | --- | ---
8+
*Map the alternatives!* | *Mapping of Mappings.* | *Your own map?*
9+
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.

‎src/partials/updates-discourse.html.md

+11-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
## **TransforMap Updates** ##
22

3-
--------------------------------------
3+
-----------------------------
4+
5+
### **[Using scrum in the production of techno-social commons within Transformap](https://discourse.transformap.co/t/using-scrum-in-the-production-of-techno-social-commons-within-transformap/861)** ###
6+
7+
We started using the scrum methodology on September last year, with the aim of supporting and planning the development of the socio-technical infrastructure of Transformap. Everyone, both technical and non-technical people, is welcome to join scrum teams of TransforMap at the planning meetings. As we work with with, we also shape scrum to be a more convivial and useful tool for Transformap, fitting to the political and cultural specificities of its communities... [Read more](https://discourse.transformap.co/t/using-scrum-in-the-production-of-techno-social-commons-within-transformap/861)
8+
*Jan 15 2016, 1:33 PM, [Gualter Barbas Baptista](https://discourse.transformap.co/users/gandhiano/activity)*
9+
10+
---
411

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

714
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)
8-
*Apr 7, 3:47 PM, [Adrien Labaeye](http://discourse.transformap.co/users/alabaeye/activity)*
15+
*Apr 7 2015, 3:47 PM, [Adrien Labaeye](http://discourse.transformap.co/users/alabaeye/activity)*
916

10-
--------------------------------------
17+
---
1118

1219
### **[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)** ###
1320

1421
Main question: how to keep track of alternative economies (what and where and when) as by definition they are often running under the radar, outside of the market, without support by public institutions... [Read more](http://discourse.transformap.co/t/paper-writing-for-critical-geographies-of-the-sharing-economy-at-rgs-conf/158)
15-
*Feb 10, 4:52 PM, [Adrien Labaeye](http://discourse.transformap.co/users/alabaeye/activity)*
22+
*Feb 10 2015, 4:52 PM, [Adrien Labaeye](http://discourse.transformap.co/users/alabaeye/activity)*

‎src/render/activities.html.eco

+33-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,39 @@ pageOrder: 2
66
---
77

88
<div id="page-activities">
9-
<section>
9+
<section id="activities">
1010
<div class="container">
11-
<%- @partial('text-15mmm') %>
11+
<div class="row">
12+
<div class="col-sm-12">
13+
<div id="15mmm-activities">
14+
<%- @partial('text-15mmm') %>
15+
</div>
16+
</div>
17+
</div>
18+
</div>
19+
</section>
20+
21+
<section id="toolkit" class="accent">
22+
<div class="container">
23+
<div class="row accent">
24+
<div class="col-sm-12">
25+
<div id="15mmm-toolkit">
26+
<%- @partial('text-toolkit') %>
27+
</div>
28+
</div>
29+
</div>
30+
</div>
31+
</section>
32+
33+
<section id="feedback">
34+
<div class="container">
35+
<div class="row">
36+
<div class="col-sm-12">
37+
<div id="15mmm-feedback">
38+
<%- @partial('text-feedback') %>
39+
</div>
40+
</div>
41+
</div>
1242
</div>
1343
</section>
1444

@@ -23,4 +53,4 @@ pageOrder: 2
2353
</div>
2454
</div>
2555
</section>
26-
</div>
56+
</div>

‎src/render/index.html.eco

+20-12
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,32 @@ tags: ['news','blog','overview']
1616
</div>
1717
<div class="row">
1818
<div class="col-sm-3">
19-
<div class="map-card">
20-
<%- @partial('map-1') %>
21-
</div>
19+
<a href="http://demo.transformap.co/greenmap.html#16/48.2084/16.3733" target="_blank">
20+
<div class="map-card">
21+
<%- @partial('map-1') %>
22+
</div>
23+
</a>
2224
</div>
2325
<div class="col-sm-3">
24-
<div class="map-card">
25-
<%- @partial('map-2') %>
26-
</div>
26+
<a href="http://demo.transformap.co/identities.html#12/47.0782/15.4385">
27+
<div class="map-card">
28+
<%- @partial('map-2') %>
29+
</div>
30+
</a>
2731
</div>
2832
<div class="col-sm-3">
29-
<div class="map-card">
30-
<%- @partial('map-3') %>
31-
</div>
33+
<a href="http://demo.transformap.co/regional.html#13/47.0721/15.4506">
34+
<div class="map-card">
35+
<%- @partial('map-3') %>
36+
</div>
37+
</a>
3238
</div>
3339
<div class="col-sm-3">
34-
<div class="map-card">
35-
<%- @partial('map-4') %>
36-
</div>
40+
<a href="http://demo.transformap.co/organic.html#12/48.1373/11.5755">
41+
<div class="map-card">
42+
<%- @partial('map-4') %>
43+
</div>
44+
</a>
3745
</div>
3846
</div>
3947
<p class="attribution">

‎src/render/styles/style.css.less

+23-6
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,20 @@ h1, h2, h3, h4, h5, h6 {
2323
hr {
2424
border-color: #6374A6;
2525
}
26+
table {
27+
thead {
28+
font-size: 120%;
29+
}
30+
td, th {
31+
padding-bottom: 0.5em;
32+
}
33+
td {
34+
vertical-align: top;
35+
padding-right: 1em;
36+
}
37+
width: 90%;
38+
margin: auto;
39+
}
2640
footer {
2741
background: #6374A6;
2842
text-align: center;
@@ -138,11 +152,6 @@ section#about {
138152
}
139153
}
140154
}
141-
section#15mmm-about {
142-
p {
143-
text-align: left !important;
144-
}
145-
}
146155
#about-who-we-are {
147156
background: #6374A6;
148157
padding-bottom: 10px;
@@ -151,6 +160,12 @@ section#15mmm-about {
151160
background: #51A65E;
152161
}
153162

163+
section#activities, section#toolkit, section#feedback {
164+
a {
165+
font-weight: 700;
166+
}
167+
}
168+
154169
section#updates {
155170
h1, h2, h3, h4, h5, h6 {
156171
text-align: left;
@@ -192,6 +207,8 @@ Page Styles
192207
text-align: left;
193208
}
194209
}
210+
211+
195212
/*****************
196213
Media Styles
197214
*****************/
@@ -248,4 +265,4 @@ Media Styles
248265
margin: 25px auto;
249266
width: 70%;
250267
}
251-
}
268+
}

0 commit comments

Comments
 (0)