1.1 --- a/app/main/initiative/add_initiator.lua	Thu Jul 10 01:02:43 2014 +0200
     1.2 +++ b/app/main/initiative/add_initiator.lua	Thu Jul 10 01:19:48 2014 +0200
     1.3 @@ -1,26 +1,55 @@
     1.4  local initiative = Initiative:by_id(param.get("initiative_id"))
     1.5  
     1.6 -slot.put_into("title", _"Invite an initiator to initiative")
     1.7 +local member = app.session.member
     1.8 +if member then
     1.9 +  initiative:load_everything_for_member_id(member.id)
    1.10 +  initiative.issue:load_everything_for_member_id(member.id)
    1.11 +end
    1.12 +
    1.13 +
    1.14 +local records = {
    1.15 +  {
    1.16 +    id = "-1",
    1.17 +    name = _"Choose member"
    1.18 +  }
    1.19 +}
    1.20 +local contact_members = app.session.member:get_reference_selector("saved_members"):add_order_by("name"):exec()
    1.21 +for i, record in ipairs(contact_members) do
    1.22 +  records[#records+1] = record
    1.23 +end
    1.24  
    1.25 -slot.select("actions", function()
    1.26 -  ui.link{
    1.27 -    content = function()
    1.28 -        ui.image{ static = "icons/16/cancel.png" }
    1.29 -        slot.put(_"Cancel")
    1.30 -    end,
    1.31 -    module = "initiative",
    1.32 -    view = "show",
    1.33 -    id = initiative.id,
    1.34 -    params = {
    1.35 -      tab = "initiators"
    1.36 -    }
    1.37 +execute.view {
    1.38 +  module = "issue", view = "_head", params = {
    1.39 +    issue = initiative.issue,
    1.40 +    member = app.session.member
    1.41    }
    1.42 -end)
    1.43 +}
    1.44 +
    1.45 +execute.view{ module = "issue", view = "_sidebar_state", params = {
    1.46 +  initiative = initiative
    1.47 +} }
    1.48  
    1.49 -util.help("initiative.add_initiator", _"Invite an initiator to initiative")
    1.50 +execute.view { 
    1.51 +  module = "issue", view = "_sidebar_issue", 
    1.52 +  params = {
    1.53 +    issue = initiative.issue,
    1.54 +    highlight_initiative_id = initiative.id
    1.55 +  }
    1.56 +}
    1.57 +
    1.58 +execute.view {
    1.59 +  module = "issue", view = "_sidebar_whatcanido",
    1.60 +  params = { initiative = initiative }
    1.61 +}
    1.62 +
    1.63 +execute.view { 
    1.64 +  module = "issue", view = "_sidebar_members", params = {
    1.65 +    issue = initiative.issue, initiative = initiative
    1.66 +  }
    1.67 +}
    1.68  
    1.69  ui.form{
    1.70 -  attr = { class = "vertical" },
    1.71 +  attr = { class = "wide section" },
    1.72    module = "initiative",
    1.73    action = "add_initiator",
    1.74    params = {
    1.75 @@ -38,23 +67,50 @@
    1.76      }
    1.77    },
    1.78    content = function()
    1.79 -    local records = {
    1.80 -      {
    1.81 -        id = "-1",
    1.82 -        name = _"Choose member"
    1.83 +
    1.84 +    ui.sectionHead( function()
    1.85 +      ui.link{
    1.86 +        module = "initiative", view = "show", id = initiative.id,
    1.87 +        content = function ()
    1.88 +          ui.heading { 
    1.89 +            level = 1,
    1.90 +            content = initiative.display_name
    1.91 +          }
    1.92 +        end
    1.93 +      }
    1.94 +      ui.heading { level = 2, content = _"Invite an initiator to initiative" }
    1.95 +    end )
    1.96 +
    1.97 +    ui.sectionRow( function()
    1.98 +      ui.heading { level = 2, content = _"Choose a member to invite" }
    1.99 +      ui.field.select{
   1.100 +        name = "member_id",
   1.101 +        foreign_records = records,
   1.102 +        foreign_id = "id",
   1.103 +        foreign_name = "name"
   1.104        }
   1.105 -    }
   1.106 -    local contact_members = app.session.member:get_reference_selector("saved_members"):add_order_by("name"):exec()
   1.107 -    for i, record in ipairs(contact_members) do
   1.108 -      records[#records+1] = record
   1.109 -    end
   1.110 -    ui.field.select{
   1.111 -      label = _"Member",
   1.112 -      name = "member_id",
   1.113 -      foreign_records = records,
   1.114 -      foreign_id = "id",
   1.115 -      foreign_name = "name"
   1.116 -    }
   1.117 -    ui.submit{ text = _"Save" }
   1.118 +      ui.container{ content = _"You can choose only members which you have been saved as contact before." }
   1.119 +      slot.put("<br />")
   1.120 +      ui.tag{
   1.121 +        tag = "input",
   1.122 +        attr = {
   1.123 +          type = "submit",
   1.124 +          class = "btn btn-default",
   1.125 +          value = _"Invite member"
   1.126 +        },
   1.127 +        content = ""
   1.128 +      }
   1.129 +      slot.put("<br />")
   1.130 +      slot.put("<br />")
   1.131 +      ui.link{
   1.132 +        content = _"Cancel",
   1.133 +        module = "initiative",
   1.134 +        view = "show",
   1.135 +        id = initiative.id,
   1.136 +        params = {
   1.137 +          tab = "initiators"
   1.138 +        }
   1.139 +      }
   1.140 +    end )
   1.141    end
   1.142  }
   1.143 \ No newline at end of file