1.1 --- a/app/main/interest/_show_box.lua	Tue Apr 17 00:07:04 2012 +0200
     1.2 +++ b/app/main/interest/_show_box.lua	Fri May 18 19:07:07 2012 +0200
     1.3 @@ -5,46 +5,31 @@
     1.4  local interest = Interest:by_pk(issue.id, app.session.member.id)
     1.5  local membership = Membership:by_pk(issue.area_id, app.session.member_id)
     1.6  
     1.7 -slot.select("interest", function()
     1.8 -  if interest then
     1.9 +if interest then
    1.10  
    1.11 -  ui.container{
    1.12 -    content = function()
    1.13 -        ui.container{
    1.14 -          attr = { 
    1.15 -            class = "head head_active",
    1.16 -          },
    1.17 -          content = function()
    1.18 -            ui.image{
    1.19 -              static = "icons/16/eye.png"
    1.20 -            }
    1.21 -            slot.put(_"Your are interested")
    1.22 -
    1.23 -          end
    1.24 -        }
    1.25 +  ui.tag{ content = _"Your are interested" }
    1.26 +  slot.put(" ")
    1.27  
    1.28 -        if issue.state ~= "finished" and issue.state ~= "cancelled" and issue.state ~= "voting" then
    1.29 -          ui.link{
    1.30 -            image   = { static = "icons/16/cross.png" },
    1.31 -            text    = _"Withdraw interest",
    1.32 -            module  = "interest",
    1.33 -            action  = "update",
    1.34 -            params  = { issue_id = issue.id, delete = true },
    1.35 -            routing = { default = { mode = "redirect", module = initiative and "initiative" or "issue", view = "show", id = initiative and initiative.id or issue.id } }
    1.36 -          }
    1.37 -        end
    1.38 -      end
    1.39 +  if issue.state ~= "finished" and issue.state ~= "cancelled" and issue.state ~= "voting" then
    1.40 +    slot.put("(")
    1.41 +    ui.link{
    1.42 +      text    = _"Withdraw",
    1.43 +      module  = "interest",
    1.44 +      action  = "update",
    1.45 +      params  = { issue_id = issue.id, delete = true },
    1.46 +      routing = { default = { mode = "redirect", module = initiative and "initiative" or "issue", view = "show", id = initiative and initiative.id or issue.id } }
    1.47      }
    1.48 -  elseif app.session.member:has_voting_right_for_unit_id(issue.area.unit_id) then
    1.49 -    if not issue.closed and not issue.fully_frozen then
    1.50 -      ui.link{
    1.51 -        image   = { static = "icons/16/user_add.png" },
    1.52 -        text    = _"Add my interest",
    1.53 -        module  = "interest",
    1.54 -        action  = "update",
    1.55 -        params  = { issue_id = issue.id },
    1.56 -        routing = { default = { mode = "redirect", module = initiative and "initiative" or "issue", view = "show", id = initiative and initiative.id or issue.id } }
    1.57 -      }
    1.58 -    end
    1.59 +    slot.put(") ")
    1.60    end
    1.61 -end)
    1.62 +elseif app.session.member:has_voting_right_for_unit_id(issue.area.unit_id) then
    1.63 +  if not issue.closed and not issue.fully_frozen then
    1.64 +    ui.link{
    1.65 +      text    = _"Add my interest",
    1.66 +      module  = "interest",
    1.67 +      action  = "update",
    1.68 +      params  = { issue_id = issue.id },
    1.69 +      routing = { default = { mode = "redirect", module = initiative and "initiative" or "issue", view = "show", id = initiative and initiative.id or issue.id } }
    1.70 +    }
    1.71 +    slot.put(" ")
    1.72 +  end
    1.73 +end