Commit Graph

164 Commits

Author SHA1 Message Date
decabeza
358449c874 adds missing i18n 2017-10-23 17:26:34 +02:00
decabeza
568303c3ff adds data equalizer for results and stats sidebar 2017-10-23 17:26:17 +02:00
rgarcia
9ce7045717 fixes specs 2017-10-23 15:17:35 +02:00
María Checa
84f67db26d Added restrictions to access Poll results and stats 2017-10-23 14:17:25 +02:00
decabeza
96f588566a changes id name to specs 2017-10-22 01:06:03 +02:00
decabeza
3f2189b124 removes unnecessary blank space 😅 2017-10-21 20:07:13 +02:00
decabeza
5ebd630b27 adds answer most voted text for screen readers 2017-10-20 18:35:03 +02:00
María Checa
e85c98f4b4 Improved results and stats percentages 2017-10-20 17:18:54 +02:00
María Checa
9bbf0b1ef9 Improved most_voted method 2017-10-20 16:48:54 +02:00
decabeza
e13a48b572 adds styles to polls stats 2017-10-19 12:27:22 +02:00
decabeza
a0eb6e56a1 fixes styles for polls tabs, uses underscore for ids 2017-10-19 12:23:57 +02:00
decabeza
78fa77b28d fixes styles for poll subnav 2017-10-19 12:23:14 +02:00
María Checa
70a35fbe58 Poll views improvements
Reorganized poll `#show`,  `#stats` and `#results` views. Gave stats section its own route.
2017-10-18 18:35:53 +02:00
María Checa
35f24b519d Merge branch 'master' into 1786-poll_results 2017-10-18 17:33:16 +02:00
iagirre
81b1fb1a72 Fixed some conflicts automatically merged that didn't realised before they were there 2017-10-18 10:27:41 +02:00
iagirre
f7bb3ec8b7 Merge remote-tracking branch 'consul/master' into iagirre-poll-stats 2017-10-18 09:48:02 +02:00
iagirre
73365ad9d2 Added spects to check de stats model and view 2017-10-18 09:34:17 +02:00
María Checa
bfe0addf3b Added poll results view 2017-10-17 18:29:53 +02:00
iagirre
0f73b787b2 Fixed views and Poll::Stats model to pass the specs 2017-10-17 16:07:44 +02:00
iagirre
6a292daf42 Partial to render the polls stats and model methods to get the information from DB 2017-10-17 15:04:29 +02:00
BertoCQ
db7c80ef13 Merge pull request #2021 from consul/fixed-already-voted-message
Fixed already voted message in poll show
2017-10-17 14:42:46 +02:00
María Checa
58f57bc15b Added poll method voted_in_web? 2017-10-17 13:16:46 +02:00
BertoCQ
a476019c49 Merge pull request #2020 from consul/poll-videos
Poll answer videos
2017-10-16 20:03:34 +02:00
iagirre
78cc09cc5a Controllers and models to see the polls stats. Routes related also added. 2017-10-16 17:25:04 +02:00
iagirre
2c6c320fa1 When answer 2 more info expand is clicked, it expands on top of the first one, not below. Same if the expand is clicked for the first answer 2017-10-13 14:38:30 +02:00
decabeza
3a20a6bc2a adds margin to read more answer description link 2017-10-11 20:16:38 +02:00
Bertocq
34c278db74 Small fixes for Poll Question Answer ordering 2017-10-11 12:05:20 +02:00
rgarcia
23397eecb3 increases consistency by moving comment's view to poll's folder 2017-10-10 12:06:50 +02:00
rgarcia
faa2f31b3a Adds comment's tab 2017-10-10 12:06:41 +02:00
Raimond Garcia
2b588753ee Merge branch 'master' into mlucena-poll-comments 2017-10-09 17:59:12 +02:00
María Checa
3fc3f9e88e Fixed condition 2017-10-09 17:42:13 +02:00
María Checa
f23073bb28 Fixed already voted message in poll show 2017-10-09 13:12:44 +02:00
decabeza
ba9814cd85 shows videos on polls answers 2017-10-09 13:01:39 +02:00
Alberto García
bd62af9eb7 Merge pull request #2014 from consul/poll_ui_fixes
Polls UI fixes
2017-10-07 21:18:48 +02:00
María Checa
316ba37d91 Requested changes 2017-10-07 20:27:44 +02:00
decabeza
63ffb1adca hides zoom icon on mobile version 2017-10-07 19:39:04 +02:00
decabeza
71d785ba78 improves polls index view on mobile version 2017-10-07 19:38:17 +02:00
María Checa
65f5c9efa9 Changed token message background color 2017-10-07 19:21:27 +02:00
María Checa
728edf64a5 Added "participate in other polls" link in poll show 2017-10-07 19:12:58 +02:00
María Checa
ca24be79e3 Moved token message below questions 2017-10-07 19:12:17 +02:00
Raimond Garcia
e9276037f9 Merge pull request #2009 from consul/votable_by_fix
Fixed already-answered logic
2017-10-07 18:21:05 +02:00
Raimond Garcia
689b6ecb9d Merge pull request #2011 from consul/show-poll-answers-after-booth-vote
Show poll answers in poll show view after voting on a booth
2017-10-07 18:20:29 +02:00
María Checa
8b2f6d454c Show poll answers in poll show view after voting on a booth
If the user votes in a booth, it can see the poll and answers but can't see what he/she voted and the answers are inactive (no link, inactive ui style).
2017-10-07 17:33:27 +02:00
decabeza
7cfd47ad87 removes duplicated content on polls show 2017-10-07 17:11:40 +02:00
rgarcia
a08d5bdba9 fixes conflict in merge 2017-10-07 17:00:26 +02:00
María Checa
bdffab7d72 Fixed already-answered logic
Added condition to check if user is unverified to avoid showing the ui element that lets users know they already voted a poll.
2017-10-07 16:56:35 +02:00
Raimond Garcia
2e4ce39722 Merge pull request #1994 from consul/feature/1985#voting_token
Voter Answer unique Token
2017-10-07 16:54:01 +02:00
Raimond Garcia
a585f79351 Merge pull request #2008 from consul/polls-gallery-polish
Polls gallery polish
2017-10-07 15:44:37 +02:00
decabeza
12427e1ce5 adds styles to document link on polls show 2017-10-07 14:46:55 +02:00
Raimond Garcia
88724abb2b Merge pull request #2007 from consul/fix/2000#already_voted_in_booth
Already voted in booth can't vote on website
2017-10-07 14:31:21 +02:00