1.1 --- a/app/main/_layout/default.html	Sun Feb 12 20:03:26 2012 +0100
     1.2 +++ b/app/main/_layout/default.html	Mon Feb 13 00:16:42 2012 +0100
     1.3 @@ -30,44 +30,37 @@
     1.4      <div class="layout_error" id="layout_error" onclick="document.getElementById('layout_error').style.display='none';">
     1.5        <!-- WEBMCP SLOT error -->
     1.6      </div>
     1.7 -    <div class="title_bar">
     1.8 -      <div class="title_bar_content">
     1.9 -        <div class="logo" id="logo">
    1.10 -          <!-- WEBMCP SLOT logo -->
    1.11 -        </div>
    1.12 -        <div class="issue_info" id="issue_info">
    1.13 -          <!-- WEBMCP SLOT issue_info -->
    1.14 -        </div>
    1.15 -        <div class="path" id="path">
    1.16 -          <!-- WEBMCP SLOT path -->
    1.17 -        </div>
    1.18 -        <div class="help_hidden" id="help_hidden">
    1.19 -          <!-- WEBMCP SLOT help_hidden -->
    1.20 -        </div>
    1.21 -        <div class="title" id="title">
    1.22 -          <!-- WEBMCP SLOT title -->
    1.23 -        </div>
    1.24 -        <div class="title2" id="title2">
    1.25 -          <!-- WEBMCP SLOT title2 -->
    1.26 -        </div>
    1.27 -        <div class="actions" id="actions">
    1.28 -          <div class="interest vote_info" id="interest">
    1.29 -            <!-- WEBMCP SLOT interest -->
    1.30 -          </div>
    1.31 -          <!-- WEBMCP SLOT actions -->
    1.32 -        </div>
    1.33 +    <div class="logo" id="logo">
    1.34 +      <!-- WEBMCP SLOT logo -->
    1.35 +    </div>
    1.36 +    <div class="issue_info" id="issue_info">
    1.37 +      <!-- WEBMCP SLOT issue_info -->
    1.38 +    </div>
    1.39 +    <div class="help_hidden" id="help_hidden">
    1.40 +      <!-- WEBMCP SLOT help_hidden -->
    1.41 +    </div>
    1.42 +    <div class="title" id="title">
    1.43 +      <!-- WEBMCP SLOT title -->
    1.44 +    </div>
    1.45 +    <div class="title2" id="title2">
    1.46 +      <!-- WEBMCP SLOT title2 -->
    1.47 +    </div>
    1.48 +    <div class="actions" id="actions">
    1.49 +      <div class="interest vote_info" id="interest">
    1.50 +        <!-- WEBMCP SLOT interest -->
    1.51        </div>
    1.52 -      <div class="initiatives_list" id="initiatives_list">
    1.53 -        <!-- WEBMCP SLOT initiatives_list -->
    1.54 -      </div>
    1.55 +      <!-- WEBMCP SLOT actions -->
    1.56      </div>
    1.57 -        <div class="initiative_head" id="initiative_head">
    1.58 +    <div class="initiatives_list" id="initiatives_list">
    1.59 +      <!-- WEBMCP SLOT initiatives_list -->
    1.60 +    </div>
    1.61 +    <div class="initiative_head" id="initiative_head">
    1.62        <!-- WEBMCP SLOT initiative_head -->
    1.63      </div>
    1.64      <div class="support vote_info" id="support">
    1.65        <!-- WEBMCP SLOT support -->
    1.66      </div>
    1.67 -    <div style="clear: left;"></div>
    1.68 +
    1.69      <div class="content_navigation" id="content_navigation">
    1.70        <!-- WEBMCP SLOT content_navigation -->
    1.71      </div>

     2.1 --- a/app/main/area/show.lua	Sun Feb 12 20:03:26 2012 +0100
     2.2 +++ b/app/main/area/show.lua	Mon Feb 13 00:16:42 2012 +0100
     2.3 @@ -65,10 +65,21 @@
     2.4  
     2.5  end
     2.6  
     2.7 -
     2.8 -execute.view{
     2.9 -  module = "area",
    2.10 -  view = "show_tab",
    2.11 -  params = { area = area }
    2.12 -}
    2.13 -
    2.14 +if app.session.member then
    2.15 +  execute.view{
    2.16 +    module = "area",
    2.17 +    view = "show_tab",
    2.18 +    params = { area = area }
    2.19 +  }
    2.20 +else
    2.21 +  execute.view{
    2.22 +    module = "issue",
    2.23 +    view = "_list",
    2.24 +    params = {
    2.25 +      issues_selector = area:get_reference_selector("issues"),
    2.26 +      filter = cgi.params["filter"],
    2.27 +      filter_voting = param.get("filter_voting"),
    2.28 +      for_area_list = true
    2.29 +    }
    2.30 +  }
    2.31 +end

     3.1 --- a/app/main/delegation/_show_box.lua	Sun Feb 12 20:03:26 2012 +0100
     3.2 +++ b/app/main/delegation/_show_box.lua	Mon Feb 13 00:16:42 2012 +0100
     3.3 @@ -194,6 +194,7 @@
     3.4      
     3.5              if not issue or (issue.state ~= "finished" and issue.state ~= "cancelled") then
     3.6                change_delegation(scope, unit_id, area_id, issue, delegation, initiative_id)
     3.7 +              slot.put("<br style='clear: left'/>")
     3.8              end
     3.9  
    3.10              for i, record in ipairs(delegation_chain) do

     4.1 --- a/app/main/initiative/_action/add_support.lua	Sun Feb 12 20:03:26 2012 +0100
     4.2 +++ b/app/main/initiative/_action/add_support.lua	Mon Feb 13 00:16:42 2012 +0100
     4.3 @@ -37,24 +37,12 @@
     4.4      supporter.auto_support = auto_support
     4.5    end
     4.6    supporter:save()
     4.7 -  slot.put_into("notice", _"Your support has been added to this initiative")
     4.8 -  if supporter.auto_active then
     4.9 -    slot.put_into("notice", _"Auto support is now enabled")
    4.10 -  end
    4.11 -elseif (auto_support ~= nil and supporter.auto_support ~= auto_support) and config.auto_support then
    4.12 -  supporter.auto_support = auto_support
    4.13 -  if auto_support then
    4.14 -    slot.put_into("notice", _"Auto support is now enabled")
    4.15 -  else
    4.16 -    slot.put_into("notice", _"Auto support is now disabled")
    4.17 -  end
    4.18 -  supporter.draft_id = last_draft.id
    4.19 -  supporter:save()
    4.20 +--  slot.put_into("notice", _"Your support has been added to this initiative")
    4.21  elseif supporter.draft_id ~= last_draft.id then
    4.22    supporter.draft_id = last_draft.id
    4.23    supporter:save()
    4.24 -  slot.put_into("notice", _"Your support has been updated to the latest draft")
    4.25 +--  slot.put_into("notice", _"Your support has been updated to the latest draft")
    4.26  else
    4.27 -  slot.put_into("notice", _"You are already supporting the latest draft")
    4.28 +--  slot.put_into("notice", _"You are already supporting the latest draft")
    4.29  end
    4.30  

     5.1 --- a/app/main/initiative/_action/remove_support.lua	Sun Feb 12 20:03:26 2012 +0100
     5.2 +++ b/app/main/initiative/_action/remove_support.lua	Mon Feb 13 00:16:42 2012 +0100
     5.3 @@ -17,7 +17,7 @@
     5.4  
     5.5  if supporter then  
     5.6    supporter:destroy()
     5.7 -  slot.put_into("notice", _"Your support has been removed from this initiative")
     5.8 +--  slot.put_into("notice", _"Your support has been removed from this initiative")
     5.9  else
    5.10 -  slot.put_into("notice", _"You are already not supporting this initiative")
    5.11 +--  slot.put_into("notice", _"You are already not supporting this initiative")
    5.12  end
    5.13 \ No newline at end of file

     6.1 --- a/app/main/initiative/show_support.lua	Sun Feb 12 20:03:26 2012 +0100
     6.2 +++ b/app/main/initiative/show_support.lua	Mon Feb 13 00:16:42 2012 +0100
     6.3 @@ -17,9 +17,6 @@
     6.4          local initiative = param.get("initiative", "table")
     6.5          local supporter = Supporter:by_pk(initiative.id, app.session.member.id)
     6.6  
     6.7 -        local unique_string = multirand.string(16, '0123456789abcdef')
     6.8 -
     6.9 -
    6.10          local partial = {
    6.11            routing = {
    6.12              default = {
    6.13 @@ -44,7 +41,7 @@
    6.14          if not initiative.issue.fully_frozen and not initiative.issue.closed then
    6.15            if supporter then
    6.16              if not supporter:has_critical_opinion() then
    6.17 -              ui.tag{ attr = { class = "supporter" }, content = function()
    6.18 +              ui.container{ attr = { class = "supporter" }, content = function()
    6.19                  ui.image{
    6.20                    static = "icons/16/thumb_up_green.png"
    6.21                  }
    6.22 @@ -58,9 +55,9 @@
    6.23                  slot.put(_"Your are potential supporter")
    6.24                end }
    6.25              end
    6.26 -            slot.put(" · ")
    6.27              ui.link{
    6.28 -              text    = _"Remove my support from this initiative",
    6.29 +              image   = { static = "icons/16/cross.png" },
    6.30 +              text    = _"Withdraw support",
    6.31                module  = "initiative",
    6.32                action  = "remove_support",
    6.33                id      = initiative.id,
    6.34 @@ -73,6 +70,7 @@
    6.35                local params = param.get_all_cgi()
    6.36                params.dyn = nil
    6.37                ui.link{
    6.38 +                image   = { static = "icons/16/thumb_up_green.png" },
    6.39                  text    = _"Support this initiative",
    6.40                  module  = "initiative",
    6.41                  action  = "add_support",
    6.42 @@ -104,6 +102,7 @@
    6.43          end
    6.44          if initiator and initiator.accepted and not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked then
    6.45            ui.link{
    6.46 +            image = { static = "icons/16/comments.png" },
    6.47              text   = _"change discussion URL",
    6.48              module = "initiative",
    6.49              view   = "edit",

     7.1 --- a/app/main/interest/_action/update.lua	Sun Feb 12 20:03:26 2012 +0100
     7.2 +++ b/app/main/interest/_action/update.lua	Mon Feb 13 00:16:42 2012 +0100
     7.3 @@ -15,9 +15,9 @@
     7.4  if param.get("delete", atom.boolean) then
     7.5    if interest then
     7.6      interest:destroy()
     7.7 -    slot.put_into("notice", _"Interest removed")
     7.8 +    --slot.put_into("notice", _"Interest removed")
     7.9    else
    7.10 -    slot.put_into("notice", _"Interest not existent")
    7.11 +    --slot.put_into("notice", _"Interest not existent")
    7.12    end
    7.13    return
    7.14  end
    7.15 @@ -30,4 +30,4 @@
    7.16  
    7.17  interest:save()
    7.18  
    7.19 -slot.put_into("notice", _"Interest updated")
    7.20 +--slot.put_into("notice", _"Interest updated")

     8.1 --- a/app/main/interest/_show_box.lua	Sun Feb 12 20:03:26 2012 +0100
     8.2 +++ b/app/main/interest/_show_box.lua	Mon Feb 13 00:16:42 2012 +0100
     8.3 @@ -4,16 +4,14 @@
     8.4  local interest = Interest:by_pk(issue.id, app.session.member.id)
     8.5  local membership = Membership:by_pk(issue.area_id, app.session.member_id)
     8.6  
     8.7 -if interest then
     8.8 -  slot.select("actions", function()
     8.9 +slot.select("interest", function()
    8.10 +  if interest then
    8.11  
    8.12    ui.container{
    8.13 -    attr = { class = "interest vote_info"},
    8.14      content = function()
    8.15          ui.container{
    8.16            attr = { 
    8.17              class = "head head_active",
    8.18 -            onclick = "document.getElementById('interest_content').style.display = 'block';"
    8.19            },
    8.20            content = function()
    8.21              ui.image{
    8.22 @@ -21,50 +19,31 @@
    8.23              }
    8.24              slot.put(_"Your are interested")
    8.25  
    8.26 -            ui.image{
    8.27 -              static = "icons/16/dropdown.png"
    8.28 -            }
    8.29            end
    8.30          }
    8.31 -    
    8.32 -        ui.container{
    8.33 -          attr = { class = "content", id = "interest_content" },
    8.34 -          content = function()
    8.35 -            ui.container{
    8.36 -              attr = {
    8.37 -                class = "close",
    8.38 -                style = "cursor: pointer;",
    8.39 -                onclick = "document.getElementById('interest_content').style.display = 'none';"
    8.40 -              },
    8.41 -              content = function()
    8.42 -                ui.image{ static = "icons/16/cross.png" }
    8.43 -              end
    8.44 -            }
    8.45 -            if issue.state ~= "finished" and issue.state ~= "cancelled" and issue.state ~= "voting" then
    8.46 -              ui.link{
    8.47 -                text    = _"Remove my interest",
    8.48 -                module  = "interest",
    8.49 -                action  = "update",
    8.50 -                params  = { issue_id = issue.id, delete = true },
    8.51 -                routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
    8.52 -              }
    8.53 -              slot.put("<br />")
    8.54 -              slot.put("<br />")
    8.55 -            end
    8.56 -          end
    8.57 -        }
    8.58 +
    8.59 +        if issue.state ~= "finished" and issue.state ~= "cancelled" and issue.state ~= "voting" then
    8.60 +          ui.link{
    8.61 +            image   = { static = "icons/16/cross.png" },
    8.62 +            text    = _"Withdraw interest",
    8.63 +            module  = "interest",
    8.64 +            action  = "update",
    8.65 +            params  = { issue_id = issue.id, delete = true },
    8.66 +            routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
    8.67 +          }
    8.68 +        end
    8.69        end
    8.70      }
    8.71 -  end)
    8.72 -else
    8.73 -  if not issue.closed and not issue.fully_frozen then
    8.74 -    ui.link{
    8.75 -      image   = { static = "icons/16/user_add.png" },
    8.76 -      text    = _"Add my interest",
    8.77 -      module  = "interest",
    8.78 -      action  = "update",
    8.79 -      params  = { issue_id = issue.id },
    8.80 -      routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
    8.81 -    }
    8.82 +  else
    8.83 +    if not issue.closed and not issue.fully_frozen then
    8.84 +      ui.link{
    8.85 +        image   = { static = "icons/16/user_add.png" },
    8.86 +        text    = _"Add my interest",
    8.87 +        module  = "interest",
    8.88 +        action  = "update",
    8.89 +        params  = { issue_id = issue.id },
    8.90 +        routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
    8.91 +      }
    8.92 +    end
    8.93    end
    8.94 -end
    8.95 +end)

     9.1 --- a/app/main/issue/_filters.lua	Sun Feb 12 20:03:26 2012 +0100
     9.2 +++ b/app/main/issue/_filters.lua	Mon Feb 13 00:16:42 2012 +0100
     9.3 @@ -18,7 +18,7 @@
     9.4    },
     9.5    {
     9.6      name = "accepted",
     9.7 -    label = _"In discussion",
     9.8 +    label = _"Discussion",
     9.9      selector_modifier = function(selector)
    9.10        selector:add_where("issue.accepted NOTNULL AND issue.half_frozen ISNULL AND issue.closed ISNULL")
    9.11      end

    10.1 --- a/app/main/issue/_show_head.lua	Sun Feb 12 20:03:26 2012 +0100
    10.2 +++ b/app/main/issue/_show_head.lua	Mon Feb 13 00:16:42 2012 +0100
    10.3 @@ -12,9 +12,6 @@
    10.4    util.html_rss_head{ title = _"Initiatives in this issue (last updated first)", module = "initiative", view = "list_rss", params = { issue_id = issue.id, order = "last_updated" } }
    10.5  end
    10.6  
    10.7 -slot.select("path", function()
    10.8 -end)
    10.9 -
   10.10  slot.select("title", function()
   10.11    ui.link{
   10.12      content = _("Issue ##{id}", { id = issue.id }),

    11.1 --- a/app/main/member/_action/update_display.lua	Sun Feb 12 20:03:26 2012 +0100
    11.2 +++ b/app/main/member/_action/update_display.lua	Mon Feb 13 00:16:42 2012 +0100
    11.3 @@ -1,4 +1,3 @@
    11.4 -app.session.member:set_setting("tab_mode", param.get("tab_mode"))
    11.5  app.session.member:set_setting("initiatives_preview_limit", param.get("initiatives_preview_limit", atom.number))
    11.6  
    11.7  slot.put_into("notice", _"Your display settings have been updated")
    11.8 \ No newline at end of file

    12.1 --- a/app/main/membership/_action/update.lua	Sun Feb 12 20:03:26 2012 +0100
    12.2 +++ b/app/main/membership/_action/update.lua	Mon Feb 13 00:16:42 2012 +0100
    12.3 @@ -4,9 +4,9 @@
    12.4  if param.get("delete", atom.boolean) then
    12.5    if membership then
    12.6      membership:destroy()
    12.7 -    slot.put_into("notice", _"Membership removed")
    12.8 +    --slot.put_into("notice", _"Membership removed")
    12.9    else
   12.10 -    slot.put_into("notice", _"Membership not existent")
   12.11 +    --slot.put_into("notice", _"Membership not existent")
   12.12    end
   12.13    return
   12.14  end

    13.1 --- a/app/main/membership/_show_box.lua	Sun Feb 12 20:03:26 2012 +0100
    13.2 +++ b/app/main/membership/_show_box.lua	Mon Feb 13 00:16:42 2012 +0100
    13.3 @@ -9,41 +9,22 @@
    13.4      ui.container{
    13.5        attr = { 
    13.6          class = "head head_active",
    13.7 -        onclick = "document.getElementById('membership_content').style.display = 'block';"
    13.8        },
    13.9        content = function()
   13.10          ui.image{
   13.11            static = "icons/16/user_green.png"
   13.12          }
   13.13          slot.put(_"You are member")
   13.14 -
   13.15 -        ui.image{
   13.16 -          static = "icons/16/dropdown.png"
   13.17 -        }
   13.18        end
   13.19      }
   13.20      
   13.21 -    ui.container{
   13.22 -      attr = { class = "content", id = "membership_content" },
   13.23 -      content = function()
   13.24 -        ui.container{
   13.25 -          attr = {
   13.26 -            class = "close",
   13.27 -            style = "cursor: pointer;",
   13.28 -            onclick = "document.getElementById('membership_content').style.display = 'none';"
   13.29 -          },
   13.30 -          content = function()
   13.31 -            ui.image{ static = "icons/16/cross.png" }
   13.32 -          end
   13.33 -        }
   13.34 -        ui.link{
   13.35 -          text    = _"Remove my membership",
   13.36 -          module  = "membership",
   13.37 -          action  = "update",
   13.38 -          params  = { area_id = area.id, delete = true },
   13.39 -          routing = { default = { mode = "redirect", module = "area", view = "show", id = area.id } }
   13.40 -        }
   13.41 -      end
   13.42 +    ui.link{
   13.43 +      image  = { static = "icons/16/cross.png" },
   13.44 +      text    = _"Withdraw membership",
   13.45 +      module  = "membership",
   13.46 +      action  = "update",
   13.47 +      params  = { area_id = area.id, delete = true },
   13.48 +      routing = { default = { mode = "redirect", module = "area", view = "show", id = area.id } }
   13.49      }
   13.50    else
   13.51      ui.link{

    14.1 --- a/db/session.lua	Sun Feb 12 20:03:26 2012 +0100
    14.2 +++ b/db/session.lua	Mon Feb 13 00:16:42 2012 +0100
    14.3 @@ -13,3 +13,6 @@
    14.4  COMMENT ON COLUMN "session"."member_id"         IS 'Reference to member, who is logged in';
    14.5  COMMENT ON COLUMN "session"."lang"              IS 'Language code of the selected language';
    14.6  
    14.7 +
    14.8 +
    14.9 +DELETE FROM "setting" WHERE key = 'tab_mode';
   14.10 \ No newline at end of file

    15.1 --- a/static/style.css	Sun Feb 12 20:03:26 2012 +0100
    15.2 +++ b/static/style.css	Mon Feb 13 00:16:42 2012 +0100
    15.3 @@ -118,6 +118,7 @@
    15.4    font-size: 90%;
    15.5    line-height: 100%;
    15.6    padding-left: 10px;
    15.7 +  overflow: hidden;
    15.8  }
    15.9  
   15.10  .topbar .logolf {
   15.11 @@ -166,6 +167,7 @@
   15.12  
   15.13  .searchbox form {
   15.14    float: left;
   15.15 +  margin: 0px;
   15.16  }
   15.17  
   15.18  .searchbox div {
   15.19 @@ -194,46 +196,14 @@
   15.20   * Title of current page including path and actions
   15.21   */
   15.22  
   15.23 -.title_bar {
   15.24 -  padding-bottom: 1ex;
   15.25 -  xbackground-color: #def;
   15.26 -  text-shadow: #fff 0px 0px 3px;
   15.27 -}
   15.28 -
   15.29 -.title_bar_content {
   15.30 -  padding-left: 1em;
   15.31 -  padding-top: 1.5ex;
   15.32 +.title {
   15.33 +  background-color: #ddd;
   15.34    background: -webkit-gradient(linear, left top, left bottom, 
   15.35 -    /*color-stop(0%,#abd3ee), color-stop(100%,#ffffff)*/
   15.36      color-stop(0%,#ddd), color-stop(100%,#fff)                           
   15.37    );
   15.38 -}
   15.39 -
   15.40 -.path {
   15.41 -  color: #444;
   15.42 -}
   15.43 -
   15.44 -.path div {
   15.45 -  font-size: 100%;
   15.46 -  line-height: 180%;
   15.47 -}
   15.48 -
   15.49 -.path a {
   15.50 -  color: #444;
   15.51 -}
   15.52 -
   15.53 -.slot_path div {
   15.54 -  display: inline;
   15.55 -  margin-left: 1em;
   15.56 -  margin-right: 1em;
   15.57 -}
   15.58 -
   15.59 -.title {
   15.60 +  text-shadow: #fff 0px 0px 3px;
   15.61    color: #000;
   15.62 -  margin-bottom: 1ex;
   15.63 -}
   15.64 -
   15.65 -.slot_title {
   15.66 +  padding: 1ex 1em 0 1em;
   15.67  }
   15.68  
   15.69  .title div {
   15.70 @@ -241,17 +211,18 @@
   15.71    line-height: 110%;
   15.72  }
   15.73  
   15.74 -.title div a {
   15.75 -  xfont-weight: bold;
   15.76 -}
   15.77 -
   15.78  .title a {
   15.79    color: #000;
   15.80  }
   15.81  
   15.82 -.title2 div {
   15.83 +.slot_title2 {
   15.84 +  margin-top: 1ex;
   15.85 +  margin-left: 1em;
   15.86 +}
   15.87 +
   15.88 +.initiatives_list {
   15.89 +  clear: left;
   15.90    margin-bottom: 1ex;
   15.91 -  xline-height: 130%;
   15.92  }
   15.93  
   15.94  .member_image_avatar {
   15.95 @@ -268,23 +239,29 @@
   15.96  .actions {
   15.97    font-size: 75%;
   15.98    line-height: 220%;
   15.99 +  margin-top: 1ex;
  15.100 +  margin-bottom: 2ex;
  15.101  }
  15.102  
  15.103 -.slot_actions {
  15.104 -  display: inline;
  15.105 +.interest {
  15.106 +  margin-left: 1.33em;
  15.107 +  margin-bottom: 1.33ex;
  15.108 +}
  15.109 +
  15.110 +.slot_actions .interest {
  15.111 +  margin-left: 0em;
  15.112  }
  15.113  
  15.114  .actions a {
  15.115 -  padding: 1px 0.5em 1px 0.0em;
  15.116    margin-right: 1em;
  15.117    border-radius: 5px;
  15.118 +  padding-right: 0.3em;
  15.119  }
  15.120  
  15.121 -
  15.122  .slot_initiative_head  {
  15.123    background: -webkit-gradient(linear, left top, left bottom, 
  15.124      /*color-stop(0%,#AFEFB9), color-stop(100%,#ffffff)                           */
  15.125 -    color-stop(0%,#ddd), color-stop(100%,#fff)                           
  15.126 +    color-stop(0%,#e7e7e7), color-stop(100%,#fff)                           
  15.127    ); 
  15.128    padding-left: 1em;
  15.129    padding-top: 2ex;
  15.130 @@ -294,11 +271,8 @@
  15.131  .initiative_name {
  15.132    font-weight: bold;
  15.133    font-size: 125%;
  15.134 -  xline-height: 110%;
  15.135 -  xmargin-bottom: 0.7ex;
  15.136  }
  15.137  
  15.138 -
  15.139  .content_navigation {
  15.140    font-size: 75%;
  15.141    background-color: #eee;
  15.142 @@ -323,14 +297,15 @@
  15.143    border-left: 1px solid black;
  15.144  }
  15.145  
  15.146 +
  15.147 +.actions a {
  15.148 +  float: left;
  15.149 +}
  15.150 +
  15.151  .actions a:hover {
  15.152    background-color: #d7d7d7;
  15.153  }
  15.154  
  15.155 -.title_bar .actions a:hover {
  15.156 -  background-color: #fff;
  15.157 -}
  15.158 -
  15.159  .actions img {
  15.160    padding-left: 0.2em;
  15.161    padding-right: 0.2em;
  15.162 @@ -363,13 +338,19 @@
  15.163    padding-left: 0.2em;
  15.164    padding-right: 0.2em;
  15.165  }
  15.166 +.actions .supporter,
  15.167  .vote_info .head {
  15.168    float: left;
  15.169    margin-right: 1em;
  15.170  }
  15.171  
  15.172 +.actions .supporter,
  15.173 +.actions .interest .head {
  15.174 +  padding-right: 0.3em;
  15.175 +}
  15.176 +
  15.177  .interest .head_active,
  15.178 -.actions .potential_supporter{
  15.179 +.actions .potential_supporter {
  15.180    background-color: #fec;
  15.181    box-shadow: #fff 0px 0px 10px 1px;
  15.182    border-radius: 5px;
  15.183 @@ -425,12 +406,12 @@
  15.184  .vote_info .content {
  15.185    font-size: 133%;
  15.186    line-height: 100%;
  15.187 -  top: 3ex;
  15.188 +  top: 2.8ex;
  15.189    display: none;
  15.190    position: absolute;
  15.191    z-index: 10;
  15.192 -  background-color: #fff;
  15.193 -  border: 1px solid #999;
  15.194 +  background-color: #ddddff;
  15.195 +  border-radius: 0 5px 5px 5px;
  15.196    padding: 1em;
  15.197    width: 35em;
  15.198  }
  15.199 @@ -458,6 +439,7 @@
  15.200  
  15.201  .vote_info .member_thumb {
  15.202    clear: left;
  15.203 +  background: #fff;
  15.204  }
  15.205  
  15.206  .delegation_overridden .member_thumb {
  15.207 @@ -490,7 +472,7 @@
  15.208  
  15.209  .ui_tabs_links {
  15.210    margin-top: 2ex;
  15.211 -  margin-bottom: 2ex;
  15.212 +  margin-bottom: 1ex;
  15.213    font-size: 75%;
  15.214  }
  15.215  
  15.216 @@ -520,61 +502,6 @@
  15.217    xpadding: 1ex 1ex 1ex 1ex;
  15.218  }
  15.219  
  15.220 -.web10 .ui_tabs_accordeon_head {
  15.221 -  margin-bottom: 1ex;
  15.222 -}
  15.223 -
  15.224 -.web20 .ui_tabs_accordeon_head {
  15.225 -  font-size: 80%;
  15.226 -  font-weight: bold;
  15.227 -  display: block;
  15.228 -  background: #eee;
  15.229 -  border: 1px solid #bbb;
  15.230 -  color: #000;
  15.231 -  padding: 0.75ex;
  15.232 -  margin-top: 2ex;
  15.233 -  cursor: pointer;
  15.234 -}
  15.235 -
  15.236 -.web20 .ui_tabs_accordeon_head img {
  15.237 -  vertical-align: middle;
  15.238 -  margin-right: 0.5em;
  15.239 -}
  15.240 -
  15.241 -.web20 .ui_tabs_accordeon_head .bargraph {
  15.242 -  margin-right: 0.5em;
  15.243 -}
  15.244 -
  15.245 -.web20 .ui_tabs_accordeon_content {
  15.246 -  border: 1px solid #aaa;
  15.247 -  border-top: none;
  15.248 -  padding: 2ex 1em 2ex 1em;
  15.249 -  margin-bottom: 3ex;
  15.250 -}
  15.251 -
  15.252 -.web20 .issue_initiative_list .ui_tabs_accordeon_head {
  15.253 -  background-color: #e5e5ff;
  15.254 -}
  15.255 -
  15.256 -.web20 .issue_initiative_list .ui_tabs_accordeon_head,
  15.257 -.web20 .issue_initiative_list .ui_tabs_accordeon_content {
  15.258 -  border-color: #aad;
  15.259 -}
  15.260 -
  15.261 -.web20 .issue_initiative_list .ui_tabs_accordeon_content .ui_tabs_accordeon_content {
  15.262 -  border-color: #bbb;
  15.263 -  border-width: 1px;
  15.264 -}
  15.265 -
  15.266 -.web20 .issue_initiative_list .ui_tabs_accordeon_content .ui_tabs_accordeon_head {
  15.267 -  background-color: #eee;
  15.268 -  border: 1px solid #bbb;
  15.269 -}
  15.270 -
  15.271 -.web20 .issue_initiative_list .ui_tabs_accordeon_head a {
  15.272 -  font-size: 120%;
  15.273 -}
  15.274 -
  15.275  .ui_tabs_links a.yellow {
  15.276    background-color: #fec;
  15.277    color: #000;
  15.278 @@ -591,17 +518,6 @@
  15.279    padding: 1ex;
  15.280  }
  15.281  
  15.282 -.web20 .ui_tabs_accordeon_head.yellow {
  15.283 -  background-color: #fec;
  15.284 -  border-color: #b96;
  15.285 -  xpadding: 1ex;
  15.286 -  xmargin-bottom: 2ex;
  15.287 -}
  15.288 -
  15.289 -.web20 .ui_tabs_accordeon_content.yellow {
  15.290 -  border-color: #b96;
  15.291 -}
  15.292 -
  15.293  .ui_tabs_links a.red {
  15.294    background-color: #c33;
  15.295    color: #000;
  15.296 @@ -618,17 +534,6 @@
  15.297    padding: 1ex;
  15.298  }
  15.299  
  15.300 -.web20 .ui_tabs_accordeon_head.red {
  15.301 -  background-color: #c23;
  15.302 -  border-color: #b66;
  15.303 -  xpadding: 1ex;
  15.304 -  xmargin-bottom: 2ex;
  15.305 -}
  15.306 -
  15.307 -.web20 .ui_tabs_accordeon_content.red {
  15.308 -  border-color: #b66;
  15.309 -}
  15.310 -
  15.311  
  15.312  /*************************************************************************
  15.313   * ui.filters
  15.314 @@ -844,40 +749,6 @@
  15.315  
  15.316  
  15.317  /*************************************************************************
  15.318 - * Hidden inline form
  15.319 - */
  15.320 -
  15.321 -.hidden_inline_form {
  15.322 -  display: none;
  15.323 -  border: 1px solid #444;
  15.324 -  width: 42em;
  15.325 -  position: fixed;
  15.326 -  background-color: #fff;
  15.327 -  left: 5em;
  15.328 -  top: 5ex;
  15.329 -z-index: 2;
  15.330 -}
  15.331 -
  15.332 -.hidden_inline_form a {
  15.333 -  padding: 0.5ex;
  15.334 -  color: #fff;
  15.335 -}
  15.336 -
  15.337 -
  15.338 -.hidden_inline_form .head {
  15.339 -  background-color: #444;
  15.340 -  color: #fff;
  15.341 -  display: block;
  15.342 -  padding: 0.5ex;
  15.343 -}
  15.344 -
  15.345 -.hidden_inline_form input[type=text],
  15.346 -.hidden_inline_form textarea,
  15.347 -.hidden_inline_form select {
  15.348 -  width: 30em;
  15.349 -}
  15.350 -
  15.351 -/*************************************************************************
  15.352   * Positive / Negtive votes
  15.353   */
  15.354  
  15.355 @@ -970,10 +841,6 @@
  15.356    background: none;
  15.357  }
  15.358  
  15.359 -.initiative_link {
  15.360 -  padding: 0.5ex 0.5em;
  15.361 -}
  15.362 -
  15.363  .initiative_link.selected {
  15.364    font-weight: bold;
  15.365  }
  15.366 @@ -1034,7 +901,7 @@
  15.367    border-radius: 7px;
  15.368  }
  15.369  
  15.370 -.member_thumb a{
  15.371 +.member_thumb a {
  15.372    position: absolute;
  15.373    top: 0;
  15.374    left: 0;
  15.375 @@ -1201,6 +1068,7 @@
  15.376  .slot_help_hidden {
  15.377    float: right;
  15.378    margin-right: 1em;
  15.379 +  margin-top: 1ex;
  15.380  }
  15.381  
  15.382  .help_actions {