1.1 --- a/app/main/index/index.lua	Mon Jan 04 12:00:00 2010 +0100
     1.2 +++ b/app/main/index/index.lua	Sun Jan 10 12:00:00 2010 +0100
     1.3 @@ -1,12 +1,14 @@
     1.4  slot.select("title", function()
     1.5 -  execute.view{
     1.6 -    module = "member_image",
     1.7 -    view = "_show",
     1.8 -    params = {
     1.9 -      member = app.session.member, 
    1.10 -      image_type = "avatar"
    1.11 +  if app.session.member then
    1.12 +    execute.view{
    1.13 +      module = "member_image",
    1.14 +      view = "_show",
    1.15 +      params = {
    1.16 +        member = app.session.member,
    1.17 +        image_type = "avatar"
    1.18 +      }
    1.19      }
    1.20 -  }
    1.21 +  end
    1.22  end)
    1.23  
    1.24  slot.select("title", function()
    1.25 @@ -43,48 +45,50 @@
    1.26  
    1.27  slot.select("actions", function()
    1.28  
    1.29 -  ui.link{
    1.30 -    content = function()
    1.31 -        ui.image{ static = "icons/16/application_form.png" }
    1.32 -        slot.put(_"Edit my profile")
    1.33 -    end,
    1.34 -    module = "member",
    1.35 -    view = "edit"
    1.36 -  }
    1.37 -
    1.38 -  ui.link{
    1.39 -    content = function()
    1.40 -        ui.image{ static = "icons/16/user_gray.png" }
    1.41 -        slot.put(_"Upload images")
    1.42 -    end,
    1.43 -    module = "member",
    1.44 -    view = "edit_images"
    1.45 -  }
    1.46 -
    1.47 -  execute.view{
    1.48 -    module = "delegation",
    1.49 -    view = "_show_box"
    1.50 -  }
    1.51 -
    1.52 -  ui.link{
    1.53 -    content = function()
    1.54 -        ui.image{ static = "icons/16/wrench.png" }
    1.55 -        slot.put(_"Settings")
    1.56 -    end,
    1.57 -    module = "member",
    1.58 -    view = "settings"
    1.59 -  }
    1.60 -
    1.61 -  if config.download_dir then
    1.62 +  if app.session.member then
    1.63 +    ui.link{
    1.64 +      content = function()
    1.65 +          ui.image{ static = "icons/16/application_form.png" }
    1.66 +          slot.put(_"Edit my profile")
    1.67 +      end,
    1.68 +      module = "member",
    1.69 +      view = "edit"
    1.70 +    }
    1.71 +  
    1.72      ui.link{
    1.73        content = function()
    1.74 -          ui.image{ static = "icons/16/database_save.png" }
    1.75 -          slot.put(_"Download")
    1.76 +          ui.image{ static = "icons/16/user_gray.png" }
    1.77 +          slot.put(_"Upload images")
    1.78        end,
    1.79 -      module = "index",
    1.80 -      view = "download"
    1.81 +      module = "member",
    1.82 +      view = "edit_images"
    1.83 +    }
    1.84 +  
    1.85 +    execute.view{
    1.86 +      module = "delegation",
    1.87 +      view = "_show_box"
    1.88      }
    1.89 -  end 
    1.90 +  
    1.91 +    ui.link{
    1.92 +      content = function()
    1.93 +          ui.image{ static = "icons/16/wrench.png" }
    1.94 +          slot.put(_"Settings")
    1.95 +      end,
    1.96 +      module = "member",
    1.97 +      view = "settings"
    1.98 +    }
    1.99 +  
   1.100 +    if config.download_dir then
   1.101 +      ui.link{
   1.102 +        content = function()
   1.103 +            ui.image{ static = "icons/16/database_save.png" }
   1.104 +            slot.put(_"Download")
   1.105 +        end,
   1.106 +        module = "index",
   1.107 +        view = "download"
   1.108 +      }
   1.109 +    end 
   1.110 +  end
   1.111  end)
   1.112  
   1.113  local lang = locale.get("lang")
   1.114 @@ -106,24 +110,25 @@
   1.115  
   1.116  util.help("index.index", _"Home")
   1.117  
   1.118 -
   1.119 -local selector = Area:new_selector()
   1.120 -  :reset_fields()
   1.121 -  :add_field("area.id", nil, { "grouped" })
   1.122 -  :add_field("area.name", nil, { "grouped" })
   1.123 -  :add_field("membership.member_id NOTNULL", "is_member", { "grouped" })
   1.124 -  :add_field("count(issue.id)", "issues_to_vote_count")
   1.125 -  :add_field("count(interest.member_id)", "interested_issues_to_vote_count")
   1.126 -  :join("issue", nil, "issue.area_id = area.id AND issue.fully_frozen NOTNULL AND issue.closed ISNULL")
   1.127 -  :left_join("direct_voter", nil, { "direct_voter.issue_id = issue.id AND direct_voter.member_id = ?", app.session.member.id })
   1.128 -  :add_where{ "direct_voter.member_id ISNULL" }
   1.129 -  :left_join("interest", nil, { "interest.issue_id = issue.id AND interest.member_id = ?", app.session.member.id })
   1.130 -  :left_join("membership", nil, { "membership.area_id = area.id AND membership.member_id = ? ", app.session.member.id })
   1.131 -
   1.132  local areas = {}
   1.133 -for i, area in ipairs(selector:exec()) do
   1.134 -  if area.is_member or area.interested_issues_to_vote_count > 0 then
   1.135 -    areas[#areas+1] = area
   1.136 +if app.session.member then
   1.137 +  local selector = Area:new_selector()
   1.138 +    :reset_fields()
   1.139 +    :add_field("area.id", nil, { "grouped" })
   1.140 +    :add_field("area.name", nil, { "grouped" })
   1.141 +    :add_field("membership.member_id NOTNULL", "is_member", { "grouped" })
   1.142 +    :add_field("count(issue.id)", "issues_to_vote_count")
   1.143 +    :add_field("count(interest.member_id)", "interested_issues_to_vote_count")
   1.144 +    :join("issue", nil, "issue.area_id = area.id AND issue.fully_frozen NOTNULL AND issue.closed ISNULL")
   1.145 +    :left_join("direct_voter", nil, { "direct_voter.issue_id = issue.id AND direct_voter.member_id = ?", app.session.member.id })
   1.146 +    :add_where{ "direct_voter.member_id ISNULL" }
   1.147 +    :left_join("interest", nil, { "interest.issue_id = issue.id AND interest.member_id = ?", app.session.member.id })
   1.148 +    :left_join("membership", nil, { "membership.area_id = area.id AND membership.member_id = ? ", app.session.member.id })
   1.149 +  
   1.150 +  for i, area in ipairs(selector:exec()) do
   1.151 +    if area.is_member or area.interested_issues_to_vote_count > 0 then
   1.152 +      areas[#areas+1] = area
   1.153 +    end
   1.154    end
   1.155  end
   1.156  
   1.157 @@ -190,9 +195,27 @@
   1.158    }
   1.159  end
   1.160  
   1.161 -execute.view{
   1.162 -  module = "member",
   1.163 -  view = "_show",
   1.164 -  params = { member = app.session.member }
   1.165 -}
   1.166 +local initiatives_selector = Initiative:new_selector()
   1.167 +  :join("initiator", nil, { "initiator.initiative_id = initiative.id AND initiator.member_id = ? AND initiator.accepted ISNULL", app.session.member.id })
   1.168 +
   1.169 +if initiatives_selector:count() > 0 then
   1.170 +  ui.container{
   1.171 +    attr = { style = "font-weight: bold;" },
   1.172 +    content = _"Initiatives that invited you to become initiator:"
   1.173 +  }
   1.174  
   1.175 +  execute.view{
   1.176 +    module = "initiative",
   1.177 +    view = "_list",
   1.178 +    params = { initiatives_selector = initiatives_selector }
   1.179 +  }
   1.180 +end
   1.181 +
   1.182 +
   1.183 +if app.session.member then
   1.184 +  execute.view{
   1.185 +    module = "member",
   1.186 +    view = "_show",
   1.187 +    params = { member = app.session.member }
   1.188 +  }
   1.189 +end