Skip to content

Commit

Permalink
Merge branch 'add/projects-page' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
sachalifs committed Oct 21, 2014
2 parents ddf8dae + d37ac61 commit 759808e
Show file tree
Hide file tree
Showing 11 changed files with 101 additions and 3 deletions.
1 change: 1 addition & 0 deletions lib/boot/boot.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ require('homepage');
require('proposal');
require('law');
require('about');
require('projects');
require('signin');
require('signup');
require('forgot');
Expand Down
1 change: 1 addition & 0 deletions lib/boot/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"proposal",
"law",
"about",
"projects",
"signin",
"signup",
"forgot",
Expand Down
6 changes: 6 additions & 0 deletions lib/boot/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,12 @@ app.use('/forgot', require('lib/forgot-api'));

app.use('/about', require('lib/about'));

/*
* Projects page explanatory
*/

app.use('/projects', require('lib/about'));

/*
* Stats routes
*/
Expand Down
6 changes: 4 additions & 2 deletions lib/header/template.jade
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@
span= t('header.signup')
a(href='/about').login.pull-left
span.hiw= t('header.about')
a(href='/projects').login.pull-left
span.hiw= t('header.projects')

a.login.pull-left(href=config['organization url'], target='_blank')
span= config['organization name']
//- a.login.pull-left(href=config['organization url'], target='_blank')
//- span= config['organization name']
//- a.login.pull-left(href='#', id='feedback')
//- span= t('header.feedback')
17 changes: 17 additions & 0 deletions lib/projects/component.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"name": "projects",
"description": "projects page",
"dependencies": {
"component/bus": "^0.0.2",
"component/dom": "0.7.1",
"visionmedia/page.js": "1.3.7"
},
"locals": [
"laws",
"view"
],
"scripts": [ "projects.js", "view.js" ],
"styles": [ "styles.styl" ],
"templates": [ "template.jade" ],
"main": "projects.js"
}
8 changes: 8 additions & 0 deletions lib/projects/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/**
* Module dependencies.
*/

var express = require('express');
var app = module.exports = express();

app.get('/', require('lib/layout'));
18 changes: 18 additions & 0 deletions lib/projects/projects.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/**
* Module dependencies.
*/

var Projects = require('./view');
var bus = require('bus');
var o = require('dom');
var page = require('page');
var laws = require('laws');

page('/projects', laws.middleware, function(ctx, next) {
bus.emit('page:render');

var projects = new Projects(laws.get());
projects.replace('#content');

o(document.body).addClass('projects');
});
9 changes: 9 additions & 0 deletions lib/projects/styles.styl
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#projects
margin 30px auto

ul.projects-container
padding 0
list-style none

li
margin-bottom 6px
8 changes: 8 additions & 0 deletions lib/projects/template.jade
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#projects.inner-container
h1=t('projects.title.1')
p=t('projects.paragraph.1.1')
p!=t('projects.paragraph.1.2')
h2=t('projects.title.2')
ul.projects-container
- each project in projects
li.project: a(href='/law/#{project.id}')=project.mediaTitle
22 changes: 22 additions & 0 deletions lib/projects/view.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/**
* Module dependencies.
*/

var template = require('./template');
var View = require('view');

function Projects(projects) {
if (!(this instanceof Projects)) {
return new Projects();
}

View.call(this, template, { projects: projects });
}

View(Projects);

/**
* Expose Projects
*/

module.exports = Projects;
8 changes: 7 additions & 1 deletion lib/translations/lib/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"header.settings": "Configuración",
"header.feedback": "Sugerencias",
"header.about": "¿Qué es DEMOS?",
"header.projects": "Los proyectos",

"how it works.title": "¿Cómo funciona?",
"how it works.tell-more": "Contame más",
Expand Down Expand Up @@ -364,5 +365,10 @@
"about.title.2": "Fechas y resultados",
"about.paragraph.2.1": "Los 20 proyectos fueron distribuidos proporcionalmente de acuerdo al número de diputados de los distintos bloques parlamentarios, con un mínimo de 1 proyecto",
"about.title.3": "¿Qué es DemocracyOS?",
"about.paragraph.3.1": "<strong>DemocracyOS</strong> es una plataforma online para la información, deliberación y votación de propuestas en la que se busca estimular los mejores argumentos para arribar a mejores decisiones, de forma colectiva. <strong>DemocracyOS</strong> se adapta a las necesidades de cualquier organización que necesite difundir, discutir y decidir soluciones para problemas complejos. <strong>DemocracyOS</strong> es de código abierto y puede ser utilizado, modificado y redistribuído libremente."
"about.paragraph.3.1": "<strong>DemocracyOS</strong> es una plataforma online para la información, deliberación y votación de propuestas en la que se busca estimular los mejores argumentos para arribar a mejores decisiones, de forma colectiva. <strong>DemocracyOS</strong> se adapta a las necesidades de cualquier organización que necesite difundir, discutir y decidir soluciones para problemas complejos. <strong>DemocracyOS</strong> es de código abierto y puede ser utilizado, modificado y redistribuído libremente.",

"projects.title.1": "¿Cómo se eligieron los proyectos?",
"projects.paragraph.1.1": "Los 20 proyectos fueron distribuidos proporcionalmente de acuerdo al número de diputados de los distintos bloques parlamentarios, con un mínimo de 1 proyecto por bloque. Por eso, todos los bloques están representados pero aquellos que tienen una representación mayor cuentan con más cantidad de proyectos.",
"projects.paragraph.1.2": "Dentro de cada bloque, los proyectos fueron nominados por su Presidencia.",
"projects.title.2": "¿Cuáles son todos los proyectos?"
}

0 comments on commit 759808e

Please sign in to comment.