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

includes help header and footer on debates and proposals

Browse Source
This commit is contained in:
decabeza
2017-08-29 18:46:10 +02:00
parent c1a18192c9
commit 4e7e1410e9
9 changed files with 103 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/assets/images/help/help_icon_debates.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
app/assets/images/help/help_icon_proposals.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

4
app/assets/stylesheets/layout.scss
View File

@@ -318,6 +318,10 @@ a {
background: $brand;
}
.align-top {
vertical-align: top;
}
// 02. Header
// ----------

14
app/assets/stylesheets/participation.scss
View File

@@ -875,6 +875,20 @@
}
}
.help-link {
margin-left: $line-height;
position: relative;
&::before {
color: $link;
content: '\4e';
font-family: 'icons';
position: absolute;
left: -24px;
top: -2px;
}
}
// 05. Featured
// ------------

19
app/views/debates/index.html.erb
View File

@@ -9,8 +9,6 @@
<% end %>
<main>
<h1 class="show-for-sr"><%= t("shared.outline.debates") %></h1>
<% if @search_terms || @advanced_search_terms || @tag_filter %>
<div class="highlight no-margin-top padding margin-bottom">
<div class="row">
@@ -33,6 +31,8 @@
</div>
</div>
</div>
<% else %>
<%= render "shared/section_header", i18n_namespace: "debates.index.section_header", image: "debates" %>
<% end %>
<div class="row">
@@ -56,6 +56,21 @@
<%= render @debates %>
<%= paginate @debates %>
<% unless @search_terms || @advanced_search_terms || @tag_filter %>
<div id="section_help" class="margin" data-magellan-target="section_help">
<p class="lead">
<strong><%= t("debates.index.section_footer.title") %></strong>
</p>
<p><%= t("debates.index.section_footer.help_text_1") %></p>
<p><%= t("debates.index.section_footer.help_text_2",
org: link_to(setting['org_name'], new_user_registration_path)).html_safe %></p>
<p><%= t("debates.index.section_footer.help_text_3",
proposal: link_to(t("debates.index.section_footer.proposals_link"), proposals_path),
budget: link_to(t("debates.index.section_footer.budget_link"), budgets_path)).html_safe %>
</p>
</div>
<% end %>
</div>
<div class="small-12 medium-3 column">

16
app/views/proposals/index.html.erb
View File

@@ -9,8 +9,6 @@
<% end %>
<main>
<h1 class="show-for-sr"><%= t("shared.outline.proposals") %></h1>
<% if @search_terms || @advanced_search_terms || @tag_filter || params[:retired].present? %>
<div class="highlight no-margin-top padding margin-bottom">
<div class="row">
@@ -35,6 +33,8 @@
</div>
</div>
</div>
<% else %>
<%= render "shared/section_header", i18n_namespace: "proposals.index.section_header", image: "proposals" %>
<% end %>
<div class="row">
@@ -70,6 +70,18 @@
<div id="proposals-list">
<%= render partial: 'proposals/proposal', collection: @proposals %>
<%= paginate @proposals %>
<% unless @search_terms || @advanced_search_terms || @tag_filter %>
<div id="section_help" class="margin" data-magellan-target="section_help">
<p class="lead">
<strong><%= t("proposals.index.section_footer.title") %></strong>
</p>
<p><%= t("proposals.index.section_footer.help_text_1") %></p>
<p><%= t("proposals.index.section_footer.help_text_2",
org: link_to(setting['org_name'], new_user_registration_path)).html_safe %></p>
<p><%= t("proposals.index.section_footer.help_text_3") %></p>
</div>
<% end %>
</div>
</div>

10
app/views/shared/_section_header.html.erb Normal file
View File

@@ -0,0 +1,10 @@
<div class="highlight no-margin-top padding margin-bottom">
<div class="row">
<div class="small-12 medium-9 column" data-magellan>
<%= image_tag "help/help_icon_#{image}.png", alt: t("#{i18n_namespace}.icon_alt"), class: "align-top" %>
<h1 class="inline-block"><%= t("#{i18n_namespace}.title") %></h1>
<p class="lead"><%= t("#{i18n_namespace}.description") %></p>
<%= link_to t("#{i18n_namespace}.help"), "#section_help", class: "help-link" %>
</div>
</div>
</div>