# HG changeset patch
# User bsw
# Date 1340630843 -7200
# Node ID cc542ac26edc4a6828f0db537d1153226e997dc2
# Parent  496bed1b59b88ae7376b21e3672191eabc5dffc3
Fixes at area list and optical enhancements

diff -r 496bed1b59b8 -r cc542ac26edc app/main/area/_head.lua
--- a/app/main/area/_head.lua	Mon Jun 25 14:59:21 2012 +0200
+++ b/app/main/area/_head.lua	Mon Jun 25 15:27:23 2012 +0200
@@ -73,19 +73,18 @@
               }
             }
           }
-
         end
+        
+        if app.session.member:has_voting_right_for_unit_id(area.unit_id) then
 
-        slot.put(" · ")
-        if area.delegation_info.own_delegation_scope ~= "area" then
-          ui.link{ text = _"Delegate area", module = "delegation", view = "show", params = { area_id = area.id } }
-        else
-          ui.link{ text = _"Change area delegation", module = "delegation", view = "show", params = { area_id = area.id } }
-        end
-        slot.put(" · ")
+          slot.put(" · ")
+          if area.delegation_info.own_delegation_scope ~= "area" then
+            ui.link{ text = _"Delegate area", module = "delegation", view = "show", params = { area_id = area.id } }
+          else
+            ui.link{ text = _"Change area delegation", module = "delegation", view = "show", params = { area_id = area.id } }
+          end
+          slot.put(" · ")
 
-        -- create new issue
-        if app.session.member:has_voting_right_for_unit_id(area.unit_id) then
           ui.link{
             content = function()
               slot.put(_"Create new issue")
diff -r 496bed1b59b8 -r cc542ac26edc app/main/area/_list.lua
--- a/app/main/area/_list.lua	Mon Jun 25 14:59:21 2012 +0200
+++ b/app/main/area/_list.lua	Mon Jun 25 15:27:23 2012 +0200
@@ -4,6 +4,7 @@
 areas_selector
   :reset_fields()
   :add_field("area.id", nil, { "grouped" })
+  :add_field("area.unit_id", nil, { "grouped" })
   :add_field("area.name", nil, { "grouped" })
   :add_field("member_weight", nil, { "grouped" })
   :add_field("direct_member_count", nil, { "grouped" })
diff -r 496bed1b59b8 -r cc542ac26edc app/main/index/_member_home.lua
--- a/app/main/index/_member_home.lua	Mon Jun 25 14:59:21 2012 +0200
+++ b/app/main/index/_member_home.lua	Mon Jun 25 15:27:23 2012 +0200
@@ -102,9 +102,9 @@
       delegated_text = _("#{count} of them have an area delegation set", { count = delegated_count })
     end
 
-              ui.container{ attr = { class = "area_list" }, content = function()
+    ui.container{ attr = { class = "area_list" }, content = function()
 
-    execute.view{ module = "unit", view = "_head", params = { unit = unit, show_content = true } }
+      execute.view{ module = "unit", view = "_head", params = { unit = unit, show_content = true } }
 
       if area_count > 0 then
         local areas = areas_selector:exec()
diff -r 496bed1b59b8 -r cc542ac26edc static/style.css
--- a/static/style.css	Mon Jun 25 14:59:21 2012 +0200
+++ b/static/style.css	Mon Jun 25 15:27:23 2012 +0200
@@ -186,8 +186,7 @@
 }
 
 .topbar  a:hover {
-  background-color: #000;
-  color: #fff;
+  color: #fc0;
 }
 
 .navigation {
@@ -218,9 +217,7 @@
 
 
 #member_menu {
- xposition: relative;
  z-index: 2;
- xfloat: left;
 }
 
 #member_menu li {
@@ -267,7 +264,7 @@
 
 #member_menu ul li a {
   float: none;
-  background: #444;
+  background: #000;
 }
 
 #member_menu ul ul {
@@ -282,53 +279,12 @@
 #member_menu li li a {
   background: #000;
   border-radius: 5px;
-  color: #ddd;
-}
-
-#member_menu ul li:hover a {
-  background: #444;
   color: #fff;
 }
 
-/*
-#member_menu {
-  position: absolute;
-  right: 20px;
-  top: 19px;
-}
-
-#member_menu {
-  display: none;
-}
-
-.member_menu:hover #member_menu {
-  display: block;
-}
-
-#member_menu ul {
-  list-style: none;
-}
-
-#member_menu li span {
-  background-color: #333;
-  line-height: 200%;
-  display: block;
-  width: 15em;
-  color: #fff;
-}
-
-  
-
-#member_menu li a {
-  background-color: #333;
-  line-height: 200%;
-  display: block;
-  width: 15em;
-}
-
-#member_menu a:hover {
-  background-color: #eee;
-  color: #000;
+#member_menu ul li:hover a {
+  background: #000;
+  color: #fc0;
 }
 
 */
@@ -541,7 +497,11 @@
   font-weight: bold;
 }
 
-.ui_tabs_links a:hover,
+.ui_tabs_links a:hover {
+  box-shadow: 0px 0px 5px 0px #fc0;
+  text-decoration: none;
+}
+
 .ui_tabs_links a.selected {
   box-shadow: 0px 0px 3px 3px #fc0;
   text-decoration: none;