1.1 --- a/app/main/lf2/_sidebar_drafts.lua	Thu Mar 03 23:47:35 2011 +0100
     1.2 +++ b/app/main/lf2/_sidebar_drafts.lua	Sat Mar 05 15:34:17 2011 +0100
     1.3 @@ -5,53 +5,52 @@
     1.4    :add_order_by("id DESC")
     1.5    :exec()
     1.6  
     1.7 +ui.form{
     1.8 +  method = "get",
     1.9 +  module = "draft",
    1.10 +  view = "diff",
    1.11 +  content = function()
    1.12 +    ui.box{ class = "drafts", content = function()
    1.13 +      if drafts then
    1.14  
    1.15 -ui.box{ class = "drafts", content = function()
    1.16 -  if drafts then
    1.17 -    ui.form{
    1.18 -      method = "get",
    1.19 -      module = "draft",
    1.20 -      view = "diff",
    1.21 -      content = function()
    1.22          ui.box_row{ class = "head", content = function() ui.box_col{ class = "head", content = _"Draft revisions" } end }
    1.23 -        ui.box_row{ class = "", content = function()
    1.24 -          ui.box_col{ class = "scrolled", content = function()
    1.25  
    1.26 -            for i, draft in ipairs(drafts) do
    1.27 -              local class = "draft"
    1.28 -              if i == 1 then class = class .. " first" end
    1.29 -              ui.box_row{ class = class, content = function()
    1.30 -                ui.box_col{ class = "left", content = function()
    1.31 -                  ui.link{
    1.32 -                    attr = { class = "created" },
    1.33 -                    text = format.timestamp(draft.created),
    1.34 -                    module = "draft",
    1.35 -                    view = "show",
    1.36 -                    id = draft.id
    1.37 -                  }
    1.38 -                  slot.put("<br />")
    1.39 +        ui.box_row{ content = function() ui.box_col{ class = "scrolled", content = function()
    1.40 +          for i, draft in ipairs(drafts) do
    1.41 +            local class = "draft"
    1.42 +            if i == 1 then class = class .. " first" end
    1.43 +            ui.box_row{ class = class, content = function()
    1.44 +              ui.box_col{ class = "left", content = function()
    1.45 +                ui.link{
    1.46 +                  attr = { class = "created" },
    1.47 +                  text = format.timestamp(draft.created),
    1.48 +                  module = "draft",
    1.49 +                  view = "show",
    1.50 +                  id = draft.id
    1.51 +                }
    1.52 +                ui.container{ attr = { class = "authors" }, content = function()
    1.53                    ui.tag{ content = _"by" }
    1.54                    slot.put(" ")
    1.55                    ui.link{
    1.56 -                    attr = { class = "author_name" },
    1.57                      module = "lf2", view = "issue", id = initiative.issue_id,
    1.58                      params = { member_id = author_id },
    1.59                      text = draft.author.name
    1.60                    }
    1.61 -                end } 
    1.62 -                ui.box_col{ class = "right", content = function()
    1.63 -                  slot.put('<input type="radio" name="old_draft_id" value="' .. tostring(draft.id) .. '">')
    1.64 -                  slot.put('<input type="radio" name="new_draft_id" value="' .. tostring(draft.id) .. '">')
    1.65                  end }
    1.66 +              end } 
    1.67 +              ui.box_col{ class = "right", content = function()
    1.68 +                slot.put('<input type="radio" name="old_draft_id" value="' .. tostring(draft.id) .. '">')
    1.69 +                slot.put('<input type="radio" name="new_draft_id" value="' .. tostring(draft.id) .. '">')
    1.70                end }
    1.71 -            end
    1.72 -          end } end }
    1.73 +            end }
    1.74 +          end
    1.75 +        end } end }
    1.76  
    1.77 -          ui.box_row{ content = function() ui.box_col{ class = "right", content = function()
    1.78 +        ui.box_row{ class = "last", content = function() ui.box_col{ class = "right", content = function()
    1.79            ui.submit{ text = _"Compare selected" }
    1.80          end } end }
    1.81 +
    1.82        end
    1.83 -    }
    1.84 -  else
    1.85 +    end }
    1.86    end
    1.87 -end }
    1.88 +}