github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-04 08:44:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: poll design on mobile

Browse Source
This commit is contained in:
Régis Hanol
2015-05-07 19:49:06 +02:00
parent c1bb7bc7cc
commit 875a013ec7
6 changed files with 65 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
plugins/poll/assets/javascripts/discourse/templates/poll.hbs
View File

@ -1,4 +1,19 @@
<div>
<div class="poll-container">
{{#if showingResults}}
{{#if isNumber}}
{{poll-results-number poll=poll}}
{{else}}
{{poll-results-standard poll=poll}}
{{/if}}
{{else}}
<ul>
{{#each option in poll.options}}
{{poll-option option=option color=poll.color background=poll.background toggle="toggleOption"}}
{{/each}}
</ul>
{{/if}}
</div>
<div class="poll-info">
<p>
<span class="info-number">{{poll.voters}}</span>
@ -15,21 +30,6 @@
{{/if}}
{{/if}}
</div>
<div class="poll-container">
{{#if showingResults}}
{{#if isNumber}}
{{poll-results-number poll=poll}}
{{else}}
{{poll-results-standard poll=poll}}
{{/if}}
{{else}}
<ul>
{{#each option in poll.options}}
{{poll-option option=option color=poll.color background=poll.background toggle="toggleOption"}}
{{/each}}
</ul>
{{/if}}
</div>
</div>
<div class="poll-buttons">

10
plugins/poll/assets/javascripts/poll_dialect.js
View File

@ -107,7 +107,11 @@
var result = ["div", attributes],
poll = ["div"];
// 1 - POLL INFO
// 1 - POLL CONTAINER
var container = ["div", { "class": "poll-container" }].concat(contents);
poll.push(container);
// 2 - POLL INFO
var info = ["div", { "class": "poll-info" }];
// # of voters
@ -148,10 +152,6 @@
poll.push(info);
// 2 - POLL CONTAINER
var container = ["div", { "class": "poll-container" }].concat(contents);
poll.push(container);
// 3 - BUTTONS
var buttons = ["div", { "class": "poll-buttons" }];