1.1 --- a/app/main/lf2/_sidebar_issue.lua	Sat Mar 05 15:34:17 2011 +0100
     1.2 +++ b/app/main/lf2/_sidebar_issue.lua	Mon Mar 07 12:15:22 2011 +0100
     1.3 @@ -23,36 +23,40 @@
     1.4  
     1.5  ui.box{ class = "issue", content = function()
     1.6  
     1.7 -  ui.box_row{ class = "unit_name head2", content = function() ui.box_col{ content = function()
     1.8 +  ui.box_row{ class = "unit_name head2x", content = function() ui.box_col{ content = function()
     1.9      ui.link{ 
    1.10        module = "lf2", view = "index", id = 1,
    1.11        content = "DE / Berlin / Friedrichshain-Kreuzberg" 
    1.12      }
    1.13    end } end }
    1.14  
    1.15 -  ui.box_row{ class = "area_name head2", content = function() ui.box_col{ content = function()
    1.16 +  ui.box_row{ class = "area_name head2x", content = function() ui.box_col{ content = function()
    1.17      ui.link{
    1.18        module = "lf2", view = "area", id = issue.area_id,
    1.19        content = issue.area.name
    1.20      }
    1.21    end } end }
    1.22    
    1.23 -  ui.box_row{ class = "issue_id head2", content = function() ui.box_col{ class = "head", content = function()
    1.24 +  ui.box_row{ class = "issue_id subhead", content = function() ui.box_col{ class = "head", content = function()
    1.25      ui.link{
    1.26        module = "lf2", view = "issue", id = issue.id,
    1.27        content = _("Issue ##{id}", { id = issue.id })
    1.28      }
    1.29    end } end }
    1.30  
    1.31 -  ui.box_row{ class = "policy_name head2", content = function() ui.box_col{ content = function()
    1.32 +  ui.box_row{ class = "policy_name", content = function() ui.box_col{ content = function()
    1.33      ui.link{
    1.34        module = "lf2", view = "policy", id = issue.policy_id,
    1.35        content = issue.policy.name
    1.36      }
    1.37    end } end }
    1.38  
    1.39 -  ui.box_row{ class = "time_left head", content = function()
    1.40 -    ui.box_col{ content = issue.closed and _("Closed since #{date}", { date = format.date(issue.closed.date) }) or _("#{time_left} left", { time_left =  issue.state_time_left }) }
    1.41 +  ui.box_row{ class = "time_left", content = function()
    1.42 +    ui.box_col{ class = "left", content = function()
    1.43 +      ui.tag{ content = issue.state_name }
    1.44 +      slot.put(" · ")
    1.45 +      ui.tag{ content = issue.closed and _("since #{date}", { date = format.date(issue.closed.date) }) or _("#{time_left} left", { time_left =  issue.state_time_left }) }
    1.46 +    end }
    1.47    end }
    1.48    
    1.49    ui.box_row{ class = "interest hoverbutton_container", content = function() ui.box_col{ content = function()
    1.50 @@ -181,11 +185,11 @@
    1.51  
    1.52    if #trustees > 1 then
    1.53      ui.box_row{ class = "delegation", content = function() ui.box_col{ content = function()
    1.54 -      execute.view{ module = "lf2", view = "_avatars", params = { members = trustees, arrows = true, size = "small" } }
    1.55 +      execute.view{ module = "lf2", view = "_avatars", params = { members = trustees, arrows = true, size = "small", issue_id = issue.id } }
    1.56      end } end }
    1.57    end
    1.58  
    1.59 -  ui.box_row{ class = "subhead", content = function() ui.box_col{ class = "head", content = _"Initiatives in this issue" } end }
    1.60 +  ui.box_row{ class = "subhead", content = function() ui.box_col{ class = "head", content = _"Initiatives" } end }
    1.61    ui.box_row{ class = "initiatives last", content = function()
    1.62      ui.box_col{ class = "scrolled", content = function()
    1.63        execute.view{ module = "lf2", view = "_issue_initiatives", params = { initiatives = alternative_initiatives, current_initiative_id = initiative_id } }