1.1 --- a/app/main/admin/policy_show.lua	Sun Sep 23 16:31:32 2012 +0200
     1.2 +++ b/app/main/admin/policy_show.lua	Sun Sep 23 16:36:44 2012 +0200
     1.3 @@ -49,7 +49,7 @@
     1.4  
     1.5      ui.field.boolean{ label = _"No reverse beat path", name = "no_reverse_beat_path" }
     1.6      ui.field.boolean{ label = _"No multistage majority", name = "no_multistage_majority" }
     1.7 -    ui.field.boolean{ label = _"Polling", name = "polling" }
     1.8 +    ui.field.boolean{ label = _"Polling mode", name = "polling" }
     1.9  
    1.10  
    1.11      ui.field.boolean{ label = _"Active?", name = "active" }

     2.1 --- a/app/main/initiative/_details.lua	Sun Sep 23 16:31:32 2012 +0200
     2.2 +++ b/app/main/initiative/_details.lua	Sun Sep 23 16:36:44 2012 +0200
     2.3 @@ -5,6 +5,22 @@
     2.4    record = initiative,
     2.5    readonly = true,
     2.6    content = function()
     2.7 +    ui.field.text{
     2.8 +      label = _"Created at",
     2.9 +      value = tostring(initiative.created)
    2.10 +    }
    2.11 +    if initiative.revoked then
    2.12 +      ui.field.text{
    2.13 +         label = _"Revoked at",
    2.14 +         value = format.timestamp(initiative.revoked)
    2.15 +       }
    2.16 +    end
    2.17 +    if initiative.admitted ~= nil then
    2.18 +      ui.field.boolean{ label = _"Admitted", name = "admitted" }
    2.19 +    end
    2.20 +    if initiative.issue.fully_frozen and initiative.polling then
    2.21 +      ui.field.text{ label = _"Admitted", value = "Implicitly admitted" }
    2.22 +    end
    2.23      if initiative.issue.closed then
    2.24        ui.field.boolean{ label = _"Direct majority", value = initiative.direct_majority }
    2.25        ui.field.boolean{ label = _"Indirect majority", value = initiative.indirect_majority }
    2.26 @@ -25,19 +41,6 @@
    2.27        }
    2.28        ui.field.boolean{ label = _"Eligible as winner", value = initiative.eligible }
    2.29      end
    2.30 -    ui.field.text{
    2.31 -      label = _"Created at",
    2.32 -      value = tostring(initiative.created)
    2.33 -    }
    2.34 -    if initiative.revoked then
    2.35 -      ui.field.text{
    2.36 -         label = _"Revoked at",
    2.37 -         value = format.timestamp(initiative.revoked)
    2.38 -       }
    2.39 -    end
    2.40 -    if initiative.admitted ~= nil then
    2.41 -      ui.field.boolean{ label = _"Admitted", name = "admitted" }
    2.42 -    end
    2.43    end
    2.44  }
    2.45  

     3.1 --- a/app/main/initiative/_show.lua	Sun Sep 23 16:31:32 2012 +0200
     3.2 +++ b/app/main/initiative/_show.lua	Sun Sep 23 16:36:44 2012 +0200
     3.3 @@ -437,7 +437,7 @@
     3.4              :left_join("initiative", nil, "initiative.id = vote.initiative_id")
     3.5              :left_join("issue", nil, "issue.id = initiative.issue_id")
     3.6        
     3.7 -      ui.anchor{ name = "voter", attr = { class = "heading" }, content = _"Member voter" }
     3.8 +      ui.anchor{ name = "voter", attr = { class = "heading" }, content = _"Voters" }
     3.9        
    3.10        execute.view{
    3.11          module = "member",

     4.1 --- a/app/main/initiative/new.lua	Sun Sep 23 16:31:32 2012 +0200
     4.2 +++ b/app/main/initiative/new.lua	Sun Sep 23 16:36:44 2012 +0200
     4.3 @@ -78,7 +78,7 @@
     4.4          if available_timings then
     4.5            ui.field.select{
     4.6              label = _"Free timing",
     4.7 -            name = _"free_timing",
     4.8 +            name = "free_timing",
     4.9              foreign_records = available_timings,
    4.10              foreign_id = "id",
    4.11              foreign_name = "name",
    4.12 @@ -132,7 +132,7 @@
    4.13      end
    4.14      
    4.15      if issue and issue.policy.polling and app.session.member:has_polling_right_for_unit_id(area.unit_id) then
    4.16 -      ui.field.boolean{ name = "polling", label = _"Poll", value = polling }
    4.17 +      ui.field.boolean{ name = "polling", label = _"No admission needed", value = polling }
    4.18      end
    4.19      
    4.20      if preview then
    4.21 @@ -236,4 +236,4 @@
    4.22      ui.submit{ name = "preview", text = _"Preview" }
    4.23      ui.submit{ text = _"Save" }
    4.24    end
    4.25 -}
    4.26 \ No newline at end of file
    4.27 +}

     5.1 --- a/app/main/issue/_details.lua	Sun Sep 23 16:31:32 2012 +0200
     5.2 +++ b/app/main/issue/_details.lua	Sun Sep 23 16:36:44 2012 +0200
     5.3 @@ -9,7 +9,7 @@
     5.4      ui.field.text{       label = _"Population",            name = "population" }
     5.5      ui.field.timestamp{  label = _"Created at",            name = "created" }
     5.6      if policy.polling then
     5.7 -      ui.field.text{       label = _"Admission time",        value = _"Automatically admitted (poll mode)" }
     5.8 +      ui.field.text{       label = _"Admission time",        value = _"Implicitly admitted" }
     5.9      else
    5.10        ui.field.text{       label = _"Admission time",        value = issue.admission_time }
    5.11        ui.field.text{