# HG changeset patch
# User bsw/jbe
# Date 1266700231 -3600
# Node ID 00d1004545f16a2b74dfd8fb6d5a448c4e1456e8
# Parent  fc9e748660c80a6934b66252c04661594139ce05
Dynamic interface using XMLHttpRequests, and many other changes

Bugfixes:
- Only allow voting on admitted initiatives
- Repaired issue search
- Don't display delegations for closed issues on member page
- Don't show revoke link in initiative, when issue is already half_frozen
- Localization for voting JavaScript
- Display author of suggestions

Disclosure of voting data after voting is finished:
- Possibility to inspect every ballot including preferences
- Show number of voters preferring one initiative to another initiative

Interface behaviour changes:
- Reversed default order of drafts
- Default order of suggestions changed
- Show new drafts of initiatives only once per day in timeline

Accessibility:
- Barrier-free voting implemented
- POST links are now accessible without JavaScript
- Changed gray for unsatisfied supporters in bar graph to a lighter gray

Other interface improvements:
- Optical enhancements
- Dynamic interface using XMLHttpRequests
- Show usage terms in about section
- Show own membership in area listing
- Show uninformed supporters greyed out and marked with yellow question mark
- Warning box in non-admitted initiatives
- When voted, don't display voting notice and change label of voting link
- Show object counts in more tabulator heads
- Enlarged member statement input field

Miscellaneous:
- Code cleanup
- Added README file containing installation instructions
- Use new WebMCP function ui.filters{...} instead of own ui.filter and ui.order functions

diff -r fc9e748660c8 -r 00d1004545f1 Makefile
--- a/Makefile	Tue Feb 02 00:31:06 2010 +0100
+++ b/Makefile	Sat Feb 20 22:10:31 2010 +0100
@@ -1,14 +1,6 @@
 default:
 
 
-db:
-	create_db liquid_feedback
-	psql liquid_feedback -f db/core.sql
-
-demo-db: db
-	psql liquid_feedback -f db/demo.sql
-
-
 translations-de:
 	cd ../webmcp/framework/bin/ && ./langtool.lua ~/workspace/liquid_feedback/locale/translations.de.lua ~/workspace/liquid_feedback/app ~/workspace/liquid_feedback/locale/translations.de.lua
 
diff -r fc9e748660c8 -r 00d1004545f1 README
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/README	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,61 @@
+
+################
+# Installation #
+################
+
+
+1. Choose a directory where to install the software, e.g. /opt :
+
+$ cd /opt
+
+
+2. Get the repositories of the core, the frondend and the web application
+   framework WebMCP:
+
+$ hg clone http://www.public-software-group.org/mercurial/liquid_feedback_core
+$ hg clone http://www.public-software-group.org/mercurial/liquid_feedback_frontend
+$ hg clone http://www.public-software-group.org/mercurial/webmcp
+
+
+3. Install LiquidFeedback Core:
+
+$ cd /opt/liquid_feedback_core
+$ make
+$ createdb liquid_feedback
+$ psql -v ON_ERROR_STOP=1 -f core.sql liquid_feedback
+
+You should initiatize your database using the command
+"psql liquid_feedback" and the examples shown in file "init.sql".
+
+
+4. Compile WebMCP
+
+$ cd /opt/webmcp
+$ make
+
+If you experience trouble during compilation, you might want to edit the
+file "Makefile.options" (i.e. to add -fPIC to compiler options) and then
+retry:
+
+$ vi Makefile.options
+$ make clean
+$ make
+
+
+5. Install Wiki-to-HTML converters
+
+Download latest LiquidFeedback Edition of RocketWiki from
+http://www.public-software-group.org/pub/projects/rocketwiki/liquid_feedback_edition/
+
+Compile the binaries by calling make, and copy them to a place of your
+choice, e.g. /opt/rocketwiki-lqfb/
+
+
+6. Configure the webserver and the LiquidFeedback Frontend application:
+
+Edit the configuration files in /opt/liquid_feedback_frontend/config/
+
+Use /opt/webmcp/doc/lighttpd.example.conf (or apache.sample.conf) to setup
+your webserver appropriatly.
+
+
diff -r fc9e748660c8 -r 00d1004545f1 app/main/_filter_view/30_navigation.lua
--- a/app/main/_filter_view/30_navigation.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/_filter_view/30_navigation.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -4,36 +4,28 @@
 if app.session.member == nil then
   slot.select('navigation', function()
     ui.link{
-      content = function()
-        ui.image{ static = "icons/16/key.png" }
-        slot.put(_"Login")
-      end,
+      image  = { static = "icons/16/key.png" },
+      text   = _"Login",
       module = 'index',
-      view = 'login'
+      view   = 'login'
     }
     ui.link{
-      content = function()
-        ui.image{ static = "icons/16/book_edit.png" }
-        slot.put(_"Registration")
-      end,
+      image  = { static = "icons/16/book_edit.png" },
+      text   = _"Registration",
       module = 'index',
-      view = 'register'
+      view   = 'register'
     }
     ui.link{
-      content = function()
-        ui.image{ static = "icons/16/key_forgot.png" }
-        slot.put(_"Reset password")
-      end,
+      image  = { static = "icons/16/key_forgot.png" },
+      text   = _"Reset password",
       module = 'index',
-      view = 'reset_password'
+      view   = 'reset_password'
     }
     ui.link{
-      content = function()
-        ui.image{ static = "icons/16/information.png" }
-        slot.put('About / Impressum')
-      end,
+      image  = { static = "icons/16/information.png" },
+      text   = _"About / Impressum",
       module = 'index',
-      view = 'about'
+      view   = 'about'
     }
   end)
   execute.inner()
@@ -43,75 +35,46 @@
 slot.select('navigation', function()
 
   ui.link{
-    content = function()
-      ui.image{ static = "icons/16/house.png" }
-      slot.put(_"Home")
-    end,
+    image  = { static = "icons/16/house.png" },
+    text   = _"Home",
     module = 'index',
-    view = 'index'
+    view   = 'index'
   }
 
-  local setting_key = "liquidfeedback_frontend_timeline_current_options"
-  local setting = Setting:by_pk(app.session.member.id, setting_key)
-
-  timeline_params = {}
-  if setting then
-    for event_ident, filter_idents in setting.value:gmatch("(%S+):(%S+)") do
-      timeline_params["option_" .. event_ident] = true
-      if filter_idents ~= "*" then
-        for filter_ident in filter_idents:gmatch("([^\|]+)") do
-          timeline_params["option_" .. event_ident .. "_" .. filter_ident] = true
-        end
-      end
-    end
-  end
-
-  timeline_params.date = param.get("date") or today
-
   ui.link{
-    content = function()
-      ui.image{ static = "icons/16/time.png" }
-      slot.put(_"Timeline")
-    end,
+    image  = { static = "icons/16/time.png" },
+    text   = _"Timeline",
     module = "timeline",
-    action = "update"
---    params = timeline_params
+    view   = "index"
   }
 
   ui.link{
-    content = function()
-      ui.image{ static = "icons/16/package.png" }
-      slot.put(_"Areas")
-    end,
+    image  = { static = "icons/16/package.png" },
+    text   = _"Areas",
     module = 'area',
-    view = 'list'
+    view   = 'list'
   }
 
   ui.link{
-    content = function()
-      ui.image{ static = "icons/16/group.png" }
-      slot.put(_"Members")
-    end,
+    image  = { static = "icons/16/group.png" },
+    text   = _"Members",
     module = 'member',
-    view = 'list'
+    view   = 'list',
+    params = { member_list = "newest" }
   }
 
   ui.link{
-    content = function()
-      ui.image{ static = "icons/16/book_edit.png" }
-      slot.put(_"Contacts")
-    end,
+    image  = { static = "icons/16/book_edit.png" },
+    text   = _"Contacts",
     module = 'contact',
-    view = 'list'
+    view   = 'list'
   }
 
   ui.link{
-    content = function()
-      ui.image{ static = "icons/16/information.png" }
-      slot.put(_"About")
-    end,
+    image  = { static = "icons/16/information.png" },
+    text   = _"About",
     module = 'index',
-    view = 'about'
+    view   = 'about'
   }
 
   if app.session.member.admin then
@@ -119,13 +82,11 @@
     slot.put(" ")
 
     ui.link{
-      attr = { class = { "admin_only" } },
-      content = function()
-        ui.image{ static = "icons/16/cog.png" }
-        slot.put(_'Admin')
-      end,
+      attr   = { class = { "admin_only" } },
+      image  = { static = "icons/16/cog.png" },
+      text   = _"Admin",
       module = 'admin',
-      view = 'index'
+      view   = 'index'
     }
 
   end
@@ -139,5 +100,3 @@
 end
 
 execute.inner()
-
-
diff -r fc9e748660c8 -r 00d1004545f1 app/main/_filter_view/31_logout_button.lua
--- a/app/main/_filter_view/31_logout_button.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/_filter_view/31_logout_button.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -5,10 +5,8 @@
 
 slot.select('logout_button', function()
   ui.link{
-    content = function()
-      ui.image{ static = "icons/16/stop.png" }
-      slot.put(_'Logout')
-    end,
+    image  = { static = "icons/16/stop.png" },
+    text   = _"Logout",
     module = 'index',
     action = 'logout'
   }
diff -r fc9e748660c8 -r 00d1004545f1 app/main/_filter_view/33_help_hidden.lua
--- a/app/main/_filter_view/33_help_hidden.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/_filter_view/33_help_hidden.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -28,9 +28,9 @@
             attr = { class = "help_icon" },
             static = "icons/16/help.png"
           }
-        end
+        end,
+        text = _"Show help text"
       }
     end
   end)
 end
-
diff -r fc9e748660c8 -r 00d1004545f1 app/main/_filter_view/34_stylesheet.lua
--- a/app/main/_filter_view/34_stylesheet.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/_filter_view/34_stylesheet.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -11,4 +11,40 @@
   slot.put_into("stylesheet_url", config.absolute_base_url .. "static/style.css")
 end
 
-execute.inner()
\ No newline at end of file
+if os.getenv("HTTP_USER_AGENT"):find("Android.*AppleWebKit.*Mobile Safari") then
+  slot.select("html_head", function()
+    ui.tag{
+      tag = "style",
+      content = "body, td, th { font-size: 16px; };"
+    }
+  end)
+end
+
+if app.session.member then
+  local tab_mode = app.session.member:get_setting_value("tab_mode")
+  if tab_mode then
+    config.user_tab_mode = tab_mode
+  end
+end
+
+local web20 = config.user_tab_mode == "accordeon"
+  or config.user_tab_mode == "accordeon_first_expanded"
+  or config.user_tab_mode == "accordeon_all_expanded"
+
+if web20 then
+  ui.enable_partial_loading()
+end
+
+if request.get_json_request_slots() then
+  slot.set_layout("blank")
+end
+
+
+ui.container{
+  attr = {
+    class = web20 and "web20" or "web10"
+  },
+  content = function()
+    execute.inner()
+  end
+}
\ No newline at end of file
diff -r fc9e748660c8 -r 00d1004545f1 app/main/_layout/atom.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/_layout/atom.html	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<feed xmlns="http://www.w3.org/2005/Atom">
+  <author>
+    <name>foo</name>
+  </author>
+  <title>LiquidFeedback</title>
+  <subtitle>Initiatives</subtitle>
+  <id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id>
+  <updated>2003-12-14T10:20:09Z</updated>
+  <!-- WEBMCP SLOTNODIV default -->
+</feed>
diff -r fc9e748660c8 -r 00d1004545f1 app/main/_layout/blank.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/_layout/blank.html	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,1 @@
+<!-- WEBMCP SLOTNODIV default -->
\ No newline at end of file
diff -r fc9e748660c8 -r 00d1004545f1 app/main/_layout/default.html
--- a/app/main/_layout/default.html	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/_layout/default.html	Sat Feb 20 22:10:31 2010 +0100
@@ -6,6 +6,8 @@
     <link rel="stylesheet" type="text/css" media="screen" href="__BASEURL__/static/gregor.js/gregor.css" />
     <link rel="stylesheet" type="text/css" media="screen" href="<!-- WEBMCP SLOTNODIV stylesheet_url -->" />
     <!-- WEBMCP SLOTNODIV html_head -->
+    <script type="text/javascript" src="__BASEURL__/static/js/partialload.js"></script>
+    <script type="text/javascript">var ui_tabs_active = {};</script>
   </head>
   <body>
     <div class="topbar">
@@ -67,7 +69,9 @@
     <div class="layout_trace" id="layout_trace" style="xdisplay: none">
       <div id="trace_show" onclick="document.getElementById('trace_content').style.display='block';this.style.display='none';">TRACE</div>
         <div id="trace_content" style="display: none;">
-          <!-- WEBMCP SLOT trace -->
+            <tt id="system_error"><!-- WEBMCP SLOT system_error --></tt>
+            <div id="trace">&nbsp;</div><hr />
+            <!-- WEBMCP SLOT trace -->
           <div class="trace_close" onclick="document.getElementById('trace_show').style.display='block';document.getElementById('trace_content').style.display='none';">
             close
           </div>
diff -r fc9e748660c8 -r 00d1004545f1 app/main/_layout/system_error.html
--- a/app/main/_layout/system_error.html	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/_layout/system_error.html	Sat Feb 20 22:10:31 2010 +0100
@@ -1,7 +1,7 @@
 <html>
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>Liquid Democracy System Error</title>
+    <title>LiquidFeedback Error</title>
     <link rel="stylesheet" type="text/css" media="screen" href="__BASEURL__/static/trace.css" />
     <style>
       body {
diff -r fc9e748660c8 -r 00d1004545f1 app/main/area/_list.lua
--- a/app/main/area/_list.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/area/_list.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -13,38 +13,56 @@
   :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")
   :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen NOTNULL AND issue.closed NOTNULL)", "issues_finished_count")
   :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen ISNULL AND issue.closed NOTNULL)", "issues_cancelled_count")
+  :left_join("membership", "_membership", { "_membership.area_id = area.id AND _membership.member_id = ?", app.session.member.id })
+  :add_field("_membership.member_id NOTNULL", "is_member", { "grouped" })
 
-ui.order{
-  name = name,
+local label_attr = { style = "text-align: right; width: 4em;" }
+local field_attr = { style = "text-align: right; width: 4em;" }
+
+ui.filters{
+  label = _"Change order",
   selector = areas_selector,
-  options = {
+  {
+    label = _"Order by",
     {
       name = "member_weight",
       label = _"Population",
-      order_by = "area.member_weight DESC"
+      selector_modifier = function(selector) selector:add_order_by("area.member_weight DESC") end
     },
     {
       name = "direct_member_count",
       label = _"Direct member count",
-      order_by = "area.direct_member_count DESC"
+      selector_modifier = function(selector) selector:add_order_by("area.direct_member_count DESC") end
     },
     {
       name = "az",
       label = _"A-Z",
-      order_by = "area.name"
+      selector_modifier = function(selector) selector:add_order_by("area.name") end
     },
     {
       name = "za",
       label = _"Z-A",
-      order_by = "area.name DESC"
+      selector_modifier = function(selector) selector:add_order_by("area.name DESC") end
     }
   },
   content = function()
     ui.list{
+      attr = { class = "area_list" },
       records = areas_selector:exec(),
       columns = {
         {
           content = function(record)
+            if record.is_member then
+              local text = _"Member of area"
+              ui.image{
+                attr = { title = text, alt = text, style = "vertical-align: middle;" },
+                static = "icons/16/user_gray.png",
+              }
+            end
+          end
+        },
+        {
+          content = function(record)
             if record.member_weight and record.direct_member_count then
               local max_value = MemberCount:get()
               ui.bargraph{
@@ -70,97 +88,143 @@
           end
         },
         {
-          label = _"New",
-          field_attr = { style = "text-align: right;" },
+          label = function()
+            local title = _"New"
+            ui.image{
+              attr = { title = title, alt = title },
+              static = "icons/16/new.png"
+            }
+          end,
+          field_attr = field_attr,
+          label_attr = label_attr,
           content = function(record)
             ui.link{
               text = tostring(record.issues_new_count),
               module = "area",
               view = "show",
               id = record.id,
-              params = { filter = "new" }
+              params = { filter = "new", tab = "issues" }
             }
           end
         },
         {
-          label = _"Discussion",
-          field_attr = { style = "text-align: right;" },
+          label = function()
+            local title = _"Discussion"
+            ui.image{
+              attr = { title = title, alt = title },
+              static = "icons/16/comments.png"
+            }
+          end,
+          field_attr = field_attr,
+          label_attr = label_attr,
           content = function(record)
             ui.link{
               text = tostring(record.issues_discussion_count),
               module = "area",
               view = "show",
               id = record.id,
-              params = { filter = "accepted" }
+              params = { filter = "accepted", tab = "issues" }
             }
           end
         },
         {
-          label = _"Frozen",
-          field_attr = { style = "text-align: right;" },
+          label = function()
+            local title = _"Frozen"
+            ui.image{
+              attr = { title = title, alt = title },
+              static = "icons/16/lock.png"
+            }
+          end,
+          field_attr = field_attr,
+          label_attr = label_attr,
           content = function(record)
             ui.link{
               text = tostring(record.issues_frozen_count),
               module = "area",
               view = "show",
               id = record.id,
-              params = { filter = "half_frozen" }
+              params = { filter = "half_frozen", tab = "issues" }
             }
           end
         },
         {
-          label = _"Voting",
-          field_attr = { style = "text-align: right;" },
+          label = function()
+            local title = _"Voting"
+            ui.image{
+              attr = { title = title, alt = title },
+              static = "icons/16/email_open.png"
+            }
+          end,
+          field_attr = field_attr,
+          label_attr = label_attr,
           content = function(record)
             ui.link{
               text = tostring(record.issues_voting_count),
               module = "area",
               view = "show",
               id = record.id,
-              params = { filter = "frozen" }
+              params = { filter = "frozen", tab = "issues" }
             }
           end
         },
         {
-          label = _"Not yet voted",
-          field_attr = { style = "text-align: right;" },
-          content = function(record)
-            ui.link{
-              attr = { class = record.issues_to_vote_count > 0 and "not_voted" or nil },
-              text = tostring(record.issues_to_vote_count),
-              module = "area",
-              view = "show",
-              id = record.id,
-              params = { filter = "frozen", filter_voting = "not_voted" }
+          label = function()
+            local title = _"Finished"
+            ui.image{
+              attr = { title = title, alt = title },
+              static = "icons/16/tick.png"
             }
-          end
-        },
-        {
-          label = _"Finished",
-          field_attr = { style = "text-align: right;" },
+          end,
+          field_attr = field_attr,
+          label_attr = label_attr,
           content = function(record)
             ui.link{
               text = tostring(record.issues_finished_count),
               module = "area",
               view = "show",
               id = record.id,
-              params = { filter = "finished", issue_list = "newest" }
+              params = { filter = "finished", issue_list = "newest", tab = "issues" }
             }
           end
         },
         {
-          label = _"Cancelled",
-          field_attr = { style = "text-align: right;" },
+          label = function()
+            local title = _"Cancelled"
+            ui.image{
+              attr = { title = title, alt = title },
+              static = "icons/16/cross.png"
+            }
+          end,
+          field_attr = field_attr,
+          label_attr = label_attr,
           content = function(record)
             ui.link{
               text = tostring(record.issues_cancelled_count),
               module = "area",
               view = "show",
               id = record.id,
-              params = { filter = "cancelled", issue_list = "newest" }
+              params = { filter = "cancelled", issue_list = "newest", tab = "issues" }
             }
           end
         },
+        {
+          content = function(record)
+            if record.issues_to_vote_count > 0 then
+              ui.link{
+                attr = { class = "not_voted" },
+                text = _"Not yet voted" .. ": " .. tostring(record.issues_to_vote_count),
+                module = "area",
+                view = "show",
+                id = record.id,
+                params = {
+                  filter = "frozen",
+                  filter_voting = "not_voted",
+                  tab = "issues"
+                }
+              }
+            end
+          end
+        },
       }
     }
   end
@@ -175,3 +239,61 @@
   }
 }
 
+slot.put("<br /> &nbsp; ")
+
+
+ui.image{
+  attr = { title = title, alt = title },
+  static = "icons/16/user_gray.png"
+}
+slot.put(" ")
+slot.put(_"Member of area")
+slot.put(" &nbsp; ")
+
+ui.image{
+  attr = { title = title, alt = title },
+  static = "icons/16/new.png"
+}
+slot.put(" ")
+slot.put(_"New")
+slot.put(" &nbsp; ")
+
+ui.image{
+  attr = { title = title, alt = title },
+  static = "icons/16/comments.png"
+}
+slot.put(" ")
+slot.put(_"Discussion")
+slot.put(" &nbsp; ")
+
+ui.image{
+  attr = { title = title, alt = title },
+  static = "icons/16/lock.png"
+}
+slot.put(" ")
+slot.put(_"Frozen")
+slot.put(" &nbsp; ")
+
+ui.image{
+  attr = { title = title, alt = title },
+  static = "icons/16/email_open.png"
+}
+slot.put(" ")
+slot.put(_"Voting")
+slot.put(" &nbsp; ")
+
+ui.image{
+  attr = { title = title, alt = title },
+  static = "icons/16/tick.png"
+}
+slot.put(" ")
+slot.put(_"Finished")
+slot.put(" &nbsp; ")
+
+ui.image{
+  attr = { title = title, alt = title },
+  static = "icons/16/cross.png"
+}
+slot.put(" ")
+slot.put(_"Cancelled")
+
diff -r fc9e748660c8 -r 00d1004545f1 app/main/area/show.lua
--- a/app/main/area/show.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/area/show.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -36,39 +36,104 @@
   params = { area_id = area.id }
 }
 
-ui.tabs{
-  {
-    name = "issues",
-    label = _"Issues",
+--[[
+for i, issue in ipairs(area.issues) do
+  local head_name = "issue_head_content_" .. tostring(issue.id)
+  local name = "issue_content_" .. tostring(issue.id)
+  local icon_name = "issue_icon_" .. tostring(issue.id)
+  ui.container{
+    attr = { class = "ui_tabs" },
     content = function()
-      execute.view{
-        module = "issue",
-        view = "_list",
-        params = { issues_selector = area:get_reference_selector("issues"), for_area_list = true }
+      local onclick = 
+        'if (ui_tabs_active["' .. name .. '"]) {' ..
+          'el=document.getElementById("' .. name .. '");' ..
+          'el.innerHTML="";' ..
+          'el.style.display="none";' ..
+          'ui_tabs_active["' .. name .. '"]=false' ..
+        '} else {' ..
+          'ui_tabs_active["' .. name .. '"]=true;' ..
+          'document.getElementById("' .. name .. '").style.display="block"; ' ..
+          'var hourglass_el = document.getElementById("' .. icon_name .. '");' ..
+          'var hourglass_src = hourglass_el.src;' ..
+          'hourglass_el.src = "' .. encode.url{ static = "icons/16/connect.png" } .. '";' ..
+          'partialMultiLoad(' ..
+            '{ trace: "trace", system_error: "system_error", ' .. name .. '_title: "title", ' .. name .. '_actions: "actions", ' .. name .. '_content: "default" },' ..
+            '{},' ..
+            '"error",' ..
+            '"' .. request.get_relative_baseurl() .. 'issue/show/' .. tostring(issue.id) .. '.html?&_webmcp_json_slots[]=title&_webmcp_json_slots[]=actions&_webmcp_json_slots[]=default&_webmcp_json_slots[]=trace&_webmcp_json_slots[]=system_error&dyn=1",' ..
+            '{},' ..
+            '{},' ..
+            'function() {' ..
+              'hourglass_el.src = hourglass_src;' ..
+            '},' ..
+            'function() {' ..
+              'hourglass_el.src = hourglass_src;' ..
+            '}' ..
+          '); ' ..
+        '}' ..
+        'return(false);'
+      ui.link{
+        attr = {
+          name = name,
+          class = "ui_tabs_accordeon_head",
+          id = head_name,
+          onclick = onclick,
+        },
+        module  = "issue",
+        view    = "show",
+        id      = issue.id,
+        params  = params,
+        anchor  = name,
+        content = function()
+          ui.image{
+            attr = { id = icon_name },
+            static = "icons/16/script.png"
+          }
+          ui.container{
+            attr = { style = "float: right;" },
+            content = function()
+              
+            end
+          }
+          slot.put(tostring(issue.id))
+        end
       }
     end
-  },
-  {
-    name = "members",
-    label = _"Members",
+  }
+
+  ui.container{
+    attr = {
+      id = name,
+      class = "ui_tabs_accordeon_content",
+    },
     content = function()
-      execute.view{
-        module = "member",
-        view = "_list",
-        params = { members_selector = area:get_reference_selector("members") }
-      }
+      ui.container{ attr = { id = name .. "_title",   }, content = function() slot.put("&nbsp;") end }
+      ui.container{ attr = { id = name .. "_actions", }, content = function() slot.put("&nbsp;") end }
+      ui.container{ attr = { id = name .. "_content", }, content = function() 
+        execute.view{
+          module = "initiative",
+          view = "_list",
+          params = {
+            issue = issue,
+            initiatives_selector = issue:get_reference_selector("initiatives"),
+            limit = 3,
+            per_page = 3,
+            no_sort = true,
+          }
+        }
+      end }
     end
-  },
-  {
-    name = "delegations",
-    label = _"Delegations",
-    content = function()
-      execute.view{
-        module = "delegation",
-        view = "_list",
-        params = { delegations_selector = area:get_reference_selector("delegations") }
-      }
-    end
-  },
+  }
+
+  if config.user_tab_mode == "accordeon_all_expanded" then
+    ui.script{ script = 'document.getElementById("' .. head_name .. '").onclick();' }
+  end
+end
+--]]
+
+execute.view{
+  module = "area",
+  view = "show_tab",
+  params = { area = area }
 }
 
diff -r fc9e748660c8 -r 00d1004545f1 app/main/area/show_tab.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/area/show_tab.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,40 @@
+local area = param.get("area", "table") or Area:by_id(param.get("area_id", atom.integer))
+
+local issues_selector = area:get_reference_selector("issues")
+local members_selector = area:get_reference_selector("members")
+local delegations_selector = area:get_reference_selector("delegations")
+
+ui.tabs{
+  module = "area",
+  view = "show_tab",
+  static_params = { area_id = area.id },
+  {
+    name = "issues",
+    label = _"Issues" .. " (" .. tostring(issues_selector:count()) .. ")",
+    icon = { static = "icons/16/folder.png" },
+    module = "issue",
+    view = "_list",
+    params = {
+      issues_selector = issues_selector,
+      filter = cgi.params["filter"],
+      filter_voting = param.get("filter_voting")
+    }
+  },
+  {
+    name = "members",
+    label = _"Members" .. " (" .. tostring(members_selector:count()) .. ")",
+    icon = { static = "icons/16/group.png" },
+    module = "member",
+    view = "_list",
+    params = { members_selector = members_selector }
+  },
+  {
+    name = "delegations",
+    label = _"Delegations" .. " (" .. tostring(delegations_selector:count()) .. ")",
+    icon = { static = "icons/16/table_go.png" },
+    module = "delegation",
+    view = "_list",
+    params = { delegations_selector = delegations_selector }
+  },
+}
+
diff -r fc9e748660c8 -r 00d1004545f1 app/main/delegation/_show_box.lua
--- a/app/main/delegation/_show_box.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/delegation/_show_box.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -1,43 +1,106 @@
-slot.select("actions", function()
-
-  local delegation
-  local area_id
-  local issue_id
-
-  local scope = "global"
+function change_delegation(scope, area_id, issue, delegation)
+  local image
+  local text
+  if scope == "global" and delegation then
+    image = { static = "icons/16/table_go.png" }
+    text = _"Change global delegation"
+  elseif scope == "global" and not delegation then
+    image = { static = "icons/16/table_go.png" }
+    text = _"Set global delegation"
+  elseif scope == "area" and delegation and delegation.area_id then
+    image = { static = "icons/16/table_go.png" }
+    text = _"Change area delegation"
+  elseif scope == "area" and not (delegation and delegation.area_id) then
+    image = { static = "icons/16/table_go.png" }
+    text = _"Set area delegation"
+  elseif scope == "issue" then
+    if delegation and delegation.issue_id then
+      image = { static = "icons/16/table_go.png" }
+      text = _"Change issue delegation"
+    elseif issue.state ~= "finished" and issue.state ~= "cancelled" then
+      image = { static = "icons/16/table_go.png" }
+      text = _"Set issue delegation"
+    end
+  end
+  ui.container{
+    attr = {
+      class = "change_delegation",
+    },
+    content = function()
+      ui.link{
+        image  = image,
+        text   = text,
+        module = "delegation",
+        view = "new",
+        params = {
+          issue_id = issue and issue.id or nil,
+          area_id = area_id
+        },
+      }
+      if delegation then
+        ui.link{
+          image  = { static = "icons/16/delete.png" },
+          text   = _"Revoke",
+          module = "delegation",
+          action = "update",
+          params = { issue_id = delegation.issue_id, area_id = delegation.area_id, delete = true },
+          routing = {
+            default = {
+              mode = "redirect",
+              module = request.get_module(),
+              view = request.get_view(),
+              id = param.get_id_cgi(),
+              params = param.get_all_cgi()
+            }
+          }
+        }
+      end
+    end
+  }
+end
 
-  if param.get("initiative_id", atom.integer) then
-    issue_id = Initiative:by_id(param.get("initiative_id", atom.integer)).issue_id
-    scope = "issue"
-  end
+local delegation
+local area_id
+local issue_id
+
+local scope = "global"
 
-  if param.get("issue_id", atom.integer) then
-    issue_id = param.get("issue_id", atom.integer)
-    scope = "issue"
-  end
+if param.get("initiative_id", atom.integer) then
+  issue_id = Initiative:by_id(param.get("initiative_id", atom.integer)).issue_id
+  scope = "issue"
+end
 
-  if param.get("area_id", atom.integer) then
-    area_id = param.get("area_id", atom.integer)
-    scope = "area"
-  end
+if param.get("issue_id", atom.integer) then
+  issue_id = param.get("issue_id", atom.integer)
+  scope = "issue"
+end
+
+if param.get("area_id", atom.integer) then
+  area_id = param.get("area_id", atom.integer)
+  scope = "area"
+end
 
 
 
-  local delegation
-  local issue
-  if issue_id then
-    issue = Issue:by_id(issue_id)
-    delegation = Delegation:by_pk(app.session.member.id, nil, issue_id)
-    if not delegation then
-      delegation = Delegation:by_pk(app.session.member.id, issue.area_id)
-    end
-  elseif area_id then
-    delegation = Delegation:by_pk(app.session.member.id, area_id)
+local delegation
+local issue
+if issue_id then
+  issue = Issue:by_id(issue_id)
+  delegation = Delegation:by_pk(app.session.member.id, nil, issue_id)
+  if not delegation then
+    delegation = Delegation:by_pk(app.session.member.id, issue.area_id)
   end
+elseif area_id then
+  delegation = Delegation:by_pk(app.session.member.id, area_id)
+end
 
-  if not delegation then
-    delegation = Delegation:by_pk(app.session.member.id)
-  end
+if not delegation then
+  delegation = Delegation:by_pk(app.session.member.id)
+end
+
+
+slot.select("actions", function()
+
   if delegation then
     ui.container{
       attr = { class = "delegation vote_info"},
@@ -85,6 +148,10 @@
               :add_order_by("index")
               :exec()
     
+            if not issue or (issue.state ~= "finished" and issue.state ~= "cancelled") then
+              change_delegation(scope, area_id, issue, delegation)
+            end
+
             for i, record in ipairs(delegation_chain) do
               local style
               local overridden = record.overridden
@@ -115,29 +182,6 @@
                         end
                       end
                     }
-                    if i == 2 then
-                      if not issue or (issue.state ~= "finished" and issue.state ~= "cancelled") then
-                        ui.link{
-                          attr = { class = "revoke" },
-                          content = function()
-                            ui.image{ static = "icons/16/delete.png" }
-                            slot.put(_"Revoke")
-                          end,
-                          module = "delegation",
-                          action = "update",
-                          params = { issue_id = delegation.issue_id, area_id = delegation.area_id, delete = true },
-                          routing = {
-                            default = {
-                              mode = "redirect",
-                              module = request.get_module(),
-                              view = request.get_view(),
-                              id = param.get_id_cgi(),
-                              params = param.get_all_cgi()
-                            }
-                          }
-                        }
-                      end
-                    end
                   end
                 }
               end
@@ -155,7 +199,7 @@
                 ui.container{
                   attr = { class = "delegation_participation" },
                   content = function()
-                    slot.put("<br /><br />-----> Participation<br />")
+                    slot.put(_"This member is participating, the rest of delegation chain is suspended while discussing")
                   end
                 }
               end
@@ -165,38 +209,7 @@
         }
       end
     }
-
-
+  else
+    change_delegation(scope, area_id, issue)
   end
-  ui.link{
-    content = function()
-      if scope == "global" and delegation then
-        ui.image{ static = "icons/16/table_go.png" }
-        slot.put(_"Change global delegation")
-      elseif scope == "global" and not delegation then
-        ui.image{ static = "icons/16/table_go.png" }
-        slot.put(_"Set global delegation")
-      elseif scope == "area" and delegation and delegation.area_id then
-        ui.image{ static = "icons/16/table_go.png" }
-        slot.put(_"Change area delegation")
-      elseif scope == "area" and not (delegation and delegation.area_id) then
-        ui.image{ static = "icons/16/table_go.png" }
-        slot.put(_"Set area delegation")
-      elseif scope == "issue" then
-        if delegation and delegation.issue_id then
-          ui.image{ static = "icons/16/table_go.png" }
-          slot.put(_"Change issue delegation")
-        elseif issue.state ~= "finished" and issue.state ~= "cancelled" then
-          ui.image{ static = "icons/16/table_go.png" }
-          slot.put(_"Set issue delegation")
-        end
-      end
-    end,
-    module = "delegation",
-    view = "new",
-    params = {
-      area_id = area_id,
-      issue_id = issue_id 
-    }
-  }
 end)
diff -r fc9e748660c8 -r 00d1004545f1 app/main/draft/_show.lua
--- a/app/main/draft/_show.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/draft/_show.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -6,8 +6,15 @@
   readonly = true,
   content = function()
 
-    ui.field.text{ label = _"Last author", name = "author_name" }
-    ui.field.timestamp{ label = _"Created at", name = "created" }
+    ui.field.text{ 
+      label = _"Last author",
+      value = _(
+        "#{author} at #{date}", {
+          author = draft.author_name,
+          date = format.timestamp(draft.created)
+        }
+      )
+    }
     ui.container{
       attr = { class = "draft_content wiki" },
       content = function()
diff -r fc9e748660c8 -r 00d1004545f1 app/main/index/about.lua
--- a/app/main/index/about.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/index/about.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -1,5 +1,18 @@
 slot.put_into("title", encode.html(_"About LiquidFeedback"))
 
+if app.session.member_id then
+  slot.select("actions", function()
+    ui.link{
+      module = "index",
+      view = "usage_terms",
+      content = function()
+        ui.image{ static = "icons/16/script.png" }
+        slot.put(_"Terms of use")
+      end
+    }
+  end)
+end
+
 
 slot.put("<br />")
 ui.field.text{ attr = { style = "font-weight: bold;" }, value = "Diensteanbieter:" }
diff -r fc9e748660c8 -r 00d1004545f1 app/main/index/index.lua
--- a/app/main/index/index.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/index/index.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -23,6 +23,7 @@
               attr = { style = "margin-left: 0.5em;", alt = lang }
             }
           end,
+          text = _('Select language "#{langcode}"', { langcode = lang }),
           module = "index",
           action = "set_lang",
           params = { lang = lang },
diff -r fc9e748660c8 -r 00d1004545f1 app/main/index/login.lua
--- a/app/main/index/login.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/index/login.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -24,6 +24,7 @@
               attr = { style = "margin-left: 0.5em;", alt = lang }
             }
           end,
+          text = _('Select language "#{langcode}"', { langcode = lang }),
           module = "index",
           action = "set_lang",
           params = { lang = lang },
diff -r fc9e748660c8 -r 00d1004545f1 app/main/index/search.lua
--- a/app/main/index/search.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/index/search.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -1,44 +1,41 @@
-local search_for = param.get("search_for", atom.string)
+local search_for = param.get("search_for", atom.string) or "global"
 local search_string = param.get("search", atom.string)
 
-search_for = search_for or "global"
-
 slot.put_into("title", _("Search results for: '#{search}'", { search  = search_string }))
 
+
 if search_for == "global" or search_for == "member" then
-  members_selector = Member:get_search_selector(search_string)
---if #members > 0 then
+  local members_selector = Member:get_search_selector(search_string)
   ui.heading{ content = _"Members" }
   execute.view{
     module = "member",
     view = "_list",
     params = { members_selector = members_selector },
   }
---end
 end
 
-if search_for == "global" or search_for == "issue" then
-  issues_selector = Issue:get_search_selector(search_string)
---if #issues > 0 then
-  ui.heading{ content = _"Issues" }
-  execute.view{
-    module = "issue",
-    view = "_list",
-    params = { issues_selector = issues_selector, highlight_string = search_string },
-  }
---end
-end
-
-if search_for == "initiative" then
-  initiatives_selector = Initiative:get_search_selector(search_string)
---if #initiatives > 0 then
+if search_for == "global" or search_for == "initiative" then
+  local initiatives_selector = Initiative:get_search_selector(search_string)
   ui.heading{ content = _"Initiatives" }
   execute.view{
     module = "initiative",
     view = "_list",
     params = { initiatives_selector = initiatives_selector },
   }
---end
+end
+
+if search_for == "issue" then
+  local issues_selector = Issue:get_search_selector(search_string)
+  ui.heading{ content = _"Issues" }
+  execute.view{
+    module = "issue",
+    view = "_list",
+    params = {
+      issues_selector = issues_selector,
+      highlight_string = search_string,
+      no_filter = true
+    },
+  }
 end
 
 
diff -r fc9e748660c8 -r 00d1004545f1 app/main/index/usage_terms.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/index/usage_terms.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,17 @@
+slot.select("actions", function()
+  ui.link{
+    module = "index",
+    view = "about",
+    content = function()
+      ui.image{ static = "icons/16/cancel.png" }
+      slot.put(_"Back")
+    end
+  }
+end)
+
+ui.container{
+  attr = { class = "wiki use_terms" },
+  content = function()
+    slot.put(format.wiki_text(config.use_terms))
+  end
+}
diff -r fc9e748660c8 -r 00d1004545f1 app/main/initiative/_current_draft.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/initiative/_current_draft.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,16 @@
+local initiator = param.get("initiator", "table")
+local initiative = param.get("initiative", "table")
+
+if initiator and initiator.accepted and not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked then
+  ui.link{
+    attr = { style = "float: right;" },
+    content = function()
+      ui.image{ static = "icons/16/script_add.png" }
+      slot.put(_"Edit draft")
+    end,
+    module = "draft",
+    view = "new",
+    params = { initiative_id = initiative.id }
+  }
+end
+execute.view{ module = "draft", view = "_show", params = { draft = initiative.current_draft } }
diff -r fc9e748660c8 -r 00d1004545f1 app/main/initiative/_details.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/initiative/_details.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,20 @@
+local initiative = param.get("initiative", "table")
+
+ui.form{
+  attr = { class = "vertical" },
+  record = initiative,
+  readonly = true,
+  content = function()
+    ui.field.text{ label = _"Issue policy", value = initiative.issue.policy.name }
+    ui.field.text{
+      label = _"Created at",
+      value = tostring(initiative.created)
+    }
+    ui.field.text{
+      label = _"Created at",
+      value = format.timestamp(initiative.created)
+    }
+  -- ui.field.date{ label = _"Revoked at", name = "revoked" }
+    ui.field.boolean{ label = _"Admitted", name = "admitted" }
+  end
+}
diff -r fc9e748660c8 -r 00d1004545f1 app/main/initiative/_initiators.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/initiative/_initiators.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,58 @@
+local initiative = param.get("initiative", "table")
+local initiator = param.get("initiator", "table")
+local initiators_members_selector = param.get("initiators_members_selector", "table")
+
+local initiator_count = initiators_members_selector:count()
+
+if initiator and initiator.accepted and not initiative.issue.fully_frozen and not initiative.issue.closed and not initiative.revoked then
+  ui.link{
+    attr = { class = "action" },
+    content = function()
+      ui.image{ static = "icons/16/user_add.png" }
+      slot.put(_"Invite initiator")
+    end,
+    module = "initiative",
+    view = "add_initiator",
+    params = { initiative_id = initiative.id }
+  }
+  if initiator_count > 1 then
+    ui.link{
+      content = function()
+        ui.image{ static = "icons/16/user_delete.png" }
+        slot.put(_"Remove initiator")
+      end,
+      module = "initiative",
+      view = "remove_initiator",
+      params = { initiative_id = initiative.id }
+    }
+  end
+end
+if initiator and initiator.accepted == false then
+    ui.link{
+      image  = { static = "icons/16/user_delete.png" },
+      text   = _"Cancel refuse of invitation",
+      module = "initiative",
+      action = "remove_initiator",
+      params = {
+        initiative_id = initiative.id,
+        member_id = app.session.member.id
+      },
+      routing = {
+        ok = {
+          mode = "redirect",
+          module = "initiative",
+          view = "show",
+          id = initiative.id
+        }
+      }
+    }
+end
+
+execute.view{
+  module = "member",
+  view = "_list",
+  params = {
+    members_selector = initiators_members_selector,
+    initiator = initiator
+  }
+}
diff -r fc9e748660c8 -r 00d1004545f1 app/main/initiative/_list.lua
--- a/app/main/initiative/_list.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/initiative/_list.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -1,71 +1,10 @@
-local initiatives_selector = param.get("initiatives_selector", "table")
-initiatives_selector:join("issue", nil, "issue.id = initiative.issue_id")
-
-local limit = param.get("limit", atom.number)
-
-local more_initiatives_count
-if limit then
-  local initiatives_count = initiatives_selector:count()
-  if initiatives_count > limit then
-    more_initiatives_count = initiatives_count - limit
-  end
-  initiatives_selector:limit(limit)
-end
-
+ui.script{ script = "lf_initiative_expanded = {};" }
 
 local issue = param.get("issue", "table")
 
-local order_options = {}
-
-if issue and issue.ranks_available then
-  order_options[#order_options+1] = {
-    name = "rank",
-    label = _"Rank",
-    order_by = "initiative.rank, initiative.admitted DESC, vote_ratio(initiative.positive_votes, initiative.negative_votes) DESC, initiative.id"
-  }
-end
-
-order_options[#order_options+1] = {
-  name = "potential_support",
-  label = _"Potential support",
-  order_by = "initiative.supporter_count::float / issue.population::float DESC, initiative.id"
-}
-
-order_options[#order_options+1] = {
-  name = "support",
-  label = _"Support",
-  order_by = "initiative.satisfied_supporter_count::float / issue.population::float DESC, initiative.id"
-}
-
-order_options[#order_options+1] = {
-  name = "newest",
-  label = _"Newest",
-  order_by = "initiative.created DESC, initiative.id"
-}
-
-order_options[#order_options+1] = {
-  name = "oldest",
-  label = _"Oldest",
-  order_by = "initiative.created, initiative.id"
-}
-
-local name = "initiative_list"
-if issue then
-  name = "issue_" .. tostring(issue.id) ..  "_initiative_list"
-end
-
-ui_order = ui.order
-
-if param.get("no_sort", atom.boolean) then
-  ui_order = function(args) args.content() end
-  if issue.ranks_available then
-    initiatives_selector:add_order_by("initiative.rank, initiative.admitted DESC, vote_ratio(initiative.positive_votes, initiative.negative_votes) DESC, initiative.id")
-  else
-    initiatives_selector:add_order_by("initiative.supporter_count::float / issue.population::float DESC, initiative.id")
-  end
-end
-
+local initiatives_selector = param.get("initiatives_selector", "table")
 initiatives_selector
+  :join("issue", nil, "issue.id = initiative.issue_id")
   :left_join("initiator", "_initiator", { "_initiator.initiative_id = initiative.id AND _initiator.member_id = ?", app.session.member.id} )
   :left_join("supporter", "_supporter", { "_supporter.initiative_id = initiative.id AND _supporter.member_id = ?", app.session.member.id} )
 
@@ -73,128 +12,213 @@
   :add_field({"(_supporter.member_id NOTNULL) AND NOT EXISTS(SELECT 1 FROM opinion WHERE opinion.initiative_id = initiative.id AND opinion.member_id = ? AND ((opinion.degree = 2 AND NOT fulfilled) OR (opinion.degree = -2 AND fulfilled)))", app.session.member.id }, "is_supporter")
   :add_field({"EXISTS(SELECT 1 FROM opinion WHERE opinion.initiative_id = initiative.id AND opinion.member_id = ? AND ((opinion.degree = 2 AND NOT fulfilled) OR (opinion.degree = -2 AND fulfilled)))", app.session.member.id }, "is_potential_supporter")
 
+local initiatives_count = initiatives_selector:count()
 
-ui_order{
-  name = name,
-  selector = initiatives_selector,
-  options = order_options,
-  content = function()
-    ui.paginate{
-      name = issue and "issue_" .. tostring(issue.id) .. "_page" or nil,
-      selector = initiatives_selector,
-      per_page = param.get("per_page", atom.number),
+local limit = param.get("limit", atom.number)
+local no_sort = param.get("no_sort", atom.boolean)
+
+local show_for_issue = param.get("show_for_issue", atom.boolean)
+
+local show_for_initiative
+
+local show_for_initiative_id = param.get("for_initiative_id", atom.number)
+
+if show_for_initiative_id then
+  show_for_initiative = Initiative:by_id(show_for_initiative_id)
+
+elseif not show_for_initiative_id and show_for_issue and issue and issue.ranks_available then
+  winning_initiative = Initiative:new_selector()
+    :add_where{ "issue_id = ?", issue.id }
+    :add_where("rank = 1")
+    :single_object_mode()
+    :exec()
+  if winning_initiative then
+    show_for_initiative = winning_initiative
+    ui.container{
+      attr = { class = "admitted_info" },
+      content = _"This issue has been finished with the following winning initiative:"
+    }
+  else
+    ui.container{
+      attr = { class = "not_admitted_info" },
+      content = _"This issue has been finished without any winning initiative."
+    }
+  end
+end
+
+
+if show_for_initiative then
+  ui.script{ script = "lf_initiative_expanded['initiative_content_" .. tostring(show_for_initiative.id) .. "'] = true;" }
+  initiatives_selector:add_where{ "initiative.id != ?", show_for_initiative.id }
+
+  execute.view{
+    module = "initiative",
+    view = "_list_element",
+    params = {
+      initiative = show_for_initiative,
+      expanded = true,
+      expandable = true
+    }
+  }
+  if show_for_issue then
+    slot.put("<br />")
+    ui.container{
+      attr = { style = "font-weight: bold;" },
       content = function()
-        local initiatives = initiatives_selector:exec()
-        local columns = {}
-        columns[#columns+1] = {
-          content = function(record)
-            if record.issue.accepted and record.issue.closed and record.issue.ranks_available then 
-              ui.field.rank{ attr = { class = "rank" }, value = record.rank }
-            end
-          end
-        }
-        columns[#columns+1] = {
-          content = function(record)
-            if record.issue.accepted and record.issue.closed then
-              if record.issue.ranks_available then 
-                if record.negative_votes and record.positive_votes then
-                  local max_value = record.issue.voter_count
-                  ui.bargraph{
-                    max_value = max_value,
-                    width = 100,
-                    bars = {
-                      { color = "#0a0", value = record.positive_votes },
-                      { color = "#aaa", value = max_value - record.negative_votes - record.positive_votes },
-                      { color = "#a00", value = record.negative_votes },
-                    }
-                  }
-                end
-              else
-                slot.put(_"Counting of votes")
-              end
-            else
-              local max_value = (record.issue.population or 0)
-              ui.bargraph{
-                max_value = max_value,
-                width = 100,
-                bars = {
-                  { color = "#0a0", value = (record.satisfied_supporter_count or 0) },
-                  { color = "#777", value = (record.supporter_count or 0) - (record.satisfied_supporter_count or 0) },
-                  { color = "#ddd", value = max_value - (record.supporter_count or 0) },
-                }
-              }
-            end
-          end
-        }
-        columns[#columns+1] = {
-          content = function(record)
-            local link_class
-            if record.revoked then
-              link_class = "revoked"
-            end
-            ui.link{
-              attr = { class = link_class },
-              content = function()
-                local name
-                if record.name_highlighted then
-                  name = encode.highlight(record.name_highlighted)
-                else
-                  name = encode.html(record.name)
-                end
-                slot.put(name)
-              end,
-              module = "initiative",
-              view = "show",
-              id = record.id
-            }
-            if record.issue.state == "new" then
-              ui.image{
-                static = "icons/16/new.png"
-              }
-            end
-            if record.is_supporter then
-              slot.put("&nbsp;")
-              local label = _"You are supporting this initiative"
-              ui.image{
-                attr = { alt = label, title = label },
-                static = "icons/16/thumb_up_green.png"
-              }
-            end
-            if record.is_potential_supporter then
-              slot.put("&nbsp;")
-              local label = _"You are potential supporter of this initiative"
-              ui.image{
-                attr = { alt = label, title = label },
-                static = "icons/16/thumb_up.png"
-              }
-            end
-            if record.is_initiator then
-              slot.put("&nbsp;")
-              local label = _"You are iniator of this initiative"
-              ui.image{
-                attr = { alt = label, title = label },
-                static = "icons/16/user_edit.png"
-              }
-            end
-          end
-        }
-
-        ui.list{
-          attr = { class = "initiatives" },
-          records = initiatives,
-          columns = columns
-        }
+        slot.put(_"Alternative initiatives")
       end
     }
   end
-}
-
-if more_initiatives_count then
-  ui.link{
-    attr = { style = "font-size: 75%; font-style: italic;" },
-    content = _("#{count} more initiatives", { count = more_initiatives_count }),
-    module = "issue",
-    view = "show",
-    id = issue.id,
+elseif show_for_issue then
+  ui.container{
+    attr = { style = "font-weight: bold;" },
+    content = function()
+      slot.put(_"Alternative initiatives")
+    end
   }
 end
+
+if not show_for_initiative or initiatives_count > 1 then
+
+
+  local more_initiatives_count
+  if limit then
+    limit = limit - (show_for_initiative and 1 or 0)
+    if initiatives_count > limit then
+      more_initiatives_count = initiatives_count - limit
+    end
+    initiatives_selector:limit(limit)
+  end
+
+  local expandable = param.get("expandable", atom.boolean)
+
+  local issue = param.get("issue", "table")
+
+  local name = "initiative_list"
+  if issue then
+    name = "issue_" .. tostring(issue.id) ..  "_initiative_list"
+  end
+
+  ui.add_partial_param_names{ name }
+
+  local order_filter = {
+    name = name,
+    label = _"Order by"
+  }
+
+  if issue and issue.ranks_available then
+    order_filter[#order_filter+1] = {
+      name = "rank",
+      label = _"Rank",
+      selector_modifier = function(selector) selector:add_order_by("initiative.rank, initiative.admitted DESC, vote_ratio(initiative.positive_votes, initiative.negative_votes) DESC, initiative.id") end
+    }
+  end
+
+  order_filter[#order_filter+1] = {
+    name = "potential_support",
+    label = _"Potential support",
+    selector_modifier = function(selector) selector:add_order_by("initiative.supporter_count::float / issue.population::float DESC, initiative.id") end
+  }
+
+  order_filter[#order_filter+1] = {
+    name = "support",
+    label = _"Support",
+    selector_modifier = function(selector) selector:add_order_by("initiative.satisfied_supporter_count::float / issue.population::float DESC, initiative.id") end
+  }
+
+  order_filter[#order_filter+1] = {
+    name = "newest",
+    label = _"Newest",
+    selector_modifier = function(selector) selector:add_order_by("initiative.created DESC, initiative.id") end
+  }
+
+  order_filter[#order_filter+1] = {
+    name = "oldest",
+    label = _"Oldest",
+    selector_modifier = function(selector) selector:add_order_by("initiative.created, initiative.id") end
+  }
+
+  ui_filters = ui.filters
+
+  if no_sort then
+    ui_filters = function(args) args.content() end
+    if issue.ranks_available then
+      initiatives_selector:add_order_by("initiative.rank, initiative.admitted DESC, vote_ratio(initiative.positive_votes, initiative.negative_votes) DESC, initiative.id")
+    else
+      initiatives_selector:add_order_by("initiative.supporter_count::float / issue.population::float DESC, initiative.id")
+    end
+  end
+
+  ui_filters{
+    label = _"Change order",
+    order_filter,
+    selector = initiatives_selector,
+    content = function()
+      ui.paginate{
+        name = issue and "issue_" .. tostring(issue.id) .. "_page" or nil,
+        selector = initiatives_selector,
+        per_page = param.get("per_page", atom.number),
+        content = function()
+          local initiatives = initiatives_selector:exec()
+          for i, initiative in ipairs(initiatives) do
+            local expanded = config.user_tab_mode == "accordeon_all_expanded" and expandable or
+              show_for_initiative and initiative.id == show_for_initiative.id
+            if expanded then
+              ui.script{ script = "lf_initiative_expanded['initiative_content_" .. tostring(initiative.id) .. "'] = true;" }
+            end
+            execute.view{
+              module = "initiative",
+              view = "_list_element",
+              params = {
+                initiative = initiative,
+                expanded = expanded,
+                expandable = expandable
+              }
+            }
+          end
+        end
+      }
+    end
+  }
+
+  if more_initiatives_count then
+    ui.link{
+      attr = { style = "font-size: 75%; font-style: italic;" },
+      content = _("and #{count} more initiatives", { count = more_initiatives_count }),
+      module = "issue",
+      view = "show",
+      id = issue.id,
+    }
+  end
+
+end
+
+if show_for_issue then
+  slot.put("<br />")
+  
+  if issue and initiatives_count == 1 then
+    ui.container{
+      content = function()
+        if issue.fully_frozen or issue.closed then
+          slot.put(_"There were no more alternative initiatives.")
+        else
+          slot.put(_"There are no more alternative initiatives currently.")
+        end
+      end
+    }
+  end
+
+  if not (issue.fully_frozen or issue.closed) then
+    slot.put(" ")
+    ui.link{
+      content = function()
+        ui.image{ static = "icons/16/script_add.png" }
+        slot.put(" ")
+        slot.put(_"Create alternative initiative")
+      end,
+      module = "initiative",
+      view = "new",
+      params = { issue_id = issue.id }
+    }
+  end
+end
diff -r fc9e748660c8 -r 00d1004545f1 app/main/initiative/_list_element.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/initiative/_list_element.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,208 @@
+local initiative = param.get("initiative", "table")
+local expanded = param.get("expanded", atom.boolean)
+local expandable = param.get("expandable", atom.boolean)
+
+local head_name = "initiative_head_" ..    tostring(initiative.id)
+local link_name = "initiative_link_" ..    tostring(initiative.id)
+local name      = "initiative_content_" .. tostring(initiative.id)
+local icon_name = "initiative_icon_" ..    tostring(initiative.id)
+
+ui.container{
+  attr = { class = "ui_tabs" .. (initiative.id == for_initiative_id and " active" or "") },
+  content = function()
+    local web20 = config.user_tab_mode == "accordeon"
+      or config.user_tab_mode == "accordeon_first_expanded"
+      or config.user_tab_mode == "accordeon_all_expanded"
+    local onclick
+    if web20 then
+      if expandable then
+      onclick = 
+        'if (lf_initiative_expanded["' .. name .. '"]) {' ..
+          'lf_initiative_expanded["' .. name .. '"]=false;' ..
+          'document.getElementById("' .. name .. '_content").innerHTML="&nbsp;";' ..
+          'document.getElementById("' .. name .. '").style.display="none";' ..
+        '} else {' ..
+          'lf_initiative_expanded["' .. name .. '"] = true;' ..
+          'document.getElementById("' .. name .. '").style.display="block"; ' ..
+          'var hourglass_el = document.getElementById("' .. icon_name .. '");' ..
+          'var hourglass_src = hourglass_el.src;' ..
+          'hourglass_el.src = "' .. encode.url{ static = "icons/16/connect.png" } .. '";' ..
+          'partialMultiLoad(' ..
+            '{ trace: "trace", system_error: "system_error", ' .. name .. '_content: "default" },' ..
+            '{},' ..
+            '"error",' ..
+            '"' .. request.get_relative_baseurl() .. 'initiative/show_partial/' .. tostring(initiative.id) .. '.html?&_webmcp_json_slots[]=default&_webmcp_json_slots[]=support&_webmcp_json_slots[]=trace&_webmcp_json_slots[]=system_error",' ..
+            '{},' ..
+            '{},' ..
+            'function() {' ..
+              'hourglass_el.src = hourglass_src;' ..
+            '},' ..
+            'function() {' ..
+              'hourglass_el.src = hourglass_src;' ..
+            '}' ..
+          '); ' ..
+        '}' ..
+        'return(false);'
+      else
+        onclick = "document.location.href = document.getElementById('" .. link_name .. "').href;"
+      end
+    end
+    local module = "initiative"
+    local view = "show"
+    local id = initiative.id
+    local params = {}
+    ui.container{
+      attr = {
+        name = name,
+        class = "ui_tabs_accordeon_head",
+        id = head_name,
+        onclick = onclick,
+      },
+      content = function()
+
+        ui.container{
+          attr = { style = "float: left; width: 4em;"},
+          content = function()
+            if initiative.issue.accepted and initiative.issue.closed and initiative.issue.ranks_available or initiative.admitted == false then 
+              ui.field.rank{ image_attr = { id = icon_name }, attr = { class = "rank" }, value = initiative.rank }
+            elseif web20 then
+              ui.image{
+                attr = {
+                  width = 16,
+                  height = 16,
+                  id = icon_name,
+                  style = "float: left;"
+                },
+                static = "icons/16/script.png"
+              }
+            else
+              slot.put("&nbsp;")
+            end
+          end
+        }
+
+        ui.container{
+          attr = { style = "float: left; width: 110px;"},
+          content = function()
+            if initiative.issue.accepted and initiative.issue.closed then
+              if initiative.issue.ranks_available then 
+                if initiative.negative_votes and initiative.positive_votes then
+                  local max_value = initiative.issue.voter_count
+                  ui.bargraph{
+                    max_value = max_value,
+                    width = 100,
+                    bars = {
+                      { color = "#0a0", value = initiative.positive_votes },
+                      { color = "#aaa", value = max_value - initiative.negative_votes - initiative.positive_votes },
+                      { color = "#a00", value = initiative.negative_votes },
+                    }
+                  }
+                else
+                  slot.put("&nbsp;")
+                end
+              else
+                slot.put(_"Counting of votes")
+              end
+            elseif initiative.issue.population then
+              local max_value = initiative.issue.population
+              ui.bargraph{
+                max_value = max_value,
+                width = 100,
+                bars = {
+                  { color = "#0a0", value = (initiative.satisfied_supporter_count or 0) },
+                  { color = "#bbb", value = (initiative.supporter_count or 0) - (initiative.satisfied_supporter_count or 0) },
+                  { color = "#eee", value = max_value - (initiative.supporter_count or 0) },
+                }
+              }
+            else
+              slot.put("&nbsp;")
+            end
+          end
+        }
+
+        ui.container{
+          attr = { style = "float: left;"},
+          content = function()
+            local link_class
+            if initiative.revoked then
+              link_class = "revoked"
+            end
+            ui.link{
+              attr = { id = link_name, class = link_class },
+              content = function()
+                local name
+                if initiative.name_highlighted then
+                  name = encode.highlight(initiative.name_highlighted)
+                else
+                  name = encode.html(initiative.name)
+                end
+                slot.put(name)
+              end,
+              module  = module,
+              view    = view,
+              id      = id,
+              params  = params,
+            }
+          end
+        }
+
+        if initiative.issue.state == "new" then
+          ui.image{
+            static = "icons/16/new.png"
+          }
+        end
+        if initiative.is_supporter then
+          slot.put("&nbsp;")
+          local label = _"You are supporting this initiative"
+          ui.image{
+            attr = { alt = label, title = label },
+            static = "icons/16/thumb_up_green.png"
+          }
+        end
+        if initiative.is_potential_supporter then
+          slot.put("&nbsp;")
+          local label = _"You are potential supporter of this initiative"
+          ui.image{
+            attr = { alt = label, title = label },
+            static = "icons/16/thumb_up.png"
+          }
+        end
+        if initiative.is_initiator then
+          slot.put("&nbsp;")
+          local label = _"You are iniator of this initiative"
+          ui.image{
+            attr = { alt = label, title = label },
+            static = "icons/16/user_edit.png"
+          }
+        end
+
+        slot.put("<br style='clear: left' />")
+      end
+    }
+  end
+}
+
+if ui.is_partial_loading_enabled() then
+  ui.container{
+    attr = {
+      id = name,
+      class = "ui_tabs_accordeon_content",
+      style = not expanded and "display: none;" or nil
+    },
+    content = function()
+      ui.container{
+        attr = { id = name .. "_content", style = "clear: left;" },
+        content = function()
+          execute.view{
+            module = "initiative",
+            view = "show_partial",
+            params = {
+              initiative = initiative,
+              expanded = expanded
+            }
+          }
+        end
+      }
+    end
+  }
+end
\ No newline at end of file
diff -r fc9e748660c8 -r 00d1004545f1 app/main/initiative/_show.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/initiative/_show.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,236 @@
+local initiative = param.get("initiative", "table")
+local initiator = param.get("initiator", "table")
+
+util.help("initiative.show")
+
+if initiative.issue.ranks_available and initiative.admitted then
+  local class = initiative.rank == 1 and "admitted_info" or "not_admitted_info"
+  ui.container{
+    attr = { class = class },
+    content = function()
+      local max_value = initiative.issue.voter_count
+      slot.put("&nbsp;")
+      local positive_votes = initiative.positive_votes
+      local negative_votes = initiative.negative_votes
+      slot.put(_"Yes" .. ": <b>" .. tostring(positive_votes) .. "</b>")
+      slot.put(" &middot; ")
+      slot.put(_"Abstention" .. ": <b>" .. tostring(max_value - initiative.negative_votes - initiative.positive_votes)  .. "</b>")
+      slot.put(" &middot; ")
+      slot.put(_"No" .. ": <b>" .. tostring(initiative.negative_votes) .. "</b>")
+      slot.put(" &middot; ")
+      slot.put("<b>")
+      if initiative.rank == 1 then
+        slot.put(_"Approved")
+      elseif initiative.rank then
+        slot.put(_("Not approved (rank #{rank})", { rank = initiative.rank }))
+      end
+      slot.put("</b>")
+    end
+  }
+end
+
+if initiative.admitted == false then
+  local policy = initiative.issue.policy
+  ui.container{
+    attr = { class = "not_admitted_info" },
+    content = _("This initiative has not been admitted! It failed the quorum of #{quorum}.", { quorum = format.percentage(policy.initiative_quorum_num / policy.initiative_quorum_den) })
+  }
+end
+
+local web20 = config.user_tab_mode == "accordeon"
+  or config.user_tab_mode == "accordeon_first_expanded"
+  or config.user_tab_mode == "accordeon_all_expanded"
+
+if not web20 and initiative.issue.state == "cancelled" then
+  local policy = initiative.issue.policy
+  ui.container{
+    attr = { class = "not_admitted_info" },
+    content = _("This issue has been cancelled. It failed the quorum of #{quorum}.", { quorum = format.percentage(policy.issue_quorum_num / policy.issue_quorum_den) })
+  }
+end
+
+if initiative.revoked then
+  ui.container{
+    attr = { class = "revoked_info" },
+    content = function()
+      slot.put(_("This initiative has been revoked at #{revoked}", { revoked = format.timestamp(initiative.revoked) }))
+      local suggested_initiative = initiative.suggested_initiative
+      if suggested_initiative then
+        slot.put("<br /><br />")
+        slot.put(_("The initiators suggest to support the following initiative:"))
+        slot.put(" ")
+        ui.link{
+          content = _("Issue ##{id}", { id = suggested_initiative.issue.id } ) .. ": " .. encode.html(suggested_initiative.name),
+          module = "initiative",
+          view = "show",
+          id = suggested_initiative.id
+        }
+      end
+    end
+  }
+end
+
+if initiator and initiator.accepted == nil then
+  ui.container{
+    attr = { class = "initiator_invite_info" },
+    content = function()
+      slot.put(_"You are invited to become initiator of this initiative.")
+      slot.put(" ")
+      ui.link{
+        image  = { static = "icons/16/tick.png" },
+        text   = _"Accept invitation",
+        module = "initiative",
+        action = "accept_invitation",
+        id     = initiative.id,
+        routing = {
+          default = {
+            mode = "redirect",
+            module = request.get_module(),
+            view = request.get_view(),
+            id = param.get_id_cgi(),
+            params = param.get_all_cgi()
+          }
+        }
+      }
+      slot.put(" ")
+      ui.link{
+        image  = { static = "icons/16/cross.png" },
+        text   = _"Refuse invitation",
+        module = "initiative",
+        action = "reject_initiator_invitation",
+        params = {
+          initiative_id = initiative.id,
+          member_id = app.session.member.id
+        },
+        routing = {
+          default = {
+            mode = "redirect",
+            module = request.get_module(),
+            view = request.get_view(),
+            id = param.get_id_cgi(),
+            params = param.get_all_cgi()
+          }
+        }
+      }
+    end
+  }
+  slot.put("<br />")
+end
+
+
+local supporter = app.session.member:get_reference_selector("supporters")
+  :add_where{ "initiative_id = ?", initiative.id }
+  :optional_object_mode()
+  :exec()
+
+if supporter and not initiative.issue.closed then
+  local old_draft_id = supporter.draft_id
+  local new_draft_id = initiative.current_draft.id
+  if old_draft_id ~= new_draft_id then
+    ui.container{
+      attr = { class = "draft_updated_info" },
+      content = function()
+        slot.put(_"The draft of this initiative has been updated!")
+        slot.put(" ")
+        ui.link{
+          content = _"Show diff",
+          module = "draft",
+          view = "diff",
+          params = {
+            old_draft_id = old_draft_id,
+            new_draft_id = new_draft_id
+          }
+        }
+        slot.put(" ")
+        ui.link{
+          text   = _"Refresh support to current draft",
+          module = "initiative",
+          action = "add_support",
+          id     = initiative.id,
+          routing = {
+            default = {
+              mode = "redirect",
+              module = "initiative",
+              view = "show",
+              id = initiative.id
+            }
+          }
+        }
+      end
+    }
+  end
+end
+
+
+
+ui.container{
+  attr = {
+    id = "initiative_" .. tostring(initiative.id) .. "_support"
+  },
+  content = function()
+    execute.view{
+      module = "initiative",
+      view = "show_support",
+      params = {
+        initiative = initiative
+      }
+    }
+  end
+}
+
+if (initiative.discussion_url and #initiative.discussion_url > 0)
+  or (initiator and initiator.accepted and not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked) then
+  ui.container{
+    attr = { class = "vertical" },
+    content = function()
+      ui.container{
+        attr = { class = "ui_field_label" },
+        content = _"Discussion with initiators"
+      }
+      ui.tag{
+        tag = "span",
+        content = function()
+          if initiative.discussion_url:find("^https?://") then
+            if initiative.discussion_url and #initiative.discussion_url > 0 then
+              ui.link{
+                attr = {
+                  class = "actions",
+                  target = "_blank",
+                  title = initiative.discussion_url
+                },
+                content = function()
+                  slot.put(encode.html(initiative.discussion_url))
+                end,
+                external = initiative.discussion_url
+              }
+            end
+          else
+            slot.put(encode.html(initiative.discussion_url))
+          end
+          slot.put(" ")
+          if initiator and initiator.accepted and not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked then
+            ui.link{
+              attr   = { class = "actions" },
+              text   = _"(change URL)",
+              module = "initiative",
+              view   = "edit",
+              id     = initiative.id
+            }
+          end
+        end
+      }
+    end
+  }
+end
+
+
+
+execute.view{
+  module = "initiative",
+  view = "show_tab",
+  params = {
+    initiative = initiative,
+    initiator = initiator
+  }
+}
+
diff -r fc9e748660c8 -r 00d1004545f1 app/main/initiative/_show_voting.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/initiative/_show_voting.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,112 @@
+local initiative = param.get("initiative", "table")
+
+
+local battled_initiatives = Initiative:new_selector()
+  :add_field("winning_battle.count", "winning_count")
+  :add_field("losing_battle.count", "losing_count")
+  :join("battle", "winning_battle", { "winning_battle.winning_initiative_id = ? AND winning_battle.losing_initiative_id = initiative.id", initiative.id })
+  :join("battle", "losing_battle", { "losing_battle.losing_initiative_id = ? AND losing_battle.winning_initiative_id = initiative.id", initiative.id })
+  :add_order_by("rank")
+  :exec()
+
+local number_of_initiatives = Initiative:new_selector()
+  :add_where{ "issue_id = ?", initiative.issue_id }
+  :add_where("admitted")
+  :count()
+
+if initiative.revoked then
+  slot.put(_"Not voted (revoked from initiator)")
+elseif initiative.admitted == false then
+  slot.put(_"Not voted (not admitted)")
+else
+  if number_of_initiatives > 1 then
+    ui.container{
+      attr = { class = "heading first" },
+      content = _"This initiative compared to alternative initiatives"
+    }
+
+    ui.list{
+      records = battled_initiatives,
+      columns = {
+        {
+          content = function()
+            slot.put(_"This initiative")
+          end
+        },
+        {
+          content = function(record)
+            local population = initiative.issue.voter_count
+            local value = record.winning_count
+            ui.bargraph{
+              class = "bargraph bargraph50",
+              max_value = population,
+              width = 50,
+              bars = {
+                { color = "#aaa", value = population - value },
+                { color = "#444", value = value },
+              }
+            }
+          end
+        },
+        {
+          content = function(record)
+            slot.put(record.winning_count)
+          end
+        },
+        {
+          content = function(record)
+            if record.winning_count == record.losing_count then
+              ui.image{ static = "icons/16/bullet_blue.png" }
+            elseif record.winning_count > record.losing_count then
+              ui.image{ static = "icons/16/resultset_previous.png" }
+            else
+              ui.image{ static = "icons/16/resultset_next.png" }
+            end
+          end
+        },
+        {
+          field_attr = { style = "text-align: right;" },
+          content = function(record)
+            slot.put(record.losing_count)
+          end
+        },
+        {
+          content = function(record)
+            local population = initiative.issue.voter_count
+            local value = record.losing_count
+            ui.bargraph{
+              class = "bargraph bargraph50",
+              max_value = population,
+              width = 50,
+              bars = {
+                { color = "#444", value = value },
+                { color = "#aaa", value = population - value },
+              }
+            }
+          end
+        },
+        {
+          name = "name"
+        }
+      }
+    }
+  end
+
+  ui.container{
+    attr = { class = "heading" },
+    content = _"Member voting"
+  }
+
+  execute.view{
+    module = "member",
+    view = "_list",
+    params = {
+      initiative = initiative,
+      members_selector =  initiative.issue:get_reference_selector("direct_voters")
+        :left_join("vote", nil, { "vote.initiative_id = ? AND vote.member_id = member.id", initiative.id })
+        :add_field("direct_voter.weight as voter_weight")
+        :add_field("coalesce(vote.grade, 0) as grade")
+    }
+  }
+
+end
diff -r fc9e748660c8 -r 00d1004545f1 app/main/initiative/_suggestions.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/initiative/_suggestions.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,26 @@
+local initiative = param.get("initiative", "table")
+
+if not initiative.issue.fully_frozen and not initiative.issue.closed and not initiative.revoked then
+  ui.link{
+    content = function()
+      ui.image{ static = "icons/16/comment_add.png" }
+      slot.put(_"Add new suggestion")
+    end,
+    module = "suggestion",
+    view = "new",
+    params = {
+      initiative_id = initiative.id
+    }
+  }
+end
+
+execute.view{
+  module = "suggestion",
+  view = "_list",
+  params = {
+    initiative = initiative,
+    suggestions_selector = initiative:get_reference_selector("suggestions"),
+    tab_id = param.get("tab_id")
+  }
+}
+
diff -r fc9e748660c8 -r 00d1004545f1 app/main/initiative/list_rss.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/initiative/list_rss.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,29 @@
+slot.set_layout("atom")
+
+request.force_absolute_baseurl()
+
+local initiatives = Initiative:new_selector()
+  :add_order_by("id DESC")
+  :limit(25)
+  :exec()
+
+for i, initiative in ipairs(initiatives) do
+  ui.tag{
+    tag = "entry",
+    content = function()
+      ui.tag{ tag = "category", attr = { term = initiative.issue.area.name } }
+      ui.tag{ tag = "author", content = initiative.current_draft.author.name }
+      ui.tag{ tag = "title", content = initiative.name }
+      ui.tag{ tag = "link", attr = { 
+        href = encode.url{
+          module = "initiative",
+          view = "show",
+          id = initiative.id
+        }
+      } }
+      ui.tag{ tag = "id",  content = "initiative_" .. tostring(initiative_id) }
+      ui.tag{ tag = "updated",  content = tostring(initiative.created) }
+      ui.tag{ tag = "content",  content = initiative.current_draft.draft }
+    end
+  }
+end
\ No newline at end of file
diff -r fc9e748660c8 -r 00d1004545f1 app/main/initiative/new.lua
--- a/app/main/initiative/new.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/initiative/new.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -12,7 +12,7 @@
 end
 
 if issue_id then
-  slot.put_into("title", _"Add new initiative to issue")
+  slot.put_into("title", _"Add alternative initiative to issue")
 else
   slot.put_into("title", _"Create new issue")
 end
diff -r fc9e748660c8 -r 00d1004545f1 app/main/initiative/show.lua
--- a/app/main/initiative/show.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/initiative/show.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -1,535 +1,36 @@
-local initiative = Initiative:new_selector():add_where{ "id = ?", param.get_id()}:single_object_mode():exec()
-
-slot.select("actions", function()
-  ui.link{
-    content = function()
-      ui.image{ static = "icons/16/script.png" }
-      slot.put(_"Show all initiatives")
-    end,
-    module = "issue",
-    view = "show",
-    id = initiative.issue.id
-  }
-end)
-
-execute.view{
-  module = "issue",
-  view = "_show_head",
-  params = { issue = initiative.issue }
-}
-
-if initiative.revoked then
-  ui.container{
-    attr = { class = "revoked_info" },
-    content = function()
-      slot.put(_("This initiative has been revoked at #{revoked}", { revoked = format.timestamp(initiative.revoked) }))
-      local suggested_initiative = initiative.suggested_initiative
-      if suggested_initiative then
-        slot.put("<br /><br />")
-        slot.put(_("The initiators suggest to support the following initiative:"))
-        slot.put("<br />")
-        ui.link{
-          content = _("Issue ##{id}", { id = suggested_initiative.issue.id } ) .. ": " .. encode.html(suggested_initiative.name),
-          module = "initiative",
-          view = "show",
-          id = suggested_initiative.id
-        }
-      end
-    end
-  }
-end
-
-local initiator = Initiator:by_pk(initiative.id, app.session.member.id)
-
---slot.put_into("html_head", '<link rel="alternate" type="application/rss+xml" title="RSS" href="../show/' .. tostring(initiative.id) .. '.rss" />')
-
-
-slot.select("actions", function()
-  if not initiative.issue.fully_frozen and not initiative.issue.closed then
-    ui.link{
-      attr = { class = "action" },
-      content = function()
-        ui.image{ static = "icons/16/script_add.png" }
-        slot.put(_"Create alternative initiative")
-      end,
-      module = "initiative",
-      view = "new",
-      params = { issue_id = initiative.issue.id }
-    }
-  end
-end)
-
-slot.put_into("sub_title", encode.html(_"Initiative: '#{name}'":gsub("#{name}", initiative.shortened_name) ))
-
-slot.select("support", function()
-  ui.container{
-    attr = { class = "actions" },
-    content = function()
-      execute.view{
-        module = "supporter",
-        view = "_show_box",
-        params = { initiative = initiative }
-      }
-      if initiator and initiator.accepted and not initiative.issue.fully_frozen and not initiative.issue.closed and not initiative.revoked then
-        ui.link{
-          attr = { class = "action", style = "float: left;" },
-          content = function()
-            ui.image{ static = "icons/16/script_delete.png" }
-            slot.put(_"Revoke initiative")
-          end,
-          module = "initiative",
-          view = "revoke",
-          id = initiative.id
-        }
-      end
-    end
-  }
-end)
-
-util.help("initiative.show")
+local initiative = param.get("initiative", "table")
 
-if initiator and initiator.accepted == nil then
-  ui.container{
-    attr = { class = "initiator_invite_info" },
-    content = function()
-      slot.put(_"You are invited to become initiator of this initiative.")
-      slot.put(" ")
-      ui.link{
-        content = function()
-          ui.image{ static = "icons/16/tick.png" }
-          slot.put(_"Accept invitation")
-        end,
-        module = "initiative",
-        action = "accept_invitation",
-        id = initiative.id,
-        routing = {
-          default = {
-            mode = "redirect",
-            module = request.get_module(),
-            view = request.get_view(),
-            id = param.get_id_cgi(),
-            params = param.get_all_cgi()
-          }
-        }
-      }
-      slot.put(" ")
-      ui.link{
-        content = function()
-          ui.image{ static = "icons/16/cross.png" }
-          slot.put(_"Refuse invitation")
-        end,
-        module = "initiative",
-        action = "reject_initiator_invitation",
-        params = {
-          initiative_id = initiative.id,
-          member_id = app.session.member.id
-        },
-        routing = {
-          default = {
-            mode = "redirect",
-            module = request.get_module(),
-            view = request.get_view(),
-            id = param.get_id_cgi(),
-            params = param.get_all_cgi()
-          }
-        }
-      }
-    end
-  }
-  slot.put("<br />")
-end
-
-if (initiative.discussion_url and #initiative.discussion_url > 0)
-  or (initiator and initiator.accepted and not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked) then
-  ui.container{
-    attr = { class = "vertical" },
-    content = function()
-      ui.container{
-        attr = { class = "ui_field_label" },
-        content = _"Discussion with initiators"
-      }
-      ui.tag{
-        tag = "span",
-        content = function()
-          if initiative.discussion_url:find("^https?://") then
-            if initiative.discussion_url and #initiative.discussion_url > 0 then
-              ui.link{
-                attr = {
-                  class = "actions",
-                  target = "_blank",
-                  title = initiative.discussion_url
-                },
-                content = function()
-                  slot.put(encode.html(initiative.discussion_url))
-                end,
-                external = initiative.discussion_url
-              }
-            end
-          else
-            slot.put(encode.html(initiative.discussion_url))
-          end
-          slot.put(" ")
-          if initiator and initiator.accepted and not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked then
-            ui.link{
-              attr = { class = "actions" },
-              content = _"(change URL)",
-              module = "initiative",
-              view = "edit",
-              id = initiative.id
-            }
-          end
-        end
-      }
-    end
-  }
+if not initiative then
+  initiative = Initiative:new_selector():add_where{ "id = ?", param.get_id()}:single_object_mode():exec()
 end
 
-
-ui.container{
-  attr = {  id = "add_suggestion_form", class = "hidden_inline_form" },
-  content = function()
-
-    ui.link{
-      content = _"Close",
-      attr = {
-        onclick = "document.getElementById('add_suggestion_form').style.display='none';return(false)",
-        style = "float: right;"
-      }
-    }
-
-    ui.field.text{ attr = { class = "head" }, value = _"Add new suggestion" }
-
-
-    ui.form{
-      module = "suggestion",
-      action = "add",
-      params = { initiative_id = initiative.id },
-      routing = {
-        default = {
-          mode = "redirect",
-          module = "initiative",
-          view = "show",
-          id = initiative.id,
-          params = { tab = "suggestion" }
-        }
-      },
-      attr = { class = "vertical" },
-      content = function()
-        local supported = Supporter:by_pk(initiative.id, app.session.member.id) and true or false
-        if not supported then
-          ui.field.text{
-            attr = { class = "warning" },
-            value = _"You are currently not supporting this initiative. By adding suggestions to this initiative you will automatically become a potential supporter."
-          }
-        end
-        ui.field.text{ label = _"Title (80 chars max)",        name = "name" }
-        ui.field.text{ label = _"Description", name = "description", multiline = true }
-        ui.field.select{ 
-          label = _"Degree", 
-          name = "degree",
-          foreign_records = { 
-            { id =  1, name = _"should"},
-            { id =  2, name = _"must"},
-          },
-          foreign_id = "id",
-          foreign_name = "name"
-        }
-        ui.submit{ text = _"Commit suggestion" }
-      end
-    }
-  end
-}
-
-local supporter = app.session.member:get_reference_selector("supporters")
-  :add_where{ "initiative_id = ?", initiative.id }
-  :optional_object_mode()
-  :exec()
-
-if supporter then
-  local old_draft_id = supporter.draft_id
-  local new_draft_id = initiative.current_draft.id
-  if old_draft_id ~= new_draft_id then
-    ui.container{
-      attr = { class = "draft_updated_info" },
-      content = function()
-        slot.put(_"The draft of this initiative has been updated!")
-        slot.put(" ")
-        ui.link{
-          content = _"Show diff",
-          module = "draft",
-          view = "diff",
-          params = {
-            old_draft_id = old_draft_id,
-            new_draft_id = new_draft_id
-          }
-        }
-        slot.put(" ")
-        ui.link{
-          content = _"Refresh support to current draft",
-          module = "initiative",
-          action = "add_support",
-          id = initiative.id,
-          routing = {
-            default = {
-              mode = "redirect",
-              module = "initiative",
-              view = "show",
-              id = initiative.id
-            }
-          }
-        }
-      end
-    }
-  end
-end
-
-
-local current_draft_name = _"Current draft"
-if initiative.issue.half_frozen then
-  current_draft_name = _"Voting proposal"
-end
-
-if initiative.issue.state == "finished" then
-  current_draft_name = _"Voted proposal"
-end
-
-local tabs = {
-  {
-    name = "current_draft",
-    label = current_draft_name,
-    content = function()
-      if initiator and initiator.accepted and not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked then
-        ui.link{
-          content = function()
-            ui.image{ static = "icons/16/script_add.png" }
-            slot.put(_"Edit draft")
-          end,
-          module = "draft",
-          view = "new",
-          params = { initiative_id = initiative.id }
-        }
-      end
-      execute.view{ module = "draft", view = "_show", params = { draft = initiative.current_draft } }
-    end
-  }
-}
-
-if initiative.issue.ranks_available then
-  tabs[#tabs+1] = {
-    name = "voter",
-    label = _"Voter",
-    content = function()
-      execute.view{
-        module = "member",
-        view = "_list",
-        params = {
-          initiative = initiative,
-          members_selector =  initiative.issue:get_reference_selector("direct_voters")
-            :left_join("vote", nil, { "vote.initiative_id = ? AND vote.member_id = member.id", initiative.id })
-            :add_field("direct_voter.weight as voter_weight")
-            :add_field("coalesce(vote.grade, 0) as grade")
-        }
-      }
-    end
-  }
-end
-
-local suggestion_count = initiative:get_reference_selector("suggestions"):count()
-
-tabs[#tabs+1] = {
-  name = "suggestion",
-  label = _"Suggestions" .. " (" .. tostring(suggestion_count) .. ")",
-  content = function()
-    execute.view{
-      module = "suggestion",
-      view = "_list",
-      params = {
-        initiative = initiative,
-        suggestions_selector = initiative:get_reference_selector("suggestions")
-      }
+if request.get_json_request_slots() then
+  execute.view{
+    module = "initiative",
+    view   = "show_partial",
+    params = {
+      initiative = initiative
     }
-    slot.put("<br />")
-    if not initiative.issue.fully_frozen and not initiative.issue.closed and not initiative.revoked then
-      ui.link{
-        content = function()
-          ui.image{ static = "icons/16/comment_add.png" }
-          slot.put(_"Add new suggestion")
-        end,
-        attr = { onclick = "document.getElementById('add_suggestion_form').style.display='block';return(false)" },
-        static = "#"
-      }
-    end
-  end
-}
-
-local members_selector = initiative:get_reference_selector("supporting_members_snapshot")
-          :join("issue", nil, "issue.id = direct_supporter_snapshot.issue_id")
-          :join("direct_interest_snapshot", nil, "direct_interest_snapshot.event = issue.latest_snapshot_event AND direct_interest_snapshot.issue_id = issue.id AND direct_interest_snapshot.member_id = member.id")
-          :add_field("direct_interest_snapshot.weight")
-          :add_where("direct_supporter_snapshot.event = issue.latest_snapshot_event")
-          :add_where("direct_supporter_snapshot.satisfied")
-
-local tmp = db:query("SELECT count(1) AS count, sum(weight) AS weight FROM (" .. tostring(members_selector) .. ") as subquery", "object")
-local direct_satisfied_supporter_count = tmp.count
-local indirect_satisfied_supporter_count = (tmp.weight or 0) - tmp.count
-
-local count_string
-if indirect_satisfied_supporter_count > 0 then
-  count_string = "(" .. tostring(direct_satisfied_supporter_count) .. "+" .. tostring(indirect_satisfied_supporter_count) .. ")"
-else
-  count_string = "(" .. tostring(direct_satisfied_supporter_count) .. ")"
-end
-
-tabs[#tabs+1] = {
-  name = "satisfied_supporter",
-  label = _"Supporter" .. " " .. count_string,
-  content = function()
-    execute.view{
-      module = "member",
-      view = "_list",
-      params = {
-        initiative = initiative,
-        members_selector = members_selector
-      }
-    }
-  end
-}
-
-local members_selector = initiative:get_reference_selector("supporting_members_snapshot")
-          :join("issue", nil, "issue.id = direct_supporter_snapshot.issue_id")
-          :join("direct_interest_snapshot", nil, "direct_interest_snapshot.event = issue.latest_snapshot_event AND direct_interest_snapshot.issue_id = issue.id AND direct_interest_snapshot.member_id = member.id")
-          :add_field("direct_interest_snapshot.weight")
-          :add_where("direct_supporter_snapshot.event = issue.latest_snapshot_event")
-          :add_where("NOT direct_supporter_snapshot.satisfied")
-
-local tmp = db:query("SELECT count(1) AS count, sum(weight) AS weight FROM (" .. tostring(members_selector) .. ") as subquery", "object")
-local direct_potential_supporter_count = tmp.count
-local indirect_potential_supporter_count = (tmp.weight or 0) - tmp.count
-
-local count_string
-if indirect_potential_supporter_count > 0 then
-  count_string = "(" .. tostring(direct_potential_supporter_count) .. "+" .. tostring(indirect_potential_supporter_count) .. ")"
-else
-  count_string = "(" .. tostring(direct_potential_supporter_count) .. ")"
-end
-
-tabs[#tabs+1] = {
-  name = "supporter",
-  label = _"Potential supporter" .. " " .. count_string,
-  content = function()
-    execute.view{
-      module = "member",
-      view = "_list",
-      params = {
-        initiative = initiative,
-        members_selector = members_selector
-      }
+  }
+elseif
+  config.user_tab_mode == "accordeon" or
+  config.user_tab_mode == "accordeon_first_expanded" or
+  config.user_tab_mode == "accordeon_all_expanded"
+then
+  execute.view{
+    module = "issue",
+    view   = "show",
+    id     = initiative.issue_id,
+    params = {
+      for_initiative_id = initiative.id
     }
-  end
-}
-
-local initiator_count = initiative:get_reference_selector("initiators"):add_where("accepted"):count()
-
-tabs[#tabs+1] = {
-  name = "initiators",
-  label = _"Initiators" .. " (" .. tostring(initiator_count) .. ")",
-  content = function()
-     if initiator and initiator.accepted and not initiative.issue.fully_frozen and not initiative.issue.closed and not initiative.revoked then
-      ui.link{
-        attr = { class = "action" },
-        content = function()
-          ui.image{ static = "icons/16/user_add.png" }
-          slot.put(_"Invite initiator")
-        end,
-        module = "initiative",
-        view = "add_initiator",
-        params = { initiative_id = initiative.id }
-      }
-      if initiator_count > 1 then
-        ui.link{
-          content = function()
-            ui.image{ static = "icons/16/user_delete.png" }
-            slot.put(_"Remove initiator")
-          end,
-          module = "initiative",
-          view = "remove_initiator",
-          params = { initiative_id = initiative.id }
-        }
-      end
-    end
-    if initiator and initiator.accepted == false then
-        ui.link{
-          content = function()
-            ui.image{ static = "icons/16/user_delete.png" }
-            slot.put(_"Cancel refuse of invitation")
-          end,
-          module = "initiative",
-          action = "remove_initiator",
-          params = {
-            initiative_id = initiative.id,
-            member_id = app.session.member.id
-          },
-          routing = {
-            ok = {
-              mode = "redirect",
-              module = "initiative",
-              view = "show",
-              id = initiative.id
-            }
-          }
-        }
-    end
-    local members_selector = initiative:get_reference_selector("initiating_members")
-      :add_field("initiator.accepted", "accepted")
-    if not (initiator and initiator.accepted) then
-      members_selector:add_where("accepted")
-    end
-    execute.view{
-      module = "member",
-      view = "_list",
-      params = {
-        members_selector = members_selector,
-        initiator = initiator
-      }
+  }
+else
+  execute.view{
+    module = "initiative",
+    view   = "show_static",
+    params = {
+      initiative = initiative
     }
-  end
-}
-
-local drafts_count = initiative:get_reference_selector("drafts"):count()
-
-tabs[#tabs+1] = {
-  name = "drafts",
-  label = _"Draft history" .. " (" .. tostring(drafts_count) .. ")",
-  content = function()
-    execute.view{ module = "draft", view = "_list", params = { drafts = initiative.drafts } }
-  end
-}
-
-tabs[#tabs+1] = {
-  name = "details",
-  label = _"Details",
-  content = function()
-    ui.form{
-      attr = { class = "vertical" },
-      record = initiative,
-      readonly = true,
-      content = function()
-        ui.field.text{ label = _"Issue policy", value = initiative.issue.policy.name }
-        ui.field.text{
-          label = _"Created at",
-          value = tostring(initiative.created)
-        }
-        ui.field.text{
-          label = _"Created at",
-          value = format.timestamp(initiative.created)
-        }
---         ui.field.date{ label = _"Revoked at", name = "revoked" }
-        ui.field.boolean{ label = _"Admitted", name = "admitted" }
-      end
-    }
-  end
-}
-
-
-ui.tabs(tabs)
-
+  }
+end
\ No newline at end of file
diff -r fc9e748660c8 -r 00d1004545f1 app/main/initiative/show_partial.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/initiative/show_partial.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,31 @@
+local initiative = param.get("initiative", "table")
+local expanded = param.get("expanded", atom.boolean)
+
+if not initiative then
+  initiative = Initiative:by_id(param.get_id())
+  expanded = true
+end
+
+-- TODO performance
+local initiator = Initiator:by_pk(initiative.id, app.session.member.id)
+
+ui.partial{
+  module = "initiative",
+  view = "show",
+  id = initiative.id,
+  target = "initiative_content_" .. tostring(initiative.id) .. "_content",
+  content = function()
+    if expanded then
+      execute.view{
+        module = "initiative",
+        view = "_show",
+        params = {
+          initiative = initiative,
+          initiator = initiator
+        }
+      }
+    else
+      slot.put("&nbsp;")
+    end
+  end
+}
diff -r fc9e748660c8 -r 00d1004545f1 app/main/initiative/show_static.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/initiative/show_static.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,49 @@
+local initiative = param.get("initiative", "table")
+
+if not initiative then
+  initiative = Initiative:new_selector():add_where{ "id = ?", param.get_id()}:single_object_mode():exec()
+end
+
+slot.select("actions", function()
+  ui.link{
+    content = function()
+      ui.image{ static = "icons/16/script.png" }
+      slot.put(_"Show alternative initiatives")
+    end,
+    module = "issue",
+    view = "show",
+    id = initiative.issue.id
+  }
+end)
+
+execute.view{
+  module = "issue",
+  view = "_show_head",
+  params = { issue = initiative.issue }
+}
+
+--slot.put_into("html_head", '<link rel="alternate" type="application/rss+xml" title="RSS" href="../show/' .. tostring(initiative.id) .. '.rss" />')
+
+
+slot.select("actions", function()
+  if not initiative.issue.fully_frozen and not initiative.issue.closed then
+    ui.link{
+      image  = { static = "icons/16/script_add.png" },
+      attr   = { class = "action" },
+      text   = _"Create alternative initiative",
+      module = "initiative",
+      view   = "new",
+      params = { issue_id = initiative.issue.id }
+    }
+  end
+end)
+
+slot.put_into("sub_title", encode.html(_"Initiative: '#{name}'":gsub("#{name}", initiative.shortened_name) ))
+
+execute.view{
+  module = "initiative",
+  view = "show_partial",
+  params = {
+    initiative = initiative
+  }
+}
\ No newline at end of file
diff -r fc9e748660c8 -r 00d1004545f1 app/main/initiative/show_support.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/initiative/show_support.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,43 @@
+local initiative = param.get("initiative", "table") or Initiative:by_id(param.get_id())
+
+-- TODO performance
+local initiator = Initiator:by_pk(initiative.id, app.session.member.id)
+
+ui.partial{
+  module = "initiative",
+  view = "show_support",
+  id = initiative.id,
+  target = "initiative_" .. tostring(initiative.id) .. "_support",
+  content = function()
+    ui.container{
+      attr = {
+        class = "slot_support vote_info",
+      },
+      content = function()
+        ui.container{
+          attr = { class = "actions" },
+          content = function()
+            execute.view{
+              module = "supporter",
+              view = "_show_box",
+              params = { initiative = initiative }
+            }
+            if initiator and initiator.accepted and not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked then
+              ui.link{
+                attr = { class = "action", style = "float: left;" },
+                content = function()
+                  ui.image{ static = "icons/16/script_delete.png" }
+                  slot.put(_"Revoke initiative")
+                end,
+                module = "initiative",
+                view = "revoke",
+                id = initiative.id
+              }
+            end
+          end
+        }
+      end
+    }
+    slot.put("<div style='clear: left;'></div>")
+  end
+}
diff -r fc9e748660c8 -r 00d1004545f1 app/main/initiative/show_tab.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/initiative/show_tab.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,175 @@
+local initiative = param.get("initiative", "table")
+local initiator = param.get("initiator", "table")
+
+if not initiative then
+  initiative = Initiative:by_id(param.get("initiative_id", atom.number))
+end
+
+if not initiator then
+  initiator = Initiator:by_pk(initiative.id, app.session.member.id)
+end
+
+local current_draft_name = _"Current draft"
+if initiative.issue.half_frozen then
+  current_draft_name = _"Voting proposal"
+end
+
+if initiative.issue.state == "finished" then
+  current_draft_name = _"Voted proposal"
+end
+
+local tabs = {
+  {
+    name = "current_draft",
+    label = current_draft_name,
+    icon = { static = "icons/16/script.png" },
+    module = "initiative",
+    view = "_current_draft",
+    params = {
+      initiative = initiative,
+      initiator = initiator
+    }
+  }
+}
+
+if initiative.issue.ranks_available then
+  tabs[#tabs+1] = {
+    name = "voting",
+    label = _"Voting details",
+    icon = { static = "icons/16/email_open.png" },
+    module = "initiative",
+    view = "_show_voting",
+    params = {
+      initiative = initiative
+    }
+  }
+end
+
+local suggestion_count = initiative:get_reference_selector("suggestions"):count()
+
+tabs[#tabs+1] = {
+  name = "suggestions",
+  label = _"Suggestions" .. " (" .. tostring(suggestion_count) .. ")",
+  icon = { static = "icons/16/comments.png" },
+  module = "initiative",
+  view = "_suggestions",
+  params = {
+    initiative = initiative
+  }
+}
+
+local members_selector = initiative:get_reference_selector("supporting_members_snapshot")
+          :join("issue", nil, "issue.id = direct_supporter_snapshot.issue_id")
+          :join("direct_interest_snapshot", nil, "direct_interest_snapshot.event = issue.latest_snapshot_event AND direct_interest_snapshot.issue_id = issue.id AND direct_interest_snapshot.member_id = member.id")
+          :add_field("direct_interest_snapshot.weight")
+          :add_where("direct_supporter_snapshot.event = issue.latest_snapshot_event")
+          :add_where("direct_supporter_snapshot.satisfied")
+          :add_field("direct_supporter_snapshot.informed", "is_informed")
+
+local tmp = db:query("SELECT count(1) AS count, sum(weight) AS weight FROM (" .. tostring(members_selector) .. ") as subquery", "object")
+local direct_satisfied_supporter_count = tmp.count
+local indirect_satisfied_supporter_count = (tmp.weight or 0) - tmp.count
+
+local count_string
+if indirect_satisfied_supporter_count > 0 then
+  count_string = "(" .. tostring(direct_satisfied_supporter_count) .. "+" .. tostring(indirect_satisfied_supporter_count) .. ")"
+else
+  count_string = "(" .. tostring(direct_satisfied_supporter_count) .. ")"
+end
+
+tabs[#tabs+1] = {
+  name = "satisfied_supporter",
+  label = _"Supporter" .. " " .. count_string,
+  icon = { static = "icons/16/thumb_up_green.png" },
+  module = "member",
+  view = "_list",
+  params = {
+    initiative = initiative,
+    members_selector = members_selector
+  }
+}
+
+local members_selector = initiative:get_reference_selector("supporting_members_snapshot")
+          :join("issue", nil, "issue.id = direct_supporter_snapshot.issue_id")
+          :join("direct_interest_snapshot", nil, "direct_interest_snapshot.event = issue.latest_snapshot_event AND direct_interest_snapshot.issue_id = issue.id AND direct_interest_snapshot.member_id = member.id")
+          :add_field("direct_interest_snapshot.weight")
+          :add_where("direct_supporter_snapshot.event = issue.latest_snapshot_event")
+          :add_where("NOT direct_supporter_snapshot.satisfied")
+          :add_field("direct_supporter_snapshot.informed", "is_informed")
+
+local tmp = db:query("SELECT count(1) AS count, sum(weight) AS weight FROM (" .. tostring(members_selector) .. ") as subquery", "object")
+local direct_potential_supporter_count = tmp.count
+local indirect_potential_supporter_count = (tmp.weight or 0) - tmp.count
+
+local count_string
+if indirect_potential_supporter_count > 0 then
+  count_string = "(" .. tostring(direct_potential_supporter_count) .. "+" .. tostring(indirect_potential_supporter_count) .. ")"
+else
+  count_string = "(" .. tostring(direct_potential_supporter_count) .. ")"
+end
+
+tabs[#tabs+1] = {
+  name = "supporter",
+  label = _"Potential supporter" .. " " .. count_string,
+  icon = { static = "icons/16/thumb_up.png" },
+  module = "member",
+  view = "_list",
+  params = {
+    initiative = initiative,
+    members_selector = members_selector
+  }
+}
+
+local initiators_members_selector = initiative:get_reference_selector("initiating_members")
+  :add_field("initiator.accepted", "accepted")
+
+if not (initiator and initiator.accepted) then
+  initiators_members_selector:add_where("initiator.accepted")
+end
+
+local initiator_count = initiators_members_selector:count()
+
+tabs[#tabs+1] = {
+  name = "initiators",
+  label = _"Initiators" .. " (" .. tostring(initiator_count) .. ")",
+  icon = { static = "icons/16/user_edit.png" },
+  module = "initiative",
+  view = "_initiators",
+  params = {
+    initiative = initiative,
+    initiator = initiator,
+    initiators_members_selector = initiators_members_selector
+  }
+}
+
+local drafts_count = initiative:get_reference_selector("drafts"):count()
+
+tabs[#tabs+1] = {
+  name = "drafts",
+  label = _"Draft history" .. " (" .. tostring(drafts_count) .. ")",
+  icon = { static = "icons/16/script.png" },
+  module = "draft",
+  view = "_list",
+  params = { drafts = initiative.drafts }
+}
+
+tabs[#tabs+1] = {
+  name = "details",
+  label = _"Details",
+  icon = { static = "icons/16/magnifier.png" },
+  module = "initiative",
+  view = "_details",
+  params = {
+    initiative = initiative,
+    members_selector = members_selector
+  }
+}
+
+tabs.module = "initiative"
+tabs.view = "show_tab"
+tabs.static_params = {
+  initiative_id = initiative.id
+}
+
+ui.tabs(tabs)
+
diff -r fc9e748660c8 -r 00d1004545f1 app/main/interest/_show_box.lua
--- a/app/main/interest/_show_box.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/interest/_show_box.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -11,7 +11,7 @@
     content = function()
         ui.container{
           attr = { 
-            class = "head head_active",
+            class = "head head_active" .. (interest.autoreject and " head_autoreject" or ""),
             onclick = "document.getElementById('interest_content').style.display = 'block';"
           },
           content = function()
@@ -19,6 +19,13 @@
               static = "icons/16/eye.png"
             }
             slot.put(_"Your are interested")
+
+            if interest.autoreject then
+              ui.image{
+                static = "icons/16/thumb_down_red.png"
+              }
+            end
+
             ui.image{
               static = "icons/16/dropdown.png"
             }
@@ -40,10 +47,10 @@
             }
             if issue.state ~= "finished" and issue.state ~= "cancelled" and issue.state ~= "voting" then
               ui.link{
-                content = _"Remove my interest",
-                module = "interest",
-                action = "update",
-                params = { issue_id = issue.id, delete = true },
+                text    = _"Remove my interest",
+                module  = "interest",
+                action  = "update",
+                params  = { issue_id = issue.id, delete = true },
                 routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
               }
               slot.put("<br />")
@@ -53,10 +60,10 @@
               ui.field.text{ value = _"Autoreject is on." }
               if issue.state ~= "finished" and issue.state ~= "cancelled" then
                 ui.link{
-                  content = _"Remove autoreject",
-                  module = "interest",
-                  action = "update",
-                  params = { issue_id = issue.id, autoreject = false },
+                  text    = _"Remove autoreject",
+                  module  = "interest",
+                  action  = "update",
+                  params  = { issue_id = issue.id, autoreject = false },
                   routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
                 }
               end
@@ -64,10 +71,10 @@
               ui.field.text{ value = _"Autoreject is off." }
               if issue.state ~= "finished" and issue.state ~= "cancelled" then
                 ui.link{
-                  content = _"Set autoreject",
-                  module = "interest",
-                  action = "update",
-                  params = { issue_id = issue.id, autoreject = true },
+                  text    = _"Set autoreject",
+                  module  = "interest",
+                  action  = "update",
+                  params  = { issue_id = issue.id, autoreject = true },
                   routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
                 }
               end
@@ -80,13 +87,11 @@
 else
   if not issue.closed and not issue.fully_frozen then
     ui.link{
-      content = function()
-        ui.image{ static = "icons/16/user_add.png" }
-        slot.put(_"Add my interest")
-      end,
-      module = "interest",
-      action = "update",
-      params = { issue_id = issue.id },
+      image   = { static = "icons/16/user_add.png" },
+      text    = _"Add my interest",
+      module  = "interest",
+      action  = "update",
+      params  = { issue_id = issue.id },
       routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
     }
   end
diff -r fc9e748660c8 -r 00d1004545f1 app/main/issue/_details.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/issue/_details.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,37 @@
+local issue = param.get("issue", "table")
+
+local policy = issue.policy
+ui.form{
+  record = issue,
+  readonly = true,
+  attr = { class = "vertical" },
+  content = function()
+    ui.field.text{ label = _"Population", name = "population" }
+    ui.field.text{ label = _"State", name = "state" }
+    ui.field.timestamp{ label = _"Created at",            name = "created" }
+    ui.field.text{      label = _"Admission time",        value = policy.admission_time }
+    ui.field.text{
+      label = _"Issue quorum",
+      value = format.percentage(policy.issue_quorum_num / policy.issue_quorum_den)
+    }
+    ui.field.timestamp{ label = _"Accepted at",              name = "accepted" }
+    ui.field.text{      label = _"Discussion time",       value = policy.discussion_time }
+    ui.field.vote_now{   label = _"Vote now", name = "vote_now" }
+    ui.field.vote_later{ label = _"Vote later", name = "vote_later" }
+    ui.field.timestamp{ label = _"Half frozen at",           name = "half_frozen" }
+    ui.field.text{      label = _"Verification time",     value = policy.verification_time }
+    ui.field.text{
+      label   = _"Initiative quorum",
+      value = format.percentage(policy.initiative_quorum_num / policy.initiative_quorum_den)
+    }
+    ui.field.timestamp{ label = _"Fully frozen at",          name = "fully_frozen" }
+    ui.field.text{      label = _"Voting time",           value = policy.voting_time }
+    ui.field.timestamp{ label = _"Closed",                name = "closed" }
+  end
+}
+ui.form{
+  record = issue.policy,
+  readonly = true,
+  content = function()
+  end
+}
diff -r fc9e748660c8 -r 00d1004545f1 app/main/issue/_list.lua
--- a/app/main/issue/_list.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/issue/_list.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -4,347 +4,310 @@
   :left_join("interest", "_interest", { "_interest.issue_id = issue.id AND _interest.member_id = ?", app.session.member.id} )
   :add_field("(_interest.member_id NOTNULL)", "is_interested")
 
-local ui_filter = ui.filter
-if param.get("filter", atom.boolean) == false then
-  ui_filter = function(args) args.content() end
-end
+ui.add_partial_param_names{
+  "filter",
+  "filter_open",
+  "filter_voting",
+  "filter_interest",
+  "issue_list" 
+}
 
-if param.get("no_filter", atom.boolean) then
-  ui_filter = function(args) args.content() end
-end
+local filters = {}
 
-local filter_voting = false
-ui_filter{
-  selector = issues_selector,
-  filters = {
+filters[#filters+1] = {
+  label = _"Filter",
+  {
+    name = "open",
+    label = _"Open",
+    selector_modifier = function(selector)
+        selector:add_where("issue.closed ISNULL")
+    end
+  },
+  {
+    name = "new",
+    label = _"New",
+    selector_modifier = function(selector)
+      selector:add_where("issue.accepted ISNULL AND issue.closed ISNULL")
+    end
+  },
+  {
+    name = "accepted",
+    label = _"In discussion",
+    selector_modifier = function(selector)
+      selector:add_where("issue.accepted NOTNULL AND issue.half_frozen ISNULL AND issue.closed ISNULL")
+    end
+  },
+  {
+    name = "half_frozen",
+    label = _"Frozen",
+    selector_modifier = function(selector)
+      selector:add_where("issue.half_frozen NOTNULL AND issue.fully_frozen ISNULL")
+    end
+  },
+  {
+    name = "frozen",
+    label = _"Voting",
+    selector_modifier = function(selector)
+      selector:add_where("issue.fully_frozen NOTNULL AND issue.closed ISNULL")
+      filter_voting = true
+    end
+  },
+  {
+    name = "finished",
+    label = _"Finished",
+    selector_modifier = function(selector)
+      selector:add_where("issue.closed NOTNULL AND issue.fully_frozen NOTNULL")
+    end
+  },
+  {
+    name = "cancelled",
+    label = _"Cancelled",
+    selector_modifier = function(selector)
+      selector:add_where("issue.closed NOTNULL AND issue.accepted ISNULL")
+    end
+  },
+  {
+    name = "any",
+    label = _"Any",
+    selector_modifier = function(selector) end
+  },
+}
+
+
+if param.get("filter") == "frozen" then
+  filters[#filters+1] = {
+    label = _"Filter",
+    name = "filter_voting",
     {
-      type = "boolean",
-      name = "open",
-      label = _"Open",
-      selector_modifier = function(selector, value)
-        if value then
-          selector:add_where("issue.closed ISNULL")
-        end
-      end
+      name = "any",
+      label = _"Any",
+      selector_modifier = function()  end
     },
     {
-      type = "boolean",
-      name = "new",
-      label = _"New",
-      selector_modifier = function(selector, value)
-        if value then
-          selector:add_where("issue.accepted ISNULL AND issue.closed ISNULL")
-        end
+      name = "not_voted",
+      label = _"Not voted",
+      selector_modifier = function(selector)
+        selector:left_join("direct_voter", nil, { "direct_voter.issue_id = issue.id AND direct_voter.member_id = ?", app.session.member.id })
+        selector:add_where("direct_voter.member_id ISNULL")
       end
     },
     {
-      type = "boolean",
-      name = "accepted",
-      label = _"In discussion",
-      selector_modifier = function(selector, value)
-        if value then
-          selector:add_where("issue.accepted NOTNULL AND issue.half_frozen ISNULL AND issue.closed ISNULL")
-        end
-      end
-    },
-    {
-      type = "boolean",
-      name = "half_frozen",
-      label = _"Frozen",
-      selector_modifier = function(selector, value)
-        if value then
-          selector:add_where("issue.half_frozen NOTNULL AND issue.fully_frozen ISNULL")
-        end
+      name = "voted",
+      label = _"Voted",
+      selector_modifier = function(selector)
+        selector:join("direct_voter", nil, { "direct_voter.issue_id = issue.id AND direct_voter.member_id = ?", app.session.member.id })
       end
     },
+  }
+end
+
+
+filters[#filters+1] = {
+  label = _"Filter",
+  name = "filter_interest",
+  {
+    name = "any",
+    label = _"Any",
+    selector_modifier = function()  end
+  },
+  {
+    name = "my",
+    label = _"Interested",
+    selector_modifier = function(selector)
+      selector:join("interest", "filter_interest", { "filter_interest.issue_id = issue.id AND filter_interest.member_id = ? ", app.session.member.id })
+    end
+  },
+  {
+    name = "supported",
+    label = _"Supported",
+    selector_modifier = function(selector)
+      selector:add_where({ "EXISTS (SELECT 1 FROM initiative JOIN supporter ON supporter.initiative_id = initiative.id AND supporter.member_id = ? LEFT JOIN opinion ON opinion.initiative_id = initiative.id AND opinion.member_id = ? AND ((opinion.degree = 2 AND NOT fulfilled) OR (opinion.degree = -2 AND fulfilled)) WHERE initiative.issue_id = issue.id AND opinion.member_id ISNULL LIMIT 1)", app.session.member.id, app.session.member.id })
+    end
+  },
+  {
+    name = "potentially_supported",
+    label = _"Potential supported",
+    selector_modifier = function(selector)
+      selector:add_where({ "EXISTS (SELECT 1 FROM initiative JOIN supporter ON supporter.initiative_id = initiative.id AND supporter.member_id = ? JOIN opinion ON opinion.initiative_id = initiative.id AND opinion.member_id = ? AND ((opinion.degree = 2 AND NOT fulfilled) OR (opinion.degree = -2 AND fulfilled)) WHERE initiative.issue_id = issue.id LIMIT 1)", app.session.member.id, app.session.member.id })
+    end
+  },
+  {
+    name = "initiated",
+    label = _"Initiated",
+    selector_modifier = function(selector)
+      selector:add_where({ "EXISTS (SELECT 1 FROM initiative JOIN initiator ON initiator.initiative_id = initiative.id AND initiator.member_id = ? WHERE initiative.issue_id = issue.id)", app.session.member.id })
+    end
+  },
+}
+
+if not param.get("no_sort", atom.boolean) then
+  filters[#filters+1] = {
+    label = _"Order by",
+    name = "issue_list",
     {
-      type = "boolean",
-      name = "frozen",
-      label = _"Voting",
-      selector_modifier = function(selector, value)
-        if value then
-          selector:add_where("issue.fully_frozen NOTNULL AND issue.closed ISNULL")
-          filter_voting = true
-        end
-      end
-    },
-    {
-      type = "boolean",
-      name = "finished",
-      label = _"Finished",
-      selector_modifier = function(selector, value)
-        if value then
-          selector:add_where("issue.closed NOTNULL AND issue.fully_frozen NOTNULL")
-        end
+      name = "max_potential_support",
+      label = _"Max potential support",
+      selector_modifier = function(selector)
+        selector:add_order_by("(SELECT max(supporter_count) FROM initiative WHERE initiative.issue_id = issue.id) DESC")
       end
     },
     {
-      type = "boolean",
-      name = "cancelled",
-      label = _"Cancelled",
-      selector_modifier = function(selector, value)
-        if value then
-          selector:add_where("issue.closed NOTNULL AND issue.accepted ISNULL")
-        end
+      name = "max_support",
+      label = _"Max support",
+      selector_modifier = function(selector)
+        selector:add_order_by("(SELECT max(satisfied_supporter_count) FROM initiative WHERE initiative.issue_id = issue.id) DESC")
+      end
+    },
+    {
+      name = "population",
+      label = _"Population",
+      selector_modifier = function(selector)
+        selector:add_order_by("issue.population DESC")
+      end
+    },
+    {
+      name = "newest",
+      label = _"Newest",
+      selector_modifier = function(selector)
+        selector:add_order_by("issue.created DESC")
       end
     },
-  },
-  content = function()
-    local ui_filter = ui.filter
-    if not filter_voting then
-      ui_filter = function(args) args.content() end
-    end
-    if param.get("no_filter", atom.boolean) then
-      ui_filter = function(args) args.content() end
-    end
-    ui_filter{
-      selector = issues_selector,
-      name = "filter_voting",
-      filters = {
-        {
-          type = "boolean",
-          name = "any",
-          label = _"Any",
-          selector_modifier = function()  end
-        },
-        {
-          type = "boolean",
-          name = "not_voted",
-          label = _"Not voted",
-          selector_modifier = function(selector, value)
-            if value then
-              selector:left_join("direct_voter", nil, { "direct_voter.issue_id = issue.id AND direct_voter.member_id = ?", app.session.member.id })
-              selector:add_where("direct_voter.member_id ISNULL")
-            end
-          end
-        },
-        {
-          type = "boolean",
-          name = "voted",
-          label = _"Voted",
-          selector_modifier = function(selector, value)
-            if value then
-              selector:join("direct_voter", nil, { "direct_voter.issue_id = issue.id AND direct_voter.member_id = ?", app.session.member.id })
-            end
-          end
-        },
-      },
-      content = function()
-        local ui_filter = ui.filter
-        if param.get("filter", atom.boolean) == false then
-          ui_filter = function(args) args.content() end
-        end
-        ui_filter{
-          selector = issues_selector,
-          name = "filter_interest",
-          filters = {
-            {
-              type = "boolean",
-              name = "any",
-              label = _"Any",
-              selector_modifier = function()  end
-            },
-            {
-              type = "boolean",
-              name = "my",
-              label = _"Interested",
-              selector_modifier = function(selector, value)
-                if value then
-                  selector:join("interest", "filter_interest", { "filter_interest.issue_id = issue.id AND filter_interest.member_id = ? ", app.session.member.id })
-                end
-              end
-            },
-            {
-              type = "boolean",
-              name = "supported",
-              label = _"Supported",
-              selector_modifier = function(selector, value)
-                if value then
-                  selector:add_where({ "EXISTS (SELECT 1 FROM initiative JOIN supporter ON supporter.initiative_id = initiative.id AND supporter.member_id = ? LEFT JOIN opinion ON opinion.initiative_id = initiative.id AND opinion.member_id = ? AND ((opinion.degree = 2 AND NOT fulfilled) OR (opinion.degree = -2 AND fulfilled)) WHERE initiative.issue_id = issue.id AND opinion.member_id ISNULL LIMIT 1)", app.session.member.id, app.session.member.id })
-                end
-              end
-            },
-            {
-              type = "boolean",
-              name = "potentially_supported",
-              label = _"Potential supported",
-              selector_modifier = function(selector, value)
-                if value then
-                  selector:add_where({ "EXISTS (SELECT 1 FROM initiative JOIN supporter ON supporter.initiative_id = initiative.id AND supporter.member_id = ? JOIN opinion ON opinion.initiative_id = initiative.id AND opinion.member_id = ? AND ((opinion.degree = 2 AND NOT fulfilled) OR (opinion.degree = -2 AND fulfilled)) WHERE initiative.issue_id = issue.id LIMIT 1)", app.session.member.id, app.session.member.id })
-                end
-              end
-            },
-            {
-              type = "boolean",
-              name = "initiated",
-              label = _"Initiated",
-              selector_modifier = function(selector, value)
-                if value then
-                  selector:add_where({ "EXISTS (SELECT 1 FROM initiative JOIN initiator ON initiator.initiative_id = initiative.id AND initiator.member_id = ? WHERE initiative.issue_id = issue.id)", app.session.member.id })
-                end
+    {
+      name = "oldest",
+      label = _"Oldest",
+      selector_modifier = function(selector)
+        selector:add_order_by("issue.created")
+      end
+    }
+  }
+end
+
+filters.content = function()
+  local ui_paginate = ui.paginate
+  if param.get("per_page") == "all" then
+    ui_paginate = function(args) args.content() end
+  end
+  ui_paginate{
+    per_page = tonumber(param.get("per_page")),
+    selector = issues_selector,
+    content = function()
+      local highlight_string = param.get("highlight_string", "string")
+      local issues = issues or issues_selector:exec()
+      -- issues:load(initiatives)
+      ui.list{
+        attr = { class = "issues" },
+        records = issues,
+        columns = {
+          {
+            label = _"Issue",
+            content = function(record)
+              if not param.get("for_area_list", atom.boolean) then
+                ui.field.text{
+                  value = record.area.name
+                }
+                slot.put("<br />")
               end
-            },
-          },
-          content = function()
-            local ui_order = ui.order
-            if param.get("no_sort", atom.boolean) then
-              ui_order = function(args) args.content() end
-            end
-            ui_order{
-              name = "issue_list",
-              selector = issues_selector,
-              options = {
-                {
-                  name = "max_potential_support",
-                  label = _"Max potential support",
-                  selector_modifier = function(selector)
-                    selector:add_order_by("(SELECT max(supporter_count) FROM initiative WHERE initiative.issue_id = issue.id) DESC")
-                  end
-                },
-                {
-                  name = "max_support",
-                  label = _"Max support",
-                  selector_modifier = function(selector)
-                    selector:add_order_by("(SELECT max(satisfied_supporter_count) FROM initiative WHERE initiative.issue_id = issue.id) DESC")
-                  end
-                },
-                {
-                  name = "population",
-                  label = _"Population",
-                  order_by = "issue.population DESC"
-                },
-                {
-                  name = "newest",
-                  label = _"Newest",
-                  order_by = "issue.created DESC"
-                },
-                {
-                  name = "oldest",
-                  label = _"Oldest",
-                  order_by = "issue.created"
+              if record.is_interested then
+                local label = _"You are interested in this issue",
+                ui.image{
+                  attr = { alt = label, title = label },
+                  static = "icons/16/eye.png"
                 }
-              },
-              content = function()
-                local ui_paginate = ui.paginate
-                if param.get("per_page") == "all" then
-                  ui_paginate = function(args) args.content() end
-                end
-                ui_paginate{
-                  per_page = tonumber(param.get("per_page")),
-                  selector = issues_selector,
-                  content = function()
-                    local highlight_string = param.get("highlight_string", "string")
-                    local issues = issues or issues_selector:exec()
-        --            issues:load(initiatives)
-                    ui.list{
-                      attr = { class = "issues" },
-                      records = issues,
-                      columns = {
-                        {
-                          label = _"Issue",
-                          content = function(record)
-                            if not param.get("for_area_list", atom.boolean) then
-                              ui.field.text{
-                                value = record.area.name
-                              }
-                              slot.put("<br />")
-                            end
-                            if record.is_interested then
-                              local label = _"You are interested in this issue",
-                              ui.image{
-                                attr = { alt = label, title = label },
-                                static = "icons/16/eye.png"
-                              }
-                              slot.put("&nbsp;")
-                            end
-                            ui.link{
-                              text = _("Issue ##{id}", { id = tostring(record.id) }),
-                              module = "issue",
-                              view = "show",
-                              id = record.id
-                            }
-                            if record.state == "new" then
-                              ui.image{
-                                static = "icons/16/new.png"
-                              }
-                            end
-                            slot.put("<br />")
-                            slot.put("<br />")
-                            if record.old_state then
-                              ui.field.text{ value = format.time(record.sort) }
-                              ui.field.text{ value = Issue:get_state_name_for_state(record.old_state) .. " > " .. Issue:get_state_name_for_state(record.new_state) }
-                            else
-                            end
-                          end
-                        },
-                        {
-                          label = _"State",
-                          content = function(record)
-                            if record.state == "voting" then
-                              ui.link{
-                                content = _"Voting",
-                                module = "vote",
-                                view = "list",
-                                params = { issue_id = record.id }
-                              }
-                            else
-                              ui.field.issue_state{ value = record.state }
-                            end
-                          end
-                        },
-                        {
-                          label = _"Initiatives",
-                          content = function(record)
-                            local initiatives_selector = record:get_reference_selector("initiatives")
-                            local highlight_string = param.get("highlight_string")
-                            if highlight_string then
-                              initiatives_selector:add_field( {'"highlight"("initiative"."name", ?)', highlight_string }, "name_highlighted")
-                            end
-                            execute.view{
-                              module = "initiative",
-                              view = "_list",
-                              params = {
-                                issue = record,
-                                initiatives_selector = initiatives_selector,
-                                highlight_string = highlight_string,
-                                per_page = param.get("initiatives_per_page", atom.number),
-                                no_sort = param.get("initiatives_no_sort", atom.boolean)
-                              }
-                            }
-                          end
-                        },
-                      }
-                    }
-                  end
+                slot.put("&nbsp;")
+              end
+              ui.link{
+                text = _("Issue ##{id}", { id = tostring(record.id) }),
+                module = "issue",
+                view = "show",
+                id = record.id
+              }
+              if record.state == "new" then
+                ui.image{
+                  static = "icons/16/new.png"
                 }
               end
-            }
-          end
+              slot.put("<br />")
+              slot.put("<br />")
+              if record.old_state then
+                ui.field.text{ value = format.time(record.sort) }
+                ui.field.text{ value = Issue:get_state_name_for_state(record.old_state) .. " > " .. Issue:get_state_name_for_state(record.new_state) }
+              else
+              end
+            end
+          },
+          {
+            label = _"State",
+            content = function(record)
+              if record.state == "voting" then
+                ui.link{
+                  content = _"Voting",
+                  module = "vote",
+                  view = "list",
+                  params = { issue_id = record.id }
+                }
+              else
+                ui.field.issue_state{ value = record.state }
+              end
+            end
+          },
+          {
+            label = _"Initiatives",
+            content = function(record)
+              local initiatives_selector = record:get_reference_selector("initiatives")
+              local highlight_string = param.get("highlight_string")
+              if highlight_string then
+                initiatives_selector:add_field( {'"highlight"("initiative"."name", ?)', highlight_string }, "name_highlighted")
+              end
+              execute.view{
+                module = "initiative",
+                view = "_list",
+                params = {
+                  issue = record,
+                  initiatives_selector = initiatives_selector,
+                  highlight_string = highlight_string,
+                  per_page = tonumber(app.session.member:get_setting_value("initiatives_preview_limit") or 3),
+                  no_sort = true,
+                  limit = tonumber(app.session.member:get_setting_value("initiatives_preview_limit") or 3)
+                }
+              }
+            end
+          },
         }
-      end
+      }
+    end
+  }
+end
+
+filters.selector = issues_selector
+filters.label = _"Change filters and order"
+
+if param.get("no_filter", atom.boolean) then
+  filters.content()
+else
+  ui.filters(filters)
+end
+
+if param.get("legend", atom.boolean) ~= false then
+  local filter = param.get_all_cgi().filter
+  if not filter or filter == "any" or filter ~= "finished" then
+    ui.bargraph_legend{
+      width = 25,
+      bars = {
+        { color = "#0a0", label = _"Supporter" },
+        { color = "#777", label = _"Potential supporter" },
+        { color = "#ddd", label = _"No support at all" },
+      }
     }
-    if param.get("legend", atom.boolean) ~= false then
-      local filter = param.get_all_cgi().filter
-      if not filter or filter == "any" or filter ~= "finished" then
-        ui.bargraph_legend{
-          width = 25,
-          bars = {
-            { color = "#0a0", label = _"Supporter" },
-            { color = "#777", label = _"Potential supporter" },
-            { color = "#ddd", label = _"No support at all" },
-          }
-        }
-      end
-      if not filter or filter == "any" or filter == "finished" then
-        ui.bargraph_legend{
-          width = 25,
-          bars = {
-            { color = "#0a0", label = _"Yes" },
-            { color = "#aaa", label = _"Abstention" },
-            { color = "#a00", label = _"No" },
-          }
-        }
-      end
-    end
   end
-}
+  if not filter or filter == "any" or filter == "finished" then
+    ui.bargraph_legend{
+      width = 25,
+      bars = {
+        { color = "#0a0", label = _"Yes" },
+        { color = "#aaa", label = _"Abstention" },
+        { color = "#a00", label = _"No" },
+      }
+    }
+  end
+end
+
diff -r fc9e748660c8 -r 00d1004545f1 app/main/issue/_list_initiatives.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/issue/_list_initiatives.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,10 @@
+local issue = param.get("issue", "table")
+
+execute.view{
+  module = "initiative",
+  view = "_list",
+  params = { 
+    issue = issue,
+    initiatives_selector = issue:get_reference_selector("initiatives")
+  }
+}
diff -r fc9e748660c8 -r 00d1004545f1 app/main/issue/_show_box.lua
--- a/app/main/issue/_show_box.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/issue/_show_box.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -2,6 +2,10 @@
 
 slot.select("issue_info", function()
   ui.field.text{ 
+    label = _"Policy",
+    value = issue.policy.name 
+  }
+  ui.field.text{ 
     label = _"State",
     value = issue.state_name 
   }
diff -r fc9e748660c8 -r 00d1004545f1 app/main/issue/_show_head.lua
--- a/app/main/issue/_show_head.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/issue/_show_head.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -1,33 +1,47 @@
 local issue = param.get("issue", "table")
 
+local direct_voter = DirectVoter:by_pk(issue.id, app.session.member.id)
+
 slot.put_into("html_head", '<link rel="alternate" type="application/rss+xml" title="RSS" href="../show/' .. tostring(issue.id) .. '.rss" />')
 
 slot.select("path", function()
+end)
+
+slot.select("title", function()
   ui.link{
-    content = _"Area '#{name}'":gsub("#{name}", issue.area.name),
+    content = issue.area.name,
     module = "area",
     view = "show",
     id = issue.area.id
   }
-end)
-
-slot.select("title", function()
+  slot.put(" &middot; ")
   ui.link{
-    content = _"Issue ##{id} (#{policy_name})":gsub("#{id}", issue.id):gsub("#{policy_name}", issue.policy.name),
+    content = _("Issue ##{id}", { id = issue.id }),
     module = "issue",
     view = "show",
     id = issue.id
   }
+  slot.put(" &middot; ")
+  ui.tag{
+    tag = "span",
+    content = issue.state_name,
+  }
 end)
 
 
 slot.select("actions", function()
 
   if issue.state == 'voting' then
+    local text
+    if not direct_voter then
+      text = _"Vote now"
+    else
+      text = _"Change vote"
+    end
     ui.link{
       content = function()
         ui.image{ static = "icons/16/email_open.png" }
-        slot.put(_"Vote now")
+        slot.put(text)
       end,
       module = "vote",
       view = "list",
@@ -78,7 +92,7 @@
 --  ui.twitter("http://example.com/t" .. tostring(issue.id))
 
 
-if issue.state == 'voting' then
+if issue.state == 'voting' and not direct_voter then
   ui.container{
     attr = { class = "voting_active_info" },
     content = function()
diff -r fc9e748660c8 -r 00d1004545f1 app/main/issue/_show_vote_later_box.lua
--- a/app/main/issue/_show_vote_later_box.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/issue/_show_vote_later_box.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -48,10 +48,10 @@
               end
             }
             ui.link{
-              content = _"Remove my request to vote later",
-              module = "interest",
-              action = "update_voting_requested",
-              params = { issue_id = issue.id, voting_requested = nil },
+              text    = _"Remove my request to vote later",
+              module  = "interest",
+              action  = "update_voting_requested",
+              params  = { issue_id = issue.id, voting_requested = nil },
               routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
             }
             slot.put("<br />")
@@ -63,10 +63,8 @@
 else
   if not issue.closed and not issue.half_frozen then
     ui.link{
-      content = function()
-        ui.image{ static = "icons/16/clock_play.png" }
-        slot.put(_"Vote later")
-      end,
+      image  = { static = "icons/16/clock_play.png" },
+      text   = _"Vote later",
       module = "interest",
       action = "update_voting_requested",
       params = {
diff -r fc9e748660c8 -r 00d1004545f1 app/main/issue/show.lua
--- a/app/main/issue/show.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/issue/show.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -6,126 +6,59 @@
   params = { issue = issue }
 }
 
+--[[
+if not issue.fully_frozen and not issue.closed then
+  slot.select("actions", function()
+    ui.link{
+      content = function()
+        ui.image{ static = "icons/16/script_add.png" }
+        slot.put(_"Create alternative initiative")
+      end,
+      module = "initiative",
+      view = "new",
+      params = { issue_id = issue.id }
+    }
+  end)
+end
+--]]
+
 util.help("issue.show")
 
-local voting_requested_percentage = 0
-if issue.vote_later and issue.population and issue.population > 0 then
-  voting_requested_percentage = math.ceil(issue.vote_later  / issue.population * 100)
+if issue.state == "cancelled" then
+  local policy = issue.policy
+  ui.container{
+    attr = { class = "not_admitted_info" },
+    content = _("This issue has been cancelled. It failed the quorum of #{quorum}.", { quorum = format.percentage(policy.issue_quorum_num / policy.issue_quorum_den) })
+  }
 end
-local voting_requested_string = "(" .. tostring(voting_requested_percentage) .. "%)"
 
-ui.tabs{
-  {
-    name = "initiatives",
-    label = _"Initiatives",
-    content = function()
-      execute.view{
-        module = "initiative",
-        view = "_list",
-        params = { 
-          issue = issue,
-          initiatives_selector = issue:get_reference_selector("initiatives")
-        }
-      }
-      slot.put("<br />")
-      if not issue.fully_frozen and not issue.closed then
-        ui.link{
-          attr = { class = "action" },
-          content = function()
-            ui.image{ static = "icons/16/script_add.png" }
-            slot.put(_"Add new initiative to issue")
-          end,
-          module = "initiative",
-          view = "new",
-          params = { issue_id = issue.id }
-        }
-      end
-    end
-  },
-  {
-    name = "interested_members",
-    label = _"Interested members",
-    content = function()
-      execute.view{
-        module = "member",
-        view = "_list",
-        params = {
-          issue = issue,
-          members_selector =  issue:get_reference_selector("interested_members_snapshot")
-            :join("issue", nil, "issue.id = direct_interest_snapshot.issue_id")
-            :add_field("direct_interest_snapshot.weight")
-            :add_where("direct_interest_snapshot.event = issue.latest_snapshot_event")
-        }
+ui.container{
+  attr = { class = "issue_initiative_list" },
+  content = function()
+    execute.view{
+      module = "initiative",
+      view = "_list",
+      params = {
+        initiatives_selector = issue:get_reference_selector("initiatives"),
+        issue = issue,
+        expandable = true,
+        for_initiative_id = param.get("for_initiative_id", atom.number),
+        show_for_issue = true
       }
-    end
-  },
-  {
-    name = "delegations",
-    label = _"Delegations",
-    content = function()
-      execute.view{
-        module = "delegation",
-        view = "_list",
-        params = { delegations_selector = issue:get_reference_selector("delegations") }
-      }
-    end
-  },
-  {
-    name = "voting_requests",
-    label = _"Vote later requests" .. " " .. voting_requested_string,
-    content = function()
-      execute.view{
-        module = "member",
-        view = "_list",
-        params = {
-          issue = issue,
-          members_selector =  issue:get_reference_selector("interested_members_snapshot")
-            :join("issue", nil, "issue.id = direct_interest_snapshot.issue_id")
-            :add_where("direct_interest_snapshot.voting_requested = false")
-        }
-      }
-    end
-  },
-  {
-    name = "details",
-    label = _"Details",
-    content = function()
-      local policy = issue.policy
-      ui.form{
-        record = issue,
-        readonly = true,
-        attr = { class = "vertical" },
-        content = function()
-          ui.field.text{ label = _"State", name = "state" }
-          ui.field.timestamp{ label = _"Created at",            name = "created" }
-          ui.field.text{      label = _"Admission time",        value = policy.admission_time }
-          ui.field.text{
-            label = _"Issue quorum",
-            value = format.percentage(policy.issue_quorum_num / policy.issue_quorum_den)
-          }
-          ui.field.timestamp{ label = _"Accepted at",              name = "accepted" }
-          ui.field.text{      label = _"Discussion time",       value = policy.discussion_time }
-          ui.field.vote_now{   label = _"Vote now", name = "vote_now" }
-          ui.field.vote_later{ label = _"Vote later", name = "vote_later" }
-          ui.field.timestamp{ label = _"Half frozen at",           name = "half_frozen" }
-          ui.field.text{      label = _"Verification time",     value = policy.verification_time }
-          ui.field.text{
-            label   = _"Initiative quorum",
-            value = format.percentage(policy.initiative_quorum_num / policy.initiative_quorum_den)
-          }
-          ui.field.timestamp{ label = _"Fully frozen at",          name = "fully_frozen" }
-          ui.field.text{      label = _"Voting time",           value = policy.voting_time }
-          ui.field.timestamp{ label = _"Closed",                name = "closed" }
-        end
-      }
-      ui.form{
-        record = issue.policy,
-        readonly = true,
-        content = function()
-        end
-      }
-    end
-  },
+    }
+  end
 }
 
+slot.put("<br />")
 
+execute.view{
+  module = "issue",
+  view = "show_tab",
+  params = { issue = issue }
+}
+
+if issue.snapshot then
+  slot.put("<br />")
+  ui.field.timestamp{ label = _"Last snapshot:", value = issue.snapshot }
+end
+
diff -r fc9e748660c8 -r 00d1004545f1 app/main/issue/show_tab.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/issue/show_tab.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,69 @@
+local issue
+if request.get_json_request_slots() then
+  issue = Issue:by_id(param.get("issue_id"))
+else
+  issue = param.get("issue", "table")
+end
+
+local voting_requested_percentage = 0
+if issue.vote_later and issue.population and issue.population > 0 then
+  voting_requested_percentage = math.ceil(issue.vote_later  / issue.population * 100)
+end
+
+local interested_members_selector = issue:get_reference_selector("interested_members_snapshot")
+  :join("issue", nil, "issue.id = direct_interest_snapshot.issue_id")
+  :add_field("direct_interest_snapshot.weight")
+  :add_where("direct_interest_snapshot.event = issue.latest_snapshot_event")
+
+local voting_requests_selector = issue:get_reference_selector("interested_members_snapshot")
+  :join("issue", nil, "issue.id = direct_interest_snapshot.issue_id")
+  :add_where("direct_interest_snapshot.voting_requested = false")
+
+local delegations_selector = issue:get_reference_selector("delegations")
+
+
+ui.tabs{
+  module = "issue",
+  view = "show_tab",
+  static_params = { issue_id = issue.id },
+  {
+    name = "interested_members",
+    label = _"Interested members" .. " (" .. tostring(interested_members_selector:count()) .. ")" ,
+    icon = { static = "icons/16/eye.png" },
+    module = "member",
+    view = "_list",
+    params = {
+      issue = issue,
+      members_selector = interested_members_selector
+    }
+  },
+  {
+    name = "voting_requests",
+    label = _"Vote later requests" .. " (" .. tostring(voting_requests_selector:count()) .. ") (" .. tostring(voting_requested_percentage) ..  "%)",
+    icon = { static = "icons/16/clock_play.png" },
+    module = "member",
+    view = "_list",
+    params = {
+      issue = issue,
+      members_selector = voting_requests_selector
+    }
+  },
+  {
+    name = "delegations",
+    label = _"Delegations" .. " (" .. tostring(delegations_selector:count()) .. ")" ,
+    icon = { static = "icons/16/table_go.png" },
+    module = "delegation",
+    view = "_list",
+    params = { delegations_selector = delegations_selector }
+  },
+  {
+    name = "details",
+    label = _"Details",
+    icon = { static = "icons/16/magnifier.png" },
+    module = "issue",
+    view = "_details",
+    params = { issue = issue }
+  },
+}
+
+
diff -r fc9e748660c8 -r 00d1004545f1 app/main/member/_action/update_display.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/member/_action/update_display.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,4 @@
+app.session.member:set_setting("tab_mode", param.get("tab_mode"))
+app.session.member:set_setting("initiatives_preview_limit", param.get("initiatives_preview_limit", atom.number))
+
+slot.put_into("notice", _"Your display settings have been updated")
\ No newline at end of file
diff -r fc9e748660c8 -r 00d1004545f1 app/main/member/_list.lua
--- a/app/main/member/_list.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/member/_list.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -4,41 +4,45 @@
 local trustee = param.get("trustee", "table")
 local initiator = param.get("initiator", "table")
 
-local options = {
+ui.add_partial_param_names{ "member_list" }
+
+local filter = {
+  label = _"Order by",
+  name = "member_list",
+  {
+    name = "name",
+    label = _"A-Z",
+    selector_modifier = function(selector) selector:add_order_by("name") end
+  },
+  {
+    name = "name_desc",
+    label = _"Z-A",
+    selector_modifier = function(selector) selector:add_order_by("name DESC") end
+  },
   {
     name = "newest",
     label = _"Newest",
-    order_by = "created DESC, id DESC"
+    selector_modifier = function(selector) selector:add_order_by("created DESC, id DESC") end
   },
   {
     name = "oldest",
     label = _"Oldest",
-    order_by = "created, id"
-  },
-  {
-    name = "name",
-    label = _"A-Z",
-    order_by = "name"
-  },
-  {
-    name = "name_desc",
-    label = _"Z-A",
-    order_by = "name DESC"
+    selector_modifier = function(selector) selector:add_order_by("created, id") end
   },
 }
 
 if initiative then
-  options[#options+1] = {
+  filter[#filter] = {
     name = "delegations",
     label = _"Delegations",
-    order_by = "weight DESC"
+    selector_modifier = function(selector) selector:add_order_by("weight DESC") end
   }
 end
 
-ui.order{
-  name = "member_list",
+ui.filters{
+  label = _"Change order",
   selector = members_selector,
-  options = options,
+  filter,
   content = function()
     ui.paginate{
       selector = members_selector,
@@ -118,12 +122,6 @@
               }
             end
 
---[[            ui.list{
-              records = members,
-              columns = columns
-            }
---]]
----[[
             for i, member in ipairs(members) do
               execute.view{
                 module = "member",
@@ -137,17 +135,11 @@
                 }
               }
             end
----]]
+
           end
         }
         slot.put('<br style="clear: left;" />')
-        if issue then
-          ui.field.timestamp{ label = _"Last snapshot:", value = issue.snapshot }
-        end
-        if initiative then
-          ui.field.timestamp{ label = _"Last snapshot:", value = initiative.issue.snapshot }
-        end
       end
     }
   end
-}
\ No newline at end of file
+}
diff -r fc9e748660c8 -r 00d1004545f1 app/main/member/_profile.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/member/_profile.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,114 @@
+local member = param.get("member", "table")
+
+if not member then
+  local member_id = param.get("member_id", atom.integer)
+  if member_id then
+    member = Member:by_id(member_id)
+  end
+end
+
+
+ui.form{
+  attr = { class = "member vertical" },
+  record = member,
+  readonly = true,
+  content = function()
+
+    ui.container{
+      attr = { class = "right" },
+      content = function()
+
+      execute.view{
+        module = "member_image",
+        view = "_show",
+        params = {
+          member = member,
+          image_type = "photo"
+        }
+      }
+
+      ui.container{
+        attr = { class = "contact_data" },
+        content = function()
+        end
+      }
+
+      end
+    }
+
+    if member.admin then
+      ui.field.boolean{ label = _"Admin?",       name = "admin" }
+    end
+    if member.locked then
+      ui.field.boolean{ label = _"Locked?",      name = "locked" }
+    end
+    if member.ident_number then
+      ui.field.text{    label = _"Ident number", name = "ident_number" }
+    end
+    ui.field.text{ label = _"Name", name = "name" }
+
+    if member.realname and #member.realname > 0 then
+      ui.field.text{ label = _"Real name", name = "realname" }
+    end
+    if member.email and #member.email > 0 then
+      ui.field.text{ label = _"email", name = "email" }
+    end
+    if member.xmpp_address and #member.xmpp_address > 0 then
+      ui.field.text{ label = _"xmpp", name = "xmpp_address" }
+    end
+    if member.website and #member.website > 0 then
+      ui.field.text{ label = _"Website", name = "website" }
+    end
+    if member.phone and #member.phone > 0 then
+      ui.field.text{ label = _"Phone", name = "phone" }
+    end
+    if member.mobile_phone and #member.mobile_phone > 0 then
+      ui.field.text{ label = _"Mobile phone", name = "mobile_phone" }
+    end
+    if member.address and #member.address > 0 then
+      ui.container{
+        content = function()
+          ui.tag{
+            tag = "label",
+            attr = { class = "ui_field_label" },
+            content = _"Address"
+          }
+          ui.tag{
+            tag = "span",
+            content = function()
+              slot.put(encode.html_newlines(encode.html(member.address)))
+            end
+          }
+        end
+      }
+    end
+    if member.profession and #member.profession > 0 then
+      ui.field.text{ label = _"Profession", name = "profession" }
+    end
+    if member.birthday and #member.birthday > 0 then
+      ui.field.text{ label = _"Birthday", name = "birthday" }
+    end
+    if member.organizational_unit and #member.organizational_unit > 0 then
+      ui.field.text{ label = _"Organizational unit", name = "organizational_unit" }
+    end
+    if member.internal_posts and #member.internal_posts > 0 then
+      ui.field.text{ label = _"Internal posts", name = "internal_posts" }
+    end
+    if member.external_memberships and #member.external_memberships > 0 then
+      ui.field.text{ label = _"Memberships", name = "external_memberships", multiline = true }
+    end
+    if member.external_posts and #member.external_posts > 0 then
+      ui.field.text{ label = _"Posts", name = "external_posts", multiline = true }
+    end
+    slot.put('<br style="clear: right;" />')
+
+  end
+}
+if member.statement and #member.statement > 0 then
+  ui.container{
+    attr = { class = "member_statement wiki" },
+    content = function()
+      slot.put(format.wiki_text(member.statement))
+    end
+  }
+end
diff -r fc9e748660c8 -r 00d1004545f1 app/main/member/_show.lua
--- a/app/main/member/_show.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/member/_show.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -1,191 +1,7 @@
-local member = param.get("member", "table")
-
-ui.tabs{
-  {
-    name = "profile",
-    label = _"Profile",
-    content = function()
-      ui.form{
-        attr = { class = "member vertical" },
-        record = member,
-        readonly = true,
-        content = function()
-
-          ui.container{
-            attr = { class = "right" },
-            content = function()
-
-            execute.view{
-              module = "member_image",
-              view = "_show",
-              params = {
-                member = member,
-                image_type = "photo"
-              }
-            }
-
-            ui.container{
-              attr = { class = "contact_data" },
-              content = function()
-              end
-            }
-
-            end
-          }
-
-          if member.admin then
-            ui.field.boolean{ label = _"Admin?",       name = "admin" }
-          end
-          if member.locked then
-            ui.field.boolean{ label = _"Locked?",      name = "locked" }
-          end
-          if member.ident_number then
-            ui.field.text{    label = _"Ident number", name = "ident_number" }
-          end
-          ui.field.text{ label = _"Name", name = "name" }
-
-          if member.realname and #member.realname > 0 then
-            ui.field.text{ label = _"Real name", name = "realname" }
-          end
-          if member.email and #member.email > 0 then
-            ui.field.text{ label = _"email", name = "email" }
-          end
-          if member.xmpp_address and #member.xmpp_address > 0 then
-            ui.field.text{ label = _"xmpp", name = "xmpp_address" }
-          end
-          if member.website and #member.website > 0 then
-            ui.field.text{ label = _"Website", name = "website" }
-          end
-          if member.phone and #member.phone > 0 then
-            ui.field.text{ label = _"Phone", name = "phone" }
-          end
-          if member.mobile_phone and #member.mobile_phone > 0 then
-            ui.field.text{ label = _"Mobile phone", name = "mobile_phone" }
-          end
-          if member.address and #member.address > 0 then
-            ui.container{
-              content = function()
-                ui.tag{
-                  tag = "label",
-                  attr = { class = "ui_field_label" },
-                  content = _"Address"
-                }
-                ui.tag{
-                  tag = "span",
-                  content = function()
-                    slot.put(encode.html_newlines(encode.html(member.address)))
-                  end
-                }
-              end
-            }
-          end
-          if member.profession and #member.profession > 0 then
-            ui.field.text{ label = _"Profession", name = "profession" }
-          end
-          if member.birthday and #member.birthday > 0 then
-            ui.field.text{ label = _"Birthday", name = "birthday" }
-          end
-          if member.organizational_unit and #member.organizational_unit > 0 then
-            ui.field.text{ label = _"Organizational unit", name = "organizational_unit" }
-          end
-          if member.internal_posts and #member.internal_posts > 0 then
-            ui.field.text{ label = _"Internal posts", name = "internal_posts" }
-          end
-          if member.external_memberships and #member.external_memberships > 0 then
-            ui.field.text{ label = _"Memberships", name = "external_memberships", multiline = true }
-          end
-          if member.external_posts and #member.external_posts > 0 then
-            ui.field.text{ label = _"Posts", name = "external_posts", multiline = true }
-          end
-          slot.put('<br style="clear: right;" />')
-
-        end
-      }
-      if member.statement and #member.statement > 0 then
-        ui.container{
-          attr = { class = "member_statement wiki" },
-          content = function()
-            slot.put(format.wiki_text(member.statement))
-          end
-        }
-      end
-    end
-  },
-  {
-    name = "areas",
-    label = _"Areas",
-    content = function()
-      execute.view{
-        module = "area",
-        view = "_list",
-        params = { areas_selector = member:get_reference_selector("areas") }
-      }
-    end
-  },
-  {
-    name = "issues",
-    label = _"Issues",
-    content = function()
-      execute.view{
-        module = "issue",
-        view = "_list",
-        params = { issues_selector = member:get_reference_selector("issues") }
-      }
-    end
-  },
-  {
-    name = "supported_initiatives",
-    label = _"Supported initiatives",
-    content = function()
-      execute.view{
-        module = "initiative",
-        view = "_list",
-        params = { initiatives_selector = member:get_reference_selector("supported_initiatives") }
-      }
-    end
-  },
-  {
-    name = "initiatied_initiatives",
-    label = _"Initiated initiatives",
-    content = function()
-      execute.view{
-        module = "initiative",
-        view = "_list",
-        params = { initiatives_selector = member:get_reference_selector("initiated_initiatives"):add_where("initiator.accepted = true") }
-      }
-    end
-  },
-  {
-    name = "incoming_delegations",
-    label = _"Incoming delegations",
-    content = function()
-      execute.view{
-        module = "delegation",
-        view = "_list",
-        params = { delegations_selector = member:get_reference_selector("incoming_delegations"), incoming = true }
-      }
-    end
-  },
-  {
-    name = "Outgoing delegations",
-    label = _"Outgoing delegations",
-    content = function()
-      execute.view{
-        module = "delegation",
-        view = "_list",
-        params = { delegations_selector = member:get_reference_selector("outgoing_delegations"), outgoing = true }
-      }
-    end
-  },
-  {
-    name = "contacts",
-    label = _"Published contacts",
-    content = function()
-      execute.view{
-        module = "member",
-        view = "_list",
-        params = { members_selector = member:get_reference_selector("saved_members"):add_where("public") }
-      }
-    end
-  },
-}
+execute.view{
+  module = "member",
+  view = "show_tab",
+  params = { 
+    member = param.get("member", "table")
+  }
+}
\ No newline at end of file
diff -r fc9e748660c8 -r 00d1004545f1 app/main/member/_show_thumb.lua
--- a/app/main/member/_show_thumb.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/member/_show_thumb.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -17,12 +17,55 @@
   container_class = container_class .. " not_accepted"
 end
 
+if member.is_informed == false then
+  container_class = container_class .. " not_informed"
+end
+
 ui.container{
   attr = { class = container_class },
   content = function()
     ui.container{
       attr = { class = "flags" },
       content = function()
+
+        if member.grade then
+          ui.link{
+            module = "vote",
+            view = "list",
+            params = {
+              issue_id = initiative.issue.id,
+              member_id = member.id,
+            },
+            content = function()
+              if member.grade > 0 then
+                ui.image{
+                  attr = { 
+                    alt   = _"Voted yes",
+                    title = _"Voted yes"
+                  },
+                  static = "icons/16/thumb_up_green.png"
+                }
+              elseif member.grade < 0 then
+                ui.image{
+                  attr = { 
+                    alt   = _"Voted no",
+                    title = _"Voted no"
+                  },
+                  static = "icons/16/thumb_down_red.png"
+                }
+              else
+                ui.image{
+                  attr = { 
+                    alt   = _"Abstention",
+                    title = _"Abstention"
+                  },
+                  static = "icons/16/bullet_yellow.png"
+                }
+              end
+            end
+          }
+        end
+
         local weight = 0
         if member.weight then
           weight = member.weight
@@ -52,9 +95,8 @@
               issue_id = issue and issue.id or nil
             }
           }
-        else
-          slot.put("&nbsp;")
         end
+
         if initiator and initiator.accepted then
           if member.accepted == nil then
             slot.put(_"Invited")
@@ -62,37 +104,15 @@
             slot.put(_"Rejected")
           end
         end
-        if member.grade then
-          ui.container{
-            content = function()
-              if member.grade > 0 then
-                ui.image{
-                  attr = { 
-                    alt   = _"Voted yes",
-                    title = _"Voted yes"
-                  },
-                  static = "icons/16/thumb_up_green.png"
-                }
-              elseif member.grade < 0 then
-                ui.image{
-                  attr = { 
-                    alt   = _"Voted no",
-                    title = _"Voted no"
-                  },
-                  static = "icons/16/thumb_down_red.png"
-                }
-              else
-                ui.image{
-                  attr = { 
-                    alt   = _"Abstention",
-                    title = _"Abstention"
-                  },
-                  static = "icons/16/bullet_yellow.png"
-                }
-              end
-            end
+
+        if member.is_informed == false then
+          local text = _"Member has not approved latest draft"
+          ui.image{
+            attr = { alt = text, title = text },
+            static = "icons/16/help_yellow.png"
           }
         end
+
         if member.admin then
           ui.image{
             attr = { 
@@ -102,6 +122,7 @@
             static = "icons/16/cog.png"
           }
         end
+
         -- TODO performance
         local contact = Contact:by_pk(app.session.member.id, member.id)
         if contact then
diff -r fc9e748660c8 -r 00d1004545f1 app/main/member/edit.lua
--- a/app/main/member/edit.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/member/edit.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -39,7 +39,7 @@
     ui.field.text{ label = _"Profession", name = "profession" }
     ui.field.text{ label = _"External memberships", name = "external_memberships", multiline = true }
     ui.field.text{ label = _"External posts", name = "external_posts", multiline = true }
-    ui.field.text{ label = _"Statement", name = "statement", multiline = true }
+    ui.field.text{ label = _"Statement", name = "statement", multiline = true, attr = { style = "height: 10em;" } }
     ui.submit{ value = _"Save" }
   end
 }
\ No newline at end of file
diff -r fc9e748660c8 -r 00d1004545f1 app/main/member/settings.lua
--- a/app/main/member/settings.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/member/settings.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -26,6 +26,55 @@
   end
 end)
 
+ui.heading{ content = _"Display settings" }
+util.help("member.settings.display", _"Display settings")
+
+ui.form{
+  attr = { class = "vertical" },
+  module = "member",
+  action = "update_display",
+  routing = {
+    ok = {
+      mode = "redirect",
+      module = "index",
+      view = "index"
+    }
+  },
+  content = function()
+    ui.field.select{
+      label = _"Type of tabs",
+      foreign_records = {
+        { id = "tabs",                     name = _"Tabs" },
+        { id = "accordeon",                name = _"Accordion (none expanded)" .. " === " .. _"EXPERIMENTAL FEATURE" .. " ===" },
+        { id = "accordeon_first_expanded", name = _"Accordion (first expanded)" .. " === " .. _"EXPERIMENTAL FEATURE" .. " ===" },
+--        { id = "accordeon_all_expanded",   name = _"Accordion (all expanded)" }
+      },
+      foreign_id = "id",
+      foreign_name = "name",
+      name = "tab_mode",
+      value = app.session.member:get_setting_value("tab_mode")
+    }
+    ui.field.select{
+      label = _"Number of initiatives to preview",
+      foreign_records = {
+        { id =  3, name = "3" },
+        { id =  4, name = "4" },
+        { id =  5, name = "5" },
+        { id =  6, name = "6" },
+        { id =  7, name = "7" },
+        { id =  8, name = "8" },
+        { id =  9, name = "9" },
+        { id = 10, name = "10" },
+      },
+      foreign_id = "id",
+      foreign_name = "name",
+      name = "initiatives_preview_limit",
+      value = app.session.member:get_setting_value("initiatives_preview_limit")
+    }
+    ui.submit{ value = _"Change display settings" }
+  end
+}
+
 ui.heading{ content = _"Change your name" }
 util.help("member.settings.name", _"Change name")
 
diff -r fc9e748660c8 -r 00d1004545f1 app/main/member/show.lua
--- a/app/main/member/show.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/member/show.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -23,13 +23,11 @@
         content = _"You have saved this member as contact."
       }
       ui.link{
-        content = function()
-          ui.image{ static = "icons/16/book_delete.png" }
-          slot.put(encode.html(_"Remove from contacts"))
-        end,
+        image  = { static = "icons/16/book_delete.png" },
+        text   = _"Remove from contacts",
         module = "contact",
         action = "remove_member",
-        id = contact.other_member_id,
+        id     = contact.other_member_id,
         routing = {
           default = {
             mode = "redirect",
@@ -44,10 +42,8 @@
   else
     slot.select("actions", function()
       ui.link{
-        content = function()
-          ui.image{ static = "icons/16/book_add.png" }
-          slot.put(encode.html(_"Add to my contacts"))
-        end,
+        image   = { static = "icons/16/book_add.png" },
+        text    = _"Add to my contacts",
         module  = "contact",
         action  = "add_member",
         id      = member.id,
diff -r fc9e748660c8 -r 00d1004545f1 app/main/member/show_tab.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/member/show_tab.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,89 @@
+local member
+
+if request.get_json_request_slots() then
+  member = Member:by_id(param.get("member_id"))
+else
+  member = param.get("member", "table")
+end
+
+local areas_selector = member:get_reference_selector("areas")
+local issues_selector = member:get_reference_selector("issues")
+local supported_initiatives_selector = member:get_reference_selector("supported_initiatives")
+local initiated_initiatives_selector = member:get_reference_selector("initiated_initiatives"):add_where("initiator.accepted = true")
+local incoming_delegations_selector = member:get_reference_selector("incoming_delegations")
+  :left_join("issue", "_member_showtab_issue", "_member_showtab_issue.id = delegation.issue_id")
+  :add_where("_member_showtab_issue.closed ISNULL")
+local outgoing_delegations_selector = member:get_reference_selector("outgoing_delegations")
+  :left_join("issue", "_member_showtab_issue", "_member_showtab_issue.id = delegation.issue_id")
+  :add_where("_member_showtab_issue.closed ISNULL")
+local contacts_selector = member:get_reference_selector("saved_members"):add_where("public")
+
+ui.tabs{
+  module = "member",
+  view = "show_tab",
+  static_params = { member_id = member.id },
+  {
+    name = "profile",
+    label = _"Profile",
+    icon = { static = "icons/16/application_form.png" },
+    module = "member",
+    view = "_profile",
+    params = { member = member },
+  },
+  {
+    name = "areas",
+    label = _"Areas" .. " (" .. tostring(areas_selector:count()) .. ")",
+    icon = { static = "icons/16/package.png" },
+    module = "area",
+    view = "_list",
+    params = { areas_selector = areas_selector },
+  },
+  {
+    name = "issues",
+    label = _"Issues" .. " (" .. tostring(issues_selector:count()) .. ")",
+    icon = { static = "icons/16/folder.png" },
+    module = "issue",
+    view = "_list",
+    params = { issues_selector = issues_selector },
+  },
+  {
+    name = "supported_initiatives",
+    label = _"Supported initiatives" .. " (" .. tostring(supported_initiatives_selector:count()) .. ")",
+    icon = { static = "icons/16/thumb_up_green.png" },
+    module = "initiative",
+    view = "_list",
+    params = { initiatives_selector = supported_initiatives_selector },
+  },
+  {
+    name = "initiatied_initiatives",
+    label = _"Initiated initiatives" .. " (" .. tostring(initiated_initiatives_selector:count()) .. ")",
+    icon = { static = "icons/16/user_edit.png" },
+    module = "initiative",
+    view = "_list",
+    params = { initiatives_selector = initiated_initiatives_selector },
+  },
+  {
+    name = "incoming_delegations",
+    label = _"Incoming delegations" .. " (" .. tostring(incoming_delegations_selector:count()) .. ")",
+    icon = { static = "icons/16/table_go.png" },
+    module = "delegation",
+    view = "_list",
+    params = { delegations_selector = incoming_delegations_selector, incoming = true },
+  },
+  {
+    name = "outgoing_delegations",
+    label = _"Outgoing delegations" .. " (" .. tostring(outgoing_delegations_selector:count()) .. ")",
+    icon = { static = "icons/16/table_go.png" },
+    module = "delegation",
+    view = "_list",
+    params = { delegations_selector = outgoing_delegations_selector },
+  },
+  {
+    name = "contacts",
+    label = _"Contacts" .. " (" .. tostring(contacts_selector:count()) .. ")",
+    icon = { static = "icons/16/book_edit.png" },
+    module = "member",
+    view = "_list",
+    params = { members_selector = contacts_selector },
+  }
+}
diff -r fc9e748660c8 -r 00d1004545f1 app/main/membership/_show_box.lua
--- a/app/main/membership/_show_box.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/membership/_show_box.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -36,28 +36,28 @@
           end
         }
         ui.link{
-          content = _"Remove my membership",
-          module = "membership",
-          action = "update",
-          params = { area_id = area.id, delete = true },
+          text    = _"Remove my membership",
+          module  = "membership",
+          action  = "update",
+          params  = { area_id = area.id, delete = true },
           routing = { default = { mode = "redirect", module = "area", view = "show", id = area.id } }
         }
         if membership.autoreject then
           ui.field.text{ value = _"Autoreject is on." }
           ui.link{
-            content = _"Remove autoreject",
-            module = "membership",
-            action = "update",
-            params = { area_id = area.id, autoreject = false },
+            text    = _"Remove autoreject",
+            module  = "membership",
+            action  = "update",
+            params  = { area_id = area.id, autoreject = false },
             routing = { default = { mode = "redirect", module = "area", view = "show", id = area.id } }
           }
         else
           ui.field.text{ value = _"Autoreject is off." }
           ui.link{
-            content = _"Set autoreject",
-            module = "membership",
-            action = "update",
-            params = { area_id = area.id, autoreject = true },
+            text    = _"Set autoreject",
+            module  = "membership",
+            action  = "update",
+            params  = { area_id = area.id, autoreject = true },
             routing = { default = { mode = "redirect", module = "area", view = "show", id = area.id } }
           }
         end
@@ -65,10 +65,8 @@
     }
   else
     ui.link{
-    content = function()
-      ui.image{ static = "icons/16/user_add.png" }
-      slot.put(_"Become a member")
-    end,
+      image  = { static = "icons/16/user_add.png" },
+      text   = _"Become a member",
       module = "membership",
       action = "update",
       params = { area_id = area.id },
diff -r fc9e748660c8 -r 00d1004545f1 app/main/suggestion/_list.lua
--- a/app/main/suggestion/_list.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/suggestion/_list.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -1,61 +1,66 @@
 
 local initiative = param.get("initiative", "table")
 local suggestions_selector = param.get("suggestions_selector", "table")
+local tab_id = param.get("tab_id")
+local show_name = param.get("show_name", atom.boolean)
+if show_name == nil then
+  show_name = true
+end
+local show_filter = param.get("show_filter", atom.boolean)
+if show_filter == nil then
+  show_filter = true
+end
 
-ui.order{
-  name = name,
+local partial = {
+  routing = {
+    default = {
+      mode = "redirect",
+      module = "initiative",
+      view = "show_tab",
+      params = {
+        initiative_id = initiative.id,
+        tab = "suggestions",
+        tab_id = tab_id
+      },
+    }
+  }
+}
+
+local ui_filters = ui.filters
+if not show_filter then
+  ui_filters = function(args) args.content() end
+end
+
+ui_filters{
+  label = _"Show filter",
   selector = suggestions_selector,
-  options = {
+  {
+    label = _"Order by",
     {
-      name = "all",
-      label = _"all",
-      order_by = "minus2_unfulfilled_count + minus1_unfulfilled_count + minus2_fulfilled_count + minus1_fulfilled_count + plus2_unfulfilled_count + plus1_unfulfilled_count + plus2_fulfilled_count + plus1_fulfilled_count DESC, id"
+      name = "plus_unfulfilled",
+      label = _"requested",
+      selector_modifier = function(selector) selector:add_order_by("plus2_unfulfilled_count + plus1_unfulfilled_count DESC, id") end
     },
     {
       name = "plus2",
       label = _"must",
-      order_by = "plus2_unfulfilled_count + plus2_fulfilled_count DESC, id"
+      selector_modifier = function(selector) selector:add_order_by("plus2_unfulfilled_count + plus2_fulfilled_count DESC, id") end
     },
     {
       name = "plus",
       label = _"must/should",
-      order_by = "plus2_unfulfilled_count + plus1_unfulfilled_count + plus2_fulfilled_count + plus1_fulfilled_count DESC, id"
+      selector_modifier = function(selector) selector:add_order_by("plus2_unfulfilled_count + plus1_unfulfilled_count + plus2_fulfilled_count + plus1_fulfilled_count DESC, id") end
     },
     {
       name = "minus",
       label = _"must/should not",
-      order_by = "minus2_unfulfilled_count + minus1_unfulfilled_count + minus2_fulfilled_count + minus1_fulfilled_count DESC, id"
+      selector_modifier = function(selector) selector:add_order_by("minus2_unfulfilled_count + minus1_unfulfilled_count + minus2_fulfilled_count + minus1_fulfilled_count DESC, id") end
     },
     {
       name = "minus2",
       label = _"must not",
-      order_by = "minus2_unfulfilled_count + minus2_fulfilled_count DESC, id"
-    },
-    {
-      name = "unfulfilled",
-      label = _"not implemented",
-      order_by = "minus2_unfulfilled_count + minus1_unfulfilled_count + plus2_unfulfilled_count + plus1_unfulfilled_count DESC, id"
-    },
-    {
-      name = "plus2_unfulfilled",
-      label = _"must",
-      order_by = "plus2_unfulfilled_count DESC, id"
-    },
-    {
-      name = "plus_unfulfilled",
-      label = _"must/should",
-      order_by = "plus2_unfulfilled_count + plus1_unfulfilled_count DESC, id"
-    },
-    {
-      name = "minus_unfulfilled",
-      label = _"must/should not",
-      order_by = "minus2_unfulfilled_count + minus1_unfulfilled_count DESC, id"
-    },
-    {
-      name = "minus2_unfulfilled",
-      label = _"must not",
-      order_by = "minus2_unfulfilled_count DESC, id"
-    },
+      selector_modifier = function(selector) selector:add_order_by("minus2_unfulfilled_count + minus2_fulfilled_count DESC, id") end
+    }
   },
   content = function()
     ui.paginate{
@@ -66,14 +71,16 @@
           records = suggestions_selector:exec(),
           columns = {
             {
-              label = _"Suggestion",
+              label = show_name and _"Suggestion" or nil,
               content = function(record)
-                ui.link{
-                  text = record.name,
-                  module = "suggestion",
-                  view = "show",
-                  id = record.id
-                }
+                if show_name then
+                  ui.link{
+                    text = record.name,
+                    module = "suggestion",
+                    view = "show",
+                    id = record.id
+                  }
+                end
               end
             },
             {
@@ -108,65 +115,98 @@
                 ui.container{
                   attr = { class = "suggestion_my_opinion" },
                   content = function()
-                    ui.link{
-                      attr = { class = "action" .. (degree == -2 and " active_red2" or "") },
-                      text = _"must not",
-                      module = "opinion",
-                      action = "update",
-                      routing = { default = { mode = "redirect", module = request.get_module(), view = request.get_view(), id = param.get_id_cgi(), params = param.get_all_cgi() } },
-                      params = {
-                        suggestion_id = record.id,
-                        degree = -2
+                    if initiative.issue.state == "voting" or initiative.issue.state == "closed" then
+                      ui.tag{
+                        tag = "span",
+                        attr = { class = "action" .. (degree == -2 and " active_red2" or "") },
+                        content = _"must not"
+                      }
+                      ui.tag{
+                        tag = "span",
+                        attr = { class = "action" .. (degree == -1 and " active_red1" or "") },
+                        content = _"should not"
+                      }
+                      ui.tag{
+                        tag = "span",
+                        attr = { class = "action" .. (degree == nil and " active" or "") },
+                        content = _"neutral"
                       }
-                    }
-                    slot.put(" ")
-                    ui.link{
-                      attr = { class = "action" .. (degree == -1 and " active_red1" or "") },
-                      text = _"should not",
-                      module = "opinion",
-                      action = "update",
-                      routing = { default = { mode = "redirect", module = request.get_module(), view = request.get_view(), id = param.get_id_cgi(), params = param.get_all_cgi() } },
-                      params = {
-                        suggestion_id = record.id,
-                        degree = -1
+                      ui.tag{
+                        tag = "span",
+                        attr = { class = "action" .. (degree == 1 and " active_green1" or "") },
+                        content = _"should"
+                      }
+                      ui.tag{
+                        tag = "span",
+                        attr = { class = "action" .. (degree == 2 and " active_green2" or "") },
+                        content = _"must"
+                      }
+                    else
+                      ui.link{
+                        attr = { class = "action" .. (degree == -2 and " active_red2" or "") },
+                        text = _"must not",
+                        module = "opinion",
+                        action = "update",
+                        routing = { default = { mode = "redirect", module = request.get_module(), view = request.get_view(), id = param.get_id_cgi(), params = param.get_all_cgi() } },
+                        params = {
+                          suggestion_id = record.id,
+                          degree = -2
+                        },
+                        partial = partial
                       }
-                    }
-                    slot.put(" ")
-                    ui.link{
-                      attr = { class = "action" .. (degree == nil and " active" or "") },
-                      text = _"neutral",
-                      module = "opinion",
-                      action = "update",
-                      routing = { default = { mode = "redirect", module = request.get_module(), view = request.get_view(), id = param.get_id_cgi(), params = param.get_all_cgi() } },
-                      params = {
-                        suggestion_id = record.id,
-                        delete = true
+                      slot.put(" ")
+                      ui.link{
+                        attr = { class = "action" .. (degree == -1 and " active_red1" or "") },
+                        text = _"should not",
+                        module = "opinion",
+                        action = "update",
+                        routing = { default = { mode = "redirect", module = request.get_module(), view = request.get_view(), id = param.get_id_cgi(), params = param.get_all_cgi() } },
+                        params = {
+                          suggestion_id = record.id,
+                          degree = -1
+                        },
+                        partial = partial
+                      }
+                      slot.put(" ")
+                      ui.link{
+                        attr = { class = "action" .. (degree == nil and " active" or "") },
+                        text = _"neutral",
+                        module = "opinion",
+                        action = "update",
+                        routing = { default = { mode = "redirect", module = request.get_module(), view = request.get_view(), id = param.get_id_cgi(), params = param.get_all_cgi() } },
+                        params = {
+                          suggestion_id = record.id,
+                          delete = true
+                        },
+                        partial = partial
                       }
-                    }
-                    slot.put(" ")
-                    ui.link{
-                      attr = { class = "action" .. (degree == 1 and " active_green1" or "") },
-                      text = _"should",
-                      module = "opinion",
-                      action = "update",
-                      routing = { default = { mode = "redirect", module = request.get_module(), view = request.get_view(), id = param.get_id_cgi(), params = param.get_all_cgi() } },
-                      params = {
-                        suggestion_id = record.id,
-                        degree = 1
+                      slot.put(" ")
+                      ui.link{
+                        attr = { class = "action" .. (degree == 1 and " active_green1" or "") },
+                        text = _"should",
+                        module = "opinion",
+                        action = "update",
+                        routing = { default = { mode = "redirect", module = request.get_module(), view = request.get_view(), id = param.get_id_cgi(), params = param.get_all_cgi() } },
+                        params = {
+                          suggestion_id = record.id,
+                          degree = 1
+                        },
+                        partial = partial
                       }
-                    }
-                    slot.put(" ")
-                    ui.link{
-                      attr = { class = "action" .. (degree == 2 and " active_green2" or "") },
-                      text = _"must",
-                      module = "opinion",
-                      action = "update",
-                      routing = { default = { mode = "redirect", module = request.get_module(), view = request.get_view(), id = param.get_id_cgi(), params = param.get_all_cgi() } },
-                      params = {
-                        suggestion_id = record.id,
-                        degree = 2
+                      slot.put(" ")
+                      ui.link{
+                        attr = { class = "action" .. (degree == 2 and " active_green2" or "") },
+                        text = _"must",
+                        module = "opinion",
+                        action = "update",
+                        routing = { default = { mode = "redirect", module = request.get_module(), view = request.get_view(), id = param.get_id_cgi(), params = param.get_all_cgi() } },
+                        params = {
+                          suggestion_id = record.id,
+                          degree = 2
+                        },
+                        partial = partial
                       }
-                    }
+                    end
                   end
                 }
               end
@@ -254,7 +294,8 @@
                       params = {
                         suggestion_id = record.id,
                         fulfilled = true
-                      }
+                      },
+                      partial = partial
                     }
                   else
                     if opinion.degree > 0 then
@@ -271,7 +312,8 @@
                       params = {
                         suggestion_id = record.id,
                         fulfilled = false
-                      }
+                      },
+                      partial = partial
                     }
                   end
                 end
@@ -295,7 +337,3 @@
     }
   end
 }
-
-if initiative then
-  ui.field.timestamp{ label = _"Last snapshot:", value = initiative.issue.snapshot }
-end
diff -r fc9e748660c8 -r 00d1004545f1 app/main/suggestion/_opinions.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/suggestion/_opinions.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,13 @@
+local suggestion = param.get("suggestion", "table")
+
+execute.view{
+  module = "opinion",
+  view = "_list",
+  params = { 
+    opinions_selector = Opinion:new_selector()
+      :add_field("member.name", "member_name")
+      :add_where{ "suggestion_id = ?", suggestion.id }
+      :join("member", nil, "member.id = opinion.member_id")
+      :add_order_by("member.id DESC")
+  }
+}
diff -r fc9e748660c8 -r 00d1004545f1 app/main/suggestion/_suggestion.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/suggestion/_suggestion.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,30 @@
+local suggestion = param.get("suggestion", "table")
+
+ui.form{
+  attr = { class = "vertical" },
+  record = suggestion,
+  readonly = true,
+  content = function()
+    ui.field.text{ label = _"Author",      value = suggestion.author.name }
+    ui.field.text{ label = _"Title",        name = "name" }
+    ui.container{
+      attr = { class = "suggestion_content wiki" },
+      content = function()
+        ui.tag{
+          tag = "p",
+          content = suggestion.description
+        }
+      end
+    }
+  end
+}
+execute.view{
+  module = "suggestion",
+  view = "_list",
+  params = {
+    suggestions_selector = Suggestion:new_selector():add_where{ "id = ?", suggestion.id },
+    initiative = suggestion.initiative,
+    show_name = false,
+    show_filter = false
+  }
+}
diff -r fc9e748660c8 -r 00d1004545f1 app/main/suggestion/new.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/suggestion/new.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,54 @@
+local initiative_id = param.get("initiative_id")
+
+slot.put_into("title", _"Add new suggestion")
+
+slot.select("actions", function()
+  ui.link{
+    content = function()
+        ui.image{ static = "icons/16/cancel.png" }
+        slot.put(_"Cancel")
+    end,
+    module = "initiative",
+    view = "show",
+    id = initiative_id,
+    params = { tab = "suggestions" }
+  }
+end)
+
+ui.form{
+  module = "suggestion",
+  action = "add",
+  params = { initiative_id = initiative_id },
+  routing = {
+    default = {
+      mode = "redirect",
+      module = "initiative",
+      view = "show",
+      id = initiative_id,
+      params = { tab = "suggestions" }
+    }
+  },
+  attr = { class = "vertical" },
+  content = function()
+    local supported = Supporter:by_pk(initiative_id, app.session.member.id) and true or false
+    if not supported then
+      ui.field.text{
+        attr = { class = "warning" },
+        value = _"You are currently not supporting this initiative. By adding suggestions to this initiative you will automatically become a potential supporter."
+      }
+    end
+    ui.field.text{ label = _"Title (80 chars max)",        name = "name" }
+    ui.field.text{ label = _"Description", name = "description", multiline = true }
+    ui.field.select{
+      label = _"Degree",
+      name = "degree",
+      foreign_records = {
+        { id =  1, name = _"should"},
+        { id =  2, name = _"must"},
+      },
+      foreign_id = "id",
+      foreign_name = "name"
+    }
+    ui.submit{ text = _"Commit suggestion" }
+  end
+}
diff -r fc9e748660c8 -r 00d1004545f1 app/main/suggestion/show.lua
--- a/app/main/suggestion/show.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/suggestion/show.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -11,34 +11,14 @@
     module = "initiative",
     view = "show",
     id = suggestion.initiative.id,
-    params = { tab = "suggestion" }
+    params = { tab = "suggestions" }
   }
 end)
 
-ui.form{
-  attr = { class = "vertical" },
-  record = suggestion,
-  readonly = true,
-  content = function()
-    ui.field.text{ label = _"Name",        name = "name" }
-    ui.field.text{ label = _"Description", name = "description" }
-  end
-}
-
 execute.view{
   module = "suggestion",
-  view = "_list",
-  params = { suggestions_selector = Suggestion:new_selector():add_where{ "id = ?", suggestion.id } }
-}
-
-execute.view{
-  module = "opinion",
-  view = "_list",
-  params = { 
-    opinions_selector = Opinion:new_selector()
-      :add_field("member.name", "member_name")
-      :add_where{ "suggestion_id = ?", suggestion.id }
-      :join("member", nil, "member.id = opinion.member_id")
-      :add_order_by("member.id DESC")
+  view = "show_tab",
+  params = {
+    suggestion = suggestion
   }
-}
+}
\ No newline at end of file
diff -r fc9e748660c8 -r 00d1004545f1 app/main/suggestion/show_tab.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/suggestion/show_tab.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,28 @@
+local suggestion = param.get("suggestion", "table") or Suggestion:by_id(param.get("suggestion_id"))
+
+ui.tabs{
+  module = "suggestion",
+  view = "show_tab",
+  static_params = {
+    suggestion_id = suggestion.id
+  },
+  {
+    name = "description",
+    label = _"Suggestion",
+    module = "suggestion",
+    view = "_suggestion",
+    params = {
+      suggestion = suggestion
+    }
+  },
+  {
+    name = "opinions",
+    label = _"Opinions",
+    module = "suggestion",
+    view = "_opinions",
+    params = {
+      suggestion = suggestion
+    }
+  }
+}
+
diff -r fc9e748660c8 -r 00d1004545f1 app/main/supporter/_show_box.lua
--- a/app/main/supporter/_show_box.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/supporter/_show_box.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -1,103 +1,109 @@
 
-slot.select("support", function()
-  local initiative = param.get("initiative", "table")
-  local supporter = Supporter:by_pk(initiative.id, app.session.member.id)
+local initiative = param.get("initiative", "table")
+local supporter = Supporter:by_pk(initiative.id, app.session.member.id)
+
+local unique_string = multirand.string(16, '0123456789abcdef')
+
+
+local partial = {
+  routing = {
+    default = {
+      mode = "redirect",
+      module = "initiative",
+      view = "show_support",
+      id = initiative.id
+    }
+  }
+}
 
-  if not initiative.issue.fully_frozen and not initiative.issue.closed then
-    if supporter then
-      if not supporter:has_critical_opinion() then
-        ui.container{
-          attr = {
-            class = "head head_supporter",
-            style = "cursor: pointer;",
-            onclick = "document.getElementById('support_content').style.display = 'block';"
-          },
-          content = function()
-            ui.image{
-              static = "icons/16/thumb_up_green.png"
-            }
-            slot.put(_"Your are supporter")
-            ui.image{
-              static = "icons/16/dropdown.png"
-            }
-          end
-        }
-      else
-        ui.container{
-          attr = {
-            class = "head head_potential_supporter",
-            style = "cursor: pointer;",
-            onclick = "document.getElementById('support_content').style.display = 'block';"
-          },
-          content = function()
-            ui.image{
-              static = "icons/16/thumb_up.png"
-            }
-            slot.put(_"Your are potential supporter")
-            ui.image{
-              static = "icons/16/dropdown.png"
-            }
-          end
-        }
-      end
+local routing = {
+  default = {
+    mode = "redirect",
+    module = request.get_module(),
+    view = request.get_view(),
+    id = param.get_id_cgi(),
+    params = param.get_all_cgi()
+  }
+}
+
+if not initiative.issue.fully_frozen and not initiative.issue.closed then
+  if supporter then
+    if not supporter:has_critical_opinion() then
       ui.container{
-        attr = { class = "content", id = "support_content" },
+        attr = {
+          class = "head head_supporter",
+          style = "cursor: pointer;",
+          onclick = "document.getElementById('support_content_" .. unique_string .. "').style.display = 'block';"
+        },
         content = function()
-          ui.container{
-            attr = {
-              class = "close",
-              style = "cursor: pointer;",
-              onclick = "document.getElementById('support_content').style.display = 'none';"
-            },
-            content = function()
-              ui.image{ static = "icons/16/cross.png" }
-            end
+          ui.image{
+            static = "icons/16/thumb_up_green.png"
           }
-          if supporter then
-            ui.link{
-              content = function()
-                ui.image{ static = "icons/16/thumb_down_red.png" }
-                slot.put(_"Remove my support from this initiative")
-              end,
-              module = "initiative",
-              action = "remove_support",
-              id = initiative.id,
-              routing = {
-                default = {
-                  mode = "redirect",
-                  module = request.get_module(),
-                  view = request.get_view(),
-                  id = param.get_id_cgi(),
-                  params = param.get_all_cgi()
-                }
-              }
-            }
-          else
-          end
+          slot.put(_"Your are supporter")
+          ui.image{
+            static = "icons/16/dropdown.png"
+          }
         end
       }
     else
-      if not initiative.revoked then
-        ui.link{
+      ui.container{
+        attr = {
+          class = "head head_potential_supporter",
+          style = "cursor: pointer;",
+          onclick = "document.getElementById('support_content_" .. unique_string .. "').style.display = 'block';"
+        },
+        content = function()
+          ui.image{
+            static = "icons/16/thumb_up.png"
+          }
+          slot.put(_"Your are potential supporter")
+          ui.image{
+            static = "icons/16/dropdown.png"
+          }
+        end
+      }
+    end
+    ui.container{
+      attr = { class = "content", id = "support_content_" .. unique_string .. "" },
+      content = function()
+        ui.container{
+          attr = {
+            class = "close",
+            style = "cursor: pointer;",
+            onclick = "document.getElementById('support_content_" .. unique_string .. "').style.display = 'none';"
+          },
           content = function()
-            ui.image{ static = "icons/16/thumb_up_green.png" }
-            slot.put(_"Support this initiative")
-          end,
-          module = "initiative",
-          action = "add_support",
-          id = initiative.id,
-          routing = {
-            default = {
-              mode = "redirect",
-              module = request.get_module(),
-              view = request.get_view(),
-              id = param.get_id_cgi(),
-              params = param.get_all_cgi()
-            }
+            ui.image{ static = "icons/16/cross.png" }
+          end
+        }
+        if supporter then
+          ui.link{
+            image   = { static = "icons/16/thumb_down_red.png" },
+            text    = _"Remove my support from this initiative",
+            module  = "initiative",
+            action  = "remove_support",
+            id      = initiative.id,
+            routing = routing,
+            partial = partial
           }
-        }
+        else
+        end
       end
+    }
+  else
+    if not initiative.revoked then
+      local params = param.get_all_cgi()
+      params.dyn = nil
+      ui.link{
+        image   = { static = "icons/16/thumb_up_green.png" },
+        text    = _"Support this initiative",
+        module  = "initiative",
+        action  = "add_support",
+        id      = initiative.id,
+        routing = routing,
+        partial = partial
+      }
     end
   end
+end
 
-end)
diff -r fc9e748660c8 -r 00d1004545f1 app/main/timeline/_action/update.lua
--- a/app/main/timeline/_action/update.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/timeline/_action/update.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -48,6 +48,11 @@
 end
 
 local date = param.get("date")
+trace.debug(param.get("search_from"))
+
+if param.get("search_from") == "last_24h" then
+  date = "last_24h"
+end
 
 if date and #date > 0 then
   local setting_key = "liquidfeedback_frontend_timeline_current_date"
diff -r fc9e748660c8 -r 00d1004545f1 app/main/timeline/_filter/29_filter.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/timeline/_filter/29_filter.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,36 @@
+if request.get_view() == "index" and not param.get("date") then
+  local setting_key = "liquidfeedback_frontend_timeline_current_options"
+  local setting = Setting:by_pk(app.session.member.id, setting_key)
+
+  local timeline_params = {}
+  if setting and setting.value then
+    for event_ident, filter_idents in setting.value:gmatch("(%S+):(%S+)") do
+      timeline_params["option_" .. event_ident] = true
+      if filter_idents ~= "*" then
+        for filter_ident in filter_idents:gmatch("([^\|]+)") do
+          timeline_params["option_" .. event_ident .. "_" .. filter_ident] = true
+        end
+      end
+    end
+  end
+
+  local setting_key = "liquidfeedback_frontend_timeline_current_date"
+  local setting = Setting:by_pk(app.session.member.id, setting_key)
+
+  if setting then
+    timeline_params.date = setting.value
+  else
+    timeline_params.date = "last_24h"
+  end
+
+  timeline_params.show_options = param.get("show_options", atom.boolean)
+
+  request.redirect{
+    module = "timeline",
+    view = "index",
+    params = timeline_params
+  }
+else
+  execute.inner()
+end
+
diff -r fc9e748660c8 -r 00d1004545f1 app/main/timeline/_list.lua
--- a/app/main/timeline/_list.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/timeline/_list.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -21,10 +21,17 @@
               attr = { style = "font-size: 75%; font-weight: bold; background-color: #ccc; display: block; margin-bottom: 1ex;"},
               value = format.time(timeline.occurrence)
             }
+
             ui.field.text{
               attr = { style = "font-size: 75%; font-weight: bold;"},
               value = event_names[timeline.event] or timeline.event
             }
+            if timeline.event == "draft_created" and timeline.count > 1 then
+              ui.field.text{
+                attr = { style = "font-size: 75%;"},
+                value = _("(#{more_count} duplicates removed)", { more_count = timeline.count - 1 })
+              }
+            end
           end
         },
         {
diff -r fc9e748660c8 -r 00d1004545f1 app/main/timeline/index.lua
--- a/app/main/timeline/index.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/timeline/index.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -37,13 +37,10 @@
     if options_string == current_options then
       active = true
     end
-    timeline_params.date = param.get("date")
     ui.link{
-      attr = { class = active and "action_active" or nil },
-      content = function()
-        ui.image{ static = "icons/16/time.png" }
-        slot.put(encode.html(name))
-      end,
+      image  = { static = "icons/16/time.png" },
+      attr   = { class = active and "action_active" or nil },
+      text   = name,
       module = 'timeline',
       action = 'update',
       params = {
@@ -81,68 +78,100 @@
   action = "update",
   content = function()
 
+    ui.container{
 
-    ui.tag{
-      tag = "label",
-      attr = { style = "font-size: 130%;" },
-      content = _"Date" .. ":"
-    }
-    slot.put(" ")
-    local date = param.get("date")
-    if not date or #date == 0 then
-      date = tostring(db:query("select now()::date as date")[1].date)
-    end
-    ui.tag{
-      tag = "input",
-      attr = {
-        type = "text",
-        id = "timeline_search_date",
-        style = "width: 10em;",
-        onchange = "this.form.submit();",
-        name = "date",
-        value = date
-      },
-      content = function() end
-    }
-
-    ui.script{ static = "gregor.js/gregor.js" }
-    util.gregor("timeline_search_date", "document.getElementById('timeline_search_date').form.submit();")
-
-
-    ui.link{
-      attr = { style = "margin-left: 1em; font-size: 130%; font-weight: bold;", onclick = "document.getElementById('timeline_search_date').form.submit();return(false);" },
       content = function()
-        ui.image{
-          attr = { style = "margin-right: 0.25em;" },
-          static = "icons/16/magnifier.png"
+
+        ui.tag{
+          tag = "input",
+          attr = {
+            type = "radio",
+            id = "timeline_search_last_24h",
+            name = "search_from",
+            value = "last_24h",
+            checked = param.get("date") == "last_24h" and "checked" or nil
+          },
         }
-        slot.put(_"Search")
-      end,
-      external = "#",
-    }
-    local show_options = param.get("show_options", atom.boolean)
-    ui.link{
-      attr = { style = "margin-left: 1em; font-size: 130%;", onclick = "el=document.getElementById('timeline_show_options');el.checked=" .. tostring(not show_options) .. ";el.form.submit();return(false);" },
-      content = function()
-        ui.image{
-          attr = { style = "margin-right: 0.25em;" },
-          static = "icons/16/text_list_bullets.png"
+
+        ui.tag{
+          tag = "label",
+          attr = {
+            ["for"] = "timeline_search_last_24h" 
+          },
+          content = " " .. _"last 24 hours" .. " "
+        }
+
+        ui.tag{
+          tag = "input",
+          attr = {
+            type = "radio",
+            id = "timeline_search_from_date",
+            name = "search_from",
+            value = "date",
+            checked = not (param.get("date") == "last_24h") and "checked" or nil
+          },
         }
-        slot.put(not show_options and _"Show filter details" or _"Hide filter details")
-      end,
-      external = "#",
-    }
 
-    ui.field.boolean{
-      attr = { id = "timeline_show_options", style = "display: none;", onchange="this.form.submit();" },
-      name = "show_options",
-      value = param.get("show_options", atom.boolean)
-    }
+        slot.put(" ")
+        local current_date = param.get("date")
+        if not current_date or #current_date == 0 or current_date == "last_24h" then
+          current_date = tostring(db:query("select now()::date as date")[1].date)
+        end
+        ui.tag{
+          tag = "input",
+          attr = {
+            type = "text",
+            id = "timeline_search_date",
+            style = "width: 10em;",
+            onchange = "this.form.submit();",
+            onclick = "document.getElementById('timeline_search_from_date').checked = true;",
+            name = "date",
+            value = current_date
+          },
+          content = function() end
+        }
+    
+        ui.script{ static = "gregor.js/gregor.js" }
+        util.gregor("timeline_search_date", "document.getElementById('timeline_search_date').form.submit();")
+    
+    
+        ui.link{
+          attr = { style = "margin-left: 1em; font-weight: bold;", onclick = "document.getElementById('timeline_search_date').form.submit();return(false);" },
+          content = function()
+            ui.image{
+              attr = { style = "margin-right: 0.25em;" },
+              static = "icons/16/magnifier.png"
+            }
+            slot.put(_"Search")
+          end,
+          external = "#",
+        }
+        local show_options = param.get("show_options", atom.boolean)
+        ui.link{
+          attr = { style = "margin-left: 1em;", onclick = "el=document.getElementById('timeline_show_options');el.checked=" .. tostring(not show_options) .. ";el.form.submit();return(false);" },
+          content = function()
+            ui.image{
+              attr = { style = "margin-right: 0.25em;" },
+              static = "icons/16/text_list_bullets.png"
+            }
+            slot.put(not show_options and _"Show filter details" or _"Hide filter details")
+          end,
+          external = "#",
+        }
 
-    ui.field.boolean{
-      attr = { id = "timeline_save", style = "display: none;", onchange="this.form.submit();" },
-      name = "save",
-      value = false
+        ui.field.boolean{
+          attr = { id = "timeline_show_options", style = "display: none;", onchange="this.form.submit();" },
+          name = "show_options",
+          value = param.get("show_options", atom.boolean)
+        }
+
+        ui.field.boolean{
+          attr = { id = "timeline_save", style = "display: none;", onchange="this.form.submit();" },
+          name = "save",
+          value = false
+        }
+
+      end
     }
 
     ui.container{
@@ -219,8 +248,6 @@
           }
         }
 
-        slot.put("<br />")
-
         slot.put("<table>")
 
         for i_event_group, event_group in ipairs(event_groups) do
@@ -255,6 +282,7 @@
 }
 
 local date = param.get("date")
+
 if not date or #date == 0 then
   date = "today"
 end
@@ -266,24 +294,50 @@
   if param.get("option_" .. event, atom.boolean) then
 
     local tmp = Timeline:new_selector()
-      :add_where{ "occurrence::date = ?", date }
-
-      :left_join("draft", nil, "draft.id = timeline.draft_id")
-      :left_join("suggestion", nil, "suggestion.id = timeline.suggestion_id")
-      :left_join("initiative", nil, "initiative.id = timeline.initiative_id or initiative.id = draft.initiative_id or initiative.id = suggestion.initiative_id")
-      :left_join("issue", nil, "issue.id = timeline.issue_id or issue.id = initiative.issue_id")
-      :left_join("area", nil, "area.id = issue.area_id")
+      if event == "draft_created" then
+        tmp
+          :reset_fields()
+          :add_field("max(timeline.occurrence)", "occurrence")
+          :add_field("timeline.event", nil,  { "grouped" })
+          :add_field("timeline.issue_id", nil, { "grouped" })
+          :add_field("timeline.initiative_id", nil, { "grouped" })
+          :add_field("max(timeline.draft_id)", "draft_id")
+          :add_field("timeline.suggestion_id", nil, { "grouped" })
+          :add_field("COUNT(*)", "count")
+      else
+        tmp
+          :add_field("1", "count")
+      end
 
-      :left_join("interest", "_interest", { "_interest.issue_id = issue.id AND _interest.member_id = ?", app.session.member.id} )
-      :left_join("membership", "_membership", { "_membership.area_id = area.id AND _membership.member_id = ?", app.session.member.id} )
-      :left_join("initiator", "_initiator", { "_initiator.initiative_id = initiative.id AND _initiator.member_id = ?", app.session.member.id} )
-      :left_join("supporter", "_supporter", { "_supporter.initiative_id = initiative.id AND _supporter.member_id = ?", app.session.member.id} )
+      if date == "last_24h" then
+        tmp:add_where{ "occurrence > now() - '24 hours'::interval" }
+      else
+        tmp:add_where{ "occurrence::date = ?::date", date }
+      end
+      tmp
+        :left_join("draft", nil, "draft.id = timeline.draft_id")
+        :left_join("suggestion", nil, "suggestion.id = timeline.suggestion_id")
+        :left_join("initiative", nil, "initiative.id = timeline.initiative_id or initiative.id = draft.initiative_id or initiative.id = suggestion.initiative_id")
+        :left_join("issue", nil, "issue.id = timeline.issue_id or issue.id = initiative.issue_id")
+        :left_join("area", nil, "area.id = issue.area_id")
 
-      :add_field("(_interest.member_id NOTNULL)", "is_interested")
-      :add_field("(_initiator.member_id NOTNULL)", "is_initiator")
-      :add_field({"(_supporter.member_id NOTNULL) AND NOT EXISTS(SELECT NULL FROM opinion WHERE opinion.initiative_id = initiative.id AND opinion.member_id = ? AND ((opinion.degree = 2 AND NOT fulfilled) OR (opinion.degree = -2 AND fulfilled)) LIMIT 1)", app.session.member.id }, "is_supporter")
-      :add_field({"EXISTS(SELECT NULL FROM opinion WHERE opinion.initiative_id = initiative.id AND opinion.member_id = ? AND ((opinion.degree = 2 AND NOT fulfilled) OR (opinion.degree = -2 AND fulfilled)) LIMIT 1)", app.session.member.id }, "is_potential_supporter")
-  --    :left_join("member", nil, "member.id = timeline.member_id")
+        :left_join("interest", "_interest", { "_interest.issue_id = issue.id AND _interest.member_id = ?", app.session.member.id} )
+        :left_join("initiator", "_initiator", { "_initiator.initiative_id = initiative.id AND _initiator.member_id = ?", app.session.member.id} )
+        :left_join("membership", "_membership", { "_membership.area_id = area.id AND _membership.member_id = ?", app.session.member.id} )
+        :left_join("supporter", "_supporter", { "_supporter.initiative_id = initiative.id AND _supporter.member_id = ?", app.session.member.id} )
+
+      local group
+      if event == "draft_created" then
+        group = { "grouped" }
+      end
+
+      tmp
+        :add_field("(_interest.member_id NOTNULL)", "is_interested", group)
+        :add_field("(_initiator.member_id NOTNULL)", "is_initiator", group)
+        :add_field({"(_supporter.member_id NOTNULL) AND NOT EXISTS(SELECT NULL FROM opinion WHERE opinion.initiative_id = initiative.id AND opinion.member_id = ? AND ((opinion.degree = 2 AND NOT fulfilled) OR (opinion.degree = -2 AND fulfilled)) LIMIT 1)", app.session.member.id }, "is_supporter", group)
+        :add_field({"EXISTS(SELECT NULL FROM opinion WHERE opinion.initiative_id = initiative.id AND opinion.member_id = ? AND ((opinion.degree = 2 AND NOT fulfilled) OR (opinion.degree = -2 AND fulfilled)) LIMIT 1)", app.session.member.id }, "is_potential_supporter", group)
+  --    :left_join("member", nil, "member.id = timeline.member_id", group)
+
 
     tmp:add_where{ "event = ?", event }
 
@@ -310,7 +364,7 @@
 
     if #filters > 0 then
       local filter_string = "(" .. table.concat(filters, ") OR (") .. ")"
-      tmp:add_where{ filter_string, app.session.member.id }
+      tmp:add_where{ filter_string, app.session.member.id, app.session.member.id }
     end
   
     if not timeline_selector then
@@ -327,10 +381,11 @@
   
   local outer_timeline_selector = db:new_selector()
   outer_timeline_selector._class = Timeline
-  outer_timeline_selector:add_field{ "timeline.*" }
-  outer_timeline_selector:from({"($)", { timeline_selector }}, "timeline" )
-  outer_timeline_selector:add_order_by("occurrence DESC")
-  
+  outer_timeline_selector
+    :add_field{ "timeline.*" }
+    :from({"($)", { timeline_selector }}, "timeline" )
+    :add_order_by("occurrence DESC")
+
   slot.put("<br />")
   execute.view{
     module = "timeline",
diff -r fc9e748660c8 -r 00d1004545f1 app/main/timeline/list_filter.lua
--- a/app/main/timeline/list_filter.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/timeline/list_filter.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -2,10 +2,8 @@
 
 slot.select("actions", function()
   ui.link{
-    content = function()
-        ui.image{ static = "icons/16/cancel.png" }
-        slot.put(_"Back to timeline")
-    end,
+    image  = { static = "icons/16/cancel.png" },
+    text   = _"Back to timeline",
     module = "timeline",
     action = "update"
   }
@@ -22,10 +20,8 @@
     {
       content = function(timeline_filter)
         ui.link{
-          attr = { class = "action" },
-          content = function()
-              slot.put(_"Delete filter")
-          end,
+          attr   = { class = "action" },
+          text   = _"Delete filter",
           module = "timeline",
           action = "delete_filter",
           params = { 
diff -r fc9e748660c8 -r 00d1004545f1 app/main/vote/_action/update.lua
--- a/app/main/vote/_action/update.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/vote/_action/update.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -10,38 +10,145 @@
   return false
 end
 
-local direct_voter = DirectVoter:by_pk(issue.id, app.session.member_id)
+local move_up = param.get("move_up", atom.integer)
+local move_down = param.get("move_down", atom.integer)
+
+if not move_down and not move_up then
+  local direct_voter = DirectVoter:by_pk(issue.id, app.session.member_id)
+
+  if not direct_voter then
+    direct_voter = DirectVoter:new()
+    direct_voter.issue_id = issue.id
+    direct_voter.member_id = app.session.member_id
+  end
+
+  direct_voter.autoreject = false
+  direct_voter:save()
+
+  local scoring = param.get("scoring")
 
-if not direct_voter then
-  direct_voter = DirectVoter:new()
-  direct_voter.issue_id = issue.id
-  direct_voter.member_id = app.session.member_id
-end
+  for initiative_id, grade in scoring:gmatch("([^:;]+):([^:;]+)") do
+    local initiative_id = tonumber(initiative_id)
+    local grade = tonumber(grade)
+    local initiative = Initiative:by_id(initiative_id)
+    if initiative.issue.id ~= issue.id then
+      error("initiative from wrong issue")
+    end
+    local vote = Vote:by_pk(initiative_id, app.session.member.id)
+    if not vote then
+      vote = Vote:new()
+      vote.issue_id = issue.id
+      vote.initiative_id = initiative.id
+      vote.member_id = app.session.member.id
+    end
+    vote.grade = grade
+    vote:save()
+  end
+
+else
+
+  local tempvoting_string = param.get("scoring")
 
-direct_voter.autoreject = false
+  local tempvotings = {}
+  for match in tempvoting_string:gmatch("([^;]+)") do
+    for initiative_id, grade in match:gmatch("([^:;]+):([^:;]+)") do
+      tempvotings[tonumber(initiative_id)] = tonumber(grade)
+    end
+  end
+
+  local current_initiative_id = move_up or move_down
 
-direct_voter:save()
+  local current_grade = tempvotings[current_initiative_id] or 0
+  local is_alone = true
+  if current_grade == 0 then
+    is_alone = false
+  else
+    for initiative_id, grade in pairs(tempvotings) do
+      if current_initiative_id ~= initiative_id and grade == current_grade then
+        is_alone = false
+        break
+      end
+    end
+  end
 
-
-local scoring = param.get("scoring")
+  if     move_up   and current_grade >= 0 and     is_alone then
+    for initiative_id, grade in pairs(tempvotings) do
+      if grade > current_grade then
+        tempvotings[initiative_id] = grade - 1
+      end
+    end
 
-for initiative_id, grade in scoring:gmatch("([^:;]+):([^:;]+)") do
-  local initiative_id = tonumber(initiative_id)
-  local grade = tonumber(grade)
-  local initiative = Initiative:by_id(initiative_id)
-  if initiative.issue.id ~= issue.id then
-    error("initiative from wrong issue")
+  elseif move_up   and current_grade >= 0 and not is_alone then
+    for initiative_id, grade in pairs(tempvotings) do
+      if grade > current_grade then
+        tempvotings[initiative_id] = grade + 1
+      end
+    end
+    tempvotings[current_initiative_id] = current_grade + 1
+
+  elseif move_up   and current_grade  < 0 and     is_alone then
+    tempvotings[current_initiative_id] = current_grade + 1
+    for initiative_id, grade in pairs(tempvotings) do
+      if grade < current_grade then
+        tempvotings[initiative_id] = grade + 1
+      end
+    end
+
+  elseif move_up   and current_grade  < 0 and not is_alone then
+    for initiative_id, grade in pairs(tempvotings) do
+      if grade <= current_grade then
+        tempvotings[initiative_id] = grade - 1
+      end
+    end
+    tempvotings[current_initiative_id] = current_grade
+
+  elseif move_down and current_grade <= 0 and     is_alone then
+    for initiative_id, grade in pairs(tempvotings) do
+      if grade < current_grade then
+        tempvotings[initiative_id] = grade + 1
+      end
+    end
+
+  elseif move_down and current_grade <= 0 and not is_alone then
+    for initiative_id, grade in pairs(tempvotings) do
+      if grade < current_grade then
+        tempvotings[initiative_id] = grade - 1
+      end
+    end
+    tempvotings[current_initiative_id] = current_grade - 1
+
+  elseif move_down and current_grade  > 0 and     is_alone then
+    tempvotings[current_initiative_id] = current_grade - 1
+    for initiative_id, grade in pairs(tempvotings) do
+      if grade > current_grade then
+        tempvotings[initiative_id] = grade - 1
+      end
+    end
+
+  elseif move_down and current_grade  > 0 and not is_alone then
+    for initiative_id, grade in pairs(tempvotings) do
+      if grade >= current_grade then
+        tempvotings[initiative_id] = grade + 1
+      end
+    end
+    tempvotings[current_initiative_id] = current_grade
+
   end
-  local vote = Vote:by_pk(initiative_id, app.session.member.id)
-  if not vote then
-    vote = Vote:new()
-    vote.issue_id = issue.id
-    vote.initiative_id = initiative.id
-    vote.member_id = app.session.member.id
+
+  local tempvotings_list = {}
+  for key, val in pairs(tempvotings) do
+    tempvotings_list[#tempvotings_list+1] = tostring(key) .. ":" .. tostring(val)
   end
-  vote.grade = grade
-  vote:save()
+
+  tempvoting_string = table.concat(tempvotings_list, ";")
+
+  request.redirect{
+    module = "vote",
+    view = "list",
+    params = {
+      issue_id = issue.id,
+      scoring = tempvoting_string
+    }
+  }
+
 end
-
-trace.debug(scoring)
-
diff -r fc9e748660c8 -r 00d1004545f1 app/main/vote/list.lua
--- a/app/main/vote/list.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/app/main/vote/list.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -1,26 +1,70 @@
+local issue = Issue:by_id(param.get("issue_id"), atom.integer)
+
+local member_id = param.get("member_id", atom.integer)
+local member
+
+local readonly = false
+if member_id then
+  if not issue.closed then
+    error("access denied")
+  end
+  member = Member:by_id(member_id)
+  readonly = true
+end
+
+if member then
+  slot.put_into("title", _("Ballot of '#{member_name}' for issue ##{issue_id}", {
+    member_name = member.name,
+    issue_id = issue.id
+  }))
+else
+  member = app.session.member
+  slot.put_into("title", _"Voting")
+
+  slot.select("actions", function()
+    ui.link{
+      content = function()
+          ui.image{ static = "icons/16/cancel.png" }
+          slot.put(_"Cancel")
+      end,
+      module = "issue",
+      view = "show",
+      id = issue.id
+    }
+  end)
+  
+end
+
+
 local warning_text = _"Some JavaScript based functions (voting in particular) will not work.\nFor this beta, please use a current version of Firefox, Safari, Opera(?), Konqueror or another (more) standard compliant browser.\nAlternative access without JavaScript will be available soon."
 
 ui.script{ static = "js/browser_warning.js" }
 ui.script{ script = "checkBrowser(" .. encode.json(_"Your web browser is not fully supported yet." .. " " .. warning_text:gsub("\n", "\n\n")) .. ");" }
 
-ui.tag{
-  tag = "noscript",
-  content = function()
-    slot.put(_"JavaScript is disabled or not available." .. " " .. encode.html_newlines(warning_text))
+
+local tempvoting_string = param.get("scoring")
+
+local tempvotings = {}
+if tempvoting_string then
+  for match in tempvoting_string:gmatch("([^;]+)") do
+    for initiative_id, grade in match:gmatch("([^:;]+):([^:;]+)") do
+      tempvotings[tonumber(initiative_id)] = tonumber(grade)
+    end
   end
-}
-
+end
 
-local issue = Issue:by_id(param.get("issue_id"), atom.integer)
-
-local initiatives = issue.initiatives
+local initiatives = issue:get_reference_selector("initiatives"):add_where("initiative.admitted"):exec()
 
 local min_grade = -1;
 local max_grade = 1;
 
 for i, initiative in ipairs(initiatives) do
   -- TODO performance
-  initiative.vote = Vote:by_pk(initiative.id, app.session.member.id)
+  initiative.vote = Vote:by_pk(initiative.id, member.id)
+  if tempvotings[initiative.id] then
+    initiative.vote = {}
+    initiative.vote.grade = tempvotings[initiative.id]
+  end
   if initiative.vote then
     if initiative.vote.grade > max_grade then
       max_grade = initiative.vote.grade
@@ -41,28 +85,59 @@
   end
 end
 
-slot.put_into("title", _"Voting")
+local approval_count, disapproval_count = 0, 0
+for i = min_grade, -1 do
+  if #sections[i] > 0 then
+    disapproval_count = disapproval_count + 1
+  end
+end
+local approval_count = 0
+for i = 1, max_grade do
+  if #sections[i] > 0 then
+    approval_count = approval_count + 1
+  end
+end
 
-slot.select("actions", function()
-  ui.link{
-    content = function()
-        ui.image{ static = "icons/16/cancel.png" }
-        slot.put(_"Cancel")
-    end,
-    module = "issue",
-    view = "show",
-    id = issue.id
-  }
-end)
-
-util.help("vote.list", _"Voting")
 
 
-slot.put('<script src="' .. request.get_relative_baseurl() .. 'static/js/dragdrop.js"></script>')
-slot.put('<script src="' .. request.get_relative_baseurl() .. 'static/js/voting.js"></script>')
+if not readonly then
+  util.help("vote.list", _"Voting")
+  slot.put('<script src="' .. request.get_relative_baseurl() .. 'static/js/dragdrop.js"></script>')
+  slot.put('<script src="' .. request.get_relative_baseurl() .. 'static/js/voting.js"></script>')
+end
+
+ui.script{
+  script = function()
+    slot.put(
+      "voting_text_approval_single               = ", encode.json(_"Approval [single entry]"), ";\n",
+      "voting_text_approval_multi                = ", encode.json(_"Approval [many entries]"), ";\n",
+      "voting_text_first_preference_single       = ", encode.json(_"Approval (first preference) [single entry]"), ";\n",
+      "voting_text_first_preference_multi        = ", encode.json(_"Approval (first preference) [many entries]"), ";\n",
+      "voting_text_second_preference_single      = ", encode.json(_"Approval (second preference) [single entry]"), ";\n",
+      "voting_text_second_preference_multi       = ", encode.json(_"Approval (second preference) [many entries]"), ";\n",
+      "voting_text_third_preference_single       = ", encode.json(_"Approval (third preference) [single entry]"), ";\n",
+      "voting_text_third_preference_multi        = ", encode.json(_"Approval (third preference) [many entries]"), ";\n",
+      "voting_text_numeric_preference_single     = ", encode.json(_"Approval (#th preference) [single entry]"), ";\n",
+      "voting_text_numeric_preference_multi      = ", encode.json(_"Approval (#th preference) [many entries]"), ";\n",
+      "voting_text_abstention_single             = ", encode.json(_"Abstention [single entry]"), ";\n",
+      "voting_text_abstention_multi              = ", encode.json(_"Abstention [many entries]"), ";\n",
+      "voting_text_disapproval_above_one_single  = ", encode.json(_"Disapproval (prefer to lower block) [single entry]"), ";\n",
+      "voting_text_disapproval_above_one_multi   = ", encode.json(_"Disapproval (prefer to lower block) [many entries]"), ";\n",
+      "voting_text_disapproval_above_many_single = ", encode.json(_"Disapproval (prefer to lower blocks) [single entry]"), ";\n",
+      "voting_text_disapproval_above_many_multi  = ", encode.json(_"Disapproval (prefer to lower blocks) [many entries]"), ";\n",
+      "voting_text_disapproval_above_last_single = ", encode.json(_"Disapproval (prefer to last block) [single entry]"), ";\n",
+      "voting_text_disapproval_above_last_multi  = ", encode.json(_"Disapproval (prefer to last block) [many entries]"), ";\n",
+      "voting_text_disapproval_single            = ", encode.json(_"Disapproval [single entry]"), ";\n",
+      "voting_text_disapproval_multi             = ", encode.json(_"Disapproval [many entries]"), ";\n"
+    )
+  end
+}
 
 ui.form{
-  attr = { id = "voting_form" },
+  attr = {
+    id = "voting_form",
+    class = readonly and "voting_form_readonly" or "voting_form_active"
+  },
   module = "vote",
   action = "update",
   params = { issue_id = issue.id },
@@ -75,21 +150,42 @@
     }
   },
   content = function()
-    slot.put('<input type="hidden" name="scoring" value=""/>')
-    -- TODO abstrahieren
-    ui.tag{
-      tag = "input",
-      attr = {
-        type = "button",
-        class = "voting_done",
-        value = _"Finish voting"
+    if not readonly then
+      local scoring = param.get("scoring")
+      if not scoring then
+        for i, initiative in ipairs(initiatives) do
+          local vote = initiative.vote
+          if vote then
+            tempvotings[initiative.id] = vote.grade
+          end
+        end
+        local tempvotings_list = {}
+        for key, val in pairs(tempvotings) do
+          tempvotings_list[#tempvotings_list+1] = tostring(key) .. ":" .. tostring(val)
+        end
+        if #tempvotings_list > 0 then
+          scoring = table.concat(tempvotings_list, ";")
+        else
+          scoring = ""
+        end
+      end
+      slot.put('<input type="hidden" name="scoring" value="' .. scoring .. '"/>')
+      -- TODO abstrahieren
+      ui.tag{
+        tag = "input",
+        attr = {
+          type = "button",
+          class = "voting_done",
+          value = _"Finish voting"
+        }
       }
-    }
+    end
     ui.container{
       attr = { id = "voting" },
       content = function()
+        local approval_index, disapproval_index = 0, 0
         for grade = max_grade, min_grade, -1 do 
-          local section = sections[grade]
+          local entries = sections[grade]
           local class
           if grade > 0 then
             class = "approval"
@@ -98,75 +194,199 @@
           else
             class = "abstention"
           end
-          ui.container{
-            attr = { class = class },
-            content = function()
-              slot.put('<div class="cathead"></div>')
-              for i, initiative in ipairs(section) do
-                ui.container{
-                  attr = {
-                    class = "movable",
-                    id = "entry_" .. tostring(initiative.id)
-                  },
-                  content = function()
-                    local initiators_selector = initiative:get_reference_selector("initiating_members")
-                      :add_where("accepted")
-                    local initiators = initiators_selector:exec()
-                    local initiator_names = {}
-                    for i, initiator in ipairs(initiators) do
-                      initiator_names[#initiator_names+1] = initiator.name
+          if
+            #entries > 0 or
+            (grade == 1 and not approval_used) or
+            (grade == -1 and not disapproval_used) or
+            grade == 0
+          then
+            ui.container{
+              attr = { class = class },
+              content = function()
+                local heading
+                if class == "approval" then
+                  approval_used = true
+                  approval_index = approval_index + 1
+                  if approval_count > 1 then
+                    if approval_index == 1 then
+                      if #entries == 1 then
+                        heading = _"Approval (first preference) [single entry]"
+                      else
+                        heading = _"Approval (first preference) [many entries]"
+                      end
+                    elseif approval_index == 2 then
+                      if #entries == 1 then
+                        heading = _"Approval (second preference) [single entry]"
+                      else
+                        heading = _"Approval (second preference) [many entries]"
+                      end
+                    elseif approval_index == 3 then
+                      if #entries == 1 then
+                        heading = _"Approval (third preference) [single entry]"
+                      else
+                        heading = _"Approval (third preference) [many entries]"
+                      end
+                    else
+                      if #entries == 1 then
+                        heading = _"Approval (#th preference) [single entry]"
+                      else
+                        heading = _"Approval (#th preference) [many entries]"
+                      end
+                    end
+                  else
+                    if #entries == 1 then
+                      heading = _"Approval [single entry]"
+                    else
+                      heading = _"Approval [many entries]"
+                    end
+                  end
+                elseif class == "abstention" then
+                    if #entries == 1 then
+                      heading = _"Abstention [single entry]"
+                    else
+                      heading = _"Abstention [many entries]"
+                    end
+                elseif class == "disapproval" then
+                  disapproval_used = true
+                  disapproval_index = disapproval_index + 1
+                  if disapproval_count > disapproval_index + 1 then
+                    if #entries == 1 then
+                      heading = _"Disapproval (prefer to lower blocks) [single entry]"
+                    else
+                      heading = _"Disapproval (prefer to lower blocks) [many entries]"
+                    end
+                  elseif disapproval_count == 2 and disapproval_index == 1 then
+                    if #entries == 1 then
+                      heading = _"Disapproval (prefer to lower block) [single entry]"
+                    else
+                      heading = _"Disapproval (prefer to lower block) [many entries]"
+                    end
+                  elseif disapproval_index == disapproval_count - 1 then
+                    if #entries == 1 then
+                      heading = _"Disapproval (prefer to last block) [single entry]"
+                    else
+                      heading = _"Disapproval (prefer to last block) [many entries]"
+                    end
+                  else
+                    if #entries == 1 then
+                      heading = _"Disapproval [single entry]"
+                    else
+                      heading = _"Disapproval [many entries]"
                     end
-                    local initiator_names_string = table.concat(initiator_names, ", ")
-                    ui.container{
-                      attr = { style = "float: right;" },
-                      content = function()
-                        ui.link{
-                          attr = { class = "clickable" },
-                          content = _"Show",
-                          module = "initiative",
-                          view = "show",
-                          id = initiative.id
+                  end
+                end
+                ui.tag {
+                  tag     = "div",
+                  attr    = { class = "cathead" },
+                  content = heading
+                }
+                for i, initiative in ipairs(entries) do
+                  ui.container{
+                    attr = {
+                      class = "movable",
+                      id = "entry_" .. tostring(initiative.id)
+                    },
+                    content = function()
+                      local initiators_selector = initiative:get_reference_selector("initiating_members")
+                        :add_where("accepted")
+                      local initiators = initiators_selector:exec()
+                      local initiator_names = {}
+                      for i, initiator in ipairs(initiators) do
+                        initiator_names[#initiator_names+1] = initiator.name
+                      end
+                      local initiator_names_string = table.concat(initiator_names, ", ")
+                      ui.container{
+                        attr = { style = "float: right;" },
+                        content = function()
+                          ui.link{
+                            attr = { class = "clickable" },
+                            content = _"Show",
+                            module = "initiative",
+                            view = "show",
+                            id = initiative.id
+                          }
+                          slot.put(" ")
+                          ui.link{
+                            attr = { class = "clickable", target = "_blank" },
+                            content = _"(new window)",
+                            module = "initiative",
+                            view = "show",
+                            id = initiative.id
+                          }
+                          if not readonly then
+                            slot.put(" ")
+                            ui.image{ attr = { class = "grabber" }, static = "icons/grabber.png" }
+                          end
+                        end
+                      }
+                      if not readonly then
+                        ui.container{
+                          attr = { style = "float: left;" },
+                          content = function()
+                            ui.tag{
+                              tag = "input",
+                              attr = {
+                                onclick = "voting_moveUp(this.parentNode.parentNode); return(false);",
+                                name = "move_up",
+                                value = initiative.id,
+                                class = not disabled and "clickable" or nil,
+                                type = "image",
+                                src = encode.url{ static = "icons/move_up.png" },
+                                alt = _"Move up"
+                              }
+                            }
+                            slot.put("&nbsp;")
+                            ui.tag{
+                              tag = "input",
+                              attr = {
+                                onclick = "voting_moveDown(this.parentNode.parentNode); return(false);",
+                                name = "move_down",
+                                value = initiative.id,
+                                class = not disabled and "clickable" or nil,
+                                type = "image",
+                                src = encode.url{ static = "icons/move_down.png" },
+                                alt = _"Move down"
+                              }
+                            }
+                            slot.put("&nbsp;")
+                          end
                         }
-                        slot.put(" ")
-                        ui.link{
-                          attr = { class = "clickable", target = "_blank" },
-                          content = _"(new window)",
-                          module = "initiative",
-                          view = "show",
-                          id = initiative.id
-                        }
-                        slot.put(" ")
-                        ui.image{ attr = { class = "grabber" }, static = "icons/grabber.png" }
                       end
-                    }
-                    slot.put(encode.html(initiative.shortened_name))
-                    if #initiators > 1 then
                       ui.container{
-                        attr = { style = "font-size: 80%;" },
-                        content = _"Initiators" .. ": " .. initiator_names_string
-                      }
-                    else
-                      ui.container{
-                        attr = { style = "font-size: 80%;" },
-                        content = _"Initiator" .. ": " .. initiator_names_string
+                        content = function()
+                          slot.put(encode.html(initiative.shortened_name))
+                          if #initiators > 1 then
+                            ui.container{
+                              attr = { style = "font-size: 80%;" },
+                              content = _"Initiators" .. ": " .. initiator_names_string
+                            }
+                          else
+                            ui.container{
+                              attr = { style = "font-size: 80%;" },
+                              content = _"Initiator" .. ": " .. initiator_names_string
+                            }
+                          end
+                        end
                       }
                     end
-                  end
-                }
+                  }
+                end
               end
-            end
-          }
+            }
+          end
         end
       end
     }
-    ui.tag{
-      tag = "input",
-      attr = {
-        type = "button",
-        class = "voting_done",
-        value = _"Finish voting"
+    if not readonly then
+      ui.tag{
+        tag = "input",
+        attr = {
+          type = "button",
+          class = "voting_done",
+          value = _"Finish voting"
+        }
       }
-    }
+    end
   end
 }
 
diff -r fc9e748660c8 -r 00d1004545f1 config/default.lua
--- a/config/default.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/config/default.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -1,5 +1,5 @@
 config.app_name = "LiquidFeedback"
-config.app_version = "beta9"
+config.app_version = "beta10"
 
 config.app_title = config.app_name .. " (" .. request.get_config_name() .. " environment)"
 
@@ -27,6 +27,11 @@
 
 config.download_use_terms = "=== Nutzungsbedingungen ===\nAlles ist verboten"
 
+request.set_allowed_json_request_slots{ "title", "actions", "support", "default", "trace", "system_error" }
+
+if request.get_json_request_slots() then
+  request.force_absolute_baseurl()
+end
 
 request.set_404_route{ module = 'index', view = '404' }
 
diff -r fc9e748660c8 -r 00d1004545f1 env/ui/bargraph.lua
--- a/env/ui/bargraph.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/env/ui/bargraph.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -1,21 +1,33 @@
 function ui.bargraph(args)
+  local text = ""
+  for i, bar in ipairs(args.bars) do
+    if #text > 0 then
+      text = text .. " / "
+    end
+    text = text .. tostring(bar.value)
+  end
   ui.container{
     attr = {
-      class = "bargraph",
+      class = args.class or "bargraph",
+      title = tostring(text)
     },
     content = function()
+      local at_least_one_bar = false
       for i, bar in ipairs(args.bars) do
         if bar.value > 0 then
+          at_least_one_bar = true
           local value = bar.value * args.width / args.max_value
           ui.container{
             attr = {
               style = "width: " .. tostring(value) .. "px; background-color: " .. bar.color .. ";",
-              title = tostring(bar.value)
             },
             content = function() slot.put("&nbsp;") end
           }
         end
       end
+      if not at_least_one_bar then
+        slot.put("&nbsp;")
+      end
     end
   }
 end
diff -r fc9e748660c8 -r 00d1004545f1 env/ui/field/rank.lua
--- a/env/ui/field/rank.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/env/ui/field/rank.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -5,11 +5,11 @@
       attr = { class = "rank" },
       content = function()
         if value == 1 then
-            ui.image{ static = "icons/16/award_star_gold_2.png" }
+            ui.image{ attr = args.image_attr, static = "icons/16/award_star_gold_2.png" }
         elseif value then
-            ui.image{ static = "icons/16/award_star_silver_2.png" }
+            ui.image{ attr = args.image_attr, static = "icons/16/award_star_silver_2.png" }
         else
-            ui.image{ static = "icons/16/cross.png" }
+            ui.image{ attr = args.image_attr, static = "icons/16/cross.png" }
         end
         if value then
           ui.tag{
diff -r fc9e748660c8 -r 00d1004545f1 env/ui/filter.lua
--- a/env/ui/filter.lua	Tue Feb 02 00:31:06 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-function ui.filter(args)
-  local name = args.name or "filter"
-  local current_filter = atom.string:load(cgi.params[name]) or args.filters[1].name
-  local id     = param.get_id_cgi()
-  local params = param.get_all_cgi()
-  ui.container{
-    attr = { class = "ui_filter" },
-    content = function()
-      ui.container{
-        attr = { class = "ui_filter_head" },
-        content = function()
-          slot.put(_"Filter")
-          slot.put(": ")
-          for i, filter in ipairs(args.filters) do
-            params[name] = filter.name
-            local attr = {}
-            if current_filter == filter.name then
-              attr.class = "active"
-              filter.selector_modifier(args.selector, true)
-            end
-            ui.link{
-              attr    = attr,
-              module  = request.get_module(),
-              view    = request.get_view(),
-              id      = id,
-              params  = params,
-              content = filter.label
-            }
-          end
-        end
-      }
-      ui.container{
-        attr = { class = "ui_filter_content" },
-        content = function()
-          args.content()
-        end
-      }
-    end
-  }
-end
diff -r fc9e748660c8 -r 00d1004545f1 env/ui/is_for_partial_load.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/env/ui/is_for_partial_load.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,3 @@
+function ui.is_for_partial_load()
+  return ui._partial_load
+end
\ No newline at end of file
diff -r fc9e748660c8 -r 00d1004545f1 env/ui/order.lua
--- a/env/ui/order.lua	Tue Feb 02 00:31:06 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-function ui.order(args)
-  local name = args.name or "order"
-  local current_order = atom.string:load(cgi.params[name]) or args.options[1].name
-  local id     = param.get_id_cgi()
-  local params = param.get_all_cgi()
-  ui.container{
-    attr = { class = "ui_order" },
-    content = function()
-      ui.container{
-        attr = { class = "ui_order_head" },
-        content = function()
-          slot.put(_"Order by")
-          slot.put(": ")
-          for i, option in ipairs(args.options) do
-            params[name] = option.name
-            local attr = {}
-            if current_order == option.name then
-              attr.class = "active"
-              if option.selector_modifier then
-                option.selector_modifier(args.selector)
-              else
-                args.selector:add_order_by(option.order_by)
-              end
-            end
-            ui.link{
-              attr    = attr,
-              module  = request.get_module(),
-              view    = request.get_view(),
-              id      = id,
-              params  = params,
-              content = option.label
-            }
-          end
-        end
-      }
-      ui.container{
-        attr = { class = "ui_order_content" },
-        content = function()
-          args.content()
-        end
-      }
-    end
-  }
-end
diff -r fc9e748660c8 -r 00d1004545f1 env/ui/partial_load.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/env/ui/partial_load.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,55 @@
+function ui.partial_load(args)
+  local hourglass_target = ui._partial.hourglass_target
+  local target           = ui._partial.target
+  local id               = param.get_id_cgi()
+  local module           = ui._partial.module
+  local view             = ui._partial.view
+  local cgi_params       = cgi.params
+
+  local params = {
+  }
+
+  if ui._partial and ui._partial.static_params then
+    for key, value in pairs(ui._partial.static_params) do
+      params[key] = value
+    end
+  end
+  if ui._partial and ui._partial.params then
+    for i, param_name in ipairs(ui._partial.params) do
+      params[param_name] = cgi_params[param_name]
+    end
+  end
+  if args.params then
+    for key, value in pairs(args.params) do
+      params[key] = value
+    end
+  end
+
+  request.force_absolute_baseurl()
+
+  return
+    'var hourglass_el = document.getElementById("' .. hourglass_target .. '");' ..
+    'var hourglass_src = hourglass_el.src;' ..
+    'hourglass_el.src = "' .. encode.url{ static = "icons/16/connect.png" } .. '";' ..
+    'partialMultiLoad(' ..
+      '{ trace: "trace", system_error: "system_error", ' .. target .. ': "default" },' ..
+    '{},' ..
+    '"error",' ..
+    '"' .. encode.url{
+      module = module,
+      view = view,
+      id = id,
+      params = params
+      } .. '&_webmcp_json_slots[]=default&_webmcp_json_slots[]=trace&_webmcp_json_slots[]=system_error",' ..
+    '{},' ..
+    '{},' ..
+    'function() {' ..
+      'hourglass_el.src = hourglass_src;' ..
+    '},' ..
+    'function() {' ..
+      'hourglass_el.src = hourglass_src;' ..
+    '}' ..
+  '); ' ..
+  'return(false);'
+end
+
diff -r fc9e748660c8 -r 00d1004545f1 env/ui/partial_set_param_names.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/env/ui/partial_set_param_names.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,6 @@
+function ui.partial_set_param_names(args)
+  if not ui._partial then
+    ui._partial = {}
+  end
+  ui._partial.params = args
+end
diff -r fc9e748660c8 -r 00d1004545f1 env/ui/set_for_partial_load.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/env/ui/set_for_partial_load.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,3 @@
+function ui.set_for_partial_load()
+  ui._partial_load = true
+end
\ No newline at end of file
diff -r fc9e748660c8 -r 00d1004545f1 env/ui/tabs.lua
--- a/env/ui/tabs.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/env/ui/tabs.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -1,41 +1,239 @@
-function ui.tabs(tabs)
-  ui.container{
-    attr = { class = "ui_tabs" },
-    content = function()
+if config.user_tab_mode == "accordeon" or config.user_tab_mode == "accordeon_first_expanded" or config.user_tab_mode == "accordeon_all_expanded" then
+
+  function ui.tabs(tabs)
+    local params = param.get_all_cgi()
+    local current_tabs_string = params["tab"]
+    local current_tabs = {}
+    if current_tabs_string then
+      for current_tab in current_tabs_string:gmatch("([^%|]+)") do
+        current_tabs[current_tab] = current_tab
+      end
+    end
+
+    local unique_string = param.get("tab_id") or multirand.string(16, '0123456789abcdef')
+
+    function render_tab(tab, first)
       local params = param.get_all_cgi()
-      local current_tab = params["tab"]
-      ui.container{
-        attr = { class = "ui_tabs_links" },
+      local active = false
+      for current_tab in pairs(current_tabs) do
+        if tab.name == current_tab then
+          active = true
+        end
+      end
+      if config.user_tab_mode == "accordeon_first_expanded" then
+        if first and current_tabs_string == nil then
+          active = true
+        end
+      end
+      local link_tabs = {}
+      if config.user_tab_mode == "accordeon" 
+        or config.user_tab_mode == "accordeon_first_expanded"
+        or config.user_tab_mode == "accordeon_all_expanded" and current_tabs_string
+      then
+        if not current_tabs_string and not first then
+          link_tabs[tabs[1].name] = true
+        end
+        for current_tab in pairs(current_tabs) do
+          if current_tab ~= tab.name then
+            link_tabs[current_tab] = true
+          end
+        end
+      elseif config.user_tab_mode == "accordeon_all_expanded" and not current_tabs_string then
+        for i, current_tab in ipairs(tabs) do
+          if current_tab.name ~= tab.name then
+            link_tabs[current_tab.name] = true
+          end
+        end
+      end
+      if not active then
+        link_tabs[tab.name] = true
+      end
+      local link_tab_string = ""
+      for link_tab in pairs(link_tabs) do
+        if #link_tab_string > 0 then
+          link_tab_string = link_tab_string .. "|"
+        end
+        link_tab_string = link_tab_string .. link_tab
+      end
+      params["tab"] = link_tab_string
+      local onclick
+      if not tab.content then
+        onclick =
+          'if (ui_tabs_active["' .. unique_string .. '"]["' .. tab.name .. '"]) {' ..
+            'el=document.getElementById("tab' .. unique_string .. '_content_' .. tab.name .. '");' ..
+            'el.innerHTML="";' ..
+            'el.style.display="none";' ..
+            'ui_tabs_active["' .. unique_string .. '"]["' .. tab.name .. '"]=false' ..
+          '} else {' ..
+            'ui_tabs_active["' .. unique_string .. '"]["' .. tab.name .. '"]=true;' ..
+            'document.getElementById("tab' .. unique_string .. '_content_' .. tab.name .. '").style.display="block"; ' ..
+            ui._partial_load_js{
+              params = { tab = tab.name }
+            } ..
+          '};' ..
+          'return(false);'
+      end
+      ui.link{
+        attr = {
+          name = "tab_" .. tab.name,
+          class = (
+            tab.name == current_tab and "ui_tabs_accordeon_head selected" or
+            not current_tab and i == 1 and "ui_tabs_accordeon_head selected" or
+            "ui_tabs_accordeon_head"
+          ),
+          id = "tab" .. unique_string .. "_head_" .. tab.name,
+          onclick = onclick,
+        },
+        module  = request.get_module(),
+        view    = request.get_view(),
+        id      = param.get_id_cgi(),
+        params  = params,
+        anchor  = "tab" .. unique_string .. "_" .. tab.name,
         content = function()
-          for i, tab in ipairs(tabs) do
-            params["tab"] = i > 1 and tab.name or nil
-            ui.link{
-              attr = { 
-                class = (
-                  tab.name == current_tab and "selected" or
-                  not current_tab and i == 1 and "selected" or
-                  ""
-                )
-              },
-              module = request.get_module(),
-              view = request.get_view(),
-              id = param.get_id_cgi(),
-              text = tab.label,
-              params = params
+          if tab.icon then
+            if not tab.icon.attr then
+              tab.icon.attr = {}
+            end
+            tab.icon.attr.id = "tab" .. unique_string .. "_icon_" .. tab.name
+            tab.icon.attr.width = 16
+            tab.icon.attr.height = 16
+            ui.image(tab.icon)
+          end
+          slot.put(tab.label)
+        end
+      }
+      local expanded = active or not request.get_json_request_slots() and config.user_tab_mode == "accordeon_all_expanded" and not current_tabs_string
+      ui.container{
+        attr = {
+          class = "ui_tabs_accordeon_content",
+          style = not expanded and "display: none;" or nil,
+          id = "tab" .. unique_string .. "_content_" .. tab.name
+        },
+        content = function()
+          if expanded then
+            ui.script{ script = 'ui_tabs_active["' .. unique_string .. '"]["' .. tab.name .. '"] = true;' }
+            execute.view{
+              module = tab.module,
+              view = tab.view,
+              id = tab.id,
+              params = tab.params
             }
-            slot.put(" ")
+          else
+            slot.put("&nbsp;")
           end
         end
       }
+    end
+
+    if not request.get_json_request_slots() or not current_tabs_string then
+      ui.script{ script = "ui_tabs_active['" .. unique_string .. "'] = {};" }
+      ui.container{
+        attr = { class = "ui_tabs" },
+        content = function()
+          for i, tab in ipairs(tabs) do
+            local static_params = tabs.static_params or {}
+            static_params.tab = tab.name
+            static_params.tab_id = unique_string
+            ui.partial{
+              module           = tabs.module,
+              view             = tabs.view,
+              id               = tabs.id,
+              params           = static_params,
+              param_names      = { "page" },
+              hourglass_target = "tab" .. unique_string .. "_icon_" .. tab.name,
+              target           = "tab" .. unique_string .. "_content_" .. tab.name,
+              content = function()
+                render_tab(tab, i == 1)
+              end
+            }
+          end
+        end
+      }
+    else
+      local dyntab
       for i, tab in ipairs(tabs) do
-        if tab.name == current_tab or not current_tab and i == 1 then
-          ui.container{
-            attr = { class = "ui_tabs_content" },
-            content = tab.content
-          }
+        if tab.name == current_tabs_string then
+          dyntab = tab
         end
       end
+      if dyntab then
+        local static_params = tabs.static_params or {}
+        static_params.tab = dyntab.name
+        static_params.tab_id = unique_string
+        dyntab.params.tab_id = unique_string
+        ui.partial{
+          module           = tabs.module,
+          view             = tabs.view,
+          id               = tabs.id,
+          params           = static_params,
+          param_names      = { "page" },
+          hourglass_target = "tab" .. unique_string .. "_icon_" .. dyntab.name,
+          target           = "tab" .. unique_string .. "_content_" .. dyntab.name,
+          content = function()
+            execute.view{
+              module = dyntab.module,
+              view   = dyntab.view,
+              id     = dyntab.id,
+              params = dyntab.params,
+            }
+          end
+        }
+      end
     end
-  }
-end
+  end
+
+else -- 'classic tab'
 
+  function ui.tabs(tabs)
+    ui.container{
+      attr = { class = "ui_tabs" },
+      content = function()
+        local params = param.get_all_cgi()
+        local current_tab = params["tab"]
+        ui.container{
+          attr = { class = "ui_tabs_links" },
+          content = function()
+            for i, tab in ipairs(tabs) do
+              params["tab"] = i > 1 and tab.name or nil
+              ui.link{
+                attr = { 
+                  class = (
+                    tab.name == current_tab and "selected" or
+                    not current_tab and i == 1 and "selected" or
+                    ""
+                  )
+                },
+                module  = request.get_module(),
+                view    = request.get_view(),
+                id      = param.get_id_cgi(),
+                content = tab.label,
+                params  = params
+              }
+              slot.put(" ")
+            end
+          end
+        }
+        for i, tab in ipairs(tabs) do
+          if tab.name == current_tab or not current_tab and i == 1 then
+            ui.container{
+              attr = { class = "ui_tabs_content" },
+              content = function()
+                if tab.content then
+                  tab.content()
+                else
+                  execute.view{
+                    module = tab.module,
+                    view   = tab.view,
+                    id     = tab.id,
+                    params = tab.params,
+                  }
+                end
+              end
+            }
+          end
+        end
+      end
+    }
+  end
+
+end
\ No newline at end of file
diff -r fc9e748660c8 -r 00d1004545f1 env/util/help.lua
--- a/env/util/help.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/env/util/help.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -13,7 +13,7 @@
           attr = { class = "help_actions" },
           content = function()
             ui.link{
-              content = _"Hide this help message",
+              text   = _"Hide this help message",
               module = "help",
               action = "update",
               params = {
diff -r fc9e748660c8 -r 00d1004545f1 locale/help/member.settings.display.de.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale/help/member.settings.display.de.txt	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,1 @@
+Hier kannst du persönliche Einstellungen in Bezug auf die optische Darstellung der Bedienoberfläche von LiquidFeedback tätigen.
diff -r fc9e748660c8 -r 00d1004545f1 locale/translations.de.lua
--- a/locale/translations.de.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/locale/translations.de.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -1,22 +1,28 @@
 #!/usr/bin/env lua
 return {
-["#{count} more initiatives"] = "#{count} weitere Initiativen";
 ["#{interested_issues_to_vote_count} issue(s) you are interested in"] = "#{interested_issues_to_vote_count} Themen, die Dich interessieren";
 ["#{issues_to_vote_count} issue(s)"] = "#{issues_to_vote_count} Themen";
 ["#{number} Image(s) has been deleted"] = "Es wurde(n) #{number} Bild(er) gelöscht";
 ["#{number} Image(s) has been updated"] = "Es wurde(n) #{number} Bild(er) aktualisiert";
+["(#{more_count} duplicates removed)"] = "(#{more_count} Duplikate entfernt)";
 ["(change URL)"] = "(URL ändern)";
 ["(new window)"] = "(neues Fenster)";
 ["+ #{weight}"] = "+ #{weight}";
 ["A-Z"] = "A-Z";
 ["About"] = "About";
+["About / Impressum"] = false;
 ["About LiquidFeedback"] = "Über LiquidFeedback";
 ["Abstention"] = "Enthaltung";
+["Abstention [many entries]"] = "Enthaltung";
+["Abstention [single entry]"] = "Enthaltung";
 ["Accept invitation"] = "Einladung annehmen";
 ["Accepted at"] = "Angenommen am/um";
+["Accordion (all expanded)"] = "Akkordeon (alle offen)";
+["Accordion (first expanded)"] = "Akkordeon (erstes offen)";
+["Accordion (none expanded)"] = "Akkordeon (keins offen)";
 ["Active?"] = "Aktiv?";
+["Add alternative initiative to issue"] = "Alternative Initiative zum Thema hinzufügen";
 ["Add my interest"] = "Mein Interesse anmelden";
-["Add new initiative to issue"] = "Neue Initiative zum Thema hinzufügen";
 ["Add new suggestion"] = "Neue Anregung hinzufügen";
 ["Add to my contacts"] = "Zu meinen Kontakten hinzufügen";
 ["Address"] = "Anschrift";
@@ -26,14 +32,26 @@
 ["Administrator"] = "Administrator";
 ["Admission time"] = "Zeit für die Zulassung";
 ["Admitted"] = "zugelassen";
+["Alternative initiatives"] = "Alternative Initiativen";
 ["Any"] = "Alle";
+["Approval (#th preference) [many entries]"] = "Zustimmung (#.-Wünsche)";
+["Approval (#th preference) [single entry]"] = "Zustimmung (#.-Wunsch)";
+["Approval (first preference) [many entries]"] = "Zustimmung (Erstwünsche)";
+["Approval (first preference) [single entry]"] = "Zustimmung (Erstwunsch)";
+["Approval (second preference) [many entries]"] = "Zustimmung (Zweitwünsche)";
+["Approval (second preference) [single entry]"] = "Zustimmung (Zweitwunsch)";
+["Approval (third preference) [many entries]"] = "Zustimmung (Drittwünsche)";
+["Approval (third preference) [single entry]"] = "Zustimmung (Drittwunsch)";
+["Approval [many entries]"] = "Zustimmung";
+["Approval [single entry]"] = "Zustimmung";
+["Approved"] = "Angenommen";
 ["Are you sure?"] = "Sicher?";
 ["Area"] = "Themenbereich";
 ["Area '#{name}'"] = "Themenbereich '#{name}'";
-["Area delegation"] = "Area-Delegation";
+["Area delegation"] = "Delegation für Themenbereich";
 ["Area list"] = "Liste der Themenbereiche";
 ["Area successfully updated"] = "Themenbereich erfolgreich aktualisiert";
-["Area wide delegation active"] = "Delegation für Themengebiet aktiv";
+["Area wide delegation active"] = "Delegation für Themenbereich aktiv";
 ["Areas"] = "Themenbereiche";
 ["Author"] = "Autor";
 ["Autoreject is off."] = "Auto-Ablehnen ist aus";
@@ -41,6 +59,7 @@
 ["Avatar"] = "Avatar";
 ["Back"] = "Zurück";
 ["Back to timeline"] = "Zurück zur Zeitachse";
+["Ballot of '#{member_name}' for issue ##{issue_id}"] = "Stimmzettel von '#{member_name}' für Thema ##{issue_id}";
 ["Become a member"] = "Mitglied werden";
 ["Birthday"] = "Geburtstag";
 ["Can't remove last initiator"] = "Der letzte Initiator kann nicht entfernt werden";
@@ -50,19 +69,22 @@
 ["Cancel refuse of invitation"] = "Ablehnung der Einladung aufheben";
 ["Cancel registration"] = "Registration abbrechen";
 ["Cancelled"] = "Abgebrochen";
-["Change area delegation"] = "Delegation für Themengebiet ändern";
+["Change area delegation"] = "Delegation für Themenbereich ändern";
+["Change display settings"] = "Anzeige-Einstellungen ändern";
+["Change filters and order"] = "Filter und Sortierung ändern";
 ["Change global delegation"] = "Globale Delegation ändern";
 ["Change issue delegation"] = "Delegation für Thema ändern";
 ["Change login"] = "Login ändern";
 ["Change name"] = "Name ändern";
+["Change order"] = "Sortierung ändern";
 ["Change password"] = "Kennwort ändern";
+["Change vote"] = "Wahl ändern";
 ["Change your login"] = "Deinen Anmeldenamen ändern";
 ["Change your name"] = "Deinen Namen ändern";
 ["Change your password"] = "Dein Kennwort ändern";
 ["Choose initiator"] = "Initiator auswählen";
 ["Choose member"] = "Mitglied auswählen";
 ["Click for details"] = "Klicke für Details";
-["Close"] = "Schließen";
 ["Closed"] = "geschlossen";
 ["Collective opinion"] = "Meinungsbild";
 ["Commit suggestion"] = "Anregung speichern";
@@ -79,7 +101,6 @@
 ["Created at"] = "Erzeugt am/um";
 ["Current draft"] = "Aktueller Entwurf";
 ["Current votings in areas you are member of and issues you are interested in:"] = "Jetzt laufende Abstimmungen zu Themen aus Deinen Themenbereichen oder solchen an denen Du interessiert bist:";
-["Date"] = "Datum";
 ["Degree"] = "Grad";
 ["Delegations"] = "Delegationen";
 ["Delete filter"] = "Filter löschen";
@@ -89,15 +110,25 @@
 ["Diff"] = "Differenz";
 ["Direct member count"] = "Anzahl Direktmitglieder";
 ["Direct membership"] = "Direkte Mitgliedschaft";
+["Disapproval (prefer to last block) [many entries]"] = "Ablehnung (jedoch Bevorzugung gegenüber letztem Ablehnungsblock)";
+["Disapproval (prefer to last block) [single entry]"] = "Ablehnung (jedoch Bevorzugung gegenüber letztem Ablehnungsblock)";
+["Disapproval (prefer to lower block) [many entries]"] = "Ablehnung (jedoch Bevorzugung gegenüber unterem Ablehnungsblock)";
+["Disapproval (prefer to lower block) [single entry]"] = "Ablehnung (jedoch Bevorzugung gegenüber unterem Ablehnungsblock)";
+["Disapproval (prefer to lower blocks) [many entries]"] = "Ablehnung (jedoch Bevorzugung gegenüber unteren Ablehnungsblöcken)";
+["Disapproval (prefer to lower blocks) [single entry]"] = "Ablehnung (jedoch Bevorzugung gegenüber unteren Ablehnungsblöcken)";
+["Disapproval [many entries]"] = "Ablehnung";
+["Disapproval [single entry]"] = "Ablehnung";
 ["Discussion"] = "Diskussion";
 ["Discussion URL"] = "Diskussions-URL";
 ["Discussion on issue"] = "Diskussion zum Thema";
 ["Discussion time"] = "Zeit für die Diskussions";
 ["Discussion with initiators"] = "Diskussion mit den Initiatoren";
+["Display settings"] = "Anzeige-Einstellungen";
 ["Download"] = "Download";
 ["Download database export"] = "Datenbankexport herunterladen";
 ["Draft"] = "Entwurf";
 ["Draft history"] = "Entwurfshistorie";
+["EXPERIMENTAL FEATURE"] = "EXPERIMENTELLE FUNKTION";
 ["Edit"] = "Bearbeiten";
 ["Edit draft"] = "Entwurf bearbeiten";
 ["Edit initiative"] = "Initiative bearbeiten";
@@ -161,7 +192,6 @@
 ["Invited"] = "Eingeladen";
 ["Issue"] = "Thema";
 ["Issue ##{id}"] = "Thema ##{id}";
-["Issue ##{id} (#{policy_name})"] = "Thema ##{id} (#{policy_name})";
 ["Issue accepted"] = "Thema akzeptiert";
 ["Issue canceled"] = "Thema abgebrochen";
 ["Issue delegation"] = "Issue-Delegation";
@@ -196,6 +226,7 @@
 ["Member '#{member}'"] = "Mitglied '#{member}'";
 ["Member has been removed from initiators"] = "Mitglied wurde von den Initiatoren entfernt";
 ["Member has been removed from your contacts"] = "Mitglied wurde aus Deinen Kontakten entfernt";
+["Member has not approved latest draft"] = "Mitglied hat den letzten Entwurf noch nicht angenommen";
 ["Member is administrator"] = "Mitglied ist Administrator";
 ["Member is already saved in your contacts!"] = "Mitglied ist schon in Deinen Kontakten!";
 ["Member is now invited to be initiator"] = "Mitglied ist jetzt als Initiator eingeladen";
@@ -206,6 +237,7 @@
 ["Member page"] = "Mitgliederseite";
 ["Member successfully registered"] = "Mitglied erfolgreich registriert";
 ["Member successfully updated"] = "Mitglied erfolgreich aktualisert";
+["Member voting"] = false;
 ["Member: '#{login}' (#{name})"] = "Mitlied: '#{login}' (#{name})";
 ["Members"] = "Mitglieder";
 ["Membership by delegation"] = "Mitgliedschaft durch Delegation";
@@ -216,6 +248,8 @@
 ["Missing help text: #{id}.#{lang}.txt"] = "Fehlender Hilfe-Text: #{id}.#{lang}.txt";
 ["Mobile phone"] = "Mobiltelefon";
 ["Monday"] = "Montag";
+["Move down"] = "Runter schieben";
+["Move up"] = "Hoch schieben";
 ["My opinion"] = "Meine Meinung";
 ["Name"] = "Name";
 ["New"] = "Neu";
@@ -237,9 +271,13 @@
 ["No membership at all"] = "Gar keine Mitgliedschaft";
 ["No support at all"] = "Gar keine Unterstützung";
 ["Not a member"] = "Kein Mitglied";
+["Not approved (rank #{rank})"] = "Nicht angenommen (Rang #{rank})";
 ["Not voted"] = "Nicht abgestimmt";
+["Not voted (not admitted)"] = "Nicht abgestimmt (nicht zugelassen)";
+["Not voted (revoked from initiator)"] = "Nicht abgestimmt (durch Initiator zurückgezogen)";
 ["Not yet voted"] = "Noch abzustimmen";
 ["Number of incoming delegations, follow link to see more details"] = "Anzahl eingehender Delegationen, Link folgen für mehr Details";
+["Number of initiatives to preview"] = "Anzahl der Initiativen in der Vorschau";
 ["OK"] = "OK";
 ["Old draft revision"] = "Alte Revision des Entwurfs";
 ["Old password"] = "Altes Kennwort";
@@ -251,6 +289,7 @@
 ["One issue you are interested in"] = "Ein Thema, das Dich interessiert";
 ["One step back"] = "Ein Schritt zurück";
 ["Open"] = "Offen";
+["Opinions"] = "Meinungen";
 ["Order by"] = "Sortieren nach";
 ["Organizational unit"] = "Organisationseinheit";
 ["Outgoing delegations"] = "Ausgehende Delegationen";
@@ -285,7 +324,6 @@
 ["Profile"] = "Profil";
 ["Publish"] = "Veröffentlichen";
 ["Published"] = "veröffentlicht";
-["Published contacts"] = "Veröffentlichte Kontakte";
 ["Rank"] = "Rang";
 ["Real name"] = "Realname";
 ["Refresh support to current draft"] = "Unterstützung auf aktuellen Entwurf aktualisieren";
@@ -322,10 +360,11 @@
 ["Search issues"] = "Suche Themen";
 ["Search members"] = "Suche Mitglieder";
 ["Search results for: '#{search}'"] = "Suchergebnisse für: '#{search}'";
+["Select language \"#{langcode}\""] = false;
 ["Set URL"] = "URL setzen";
-["Set area delegation"] = "Delegation für Themengebiet festlegen";
+["Set area delegation"] = "Delegation für Themenbereich festlegen";
 ["Set autoreject"] = "Auto-Ablehnen anschalten";
-["Set delegation for Area '#{name}'"] = "Delegation für Themengebiet '#{name}' festlegen";
+["Set delegation for Area '#{name}'"] = "Delegation für Themenbereich '#{name}' festlegen";
 ["Set delegation for Issue ##{number} in Area '#{area_name}'"] = "Delegation für Thema ##{number} im Themenbereich '#{area_name}' festlegen";
 ["Set global delegation"] = "Globale Delegation festlegen";
 ["Set issue delegation"] = "Delegation für Thema festlegen";
@@ -333,11 +372,13 @@
 ["Settings"] = "Einstellungen";
 ["Show"] = "Zeige";
 ["Show active members"] = "Zeige aktive Mitglieder";
-["Show all initiatives"] = "Zeige alle Initiativen";
+["Show alternative initiatives"] = "Zeige alternative Initiativen";
 ["Show areas in use"] = "Zeige verwendete Themenbereiche";
 ["Show areas not in use"] = "Zeige nicht verwendente Themenbereiche";
 ["Show diff"] = "Änderungen anzeigen";
+["Show filter"] = "Zeige Filter";
 ["Show filter details"] = "Zeige Filter-Details";
+["Show help text"] = "Zeige Hilfe-Text";
 ["Show locked members"] = "Zeige gesperrte Mitglieder";
 ["Show member"] = "Mitglied anzeigen";
 ["Show name history"] = "Namenshistorie zeigen";
@@ -370,14 +411,24 @@
 ["Supported"] = "Unterstützt";
 ["Supported initiatives"] = "Unterstützte Initiativen";
 ["Supporter"] = "Unterstützer";
+["Tabs"] = "Registerkarten";
 ["Terms accepted"] = "Bedingungen akzeptiert";
+["Terms of use"] = "Nutzungsbedingungen";
 ["The code you've entered is invalid"] = "Der Code, den Du eingeben hast, ist nicht gültig!";
 ["The draft of this initiative has been updated!"] = "Der Entwurfstext der Initiative wurde aktualisiert!";
 ["The drafts do not differ"] = "Die Entwürfe unterscheiden sich nicht";
 ["The initiators suggest to support the following initiative:"] = "Die Initiatoren empfehlen folgende Initiative zu unterstützen:";
+["There are no more alternative initiatives currently."] = "Es gibt zur Zeit keine weiteren alternative Initiative.";
+["There were no more alternative initiatives."] = "Es gab keine weiteren alternativen Initiativen.";
+["This initiative"] = "Diese Initiative";
+["This initiative compared to alternative initiatives"] = "Diese Initiative im Vergleich zu alternativen Initiativen";
 ["This initiative has been revoked at #{revoked}"] = "Diese Initiative wurde am/um #{revoked} zurückgezogen";
+["This initiative has not been admitted! It failed the quorum of #{quorum}."] = "Diese Initiative wurde nicht zugelassen. Sie hat das Quorum von #{quorum} nicht erreicht.";
 ["This initiative is already revoked"] = "Diese Initiative ist schon zurückgezogen";
 ["This initiative is revoked"] = "Diese Initiative wurde zurückgezogen";
+["This issue has been cancelled. It failed the quorum of #{quorum}."] = "Dieses Thema wurde abgebrochen. Es hat das Quorum von #{quorum} nicht erfüllt.";
+["This issue has been finished with the following winning initiative:"] = "Diese Thema wurde mit folgender Initiative als Gewinner abgeschlossen:";
+["This issue has been finished without any winning initiative."] = "Das Thema wurde ohne Gewinner abgeschlossen.";
 ["This issue is already closed."] = "Das Thema ist schon geschlossen.";
 ["This issue is already frozen."] = "Das Thema ist schon eingefroren";
 ["This login is already taken, please choose another one!"] = "Dieser Anmeldename ist bereits vergeben, bitte wähle einen anderen!";
@@ -386,6 +437,7 @@
 ["This member has rejected to become initiator of this initiative"] = "Dieses Mitglied hat die Einladung, Initiator zu werden, abgelehnt";
 ["This member is already initiator of this initiative"] = "Dieses Mitglied ist bereits Initiator dieser Initiative";
 ["This member is already invited to become initiator of this initiative"] = "Dieses Mitglied ist bereits eingeladen Initiator dieser Initiative zu werden";
+["This member is participating, the rest of delegation chain is suspended while discussing"] = "Dieses Mitglied partizipiert, Rest der Delegationskette ausgesetzt.";
 ["This name is already taken, please choose another one!"] = "Dieser Name ist bereits vergeben, bitte wähle einen anderen!";
 ["This name is really too short!"] = "Dieser Name ist wirklich zu kurz!";
 ["This name is too short!"] = "Dieser Name ist zu kurz!";
@@ -395,10 +447,12 @@
 ["Thursday"] = "Donnerstag";
 ["Time left"] = "Restzeit";
 ["Timeline"] = "Zeitachse";
-["Title (80 chars max)"] = "Title (max. 80 Zeichen)";
-["Traditional wiki syntax"] = "Traditionaller Wiki-Syntax";
+["Title"] = "Titel";
+["Title (80 chars max)"] = "Titel (max. 80 Zeichen)";
+["Traditional wiki syntax"] = "Traditionelle Wiki-Syntax";
 ["Trustee"] = "Bevollmächtigter";
 ["Tuesday"] = "Dienstag";
+["Type of tabs"] = "Tabulatortyp";
 ["Unknown author"] = "Unbekannter Autor";
 ["Upload images"] = "Bilder hochladen";
 ["Used until"] = "Benutzt bis";
@@ -411,8 +465,8 @@
 ["Voted no"] = "Mit Nein gestimmt";
 ["Voted proposal"] = "Abgestimmte Vorlage";
 ["Voted yes"] = "Mit Ja gestimmt";
-["Voter"] = "Abstimmende";
 ["Voting"] = "Abstimmung";
+["Voting details"] = "Abstimmdetails";
 ["Voting for this issue has already begun."] = "Die Abstimmung für dieses Thema hat schon begonnen.";
 ["Voting for this issue is currently running!"] = "Über dieses Thema wird gerade abgestimmt!";
 ["Voting has not started yet."] = "Die Abstimmung hat noch nicht begonnen.";
@@ -447,10 +501,11 @@
 ["Your are interested"] = "Du bist interessiert";
 ["Your are potential supporter"] = "Du bist potentieller Unterstützer";
 ["Your are supporter"] = "Du bist Unterstützer";
-["Your delegation for this area has been deleted."] = "Deine Delegation für dieses Themengebiet wurde gelöscht";
-["Your delegation for this area has been updated."] = "Deine Delegation für dieses Themengebiet wurde geändert";
+["Your delegation for this area has been deleted."] = "Deine Delegation für dieses Themenbereich wurde gelöscht";
+["Your delegation for this area has been updated."] = "Deine Delegation für dieses Themenbereich wurde geändert";
 ["Your delegation for this issue has been deleted."] = "Deine Delegation für dieses Thema wurde gelöscht";
 ["Your delegation for this issue has been updated."] = "Deine Delegation für dieses Thema wurde geändert";
+["Your display settings have been updated"] = "Deine Anzeige-Einstellungen wurden aktualisiert";
 ["Your global delegation has been deleted."] = "Deine globale Delegation wurde gelöscht";
 ["Your global delegation has been updated."] = "Deine globale Delegation wurde geändert";
 ["Your login has been changed to '#{login}'"] = "Dein Anmeldename wurde auf '#{login}' geändert";
@@ -465,17 +520,18 @@
 ["Your support has been updated to the latest draft"] = "Deine Unterstützung wurde auf den neuesten Entwurf aktualisiert";
 ["Your web browser is not fully supported yet."] = "Dein Web-Browser wird noch nicht vollständig unterstützt.";
 ["Z-A"] = "Z-A";
-["all"] = "Alle";
+["and #{count} more initiatives"] = "und #{count} weitere Initiativen";
 ["continuing"] = "andauernd";
 ["delete<br /><br />"] = "löschen<br /><br />";
 ["email"] = "E-Mail";
+["last 24 hours"] = "letzte 24 Stunden";
 ["login name"] = "Anmeldename";
 ["must"] = "muss";
 ["must not"] = "darf nicht";
 ["must/should"] = "muss/soll";
 ["must/should not"] = "muss/soll nicht";
 ["neutral"] = "neutral";
-["not implemented"] = "nicht umgesetzt";
+["requested"] = "angefragt";
 ["should"] = "soll";
 ["should not"] = "soll nicht";
 ["to reset your password please click on the following link:\n\n"] = "um Dein Kennwort zurückzusetzen klicke bitte den folgenden Link an:\n\n";
diff -r fc9e748660c8 -r 00d1004545f1 locale/translations.en.lua
--- a/locale/translations.en.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/locale/translations.en.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -1,15 +1,517 @@
 #!/usr/bin/env lua
 return {
-["Error compile"] = false;
-["Error no file"] = false;
-["Error runtime"] = false;
+["#{interested_issues_to_vote_count} issue(s) you are interested in"] = false;
+["#{issues_to_vote_count} issue(s)"] = false;
+["#{number} Image(s) has been deleted"] = false;
+["#{number} Image(s) has been updated"] = false;
+["(#{more_count} duplicates removed)"] = false;
+["(change URL)"] = false;
+["(new window)"] = false;
+["+ #{weight}"] = false;
+["A-Z"] = false;
+["About"] = false;
+["About LiquidFeedback"] = false;
+["Abstention"] = false;
+["Abstention [many entries]"] = "Abstention";
+["Abstention [single entry]"] = "Abstention";
+["Accept invitation"] = false;
+["Accepted at"] = false;
+["Accordion (all expanded)"] = false;
+["Accordion (first expanded)"] = false;
+["Accordion (none expanded)"] = false;
+["Active?"] = false;
+["Add my interest"] = false;
+["Add new initiative"] = false;
+["Add new initiative to issue"] = false;
+["Add new suggestion"] = false;
+["Add to my contacts"] = false;
+["Address"] = false;
+["Admin"] = false;
+["Admin menu"] = false;
+["Admin?"] = false;
+["Administrator"] = false;
+["Admission time"] = false;
+["Admitted"] = false;
+["Any"] = false;
+["Approval (#th preference) [many entries]"] = "Approval (#th preference)";
+["Approval (#th preference) [single entry]"] = "Approval (#th preference)";
+["Approval (first preference) [many entries]"] = "Approval (first preference)";
+["Approval (first preference) [single entry]"] = "Approval (first preference)";
+["Approval (second preference) [many entries]"] = "Approval (second preference)";
+["Approval (second preference) [single entry]"] = "Approval (second preference)";
+["Approval (third preference) [many entries]"] = "Approval (third preference)";
+["Approval (third preference) [single entry]"] = "Approval (third preference)";
+["Approval [many entries]"] = "Approval";
+["Approval [single entry]"] = "Approval";
+["Are you sure?"] = false;
+["Area"] = false;
+["Area '#{name}'"] = false;
+["Area delegation"] = false;
+["Area list"] = false;
+["Area successfully updated"] = false;
+["Area wide delegation active"] = false;
+["Areas"] = false;
+["Author"] = false;
+["Autoreject is off."] = false;
+["Autoreject is on."] = false;
+["Avatar"] = false;
+["Back"] = false;
+["Back to timeline"] = false;
+["Become a member"] = false;
+["Birthday"] = false;
+["Can't remove last initiator"] = false;
+["Can't send confirmation email"] = false;
+["Cancel"] = false;
+["Cancel password reset"] = false;
+["Cancel refuse of invitation"] = false;
+["Cancel registration"] = false;
+["Cancelled"] = false;
+["Change area delegation"] = false;
+["Change display settings"] = false;
+["Change global delegation"] = false;
+["Change issue delegation"] = false;
+["Change login"] = false;
+["Change name"] = false;
+["Change password"] = false;
+["Change vote"] = false;
+["Change your login"] = false;
+["Change your name"] = false;
+["Change your password"] = false;
+["Choose initiator"] = false;
+["Choose member"] = false;
+["Click for details"] = false;
+["Close"] = false;
+["Closed"] = false;
+["Collective opinion"] = false;
+["Commit suggestion"] = false;
+["Compare"] = false;
+["Confirm"] = false;
+["Confirmation code"] = false;
+["Confirmation code invalid!"] = false;
+["Contacts"] = false;
+["Content"] = false;
+["Counting of votes"] = false;
+["Create alternative initiative"] = false;
+["Create new area"] = false;
+["Create new issue"] = false;
+["Created at"] = false;
+["Current draft"] = false;
+["Current votings in areas you are member of and issues you are interested in:"] = false;
+["Degree"] = false;
+["Delegations"] = false;
+["Delete filter"] = false;
+["Description"] = false;
+["Details"] = false;
+["Developer features"] = false;
+["Diff"] = false;
+["Direct member count"] = false;
+["Direct membership"] = false;
+["Disapproval (prefer to last block) [many entries]"] = "Disapproval (prefer to last block)";
+["Disapproval (prefer to last block) [single entry]"] = "Disapproval (prefer to last block)";
+["Disapproval (prefer to lower block) [many entries]"] = "Disapproval (prefer to lower block)";
+["Disapproval (prefer to lower block) [single entry]"] = "Disapproval (prefer to lower block)";
+["Disapproval (prefer to lower blocks) [many entries]"] = "Disapproval (prefer to lower blocks)";
+["Disapproval (prefer to lower blocks) [single entry]"] = "Disapproval (prefer to lower blocks)";
+["Disapproval [many entries]"] = "Disapproval";
+["Disapproval [single entry]"] = "Disapproval";
+["Discussion"] = false;
+["Discussion URL"] = false;
+["Discussion on issue"] = false;
+["Discussion time"] = false;
+["Discussion with initiators"] = false;
+["Display settings"] = false;
+["Display starting from"] = false;
+["Download"] = false;
+["Download database export"] = false;
+["Draft"] = false;
+["Draft history"] = false;
+["Edit"] = false;
+["Edit draft"] = false;
+["Edit initiative"] = false;
+["Edit my page"] = false;
+["Edit my profile"] = false;
+["Email address"] = false;
+["Email address confirmation"] = false;
+["Email address is confirmed now"] = false;
+["Email address too short!"] = false;
+["Email confirmation request"] = false;
+["Empty help text: #{id}.#{lang}.txt"] = false;
+["Error while updating member, database reported:<br /><br /> (#{errormessage})"] = false;
+["External memberships"] = false;
+["External posts"] = false;
+["Filter"] = false;
+["Finish voting"] = false;
+["Finished"] = false;
+["Friday"] = false;
+["Frozen"] = false;
+["Fully frozen at"] = false;
+["Global delegation"] = false;
+["Global delegation active"] = false;
+["Half frozen at"] = false;
+["Hello "] = false;
+["Help for: #{text}"] = false;
+["Hide"] = false;
+["Hide filter details"] = false;
+["Hide this help message"] = false;
 ["Home"] = false;
+["I accept the terms of use by checking the following checkbox:"] = false;
+["Id"] = false;
+["Ident number"] = false;
+["If this link is not working, please open following url in your web browser:\n\n"] = false;
+["Images"] = false;
+["In discussion"] = false;
+["Incoming delegations"] = false;
+["Initiated"] = false;
+["Initiated initiatives"] = false;
+["Initiative events"] = false;
+["Initiative is revoked now"] = false;
+["Initiative quorum"] = false;
+["Initiative revoked"] = false;
+["Initiative successfully created"] = false;
+["Initiative successfully updated"] = false;
+["Initiative: '#{name}'"] = false;
+["Initiatives"] = false;
+["Initiatives that invited you to become initiator:"] = false;
+["Initiator"] = false;
+["Initiators"] = false;
+["Interest not existant"] = false;
+["Interest removed"] = false;
+["Interest updated"] = false;
+["Interested"] = false;
+["Interested members"] = false;
+["Internal posts"] = false;
 ["Invalid username or password!"] = false;
+["Invitation has been refused"] = false;
+["Invite an initiator to initiative"] = false;
+["Invite code"] = false;
+["Invite initiator"] = false;
+["Invited"] = false;
+["Issue"] = false;
+["Issue ##{id}"] = false;
+["Issue ##{id} (#{policy_name})"] = false;
+["Issue accepted"] = false;
+["Issue canceled"] = false;
+["Issue delegation"] = false;
+["Issue delegation active"] = false;
+["Issue events"] = false;
+["Issue finished"] = false;
+["Issue finished without voting"] = false;
+["Issue frozen"] = false;
+["Issue policy"] = false;
+["Issue quorum"] = false;
+["Issues"] = false;
+["JavaScript is disabled or not available."] = false;
+["Last author"] = false;
+["Last snapshot:"] = false;
+["Legend:"] = false;
+["License"] = false;
+["Locked?"] = false;
 ["Login"] = false;
+["Login name"] = false;
 ["Login successful!"] = false;
 ["Logout"] = false;
 ["Logout successful"] = false;
+["Manage filter"] = false;
+["Manage timeline filters"] = false;
+["Mark suggestion as implemented and express dissatisfaction"] = false;
+["Mark suggestion as implemented and express satisfaction"] = false;
+["Mark suggestion as not implemented and express dissatisfaction"] = false;
+["Mark suggestion as not implemented and express satisfaction"] = false;
+["Max potential support"] = false;
+["Max support"] = false;
+["Member"] = false;
+["Member '#{member}'"] = false;
+["Member has been removed from initiators"] = false;
+["Member has been removed from your contacts"] = false;
+["Member is administrator"] = false;
+["Member is already saved in your contacts!"] = false;
+["Member is now invited to be initiator"] = false;
+["Member list"] = false;
+["Member name"] = false;
+["Member name history for '#{name}'"] = false;
+["Member of area"] = false;
+["Member page"] = false;
+["Member successfully registered"] = false;
+["Member successfully updated"] = false;
+["Member: '#{login}' (#{name})"] = false;
+["Members"] = false;
+["Membership by delegation"] = false;
+["Membership not existant"] = false;
+["Membership removed"] = false;
+["Membership updated"] = false;
+["Memberships"] = false;
+["Missing help text: #{id}.#{lang}.txt"] = false;
+["Mobile phone"] = false;
+["Monday"] = false;
+["My opinion"] = false;
+["Name"] = false;
+["New"] = false;
+["New draft"] = false;
+["New draft has been added to initiative"] = false;
+["New draft revision"] = false;
+["New initiative"] = false;
+["New issue"] = false;
+["New password"] = false;
+["New passwords does not match."] = false;
+["New passwords is too short."] = false;
+["New suggestion"] = false;
+["Newest"] = false;
+["Next state"] = false;
+["No"] = false;
+["No changes to your images were made"] = false;
+["No delegation"] = false;
+["No events selected to list"] = false;
+["No membership at all"] = false;
+["No support at all"] = false;
+["Not a member"] = false;
+["Not voted"] = false;
+["Not yet voted"] = false;
+["Number of incoming delegations, follow link to see more details"] = false;
+["Number of initiatives to preview"] = false;
+["OK"] = false;
+["Old draft revision"] = false;
+["Old password"] = false;
+["Old password is wrong"] = false;
+["Oldest"] = false;
+["On that page please enter the confirmation code:\n\n"] = false;
+["On that page please enter the reset code:\n\n"] = false;
+["One issue"] = false;
+["One issue you are interested in"] = false;
+["One step back"] = false;
+["Open"] = false;
+["Order by"] = false;
+["Organizational unit"] = false;
+["Outgoing delegations"] = false;
 ["Password"] = false;
-["Password login"] = false;
-["Username"] = false;
+["Password (repeat)"] = false;
+["Password has been reset successfully"] = false;
+["Password reset request"] = false;
+["Passwords don't match!"] = false;
+["Passwords must consist of at least 8 characters!"] = false;
+["Phone"] = false;
+["Photo"] = false;
+["Please choose a login name. This name will not be shown to others and is used only by you to login into the system. The login name is case sensitive."] = false;
+["Please choose a member"] = false;
+["Please choose a name, i.e. your real name or your nick name. This name will be shown to others to identify you."] = false;
+["Please choose a password and enter it twice. The password is case sensitive."] = false;
+["Please choose a policy"] = false;
+["Please choose two different versions of the draft to compare"] = false;
+["Please choose two versions of the draft to compare"] = false;
+["Please confirm your email address by clicking the following link:\n\n"] = false;
+["Please enter the email reset code you have received:"] = false;
+["Please enter the invite code you've received."] = false;
+["Please enter your email address. This address will be used for automatic notifications (if you request them) and in case you've lost your password. This address will not be published. After registration you will receive an email with a confirmation link."] = false;
+["Please enter your login name. You will receive an email with a link to reset your password."] = false;
+["Please enter your new password twice."] = false;
+["Policy"] = false;
+["Population"] = false;
+["Posts"] = false;
+["Potential support"] = false;
+["Potential supported"] = false;
+["Potential supporter"] = false;
+["Profession"] = false;
+["Profile"] = false;
+["Publish"] = false;
+["Published"] = false;
+["Published contacts"] = false;
+["Rank"] = false;
+["Real name"] = false;
+["Refresh support to current draft"] = false;
+["Refuse invitation"] = false;
+["Register"] = false;
+["Register new member"] = false;
+["Registration"] = false;
+["Rejected"] = false;
+["Remove"] = false;
+["Remove autoreject"] = false;
+["Remove from contacts"] = false;
+["Remove initiator"] = false;
+["Remove initiator from initiative"] = false;
+["Remove my interest"] = false;
+["Remove my membership"] = false;
+["Remove my request to vote later"] = false;
+["Remove my support from this initiative"] = false;
+["Repeat new password"] = false;
+["Request password reset link"] = false;
+["Reset code"] = false;
+["Reset code is invalid!"] = false;
+["Reset link has been send for this member"] = false;
+["Reset password"] = false;
+["Revoke"] = false;
+["Revoke initiative"] = false;
+["Revoked at"] = false;
+["Saturday"] = false;
+["Save"] = false;
+["Save current filter"] = false;
+["Save timeline filters"] = false;
+["Saved as contact"] = false;
+["Search"] = false;
+["Search initiatives"] = false;
+["Search issues"] = false;
+["Search members"] = false;
+["Search results for: '#{search}'"] = false;
+["Set URL"] = false;
+["Set area delegation"] = false;
+["Set autoreject"] = false;
+["Set delegation for Area '#{name}'"] = false;
+["Set delegation for Issue ##{number} in Area '#{area_name}'"] = false;
+["Set global delegation"] = false;
+["Set issue delegation"] = false;
+["Set new password"] = false;
+["Settings"] = false;
+["Show"] = false;
+["Show active members"] = false;
+["Show all initiatives"] = false;
+["Show areas in use"] = false;
+["Show areas not in use"] = false;
+["Show diff"] = false;
+["Show filter details"] = false;
+["Show locked members"] = false;
+["Show member"] = false;
+["Show name history"] = false;
+["Show only events which match... (or associtated)"] = false;
+["Software"] = false;
+["Some JavaScript based functions (voting in particular) will not work.\nFor this beta, please use a current version of Firefox, Safari, Opera(?), Konqueror or another (more) standard compliant browser.\nAlternative access without JavaScript will be available soon."] = false;
+["Sorry, but there is not confirmed email address for your account. Please contact the administrator or support."] = false;
+["Sorry, but you are currently not invited"] = false;
+["Sorry, you have reached your personal flood limit. Please be slower..."] = false;
+["Sorry, your contingent for creating initiatives has been used up. Please try again later."] = false;
+["State"] = false;
+["Statement"] = false;
+["Step 1/5: Invite code"] = false;
+["Step 2/5: Email address"] = false;
+["Step 3/5: Username"] = false;
+["Step 4/5: Login name"] = false;
+["Step 5/5: Terms of use and password"] = false;
+["Stylesheet URL"] = false;
+["Stylesheet URL has been updated"] = false;
+["Suggest no initiative"] = false;
+["Suggested initiative"] = false;
+["Suggestion"] = false;
+["Suggestion currently implemented"] = false;
+["Suggestion currently not implemented"] = false;
+["Suggestion for initiative: '#{name}'"] = false;
+["Suggestions"] = false;
+["Sunday"] = false;
+["Support"] = false;
+["Support this initiative"] = false;
+["Supported"] = false;
+["Supported initiatives"] = false;
+["Supporter"] = false;
+["Tabs"] = false;
+["Terms accepted"] = false;
+["The code you've entered is invalid"] = false;
+["The draft of this initiative has been updated!"] = false;
+["The drafts do not differ"] = false;
+["The initiators suggest to support the following initiative:"] = false;
+["This initiative has been revoked at #{revoked}"] = false;
+["This initiative has not been admitted! It failed the quorum of #{quorum}."] = false;
+["This initiative is already revoked"] = false;
+["This initiative is revoked"] = false;
+["This issue is already closed."] = false;
+["This issue is already frozen."] = false;
+["This login is already taken, please choose another one!"] = false;
+["This login is too short!"] = false;
+["This member account has been created at #{created}"] = false;
+["This member has rejected to become initiator of this initiative"] = false;
+["This member is already initiator of this initiative"] = false;
+["This member is already invited to become initiator of this initiative"] = false;
+["This name is already taken, please choose another one!"] = false;
+["This name is really too short!"] = false;
+["This name is too short!"] = false;
+["This suggestion has been meanwhile deleted"] = false;
+["This title is really too short!"] = false;
+["This username is too short!"] = false;
+["Thursday"] = false;
+["Time left"] = false;
+["Timeline"] = false;
+["Title (80 chars max)"] = false;
+["Traditional wiki syntax"] = false;
+["Trustee"] = false;
+["Tuesday"] = false;
+["Type of tabs"] = false;
+["Unknown author"] = false;
+["Upload images"] = false;
+["Used until"] = false;
+["Verification time"] = false;
+["Version"] = false;
+["Vote later"] = false;
+["Vote later requests"] = false;
+["Vote now"] = false;
+["Voted"] = false;
+["Voted no"] = false;
+["Voted proposal"] = false;
+["Voted yes"] = false;
+["Voter"] = false;
+["Voting"] = false;
+["Voting for this issue has already begun."] = false;
+["Voting for this issue is currently running!"] = false;
+["Voting has not started yet."] = false;
+["Voting proposal"] = false;
+["Voting request updated"] = false;
+["Voting started"] = false;
+["Voting time"] = false;
+["Website"] = false;
+["Wednesday"] = false;
+["Wiki engine"] = false;
+["Yes"] = false;
+["You are already initator"] = false;
+["You are already not supporting this initiative"] = false;
+["You are already supporting the latest draft"] = false;
+["You are currently not supporting this initiative. By adding suggestions to this initiative you will automatically become a potential supporter."] = false;
+["You are iniator of this initiative"] = false;
+["You are interested in this issue"] = false;
+["You are invited to become initiator of this initiative."] = false;
+["You are member"] = false;
+["You are now initiator of this initiative"] = false;
+["You are potential supporter of this initiative"] = false;
+["You are supporting this initiative"] = false;
+["You can't suggest the initiative you are revoking"] = false;
+["You didn't saved any member as contact yet."] = false;
+["You have saved this member as contact"] = false;
+["You have saved this member as contact."] = false;
+["You have to accept the terms of use to complete registration."] = false;
+["You have to mark 'Are you sure' to revoke!"] = false;
+["You need to be logged in, to use this system."] = false;
+["You want to vote later"] = false;
+["You've successfully registered and you can login now with your login and password!"] = false;
+["Your are interested"] = false;
+["Your are potential supporter"] = false;
+["Your are supporter"] = false;
+["Your delegation for this area has been deleted."] = false;
+["Your delegation for this area has been updated."] = false;
+["Your delegation for this issue has been deleted."] = false;
+["Your delegation for this issue has been updated."] = false;
+["Your display settings have been updated"] = false;
+["Your global delegation has been deleted."] = false;
+["Your global delegation has been updated."] = false;
+["Your login has been changed to '#{login}'"] = false;
+["Your name has been changed"] = false;
+["Your opinion has been deleted"] = false;
+["Your opinion has been updated"] = false;
+["Your page has been updated"] = false;
+["Your password has been updated successfully"] = false;
+["Your suggestion has been added"] = false;
+["Your support has been added to this initiative"] = false;
+["Your support has been removed from this initiative"] = false;
+["Your support has been updated to the latest draft"] = false;
+["Your web browser is not fully supported yet."] = false;
+["Z-A"] = false;
+["all"] = false;
+["and #{count} more initiatives"] = false;
+["continuing"] = false;
+["delete<br /><br />"] = false;
+["email"] = false;
+["login name"] = false;
+["must"] = false;
+["must not"] = false;
+["must/should"] = false;
+["must/should not"] = false;
+["neutral"] = false;
+["not implemented"] = false;
+["now"] = false;
+["should"] = false;
+["should not"] = false;
+["to reset your password please click on the following link:\n\n"] = false;
+["xmpp"] = false;
 }
diff -r fc9e748660c8 -r 00d1004545f1 locale/translations.eo.lua
--- a/locale/translations.eo.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/locale/translations.eo.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -4,18 +4,25 @@
 ["#{issues_to_vote_count} issue(s)"] = "#{issues_to_vote_count} temoj";
 ["#{number} Image(s) has been deleted"] = "Estas viŝita(j) #{number} bildo(j)";
 ["#{number} Image(s) has been updated"] = "Estas ĝisdatigita(j) #{number} bildo(j)";
+["(#{more_count} duplicates removed)"] = false;
 ["(change URL)"] = "(ŝanĝi URL)";
 ["(new window)"] = "(nova fenestro)";
 ["+ #{weight}"] = "+ #{weight}";
 ["A-Z"] = "A-Z";
 ["About"] = "Pri";
+["About / Impressum"] = false;
 ["About LiquidFeedback"] = "Pri LiquidFeedback";
 ["Abstention"] = "Sindeteno";
+["Abstention [many entries]"] = false;
+["Abstention [single entry]"] = false;
 ["Accept invitation"] = "Akcepti inviton";
 ["Accepted at"] = "Akceptita je";
+["Accordion (all expanded)"] = false;
+["Accordion (first expanded)"] = false;
+["Accordion (none expanded)"] = false;
 ["Active?"] = "Ĉu aktiva?";
+["Add alternative initiative to issue"] = false;
 ["Add my interest"] = "Anonci mian intereson";
-["Add new initiative to issue"] = "Aldoni novan iniciaton al la temon";
 ["Add new suggestion"] = "Aldoni novan sugeston";
 ["Add to my contacts"] = "Aldoni al miaj kontaktoj";
 ["Address"] = "Adreso";
@@ -25,8 +32,19 @@
 ["Administrator"] = "Administranto";
 ["Admission time"] = "Aprobotempo";
 ["Admitted"] = "Aprobita";
-["All"] = "Ĉiuj";
+["Alternative initiatives"] = false;
 ["Any"] = "Kelkaj";
+["Approval (#th preference) [many entries]"] = false;
+["Approval (#th preference) [single entry]"] = false;
+["Approval (first preference) [many entries]"] = false;
+["Approval (first preference) [single entry]"] = false;
+["Approval (second preference) [many entries]"] = false;
+["Approval (second preference) [single entry]"] = false;
+["Approval (third preference) [many entries]"] = false;
+["Approval (third preference) [single entry]"] = false;
+["Approval [many entries]"] = false;
+["Approval [single entry]"] = false;
+["Approved"] = false;
 ["Are you sure?"] = "Ĉu vi estas certa?";
 ["Area"] = "Temaro";
 ["Area '#{name}'"] = "Temaro '#{name}'";
@@ -39,7 +57,9 @@
 ["Autoreject is off."] = "Aŭtomata rifuzo estas malŝaltita.";
 ["Autoreject is on."] = "Aŭtomata rifuzo estas ŝaltita.";
 ["Avatar"] = "Avataro";
-["Back"] = "Reen"; 
+["Back"] = "Reen";
+["Back to timeline"] = false;
+["Ballot of '#{member_name}' for issue ##{issue_id}"] = false;
 ["Become a member"] = "Iĝi membro";
 ["Birthday"] = "Naskiĝtago";
 ["Can't remove last initiator"] = "Ne povas forigi la lastan iniciatinton";
@@ -50,18 +70,21 @@
 ["Cancel registration"] = "Nuligi registradon";
 ["Cancelled"] = "Abolita";
 ["Change area delegation"] = "Ŝanĝi delegacion por temaro";
+["Change display settings"] = false;
+["Change filters and order"] = false;
 ["Change global delegation"] = "Ŝanĝi ĝeneralan delegacion";
 ["Change issue delegation"] = "Ŝanĝi delegacion por la temo";
 ["Change login"] = "Ŝanĝi salutnomon";
 ["Change name"] = "Ŝanĝi nomon";
+["Change order"] = false;
 ["Change password"] = "Ŝanĝi pasvorton";
+["Change vote"] = false;
 ["Change your login"] = "Ŝanĝi vian salutnomon";
 ["Change your name"] = "Ŝanĝi vian nomon";
 ["Change your password"] = "Ŝanĝi vian pasvorton";
 ["Choose initiator"] = "Elekti iniciatanton";
 ["Choose member"] = "Elekti membron";
 ["Click for details"] = "Klaki por detaloj";
-["Close"] = "Fermi";
 ["Closed"] = "Fermita";
 ["Collective opinion"] = "Opinioresumo";
 ["Commit suggestion"] = "Stori sugeston";
@@ -80,21 +103,32 @@
 ["Current votings in areas you are member of and issues you are interested in:"] = "Aktualaj voĉdonoj pri temoj en kiuj vi membraa kaj kiuj vin interesas:";
 ["Degree"] = "Grado";
 ["Delegations"] = "Delegacioj";
+["Delete filter"] = false;
 ["Description"] = "Priskribo";
 ["Details"] = "Detaloj";
-["Developer features"] = "Porprogramistaj funkcioj"; 
+["Developer features"] = "Porprogramistaj funkcioj";
 ["Diff"] = "Diferenco";
 ["Direct member count"] = "Nombro de la rektaj membroj";
 ["Direct membership"] = "Rekta membreco";
+["Disapproval (prefer to last block) [many entries]"] = false;
+["Disapproval (prefer to last block) [single entry]"] = false;
+["Disapproval (prefer to lower block) [many entries]"] = false;
+["Disapproval (prefer to lower block) [single entry]"] = false;
+["Disapproval (prefer to lower blocks) [many entries]"] = false;
+["Disapproval (prefer to lower blocks) [single entry]"] = false;
+["Disapproval [many entries]"] = false;
+["Disapproval [single entry]"] = false;
 ["Discussion"] = "Diskuto";
 ["Discussion URL"] = "Diskuto-URL";
 ["Discussion on issue"] = "Diskuto pri la temo";
 ["Discussion time"] = "Tempo de la diskuto";
 ["Discussion with initiators"] = "Diskuto kun la iniciatintoj";
+["Display settings"] = false;
 ["Download"] = "Elŝuti";
 ["Download database export"] = "Elŝuti datumbazoeksporton";
 ["Draft"] = "Skizo";
 ["Draft history"] = "Skizohistorio";
+["EXPERIMENTAL FEATURE"] = false;
 ["Edit"] = "Redakti";
 ["Edit draft"] = "Redakti skizon";
 ["Edit initiative"] = "Redakti iniciaton";
@@ -115,30 +149,32 @@
 ["Friday"] = "Vendredo";
 ["Frozen"] = "Ĝelita";
 ["Fully frozen at"] = "Tute ĝelita je";
-["Global delegation"] = "Ĝenerala delegacio"; 
-["Global delegation active"] = "Ĝenerala delegacio estas aktiva";  
-["Global timeline"] = "Ĝenerala tempolineo";  
+["Global delegation"] = "Ĝenerala delegacio";
+["Global delegation active"] = "Ĝenerala delegacio estas aktiva";
 ["Half frozen at"] = "Duone ĝelita je";
 ["Hello "] = "Saluton ";
 ["Help for: #{text}"] = "Helpo por: #{text}";
 ["Hide"] = "Kaŝi";
+["Hide filter details"] = false;
 ["Hide this help message"] = "Kaŝi tiun helpotekston";
 ["Home"] = "Ĉefpaĝo";
 ["I accept the terms of use by checking the following checkbox:"] = "Mi akceptas la uzokondiĉojn per la selekto de la sekva krucosignokesteto:";
-["Id"] = "Identigilo"; 
-["Ident number"] = "Identonumero"; 
+["Id"] = "Identigilo";
+["Ident number"] = "Identonumero";
 ["If this link is not working, please open following url in your web browser:\n\n"] = "Se tiu ligilo ne funkcias, bonvolu malfermi la sekvan URL per via retumilo:\n\n";
 ["Images"] = "Bildoj";
 ["In discussion"] = "En diskuton";
 ["Incoming delegations"] = "Alvenantaj delegacioj";
-["Initiated initiatives"] = "Lanĉitaj iniciatoj ";
+["Initiated"] = false;
+["Initiated initiatives"] = "Lanĉitaj iniciatoj";
+["Initiative events"] = false;
 ["Initiative is revoked now"] = "Iniciato nun estas retirita";
 ["Initiative quorum"] = "Kvorumo de la iniciato";
+["Initiative revoked"] = false;
 ["Initiative successfully created"] = "Iniciato sukcese kreita";
 ["Initiative successfully updated"] = "Iniciato sukcese ĝisdatigita";
 ["Initiative: '#{name}'"] = "Iniciato: '#{name}'";
 ["Initiatives"] = "Iniciatoj";
-["Initiatives per page"] = "Iniciatoj po paĝo";
 ["Initiatives that invited you to become initiator:"] = "Iniciatoj, kiuj vin invitis esti iniciatinto:";
 ["Initiator"] = "Iniciatinto";
 ["Initiators"] = "Iniciatintoj";
@@ -154,16 +190,19 @@
 ["Invite code"] = "Invitokodo";
 ["Invite initiator"] = "Inviti iniciatanton";
 ["Invited"] = "Invitita";
-["Inviting initiator"] = "Invitanta iniciatinto";
 ["Issue"] = "Temo";
 ["Issue ##{id}"] = "Temo ##{id}";
-["Issue ##{id} (#{policy_name})"] = "Temo ##{id} (#{policy_name})";
+["Issue accepted"] = false;
+["Issue canceled"] = false;
 ["Issue delegation"] = "Temodelegacio";
 ["Issue delegation active"] = "Delegacio por temo aktiva";
+["Issue events"] = false;
+["Issue finished"] = false;
+["Issue finished without voting"] = false;
+["Issue frozen"] = false;
 ["Issue policy"] = "Regularo por temo";
 ["Issue quorum"] = "Kvorumo per temo";
 ["Issues"] = "Temoj";
-["Issues per page"] = "Temoj po paĝo";
 ["JavaScript is disabled or not available."] = "JavaScript ne estas ŝaltita aŭ disponebla.";
 ["Last author"] = "Lasta aŭtoro";
 ["Last snapshot:"] = "Lasta fulmrigardo:";
@@ -175,6 +214,8 @@
 ["Login successful!"] = "Saluto sukcesa!";
 ["Logout"] = "Adiaŭi";
 ["Logout successful"] = "Adiaŭo sukcesa";
+["Manage filter"] = false;
+["Manage timeline filters"] = false;
 ["Mark suggestion as implemented and express dissatisfaction"] = "Marki sugeston kiel realigitan kaj esprimi malkontentecon";
 ["Mark suggestion as implemented and express satisfaction"] = "Marki sugeston kiel realigitan kaj esprimi kontentecon";
 ["Mark suggestion as not implemented and express dissatisfaction"] = "Marki sugeston kiel ne realigitan kaj esprimi malkontentecon";
@@ -185,15 +226,18 @@
 ["Member '#{member}'"] = "Membro '#{member}'";
 ["Member has been removed from initiators"] = "La membro estas forigita de la iniciatantaro";
 ["Member has been removed from your contacts"] = "La membro estas forigita de viaj kontaktoj";
+["Member has not approved latest draft"] = false;
 ["Member is administrator"] = "La membro estas administranto";
 ["Member is already saved in your contacts!"] = "La membro estas jam konservita en viaj kontaktoj!";
 ["Member is now invited to be initiator"] = "La membro nun estas invitita kiel iniciatanto";
 ["Member list"] = "Membrolisto";
 ["Member name"] = "Membronomo";
 ["Member name history for '#{name}'"] = "Nomohistorio por '#{name}'";
+["Member of area"] = false;
 ["Member page"] = "Membropaĝo";
 ["Member successfully registered"] = "Membro sukcese registrita";
 ["Member successfully updated"] = "Membro sukcese ĝisdatigita";
+["Member voting"] = false;
 ["Member: '#{login}' (#{name})"] = "Membro: '#{login}' (#{name})";
 ["Members"] = "Membroj";
 ["Membership by delegation"] = "Membreco laŭ delegacio";
@@ -204,25 +248,36 @@
 ["Missing help text: #{id}.#{lang}.txt"] = "Mankas helpoteksto: #{id}.#{lang}.txt";
 ["Mobile phone"] = "Poŝtelefono";
 ["Monday"] = "Lundo";
+["Move down"] = false;
+["Move up"] = false;
 ["My opinion"] = "Mia opinio";
 ["Name"] = "Nomo";
 ["New"] = "Nova";
+["New draft"] = false;
 ["New draft has been added to initiative"] = "La nova skizo estas aldonita al la iniciato";
 ["New draft revision"] = "Nova revizio de la skizon";
+["New initiative"] = false;
+["New issue"] = false;
 ["New password"] = "Nova pasvorto";
 ["New passwords does not match."] = "Vi ne enigis dufoje la saman pasvorton";
 ["New passwords is too short."] = "La nova pasvorto estas tro mallonga";
+["New suggestion"] = false;
 ["Newest"] = "Plej nova";
 ["Next state"] = "Sekva stato";
 ["No"] = "Ne";
 ["No changes to your images were made"] = "Viaj bildoj ne estas ŝanĝitaj";
 ["No delegation"] = "Neniu delegacio";
+["No events selected to list"] = false;
 ["No membership at all"] = "Tute sen membreco";
 ["No support at all"] = "Tute sen subteno";
 ["Not a member"] = "Ne estas membro";
+["Not approved (rank #{rank})"] = false;
 ["Not voted"] = "Ne balotinta";
+["Not voted (not admitted)"] = false;
+["Not voted (revoked from initiator)"] = false;
 ["Not yet voted"] = "Ankoraŭ ne balotinta";
 ["Number of incoming delegations, follow link to see more details"] = "Nombro de alvenantaj delegacioj, sekvi ligilon por pli da detaloj";
+["Number of initiatives to preview"] = false;
 ["OK"] = "Bone";
 ["Old draft revision"] = "Malnova revizio de la skizo";
 ["Old password"] = "Malnova pasvorto";
@@ -234,6 +289,7 @@
 ["One issue you are interested in"] = "Unu temo, kiu vin interesas";
 ["One step back"] = "Unu paŝo reen";
 ["Open"] = "Malferma";
+["Opinions"] = false;
 ["Order by"] = "Ordigi laŭ";
 ["Organizational unit"] = "Organiza unuo";
 ["Outgoing delegations"] = "Elirantaj delegacioj";
@@ -247,7 +303,7 @@
 ["Photo"] = "Foto";
 ["Please choose a login name. This name will not be shown to others and is used only by you to login into the system. The login name is case sensitive."] = "Bonvolu elekti salutonomon! Tiu nomo ne estas montrita al aliaj kaj nur vi uzas tiun nomon por la saluto. La uskleco (granda/malgranda) gravas";
 ["Please choose a member"] = "Bonvolu elekti membron";
-["Please choose a name, i.e. your real name or your nick name. This name will be shown to others to identify you."] = "Bonvolu elekti nomon, ekzemple vian veran nomon aŭ kromnomon. Tiu nomo estas montrita al aliaj por vin identecigi."; 
+["Please choose a name, i.e. your real name or your nick name. This name will be shown to others to identify you."] = "Bonvolu elekti nomon, ekzemple vian veran nomon aŭ kromnomon. Tiu nomo estas montrita al aliaj por vin identecigi.";
 ["Please choose a password and enter it twice. The password is case sensitive."] = "Bonvolu elekti pasvorton kaj enigi tiun pasvorton dufoje! La uskleco (granda/malgranda) gravas.";
 ["Please choose a policy"] = "Bonvolu elekti regularon";
 ["Please choose two different versions of the draft to compare"] = "Bonvolu elekti du malsamajn versiojn de la skizo por kompari ilin.";
@@ -260,14 +316,14 @@
 ["Please enter your new password twice."] = "Bonvolu enigi dufoje vian novan pasvorton:";
 ["Policy"] = "Regularo";
 ["Population"] = "Loĝantaro";
-["Posts"] = "Postenoj"; -- im Sinne von Posten oder im Sinne von Einträge? Letzeres wäre "Enskriboj"
+["Posts"] = "Postenoj";
 ["Potential support"] = "Eventuala subteno";
+["Potential supported"] = false;
 ["Potential supporter"] = "Eventuala subtenanto";
 ["Profession"] = "Profesio";
 ["Profile"] = "Profilo";
 ["Publish"] = "Publikigi";
 ["Published"] = "Publikigita";
-["Published contacts"] = "Kontaktoj publikigitaj";
 ["Rank"] = "Rango";
 ["Real name"] = "Vera nomo";
 ["Refresh support to current draft"] = "Refreŝigi subtenon por la aktuala skizo";
@@ -283,6 +339,7 @@
 ["Remove initiator from initiative"] = "Ĉu forigi iniciatinton de la iniciato?";
 ["Remove my interest"] = "Forigi mian intereson";
 ["Remove my membership"] = "Forigi mian membrecon";
+["Remove my request to vote later"] = false;
 ["Remove my support from this initiative"] = "Forigi mian subtenon de la iniciato";
 ["Repeat new password"] = "Ripeti novan pasvorton";
 ["Request password reset link"] = "Demandi ligilon por remeti la pasvorton";
@@ -295,12 +352,15 @@
 ["Revoked at"] = "Nuligita je";
 ["Saturday"] = "Sabato";
 ["Save"] = "Konservi";
+["Save current filter"] = false;
+["Save timeline filters"] = false;
 ["Saved as contact"] = "Konservi kiel kontakton";
 ["Search"] = "Serĉi";
 ["Search initiatives"] = "Serĉi iniciatojn";
 ["Search issues"] = "Serĉi temojn";
 ["Search members"] = "Serĉi membrojn";
 ["Search results for: '#{search}'"] = "Serĉorezultoj por: '#{search}'";
+["Select language \"#{langcode}\""] = false;
 ["Set URL"] = "Meti URL";
 ["Set area delegation"] = "Meti delegacion por temaro";
 ["Set autoreject"] = "Meti aŭtorifuzo";
@@ -309,16 +369,20 @@
 ["Set global delegation"] = "Meti ĝeneralan delegacion";
 ["Set issue delegation"] = "Meti delegacion por temo";
 ["Set new password"] = "Meti novan pasvorton";
-["Settings"] = "Agordoj"; 
+["Settings"] = "Agordoj";
 ["Show"] = "Montri";
 ["Show active members"] = "Montri aktivajn membrojn";
-["Show all initiatives"] = "Montri ĉiujn iniciatojn";
+["Show alternative initiatives"] = false;
 ["Show areas in use"] = "Montri uzatajn temarojn";
 ["Show areas not in use"] = "Montri ne uzatajn temarojn";
 ["Show diff"] = "Montri diferencojn";
+["Show filter"] = false;
+["Show filter details"] = false;
+["Show help text"] = false;
 ["Show locked members"] = "Montri blokitajn membrojn";
 ["Show member"] = "Montri membron";
 ["Show name history"] = "Montri nomohistorion";
+["Show only events which match... (or associtated)"] = false;
 ["Software"] = "Programaro";
 ["Some JavaScript based functions (voting in particular) will not work.\nFor this beta, please use a current version of Firefox, Safari, Opera(?), Konqueror or another (more) standard compliant browser.\nAlternative access without JavaScript will be available soon."] = "Kelkaj funkcioj bazitaj je JavaScript (precipe la voĉdono) ne funkcios.\nBonvolu, uzi por tiu betaversio aktualan version de Firefox, Safari, Opera(?), Konqueror aŭ alian (pli) normokonforman retumilon.\nAlternativa atingo sen JavaScript estos baldaŭ disponeble.";
 ["Sorry, but there is not confirmed email address for your account. Please contact the administrator or support."] = "Pardonu, por tiu konto ne ekzistas konfirmita retadreson. Bonvolu vin turni al administranto aŭ al la helpantaro.";
@@ -344,15 +408,27 @@
 ["Sunday"] = "Dimanĉo";
 ["Support"] = "Subteno";
 ["Support this initiative"] = "Subteni tiun iniciaton";
+["Supported"] = false;
 ["Supported initiatives"] = "Iniciatoj subtenitaj";
 ["Supporter"] = "Subtenantoj";
+["Tabs"] = false;
 ["Terms accepted"] = "Kondiĉoj akceptitaj";
+["Terms of use"] = false;
 ["The code you've entered is invalid"] = "La kodo, kiun vi enigis ne estas valida!";
+["The draft of this initiative has been updated!"] = false;
 ["The drafts do not differ"] = "La skizoj ne estas malsamaj";
 ["The initiators suggest to support the following initiative:"] = "La iniciatantoj rekomendas subteni sekvan iniciaton:";
+["There are no more alternative initiatives currently."] = false;
+["There were no more alternative initiatives."] = false;
+["This initiative"] = false;
+["This initiative compared to alternative initiatives"] = false;
 ["This initiative has been revoked at #{revoked}"] = "Tiu iniciato estis nuligita je #{revoked}";
+["This initiative has not been admitted! It failed the quorum of #{quorum}."] = false;
 ["This initiative is already revoked"] = "Tiu iniciato estas jam nuligita";
 ["This initiative is revoked"] = "Tiu iniciato estas nuligita";
+["This issue has been cancelled. It failed the quorum of #{quorum}."] = false;
+["This issue has been finished with the following winning initiative:"] = false;
+["This issue has been finished without any winning initiative."] = false;
 ["This issue is already closed."] = "La temo estas jam fermita.";
 ["This issue is already frozen."] = "La temo estas jam ĝelita";
 ["This login is already taken, please choose another one!"] = "Tiu salutnomo estas jam fordonita, bonvolu elekti alian!";
@@ -361,6 +437,7 @@
 ["This member has rejected to become initiator of this initiative"] = "Tiu membro rifuzis inviton por esti iniciatanto";
 ["This member is already initiator of this initiative"] = "Tiu membro estas jam iniciatanto de tiu iniciato";
 ["This member is already invited to become initiator of this initiative"] = "Tiu membro estis jam invitita por esti iniciatanto de tiu iniciato";
+["This member is participating, the rest of delegation chain is suspended while discussing"] = false;
 ["This name is already taken, please choose another one!"] = "Tiu nomo estas jam fordonita, bonvolu elekti alian!";
 ["This name is really too short!"] = "Tiu nomo estas vere tro mallonga!";
 ["This name is too short!"] = "Tiu nomo estas tro mallonga!";
@@ -369,43 +446,49 @@
 ["This username is too short!"] = "Tiu salutonomo estas tro mallonga!";
 ["Thursday"] = "Ĵaŭdo";
 ["Time left"] = "Restanta tempo";
+["Timeline"] = false;
+["Title"] = false;
 ["Title (80 chars max)"] = "Titolo (maksimume 80 literoj)";
-["Today"] = "Hodiaŭ";
 ["Traditional wiki syntax"] = "Tradicia Viki-sintakso";
-["Trustee"] = "Fidulo mastrumanta"; -- kommt stark auf den Sinn an, ist ohne Kontext schwierig
+["Trustee"] = "Fidulo mastrumanta";
 ["Tuesday"] = "Mardo";
+["Type of tabs"] = false;
 ["Unknown author"] = "Aŭtoro nekonata";
 ["Upload images"] = "Alŝuti bildojn";
 ["Used until"] = "Uzita ĝis";
 ["Verification time"] = "Tempo por la kontrolo";
 ["Version"] = "Versio";
 ["Vote later"] = "Baloti pli malfrue";
+["Vote later requests"] = false;
 ["Vote now"] = "Baloti nun";
-["Vote now/later"] = "Baloti nun/pli malfrue";
 ["Voted"] = "Balotita";
 ["Voted no"] = "Balotita nee";
 ["Voted proposal"] = "Propono balotita";
 ["Voted yes"] = "Balotita jese";
-["Voter"] = "Voĉdonantoj";
 ["Voting"] = "Voĉdono";
+["Voting details"] = false;
 ["Voting for this issue has already begun."] = "Voĉdono pri tiu temo jam komenciĝis.";
 ["Voting for this issue is currently running!"] = "Voĉdono pri tiu temo okazas nun!";
 ["Voting has not started yet."] = "Voĉdono por tiu temo ankoraŭ ne komenciĝis.";
 ["Voting proposal"] = "Privoĉdonendaj proponoj";
-["Voting requests"] = "Voĉdonopetoj";
+["Voting request updated"] = false;
+["Voting started"] = false;
 ["Voting time"] = "Tempo por la voĉdono";
 ["Website"] = "Retpaĝo";
 ["Wednesday"] = "Merkredo";
 ["Wiki engine"] = "Viki-motoro";
 ["Yes"] = "Jes";
-["Yesterday"] = "Hieraŭ";
 ["You are already initator"] = "Vi estas jam iniciatanto";
 ["You are already not supporting this initiative"] = "Vi jam ne subtenas tiun iniciaton";
 ["You are already supporting the latest draft"] = "Vi jam subtenas la plej novan skizon";
 ["You are currently not supporting this initiative. By adding suggestions to this initiative you will automatically become a potential supporter."] = "Vi aktuale ne subtenas tiun iniciaton. Se vi aldonas sugeston al tiu iniciato vi estos aŭtomate eventuala subtenanto!";
+["You are iniator of this initiative"] = false;
+["You are interested in this issue"] = false;
 ["You are invited to become initiator of this initiative."] = "Vi estas invitita por esti iniciatanto de tiu iniciato.";
 ["You are member"] = "Vi estas membro";
 ["You are now initiator of this initiative"] = "Vi nun estas iniciatanto de tiu iniciato";
+["You are potential supporter of this initiative"] = false;
+["You are supporting this initiative"] = false;
 ["You can't suggest the initiative you are revoking"] = "Vi ne povas rekomendi la iniciaton, kiun vi nuligas";
 ["You didn't saved any member as contact yet."] = "Vi ankoraŭ ne storis membron kiel kontakton!";
 ["You have saved this member as contact"] = "Vi storis membron kiel kontakton";
@@ -413,6 +496,7 @@
 ["You have to accept the terms of use to complete registration."] = "Vi devas akcepti la uzokondiĉojn por fini la registradon.";
 ["You have to mark 'Are you sure' to revoke!"] = "Por nuligi vi devas elekti 'Certa?'";
 ["You need to be logged in, to use this system."] = "Vi devas esti ensalutinta, por uzi la sistemon";
+["You want to vote later"] = false;
 ["You've successfully registered and you can login now with your login and password!"] = "Vi sukcese registriĝis kaj povas nun ensaluti per via salutnomo kaj pasvorto!";
 ["Your are interested"] = "Vi estas interesita";
 ["Your are potential supporter"] = "Vi estas eventuala subtenanto";
@@ -421,6 +505,7 @@
 ["Your delegation for this area has been updated."] = "Via delegacio por tiu temaro estas ĝisdatigita";
 ["Your delegation for this issue has been deleted."] = "Via delegacio por tiu temaro estas viŝita";
 ["Your delegation for this issue has been updated."] = "Via delegacio por tiu temaro estas ĝisdatigita";
+["Your display settings have been updated"] = false;
 ["Your global delegation has been deleted."] = "Via ĝenerala delegacio estas viŝita";
 ["Your global delegation has been updated."] = "Via ĝenerala delegacio estas ĝisdatigita";
 ["Your login has been changed to '#{login}'"] = "Via salutnomo estas ĝisdatigita al '#{login}'";
@@ -435,17 +520,18 @@
 ["Your support has been updated to the latest draft"] = "Via subteno estas ĝisdatigita al la plej nova skizo";
 ["Your web browser is not fully supported yet."] = "Via retumilo ne estas jam komplete subtenita.";
 ["Z-A"] = "Z-A";
-["all"] = "ĉiuj";
+["and #{count} more initiatives"] = false;
 ["continuing"] = "kontinue";
 ["delete<br /><br />"] = "forviŝi<br /><br />";
 ["email"] = "Retpoŝto";
+["last 24 hours"] = false;
 ["login name"] = "Salutnomo";
 ["must"] = "devas";
 ["must not"] = "ne rajtas";
 ["must/should"] = "devus";
 ["must/should not"] = "ne devus";
 ["neutral"] = "neŭtrala";
-["not implemented"] = "ne realigita";
+["requested"] = false;
 ["should"] = "devus";
 ["should not"] = "ne devus";
 ["to reset your password please click on the following link:\n\n"] = "por remeti vian pasvorton bonvolu klaki sekvan ligilon:\n\n";
diff -r fc9e748660c8 -r 00d1004545f1 model/initiative.lua
--- a/model/initiative.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/model/initiative.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -16,7 +16,7 @@
   that_key      = 'initiative_id',
   ref           = 'drafts',
   back_ref      = 'initiative',
-  default_order = '"id"'
+  default_order = '"id" DESC'
 }
 
 Initiative:add_reference{
@@ -129,8 +129,11 @@
     :add_group_by('"initiative"."negative_votes"')
     :add_group_by('"initiative"."agreed"')
     :add_group_by('"initiative"."rank"')
+    :add_group_by('"initiative"."suggested_initiative_id"')
     :add_group_by('"initiative"."text_search_data"')
     :add_group_by('"issue"."population"')
+    :add_group_by("_initiator.member_id")
+    :add_group_by("_supporter.member_id")
 end
 
 function Member:get_search_selector(search_string)
diff -r fc9e748660c8 -r 00d1004545f1 model/issue.lua
--- a/model/issue.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/model/issue.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -142,6 +142,7 @@
     :add_group_by('"issue"."vote_now"')
     :add_group_by('"issue"."vote_later"')
     :add_group_by('"issue"."voter_count"')
+    :add_group_by('"_interest"."member_id"')
     --:set_distinct()
 end
 
diff -r fc9e748660c8 -r 00d1004545f1 model/member.lua
--- a/model/member.lua	Tue Feb 02 00:31:06 2010 +0100
+++ b/model/member.lua	Sat Feb 20 22:10:31 2010 +0100
@@ -311,10 +311,26 @@
   return success
 end
 
-function Member.object:get_setting_by_key(key)
+function Member.object:get_setting(key)
+  return Setting:by_pk(app.session.member.id, key)
+end
+
+function Member.object:get_setting_value(key)
+  local setting = Setting:by_pk(app.session.member.id, key)
+  if setting then
+    return setting.value
+  end
 end
 
 function Member.object:set_setting(key, value)
+  local setting = self:get_setting(key)
+  if not setting then
+    setting = Setting:new()
+    setting.member_id = app.session.member_id
+    setting.key = key
+  end
+  setting.value = value
+  setting:save()
 end
 
 function Member.object:get_setting_maps_by_key(key)
diff -r fc9e748660c8 -r 00d1004545f1 static/icons/16/bullet_blue.png
Binary file static/icons/16/bullet_blue.png has changed
diff -r fc9e748660c8 -r 00d1004545f1 static/icons/16/bullet_toggle_minus.png
Binary file static/icons/16/bullet_toggle_minus.png has changed
diff -r fc9e748660c8 -r 00d1004545f1 static/icons/16/bullet_toggle_plus.png
Binary file static/icons/16/bullet_toggle_plus.png has changed
diff -r fc9e748660c8 -r 00d1004545f1 static/icons/16/connect.png
Binary file static/icons/16/connect.png has changed
diff -r fc9e748660c8 -r 00d1004545f1 static/icons/16/help_yellow.png
Binary file static/icons/16/help_yellow.png has changed
diff -r fc9e748660c8 -r 00d1004545f1 static/icons/16/lock.png
Binary file static/icons/16/lock.png has changed
diff -r fc9e748660c8 -r 00d1004545f1 static/icons/16/resultset_next.png
Binary file static/icons/16/resultset_next.png has changed
diff -r fc9e748660c8 -r 00d1004545f1 static/icons/move_down.png
Binary file static/icons/move_down.png has changed
diff -r fc9e748660c8 -r 00d1004545f1 static/icons/move_up.png
Binary file static/icons/move_up.png has changed
diff -r fc9e748660c8 -r 00d1004545f1 static/js/partialload.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/static/js/partialload.js	Sat Feb 20 22:10:31 2010 +0100
@@ -0,0 +1,271 @@
+
+partialload_queue = [];
+partialload_queueRPos = 0;
+partialload_queueWPos = 0;
+
+function partialload_getFormKeyValuePairs(form) {
+  var result = {};
+  for (var i=0; i<form.elements.length; i++) {
+    var inputElement = form.elements[i];
+    var key = inputElement.name;
+    var value = inputElement.value;
+    if (result[key] == null) result[key] = value;
+    else if (typeof(result[key]) == "object") {
+      result[key][result[key].length] = value;
+    } else {
+      result[key] = [result[key], value];
+    }
+  }
+  return result;
+}
+
+function partialload_encodeFormData(params) {
+  var result = "";
+  for (var key in params) {
+    var value = params[key];
+    if (typeof(value) == "string") {
+      if (result != "") result += "&";
+      result += encodeURIComponent(key) + "=" + encodeURIComponent(value);
+    } else if (typeof(value) == "object") {
+      var i;
+      for (i=0; i<value.length; i++) {
+        if (result != "") result += "&";
+        result += encodeURIComponent(key) + "=" + encodeURIComponent(value[i]);
+      }
+    }
+  }
+  return result;
+}
+
+function partialload_addFormDataToUrl(url, params) {
+  if (params != null && typeof(params) != "string") {
+    params = partialload_encodeFormData(params);
+  }
+  if (params != null) {
+    if (url.search(/\?/) >= 0) {
+      if (url.search(/&$/) >= 0) {
+        url = url + params;
+      } else {
+        url = url + "&" + params;
+      }
+    } else {
+      url = url + "?" + params;
+    }
+  }
+  return url;
+}
+
+function partialload_mergeEncodedFormData(data1, data2) {
+  if (data2 == null || data2 == "") return data1;
+  if (data1 == null || data1 == "") return data2;
+  return data1 + "&" + data2;
+}
+
+function partialload_startNextRequest() {
+  var entry = partialload_queue[partialload_queueRPos++];
+  var req = new XMLHttpRequest();
+  req.open(entry.method, entry.url, true);
+  req.onreadystatechange = function() {
+    if (req.readyState == 4) {
+      if (req.status == 200) {
+        if (entry.successHandler != null) entry.successHandler(req.responseText);
+      } else {
+        if (entry.failureHandler != null) entry.failureHandler();
+      }
+      if (partialload_queue[partialload_queueRPos]) {
+        partialload_startNextRequest();
+      } else {
+        partialload_queue = [];
+        partialload_queueRPos = 0;
+        partialload_queueWPos = 0;
+      }
+    }
+  }
+  if (entry.data) {
+    req.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+  }
+  req.send(entry.data);
+}
+
+function queuedHttpRequest(
+  url_or_form,
+  urlParams,
+  postParams,
+  successHandler,
+  failureHandler
+) {
+  var method;
+  var data = null;
+  if (typeof(postParams) == "string") {
+    data = postParams;
+  } else if (postParams != null) {
+    data = partialload_encodeFormData(postParams);
+  }
+  var url;
+  if (typeof(url_or_form) == "object") {
+    // form element given
+    var form = url_or_form;
+    url = partialload_addFormDataToUrl(form.action, urlParams);
+    var dataFromForm = partialload_encodeFormData(
+      partialload_getFormKeyValuePairs(form)
+    );
+    if (form.method != null && form.method.search(/^POST$/i) >= 0) {
+      method = "POST";
+      data = partialload_mergeEncodedFormData(data, dataFromForm);
+    } else {
+      method = (postParams == NULL) ? "GET" : "POST";
+      url = partialload_addFormDataToUrl(url, dataFromForm);
+    }
+  } else {
+    // URL given
+    url = partialload_addFormDataToUrl(url_or_form, urlParams);
+    if (postParams == null) {
+      method = "GET";
+    } else {
+      method = "POST";
+      if (typeof(postParams) == "string") {
+	data = postParams;
+      } else {
+	data = partialload_encodeFormData(postParams);
+      }
+    }
+  }
+  partialload_queue[partialload_queueWPos++] = {
+    method:         method,
+    url:            url,
+    data:           data,
+    successHandler: successHandler,
+    failureHandler: failureHandler
+  };
+  if (partialload_queueRPos == 0) {
+    partialload_startNextRequest();
+  }
+}
+
+function setHtmlContent(node, htmlWithScripts) {
+  var uniquePrefix = "placeholder" + Math.floor(Math.random()*10e16) + "_";
+  var i = 0;
+  var scripts = [];
+  var htmlWithPlaceholders = "";
+  // NOTE: This function can not handle CDATA blocks at random positions.
+  htmlWithPlaceholders = htmlWithScripts.replace(
+    /<script[^>]*>(.*?)<\/script>/ig,
+    function(all, inside) {
+      scripts[i] = inside;
+      var placeholder = '<span id="' + uniquePrefix + i + '"></span>';
+      i++;
+      return placeholder;
+    }
+  )
+  node.innerHTML = htmlWithPlaceholders;
+  var documentWriteBackup   = document.write;
+  var documentWritelnBackup = document.writeln;
+  var output;
+  document.write   = function(str) { output += str; }
+  document.writeln = function(str) { output += str + "\n"; }
+  for (i=0; i<scripts.length; i++) {
+    var placeholderNode = document.getElementById(uniquePrefix + i);
+    output = "";
+    eval(scripts[i]);
+    if (output != "") {
+      placeholderNode.innerHTML = output;
+      while (placeholderNode.childNodes.length > 0) {
+        var childNode = placeholderNode.childNodes[0];
+        placeholderNode.removeChild(childNode);
+        placeholderNode.parentNode.insertBefore(childNode, placeholderNode);
+      }
+    }
+    placeholderNode.parentNode.removeChild(placeholderNode);
+  }
+  document.write   = documentWriteBackup;
+  document.writeln = documentWritelnBackup;
+}
+
+function partialLoad(
+  node,
+  tempLoadingContent,
+  failureContent,
+  url_or_form,
+  urlParams,
+  postParams,
+  successHandler,
+  failureHandler
+) {
+  if (typeof(node) == "string") node = document.getElementById(node);
+  if (tempLoadingContent != null) setHtmlContent(node, tempLoadingContent);
+  queuedHttpRequest(
+    url_or_form,
+    urlParams,
+    postParams,
+    function(response) {
+      setHtmlContent(node, response);
+      if (successHandler != null) successHandler();
+    },
+    function() {
+      if (failureContent != null) setHtmlContent(node, failureContent);
+      if (failureHandler != null) failureHandler();
+    }
+  );
+}
+
+function partialMultiLoad(
+  mapping,
+  tempLoadingContents,
+  failureContents,
+  url_or_form,
+  urlParams,
+  postParams,
+  successHandler,
+  failureHandler
+) {
+  if (mapping instanceof Array) {
+    var mappingHash = {}
+    for (var i=0; i<mapping.length; i++) {
+      mappingHash[mapping[i]] = mapping[i];
+    }
+    mapping = mappingHash;
+  }
+  if (typeof(tempLoadingContents) == "string") {
+    for (var key in mapping) {
+      var node = key;
+      if (typeof(node) == "string") node = document.getElementById(node);
+      setHtmlContent(node, tempLoadingContents);
+    }
+  } else if (tempLoadingContents != null) {
+    for (var key in tempLoadingContents) {
+      var node = key;
+      if (typeof(node) == "string") node = document.getElementById(node);
+      setHtmlContent(node, tempLoadingContents[key]);
+    }
+  }
+  queuedHttpRequest(
+    url_or_form,
+    urlParams,
+    postParams,
+    function(response) {
+      var data = eval("(" + response + ")");
+      for (var key in mapping) {
+        var node = key;
+        if (typeof(node) == "string") node = document.getElementById(node);
+        setHtmlContent(node, data[mapping[key]]);
+      }
+      if (successHandler != null) successHandler();
+    },
+    function() {
+      if (typeof(failureContents) == "string") {
+        for (var key in mapping) {
+          var node = key;
+          if (typeof(node) == "string") node = document.getElementById(node);
+          setHtmlContent(node, failureContents);
+        }
+      } else if (failureContents != null) {
+        for (var key in failureContents) {
+          var node = key;
+          if (typeof(node) == "string") node = document.getElementById(node);
+          setHtmlContent(node, failureContents[key]);
+        }
+      }
+      if (failureHandler != null) failureHandler();
+    }
+  );
+}
diff -r fc9e748660c8 -r 00d1004545f1 static/js/voting.js
--- a/static/js/voting.js	Tue Feb 02 00:31:06 2010 +0100
+++ b/static/js/voting.js	Sat Feb 20 22:10:31 2010 +0100
@@ -1,4 +1,25 @@
-function setCategoryHeadings() {
+voting_text_approval_single               = "Approval"
+voting_text_approval_multi                = "Approval"
+voting_text_first_preference_single       = "Approval (first preference)"
+voting_text_first_preference_multi        = "Approval (first preference)"
+voting_text_second_preference_single      = "Approval (second preference)"
+voting_text_second_preference_multi       = "Approval (second preference)"
+voting_text_third_preference_single       = "Approval (third preference)"
+voting_text_third_preference_multi        = "Approval (third preference)"
+voting_text_numeric_preference_single     = "Approval (#th preference)"
+voting_text_numeric_preference_multi      = "Approval (#th preference)"
+voting_text_abstention_single             = "Abstention"
+voting_text_abstention_multi              = "Abstention"
+voting_text_disapproval_above_one_single  = "Disapproval (prefer to lower block)"
+voting_text_disapproval_above_one_multi   = "Disapproval (prefer to lower block)"
+voting_text_disapproval_above_many_single = "Disapproval (prefer to lower blocks)"
+voting_text_disapproval_above_many_multi  = "Disapproval (prefer to lower blocks)"
+voting_text_disapproval_above_last_single = "Disapproval (prefer to last block)"
+voting_text_disapproval_above_last_multi  = "Disapproval (prefer to last block)"
+voting_text_disapproval_single            = "Disapproval"
+voting_text_disapproval_multi             = "Disapproval"
+
+function voting_setCategoryHeadings() {
   var approvalCount = 0;
   var disapprovalCount = 0;
   var sections = document.getElementById("voting").childNodes;
@@ -34,42 +55,53 @@
       if (section.className == "approval") {
         if (approvalCount > 1) {
           if (approvalIndex == 0) {
-            if (count == 1) setHeading("Zustimmung (Erstwunsch)");
-            else setHeading("Zustimmung (Erstwünsche)");
+            if (count == 1) setHeading(voting_text_first_preference_single);
+            else setHeading(voting_text_first_preference_multi);
           } else if (approvalIndex == 1) {
-            if (count == 1) setHeading("Zustimmung (Zweitwunsch)");
-            else setHeading("Zustimmung (Zweitwünsche)");
+            if (count == 1) setHeading(voting_text_second_preference_single);
+            else setHeading(voting_text_second_preference_multi);
           } else if (approvalIndex == 2) {
-            if (count == 1) setHeading("Zustimmung (Drittwunsch)");
-            else setHeading("Zustimmung (Drittwünsche)");
+            if (count == 1) setHeading(voting_text_third_preference_single);
+            else setHeading(voting_text_third_preference_multi);
           } else {
-            if (count == 1) setHeading("Zustimmung (" + (approvalIndex+1) + ".-Wunsch)");
-            else setHeading("Zustimmung (" + (approvalIndex+1) + ".-Wünsche)");
+            var text;
+            if (count == 1) text = voting_text_numeric_preference_single;
+            else text = voting_text_numeric_preference_multi;
+            text = text.replace(/#/, "" + (approvalIndex + 1))
+            setHeading(text);
           }
         } else {
-          setHeading("Zustimmung");
+          if (count == 1) setHeading(voting_text_approval_single);
+          else setHeading(voting_text_approval_multi);
         }
         approvalIndex++;
       } else if (section.className == "abstention") {
-        setHeading("Enthaltung");
+        if (count == 1) setHeading(voting_text_abstention_single);
+        else setHeading(voting_text_abstention_multi);
       } else if (section.className == "disapproval") {
         if (disapprovalCount > disapprovalIndex + 2) {
-          setHeading("Ablehnung (jedoch Bevorzugung gegenüber unteren Ablehnungsblöcken)")
+          if (count == 1) setHeading(voting_text_disapproval_above_many_single);
+          else setHeading(voting_text_disapproval_above_many_multi);
         } else if (disapprovalCount == 2 && disapprovalIndex == 0) {
-          setHeading("Ablehnung (jedoch Bevorzugung gegenüber unterem Ablehnungsblock)")
+          if (count == 1) setHeading(voting_text_disapproval_above_one_single);
+          else setHeading(voting_text_disapproval_above_one_multi);
         } else if (disapprovalIndex == disapprovalCount - 2) {
-          setHeading("Ablehnung (jedoch Bevorzugung gegenüber letztem Ablehnungsblock)")
+          if (count == 1) setHeading(voting_text_disapproval_above_last_single);
+          else setHeading(voting_text_disapproval_above_last_multi);
         } else {
-          setHeading("Ablehnung");
+          if (count == 1) setHeading(voting_text_disapproval_single);
+          else setHeading(voting_text_disapproval_multi);
         }
         disapprovalIndex++;
       }
     }
   }
 }
-function elementDropped(element, dropX, dropY) {
+function voting_move(element, up, dropX, dropY) {
+  if (typeof(element) == "string") element = document.getElementById(element);
+  var mouse = (up == null);
   var oldParent = element.parentNode;
-  var centerY = dropY + element.clientHeight / 2
+  if (mouse) var centerY = dropY + element.clientHeight / 2;
   var approvalCount = 0;
   var disapprovalCount = 0;
   var mainDiv = document.getElementById("voting");
@@ -79,43 +111,7 @@
     if (section.className == "approval")       approvalCount++;
     if (section.className == "disapproval") disapprovalCount++;
   }
-  for (var i=0; i<sections.length; i++) {
-    var section = sections[i];
-    if (
-      section.className == "approval" ||
-      section.className == "abstention" ||
-      section.className == "disapproval"
-    ) {
-      if (
-        centerY >= section.offsetTop &&
-        centerY <  section.offsetTop + section.clientHeight
-      ) {
-        var entries = section.childNodes;
-        for (var j=0; j<entries.length; j++) {
-          var entry = entries[j];
-          if (entry.className == "movable") {
-            if (centerY < entry.offsetTop + entry.clientHeight / 2) {
-              if (element != entry) {
-                oldParent.removeChild(element);
-                section.insertBefore(element, entry);
-              }
-              break;
-            }
-          }
-        }
-        if (j == entries.length) {
-          oldParent.removeChild(element);
-          section.appendChild(element);
-        }
-        break;
-      }
-    }
-  }
-  if (i == sections.length) {
-    var newSection = document.createElement("div");
-    var cathead = document.createElement("div");
-    cathead.setAttribute("class", "cathead");
-    newSection.appendChild(cathead);
+  if (mouse) {
     for (var i=0; i<sections.length; i++) {
       var section = sections[i];
       if (
@@ -123,28 +119,145 @@
         section.className == "abstention" ||
         section.className == "disapproval"
       ) {
-        if (centerY < section.offsetTop + section.clientHeight / 2) {
-          if (section.className == "disapproval") {
-            newSection.setAttribute("class", "disapproval");
-            disapprovalCount++;
-          } else {
-            newSection.setAttribute("class", "approval");
-            approvalCount++;
+        if (
+          centerY >= section.offsetTop &&
+          centerY <  section.offsetTop + section.clientHeight
+        ) {
+          var entries = section.childNodes;
+          for (var j=0; j<entries.length; j++) {
+            var entry = entries[j];
+            if (entry.className == "movable") {
+              if (centerY < entry.offsetTop + entry.clientHeight / 2) {
+                if (element != entry) {
+                  oldParent.removeChild(element);
+                  section.insertBefore(element, entry);
+                }
+                break;
+              }
+            }
           }
-          mainDiv.insertBefore(newSection, section);
+          if (j == entries.length) {
+            oldParent.removeChild(element);
+            section.appendChild(element);
+          }
           break;
         }
       }
     }
     if (i == sections.length) {
-      newSection.setAttribute("class", "disapproval");
-      disapprovalCount++;
-      mainDiv.appendChild(newSection);
+      var newSection = document.createElement("div");
+      var cathead = document.createElement("div");
+      cathead.setAttribute("class", "cathead");
+      newSection.appendChild(cathead);
+      for (var i=0; i<sections.length; i++) {
+        var section = sections[i];
+        if (
+          section.className == "approval" ||
+          section.className == "abstention" ||
+          section.className == "disapproval"
+        ) {
+          if (centerY < section.offsetTop + section.clientHeight / 2) {
+            if (section.className == "disapproval") {
+              newSection.setAttribute("class", "disapproval");
+              disapprovalCount++;
+            } else {
+              newSection.setAttribute("class", "approval");
+              approvalCount++;
+            }
+            mainDiv.insertBefore(newSection, section);
+            break;
+          }
+        }
+      }
+      if (i == sections.length) {
+        newSection.setAttribute("class", "disapproval");
+        disapprovalCount++;
+        mainDiv.appendChild(newSection);
+      }
+      oldParent.removeChild(element);
+      newSection.appendChild(element);
+    }
+  } else {
+    var oldFound = false;
+    var prevSection = null;
+    var nextSection = null;
+    for (var i=0; i<sections.length; i++) {
+      var section = sections[i];
+      if (
+        section.className == "approval" ||
+        section.className == "abstention" ||
+        section.className == "disapproval"
+      ) {
+        if (oldFound) {
+          nextSection = section;
+          break;
+        } else if (section == oldParent) {
+          oldFound = true;
+        } else {
+          prevSection = section;
+        }
+      }
     }
-    oldParent.removeChild(element);
-    newSection.appendChild(element);
+    var create;
+    if (oldParent.className == "abstention") {
+      create = true;
+    } else {
+      create = false;
+      for (var i=0; i<oldParent.childNodes.length; i++) {
+        var entry = oldParent.childNodes[i];
+        if (entry.className == "movable") {
+          if (entry != element) {
+            create = true;
+            break;
+          }
+        }
+      }
+    }
+    var newSection;
+    if (create) {
+      newSection = document.createElement("div");
+      var cathead = document.createElement("div");
+      cathead.setAttribute("class", "cathead");
+      newSection.appendChild(cathead);
+      if (
+        oldParent.className == "approval" ||
+        (oldParent.className == "abstention" && up)
+      ) {
+        newSection.setAttribute("class", "approval");
+        approvalCount++;
+      } else {
+        newSection.setAttribute("class", "disapproval");
+        disapprovalCount++;
+      }
+      if (up) {
+        mainDiv.insertBefore(newSection, oldParent);
+      } else {
+        if (nextSection) mainDiv.insertBefore(newSection, nextSection);
+        else mainDiv.appendChild(newSection);
+      }
+    } else {
+      if (up) newSection = prevSection;
+      else newSection = nextSection;
+    }
+    if (newSection) {
+      oldParent.removeChild(element);
+      if (create || up) {
+        newSection.appendChild(element);
+      } else {
+        var inserted = false;
+        for (var i=0; i<newSection.childNodes.length; i++) {
+          var entry = newSection.childNodes[i];
+          if (entry.className == "movable") {
+            newSection.insertBefore(element, entry);
+            inserted = true;
+            break;
+          }
+        }
+        if (!inserted) newSection.appendChild(element);
+      }
+    }
   }
-  sections = mainDiv.childNodes;
+  // sections = mainDiv.childNodes;
   for (i=0; i<sections.length; i++) {
     var section = sections[i];
     if (
@@ -161,10 +274,13 @@
       }
     }
   }
-  setCategoryHeadings();
+  voting_setCategoryHeadings();
+}
+function elementDropped(element, dropX, dropY) {
+  voting_move(element, null, dropX, dropY);
 }
 window.addEventListener("load", function(event) {
-  setCategoryHeadings();
+  voting_setCategoryHeadings();
   var mainDiv = document.getElementById("voting");
   var form = document.getElementById("voting_form");
   var elements = document.getElementsByTagName("input");
@@ -225,3 +341,9 @@
     }
   }
 }, false);
+function voting_moveUp(element) {
+  return voting_move(element, true);
+}
+function voting_moveDown(element) {
+  return voting_move(element, false);
+}
diff -r fc9e748660c8 -r 00d1004545f1 static/style.css
--- a/static/style.css	Tue Feb 02 00:31:06 2010 +0100
+++ b/static/style.css	Sat Feb 20 22:10:31 2010 +0100
@@ -4,11 +4,16 @@
 
 body, th, td {
   font-family: sans-serif;
+  font-size: 15px;
   font-size: 14px;
   padding: 0;
   margin: 0;
 }
 
+.area_list {
+  line-height: 170%;
+}
+
 body, a {
   color: #000;
 }
@@ -54,7 +59,7 @@
 }
 
 a {
-  vertical-align: middle;
+  xvertical-align: middle;
 }
 
 h1 {
@@ -104,6 +109,8 @@
   background-color: #444;
   color: #fff;
   font-size: 75%;
+  line-height: 140%;
+  margin-bottom: 1.8ex;
 }
 
 .topbar a {
@@ -137,11 +144,16 @@
 }
 
 .searchbox {
-  padding: 0.5ex 1em 0ex 1em;
+  margin: 0;
+  padding: 0.1ex 1em 0ex 1em;
   float: right;
   line-height: 250%;
 }
 
+.searchbox form {
+  float: left;
+}
+
 .searchbox div {
   display: inline;
 }
@@ -162,7 +174,6 @@
 
 .searchbox input[type=submit] {
   font-size: 100%;
-  width: 2.5em;
 }
 
 /*************************************************************************
@@ -264,6 +275,7 @@
 .voting_requested {
   float: left;
   position: relative;
+  z-index: 1;
 }
 
 .interest img,
@@ -284,6 +296,11 @@
   border: 1px solid #b96;
 }
 
+.interest .head_autoreject {
+  background-color: #fdd;
+  border: 1px solid #b77;
+}
+
 .slot_support .head_supporter {
   background-color: #dfc;
   border: 1px solid #8b8;
@@ -299,6 +316,23 @@
   border: 1px solid #88b;
 }
 
+.delegation .change_delegation {
+  margin-bottom: 2ex;
+}
+
+.delegation .change_delegation a {
+  display: inline;
+  float: none;
+  padding: 1ex;
+}
+
+.delegation .delegation_participation {
+  margin-left: 20.5em;
+  margin-top: 3ex;
+  font-style: italic;
+  font-size: 80%;
+}
+
 .voting_requested .head_active {
   background-color: #fdd;
   border: 1px solid #b77;
@@ -322,7 +356,7 @@
   background-color: #fff;
   border: 1px solid #999;
   padding: 1em;
-  width: 25em;
+  width: 35em;
 }
 
 .vote_info .delegation_arrow {
@@ -365,7 +399,6 @@
 
 
 .sub_title div {
-  border-top: 1px solid #444;
   padding-top: 1ex;
   margin-top: 1ex;
   font-weight: bold;
@@ -415,27 +448,81 @@
   padding: 1ex 1ex 1ex 1ex;
 }
 
+.web10 .ui_tabs_accordeon_head {
+  margin-bottom: 1ex;
+}
+
+.web20 .ui_tabs_accordeon_head {
+  font-size: 80%;
+  font-weight: bold;
+  display: block;
+  background: #eee;
+  border: 1px solid #bbb;
+  color: #000;
+  padding: 0.75ex;
+  margin-top: 2ex;
+  cursor: pointer;
+}
+
+.web20 .ui_tabs_accordeon_head img {
+  vertical-align: middle;
+  margin-right: 0.5em;
+}
+
+.web20 .ui_tabs_accordeon_head .bargraph {
+  margin-right: 0.5em;
+}
+
+.web20 .ui_tabs_accordeon_content {
+  border: 1px solid #aaa;
+  border-top: none;
+  padding: 2ex 1em 2ex 1em;
+  margin-bottom: 3ex;
+}
+
+.web20 .issue_initiative_list .ui_tabs_accordeon_head {
+  background-color: #e5e5ff;
+}
+
+.web20 .issue_initiative_list .ui_tabs_accordeon_head,
+.web20 .issue_initiative_list .ui_tabs_accordeon_content {
+  border-color: #aad;
+}
+
+.web20 .issue_initiative_list .ui_tabs_accordeon_content .ui_tabs_accordeon_content {
+  border-color: #bbb;
+  border-width: 1px;
+}
+
+.web20 .issue_initiative_list .ui_tabs_accordeon_content .ui_tabs_accordeon_head {
+  background-color: #eee;
+  border: 1px solid #bbb;
+}
+
+.web20 .issue_initiative_list .ui_tabs_accordeon_head a {
+  font-size: 125%;
+}
+
+
+
 /*************************************************************************
- * ui.filter
- * ui.order
+ * ui.filters
  */
 
-.ui_filter_head,
-.ui_order_head {
+.ui_filter_closed_head,
+.ui_filter_head {
   color: #777;
   margin-top: 1ex;
   margin-bottom: 1.5ex;
   font-size: 75%;
 }
 
-.ui_filter_head a,
-.ui_order_head a {
+.ui_filter_head a {
   color: #777;
   padding: 0.5ex;
 }
 
-.ui_filter_head a.active,
-.ui_order_head a.active {
+.ui_filter_head a.active {
   color: #fff;
   background-color: #777;
   padding: 0.5ex;
@@ -462,7 +549,11 @@
  */
 
 .bargraph {
-  width: 101px;
+  width: 103px;
+}
+
+.bargraph50 {
+  width: 52px;
 }
 
 .bargraph div {
@@ -627,6 +718,7 @@
   background-color: #fff;
   left: 5em;
   top: 5ex;
+z-index: 2;
 }
 
 .hidden_inline_form a {
@@ -673,7 +765,8 @@
   padding: 0.3ex 0.5em 0.3ex 0.5em;
 }
 
-.suggestion_my_opinion a {
+.suggestion_my_opinion a,
+.suggestion_my_opinion span {
   white-space: nowrap;
   padding-left: 0.2ex !important;
   padding-right: 0.2ex !important;
@@ -737,7 +830,7 @@
 
 .member_thumb {
   text-decoration: none;
-  width: 18em;
+  width: 15.5em;
   height: 48px;
   display: block;
   float: left;
@@ -781,13 +874,15 @@
 }
 
 .member_thumb .flags {
-  float: right;
+  text-align: right;
   font-size: 75%;
 }
 
-.member_thumb .flags a{
+.member_thumb .flags a,
+.member_thumb .flags img {
   position: static;
   float: right;
+  margin-left: 0.5em;
 }
 
 
@@ -795,12 +890,14 @@
   float: right;
 }
 
-.member_thumb.not_accepted {
+.member_thumb.not_accepted,
+.member_thumb.not_informed {
   opacity: 0.5;
 }
 
+.member_statement,
 .draft_content,
-.member_statement {
+.suggestion_content {
   background-color: #eee;
   border: 1px solid #ccc;
   padding-left: 1ex;
@@ -842,14 +939,27 @@
   margin-right: 0.7em;
 }
 
+.admitted_info {
+  background-color: #dfd;
+  padding: 1ex;
+  margin-bottom: 2ex;
+}
+
+.not_admitted_info,
+.revoked_info {
+  background-color: #fdd;
+  padding: 1ex;
+  margin-bottom: 2ex;
+}
+
 .draft_updated_info,
 .voting_active_info,
-.revoked_info,
 .initiator_invite_info,
 .motd {
   background-color: #fec;
-  border: 2px solid #b96;
+  border: 1px solid #b96;
   padding: 1ex;
+  margin-bottom: 2ex;
 }
 
 .suggestion_fulfilled {
@@ -934,6 +1044,17 @@
   background-color: #fec;
 }
 
+.heading {
+  font-size: 120%;
+  font-weight: bold;
+  margin-top: 2ex;
+  margin-bottom: 1ex;
+}
+
+.heading.first {
+  margin-top: 0;
+}
+
 /*************************************************************************
  * Voting
  */
@@ -974,16 +1095,20 @@
   border: 1px black solid;
   margin: 1ex;
   padding: 0.5ex;
+}
+#voting .voting_form_active .movable {
   cursor: pointer;
 }
-#voting .clickable {
+#voting .voting_form_active .clickable {
   cursor: auto;
 }
-#voting a.clickable {
+#voting .voting_form_active a.clickable {
   cursor: pointer;
 }
 
 #voting .grabber {
   vertical-align: middle;
   cursor: move;
-}
\ No newline at end of file
+}
+
+