Permalink
Browse files

Merge branch 'release_0.7'

  • Loading branch information...
2 parents 9cd7d5c + 6eca9cb commit e559c0d379e791c13f13fefbe745480cd20a8bd3 @laszlopapp laszlopapp committed Jun 17, 2010
@@ -1,3 +1,4 @@
-<%= render :partial => 'topic', :locals => {:category => "echonomyjam", :image_path => "../images/page/discuss/topics/echonomyJAM.png" }%>
+<%= render :partial => 'topic', :locals => {:category => "klimaherbsttv", :image_path => "../images/page/discuss/topics/klimaherbstTV.png" }%>
+<%= render :partial => 'topic', :locals => {:category => "igf", :image_path => "../images/page/discuss/topics/igf.png" }%>
<%= render :partial => 'topic', :locals => {:category => "realprices", :image_path => "../images/page/discuss/topics/realprices.png" }%>
-<%= render :partial => 'topic', :locals => {:category => "igf", :image_path => "../images/page/discuss/topics/igf.png" }%>
+<%= render :partial => 'topic', :locals => {:category => "echonomyjam", :image_path => "../images/page/discuss/topics/echonomyJAM.png" }%>
View
@@ -388,6 +388,7 @@ de:
</p><p>
Hintergrundinformationen zur Veranstaltung finden Sie auf dem
<a href='http://www.netzwerk-gemeinsinn.net/content/view/625/218' target='_blank'>Blog vom Netzwerk Gemeinsinn</a>.
+ </p>
igf:
name: Internet Governance Forum - Deutschland
short_name: IGF-D
@@ -412,8 +413,25 @@ de:
Den Beitrag der deutschen Stakeholder zum Internet Governance Forum der Vereinten Nationen
vorzubereiten und zu stärken sowie das europäische Internet Governance Forum zu flankieren.
</li>
- <ul>
+ </ul>
</p>
+ klimaherbsttv:
+ name: Klimaherbst TV
+ short_name: Klimaherbst TV
+ teaser: |
+ Diskutieren Sie über das Handlungsfeld „Nutzerverhalten, Lebensstile und Gesundheit“ der kommenden
+ Leitlinie Ökologie der Stadt München mit.
+ description: |
+ <p>
+ In München wird die <strong>Leitlinie Ökologie</strong> zum Klimaschutz dem Stadtrat vorgelegt – zur Zeit läuft die
+ Öffentlichkeitsphase, in der BürgerInnen sich <strong>an den Diskussionen beteiligen</strong> und Stellung
+ beziehen können. Es geht dabei um die Fragen: Zu wie viel Verzicht sind wir bereit?
+ Wie stark wollen wir unser Verkehrssystem umbauen? Wo soll investiert werden?
+ Wie kann die Stadt den Wandel des Lebensstils unterstützen?
+ <br/>
+ Mehr Infos über die Veranstaltungsreihe Klimaherbst TV finden Sie
+ <a href='http://www.klimaherbst.de/hallo-offentlichkeit' target='_blank'>hier</a>.
+ </p>
tooltips:
@@ -125,7 +125,7 @@ de:
esf: Europäische Sozialfonds für Deutschland
bmwi: Bundesministerium für Wirtschaft und Technologie
grm: GründerRegio M
- lmu_ec: LMU Entrepreneurship Center
+ lmu_ec: Ludwig-Maximilians-Universität München - Entrepreneurship Center
tu: Technische Universität Berlin / Zentrum Technik und Gesellschaft
# Static content
@@ -279,7 +279,7 @@ de:
# ECHO SECTION
echo:
title: echo
- subtitle: Die Plattform
+ subtitle: Das Projekt
tabs:
echo: echo
View
@@ -402,9 +402,26 @@ en:
Preparing and enriching the German stakeholders' contribution to the Internet Governance Forum of the
United Nations.
</li>
- <ul>
+ </ul>
</p>
-
+ klimaherbsttv:
+ name: Klimaherbst TV (Climate Autumn TV)
+ short_name: Klimaherbst TV
+ teaser: |
+ Discuss about "usage behavior, lifestyles and health" concerning the ecology guideline being prepared
+ for the city of Munich.
+ description: |
+ <p>
+ In Munich, the <strong>ecology guideline</strong> to climate protection is going to be submitted to the
+ council - currently we are in the public phase, which allows citizens to
+ <strong>participate in the discussions</strong> and to take position.
+ Some of the discussed questions are: How much are we willing to waive?
+ How far do we want to go rebuilding our transport system? Where should be invested?
+ How can the city support the change of lifestyle?
+ <br/>
+ For more infos about the Klimaherbst TV event series, click
+ <a href='http://www.klimaherbst.de/hallo-offentlichkeit' target='_blank'>here</a>.
+ </p>
tooltips:
read_question: 'Go to this question'
@@ -124,7 +124,7 @@ en:
esf: European Social Fund for Germany
bmwi: Federal Ministry of Economics and Technolgy
grm: GründerRegio M
- lmu_ec: LMU Entrepreneurship Center
+ lmu_ec: Ludwig-Maximilians-University Munich - Entrepreneurship Center
tu: Technical University Berlin / Center for Technology and Society
@@ -276,7 +276,7 @@ en:
# Static content for the echo main menu point
echo:
title: echo
- subtitle: The Platform
+ subtitle: The Project
tabs:
echo: echo
View
@@ -415,8 +415,27 @@ es:
Preparing and enriching the German stakeholders' contribution to the Internet Governance Forum of the
United Nations.
</li>
- <ul>
+ </ul>
</p>
+ klimaherbsttv:
+ name: Klimaherbst TV (Climate Autumn TV)
+ short_name: Klimaherbst TV
+ teaser: |
+ Discuss about "usage behavior, lifestyles and health" concerning the ecology guideline being prepared
+ for the city of Munich.
+ description: |
+ <p>
+ In Munich, the <strong>ecology guideline</strong> to climate protection is going to be submitted to the
+ council - currently we are in the public phase, which allows citizens to
+ <strong>participate in the discussions</strong> and to take position.
+ Some of the discussed questions are: How much are we willing to waive?
+ How far do we want to go rebuilding our transport system? Where should be invested?
+ How can the city support the change of lifestyle?
+ <br/>
+ For more infos about the Klimaherbst TV event series, click
+ <a href='http://www.klimaherbst.de/hallo-offentlichkeit' target='_blank'>here</a>.
+ </p>
+
tooltips:
read_question: 'Mirar esta cuestión'
@@ -102,7 +102,7 @@ es:
esf: Fondo Social de la Unión Europea
bmwi: Ministerio Alemán de Tecnologia y Economia
grm: GründerRegio M
- lmu_ec: LMU Entrepreneurship Center
+ lmu_ec: Ludwig-Maximilians-University Munich - Entrepreneurship Center
tu: Technical University Berlin / Center for Technology and Society
@@ -112,7 +112,7 @@ es:
# ECHOLOGIC SECTION
echologic:
title: echologic
- subtitle: El movimiento
+ subtitle: El Movimiento
show:
ms1: echologic es una red de librepensadores. <br/> Nuestro objetivo es la realización de
@@ -260,7 +260,7 @@ es:
# ECHO SECTION
echo:
title: echo
- subtitle: La plataforma
+ subtitle: El Proyecto
tabs:
echo: echo
@@ -472,7 +472,7 @@ es:
# ECHOCRACY SECTION
echocracy:
title: echocracy
- subtitle: Los participantes
+ subtitle: Los Participantes
tabs:
echocracy: echocracy
@@ -626,7 +626,7 @@ es:
# ECHONOMY SECTION
echonomy:
title: echonomy
- subtitle: Los valores
+ subtitle: Los Valores
tabs:
echonomy: echonomy
View
@@ -407,8 +407,27 @@ pt:
Preparing and enriching the German stakeholders' contribution to the Internet Governance Forum of the
United Nations.
</li>
- <ul>
+ </ul>
</p>
+ klimaherbsttv:
+ name: Klimaherbst TV (Climate Autumn TV)
+ short_name: Klimaherbst TV
+ teaser: |
+ Discuss about "usage behavior, lifestyles and health" concerning the ecology guideline being prepared
+ for the city of Munich.
+ description: |
+ <p>
+ In Munich, the <strong>ecology guideline</strong> to climate protection is going to be submitted to the
+ council - currently we are in the public phase, which allows citizens to
+ <strong>participate in the discussions</strong> and to take position.
+ Some of the discussed questions are: How much are we willing to waive?
+ How far do we want to go rebuilding our transport system? Where should be invested?
+ How can the city support the change of lifestyle?
+ <br/>
+ For more infos about the Klimaherbst TV event series, click
+ <a href='http://www.klimaherbst.de/hallo-offentlichkeit' target='_blank'>here</a>.
+ </p>
+
tooltips:
read_question: 'Ir para esta questão'
@@ -101,7 +101,7 @@ pt:
esf: Fundo Social Europeu para a Alemanha
bmwi: Ministério Federal da Economia e Tecnologia
grm: GründerRegio M
- lmu_ec: LMU Entrepreneurship Center
+ lmu_ec: Ludwig-Maximilians-University Munich - Entrepreneurship Center
tu: Technical University Berlin / Center for Technology and Society
@@ -251,7 +251,7 @@ pt:
# Static content for the echo main menu point
echo:
title: echo
- subtitle: A plataforma
+ subtitle: O Projeto
tabs:
echo: echo
View
@@ -4,7 +4,7 @@
}.each_pair { |role, users| users.each { |user| user.has_role!(role) } }
# TOPIC CATEGORIES
-%w(echonomyjam echocracy echo echosocial realprices igf).each { |name| Tag.create(:value => name) }
+%w(echonomyjam echocracy echo echosocial realprices igf klimaherbsttv).each { |name| Tag.create(:value => name) }
###############
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -79,8 +79,8 @@
background: url(../images/page/staticMenu/main_menu_button.png) no-repeat scroll 0 0;
display: block;
height: 67px;
- width: 220px;
- padding: 29px 0 2px 55px;
+ width: 230px;
+ padding: 29px 0 2px 50px;
}
#static_menu a:hover {

0 comments on commit e559c0d

Please sign in to comment.