Merge pull request #2405 from consul/more-info-pages
Improve texts of help page
This commit is contained in:
Alberto García
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 9.6 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 284 KiB After Width: | Height: | Size: 284 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 7.3 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
@@ -1641,7 +1641,7 @@ table {
|
||||
// 13. Pages
|
||||
// ---------
|
||||
|
||||
.more-information {
|
||||
.help {
|
||||
|
||||
li {
|
||||
border-bottom: 1px solid $border;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<div data-alert class="callout primary">
|
||||
<%= t("debates.new.info",
|
||||
info_link: link_to(t("debates.new.info_link"), new_proposal_path )).html_safe %>
|
||||
<%= link_to more_info_path, title: t('shared.target_blank_html'), target: "_blank" do %>
|
||||
<%= link_to help_path, title: t('shared.target_blank_html'), target: "_blank" do %>
|
||||
<strong><%= t("debates.new.more_info") %></strong>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
<h1><%= t("proposals.new.start_new") %></h1>
|
||||
<div data-alert class="callout primary">
|
||||
<%= link_to more_info_path(anchor: "proposals") ,title: t('shared.target_blank_html'), target: "_blank" do %>
|
||||
<%= link_to help_path(anchor: "proposals") ,title: t('shared.target_blank_html'), target: "_blank" do %>
|
||||
<%= t("proposals.new.more_info")%>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
28
app/views/pages/help/_budgets.html.erb
Normal file
28
app/views/pages/help/_budgets.html.erb
Normal file
@@ -0,0 +1,28 @@
|
||||
<div class="row section-content">
|
||||
<div class="small-12 column">
|
||||
<h3 id="budgets" data-magellan-target="budgets">
|
||||
<%= t("pages.help.budgets.title") %>
|
||||
</h3>
|
||||
<p>
|
||||
<%= t("pages.help.budgets.description",
|
||||
link: link_to(t("pages.help.budgets.link"), budgets_path)).html_safe %>
|
||||
</p>
|
||||
<ul class="features">
|
||||
<li>
|
||||
<%= t("pages.help.budgets.feature") %>
|
||||
</li>
|
||||
<li><%= t("pages.help.budgets.phase_1_html",
|
||||
org: setting['org_name']).html_safe %></li>
|
||||
<li><%= t("pages.help.budgets.phase_2_html") %></li>
|
||||
<li><%= t("pages.help.budgets.phase_3_html") %></li>
|
||||
<li><%= t("pages.help.budgets.phase_4_html") %></li>
|
||||
</ul>
|
||||
|
||||
<p><%= t("pages.help.budgets.phase_5_html") %></p>
|
||||
|
||||
<figure>
|
||||
<%= image_tag "help/budgets_#{I18n.locale}.png", alt: t("pages.help.budgets.image_alt") %>
|
||||
<figcaption><%= t("pages.help.budgets.figcaption_html") %></figcaption>
|
||||
</figure>
|
||||
</div>
|
||||
</div>
|
||||
25
app/views/pages/help/_debates.html.erb
Normal file
25
app/views/pages/help/_debates.html.erb
Normal file
@@ -0,0 +1,25 @@
|
||||
<div class="row section-content">
|
||||
<div class="small-12 column">
|
||||
<h3 id="debates" data-magellan-target="debates">
|
||||
<%= t("pages.help.debates.title") %>
|
||||
</h3>
|
||||
<p>
|
||||
<%= t("pages.help.debates.description",
|
||||
org: setting['org_name'],
|
||||
link: link_to(t("pages.help.debates.link"),
|
||||
debates_path)).html_safe %>
|
||||
</p>
|
||||
<ul class="features">
|
||||
<li>
|
||||
<%= t("pages.help.debates.feature_html",
|
||||
link: link_to(t("pages.help.debates.feature_link", org: setting['org_name']),
|
||||
new_user_registration_path)).html_safe %>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<figure>
|
||||
<%= image_tag "help/debates.png", alt: t("pages.help.debates.image_alt") %>
|
||||
<figcaption><%= t("pages.help.debates.figcaption") %></figcaption>
|
||||
</figure>
|
||||
</div>
|
||||
</div>
|
||||
24
app/views/pages/help/_menu.html.erb
Normal file
24
app/views/pages/help/_menu.html.erb
Normal file
@@ -0,0 +1,24 @@
|
||||
<div class="row">
|
||||
<div class="small-12 column">
|
||||
<ul class="menu-pages" data-magellan>
|
||||
<% if feature?(:debates) %>
|
||||
<li>
|
||||
<%= link_to t("pages.help.menu.debates"), "#debates", class: "button hollow expanded" %>
|
||||
</li>
|
||||
<% end %>
|
||||
<% if feature?(:proposals) %>
|
||||
<li>
|
||||
<%= link_to t("pages.help.menu.proposals"), "#proposals", class: "button hollow expanded" %>
|
||||
</li>
|
||||
<% end %>
|
||||
<% if feature?(:budgets) %>
|
||||
<li>
|
||||
<%= link_to t("pages.help.menu.budgets"), "#budgets", class: "button hollow expanded" %>
|
||||
</li>
|
||||
<% end %>
|
||||
<li>
|
||||
<%= link_to t("pages.help.menu.other"), "#other", class: "button hollow expanded" %>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,7 +1,7 @@
|
||||
<h3 id="other" data-magellan-target="other"><%= t("pages.more_info.other.title") %></h3>
|
||||
<h3 id="other" data-magellan-target="other"><%= t("pages.help.other.title") %></h3>
|
||||
|
||||
<ul class="features">
|
||||
<li><%= link_to t("pages.more_info.other.how_to_use", org_name: setting['org_name']), how_to_use_path %></li>
|
||||
<li><%= link_to t("pages.help.other.how_to_use", org_name: setting['org_name']), how_to_use_path %></li>
|
||||
|
||||
<% SiteCustomization::Page.with_more_info_flag.with_same_locale.each do |custom_page| %>
|
||||
<li><%= link_to custom_page.title, page_path(custom_page.slug) %></li>
|
||||
18
app/views/pages/help/_polls.html.erb
Normal file
18
app/views/pages/help/_polls.html.erb
Normal file
@@ -0,0 +1,18 @@
|
||||
<div class="row section-content">
|
||||
<div class="small-12 column">
|
||||
<h3 id="polls" data-magellan-target="polls"><%= t("pages.help.polls.title") %></h3>
|
||||
<p>
|
||||
<%= t("pages.help.polls.description",
|
||||
link: link_to(t("pages.help.polls.link"), polls_path)).html_safe %>
|
||||
</p>
|
||||
<ul class="features">
|
||||
<li>
|
||||
<%= t("pages.help.polls.feature_1",
|
||||
link: link_to(t("pages.help.polls.feature_1_link", org_name: setting['org_name']),
|
||||
new_user_registration_path)).html_safe %>
|
||||
</li>
|
||||
<li><%= t("pages.help.polls.feature_2") %></li>
|
||||
<li><%= t("pages.help.polls.feature_3") %></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
23
app/views/pages/help/_proposals.html.erb
Normal file
23
app/views/pages/help/_proposals.html.erb
Normal file
@@ -0,0 +1,23 @@
|
||||
<div class="row section-content">
|
||||
<div class="small-12 column">
|
||||
<h3 id="proposals" data-magellan-target="proposals">
|
||||
<%= t("pages.help.proposals.title") %>
|
||||
</h3>
|
||||
<p>
|
||||
<%= t("pages.help.proposals.description",
|
||||
link: link_to(t("pages.help.proposals.link"), proposals_path)).html_safe %>
|
||||
</p>
|
||||
<ul class="features">
|
||||
<li>
|
||||
<%= t("pages.help.proposals.feature_html",
|
||||
org: setting['org_name'],
|
||||
supports: setting['votes_for_proposal_success']).html_safe %>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<figure>
|
||||
<%= image_tag "help/proposals_#{I18n.locale}.png", alt: t("pages.help.proposals.image_alt") %>
|
||||
<figcaption><%= t("pages.help.proposals.figcaption_html") %></figcaption>
|
||||
</figure>
|
||||
</div>
|
||||
</div>
|
||||
5
app/views/pages/help/_sidebar.html.erb
Normal file
5
app/views/pages/help/_sidebar.html.erb
Normal file
@@ -0,0 +1,5 @@
|
||||
<div class="sidebar-card">
|
||||
<h3><%= t("pages.help.faq.title") %></h3>
|
||||
<p><%= t("pages.help.faq.description") %></p>
|
||||
<%= link_to t("pages.help.faq.button"), faq_path, class: "button expanded" %>
|
||||
</div>
|
||||
21
app/views/pages/help/faq/index.html.erb
Normal file
21
app/views/pages/help/faq/index.html.erb
Normal file
@@ -0,0 +1,21 @@
|
||||
<% content_for :canonical do %>
|
||||
<%= render "shared/canonical", href: faq_url %>
|
||||
<% end %>
|
||||
|
||||
<div class="row margin-top">
|
||||
<div class="menu small-12 medium-3 column">
|
||||
<%= back_link_to %>
|
||||
|
||||
<ul class="menu vertical margin-top">
|
||||
<li><a href="#1"><strong><%= t("pages.help.faq.page.faq_1_title") %></strong></a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="text small-12 medium-9 column">
|
||||
<h1 class="clear"><%= t("pages.help.faq.page.title") %></h1>
|
||||
<p><%= t("pages.help.faq.page.description") %></p>
|
||||
|
||||
<h2 id="1"><%= t("pages.help.faq.page.faq_1_title") %></h2>
|
||||
<p><%= t("pages.help.faq.page.faq_1_description") %></p>
|
||||
</div>
|
||||
</div>
|
||||
@@ -6,8 +6,8 @@
|
||||
<div class="text small-12 column">
|
||||
<%= back_link_to %>
|
||||
|
||||
<h1><%= t('pages.more_info.titles.how_to_use') %></h1>
|
||||
<h1><%= t('pages.help.titles.how_to_use') %></h1>
|
||||
|
||||
<%= markdown t('pages.more_info.how_to_use.text') %>
|
||||
<%= markdown t('pages.help.how_to_use.text') %>
|
||||
</div>
|
||||
</div>
|
||||
48
app/views/pages/help/index.html.erb
Normal file
48
app/views/pages/help/index.html.erb
Normal file
@@ -0,0 +1,48 @@
|
||||
<% provide :title do %><%= t("pages.titles.help", org: setting['org_name']) %><% end %>
|
||||
<% content_for :canonical do %>
|
||||
<%= render "shared/canonical", href: help_url %>
|
||||
<% end %>
|
||||
|
||||
<div class="jumbo light">
|
||||
<div class="row">
|
||||
<div class="small-12 medium-9 column">
|
||||
<h2><%= t("pages.help.title", org: setting['org_name']) %></h2>
|
||||
<p><%= t("pages.help.subtitle", org: setting['org_name']) %></p>
|
||||
<p><%= t("pages.help.guide", org: setting['org_name']) %></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<%= render "pages/help/menu" %>
|
||||
</div>
|
||||
|
||||
<div id="more-info" class="more-info-content">
|
||||
<div class="row">
|
||||
<div class="small-12 medium-7 large-8 column">
|
||||
<% if feature?(:debates) %>
|
||||
<%= render "pages/help/debates" %>
|
||||
<% end %>
|
||||
|
||||
<% if feature?(:proposals) %>
|
||||
<%= render "pages/help/proposals" %>
|
||||
<% end %>
|
||||
|
||||
<% if feature?(:budgets) %>
|
||||
<%= render "pages/help/budgets" %>
|
||||
<% end %>
|
||||
|
||||
<% if feature?(:polls) %>
|
||||
<%= render "pages/help/polls" %>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="small-12 medium-4 large-3 column more-info-sidebar">
|
||||
<%= render "pages/help/sidebar" %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<hr>
|
||||
<div class="small-12 column">
|
||||
<%= render "pages/help/other" %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,23 +0,0 @@
|
||||
<div class="row section-content">
|
||||
<div class="small-12 column">
|
||||
<h3 id="budgets" data-magellan-target="budgets">
|
||||
<%= t("pages.more_info.budgets.title") %>
|
||||
</h3>
|
||||
<p><%= t("pages.more_info.budgets.description") %></p>
|
||||
<ul class="features">
|
||||
<li>
|
||||
<%= t("pages.more_info.budgets.feature_1",
|
||||
link: link_to(t("pages.more_info.budgets.feature_1_link", org_name: setting['org_name']),
|
||||
new_user_registration_path)).html_safe %>
|
||||
</li>
|
||||
<li><%= t("pages.more_info.budgets.feature_2_html") %></li>
|
||||
<li><%= t("pages.more_info.budgets.feature_3_html") %></li>
|
||||
<li><%= t("pages.more_info.budgets.feature_4_html") %></li>
|
||||
</ul>
|
||||
|
||||
<figure>
|
||||
<%= image_tag "more_info/budgets_#{I18n.locale}.png", alt: t("pages.more_info.budgets.image_alt") %>
|
||||
<figcaption><%= t("pages.more_info.budgets.figcaption_html") %></figcaption>
|
||||
</figure>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,21 +0,0 @@
|
||||
<div class="row section-content">
|
||||
<div class="small-12 column">
|
||||
<h3 id="debates" data-magellan-target="debates">
|
||||
<%= t("pages.more_info.debates.title") %>
|
||||
</h3>
|
||||
<p><%= t("pages.more_info.debates.description") %></p>
|
||||
<ul class="features">
|
||||
<li>
|
||||
<%= t("pages.more_info.debates.feature_1",
|
||||
link: link_to(t("pages.more_info.debates.feature_1_link", org_name: setting['org_name']),
|
||||
new_user_registration_path)).html_safe %>
|
||||
</li>
|
||||
<li><%= t("pages.more_info.debates.feature_2_html") %></li>
|
||||
</ul>
|
||||
|
||||
<figure>
|
||||
<%= image_tag "more_info/debates.png", alt: t("pages.more_info.debates.image_alt") %>
|
||||
<figcaption><%= t("pages.more_info.debates.figcaption") %></figcaption>
|
||||
</figure>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,24 +0,0 @@
|
||||
<div class="row">
|
||||
<div class="small-12 column">
|
||||
<ul class="menu-pages" data-magellan>
|
||||
<% if feature?(:debates) %>
|
||||
<li>
|
||||
<%= link_to t("pages.more_info.menu.debates"), "#debates", class: "button hollow expanded" %>
|
||||
</li>
|
||||
<% end %>
|
||||
<% if feature?(:proposals) %>
|
||||
<li>
|
||||
<%= link_to t("pages.more_info.menu.proposals"), "#proposals", class: "button hollow expanded" %>
|
||||
</li>
|
||||
<% end %>
|
||||
<% if feature?(:budgets) %>
|
||||
<li>
|
||||
<%= link_to t("pages.more_info.menu.budgets"), "#budgets", class: "button hollow expanded" %>
|
||||
</li>
|
||||
<% end %>
|
||||
<li>
|
||||
<%= link_to t("pages.more_info.menu.other"), "#other", class: "button hollow expanded" %>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,15 +0,0 @@
|
||||
<div class="row section-content">
|
||||
<div class="small-12 column">
|
||||
<h3 id="polls" data-magellan-target="polls"><%= t("pages.more_info.polls.title") %></h3>
|
||||
<p><%= t("pages.more_info.polls.description") %></p>
|
||||
<ul class="features">
|
||||
<li>
|
||||
<%= t("pages.more_info.polls.feature_1",
|
||||
link: link_to(t("pages.more_info.polls.feature_1_link", org_name: setting['org_name']),
|
||||
new_user_registration_path)).html_safe %>
|
||||
</li>
|
||||
<li><%= t("pages.more_info.polls.feature_2") %></li>
|
||||
<li><%= t("pages.more_info.polls.feature_3") %></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,22 +0,0 @@
|
||||
<div class="row section-content">
|
||||
<div class="small-12 column">
|
||||
<h3 id="proposals" data-magellan-target="proposals">
|
||||
<%= t("pages.more_info.proposals.title") %>
|
||||
</h3>
|
||||
<p><%= t("pages.more_info.proposals.description") %></p>
|
||||
<ul class="features">
|
||||
<li>
|
||||
<%= t("pages.more_info.proposals.feature_1",
|
||||
link: link_to(t("pages.more_info.proposals.feature_1_link", org_name: setting['org_name']),
|
||||
new_user_registration_path)).html_safe %>
|
||||
</li>
|
||||
<li><%= t("pages.more_info.proposals.feature_2_html") %></li>
|
||||
<li><%= t("pages.more_info.proposals.feature_3_html") %></li>
|
||||
</ul>
|
||||
|
||||
<figure>
|
||||
<%= image_tag "more_info/proposals_#{I18n.locale}.png", alt: t("pages.more_info.proposals.image_alt") %>
|
||||
<figcaption><%= t("pages.more_info.proposals.figcaption_html") %></figcaption>
|
||||
</figure>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,5 +0,0 @@
|
||||
<div class="sidebar-card">
|
||||
<h3><%= t("pages.more_info.faq.title") %></h3>
|
||||
<p><%= t("pages.more_info.faq.description") %></p>
|
||||
<%= link_to t("pages.more_info.faq.button"), faq_path, class: "button expanded" %>
|
||||
</div>
|
||||
@@ -1,21 +0,0 @@
|
||||
<% content_for :canonical do %>
|
||||
<%= render "shared/canonical", href: faq_url %>
|
||||
<% end %>
|
||||
|
||||
<div class="row margin-top">
|
||||
<div class="menu small-12 medium-3 column">
|
||||
<%= back_link_to %>
|
||||
|
||||
<ul class="menu vertical margin-top">
|
||||
<li><a href="#1"><strong><%= t("pages.more_info.faq.page.faq_1_title") %></strong></a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="text small-12 medium-9 column">
|
||||
<h1 class="clear"><%= t("pages.more_info.faq.page.title") %></h1>
|
||||
<p><%= t("pages.more_info.faq.page.description") %></p>
|
||||
|
||||
<h2 id="1"><%= t("pages.more_info.faq.page.faq_1_title") %></h2>
|
||||
<p><%= t("pages.more_info.faq.page.faq_1_description") %></p>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,48 +0,0 @@
|
||||
<% provide :title do %><%= t("pages.titles.more_info", org_name: setting['org_name']) %><% end %>
|
||||
<% content_for :canonical do %>
|
||||
<%= render "shared/canonical", href: more_info_url %>
|
||||
<% end %>
|
||||
|
||||
<div class="jumbo light">
|
||||
<div class="row">
|
||||
<div class="small-12 column">
|
||||
<h2><%= t("pages.more_info.title", org_name: setting['org_name']) %></h2>
|
||||
<p class="lead"><%= t("pages.more_info.subtitle") %></p>
|
||||
<p><%= t("pages.more_info.guide", org_name: setting['org_name']) %></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<%= render "pages/more_info/menu" %>
|
||||
</div>
|
||||
|
||||
<div id="more-info" class="more-info-content">
|
||||
<div class="row">
|
||||
<div class="small-12 medium-7 large-8 column">
|
||||
<% if feature?(:debates) %>
|
||||
<%= render "pages/more_info/debates" %>
|
||||
<% end %>
|
||||
|
||||
<% if feature?(:proposals) %>
|
||||
<%= render "pages/more_info/proposals" %>
|
||||
<% end %>
|
||||
|
||||
<% if feature?(:budgets) %>
|
||||
<%= render "pages/more_info/budgets" %>
|
||||
<% end %>
|
||||
|
||||
<% if feature?(:polls) %>
|
||||
<%= render "pages/more_info/polls" %>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="small-12 medium-4 large-3 column more-info-sidebar">
|
||||
<%= render "pages/more_info/sidebar" %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<hr>
|
||||
<div class="small-12 column">
|
||||
<%= render "pages/more_info/other" %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
<h1><%= t("proposals.new.start_new") %></h1>
|
||||
<div data-alert class="callout primary">
|
||||
<%= link_to more_info_path(anchor: "proposals") ,title: t('shared.target_blank_html'), target: "_blank" do %>
|
||||
<%= link_to help_path(anchor: "proposals") ,title: t('shared.target_blank_html'), target: "_blank" do %>
|
||||
<%= t("proposals.new.more_info")%>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<div class="row">
|
||||
<div class="more-information small-12 medium-9 large-7 column">
|
||||
<div class="help small-12 medium-9 large-7 column">
|
||||
<h1>Más información</h1>
|
||||
<ul class="no-bullet">
|
||||
<li>
|
||||
|
||||
@@ -53,11 +53,11 @@
|
||||
</li>
|
||||
<% end %>
|
||||
<li>
|
||||
<%= link_to t("layouts.header.more_info"),
|
||||
more_info_path,
|
||||
<%= link_to t("layouts.header.help"),
|
||||
help_path,
|
||||
accesskey: "5",
|
||||
class: ("active" if current_page?(more_info_path)),
|
||||
title: t("shared.go_to_page") + t("layouts.header.more_info") %>
|
||||
class: ("active" if current_page?(help_path)),
|
||||
title: t("shared.go_to_page") + t("layouts.header.help") %>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
<%= t("layouts.header.open_city_slogan_html") %>
|
||||
</p>
|
||||
<div class="small-12 medium-6 large-4 small-centered">
|
||||
<%= link_to t("layouts.header.more_info"), more_info_path, class: "button expanded large" %>
|
||||
<%= link_to t("shared.more_info"), help_path, class: "button expanded large" %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -187,7 +187,7 @@ en:
|
||||
status: Status
|
||||
title: Title
|
||||
updated_at: Updated at
|
||||
more_info_flag: Show in more information page
|
||||
more_info_flag: Show in help page
|
||||
print_content_flag: Print content button
|
||||
locale: Language
|
||||
site_customization/image:
|
||||
|
||||
@@ -231,7 +231,7 @@ en:
|
||||
moderation: Moderation
|
||||
valuation: Valuation
|
||||
officing: Polling officers
|
||||
more_info: More information
|
||||
help: Help
|
||||
my_account_link: My account
|
||||
my_activity_link: My activity
|
||||
notifications: Notifications
|
||||
@@ -623,6 +623,7 @@ en:
|
||||
previous_slide: Previous Slide
|
||||
next_slide: Next Slide
|
||||
documentation: Additional documentation
|
||||
more_info: More information
|
||||
social:
|
||||
blog: "%{org} Blog"
|
||||
facebook: "%{org} Facebook"
|
||||
|
||||
@@ -3,10 +3,10 @@ en:
|
||||
census_terms: To confirm the account, you must be 16 or older and be registered, having provided the information requested previously, will verify. By accepting the verification process, you also consent to the verification of this information, as well as the contact methods featuring in said files. The data provided will be acquired and processed in a file mentioned previously in the terms and conditions of use for the Portal.
|
||||
conditions: Terms and conditions of use
|
||||
general_terms: Terms and Conditions
|
||||
more_info:
|
||||
title: "Discover %{org_name}"
|
||||
subtitle: "Learn everything you can do on this website."
|
||||
guide: 'This guide explains each section of %{org_name}. You can expand the information on "Detailed information" links.'
|
||||
help:
|
||||
title: "%{org} is a platform for citizen participation"
|
||||
subtitle: "In %{org} you can make proposals, vote in citizen consultations, propose participatory budget projects, decide on municipal regulations and open debates to exchange opinions with others."
|
||||
guide: "This guide explains what each of the %{org} sections are for and how they work."
|
||||
menu:
|
||||
debates: "Debates"
|
||||
proposals: "Proposals"
|
||||
@@ -14,38 +14,39 @@ en:
|
||||
other: "Other information of interest"
|
||||
debates:
|
||||
title: "Debates"
|
||||
description: "Create a thread where you can discuss any topic you want to share with other people in your city."
|
||||
feature_1: "To create a debate you have to %{link}"
|
||||
feature_1_link: "sign up on %{org_name}"
|
||||
feature_2_html: "Debates can be rated using the <strong>I agree</strong> or <strong>I disagree</strong> buttons you'll find on each of them."
|
||||
description: "In the %{link} section you can present and share your opinion with other people on issues of concern to you related to the city. It is also a place to generate ideas that through the other sections of %{org} lead to concrete actions by the City Council."
|
||||
link: "citizen debates"
|
||||
feature_html: "You can open debates, comment and evaluate them with the <strong>I agree</strong> or <strong>I don't agree</strong>. For that you have to %{link}."
|
||||
feature_link: "register in %{org}"
|
||||
image_alt: "Buttons to rate the debates"
|
||||
figcaption: '"I agree" and "I disagree" buttons to rate the debates.'
|
||||
proposals:
|
||||
title: "Proposals"
|
||||
description: "Propose what you want the City Council to do and support proposals from other people."
|
||||
feature_1: "To create a proposal you have to %{link}, in addition to support you must verify your account."
|
||||
feature_1_link: "sign up on %{org_name}"
|
||||
feature_2_html: "Proposals that get <strong>support from 1% of people</strong> will be voted on."
|
||||
feature_3_html: "If there are more people in favor than against, <strong>the City Council will publish their plan to accomplish</strong> the proposal and you can track its progress."
|
||||
description: "In the %{link} section you can make proposals for the City Council to carry them out. The proposals require support, and if they reach sufficient support, they are put to a public vote. The proposals approved in these citizens' votes are accepted by the City Council and carried out."
|
||||
link: "citizen proposals"
|
||||
feature_html: "To create a proposal you must register in %{org}. The proposals that get the support on the website of 1% of people with the right to vote (%{supports} supports of people over 16 years old registered) go to vote. To support proposals it is necessary to verify your account."
|
||||
image_alt: "Button to support a proposal"
|
||||
figcaption_html: 'Button to "Support" a proposal.<br>When it reaches the number of supports will go to vote.'
|
||||
budgets:
|
||||
title: "Participatory Budgeting"
|
||||
description: "The first six months of each year you can decide how to spend part of the budget."
|
||||
feature_1: "To submit an investment project you have to %{link} and verify your account."
|
||||
feature_1_link: "sign up on %{org_name}"
|
||||
feature_2_html: "The first is the <strong>submit phase</strong> of investment projects."
|
||||
feature_3_html: "Then there is a <strong>support phase</strong> to prioritize the most interesting, the most supported are evaluated by the City to see if they are viable and how much they are worth."
|
||||
feature_4_html: "At the end there is a <strong>vote phase </strong> and you decide which of the approved projects to spend the budget on."
|
||||
description: "The %{link} section helps people make a direct decision on what part of the municipal budget is spent on."
|
||||
link: "participative budgets"
|
||||
feature: "In this process, every year people raise, support and vote on projects. The most voted votes are financed by the municipal budget."
|
||||
phase_1_html: "Between January and early March, people registered in %{org} can <strong>present</strong>."
|
||||
phase_2_html: "In March, proposers have to gather support, in the form of <strong>preselection</strong>."
|
||||
phase_3_html: "Between April and the beginning of May, the experts from the <strong>City Council rate</strong> projects on an order of more or less supported and check that they are viable."
|
||||
phase_4_html: "Finally, between May and June, all citizens can <strong>vote</strong> projects that interest them the most."
|
||||
phase_5_html: "From the approval of the budgets the following year the City Council begins to carry out the winning projects."
|
||||
image_alt: "Different phases of a participatory budget"
|
||||
figcaption_html: '"Support" and "Voting" phases of participatory budgets.'
|
||||
polls:
|
||||
title: "Polls"
|
||||
description: "Citizen proposals that reach 1% of support will be put to a vote."
|
||||
feature_1: "To participate in the next poll you have to %{link} and verify your account."
|
||||
feature_1_link: "sign up on %{org_name}"
|
||||
feature_2: "All verified users over 16 years old can vote."
|
||||
feature_3: "The results of all votes shall be binding on the government."
|
||||
description: "The %{link} section is activated each time a proposal reaches 1% support and goes to the vote or when the City Council proposes an issue for people to decide on."
|
||||
link: "polls"
|
||||
feature_1: "To participate in the voting you have to %{link} and verify your account."
|
||||
feature_1_link: "register in %{org_name}"
|
||||
feature_2: "All registered voters over the age of 16 can vote."
|
||||
feature_3: "The results of all votes are binding on the municipal government."
|
||||
faq:
|
||||
title: "Technical problems?"
|
||||
description: "Read the FAQs and solve your questions."
|
||||
@@ -71,7 +72,7 @@ en:
|
||||
titles:
|
||||
accessibility: Accessibility
|
||||
conditions: Terms of use
|
||||
more_info: "More information about %{org_name}"
|
||||
help: "What is %{org}? - Citizen participation"
|
||||
privacy: Privacy Policy
|
||||
verify:
|
||||
code: Code you received in letter
|
||||
|
||||
@@ -183,7 +183,7 @@ es:
|
||||
status: Estado
|
||||
title: Título
|
||||
updated_at: última actualización
|
||||
more_info_flag: Mostrar en la página de más información
|
||||
more_info_flag: Mostrar en la página de ayuda
|
||||
print_content_flag: Botón de imprimir contenido
|
||||
locale: Idioma
|
||||
site_customization/image:
|
||||
|
||||
@@ -231,7 +231,7 @@ es:
|
||||
moderation: Moderar
|
||||
valuation: Evaluación
|
||||
officing: Presidentes de mesa
|
||||
more_info: Más información
|
||||
help: Ayuda
|
||||
my_account_link: Mi cuenta
|
||||
my_activity_link: Mi actividad
|
||||
notifications: Notificaciones
|
||||
@@ -622,6 +622,7 @@ es:
|
||||
previous_slide: Imagen anterior
|
||||
next_slide: Siguiente imagen
|
||||
documentation: Documentación adicional
|
||||
more_info: Más información
|
||||
social:
|
||||
blog: "Blog de %{org}"
|
||||
facebook: "Facebook de %{org}"
|
||||
|
||||
@@ -3,10 +3,10 @@ es:
|
||||
census_terms: Para verificar la cuenta hay que tener 16 años o más y estar empadronado aportando los datos indicados anteriormente, los cuales serán contrastados. Aceptando el proceso de verificación acepta dar su consentimiento para contrastar dicha información, así como medios de contacto que figuren en dichos ficheros. Los datos aportados serán incorporados y tratados en un fichero indicado anteriormente en las condiciones de uso del portal.
|
||||
conditions: Condiciones de uso
|
||||
general_terms: Términos y Condiciones
|
||||
more_info:
|
||||
title: "Descubre %{org_name}"
|
||||
subtitle: "Aprende todo lo que puedes hacer en esta web."
|
||||
guide: 'Esta guía explica cada una de las secciones de %{org_name}. Puedes ampliar la información en los enlaces de "Información detallada".'
|
||||
help:
|
||||
title: "%{org} es una plataforma de participación ciudadana"
|
||||
subtitle: "En %{org} se pueden hacer propuestas, votar en consultas ciudadanas, plantear proyectos de presupuestos participativos, decidir la normativa municipal y abrir debates para intercambiar opiniones con otras personas."
|
||||
guide: 'Esta guía explica para qué sirven y cómo funcionan cada una de las secciones de %{org}.'
|
||||
menu:
|
||||
debates: "Debates"
|
||||
proposals: "Propuestas"
|
||||
@@ -14,38 +14,39 @@ es:
|
||||
other: "Otra información de interés"
|
||||
debates:
|
||||
title: "Debates"
|
||||
description: "Crea un hilo en el que debatir sobre cualquier tema que quieras compartir con el resto de gente de tu ciudad."
|
||||
feature_1: "Para crear un debate tienes que %{link}"
|
||||
feature_1_link: "registrarte en %{org_name}"
|
||||
feature_2_html: "Los debates pueden ser valorados utilizando los botones de <strong>Estoy de acuerdo</strong> o <strong>No estoy de acuerdo</strong> que encontrarás en cada uno de ellos."
|
||||
description: "En la sección de %{link} puedes exponer y compartir tu opinión con otras personas sobre temas que te preocupan relacionados con la ciudad. También es un espacio donde generar ideas que a través de las otras secciones de %{org} lleven a actuaciones concretas por parte del Ayuntamiento."
|
||||
link: "debates ciudadanos"
|
||||
feature_html: "Puedes abrir debates, comentarlos y valorarlos con los botones de <strong>Estoy de acuerdo</strong> o <strong>No estoy de acuerdo</strong>. Para ello tienes que %{link}."
|
||||
feature_link: "registrarte en %{org}"
|
||||
image_alt: "Botones para valorar los debates"
|
||||
figcaption: 'Botones "Estoy de acuerdo" y "No estoy de acuerdo" para valorar los debates.'
|
||||
proposals:
|
||||
title: "Propuestas"
|
||||
description: "Propón lo que quieres que el Ayuntamiento lleve a cabo y apoya propuestas de otras personas."
|
||||
feature_1: "Para crear una propuesta tienes que %{link}, además para apoyarlas debes verificar tu cuenta."
|
||||
feature_1_link: "registrarte en %{org_name}"
|
||||
feature_2_html: "Las propuestas que consigan <strong>el apoyo del 1% de la gente</strong> (mayor de 16 años empadronada; %{supports} apoyos) pasan a votación."
|
||||
feature_3_html: "Si hay más gente a favor que en contra en la votación, <strong>el Ayuntamiento asume la propuesta y se hace</strong>."
|
||||
description: "En la sección de %{link} puedes plantear propuestas para que el Ayuntamiento las lleve a cabo. Las propuestas recaban apoyos, y si alcanzan los apoyos suficientes se someten a votación ciudadana. Las propuestas aprobadas en estas votaciones ciudadanas son asumidas por el Ayuntamiento y se llevan a cabo."
|
||||
link: "propuestas ciudadanas"
|
||||
feature_html: "Para crear una propuesta hay que registrarse en %{org}. Las propuestas que consiguen el apoyo en la web del 1% de la gente con derecho a voto (%{supports} apoyos de personas mayores de 16 años empadronadas) pasan a votación. Para apoyar propuestas es necesario verificar tu cuenta."
|
||||
image_alt: "Botón para apoyar una propuesta"
|
||||
figcaption_html: 'Botón para "Apoyar" una propuesta.<br>Cuando alcance el número de apoyos pasará a votación.'
|
||||
budgets:
|
||||
title: "Presupuestos participativos"
|
||||
description: "Los primeros seis meses de cada año puedes decidir cómo gastar parte del presupuesto."
|
||||
feature_1: "Para crear un proyecto de gasto tienes que %{link} y verificar tu cuenta."
|
||||
feature_1_link: "registrarte en %{org_name}"
|
||||
feature_2_html: "En primer lugar empieza la <strong>fase de aceptación</strong> de proyectos de gasto."
|
||||
feature_3_html: "Después hay una <strong>fase de apoyos</strong> para priorizar lo más interesante, las más apoyadas son evaluadas por el Ayuntamiento para ver si son viables y cuánto valen."
|
||||
feature_4_html: "Al final hay una <strong>fase de votación</strong> donde se decide en cuáles se gasta esa parte del presupuesto."
|
||||
description: "La sección de %{link} sirve para que la gente decida de manera directa a qué se destina una parte del presupuesto municipal."
|
||||
link: "presupuestos participativos"
|
||||
feature: "En este proceso cada año la gente plantea, apoya y vota proyectos. Los más votados pasan a financiarse con el presupuesto municipal."
|
||||
phase_1_html: "Entre enero y principios de marzo, las personas registradas en %{org} pueden <strong>presentar proyectos</strong>."
|
||||
phase_2_html: "En marzo, los proponentes tienen que recabar apoyos, a modo de <strong>fase de preselección</strong>."
|
||||
phase_3_html: "Entre abril y comienzos de mayo los técnicos del Ayuntamiento <strong>tasan los proyectos</strong> por orden de más a menos apoyados y comprueban que son viables."
|
||||
phase_4_html: "Finalmente, entre mayo y junio, toda la ciudadanía puede <strong>votar los proyectos</strong> que más le interesan."
|
||||
phase_5_html: "A partir de la aprobación de los presupuestos al año siguiente el Ayuntamiento empieza a llevar a cabo los proyectos ganadores."
|
||||
image_alt: "Diferentes fases de un presupuesto participativo"
|
||||
figcaption_html: 'Fase de "Apoyos" y fase de "Votación" de los presupuestos participativos.'
|
||||
polls:
|
||||
title: "Votaciones"
|
||||
description: "Las propuestas ciudadanas que alcancen el 1% de apoyos pasarán a votación."
|
||||
feature_1: "Para participar en la próxima votación tienes que %{link} y verificar tu cuenta."
|
||||
description: "La sección de %{link} se activa cada vez que una propuesta alcanza el 1% de apoyos y pasa a votación o cuando el Ayuntamiento propone un tema para que la gente decida sobre él."
|
||||
link: "votaciones ciudadanas"
|
||||
feature_1: "Para participar en las votaciones tienes que %{link} y verificar tu cuenta."
|
||||
feature_1_link: "registrarte en %{org_name}"
|
||||
feature_2: "Pueden votar todas las personas empadronadas en la ciudad mayores de 16 años."
|
||||
feature_3: "Los resultados de todas las votaciones serán vinculantes para el gobierno."
|
||||
feature_3: "Los resultados de todas las votaciones son vinculantes para el gobierno municipal."
|
||||
faq:
|
||||
title: "¿Problemas técnicos?"
|
||||
description: "Lee las preguntas frecuentes y resuelve tus dudas."
|
||||
@@ -71,7 +72,7 @@ es:
|
||||
titles:
|
||||
accessibility: Accesibilidad
|
||||
conditions: Condiciones de uso
|
||||
more_info: "Más información sobre %{org_name}"
|
||||
help: "¿Qué es %{org}? - Participación ciudadana"
|
||||
privacy: Política de Privacidad
|
||||
verify:
|
||||
code: Código que has recibido en tu carta
|
||||
|
||||
@@ -42,9 +42,9 @@ Rails.application.routes.draw do
|
||||
resources :follows, only: [:create, :destroy]
|
||||
|
||||
# More info pages
|
||||
get 'more-information', to: 'pages#show', id: 'more_info/index', as: 'more_info'
|
||||
get 'more-information/how-to-use', to: 'pages#show', id: 'more_info/how_to_use/index', as: 'how_to_use'
|
||||
get 'more-information/faq', to: 'pages#show', id: 'more_info/faq/index', as: 'faq'
|
||||
get 'help', to: 'pages#show', id: 'help/index', as: 'help'
|
||||
get 'help/how-to-use', to: 'pages#show', id: 'help/how_to_use/index', as: 'how_to_use'
|
||||
get 'help/faq', to: 'pages#show', id: 'help/faq/index', as: 'faq'
|
||||
|
||||
# Static pages
|
||||
get '/blog' => redirect("http://blog.consul/")
|
||||
|
||||
@@ -14,7 +14,7 @@ SitemapGenerator::Sitemap.create do
|
||||
add page_path(id: page)
|
||||
end
|
||||
|
||||
add more_info_path
|
||||
add help_path
|
||||
add how_to_use_path
|
||||
add faq_path
|
||||
|
||||
|
||||
@@ -112,7 +112,7 @@ Setting['mailer_from_address'] = 'noreply@consul.dev'
|
||||
Setting['verification_offices_url'] = 'http://oficinas-atencion-ciudadano.url/'
|
||||
Setting['min_age_to_participate'] = 16
|
||||
|
||||
# Proposal improvement url path ('/more-information/proposal-improvement')
|
||||
# Proposal improvement url path ('/help/proposal-improvement')
|
||||
Setting['proposal_improvement_path'] = nil
|
||||
|
||||
# City map feature default configuration (Greenwich)
|
||||
|
||||
@@ -32,17 +32,17 @@ describe PagesController do
|
||||
describe 'More info pages' do
|
||||
|
||||
it 'includes a more info page' do
|
||||
get :show, id: 'more_info/index'
|
||||
get :show, id: 'help/index'
|
||||
expect(response).to be_ok
|
||||
end
|
||||
|
||||
it 'includes a how_to_use page' do
|
||||
get :show, id: 'more_info/how_to_use/index'
|
||||
get :show, id: 'help/how_to_use/index'
|
||||
expect(response).to be_ok
|
||||
end
|
||||
|
||||
it 'includes a faq page' do
|
||||
get :show, id: 'more_info/faq/index'
|
||||
get :show, id: 'help/faq/index'
|
||||
expect(response).to be_ok
|
||||
end
|
||||
end
|
||||
|
||||
@@ -80,7 +80,7 @@ feature "Custom Pages" do
|
||||
locale: "en"
|
||||
)
|
||||
|
||||
visit more_info_path
|
||||
visit help_path
|
||||
|
||||
expect(page).to have_content("Another custom page")
|
||||
end
|
||||
@@ -93,7 +93,7 @@ feature "Custom Pages" do
|
||||
locale: "en"
|
||||
)
|
||||
|
||||
visit more_info_path
|
||||
visit help_path
|
||||
|
||||
expect(page).not_to have_content("Another custom page")
|
||||
|
||||
@@ -112,7 +112,7 @@ feature "Custom Pages" do
|
||||
locale: "fr"
|
||||
)
|
||||
|
||||
visit more_info_path
|
||||
visit help_path
|
||||
|
||||
expect(page).not_to have_content("Ce texte est en français")
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ feature 'rake sitemap:create' do
|
||||
|
||||
# Static pages
|
||||
expect(sitemap).to include(faq_path)
|
||||
expect(sitemap).to include(more_info_path)
|
||||
expect(sitemap).to include(help_path)
|
||||
expect(sitemap).to include(how_to_use_path)
|
||||
expect(sitemap).to include(page_path(id: 'general_terms'))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user