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

Updates custom note class to foundation help-text

Browse Source
This commit is contained in:
decabeza
2017-06-27 10:29:36 +02:00
parent 14e74ab6a9
commit af7807ce9f
18 changed files with 81 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -825,23 +825,6 @@ form {
margin: $line-height / 2 0 $line-height / 2 $line-height / 4; margin: $line-height / 2 0 $line-height / 2 $line-height / 4;
} }
.note,
.note-marked {
display: block;
font-size: rem-calc(13);
margin-bottom: $line-height / 2;
}
.note-marked {
background: #ff0;
display: inline-block;
em {
background: #fff;
display: block;
}
}
.ckeditor { .ckeditor {
min-height: $line-height * 13; min-height: $line-height * 13;
} }

4
app/views/admin/poll/questions/_form.html.erb
View File

@@ -17,8 +17,8 @@
<%= f.text_field :title, maxlength: Poll::Question.title_max_length %> <%= f.text_field :title, maxlength: Poll::Question.title_max_length %>
<%= f.label :valid_answers %> <%= f.label :valid_answers %>
<p class="note"><%= t("admin.questions.new.valid_answers_note") %></p> <p class="help-text" id="valid-answers-help-text"><%= t("admin.questions.new.valid_answers_note") %></p>
<%= f.text_field :valid_answers, label: false %> <%= f.text_field :valid_answers, label: false, aria: {describedby: "valid-answers-help-text"} %>
<div class="ckeditor"> <div class="ckeditor">
<%= f.cktext_area :description, <%= f.cktext_area :description,

4
app/views/admin/signature_sheets/new.html.erb
View File

@@ -15,8 +15,8 @@
</div> </div>
<%= f.label :document_numbers %> <%= f.label :document_numbers %>
<p class="note"><%= t("admin.signature_sheets.new.document_numbers_note") %></p> <p class="help-text" id="document-numbers-help-text"><%= t("admin.signature_sheets.new.document_numbers_note") %></p>
<%= f.text_area :document_numbers, rows: "6", label: false %> <%= f.text_area :document_numbers, rows: "6", label: false, aria: {describedby: "document-numbers-help-text"} %>
<%= f.submit(class: "button", value: t("admin.signature_sheets.new.submit")) %> <%= f.submit(class: "button", value: t("admin.signature_sheets.new.submit")) %>
<% end %> <% end %>

3
app/views/budgets/investments/_form.html.erb
View File

@@ -31,7 +31,7 @@
<div class="small-12 column"> <div class="small-12 column">
<%= f.label :tag_list, t("budgets.investments.form.tags_label") %> <%= f.label :tag_list, t("budgets.investments.form.tags_label") %>
<p class="note"><%= t("budgets.investments.form.tags_instructions") %></p> <p class="help-text" id="tags-list-help-text"><%= t("budgets.investments.form.tags_instructions") %></p>
<div id="category_tags" class="tags"> <div id="category_tags" class="tags">
<%= f.label :category_tag_list, t("budgets.investments.form.tag_category_label") %> <%= f.label :category_tag_list, t("budgets.investments.form.tag_category_label") %>
@@ -44,6 +44,7 @@
<%= f.text_field :tag_list, value: @investment.tag_list.to_s, <%= f.text_field :tag_list, value: @investment.tag_list.to_s,
label: false, label: false,
placeholder: t("budgets.investments.form.tags_placeholder"), placeholder: t("budgets.investments.form.tags_placeholder"),
aria: {describedby: "tags-list-help-text"},
class: 'js-tag-list' %> class: 'js-tag-list' %>
</div> </div>

5
app/views/debates/_form.html.erb
View File

@@ -17,11 +17,12 @@
<div class="small-12 column"> <div class="small-12 column">
<%= f.label :tag_list, t("debates.form.tags_label") %> <%= f.label :tag_list, t("debates.form.tags_label") %>
<p class="note"><%= t("debates.form.tags_instructions") %></p> <p class="help-text" id="tag-list-help-text"><%= t("debates.form.tags_instructions") %></p>
<%= f.text_field :tag_list, value: @debate.tag_list.to_s, <%= f.text_field :tag_list, value: @debate.tag_list.to_s,
label: false, label: false,
placeholder: t("debates.form.tags_placeholder") %> placeholder: t("debates.form.tags_placeholder"),
aria: {describedby: "tag-list-help-text"} %>
</div> </div>
<div class="small-12 column"> <div class="small-12 column">
<% if @debate.new_record? %> <% if @debate.new_record? %>

6
app/views/management/user_invites/new.html.erb
View File

@@ -3,8 +3,10 @@
<%= form_tag management_user_invites_path do %> <%= form_tag management_user_invites_path do %>
<label><%= t('management.user_invites.new.label') %></label> <label><%= t('management.user_invites.new.label') %></label>
<p class="note"><%= t('management.user_invites.new.info') %></p> <p class="help-text" id="emails-help-text"><%= t('management.user_invites.new.info') %></p>
<%= text_area_tag "emails", nil, rows: 5, placeholder: t('management.user_invites.new.info') %> <%= text_area_tag "emails", nil, rows: 5,
placeholder: t('management.user_invites.new.info'),
aria: {describedby: "emails-help-text"} %>
<div class="small-12 medium-6"> <div class="small-12 medium-6">
<input type="submit" name="" value="<%= t('management.user_invites.new.submit') %>", class="button hollow expanded"> <input type="submit" name="" value="<%= t('management.user_invites.new.submit') %>", class="button hollow expanded">
</div> </div>

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

@@ -9,8 +9,10 @@
<%= f.fields_for :organization do |fo| %> <%= 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.text_field :name, autofocus: true, maxlength: Organization.name_max_length, placeholder: t("devise_views.organizations.registrations.new.organization_name_label") %>
<%= fo.label :responsible_name %> <%= fo.label :responsible_name %>
<p class="note"><%= t("devise_views.organizations.registrations.new.responsible_name_note") %></p> <p class="help-text" id="responsible-name-help-text"><%= t("devise_views.organizations.registrations.new.responsible_name_note") %></p>
<%= fo.text_field :responsible_name, placeholder: t("devise_views.organizations.registrations.new.responsible_name_label"), 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,
aria: {describedby: "responsible-name-help-text"} %>
<% end %> <% end %>
<%= f.email_field :email, placeholder: t("devise_views.organizations.registrations.new.email_label") %> <%= f.email_field :email, placeholder: t("devise_views.organizations.registrations.new.email_label") %>

29
app/views/proposals/_form.html.erb
View File

@@ -12,17 +12,21 @@
<div class="small-12 column"> <div class="small-12 column">
<%= f.label :question, t("proposals.form.proposal_question") %> <%= f.label :question, t("proposals.form.proposal_question") %>
<span class="note-marked"> <p class="help-text" id="question-help-text">
<%= t("proposals.form.proposal_question_example_html") %> <%= t("proposals.form.proposal_question_example_html") %>
</span> </p>
<%= f.text_field :question, maxlength: Proposal.question_max_length, placeholder: t("proposals.form.proposal_question"), label: false %> <%= f.text_field :question, maxlength: Proposal.question_max_length,
placeholder: t("proposals.form.proposal_question"),
label: false,
aria: {describedby: "question-help-text"} %>
</div> </div>
<div class="small-12 column"> <div class="small-12 column">
<%= f.label :summary, t("proposals.form.proposal_summary") %> <%= f.label :summary, t("proposals.form.proposal_summary") %>
<p class="note"><%= t("proposals.form.proposal_summary_note") %></p> <p class="help-text" id="summary-help-text"><%= t("proposals.form.proposal_summary_note") %></p>
<%= f.text_area :summary, rows: 4, maxlength: 200, label: false, <%= f.text_area :summary, rows: 4, maxlength: 200, label: false,
placeholder: t('proposals.form.proposal_summary') %> placeholder: t('proposals.form.proposal_summary'),
aria: {describedby: "summary-help-text"} %>
</div> </div>
<div class="ckeditor small-12 column"> <div class="ckeditor small-12 column">
@@ -33,8 +37,9 @@
<div class="small-12 column"> <div class="small-12 column">
<%= f.label :video_url, t("proposals.form.proposal_video_url") %> <%= f.label :video_url, t("proposals.form.proposal_video_url") %>
<p class="note"><%= t("proposals.form.proposal_video_url_note") %></p> <p class="help-text" id="video-url-help-text"><%= t("proposals.form.proposal_video_url_note") %></p>
<%= f.text_field :video_url, placeholder: t("proposals.form.proposal_video_url"), label: false %> <%= f.text_field :video_url, placeholder: t("proposals.form.proposal_video_url"), label: false,
aria: {describedby: "video-url-help-text"} %>
</div> </div>
<div class="small-12 column"> <div class="small-12 column">
@@ -49,7 +54,7 @@
<div class="small-12 column"> <div class="small-12 column">
<%= f.label :tag_list, t("proposals.form.tags_label") %> <%= f.label :tag_list, t("proposals.form.tags_label") %>
<p class="note"><%= t("proposals.form.tags_instructions") %></p> <p class="help-text" id="tag-list-help-text"><%= t("proposals.form.tags_instructions") %></p>
<div id="category_tags" class="tags"> <div id="category_tags" class="tags">
<%= f.label :category_tag_list, t("proposals.form.tag_category_label") %> <%= f.label :category_tag_list, t("proposals.form.tag_category_label") %>
@@ -62,14 +67,16 @@
<%= f.text_field :tag_list, value: @proposal.tag_list.to_s, <%= f.text_field :tag_list, value: @proposal.tag_list.to_s,
label: false, label: false,
placeholder: t("proposals.form.tags_placeholder"), placeholder: t("proposals.form.tags_placeholder"),
class: 'js-tag-list' %> class: 'js-tag-list',
aria: {describedby: "tag-list-help-text"} %>
</div> </div>
<% if current_user.unverified? %> <% if current_user.unverified? %>
<div class="small-12 column"> <div class="small-12 column">
<%= f.label :responsible_name, t("proposals.form.proposal_responsible_name") %> <%= f.label :responsible_name, t("proposals.form.proposal_responsible_name") %>
<p class="note"><%= t("proposals.form.proposal_responsible_name_note") %></p> <p class="help-text" id="responsible-name-help-text"><%= t("proposals.form.proposal_responsible_name_note") %></p>
<%= f.text_field :responsible_name, placeholder: t("proposals.form.proposal_responsible_name"), label: false %> <%= f.text_field :responsible_name, placeholder: t("proposals.form.proposal_responsible_name"), label: false,
aria: {describedby: "responsible-name-help-text"} %>
</div> </div>
<% end %> <% end %>

22
app/views/shared/_suggest.html.erb
View File

@@ -1,10 +1,12 @@
<div class="small-12 column" > <div class="small-12 column" >
<% if @search_terms && @resources.any? %> <% if @search_terms && @resources.any? %>
<div class="callout warning"> <div class="callout warning">
<p class="note-marked"> <p>
<%= t("shared.suggest.#{resource_name}.found", <strong>
count: @resources.count, <%= t("shared.suggest.#{resource_name}.found",
query: @search_terms)%> count: @resources.count,
query: @search_terms)%>
</strong>
</p> </p>
<ul> <ul>
@@ -14,11 +16,13 @@
</ul> </ul>
<% if @resources.count > @limit %> <% if @resources.count > @limit %>
<p class="note-marked"> <p>
<%= t("shared.suggest.#{resource_name}.message", <strong>
count: @resources.count, <%= t("shared.suggest.#{resource_name}.message",
query: @search_terms, count: @resources.count,
limit: @limit) %> query: @search_terms,
limit: @limit) %>
</strong>
<%= link_to t("shared.suggest.#{resource_name}.see_all"), <%= link_to t("shared.suggest.#{resource_name}.see_all"),
polymorphic_url(resource_model, search: @search_terms)%> polymorphic_url(resource_model, search: @search_terms)%>
</p> </p>

12
app/views/users/registrations/edit.html.erb
View File

@@ -18,8 +18,10 @@
<div class="small-12 column"> <div class="small-12 column">
<%= f.label :password, t("devise_views.users.registrations.edit.password_label") %> <%= f.label :password, t("devise_views.users.registrations.edit.password_label") %>
<p class="note"><%= t("devise_views.users.registrations.edit.leave_blank") %></p> <p class="help-text" id="password-help-text"><%= t("devise_views.users.registrations.edit.leave_blank") %></p>
<%= f.password_field :password, autocomplete: "off", label: false, placeholder: t("devise_views.users.registrations.edit.password_label") %> <%= f.password_field :password, autocomplete: "off", label: false,
placeholder: t("devise_views.users.registrations.edit.password_label"),
aria: {describedby: "password-help-text"} %>
</div> </div>
<div class="small-12 column"> <div class="small-12 column">
@@ -29,8 +31,10 @@
<div class="small-12 column"> <div class="small-12 column">
<%= f.label :current_password, t("devise_views.users.registrations.edit.current_password_label") %> <%= f.label :current_password, t("devise_views.users.registrations.edit.current_password_label") %>
<p class="note"><%= t("devise_views.users.registrations.edit.need_current") %></p> <p class="help-text" id="current-password-help-text"><%= t("devise_views.users.registrations.edit.need_current") %></p>
<%= f.password_field :current_password, label: false, autocomplete: "off", placeholder: t("devise_views.users.registrations.edit.current_password_label") %> <%= f.password_field :current_password, label: false, autocomplete: "off",
placeholder: t("devise_views.users.registrations.edit.current_password_label"),
aria: {describedby: "current-password-help-text"} %>
</div> </div>
<div class="small-12 column"> <div class="small-12 column">

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

@@ -18,8 +18,11 @@
<%= f.hidden_field :locale, value: I18n.locale %> <%= f.hidden_field :locale, value: I18n.locale %>
<%= f.label :username %> <%= f.label :username %>
<p class="note"><%= t("devise_views.users.registrations.new.username_note") %></p> <p class="help-text" id="username-help-text"><%= t("devise_views.users.registrations.new.username_note") %></p>
<%= f.text_field :username, autofocus: true, maxlength: User.username_max_length, placeholder: t("devise_views.users.registrations.new.username_label"), label: false %> <%= f.text_field :username, autofocus: true, maxlength: User.username_max_length,
placeholder: t("devise_views.users.registrations.new.username_label"),
label: false,
aria: {describedby: "username-help-text"} %>
<%= f.invisible_captcha :family_name %> <%= f.invisible_captcha :family_name %>

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

@@ -76,9 +76,9 @@
<div class="small-12 medium-5 clear"> <div class="small-12 medium-5 clear">
<%= f.label t("verification.residence.new.postal_code") %> <%= f.label t("verification.residence.new.postal_code") %>
<p class="note"><%= t("verification.residence.new.postal_code_note") %></p> <p class="help-text" id="postal-code-help-text"><%= t("verification.residence.new.postal_code_note") %></p>
<div class="medium-6"> <div class="medium-6">
<%= f.text_field :postal_code, label: false %> <%= f.text_field :postal_code, label: false, aria: {describedby: "postal-code-help-text"} %>
</div> </div>
</div> </div>

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

@@ -31,8 +31,10 @@
<div class="small-12 medium-6"> <div class="small-12 medium-6">
<%= f.label :phone, t("verification.sms.new.phone"), class: "inline-block" %> <%= f.label :phone, t("verification.sms.new.phone"), class: "inline-block" %>
<span class="inline-block"><%= t("verification.sms.new.phone_format_html") %></span> <span class="inline-block"><%= t("verification.sms.new.phone_format_html") %></span>
<p class="note"><%= t("verification.sms.new.phone_note") %></p> <p class="help-text" id="phone-text-help"><%= t("verification.sms.new.phone_note") %></p>
<%= f.text_field :phone, label: false, placeholder: t("verification.sms.new.phone_placeholder") %> <%= f.text_field :phone, label: false,
placeholder: t("verification.sms.new.phone_placeholder"),
aria: {describedby: "phone-help-text"} %>
</div> </div>
<%= f.submit t("verification.sms.new.submit_button"), class: "button success" %> <%= f.submit t("verification.sms.new.submit_button"), class: "button success" %>

2
config/locales/en.yml
View File

@@ -298,7 +298,7 @@ en:
geozone: Scope of operation geozone: Scope of operation
proposal_external_url: Link to additional documentation proposal_external_url: Link to additional documentation
proposal_question: Proposal question proposal_question: Proposal question
proposal_question_example_html: Must be summarised in one question with a Yes or No answer. <em>E.g. 'Do you agree with the pedestrianisation of Calle Mayor?'</em> proposal_question_example_html: "Must be summarised in one question with a Yes or No answer. <br>E.g. 'Do you agree with the pedestrianisation of Calle Mayor?'"
proposal_responsible_name: Full name of the person submitting the proposal proposal_responsible_name: Full name of the person submitting the proposal
proposal_responsible_name_note: "(individually or as representative of a collective; will not be displayed publically)" proposal_responsible_name_note: "(individually or as representative of a collective; will not be displayed publically)"
proposal_summary: Proposal summary proposal_summary: Proposal summary

2
config/locales/es.yml
View File

@@ -298,7 +298,7 @@ es:
geozone: "Ámbito de actuación" geozone: "Ámbito de actuación"
proposal_external_url: Enlace a documentación adicional proposal_external_url: Enlace a documentación adicional
proposal_question: Pregunta de la propuesta proposal_question: Pregunta de la propuesta
proposal_question_example_html: Debe ser resumida en una pregunta cuya respuesta sea Sí o No. <em>Ej. '¿Está usted de acuerdo en peatonalizar la calle Mayor?'</em> proposal_question_example_html: "Debe ser resumida en una pregunta cuya respuesta sea Sí o No. <br>Ej. '¿Está usted de acuerdo en peatonalizar la calle Mayor?'"
proposal_responsible_name: Nombre y apellidos de la persona que hace esta propuesta proposal_responsible_name: Nombre y apellidos de la persona que hace esta propuesta
proposal_responsible_name_note: "(individualmente o como representante de un colectivo; no se mostrará públicamente)" proposal_responsible_name_note: "(individualmente o como representante de un colectivo; no se mostrará públicamente)"
proposal_summary: Resumen de la propuesta proposal_summary: Resumen de la propuesta

4
config/locales/fr.yml
View File

@@ -1249,8 +1249,8 @@ fr:
proposal_external_url: Lien vers de la documentation complémentaire proposal_external_url: Lien vers de la documentation complémentaire
proposal_question: Question proposée proposal_question: Question proposée
proposal_question_example_html: 'Doit être résumé par une question appelant proposal_question_example_html: 'Doit être résumé par une question appelant
à une réponse par oui ou par non. <em>Exemple : ''Êtes-vous d''accord avec à une réponse par oui ou par non. <br>Exemple : ''Êtes-vous d''accord avec
la piétonnisation de Calle Mayor?''</em>' la piétonnisation de Calle Mayor?'
proposal_responsible_name: Nom complet de la personne qui soumet la proposition proposal_responsible_name: Nom complet de la personne qui soumet la proposition
proposal_responsible_name_note: "(individuellement ou comme représentant d'un proposal_responsible_name_note: "(individuellement ou comme représentant d'un
collectif; ne sera pas public)" collectif; ne sera pas public)"

2
config/locales/nl.yml
View File

@@ -300,7 +300,7 @@ nl:
geozone: Regio geozone: Regio
proposal_external_url: Link naar meet informatie proposal_external_url: Link naar meet informatie
proposal_question: Vraag proposal_question: Vraag
proposal_question_example_html: Moet samengevat worden in een vraag met een ja/nee antwoord. <Em>E.g. 'Ben je het eens met autovrije Geldersekade?'</em> proposal_question_example_html: Moet samengevat worden in een vraag met een ja/nee antwoord. <br>E.g. 'Ben je het eens met autovrije Geldersekade?'
proposal_responsible_name: Volledige naam van persoon die het voorstel doet proposal_responsible_name: Volledige naam van persoon die het voorstel doet
proposal_responsible_name_note: "(individueel of als vertegenwoordiger van een collectief; niet publiek zichtbaar)" proposal_responsible_name_note: "(individueel of als vertegenwoordiger van een collectief; niet publiek zichtbaar)"
proposal_summary: Samenvatting voorstel proposal_summary: Samenvatting voorstel

4
config/locales/pt-BR.yml
View File

@@ -1267,8 +1267,8 @@ pt-BR:
proposal_external_url: Link para documentação adicional proposal_external_url: Link para documentação adicional
proposal_question: Questão proposta proposal_question: Questão proposta
proposal_question_example_html: 'Precisa ser sumarizado em uma questão com resposta proposal_question_example_html: 'Precisa ser sumarizado em uma questão com resposta
Sim ou Não. <em>Ex.: ''Você concorda com a mudança da Calle Mayor como via Sim ou Não. <br>Ex.: ''Você concorda com a mudança da Calle Mayor como via
exclusiva de pedestres?''</em>' exclusiva de pedestres?'
proposal_responsible_name: Nome completo da pessoa que está submetendo a proposta proposal_responsible_name: Nome completo da pessoa que está submetendo a proposta
proposal_responsible_name_note: "(indivudualmente ou como representante de um proposal_responsible_name_note: "(indivudualmente ou como representante de um
coletivo; não será mostrado publicamente)" coletivo; não será mostrado publicamente)"