Commit Graph

985 Commits

Author SHA1 Message Date
decabeza
de27530621 improves polls gallery partial 2017-10-05 11:46:21 +02:00
decabeza
2e8922459d adds line break on css 2017-10-05 11:08:12 +02:00
BertoCQ
9ab22870cc Merge pull request #1971 from consul/polls-show
Polls show
2017-10-04 14:20:50 +02:00
BertoCQ
05df996078 Merge pull request #1970 from consul/minor-fixes
Minor fixes
2017-10-04 12:55:08 +02:00
decabeza
a318b82159 fixes lint warnings 2017-10-04 11:47:31 +02:00
decabeza
e4205dc22a includes poll image on polls index 2017-10-04 11:40:20 +02:00
decabeza
c9e8152ead includes lorem content and images to answers 2017-10-04 10:12:54 +02:00
decabeza
cfbc5db9af adds zoom icons and texts 2017-10-04 10:12:54 +02:00
decabeza
639f24e316 adds foundation orbit components and customise them 2017-10-04 10:12:54 +02:00
decabeza
87676f5296 include lorem ipsum content on polls show 2017-10-04 10:12:54 +02:00
decabeza
1b3cdc181d improves polls show layout 2017-10-04 10:12:54 +02:00
decabeza
c32a70d2a9 improves css for items on list with images 2017-10-03 13:57:01 +02:00
decabeza
d39c2c6e9e cleans css format 2017-10-03 13:55:59 +02:00
decabeza
894bda92ba moves custom setting to consul settings css 2017-10-03 13:53:57 +02:00
BertoCQ
3835821871 Merge branch 'master' into iagirre-admin-polls-section 2017-10-02 22:25:09 +02:00
BertoCQ
356eb4ca8a Merge pull request #1959 from consul/polls-index
Polls index view
2017-10-02 21:42:59 +02:00
BertoCQ
1b4f6d5cae Merge pull request #1938 from consul/imageable-polish
Imageable polish
2017-10-02 21:42:15 +02:00
iagirre
166caa3b4c Deleted code in views and concerns that lets polls have more images and documentes attached, like it was at first.
Added missing text for english and new texts in english and spanish.

 Cambios para hacer commit:
	modificado:    app/assets/stylesheets/participation.scss
	modificado:    app/models/concerns/imageable.rb
	modificado:    app/models/poll.rb
	modificado:    app/views/admin/poll/polls/_form.html.erb
	modificado:    app/views/images/_admin_image.html.erb
	modificado:    config/locales/en/images.yml
	modificado:    config/locales/es/admin.yml
	modificado:    config/locales/es/images.yml
	modificado:    spec/features/admin/poll/polls_spec.rb
2017-10-02 12:59:26 +02:00
decabeza
f497227e3f improves layout for polls index view 2017-10-02 12:24:31 +02:00
Raimond Garcia
f68d86a2e5 Merge pull request #1824 from rockandror/user-recomendations
User recomendations
2017-09-29 19:02:03 +02:00
iagirre
c67620fdef Table for links added (links to add images/documents).
Custom partial for admins upload image created, so that it can be reused in upload images and documents.
2017-09-29 14:51:49 +02:00
decabeza
f44f3f5bc1 fixes css to shows error messages correctly 2017-09-28 17:52:28 +02:00
Alessandro Cuoghi
20fd176b6a Change again margin-top to button.hollow 2017-09-28 17:13:45 +02:00
Alessandro Cuoghi
4eee5f6eba Fixed orbit-bullets. Decreased margin-top to button.hollow.expanded. 2017-09-28 17:03:50 +02:00
decabeza
876a2b530b fixes lint warnings 2017-09-28 16:03:08 +02:00
decabeza
8aaa0cb718 adds data equalizer to fix height on items with images 2017-09-28 15:20:00 +02:00
Senén Rodero Rodríguez
92c774cdeb Merge with master 2017-09-28 13:36:20 +02:00
BertoCQ
121109f967 Merge branch 'master' into feature/1924#poll_shifts_creation 2017-09-28 13:03:34 +02:00
Raimond Garcia
e590e31053 Merge pull request #1864 from rockandror/maps-frontend
Maps frontend
2017-09-28 12:53:17 +02:00
María Checa
08cdf93ecc Switch date selects for shift tasks 2017-09-28 10:40:48 +02:00
decabeza
fff643db8c improves delete image button on proposal show 2017-09-28 09:16:08 +02:00
decabeza
33d9d2d005 adds new icon image 2017-09-28 09:15:46 +02:00
decabeza
407c0fc702 fixes styles for filters, orders and subnavs on admin 2017-09-27 17:57:54 +02:00
taitus
51c53b6f31 Add missing specs from Maps on New, Edit and Show. 2017-09-27 14:50:54 +02:00
Senén Rodero Rodríguez
05350b0f40 Fix scss lint warnings 2017-09-27 14:50:03 +02:00
Senén Rodero Rodríguez
5a09b79da4 Move map tiles provider server and map tiles attribution to secrets. 2017-09-27 14:50:03 +02:00
Senén Rodero Rodríguez
011ef41ae1 Add map location missing specs 2017-09-27 14:50:03 +02:00
Senén Rodero Rodríguez
3b04f881e7 Fix map marker positioning. 2017-09-27 14:48:12 +02:00
Senén Rodero Rodríguez
130e4533ac Allow to render map without marker on new forms. 2017-09-27 14:48:12 +02:00
Senén Rodero Rodríguez
dd7afd3593 Add methods to map locations helper. 2017-09-27 14:48:12 +02:00
Senén Rodero Rodríguez
874a951dd2 Add map locations helper. Allow to configure map marker edition on map instantiation at views. 2017-09-27 14:48:12 +02:00
Senén Rodero Rodríguez
5956207a00 Add map locations. Each map location can belongs to proposal or budget investment. 2017-09-27 14:48:12 +02:00
Senén Rodero Rodríguez
6c1d1c2cde Add map settings to backend. Install leaflet assets to render maps. 2017-09-27 14:46:02 +02:00
Senén Rodero Rodríguez
6c1d828a62 Remove unneded code 2017-09-27 11:38:38 +02:00
Senén Rodero Rodríguez
eef8ad1b73 Remove images single uploads 2017-09-27 10:41:48 +02:00
Senén Rodero Rodríguez
5deb07328b Remove obsolete code 2017-09-26 13:57:14 +02:00
Senén Rodero Rodríguez
2854c0b683 Some fixes and refactor 2017-09-26 13:57:14 +02:00
Senén Rodero Rodríguez
0a86727c6a Move method 'recover_image_from_cache' from imageable controllers to image. 2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
ce29185b76 Fix documentable on admin poll questions. Adapt nested documentable shared specs to admin fetaure specs and include at admin poll questions specs. 2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
d98d1312ca Add _destroy parameter to nested image 2017-09-26 13:57:13 +02:00