Browse Source

Missing awesome icons

remotes/origin/master
echarp 5 years ago
parent
commit
073893424d
  1. 1
      app/assets/stylesheets/form.sass
  2. 11
      app/views/events/cancel.html.haml
  3. 14
      app/views/events/edit.html.haml
  4. 8
      app/views/events/new.html.haml
  5. 2
      app/views/events/show.html.haml
  6. 14
      app/views/moderations/edit.html.haml
  7. 6
      app/views/moderations/index.html.haml
  8. 4
      app/views/orgas/_aside.html.haml
  9. 4
      app/views/orgas/_form.html.haml
  10. 11
      app/views/orgas/cancel.html.haml
  11. 2
      app/views/orgas/edit.html.haml
  12. 2
      app/views/orgas/index.html.haml
  13. 2
      app/views/orgas/new.html.haml
  14. 2
      app/views/orgas/show.html.haml
  15. 4
      app/views/stats/index.html.haml
  16. 2
      app/views/tags/show.html.haml
  17. 2
      config/locales/models/en.yml
  18. 2
      config/locales/models/fr.yml
  19. 2
      config/locales/models/pt-BR.yml

1
app/assets/stylesheets/form.sass

@ -33,6 +33,7 @@ body.mce-content-body
margin: 0
padding: 0.8em
text-align: right
padding-left: 0
.helper
color: #888
padding: 0.8em

11
app/views/events/cancel.html.haml

@ -1,5 +1,5 @@
%h2
%em.fa.fa-trash-o
%em.fa.fa-trash-alt
= t '.title'
- if @event.moderated?
@ -14,8 +14,13 @@
= f.label :reason
= f.text_area :reason, cols: 40, rows: 5
= f.submit t('.ok'), name: :yes
= link_to t('.ko'), @event, class: :button
.actions
= link_to @event do
%em.fa.fa-arrow-left
= t '.ko'
= f.button do
%em.fa.fa-check
= t '.ok'
%fieldset
%legend= Event.model_name.human

14
app/views/events/edit.html.haml

@ -1,20 +1,20 @@
%h2
%em.fa.fa-pencil
=t '.title'
%em.fa.fa-edit
= t '.title'
- if @event.moderated?
%h3.warning
%em.fa.fa-warning
=t '.warning'
%em.fa.fa-exclamation-triangle
= t '.warning'
%fieldset
%legend
%em.fa.fa-eye
=t '.preview'
= t '.preview'
= render file: '/events/show'
%fieldset
%legend
%em.fa.fa-pencil
=t '.edit'
%em.fa.fa-edit
= t '.edit'
= render '/events/form'

8
app/views/events/new.html.haml

@ -1,12 +1,12 @@
%h2
%em.fa.fa-pencil
=title t '.title'
%em.fa.fa-edit
= title t '.title'
- if @event.description
%fieldset
%legend
%em.fa.fa-eye
=t '.preview'
= t '.preview'
= render file: '/events/show'
- else
@ -20,5 +20,5 @@
%fieldset
%legend
%em.fa.fa-plus
=t '.edit'
= t '.edit'
= render 'form'

2
app/views/events/show.html.haml

@ -55,7 +55,7 @@
- if user_signed_in?
%h2
= link_to edit_moderation_path @event do
%em.fa.fa-lg.fa-pencil
%em.fa.fa-lg.fa-edit
= t '.edit'
%h2
= link_to cancel_event_path @event, secret: @event.secret do

14
app/views/moderations/edit.html.haml

@ -1,20 +1,20 @@
%h2
%em.fa.fa-pencil
=t '.title'
%em.fa.fa-edit
= t '.title'
- if @moderation.moderated?
%h3.warning
%em.fa.fa-warning
=t '.warning'
%em.fa.fa-exclamation-triangle
= t '.warning'
%fieldset
%legend
%em.fa.fa-eye
=t '.preview'
= t '.preview'
= render file: '/events/show'
%fieldset
%legend
%em.fa.fa-pencil
=t '.edit'
%em.fa.fa-edit
= t '.edit'
= render '/events/form'

6
app/views/moderations/index.html.haml

@ -24,7 +24,7 @@
%td= time_ago_in_words orga.submission_time
%th.actions
= link_to edit_orga_path orga do
%em.fa.fa-pencil
%em.fa.fa-edit
= t 'edit'
\-
= link_to validate_orga_path orga do
@ -59,7 +59,7 @@
%td= time_ago_in_words event.submission_time
%th.actions
= link_to edit_moderation_path event do
%em.fa.fa-pencil
%em.fa.fa-edit
= t 'edit'
\-
= link_to validate_moderation_path event do
@ -90,5 +90,5 @@
.logout
= link_to destroy_user_session_path, method: :delete do
%em.fa.fa-sign-out
%em.fa.fa-sign-out-alt
= t 'logout'

4
app/views/orgas/_aside.html.haml

@ -31,7 +31,7 @@
OpenStreetMap
%li
= link_to maps_path format: :json, tag: @orga.name_as_tag do
%em.fa.fa-li.fa-dot-circle-o
%em.fa.fa-li.fa-dot-circle
GeoJSON
- if @orga.secret.nil? || user_signed_in?
@ -40,7 +40,7 @@
= t '.actions'
%h2
= link_to edit_orga_path @orga do
%em.fa.fa-lg.fa-pencil
%em.fa.fa-lg.fa-edit
= t '.edit'
- if user_signed_in?
%h2

4
app/views/orgas/_form.html.haml

@ -45,9 +45,9 @@
/= f.text_area :description, rows: 25, class: :description
= f.text_field :description, class: :description
.field.url{ title: t('.url_helper') }
.field.url.required{ title: t('.url_helper') }
= f.label :url
= f.url_field :url, placeholder: 'Ex: https://april.org'
= f.url_field :url, required: true, placeholder: 'Ex: https://april.org'
.field.diaspora
= f.label :diaspora
= f.url_field :diaspora

11
app/views/orgas/cancel.html.haml

@ -1,5 +1,5 @@
%h2
%em.fa.fa-trash-o
%em.fa.fa-trash-alt
= t '.title'
- if @orga.moderated?
@ -10,8 +10,13 @@
= hidden_field_tag :secret, params[:secret]
%h2= t '.confirm'
= f.submit t('.ok'), name: :yes
= link_to t('.ko'), @orga, class: :button
.actions
= link_to @orga do
%em.fa.fa-arrow-left
= t '.ko'
= f.button do
%em.fa.fa-check
= t '.ok'
%fieldset
%legend= Orga.model_name.human

2
app/views/orgas/edit.html.haml

@ -4,6 +4,6 @@
%fieldset
%legend
%em.fa.fa-pencil
%em.fa.fa-edit
= t '.edit'
= render 'form'

2
app/views/orgas/index.html.haml

@ -59,7 +59,7 @@
%td.edit
- if orga.secret.nil? || user_signed_in?
= link_to edit_orga_path orga do
%em.fa.fa-pencil
%em.fa.fa-edit
%tfoot
%tr

2
app/views/orgas/new.html.haml

@ -4,6 +4,6 @@
%fieldset
%legend
%em.fa.fa-pencil
%em.fa.fa-edit
= t '.edit'
= render 'form'

2
app/views/orgas/show.html.haml

@ -37,7 +37,7 @@
%dd= @orga.department
- if @orga.url.present?
%dt
%em.fa.fa-external-link
%em.fa.fa-external-link-alt
= Orga.human_attribute_name :url
%dd= link_to @orga.url, sanitize(@orga.url)
- if @orga.diaspora.present?

4
app/views/stats/index.html.haml

@ -73,7 +73,9 @@
%th.quantity.total= number_with_delimiter total
%td.sparkline/
%h3= t '.city'
%h3
%em.fa.fa-building
= t '.city'
%p= t '.city_conditions'

2
app/views/tags/show.html.haml

@ -30,7 +30,7 @@
OpenStreetMap
%li
= link_to maps_path format: :json, tag: params[:id] do
%em.fa.fa-li.fa-dot-circle-o
%em.fa.fa-li.fa-dot-circle
GeoJSON
- @events_future.order('start_time asc').each do |event|

2
config/locales/models/en.yml

@ -45,7 +45,7 @@ en:
department: Department
region: Region
url: Web address
diaspora: diaspora*
diaspora: diaspora
feed: Syndication
contact: Contact
submitter: Soumetteur

2
config/locales/models/fr.yml

@ -45,7 +45,7 @@ fr:
department: Département
region: Région
url: Adresse web
diaspora: diaspora*
diaspora: diaspora
feed: Syndication
contact: Contact
submitter: Soumetteur

2
config/locales/models/pt-BR.yml

@ -45,7 +45,7 @@ pt-BR:
department: Bairro
region: Estado
url: Site
diaspora: diaspora*
diaspora: diaspora
feed: RSS
contact: Contato
submitter: Remetente

Loading…
Cancel
Save