1.1 --- a/app/main/issue/_sidebar_issue.lua	Thu Jun 23 03:30:57 2016 +0200
     1.2 +++ b/app/main/issue/_sidebar_issue.lua	Sun Jul 15 14:07:29 2018 +0200
     1.3 @@ -1,39 +1,44 @@
     1.4  local issue = param.get("issue", "table")
     1.5 -local hide_initiatives = param.get("hide_initiatives", atom.boolean)
     1.6 -local highlight_initiative_id = param.get ( "highlight_initiative_id", "number" )
     1.7 -
     1.8 -ui.sidebar ( "tab-whatcanido", function ()
     1.9 +local ommit_initiative_id = param.get ( "ommit_initiative_id", "number" )
    1.10  
    1.11 -  ui.sidebarHead( function()
    1.12 -    ui.heading {
    1.13 -      level = 2,
    1.14 -      content = _"Competing initiatives"
    1.15 -    }
    1.16 -  end )
    1.17 -  
    1.18 +--[[
    1.19 +ui.heading {
    1.20 +  level = 2,
    1.21 +  content = _"Competing initiatives"
    1.22 +}
    1.23 +--]]
    1.24 +
    1.25 +if #(issue.initiatives) > (ommit_initiative_id and 1 or 0) then
    1.26    execute.view {
    1.27      module = "initiative", view = "_list",
    1.28      params = {
    1.29        issue = issue,
    1.30        initiatives = issue.initiatives,
    1.31 -      highlight_initiative_id = highlight_initiative_id
    1.32 +      ommit_initiative_id = ommit_initiative_id
    1.33      }
    1.34    }
    1.35 -  if #issue.initiatives == 1 then
    1.36 -    ui.sidebarSection( function ()
    1.37 -    
    1.38 -      if not issue.closed and not (issue.state == "voting") then
    1.39 -        ui.container { content = function()
    1.40 -        ui.tag { content = _"Currently this is the only initiative in this issue, because nobody started a competing initiative (yet)." }
    1.41 -          if app.session.member and app.session.member:has_voting_right_for_unit_id(issue.area.unit_id) then
    1.42 -            slot.put(" ")
    1.43 -            ui.tag { content = _"To create a competing initiative see below." }
    1.44 -          end
    1.45 -        end }
    1.46 -      else
    1.47 -        ui.container { content = _"This is the only initiative in this issue, because nobody started a competing initiative." }
    1.48 -      end
    1.49 -    end )
    1.50 -  end
    1.51 +end
    1.52 +
    1.53 +if #issue.initiatives == 1 then
    1.54 +  ui.container { attr = { class = "mdl-card__content" }, content = function()
    1.55 +    if not issue.closed and not (issue.state == "voting") then
    1.56 +      ui.tag { content = _"Currently this is the only initiative in this issue, because nobody started a competing initiative (yet)." }
    1.57 +    else
    1.58 +      ui.container { content = _"This is the only initiative in this issue, because nobody started a competing initiative." }
    1.59 +    end
    1.60 +  end }
    1.61 +end
    1.62  
    1.63 -end ) -- ui.sidebar
    1.64 +if app.session.member 
    1.65 +    and app.session.member:has_voting_right_for_unit_id(issue.area.unit_id) 
    1.66 +    and not issue.closed and not issue.fully_frozen 
    1.67 +then
    1.68 +  ui.container{ attr = { class = "mdl-card__actions mdl-card--border" }, content = function()
    1.69 +    ui.link {
    1.70 +      attr = { class = "mdl-button mdl-js-button" },
    1.71 +      module = "initiative", view = "new", 
    1.72 +      params = { issue_id = issue.id },
    1.73 +      content = _"start a new competing initiative"
    1.74 +    }
    1.75 +  end }
    1.76 +end