Fixed some links and recommit content

content/en/community/index.html

@@ -6,7 +6,7 @@
 title: e-cidadania community
 ---
 
-<h1 class="pagetitle">Community</h1>
+<h1>Community</h1>
 
 <div class="row">
     <div class="span12">

content/en/demo/index.html

@@ -6,7 +6,7 @@
 title: e-cidadania demo
 ---
 
-<h1 class="pagetitle">Demonstration</h1>
+<h1>Demonstration</h1>
 
 <div class="row">
     <div class="span12">
@@ -17,22 +17,25 @@ <h1 class="pagetitle">Demonstration</h1>
 </div>
 
 <div class="row">
-    <div class="span7">
+    <div class="span12">
+        <h3>Access</h3>
+        <p><strong>URL:</strong> <a href="http://demo.ecidadania.org">demo.ecidadania.org</a></p>
+    </div>
+</div>
+
+<div class="row">
+    <div class="span6">
         <div class="well">
-            <h3>Access</h3><br />
-            <p><strong>URL:</strong> <a href="http://demo.ecidadania.org">demo.ecidadania.org</a></p>
-            <div class="row">
-                <div class="span3">
-                    <h6>Admnistration:</h6>
-                    <p><strong>User:</strong> demoadmin</p>
-                    <p><strong>Password:</strong> demoadmin023</p>
-                </div>
-                <div class="span3">
-                    <h6>Regular user:</h6>
-                    <p><strong>User:</strong> demouser</p>
-                    <p><strong>Password:</strong> demouser023</p>
-                </div>
-            </div>
+            <h4>Administrator</h4>
+            <p><strong>User:</strong> demoadmin</p>
+            <p><strong>Password:</strong> demoadmin023</p>
         </div>
     </div>
-</div>
+    <div class="span6">
+        <div class="well">
+            <h4>Regular user</h4>
+            <p><strong>User:</strong> demouser</p>
+            <p><strong>Password:</strong> demouser023</p>
+        </div>
+    </div>
+</div>

content/en/download/index.html

@@ -6,7 +6,7 @@
 title: e-cidadania | Download
 ---
 
-<h1 class="pagetitle">Download e-cidadania</h1>
+<h1>Download e-cidadania</h1><br>
 
 <h2>Use it</h2>
 
@@ -25,10 +25,10 @@ <h2>Use it</h2>
     <div class="span12">
         <h2>Download it</h2>
         <div class="row">
-            <div class="span5 well">
+            <div class="span5 well" style="padding-top:-15px;">
                 <h3><i class="icon-ok-sign"></i> Stable version</h3>
                 <p>The stable version is recommended for production environments or
-                environments that have stability needs.</p>
+                environments that need to have supporst and stabilty.</p>
                 <p><strong>Latest version</strong>: 0.1.5</p>
                 <h6>Older versions</h6>
                 <ul>
@@ -42,7 +42,7 @@ <h3><i class="icon-exclamation-sign"></i> Development version</h3>
                 <p><i class="icon-download-alt"></i> <strong>Repositories</strong>: <a href="http://github.com/cidadania/e-cidadania">GitHub</a>,
                 <a href="http://gitorious.org/e-cidadania">Gitorious</a>,
                 <a href="http://repo.or.cz/w/e_cidadania.git">Repo.or.cz (Mirror)</a></p>
-                <p><i class="icon-adjust"></i> <strong>Nightly</strong>: 2012-02-16</p>
+                <p><i class="icon-adjust"></i> <strong>Nightly</strong>: 2012-08-28</p>
             </div>
         </div>
     </div>
@@ -52,16 +52,16 @@ <h3><i class="icon-exclamation-sign"></i> Development version</h3>
     <div class="span12">
         <h2><i class="icon-cog"></i> Other tools</h2>
         <p>During the e-cidadania development we have created some scripts and tools that you may find useful not just
-        during the ec-idadania development but in other django projects as well.</p>
+        during the e-cidadania development but in other django projects as well.</p>
         <p>The majority of this tools are little scripts that make easier the maintenance
          of a big platform like, for example, a script that takes the documentation from
          the repository (previously multilanguage) and after that compiles it and puts it
          on the server in three formats each language. In the same way another script
          takes all the language catalogs from your applications and makes/compiles them,
          that way you won't need a central language catalog.</p>
-        <ul>
-            <li>GenDocs 0.2</li>
-            <li>GenLangs 0.1</li>
-        </ul>
+
+        <p>We have gathered all the scripts into a package called <em>e-cidadania toolset</em>,
+        you can find them in <a href="http://github.com/cidadania/e-cidadania-toolset">
+        this repository.</a>
     </div>
 </div>

content/en/index.html

@@ -3,12 +3,12 @@
 default_block: container
 language: en
 uuid: bcc50150-6606-11e1-b86c-0800200c9a66
-title: e-cidadania | Citizen participation
+title: e-cidadania | Open Source Citizen Participation
 ---
 
-<div class="row" style="margin-top:40px;">
+<div class="row">
     <div class="span12">
-        <div id="carousel" class="carousel">
+        <div id="carousel" class="carousel slide">
             <!-- Carousel items -->
             <div class="carousel-inner">
                 <div class="item active">

content/en/meta.yaml

@@ -6,12 +6,12 @@ menu:
         name: Home
         description: Homepage
         type: redirect
-        url: /en
+        url: /en/
     -
         name: Weblog
         description: Weblog
         type: redirect
-        url: /es/blog
+        url: http://blog.ecidadania.org
     -
         name: Community
         description: e-cidadania community
@@ -26,7 +26,7 @@ menu:
         name: Development
         description: e-cidadania Trac
         type: redirect
-        url: http://dev.ecidadania.org
+        url: http://code.ecidadania.org
     -
         name: Documentation
         description: e-cidadania documentation
@@ -63,9 +63,9 @@ contact_links:
         name: Issues
         description: Tickets and issues
         type: redirect
-        url: http://dev.ecidadania.org
+        url: http://code.ecidadania.org
     -
         name: Support
         description: Help and support
         type: redirect
-        url: mailto:support@ecidadania.org
+        url: mailto:info@ecidadania.org

content/es/index.html

@@ -6,7 +6,7 @@
 title: e-cidadania | Participación ciudadana
 ---
 
-<div class="row" style="margin-top:40px;">
+<div class="row">
     <div class="span12">
         <div id="carousel" class="carousel">
             <!-- Carousel items -->
@@ -39,8 +39,8 @@ <h4>Software libre</h4>
         </div>
         <script type="text/javascript">
             $('.carousel').carousel({
-                interval:10000
-            })
+                interval: 5000,
+            });
         </script>
     </div>
 </div>
@@ -73,7 +73,7 @@ <h2>Échanos una mano</h2>
 	    <p>e-cidadania necesita gente para seguir creciendo. No hace falta que seas
 	    programador, ni siquiera hace falta que tengas conocimientos técnicos, puedes
 	    ayudarnos de muchas otras formas.</p>
-	    <p><a href="http://dev.ecidadania.org" class="btn btn-primary btn-large">Colabora</a></p>
+	    <p><a href="http://code.ecidadania.org" class="btn btn-primary btn-large">Colabora</a></p>
     </div>
 </div>
 

content/es/meta.yaml

@@ -6,12 +6,12 @@ menu:
         name: Inicio
         description: Página de inicio
         type: redirect
-        url: /
+        url: /es/
     -
         name: Weblog
         description: Weblog
         type: node
-        url: blog
+        url: http://blog.ecidadania.org
     -
         name: Comunidad
         description: Comunidad
@@ -26,7 +26,7 @@ menu:
         name: Desarrollo
         description: Trac e-cidadania
         type: redirect
-        url: http://dev.ecidadania.org
+        url: http://code.ecidadania.org
     -
         name: Documentación
         description: Documentación de e-cidadania
@@ -63,9 +63,9 @@ contact_links:
         name: Incidencias
         description: Incidencias y problemas
         type: redirect
-        url: http://dev.ecidadania.org
+        url: http://code.ecidadania.org
     -
         name: Soporte
         description: Ayuda y soporte
         type: redirect
-        url: mailto:support@ecidadania.org
+        url: mailto:info@ecidadania.org

content/gl/meta.yaml

@@ -6,12 +6,12 @@ menu:
         name: Inicio
         description: Páxina de inicio
         type: redirect
-        url: /gl
+        url: /gl/
     -
         name: Weblog
         description: Weblog
         type: node
-        url: /es/blog
+        url: http://blog.ecidadania.org
     -
         name: Comunidade
         description: Comunidade
@@ -26,7 +26,7 @@ menu:
         name: Desenvolvemento
         description: Trac e-cidadania
         type: redirect
-        url: http://dev.ecidadania.org
+        url: http://code.ecidadania.org
     -
         name: Documentación
         description: Documentación de e-cidadania
@@ -63,9 +63,9 @@ contact_links:
         name: Incidencias
         description: Incidencias e problemas
         type: redirect
-        url: http://dev.ecidadania.org
+        url: http://code.ecidadania.org
     -
         name: Soporte
         description: Axuda e soporte
         type: redirect
-        url: mailto:support@ecidadania.org
+        url: mailto:info@ecidadania.org