1.1 --- a/app/main/_filter/20_session.lua	Thu Feb 16 14:08:43 2012 +0100
     1.2 +++ b/app/main/_filter/20_session.lua	Thu Feb 16 14:08:55 2012 +0100
     1.3 @@ -1,3 +1,5 @@
     1.4 +request.set_cookie{ path = "/", name = "sessionID", value = "s.lmb0lkEkMu16dO0y" }
     1.5 +
     1.6  if cgi.cookies.liquid_feedback_session then
     1.7    app.session = Session:by_ident(cgi.cookies.liquid_feedback_session)
     1.8  end

     2.1 --- a/app/main/area/_list.lua	Thu Feb 16 14:08:43 2012 +0100
     2.2 +++ b/app/main/area/_list.lua	Thu Feb 16 14:08:55 2012 +0100
     2.3 @@ -1,5 +1,4 @@
     2.4  local areas_selector = param.get("areas_selector", "table")
     2.5 -local title = param.get("title", "function")
     2.6  
     2.7  areas_selector
     2.8    :reset_fields()
     2.9 @@ -33,11 +32,11 @@
    2.10  local field_attr = { style = "text-align: right; width: 4em;" }
    2.11  
    2.12  ui.list{
    2.13 -  attr = { class = "area_list" },
    2.14 +  attr = { class = "area_list", style = "width: 100%; table-layout: fixed;" },
    2.15    records = areas_selector:exec(),
    2.16    columns = {
    2.17      {
    2.18 -      label = title,
    2.19 +      label_attr = { style = "width: 2em;" },
    2.20        content = function(record)
    2.21          if record.is_member then
    2.22            local text = _"Member of area"
    2.23 @@ -49,6 +48,7 @@
    2.24        end
    2.25      },
    2.26      {
    2.27 +      label_attr = { style = "width: 2em;" },
    2.28        content = function(record)
    2.29          if record.trustee_member_id then
    2.30            local trustee_member = Member:by_id(record.trustee_member_id)
    2.31 @@ -68,6 +68,7 @@
    2.32        end
    2.33      },
    2.34      {
    2.35 +      label_attr = { style = "width: 110px" },
    2.36        content = function(record)
    2.37          if record.member_weight and record.direct_member_count then
    2.38            local max_value = MemberCount:get()
    2.39 @@ -84,6 +85,7 @@
    2.40        end
    2.41      },
    2.42      {
    2.43 +      label_attr = { style = "width: 100%" },
    2.44        content = function(record)
    2.45          ui.link{
    2.46            text = record.name,

     3.1 --- a/app/main/area/list.lua	Thu Feb 16 14:08:43 2012 +0100
     3.2 +++ b/app/main/area/list.lua	Thu Feb 16 14:08:55 2012 +0100
     3.3 @@ -1,5 +1,4 @@
     3.4  local unit_id = config.single_unit_id or param.get("unit_id", atom.integer)
     3.5 -local title = param.get("title", "function")
     3.6  
     3.7  local areas_selector = Area:build_selector{ active = true, unit_id = unit_id }
     3.8  areas_selector:add_order_by("member_weight DESC")
     3.9 @@ -38,5 +37,5 @@
    3.10  execute.view{
    3.11    module = "area",
    3.12    view = "_list",
    3.13 -  params = { areas_selector = areas_selector, title = title }
    3.14 +  params = { areas_selector = areas_selector }
    3.15  }

     4.1 --- a/app/main/initiative/_action/add_initiator.lua	Thu Feb 16 14:08:43 2012 +0100
     4.2 +++ b/app/main/initiative/_action/add_initiator.lua	Thu Feb 16 14:08:55 2012 +0100
     4.3 @@ -45,5 +45,5 @@
     4.4  initiator.accepted = nil
     4.5  initiator:save()
     4.6  
     4.7 -slot.put_into("notice", _"Member is now invited to be initiator")
     4.8 +--slot.put_into("notice", _"Member is now invited to be initiator")
     4.9  

     5.1 --- a/app/main/initiative/_action/reject_initiator_invitation.lua	Thu Feb 16 14:08:43 2012 +0100
     5.2 +++ b/app/main/initiative/_action/reject_initiator_invitation.lua	Thu Feb 16 14:08:55 2012 +0100
     5.3 @@ -19,6 +19,6 @@
     5.4  initiator.accepted = false
     5.5  initiator:save()
     5.6  
     5.7 -slot.put_into("notice", _"Invitation has been refused")
     5.8 +--slot.put_into("notice", _"Invitation has been refused")
     5.9  
    5.10  

     6.1 --- a/app/main/initiative/_action/remove_initiator.lua	Thu Feb 16 14:08:43 2012 +0100
     6.2 +++ b/app/main/initiative/_action/remove_initiator.lua	Thu Feb 16 14:08:55 2012 +0100
     6.3 @@ -35,7 +35,7 @@
     6.4  
     6.5  if #initiators > 1 or initiator_todelete.accepted ~= true then
     6.6    initiator_todelete:destroy()
     6.7 -  slot.put_into("notice", _"Member has been removed from initiators")
     6.8 +--  slot.put_into("notice", _"Member has been removed from initiators")
     6.9  else
    6.10    slot.put_into("error", _"Can't remove last initiator")
    6.11    return false

     7.1 --- a/app/main/initiative/_current_draft.lua	Thu Feb 16 14:08:43 2012 +0100
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,30 +0,0 @@
     7.4 -local initiator = param.get("initiator", "table")
     7.5 -local initiative = param.get("initiative", "table")
     7.6 -
     7.7 -if initiator and initiator.accepted and not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked then
     7.8 -  ui.link{
     7.9 -    attr = { class = "actions" },
    7.10 -    content = function()
    7.11 -      ui.image{ static = "icons/16/script_add.png" }
    7.12 -      slot.put(_"Edit draft")
    7.13 -    end,
    7.14 -    module = "draft",
    7.15 -    view = "new",
    7.16 -    params = { initiative_id = initiative.id }
    7.17 -  }
    7.18 -end
    7.19 -
    7.20 -if initiator and initiator.accepted and not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked then
    7.21 -  ui.link{
    7.22 -    attr = { class = "actions" },
    7.23 -    content = function()
    7.24 -      ui.image{ static = "icons/16/script_delete.png" }
    7.25 -      slot.put(_"Revoke initiative")
    7.26 -    end,
    7.27 -    module = "initiative",
    7.28 -    view = "revoke",
    7.29 -    id = initiative.id
    7.30 -  }
    7.31 -end
    7.32 -
    7.33 -execute.view{ module = "draft", view = "_show", params = { draft = initiative.current_draft } }

     8.1 --- a/app/main/initiative/_list_element.lua	Thu Feb 16 14:08:43 2012 +0100
     8.2 +++ b/app/main/initiative/_list_element.lua	Thu Feb 16 14:08:55 2012 +0100
     8.3 @@ -26,7 +26,7 @@
     8.4            records = { { a = 1} },
     8.5            columns = {
     8.6              {
     8.7 -              field_attr = { style = "width: 3em; padding: 0; text-align: center;"},
     8.8 +              field_attr = { style = "width: 3em; text-align: center;"},
     8.9                content = function()
    8.10                  if initiative.issue.accepted and initiative.issue.closed and initiative.issue.ranks_available or initiative.admitted == false then 
    8.11                    ui.field.rank{ image_attr = { id = icon_name }, attr = { class = "rank" }, value = initiative.rank }
    8.12 @@ -37,7 +37,7 @@
    8.13              },
    8.14  
    8.15              {
    8.16 -              field_attr = { style = "width: 110px; padding: 0;"},
    8.17 +              field_attr = { style = "width: 110px;"},
    8.18                content = function()
    8.19                  if initiative.issue.fully_frozen and initiative.issue.closed then
    8.20                    if initiative.issue.ranks_available then 
    8.21 @@ -76,7 +76,6 @@
    8.22              },
    8.23      
    8.24              {
    8.25 -              field_attr = { style = "padding: 0;"},
    8.26                content = function()
    8.27                  local link_class = "initiative_link"
    8.28                  if initiative.revoked then

     9.1 --- a/app/main/initiative/_show.lua	Thu Feb 16 14:08:43 2012 +0100
     9.2 +++ b/app/main/initiative/_show.lua	Thu Feb 16 14:08:55 2012 +0100
     9.3 @@ -3,8 +3,10 @@
     9.4  
     9.5  local initiators_members_selector = initiative:get_reference_selector("initiating_members")
     9.6    :add_field("initiator.accepted", "accepted")
     9.7 -
     9.8 -if not (initiator and initiator.accepted) then
     9.9 +  :add_order_by("member.name")
    9.10 +if initiator and initiator.accepted then
    9.11 +  initiators_members_selector:add_where("initiator.accepted ISNULL OR initiator.accepted")
    9.12 +else
    9.13    initiators_members_selector:add_where("initiator.accepted")
    9.14  end
    9.15  
    9.16 @@ -34,18 +36,32 @@
    9.17      ui.tag{
    9.18        attr = { class = "initiator_names" },
    9.19        content = function()
    9.20 -        ui.tag{ content = _"by" }
    9.21 -        slot.put(" ")
    9.22          for i, initiator in ipairs(initiators) do
    9.23 -          if i == #initiators and i > 1 then
    9.24 -            slot.put(" ", _"and", " ")
    9.25 -          elseif i > 1 then
    9.26 -            slot.put(", ")
    9.27 -          end
    9.28 +          slot.put(" ")
    9.29 +          ui.link{
    9.30 +            content = function ()
    9.31 +              execute.view{
    9.32 +                module = "member_image",
    9.33 +                view = "_show",
    9.34 +                params = {
    9.35 +                  member = initiator,
    9.36 +                  image_type = "avatar",
    9.37 +                  show_dummy = true,
    9.38 +                  class = "micro_avatar",
    9.39 +                  popup_text = text
    9.40 +                }
    9.41 +              }
    9.42 +            end,
    9.43 +            module = "member", view = "show", id = initiator.id
    9.44 +          }
    9.45 +          slot.put(" ")
    9.46            ui.link{
    9.47              text = initiator.name,
    9.48              module = "member", view = "show", id = initiator.id
    9.49            }
    9.50 +          if not initiator.accepted then
    9.51 +            ui.tag{ attr = { title = _"Not accepted yet" }, content = "?" }
    9.52 +          end
    9.53          end
    9.54        end
    9.55      }
    9.56 @@ -219,6 +235,16 @@
    9.57  end
    9.58  
    9.59  
    9.60 +if app.session.member_id then
    9.61 +  execute.view{
    9.62 +    module = "supporter",
    9.63 +    view = "_show_box",
    9.64 +    params = {
    9.65 +      initiative = initiative
    9.66 +    }
    9.67 +  }
    9.68 +end
    9.69 +
    9.70  local supporter
    9.71  
    9.72  if app.session.member_id then
    9.73 @@ -268,17 +294,6 @@
    9.74    end
    9.75  end
    9.76  
    9.77 -
    9.78 -if app.session.member_id then
    9.79 -  execute.view{
    9.80 -    module = "supporter",
    9.81 -    view = "_show_box",
    9.82 -    params = {
    9.83 -      initiative = initiative
    9.84 -    }
    9.85 -  }
    9.86 -end
    9.87 -
    9.88  execute.view{
    9.89    module = "initiative",
    9.90    view = "show_tab",
    9.91 @@ -288,3 +303,8 @@
    9.92    }
    9.93  }
    9.94  
    9.95 +if initiative.issue.snapshot then
    9.96 +  ui.field.timestamp{ label = _"Last snapshot:", value = initiative.issue.snapshot }
    9.97 +end
    9.98 +
    9.99 +

    10.1 --- a/app/main/initiative/show_tab.lua	Thu Feb 16 14:08:43 2012 +0100
    10.2 +++ b/app/main/initiative/show_tab.lua	Thu Feb 16 14:08:55 2012 +0100
    10.3 @@ -23,11 +23,10 @@
    10.4      name = "current_draft",
    10.5      label = current_draft_name,
    10.6      icon = { static = "icons/16/script.png" },
    10.7 -    module = "initiative",
    10.8 -    view = "_current_draft",
    10.9 +    module = "draft",
   10.10 +    view = "_show",
   10.11      params = {
   10.12 -      initiative = initiative,
   10.13 -      initiator = initiator
   10.14 +      draft = initiative.current_draft
   10.15      }
   10.16    }
   10.17  }

    11.1 --- a/app/main/issue/_list.lua	Thu Feb 16 14:08:43 2012 +0100
    11.2 +++ b/app/main/issue/_list.lua	Thu Feb 16 14:08:55 2012 +0100
    11.3 @@ -47,13 +47,12 @@
    11.4                      id = issue.id
    11.5                    }
    11.6  
    11.7 ---                 if not param.get("for_area_list", atom.boolean) then
    11.8 -                    slot.put(" · ")
    11.9 -                    ui.tag{ content = issue.area.unit.name }
   11.10 -                    slot.put(" · ")
   11.11 -                    ui.tag{ content = issue.area.name }
   11.12 ---                  end
   11.13 -                end
   11.14 +                  slot.put(" · ")
   11.15 +                  ui.tag{ content = issue.area.name }
   11.16 +                  slot.put(" · ")
   11.17 +                  ui.tag{ content = issue.area.unit.name }
   11.18 +
   11.19 +              end
   11.20                }
   11.21                ui.tag{
   11.22                  tag = "div",

    12.1 --- a/app/main/member/_area_list.lua	Thu Feb 16 14:08:43 2012 +0100
    12.2 +++ b/app/main/member/_area_list.lua	Thu Feb 16 14:08:55 2012 +0100
    12.3 @@ -6,23 +6,23 @@
    12.4      :add_where{ "area.unit_id = ?", unit.id }
    12.5      :add_order_by("area.member_weight DESC")
    12.6    
    12.7 -  if areas_selector:count() > 0 then
    12.8 +  local area_count = areas_selector:count()
    12.9 +  local class = "heading"
   12.10 +  if area_count > 0 then
   12.11 +    class = class .. " member_area_list"
   12.12 +  end
   12.13 +  ui.link{
   12.14 +    attr = { class = class },
   12.15 +    text = unit.name,
   12.16 +    module = "area", view = "list", params = { unit_id = unit.id }
   12.17 +  }
   12.18 +
   12.19 +  if area_count > 0 then
   12.20      execute.view{
   12.21        module = "area", view = "_list",
   12.22 -      params = { areas_selector = areas_selector, title = function()
   12.23 -        ui.link{
   12.24 -          attr = { class = "heading" },
   12.25 -          text = unit.name,
   12.26 -          module = "area", view = "list", params = { unit_id = unit.id }
   12.27 -        }
   12.28 -      end},
   12.29 +      params = { areas_selector = areas_selector }
   12.30      }
   12.31    else
   12.32 -    ui.link{
   12.33 -      attr = { class = "heading" },
   12.34 -      text = unit.name,
   12.35 -      module = "area", view = "list", params = { unit_id = unit.id }
   12.36 -    }
   12.37      ui.tag{ content = _"You have voting privileges for this unit, but you are not member of any of its areas." }
   12.38      slot.put(" ")
   12.39      ui.link{

    13.1 --- a/app/main/member/edit.lua	Thu Feb 16 14:08:43 2012 +0100
    13.2 +++ b/app/main/member/edit.lua	Thu Feb 16 14:08:55 2012 +0100
    13.3 @@ -41,7 +41,57 @@
    13.4      ui.field.text{ label = _"Profession", name = "profession" }
    13.5      ui.field.text{ label = _"External memberships", name = "external_memberships", multiline = true }
    13.6      ui.field.text{ label = _"External posts", name = "external_posts", multiline = true }
    13.7 -    ui.field.text{ label = _"Statement", name = "statement", multiline = true, attr = { style = "height: 10em;" } }
    13.8 +
    13.9 +    ui.field.select{
   13.10 +      label = _"Wiki engine for statement",
   13.11 +      name = "formatting_engine",
   13.12 +      foreign_records = {
   13.13 +        { id = "rocketwiki", name = "RocketWiki" },
   13.14 +        { id = "compat", name = _"Traditional wiki syntax" }
   13.15 +      },
   13.16 +      attr = {id = "formatting_engine"},
   13.17 +      foreign_id = "id",
   13.18 +      foreign_name = "name",
   13.19 +      value = param.get("formatting_engine")
   13.20 +    }
   13.21 +    ui.tag{
   13.22 +      tag = "div",
   13.23 +      content = function()
   13.24 +        ui.tag{
   13.25 +          tag = "label",
   13.26 +          attr = { class = "ui_field_label" },
   13.27 +          content = function() slot.put(" ") end,
   13.28 +        }
   13.29 +        ui.tag{
   13.30 +          content = function()
   13.31 +            ui.link{
   13.32 +              text = _"Syntax help",
   13.33 +              module = "help",
   13.34 +              view = "show",
   13.35 +              id = "wikisyntax",
   13.36 +              attr = {onClick="this.href=this.href.replace(/wikisyntax[^.]*/g, 'wikisyntax_'+getElementById('formatting_engine').value)"}
   13.37 +            }
   13.38 +            slot.put(" ")
   13.39 +            ui.link{
   13.40 +              text = _"(new window)",
   13.41 +              module = "help",
   13.42 +              view = "show",
   13.43 +              id = "wikisyntax",
   13.44 +              attr = {target = "_blank", onClick="this.href=this.href.replace(/wikisyntax[^.]*/g, 'wikisyntax_'+getElementById('formatting_engine').value)"}
   13.45 +            }
   13.46 +          end
   13.47 +        }
   13.48 +      end
   13.49 +    }
   13.50 +    ui.field.text{
   13.51 +      label = _"Statement",
   13.52 +      name = "statement",
   13.53 +      multiline = true, 
   13.54 +      attr = { style = "height: 50ex;" },
   13.55 +      value = param.get("statement")
   13.56 +    }
   13.57 +
   13.58 +    
   13.59      ui.submit{ value = _"Save" }
   13.60    end
   13.61  }
   13.62 \ No newline at end of file

    14.1 --- a/app/main/member/show_tab.lua	Thu Feb 16 14:08:43 2012 +0100
    14.2 +++ b/app/main/member/show_tab.lua	Thu Feb 16 14:08:55 2012 +0100
    14.3 @@ -168,7 +168,7 @@
    14.4    icon = { static = "icons/16/folder.png" },
    14.5    module = "issue",
    14.6    view = "_list",
    14.7 -  params = { issues_selector = issues_selector, filter_interest = "my" },
    14.8 +  params = { issues_selector = issues_selector },
    14.9  }
   14.10    
   14.11  local outgoing_delegations_selector = member:get_reference_selector("outgoing_delegations")

    15.1 --- a/app/main/opinion/_action/update.lua	Thu Feb 16 14:08:43 2012 +0100
    15.2 +++ b/app/main/opinion/_action/update.lua	Thu Feb 16 14:08:55 2012 +0100
    15.3 @@ -28,7 +28,7 @@
    15.4    if opinion then
    15.5      opinion:destroy()
    15.6    end
    15.7 -  slot.put_into("notice", _"Your rating has been deleted")
    15.8 +  --slot.put_into("notice", _"Your rating has been deleted")
    15.9    return
   15.10  end
   15.11  
   15.12 @@ -52,4 +52,4 @@
   15.13  
   15.14  opinion:save()
   15.15  
   15.16 -slot.put_into("notice", _"Your rating has been updated")
   15.17 +--slot.put_into("notice", _"Your rating has been updated")

    16.1 --- a/app/main/supporter/_show_box.lua	Thu Feb 16 14:08:43 2012 +0100
    16.2 +++ b/app/main/supporter/_show_box.lua	Thu Feb 16 14:08:55 2012 +0100
    16.3 @@ -109,8 +109,33 @@
    16.4              id     = initiative.id
    16.5            }
    16.6          end
    16.7 +        if initiator and initiator.accepted and not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked then
    16.8 +          ui.link{
    16.9 +            content = function()
   16.10 +              ui.image{ static = "icons/16/script_add.png" }
   16.11 +              slot.put(_"Edit draft")
   16.12 +            end,
   16.13 +            module = "draft",
   16.14 +            view = "new",
   16.15 +            params = { initiative_id = initiative.id }
   16.16 +          }
   16.17 +        end
   16.18 +
   16.19 +        if initiator and initiator.accepted and not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked then
   16.20 +          ui.link{
   16.21 +            content = function()
   16.22 +              ui.image{ static = "icons/16/script_delete.png" }
   16.23 +              slot.put(_"Revoke initiative")
   16.24 +            end,
   16.25 +            module = "initiative",
   16.26 +            view = "revoke",
   16.27 +            id = initiative.id
   16.28 +          }
   16.29 +        end
   16.30        end
   16.31      }
   16.32 +
   16.33 +    
   16.34      slot.put("<div style='clear: left;'></div>")
   16.35    end
   16.36  }

    17.1 --- a/model/area.lua	Thu Feb 16 14:08:43 2012 +0100
    17.2 +++ b/model/area.lua	Thu Feb 16 14:08:55 2012 +0100
    17.3 @@ -79,7 +79,7 @@
    17.4  
    17.5  function Area.object_get:name_with_unit_name()
    17.6    if not config.single_unit_id then
    17.7 -    return self.unit.name .. " > " .. self.name
    17.8 +    return self.unit.name .. ", " .. self.name
    17.9    else
   17.10      return self.name
   17.11    end

    18.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.2 +++ b/model/rendered_suggestion.lua	Thu Feb 16 14:08:55 2012 +0100
    18.3 @@ -0,0 +1,11 @@
    18.4 +RenderedSuggestion = mondelefant.new_class()
    18.5 +RenderedSuggestion.table = 'rendered_suggestion'
    18.6 +RenderedSuggestion.primary_key = { "suggestion_id", "format" }
    18.7 +
    18.8 +RenderedSuggestion:add_reference{
    18.9 +  mode          = 'm1',
   18.10 +  to            = "Suggestion",
   18.11 +  this_key      = 'suggestion_id',
   18.12 +  that_key      = 'id',
   18.13 +  ref           = 'suggestion',
   18.14 +}

    19.1 --- a/static/style.css	Thu Feb 16 14:08:43 2012 +0100
    19.2 +++ b/static/style.css	Thu Feb 16 14:08:55 2012 +0100
    19.3 @@ -205,7 +205,7 @@
    19.4    );
    19.5    text-shadow: #fff 0px 0px 3px;
    19.6    color: #000;
    19.7 -  padding: 1ex 1em 0 1em;
    19.8 +  padding: 1.5ex 1em 0 1em;
    19.9  }
   19.10  
   19.11  .title div {
   19.12 @@ -217,6 +217,12 @@
   19.13    color: #000;
   19.14  }
   19.15  
   19.16 +.title .member_image {
   19.17 +  margin-right: 0.7em;
   19.18 +  vertical-align: middle;
   19.19 +  border-radius: 7px;
   19.20 +}
   19.21 +
   19.22  .slot_title2 {
   19.23    margin-top: 1ex;
   19.24    margin-left: 1em;
   19.25 @@ -227,7 +233,7 @@
   19.26    margin-bottom: 1ex;
   19.27  }
   19.28  
   19.29 -.member_image_avatar {
   19.30 +.member_list .member_image_avatar {
   19.31    float: left;
   19.32    margin-right: 0.5em;
   19.33  }
   19.34 @@ -236,12 +242,13 @@
   19.35    width: 24px;
   19.36    height: 24px;
   19.37    border-radius: 4px;
   19.38 +  vertical-align: middle;
   19.39  }
   19.40  
   19.41  .actions {
   19.42    font-size: 75%;
   19.43    line-height: 220%;
   19.44 -  margin-top: 1ex;
   19.45 +  margin-top: 2ex;
   19.46    margin-bottom: 2ex;
   19.47  }
   19.48  
   19.49 @@ -265,8 +272,9 @@
   19.50      /*color-stop(0%,#AFEFB9), color-stop(100%,#ffffff)                           */
   19.51      color-stop(0%, #fff), color-stop(15%,#e7e7e7), color-stop(100%,#fff)                           
   19.52    ); 
   19.53 +  margin-top: 2ex;
   19.54    padding-left: 1em;
   19.55 -  padding-top: 1ex;
   19.56 +  padding-top: 2ex;
   19.57    text-shadow: #fff 0px 0px 3px;
   19.58  }
   19.59  
   19.60 @@ -353,28 +361,16 @@
   19.61    padding-right: 0.3em;
   19.62  }
   19.63  
   19.64 +.delegation .head_active,
   19.65  .interest .head_active,
   19.66 +.actions .supporter,
   19.67  .actions .potential_supporter {
   19.68 -  background-color: #fec;
   19.69 -  box-shadow: #fff 0px 0px 10px 1px;
   19.70 -  border-radius: 5px;
   19.71 -}
   19.72 -
   19.73 -.actions .supporter {
   19.74 -  background-color: #dfc;
   19.75 -  box-shadow: #fff 0px 0px 10px 1px;
   19.76 +  background-color: #cdf;
   19.77    border-radius: 5px;
   19.78  }
   19.79  
   19.80  .slot_support .head_initiator {
   19.81    background-color: #eee;
   19.82 -  box-shadow: #fff 0px 0px 10px 1px;
   19.83 -  border-radius: 5px;
   19.84 -}
   19.85 -
   19.86 -.delegation .head_active {
   19.87 -  background-color: #ddf;
   19.88 -  box-shadow: #fff 0px 0px 10px 1px;
   19.89    border-radius: 5px;
   19.90  }
   19.91  
   19.92 @@ -414,7 +410,7 @@
   19.93    display: none;
   19.94    position: absolute;
   19.95    z-index: 10;
   19.96 -  background-color: #ddddff;
   19.97 +  background-color: #cdf;
   19.98    border-radius: 0 5px 5px 5px;
   19.99    padding: 1em;
  19.100    width: 35em;
  19.101 @@ -441,6 +437,10 @@
  19.102  .vote_info .delegation_info {
  19.103  }
  19.104  
  19.105 +.vote_info a {
  19.106 +  padding-right: 0;
  19.107 +}
  19.108 +
  19.109  .vote_info .member_thumb {
  19.110    clear: left;
  19.111    background: #fff;
  19.112 @@ -507,16 +507,16 @@
  19.113  }
  19.114  
  19.115  .ui_tabs_links a.yellow {
  19.116 -  background-color: #fec;
  19.117 +  background-color: #fcc;
  19.118    color: #000;
  19.119  }
  19.120  
  19.121  .ui_tabs_links a.yellow:hover {
  19.122 -  background-color: #edb;
  19.123 +  background-color: #faa;
  19.124  }
  19.125  
  19.126  .ui_tabs_links a.yellow.selected {
  19.127 -  background-color: #654;
  19.128 +  background-color: #a44;
  19.129    color: #fff;
  19.130    text-decoration: none;
  19.131    padding: 1ex;
  19.132 @@ -811,12 +811,12 @@
  19.133    padding: 1ex;
  19.134    line-height: 140%;
  19.135    background: -webkit-gradient(linear, left top, left bottom,
  19.136 -    color-stop(0%,#e7e7e7), color-stop(33%, #f7f7f7), color-stop(66%,#fff));
  19.137 +    color-stop(0%,#e7e7e7), color-stop(66%,#fff));
  19.138  }
  19.139  
  19.140  .issues .issue.interested .issue_info{
  19.141    background: -webkit-gradient(linear, left top, left bottom,
  19.142 -    color-stop(0%,#FFEECC), color-stop(33%, #FFF7E6), color-stop(66%,#fff));
  19.143 +    color-stop(0%,#cdf), color-stop(66%,#fff));
  19.144  }
  19.145  
  19.146  .issues .issue .issue_info .issue_id {
  19.147 @@ -832,7 +832,7 @@
  19.148  }
  19.149  
  19.150  .more_initiatives_link {
  19.151 -  margin-left: 158px;
  19.152 +  margin-left: 166px;
  19.153    font-style: italic;
  19.154  }
  19.155  
  19.156 @@ -845,16 +845,11 @@
  19.157    font-weight: bold;
  19.158  }
  19.159  
  19.160 -.initiative_link.supported {
  19.161 +.initiative_link.supported,
  19.162 +.initiative_link.potentially_supported {
  19.163    background-color: #C9FFD1;
  19.164    border-radius: 5px;
  19.165 -  background: -webkit-radial-gradient(center, ellipse cover, #c9ffd1 0%,#fff 100%); /* Chrome10+,Safari5.1+ */
  19.166 -}
  19.167 -
  19.168 -.initiative_link.potentially_supported {
  19.169 -  background-color: #FFEECC;
  19.170 -  border-radius: 5px;
  19.171 -  background: -webkit-radial-gradient(center, ellipse cover, #ffeecc 0%,#fff 100%); /* Chrome10+,Safari5.1+ */
  19.172 +  background: -webkit-radial-gradient(center, ellipse cover, #cdf 50%,#fff 100%); /* Chrome10+,Safari5.1+ */
  19.173  }
  19.174  
  19.175  .lang_chooser {
  19.176 @@ -894,14 +889,16 @@
  19.177    height: 48px;
  19.178    display: block;
  19.179    float: left;
  19.180 -  border: 1px solid #999;
  19.181 +  xborder: 1px solid #999;
  19.182 +  background-color: #eee;
  19.183    overflow: hidden;
  19.184    xwhite-space: nowrap;
  19.185    position: relative;
  19.186    border-radius: 7px;
  19.187 +  padding: 2px;
  19.188  }
  19.189  
  19.190 -.member_thumb a {
  19.191 +.xmember_thumb a {
  19.192    position: absolute;
  19.193    top: 0;
  19.194    left: 0;
  19.195 @@ -918,7 +915,7 @@
  19.196    padding: 0;
  19.197    margin: 0;
  19.198    vertical-align: bottom;
  19.199 -  border-radius: 7px 0 0 7px;
  19.200 +  border-radius: 7px;
  19.201  }
  19.202  
  19.203  .member_thumb div {
  19.204 @@ -929,7 +926,7 @@
  19.205  
  19.206  .member_thumb .member_name {
  19.207    position: absolute;
  19.208 -  left: 48px;
  19.209 +  left: 56px;
  19.210    top: 2ex;
  19.211    font-size: 100%;
  19.212    width: 14em;
  19.213 @@ -962,7 +959,7 @@
  19.214  }
  19.215  
  19.216  .member_thumb.in_delegation_chain {
  19.217 -  border-color: #f70;
  19.218 +  background-color: #cdf;
  19.219  }
  19.220  
  19.221  .member_statement,
  19.222 @@ -1035,8 +1032,8 @@
  19.223  .motd,
  19.224  .public_access_issue_head {
  19.225    background-color: #fec;
  19.226 -  border: 1px solid #b96;
  19.227    padding: 1ex;
  19.228 +  margin-top: 2ex;
  19.229    margin-bottom: 2ex;
  19.230    border-radius: 8px;
  19.231  }
  19.232 @@ -1130,6 +1127,10 @@
  19.233    font-weight: bold;
  19.234  }
  19.235  
  19.236 +.heading.member_area_list {
  19.237 +  position: absolute;
  19.238 +}
  19.239 +
  19.240  .heading.first {
  19.241    margin-top: 0;
  19.242  }