decidim-meetings 0.0.7 → 0.0.8.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (16) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +2 -2
  3. data/app/controllers/decidim/meetings/meeting_widgets_controller.rb +21 -0
  4. data/app/controllers/decidim/meetings/meetings_controller.rb +2 -0
  5. data/app/views/decidim/meetings/meeting_widgets/show.html.erb +18 -0
  6. data/app/views/decidim/meetings/meetings/show.html.erb +1 -0
  7. data/config/locales/ca.yml +5 -5
  8. data/config/locales/en.yml +5 -5
  9. data/config/locales/es.yml +5 -5
  10. data/config/locales/eu.yml +0 -7
  11. data/config/locales/fi.yml +0 -7
  12. data/config/locales/fr.yml +5 -0
  13. data/config/locales/nl.yml +5 -0
  14. data/db/migrate/20170410074252_remove_not_null_reference_meetings.rb +5 -0
  15. data/lib/decidim/meetings/list_engine.rb +3 -1
  16. metadata +18 -13
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 81a31e09f8206069413d440a1794e98ce0b5c212
4
- data.tar.gz: 44e29fe2b7d16f221edf1d638e18f60577a9a79c
3
+ metadata.gz: e8b84070cb3d3171fe6747f00691ed636022a1ab
4
+ data.tar.gz: 40848e4b2ab0096799772020dab43583feb82f14
5
5
  SHA512:
6
- metadata.gz: 59c464dd72380d14228c39318e423478a23747bd0a83ed43158f19054490952229554e77b178d46534576fd82771adacfb6eb0fcd9b581b6c636fddc044e4ead
7
- data.tar.gz: 7b6784369efad8db10f15956819c69d5e311c968cdd4194c2d1442fe4cc52bf50e3d92da1cd2047a1a5c06087a96853af19c17ab09a2596caf22f6c921cb84b2
6
+ metadata.gz: c6df878b0e98c1e9997f01127b530645a1522513b9364e664c6e4c58c4bfb92d1cee8789a26130f9f5104ea9c1e72bc5e4ce8ee9f9290a731f407222f8443bc3
7
+ data.tar.gz: 166f6ec6dd4eb4ec98ed95c14ffdd4674611b3c9f4ba0f29cbfa2c9e44897007a972fbf30ab1ab8adb27379111935c7e4842f1f665d12a06ad074e065d28454a
data/README.md CHANGED
@@ -17,7 +17,7 @@ $ bundle
17
17
  ```
18
18
 
19
19
  ## Contributing
20
- See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
20
+ See [Decidim](https://github.com/decidim/decidim).
21
21
 
22
22
  ## License
23
- See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
23
+ See [Decidim](https://github.com/decidim/decidim).
data/app/controllers/decidim/meetings/meeting_widgets_controller.rb ADDED
@@ -0,0 +1,21 @@
1
+ module Decidim
2
+ module Meetings
3
+ class MeetingWidgetsController < Decidim::WidgetsController
4
+ helper_method :model, :current_participatory_process
5
+
6
+ private
7
+
8
+ def model
9
+ @model ||= Meeting.where(feature: params[:feature_id]).find(params[:meeting_id])
10
+ end
11
+
12
+ def current_participatory_process
13
+ @current_participatory_process ||= model.feature.participatory_process
14
+ end
15
+
16
+ def iframe_url
17
+ @iframe_url ||= meeting_meeting_widget_url(model)
18
+ end
19
+ end
20
+ end
21
+ end
data/app/controllers/decidim/meetings/meetings_controller.rb CHANGED
@@ -6,6 +6,8 @@ module Decidim
6
6
  class MeetingsController < Decidim::Meetings::ApplicationController
7
7
  include FilterResource
8
8
 
9
+ helper Decidim::WidgetUrlsHelper
10
+
9
11
  helper_method :meetings, :geocoded_meetings, :meeting
10
12
 
11
13
  def index
data/app/views/decidim/meetings/meeting_widgets/show.html.erb ADDED
@@ -0,0 +1,18 @@
1
+ <div class="column">
2
+ <article class="card card--meeting">
3
+ <div class="card__content">
4
+ <%= link_to model, class: "card__link" do %>
5
+ <h5 class="card__title"><%= translated_attribute model.title %></h5>
6
+ <% end %>
7
+ <%= render partial: "decidim/meetings/meetings/datetime", locals: { meeting: model } %>
8
+ <%== translated_attribute model.description %>
9
+ <%= render partial: "decidim/meetings/meetings/tags", locals: { meeting: model } %>
10
+ <div class="address card__extra">
11
+ <div class="address__icon">
12
+ <%= icon "meetings", remove_icon_class: true, width: 40, height: 70 %>
13
+ </div>
14
+ <%= render partial: "decidim/shared/address_details", locals: { icon_name: "meetings", geolocalizable: model } %>
15
+ </div>
16
+ </div>
17
+ </article>
18
+ </div>
data/app/views/decidim/meetings/meetings/show.html.erb CHANGED
@@ -47,6 +47,7 @@
47
47
  <% end %>
48
48
  <%= feature_reference(meeting) %>
49
49
  <%= render partial: "decidim/shared/share_modal" %>
50
+ <%= embed_modal_for meeting_meeting_widget_url(meeting, format: :js) %>
50
51
  </div>
51
52
  <div class="columns mediumlarge-8 mediumlarge-pull-4">
52
53
  <div class="section">
data/config/locales/ca.yml CHANGED
@@ -8,7 +8,7 @@ ca:
8
8
  contributions_count: Nombre de contribucions
9
9
  proposal_ids: Propostes creades en una trobada
10
10
  meeting:
11
- adress: Adreça
11
+ address: Adreça
12
12
  decidim_category_id: Categoria
13
13
  decidim_scope_id: Àmbit
14
14
  description: Descripció
@@ -28,7 +28,7 @@ ca:
28
28
  confirm_destroy: Esteu segur de que voleu suprimir aquesta trobada?
29
29
  destroy: Esborra
30
30
  edit: Edita
31
- new: Nou/va %{name}
31
+ new: Nova
32
32
  preview: Previsualitzar
33
33
  title: Accions
34
34
  admin:
@@ -46,12 +46,12 @@ ca:
46
46
  destroy:
47
47
  success: La trobada s'ha eliminat correctament
48
48
  edit:
49
- update: Actualitzar trobada
49
+ update: Actualitzar
50
50
  index:
51
51
  title: Trobades
52
52
  new:
53
- create: Crear trobada
54
- title: Nova trobada
53
+ create: Crear
54
+ title: Crear trobada
55
55
  update:
56
56
  invalid: Hi ha hagut un problema en actualitzar aquesta trobada
57
57
  success: Trobada actualitzada correctament
data/config/locales/en.yml CHANGED
@@ -9,7 +9,7 @@ en:
9
9
  contributions_count: Number of contributions
10
10
  proposal_ids: Proposals created in the meeting
11
11
  meeting:
12
- adress: Adress
12
+ address: Address
13
13
  decidim_category_id: Category
14
14
  decidim_scope_id: Scope
15
15
  description: Description
@@ -29,7 +29,7 @@ en:
29
29
  confirm_destroy: Are you sure you want to delete this meeting?
30
30
  destroy: Delete
31
31
  edit: Edit
32
- new: New %{name}
32
+ new: New
33
33
  preview: Preview
34
34
  title: Actions
35
35
  admin:
@@ -47,12 +47,12 @@ en:
47
47
  destroy:
48
48
  success: Meeting successfully deleted
49
49
  edit:
50
- update: Update meeting
50
+ update: Update
51
51
  index:
52
52
  title: Meetings
53
53
  new:
54
- create: Create meeting
55
- title: New meeting
54
+ create: Create
55
+ title: Create meeting
56
56
  update:
57
57
  invalid: There's been a problem updating this meeting
58
58
  success: Meeting successfully updated
data/config/locales/es.yml CHANGED
@@ -8,7 +8,7 @@ es:
8
8
  contributions_count: Número de contribuciones
9
9
  proposal_ids: Propuestas creadas en el encuentro
10
10
  meeting:
11
- adress: Dirección
11
+ address: Dirección
12
12
  decidim_category_id: Categoría
13
13
  decidim_scope_id: Ámbito
14
14
  description: Descripción
@@ -28,7 +28,7 @@ es:
28
28
  confirm_destroy: '¿Está seguro de que quiere eliminar este encuentro?'
29
29
  destroy: Borrar
30
30
  edit: Editar
31
- new: Nuevo/a %{name}
31
+ new: Nuevo
32
32
  preview: Previsualizar
33
33
  title: Acciones
34
34
  admin:
@@ -46,12 +46,12 @@ es:
46
46
  destroy:
47
47
  success: El encuentro se ha eliminado correctamente
48
48
  edit:
49
- update: Actualizar encuentro
49
+ update: Actualizar
50
50
  index:
51
51
  title: Lista de encuentros
52
52
  new:
53
- create: Crear encuentro
54
- title: Nuevo encuentro
53
+ create: Crear
54
+ title: Crear encuentro
55
55
  update:
56
56
  invalid: Ha habido un problema al actualizar este encuentro
57
57
  success: Encuentro actualizado correctamente
data/config/locales/eu.yml CHANGED
@@ -8,7 +8,6 @@ eu:
8
8
  contributions_count: Ekarpen-kopurua
9
9
  proposal_ids: Topaketan sortutako proposamenak
10
10
  meeting:
11
- adress: Helbidea
12
11
  decidim_category_id: Kategoria
13
12
  decidim_scope_id: Esparrua
14
13
  description: Deskribapena
@@ -28,7 +27,6 @@ eu:
28
27
  confirm_destroy: Ziur zaude topaketa hau ezabatu nahi duzula?
29
28
  destroy: Ezabatu
30
29
  edit: Editatu
31
- new: '%{name} berria'
32
30
  preview: Aurreikusi
33
31
  title: Ekintzak
34
32
  admin:
@@ -45,13 +43,8 @@ eu:
45
43
  success: Topaketa ongi sortu da
46
44
  destroy:
47
45
  success: Topaketa zuzen ezabatu da.
48
- edit:
49
- update: Eguneratu topaketa
50
46
  index:
51
47
  title: Topaketa-zerrenda
52
- new:
53
- create: Sortu topaketa
54
- title: Topaketa berria
55
48
  update:
56
49
  invalid: Arazo bat izan da topaketa hau eguneratzean.
57
50
  success: Topaketa zuzen eguneratu da.
data/config/locales/fi.yml CHANGED
@@ -8,7 +8,6 @@ fi:
8
8
  contributions_count: Kontribuutioiden määrä
9
9
  proposal_ids: Ehdotusta luotu tapaamisessa
10
10
  meeting:
11
- adress: Adressi
12
11
  decidim_category_id: Kategoria
13
12
  decidim_scope_id: Konteksti
14
13
  description: Kuvaus
@@ -28,7 +27,6 @@ fi:
28
27
  confirm_destroy: Haluatko varmasti poistaa tämän tapaamisen?
29
28
  destroy: Poista
30
29
  edit: Muokkaa
31
- new: Uusi %{name}
32
30
  title: Toiminnot
33
31
  admin:
34
32
  meeting_closes:
@@ -44,13 +42,8 @@ fi:
44
42
  success: Tapaaminen onnistuneesti luotu
45
43
  destroy:
46
44
  success: Tapaaminen onnistuneesti poistettu
47
- edit:
48
- update: Päivitä tapaaminen
49
45
  index:
50
46
  title: Tapaamiset
51
- new:
52
- create: Luo tapaaminen
53
- title: Uusi tapaaminen
54
47
  update:
55
48
  invalid: Tapaamisen luonnissa tapahtui virhe
56
49
  success: Tapaaminen luotu onnistuneesti
data/config/locales/fr.yml ADDED
@@ -0,0 +1,5 @@
1
+ fr:
2
+ activemodel:
3
+ attributes:
4
+ close_meeting:
5
+ attendees_count: Nombre de participants
data/config/locales/nl.yml ADDED
@@ -0,0 +1,5 @@
1
+ nl:
2
+ activemodel:
3
+ attributes:
4
+ meeting:
5
+ decidim_category_id: Categorie
data/db/migrate/20170410074252_remove_not_null_reference_meetings.rb ADDED
@@ -0,0 +1,5 @@
1
+ class RemoveNotNullReferenceMeetings < ActiveRecord::Migration[5.0]
2
+ def change
3
+ change_column_null :decidim_meetings_meetings, :reference, true
4
+ end
5
+ end
data/lib/decidim/meetings/list_engine.rb CHANGED
@@ -12,7 +12,9 @@ module Decidim
12
12
  isolate_namespace Decidim::Meetings
13
13
 
14
14
  routes do
15
- resources :meetings, only: [:index, :show]
15
+ resources :meetings, only: [:index, :show] do
16
+ resource :meeting_widget, only: :show, path: "embed"
17
+ end
16
18
  root to: "meetings#index"
17
19
  end
18
20
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: decidim-meetings
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.7
4
+ version: 0.0.8.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2017-04-07 00:00:00.000000000 Z
13
+ date: 2017-04-27 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 0.0.7
21
+ version: 0.0.8.1
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
26
  - - '='
27
27
  - !ruby/object:Gem::Version
28
- version: 0.0.7
28
+ version: 0.0.8.1
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: rectify
31
31
  requirement: !ruby/object:Gem::Requirement
@@ -116,56 +116,56 @@ dependencies:
116
116
  requirements:
117
117
  - - '='
118
118
  - !ruby/object:Gem::Version
119
- version: 0.0.7
119
+ version: 0.0.8.1
120
120
  type: :development
121
121
  prerelease: false
122
122
  version_requirements: !ruby/object:Gem::Requirement
123
123
  requirements:
124
124
  - - '='
125
125
  - !ruby/object:Gem::Version
126
- version: 0.0.7
126
+ version: 0.0.8.1
127
127
  - !ruby/object:Gem::Dependency
128
128
  name: decidim-proposals
129
129
  requirement: !ruby/object:Gem::Requirement
130
130
  requirements:
131
131
  - - '='
132
132
  - !ruby/object:Gem::Version
133
- version: 0.0.7
133
+ version: 0.0.8.1
134
134
  type: :development
135
135
  prerelease: false
136
136
  version_requirements: !ruby/object:Gem::Requirement
137
137
  requirements:
138
138
  - - '='
139
139
  - !ruby/object:Gem::Version
140
- version: 0.0.7
140
+ version: 0.0.8.1
141
141
  - !ruby/object:Gem::Dependency
142
142
  name: decidim-admin
143
143
  requirement: !ruby/object:Gem::Requirement
144
144
  requirements:
145
145
  - - '='
146
146
  - !ruby/object:Gem::Version
147
- version: 0.0.7
147
+ version: 0.0.8.1
148
148
  type: :development
149
149
  prerelease: false
150
150
  version_requirements: !ruby/object:Gem::Requirement
151
151
  requirements:
152
152
  - - '='
153
153
  - !ruby/object:Gem::Version
154
- version: 0.0.7
154
+ version: 0.0.8.1
155
155
  - !ruby/object:Gem::Dependency
156
156
  name: decidim-results
157
157
  requirement: !ruby/object:Gem::Requirement
158
158
  requirements:
159
159
  - - '='
160
160
  - !ruby/object:Gem::Version
161
- version: 0.0.7
161
+ version: 0.0.8.1
162
162
  type: :development
163
163
  prerelease: false
164
164
  version_requirements: !ruby/object:Gem::Requirement
165
165
  requirements:
166
166
  - - '='
167
167
  - !ruby/object:Gem::Version
168
- version: 0.0.7
168
+ version: 0.0.8.1
169
169
  description: ''
170
170
  email:
171
171
  - josepjaume@gmail.com
@@ -186,6 +186,7 @@ files:
186
186
  - app/controllers/decidim/meetings/admin/meeting_closes_controller.rb
187
187
  - app/controllers/decidim/meetings/admin/meetings_controller.rb
188
188
  - app/controllers/decidim/meetings/application_controller.rb
189
+ - app/controllers/decidim/meetings/meeting_widgets_controller.rb
189
190
  - app/controllers/decidim/meetings/meetings_controller.rb
190
191
  - app/forms/decidim/meetings/admin/close_meeting_form.rb
191
192
  - app/forms/decidim/meetings/admin/meeting_form.rb
@@ -201,6 +202,7 @@ files:
201
202
  - app/views/decidim/meetings/admin/meetings/edit.html.erb
202
203
  - app/views/decidim/meetings/admin/meetings/index.html.erb
203
204
  - app/views/decidim/meetings/admin/meetings/new.html.erb
205
+ - app/views/decidim/meetings/meeting_widgets/show.html.erb
204
206
  - app/views/decidim/meetings/meetings/_datetime.html.erb
205
207
  - app/views/decidim/meetings/meetings/_filters.html.erb
206
208
  - app/views/decidim/meetings/meetings/_filters_small_view.html.erb
@@ -216,11 +218,14 @@ files:
216
218
  - config/locales/es.yml
217
219
  - config/locales/eu.yml
218
220
  - config/locales/fi.yml
221
+ - config/locales/fr.yml
222
+ - config/locales/nl.yml
219
223
  - db/migrate/20161130121354_create_meetings.rb
220
224
  - db/migrate/20170110142105_close_a_meeting.rb
221
225
  - db/migrate/20170123151650_add_latitude_and_longitude_to_meetings.rb
222
226
  - db/migrate/20170129153716_remove_short_description_from_meetings.rb
223
227
  - db/migrate/20170215132546_add_reference_to_meetings.rb
228
+ - db/migrate/20170410074252_remove_not_null_reference_meetings.rb
224
229
  - lib/decidim/meetings.rb
225
230
  - lib/decidim/meetings/admin.rb
226
231
  - lib/decidim/meetings/admin_engine.rb
@@ -229,7 +234,7 @@ files:
229
234
  - lib/decidim/meetings/seeds/Exampledocument.pdf
230
235
  - lib/decidim/meetings/seeds/city.jpeg
231
236
  - lib/decidim/meetings/test/factories.rb
232
- homepage: https://github.com/AjuntamentdeBarcelona/decidim
237
+ homepage: https://github.com/decidim/decidim
233
238
  licenses:
234
239
  - AGPLv3
235
240
  metadata: {}