1.1 --- a/app/main/area/_head.lua	Mon Jun 25 14:59:21 2012 +0200
     1.2 +++ b/app/main/area/_head.lua	Mon Jun 25 15:27:23 2012 +0200
     1.3 @@ -73,19 +73,18 @@
     1.4                }
     1.5              }
     1.6            }
     1.7 -
     1.8          end
     1.9 +        
    1.10 +        if app.session.member:has_voting_right_for_unit_id(area.unit_id) then
    1.11  
    1.12 -        slot.put(" · ")
    1.13 -        if area.delegation_info.own_delegation_scope ~= "area" then
    1.14 -          ui.link{ text = _"Delegate area", module = "delegation", view = "show", params = { area_id = area.id } }
    1.15 -        else
    1.16 -          ui.link{ text = _"Change area delegation", module = "delegation", view = "show", params = { area_id = area.id } }
    1.17 -        end
    1.18 -        slot.put(" · ")
    1.19 +          slot.put(" · ")
    1.20 +          if area.delegation_info.own_delegation_scope ~= "area" then
    1.21 +            ui.link{ text = _"Delegate area", module = "delegation", view = "show", params = { area_id = area.id } }
    1.22 +          else
    1.23 +            ui.link{ text = _"Change area delegation", module = "delegation", view = "show", params = { area_id = area.id } }
    1.24 +          end
    1.25 +          slot.put(" · ")
    1.26  
    1.27 -        -- create new issue
    1.28 -        if app.session.member:has_voting_right_for_unit_id(area.unit_id) then
    1.29            ui.link{
    1.30              content = function()
    1.31                slot.put(_"Create new issue")

     2.1 --- a/app/main/area/_list.lua	Mon Jun 25 14:59:21 2012 +0200
     2.2 +++ b/app/main/area/_list.lua	Mon Jun 25 15:27:23 2012 +0200
     2.3 @@ -4,6 +4,7 @@
     2.4  areas_selector
     2.5    :reset_fields()
     2.6    :add_field("area.id", nil, { "grouped" })
     2.7 +  :add_field("area.unit_id", nil, { "grouped" })
     2.8    :add_field("area.name", nil, { "grouped" })
     2.9    :add_field("member_weight", nil, { "grouped" })
    2.10    :add_field("direct_member_count", nil, { "grouped" })

     3.1 --- a/app/main/index/_member_home.lua	Mon Jun 25 14:59:21 2012 +0200
     3.2 +++ b/app/main/index/_member_home.lua	Mon Jun 25 15:27:23 2012 +0200
     3.3 @@ -102,9 +102,9 @@
     3.4        delegated_text = _("#{count} of them have an area delegation set", { count = delegated_count })
     3.5      end
     3.6  
     3.7 -              ui.container{ attr = { class = "area_list" }, content = function()
     3.8 +    ui.container{ attr = { class = "area_list" }, content = function()
     3.9  
    3.10 -    execute.view{ module = "unit", view = "_head", params = { unit = unit, show_content = true } }
    3.11 +      execute.view{ module = "unit", view = "_head", params = { unit = unit, show_content = true } }
    3.12  
    3.13        if area_count > 0 then
    3.14          local areas = areas_selector:exec()

     4.1 --- a/static/style.css	Mon Jun 25 14:59:21 2012 +0200
     4.2 +++ b/static/style.css	Mon Jun 25 15:27:23 2012 +0200
     4.3 @@ -186,8 +186,7 @@
     4.4  }
     4.5  
     4.6  .topbar  a:hover {
     4.7 -  background-color: #000;
     4.8 -  color: #fff;
     4.9 +  color: #fc0;
    4.10  }
    4.11  
    4.12  .navigation {
    4.13 @@ -218,9 +217,7 @@
    4.14  
    4.15  
    4.16  #member_menu {
    4.17 - xposition: relative;
    4.18   z-index: 2;
    4.19 - xfloat: left;
    4.20  }
    4.21  
    4.22  #member_menu li {
    4.23 @@ -267,7 +264,7 @@
    4.24  
    4.25  #member_menu ul li a {
    4.26    float: none;
    4.27 -  background: #444;
    4.28 +  background: #000;
    4.29  }
    4.30  
    4.31  #member_menu ul ul {
    4.32 @@ -282,53 +279,12 @@
    4.33  #member_menu li li a {
    4.34    background: #000;
    4.35    border-radius: 5px;
    4.36 -  color: #ddd;
    4.37 -}
    4.38 -
    4.39 -#member_menu ul li:hover a {
    4.40 -  background: #444;
    4.41    color: #fff;
    4.42  }
    4.43  
    4.44 -/*
    4.45 -#member_menu {
    4.46 -  position: absolute;
    4.47 -  right: 20px;
    4.48 -  top: 19px;
    4.49 -}
    4.50 -
    4.51 -#member_menu {
    4.52 -  display: none;
    4.53 -}
    4.54 -
    4.55 -.member_menu:hover #member_menu {
    4.56 -  display: block;
    4.57 -}
    4.58 -
    4.59 -#member_menu ul {
    4.60 -  list-style: none;
    4.61 -}
    4.62 -
    4.63 -#member_menu li span {
    4.64 -  background-color: #333;
    4.65 -  line-height: 200%;
    4.66 -  display: block;
    4.67 -  width: 15em;
    4.68 -  color: #fff;
    4.69 -}
    4.70 -
    4.71 -  
    4.72 -
    4.73 -#member_menu li a {
    4.74 -  background-color: #333;
    4.75 -  line-height: 200%;
    4.76 -  display: block;
    4.77 -  width: 15em;
    4.78 -}
    4.79 -
    4.80 -#member_menu a:hover {
    4.81 -  background-color: #eee;
    4.82 -  color: #000;
    4.83 +#member_menu ul li:hover a {
    4.84 +  background: #000;
    4.85 +  color: #fc0;
    4.86  }
    4.87  
    4.88  */
    4.89 @@ -541,7 +497,11 @@
    4.90    font-weight: bold;
    4.91  }
    4.92  
    4.93 -.ui_tabs_links a:hover,
    4.94 +.ui_tabs_links a:hover {
    4.95 +  box-shadow: 0px 0px 5px 0px #fc0;
    4.96 +  text-decoration: none;
    4.97 +}
    4.98 +
    4.99  .ui_tabs_links a.selected {
   4.100    box-shadow: 0px 0px 3px 3px #fc0;
   4.101    text-decoration: none;