1.1 --- a/app/main/area/_list.lua	Mon Feb 01 21:02:47 2021 +0100
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,39 +0,0 @@
     1.4 -local areas_selector = param.get("areas_selector", "table")
     1.5 -local hide_membership = param.get("hide_membership", atom.boolean)
     1.6 -local member = param.get("member", "table")
     1.7 -
     1.8 -areas_selector
     1.9 -  :reset_fields()
    1.10 -  :add_field("area.id", nil, { "grouped" })
    1.11 -  :add_field("area.unit_id", nil, { "grouped" })
    1.12 -  :add_field("area.name", nil, { "grouped" })
    1.13 -  :add_field("member_weight", nil, { "grouped" })
    1.14 -  :add_field("direct_member_count", nil, { "grouped" })
    1.15 -  :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.accepted ISNULL AND issue.closed ISNULL)", "issues_new_count")
    1.16 -  :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.accepted NOTNULL AND issue.half_frozen ISNULL AND issue.closed ISNULL)", "issues_discussion_count")
    1.17 -  :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.half_frozen NOTNULL AND issue.fully_frozen ISNULL AND issue.closed ISNULL)", "issues_frozen_count")
    1.18 -  :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen NOTNULL AND issue.closed ISNULL)", "issues_voting_count")
    1.19 -  :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen NOTNULL AND issue.closed NOTNULL)", "issues_finished_count")
    1.20 -  :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen ISNULL AND issue.closed NOTNULL)", "issues_canceled_count")
    1.21 -
    1.22 -if app.session.member_id then
    1.23 -  areas_selector
    1.24 -    :add_field({ "(SELECT COUNT(*) FROM issue LEFT JOIN direct_voter ON direct_voter.issue_id = issue.id AND direct_voter.member_id = ? WHERE issue.area_id = area.id AND issue.fully_frozen NOTNULL AND issue.closed ISNULL AND direct_voter.member_id ISNULL)", app.session.member.id }, "issues_to_vote_count")
    1.25 -    :left_join("membership", "_membership", { "_membership.area_id = area.id AND _membership.member_id = ?", app.session.member.id })
    1.26 -    :add_field("_membership.member_id NOTNULL", "is_member", { "grouped" })
    1.27 -    :left_join("delegation", nil, {
    1.28 -      "delegation.truster_id = ? AND delegation.area_id = area.id AND delegation.scope = 'area'", app.session.member_id
    1.29 -    })
    1.30 -    :left_join("member", nil, "member.id = delegation.trustee_id")
    1.31 -    :add_field("member.id", "trustee_member_id", { "grouped" })
    1.32 -    :add_field("member.name", "trustee_member_name", { "grouped" })
    1.33 -else
    1.34 -  areas_selector:add_field("0", "issues_to_vote_count")
    1.35 -end
    1.36 -
    1.37 -ui.container{ attr = { class = "area_list" }, content = function()
    1.38 -  for i, area in ipairs(areas_selector:exec()) do
    1.39 -    execute.view { module = "area", view = "_list_entry", params = { area = area, member = member } }
    1.40 -  end 
    1.41 -end }
    1.42 -

     2.1 --- a/app/main/delegation/show.lua	Mon Feb 01 21:02:47 2021 +0100
     2.2 +++ b/app/main/delegation/show.lua	Mon Feb 01 21:25:34 2021 +0100
     2.3 @@ -397,9 +397,6 @@
     2.4          end
     2.5  
     2.6          if preview_trustee_id == 0 or not preview_trustee_id == null and delegation and not delegation.trustee_id then
     2.7 -          ui.image{
     2.8 -            static = "icons/16/table_go_crossed.png"
     2.9 -          }
    2.10            if issue_id then
    2.11              slot.put(_"Delegation turned off for issue")
    2.12            elseif area_id then

     3.1 --- a/app/main/index/_member_home.lua	Mon Feb 01 21:02:47 2021 +0100
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,153 +0,0 @@
     3.4 -local member = param.get("member", "table")
     3.5 -local for_member = param.get("for_member", atom.boolean)
     3.6 -local filter_unit = request.get_param_strings()["filter_unit"] or "my_areas"
     3.7 -
     3.8 -if not for_member then
     3.9 -
    3.10 -  ui.container{ attr = { class = "ui_filter" }, content = function()
    3.11 -    ui.container{ attr = { class = "ui_filter_head" }, content = function()
    3.12 -
    3.13 -      ui.link{
    3.14 -        attr = { class = filter_unit == "my_areas" and "ui_tabs_link active" or nil },
    3.15 -        text = _"My areas",
    3.16 -        module = "index", view = "index", params = { filter_unit = "my_areas" }
    3.17 -      }
    3.18 -      
    3.19 -      slot.put(" ")
    3.20 -
    3.21 -      ui.link{
    3.22 -        attr = { class = filter_unit == "my_units" and "ui_tabs_link active" or nil },
    3.23 -        text = _"All areas in my units",
    3.24 -        module = "index", view = "index", params = { filter_unit = "my_units" }
    3.25 -      }
    3.26 -      
    3.27 -      slot.put(" ")
    3.28 -
    3.29 -      ui.link{
    3.30 -        attr = { class = filter_unit == "global" and "active" or nil },
    3.31 -        text = _"All units",
    3.32 -        module = "index", view = "index", params = { filter_unit = "global" }
    3.33 -      }
    3.34 -    end }
    3.35 -  end }
    3.36 -end
    3.37 -
    3.38 -if not for_member then
    3.39 -  if filter_unit == "global" then
    3.40 -    execute.view{ module = "unit", view = "_list" }
    3.41 -    return
    3.42 -  end
    3.43 -
    3.44 -end
    3.45 -
    3.46 -local units = Unit:new_selector():add_where("active"):add_order_by("name"):exec()
    3.47 -
    3.48 -if member then
    3.49 -  units:load_delegation_info_once_for_member_id(member.id)
    3.50 -end
    3.51 -
    3.52 -for i, unit in ipairs(units) do
    3.53 -  if member:has_voting_right_for_unit_id(unit.id) then
    3.54 -   
    3.55 -    local areas_selector = Area:new_selector()
    3.56 -      :reset_fields()
    3.57 -      :add_field("area.id", nil, { "grouped" })
    3.58 -      :add_field("area.unit_id", nil, { "grouped" })
    3.59 -      :add_field("area.name", nil, { "grouped" })
    3.60 -      :add_field("member_weight", nil, { "grouped" })
    3.61 -      :add_field("direct_member_count", nil, { "grouped" })
    3.62 -      :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.accepted ISNULL AND issue.closed ISNULL)", "issues_new_count")
    3.63 -      :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.accepted NOTNULL AND issue.half_frozen ISNULL AND issue.closed ISNULL)", "issues_discussion_count")
    3.64 -      :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.half_frozen NOTNULL AND issue.fully_frozen ISNULL AND issue.closed ISNULL)", "issues_frozen_count")
    3.65 -      :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen NOTNULL AND issue.closed ISNULL)", "issues_voting_count")
    3.66 -      :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen NOTNULL AND issue.closed NOTNULL)", "issues_finished_count")
    3.67 -      :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen ISNULL AND issue.closed NOTNULL)", "issues_canceled_count")
    3.68 -      :add_where{ "area.unit_id = ?", unit.id }
    3.69 -      :add_where{ "area.active" }
    3.70 -      :add_order_by("area.name")
    3.71 -
    3.72 -    if filter_unit == "my_areas" then
    3.73 -      areas_selector:join("membership", nil, { "membership.area_id = area.id AND membership.member_id = ?", member.id })
    3.74 -    else
    3.75 -      areas_selector:join("privilege", nil, { "privilege.unit_id = area.unit_id AND privilege.member_id = ? AND privilege.voting_right", member.id })
    3.76 -    end
    3.77 -    
    3.78 -    local area_count = areas_selector:count()
    3.79 -    
    3.80 -    local max_area_count = Area:new_selector()
    3.81 -      :add_where{ "area.unit_id = ?", unit.id }
    3.82 -      :add_where{ "area.active" }
    3.83 -      :count()
    3.84 -    local more_area_count = max_area_count - area_count
    3.85 -    local delegated_count = Area:new_selector()
    3.86 -      :add_where{ "area.unit_id = ?", unit.id }
    3.87 -      :add_where{ "area.active" }
    3.88 -      :left_join("membership", nil, { "membership.area_id = area.id AND membership.member_id = ?", member.id } )
    3.89 -      :add_where{ "membership.member_id ISNULL" }
    3.90 -      :join("delegation", nil, { "delegation.area_id = area.id AND delegation.truster_id = ?", member.id } )
    3.91 -      :add_where{ "delegation.trustee_id NOTNULL" }
    3.92 -      :count()
    3.93 -
    3.94 -    local more_area_text
    3.95 -    if area_count == 0 and more_area_count == 1 then
    3.96 -      if app.session.member_id == member.id then
    3.97 -        more_area_text = _("You are not participating in the only area of the unit")
    3.98 -      else
    3.99 -        more_area_text = _("Member is not participating in the only area of the unit")
   3.100 -      end
   3.101 -    elseif area_count == 0 and more_area_count > 0 then
   3.102 -      if app.session.member_id == member.id then
   3.103 -        more_area_text = _("You are not participating in any of the #{count} areas in this unit", { count = more_area_count })
   3.104 -      else
   3.105 -        more_area_text = _("Member is not participating in any of the #{count} areas in this unit", { count = more_area_count })
   3.106 -      end
   3.107 -    elseif area_count > 0 and more_area_count == 1 then
   3.108 -      more_area_text = _("One more area in this unit")
   3.109 -    elseif area_count > 0 and more_area_count > 0 then
   3.110 -      more_area_text = _("#{count} more areas in this unit", { count = more_area_count })
   3.111 -    end
   3.112 -    local delegated_text
   3.113 -    if delegated_count == 1 then
   3.114 -      delegated_text = _("One of them have an area delegation set", { count = delegated_count })
   3.115 -    elseif delegated_count > 0 then
   3.116 -      delegated_text = _("#{count} of them have an area delegation set", { count = delegated_count })
   3.117 -    end
   3.118 -
   3.119 -    ui.container{ attr = { class = "area_list" }, content = function()
   3.120 -      execute.view{ module = "unit", view = "_head", params = { unit = unit, show_content = true, member = member } }
   3.121 -
   3.122 -      if area_count > 0 then
   3.123 -        local areas = areas_selector:exec()
   3.124 -        
   3.125 -        areas:load_delegation_info_once_for_member_id(member.id)
   3.126 -        
   3.127 -        for i, area in ipairs(areas) do
   3.128 -          execute.view{
   3.129 -            module = "area", view = "_list_entry", params = {
   3.130 -              area = area, member = member
   3.131 -            }
   3.132 -          }
   3.133 -        end
   3.134 -      end 
   3.135 -
   3.136 -      if area_count == 0 and member:has_voting_right_for_unit_id(unit.id) or
   3.137 -         more_area_count > 0 then
   3.138 -        
   3.139 -      end
   3.140 -    end }
   3.141 -    ui.container{ attr = { class = "area", style="margin-top: 1ex; margin-left: 10px;" }, content = function()
   3.142 -      ui.container{ attr = { class = "title" }, content = function()
   3.143 -        if more_area_text then
   3.144 -          ui.link{ module = "unit", view = "show", id = unit.id, text = more_area_text }
   3.145 -        end
   3.146 -        if delegated_text then
   3.147 -          slot.put(" · ")
   3.148 -          ui.tag{ content = delegated_text }
   3.149 -        end
   3.150 -      end }
   3.151 -    end }
   3.152 -    slot.put("<br />")
   3.153 -  end
   3.154 -end
   3.155 -
   3.156 -

     4.1 --- a/app/main/index/about.lua	Mon Feb 01 21:02:47 2021 +0100
     4.2 +++ b/app/main/index/about.lua	Mon Feb 01 21:25:34 2021 +0100
     4.3 @@ -95,9 +95,6 @@
     4.4            }
     4.5          }
     4.6  
     4.7 -        slot.put("<br />")
     4.8 -        ui.container{ content = "3rd party license information:" }
     4.9 -        slot.put('Some of the icons used in Liquid Feedback are from <a href="http://www.famfamfam.com/lab/icons/silk/">Silk icon set 1.3</a> by Mark James. His work is licensed under a <a href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution 2.5 License.</a>')
    4.10        end }
    4.11      end }
    4.12    end }

     5.1 --- a/app/main/index/document.lua	Mon Feb 01 21:02:47 2021 +0100
     5.2 +++ b/app/main/index/document.lua	Mon Feb 01 21:25:34 2021 +0100
     5.3 @@ -7,7 +7,6 @@
     5.4  slot.select("actions", function()
     5.5    ui.link{
     5.6      content = function()
     5.7 -        ui.image{ static = "icons/16/cancel.png" }
     5.8          slot.put(_"Cancel")
     5.9      end,
    5.10      module = "index",

     6.1 --- a/app/main/index/show_tab.lua	Mon Feb 01 21:02:47 2021 +0100
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,72 +0,0 @@
     6.4 -local tabs = {
     6.5 -  module = "index",
     6.6 -  view = "show_tab"
     6.7 -}
     6.8 -
     6.9 -local selector = Area:new_selector()
    6.10 -  :reset_fields()
    6.11 -  :add_field("area.id", nil, { "grouped" })
    6.12 -  :add_field("area.name", nil, { "grouped" })
    6.13 -  :add_field("membership.member_id NOTNULL", "is_member", { "grouped" })
    6.14 -  :add_field("count(issue.id)", "issues_to_vote_count")
    6.15 -  :add_field("count(interest.member_id)", "interested_issues_to_vote_count")
    6.16 -  :add_field("count(interest.member_id NOTNULL OR interest.member_id NOTNULL)", "issues_to_vote_count_sum")
    6.17 -  :join("issue", nil, "issue.area_id = area.id AND issue.fully_frozen NOTNULL AND issue.closed ISNULL")
    6.18 -  :left_join("direct_voter", nil, { "direct_voter.issue_id = issue.id AND direct_voter.member_id = ?", app.session.member.id })
    6.19 -  :add_where{ "direct_voter.member_id ISNULL" }
    6.20 -  :left_join("interest", nil, { "interest.issue_id = issue.id AND interest.member_id = ?", app.session.member.id })
    6.21 -  :left_join("membership", nil, { "membership.area_id = area.id AND membership.member_id = ? ", app.session.member.id })
    6.22 -
    6.23 -local not_voted_areas = {}
    6.24 -local issues_to_vote_count = 0
    6.25 -for i, area in ipairs(selector:exec()) do
    6.26 -  if area.is_member or area.interested_issues_to_vote_count > 0 then
    6.27 -    not_voted_areas[#not_voted_areas+1] = area
    6.28 -  end
    6.29 -  issues_to_vote_count = issues_to_vote_count + area.issues_to_vote_count_sum
    6.30 -end
    6.31 -
    6.32 -tabs[#tabs+1] = {
    6.33 -  name = "not_voted_issues",
    6.34 -  label = _"Not voted issues" .. " (" .. tostring(issues_to_vote_count) .. ")",
    6.35 -  icon = { static = "icons/16/email_open.png" },
    6.36 -  module = "index",
    6.37 -  view = "_not_voted_issues",
    6.38 -  params = {
    6.39 -    areas = not_voted_areas
    6.40 -  }
    6.41 -}
    6.42 -
    6.43 -local initiator_invites_selector = Initiative:new_selector()
    6.44 -  :join("issue", "_issue_state", "_issue_state.id = initiative.issue_id")
    6.45 -  :join("initiator", nil, { "initiator.initiative_id = initiative.id AND initiator.member_id = ? AND initiator.accepted ISNULL", app.session.member.id })
    6.46 -  :add_where("_issue_state.closed ISNULL AND _issue_state.half_frozen ISNULL")
    6.47 -
    6.48 -tabs[#tabs+1] = {
    6.49 -  name = "initiator_invites",
    6.50 -  label = _"Initiator invites" .. " (" .. tostring(initiator_invites_selector:count()) .. ")",
    6.51 -  icon = { static = "icons/16/email_open.png" },
    6.52 -  module = "index",
    6.53 -  view = "_initiator_invites",
    6.54 -  params = {
    6.55 -    initiatives_selector = initiator_invites_selector
    6.56 -  }
    6.57 -}
    6.58 -
    6.59 -local updated_drafts_selector = Initiative:new_selector()
    6.60 -  :join("issue", "_issue_state", "_issue_state.id = initiative.issue_id AND _issue_state.closed ISNULL AND _issue_state.fully_frozen ISNULL")
    6.61 -  :join("current_draft", "_current_draft", "_current_draft.initiative_id = initiative.id")
    6.62 -  :join("supporter", "supporter", { "supporter.member_id = ? AND supporter.initiative_id = initiative.id AND supporter.draft_id < _current_draft.id", app.session.member_id })
    6.63 -
    6.64 -tabs[#tabs+1] = {
    6.65 -  name = "updated_drafts",
    6.66 -  label = _"Updated drafts" .. " (" .. tostring(updated_drafts_selector:count()) .. ")",
    6.67 -  icon = { static = "icons/16/email_open.png" },
    6.68 -  module = "index",
    6.69 -  view = "_updated_drafts",
    6.70 -  params = {
    6.71 -    initiatives_selector = updated_drafts_selector
    6.72 -  }
    6.73 -}
    6.74 -
    6.75 -ui.tabs(tabs)
    6.76 \ No newline at end of file

     7.1 --- a/app/main/initiative/_battles.lua	Mon Feb 01 21:02:47 2021 +0100
     7.2 +++ b/app/main/initiative/_battles.lua	Mon Feb 01 21:25:34 2021 +0100
     7.3 @@ -51,11 +51,11 @@
     7.4        {
     7.5          content = function(record)
     7.6            if record.winning_count == record.losing_count then
     7.7 -            ui.image{ static = "icons/16/bullet_blue.png" }
     7.8 +            ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "fiber_manual_record" }
     7.9            elseif record.winning_count > record.losing_count then
    7.10 -            ui.image{ static = "icons/16/resultset_previous.png" }
    7.11 +            ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "arrow_left" }
    7.12            else
    7.13 -            ui.image{ static = "icons/16/resultset_next.png" }
    7.14 +            ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "arrow_right" }
    7.15            end
    7.16          end
    7.17        },

     8.1 --- a/app/main/issue/_sidebar_whatcanido.lua	Mon Feb 01 21:02:47 2021 +0100
     8.2 +++ b/app/main/issue/_sidebar_whatcanido.lua	Mon Feb 01 21:25:34 2021 +0100
     8.3 @@ -259,18 +259,6 @@
     8.4      if privileged_to_vote and not issue.closed and not issue.fully_frozen then
     8.5        if issue.member_info.own_participation then
     8.6          ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function ()
     8.7 -          --[[
     8.8 -          ui.container{ attr = { class = "right" }, content = function()
     8.9 -            ui.image{ attr = { class = "right" }, static = "icons/48/eye.png" }
    8.10 -            if issue.member_info.weight and issue.member_info.weight > 1 then
    8.11 -              slot.put("<br />")
    8.12 -              ui.tag{ 
    8.13 -                attr = { class = "right" },
    8.14 -                content = "+" .. issue.member_info.weight - 1
    8.15 -            }
    8.16 -            end
    8.17 -          end }
    8.18 -          --]]
    8.19            ui.tag{ content = _("You are interested in this issue", { id = issue.id }) }
    8.20            ui.tag { tag = "ul", attr = { class = "ul" }, content = function ()
    8.21              if issue.member_info.weight and issue.member_info.weight > 1 then

     9.1 --- a/app/main/member/_show_thumb.lua	Mon Feb 01 21:02:47 2021 +0100
     9.2 +++ b/app/main/member/_show_thumb.lua	Mon Feb 01 21:25:34 2021 +0100
     9.3 @@ -101,14 +101,8 @@
     9.4      end
     9.5  
     9.6      if (member.voter_comment) then
     9.7 -      ui.image{
     9.8 -        attr = { 
     9.9 -          alt   = _"Voting comment available",
    9.10 -          title = _"Voting comment available",
    9.11 -          class = "icon24 right"
    9.12 -        },
    9.13 -        static = "icons/16/comment.png"
    9.14 -      }
    9.15 +      local text = _"Voting comment available",
    9.16 +      ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "comment" }
    9.17      end
    9.18  
    9.19  
    9.20 @@ -128,13 +122,8 @@
    9.21      end
    9.22  
    9.23      if not member.active then
    9.24 -      slot.put ( " " )
    9.25        local text = _"member inactive"
    9.26 -      ui.image{
    9.27 -        attr = { alt = text, title = text },
    9.28 -        static = "icons/16/cross.png"
    9.29 -      }
    9.30 -      ui.tag{ content = _"inactive" }
    9.31 +      ui.tag{ tag = "i", attr = { class = "material-icons icon-red" }, content = "disabled_by_default" }
    9.32      end
    9.33  
    9.34      if initiator and initiator.accepted then
    9.35 @@ -147,10 +136,7 @@
    9.36  
    9.37      if member.is_informed == false then
    9.38        local text = _"Member has not approved latest draft"
    9.39 -      ui.image{
    9.40 -        attr = { alt = text, title = text },
    9.41 -        static = "icons/16/help_yellow.png"
    9.42 -      }
    9.43 +      ui.tag{ tag = "i", attr = { class = "material-icons icon-yellow" }, content = "help" }
    9.44      end
    9.45  
    9.46    end

    10.1 --- a/app/main/member_image/show.lua	Mon Feb 01 21:02:47 2021 +0100
    10.2 +++ b/app/main/member_image/show.lua	Mon Feb 01 21:25:34 2021 +0100
    10.3 @@ -14,7 +14,7 @@
    10.4    local default_file = "avatar.jpg"
    10.5    content_type = "image/jpeg"
    10.6    if image_type == "photo" then
    10.7 -    default_file = "icons/16/lightning.png"
    10.8 +    default_file = "avatar.jpg"
    10.9      content_type = "image/png"
   10.10    end
   10.11    

    11.1 --- a/app/main/membership/_action/update.lua	Mon Feb 01 21:02:47 2021 +0100
    11.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.3 @@ -1,26 +0,0 @@
    11.4 -local area_id = assert(param.get("area_id", atom.integer), "no area id given")
    11.5 -local membership = Membership:by_pk(area_id, app.session.member.id)
    11.6 -
    11.7 -local area = Area:by_id(area_id)
    11.8 -if param.get("delete", atom.boolean) then
    11.9 -  if membership then
   11.10 -    membership:destroy()
   11.11 -    slot.put_into("notice", _"Subscription removed")
   11.12 -  else
   11.13 -    slot.put_into("notice", _"Subscription already removed")
   11.14 -  end
   11.15 -  return
   11.16 -end
   11.17 -
   11.18 -if not app.session.member:has_voting_right_for_unit_id(area.unit_id) then
   11.19 -  slot.put_into("error", _"You are not eligible to participate")
   11.20 -  return false
   11.21 -end
   11.22 -
   11.23 -if not membership then
   11.24 -  membership = Membership:new()
   11.25 -  membership.area_id    = area_id
   11.26 -  membership.member_id  = app.session.member_id
   11.27 -  membership:save()
   11.28 -  slot.put_into("notice", _"Subject area subscribed")
   11.29 -end

    12.1 --- a/app/main/membership/_show_box.lua	Mon Feb 01 21:02:47 2021 +0100
    12.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.3 @@ -1,44 +0,0 @@
    12.4 -local area = param.get("area", "table")
    12.5 -
    12.6 -local membership = Membership:by_pk(area.id, app.session.member.id)
    12.7 -
    12.8 -if membership then
    12.9 -
   12.10 -  ui.container{
   12.11 -    attr = { 
   12.12 -      class = "head head_active",
   12.13 -    },
   12.14 -    content = function()
   12.15 -      ui.image{
   12.16 -        static = "icons/16/user_green.png"
   12.17 -      }
   12.18 -      slot.put(_"You are member")
   12.19 -    end
   12.20 -  }
   12.21 -  
   12.22 -  ui.link{
   12.23 -    image  = { static = "icons/16/cross.png" },
   12.24 -    text    = _"Withdraw membership",
   12.25 -    module  = "membership",
   12.26 -    action  = "update",
   12.27 -    params  = { area_id = area.id, delete = true },
   12.28 -    routing = { default = { mode = "redirect", module = "area", view = "show", id = area.id } }
   12.29 -  }
   12.30 -elseif app.session.member:has_voting_right_for_unit_id(area.unit_id) then
   12.31 -  ui.link{
   12.32 -    image  = { static = "icons/16/user_add.png" },
   12.33 -    text   = _"Become a member",
   12.34 -    module = "membership",
   12.35 -    action = "update",
   12.36 -    params = { area_id = area.id },
   12.37 -    routing = {
   12.38 -      default = {
   12.39 -        mode = "redirect",
   12.40 -        module = "area",
   12.41 -        view = "show",
   12.42 -        id = area.id
   12.43 -      }
   12.44 -    }
   12.45 -  }
   12.46 -end
   12.47 -

    13.1 Binary file static/icons/16/add.png has changed

    14.1 Binary file static/icons/16/application_form.png has changed

    15.1 Binary file static/icons/16/arrow_refresh.png has changed

    16.1 Binary file static/icons/16/award_star_gold_2.png has changed

    17.1 Binary file static/icons/16/award_star_silver_2.png has changed

    18.1 Binary file static/icons/16/bell.png has changed

    19.1 Binary file static/icons/16/book_add.png has changed

    20.1 Binary file static/icons/16/book_delete.png has changed

    21.1 Binary file static/icons/16/book_edit.png has changed

    22.1 Binary file static/icons/16/bug.png has changed

    23.1 Binary file static/icons/16/bullet_blue.png has changed

    24.1 Binary file static/icons/16/bullet_disk.png has changed

    25.1 Binary file static/icons/16/bullet_toggle_minus.png has changed

    26.1 Binary file static/icons/16/bullet_toggle_plus.png has changed

    27.1 Binary file static/icons/16/bullet_yellow.png has changed

    28.1 Binary file static/icons/16/cancel.png has changed

    29.1 Binary file static/icons/16/chart_organisation.png has changed

    30.1 Binary file static/icons/16/clock.png has changed

    31.1 Binary file static/icons/16/clock_edit.png has changed

    32.1 Binary file static/icons/16/clock_play.png has changed

    33.1 Binary file static/icons/16/cog.png has changed

    34.1 Binary file static/icons/16/comment.png has changed

    35.1 Binary file static/icons/16/comment_add.png has changed

    36.1 Binary file static/icons/16/comments.png has changed

    37.1 Binary file static/icons/16/connect.png has changed

    38.1 Binary file static/icons/16/cross.png has changed

    39.1 Binary file static/icons/16/database_save.png has changed

    40.1 Binary file static/icons/16/delete.png has changed

    41.1 Binary file static/icons/16/dropdown.png has changed

    42.1 Binary file static/icons/16/email_delete.png has changed

    43.1 Binary file static/icons/16/email_open.png has changed

    44.1 Binary file static/icons/16/error.png has changed

    45.1 Binary file static/icons/16/eye.png has changed

    46.1 Binary file static/icons/16/folder.png has changed

    47.1 Binary file static/icons/16/folder_add.png has changed

    48.1 Binary file static/icons/16/go_up.png has changed

    49.1 Binary file static/icons/16/group.png has changed

    50.1 Binary file static/icons/16/help.png has changed

    51.1 Binary file static/icons/16/help_yellow.png has changed

    52.1 Binary file static/icons/16/house.png has changed

    53.1 Binary file static/icons/16/information.png has changed

    54.1 Binary file static/icons/16/key.png has changed

    55.1 Binary file static/icons/16/key_forgot.png has changed

    56.1 Binary file static/icons/16/lightning.png has changed

    57.1 Binary file static/icons/16/link.png has changed

    58.1 Binary file static/icons/16/lock.png has changed

    59.1 Binary file static/icons/16/magnifier.png has changed

    60.1 Binary file static/icons/16/new.png has changed

    61.1 Binary file static/icons/16/package.png has changed

    62.1 Binary file static/icons/16/page.png has changed

    63.1 Binary file static/icons/16/page_add.png has changed

    64.1 Binary file static/icons/16/resultset_next.png has changed

    65.1 Binary file static/icons/16/resultset_next_double.png has changed

    66.1 Binary file static/icons/16/resultset_previous.png has changed

    67.1 Binary file static/icons/16/resultset_previous_double.png has changed

    68.1 Binary file static/icons/16/script.png has changed

    69.1 Binary file static/icons/16/script_add.png has changed

    70.1 Binary file static/icons/16/script_delete.png has changed

    71.1 Binary file static/icons/16/stop.png has changed

    72.1 Binary file static/icons/16/table_go.png has changed

    73.1 Binary file static/icons/16/table_go_crossed.png has changed

    74.1 Binary file static/icons/16/text_list_bullets.png has changed

    75.1 Binary file static/icons/16/thumb_down_red.png has changed

    76.1 Binary file static/icons/16/thumb_down_red_crossed.png has changed

    77.1 Binary file static/icons/16/thumb_up.png has changed

    78.1 Binary file static/icons/16/thumb_up_arrow.png has changed

    79.1 Binary file static/icons/16/thumb_up_green.png has changed

    80.1 Binary file static/icons/16/thumb_up_green_arrow.png has changed

    81.1 Binary file static/icons/16/tick.png has changed

    82.1 Binary file static/icons/16/time.png has changed

    83.1 Binary file static/icons/16/user_add.png has changed

    84.1 Binary file static/icons/16/user_comment.png has changed

    85.1 Binary file static/icons/16/user_delete.png has changed

    86.1 Binary file static/icons/16/user_edit.png has changed

    87.1 Binary file static/icons/16/user_gray.png has changed

    88.1 Binary file static/icons/16/user_green.png has changed

    89.1 Binary file static/icons/16/wrench.png has changed

    90.1 Binary file static/icons/32/empty.png has changed

    91.1 Binary file static/icons/32/phase_current.png has changed

    92.1 Binary file static/icons/32/phase_failed.png has changed

    93.1 Binary file static/icons/32/phase_finished.png has changed

    94.1 Binary file static/icons/32/support_none.png has changed

    95.1 Binary file static/icons/32/support_satisfied.png has changed

    96.1 Binary file static/icons/32/support_satisfied_via_delegation.png has changed

    97.1 Binary file static/icons/32/support_unsatisfied.png has changed

    98.1 Binary file static/icons/32/support_unsatisfied_via_delegation.png has changed

    99.1 Binary file static/icons/32/voted_no.png has changed

   100.1 Binary file static/icons/48/bell.png has changed

   101.1 Binary file static/icons/48/eye.png has changed

   102.1 Binary file static/icons/48/home.png has changed

   103.1 Binary file static/icons/48/info.png has changed

   104.1 Binary file static/icons/48/lf_plus.png has changed

   105.1 Binary file static/icons/48/star.png has changed

   106.1 Binary file static/icons/48/star_empty.png has changed

   107.1 Binary file static/icons/48/voted_ok.png has changed

   108.1 Binary file static/icons/emoticon_happy.png has changed

   109.1 Binary file static/icons/emoticon_unhappy.png has changed

   110.1 Binary file static/icons/emoticon_unhappy_red.png has changed

   111.1 Binary file static/icons/move_down.png has changed

   112.1 Binary file static/icons/move_up.png has changed

   113.1 Binary file static/star.png has changed