1.1 --- a/app/main/area/_list.lua	Tue Dec 27 02:13:46 2011 +0100
     1.2 +++ b/app/main/area/_list.lua	Tue Dec 27 03:34:35 2011 +0100
     1.3 @@ -18,6 +18,7 @@
     1.4      :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.5      :left_join("membership", "_membership", { "_membership.area_id = area.id AND _membership.member_id = ?", app.session.member.id })
     1.6      :add_field("_membership.member_id NOTNULL", "is_member", { "grouped" })
     1.7 +    :add_field({ "(SELECT member.name FROM delegation LEFT JOIN member ON delegation.trustee_id = member.id WHERE delegation.scope = 'area' AND delegation.area_id = area.id AND truster_id = ?)", app.session.member.id }, "area_delegation_name")
     1.8  else
     1.9    areas_selector:add_field("0", "issues_to_vote_count")
    1.10  end
    1.11 @@ -69,6 +70,17 @@
    1.12          },
    1.13          {
    1.14            content = function(record)
    1.15 +            if record.area_delegation_name then
    1.16 +              local text = _("Area delegated to '#{name}'", { name = record.area_delegation_name })
    1.17 +              ui.image{
    1.18 +                attr = { title = text, alt = text, style = "vertical-align: middle;" },
    1.19 +                static = "icons/16/link.png",
    1.20 +              }
    1.21 +            end
    1.22 +          end
    1.23 +        },
    1.24 +        {
    1.25 +          content = function(record)
    1.26              if record.member_weight and record.direct_member_count then
    1.27                local max_value = MemberCount:get()
    1.28                ui.bargraph{
    1.29 @@ -256,6 +268,14 @@
    1.30    slot.put(" ")
    1.31    slot.put(_"Member of area")
    1.32    slot.put("   ")
    1.33 +
    1.34 +  ui.image{
    1.35 +    attr = { title = title, alt = title },
    1.36 +    static = "icons/16/link.png"
    1.37 +  }
    1.38 +  slot.put(" ")
    1.39 +  slot.put(_"Area delegated")
    1.40 +  slot.put("   ")
    1.41  end
    1.42  
    1.43  ui.image{

     2.1 --- a/locale/translations.de.lua	Tue Dec 27 02:13:46 2011 +0100
     2.2 +++ b/locale/translations.de.lua	Tue Dec 27 03:34:35 2011 +0100
     2.3 @@ -57,6 +57,8 @@
     2.4  ["Are you sure?"] = "Sicher?";
     2.5  ["Area"] = "Themenbereich";
     2.6  ["Area '#{name}'"] = "Themenbereich '#{name}'";
     2.7 +["Area delegated"] = "Themenbereich delegiert";
     2.8 +["Area delegated to '#{name}'"] = "Themenbereich an '#{name}' delegiert";
     2.9  ["Area delegation"] = "Delegation für Themenbereich";
    2.10  ["Area delegation active"] = "Delegation für Themenbereich aktiv";
    2.11  ["Area list"] = "Liste der Themenbereiche";

     3.1 --- a/locale/translations.en.lua	Tue Dec 27 02:13:46 2011 +0100
     3.2 +++ b/locale/translations.en.lua	Tue Dec 27 03:34:35 2011 +0100
     3.3 @@ -57,6 +57,8 @@
     3.4  ["Are you sure?"] = false;
     3.5  ["Area"] = false;
     3.6  ["Area '#{name}'"] = false;
     3.7 +["Area delegated"] = false;
     3.8 +["Area delegated to '#{name}'"] = false;
     3.9  ["Area delegation"] = false;
    3.10  ["Area delegation active"] = false;
    3.11  ["Area list"] = false;

     4.1 --- a/locale/translations.eo.lua	Tue Dec 27 02:13:46 2011 +0100
     4.2 +++ b/locale/translations.eo.lua	Tue Dec 27 03:34:35 2011 +0100
     4.3 @@ -57,6 +57,8 @@
     4.4  ["Are you sure?"] = "Ĉu vi estas certa?";
     4.5  ["Area"] = "Temaro";
     4.6  ["Area '#{name}'"] = "Temaro '#{name}'";
     4.7 +["Area delegated"] = "Temarodelegacio"; -- FIXME
     4.8 +["Area delegated to '#{name}'"] = "Temarodelegacio '#{name}'"; -- FIXME
     4.9  ["Area delegation"] = "Temarodelegacio";
    4.10  ["Area delegation active"] = "Temarodlegacio aplikita";
    4.11  ["Area list"] = "Temarolisto";

     5.1 --- a/locale/translations.fr.lua	Tue Dec 27 02:13:46 2011 +0100
     5.2 +++ b/locale/translations.fr.lua	Tue Dec 27 03:34:35 2011 +0100
     5.3 @@ -57,6 +57,8 @@
     5.4  ["Are you sure?"] = false;
     5.5  ["Area"] = false;
     5.6  ["Area '#{name}'"] = false;
     5.7 +["Area delegated"] = false;
     5.8 +["Area delegated to '#{name}'"] = false;
     5.9  ["Area delegation"] = false;
    5.10  ["Area delegation active"] = false;
    5.11  ["Area list"] = false;

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