consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes conflicts with master

Browse Source
This commit is contained in:
rgarcia
2015-10-14 15:48:55 +02:00
parent 68b866171b 77bacdc3ec
commit e08ed41e98
63 changed files with 1394 additions and 1677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@@ -43,7 +43,7 @@ gem 'paranoia'
gem 'rinku', require: 'rails_rinku'
gem 'savon'
gem 'dalli'
gem 'rollbar', '~> 2.3.0'
gem 'rollbar', '~> 2.4.0'
gem 'delayed_job_active_record', '~> 4.1.0'
gem 'daemons'
gem 'devise-async'
@@ -72,7 +72,7 @@ group :development, :test do
gem 'i18n-tasks'
gem 'capistrano', '3.4.0', require: false
gem "capistrano-bundler", '1.1.4', require: false
gem "capistrano-rails", '1.1.3', require: false
gem "capistrano-rails", '1.1.4', require: false
gem "capistrano-rvm", require: false
gem 'capistrano3-delayed-job', '~> 1.0'
gem "bullet"

47
Gemfile.lock
View File

@@ -70,11 +70,11 @@ GEM
debug_inspector (>= 0.0.1)
browser (1.0.1)
builder (3.2.2)
bullet (4.14.7)
bullet (4.14.9)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.9.0)
byebug (6.0.2)
cancancan (1.12.0)
cancancan (1.13.1)
capistrano (3.4.0)
i18n
rake (>= 10.0.0)
@@ -82,13 +82,13 @@ GEM
capistrano-bundler (1.1.4)
capistrano (~> 3.1)
sshkit (~> 1.2)
capistrano-rails (1.1.3)
capistrano-rails (1.1.4)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
capistrano-rvm (0.1.2)
capistrano (~> 3.0)
sshkit (~> 1.2)
capistrano3-delayed-job (1.4.0)
capistrano3-delayed-job (1.4.1)
capistrano (>= 3.0.0)
capybara (2.5.0)
mime-types (>= 1.16)
@@ -97,7 +97,7 @@ GEM
rack-test (>= 0.5.4)
xpath (~> 2.0)
chronic (0.10.2)
ckeditor (4.1.3)
ckeditor (4.1.4)
cocaine
orm_adapter (~> 0.5.0)
climate_control (0.0.3)
@@ -113,7 +113,7 @@ GEM
execjs
coffee-script-source (1.9.1.1)
colorize (0.7.7)
coveralls (0.8.2)
coveralls (0.8.3)
json (~> 1.8)
rest-client (>= 1.6.8, < 2)
simplecov (~> 0.10.0)
@@ -139,7 +139,7 @@ GEM
devise (~> 3.2)
diff-lcs (1.2.5)
docile (1.1.5)
domain_name (0.5.24)
domain_name (0.5.25)
unf (>= 0.0.5, < 1.0.0)
easy_translate (0.5.0)
json
@@ -158,9 +158,9 @@ GEM
railties (>= 3.0.0)
faker (1.5.0)
i18n (~> 0.5)
faraday (0.9.1)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
foundation-rails (5.5.2.1)
foundation-rails (5.5.3.2)
railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5)
foundation_rails_helper (1.0.0)
@@ -175,12 +175,12 @@ GEM
geocoder (1.2.11)
globalid (0.3.6)
activesupport (>= 4.1.0)
groupdate (2.4.0)
groupdate (2.5.0)
activesupport (>= 3)
gyoku (1.3.1)
builder (>= 2.1.2)
hashie (3.4.2)
highline (1.7.6)
highline (1.7.8)
http-cookie (1.0.2)
domain_name (~> 0.5)
httpi (2.4.1)
@@ -220,13 +220,13 @@ GEM
mime-types (>= 1.16, < 3)
mime-types (2.6.2)
mini_portile (0.6.2)
minitest (5.8.0)
minitest (5.8.1)
multi_json (1.11.2)
multi_xml (0.5.5)
multipart-post (2.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.2)
net-ssh (3.0.1)
netrc (0.10.3)
newrelic_rpm (3.13.2.302)
nokogiri (1.6.6.2)
@@ -239,13 +239,12 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
oj (2.12.14)
omniauth (1.2.2)
hashie (>= 1.2, < 4)
rack (~> 1.0)
omniauth-facebook (2.0.1)
omniauth-oauth2 (~> 1.2)
omniauth-google-oauth2 (0.2.7)
omniauth-google-oauth2 (0.2.8)
addressable (~> 2.3)
jwt (~> 1.0)
multi_json (~> 1.3)
@@ -264,7 +263,7 @@ GEM
paranoia (2.1.3)
activerecord (~> 4.0)
pg (0.18.3)
poltergeist (1.6.0)
poltergeist (1.7.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
multi_json (~> 1.0)
@@ -309,8 +308,8 @@ GEM
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rinku (1.7.3)
rollbar (2.3.0)
oj (~> 2.12.14)
rollbar (2.4.0)
multi_json
rspec (3.3.0)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
@@ -333,7 +332,7 @@ GEM
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
ruby-progressbar (1.7.5)
sass (3.4.18)
sass (3.4.19)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
@@ -356,8 +355,8 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
spring (1.4.0)
sprockets (3.3.4)
rack (~> 1.0)
sprockets (3.4.0)
rack (> 1, < 3)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
@@ -389,7 +388,7 @@ GEM
rack
raindrops (~> 0.7)
uniform_notifier (1.9.0)
user_agent_parser (2.2.0)
user_agent_parser (2.3.0)
uuidtools (2.1.5)
warden (1.2.3)
rack (>= 1.0)
@@ -423,7 +422,7 @@ DEPENDENCIES
cancancan
capistrano (= 3.4.0)
capistrano-bundler (= 1.1.4)
capistrano-rails (= 1.1.3)
capistrano-rails (= 1.1.4)
capistrano-rvm
capistrano3-delayed-job (~> 1.0)
capybara
@@ -461,7 +460,7 @@ DEPENDENCIES
rails (= 4.2.4)
responders
rinku
rollbar (~> 2.3.0)
rollbar (~> 2.4.0)
rspec-rails (~> 3.0)
sass-rails (~> 5.0)
savon

4
README.md
View File

@@ -11,9 +11,7 @@ Este es el repositorio de código abierto de la Aplicación de Participación Ci
## Estado del proyecto
El desarrollo de esta aplicación comenzó el [15 de Julio de 2015](https://github.com/AyuntamientoMadrid/participacion/commit/8db36308379accd44b5de4f680a54c41a0cc6fc6)
Este proyecto está en las primeras fases de su desarrollo. Las funcionalidades actualmente presentes en el código, así como sus nombres, deben considerarse como provisionales.
El desarrollo de esta aplicación comenzó el [15 de Julio de 2015](https://github.com/AyuntamientoMadrid/participacion/commit/8db36308379accd44b5de4f680a54c41a0cc6fc6) y el código fue puesto en producción el día 7 de Septiembre de 2015 en [decide.madrid.es](https://decide.madrid.es). Desde entonces se le añaden mejoras y funcionalidades constantemente. La evolución y futura lista de funcionalidades a implementar se pueden consultar en la lista de [tareas por hacer](https://github.com/AyuntamientoMadrid/participacion/issues).
## Tecnología

4
README_EN.md
View File

@@ -11,9 +11,7 @@ This is the opensource code repository of Madrid City government eParticipation
## Current state
Development started on [2015 July 15th](https://github.com/AyuntamientoMadrid/participacion/commit/8db36308379accd44b5de4f680a54c41a0cc6fc6)
The project is in its early stages. Features currently present in the code (and their names) are subject to change.
Development started on [2015 July 15th](https://github.com/AyuntamientoMadrid/participacion/commit/8db36308379accd44b5de4f680a54c41a0cc6fc6). Code was deployed to production on 2015 september 7th to [decide.madrid.es](https://decide.madrid.es). Since then new features are added often. You can take a look at a roadmap and future features in the [open issues list](https://github.com/AyuntamientoMadrid/participacion/issues).
## Tech stack

72
app/assets/fonts/icons.svg
View File

@@ -7,38 +7,42 @@
<font-face font-family="icons" units-per-em="512" ascent="480" descent="-32"/>
<missing-glyph horiz-adv-x="512" />
<glyph unicode="&#97;" d="M399 302c0-3-1-5-3-7l-133-133c-2-2-5-3-7-3-2 0-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l15 15c1 1 4 2 6 2 3 0 5-1 7-2l112-113 112 113c2 1 4 2 7 2 2 0 5-1 6-2l15-15c2-2 3-4 3-6z"/>
<glyph unicode="&#98;" d="M344 357c0-3-1-5-3-7l-112-112 112-113c2-1 3-4 3-6 0-3-1-5-3-7l-14-14c-2-2-5-3-7-3-2 0-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3 2 0 5-1 7-3l14-14c2-2 3-4 3-6z"/>
<glyph unicode="&#99;" d="M335 238c0-3-1-5-3-7l-133-133c-2-2-5-3-7-3-2 0-5 1-7 3l-14 14c-2 2-3 4-3 7 0 2 1 5 3 6l112 113-112 112c-2 2-3 4-3 7 0 2 1 4 3 6l14 14c2 2 5 3 7 3 2 0 5-1 7-3l133-133c2-2 3-4 3-6z"/>
<glyph unicode="&#100;" d="M399 174c0-3-1-5-3-7l-15-14c-1-2-4-3-6-3-3 0-5 1-7 3l-112 112-112-112c-2-2-4-3-7-3-2 0-5 1-6 3l-15 14c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3 2 0 5-1 7-3l133-133c2-2 3-4 3-6z"/>
<glyph unicode="&#101;" d="M201 402c-29 0-56-5-82-15-25-9-45-23-60-40-15-17-22-35-22-54 0-16 5-31 15-46 10-14 24-27 42-37l28-16-10-24c6 4 12 7 18 11l12 9 15-3c15-3 30-4 44-4 29 0 57 5 82 15 25 10 45 23 60 40 15 17 23 35 23 55 0 19-8 37-23 54-15 17-35 31-60 40-25 10-53 15-82 15z m0 37c37 0 70-7 101-20 31-13 56-31 73-53 18-22 27-47 27-73 0-27-9-51-27-74-17-22-42-40-73-53-31-13-64-20-101-20-16 0-33 2-50 5-24-17-50-29-80-37-6-1-15-3-24-4l-1 0c-2 0-4 0-6 2-2 2-3 4-3 6 0 1 0 1 0 2 0 1 0 1 0 2 0 0 0 1 0 1l1 2c0 0 0 0 1 1 1 1 1 2 1 2 0 0 1 0 1 1 1 1 2 2 2 2 1 1 3 3 6 7 4 3 6 6 8 8 1 2 3 5 6 8 3 4 5 8 7 11 2 4 4 8 6 13-24 14-42 31-56 51-13 20-20 41-20 64 0 26 9 51 27 73 18 22 42 40 73 53 31 13 65 20 101 20z m235-334c2-5 4-9 6-13 2-4 4-7 7-11 3-3 5-6 6-8 2-2 4-5 8-8 3-4 5-6 6-8 1 0 1 0 2-1 0-1 1-1 1-1 0-1 1-1 1-2 0 0 1-1 1-1l1-2c0 0 0 0 0-1 1-2 1-2 0-2 0 0 0-1 0-2 0-3-2-5-4-6-1-2-4-3-6-2-9 1-18 2-24 4-30 8-56 20-80 37-17-3-34-5-50-5-52 0-97 13-135 38 11-1 19-1 25-1 31 0 60 4 88 13 29 8 54 20 76 36 24 18 42 38 55 61 12 23 19 47 19 73 0 14-2 29-7 43 25-14 44-30 59-51 14-20 21-42 21-66 0-22-7-44-20-64-14-20-32-36-56-50z"/>
<glyph unicode="&#102;" d="M481 395c-13-18-28-34-46-47 0-3 0-7 0-12 0-25-3-50-11-74-7-25-18-49-33-71-14-23-32-43-52-61-21-17-45-31-74-41-29-11-60-16-92-16-52 0-99 14-142 42 7-1 14-2 22-2 43 0 81 14 115 40-20 0-38 6-54 18-16 12-27 27-33 46 7-1 13-2 18-2 8 0 16 1 24 4-21 4-39 15-53 31-14 17-21 37-21 59l0 1c13-7 27-11 42-11-13 8-23 19-30 32-8 14-11 29-11 44 0 17 4 33 12 47 23-28 51-51 84-68 33-17 69-27 107-29-2 8-3 15-3 22 0 25 9 47 27 65 18 18 40 27 66 27 26 0 49-10 67-29 21 4 40 11 59 22-7-22-21-39-41-51 18 2 35 7 53 14z"/>
<glyph unicode="&#103;" d="M55 37l402 0 0 292-402 0z m110 347l0 82c0 3-1 5-3 7-2 2-4 2-7 2l-18 0c-3 0-5 0-6-2-2-2-3-4-3-7l0-82c0-3 1-5 3-7 1-1 3-2 6-2l18 0c3 0 5 1 7 2 2 2 3 4 3 7z m219 0l0 82c0 3-1 5-3 7-1 2-3 2-6 2l-18 0c-3 0-5 0-7-2-2-2-3-4-3-7l0-82c0-3 1-5 3-7 2-1 4-2 7-2l18 0c3 0 5 1 6 2 2 2 3 4 3 7z m110 18l0-365c0-10-4-19-11-26-7-7-16-11-26-11l-402 0c-10 0-19 4-26 11-7 7-11 16-11 26l0 365c0 10 4 19 11 26 7 7 16 11 26 11l36 0 0 27c0 13 5 24 14 33 9 9 20 13 32 13l18 0c13 0 24-4 33-13 9-9 13-20 13-33l0-27 110 0 0 27c0 13 4 24 13 33 9 9 20 13 33 13l18 0c12 0 23-4 32-13 9-9 14-20 14-33l0-27 36 0c10 0 19-4 26-11 7-7 11-16 11-26z"/>
<glyph unicode="&#105;" d="M453 425c-1 9-8 16-17 16l-360 0 0 0c-9 0-16-7-17-16l0 0 0-288 0 0c2-8 9-14 17-14l0 0 59 0 0-35c0-9 8-17 17-17 6 0 11 3 14 8l45 44 225 0c8 0 15 6 17 14l0 0 0 288z m-308-172c-15 0-29 12-29 34 0 25 13 47 34 61l0 0c1 1 1 1 2 1 1 0 1 0 2-1l0 0 14-9 0 0c1 0 1-1 1-3 0-1 0-2-2-3l0 0c0 0 0 0 0 0 0 0 0 0 0 0-10-6-22-19-25-31 2 1 4 1 7 1 13 0 23-10 23-24 0-14-12-26-27-26z m68 0c-15 0-29 12-29 34 0 25 13 47 34 61l0 0c0 1 1 1 2 1 0 0 1 0 2-1l0 0 14-9 0 0c1 0 1-1 1-3 0-1-1-2-2-3l0 0c0 0 0 0 0 0 0 0 0 0 0 0-11-6-22-19-25-31 1 1 4 1 7 1 12 0 22-10 22-24 0-14-12-26-26-26z m81-37l0 0c0 0-1-1-2-1 0 0-1 1-2 1l0 0-14 9 0 0c-1 1-1 2-1 3 0 1 1 3 2 3l0 0c0 0 0 0 0 0 0 0 0 0 0 0 11 6 22 20 25 31-1 0-4-1-7-1-12 0-22 10-22 24 0 15 12 27 26 27 15 0 29-13 29-34 0-25-13-48-34-62z m68 0l0 0c-1 0-1-1-2-1-1 0-1 1-2 1l0 0-14 9 0 0c-1 1-1 2-1 3 0 1 0 3 2 3l0 0c0 0 0 0 0 0 0 0 0 0 0 0 10 6 22 20 25 31-2 0-4-1-7-1-13 0-23 10-23 24 0 15 12 27 27 27 15 0 29-13 29-34 0-25-13-48-34-62z"/>
<glyph unicode="&#106;" d="M91 347c0-5-1-9-5-12-4-4-8-6-13-6-5 0-9 2-13 6-3 3-5 7-5 12 0 6 2 10 5 13 4 4 8 6 13 6 5 0 9-2 13-6 4-3 5-7 5-13z m46-146l0 183c0 5-2 9-5 13-4 3-8 5-13 5l-82 0c-5 0-10-2-13-5-4-4-6-8-6-13l0-183c0-5 2-9 6-13 3-3 8-5 13-5l82 0c5 0 9 2 13 5 3 4 5 8 5 13z m323 43c10-12 15-26 15-43 0-15-5-28-16-38-11-11-24-17-38-17l-80 0c1-2 2-5 3-7 0-1 2-4 3-6 1-2 2-4 3-5 3-7 6-12 7-16 2-4 4-10 6-17 2-7 3-15 3-22 0-4 0-8 0-11-1-3-1-7-2-13-1-6-2-10-3-14-2-4-4-8-7-13-3-5-7-9-12-12-4-3-10-5-17-7-7-2-15-3-23-3-5 0-10 2-13 5-4 4-7 9-10 15-3 5-4 10-5 15-1 4-3 10-4 17-2 8-3 14-4 17-1 4-2 8-5 14-2 6-5 10-9 14-6 6-16 18-29 34-9 12-19 24-28 35-10 11-18 16-22 17-5 0-9 2-12 5-4 4-6 8-6 13l0 183c0 5 2 9 6 13 3 3 8 5 13 5 6 0 21 5 45 13 15 5 26 9 34 11 9 3 20 5 35 8 15 3 29 5 41 5l37 0c25-1 44-8 56-22 11-14 16-31 14-52 8-7 13-16 16-27 3-12 3-23 0-33 8-12 13-25 12-40 0-6-1-13-4-21z"/>
<glyph unicode="&#107;" d="M91 128c0 5-1 9-5 13-4 3-8 5-13 5-5 0-9-2-13-5-3-4-5-8-5-13 0-5 2-9 5-13 4-4 8-5 13-5 5 0 9 1 13 5 4 4 5 8 5 13z m46 146l0-183c0-5-2-9-5-12-4-4-8-6-13-6l-82 0c-5 0-10 2-13 6-4 3-6 7-6 12l0 183c0 5 2 10 6 13 3 4 8 6 13 6l82 0c5 0 9-2 13-6 3-3 5-8 5-13z m338 0c0-16-5-30-15-42 3-9 4-16 4-22 1-14-4-28-12-39 3-11 3-22 0-34-3-10-8-19-16-26 2-22-3-39-14-52-12-15-31-22-56-22l-37 0c-12 0-26 1-41 4-15 3-26 6-35 8-8 3-19 7-34 12-24 8-39 12-45 12-5 0-10 2-13 6-4 3-6 7-6 12l0 184c0 4 2 8 6 12 3 4 7 5 12 6 4 0 12 6 22 17 9 11 19 22 28 34 13 17 23 28 29 35 4 3 7 8 9 13 3 6 4 11 5 14 1 4 2 9 4 17 1 8 3 14 4 18 1 4 2 9 5 15 3 5 6 10 10 14 3 4 8 5 13 5 8 0 16-1 23-3 7-2 13-4 17-7 5-3 9-7 12-12 3-4 5-9 7-12 1-4 2-9 3-15 1-5 1-10 2-13 0-2 0-6 0-11 0-7-1-14-3-21-2-8-4-13-5-18-2-4-5-9-8-16-1-1-2-2-3-5-1-2-3-4-3-6-1-2-2-4-3-7l80 0c14 0 27-5 38-16 11-11 16-24 16-39z"/>
<glyph unicode="&#108;" d="M477 350c0-7-2-14-8-19l-206-207-39-39c-6-5-12-8-20-8-7 0-14 3-19 8l-142 142c-6 6-8 12-8 20 0 7 2 14 8 19l38 39c6 5 12 8 20 8 7 0 14-3 19-8l84-84 188 188c5 5 12 8 19 8 8 0 14-3 20-8l38-39c6-6 8-12 8-20z"/>
<glyph unicode="&#109;" d="M140 73l26 26-67 67-26-26 0-30 37 0 0-37z m150 265c0 4-2 7-7 7-1 0-3-1-4-2l-155-155c-2-2-2-3-2-5 0-4 2-6 6-6 2 0 4 0 5 2l155 154c1 2 2 3 2 5z m-16 55l119-119-238-237-118 0 0 118z m195-27c0-10-3-19-10-26l-48-47-118 118 47 48c7 7 15 10 26 10 10 0 18-3 26-10l67-67c7-8 10-16 10-26z"/>
<glyph unicode="&#110;" d="M494 327c0-4-3-9-8-14l-103-101 24-143c0-1 0-3 0-5 0-4-1-8-3-10-2-3-4-5-8-5-4 0-8 2-12 4l-128 67-128-67c-4-2-8-4-12-4-4 0-7 2-9 5-2 2-3 6-3 10 0 1 0 3 1 5l24 143-104 101c-4 6-7 10-7 14 0 7 6 12 16 13l144 21 64 130c4 8 8 12 14 12 6 0 10-4 14-12l64-130 144-21c10-1 16-6 16-13z"/>
<glyph unicode="&#111;" d="M410 203l-80 38-34 16c15 9 27 24 35 41 6 14 10 29 10 46 0 9-1 18-4 27-10 41-42 72-81 72-38 0-70-30-81-70-2-9-4-19-4-29 0-18 4-34 11-49 8-16 20-30 35-39l-32-15-83-38c-7-4-12-12-12-21l0-91c0-12 8-22 19-22l294 0c11 0 19 10 19 22l0 91c0 9-4 17-12 21z"/>
<glyph unicode="&#113;" d="M329 256c0 20-7 37-21 52-15 14-32 21-52 21-20 0-37-7-52-21-14-15-21-32-21-52 0-20 7-37 21-52 15-14 32-21 52-21 20 0 37 7 52 21 14 15 21 32 21 52z m146 31l0-63c0-3 0-5-2-7-1-2-3-3-6-4l-52-8c-4-10-8-19-12-26 7-9 17-22 31-39 2-2 3-5 3-7 0-3-1-5-3-7-5-7-14-17-28-31-14-13-23-20-27-20-2 0-5 1-7 3l-40 31c-8-5-17-8-26-11-3-26-6-44-8-53-1-6-5-8-10-8l-64 0c-2 0-5 0-7 2-2 2-3 4-3 6l-8 53c-9 3-18 6-26 10l-40-30c-2-2-4-3-7-3-3 0-5 1-7 3-24 22-40 38-47 48-2 2-2 4-2 7 0 2 0 4 2 6 3 4 8 11 14 19 7 9 12 16 16 21-5 9-9 19-12 28l-52 8c-3 0-5 1-6 3-2 2-2 4-2 7l0 63c0 3 0 5 2 7 1 2 3 3 5 4l53 8c3 8 7 17 12 26-8 11-18 24-31 39-2 3-3 5-3 7 0 2 1 4 3 7 5 7 14 17 28 30 14 14 23 21 27 21 2 0 5-1 7-3l40-31c8 5 17 8 26 11 3 26 6 44 8 53 1 6 5 8 10 8l64 0c2 0 5 0 7-2 2-2 3-4 3-6l8-53c9-3 18-6 26-10l40 30c2 2 4 3 7 3 3 0 5-1 7-3 25-23 41-39 47-49 2-1 2-3 2-6 0-2 0-4-2-6-3-4-8-11-14-19-7-9-12-16-16-21 5-9 9-18 12-28l52-8c3 0 5-1 6-3 2-2 2-4 2-7z"/>
<glyph unicode="&#114;" d="M17 222c-14 4-20 13-16 29 3 14 12 20 27 16 0 0 50-12 50-12 0 0-26-41-26-41 0 0-35 8-35 8m455-6c4 4 10 6 16 6 7-1 12-3 16-8 11-11 11-22-1-33 0 0-128-115-128-115-5-4-10-6-16-6-5 0-9 2-14 5 0 0-146 112-146 112 0 0-28 8-28 8 0 0 26 40 26 40 0 0 18-4 18-4 4-1 7-2 8-4 0 0 135-104 135-104 0 0 114 103 114 103m-251 112c0 0-178-280-178-280-4-8-11-12-20-12-4 0-8 2-12 5-5 3-9 8-10 14-1 7 0 12 3 17 0 0 191 300 191 300 3 6 7 9 14 11 6 2 12 1 19-3 0 0 125-80 125-80 0 0 115 166 115 166 4 6 9 9 15 10 6 1 12-1 17-5 13-8 15-18 6-31 0 0-128-185-128-185-9-12-19-14-32-6 0 0-125 79-125 79"/>
<glyph unicode="&#104;" d="M411 415l0 0 0 0c3 3 3 8 0 11l-10 10c-3 3-8 3-11 0l0 0-45-45c-3-3-3-7 0-10l11-11 0 0c2-3 7-3 10 0z m-162-2l0 0 14 0 0 0c4 0 8 3 8 7l0 0 0 64c0 5-3 8-8 8l0 0-14 0 0 0c-5 0-8-3-8-8l0-64 0 0c0-4 4-7 8-7z m220-106c0 4-3 7-7 8l0 0-64 0c-4 0-8-4-8-8l0-15c0-4 4-7 8-7l64 0 0 0c4 0 7 3 7 7z m-213 81c-60 0-109-49-109-109 0-23 8-45 20-63l0 0c17-25 27-59 27-96 2-2 4-4 7-4 0 0 0 0 1 0l0 0 108 0 0 0c0 0 1 0 1 0 3 0 5 2 7 5 0 38 12 73 29 99 11 17 18 37 18 59 0 60-49 109-109 109z m55-336c0 0-1 0-1 0l0 0-108 0 0 0c-1 0-1 0-1 0-4 0-8-3-8-7l0-17c0-5 4-8 8-8 0 0 0 0 1 0l0 0 108 0 0 0c0 0 1 0 1 0 4 0 7 3 7 8l0 17c0 4-3 7-7 7z m0 49c0 0-1 0-1 0l0 0-108 0 0 0c-1 0-1 0-1 0-4 0-7-4-8-8 0 0 0 0 0 0l0-17c0-4 4-8 8-8 0 0 0 0 1 1l0-1 108 0 0 1c0-1 1-1 1-1 4 0 7 4 7 8l0 17c0 4-3 8-7 8z m-197 208l0 0-64 0c-4 0-7-3-7-8l0-14c0-5 3-8 7-8l64 0 0 0c4 0 8 4 8 8l0 14c0 4-4 8-8 8z m-11 109l46-46 0 0c3-2 7-2 10 1l0 0 11 10c2 3 2 8 0 10l0 0-46 46c-2 3-7 3-10 0l-11-11c-2-3-2-7 0-10z"/>
<glyph unicode="&#115;" d="M492 217l-83 40c20 12 33 36 33 63 0 40-28 72-62 72-12 0-23-4-32-11 6-14 9-29 9-46 0-24-7-48-20-67 4-5 9-9 15-12l0 0 53-25c15-8 25-24 25-41l0-70 57 0c7 0 14 7 14 16l0 66c0 7-4 13-9 15z m-330 40c4 3 8 6 12 10-13 19-21 43-21 68 0 17 4 33 10 47-10 6-20 10-31 10-34 0-62-32-62-72 0-28 14-52 34-64l-84-39c-5-2-9-8-9-15l0-66c0-9 7-16 14-16l55 0 0 70c0 17 10 34 26 41z m232-49l-72 34-31 15c14 8 25 21 32 37 5 12 9 26 9 41 0 9-2 17-4 24-9 38-38 65-73 65-34 0-63-26-73-63-2-8-3-17-3-26 0-16 3-31 10-44 7-14 18-27 31-35l-29-13-75-35c-6-3-10-10-10-18l0-82c0-11 7-20 17-20l264 0c10 0 18 9 18 20l0 82c0 8-5 15-11 18z"/>
<glyph unicode="&#116;" d="M256 448c-106 0-192-86-192-192 0-106 86-192 192-192 106 0 192 86 192 192 0 106-86 192-192 192z m0-333c-78 0-141 63-141 141 0 34 12 66 33 90l198-198c-24-21-56-33-90-33z m108 51l-198 198c24 21 56 33 90 33 78 0 141-63 141-141 0-34-12-66-33-90z"/>
<glyph unicode="&#117;" d="M165 384c0 10-4 19-11 26-7 7-16 11-26 11-10 0-19-4-26-11-7-7-11-16-11-26 0-10 4-19 11-26 7-7 16-11 26-11 10 0 19 4 26 11 7 7 11 16 11 26z m304-165c0-10-3-18-10-25l-140-141c-8-7-17-10-26-10-11 0-19 3-26 10l-204 205c-8 7-14 16-19 29-5 12-7 23-7 33l0 119c0 10 3 18 10 26 8 7 16 10 26 10l119 0c10 0 21-2 33-7 13-5 22-11 30-19l204-204c7-7 10-16 10-26z"/>
<glyph unicode="&#112;" d="M475 238c-29 45-65 78-108 101 11-20 17-42 17-65 0-35-13-65-38-90-25-25-55-38-90-38-35 0-65 13-90 38-25 25-38 55-38 90 0 23 6 45 17 65-43-23-79-56-108-101 25-39 57-70 95-94 38-23 79-34 124-34 45 0 86 11 124 34 38 24 70 55 95 94z m-205 109c0 4-2 7-4 10-3 3-6 4-10 4-24 0-44-8-61-25-17-17-26-38-26-62 0-4 1-7 4-9 3-3 6-4 10-4 4 0 7 1 10 4 2 2 4 5 4 9 0 17 5 31 17 42 12 12 26 18 42 18 4 0 7 1 10 4 2 2 4 6 4 9z m242-109c0-7-2-13-6-20-26-44-62-79-107-105-45-27-93-40-143-40-50 0-98 13-143 40-45 26-81 61-107 105-4 7-6 13-6 20 0 6 2 13 6 19 26 44 62 79 107 106 45 26 93 39 143 39 50 0 98-13 143-39 45-27 81-62 107-106 4-6 6-13 6-19z"/>
<glyph unicode="&#118;" d="M426 134c0-7-3-14-8-19l-39-39c-5-5-12-8-20-8-7 0-14 3-19 8l-84 84-84-84c-5-5-12-8-19-8-8 0-15 3-20 8l-39 39c-5 5-8 12-8 19 0 8 3 14 8 20l84 84-84 84c-5 5-8 12-8 19 0 8 3 14 8 20l39 38c5 6 12 8 20 8 7 0 14-2 19-8l84-84 84 84c5 6 12 8 19 8 8 0 15-2 20-8l39-38c5-6 8-12 8-20 0-7-3-14-8-19l-84-84 84-84c5-6 8-12 8-20z"/>
<glyph unicode="&#119;" d="M434 389c-1 0-2 0-3 0l0 0c-17-9-37-14-58-14-38 0-73 17-95 45-21 19-49 31-80 31-29 0-56-11-77-29-4 9-13 15-24 15-15 0-27-12-27-27l0-322c0-15 12-27 27-27 15 0 27 12 27 27l0 145c17 9 36 13 56 13 39 0 73-17 96-45 21-19 49-31 79-31 33 0 63 14 84 36 2 2 3 4 3 6l0 169c0 5-4 8-8 8z"/>
<glyph unicode="&#120;" d="M261 27c0 3-2 5-5 5-11 0-21 4-29 12-8 8-12 18-12 29 0 3-2 5-5 5-3 0-4-2-4-5 0-14 5-26 14-35 10-10 22-15 36-15 3 0 5 1 5 4z m-190 83l370 0c-31 34-54 73-70 117-16 44-24 90-24 139 0 48-30 73-91 73-61 0-91-25-91-73 0-49-8-95-24-139-16-44-39-83-70-117z m423 0c0-10-4-19-11-26-7-7-16-11-26-11l-128 0c0-20-7-37-21-52-15-14-32-21-52-21-20 0-37 7-52 21-14 15-21 32-21 52l-128 0c-10 0-19 4-26 11-7 7-11 16-11 26 36 30 64 68 82 113 19 45 28 93 28 143 0 31 9 56 27 75 19 18 44 29 76 33-2 3-2 7-2 11 0 7 2 14 8 19 5 5 11 8 19 8 8 0 14-3 19-8 6-5 8-12 8-19 0-4 0-8-2-11 32-4 57-15 76-33 18-19 27-44 27-75 0-50 9-98 28-143 18-45 46-83 82-113z"/>
<glyph unicode="&#121;" d="M256 402c-39 0-75-6-109-20-34-13-61-31-81-53-19-23-29-47-29-73 0-21 6-42 20-61 14-19 33-36 58-50l24-14-7-28c-5-17-12-34-20-49 29 12 55 28 78 49l13 11 16-2c13-2 25-2 37-2 39 0 75 6 109 20 34 13 61 31 81 53 19 23 29 47 29 73 0 26-10 50-29 73-20 22-47 40-81 53-34 14-70 20-109 20z m256-146c0-33-11-64-34-92-23-28-54-50-93-66-40-17-83-25-129-25-13 0-27 1-41 2-38-33-82-56-132-69-9-2-20-4-32-6l-2 0c-3 0-5 1-8 3-2 2-3 5-4 8l0 0c-1 1-1 2 0 4 0 1 0 2 0 2 0 1 1 2 2 3l1 3c0 0 1 1 2 2 2 2 2 3 3 3 1 1 4 5 8 10 5 5 8 8 10 10 2 3 5 6 9 12 4 5 7 10 9 14 3 5 5 10 8 17 3 7 5 14 8 22-30 17-54 38-71 63-17 25-26 51-26 80 0 33 11 64 34 92 23 28 54 50 93 66 40 17 83 25 129 25 46 0 89-8 129-25 39-16 70-38 93-66 23-28 34-59 34-92z"/>
<glyph unicode="&#122;" d="M183 203l0-20c0-8-4-14-11-17-3-1-5-1-7-1-6 0-10 1-13 5l-147 146c-3 4-5 8-5 13 0 5 2 9 5 13l147 146c5 6 12 8 20 4 7-3 11-9 11-17l0-19-114-114c-3-4-5-8-5-13 0-5 2-9 5-13z m329-11c0-11-2-24-5-38-3-15-7-28-11-40-4-11-9-23-14-35-5-12-8-21-11-26l-6-12c-1-3-4-4-8-4-1 0-2 0-2 0-5 1-7 5-7 10 8 76-2 130-30 161-12 14-29 24-49 32-20 7-46 12-76 15l0-72c0-8-4-14-12-17-2-1-4-1-7-1-5 0-9 1-13 5l-146 146c-3 4-5 8-5 13 0 5 2 9 5 13l146 146c6 6 13 8 20 4 8-3 12-9 12-17l0-74c78-6 135-27 171-64 32-33 48-81 48-145z"/>
<glyph unicode="&#65;" d="M292 353l74 0-9-81-65 0 0-235-97 0 0 235-49 0 0 81 49 0 0 49c0 35 8 61 24 79 17 18 44 26 81 26l65 0 0-81-40 0c-8 0-14 0-18-2-5-1-8-3-10-6-2-4-3-7-4-10 0-3-1-8-1-14z"/>
<glyph unicode="&#66;" d="M269 93c0 4-1 8-2 12-1 4-1 7-2 10-1 3-3 7-5 10-3 4-5 6-6 9-2 2-5 5-8 8-3 4-6 6-8 8-2 1-5 4-9 7-4 3-7 5-9 6-1 2-5 4-9 7-5 3-8 5-9 6-3 0-8 1-14 1-11 0-21-1-31-2-9-2-20-4-30-8-11-3-20-7-28-13-8-5-15-12-20-21-5-9-8-19-8-31 0-13 4-24 10-34 7-11 16-19 27-24 11-6 22-11 34-13 12-3 24-5 37-5 11 0 22 1 32 4 10 2 19 6 28 11 9 5 16 12 22 21 5 9 8 19 8 31z m-35 247c0 11-1 23-4 36-4 13-8 25-14 37-6 12-14 22-24 30-10 8-21 12-34 12-18 0-31-7-41-20-10-13-15-29-15-47 0-9 1-18 4-28 2-10 5-20 10-30 4-10 10-19 16-27 6-8 13-14 22-19 9-5 18-7 28-7 18 0 32 5 40 17 8 11 12 27 12 46z m-37 135l125 0-39-22-38 0c13-9 24-21 31-36 7-16 11-32 11-48 0-15-2-27-6-38-5-11-10-20-16-26-7-7-13-13-19-19-7-5-12-11-16-17-5-6-7-13-7-20 0-5 2-9 5-14 3-5 7-9 12-14 5-4 11-9 17-14 6-4 12-10 18-15 6-6 12-13 17-19 5-7 9-15 12-25 3-9 5-19 5-30 0-30-13-57-40-81-29-25-69-37-120-37-11 0-23 1-34 3-12 2-23 5-35 9-12 5-22 10-31 17-9 7-16 15-22 25-6 11-9 22-9 35 0 12 4 25 11 39 6 12 15 22 27 31 12 9 26 16 42 21 15 4 30 8 44 10 14 2 28 3 43 4-12 16-18 30-18 42 0 3 0 5 0 7 1 2 1 4 2 6 0 1 1 3 2 6 1 2 1 4 2 6-8-1-14-2-20-2-29 0-53 10-73 28-20 19-31 43-31 71 0 26 9 50 28 71 18 21 40 35 66 41 18 4 36 5 54 5z m297-73l0-36-73 0 0-73-37 0 0 73-73 0 0 36 73 0 0 73 37 0 0-73z"/>
<glyph unicode="&#67;" d="M256 475c40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110 0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29z m78-148c0-1-1-2-2-3-2-2-3-3-4-3 0 0 1 1 1 2 0 1 1 2 1 3 1 1 1 2 1 2 2 1 4 2 7 4 2 1 7 2 15 3 6 2 11 1 14-3 0 1 1 2 3 4 2 2 3 3 4 3 1 1 2 1 4 2 3 0 4 1 5 2l0 6c-2 0-4 1-5 2-1 2-2 4-2 6 0 0 0-1-1-2 0 1-1 2-2 2-1 0-2 0-3 0-1-1-2-1-3 0-1 0-3 1-4 2-1 1-2 2-2 4-1 3-1 4-1 5-1 1-2 2-3 3-1 1-2 2-3 3 0 0 0 1 0 1-1 1-1 2-1 2-1 1-1 1-1 2-1 0-1 0-2 0-1 0-1 0-2-1-1-1-1-2-2-3-1-1-1-1-1-1-1 0-2 0-2 0-1 0-1 0-1 0-1 0-1-1-2-1 0 0-1-1-1-1-1 0-2-1-3-1-1 0-1 0-2 0 3 1 3 2 0 3-2 0-4 1-5 1 2 0 3 1 2 3 0 2-1 3-2 4l1 0c0 1-1 2-2 2-2 1-3 2-5 3-2 1-3 1-4 2-1 1-5 1-10 2-5 1-8 1-9 0-1-1-1-2-1-3 0 0 0-2 1-4 1-1 1-3 1-3 0-1 0-3-2-4-1-1-2-2-2-3 0-2 2-3 4-5 3-1 4-3 3-6 0-1-2-3-4-4-3-2-4-3-5-4-1-1-1-3 0-5 0-2 1-4 3-5 0 0 0-1 0-1 0 0 0-1-1-1 0-1-1-1-1-1-1-1-2-1-2-1l-1-1c-2-1-4 0-6 2-2 2-3 4-4 7-1 5-3 8-4 9-5 1-8 1-9-1-1 3-5 5-11 8-5 2-11 2-17 1 1 0 1 2 0 4-1 3-3 4-5 4 0 1 1 3 1 5 0 2 0 3 0 4 1 2 2 4 3 6 1 0 1 1 2 3 2 1 2 2 3 3 1 2 1 2 0 2 7-1 12 0 15 3 1 1 2 3 3 5 1 2 2 4 3 5 2 1 3 2 4 2 1-1 2-1 4-2 2-1 3-1 4-1 3-1 4 0 5 3 0 2-1 4-3 5 3 0 3 2 1 5-1 2-1 2-2 3-2 1-5 0-8-2-1 0-1-1 1-2 0 0-1-1-3-3-1-2-3-4-5-5-1-1-3-1-4 2 0 0-1 1-2 3-1 3-1 4-2 4-2 0-3-1-5-4 1 2 0 3-3 4-3 2-5 2-7 3 4 2 3 4-2 7-2 1-4 2-6 2-3 0-5 0-6-1-1-2-1-3-1-4 0-1 0-1 1-2 1-1 2-1 3-2 1 0 2 0 3-1 2 0 2 0 3-1 3-1 3-3 2-4 0 0-1 0-2-1-2 0-3 0-4-1-1 0-1-1-1-1-1-1-1-2 0-4 0-2 0-3-1-4-1 1-2 3-2 5-1 2-2 4-2 5 1-2-1-3-8-2l-2 0c-1 0-3 0-5 0-2-1-4-1-6-1-1 1-3 1-4 3 0 1 0 3 0 5 0 1 1 1 1 1 0 1-1 1-3 3-1 1-2 2-3 2-8-3-17-7-26-12 1 0 2 0 3 1 1 0 2 1 4 2 1 0 2 1 3 1 6 3 10 3 12 2l1 2c3-3 5-6 6-8-2 1-4 1-9 1-4-1-6-3-6-4 1-2 2-4 1-5 0 1-2 2-3 3-1 1-3 2-4 3-1 1-3 1-4 2-3 0-6-1-7-1-28-15-50-36-67-63 1-1 3-2 4-2 0-1 1-1 1-3 0-2 0-3 1-3 0-1 1 0 3 1 2-2 2-4 1-6 0 0 4-2 12-7 4-4 6-6 6-6 1-3 0-4-2-6-1 1-1 2-3 3-2 1-2 2-3 1 0-1 0-3 1-5 0-3 1-4 3-4-2 0-3-1-3-4-1-3-1-7-1-10 0-4 0-6 0-7l0 0c0-3 0-6 2-10 2-5 4-6 6-6-2 0 0-5 6-12 1-2 2-3 2-3 1 0 2-1 4-2 1-1 3-2 4-3 1-1 2-2 3-3 0-1 1-3 3-6 1-3 2-6 4-7-1-1 0-3 2-6 2-2 3-4 3-6 0 0 0 0 0 0-1-1-1-1-1-1 0-1 2-2 4-4 3-1 4-2 5-3 0-1 0-2 0-3 0-2 1-3 1-3 1-1 1-1 2-1 1 4-1 10-6 18-3 4-5 7-5 8-1 1-1 2-2 4 0 2-1 4-1 5 0 0 1-1 2-1 0 0 1 0 2-1 1 0 2-1 2-1 1 0 1-1 1-1-1-1-1-3 0-5 1-2 2-4 4-5 1-2 3-3 5-6 1-2 3-3 3-3 1-1 2-3 4-6 2-2 2-4 0-4 2 0 4-1 6-3 2-1 3-3 5-5 1-2 1-4 2-8 0-3 1-5 1-7 1-1 1-2 3-3 1-2 2-3 3-3l5-2c0 0 1-1 4-2 1-1 2-2 5-3 2-2 4-3 6-4 2 0 3-1 5-1 1 0 2 0 4 1 1 0 3 1 4 1 2 0 5-1 8-4 3-4 5-6 6-6 7-4 12-5 16-4-1 0-1 0 0-2 0-1 1-2 2-4 1-2 2-3 3-4 0-1 1-2 1-3 1-1 3-2 5-4 3-2 4-3 5-4 2 0 2 1 2 2 0-1 1-3 2-5 2-3 4-4 6-3 2 0 4 3 4 9-6-3-11-1-14 5 0 0-1 1-1 2-1 0-1 1-1 2-1 1-1 2-1 2 0 1 0 2 0 3 0 0 1 0 1 0 2 0 3 1 3 1 0 1 0 2 0 4-1 2-1 3-1 4-1 1-2 3-4 5-1 3-3 4-3 5-1-2-2-3-5-3-2 1-3 1-4 3 0 0 0-1-1-2 0 0 0-1 0-1-2 0-4 0-4 0 0 0 0 2 0 5 1 3 1 5 1 6 1 1 1 2 2 4 1 1 2 3 2 4 1 1 1 2 1 3 0 2 0 2-1 3-1 1-3 1-5 1-4 0-6-2-7-6-1 0-1-1-1-3-1-1-1-2-2-3 0-1-1-2-2-2-2-1-4-1-7-1-3 0-6 1-7 2-2 1-5 4-6 8-2 4-3 8-3 11 0 1 0 4 1 7 0 3 0 6 0 7 1 2 0 4-1 7 0 1 1 2 2 3 2 1 3 2 3 3 1 0 1 0 2 0 0 1 0 1 1 0 0 0 1 0 1 1 0 0 1 1 1 2 0 0-1 0-1 0-1 1-1 1-1 1 1 0 4 0 8 1 4 1 6 0 8-1 2-2 5-2 6 1 0 0 0 1-1 3 0 1 0 2 0 3 1-5 4-6 8-2 1-1 2-1 5-2 2 0 4 0 5-1 0 0 1-1 2-2 0 0 1-1 1-1 1 0 1 0 2 0 0 1 1 1 2 2 2-3 3-5 4-7 2-7 3-12 5-12 1-1 2-1 3-1 1 0 1 1 1 3 1 1 1 3 0 4 0 1 0 2 0 3l0 3 0 5-1 2c-2 1-4 2-5 4-1 1 0 3 1 5 1 2 2 3 4 5 0 0 1 1 2 1 1 1 3 1 5 2 1 1 2 2 3 2 4 4 6 7 4 10 2 0 3 1 4 3-1 0-1 0-2 1-1 0-1 1-2 1-1 1-1 1-1 1 1 1 2 2 0 4 1 1 2 2 2 3 1 2 2 3 3 3 1-2 3-2 6 0 1 1 1 3 0 4 1 2 3 3 6 3 3 1 4 2 5 3 1 0 2 0 2 1 0 0 1 1 1 3 0 2 0 3 0 3 1 1 3 2 5 3 2 1 3 1 3 1l5 4c1 0 1 1 0 1 4-1 7 0 9 3 2 2 1 4-2 6 1 1 1 2 0 2-2 1-3 1-5 2 1 0 2 0 4 0 1 0 2 0 3 0 2 2 2 4-2 5-4 1-8 0-13-3z m-46-251c39 7 72 25 100 54-1 1-2 1-4 1-1 1-3 1-3 1-4 2-6 2-7 3 0 1 0 2-1 3 0 1-1 2-2 3-1 0-2 1-4 2-1 1-2 2-3 2 0 1-1 1-2 2-1 1-1 1-2 1 0 1-1 1-2 2-1 0-2 0-2 0-1 0-2 0-3 0l-1 0c-1 0-1-1-2-1 0 0-1-1-1-1-1 0-1 0-1-1 0 0 0 0 0 0-4 3-8 5-11 6-1 0-2 1-3 1-1 1-2 2-3 2-1 1-2 1-3 1-1 0-2-1-3-2-1-1-1-3-2-4 0-2 0-4 0-4-1 1-1 2 0 5 1 2 1 4 0 5 0 1-1 2-3 1-1 0-2 0-3-1-1 0-2-1-3-2-2-1-2-2-3-2 0 0-1-1-2-2-2-1-2-1-3-2 0-1-1-2-1-3-1-2-1-3-2-3 0 0-1 1-3 1-2 1-3 1-3 2 1-2 1-5 1-10 1-5 1-8 2-11 1-6 0-10-4-14-5-4-8-8-8-11-1-4 0-7 3-7 0-2 0-4-2-6-1-3-2-5-2-6 0-2 0-3 1-5z"/>
<glyph unicode="&#69;" d="M347 274c0 36-12 66-37 91-25 25-55 37-91 37-35 0-65-12-90-37-25-25-38-55-38-91 0-35 13-65 38-90 25-25 55-38 90-38 36 0 66 13 91 38 25 25 37 55 37 90z m147-237c0-10-4-19-11-26-7-7-16-11-26-11-10 0-19 4-26 11l-98 98c-34-24-72-36-114-36-27 0-53 5-78 16-25 11-46 25-64 43-18 18-32 39-43 64-10 25-16 51-16 78 0 28 6 54 16 78 11 25 25 47 43 65 18 18 39 32 64 43 25 10 51 15 78 15 28 0 54-5 79-15 24-11 46-25 64-43 18-18 32-40 43-65 10-24 16-50 16-78 0-42-12-80-36-114l98-98c7-7 11-15 11-25z"/>
<glyph unicode="&#70;" d="M402 247l0-92c0-22-8-42-24-58-16-16-35-24-58-24l-238 0c-22 0-42 8-58 24-16 16-24 36-24 58l0 238c0 23 8 42 24 58 16 16 36 24 58 24l201 0c3 0 5 0 7-2 2-2 3-4 3-7l0-18c0-3-1-5-3-7-2-1-4-2-7-2l-201 0c-12 0-23-5-32-14-9-9-13-19-13-32l0-238c0-12 4-23 13-32 9-9 20-13 32-13l238 0c13 0 23 4 32 13 9 9 14 20 14 32l0 92c0 3 1 5 2 6 2 2 4 3 7 3l18 0c3 0 5-1 7-3 1-1 2-3 2-6z m110 247l0-147c0-5-2-9-5-12-4-4-8-6-13-6-5 0-10 2-13 6l-50 50-187-186c-2-2-4-3-6-3-3 0-5 1-7 3l-32 32c-2 2-3 4-3 7 0 2 1 4 3 6l186 187-50 50c-4 3-6 8-6 13 0 5 2 9 6 13 3 3 7 5 12 5l147 0c5 0 9-2 13-5 3-4 5-8 5-13z"/>
<glyph unicode="&#68;" d="M438 99c14 0 25 11 25 26l0 262c0 15-11 26-25 26l-364 0c-14 0-25-11-25-26l0-262c0-15 11-26 25-26z m-26 51l-312 0 0 212 312 0z m-80 105l-61-36-62-35 0 141 62-35z"/>
<glyph unicode="&#71;" d="M411 448l0 0 0 21c0 4-4 8-9 8l-168 0-133-132 0-302c0-4 4-8 9-8l292 0c5 0 9 4 9 8l0 13 0 0z m-259-362l0 241 91 0c5 0 9 4 9 9l0 90 108 0 0-340z"/>
<glyph unicode="&#72;" d="M463 332c0 5-4 9-9 9l-67 0 0 110c0 5-5 10-10 10l-242 0c-5 0-10-5-10-10l0-110-67 0c0 0 0 0 0 0-5 0-9-4-9-9l0 0 0-188c0-5 4-10 9-10l67 0 0 79 262 0 0-79 67 0c5 0 9 5 9 10l0 188z m-102-33l-210 0 0 127c0 5 4 9 9 9l192 0c5 0 9-4 9-9l0-127z m-209-238c0-5 4-10 9-10l190 0c5 0 9 5 9 10l0 126-208 0z"/>
<glyph glyph-name="angle-down" unicode="&#97;" d="M399 302c0-3-1-5-3-7l-133-133c-2-2-5-3-7-3-2 0-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l15 15c1 1 4 2 6 2 3 0 5-1 7-2l112-113 112 113c2 1 4 2 7 2 2 0 5-1 6-2l15-15c2-2 3-4 3-6z"/>
<glyph glyph-name="angle-left" unicode="&#98;" d="M344 357c0-3-1-5-3-7l-112-112 112-113c2-1 3-4 3-6 0-3-1-5-3-7l-14-14c-2-2-5-3-7-3-2 0-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3 2 0 5-1 7-3l14-14c2-2 3-4 3-6z"/>
<glyph glyph-name="angle-right" unicode="&#99;" d="M335 238c0-3-1-5-3-7l-133-133c-2-2-5-3-7-3-2 0-5 1-7 3l-14 14c-2 2-3 4-3 7 0 2 1 5 3 6l112 113-112 112c-2 2-3 4-3 7 0 2 1 4 3 6l14 14c2 2 5 3 7 3 2 0 5-1 7-3l133-133c2-2 3-4 3-6z"/>
<glyph glyph-name="angle-up" unicode="&#100;" d="M399 174c0-3-1-5-3-7l-15-14c-1-2-4-3-6-3-3 0-5 1-7 3l-112 112-112-112c-2-2-4-3-7-3-2 0-5 1-6 3l-15 14c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3 2 0 5-1 7-3l133-133c2-2 3-4 3-6z"/>
<glyph glyph-name="comments" unicode="&#101;" d="M201 402c-29 0-56-5-82-15-25-9-45-23-60-40-15-17-22-35-22-54 0-16 5-31 15-46 10-14 24-27 42-37l28-16-10-24c6 4 12 7 18 11l12 9 15-3c15-3 30-4 44-4 29 0 57 5 82 15 25 10 45 23 60 40 15 17 23 35 23 55 0 19-8 37-23 54-15 17-35 31-60 40-25 10-53 15-82 15z m0 37c37 0 70-7 101-20 31-13 56-31 73-53 18-22 27-47 27-73 0-27-9-51-27-74-17-22-42-40-73-53-31-13-64-20-101-20-16 0-33 2-50 5-24-17-50-29-80-37-6-1-15-3-24-4l-1 0c-2 0-4 0-6 2-2 2-3 4-3 6 0 1 0 1 0 2 0 1 0 1 0 2 0 0 0 1 0 1l1 2c0 0 0 0 1 1 1 1 1 2 1 2 0 0 1 0 1 1 1 1 2 2 2 2 1 1 3 3 6 7 4 3 6 6 8 8 1 2 3 5 6 8 3 4 5 8 7 11 2 4 4 8 6 13-24 14-42 31-56 51-13 20-20 41-20 64 0 26 9 51 27 73 18 22 42 40 73 53 31 13 65 20 101 20z m235-334c2-5 4-9 6-13 2-4 4-7 7-11 3-3 5-6 6-8 2-2 4-5 8-8 3-4 5-6 6-8 1 0 1 0 2-1 0-1 1-1 1-1 0-1 1-1 1-2 0 0 1-1 1-1l1-2c0 0 0 0 0-1 1-2 1-2 0-2 0 0 0-1 0-2 0-3-2-5-4-6-1-2-4-3-6-2-9 1-18 2-24 4-30 8-56 20-80 37-17-3-34-5-50-5-52 0-97 13-135 38 11-1 19-1 25-1 31 0 60 4 88 13 29 8 54 20 76 36 24 18 42 38 55 61 12 23 19 47 19 73 0 14-2 29-7 43 25-14 44-30 59-51 14-20 21-42 21-66 0-22-7-44-20-64-14-20-32-36-56-50z"/>
<glyph glyph-name="twitter" unicode="&#102;" d="M481 395c-13-18-28-34-46-47 0-3 0-7 0-12 0-25-3-50-11-74-7-25-18-49-33-71-14-23-32-43-52-61-21-17-45-31-74-41-29-11-60-16-92-16-52 0-99 14-142 42 7-1 14-2 22-2 43 0 81 14 115 40-20 0-38 6-54 18-16 12-27 27-33 46 7-1 13-2 18-2 8 0 16 1 24 4-21 4-39 15-53 31-14 17-21 37-21 59l0 1c13-7 27-11 42-11-13 8-23 19-30 32-8 14-11 29-11 44 0 17 4 33 12 47 23-28 51-51 84-68 33-17 69-27 107-29-2 8-3 15-3 22 0 25 9 47 27 65 18 18 40 27 66 27 26 0 49-10 67-29 21 4 40 11 59 22-7-22-21-39-41-51 18 2 35 7 53 14z"/>
<glyph glyph-name="calendar" unicode="&#103;" d="M55 37l402 0 0 292-402 0z m110 347l0 82c0 3-1 5-3 7-2 2-4 2-7 2l-18 0c-3 0-5 0-6-2-2-2-3-4-3-7l0-82c0-3 1-5 3-7 1-1 3-2 6-2l18 0c3 0 5 1 7 2 2 2 3 4 3 7z m219 0l0 82c0 3-1 5-3 7-1 2-3 2-6 2l-18 0c-3 0-5 0-7-2-2-2-3-4-3-7l0-82c0-3 1-5 3-7 2-1 4-2 7-2l18 0c3 0 5 1 6 2 2 2 3 4 3 7z m110 18l0-365c0-10-4-19-11-26-7-7-16-11-26-11l-402 0c-10 0-19 4-26 11-7 7-11 16-11 26l0 365c0 10 4 19 11 26 7 7 16 11 26 11l36 0 0 27c0 13 5 24 14 33 9 9 20 13 32 13l18 0c13 0 24-4 33-13 9-9 13-20 13-33l0-27 110 0 0 27c0 13 4 24 13 33 9 9 20 13 33 13l18 0c12 0 23-4 32-13 9-9 14-20 14-33l0-27 36 0c10 0 19-4 26-11 7-7 11-16 11-26z"/>
<glyph glyph-name="debates" unicode="&#105;" d="M453 425c-1 9-8 16-17 16l-360 0 0 0c-9 0-16-7-17-16l0 0 0-288 0 0c2-8 9-14 17-14l0 0 59 0 0-35c0-9 8-17 17-17 6 0 11 3 14 8l45 44 225 0c8 0 15 6 17 14l0 0 0 288z m-308-172c-15 0-29 12-29 34 0 25 13 47 34 61l0 0c1 1 1 1 2 1 1 0 1 0 2-1l0 0 14-9 0 0c1 0 1-1 1-3 0-1 0-2-2-3l0 0c0 0 0 0 0 0 0 0 0 0 0 0-10-6-22-19-25-31 2 1 4 1 7 1 13 0 23-10 23-24 0-14-12-26-27-26z m68 0c-15 0-29 12-29 34 0 25 13 47 34 61l0 0c0 1 1 1 2 1 0 0 1 0 2-1l0 0 14-9 0 0c1 0 1-1 1-3 0-1-1-2-2-3l0 0c0 0 0 0 0 0 0 0 0 0 0 0-11-6-22-19-25-31 1 1 4 1 7 1 12 0 22-10 22-24 0-14-12-26-26-26z m81-37l0 0c0 0-1-1-2-1 0 0-1 1-2 1l0 0-14 9 0 0c-1 1-1 2-1 3 0 1 1 3 2 3l0 0c0 0 0 0 0 0 0 0 0 0 0 0 11 6 22 20 25 31-1 0-4-1-7-1-12 0-22 10-22 24 0 15 12 27 26 27 15 0 29-13 29-34 0-25-13-48-34-62z m68 0l0 0c-1 0-1-1-2-1-1 0-1 1-2 1l0 0-14 9 0 0c-1 1-1 2-1 3 0 1 0 3 2 3l0 0c0 0 0 0 0 0 0 0 0 0 0 0 10 6 22 20 25 31-2 0-4-1-7-1-13 0-23 10-23 24 0 15 12 27 27 27 15 0 29-13 29-34 0-25-13-48-34-62z"/>
<glyph glyph-name="unlike" unicode="&#106;" d="M91 347c0-5-1-9-5-12-4-4-8-6-13-6-5 0-9 2-13 6-3 3-5 7-5 12 0 6 2 10 5 13 4 4 8 6 13 6 5 0 9-2 13-6 4-3 5-7 5-13z m46-146l0 183c0 5-2 9-5 13-4 3-8 5-13 5l-82 0c-5 0-10-2-13-5-4-4-6-8-6-13l0-183c0-5 2-9 6-13 3-3 8-5 13-5l82 0c5 0 9 2 13 5 3 4 5 8 5 13z m323 43c10-12 15-26 15-43 0-15-5-28-16-38-11-11-24-17-38-17l-80 0c1-2 2-5 3-7 0-1 2-4 3-6 1-2 2-4 3-5 3-7 6-12 7-16 2-4 4-10 6-17 2-7 3-15 3-22 0-4 0-8 0-11-1-3-1-7-2-13-1-6-2-10-3-14-2-4-4-8-7-13-3-5-7-9-12-12-4-3-10-5-17-7-7-2-15-3-23-3-5 0-10 2-13 5-4 4-7 9-10 15-3 5-4 10-5 15-1 4-3 10-4 17-2 8-3 14-4 17-1 4-2 8-5 14-2 6-5 10-9 14-6 6-16 18-29 34-9 12-19 24-28 35-10 11-18 16-22 17-5 0-9 2-12 5-4 4-6 8-6 13l0 183c0 5 2 9 6 13 3 3 8 5 13 5 6 0 21 5 45 13 15 5 26 9 34 11 9 3 20 5 35 8 15 3 29 5 41 5l37 0c25-1 44-8 56-22 11-14 16-31 14-52 8-7 13-16 16-27 3-12 3-23 0-33 8-12 13-25 12-40 0-6-1-13-4-21z"/>
<glyph glyph-name="like" unicode="&#107;" d="M91 128c0 5-1 9-5 13-4 3-8 5-13 5-5 0-9-2-13-5-3-4-5-8-5-13 0-5 2-9 5-13 4-4 8-5 13-5 5 0 9 1 13 5 4 4 5 8 5 13z m46 146l0-183c0-5-2-9-5-12-4-4-8-6-13-6l-82 0c-5 0-10 2-13 6-4 3-6 7-6 12l0 183c0 5 2 10 6 13 3 4 8 6 13 6l82 0c5 0 9-2 13-6 3-3 5-8 5-13z m338 0c0-16-5-30-15-42 3-9 4-16 4-22 1-14-4-28-12-39 3-11 3-22 0-34-3-10-8-19-16-26 2-22-3-39-14-52-12-15-31-22-56-22l-37 0c-12 0-26 1-41 4-15 3-26 6-35 8-8 3-19 7-34 12-24 8-39 12-45 12-5 0-10 2-13 6-4 3-6 7-6 12l0 184c0 4 2 8 6 12 3 4 7 5 12 6 4 0 12 6 22 17 9 11 19 22 28 34 13 17 23 28 29 35 4 3 7 8 9 13 3 6 4 11 5 14 1 4 2 9 4 17 1 8 3 14 4 18 1 4 2 9 5 15 3 5 6 10 10 14 3 4 8 5 13 5 8 0 16-1 23-3 7-2 13-4 17-7 5-3 9-7 12-12 3-4 5-9 7-12 1-4 2-9 3-15 1-5 1-10 2-13 0-2 0-6 0-11 0-7-1-14-3-21-2-8-4-13-5-18-2-4-5-9-8-16-1-1-2-2-3-5-1-2-3-4-3-6-1-2-2-4-3-7l80 0c14 0 27-5 38-16 11-11 16-24 16-39z"/>
<glyph glyph-name="check" unicode="&#108;" d="M477 350c0-7-2-14-8-19l-206-207-39-39c-6-5-12-8-20-8-7 0-14 3-19 8l-142 142c-6 6-8 12-8 20 0 7 2 14 8 19l38 39c6 5 12 8 20 8 7 0 14-3 19-8l84-84 188 188c5 5 12 8 19 8 8 0 14-3 20-8l38-39c6-6 8-12 8-20z"/>
<glyph glyph-name="edit" unicode="&#109;" d="M140 73l26 26-67 67-26-26 0-30 37 0 0-37z m150 265c0 4-2 7-7 7-1 0-3-1-4-2l-155-155c-2-2-2-3-2-5 0-4 2-6 6-6 2 0 4 0 5 2l155 154c1 2 2 3 2 5z m-16 55l119-119-238-237-118 0 0 118z m195-27c0-10-3-19-10-26l-48-47-118 118 47 48c7 7 15 10 26 10 10 0 18-3 26-10l67-67c7-8 10-16 10-26z"/>
<glyph glyph-name="star" unicode="&#110;" d="M494 327c0-4-3-9-8-14l-103-101 24-143c0-1 0-3 0-5 0-4-1-8-3-10-2-3-4-5-8-5-4 0-8 2-12 4l-128 67-128-67c-4-2-8-4-12-4-4 0-7 2-9 5-2 2-3 6-3 10 0 1 0 3 1 5l24 143-104 101c-4 6-7 10-7 14 0 7 6 12 16 13l144 21 64 130c4 8 8 12 14 12 6 0 10-4 14-12l64-130 144-21c10-1 16-6 16-13z"/>
<glyph glyph-name="user" unicode="&#111;" d="M410 203l-80 38-34 16c15 9 27 24 35 41 6 14 10 29 10 46 0 9-1 18-4 27-10 41-42 72-81 72-38 0-70-30-81-70-2-9-4-19-4-29 0-18 4-34 11-49 8-16 20-30 35-39l-32-15-83-38c-7-4-12-12-12-21l0-91c0-12 8-22 19-22l294 0c11 0 19 10 19 22l0 91c0 9-4 17-12 21z"/>
<glyph glyph-name="settings" unicode="&#113;" d="M329 256c0 20-7 37-21 52-15 14-32 21-52 21-20 0-37-7-52-21-14-15-21-32-21-52 0-20 7-37 21-52 15-14 32-21 52-21 20 0 37 7 52 21 14 15 21 32 21 52z m146 31l0-63c0-3 0-5-2-7-1-2-3-3-6-4l-52-8c-4-10-8-19-12-26 7-9 17-22 31-39 2-2 3-5 3-7 0-3-1-5-3-7-5-7-14-17-28-31-14-13-23-20-27-20-2 0-5 1-7 3l-40 31c-8-5-17-8-26-11-3-26-6-44-8-53-1-6-5-8-10-8l-64 0c-2 0-5 0-7 2-2 2-3 4-3 6l-8 53c-9 3-18 6-26 10l-40-30c-2-2-4-3-7-3-3 0-5 1-7 3-24 22-40 38-47 48-2 2-2 4-2 7 0 2 0 4 2 6 3 4 8 11 14 19 7 9 12 16 16 21-5 9-9 19-12 28l-52 8c-3 0-5 1-6 3-2 2-2 4-2 7l0 63c0 3 0 5 2 7 1 2 3 3 5 4l53 8c3 8 7 17 12 26-8 11-18 24-31 39-2 3-3 5-3 7 0 2 1 4 3 7 5 7 14 17 28 30 14 14 23 21 27 21 2 0 5-1 7-3l40-31c8 5 17 8 26 11 3 26 6 44 8 53 1 6 5 8 10 8l64 0c2 0 5 0 7-2 2-2 3-4 3-6l8-53c9-3 18-6 26-10l40 30c2 2 4 3 7 3 3 0 5-1 7-3 25-23 41-39 47-49 2-1 2-3 2-6 0-2 0-4-2-6-3-4-8-11-14-19-7-9-12-16-16-21 5-9 9-18 12-28l52-8c3 0 5-1 6-3 2-2 2-4 2-7z"/>
<glyph glyph-name="stats" unicode="&#114;" d="M17 222c-14 4-20 13-16 29 3 14 12 20 27 16 0 0 50-12 50-12 0 0-26-41-26-41 0 0-35 8-35 8m455-6c4 4 10 6 16 6 7-1 12-3 16-8 11-11 11-22-1-33 0 0-128-115-128-115-5-4-10-6-16-6-5 0-9 2-14 5 0 0-146 112-146 112 0 0-28 8-28 8 0 0 26 40 26 40 0 0 18-4 18-4 4-1 7-2 8-4 0 0 135-104 135-104 0 0 114 103 114 103m-251 112c0 0-178-280-178-280-4-8-11-12-20-12-4 0-8 2-12 5-5 3-9 8-10 14-1 7 0 12 3 17 0 0 191 300 191 300 3 6 7 9 14 11 6 2 12 1 19-3 0 0 125-80 125-80 0 0 115 166 115 166 4 6 9 9 15 10 6 1 12-1 17-5 13-8 15-18 6-31 0 0-128-185-128-185-9-12-19-14-32-6 0 0-125 79-125 79"/>
<glyph glyph-name="proposals" unicode="&#104;" d="M411 415l0 0 0 0c3 3 3 8 0 11l-10 10c-3 3-8 3-11 0l0 0-45-45c-3-3-3-7 0-10l11-11 0 0c2-3 7-3 10 0z m-162-2l0 0 14 0 0 0c4 0 8 3 8 7l0 0 0 64c0 5-3 8-8 8l0 0-14 0 0 0c-5 0-8-3-8-8l0-64 0 0c0-4 4-7 8-7z m220-106c0 4-3 7-7 8l0 0-64 0c-4 0-8-4-8-8l0-15c0-4 4-7 8-7l64 0 0 0c4 0 7 3 7 7z m-213 81c-60 0-109-49-109-109 0-23 8-45 20-63l0 0c17-25 27-59 27-96 2-2 4-4 7-4 0 0 0 0 1 0l0 0 108 0 0 0c0 0 1 0 1 0 3 0 5 2 7 5 0 38 12 73 29 99 11 17 18 37 18 59 0 60-49 109-109 109z m55-336c0 0-1 0-1 0l0 0-108 0 0 0c-1 0-1 0-1 0-4 0-8-3-8-7l0-17c0-5 4-8 8-8 0 0 0 0 1 0l0 0 108 0 0 0c0 0 1 0 1 0 4 0 7 3 7 8l0 17c0 4-3 7-7 7z m0 49c0 0-1 0-1 0l0 0-108 0 0 0c-1 0-1 0-1 0-4 0-7-4-8-8 0 0 0 0 0 0l0-17c0-4 4-8 8-8 0 0 0 0 1 1l0-1 108 0 0 1c0-1 1-1 1-1 4 0 7 4 7 8l0 17c0 4-3 8-7 8z m-197 208l0 0-64 0c-4 0-7-3-7-8l0-14c0-5 3-8 7-8l64 0 0 0c4 0 8 4 8 8l0 14c0 4-4 8-8 8z m-11 109l46-46 0 0c3-2 7-2 10 1l0 0 11 10c2 3 2 8 0 10l0 0-46 46c-2 3-7 3-10 0l-11-11c-2-3-2-7 0-10z"/>
<glyph glyph-name="organizations" unicode="&#115;" d="M492 217l-83 40c20 12 33 36 33 63 0 40-28 72-62 72-12 0-23-4-32-11 6-14 9-29 9-46 0-24-7-48-20-67 4-5 9-9 15-12l0 0 53-25c15-8 25-24 25-41l0-70 57 0c7 0 14 7 14 16l0 66c0 7-4 13-9 15z m-330 40c4 3 8 6 12 10-13 19-21 43-21 68 0 17 4 33 10 47-10 6-20 10-31 10-34 0-62-32-62-72 0-28 14-52 34-64l-84-39c-5-2-9-8-9-15l0-66c0-9 7-16 14-16l55 0 0 70c0 17 10 34 26 41z m232-49l-72 34-31 15c14 8 25 21 32 37 5 12 9 26 9 41 0 9-2 17-4 24-9 38-38 65-73 65-34 0-63-26-73-63-2-8-3-17-3-26 0-16 3-31 10-44 7-14 18-27 31-35l-29-13-75-35c-6-3-10-10-10-18l0-82c0-11 7-20 17-20l264 0c10 0 18 9 18 20l0 82c0 8-5 15-11 18z"/>
<glyph glyph-name="deleted" unicode="&#116;" d="M256 448c-106 0-192-86-192-192 0-106 86-192 192-192 106 0 192 86 192 192 0 106-86 192-192 192z m0-333c-78 0-141 63-141 141 0 34 12 66 33 90l198-198c-24-21-56-33-90-33z m108 51l-198 198c24 21 56 33 90 33 78 0 141-63 141-141 0-34-12-66-33-90z"/>
<glyph glyph-name="tag" unicode="&#117;" d="M165 384c0 10-4 19-11 26-7 7-16 11-26 11-10 0-19-4-26-11-7-7-11-16-11-26 0-10 4-19 11-26 7-7 16-11 26-11 10 0 19 4 26 11 7 7 11 16 11 26z m304-165c0-10-3-18-10-25l-140-141c-8-7-17-10-26-10-11 0-19 3-26 10l-204 205c-8 7-14 16-19 29-5 12-7 23-7 33l0 119c0 10 3 18 10 26 8 7 16 10 26 10l119 0c10 0 21-2 33-7 13-5 22-11 30-19l204-204c7-7 10-16 10-26z"/>
<glyph glyph-name="eye" unicode="&#112;" d="M475 238c-29 45-65 78-108 101 11-20 17-42 17-65 0-35-13-65-38-90-25-25-55-38-90-38-35 0-65 13-90 38-25 25-38 55-38 90 0 23 6 45 17 65-43-23-79-56-108-101 25-39 57-70 95-94 38-23 79-34 124-34 45 0 86 11 124 34 38 24 70 55 95 94z m-205 109c0 4-2 7-4 10-3 3-6 4-10 4-24 0-44-8-61-25-17-17-26-38-26-62 0-4 1-7 4-9 3-3 6-4 10-4 4 0 7 1 10 4 2 2 4 5 4 9 0 17 5 31 17 42 12 12 26 18 42 18 4 0 7 1 10 4 2 2 4 6 4 9z m242-109c0-7-2-13-6-20-26-44-62-79-107-105-45-27-93-40-143-40-50 0-98 13-143 40-45 26-81 61-107 105-4 7-6 13-6 20 0 6 2 13 6 19 26 44 62 79 107 106 45 26 93 39 143 39 50 0 98-13 143-39 45-27 81-62 107-106 4-6 6-13 6-19z"/>
<glyph glyph-name="x" unicode="&#118;" d="M426 134c0-7-3-14-8-19l-39-39c-5-5-12-8-20-8-7 0-14 3-19 8l-84 84-84-84c-5-5-12-8-19-8-8 0-15 3-20 8l-39 39c-5 5-8 12-8 19 0 8 3 14 8 20l84 84-84 84c-5 5-8 12-8 19 0 8 3 14 8 20l39 38c5 6 12 8 20 8 7 0 14-2 19-8l84-84 84 84c5 6 12 8 19 8 8 0 15-2 20-8l39-38c5-6 8-12 8-20 0-7-3-14-8-19l-84-84 84-84c5-6 8-12 8-20z"/>
<glyph glyph-name="flag" unicode="&#119;" d="M434 389c-1 0-2 0-3 0l0 0c-17-9-37-14-58-14-38 0-73 17-95 45-21 19-49 31-80 31-29 0-56-11-77-29-4 9-13 15-24 15-15 0-27-12-27-27l0-322c0-15 12-27 27-27 15 0 27 12 27 27l0 145c17 9 36 13 56 13 39 0 73-17 96-45 21-19 49-31 79-31 33 0 63 14 84 36 2 2 3 4 3 6l0 169c0 5-4 8-8 8z"/>
<glyph glyph-name="notification" unicode="&#120;" d="M261 27c0 3-2 5-5 5-11 0-21 4-29 12-8 8-12 18-12 29 0 3-2 5-5 5-3 0-4-2-4-5 0-14 5-26 14-35 10-10 22-15 36-15 3 0 5 1 5 4z m-190 83l370 0c-31 34-54 73-70 117-16 44-24 90-24 139 0 48-30 73-91 73-61 0-91-25-91-73 0-49-8-95-24-139-16-44-39-83-70-117z m423 0c0-10-4-19-11-26-7-7-16-11-26-11l-128 0c0-20-7-37-21-52-15-14-32-21-52-21-20 0-37 7-52 21-14 15-21 32-21 52l-128 0c-10 0-19 4-26 11-7 7-11 16-11 26 36 30 64 68 82 113 19 45 28 93 28 143 0 31 9 56 27 75 19 18 44 29 76 33-2 3-2 7-2 11 0 7 2 14 8 19 5 5 11 8 19 8 8 0 14-3 19-8 6-5 8-12 8-19 0-4 0-8-2-11 32-4 57-15 76-33 18-19 27-44 27-75 0-50 9-98 28-143 18-45 46-83 82-113z"/>
<glyph glyph-name="comment" unicode="&#121;" d="M256 402c-39 0-75-6-109-20-34-13-61-31-81-53-19-23-29-47-29-73 0-21 6-42 20-61 14-19 33-36 58-50l24-14-7-28c-5-17-12-34-20-49 29 12 55 28 78 49l13 11 16-2c13-2 25-2 37-2 39 0 75 6 109 20 34 13 61 31 81 53 19 23 29 47 29 73 0 26-10 50-29 73-20 22-47 40-81 53-34 14-70 20-109 20z m256-146c0-33-11-64-34-92-23-28-54-50-93-66-40-17-83-25-129-25-13 0-27 1-41 2-38-33-82-56-132-69-9-2-20-4-32-6l-2 0c-3 0-5 1-8 3-2 2-3 5-4 8l0 0c-1 1-1 2 0 4 0 1 0 2 0 2 0 1 1 2 2 3l1 3c0 0 1 1 2 2 2 2 2 3 3 3 1 1 4 5 8 10 5 5 8 8 10 10 2 3 5 6 9 12 4 5 7 10 9 14 3 5 5 10 8 17 3 7 5 14 8 22-30 17-54 38-71 63-17 25-26 51-26 80 0 33 11 64 34 92 23 28 54 50 93 66 40 17 83 25 129 25 46 0 89-8 129-25 39-16 70-38 93-66 23-28 34-59 34-92z"/>
<glyph glyph-name="reply" unicode="&#122;" d="M183 203l0-20c0-8-4-14-11-17-3-1-5-1-7-1-6 0-10 1-13 5l-147 146c-3 4-5 8-5 13 0 5 2 9 5 13l147 146c5 6 12 8 20 4 7-3 11-9 11-17l0-19-114-114c-3-4-5-8-5-13 0-5 2-9 5-13z m329-11c0-11-2-24-5-38-3-15-7-28-11-40-4-11-9-23-14-35-5-12-8-21-11-26l-6-12c-1-3-4-4-8-4-1 0-2 0-2 0-5 1-7 5-7 10 8 76-2 130-30 161-12 14-29 24-49 32-20 7-46 12-76 15l0-72c0-8-4-14-12-17-2-1-4-1-7-1-5 0-9 1-13 5l-146 146c-3 4-5 8-5 13 0 5 2 9 5 13l146 146c6 6 13 8 20 4 8-3 12-9 12-17l0-74c78-6 135-27 171-64 32-33 48-81 48-145z"/>
<glyph glyph-name="facebook" unicode="&#65;" d="M292 353l74 0-9-81-65 0 0-235-97 0 0 235-49 0 0 81 49 0 0 49c0 35 8 61 24 79 17 18 44 26 81 26l65 0 0-81-40 0c-8 0-14 0-18-2-5-1-8-3-10-6-2-4-3-7-4-10 0-3-1-8-1-14z"/>
<glyph glyph-name="google-plus" unicode="&#66;" d="M269 93c0 4-1 8-2 12-1 4-1 7-2 10-1 3-3 7-5 10-3 4-5 6-6 9-2 2-5 5-8 8-3 4-6 6-8 8-2 1-5 4-9 7-4 3-7 5-9 6-1 2-5 4-9 7-5 3-8 5-9 6-3 0-8 1-14 1-11 0-21-1-31-2-9-2-20-4-30-8-11-3-20-7-28-13-8-5-15-12-20-21-5-9-8-19-8-31 0-13 4-24 10-34 7-11 16-19 27-24 11-6 22-11 34-13 12-3 24-5 37-5 11 0 22 1 32 4 10 2 19 6 28 11 9 5 16 12 22 21 5 9 8 19 8 31z m-35 247c0 11-1 23-4 36-4 13-8 25-14 37-6 12-14 22-24 30-10 8-21 12-34 12-18 0-31-7-41-20-10-13-15-29-15-47 0-9 1-18 4-28 2-10 5-20 10-30 4-10 10-19 16-27 6-8 13-14 22-19 9-5 18-7 28-7 18 0 32 5 40 17 8 11 12 27 12 46z m-37 135l125 0-39-22-38 0c13-9 24-21 31-36 7-16 11-32 11-48 0-15-2-27-6-38-5-11-10-20-16-26-7-7-13-13-19-19-7-5-12-11-16-17-5-6-7-13-7-20 0-5 2-9 5-14 3-5 7-9 12-14 5-4 11-9 17-14 6-4 12-10 18-15 6-6 12-13 17-19 5-7 9-15 12-25 3-9 5-19 5-30 0-30-13-57-40-81-29-25-69-37-120-37-11 0-23 1-34 3-12 2-23 5-35 9-12 5-22 10-31 17-9 7-16 15-22 25-6 11-9 22-9 35 0 12 4 25 11 39 6 12 15 22 27 31 12 9 26 16 42 21 15 4 30 8 44 10 14 2 28 3 43 4-12 16-18 30-18 42 0 3 0 5 0 7 1 2 1 4 2 6 0 1 1 3 2 6 1 2 1 4 2 6-8-1-14-2-20-2-29 0-53 10-73 28-20 19-31 43-31 71 0 26 9 50 28 71 18 21 40 35 66 41 18 4 36 5 54 5z m297-73l0-36-73 0 0-73-37 0 0 73-73 0 0 36 73 0 0 73 37 0 0-73z"/>
<glyph glyph-name="language" unicode="&#67;" d="M256 475c40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110 0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29z m78-148c0-1-1-2-2-3-2-2-3-3-4-3 0 0 1 1 1 2 0 1 1 2 1 3 1 1 1 2 1 2 2 1 4 2 7 4 2 1 7 2 15 3 6 2 11 1 14-3 0 1 1 2 3 4 2 2 3 3 4 3 1 1 2 1 4 2 3 0 4 1 5 2l0 6c-2 0-4 1-5 2-1 2-2 4-2 6 0 0 0-1-1-2 0 1-1 2-2 2-1 0-2 0-3 0-1-1-2-1-3 0-1 0-3 1-4 2-1 1-2 2-2 4-1 3-1 4-1 5-1 1-2 2-3 3-1 1-2 2-3 3 0 0 0 1 0 1-1 1-1 2-1 2-1 1-1 1-1 2-1 0-1 0-2 0-1 0-1 0-2-1-1-1-1-2-2-3-1-1-1-1-1-1-1 0-2 0-2 0-1 0-1 0-1 0-1 0-1-1-2-1 0 0-1-1-1-1-1 0-2-1-3-1-1 0-1 0-2 0 3 1 3 2 0 3-2 0-4 1-5 1 2 0 3 1 2 3 0 2-1 3-2 4l1 0c0 1-1 2-2 2-2 1-3 2-5 3-2 1-3 1-4 2-1 1-5 1-10 2-5 1-8 1-9 0-1-1-1-2-1-3 0 0 0-2 1-4 1-1 1-3 1-3 0-1 0-3-2-4-1-1-2-2-2-3 0-2 2-3 4-5 3-1 4-3 3-6 0-1-2-3-4-4-3-2-4-3-5-4-1-1-1-3 0-5 0-2 1-4 3-5 0 0 0-1 0-1 0 0 0-1-1-1 0-1-1-1-1-1-1-1-2-1-2-1l-1-1c-2-1-4 0-6 2-2 2-3 4-4 7-1 5-3 8-4 9-5 1-8 1-9-1-1 3-5 5-11 8-5 2-11 2-17 1 1 0 1 2 0 4-1 3-3 4-5 4 0 1 1 3 1 5 0 2 0 3 0 4 1 2 2 4 3 6 1 0 1 1 2 3 2 1 2 2 3 3 1 2 1 2 0 2 7-1 12 0 15 3 1 1 2 3 3 5 1 2 2 4 3 5 2 1 3 2 4 2 1-1 2-1 4-2 2-1 3-1 4-1 3-1 4 0 5 3 0 2-1 4-3 5 3 0 3 2 1 5-1 2-1 2-2 3-2 1-5 0-8-2-1 0-1-1 1-2 0 0-1-1-3-3-1-2-3-4-5-5-1-1-3-1-4 2 0 0-1 1-2 3-1 3-1 4-2 4-2 0-3-1-5-4 1 2 0 3-3 4-3 2-5 2-7 3 4 2 3 4-2 7-2 1-4 2-6 2-3 0-5 0-6-1-1-2-1-3-1-4 0-1 0-1 1-2 1-1 2-1 3-2 1 0 2 0 3-1 2 0 2 0 3-1 3-1 3-3 2-4 0 0-1 0-2-1-2 0-3 0-4-1-1 0-1-1-1-1-1-1-1-2 0-4 0-2 0-3-1-4-1 1-2 3-2 5-1 2-2 4-2 5 1-2-1-3-8-2l-2 0c-1 0-3 0-5 0-2-1-4-1-6-1-1 1-3 1-4 3 0 1 0 3 0 5 0 1 1 1 1 1 0 1-1 1-3 3-1 1-2 2-3 2-8-3-17-7-26-12 1 0 2 0 3 1 1 0 2 1 4 2 1 0 2 1 3 1 6 3 10 3 12 2l1 2c3-3 5-6 6-8-2 1-4 1-9 1-4-1-6-3-6-4 1-2 2-4 1-5 0 1-2 2-3 3-1 1-3 2-4 3-1 1-3 1-4 2-3 0-6-1-7-1-28-15-50-36-67-63 1-1 3-2 4-2 0-1 1-1 1-3 0-2 0-3 1-3 0-1 1 0 3 1 2-2 2-4 1-6 0 0 4-2 12-7 4-4 6-6 6-6 1-3 0-4-2-6-1 1-1 2-3 3-2 1-2 2-3 1 0-1 0-3 1-5 0-3 1-4 3-4-2 0-3-1-3-4-1-3-1-7-1-10 0-4 0-6 0-7l0 0c0-3 0-6 2-10 2-5 4-6 6-6-2 0 0-5 6-12 1-2 2-3 2-3 1 0 2-1 4-2 1-1 3-2 4-3 1-1 2-2 3-3 0-1 1-3 3-6 1-3 2-6 4-7-1-1 0-3 2-6 2-2 3-4 3-6 0 0 0 0 0 0-1-1-1-1-1-1 0-1 2-2 4-4 3-1 4-2 5-3 0-1 0-2 0-3 0-2 1-3 1-3 1-1 1-1 2-1 1 4-1 10-6 18-3 4-5 7-5 8-1 1-1 2-2 4 0 2-1 4-1 5 0 0 1-1 2-1 0 0 1 0 2-1 1 0 2-1 2-1 1 0 1-1 1-1-1-1-1-3 0-5 1-2 2-4 4-5 1-2 3-3 5-6 1-2 3-3 3-3 1-1 2-3 4-6 2-2 2-4 0-4 2 0 4-1 6-3 2-1 3-3 5-5 1-2 1-4 2-8 0-3 1-5 1-7 1-1 1-2 3-3 1-2 2-3 3-3l5-2c0 0 1-1 4-2 1-1 2-2 5-3 2-2 4-3 6-4 2 0 3-1 5-1 1 0 2 0 4 1 1 0 3 1 4 1 2 0 5-1 8-4 3-4 5-6 6-6 7-4 12-5 16-4-1 0-1 0 0-2 0-1 1-2 2-4 1-2 2-3 3-4 0-1 1-2 1-3 1-1 3-2 5-4 3-2 4-3 5-4 2 0 2 1 2 2 0-1 1-3 2-5 2-3 4-4 6-3 2 0 4 3 4 9-6-3-11-1-14 5 0 0-1 1-1 2-1 0-1 1-1 2-1 1-1 2-1 2 0 1 0 2 0 3 0 0 1 0 1 0 2 0 3 1 3 1 0 1 0 2 0 4-1 2-1 3-1 4-1 1-2 3-4 5-1 3-3 4-3 5-1-2-2-3-5-3-2 1-3 1-4 3 0 0 0-1-1-2 0 0 0-1 0-1-2 0-4 0-4 0 0 0 0 2 0 5 1 3 1 5 1 6 1 1 1 2 2 4 1 1 2 3 2 4 1 1 1 2 1 3 0 2 0 2-1 3-1 1-3 1-5 1-4 0-6-2-7-6-1 0-1-1-1-3-1-1-1-2-2-3 0-1-1-2-2-2-2-1-4-1-7-1-3 0-6 1-7 2-2 1-5 4-6 8-2 4-3 8-3 11 0 1 0 4 1 7 0 3 0 6 0 7 1 2 0 4-1 7 0 1 1 2 2 3 2 1 3 2 3 3 1 0 1 0 2 0 0 1 0 1 1 0 0 0 1 0 1 1 0 0 1 1 1 2 0 0-1 0-1 0-1 1-1 1-1 1 1 0 4 0 8 1 4 1 6 0 8-1 2-2 5-2 6 1 0 0 0 1-1 3 0 1 0 2 0 3 1-5 4-6 8-2 1-1 2-1 5-2 2 0 4 0 5-1 0 0 1-1 2-2 0 0 1-1 1-1 1 0 1 0 2 0 0 1 1 1 2 2 2-3 3-5 4-7 2-7 3-12 5-12 1-1 2-1 3-1 1 0 1 1 1 3 1 1 1 3 0 4 0 1 0 2 0 3l0 3 0 5-1 2c-2 1-4 2-5 4-1 1 0 3 1 5 1 2 2 3 4 5 0 0 1 1 2 1 1 1 3 1 5 2 1 1 2 2 3 2 4 4 6 7 4 10 2 0 3 1 4 3-1 0-1 0-2 1-1 0-1 1-2 1-1 1-1 1-1 1 1 1 2 2 0 4 1 1 2 2 2 3 1 2 2 3 3 3 1-2 3-2 6 0 1 1 1 3 0 4 1 2 3 3 6 3 3 1 4 2 5 3 1 0 2 0 2 1 0 0 1 1 1 3 0 2 0 3 0 3 1 1 3 2 5 3 2 1 3 1 3 1l5 4c1 0 1 1 0 1 4-1 7 0 9 3 2 2 1 4-2 6 1 1 1 2 0 2-2 1-3 1-5 2 1 0 2 0 4 0 1 0 2 0 3 0 2 2 2 4-2 5-4 1-8 0-13-3z m-46-251c39 7 72 25 100 54-1 1-2 1-4 1-1 1-3 1-3 1-4 2-6 2-7 3 0 1 0 2-1 3 0 1-1 2-2 3-1 0-2 1-4 2-1 1-2 2-3 2 0 1-1 1-2 2-1 1-1 1-2 1 0 1-1 1-2 2-1 0-2 0-2 0-1 0-2 0-3 0l-1 0c-1 0-1-1-2-1 0 0-1-1-1-1-1 0-1 0-1-1 0 0 0 0 0 0-4 3-8 5-11 6-1 0-2 1-3 1-1 1-2 2-3 2-1 1-2 1-3 1-1 0-2-1-3-2-1-1-1-3-2-4 0-2 0-4 0-4-1 1-1 2 0 5 1 2 1 4 0 5 0 1-1 2-3 1-1 0-2 0-3-1-1 0-2-1-3-2-2-1-2-2-3-2 0 0-1-1-2-2-2-1-2-1-3-2 0-1-1-2-1-3-1-2-1-3-2-3 0 0-1 1-3 1-2 1-3 1-3 2 1-2 1-5 1-10 1-5 1-8 2-11 1-6 0-10-4-14-5-4-8-8-8-11-1-4 0-7 3-7 0-2 0-4-2-6-1-3-2-5-2-6 0-2 0-3 1-5z"/>
<glyph glyph-name="search" unicode="&#69;" d="M347 274c0 36-12 66-37 91-25 25-55 37-91 37-35 0-65-12-90-37-25-25-38-55-38-91 0-35 13-65 38-90 25-25 55-38 90-38 36 0 66 13 91 38 25 25 37 55 37 90z m147-237c0-10-4-19-11-26-7-7-16-11-26-11-10 0-19 4-26 11l-98 98c-34-24-72-36-114-36-27 0-53 5-78 16-25 11-46 25-64 43-18 18-32 39-43 64-10 25-16 51-16 78 0 28 6 54 16 78 11 25 25 47 43 65 18 18 39 32 64 43 25 10 51 15 78 15 28 0 54-5 79-15 24-11 46-25 64-43 18-18 32-40 43-65 10-24 16-50 16-78 0-42-12-80-36-114l98-98c7-7 11-15 11-25z"/>
<glyph glyph-name="external" unicode="&#70;" d="M402 247l0-92c0-22-8-42-24-58-16-16-35-24-58-24l-238 0c-22 0-42 8-58 24-16 16-24 36-24 58l0 238c0 23 8 42 24 58 16 16 36 24 58 24l201 0c3 0 5 0 7-2 2-2 3-4 3-7l0-18c0-3-1-5-3-7-2-1-4-2-7-2l-201 0c-12 0-23-5-32-14-9-9-13-19-13-32l0-238c0-12 4-23 13-32 9-9 20-13 32-13l238 0c13 0 23 4 32 13 9 9 14 20 14 32l0 92c0 3 1 5 2 6 2 2 4 3 7 3l18 0c3 0 5-1 7-3 1-1 2-3 2-6z m110 247l0-147c0-5-2-9-5-12-4-4-8-6-13-6-5 0-10 2-13 6l-50 50-187-186c-2-2-4-3-6-3-3 0-5 1-7 3l-32 32c-2 2-3 4-3 7 0 2 1 4 3 6l186 187-50 50c-4 3-6 8-6 13 0 5 2 9 6 13 3 3 7 5 12 5l147 0c5 0 9-2 13-5 3-4 5-8 5-13z"/>
<glyph glyph-name="video" unicode="&#68;" d="M438 99c14 0 25 11 25 26l0 262c0 15-11 26-25 26l-364 0c-14 0-25-11-25-26l0-262c0-15 11-26 25-26z m-26 51l-312 0 0 212 312 0z m-80 105l-61-36-62-35 0 141 62-35z"/>
<glyph glyph-name="document" unicode="&#71;" d="M411 448l0 0 0 21c0 4-4 8-9 8l-168 0-133-132 0-302c0-4 4-8 9-8l292 0c5 0 9 4 9 8l0 13 0 0z m-259-362l0 241 91 0c5 0 9 4 9 9l0 90 108 0 0-340z"/>
<glyph glyph-name="print" unicode="&#72;" d="M463 332c0 5-4 9-9 9l-67 0 0 110c0 5-5 10-10 10l-242 0c-5 0-10-5-10-10l0-110-67 0c0 0 0 0 0 0-5 0-9-4-9-9l0 0 0-188c0-5 4-10 9-10l67 0 0 79 262 0 0-79 67 0c5 0 9 5 9 10l0 188z m-102-33l-210 0 0 127c0 5 4 9 9 9l192 0c5 0 9-4 9-9l0-127z m-209-238c0-5 4-10 9-10l190 0c5 0 9 5 9 10l0 126-208 0z"/>
<glyph glyph-name="blog" unicode="&#74;" d="M52 369c38 71 115 118 204 118 58 0 110-24 150-59-11 2-24 0-36-7-30-17-40-66-1-90 24-15 32-53 32-76-1-23-56-128-56-128l-54 184c0 0-2 13-2 17 0 4 2 10 5 13 2 3 5 7 8 7l26 0 0 21-139 0 0-21 5 0c4 0 9-6 13-10 5-6 11-25 19-45l20-67-43-100-48 200c0 0 2 14 5 16 1 2 4 6 8 6l1 0 0 21z m27-35c0 0-11 14-23 14l-12 0c-12-25-18-60-18-91 0-95 58-176 141-211z m375 36c5-20 4-46-5-73-22-72-77-202-99-252 81 36 136 116 136 209 0 43-11 82-32 116z m-193-194l-59-144c17-4 35-7 54-7 19 0 38 3 56 7z"/>
<glyph glyph-name="box" unicode="&#73;" d="M311 274c0 5-2 10-6 13-3 4-7 6-12 6l-74 0c-5 0-9-2-12-6-4-3-6-8-6-13 0-5 2-9 6-13 3-3 7-5 12-5l74 0c5 0 9 2 12 5 4 4 6 8 6 13z m164 55l0-274c0-5-1-9-5-13-4-4-8-5-13-5l-402 0c-5 0-9 1-13 5-4 4-5 8-5 13l0 274c0 5 1 9 5 13 4 4 8 5 13 5l402 0c5 0 9-1 13-5 4-4 5-8 5-13z m19 128l0-73c0-5-2-9-6-13-3-3-8-5-13-5l-438 0c-5 0-10 2-13 5-4 4-6 8-6 13l0 73c0 5 2 9 6 13 3 4 8 5 13 5l438 0c5 0 10-1 13-5 4-4 6-8 6-13z"/>
<glyph glyph-name="youtube" unicode="&#75;" d="M314 157l0-61c0-12-4-19-11-19-5 0-9 2-13 6l0 86c4 5 8 7 13 7 7 0 11-7 11-19z m97-1l0-13-26 0 0 13c0 13 4 20 13 20 8 0 13-7 13-20z m-276 63l30 0 0 26-89 0 0-26 30 0 0-163 29 0z m82-163l25 0 0 141-25 0 0-108c-6-8-11-12-16-12-4 0-6 2-6 6-1 1-1 4-1 10l0 104-25 0 0-112c0-9 1-16 2-20 2-7 8-11 17-11 9 0 19 6 29 17z m122 42l0 57c0 13 0 23-2 28-3 11-10 16-20 16-10 0-19-5-27-16l0 62-25 0 0-189 25 0 0 14c9-11 17-16 27-16 10 0 17 5 20 16 2 5 2 14 2 28z m97 3l0 4-26 0c0-10 0-16-1-18-1-6-5-10-11-10-9 0-13 7-13 20l0 25 51 0 0 29c0 15-3 26-8 33-7 10-17 15-30 15-13 0-23-5-31-15-5-7-8-18-8-33l0-49c0-15 3-26 9-33 7-10 17-15 31-15 13 0 24 5 30 15 4 5 6 10 6 16 1 1 1 7 1 16z m-174 261l0 60c0 13-4 20-12 20-8 0-12-7-12-20l0-60c0-13 4-20 12-20 8 0 12 7 12 20z m206-215c0-44-3-77-8-100-2-11-8-20-16-28-9-7-18-12-29-13-35-4-88-6-159-6-71 0-124 2-159 6-11 1-20 6-29 13-8 8-14 17-16 28-5 22-8 55-8 100 0 45 3 78 8 100 2 12 8 21 16 29 9 7 18 12 30 13 35 4 87 6 158 6 71 0 124-2 159-6 11-1 20-6 29-13 8-8 14-17 16-29 5-21 8-54 8-100z m-285 365l29 0-35-114 0-77-28 0 0 77c-3 14-9 34-18 61-7 19-13 37-18 53l30 0 20-75z m105-95l0-50c0-16-2-27-8-34-7-10-17-14-30-14-13 0-23 4-30 14-5 7-8 19-8 34l0 50c0 15 3 26 8 33 7 10 17 15 30 15 13 0 23-5 30-15 6-7 8-18 8-33z m96 46l0-142-26 0 0 15c-10-12-20-17-29-17-9 0-15 3-17 10-2 5-3 12-3 22l0 112 26 0 0-105c0-6 1-9 1-10 0-4 2-6 6-6 5 0 10 4 16 12l0 109z"/>icons.eot
</font></defs></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 25 KiB

BIN
app/assets/images/icon_home_debate.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.9 KiB

12
app/assets/images/icon_home_debate.svg
View File

@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="168px" height="168px" viewBox="0 0 168 168" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<!-- Generator: Sketch 3.3 (11970) - http://www.bohemiancoding.com/sketch -->
<title>Imported Layers</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
<g id="Imported-Layers" sketch:type="MSLayerGroup" transform="translate(21.000000, 35.000000)" fill="#0072AD">
<path d="M125.511254,31.9 C125.511254,21.994 121.075254,13.682 112.682254,7.864 C105.367254,2.793 95.5322542,0 84.9902542,0 C69.8922542,0 56.6642542,5.559 49.3292542,14.922 C46.1232542,14.367 42.8152542,14.086 39.4782542,14.086 C31.0882542,14.086 23.1392542,15.861 17.0972542,19.086 C7.8942542,24 -2.0127458,34.63 0.355254197,48.423 C2.8542542,62.974 16.6182542,71.008 28.3212542,73.706 C26.9222542,82.031 20.5142542,87.966 14.3362542,92.71 L9.9652542,96.064 L15.4712542,95.883 C30.3132542,95.4 43.9332542,86.192 47.7262542,74.266 C57.0442542,72.708 65.7892542,68.271 71.5262542,62.197 C72.4532542,62.441 73.3832542,62.655 74.3022542,62.835 C76.0072542,63.167 77.7572542,63.416 79.5172542,63.577 C84.0742542,73.088 95.3592542,80.942 104.710254,80.944 L104.711254,80.944 C106.881254,80.944 108.879254,80.519 110.645254,79.679 L113.825254,78.169 L110.717254,76.516 C104.688254,73.309 100.529254,68.546 98.0472542,61.993 C111.620254,58.224 125.511254,47.525 125.511254,31.9 L125.511254,31.9 Z M50.8742542,18.833 C51.6552542,19.002 52.4082542,19.199 53.1562542,19.4 L48.0952542,24.461 C48.7872542,22.478 49.7142542,20.592 50.8742542,18.833 L50.8742542,18.833 Z M63.3282542,55.228 L75.3252542,43.23 C75.3412542,43.597 75.3752542,43.956 75.3752542,44.328 C75.3752542,45.44 75.2792542,46.527 75.1162542,47.6 L66.1382542,56.578 C65.1822542,56.162 64.2452542,55.71 63.3282542,55.228 L63.3282542,55.228 Z M58.8732542,52.518 L74.2782542,37.11 C74.6222542,38.202 74.8802542,39.331 75.0592542,40.49 L61.3992542,54.151 C60.5312542,53.636 59.6882542,53.09 58.8732542,52.518 L58.8732542,52.518 Z M57.1562542,51.228 C56.3802542,50.612 55.6342542,49.969 54.9252542,49.298 L72.0372542,32.188 C72.5732542,33.069 73.0492542,33.981 73.4602542,34.924 L57.1562542,51.228 L57.1562542,51.228 Z M53.4302542,47.789 C52.7552542,47.06 52.1222542,46.305 51.5342542,45.524 L68.9312542,28.127 C69.6212542,28.849 70.2402542,29.612 70.8242542,30.395 L53.4302542,47.789 L53.4302542,47.789 Z M50.3032542,43.751 C49.7532542,42.88 49.2602542,41.984 48.8282542,41.064 L65.0732542,24.819 C65.8912542,25.402 66.6672542,26.015 67.3942542,26.659 L50.3032542,43.751 L50.3032542,43.751 Z M47.9552542,38.931 C47.5822542,37.863 47.2832542,36.768 47.0832542,35.645 L60.5722542,22.155 C61.5072542,22.615 62.4142542,23.097 63.2682542,23.619 L47.9552542,38.931 L47.9552542,38.931 Z M46.7852542,32.937 C46.7202542,31.494 46.8112542,30.013 47.0602542,28.502 L55.4682542,20.094 C56.5162542,20.437 57.5352542,20.805 58.5092542,21.211 L46.7852542,32.937 L46.7852542,32.937 Z M46.0932542,70.934 L44.9262542,71.099 L44.6282542,72.239 C42.1542542,81.68 32.5512542,89.38 21.1652542,91.669 C26.6082542,86.773 31.3162542,80.681 32.0492542,72.467 L32.1922542,70.873 L30.6172542,70.571 C18.8492542,68.317 6.0072542,60.409 3.8462542,47.824 C1.7972542,35.891 10.6022542,26.569 18.7652542,22.211 C24.3032542,19.255 31.6592542,17.627 39.4782542,17.627 C42.0582542,17.627 44.6192542,17.807 47.1212542,18.161 C45.7972542,20.414 44.7862542,22.829 44.1082542,25.37 C41.8682542,33.744 43.8012542,41.878 49.6972542,48.896 C54.0712542,54.102 60.5272542,58.422 67.7072542,61.006 C62.2772542,66.113 54.4022542,69.759 46.0932542,70.934 L46.0932542,70.934 Z M70.3492542,58.166 C69.6532542,57.943 68.9642542,57.699 68.2792542,57.442 L74.1012542,51.621 C73.2622542,53.92 72.0102542,56.107 70.3492542,58.166 L70.3492542,58.166 Z M95.3432542,59.025 L93.4702542,59.457 L94.0532542,61.289 C96.2602542,68.225 99.9882542,73.525 105.393254,77.383 C105.169254,77.396 104.941254,77.401 104.711254,77.401 L104.710254,77.401 C96.5962542,77.4 85.9302542,69.681 82.3312542,61.204 L81.9072542,60.207 L80.8262542,60.13 C78.8532542,59.989 76.8862542,59.73 74.9802542,59.358 C74.6692542,59.296 74.3592542,59.232 74.0452542,59.164 C77.2802542,54.696 78.9172542,49.717 78.9172542,44.328 C78.9172542,30.313 69.3872542,19.787 53.2592542,15.752 C60.0892542,8.164 71.9502542,3.543 84.9902542,3.543 C102.801254,3.543 121.969254,12.417 121.969254,31.9 C121.969254,46.322 108.167254,56.071 95.3432542,59.025 L95.3432542,59.025 Z" sketch:type="MSShapeGroup"></path>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 4.6 KiB

BIN
app/assets/images/icon_home_decide.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

10
app/assets/images/icon_home_decide.svg
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="168px" height="168px" viewBox="0 0 168 168" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<!-- Generator: Sketch 3.3 (11970) - http://www.bohemiancoding.com/sketch -->
<title>Imported Layers</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
<path d="M114.216871,68.813 C112.382871,68.813 110.689871,69.427 109.329871,70.457 C108.210871,67.324 105.214871,65.077 101.701871,65.077 C99.7538708,65.077 97.9638708,65.769 96.5658708,66.919 C95.2908708,64.115 92.4638708,62.16 89.1888708,62.16 C87.5608708,62.16 86.0428708,62.643 84.7718708,63.473 L84.7718708,42.097 C84.7718708,37.633 81.1388708,34 76.6728708,34 C72.2078708,34 68.5758708,37.633 68.5758708,42.097 L68.5758708,81.363 C64.9708708,78.804 60.0988708,77.516 56.2828708,77.737 C48.0188708,78.215 44.6738708,84.626 45.0248708,90.771 L45.0978708,92.05 L46.3228708,92.425 C47.6398708,92.827 49.0678708,93.076 50.5788708,93.339 C55.1588708,94.136 59.8958708,94.959 62.5868708,100.123 C67.0048708,108.604 71.8968708,114.061 78.7838708,118.136 L76.4248708,133.597 L80.0638708,134.152 L82.8048708,116.177 L81.6838708,115.556 C74.7898708,111.74 70.2028708,106.776 65.8508708,98.423 C62.3178708,91.645 56.1588708,90.574 51.2088708,89.714 C50.3328708,89.561 49.4888708,89.414 48.7088708,89.243 C48.8808708,86.665 50.0628708,81.782 56.4948708,81.411 C60.4368708,81.191 66.0408708,83.101 68.5758708,86.347 L68.5758708,93.395 L72.2558708,93.395 L72.2558708,42.097 C72.2558708,39.661 74.2388708,37.68 76.6728708,37.68 C79.1098708,37.68 81.0918708,39.661 81.0918708,42.097 L81.0918708,75.383 L84.7718708,75.383 L84.7718708,70.258 C84.7718708,67.821 86.7528708,65.84 89.1888708,65.84 C91.6238708,65.84 93.6058708,67.821 93.6058708,70.258 L93.6058708,78.301 L97.2848708,78.301 L97.2848708,73.174 C97.2848708,70.738 99.2668708,68.756 101.701871,68.756 C104.137871,68.756 106.118871,70.738 106.118871,73.174 L106.118871,82.036 L109.798871,82.036 L109.798871,76.91 C109.798871,74.474 111.780871,72.493 114.216871,72.493 C116.652871,72.493 118.633871,74.474 118.633871,76.91 L118.633871,86.225 C118.633871,86.681 118.617871,87.153 118.602871,87.622 C118.249871,90.912 117.125871,95.05 113.627871,96.519 C109.960871,98.059 108.856871,101.293 108.000871,104.449 C107.395871,106.681 107.858871,109.064 107.547871,111.355 C107.395871,112.469 107.043871,113.639 106.458871,114.536 C105.913871,114.892 105.352871,115.23 104.764871,115.532 L103.475871,116.194 L107.807871,134.029 L111.383871,133.159 L107.723871,118.095 C118.462871,111.655 122.313871,97.074 122.313871,86.225 L122.313871,76.91 C122.313871,72.446 118.681871,68.813 114.216871,68.813" id="Imported-Layers" fill="#00A14C" sketch:type="MSShapeGroup"></path>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.9 KiB

BIN
app/assets/images/icon_home_do.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.7 KiB

13
app/assets/images/icon_home_done.svg
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="168px" height="168px" viewBox="0 0 168 168" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<!-- Generator: Sketch 3.3 (11970) - http://www.bohemiancoding.com/sketch -->
<title>Imported Layers</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
<g id="Imported-Layers" sketch:type="MSLayerGroup" transform="translate(37.000000, 42.000000)" fill="#1A1918">
<path d="M70.681,36.003 C77.815,27.909 85.818,20.678 93.588,13.215 C99.095,7.925 93.841,0.263 87.899,0.263 C86.178,0.263 84.4,0.905 82.808,2.434 C74.512,10.403 66.045,18.153 58.482,26.843 C53.751,32.279 49.383,38.056 45.382,44.048 C43.843,46.353 42.394,48.715 41,51.11 C39.493,49.112 37.986,47.114 36.477,45.117 C34.017,41.862 31.556,38.607 29.065,35.376 C26.79,32.427 24.331,28.542 20.343,28.541 C19.637,28.541 18.884,28.663 18.075,28.932 C11.554,31.107 11.587,39.022 15.427,42.454 C15.563,42.637 15.695,42.821 15.825,42.986 C15.988,43.192 16.148,43.4 16.309,43.607 C16.537,43.904 17.337,44.94 17.53,45.193 C20.072,48.515 22.591,51.855 25.111,55.193 C27.547,58.42 29.98,61.651 32.42,64.875 C33.806,66.708 35.126,68.921 36.762,70.516 C38.257,71.974 40.162,72.636 42.049,72.636 C45.223,72.636 48.349,70.765 49.401,67.659 C55.161,56.222 62.205,45.618 70.681,36.003" id="Fill-1" sketch:type="MSShapeGroup"></path>
<path d="M72.969,38.019 C72.778,38.235 72.596,38.461 72.407,38.679 C72.938,41.118 73.218,43.614 73.218,46.138 C73.218,65.368 57.572,81.013 38.342,81.013 C19.111,81.013 3.467,65.368 3.467,46.138 C3.467,26.907 19.111,11.262 38.342,11.262 C46.666,11.262 54.644,14.215 60.95,19.591 C61.736,18.759 62.528,17.935 63.325,17.117 C56.375,11.128 47.552,7.836 38.342,7.836 C17.222,7.836 0.039,25.018 0.039,46.138 C0.039,67.258 17.222,84.44 38.342,84.44 C59.462,84.44 76.645,67.258 76.645,46.138 C76.645,42.551 76.129,39.013 75.153,35.599 C74.415,36.399 73.685,37.206 72.969,38.019" id="Fill-2" sketch:type="MSShapeGroup"></path>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

BIN
app/assets/images/icon_home_proposal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

10
app/assets/images/icon_home_proposal.svg
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="168px" height="168px" viewBox="0 0 168 168" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<!-- Generator: Sketch 3.3 (11970) - http://www.bohemiancoding.com/sketch -->
<title>Imported Layers</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
<path d="M83.7019521,31 C66.7919521,31 53.3089521,44.238 53.0049521,61.138 C52.8259521,71.087 57.5089521,80.548 65.5349521,86.446 C68.2559521,88.446 69.8799521,91.664 69.8799521,95.053 L69.8799521,99.237 C69.8799521,100.61 70.3489521,101.873 71.1279521,102.886 C69.9239521,103.842 69.1349521,105.301 69.1349521,106.954 C69.1349521,108.255 69.6139521,109.446 70.4039521,110.361 C69.6139521,111.275 69.1349521,112.466 69.1349521,113.766 C69.1349521,115.067 69.6129521,116.257 70.4029521,117.172 C69.6129521,118.087 69.1349521,119.277 69.1349521,120.577 C69.1349521,123.319 71.2679521,125.549 73.9589521,125.755 L74.7749521,131.146 L92.6299521,131.146 L93.4459521,125.755 C96.1359521,125.55 98.2699521,123.32 98.2699521,120.577 C98.2699521,119.277 97.7919521,118.087 97.0019521,117.172 C97.7919521,116.257 98.2699521,115.067 98.2699521,113.766 C98.2699521,112.466 97.7909521,111.275 97.0009521,110.361 C97.7909521,109.446 98.2699521,108.255 98.2699521,106.954 C98.2699521,105.301 97.4809521,103.842 96.2769521,102.885 C97.0559521,101.873 97.5249521,100.61 97.5249521,99.237 L97.5249521,95.055 C97.5249521,91.683 99.1889521,88.435 101.976952,86.367 C109.758952,80.595 114.404952,71.375 114.404952,61.702 C114.404952,44.773 100.631952,31 83.7019521,31 L83.7019521,31 Z M83.7019521,60.623 C85.9319521,60.623 87.6609521,58.153 87.6609521,56.027 C87.6609521,53.889 86.8459521,51.938 85.5089521,50.468 C86.2729521,50.123 87.1209521,49.93 88.0119521,49.93 C91.5449521,49.93 94.1089521,52.494 94.1089521,56.027 C94.1089521,60.621 91.0709521,65.06 87.5539521,70.201 C86.2759521,72.07 84.9499521,74.007 83.7019521,76.054 C82.4539521,74.007 81.1289521,72.07 79.8499521,70.201 C76.3339521,65.06 73.2969521,60.621 73.2969521,56.027 C73.2969521,52.494 75.8599521,49.93 79.3929521,49.93 C80.2839521,49.93 81.1309521,50.123 81.8949521,50.468 C80.5579521,51.937 79.7419521,53.889 79.7419521,56.027 C79.7419521,58.153 81.4719521,60.623 83.7019521,60.623 L83.7019521,60.623 Z M81.9149521,56.027 C81.9149521,54.346 82.5989521,52.823 83.7019521,51.719 C84.8049521,52.823 85.4879521,54.346 85.4879521,56.027 C85.4879521,57.063 84.6049521,58.45 83.7019521,58.45 C82.7979521,58.45 81.9149521,57.063 81.9149521,56.027 L81.9149521,56.027 Z M87.4779521,93.923 L79.9259521,93.923 C80.1219521,88.864 81.6459521,84.451 83.7019521,80.476 C85.7579521,84.451 87.2819521,88.864 87.4779521,93.923 L87.4779521,93.923 Z M77.5859521,96.095 L89.8179521,96.095 L89.8179521,101.737 L77.5859521,101.737 L77.5859521,96.095 Z M77.4899521,127.989 L77.1579521,125.795 L90.2459521,125.795 L89.9139521,127.989 L77.4899521,127.989 L77.4899521,127.989 Z M93.0519521,122.173 L74.3529521,122.173 C73.4729521,122.173 72.7569521,121.457 72.7569521,120.577 C72.7569521,119.698 73.4729521,118.984 74.3529521,118.984 L93.0519521,118.984 C93.9319521,118.984 94.6479521,119.698 94.6479521,120.577 C94.6479521,121.457 93.9319521,122.173 93.0519521,122.173 L93.0519521,122.173 Z M93.0519521,115.361 L74.3529521,115.361 C73.4729521,115.361 72.7569521,114.646 72.7569521,113.766 C72.7569521,112.887 73.4729521,112.172 74.3529521,112.172 L93.0519521,112.172 C93.9319521,112.172 94.6479521,112.887 94.6479521,113.766 C94.6479521,114.646 93.9319521,115.361 93.0519521,115.361 L93.0519521,115.361 Z M93.0519521,108.549 L74.3529521,108.549 C73.4729521,108.549 72.7569521,107.834 72.7569521,106.954 C72.7569521,106.075 73.4729521,105.36 74.3529521,105.36 L93.0519521,105.36 C93.9319521,105.36 94.6479521,106.075 94.6479521,106.954 C94.6479521,107.834 93.9319521,108.549 93.0519521,108.549 L93.0519521,108.549 Z M99.9639521,83.653 C96.3199521,86.355 94.1459521,90.618 94.1459521,95.055 L94.1459521,99.237 C94.1459521,100.421 93.3519521,101.413 92.2719521,101.737 L91.9909521,101.737 L91.9909521,93.923 L89.6479521,93.923 C89.4329521,87.865 87.4789521,82.746 84.9559521,78.201 C86.3489521,75.812 87.8809521,73.572 89.3479521,71.428 C92.9129521,66.216 96.2809521,61.293 96.2809521,56.027 C96.2809521,51.313 92.7259521,47.757 88.0119521,47.757 C86.4339521,47.757 84.9579521,48.202 83.7019521,48.971 C82.4459521,48.202 80.9709521,47.757 79.3929521,47.757 C74.6789521,47.757 71.1239521,51.313 71.1239521,56.027 C71.1239521,61.293 74.4909521,66.216 78.0569521,71.428 C79.5239521,73.572 81.0559521,75.812 82.4489521,78.201 C79.9249521,82.746 77.9709521,87.865 77.7559521,93.923 L75.4129521,93.923 L75.4129521,101.737 L75.1329521,101.737 C74.0529521,101.413 73.2589521,100.421 73.2589521,99.237 L73.2589521,95.053 C73.2589521,90.593 71.1189521,86.358 67.5359521,83.724 C60.3929521,78.474 56.2239521,70.053 56.3839521,61.198 C56.6529521,46.159 68.6529521,34.379 83.7019521,34.379 C98.7689521,34.379 111.025952,46.636 111.025952,61.702 C111.025952,70.438 106.993952,78.439 99.9639521,83.653 L99.9639521,83.653 Z" id="Imported-Layers" fill="#D82331" sketch:type="MSShapeGroup"></path>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 5.2 KiB

5
app/assets/stylesheets/application.scss
View File

@@ -4,7 +4,6 @@
@import "icons";
@import "variables";
@import "admin";
@import "participacion";
@import "debates";
@import "proposals";
@import "layout";
@import "participation";
@import "c3";

9
app/assets/stylesheets/icons.scss
View File

@@ -139,3 +139,12 @@
.icon-print:before {
content: "H";
}
.icon-blog:before {
content: "J";
}
.icon-box:before {
content: "I";
}
.icon-youtube:before {
content: "K";
}

364
app/assets/stylesheets/participacion.scss → app/assets/stylesheets/layout.scss
View File

@@ -17,6 +17,9 @@
// 15. Social
// 16. Pages
// 17. Verification
// 18. Comments
// 19. Flags
// 20. Accesibility
//
// 01. Variables
@@ -277,6 +280,10 @@ h6 {
margin: rem-calc(24) 0;
}
.text-medium {
font-size: rem-calc(16) !important;
}
// 04. Header
// - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -304,10 +311,11 @@ header {
padding: 0;
}
p {
h2 {
color: white;
font-size: rem-calc(16);
line-height: rem-calc(30);
font-weight: normal;
line-height: rem-calc(30);
}
.button {
@@ -438,7 +446,7 @@ header {
}
.contain-to-grid {
background: rgba(0,0,0,.5);
background: #112E51;
}
.top-bar {
@@ -763,21 +771,19 @@ footer {
opacity: .75;
margin-top: rem-calc(24);
padding-top: rem-calc(12);
}
// 06. Tags
// - - - - - - - - - - - - - - - - - - - - - - - - -
.tags {
.tags, .tag-cloud {
a {
background: $border;
border-radius: rem-calc(30);
border-radius: rem-calc(6);
color: #4d4d4d;
display: inline-block;
font-size: rem-calc(13);
font-weight: bold;
line-height: rem-calc(22);
margin-bottom: rem-calc(8);
padding: 0 rem-calc(8);
@@ -791,7 +797,6 @@ footer {
}
.tag-cloud {
@extend .tags;
h3 {
border-top: 2px solid $brand;
@@ -941,14 +946,13 @@ form {
margin: rem-calc(12) 0 rem-calc(12) rem-calc(6);
}
.note {
.note, .note-marked {
display: block;
font-size: rem-calc(13);
margin-bottom: rem-calc(12);
}
.note-marked {
@extend .note;
background: yellow;
display: inline-block;
@@ -1075,6 +1079,10 @@ label.error, label.error a {
margin-bottom: $line-height;
}
h1.avatar {
margin-left: rem-calc(12);
}
h3 {
clear: both;
font-size: rem-calc(20);
@@ -1109,18 +1117,33 @@ label.error, label.error a {
.verify-account {
padding-right: rem-calc(12);
}
.final-votes-info {
background: $warning-bg;
border: 1px solid $warning-border;
color: $warning-color;
margin-top: rem-calc(24);
padding: rem-calc(12);
ul li {
margin: rem-calc(12) 0;
}
.icon-box {
color: #D4A26D;
font-size: rem-calc(120);
line-height: rem-calc(120);
vertical-align: top;
}
}
}
img.avatar, img.admin-avatar, img.moderator-avatar {
img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar {
border-radius: rem-calc(1000);
position: relative;
}
img.initialjs-avatar {
@extend .avatar;
}
.author-deleted {
.author-deleted, .user-deleted {
background-color: rgba(255,255,255,.5);
color: rgba(0,0,0,.4);
font-size: rem-calc(40);
@@ -1130,14 +1153,47 @@ img.initialjs-avatar {
}
.user-deleted {
@extend .author-deleted;
top: -9px;
}
.user-permissions {
p {
span {
color: $text-medium;
font-size: rem-calc(12);
}
}
ul {
list-style-type: none;
margin-bottom: 0;
margin-left: 0;
li {
font-size: rem-calc(14);
margin-bottom: rem-calc(12);
span {
color: $text-medium;
font-size: rem-calc(12);
}
.icon-check {
color: $check;
}
.icon-x {
color: $delete;
}
}
}
}
// 11. Filters & search
// - - - - - - - - - - - - - - - - - - - - - - - - -
.filters {
.filters, .search-results {
h2 {
display: inline-block;
@@ -1188,10 +1244,6 @@ img.initialjs-avatar {
}
}
.search-results {
@extend .filters;
}
.search-form {
h3 {
@@ -1318,6 +1370,7 @@ table {
}
&:hover {
background: white;
color: #40A2D1;
}
}
@@ -1357,6 +1410,7 @@ table {
}
&:hover {
background: white;
color: #354F88;
}
}
@@ -1396,10 +1450,42 @@ table {
}
&:hover {
background: white;
color: #CE3E26;
}
}
.social {
margin-top: rem-calc(24);
text-align: center;
@media (min-width: $small-breakpoint) {
margin-top: 0;
text-align: right;
}
a {
font-size: rem-calc(24);
line-height: rem-calc(24);
margin: 0 rem-calc(12);
text-decoration: none;
vertical-align: middle;
&:hover {
opacity: .5;
text-decoration: none;
}
@media (min-width: $small-breakpoint) {
font-size: rem-calc(18);
}
&:last-child {
margin-right: 0;
}
}
}
.share-supported {
.social-share-button {
@@ -1407,27 +1493,72 @@ table {
}
.social-share-button-twitter {
@extend .social-share-button-twitter;
background: none;
color: white;
height: rem-calc(24);
position: relative;
width: rem-calc(48);
&:before {
content: "f";
font-family: "icons" !important;
font-size: rem-calc(24);
left: 50%;
line-height: $line-height*2;
margin-left: rem-calc(-11);
position: absolute;
top: 0;
}
&:hover {
color: #40A2D1;
}
}
.social-share-button-facebook {
@extend .social-share-button-facebook;
background: none;
color: white;
height: rem-calc(24);
position: relative;
width: rem-calc(48);
&:before {
content: "A";
font-family: "icons" !important;
font-size: rem-calc(24);
left: 50%;
line-height: $line-height*2;
margin-left: rem-calc(-11);
position: absolute;
top: 0;
}
&:hover {
color: #354F88;
}
}
.social-share-button-google_plus {
@extend .social-share-button-google_plus;
background: none;
color: white;
height: rem-calc(24);
position: relative;
width: rem-calc(48);
&:before {
content: "B";
font-family: "icons" !important;
font-size: rem-calc(24);
left: 50%;
line-height: $line-height*2;
margin-left: rem-calc(-11);
position: absolute;
top: 0;
}
&:hover {
color: #CE3E26;
}
}
}
@@ -1513,7 +1644,7 @@ table {
font-family: "icons" !important;
position: absolute;
right: 0;
top: rem-calc(6);
top: rem-calc(12);
@media (min-width: $small-breakpoint) {
content: 'c';
@@ -1636,3 +1767,184 @@ table {
}
}
}
// 18. Comments
// - - - - - - - - - - - - - - - - - - - - - - - - -
.comments {
background: $white;
background-repeat: repeat-x;
padding-top: rem-calc(24);
padding-bottom: rem-calc(96);
h2 {
margin: 0;
font-weight: bold;
span {
font-size: rem-calc(18);
font-weight: normal;
opacity: .8;
}
}
.comment {
margin: rem-calc(6) 0;
p {
margin-bottom: 0;
}
.comment-votes {
color: $text-medium;
font-weight: lighter;
line-height: rem-calc(24);
margin: rem-calc(10) rem-calc(12) rem-calc(6) 0;
a {
color: $text-light;
display: inline-block;
vertical-align: top;
&:hover {
color: $text-medium;
}
}
[class^="icon-"] {
font-size: rem-calc(20);
vertical-align: middle;
}
}
.comment-body {
margin-left: rem-calc(42);
p {
font-size: rem-calc(14);
}
.reply {
background: white;
border: 1px solid $border;
font-size: rem-calc(12);
margin: rem-calc(6) 0;
padding: rem-calc(6);
.divider {
color: $text-light;
}
}
.comment-user {
margin-top: rem-calc(6);
padding: rem-calc(6) 0;
overflow: hidden;
@each $n in ("1", "2", "3","4", "5") {
&.level-#{$n} {
@if $n == "5" {
background: $comment-level-5;
padding: rem-calc(6) rem-calc(12);
}
@elseif $n == "1" {
background: none;
padding: rem-calc(6) rem-calc(12);
}
@else {
background: $comment-official;
padding: rem-calc(6) rem-calc(12);
}
}
}
&.is-author {
background: $comment-author;
padding: rem-calc(6) rem-calc(12);
}
&.is-admin, &.is-moderator {
background: $comment-admin;
padding: rem-calc(6) rem-calc(12);
}
&.level-5 {
background: $comment-level-5;
padding: rem-calc(6) rem-calc(12);
}
}
}
.is-deleted {
background: $deleted;
margin-left: rem-calc(42);
padding: rem-calc(6) rem-calc(12);
}
.comment-children {
border-left: 1px dashed $border;
margin-left: rem-calc(42);
padding-left: rem-calc(6);
@media only screen and (max-width: 40em) {
margin-left: rem-calc(16);
}
}
.comment-info {
color: $text-light;
font-size: rem-calc(13);
font-weight: lighter;
margin-top: rem-calc(6);
vertical-align: middle;
span.user-name {
color: $text;
font-weight: bold;
}
}
}
}
.faded {
opacity: 0.4;
}
// 19. Flags
// - - - - - - - - - - - - - - - - - - - - - - - - -
.flag-content {
.button {
background: none;
margin-bottom: 0;
padding: 0;
}
}
.flag-disable, .flag-active {
line-height: rem-calc(24);
vertical-align: middle;
}
.flag-disable {
color: $text-medium;
}
.flag-active {
color: $delete;
}
// 20. Accesibility
// - - - - - - - - - - - - - - - - - - - - - - - - -
.sr-only {
position: absolute;
width: 1px;
height: 1px;
padding: 0;
margin: -1px;
overflow: hidden;
clip: rect(0, 0, 0, 0);
border: 0;
}

969
app/assets/stylesheets/debates.scss → app/assets/stylesheets/participation.scss
View File

File diff suppressed because it is too large Load Diff

775
app/assets/stylesheets/proposals.scss
View File

@@ -1,775 +0,0 @@
// Table of Contents
//
// 01. Debates
// 02. Index
// 02.1. Featured
// 02.2. List
// 03. Show
// 04. New
// 05. Comments
// 06. Flags
//
// 01. Proposals
// - - - - - - - - - - - - - - - - - - - - - - - - -
.button-proposal {
background: $proposals;
&:hover {
background: $proposals-border;
}
}
@mixin supports {
background: $proposals;
border-top: 1px solid $proposals-border;
margin: 0 rem-calc(-12);
padding: rem-calc(14) rem-calc(12);
position: relative;
.progress {
background-color: rgba(255,255,255,.8);
height: rem-calc(12);
margin-bottom: rem-calc(6);
margin-top: rem-calc(4);
.meter {
background: $votes-like;
}
}
.percentage {
font-size: rem-calc(10);
color: $brand;
vertical-align: top;
position: absolute;
top: 17px;
right: 18px;
}
abbr {
color: white;
&[title] {
border-bottom: 1px dotted white;
}
}
.button-support {
background: white;
color: $proposals;
display: inline-block;
font-size: rem-calc(14);
margin-top: rem-calc(12);
&:hover {
background: $proposals-border;
color: white;
cursor: pointer;
}
&:active {
opacity: .75;
}
}
.total-supports {
color: white;
text-align: center;
font-size: rem-calc(14);
span {
display: block;
font-size: rem-calc(11);
opacity: .75;
}
}
.divider {
margin: 0 rem-calc(6);
}
.not-logged {
background: rgba(255,164,45,.9);
color: white;
height: 100%;
left: 0;
line-height: $line-height*2;
padding-top: rem-calc(12);
position: absolute;
text-align: center;
top: 0;
width: 100%;
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#222222', endColorstr='#222222'); /* IE */
a {
color: white;
text-decoration: underline;
}
}
.anonymous-votes, .organizations-votes {
background: $warning-bg;
color: $warning-color;
height: 100%;
left: 0;
line-height: $line-height;
padding-top: rem-calc(12);
position: absolute;
text-align: center;
top: 0;
width: 100%;
p {
color: $warning-color;
margin: 0 rem-calc(12);
text-align: left;
}
a {
color: $warning-color;
font-weight: bold;
text-decoration: underline;
}
}
.supported {
color: white;
margin-top: rem-calc(12);
}
}
// 02. Index
// - - - - - - - - - - - - - - - - - - - - - - - - -
// 02.1. Featured
// - - - - - - - - - - - - -
.proposal-featured {
.panel {
background: white;
border: 1px solid;
border-color: #e5e6e9 #dfe0e4 #d0d1d5;
border-radius: rem-calc(3);
margin-bottom: rem-calc(24);
padding: rem-calc(24) rem-calc(12) 0 rem-calc(12);
.proposal-content {
min-height: rem-calc(353);
}
.label-proposal {
background: none;
clear: both;
color: $proposals;
display: block;
font-size: rem-calc(12);
font-weight: bold;
text-transform: uppercase;
padding-left: 0;
padding-top: 0;
}
.icon-proposals {
color: $proposals;
font-size: rem-calc(36);
line-height: $line-height;
position: absolute;
right: rem-calc(18);
top: rem-calc(12);
}
h3 {
font-weight: bold;
margin: rem-calc(8) 0 0 0;
min-height: rem-calc(65);
a {
clear: both;
color: $text;
display: block;
font-size: rem-calc(16);
line-height: $line-height;
text-transform: lowercase;
&:first-letter {
text-transform: uppercase;
}
}
}
.proposal-info {
color: $text-medium;
font-weight: lighter;
margin-bottom: 0;
.icon-comments {
font-size: rem-calc(16);
vertical-align: top;
}
a {
color: $text-medium;
}
}
.proposal-description {
color: $text;
font-size: rem-calc(13);
height: rem-calc(156);
line-height: $line-height;
margin-bottom: rem-calc(12);
margin-top: rem-calc(24);
overflow: hidden;
position: relative;
a {
color: $text;
}
ul, ol {
li {
font-size: rem-calc(13);
margin-bottom: rem-calc(12);
}
}
}
.truncate {
background: image-url('truncate.png');
background-repeat: repeat-x;
bottom: 0;
height: 24px;
position: absolute;
width: 100%;
}
p {
color: $text;
font-size: rem-calc(14);
line-height: $line-height;
margin-bottom: rem-calc(12);
&.debate-info {
font-size: rem-calc(13);
}
}
}
.supports {
@include supports;
}
}
// 02.2. List
// - - - - - - - - - - - - -
.proposals-list {
@media (min-width: $small-breakpoint) {
margin-bottom: rem-calc(48);
}
}
.proposal {
@extend .proposal-featured;
margin-bottom: 0;
margin-top: 0;
.panel {
border-radius: 0;
box-shadow: 0px 1px 3px 0 $border;
margin-bottom: rem-calc(12);
min-height: rem-calc(192);
padding-top: rem-calc(12);
@media (min-width: $small-breakpoint) {
margin-bottom: rem-calc(-1);
padding-bottom: rem-calc(12);
}
.label-proposal {
line-height: $line-height;
padding-bottom: 0;
}
h3 {
margin-top: 0;
min-height: rem-calc(48);
}
.proposal-content {
margin: 0;
min-height: rem-calc(180);
.tags {
display: block;
}
}
.icon-proposals {
font-size: rem-calc(18);
left: rem-calc(88);
top: 0;
}
.proposal-description {
height: rem-calc(72);
margin-top: 0;
}
}
.supports {
border: 1px solid $proposals-border;
margin: 0 rem-calc(-12);
@media (min-width: $small-breakpoint) {
border-top-left-radius: 3px;
border-bottom-left-radius: 3px;
margin: 0 rem-calc(-25) 0 rem-calc(12);
}
&:after {
content: none;
position: absolute;
display: block;
border-style: solid;
border-color: #664212 transparent transparent transparent;
bottom: rem-calc(-14);
border-left-width: 0;
border-right-color: transparent;
right: rem-calc(-1);
border-width: 1em 1em 0 0;
@media (min-width: $small-breakpoint) {
content: "";
}
}
.total-supports {
display: inline-block;
line-height: $line-height;
padding-top: rem-calc(12);
vertical-align: top;
@media (min-width: $small-breakpoint) {
display: block;
float: none;
margin-left: 0;
padding-top: 0;
}
}
.not-logged {
line-height: $line-height;
padding-top: rem-calc(24);
}
.anonymous-votes, .organizations-votes {
padding-top: rem-calc(24);
}
.divider {
display: none;
}
@media (min-width: $medium-breakpoint) {
.divider {
display: inline-block;
}
}
}
}
// 03. Show
// - - - - - - - - - - - - - - - - - - - - - - - - -
.proposal-show {
padding-top: rem-calc(12);
.back {
@include back;
}
.icon-angle-left {
@extend .back;
}
h1 {
clear: both;
font-size: rem-calc(30);
font-weight: bold;
margin: 0;
text-transform: lowercase;
&:first-letter {
text-transform: uppercase;
}
}
h4 {
margin: rem-calc(12) 0;
}
.edit-proposal {
margin-bottom: 0;
}
.proposal-info {
clear: both;
color: $text-medium;
font-weight: lighter;
line-height: $line-height*2;
text-align: justify;
a {
color: $text-medium;
}
p {
font-size: rem-calc(15);
line-height: $line-height;
margin-bottom: 0;
}
}
.proposal-description {
font-size: rem-calc(15);
line-height: rem-calc(30);
}
ul, ol {
margin: rem-calc(12) 0;
li {
font-size: rem-calc(15);
margin-bottom: rem-calc(15);
}
}
.author-photo {
line-height: $line-height*2;
margin-right: rem-calc(6);
vertical-align: middle;
width: 32px;
}
.author {
color: $text;
font-weight: bold;
}
aside {
h3 {
border-top: 2px solid $brand;
display: inline-block;
font-size: rem-calc(16);
margin: -1px 0 rem-calc(12);
padding-top: rem-calc(6);
text-transform: uppercase;
}
}
blockquote {
margin-top: rem-calc(12);
padding-top: 0;
font-size: rem-calc(15);
line-height: rem-calc(30);
}
.document-link {
border: 1px solid $border;
display: block;
margin-top: rem-calc(12);
padding: rem-calc(12);
position: relative;
a {
padding-left: rem-calc(24);
}
:before {
color: #007BB7;
content: "G";
font-family: "icons" !important;
font-size: rem-calc(24);
left: rem-calc(6);
padding-top: rem-calc(3);
position: absolute;
top: 0;
}
}
.video-link {
@extend .document-link;
:before {
color: #CC181E;
content: "D";
}
}
.supports {
@include supports;
border: 0;
border-radius: 0;
margin: 0;
.total-supports {
display: block;
float: none;
line-height: $line-height;
}
.not-logged {
line-height: $line-height;
padding: rem-calc(24);
}
}
.leave-comment {
display: inline-block;
margin-top: rem-calc(24);
}
.tags {
display: block;
margin: rem-calc(24) 0;
a {
margin-right: rem-calc(6);
}
}
}
.bullet {
color: $border;
}
// 04. New
// - - - - - - - - - - - - - - - - - - - - - - - - -
.proposal-new {
background: white;
padding-top: rem-calc(24);
.back {
@include back;
}
h1 {
clear: both;
font-size: rem-calc(36);
font-weight: bold;
line-height: $line-height*2;
margin-bottom: rem-calc(24);
}
.icon-proposals {
color: $proposals;
font-size: rem-calc(50);
line-height: $line-height;
opacity: .5;
}
h2 {
clear: both;
font-size: rem-calc(20);
font-weight: bold;
line-height: $line-height;
margin: 0;
}
.recommendations {
list-style-type: none;
margin-left: 0;
margin-top: rem-calc(24);
li {
font-size: rem-calc(12);
margin: rem-calc(12) 0;
&:before {
color: $proposals;
content: "l ";
font-family: "icons" !important;
}
}
}
}
.proposal-edit {
@extend .proposal-new;
}
// 05. Comments
// - - - - - - - - - - - - - - - - - - - - - - - - -
.comments {
background: $white;
background-repeat: repeat-x;
padding-top: rem-calc(24);
padding-bottom: rem-calc(96);
h2 {
margin: 0;
font-weight: bold;
span {
font-size: rem-calc(18);
font-weight: normal;
opacity: .8;
}
}
.comment {
margin: rem-calc(6) 0;
p {
margin-bottom: 0;
}
.comment-votes {
color: $text-medium;
font-weight: lighter;
margin: rem-calc(8) rem-calc(12) rem-calc(6) 0;
a {
color: $text-light;
display: inline-block;
vertical-align: top;
&:hover {
color: $text-medium;
}
}
[class^="icon-"] {
font-size: rem-calc(20);
vertical-align: middle;
}
}
.comment-body {
margin-left: rem-calc(42);
p {
font-size: rem-calc(14);
}
.reply {
background: white;
border: 1px solid $border;
font-size: rem-calc(12);
margin: rem-calc(6) 0;
padding: rem-calc(6);
.divider {
color: $text-light;
}
}
.comment-user {
margin-top: rem-calc(6);
padding: rem-calc(6) 0;
overflow: hidden;
@each $n in ("1", "2", "3","4", "5") {
&.level-#{$n} {
@if $n == "5" {
background: $comment-level-5;
padding: rem-calc(6) rem-calc(12);
}
@elseif $n == "1" {
background: none;
padding: rem-calc(6) rem-calc(12);
}
@else {
background: $comment-official;
padding: rem-calc(6) rem-calc(12);
}
}
}
&.is-author {
background: $comment-author;
padding: rem-calc(6) rem-calc(12);
}
&.is-admin {
background: $comment-admin;
padding: rem-calc(6) rem-calc(12);
}
&.is-moderator {
@extend .is-admin;
}
&.level-5 {
background: $comment-level-5;
padding: rem-calc(6) rem-calc(12);
}
}
}
.is-deleted {
background: $deleted;
margin-left: rem-calc(42);
padding: rem-calc(6) rem-calc(12);
}
.comment-children {
border-left: 1px dashed $border;
margin-left: rem-calc(42);
padding-left: rem-calc(6);
@media only screen and (max-width: 40em) {
margin-left: rem-calc(16);
}
}
.comment-info {
color: $text-light;
font-size: rem-calc(13);
font-weight: lighter;
margin-top: rem-calc(6);
vertical-align: middle;
span.user-name {
color: $text;
font-weight: bold;
}
}
}
}
.faded {
opacity: 0.4;
}
// 06. Flags
// - - - - - - - - - - - - - - - - - - - - - - - - -
.flag-content {
.button {
background: none;
margin-bottom: 0;
padding: 0;
}
}
.flag-disable {
color: $text-medium;
line-height: rem-calc(24);
vertical-align: middle;
}
.flag-active {
@extend .flag-disable;
color: $delete;
}

2
app/controllers/pages_controller.rb
View File

@@ -47,6 +47,6 @@ class PagesController < ApplicationController
end
def blog
redirect_to "http://diario.madrid.es/blog/category/gobiernoabierto/"
redirect_to "http://diario.madrid.es/participa/"
end
end

5
app/models/concerns/taggable.rb
View File

@@ -3,6 +3,7 @@ module Taggable
included do
acts_as_taggable
validate :max_number_of_tags
end
def tag_list_with_limit(limit = nil)
@@ -17,4 +18,8 @@ module Taggable
count = tags.size - limit
count < 0 ? 0 : count
end
def max_number_of_tags
errors.add(:tag_list, :less_than_or_equal_to, count: 6) if tag_list.count > 6
end
end

2
app/models/proposal.rb
View File

@@ -65,7 +65,7 @@ class Proposal < ActiveRecord::Base
end
def code
"#{Setting.value_for("proposal_code_prefix")}-#{created_at.strftime('%Y-%M')}-#{id}"
"#{Setting.value_for("proposal_code_prefix")}-#{created_at.strftime('%Y-%m')}-#{id}"
end
def after_commented

79
app/views/account/show.html.erb
View File

@@ -1,35 +1,20 @@
<div class="row account">
<div class="small-12 column">
<%= link_to t("account.show.change_credentials_link"), edit_user_registration_path, class: "button radius small secondary right" %>
<% unless @account.organization? %>
<div>
<span class="right verify-account">
<% if current_user.level_three_verified? %>
<p class="already-verified">
<i class="icon-check"></i>
<%= t("account.show.verified_account") %>
</p>
<% elsif current_user.level_two_verified? %>
<%= link_to t("account.show.finish_verification"), verification_path, class: "button radius small success right" %>
<% else %>
<%= link_to t("account.show.verify_my_account"), verification_path, class: "button radius small success right" %>
<% end %>
</span>
</div>
<% end %>
<h1 class="inline-block"><%= t("account.show.title") %></h1>
<%= avatar_image(@account, seed: @account.id, size: 60) %>
<h1 class="inline-block avatar"><%= t("account.show.title") %></h1>
<%= form_for @account, as: :account, url: account_path do |f| %>
<%= render "shared/errors", resource: @account %>
<div class="row">
<div class="small-12 column">
<h2><%= t("account.show.avatar")%></h2>
<%= avatar_image(@account, seed: @account.id, size: 60) %>
<div class="small-12 medium-6 column">
<h2><%= t("account.show.personal")%></h2>
<div class="small-12 medium-4">
<div class="small-12 medium-10">
<% if @account.organization? %>
<%= f.fields_for :organization do |fo| %>
<%= fo.text_field :name, autofocus: true, maxlength: Organization.name_max_length, placeholder: t("account.show.organization_name_label") %>
@@ -57,10 +42,58 @@
<span class="checkbox"><%= t("account.show.email_on_comment_reply_label") %></span>
<% end %>
</div>
<%= f.submit t("account.show.save_changes_submit"), class: "button radius" %>
</div>
<div class="small-12 column">
<%= f.submit t("account.show.save_changes_submit"), class: "button radius" %>
<div class="user-permissions small-12 medium-6 column">
<h2><%= t("account.show.user_permission_title") %></h2>
<p><%= t("account.show.user_permission_info") %></p>
<ul>
<li><i class="icon-check"></i>&nbsp;<%= t("account.show.user_permission_debates") %></li>
<li><i class="icon-check"></i>&nbsp;<%= t("account.show.user_permission_proposal") %></li>
<li>
<% if current_user.level_two_verified? || current_user.level_three_verified? %>
<i class="icon-check"></i>
<% else %>
<i class="icon-x"></i>
<% end %>
<%= t("account.show.user_permission_support_proposal") %>
</li>
<li>
<% if current_user.level_three_verified? %>
<i class="icon-check"></i>
<% else %>
<i class="icon-x"></i>
<% end %>
<%= t("account.show.user_permission_votes") %>
</li>
</ul>
<p>
<span><%= t("account.show.user_permission_verify_info") %></span>
<br>
<%= t("account.show.user_permission_verify") %>
</p>
<% unless @account.organization? %>
<div>
<span class="verify-account">
<% if current_user.level_three_verified? %>
<p class="already-verified">
<i class="icon-check"></i>
<%= t("account.show.verified_account") %>
</p>
<% elsif current_user.level_two_verified? %>
<%= link_to t("account.show.finish_verification"), verification_path, class: "button radius small success" %>
<% else %>
<%= link_to t("account.show.verify_my_account"), verification_path, class: "button radius small success" %>
<% end %>
</span>
</div>
<% end %>
</div>
</div>
<% end %>

4
app/views/admin/stats/show.html.erb
View File

@@ -80,12 +80,12 @@
</div>
<div class="small-12 medium-6 left">
<h2><%= t "admin.stats.show.combined_title" %></h2>
<h2><%= t "admin.stats.show.visits_title" %></h2>
<%= visits_chart_tag id: "visits" %>
</div>
<div class="small-12 medium-6 left">
<h2><%= t "admin.stats.show.visits_title" %></h2>
<h2><%= t "admin.stats.show.combined_title" %></h2>
<%= events_chart_tag @event_types.keys, id: 'combined' %>
</div>

3
app/views/devise/confirmations/new.html.erb
View File

@@ -1,5 +1,6 @@
<% provide :title do %><%= t("devise_views.confirmations.new.title") %><% end %>
<h1 class="text-center"><%= t("devise_views.confirmations.new.title") %></h1>
<h2 class="text-center"><%= t("devise_views.confirmations.new.title") %></h2>
<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
<%= render 'shared/errors', resource: resource %>

2
app/views/devise/passwords/new.html.erb
View File

@@ -1,5 +1,5 @@
<% provide :title do %><%= t("devise_views.passwords.new.title") %><% end %>
<h1 class="text-center"><%= t("devise_views.passwords.new.title") %></h1>
<h2 class="text-center"><%= t("devise_views.passwords.new.title") %></h2>
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
<%= render 'shared/errors', resource: resource %>

2
app/views/kaminari/_paginator.html.erb
View File

@@ -1,6 +1,6 @@
<%= paginator.render do -%>
<div class="pagination-centered">
<nav role="navigation">
<nav>
<ul class="pagination">
<%= first_page_tag unless current_page.first? %>
<%= prev_page_tag unless current_page.first? %>

4
app/views/layouts/_admin_header.html.erb
View File

@@ -6,11 +6,11 @@
</section>
<div class="contain-to-grid clear">
<nav class="top-bar" data-topbar role="navigation">
<nav class="top-bar" data-topbar>
<ul class="title-area">
<li class="name">
<%= link_to root_path do %>
<%= image_tag('header_logo_madrid.png', class: 'left', size: '96x96') %>
<%= image_tag('header_logo_madrid.png', class: 'left', size: '96x96', alt: t("layouts.header.logo")) %>
<%= t("layouts.header.open_gov", open: "<strong>#{t('layouts.header.open')}</strong>").html_safe %> <span>|</span> <span class="logo-site"><%= t("admin.dashboard.index.title") %></span>
<% end %>
</li>

25
app/views/layouts/_footer.html.erb
View File

@@ -3,9 +3,9 @@
<div class="row">
<div class="small-12 large-4 column">
<div class="logo">
<h3 class="logo">
<%= link_to t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %>
</div>
</h3>
<p>
<%= t("layouts.footer.description",
@@ -42,13 +42,32 @@
</div>
<div class="subfooter row">
<div class="small-12 column">
<div class="small-12 medium-10 column">
<%= t("layouts.footer.copyright", year: Time.now.year) %>&nbsp;|&nbsp;
<%= link_to t("layouts.footer.more_info"), "/more_information" %>&nbsp;|&nbsp;
<%= link_to t("layouts.footer.privacy"), "/privacy" %>&nbsp;|&nbsp;
<%= link_to t("layouts.footer.conditions"), "/conditions" %>&nbsp;|&nbsp;
<%= link_to t("layouts.footer.accessibility"), "/accessibility" %>
</div>
<div class="small-12 medium-2 column social">
<%= link_to "https://twitter.com/abriendomadrid", target: "_blank", title: t("social.twitter") do %>
<span class="sr-only"><%= t("social.twitter") %></span>
<i class="icon-twitter"></i>
<% end %>
<%= link_to "https://www.facebook.com/Abriendo-Madrid-1475577616080350/", target: "_blank", title: t("social.facebook") do %>
<span class="sr-only"><%= t("social.facebook") %></span>
<i class="icon-facebook"></i>
<% end %>
<%= link_to "/blog", target: "_blank", title: t("social.blog") do %>
<span class="sr-only"><%= t("social.blog") %></span>
<i class="icon-blog"></i>
<% end %>
<%= link_to "https://www.youtube.com/channel/UCFmaChI9quIY7lwHplnacfg", target: "_blank", title: t("social.youtube") do %>
<span class="sr-only"><%= t("social.youtube") %></span>
<i class="icon-youtube"></i>
<% end %>
</div>
</div>
</div>
</footer>

38
app/views/layouts/_header.html.erb
View File

@@ -6,18 +6,46 @@
<%= link_to t("layouts.header.participation"), root_path, class: ("selected" unless current_page?("/transparency") || current_page?("/opendata")) %>&nbsp;|
<%= link_to t("layouts.header.external_link_transparency"), "/transparency", class: ("selected" if current_page?("/transparency")) %>&nbsp;|
<%= link_to t("layouts.header.external_link_opendata"), "/opendata", class: ("selected" if current_page?("/opendata")) %>
&nbsp;|&nbsp;
<div class="social inline-block">
<%= link_to "https://twitter.com/abriendomadrid", target: "_blank", title: t("social.twitter") do %>
<span class="sr-only"><%= t("social.twitter") %></span>
<i class="icon-twitter"></i>
<% end %>
<%= link_to "https://www.facebook.com/Abriendo-Madrid-1475577616080350/", target: "_blank", title: t("social.facebook") do %>
<span class="sr-only"><%= t("social.facebook") %></span>
<i class="icon-facebook"></i>
<% end %>
<%= link_to "/blog", target: "_blank", title: t("social.blog") do %>
<span class="sr-only"><%= t("social.blog") %></span>
<i class="icon-blog"></i>
<% end %>
<%= link_to "https://www.youtube.com/channel/UCFmaChI9quIY7lwHplnacfg", target: "_blank", title: t("social.youtube") do %>
<span class="sr-only"><%= t("social.youtube") %></span>
<i class="icon-youtube"></i>
<% end %>
</div>
</div>
</div>
</section>
<div class="contain-to-grid clear">
<nav class="top-bar" data-topbar role="navigation">
<nav class="top-bar" data-topbar>
<ul class="title-area">
<li class="toggle-topbar menu-icon"><a href="#"><span><%= t("application.menu")%></span></a></li>
<li class="name">
<%= link_to root_path do %>
<%= image_tag('header_logo_madrid.png', class: 'show-for-medium-up left', size: '96x96') %>
<%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %> <span>|</span> <span class="logo-site"><%= t("layouts.header.participation") %></span>
<%= image_tag('header_logo_madrid.png', class: 'show-for-medium-up left', size: '96x96', alt: t("layouts.header.logo")) %>
<%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %> <span>|</span>
<span class="logo-site">
<% if transparency_page? %>
<%= t("layouts.header.transparency") %>
<% elsif opendata_page? %>
<%= t("layouts.header.open_data") %>
<% else %>
<%= t("layouts.header.participation") %>
<% end %>
</span>
<% end %>
</li>
</ul>
@@ -51,8 +79,8 @@
<div class="row home-page">
<div class="small-12 medium-7 column">
<h1><%= t("layouts.header.open_city_title") %></h1>
<p><%= t("layouts.header.open_city_slogan_html") %></p>
<%= link_to t("layouts.header.see_all"), highlights_path, class: "button radius see-more warning" %>
<h2><%= t("layouts.header.open_city_slogan_html") %></h2>
<%= link_to t("layouts.header.see_all"), proposals_path, class: "button radius see-more warning" %>
<%= link_to t("layouts.header.more_information"), "/more_information", class: "more-info" %>
</div>

64
app/views/layouts/devise.html.erb
View File

@@ -13,39 +13,41 @@
</head>
<body class="auth-page">
<div class="row">
<div class="small-12 medium-8 large-5 column small-centered">
<h1>
<%= link_to root_path do %>
<%= image_tag('header_logo_madrid.png', class: 'show-for-medium-up left', size: '96x96') %>
<%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %>
<% end %>
</h1>
</div>
</div>
<div class="row auth">
<div class="small-12 medium-8 large-5 column small-centered">
<div class="panel">
<% if notice %>
<div data-alert class="alert-box radius success">
<a href="#" class="close" title="<%= t("application.close") %>">&times;</a>
<%= notice %>
</div>
<% end %>
<% if alert %>
<div data-alert class="alert-box radius warning">
<a href="#" class="close" title="<%= t("application.close") %>">&times;</a>
<%= alert %>
</div>
<% end %>
<%= yield %>
<div class="wrapper">
<div class="row">
<div class="small-12 medium-8 large-5 column small-centered">
<h1>
<%= link_to root_path do %>
<%= image_tag('header_logo_madrid.png', class: 'show-for-medium-up left', size: '96x96', alt: t("layouts.header.logo")) %>
<%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %>
<% end %>
</h1>
</div>
</div>
<div class="row auth">
<div class="small-12 medium-8 large-5 column small-centered">
<div class="panel">
<% if notice %>
<div data-alert class="alert-box radius success">
<a href="#" class="close" title="<%= t("application.close") %>">&times;</a>
<%= notice %>
</div>
<% end %>
<% if alert %>
<div data-alert class="alert-box radius warning">
<a href="#" class="close" title="<%= t("application.close") %>">&times;</a>
<%= alert %>
</div>
<% end %>
<%= yield %>
</div>
</div>
</div>
<div class="push"></div>
</div>
<div class="footer">

4
app/views/organizations/registrations/new.html.erb
View File

@@ -8,9 +8,9 @@
<%= f.fields_for :organization do |fo| %>
<%= fo.text_field :name, autofocus: true, maxlength: Organization.name_max_length, placeholder: t("devise_views.organizations.registrations.new.organization_name_label") %>
<%= fo.label t("devise_views.organizations.registrations.new.responsible_name_label") %>
<%= fo.label :responsible_name %>
<p class="note"><%= t("devise_views.organizations.registrations.new.responsible_name_note") %></p>
<%= fo.text_field :responsible_name, maxlength: Organization.responsible_name_max_length, label: false %>
<%= fo.text_field :responsible_name, placeholder: t("devise_views.organizations.registrations.new.responsible_name_label"), maxlength: Organization.responsible_name_max_length, label: false %>
<% end %>
<%= f.email_field :email, placeholder: t("devise_views.organizations.registrations.new.email_label") %>

2
app/views/pages/conditions.html.erb
View File

@@ -82,7 +82,7 @@
<li>B. Protección de datos: Los datos personales aportados por los usuarios que se registren en el Portal de Gobierno Abierto, serán incorporados y tratados en el fichero Gestión de Procesos Participativos, cuya finalidad es gestionar los procesos participativos para el control de la habilitación de las personas que participan en los mismos y recuento meramente numérico y estadístico de los resultados derivados de los procesos de participación ciudadana. Gestión de Agendas para convocatorias y envío de información solicitada. El órgano responsable del fichero es la Dirección General competente en materia de Participación Ciudadana, ante la que la persona interesada podrá ejercer los derechos de acceso, rectificación, cancelación y oposición, todo lo cual se informa en cumplimiento del artículo 5 de la Ley Orgánica 15/1999, de 13 de diciembre, de Protección de Datos de Carácter Personal.</li>
</ul>
<p>Como principio general, los datos personales no serán comunicados a terceros, excepto cuando la comunicación haya sido autorizada por el usuario, o la información sea requerida por la autoridad judicial, ministerio fiscal o la policía judicial, o se de alguno de los supuestos regulados en el artículo 11 de la Ley Orgánica 15/1999, de 13 de diciembre, de Protección de Datos de Carácter Personal.<p>
<p>Como principio general, los datos personales no serán comunicados a terceros, excepto cuando la comunicación haya sido autorizada por el usuario, o la información sea requerida por la autoridad judicial, ministerio fiscal o la policía judicial, o se de alguno de los supuestos regulados en el artículo 11 de la Ley Orgánica 15/1999, de 13 de diciembre, de Protección de Datos de Carácter Personal.</p>
<ul>
<li>Los derechos de acceso, rectificación, cancelación y oposición, se podrán ejercitar dirigiendo una comunicación por escrito al Ayuntamiento de Madrid, Área de Gobierno de Participación Ciudadana, Transparencia y Gobierno Abierto, Dirección General de Participación Ciudadana.</li>
</ul>

48
app/views/pages/more_information.html.erb
View File

@@ -4,42 +4,42 @@
<div class="more-information text small-12 medium-8 column">
<h1>Más información</h1>
<ul>
<a href="/how_it_works">
<li>
<li>
<a href="/how_it_works">
¿Cómo funciona este Portal de Gobierno Abierto?
<span>Descubre todo lo que puedes hacer en esta web</span>
</li>
</a>
<a href="/how_to_use">
<li>
</a>
</li>
<li>
<a href="/how_to_use">
Utilízalo en tu municipio
<span>Utilízalo libremente o ayúdanos a mejorarlo, es software libre</span>
</li>
</a>
<a href="/participation">
<li>
</a>
</li>
<li>
<a href="/participation">
Participación y Transparencia en Madrid - Próximas novedades
<span>Participación Ciudadana, Transparencia y Gobierno Abierto</span>
</li>
</a>
<a href="/proposals_info">
<li>
</a>
</li>
<li>
<a href="/proposals_info">
¿Cómo funcionan las propuestas ciudadanas?
<span>Crea tus propias propuestas</span>
</li>
</a>
<a href="/participation_world">
<li>
</a>
</li>
<li>
<a href="/participation_world">
Participación ciudadana directa en el mundo
<span>Sistemas de participación ciudadana que ya existen en el mundo</span>
</li>
</a>
<a href="/participation_facts">
<li>
</a>
</li>
<li>
<a href="/participation_facts">
Hechos sobre participación ciudadana y democracia directa
<span>Para perderle el miedo</span>
</li>
</a>
</a>
</li>
</ul>
<p>Si tienes problemas con la web <a href="mailto:web.gobiernoabierto@madrid.es">contacta con el servicio técnico</a>.</p>

2
app/views/pages/participation_facts.html.erb
View File

@@ -8,7 +8,7 @@
<div class="small-12 medium-9">
<div class="flex-video">
<iframe width="560" height="315" src="https://www.youtube.com/embed/s_asCv_nkX0?list=PLhnvwI6F9eqUk7l8_sIVcPz7DjvE27hfS" frameborder="0" allowfullscreen></iframe>
<iframe width="560" height="315" src="https://www.youtube.com/embed/s_asCv_nkX0?list=PLhnvwI6F9eqUk7l8_sIVcPz7DjvE27hfS" frameborder="0" allowfullscreen title="Vídeos del canal de YouTube de Abriendo Madrid"></iframe>
</div>
</div>

12
app/views/pages/proposals_info.html.erb
View File

@@ -28,7 +28,7 @@
<p>Además no hace falta ni que tengas Internet, todos los pasos se pueden hacer en cualquiera de las <a href="http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD" target="_blank">26 Oficinas de Atención al Ciudadano</a> que hay por todo Madrid.</p>
<div class="flex-video">
<iframe width="560" height="315" src="https://www.youtube.com/embed/videoseries?list=PLhnvwI6F9eqWqN8vyiZtfpV8SO11ague2" frameborder="0" allowfullscreen></iframe>
<iframe width="560" height="315" src="https://www.youtube.com/embed/videoseries?list=PLhnvwI6F9eqWqN8vyiZtfpV8SO11ague2" frameborder="0" allowfullscreen title="Vídeos del canal de YouTube de Abriendo Madrid"></iframe>
</div>
<h2 id="i">Explicación detallada del proceso</h2>
@@ -39,11 +39,11 @@
<li><strong>Realización de las propuestas</strong>. En caso de que haya más gente a favor de una propuesta que rechazándola se aceptará como propuesta colectiva de la ciudadanía de Madrid, y el gobierno del Ayuntamiento de Madrid la asumirá como propia y la llevará a cabo. Para ello en un plazo máximo de un mes, se realizarán los informes técnicos correspondientes sobre su legalidad, viabilidad y coste económico, teniendo en cuenta a los sectores afectados y a la persona que haya lanzado la propuesta, para detallar la actuación correspondiente por parte del Ayuntamiento. Se publicarán en la web todos los informes realizados, y un seguimiento de las actuaciones que se lleven a cabo, para asegurar un correcto desarrollo de la propuesta.</li>
</ol>
<p>Todas las acciones relacionadas con el proceso de propuestas ciudadanas pueden realizarse a través del portal de gobierno abierto, o presencialmente en cualquiera de las 26 Oficinas de Atención al Ciudadano existentes en Madrid. <a href="http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD" target="_blank">Ver la lista completa de oficinas y su ubicación</a>.</p>
<p>Todas las acciones relacionadas con el proceso de propuestas ciudadanas pueden realizarse a través del portal de gobierno abierto, o presencialmente en cualquiera de las <a href="http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD" target="_blank">26 Oficinas de Atención al Ciudadano</a> existentes en Madrid.</p>
<p>El proceso de recogida de apoyos de una propuesta puede realizarse también a través de hojas de firmas, cuyo modelo puede ser <a href="/docs/formulario_propuestas_ciudadanas.pdf" target="_blank">descargado en este enlace</a>. Los apoyos recogidos de esta manera se sumarán a los apoyos ya existentes en el portal de gobierno abierto. Las hojas pueden ser entregadas en cualquiera de los Registros del Ayuntamiento, presentes en cada una de las Juntas de Distrito. <a href="http://www.madrid.es/portales/munimadrid/es/Inicio/Ayuntamiento/Oposiciones-y-Empleo/Direcciones-y-telefonos/Oficinas-de-Registro-del-Ayuntamiento-de-Madrid?vgnextfmt=default&vgnextoid=adedb88db777f010VgnVCM2000000c205a0aRCRD&vgnextchannel=ddc3ca1c5a057010VgnVCM100000dc0ca8c0RCRD" target="_blank">Ver la lista completa de Oficinas de Registro</a>.</p>
<p>El proceso de recogida de apoyos de una propuesta puede realizarse también a través de hojas de firmas, cuyo modelo puede ser <a href="/docs/formulario_propuestas_ciudadanas.pdf" target="_blank">descargado en este documento PDF</a>. Los apoyos recogidos de esta manera se sumarán a los apoyos ya existentes en el portal de gobierno abierto. Las hojas pueden ser entregadas en cualquiera de los Registros del Ayuntamiento, presentes en cada una de las Juntas de Distrito. <a href="http://www.madrid.es/portales/munimadrid/es/Inicio/Ayuntamiento/Oposiciones-y-Empleo/Direcciones-y-telefonos/Oficinas-de-Registro-del-Ayuntamiento-de-Madrid?vgnextfmt=default&vgnextoid=adedb88db777f010VgnVCM2000000c205a0aRCRD&vgnextchannel=ddc3ca1c5a057010VgnVCM100000dc0ca8c0RCRD" target="_blank">Ver la lista completa de Oficinas de Registro</a>.</p>
<p>Las directrices aprobadas por el Ayuntamiento por las que se regulan las propuestas ciudadanas son las siguientes: <a href="/docs/directrices_ejercicio_propuesta.pdf" target="_blank">Directrices sobre el derecho de propuesta</a>.</p>
<p>Las directrices aprobadas por el Ayuntamiento por las que se regulan las propuestas ciudadanas son las siguientes: <a href="/docs/directrices_ejercicio_propuesta.pdf" target="_blank">Directrices sobre el derecho de propuesta (documento PDF)</a>.</p>
<h2 id="ii">Preguntas Frecuentes</h2>
<ol>
@@ -83,7 +83,7 @@
El quórum es el mínimo de participación necesaria para considerar una votación vinculante de manera legal. Ningún reglamento del Ayuntamiento puede hacer que este mecanismo sea vinculante juridicamente, porque eso está en contra de la legislación española. La vinculación con el mecanismo es política y se asume de manera personal por los concejales y la Alcaldesa. Por ello no se considerará ningún quórum.</li>
<li><strong>¿Existen mecanismos presenciales para participar? ¿Se ha planteado llegar a los ciudadanos y ciudadanas con dificultades de acceso a Internet o en situación de exclusión?</strong><br>
Todas las acciones relacionadas con el proceso de propuestas ciudadanas pueden realizarse presencialmente en cualquiera de las <a href="http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD" target="_blank">26 Oficinas de Atención al Ciudadano</a> repartidas por todos los distritos de Madrid. Además, el proceso de recogida de apoyos de una propuesta puede realizarse también a través de hojas de firmas, cuyo modelo puede ser <a href="/docs/formulario_propuestas_ciudadanas.pdf" target="_blank">descargado en este enlace</a>.
Todas las acciones relacionadas con el proceso de propuestas ciudadanas pueden realizarse presencialmente en cualquiera de las <a href="http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD" target="_blank">26 Oficinas de Atención al Ciudadano</a> repartidas por todos los distritos de Madrid. Además, el proceso de recogida de apoyos de una propuesta puede realizarse también a través de hojas de firmas, cuyo modelo puede ser <a href="/docs/formulario_propuestas_ciudadanas.pdf" target="_blank">descargado en este documento PDF</a>.
<br>Adicionalmente se ha creado en el Área de Gobierno de Participación Ciudadana, Transparencia y Gobierno Abierto el Servicio de Inclusión, Neutralidad y Privacidad que pondrá en marcha una mesa de inclusión con personal del Ayuntamiento y asociaciones que trabajan con colectivos en situación de exclusión, para diseñar mecanismos especiales para que puedan participar dichos colectivos.</li>
<li><strong>¿Cómo puede participar la gente que no esté empadronada en Madrid?</strong><br>
@@ -100,7 +100,7 @@
<h2 id="iii">Hojas de firmas para recoger apoyos</h2>
<p>El proceso de recogida de apoyos de una propuesta, además de en la web, puede realizarse a través de hojas de firmas, cuyo modelo puede ser <a href="/docs/formulario_propuestas_ciudadanas.pdf" target="_blank">descargado en este enlace</a>.</p>
<p>El proceso de recogida de apoyos de una propuesta, además de en la web, puede realizarse a través de hojas de firmas, cuyo modelo puede ser <a href="/docs/formulario_propuestas_ciudadanas.pdf" target="_blank">descargado en este documento PDF</a>.</p>
<p>La hoja debe contener en las casillas superiores el código de la propuesta y su título, según figura en la página web específica de la propuesta, dentro del Portal de Gobierno Abierto.</p>
<p>Los apoyos recogidos de esta manera se sumarán a los apoyos ya existentes en el portal de gobierno abierto. Las hojas pueden ser entregadas en cualquiera de los Registros del Ayuntamiento, presentes en cada una de las Juntas de Distrito. <a href="http://www.madrid.es/portales/munimadrid/es/Inicio/Ayuntamiento/Oposiciones-y-Empleo/Direcciones-y-telefonos/Oficinas-de-Registro-del-Ayuntamiento-de-Madrid?vgnextfmt=default&vgnextoid=adedb88db777f010VgnVCM2000000c205a0aRCRD&vgnextchannel=ddc3ca1c5a057010VgnVCM100000dc0ca8c0RCRD" target="_blank">Ver la lista completa de Oficinas de Registro</a>.</p>

3
app/views/shared/_order_selector.html.erb
View File

@@ -4,7 +4,8 @@
%>
<form class="inline-block">
<select class="js-location-changer js-order-selector select-order" data-order="<%= @current_order %>" name="order-selector">
<label for="order-selector-participation" class="sr-only"><%= t("debates.index.select_order") %></label>
<select class="js-location-changer js-order-selector select-order" data-order="<%= @current_order %>" name="order-selector" id="order-selector-participation">
<% @valid_orders.each do |order| %>
<option <%= 'selected' if order == @current_order %>
value='<%= current_path_with_query_params(order: order, page: 1) %>'>

4
app/views/shared/_search_form_header.html.erb
View File

@@ -11,10 +11,12 @@
<div class="small-12 columns">
<div class="row collapse">
<div class="small-10 column">
<input type="text" name="search" placeholder="<%= t("#{i18n_namespace}.placeholder") %>" class="search-form">
<label for="search-form-header" class="sr-only"><%= t("debates.index.search_form.title") %></label>
<input type="text" id="search-form-header" name="search" placeholder="<%= t("#{i18n_namespace}.placeholder") %>" class="search-form">
</div>
<div class="small-2 column">
<button type="submit" class="button postfix" title="<%= t("#{i18n_namespace}.button") %>">
<span class="sr-only"><%= t("debates.index.search_form.button") %></span>
<i class="icon-search"></i>
</button>
</div>

2
app/views/users/registrations/new.html.erb
View File

@@ -14,7 +14,7 @@
<div class="row">
<div class="small-12 column">
<%= f.label t("devise_views.users.registrations.new.username_label") %>
<%= f.label :username %>
<p class="note"><%= t("devise_views.users.registrations.new.username_note") %></p>
<%= f.text_field :username, maxlength: User.username_max_length, placeholder: t("devise_views.users.registrations.new.username_label"), label: false %>

13
app/views/verification/letter/edit.html.erb
View File

@@ -9,8 +9,6 @@
<h1><%= t("verification.letter.edit.title") %></h1>
<%= t("verification.letter.edit.explanation_html") %>
<div class="alert-box success radius clear margin-top">
<%= t("verification.letter.create.flash.success_html",
offices: link_to(t("verification.letter.create.flash.offices"),
@@ -19,15 +17,6 @@
%>
</div>
<%= form_for @letter, as: "letter", url: letter_path, method: :put do |f| %>
<div class="small-12 medium-6 inline-block">
<%= f.text_field :verification_code,
label: t("verification.letter.edit.confirmation_code"),
placeholder: t("verification.letter.edit.confirmation_code") %>
</div>
<%= f.submit t("verification.letter.new.send_code"), class: "button radius success" %>
<% end %>
<%= link_to t("verification.letter.edit.see_all"), highlights_path, class: "button warning radius" %>
<%= link_to t("verification.letter.edit.see_all"), proposals_path, class: "button warning radius" %>
</div>
</div>

36
app/views/verification/letter/new.html.erb
View File

@@ -17,7 +17,7 @@
</div>
</div>
<div class="small-12 medium-12 column">
<div class="small-12 medium-4 column">
<%= link_to account_path, class: "left back clear" do %>
<i class="icon-angle-left left"></i>
@@ -26,16 +26,36 @@
<h1><%= t("verification.letter.new.title") %></h1>
<%= t("verification.letter.new.explanation_html") %>
<div class="user-permissions">
<%= link_to t("verification.letter.new.offices"), t("verification.letter.new.offices_url"),
target: "_blank", class: "button radius inline-block"
%>
<p class="text-medium"><%= t("verification.letter.new.user_permission_info") %></p>
<%= form_for @letter, as: "letter", url: letter_path do |f| %>
<%= f.submit t("verification.letter.new.send_letter"), class: "button radius secondary inline-block" %>
<% end %>
<ul>
<li><i class="icon-check"></i>&nbsp;<%= t("verification.user_permission_debates") %></li>
<li><i class="icon-check"></i>&nbsp;<%= t("verification.user_permission_proposal") %></li>
<li><i class="icon-check"></i>&nbsp;<%= t("verification.user_permission_support_proposal") %></li>
<li><i class="icon-x"></i>&nbsp;<%= t("verification.user_permission_votes") %></li>
</ul>
</div>
<%= link_to t("verification.letter.new.go_to_index"), root_path, class: "button radius warning" %>
</div>
<div class="small-12 medium-8 column final-votes-info">
<i class="icon-box"></i>
<p class="text-medium"><strong><%= t("verification.letter.new.explanation") %></strong></p>
<ul>
<li>
<%= t("verification.letter.new.office",
office: link_to(t("verification.letter.new.offices"), t("verification.letter.new.offices_url"),
target: "blank")).html_safe %>
</li>
<li>
<%= link_to t("verification.letter.new.send_letter"), letter_path, method: :post %>
</li>
</ul>
</div>
</div>
</div>

14
app/views/verification/residence/new.html.erb
View File

@@ -24,6 +24,17 @@
<h1><%= t("verification.residence.new.title") %></h1>
<div class="user-permissions small-12">
<p><%= t("verification.user_permission_info") %></p>
<ul>
<li><i class="icon-check"></i>&nbsp;<%= t("verification.user_permission_debates") %></li>
<li><i class="icon-check"></i>&nbsp;<%= t("verification.user_permission_proposal") %></li>
<li><i class="icon-check"></i>&nbsp;<%= t("verification.user_permission_support_proposal") %></li>
<li><i class="icon-x"></i>&nbsp;<%= t("verification.user_permission_votes") %></li>
</ul>
</div>
<%= form_for @residence, as: "residence", url: residence_path do |f| %>
<%= render "errors" %>
@@ -46,8 +57,9 @@
label: false %>
</div>
<div class="small-12 medium-4 clear">
<div class="small-12 medium-5 clear">
<%= f.label t("verification.residence.new.postal_code") %>
<p class="note"><%= t("verification.residence.new.postal_code_note") %></p>
<%= f.text_field :postal_code, label: false %>
</div>

1
app/views/verification/sms/new.html.erb
View File

@@ -29,6 +29,7 @@
<div class="small-12 medium-6">
<%= f.label t("verification.sms.new.phone") %>
<p class="note"><%= t("verification.sms.new.phone_note") %></p>
<%= f.text_field :phone, label: false %>
</div>

2
app/views/welcome/highlights.html.erb
View File

@@ -7,6 +7,8 @@
<div class="filters">
<div class="small-12 medium-7 left">
<h1 class="inline-block"><%= t('welcome.highlights') %></h1>
&nbsp;&nbsp;
<h2 class="margin-top">
<%= t('welcome.signed_in_home_title') %>
</h2>

8
app/views/welcome/index.html.erb
View File

@@ -2,24 +2,24 @@
<section role="main">
<div class="row text-center">
<div class="small-12 medium-3 column">
<%= image_tag("icon_home_debate.svg", size: "168x168") %>
<%= image_tag("icon_home_debate.png", size: "168x168", alt: t("welcome.debates.title")) %>
<h3><%= t("welcome.debates.title") %></h3>
<p><%= t("welcome.debates.description") %></p>
</div>
<div class="small-12 medium-3 column">
<%= image_tag("icon_home_proposal.svg", size: "168x168") %>
<%= image_tag("icon_home_proposal.png", size: "168x168", alt: t("welcome.proposal.title")) %>
<h3><%= t("welcome.proposal.title") %></h3>
<p><%= t("welcome.proposal.description") %></p>
</div>
<div class="small-12 medium-3 column">
<%= image_tag("icon_home_decide.svg", size: "168x168") %>
<%= image_tag("icon_home_decide.png", size: "168x168", alt: t("welcome.decide.title")) %>
<h3><%= t("welcome.decide.title") %></h3>
<p><%= t("welcome.decide.description") %></p>
</div>
<div class="small-12 medium-3 column">
<%= image_tag("icon_home_done.svg", size: "168x168") %>
<%= image_tag("icon_home_do.png", size: "168x168", alt: t("welcome.do.title")) %>
<h3><%= t("welcome.do.title") %></h3>
<p><%= t("welcome.do.description") %></p>
</div>

38
app/views/welcome/welcome.html.erb
View File

@@ -1,13 +1,27 @@
<h2><%= t("welcome.welcome.title") %></h2>
<p><%= t("welcome.welcome.instructions_1_html") %></p>
<p><%= t("welcome.welcome.instructions_2_html") %></p>
<p><%= t("welcome.welcome.instructions_3_html") %></p>
<p>
<%= link_to t("welcome.welcome.verify_account"),
verification_path, class: "button success radius margin-top expand" %>
</p>
<p class="text-center">
<%= link_to t("welcome.welcome.go_to_index"),
root_path, class: "small margin-top expand" %>
</p>
<p><%= t("welcome.welcome.instructions_4_html") %></p>
<div class="user-permissions">
<p><%= t("welcome.welcome.user_permission_info") %></p>
<ul>
<li><i class="icon-check"></i>&nbsp;<%= t("welcome.welcome.user_permission_debates") %></li>
<li><i class="icon-check"></i>&nbsp;<%= t("welcome.welcome.user_permission_proposal") %></li>
<li><i class="icon-x"></i>&nbsp;<%= t("welcome.welcome.user_permission_support_proposal") %></li>
<li><i class="icon-x"></i>&nbsp;<%= t("welcome.welcome.user_permission_votes") %></li>
</ul>
<p>
<span><%= t("welcome.welcome.user_permission_verify_info") %></span>
</p>
<p class="text-medium">
<%= t("welcome.welcome.user_permission_verify",
verify: link_to(t("welcome.welcome.user_permission_verify_url"), verification_path)).html_safe %>
</p>
<p class="text-center">
<%= link_to t("welcome.welcome.go_to_index"),
verification_path, class: "button success radius" %>
</p>
</div>

10
config/locales/activerecord.en.yml
View File

@@ -40,3 +40,13 @@ en:
organization:
name: Organization name
responsible_name: Person in charge
errors:
models:
debate:
attributes:
tag_list:
less_than_or_equal_to: tags must be less than or equal to %{count}
proposal:
attributes:
tag_list:
less_than_or_equal_to: tags must be less than or equal to %{count}

10
config/locales/activerecord.es.yml
View File

@@ -62,3 +62,13 @@ es:
organization:
name: Nombre de organización
responsible_name: Persona responsable del colectivo
errors:
models:
debate:
attributes:
tag_list:
less_than_or_equal_to: los temas deben ser menor o igual que %{count}
proposal:
attributes:
tag_list:
less_than_or_equal_to: los temas deben ser menor o igual que %{count}

56
config/locales/en.yml
View File

@@ -5,6 +5,7 @@ en:
user_not_found: "User not found"
layouts:
header:
logo: "Madrid"
external_link_transparency: Transparency
external_link_transparency_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Transparencia?vgnextfmt=default&vgnextchannel=20fd850769797310VgnVCM2000000c205a0aRCRD"
external_link_opendata: Open data
@@ -13,19 +14,14 @@ en:
external_link_blog_url: "/blog"
open_gov: "%{open} government"
open: "Open"
participation: Participation
participation: "Participation"
transparency: "Transparency"
open_data: "Open data"
open_city_title: "The city you want, it will be the city you want."
open_city_slogan_html:
"Start listening to Madrid.
For that we open this digital Puerta del Sol, where all the locals can meet to discuss and share everything we want."
# "Existen ciudades gobernadas directamente por sus habitantes, que <b>debaten</b> sobre temas que les preocupan, <b>proponen</b> ideas para mejorar
# sus vidas y <b>deciden</b> entre todas y todos las que se llevan a cabo. Madrid ya es una de ellas."
# open_city_text:
# "Here every voice has its place and are citizens, and no one in their name, they decide to vote debates what issues are
# most important of every time. Government officials have individual users with whom you may participate in the debates, and evaluated,
# the same level as everyone else. Because the Madrid City Council works for its citizens, and must respond to them."
# open_city_soon: "And soon... we'll open the section for citizen proposals."
see_all: See debates and proposals
see_all: "See proposals"
my_account_link: My account
locale: "Language:"
administration: Administration
@@ -47,7 +43,7 @@ en:
transparency_text: Get any information on the City of Madrid.
open_data_title: Open Data
open_data_text: "All City Council data are yours."
contact_us: "Contact us"
contact_us: "For technical support contact us"
privacy: "Privacy Policy"
conditions: "Terms of use"
more_info: "More information"
@@ -59,6 +55,11 @@ en:
For a better experience we recommend use %{chrome} or %{firefox}."
chrome: "Google Chrome"
firefox: "Firefox"
social:
twitter: "Twitter"
facebook: "Facebook"
blog: "Blog"
youtube: "YouTube"
form:
error: error
errors: errors
@@ -123,7 +124,7 @@ en:
one: 1 Comment
other: "%{count} Comments"
login_to_comment: "You need to %{signin} or %{signup} to comment."
edit_debate_link: Edit
edit_debate_link: "Edit debate"
share: Share
flag: "This debate has been flag as innapropiate for some users."
edit:
@@ -158,7 +159,7 @@ en:
select_order_long: Order proposals by
orders:
confidence_score: "most supported"
hot_score: most active
hot_score: "most active today"
created_at: newest
most_commented: most commented
random: random
@@ -214,7 +215,7 @@ en:
one: 1 Comment
other: "%{count} Comments"
login_to_comment: "You need to %{signin} or %{signup} to comment."
edit_proposal_link: Edit
edit_proposal_link: "Edit proposal"
share: Share
flag: "This proposal has been flag as innapropiate for some users."
edit:
@@ -278,10 +279,9 @@ en:
show:
title: "My account"
save_changes_submit: "Save changes"
change_credentials_link: "Change my credentials"
email_on_comment_label: "Receive email when someone comments on my debates or proposals"
email_on_comment_reply_label: "Receive email when someone replies to my comments"
change_credentials_link: "Change my credentials"
avatar: "Avatar"
personal: "Personal data"
username_label: "Username"
phone_number_label: "Phone number"
@@ -291,6 +291,14 @@ en:
finish_verification: "Finish verification"
verified_account: Verified account
verify_my_account: Verify my account
user_permission_title: "Participation"
user_permission_info: "With your account you can..."
user_permission_debates: "Participate on debates"
user_permission_proposal: "Create new proposals"
user_permission_support_proposal: "Support proposals"
user_permission_votes: "Participate on final voting"
user_permission_verify: "To perform all the actions verify your account."
user_permission_verify_info: "* Only for users on Madrid City Census."
simple_captcha:
placeholder: "Enter the image value"
label: "Enter the image value in the next form"
@@ -313,6 +321,7 @@ en:
manage:
all: "You are not authorized to %{action} %{subject}."
welcome:
highlights: "Highlights: "
signed_in_home_title: Recent activity
debates:
title: "Debate"
@@ -327,13 +336,16 @@ en:
title: "It does"
description: "If the proposal is accepted mostly, the City Council makes his own and done."
welcome:
title: Account verification
instructions_1_html: "Welcome to the public participation website."
instructions_2_html: "We have detected that <b>your email is confirmed but we were not able to verify your citizen data</b>."
instructions_3_html: "Without verifying them, <b>you have only partial access to the website</b>. You need to be verified, for example, in order to participate in public proposals."
verify_account: "Verify my account now"
go_to_index: "I prefer to continue as a non-verified user with limited access"
instructions_4_html: "If you want to verify your account later on, you can do so in <i>My account -> Verify my account</i>."
title: "Participate"
go_to_index: "See proposals and debates"
user_permission_info: "With your account you can..."
user_permission_debates: "Participate on debates"
user_permission_proposal: "Create new proposals"
user_permission_support_proposal: "Support proposals*"
user_permission_votes: "Participate on final voting*"
user_permission_verify: "To perform all the actions %{verify}."
user_permission_verify_url: "verify your account"
user_permission_verify_info: "* Only for users on Madrid City Census."
omniauth:
finish_signup:
title: Add Email

54
config/locales/es.yml
View File

@@ -5,6 +5,7 @@ es:
user_not_found: "No se encontró el usuario"
layouts:
header:
logo: "Madrid"
external_link_transparency: Transparencia
external_link_transparency_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Transparencia?vgnextfmt=default&vgnextchannel=20fd850769797310VgnVCM2000000c205a0aRCRD"
external_link_opendata: Datos abiertos
@@ -13,19 +14,14 @@ es:
external_link_blog_url: "/blog"
open_gov: "Gobierno %{open}"
open: "abierto"
participation: Participación
participation: "Participación"
transparency: "Transparencia"
open_data: "Datos abiertos"
open_city_title: "La ciudad que quieres será la ciudad que quieras."
open_city_slogan_html:
"Existen ciudades gobernadas directamente por sus habitantes, que <b>debaten</b> sobre temas que les preocupan, <b>proponen</b> ideas para mejorar
sus vidas y <b>deciden</b> entre todas y todos las que se llevan a cabo. Madrid ya es una de ellas."
#"Empecemos escuchando qué tiene que decir Madrid.
#Para ello abrimos esta Puerta del Sol digital, donde toda la gente de Madrid podemos encontrarnos para debatir y compartir todo lo que queramos."
# open_city_text:
# "Aquí cualquier voz tiene su espacio y son los ciudadanos y ciudadanas, y nadie en su nombre, quienes deciden votando los debates cuáles son los temas
# más importantes de cada momento. Los responsables del gobierno tienen cuentas de usuario propias con las que podrán participar en los debates, y ser evaluados
# al mismo nivel que todos los demás."
# open_city_soon: "Muy pronto abriremos la sección de propuestas ciudadanas, donde cualquiera podrá presentar propuestas y, si reciben apoyo, serán puestas en marcha por el Ayuntamiento."
see_all: Ver debates y propuestas
see_all: "Ver propuestas"
my_account_link: Mi cuenta
locale: "Idioma:"
administration: Administrar
@@ -47,7 +43,7 @@ es:
transparency_text: "Obtén cualquier información sobre el Ayuntamiento de Madrid."
open_data_title: Datos Abiertos
open_data_text: "Todos los datos del Ayuntamiento son tuyos."
contact_us: "Contacta con nosotros en"
contact_us: "Para asistencia técnica contáctenos en"
privacy: "Política de privacidad"
conditions: "Condiciones de uso"
more_info: "Más información"
@@ -59,6 +55,11 @@ es:
Para una mejor experiencia te recomendamos utilizar %{chrome} o %{firefox}."
chrome: "Google Chrome"
firefox: "Firefox"
social:
twitter: "Twitter"
facebook: "Facebook"
blog: "Blog"
youtube: "YouTube"
form:
error: error
errors: errores
@@ -123,7 +124,7 @@ es:
one: 1 Comentario
other: "%{count} Comentarios"
login_to_comment: "Necesitas %{signin} o %{signup} para comentar."
edit_debate_link: Editar
edit_debate_link: "Editar debate"
share: Compartir
flag: "Este debate ha sido marcado como inapropiado por varios usuarios."
edit:
@@ -158,7 +159,7 @@ es:
select_order_long: Estás viendo las propuestas
orders:
confidence_score: "más apoyadas"
hot_score: "más activas"
hot_score: "más activas hoy"
created_at: "más nuevas"
most_commented: "más comentadas"
random: "aleatorias"
@@ -214,7 +215,7 @@ es:
one: 1 Comentario
other: "%{count} Comentarios"
login_to_comment: "Necesitas %{signin} o %{signup} para comentar."
edit_proposal_link: Editar
edit_proposal_link: "Editar propuesta"
share: Compartir
flag: "Esta propuesta ha sido marcada como inapropiada por varios usuarios."
edit:
@@ -281,7 +282,6 @@ es:
change_credentials_link: "Cambiar mis datos de acceso"
email_on_comment_label: "Recibir un email cuando alguien comenta en mis propuestas o debates"
email_on_comment_reply_label: "Recibir un email cuando alguien contesta a mis comentarios"
avatar: "Avatar"
personal: "Datos personales"
username_label: "Nombre de usuario"
phone_number_label: "Teléfono"
@@ -291,6 +291,14 @@ es:
finish_verification: "Finalizar verificación"
verified_account: Cuenta verificada
verify_my_account: Verificar mi cuenta
user_permission_title: "Participación"
user_permission_info: "Con tu cuenta ya puedes..."
user_permission_debates: "Participar en debates"
user_permission_proposal: "Crear nuevas propuestas"
user_permission_support_proposal: "Apoyar propuestas*"
user_permission_votes: "Participar en las votaciones finales*"
user_permission_verify: "Para poder realizar todas las acciones verifica tu cuenta."
user_permission_verify_info: "* Sólo usuarios empadronados en el municipio de Madrid."
simple_captcha:
placeholder: "Introduce el texto de la imagen"
label: "Introduce el texto de la imagen en la siguiente caja"
@@ -313,6 +321,7 @@ es:
manage:
all: "No tienes permiso para realizar la acción '%{action}' sobre %{subject}."
welcome:
highlights: "Portada: "
signed_in_home_title: Actividad reciente
debates:
title: "Debates"
@@ -327,13 +336,16 @@ es:
title: "Se hace"
description: "Si la propuesta es aceptada mayoritariamente, el Ayuntamiento la asume como propia y se hace."
welcome:
title: Verificación de cuenta
instructions_1_html: "Bienvenido a la página de participación ciudadana"
instructions_2_html: "Hemos detectado que <b>tu dirección de email está confirmada pero no hemos verificado tus datos todavía</b>."
instructions_3_html: "Sin verificar tus datos <b>el acceso que tienes es limitado</b>. Verificarlos ahora te permitirá, por ejemplo, apoyar propuestas ciudadanas."
verify_account: "Verificar mi cuenta"
go_to_index: "Quiero entrar como un usuario no verificado (acceso limitado)"
instructions_4_html: "Si quieres verificarte más tarde, puedes hacerlo en <i>Mi cuenta > Verificar mi cuenta</i>."
title: "Empieza a participar"
go_to_index: "Ver propuestas y debates"
user_permission_info: "Con tu cuenta ya puedes..."
user_permission_debates: "Participar en debates"
user_permission_proposal: "Crear nuevas propuestas"
user_permission_support_proposal: "Apoyar propuestas*"
user_permission_votes: "Participar en las votaciones finales*"
user_permission_verify: "Para poder realizar todas las acciones %{verify}."
user_permission_verify_url: "verifica tu cuenta"
user_permission_verify_info: "* Sólo usuarios empadronados en el municipio de Madrid."
omniauth:
finish_signup:
title: Añade tu email

35
config/locales/verification.en.yml
View File

@@ -2,10 +2,15 @@ en:
verification:
back: "Back to my account"
step_1: "Residence"
step_2: "Confirmation code"
step_2: "SMS confirmation"
step_3: "Final verification"
alert:
lock: "You have reached the maximum number of verification tries. Please try again later."
user_permission_info: "Verifing your information you'll be able to..."
user_permission_debates: "Participar en debates"
user_permission_proposal: "Crear nuevas propuestas"
user_permission_support_proposal: "Apoyar propuestas*"
user_permission_votes: "Participar en las votaciones finales*"
residence:
new:
title: "Verify residence"
@@ -17,6 +22,7 @@ en:
document_number: "Document number"
date_of_birth: "Date of birth"
postal_code: "Postal code"
postal_code_note: "To verify your account you must be on Madrid city Census"
accept_terms_text: "I accept %{terms_url} to access the city Census"
terms: "the terms"
verify_residence: "Verify residence"
@@ -33,15 +39,16 @@ en:
new:
title: "Phone verification"
phone: "Enter your phone for recive the code"
phone_note: "We only user your phone for send to you a code, we never contact to you."
submit_button: "Send"
create:
flash:
success: "Enter the confirmation code we have sent your phone"
edit:
title: "Security code confirmation"
title: "Phone confirmation"
confirmation_code: "Code confirmation"
resend_sms_text: "You have not received the confirmation code in your phone?"
resend_sms_link: "Click here to send the confirmation code again"
resend_sms_link: "Request a new code"
submit_button: "Send"
update:
error: "Incorrect confirmation code"
@@ -64,23 +71,21 @@ en:
letter:
new:
title: "Final Verification"
explanation_html:
"<p>Congratulations! You can now participate in discussions or support proposals of others.</p><p>To finish we need to verify your account completely provide you with a <b>maximum security code</b>, we ensure that no one is using your data on your behalf.</p><p>This requirement is essential to participate in final votes on motions. This can approach any <b>Office of Citizen</b> where you will verify in person, or in case you is impossible, we can send you a letter home with the code.</p>"
offices: "See Office of Citizen"
user_permission_info: "With your account you can..."
explanation: "For participate on final voting you can:"
office: "Verify in any %{office}"
offices: "Office of Citizen"
offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
send_letter: "Send me a letter with the code"
send_code: "Send"
send_letter: "Request a letter"
go_to_index: "See proposals"
create:
flash:
success_html: "Thank you for requesting a maximum security code in a few days we will send it to the address on your census data."
offices: "Oficinas de Atención al Ciudadano"
success_html: "Before voting you'll receive a letter whith the instructions for verify your account.<br> Remember you can verify your information in any %{offices}."
offices: "Office of Citizen"
offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
edit:
title: "Empieza a participar"
confirmation_code: "Introduce aquí el código de máxima seguridad cuando recibas tu carta"
explanation_html:
"<p><b>¡Felicidades! Ya puedes participar en debates o apoyar propuestas de otras personas.</p>"
see_all: "Ver debates y propuestas"
title: "Letter requested"
see_all: "See proposals"
update:
flash:
success: "Correct code. Your account is verified"

37
config/locales/verification.es.yml
View File

@@ -2,10 +2,15 @@ es:
verification:
back: "Volver a mi cuenta"
step_1: "Residencia"
step_2: "Código de confirmación"
step_2: "SMS de confirmación"
step_3: "Verificación final"
alert:
lock: "Has llegado al máximo número de intentos. Por favor intentalo de nuevo más tarde."
user_permission_info: "Al verificar tus datos podrás..."
user_permission_debates: "Participar en debates"
user_permission_proposal: "Crear nuevas propuestas"
user_permission_support_proposal: "Apoyar propuestas"
user_permission_votes: "Participar en las votaciones finales"
residence:
new:
title: "Verificar residencia"
@@ -17,6 +22,7 @@ es:
document_number: "Número de documento"
date_of_birth: "Fecha de nacimiento"
postal_code: "Código postal"
postal_code_note: "Para verificar tus datos debes estar empadronado en el municipio de Madrid"
accept_terms_text: "Acepto %{terms_url} al Padrón"
terms: "los términos de acceso"
verify_residence: "Verificar residencia"
@@ -31,17 +37,18 @@ es:
unconfirmed_residency: "Aún no has verificado tu residencia"
sms:
new:
title: "Recibir código de confirmación"
title: "SMS de confirmación"
phone: "Introduce tu teléfono móvil para recibir el código"
phone_note: "Sólo usaremos tu teléfono para enviarte un código, nunca te contactaremos."
submit_button: "Enviar"
create:
flash:
success: "Introduce el código de confirmación que te hemos enviado por mensaje de texto"
edit:
title: "Confirmación de código de seguridad"
title: "SMS de confirmación"
confirmation_code: "Introduce el código que has recibido en tu móvil"
resend_sms_text: "¿No has recibido un mensaje de texto con tu código de confirmación?"
resend_sms_link: "Haz click aquí para volver a enviártelo"
resend_sms_link: "Solicitar un nuevo código"
submit_button: "Enviar"
update:
error: "Código de confirmación incorrecto"
@@ -63,24 +70,22 @@ es:
failure: "Hubo un problema enviándote un email a tu cuenta"
letter:
new:
title: "Verificación Final"
explanation_html:
"<p>¡Felicidades! Ya puedes participar en debates o apoyar propuestas de otras personas.</p><p>Para terminar de verificar tu cuenta completamente necesitamos proporcionarte un <b>código de máxima seguridad</b>, que nos asegure que nadie está utilizando tus datos en tu nombre.</p><p>Este requerimiento es esencial para participar en las votaciones finales de las propuestas. Para ello puedes acercarte a cualquier <b>Oficina de Atención al Ciudadano</b> donde te verificarán presencialmente, o en caso de que te sea imposible, podemos mandarte una carta a casa con el código.</p>"
offices: "Ver Oficinas de Atención al Ciudadano"
title: "¡Felicidades!"
user_permission_info: "Con tu cuenta ya puedes..."
explanation: "Para participar en las votaciones finales puedes:"
office: "Verificarte presencialmente en cualquier %{office}"
offices: "Oficina de Atención al Ciudadano"
offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
send_letter: "Enviarme una carta con el código"
send_code: "Enviar"
send_letter: "Solicitar una carta por correo postal"
go_to_index: "Ver propuestas"
create:
flash:
success_html: "Gracias por solicitar tu <b>código de máxima seguridad (solo necesario para las votaciones finales)</b>, en unos días te lo enviaremos a la dirección que figura en tus datos del padrón. Recuerda que puedes ahorrar el envío recogiendo tu código en cualquiera de las %{offices}."
success_html: "Antes de las votaciones recibirás una carta con las instrucciones para verificar tu cuenta.<br> Recuerda que puedes ahorrar el envío verificándote presencialmente en cualquiera de las %{offices}."
offices: "Oficinas de Atención al Ciudadano"
offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
edit:
title: "Empieza a participar"
confirmation_code: "Introduce aquí el código de máxima seguridad cuando recibas tu carta"
explanation_html:
"<p><b>¡Felicidades! Ya puedes participar en debates o apoyar propuestas de otras personas.</p>"
see_all: "Ver debates y propuestas"
title: "Carta solicitada"
see_all: "Ver propuestas"
update:
flash:
success: "Código correcto. Tu cuenta ya está verificada"

2
db/seeds.rb
View File

@@ -1,5 +1,5 @@
# Default admin user (change password after first deploy to a server!)
if Administrator.count == 0
if Administrator.count == 0 && !Rails.env.test?
admin = User.create!(username: 'admin', email: 'admin@madrid.es', password: '12345678', password_confirmation: '12345678', confirmed_at: Time.now, terms_of_service: "1")
admin.create_administrator
end

11
spec/features/debates_spec.rb
View File

@@ -55,9 +55,10 @@ feature 'Debates' do
debate = create(:debate, title: 'Test Debate 1')
visit debates_path(order: :hot_score, page: 1)
find(:xpath, "//a[@href='/debates/#{debate.id}']", match: :first).click
first(:link, debate.title).click
link_text = find_link('Back')[:href]
expect(find_link('Back')[:href]).to include(debates_path order: :hot_score, page: 1)
expect(link_text).to include(debates_path order: :hot_score, page: 1)
end
scenario 'Create' do
@@ -183,7 +184,7 @@ feature 'Debates' do
expect(page).not_to have_link('click me')
expect(page.html).to_not include "<script>alert('hey')</script>"
click_link 'Edit'
click_link 'Edit debate'
expect(current_path).to eq edit_debate_path(Debate.last)
expect(page).not_to have_link('click me')
@@ -339,13 +340,13 @@ feature 'Debates' do
describe 'Limiting tags shown' do
scenario 'Index page shows up to 5 tags per debate' do
tag_list = ["Hacienda", "Economía", "Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa", "Huelgas"]
tag_list = ["Hacienda", "Economía", "Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa"]
create :debate, tag_list: tag_list
visit debates_path
within('.debate .tags') do
expect(page).to have_content '2+'
expect(page).to have_content '1+'
end
end

6
spec/features/proposals_spec.rb
View File

@@ -253,7 +253,7 @@ feature 'Proposals' do
expect(page).not_to have_link('click me')
expect(page.html).to_not include "<script>alert('hey')</script>"
click_link 'Edit'
click_link 'Edit proposal'
expect(current_path).to eq edit_proposal_path(Proposal.last)
expect(page).not_to have_link('click me')
@@ -422,13 +422,13 @@ feature 'Proposals' do
describe 'Limiting tags shown' do
scenario 'Index page shows up to 5 tags per proposal' do
tag_list = ["Hacienda", "Economía", "Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa", "Huelgas"]
tag_list = ["Hacienda", "Economía", "Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa"]
create :proposal, tag_list: tag_list
visit proposals_path
within('.proposal .tags') do
expect(page).to have_content '2+'
expect(page).to have_content '1+'
end
end

6
spec/features/stats_spec.rb
View File

@@ -42,16 +42,10 @@ feature 'Stats' do
end
scenario 'Users' do
Administrator.destroy_all
User.all.map(&:really_destroy!)
1.times { create(:user, :level_three) }
2.times { create(:user, :level_two) }
3.times { create(:user) }
admin = create(:administrator)
login_as(admin.user)
visit admin_stats_path
expect(page).to have_content "Level three users 1"

18
spec/features/tags_spec.rb
View File

@@ -90,6 +90,24 @@ feature 'Tags' do
expect(page).to have_content 'Impuestos'
end
scenario 'Create with too many tags' do
user = create(:user)
login_as(user)
visit new_debate_path
fill_in 'debate_title', with: 'Title'
fill_in 'debate_description', with: 'Description'
fill_in 'debate_captcha', with: correct_captcha_text
check 'debate_terms_of_service'
fill_in 'debate_tag_list', with: "Impuestos, Economía, Hacienda, Sanidad, Educación, Política, Igualdad"
click_button 'Start a debate'
expect(page).to have_content '1 error prohibited this debate from being saved:'
expect(page).to have_content 'tags must be less than or equal to 6'
end
scenario 'Update' do
debate = create(:debate, tag_list: 'Economía')

41
spec/features/verification/letter_spec.rb
View File

@@ -10,15 +10,9 @@ feature 'Verify Letter' do
login_as(user)
visit new_letter_path
click_button "Send me a letter with the code"
click_link "Request a letter"
expect(page).to have_content "Thank you for requesting a maximum security code in a few days we will send it to the address on your census data."
user.reload
fill_in "letter_verification_code", with: user.letter_verification_code
click_button "Send"
expect(page).to have_content "Correct code. Your account is verified"
expect(page).to have_content "Before voting you'll receive a letter whith the instructions for verify your account."
end
scenario 'Go to office instead of send letter' do
@@ -29,7 +23,7 @@ feature 'Verify Letter' do
login_as(user)
visit new_letter_path
expect(page).to have_link "See Office of Citizen", href: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
expect(page).to have_link "Office of Citizen", href: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
end
scenario 'Errors on verification code' do
@@ -40,13 +34,9 @@ feature 'Verify Letter' do
login_as(user)
visit new_letter_path
click_button "Send me a letter with the code"
expect(page).to have_content "Thank you for requesting a maximum security code in a few days we will send it to the address on your census data."
click_link "Request a letter"
expect(page).to have_content "Before voting you'll receive a letter whith the instructions for verify your account."
fill_in "letter_verification_code", with: "1"
click_button "Send"
expect(page).to have_content "Incorrect confirmation code"
end
scenario "Deny access unless verified residence" do
@@ -68,25 +58,4 @@ feature 'Verify Letter' do
expect(page).to have_content 'You have not yet enter the confirmation code'
expect(current_path).to eq(new_sms_path)
end
scenario '6 tries allowed' do
user = create(:user, residence_verified_at: Time.now, confirmed_phone: "611111111")
login_as(user)
visit new_letter_path
click_button 'Send me a letter with the code'
6.times do
fill_in 'letter_verification_code', with: "999999"
click_button 'Send'
end
expect(page).to have_content "You have reached the maximum number of verification tries. Please try again later."
expect(current_path).to eq(account_path)
visit new_letter_path
expect(page).to have_content "You have reached the maximum number of verification tries. Please try again later."
expect(current_path).to eq(account_path)
end
end

14
spec/features/verification/level_three_verification_spec.rb
View File

@@ -20,7 +20,7 @@ feature 'Level three verification' do
click_button "Send code"
end
expect(page).to have_content 'Security code confirmation'
expect(page).to have_content 'Phone confirmation'
user = user.reload
fill_in 'sms_confirmation_code', with: user.sms_confirmation_code
@@ -75,7 +75,7 @@ feature 'Level three verification' do
fill_in 'sms_phone', with: "611111111"
click_button 'Send'
expect(page).to have_content 'Security code confirmation'
expect(page).to have_content 'Phone confirmation'
user = user.reload
fill_in 'sms_confirmation_code', with: user.sms_confirmation_code
@@ -83,14 +83,8 @@ feature 'Level three verification' do
expect(page).to have_content 'Correct code'
click_button "Send me a letter with the code"
click_link "Request a letter"
expect(page).to have_content "Thank you for requesting a maximum security code in a few days we will send it to the address on your census data."
user.reload
fill_in "letter_verification_code", with: user.letter_verification_code
click_button "Send"
expect(page).to have_content "We have not sent you the letter with the code yet"
expect(page).to have_content "Before voting you'll receive a letter whith the instructions for verify your account."
end
end

2
spec/features/verification/level_two_verification_spec.rb
View File

@@ -14,7 +14,7 @@ feature 'Level two verification' do
fill_in 'sms_phone', with: "611111111"
click_button 'Send'
expect(page).to have_content 'Security code confirmation'
expect(page).to have_content 'Phone confirmation'
user = user.reload
fill_in 'sms_confirmation_code', with: user.sms_confirmation_code

6
spec/features/verification/sms_spec.rb
View File

@@ -11,7 +11,7 @@ feature 'SMS Verification' do
fill_in 'sms_phone', with: "611111111"
click_button 'Send'
expect(page).to have_content 'Security code confirmation'
expect(page).to have_content 'Phone confirmation'
user = user.reload
fill_in 'sms_confirmation_code', with: user.sms_confirmation_code
@@ -40,7 +40,7 @@ feature 'SMS Verification' do
fill_in 'sms_phone', with: "611111111"
click_button 'Send'
expect(page).to have_content 'Security code confirmation'
expect(page).to have_content 'Phone confirmation'
click_button 'Send'
@@ -66,7 +66,7 @@ feature 'SMS Verification' do
5.times do
fill_in 'sms_phone', with: "611111111"
click_button 'Send'
click_link 'Click here to send the confirmation code again'
click_link 'Request a new code'
end
expect(page).to have_content "You have reached the maximum number of verification tries. Please try again later."

20
spec/models/debate_spec.rb
View File

@@ -57,10 +57,22 @@ describe Debate do
end
end
it "should sanitize the tag list" do
debate.tag_list = "user_id=1"
debate.valid?
expect(debate.tag_list).to eq(['user_id1'])
describe "#tag_list" do
it "should sanitize the tag list" do
debate.tag_list = "user_id=1"
debate.valid?
expect(debate.tag_list).to eq(['user_id1'])
end
it "should not be valid with a tag list of more than 6 elements" do
debate.tag_list = ["Hacienda", "Economía", "Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa", "Huelgas"]
expect(debate).to_not be_valid
end
it "should be valid with a tag list of 6 elements" do
debate.tag_list = ["Hacienda", "Economía", "Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa"]
expect(debate).to be_valid
end
end
it "should not be valid without accepting terms of service" do

22
spec/models/proposal_spec.rb
View File

@@ -99,10 +99,22 @@ describe Proposal do
end
end
it "should sanitize the tag list" do
proposal.tag_list = "user_id=1"
proposal.valid?
expect(proposal.tag_list).to eq(['user_id1'])
describe "tag_list" do
it "should sanitize the tag list" do
proposal.tag_list = "user_id=1"
proposal.valid?
expect(proposal.tag_list).to eq(['user_id1'])
end
it "should not be valid with a tag list of more than 6 elements" do
proposal.tag_list = ["Hacienda", "Economía", "Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa", "Huelgas"]
expect(proposal).to_not be_valid
end
it "should be valid with a tag list of more than 6 elements" do
proposal.tag_list = ["Hacienda", "Economía", "Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa"]
expect(proposal).to be_valid
end
end
it "should not be valid without accepting terms of service" do
@@ -113,7 +125,7 @@ describe Proposal do
it "should have a code" do
Setting.find_by(key: "proposal_code_prefix").update(value: "TEST")
proposal = create(:proposal)
expect(proposal.code).to eq "TEST-#{proposal.created_at.strftime('%Y-%M')}-#{proposal.id}"
expect(proposal.code).to eq "TEST-#{proposal.created_at.strftime('%Y-%m')}-#{proposal.id}"
end
describe "#editable?" do

2
spec/support/common_actions.rb
View File

@@ -135,7 +135,7 @@ module CommonActions
fill_in 'sms_phone', with: "611111111"
click_button 'Send'
expect(page).to have_content 'Security code confirmation'
expect(page).to have_content 'Phone confirmation'
user = User.last.reload
fill_in 'sms_confirmation_code', with: user.sms_confirmation_code