liquid_feedback_frontend
diff app/main/delegation/_info.lua @ 1309:32cc544d5a5b
Cumulative patch for upcoming frontend version 4
| author | bsw/jbe |
|---|---|
| date | Sun Jul 15 14:07:29 2018 +0200 (2018-07-15) |
| parents | 701a5cf6b067 |
| children | 3ab878ba277e |
line diff
1.1 --- a/app/main/delegation/_info.lua Thu Jun 23 03:30:57 2016 +0200 1.2 +++ b/app/main/delegation/_info.lua Sun Jul 15 14:07:29 2018 +0200 1.3 @@ -174,7 +174,7 @@ 1.4 if info.own_participation then 1.5 if issue and issue.fully_frozen then 1.6 ui.link{ 1.7 - attr = { class = "right" }, 1.8 + attr = { class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined" }, 1.9 module = "vote", view = "list", params = { 1.10 issue_id = issue.id 1.11 }, 1.12 @@ -184,8 +184,9 @@ 1.13 } 1.14 else 1.15 if issue then 1.16 - local text = _"you are interested" 1.17 - ui.image { attr = { class = "star", title = text, alt = text }, static = "icons/48/eye.png" } 1.18 + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "star" } 1.19 + slot.put(" ") 1.20 + ui.tag{ content = _"you are interested" } 1.21 if not issue.closed and info.own_participation and info.weight and info.weight > 1 then 1.22 ui.link { 1.23 attr = { class = "right" }, content = "+" .. (info.weight - 1), 1.24 @@ -198,11 +199,7 @@ 1.25 local text = _"you are subscribed" 1.26 ui.image { attr = { class = "icon24 star", title = text, alt = text }, static = "icons/48/star.png" } 1.27 end 1.28 - if not for_title then 1.29 - slot.put("<br />") 1.30 - else 1.31 - slot.put(" ") 1.32 - end 1.33 + slot.put(" ") 1.34 end 1.35 end 1.36 end 1.37 @@ -260,3 +257,15 @@ 1.38 end 1.39 end 1.40 1.41 +if issue and app.session.member and issue.fully_frozen and not issue.closed and not issue.member_info.direct_voted and app.session.member:has_voting_right_for_unit_id(issue.area.unit_id) then 1.42 + ui.link{ 1.43 + attr = { class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined" }, 1.44 + module = "vote", view = "list", params = { 1.45 + issue_id = issue.id 1.46 + }, 1.47 + content = function () 1.48 + ui.tag { content = _"vote now" } 1.49 + end 1.50 + } 1.51 + else 1.52 +end