liquid_feedback_frontend
diff app/main/policy/_list.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 | 8288027edb54 |
| children |
line diff
1.1 --- a/app/main/policy/_list.lua Thu Jun 23 03:30:57 2016 +0200 1.2 +++ b/app/main/policy/_list.lua Sun Jul 15 14:07:29 2018 +0200 1.3 @@ -20,11 +20,12 @@ 1.4 1.5 ui.heading { level = 3, content = policy.name } 1.6 1.7 - ui.tag{ 1.8 - content = policy.description 1.9 - } 1.10 - 1.11 - slot.put ( "<br />" ) 1.12 + if policy.description and #(policy.description) > 0 then 1.13 + ui.tag{ 1.14 + content = policy.description 1.15 + } 1.16 + slot.put ( "<br />" ) 1.17 + end 1.18 1.19 ui.link { 1.20 attr = { 1.21 @@ -55,8 +56,8 @@ 1.22 if policy.polling then 1.23 ui.field.text{ label = _"New" .. ":", value = _"without" } 1.24 else 1.25 - ui.field.text{ label = _"New" .. ":", value = "≤ min " .. format.interval_text(policy.max_admission_time) } 1.26 - ui.field.text{ label = _"New" .. ":", value = "≤ max " .. format.interval_text(policy.max_admission_time) } 1.27 + ui.field.text{ label = _"New" .. ":", value = "≥ " .. format.interval_text(policy.min_admission_time) } 1.28 + ui.field.text{ label = _"New" .. ":", value = "≤ " .. format.interval_text(policy.max_admission_time) } 1.29 end 1.30 ui.field.text{ label = _"Discussion" .. ":", value = format.interval_text(policy.discussion_time) or _"variable" } 1.31 ui.field.text{ label = _"Frozen" .. ":", value = format.interval_text(policy.verification_time) or _"variable" } 1.32 @@ -69,7 +70,7 @@ 1.33 else 1.34 ui.field.text{ 1.35 label = _"Issue quorum" .. ":", 1.36 - value = "≥ " .. tostring(policy.issue_quorum_num) .. "/" .. tostring(policy.issue_quorum_den) 1.37 + value = "≥ " .. tostring(policy.issue_quorum) 1.38 } 1.39 end 1.40 ui.field.text{ 1.41 @@ -88,4 +89,4 @@ 1.42 } 1.43 end 1.44 } 1.45 -end 1.46 \ No newline at end of file 1.47 +end