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

Merge pull request #2732 from consul/legislation-help-gif

Browse Source 
Legislation help gif
This commit is contained in:
Alberto
2018-07-11 17:44:12 +02:00
committed by GitHub
parent b8396135e9 5dd1cdf6d3
commit c5c611837d
9 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/assets/images/annotator_help.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 103 KiB

After

Width:  |  Height:  |  Size: 33 KiB

1
app/assets/stylesheets/legislation_process.scss
View File

@@ -289,7 +289,6 @@
padding: rem-calc(32) 0;
.draft-chooser {
margin-bottom: rem-calc(32);
h3 {
vertical-align: top;

2
app/views/legislation/annotations/index.html.erb
View File

@@ -9,6 +9,8 @@
<%= render 'slim_version_chooser', process: @process, draft_version: @draft_version %>
</div>
<%= render 'legislation/processes/help_gif' %>
<div class="small-12 medium-8 column row legislation-comments end">
<% @annotations.each do |annotation| %>

2
app/views/legislation/annotations/show.html.erb
View File

@@ -8,6 +8,8 @@
<div class="draft-panels small-12 column row">
<%= render 'version_chooser', process: @process, draft_version: @draft_version %>
<%= render 'legislation/processes/help_gif' %>
<div class="legislation-comment">
<div class="annotation-comment">
<div class="row annotation-share-comment">

2
app/views/legislation/draft_versions/changes.html.erb
View File

@@ -27,6 +27,8 @@
</div>
</div>
<%= render 'legislation/processes/help_gif' %>
<div class="row">
<div class="small-12 medium-8 column legislation-changes">
<%= markdown @draft_version.changelog %>

4
app/views/legislation/draft_versions/show.html.erb
View File

@@ -25,7 +25,7 @@
<% unless @draft_version.final_version? %>
<div class="small-12 medium-3 column">
<%= link_to legislation_process_draft_version_annotations_path(@process, @draft_version), title: t('.see_comments'), class: "button" do %>
<%= link_to legislation_process_draft_version_annotations_path(@process, @draft_version), title: t('.see_comments'), class: "button expanded" do %>
<strong><%= t('.see_comments') %></strong>
<% end %>
</div>
@@ -33,6 +33,8 @@
</div>
<%= render 'legislation/processes/help_gif' %>
<div class="row draft-allegation medium-collapse comments-on">
<div class="small-12 calc-index column <%= "js-toggle-allegations" unless @draft_version.final_version? %>">
<div class="draft-panel">

24
app/views/legislation/processes/_help_gif.html.erb Normal file
View File

@@ -0,0 +1,24 @@
<div class="row">
<div class="small-12 column">
<div class="float-right">
<a class="button hollow" data-toggle="annotator-help">
<sub><span class="icon-edit"></span></sub>&nbsp;
<%= t("annotator.help.title") %>
</a>
<div class="dropdown-pane" id="annotator-help" data-dropdown data-auto-focus="true">
<% if user_signed_in? %>
<%= t("annotator.help.alt") %>
<% else %>
<p>
<%= t("annotator.help.text",
sign_in: link_to(t("annotator.help.text_sign_in"), new_user_session_path),
sign_up: link_to(t("annotator.help.text_sign_up"), new_user_registration_path)).html_safe %>
</p>
<% end %>
<%= image_tag ("annotator_help.gif"), alt: t("annotator.help.alt") %>
</div>
</div>
</div>
</div>

9
config/locales/en/general.yml
View File

@@ -846,4 +846,11 @@ en:
budget_investment: "Budget investment"
admin/widget:
header:
title: Administration
title: Administration
annotator:
help:
alt: Select the text you want to comment and press the button with the pencil.
text: To comment this document you must %{sign_in} or %{sign_up}. Then select the text you want to comment and press the button with the pencil.
text_sign_in: login
text_sign_up: sign up
title: How I can comment this document?

9
config/locales/es/general.yml
View File

@@ -845,4 +845,11 @@ es:
budget_investment: "Proyecto de gasto"
admin/widget:
header:
title: Administración
title: Administración
annotator:
help:
alt: Selecciona el texto que quieres comentar y pulsa en el botón con el lápiz.
text: Para comentar este documento debes %{sign_in} o %{sign_up}. Después selecciona el texto que quieres comentar y pulsa en el botón con el lápiz.
text_sign_in: iniciar sesión
text_sign_up: registrarte
title: "¿Cómo puedo comentar este documento?"