Browse Source

Added flag to the orgas page

remotes/origin/master
echarp 3 years ago
parent
commit
d86cbde568
  1. 4
      app/assets/stylesheets/moderations.sass
  2. 33
      app/views/moderations/index.html.haml
  3. 5
      app/views/orgas/index.html.haml

4
app/assets/stylesheets/moderations.sass

@ -6,8 +6,8 @@ body.moderations h3
.moderations, .notes
table.list
margin-top: 25px
margin-bottom: 25px
margin-top: 2em
margin-bottom: 2em
td
padding-top: 0.5em
padding-bottom: 0.5em

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

@ -9,27 +9,30 @@
%table.list
%thead
%tr
%th(colspan='5')
%th(colspan='7')
%h3
%em.fa.fa-users
= Orga.model_name.human.pluralize @orgas.count
%tr
%th= Orga.human_attribute_name :city
%th(colspan='2')= Orga.human_attribute_name :name
%th.flag
%th.name(colspan='2')= Orga.human_attribute_name :name
%th.city= Orga.human_attribute_name :city
%th.region= Orga.human_attribute_name :region
%th= Orga.human_attribute_name :submission_time
%th= t '.actions'
%tbody
- @orgas.each do |orga|
%tr
%td{ title: orga.region }
%td.flag{ title: orga.region }
= flag_icon orga.region.flag
= orga.city || orga.region
%td.kind
- if orga.kind
%em.fa{ class: "fa-#{orga.kind.icon}",
title: Kind.human_attribute_name("name_#{orga.kind.name}") }
%td= orga.name
%td.name= orga.name
%td.city= orga.city
%td.region= orga.region
%td= time_ago_in_words orga.submission_time
%th.actions
= link_to edit_orga_path orga do
@ -48,28 +51,30 @@
%table.list
%thead
%tr
%th(colspan='5')
%th(colspan='7')
%h3
%em.fa.fa-calendar
= Event.model_name.human.pluralize @events.count
%tr
%th= Event.human_attribute_name :city
%th= Event.human_attribute_name :title
%th.flag
%th.title= Event.human_attribute_name :title
%th
= Event.human_attribute_name :start_time
\-
= Event.human_attribute_name :end_time
%th.city= Event.human_attribute_name :city
%th.region= Event.human_attribute_name :region
%th= Event.human_attribute_name :submission_time
%th= t '.actions'
%th.actions= t '.actions'
%tbody
- @events.each do |event|
%tr
%td{ title: event.region }
= flag_icon event.region.flag
= event.city
%td= event.title
%td.flag= flag_icon event.region.flag
%td.title= event.title
%td= display_date event
%td.city= event.city
%td.region= event.region
%td= time_ago_in_words event.submission_time
%th.actions
= link_to edit_moderation_path event do

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

@ -2,14 +2,13 @@
%em.fa.fa-users
= title t '.title'
= render 'search'
= render 'types'
%table.list.autopagerize_page_element
%thead
%th.flag
%th.name(colspan='2')= sort_link @search, :name
%th.city= sort_link @search, :city
%th.department= sort_link @search, :department
%th.region= sort_link @search,
:region_name, Orga.human_attribute_name(:region)
%th.updated_at= sort_link @search,
@ -17,6 +16,7 @@
%tbody
- @orgas.each do |orga|
%tr{ class: orga.active ? 'active' : 'inactive' }
%td.flag= flag_icon orga.region.flag
%td.kind
- if orga.kind
%em.fa{ class: "fa-#{orga.kind.icon}",
@ -25,7 +25,6 @@
= orga.name
= render partial: '/orgas/favicon', locals: { orga: orga }
%td.city= orga.city
%td.department= orga.department
%td.region= orga.region
%td.updated_at
- if orga.updated_at.present?

Loading…
Cancel
Save