1.1 --- a/Makefile	Tue Feb 02 00:31:06 2010 +0100
     1.2 +++ b/Makefile	Sat Feb 20 22:10:31 2010 +0100
     1.3 @@ -1,14 +1,6 @@
     1.4  default:
     1.5  
     1.6  
     1.7 -db:
     1.8 -	create_db liquid_feedback
     1.9 -	psql liquid_feedback -f db/core.sql
    1.10 -
    1.11 -demo-db: db
    1.12 -	psql liquid_feedback -f db/demo.sql
    1.13 -
    1.14 -
    1.15  translations-de:
    1.16  	cd ../webmcp/framework/bin/ && ./langtool.lua ~/workspace/liquid_feedback/locale/translations.de.lua ~/workspace/liquid_feedback/app ~/workspace/liquid_feedback/locale/translations.de.lua
    1.17  

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/README	Sat Feb 20 22:10:31 2010 +0100
     2.3 @@ -0,0 +1,61 @@
     2.4 +
     2.5 +################
     2.6 +# Installation #
     2.7 +################
     2.8 +
     2.9 +
    2.10 +1. Choose a directory where to install the software, e.g. /opt :
    2.11 +
    2.12 +$ cd /opt
    2.13 +
    2.14 +
    2.15 +2. Get the repositories of the core, the frondend and the web application
    2.16 +   framework WebMCP:
    2.17 +
    2.18 +$ hg clone http://www.public-software-group.org/mercurial/liquid_feedback_core
    2.19 +$ hg clone http://www.public-software-group.org/mercurial/liquid_feedback_frontend
    2.20 +$ hg clone http://www.public-software-group.org/mercurial/webmcp
    2.21 +
    2.22 +
    2.23 +3. Install LiquidFeedback Core:
    2.24 +
    2.25 +$ cd /opt/liquid_feedback_core
    2.26 +$ make
    2.27 +$ createdb liquid_feedback
    2.28 +$ psql -v ON_ERROR_STOP=1 -f core.sql liquid_feedback
    2.29 +
    2.30 +You should initiatize your database using the command
    2.31 +"psql liquid_feedback" and the examples shown in file "init.sql".
    2.32 +
    2.33 +
    2.34 +4. Compile WebMCP
    2.35 +
    2.36 +$ cd /opt/webmcp
    2.37 +$ make
    2.38 +
    2.39 +If you experience trouble during compilation, you might want to edit the
    2.40 +file "Makefile.options" (i.e. to add -fPIC to compiler options) and then
    2.41 +retry:
    2.42 +
    2.43 +$ vi Makefile.options
    2.44 +$ make clean
    2.45 +$ make
    2.46 +
    2.47 +
    2.48 +5. Install Wiki-to-HTML converters
    2.49 +
    2.50 +Download latest LiquidFeedback Edition of RocketWiki from
    2.51 +http://www.public-software-group.org/pub/projects/rocketwiki/liquid_feedback_edition/
    2.52 +
    2.53 +Compile the binaries by calling make, and copy them to a place of your
    2.54 +choice, e.g. /opt/rocketwiki-lqfb/
    2.55 +
    2.56 +
    2.57 +6. Configure the webserver and the LiquidFeedback Frontend application:
    2.58 +
    2.59 +Edit the configuration files in /opt/liquid_feedback_frontend/config/
    2.60 +
    2.61 +Use /opt/webmcp/doc/lighttpd.example.conf (or apache.sample.conf) to setup
    2.62 +your webserver appropriatly.
    2.63 +
    2.64 +

     3.1 --- a/app/main/_filter_view/30_navigation.lua	Tue Feb 02 00:31:06 2010 +0100
     3.2 +++ b/app/main/_filter_view/30_navigation.lua	Sat Feb 20 22:10:31 2010 +0100
     3.3 @@ -4,36 +4,28 @@
     3.4  if app.session.member == nil then
     3.5    slot.select('navigation', function()
     3.6      ui.link{
     3.7 -      content = function()
     3.8 -        ui.image{ static = "icons/16/key.png" }
     3.9 -        slot.put(_"Login")
    3.10 -      end,
    3.11 +      image  = { static = "icons/16/key.png" },
    3.12 +      text   = _"Login",
    3.13        module = 'index',
    3.14 -      view = 'login'
    3.15 +      view   = 'login'
    3.16      }
    3.17      ui.link{
    3.18 -      content = function()
    3.19 -        ui.image{ static = "icons/16/book_edit.png" }
    3.20 -        slot.put(_"Registration")
    3.21 -      end,
    3.22 +      image  = { static = "icons/16/book_edit.png" },
    3.23 +      text   = _"Registration",
    3.24        module = 'index',
    3.25 -      view = 'register'
    3.26 +      view   = 'register'
    3.27      }
    3.28      ui.link{
    3.29 -      content = function()
    3.30 -        ui.image{ static = "icons/16/key_forgot.png" }
    3.31 -        slot.put(_"Reset password")
    3.32 -      end,
    3.33 +      image  = { static = "icons/16/key_forgot.png" },
    3.34 +      text   = _"Reset password",
    3.35        module = 'index',
    3.36 -      view = 'reset_password'
    3.37 +      view   = 'reset_password'
    3.38      }
    3.39      ui.link{
    3.40 -      content = function()
    3.41 -        ui.image{ static = "icons/16/information.png" }
    3.42 -        slot.put('About / Impressum')
    3.43 -      end,
    3.44 +      image  = { static = "icons/16/information.png" },
    3.45 +      text   = _"About / Impressum",
    3.46        module = 'index',
    3.47 -      view = 'about'
    3.48 +      view   = 'about'
    3.49      }
    3.50    end)
    3.51    execute.inner()
    3.52 @@ -43,75 +35,46 @@
    3.53  slot.select('navigation', function()
    3.54  
    3.55    ui.link{
    3.56 -    content = function()
    3.57 -      ui.image{ static = "icons/16/house.png" }
    3.58 -      slot.put(_"Home")
    3.59 -    end,
    3.60 +    image  = { static = "icons/16/house.png" },
    3.61 +    text   = _"Home",
    3.62      module = 'index',
    3.63 -    view = 'index'
    3.64 +    view   = 'index'
    3.65    }
    3.66  
    3.67 -  local setting_key = "liquidfeedback_frontend_timeline_current_options"
    3.68 -  local setting = Setting:by_pk(app.session.member.id, setting_key)
    3.69 -
    3.70 -  timeline_params = {}
    3.71 -  if setting then
    3.72 -    for event_ident, filter_idents in setting.value:gmatch("(%S+):(%S+)") do
    3.73 -      timeline_params["option_" .. event_ident] = true
    3.74 -      if filter_idents ~= "*" then
    3.75 -        for filter_ident in filter_idents:gmatch("([^\|]+)") do
    3.76 -          timeline_params["option_" .. event_ident .. "_" .. filter_ident] = true
    3.77 -        end
    3.78 -      end
    3.79 -    end
    3.80 -  end
    3.81 -
    3.82 -  timeline_params.date = param.get("date") or today
    3.83 -
    3.84    ui.link{
    3.85 -    content = function()
    3.86 -      ui.image{ static = "icons/16/time.png" }
    3.87 -      slot.put(_"Timeline")
    3.88 -    end,
    3.89 +    image  = { static = "icons/16/time.png" },
    3.90 +    text   = _"Timeline",
    3.91      module = "timeline",
    3.92 -    action = "update"
    3.93 ---    params = timeline_params
    3.94 +    view   = "index"
    3.95    }
    3.96  
    3.97    ui.link{
    3.98 -    content = function()
    3.99 -      ui.image{ static = "icons/16/package.png" }
   3.100 -      slot.put(_"Areas")
   3.101 -    end,
   3.102 +    image  = { static = "icons/16/package.png" },
   3.103 +    text   = _"Areas",
   3.104      module = 'area',
   3.105 -    view = 'list'
   3.106 +    view   = 'list'
   3.107    }
   3.108  
   3.109    ui.link{
   3.110 -    content = function()
   3.111 -      ui.image{ static = "icons/16/group.png" }
   3.112 -      slot.put(_"Members")
   3.113 -    end,
   3.114 +    image  = { static = "icons/16/group.png" },
   3.115 +    text   = _"Members",
   3.116      module = 'member',
   3.117 -    view = 'list'
   3.118 +    view   = 'list',
   3.119 +    params = { member_list = "newest" }
   3.120    }
   3.121  
   3.122    ui.link{
   3.123 -    content = function()
   3.124 -      ui.image{ static = "icons/16/book_edit.png" }
   3.125 -      slot.put(_"Contacts")
   3.126 -    end,
   3.127 +    image  = { static = "icons/16/book_edit.png" },
   3.128 +    text   = _"Contacts",
   3.129      module = 'contact',
   3.130 -    view = 'list'
   3.131 +    view   = 'list'
   3.132    }
   3.133  
   3.134    ui.link{
   3.135 -    content = function()
   3.136 -      ui.image{ static = "icons/16/information.png" }
   3.137 -      slot.put(_"About")
   3.138 -    end,
   3.139 +    image  = { static = "icons/16/information.png" },
   3.140 +    text   = _"About",
   3.141      module = 'index',
   3.142 -    view = 'about'
   3.143 +    view   = 'about'
   3.144    }
   3.145  
   3.146    if app.session.member.admin then
   3.147 @@ -119,13 +82,11 @@
   3.148      slot.put(" ")
   3.149  
   3.150      ui.link{
   3.151 -      attr = { class = { "admin_only" } },
   3.152 -      content = function()
   3.153 -        ui.image{ static = "icons/16/cog.png" }
   3.154 -        slot.put(_'Admin')
   3.155 -      end,
   3.156 +      attr   = { class = { "admin_only" } },
   3.157 +      image  = { static = "icons/16/cog.png" },
   3.158 +      text   = _"Admin",
   3.159        module = 'admin',
   3.160 -      view = 'index'
   3.161 +      view   = 'index'
   3.162      }
   3.163  
   3.164    end
   3.165 @@ -139,5 +100,3 @@
   3.166  end
   3.167  
   3.168  execute.inner()
   3.169 -
   3.170 -

     4.1 --- a/app/main/_filter_view/31_logout_button.lua	Tue Feb 02 00:31:06 2010 +0100
     4.2 +++ b/app/main/_filter_view/31_logout_button.lua	Sat Feb 20 22:10:31 2010 +0100
     4.3 @@ -5,10 +5,8 @@
     4.4  
     4.5  slot.select('logout_button', function()
     4.6    ui.link{
     4.7 -    content = function()
     4.8 -      ui.image{ static = "icons/16/stop.png" }
     4.9 -      slot.put(_'Logout')
    4.10 -    end,
    4.11 +    image  = { static = "icons/16/stop.png" },
    4.12 +    text   = _"Logout",
    4.13      module = 'index',
    4.14      action = 'logout'
    4.15    }

     5.1 --- a/app/main/_filter_view/33_help_hidden.lua	Tue Feb 02 00:31:06 2010 +0100
     5.2 +++ b/app/main/_filter_view/33_help_hidden.lua	Sat Feb 20 22:10:31 2010 +0100
     5.3 @@ -28,9 +28,9 @@
     5.4              attr = { class = "help_icon" },
     5.5              static = "icons/16/help.png"
     5.6            }
     5.7 -        end
     5.8 +        end,
     5.9 +        text = _"Show help text"
    5.10        }
    5.11      end
    5.12    end)
    5.13  end
    5.14 -

     6.1 --- a/app/main/_filter_view/34_stylesheet.lua	Tue Feb 02 00:31:06 2010 +0100
     6.2 +++ b/app/main/_filter_view/34_stylesheet.lua	Sat Feb 20 22:10:31 2010 +0100
     6.3 @@ -11,4 +11,40 @@
     6.4    slot.put_into("stylesheet_url", config.absolute_base_url .. "static/style.css")
     6.5  end
     6.6  
     6.7 -execute.inner()
     6.8 \ No newline at end of file
     6.9 +if os.getenv("HTTP_USER_AGENT"):find("Android.*AppleWebKit.*Mobile Safari") then
    6.10 +  slot.select("html_head", function()
    6.11 +    ui.tag{
    6.12 +      tag = "style",
    6.13 +      content = "body, td, th { font-size: 16px; };"
    6.14 +    }
    6.15 +  end)
    6.16 +end
    6.17 +
    6.18 +if app.session.member then
    6.19 +  local tab_mode = app.session.member:get_setting_value("tab_mode")
    6.20 +  if tab_mode then
    6.21 +    config.user_tab_mode = tab_mode
    6.22 +  end
    6.23 +end
    6.24 +
    6.25 +local web20 = config.user_tab_mode == "accordeon"
    6.26 +  or config.user_tab_mode == "accordeon_first_expanded"
    6.27 +  or config.user_tab_mode == "accordeon_all_expanded"
    6.28 +
    6.29 +if web20 then
    6.30 +  ui.enable_partial_loading()
    6.31 +end
    6.32 +
    6.33 +if request.get_json_request_slots() then
    6.34 +  slot.set_layout("blank")
    6.35 +end
    6.36 +
    6.37 +
    6.38 +ui.container{
    6.39 +  attr = {
    6.40 +    class = web20 and "web20" or "web10"
    6.41 +  },
    6.42 +  content = function()
    6.43 +    execute.inner()
    6.44 +  end
    6.45 +}
    6.46 \ No newline at end of file

     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/app/main/_layout/atom.html	Sat Feb 20 22:10:31 2010 +0100
     7.3 @@ -0,0 +1,12 @@
     7.4 +<?xml version="1.0" encoding="utf-8"?>
     7.5 +
     7.6 +<feed xmlns="http://www.w3.org/2005/Atom">
     7.7 +  <author>
     7.8 +    <name>foo</name>
     7.9 +  </author>
    7.10 +  <title>LiquidFeedback</title>
    7.11 +  <subtitle>Initiatives</subtitle>
    7.12 +  <id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id>
    7.13 +  <updated>2003-12-14T10:20:09Z</updated>
    7.14 +  <!-- WEBMCP SLOTNODIV default -->
    7.15 +</feed>

     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/app/main/_layout/blank.html	Sat Feb 20 22:10:31 2010 +0100
     8.3 @@ -0,0 +1,1 @@
     8.4 +<!-- WEBMCP SLOTNODIV default -->
     8.5 \ No newline at end of file

     9.1 --- a/app/main/_layout/default.html	Tue Feb 02 00:31:06 2010 +0100
     9.2 +++ b/app/main/_layout/default.html	Sat Feb 20 22:10:31 2010 +0100
     9.3 @@ -6,6 +6,8 @@
     9.4      <link rel="stylesheet" type="text/css" media="screen" href="__BASEURL__/static/gregor.js/gregor.css" />
     9.5      <link rel="stylesheet" type="text/css" media="screen" href="<!-- WEBMCP SLOTNODIV stylesheet_url -->" />
     9.6      <!-- WEBMCP SLOTNODIV html_head -->
     9.7 +    <script type="text/javascript" src="__BASEURL__/static/js/partialload.js"></script>
     9.8 +    <script type="text/javascript">var ui_tabs_active = {};</script>
     9.9    </head>
    9.10    <body>
    9.11      <div class="topbar">
    9.12 @@ -67,7 +69,9 @@
    9.13      <div class="layout_trace" id="layout_trace" style="xdisplay: none">
    9.14        <div id="trace_show" onclick="document.getElementById('trace_content').style.display='block';this.style.display='none';">TRACE</div>
    9.15          <div id="trace_content" style="display: none;">
    9.16 -          <!-- WEBMCP SLOT trace -->
    9.17 +            <tt id="system_error"><!-- WEBMCP SLOT system_error --></tt>
    9.18 +            <div id="trace">&nbsp;</div><hr />
    9.19 +            <!-- WEBMCP SLOT trace -->
    9.20            <div class="trace_close" onclick="document.getElementById('trace_show').style.display='block';document.getElementById('trace_content').style.display='none';">
    9.21              close
    9.22            </div>

    10.1 --- a/app/main/_layout/system_error.html	Tue Feb 02 00:31:06 2010 +0100
    10.2 +++ b/app/main/_layout/system_error.html	Sat Feb 20 22:10:31 2010 +0100
    10.3 @@ -1,7 +1,7 @@
    10.4  <html>
    10.5    <head>
    10.6      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
    10.7 -    <title>Liquid Democracy System Error</title>
    10.8 +    <title>LiquidFeedback Error</title>
    10.9      <link rel="stylesheet" type="text/css" media="screen" href="__BASEURL__/static/trace.css" />
   10.10      <style>
   10.11        body {

    11.1 --- a/app/main/area/_list.lua	Tue Feb 02 00:31:06 2010 +0100
    11.2 +++ b/app/main/area/_list.lua	Sat Feb 20 22:10:31 2010 +0100
    11.3 @@ -13,38 +13,56 @@
    11.4    :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")
    11.5    :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen NOTNULL AND issue.closed NOTNULL)", "issues_finished_count")
    11.6    :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen ISNULL AND issue.closed NOTNULL)", "issues_cancelled_count")
    11.7 +  :left_join("membership", "_membership", { "_membership.area_id = area.id AND _membership.member_id = ?", app.session.member.id })
    11.8 +  :add_field("_membership.member_id NOTNULL", "is_member", { "grouped" })
    11.9  
   11.10 -ui.order{
   11.11 -  name = name,
   11.12 +local label_attr = { style = "text-align: right; width: 4em;" }
   11.13 +local field_attr = { style = "text-align: right; width: 4em;" }
   11.14 +
   11.15 +ui.filters{
   11.16 +  label = _"Change order",
   11.17    selector = areas_selector,
   11.18 -  options = {
   11.19 +  {
   11.20 +    label = _"Order by",
   11.21      {
   11.22        name = "member_weight",
   11.23        label = _"Population",
   11.24 -      order_by = "area.member_weight DESC"
   11.25 +      selector_modifier = function(selector) selector:add_order_by("area.member_weight DESC") end
   11.26      },
   11.27      {
   11.28        name = "direct_member_count",
   11.29        label = _"Direct member count",
   11.30 -      order_by = "area.direct_member_count DESC"
   11.31 +      selector_modifier = function(selector) selector:add_order_by("area.direct_member_count DESC") end
   11.32      },
   11.33      {
   11.34        name = "az",
   11.35        label = _"A-Z",
   11.36 -      order_by = "area.name"
   11.37 +      selector_modifier = function(selector) selector:add_order_by("area.name") end
   11.38      },
   11.39      {
   11.40        name = "za",
   11.41        label = _"Z-A",
   11.42 -      order_by = "area.name DESC"
   11.43 +      selector_modifier = function(selector) selector:add_order_by("area.name DESC") end
   11.44      }
   11.45    },
   11.46    content = function()
   11.47      ui.list{
   11.48 +      attr = { class = "area_list" },
   11.49        records = areas_selector:exec(),
   11.50        columns = {
   11.51          {
   11.52            content = function(record)
   11.53 +            if record.is_member then
   11.54 +              local text = _"Member of area"
   11.55 +              ui.image{
   11.56 +                attr = { title = text, alt = text, style = "vertical-align: middle;" },
   11.57 +                static = "icons/16/user_gray.png",
   11.58 +              }
   11.59 +            end
   11.60 +          end
   11.61 +        },
   11.62 +        {
   11.63 +          content = function(record)
   11.64              if record.member_weight and record.direct_member_count then
   11.65                local max_value = MemberCount:get()
   11.66                ui.bargraph{
   11.67 @@ -70,97 +88,143 @@
   11.68            end
   11.69          },
   11.70          {
   11.71 -          label = _"New",
   11.72 -          field_attr = { style = "text-align: right;" },
   11.73 +          label = function()
   11.74 +            local title = _"New"
   11.75 +            ui.image{
   11.76 +              attr = { title = title, alt = title },
   11.77 +              static = "icons/16/new.png"
   11.78 +            }
   11.79 +          end,
   11.80 +          field_attr = field_attr,
   11.81 +          label_attr = label_attr,
   11.82            content = function(record)
   11.83              ui.link{
   11.84                text = tostring(record.issues_new_count),
   11.85                module = "area",
   11.86                view = "show",
   11.87                id = record.id,
   11.88 -              params = { filter = "new" }
   11.89 +              params = { filter = "new", tab = "issues" }
   11.90              }
   11.91            end
   11.92          },
   11.93          {
   11.94 -          label = _"Discussion",
   11.95 -          field_attr = { style = "text-align: right;" },
   11.96 +          label = function()
   11.97 +            local title = _"Discussion"
   11.98 +            ui.image{
   11.99 +              attr = { title = title, alt = title },
  11.100 +              static = "icons/16/comments.png"
  11.101 +            }
  11.102 +          end,
  11.103 +          field_attr = field_attr,
  11.104 +          label_attr = label_attr,
  11.105            content = function(record)
  11.106              ui.link{
  11.107                text = tostring(record.issues_discussion_count),
  11.108                module = "area",
  11.109                view = "show",
  11.110                id = record.id,
  11.111 -              params = { filter = "accepted" }
  11.112 +              params = { filter = "accepted", tab = "issues" }
  11.113              }
  11.114            end
  11.115          },
  11.116          {
  11.117 -          label = _"Frozen",
  11.118 -          field_attr = { style = "text-align: right;" },
  11.119 +          label = function()
  11.120 +            local title = _"Frozen"
  11.121 +            ui.image{
  11.122 +              attr = { title = title, alt = title },
  11.123 +              static = "icons/16/lock.png"
  11.124 +            }
  11.125 +          end,
  11.126 +          field_attr = field_attr,
  11.127 +          label_attr = label_attr,
  11.128            content = function(record)
  11.129              ui.link{
  11.130                text = tostring(record.issues_frozen_count),
  11.131                module = "area",
  11.132                view = "show",
  11.133                id = record.id,
  11.134 -              params = { filter = "half_frozen" }
  11.135 +              params = { filter = "half_frozen", tab = "issues" }
  11.136              }
  11.137            end
  11.138          },
  11.139          {
  11.140 -          label = _"Voting",
  11.141 -          field_attr = { style = "text-align: right;" },
  11.142 +          label = function()
  11.143 +            local title = _"Voting"
  11.144 +            ui.image{
  11.145 +              attr = { title = title, alt = title },
  11.146 +              static = "icons/16/email_open.png"
  11.147 +            }
  11.148 +          end,
  11.149 +          field_attr = field_attr,
  11.150 +          label_attr = label_attr,
  11.151            content = function(record)
  11.152              ui.link{
  11.153                text = tostring(record.issues_voting_count),
  11.154                module = "area",
  11.155                view = "show",
  11.156                id = record.id,
  11.157 -              params = { filter = "frozen" }
  11.158 +              params = { filter = "frozen", tab = "issues" }
  11.159              }
  11.160            end
  11.161          },
  11.162          {
  11.163 -          label = _"Not yet voted",
  11.164 -          field_attr = { style = "text-align: right;" },
  11.165 -          content = function(record)
  11.166 -            ui.link{
  11.167 -              attr = { class = record.issues_to_vote_count > 0 and "not_voted" or nil },
  11.168 -              text = tostring(record.issues_to_vote_count),
  11.169 -              module = "area",
  11.170 -              view = "show",
  11.171 -              id = record.id,
  11.172 -              params = { filter = "frozen", filter_voting = "not_voted" }
  11.173 +          label = function()
  11.174 +            local title = _"Finished"
  11.175 +            ui.image{
  11.176 +              attr = { title = title, alt = title },
  11.177 +              static = "icons/16/tick.png"
  11.178              }
  11.179 -          end
  11.180 -        },
  11.181 -        {
  11.182 -          label = _"Finished",
  11.183 -          field_attr = { style = "text-align: right;" },
  11.184 +          end,
  11.185 +          field_attr = field_attr,
  11.186 +          label_attr = label_attr,
  11.187            content = function(record)
  11.188              ui.link{
  11.189                text = tostring(record.issues_finished_count),
  11.190                module = "area",
  11.191                view = "show",
  11.192                id = record.id,
  11.193 -              params = { filter = "finished", issue_list = "newest" }
  11.194 +              params = { filter = "finished", issue_list = "newest", tab = "issues" }
  11.195              }
  11.196            end
  11.197          },
  11.198          {
  11.199 -          label = _"Cancelled",
  11.200 -          field_attr = { style = "text-align: right;" },
  11.201 +          label = function()
  11.202 +            local title = _"Cancelled"
  11.203 +            ui.image{
  11.204 +              attr = { title = title, alt = title },
  11.205 +              static = "icons/16/cross.png"
  11.206 +            }
  11.207 +          end,
  11.208 +          field_attr = field_attr,
  11.209 +          label_attr = label_attr,
  11.210            content = function(record)
  11.211              ui.link{
  11.212                text = tostring(record.issues_cancelled_count),
  11.213                module = "area",
  11.214                view = "show",
  11.215                id = record.id,
  11.216 -              params = { filter = "cancelled", issue_list = "newest" }
  11.217 +              params = { filter = "cancelled", issue_list = "newest", tab = "issues" }
  11.218              }
  11.219            end
  11.220          },
  11.221 +        {
  11.222 +          content = function(record)
  11.223 +            if record.issues_to_vote_count > 0 then
  11.224 +              ui.link{
  11.225 +                attr = { class = "not_voted" },
  11.226 +                text = _"Not yet voted" .. ": " .. tostring(record.issues_to_vote_count),
  11.227 +                module = "area",
  11.228 +                view = "show",
  11.229 +                id = record.id,
  11.230 +                params = {
  11.231 +                  filter = "frozen",
  11.232 +                  filter_voting = "not_voted",
  11.233 +                  tab = "issues"
  11.234 +                }
  11.235 +              }
  11.236 +            end
  11.237 +          end
  11.238 +        },
  11.239        }
  11.240      }
  11.241    end
  11.242 @@ -175,3 +239,61 @@
  11.243    }
  11.244  }
  11.245  
  11.246 +slot.put("<br /> &nbsp; ")
  11.247 +
  11.248 +
  11.249 +ui.image{
  11.250 +  attr = { title = title, alt = title },
  11.251 +  static = "icons/16/user_gray.png"
  11.252 +}
  11.253 +slot.put(" ")
  11.254 +slot.put(_"Member of area")
  11.255 +slot.put(" &nbsp; ")
  11.256 +
  11.257 +ui.image{
  11.258 +  attr = { title = title, alt = title },
  11.259 +  static = "icons/16/new.png"
  11.260 +}
  11.261 +slot.put(" ")
  11.262 +slot.put(_"New")
  11.263 +slot.put(" &nbsp; ")
  11.264 +
  11.265 +ui.image{
  11.266 +  attr = { title = title, alt = title },
  11.267 +  static = "icons/16/comments.png"
  11.268 +}
  11.269 +slot.put(" ")
  11.270 +slot.put(_"Discussion")
  11.271 +slot.put(" &nbsp; ")
  11.272 +
  11.273 +ui.image{
  11.274 +  attr = { title = title, alt = title },
  11.275 +  static = "icons/16/lock.png"
  11.276 +}
  11.277 +slot.put(" ")
  11.278 +slot.put(_"Frozen")
  11.279 +slot.put(" &nbsp; ")
  11.280 +
  11.281 +ui.image{
  11.282 +  attr = { title = title, alt = title },
  11.283 +  static = "icons/16/email_open.png"
  11.284 +}
  11.285 +slot.put(" ")
  11.286 +slot.put(_"Voting")
  11.287 +slot.put(" &nbsp; ")
  11.288 +
  11.289 +ui.image{
  11.290 +  attr = { title = title, alt = title },
  11.291 +  static = "icons/16/tick.png"
  11.292 +}
  11.293 +slot.put(" ")
  11.294 +slot.put(_"Finished")
  11.295 +slot.put(" &nbsp; ")
  11.296 +
  11.297 +ui.image{
  11.298 +  attr = { title = title, alt = title },
  11.299 +  static = "icons/16/cross.png"
  11.300 +}
  11.301 +slot.put(" ")
  11.302 +slot.put(_"Cancelled")
  11.303 +

    12.1 --- a/app/main/area/show.lua	Tue Feb 02 00:31:06 2010 +0100
    12.2 +++ b/app/main/area/show.lua	Sat Feb 20 22:10:31 2010 +0100
    12.3 @@ -36,39 +36,104 @@
    12.4    params = { area_id = area.id }
    12.5  }
    12.6  
    12.7 -ui.tabs{
    12.8 -  {
    12.9 -    name = "issues",
   12.10 -    label = _"Issues",
   12.11 +--[[
   12.12 +for i, issue in ipairs(area.issues) do
   12.13 +  local head_name = "issue_head_content_" .. tostring(issue.id)
   12.14 +  local name = "issue_content_" .. tostring(issue.id)
   12.15 +  local icon_name = "issue_icon_" .. tostring(issue.id)
   12.16 +  ui.container{
   12.17 +    attr = { class = "ui_tabs" },
   12.18      content = function()
   12.19 -      execute.view{
   12.20 -        module = "issue",
   12.21 -        view = "_list",
   12.22 -        params = { issues_selector = area:get_reference_selector("issues"), for_area_list = true }
   12.23 +      local onclick = 
   12.24 +        'if (ui_tabs_active["' .. name .. '"]) {' ..
   12.25 +          'el=document.getElementById("' .. name .. '");' ..
   12.26 +          'el.innerHTML="";' ..
   12.27 +          'el.style.display="none";' ..
   12.28 +          'ui_tabs_active["' .. name .. '"]=false' ..
   12.29 +        '} else {' ..
   12.30 +          'ui_tabs_active["' .. name .. '"]=true;' ..
   12.31 +          'document.getElementById("' .. name .. '").style.display="block"; ' ..
   12.32 +          'var hourglass_el = document.getElementById("' .. icon_name .. '");' ..
   12.33 +          'var hourglass_src = hourglass_el.src;' ..
   12.34 +          'hourglass_el.src = "' .. encode.url{ static = "icons/16/connect.png" } .. '";' ..
   12.35 +          'partialMultiLoad(' ..
   12.36 +            '{ trace: "trace", system_error: "system_error", ' .. name .. '_title: "title", ' .. name .. '_actions: "actions", ' .. name .. '_content: "default" },' ..
   12.37 +            '{},' ..
   12.38 +            '"error",' ..
   12.39 +            '"' .. 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",' ..
   12.40 +            '{},' ..
   12.41 +            '{},' ..
   12.42 +            'function() {' ..
   12.43 +              'hourglass_el.src = hourglass_src;' ..
   12.44 +            '},' ..
   12.45 +            'function() {' ..
   12.46 +              'hourglass_el.src = hourglass_src;' ..
   12.47 +            '}' ..
   12.48 +          '); ' ..
   12.49 +        '}' ..
   12.50 +        'return(false);'
   12.51 +      ui.link{
   12.52 +        attr = {
   12.53 +          name = name,
   12.54 +          class = "ui_tabs_accordeon_head",
   12.55 +          id = head_name,
   12.56 +          onclick = onclick,
   12.57 +        },
   12.58 +        module  = "issue",
   12.59 +        view    = "show",
   12.60 +        id      = issue.id,
   12.61 +        params  = params,
   12.62 +        anchor  = name,
   12.63 +        content = function()
   12.64 +          ui.image{
   12.65 +            attr = { id = icon_name },
   12.66 +            static = "icons/16/script.png"
   12.67 +          }
   12.68 +          ui.container{
   12.69 +            attr = { style = "float: right;" },
   12.70 +            content = function()
   12.71 +              
   12.72 +            end
   12.73 +          }
   12.74 +          slot.put(tostring(issue.id))
   12.75 +        end
   12.76        }
   12.77      end
   12.78 -  },
   12.79 -  {
   12.80 -    name = "members",
   12.81 -    label = _"Members",
   12.82 +  }
   12.83 +
   12.84 +  ui.container{
   12.85 +    attr = {
   12.86 +      id = name,
   12.87 +      class = "ui_tabs_accordeon_content",
   12.88 +    },
   12.89      content = function()
   12.90 -      execute.view{
   12.91 -        module = "member",
   12.92 -        view = "_list",
   12.93 -        params = { members_selector = area:get_reference_selector("members") }
   12.94 -      }
   12.95 +      ui.container{ attr = { id = name .. "_title",   }, content = function() slot.put(" ") end }
   12.96 +      ui.container{ attr = { id = name .. "_actions", }, content = function() slot.put(" ") end }
   12.97 +      ui.container{ attr = { id = name .. "_content", }, content = function() 
   12.98 +        execute.view{
   12.99 +          module = "initiative",
  12.100 +          view = "_list",
  12.101 +          params = {
  12.102 +            issue = issue,
  12.103 +            initiatives_selector = issue:get_reference_selector("initiatives"),
  12.104 +            limit = 3,
  12.105 +            per_page = 3,
  12.106 +            no_sort = true,
  12.107 +          }
  12.108 +        }
  12.109 +      end }
  12.110      end
  12.111 -  },
  12.112 -  {
  12.113 -    name = "delegations",
  12.114 -    label = _"Delegations",
  12.115 -    content = function()
  12.116 -      execute.view{
  12.117 -        module = "delegation",
  12.118 -        view = "_list",
  12.119 -        params = { delegations_selector = area:get_reference_selector("delegations") }
  12.120 -      }
  12.121 -    end
  12.122 -  },
  12.123 +  }
  12.124 +
  12.125 +  if config.user_tab_mode == "accordeon_all_expanded" then
  12.126 +    ui.script{ script = 'document.getElementById("' .. head_name .. '").onclick();' }
  12.127 +  end
  12.128 +end
  12.129 +--]]
  12.130 +
  12.131 +execute.view{
  12.132 +  module = "area",
  12.133 +  view = "show_tab",
  12.134 +  params = { area = area }
  12.135  }
  12.136  

    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/app/main/area/show_tab.lua	Sat Feb 20 22:10:31 2010 +0100
    13.3 @@ -0,0 +1,40 @@
    13.4 +local area = param.get("area", "table") or Area:by_id(param.get("area_id", atom.integer))
    13.5 +
    13.6 +local issues_selector = area:get_reference_selector("issues")
    13.7 +local members_selector = area:get_reference_selector("members")
    13.8 +local delegations_selector = area:get_reference_selector("delegations")
    13.9 +
   13.10 +ui.tabs{
   13.11 +  module = "area",
   13.12 +  view = "show_tab",
   13.13 +  static_params = { area_id = area.id },
   13.14 +  {
   13.15 +    name = "issues",
   13.16 +    label = _"Issues" .. " (" .. tostring(issues_selector:count()) .. ")",
   13.17 +    icon = { static = "icons/16/folder.png" },
   13.18 +    module = "issue",
   13.19 +    view = "_list",
   13.20 +    params = {
   13.21 +      issues_selector = issues_selector,
   13.22 +      filter = cgi.params["filter"],
   13.23 +      filter_voting = param.get("filter_voting")
   13.24 +    }
   13.25 +  },
   13.26 +  {
   13.27 +    name = "members",
   13.28 +    label = _"Members" .. " (" .. tostring(members_selector:count()) .. ")",
   13.29 +    icon = { static = "icons/16/group.png" },
   13.30 +    module = "member",
   13.31 +    view = "_list",
   13.32 +    params = { members_selector = members_selector }
   13.33 +  },
   13.34 +  {
   13.35 +    name = "delegations",
   13.36 +    label = _"Delegations" .. " (" .. tostring(delegations_selector:count()) .. ")",
   13.37 +    icon = { static = "icons/16/table_go.png" },
   13.38 +    module = "delegation",
   13.39 +    view = "_list",
   13.40 +    params = { delegations_selector = delegations_selector }
   13.41 +  },
   13.42 +}
   13.43 +

    14.1 --- a/app/main/delegation/_show_box.lua	Tue Feb 02 00:31:06 2010 +0100
    14.2 +++ b/app/main/delegation/_show_box.lua	Sat Feb 20 22:10:31 2010 +0100
    14.3 @@ -1,43 +1,106 @@
    14.4 -slot.select("actions", function()
    14.5 -
    14.6 -  local delegation
    14.7 -  local area_id
    14.8 -  local issue_id
    14.9 -
   14.10 -  local scope = "global"
   14.11 +function change_delegation(scope, area_id, issue, delegation)
   14.12 +  local image
   14.13 +  local text
   14.14 +  if scope == "global" and delegation then
   14.15 +    image = { static = "icons/16/table_go.png" }
   14.16 +    text = _"Change global delegation"
   14.17 +  elseif scope == "global" and not delegation then
   14.18 +    image = { static = "icons/16/table_go.png" }
   14.19 +    text = _"Set global delegation"
   14.20 +  elseif scope == "area" and delegation and delegation.area_id then
   14.21 +    image = { static = "icons/16/table_go.png" }
   14.22 +    text = _"Change area delegation"
   14.23 +  elseif scope == "area" and not (delegation and delegation.area_id) then
   14.24 +    image = { static = "icons/16/table_go.png" }
   14.25 +    text = _"Set area delegation"
   14.26 +  elseif scope == "issue" then
   14.27 +    if delegation and delegation.issue_id then
   14.28 +      image = { static = "icons/16/table_go.png" }
   14.29 +      text = _"Change issue delegation"
   14.30 +    elseif issue.state ~= "finished" and issue.state ~= "cancelled" then
   14.31 +      image = { static = "icons/16/table_go.png" }
   14.32 +      text = _"Set issue delegation"
   14.33 +    end
   14.34 +  end
   14.35 +  ui.container{
   14.36 +    attr = {
   14.37 +      class = "change_delegation",
   14.38 +    },
   14.39 +    content = function()
   14.40 +      ui.link{
   14.41 +        image  = image,
   14.42 +        text   = text,
   14.43 +        module = "delegation",
   14.44 +        view = "new",
   14.45 +        params = {
   14.46 +          issue_id = issue and issue.id or nil,
   14.47 +          area_id = area_id
   14.48 +        },
   14.49 +      }
   14.50 +      if delegation then
   14.51 +        ui.link{
   14.52 +          image  = { static = "icons/16/delete.png" },
   14.53 +          text   = _"Revoke",
   14.54 +          module = "delegation",
   14.55 +          action = "update",
   14.56 +          params = { issue_id = delegation.issue_id, area_id = delegation.area_id, delete = true },
   14.57 +          routing = {
   14.58 +            default = {
   14.59 +              mode = "redirect",
   14.60 +              module = request.get_module(),
   14.61 +              view = request.get_view(),
   14.62 +              id = param.get_id_cgi(),
   14.63 +              params = param.get_all_cgi()
   14.64 +            }
   14.65 +          }
   14.66 +        }
   14.67 +      end
   14.68 +    end
   14.69 +  }
   14.70 +end
   14.71  
   14.72 -  if param.get("initiative_id", atom.integer) then
   14.73 -    issue_id = Initiative:by_id(param.get("initiative_id", atom.integer)).issue_id
   14.74 -    scope = "issue"
   14.75 -  end
   14.76 +local delegation
   14.77 +local area_id
   14.78 +local issue_id
   14.79 +
   14.80 +local scope = "global"
   14.81  
   14.82 -  if param.get("issue_id", atom.integer) then
   14.83 -    issue_id = param.get("issue_id", atom.integer)
   14.84 -    scope = "issue"
   14.85 -  end
   14.86 +if param.get("initiative_id", atom.integer) then
   14.87 +  issue_id = Initiative:by_id(param.get("initiative_id", atom.integer)).issue_id
   14.88 +  scope = "issue"
   14.89 +end
   14.90  
   14.91 -  if param.get("area_id", atom.integer) then
   14.92 -    area_id = param.get("area_id", atom.integer)
   14.93 -    scope = "area"
   14.94 -  end
   14.95 +if param.get("issue_id", atom.integer) then
   14.96 +  issue_id = param.get("issue_id", atom.integer)
   14.97 +  scope = "issue"
   14.98 +end
   14.99 +
  14.100 +if param.get("area_id", atom.integer) then
  14.101 +  area_id = param.get("area_id", atom.integer)
  14.102 +  scope = "area"
  14.103 +end
  14.104  
  14.105  
  14.106  
  14.107 -  local delegation
  14.108 -  local issue
  14.109 -  if issue_id then
  14.110 -    issue = Issue:by_id(issue_id)
  14.111 -    delegation = Delegation:by_pk(app.session.member.id, nil, issue_id)
  14.112 -    if not delegation then
  14.113 -      delegation = Delegation:by_pk(app.session.member.id, issue.area_id)
  14.114 -    end
  14.115 -  elseif area_id then
  14.116 -    delegation = Delegation:by_pk(app.session.member.id, area_id)
  14.117 +local delegation
  14.118 +local issue
  14.119 +if issue_id then
  14.120 +  issue = Issue:by_id(issue_id)
  14.121 +  delegation = Delegation:by_pk(app.session.member.id, nil, issue_id)
  14.122 +  if not delegation then
  14.123 +    delegation = Delegation:by_pk(app.session.member.id, issue.area_id)
  14.124    end
  14.125 +elseif area_id then
  14.126 +  delegation = Delegation:by_pk(app.session.member.id, area_id)
  14.127 +end
  14.128  
  14.129 -  if not delegation then
  14.130 -    delegation = Delegation:by_pk(app.session.member.id)
  14.131 -  end
  14.132 +if not delegation then
  14.133 +  delegation = Delegation:by_pk(app.session.member.id)
  14.134 +end
  14.135 +
  14.136 +
  14.137 +slot.select("actions", function()
  14.138 +
  14.139    if delegation then
  14.140      ui.container{
  14.141        attr = { class = "delegation vote_info"},
  14.142 @@ -85,6 +148,10 @@
  14.143                :add_order_by("index")
  14.144                :exec()
  14.145      
  14.146 +            if not issue or (issue.state ~= "finished" and issue.state ~= "cancelled") then
  14.147 +              change_delegation(scope, area_id, issue, delegation)
  14.148 +            end
  14.149 +
  14.150              for i, record in ipairs(delegation_chain) do
  14.151                local style
  14.152                local overridden = record.overridden
  14.153 @@ -115,29 +182,6 @@
  14.154                          end
  14.155                        end
  14.156                      }
  14.157 -                    if i == 2 then
  14.158 -                      if not issue or (issue.state ~= "finished" and issue.state ~= "cancelled") then
  14.159 -                        ui.link{
  14.160 -                          attr = { class = "revoke" },
  14.161 -                          content = function()
  14.162 -                            ui.image{ static = "icons/16/delete.png" }
  14.163 -                            slot.put(_"Revoke")
  14.164 -                          end,
  14.165 -                          module = "delegation",
  14.166 -                          action = "update",
  14.167 -                          params = { issue_id = delegation.issue_id, area_id = delegation.area_id, delete = true },
  14.168 -                          routing = {
  14.169 -                            default = {
  14.170 -                              mode = "redirect",
  14.171 -                              module = request.get_module(),
  14.172 -                              view = request.get_view(),
  14.173 -                              id = param.get_id_cgi(),
  14.174 -                              params = param.get_all_cgi()
  14.175 -                            }
  14.176 -                          }
  14.177 -                        }
  14.178 -                      end
  14.179 -                    end
  14.180                    end
  14.181                  }
  14.182                end
  14.183 @@ -155,7 +199,7 @@
  14.184                  ui.container{
  14.185                    attr = { class = "delegation_participation" },
  14.186                    content = function()
  14.187 -                    slot.put("<br /><br />-----> Participation<br />")
  14.188 +                    slot.put(_"This member is participating, the rest of delegation chain is suspended while discussing")
  14.189                    end
  14.190                  }
  14.191                end
  14.192 @@ -165,38 +209,7 @@
  14.193          }
  14.194        end
  14.195      }
  14.196 -
  14.197 -
  14.198 +  else
  14.199 +    change_delegation(scope, area_id, issue)
  14.200    end
  14.201 -  ui.link{
  14.202 -    content = function()
  14.203 -      if scope == "global" and delegation then
  14.204 -        ui.image{ static = "icons/16/table_go.png" }
  14.205 -        slot.put(_"Change global delegation")
  14.206 -      elseif scope == "global" and not delegation then
  14.207 -        ui.image{ static = "icons/16/table_go.png" }
  14.208 -        slot.put(_"Set global delegation")
  14.209 -      elseif scope == "area" and delegation and delegation.area_id then
  14.210 -        ui.image{ static = "icons/16/table_go.png" }
  14.211 -        slot.put(_"Change area delegation")
  14.212 -      elseif scope == "area" and not (delegation and delegation.area_id) then
  14.213 -        ui.image{ static = "icons/16/table_go.png" }
  14.214 -        slot.put(_"Set area delegation")
  14.215 -      elseif scope == "issue" then
  14.216 -        if delegation and delegation.issue_id then
  14.217 -          ui.image{ static = "icons/16/table_go.png" }
  14.218 -          slot.put(_"Change issue delegation")
  14.219 -        elseif issue.state ~= "finished" and issue.state ~= "cancelled" then
  14.220 -          ui.image{ static = "icons/16/table_go.png" }
  14.221 -          slot.put(_"Set issue delegation")
  14.222 -        end
  14.223 -      end
  14.224 -    end,
  14.225 -    module = "delegation",
  14.226 -    view = "new",
  14.227 -    params = {
  14.228 -      area_id = area_id,
  14.229 -      issue_id = issue_id 
  14.230 -    }
  14.231 -  }
  14.232  end)

    15.1 --- a/app/main/draft/_show.lua	Tue Feb 02 00:31:06 2010 +0100
    15.2 +++ b/app/main/draft/_show.lua	Sat Feb 20 22:10:31 2010 +0100
    15.3 @@ -6,8 +6,15 @@
    15.4    readonly = true,
    15.5    content = function()
    15.6  
    15.7 -    ui.field.text{ label = _"Last author", name = "author_name" }
    15.8 -    ui.field.timestamp{ label = _"Created at", name = "created" }
    15.9 +    ui.field.text{ 
   15.10 +      label = _"Last author",
   15.11 +      value = _(
   15.12 +        "#{author} at #{date}", {
   15.13 +          author = draft.author_name,
   15.14 +          date = format.timestamp(draft.created)
   15.15 +        }
   15.16 +      )
   15.17 +    }
   15.18      ui.container{
   15.19        attr = { class = "draft_content wiki" },
   15.20        content = function()

    16.1 --- a/app/main/index/about.lua	Tue Feb 02 00:31:06 2010 +0100
    16.2 +++ b/app/main/index/about.lua	Sat Feb 20 22:10:31 2010 +0100
    16.3 @@ -1,5 +1,18 @@
    16.4  slot.put_into("title", encode.html(_"About LiquidFeedback"))
    16.5  
    16.6 +if app.session.member_id then
    16.7 +  slot.select("actions", function()
    16.8 +    ui.link{
    16.9 +      module = "index",
   16.10 +      view = "usage_terms",
   16.11 +      content = function()
   16.12 +        ui.image{ static = "icons/16/script.png" }
   16.13 +        slot.put(_"Terms of use")
   16.14 +      end
   16.15 +    }
   16.16 +  end)
   16.17 +end
   16.18 +
   16.19  
   16.20  slot.put("<br />")
   16.21  ui.field.text{ attr = { style = "font-weight: bold;" }, value = "Diensteanbieter:" }

    17.1 --- a/app/main/index/index.lua	Tue Feb 02 00:31:06 2010 +0100
    17.2 +++ b/app/main/index/index.lua	Sat Feb 20 22:10:31 2010 +0100
    17.3 @@ -23,6 +23,7 @@
    17.4                attr = { style = "margin-left: 0.5em;", alt = lang }
    17.5              }
    17.6            end,
    17.7 +          text = _('Select language "#{langcode}"', { langcode = lang }),
    17.8            module = "index",
    17.9            action = "set_lang",
   17.10            params = { lang = lang },

    18.1 --- a/app/main/index/login.lua	Tue Feb 02 00:31:06 2010 +0100
    18.2 +++ b/app/main/index/login.lua	Sat Feb 20 22:10:31 2010 +0100
    18.3 @@ -24,6 +24,7 @@
    18.4                attr = { style = "margin-left: 0.5em;", alt = lang }
    18.5              }
    18.6            end,
    18.7 +          text = _('Select language "#{langcode}"', { langcode = lang }),
    18.8            module = "index",
    18.9            action = "set_lang",
   18.10            params = { lang = lang },

    19.1 --- a/app/main/index/search.lua	Tue Feb 02 00:31:06 2010 +0100
    19.2 +++ b/app/main/index/search.lua	Sat Feb 20 22:10:31 2010 +0100
    19.3 @@ -1,44 +1,41 @@
    19.4 -local search_for = param.get("search_for", atom.string)
    19.5 +local search_for = param.get("search_for", atom.string) or "global"
    19.6  local search_string = param.get("search", atom.string)
    19.7  
    19.8 -search_for = search_for or "global"
    19.9 -
   19.10  slot.put_into("title", _("Search results for: '#{search}'", { search  = search_string }))
   19.11  
   19.12 +
   19.13  if search_for == "global" or search_for == "member" then
   19.14 -  members_selector = Member:get_search_selector(search_string)
   19.15 ---if #members > 0 then
   19.16 +  local members_selector = Member:get_search_selector(search_string)
   19.17    ui.heading{ content = _"Members" }
   19.18    execute.view{
   19.19      module = "member",
   19.20      view = "_list",
   19.21      params = { members_selector = members_selector },
   19.22    }
   19.23 ---end
   19.24  end
   19.25  
   19.26 -if search_for == "global" or search_for == "issue" then
   19.27 -  issues_selector = Issue:get_search_selector(search_string)
   19.28 ---if #issues > 0 then
   19.29 -  ui.heading{ content = _"Issues" }
   19.30 -  execute.view{
   19.31 -    module = "issue",
   19.32 -    view = "_list",
   19.33 -    params = { issues_selector = issues_selector, highlight_string = search_string },
   19.34 -  }
   19.35 ---end
   19.36 -end
   19.37 -
   19.38 -if search_for == "initiative" then
   19.39 -  initiatives_selector = Initiative:get_search_selector(search_string)
   19.40 ---if #initiatives > 0 then
   19.41 +if search_for == "global" or search_for == "initiative" then
   19.42 +  local initiatives_selector = Initiative:get_search_selector(search_string)
   19.43    ui.heading{ content = _"Initiatives" }
   19.44    execute.view{
   19.45      module = "initiative",
   19.46      view = "_list",
   19.47      params = { initiatives_selector = initiatives_selector },
   19.48    }
   19.49 ---end
   19.50 +end
   19.51 +
   19.52 +if search_for == "issue" then
   19.53 +  local issues_selector = Issue:get_search_selector(search_string)
   19.54 +  ui.heading{ content = _"Issues" }
   19.55 +  execute.view{
   19.56 +    module = "issue",
   19.57 +    view = "_list",
   19.58 +    params = {
   19.59 +      issues_selector = issues_selector,
   19.60 +      highlight_string = search_string,
   19.61 +      no_filter = true
   19.62 +    },
   19.63 +  }
   19.64  end
   19.65  
   19.66  

    20.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    20.2 +++ b/app/main/index/usage_terms.lua	Sat Feb 20 22:10:31 2010 +0100
    20.3 @@ -0,0 +1,17 @@
    20.4 +slot.select("actions", function()
    20.5 +  ui.link{
    20.6 +    module = "index",
    20.7 +    view = "about",
    20.8 +    content = function()
    20.9 +      ui.image{ static = "icons/16/cancel.png" }
   20.10 +      slot.put(_"Back")
   20.11 +    end
   20.12 +  }
   20.13 +end)
   20.14 +
   20.15 +ui.container{
   20.16 +  attr = { class = "wiki use_terms" },
   20.17 +  content = function()
   20.18 +    slot.put(format.wiki_text(config.use_terms))
   20.19 +  end
   20.20 +}

    21.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.2 +++ b/app/main/initiative/_current_draft.lua	Sat Feb 20 22:10:31 2010 +0100
    21.3 @@ -0,0 +1,16 @@
    21.4 +local initiator = param.get("initiator", "table")
    21.5 +local initiative = param.get("initiative", "table")
    21.6 +
    21.7 +if initiator and initiator.accepted and not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked then
    21.8 +  ui.link{
    21.9 +    attr = { style = "float: right;" },
   21.10 +    content = function()
   21.11 +      ui.image{ static = "icons/16/script_add.png" }
   21.12 +      slot.put(_"Edit draft")
   21.13 +    end,
   21.14 +    module = "draft",
   21.15 +    view = "new",
   21.16 +    params = { initiative_id = initiative.id }
   21.17 +  }
   21.18 +end
   21.19 +execute.view{ module = "draft", view = "_show", params = { draft = initiative.current_draft } }

    22.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    22.2 +++ b/app/main/initiative/_details.lua	Sat Feb 20 22:10:31 2010 +0100
    22.3 @@ -0,0 +1,20 @@
    22.4 +local initiative = param.get("initiative", "table")
    22.5 +
    22.6 +ui.form{
    22.7 +  attr = { class = "vertical" },
    22.8 +  record = initiative,
    22.9 +  readonly = true,
   22.10 +  content = function()
   22.11 +    ui.field.text{ label = _"Issue policy", value = initiative.issue.policy.name }
   22.12 +    ui.field.text{
   22.13 +      label = _"Created at",
   22.14 +      value = tostring(initiative.created)
   22.15 +    }
   22.16 +    ui.field.text{
   22.17 +      label = _"Created at",
   22.18 +      value = format.timestamp(initiative.created)
   22.19 +    }
   22.20 +  -- ui.field.date{ label = _"Revoked at", name = "revoked" }
   22.21 +    ui.field.boolean{ label = _"Admitted", name = "admitted" }
   22.22 +  end
   22.23 +}

    23.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    23.2 +++ b/app/main/initiative/_initiators.lua	Sat Feb 20 22:10:31 2010 +0100
    23.3 @@ -0,0 +1,58 @@
    23.4 +local initiative = param.get("initiative", "table")
    23.5 +local initiator = param.get("initiator", "table")
    23.6 +local initiators_members_selector = param.get("initiators_members_selector", "table")
    23.7 +
    23.8 +local initiator_count = initiators_members_selector:count()
    23.9 +
   23.10 +if initiator and initiator.accepted and not initiative.issue.fully_frozen and not initiative.issue.closed and not initiative.revoked then
   23.11 +  ui.link{
   23.12 +    attr = { class = "action" },
   23.13 +    content = function()
   23.14 +      ui.image{ static = "icons/16/user_add.png" }
   23.15 +      slot.put(_"Invite initiator")
   23.16 +    end,
   23.17 +    module = "initiative",
   23.18 +    view = "add_initiator",
   23.19 +    params = { initiative_id = initiative.id }
   23.20 +  }
   23.21 +  if initiator_count > 1 then
   23.22 +    ui.link{
   23.23 +      content = function()
   23.24 +        ui.image{ static = "icons/16/user_delete.png" }
   23.25 +        slot.put(_"Remove initiator")
   23.26 +      end,
   23.27 +      module = "initiative",
   23.28 +      view = "remove_initiator",
   23.29 +      params = { initiative_id = initiative.id }
   23.30 +    }
   23.31 +  end
   23.32 +end
   23.33 +if initiator and initiator.accepted == false then
   23.34 +    ui.link{
   23.35 +      image  = { static = "icons/16/user_delete.png" },
   23.36 +      text   = _"Cancel refuse of invitation",
   23.37 +      module = "initiative",
   23.38 +      action = "remove_initiator",
   23.39 +      params = {
   23.40 +        initiative_id = initiative.id,
   23.41 +        member_id = app.session.member.id
   23.42 +      },
   23.43 +      routing = {
   23.44 +        ok = {
   23.45 +          mode = "redirect",
   23.46 +          module = "initiative",
   23.47 +          view = "show",
   23.48 +          id = initiative.id
   23.49 +        }
   23.50 +      }
   23.51 +    }
   23.52 +end
   23.53 +
   23.54 +execute.view{
   23.55 +  module = "member",
   23.56 +  view = "_list",
   23.57 +  params = {
   23.58 +    members_selector = initiators_members_selector,
   23.59 +    initiator = initiator
   23.60 +  }
   23.61 +}

    24.1 --- a/app/main/initiative/_list.lua	Tue Feb 02 00:31:06 2010 +0100
    24.2 +++ b/app/main/initiative/_list.lua	Sat Feb 20 22:10:31 2010 +0100
    24.3 @@ -1,71 +1,10 @@
    24.4 -local initiatives_selector = param.get("initiatives_selector", "table")
    24.5 -initiatives_selector:join("issue", nil, "issue.id = initiative.issue_id")
    24.6 -
    24.7 -local limit = param.get("limit", atom.number)
    24.8 -
    24.9 -local more_initiatives_count
   24.10 -if limit then
   24.11 -  local initiatives_count = initiatives_selector:count()
   24.12 -  if initiatives_count > limit then
   24.13 -    more_initiatives_count = initiatives_count - limit
   24.14 -  end
   24.15 -  initiatives_selector:limit(limit)
   24.16 -end
   24.17 -
   24.18 +ui.script{ script = "lf_initiative_expanded = {};" }
   24.19  
   24.20  local issue = param.get("issue", "table")
   24.21  
   24.22 -local order_options = {}
   24.23 -
   24.24 -if issue and issue.ranks_available then
   24.25 -  order_options[#order_options+1] = {
   24.26 -    name = "rank",
   24.27 -    label = _"Rank",
   24.28 -    order_by = "initiative.rank, initiative.admitted DESC, vote_ratio(initiative.positive_votes, initiative.negative_votes) DESC, initiative.id"
   24.29 -  }
   24.30 -end
   24.31 -
   24.32 -order_options[#order_options+1] = {
   24.33 -  name = "potential_support",
   24.34 -  label = _"Potential support",
   24.35 -  order_by = "initiative.supporter_count::float / issue.population::float DESC, initiative.id"
   24.36 -}
   24.37 -
   24.38 -order_options[#order_options+1] = {
   24.39 -  name = "support",
   24.40 -  label = _"Support",
   24.41 -  order_by = "initiative.satisfied_supporter_count::float / issue.population::float DESC, initiative.id"
   24.42 -}
   24.43 -
   24.44 -order_options[#order_options+1] = {
   24.45 -  name = "newest",
   24.46 -  label = _"Newest",
   24.47 -  order_by = "initiative.created DESC, initiative.id"
   24.48 -}
   24.49 -
   24.50 -order_options[#order_options+1] = {
   24.51 -  name = "oldest",
   24.52 -  label = _"Oldest",
   24.53 -  order_by = "initiative.created, initiative.id"
   24.54 -}
   24.55 -
   24.56 -local name = "initiative_list"
   24.57 -if issue then
   24.58 -  name = "issue_" .. tostring(issue.id) ..  "_initiative_list"
   24.59 -end
   24.60 -
   24.61 -ui_order = ui.order
   24.62 -
   24.63 -if param.get("no_sort", atom.boolean) then
   24.64 -  ui_order = function(args) args.content() end
   24.65 -  if issue.ranks_available then
   24.66 -    initiatives_selector:add_order_by("initiative.rank, initiative.admitted DESC, vote_ratio(initiative.positive_votes, initiative.negative_votes) DESC, initiative.id")
   24.67 -  else
   24.68 -    initiatives_selector:add_order_by("initiative.supporter_count::float / issue.population::float DESC, initiative.id")
   24.69 -  end
   24.70 -end
   24.71 -
   24.72 +local initiatives_selector = param.get("initiatives_selector", "table")
   24.73  initiatives_selector
   24.74 +  :join("issue", nil, "issue.id = initiative.issue_id")
   24.75    :left_join("initiator", "_initiator", { "_initiator.initiative_id = initiative.id AND _initiator.member_id = ?", app.session.member.id} )
   24.76    :left_join("supporter", "_supporter", { "_supporter.initiative_id = initiative.id AND _supporter.member_id = ?", app.session.member.id} )
   24.77  
   24.78 @@ -73,128 +12,213 @@
   24.79    :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")
   24.80    :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")
   24.81  
   24.82 +local initiatives_count = initiatives_selector:count()
   24.83  
   24.84 -ui_order{
   24.85 -  name = name,
   24.86 -  selector = initiatives_selector,
   24.87 -  options = order_options,
   24.88 -  content = function()
   24.89 -    ui.paginate{
   24.90 -      name = issue and "issue_" .. tostring(issue.id) .. "_page" or nil,
   24.91 -      selector = initiatives_selector,
   24.92 -      per_page = param.get("per_page", atom.number),
   24.93 +local limit = param.get("limit", atom.number)
   24.94 +local no_sort = param.get("no_sort", atom.boolean)
   24.95 +
   24.96 +local show_for_issue = param.get("show_for_issue", atom.boolean)
   24.97 +
   24.98 +local show_for_initiative
   24.99 +
  24.100 +local show_for_initiative_id = param.get("for_initiative_id", atom.number)
  24.101 +
  24.102 +if show_for_initiative_id then
  24.103 +  show_for_initiative = Initiative:by_id(show_for_initiative_id)
  24.104 +
  24.105 +elseif not show_for_initiative_id and show_for_issue and issue and issue.ranks_available then
  24.106 +  winning_initiative = Initiative:new_selector()
  24.107 +    :add_where{ "issue_id = ?", issue.id }
  24.108 +    :add_where("rank = 1")
  24.109 +    :single_object_mode()
  24.110 +    :exec()
  24.111 +  if winning_initiative then
  24.112 +    show_for_initiative = winning_initiative
  24.113 +    ui.container{
  24.114 +      attr = { class = "admitted_info" },
  24.115 +      content = _"This issue has been finished with the following winning initiative:"
  24.116 +    }
  24.117 +  else
  24.118 +    ui.container{
  24.119 +      attr = { class = "not_admitted_info" },
  24.120 +      content = _"This issue has been finished without any winning initiative."
  24.121 +    }
  24.122 +  end
  24.123 +end
  24.124 +
  24.125 +
  24.126 +if show_for_initiative then
  24.127 +  ui.script{ script = "lf_initiative_expanded['initiative_content_" .. tostring(show_for_initiative.id) .. "'] = true;" }
  24.128 +  initiatives_selector:add_where{ "initiative.id != ?", show_for_initiative.id }
  24.129 +
  24.130 +  execute.view{
  24.131 +    module = "initiative",
  24.132 +    view = "_list_element",
  24.133 +    params = {
  24.134 +      initiative = show_for_initiative,
  24.135 +      expanded = true,
  24.136 +      expandable = true
  24.137 +    }
  24.138 +  }
  24.139 +  if show_for_issue then
  24.140 +    slot.put("<br />")
  24.141 +    ui.container{
  24.142 +      attr = { style = "font-weight: bold;" },
  24.143        content = function()
  24.144 -        local initiatives = initiatives_selector:exec()
  24.145 -        local columns = {}
  24.146 -        columns[#columns+1] = {
  24.147 -          content = function(record)
  24.148 -            if record.issue.accepted and record.issue.closed and record.issue.ranks_available then 
  24.149 -              ui.field.rank{ attr = { class = "rank" }, value = record.rank }
  24.150 -            end
  24.151 -          end
  24.152 -        }
  24.153 -        columns[#columns+1] = {
  24.154 -          content = function(record)
  24.155 -            if record.issue.accepted and record.issue.closed then
  24.156 -              if record.issue.ranks_available then 
  24.157 -                if record.negative_votes and record.positive_votes then
  24.158 -                  local max_value = record.issue.voter_count
  24.159 -                  ui.bargraph{
  24.160 -                    max_value = max_value,
  24.161 -                    width = 100,
  24.162 -                    bars = {
  24.163 -                      { color = "#0a0", value = record.positive_votes },
  24.164 -                      { color = "#aaa", value = max_value - record.negative_votes - record.positive_votes },
  24.165 -                      { color = "#a00", value = record.negative_votes },
  24.166 -                    }
  24.167 -                  }
  24.168 -                end
  24.169 -              else
  24.170 -                slot.put(_"Counting of votes")
  24.171 -              end
  24.172 -            else
  24.173 -              local max_value = (record.issue.population or 0)
  24.174 -              ui.bargraph{
  24.175 -                max_value = max_value,
  24.176 -                width = 100,
  24.177 -                bars = {
  24.178 -                  { color = "#0a0", value = (record.satisfied_supporter_count or 0) },
  24.179 -                  { color = "#777", value = (record.supporter_count or 0) - (record.satisfied_supporter_count or 0) },
  24.180 -                  { color = "#ddd", value = max_value - (record.supporter_count or 0) },
  24.181 -                }
  24.182 -              }
  24.183 -            end
  24.184 -          end
  24.185 -        }
  24.186 -        columns[#columns+1] = {
  24.187 -          content = function(record)
  24.188 -            local link_class
  24.189 -            if record.revoked then
  24.190 -              link_class = "revoked"
  24.191 -            end
  24.192 -            ui.link{
  24.193 -              attr = { class = link_class },
  24.194 -              content = function()
  24.195 -                local name
  24.196 -                if record.name_highlighted then
  24.197 -                  name = encode.highlight(record.name_highlighted)
  24.198 -                else
  24.199 -                  name = encode.html(record.name)
  24.200 -                end
  24.201 -                slot.put(name)
  24.202 -              end,
  24.203 -              module = "initiative",
  24.204 -              view = "show",
  24.205 -              id = record.id
  24.206 -            }
  24.207 -            if record.issue.state == "new" then
  24.208 -              ui.image{
  24.209 -                static = "icons/16/new.png"
  24.210 -              }
  24.211 -            end
  24.212 -            if record.is_supporter then
  24.213 -              slot.put("&nbsp;")
  24.214 -              local label = _"You are supporting this initiative"
  24.215 -              ui.image{
  24.216 -                attr = { alt = label, title = label },
  24.217 -                static = "icons/16/thumb_up_green.png"
  24.218 -              }
  24.219 -            end
  24.220 -            if record.is_potential_supporter then
  24.221 -              slot.put("&nbsp;")
  24.222 -              local label = _"You are potential supporter of this initiative"
  24.223 -              ui.image{
  24.224 -                attr = { alt = label, title = label },
  24.225 -                static = "icons/16/thumb_up.png"
  24.226 -              }
  24.227 -            end
  24.228 -            if record.is_initiator then
  24.229 -              slot.put("&nbsp;")
  24.230 -              local label = _"You are iniator of this initiative"
  24.231 -              ui.image{
  24.232 -                attr = { alt = label, title = label },
  24.233 -                static = "icons/16/user_edit.png"
  24.234 -              }
  24.235 -            end
  24.236 -          end
  24.237 -        }
  24.238 -
  24.239 -        ui.list{
  24.240 -          attr = { class = "initiatives" },
  24.241 -          records = initiatives,
  24.242 -          columns = columns
  24.243 -        }
  24.244 +        slot.put(_"Alternative initiatives")
  24.245        end
  24.246      }
  24.247    end
  24.248 -}
  24.249 -
  24.250 -if more_initiatives_count then
  24.251 -  ui.link{
  24.252 -    attr = { style = "font-size: 75%; font-style: italic;" },
  24.253 -    content = _("#{count} more initiatives", { count = more_initiatives_count }),
  24.254 -    module = "issue",
  24.255 -    view = "show",
  24.256 -    id = issue.id,
  24.257 +elseif show_for_issue then
  24.258 +  ui.container{
  24.259 +    attr = { style = "font-weight: bold;" },
  24.260 +    content = function()
  24.261 +      slot.put(_"Alternative initiatives")
  24.262 +    end
  24.263    }
  24.264  end
  24.265 +
  24.266 +if not show_for_initiative or initiatives_count > 1 then
  24.267 +
  24.268 +
  24.269 +  local more_initiatives_count
  24.270 +  if limit then
  24.271 +    limit = limit - (show_for_initiative and 1 or 0)
  24.272 +    if initiatives_count > limit then
  24.273 +      more_initiatives_count = initiatives_count - limit
  24.274 +    end
  24.275 +    initiatives_selector:limit(limit)
  24.276 +  end
  24.277 +
  24.278 +  local expandable = param.get("expandable", atom.boolean)
  24.279 +
  24.280 +  local issue = param.get("issue", "table")
  24.281 +
  24.282 +  local name = "initiative_list"
  24.283 +  if issue then
  24.284 +    name = "issue_" .. tostring(issue.id) ..  "_initiative_list"
  24.285 +  end
  24.286 +
  24.287 +  ui.add_partial_param_names{ name }
  24.288 +
  24.289 +  local order_filter = {
  24.290 +    name = name,
  24.291 +    label = _"Order by"
  24.292 +  }
  24.293 +
  24.294 +  if issue and issue.ranks_available then
  24.295 +    order_filter[#order_filter+1] = {
  24.296 +      name = "rank",
  24.297 +      label = _"Rank",
  24.298 +      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
  24.299 +    }
  24.300 +  end
  24.301 +
  24.302 +  order_filter[#order_filter+1] = {
  24.303 +    name = "potential_support",
  24.304 +    label = _"Potential support",
  24.305 +    selector_modifier = function(selector) selector:add_order_by("initiative.supporter_count::float / issue.population::float DESC, initiative.id") end
  24.306 +  }
  24.307 +
  24.308 +  order_filter[#order_filter+1] = {
  24.309 +    name = "support",
  24.310 +    label = _"Support",
  24.311 +    selector_modifier = function(selector) selector:add_order_by("initiative.satisfied_supporter_count::float / issue.population::float DESC, initiative.id") end
  24.312 +  }
  24.313 +
  24.314 +  order_filter[#order_filter+1] = {
  24.315 +    name = "newest",
  24.316 +    label = _"Newest",
  24.317 +    selector_modifier = function(selector) selector:add_order_by("initiative.created DESC, initiative.id") end
  24.318 +  }
  24.319 +
  24.320 +  order_filter[#order_filter+1] = {
  24.321 +    name = "oldest",
  24.322 +    label = _"Oldest",
  24.323 +    selector_modifier = function(selector) selector:add_order_by("initiative.created, initiative.id") end
  24.324 +  }
  24.325 +
  24.326 +  ui_filters = ui.filters
  24.327 +
  24.328 +  if no_sort then
  24.329 +    ui_filters = function(args) args.content() end
  24.330 +    if issue.ranks_available then
  24.331 +      initiatives_selector:add_order_by("initiative.rank, initiative.admitted DESC, vote_ratio(initiative.positive_votes, initiative.negative_votes) DESC, initiative.id")
  24.332 +    else
  24.333 +      initiatives_selector:add_order_by("initiative.supporter_count::float / issue.population::float DESC, initiative.id")
  24.334 +    end
  24.335 +  end
  24.336 +
  24.337 +  ui_filters{
  24.338 +    label = _"Change order",
  24.339 +    order_filter,
  24.340 +    selector = initiatives_selector,
  24.341 +    content = function()
  24.342 +      ui.paginate{
  24.343 +        name = issue and "issue_" .. tostring(issue.id) .. "_page" or nil,
  24.344 +        selector = initiatives_selector,
  24.345 +        per_page = param.get("per_page", atom.number),
  24.346 +        content = function()
  24.347 +          local initiatives = initiatives_selector:exec()
  24.348 +          for i, initiative in ipairs(initiatives) do
  24.349 +            local expanded = config.user_tab_mode == "accordeon_all_expanded" and expandable or
  24.350 +              show_for_initiative and initiative.id == show_for_initiative.id
  24.351 +            if expanded then
  24.352 +              ui.script{ script = "lf_initiative_expanded['initiative_content_" .. tostring(initiative.id) .. "'] = true;" }
  24.353 +            end
  24.354 +            execute.view{
  24.355 +              module = "initiative",
  24.356 +              view = "_list_element",
  24.357 +              params = {
  24.358 +                initiative = initiative,
  24.359 +                expanded = expanded,
  24.360 +                expandable = expandable
  24.361 +              }
  24.362 +            }
  24.363 +          end
  24.364 +        end
  24.365 +      }
  24.366 +    end
  24.367 +  }
  24.368 +
  24.369 +  if more_initiatives_count then
  24.370 +    ui.link{
  24.371 +      attr = { style = "font-size: 75%; font-style: italic;" },
  24.372 +      content = _("and #{count} more initiatives", { count = more_initiatives_count }),
  24.373 +      module = "issue",
  24.374 +      view = "show",
  24.375 +      id = issue.id,
  24.376 +    }
  24.377 +  end
  24.378 +
  24.379 +end
  24.380 +
  24.381 +if show_for_issue then
  24.382 +  slot.put("<br />")
  24.383 +  
  24.384 +  if issue and initiatives_count == 1 then
  24.385 +    ui.container{
  24.386 +      content = function()
  24.387 +        if issue.fully_frozen or issue.closed then
  24.388 +          slot.put(_"There were no more alternative initiatives.")
  24.389 +        else
  24.390 +          slot.put(_"There are no more alternative initiatives currently.")
  24.391 +        end
  24.392 +      end
  24.393 +    }
  24.394 +  end
  24.395 +
  24.396 +  if not (issue.fully_frozen or issue.closed) then
  24.397 +    slot.put(" ")
  24.398 +    ui.link{
  24.399 +      content = function()
  24.400 +        ui.image{ static = "icons/16/script_add.png" }
  24.401 +        slot.put(" ")
  24.402 +        slot.put(_"Create alternative initiative")
  24.403 +      end,
  24.404 +      module = "initiative",
  24.405 +      view = "new",
  24.406 +      params = { issue_id = issue.id }
  24.407 +    }
  24.408 +  end
  24.409 +end

    25.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    25.2 +++ b/app/main/initiative/_list_element.lua	Sat Feb 20 22:10:31 2010 +0100
    25.3 @@ -0,0 +1,208 @@
    25.4 +local initiative = param.get("initiative", "table")
    25.5 +local expanded = param.get("expanded", atom.boolean)
    25.6 +local expandable = param.get("expandable", atom.boolean)
    25.7 +
    25.8 +local head_name = "initiative_head_" ..    tostring(initiative.id)
    25.9 +local link_name = "initiative_link_" ..    tostring(initiative.id)
   25.10 +local name      = "initiative_content_" .. tostring(initiative.id)
   25.11 +local icon_name = "initiative_icon_" ..    tostring(initiative.id)
   25.12 +
   25.13 +ui.container{
   25.14 +  attr = { class = "ui_tabs" .. (initiative.id == for_initiative_id and " active" or "") },
   25.15 +  content = function()
   25.16 +    local web20 = config.user_tab_mode == "accordeon"
   25.17 +      or config.user_tab_mode == "accordeon_first_expanded"
   25.18 +      or config.user_tab_mode == "accordeon_all_expanded"
   25.19 +    local onclick
   25.20 +    if web20 then
   25.21 +      if expandable then
   25.22 +      onclick = 
   25.23 +        'if (lf_initiative_expanded["' .. name .. '"]) {' ..
   25.24 +          'lf_initiative_expanded["' .. name .. '"]=false;' ..
   25.25 +          'document.getElementById("' .. name .. '_content").innerHTML=" ";' ..
   25.26 +          'document.getElementById("' .. name .. '").style.display="none";' ..
   25.27 +        '} else {' ..
   25.28 +          'lf_initiative_expanded["' .. name .. '"] = true;' ..
   25.29 +          'document.getElementById("' .. name .. '").style.display="block"; ' ..
   25.30 +          'var hourglass_el = document.getElementById("' .. icon_name .. '");' ..
   25.31 +          'var hourglass_src = hourglass_el.src;' ..
   25.32 +          'hourglass_el.src = "' .. encode.url{ static = "icons/16/connect.png" } .. '";' ..
   25.33 +          'partialMultiLoad(' ..
   25.34 +            '{ trace: "trace", system_error: "system_error", ' .. name .. '_content: "default" },' ..
   25.35 +            '{},' ..
   25.36 +            '"error",' ..
   25.37 +            '"' .. 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",' ..
   25.38 +            '{},' ..
   25.39 +            '{},' ..
   25.40 +            'function() {' ..
   25.41 +              'hourglass_el.src = hourglass_src;' ..
   25.42 +            '},' ..
   25.43 +            'function() {' ..
   25.44 +              'hourglass_el.src = hourglass_src;' ..
   25.45 +            '}' ..
   25.46 +          '); ' ..
   25.47 +        '}' ..
   25.48 +        'return(false);'
   25.49 +      else
   25.50 +        onclick = "document.location.href = document.getElementById('" .. link_name .. "').href;"
   25.51 +      end
   25.52 +    end
   25.53 +    local module = "initiative"
   25.54 +    local view = "show"
   25.55 +    local id = initiative.id
   25.56 +    local params = {}
   25.57 +    ui.container{
   25.58 +      attr = {
   25.59 +        name = name,
   25.60 +        class = "ui_tabs_accordeon_head",
   25.61 +        id = head_name,
   25.62 +        onclick = onclick,
   25.63 +      },
   25.64 +      content = function()
   25.65 +
   25.66 +        ui.container{
   25.67 +          attr = { style = "float: left; width: 4em;"},
   25.68 +          content = function()
   25.69 +            if initiative.issue.accepted and initiative.issue.closed and initiative.issue.ranks_available or initiative.admitted == false then 
   25.70 +              ui.field.rank{ image_attr = { id = icon_name }, attr = { class = "rank" }, value = initiative.rank }
   25.71 +            elseif web20 then
   25.72 +              ui.image{
   25.73 +                attr = {
   25.74 +                  width = 16,
   25.75 +                  height = 16,
   25.76 +                  id = icon_name,
   25.77 +                  style = "float: left;"
   25.78 +                },
   25.79 +                static = "icons/16/script.png"
   25.80 +              }
   25.81 +            else
   25.82 +              slot.put(" ")
   25.83 +            end
   25.84 +          end
   25.85 +        }
   25.86 +
   25.87 +        ui.container{
   25.88 +          attr = { style = "float: left; width: 110px;"},
   25.89 +          content = function()
   25.90 +            if initiative.issue.accepted and initiative.issue.closed then
   25.91 +              if initiative.issue.ranks_available then 
   25.92 +                if initiative.negative_votes and initiative.positive_votes then
   25.93 +                  local max_value = initiative.issue.voter_count
   25.94 +                  ui.bargraph{
   25.95 +                    max_value = max_value,
   25.96 +                    width = 100,
   25.97 +                    bars = {
   25.98 +                      { color = "#0a0", value = initiative.positive_votes },
   25.99 +                      { color = "#aaa", value = max_value - initiative.negative_votes - initiative.positive_votes },
  25.100 +                      { color = "#a00", value = initiative.negative_votes },
  25.101 +                    }
  25.102 +                  }
  25.103 +                else
  25.104 +                  slot.put(" ")
  25.105 +                end
  25.106 +              else
  25.107 +                slot.put(_"Counting of votes")
  25.108 +              end
  25.109 +            elseif initiative.issue.population then
  25.110 +              local max_value = initiative.issue.population
  25.111 +              ui.bargraph{
  25.112 +                max_value = max_value,
  25.113 +                width = 100,
  25.114 +                bars = {
  25.115 +                  { color = "#0a0", value = (initiative.satisfied_supporter_count or 0) },
  25.116 +                  { color = "#bbb", value = (initiative.supporter_count or 0) - (initiative.satisfied_supporter_count or 0) },
  25.117 +                  { color = "#eee", value = max_value - (initiative.supporter_count or 0) },
  25.118 +                }
  25.119 +              }
  25.120 +            else
  25.121 +              slot.put(" ")
  25.122 +            end
  25.123 +          end
  25.124 +        }
  25.125 +
  25.126 +        ui.container{
  25.127 +          attr = { style = "float: left;"},
  25.128 +          content = function()
  25.129 +            local link_class
  25.130 +            if initiative.revoked then
  25.131 +              link_class = "revoked"
  25.132 +            end
  25.133 +            ui.link{
  25.134 +              attr = { id = link_name, class = link_class },
  25.135 +              content = function()
  25.136 +                local name
  25.137 +                if initiative.name_highlighted then
  25.138 +                  name = encode.highlight(initiative.name_highlighted)
  25.139 +                else
  25.140 +                  name = encode.html(initiative.name)
  25.141 +                end
  25.142 +                slot.put(name)
  25.143 +              end,
  25.144 +              module  = module,
  25.145 +              view    = view,
  25.146 +              id      = id,
  25.147 +              params  = params,
  25.148 +            }
  25.149 +          end
  25.150 +        }
  25.151 +
  25.152 +        if initiative.issue.state == "new" then
  25.153 +          ui.image{
  25.154 +            static = "icons/16/new.png"
  25.155 +          }
  25.156 +        end
  25.157 +        if initiative.is_supporter then
  25.158 +          slot.put(" ")
  25.159 +          local label = _"You are supporting this initiative"
  25.160 +          ui.image{
  25.161 +            attr = { alt = label, title = label },
  25.162 +            static = "icons/16/thumb_up_green.png"
  25.163 +          }
  25.164 +        end
  25.165 +        if initiative.is_potential_supporter then
  25.166 +          slot.put(" ")
  25.167 +          local label = _"You are potential supporter of this initiative"
  25.168 +          ui.image{
  25.169 +            attr = { alt = label, title = label },
  25.170 +            static = "icons/16/thumb_up.png"
  25.171 +          }
  25.172 +        end
  25.173 +        if initiative.is_initiator then
  25.174 +          slot.put(" ")
  25.175 +          local label = _"You are iniator of this initiative"
  25.176 +          ui.image{
  25.177 +            attr = { alt = label, title = label },
  25.178 +            static = "icons/16/user_edit.png"
  25.179 +          }
  25.180 +        end
  25.181 +
  25.182 +        slot.put("<br style='clear: left' />")
  25.183 +      end
  25.184 +    }
  25.185 +  end
  25.186 +}
  25.187 +
  25.188 +if ui.is_partial_loading_enabled() then
  25.189 +  ui.container{
  25.190 +    attr = {
  25.191 +      id = name,
  25.192 +      class = "ui_tabs_accordeon_content",
  25.193 +      style = not expanded and "display: none;" or nil
  25.194 +    },
  25.195 +    content = function()
  25.196 +      ui.container{
  25.197 +        attr = { id = name .. "_content", style = "clear: left;" },
  25.198 +        content = function()
  25.199 +          execute.view{
  25.200 +            module = "initiative",
  25.201 +            view = "show_partial",
  25.202 +            params = {
  25.203 +              initiative = initiative,
  25.204 +              expanded = expanded
  25.205 +            }
  25.206 +          }
  25.207 +        end
  25.208 +      }
  25.209 +    end
  25.210 +  }
  25.211 +end
  25.212 \ No newline at end of file

    26.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.2 +++ b/app/main/initiative/_show.lua	Sat Feb 20 22:10:31 2010 +0100
    26.3 @@ -0,0 +1,236 @@
    26.4 +local initiative = param.get("initiative", "table")
    26.5 +local initiator = param.get("initiator", "table")
    26.6 +
    26.7 +util.help("initiative.show")
    26.8 +
    26.9 +if initiative.issue.ranks_available and initiative.admitted then
   26.10 +  local class = initiative.rank == 1 and "admitted_info" or "not_admitted_info"
   26.11 +  ui.container{
   26.12 +    attr = { class = class },
   26.13 +    content = function()
   26.14 +      local max_value = initiative.issue.voter_count
   26.15 +      slot.put(" ")
   26.16 +      local positive_votes = initiative.positive_votes
   26.17 +      local negative_votes = initiative.negative_votes
   26.18 +      slot.put(_"Yes" .. ": <b>" .. tostring(positive_votes) .. "</b>")
   26.19 +      slot.put(" &middot; ")
   26.20 +      slot.put(_"Abstention" .. ": <b>" .. tostring(max_value - initiative.negative_votes - initiative.positive_votes)  .. "</b>")
   26.21 +      slot.put(" &middot; ")
   26.22 +      slot.put(_"No" .. ": <b>" .. tostring(initiative.negative_votes) .. "</b>")
   26.23 +      slot.put(" &middot; ")
   26.24 +      slot.put("<b>")
   26.25 +      if initiative.rank == 1 then
   26.26 +        slot.put(_"Approved")
   26.27 +      elseif initiative.rank then
   26.28 +        slot.put(_("Not approved (rank #{rank})", { rank = initiative.rank }))
   26.29 +      end
   26.30 +      slot.put("</b>")
   26.31 +    end
   26.32 +  }
   26.33 +end
   26.34 +
   26.35 +if initiative.admitted == false then
   26.36 +  local policy = initiative.issue.policy
   26.37 +  ui.container{
   26.38 +    attr = { class = "not_admitted_info" },
   26.39 +    content = _("This initiative has not been admitted! It failed the quorum of #{quorum}.", { quorum = format.percentage(policy.initiative_quorum_num / policy.initiative_quorum_den) })
   26.40 +  }
   26.41 +end
   26.42 +
   26.43 +local web20 = config.user_tab_mode == "accordeon"
   26.44 +  or config.user_tab_mode == "accordeon_first_expanded"
   26.45 +  or config.user_tab_mode == "accordeon_all_expanded"
   26.46 +
   26.47 +if not web20 and initiative.issue.state == "cancelled" then
   26.48 +  local policy = initiative.issue.policy
   26.49 +  ui.container{
   26.50 +    attr = { class = "not_admitted_info" },
   26.51 +    content = _("This issue has been cancelled. It failed the quorum of #{quorum}.", { quorum = format.percentage(policy.issue_quorum_num / policy.issue_quorum_den) })
   26.52 +  }
   26.53 +end
   26.54 +
   26.55 +if initiative.revoked then
   26.56 +  ui.container{
   26.57 +    attr = { class = "revoked_info" },
   26.58 +    content = function()
   26.59 +      slot.put(_("This initiative has been revoked at #{revoked}", { revoked = format.timestamp(initiative.revoked) }))
   26.60 +      local suggested_initiative = initiative.suggested_initiative
   26.61 +      if suggested_initiative then
   26.62 +        slot.put("<br /><br />")
   26.63 +        slot.put(_("The initiators suggest to support the following initiative:"))
   26.64 +        slot.put(" ")
   26.65 +        ui.link{
   26.66 +          content = _("Issue ##{id}", { id = suggested_initiative.issue.id } ) .. ": " .. encode.html(suggested_initiative.name),
   26.67 +          module = "initiative",
   26.68 +          view = "show",
   26.69 +          id = suggested_initiative.id
   26.70 +        }
   26.71 +      end
   26.72 +    end
   26.73 +  }
   26.74 +end
   26.75 +
   26.76 +if initiator and initiator.accepted == nil then
   26.77 +  ui.container{
   26.78 +    attr = { class = "initiator_invite_info" },
   26.79 +    content = function()
   26.80 +      slot.put(_"You are invited to become initiator of this initiative.")
   26.81 +      slot.put(" ")
   26.82 +      ui.link{
   26.83 +        image  = { static = "icons/16/tick.png" },
   26.84 +        text   = _"Accept invitation",
   26.85 +        module = "initiative",
   26.86 +        action = "accept_invitation",
   26.87 +        id     = initiative.id,
   26.88 +        routing = {
   26.89 +          default = {
   26.90 +            mode = "redirect",
   26.91 +            module = request.get_module(),
   26.92 +            view = request.get_view(),
   26.93 +            id = param.get_id_cgi(),
   26.94 +            params = param.get_all_cgi()
   26.95 +          }
   26.96 +        }
   26.97 +      }
   26.98 +      slot.put(" ")
   26.99 +      ui.link{
  26.100 +        image  = { static = "icons/16/cross.png" },
  26.101 +        text   = _"Refuse invitation",
  26.102 +        module = "initiative",
  26.103 +        action = "reject_initiator_invitation",
  26.104 +        params = {
  26.105 +          initiative_id = initiative.id,
  26.106 +          member_id = app.session.member.id
  26.107 +        },
  26.108 +        routing = {
  26.109 +          default = {
  26.110 +            mode = "redirect",
  26.111 +            module = request.get_module(),
  26.112 +            view = request.get_view(),
  26.113 +            id = param.get_id_cgi(),
  26.114 +            params = param.get_all_cgi()
  26.115 +          }
  26.116 +        }
  26.117 +      }
  26.118 +    end
  26.119 +  }
  26.120 +  slot.put("<br />")
  26.121 +end
  26.122 +
  26.123 +
  26.124 +local supporter = app.session.member:get_reference_selector("supporters")
  26.125 +  :add_where{ "initiative_id = ?", initiative.id }
  26.126 +  :optional_object_mode()
  26.127 +  :exec()
  26.128 +
  26.129 +if supporter and not initiative.issue.closed then
  26.130 +  local old_draft_id = supporter.draft_id
  26.131 +  local new_draft_id = initiative.current_draft.id
  26.132 +  if old_draft_id ~= new_draft_id then
  26.133 +    ui.container{
  26.134 +      attr = { class = "draft_updated_info" },
  26.135 +      content = function()
  26.136 +        slot.put(_"The draft of this initiative has been updated!")
  26.137 +        slot.put(" ")
  26.138 +        ui.link{
  26.139 +          content = _"Show diff",
  26.140 +          module = "draft",
  26.141 +          view = "diff",
  26.142 +          params = {
  26.143 +            old_draft_id = old_draft_id,
  26.144 +            new_draft_id = new_draft_id
  26.145 +          }
  26.146 +        }
  26.147 +        slot.put(" ")
  26.148 +        ui.link{
  26.149 +          text   = _"Refresh support to current draft",
  26.150 +          module = "initiative",
  26.151 +          action = "add_support",
  26.152 +          id     = initiative.id,
  26.153 +          routing = {
  26.154 +            default = {
  26.155 +              mode = "redirect",
  26.156 +              module = "initiative",
  26.157 +              view = "show",
  26.158 +              id = initiative.id
  26.159 +            }
  26.160 +          }
  26.161 +        }
  26.162 +      end
  26.163 +    }
  26.164 +  end
  26.165 +end
  26.166 +
  26.167 +
  26.168 +
  26.169 +ui.container{
  26.170 +  attr = {
  26.171 +    id = "initiative_" .. tostring(initiative.id) .. "_support"
  26.172 +  },
  26.173 +  content = function()
  26.174 +    execute.view{
  26.175 +      module = "initiative",
  26.176 +      view = "show_support",
  26.177 +      params = {
  26.178 +        initiative = initiative
  26.179 +      }
  26.180 +    }
  26.181 +  end
  26.182 +}
  26.183 +
  26.184 +if (initiative.discussion_url and #initiative.discussion_url > 0)
  26.185 +  or (initiator and initiator.accepted and not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked) then
  26.186 +  ui.container{
  26.187 +    attr = { class = "vertical" },
  26.188 +    content = function()
  26.189 +      ui.container{
  26.190 +        attr = { class = "ui_field_label" },
  26.191 +        content = _"Discussion with initiators"
  26.192 +      }
  26.193 +      ui.tag{
  26.194 +        tag = "span",
  26.195 +        content = function()
  26.196 +          if initiative.discussion_url:find("^https?://") then
  26.197 +            if initiative.discussion_url and #initiative.discussion_url > 0 then
  26.198 +              ui.link{
  26.199 +                attr = {
  26.200 +                  class = "actions",
  26.201 +                  target = "_blank",
  26.202 +                  title = initiative.discussion_url
  26.203 +                },
  26.204 +                content = function()
  26.205 +                  slot.put(encode.html(initiative.discussion_url))
  26.206 +                end,
  26.207 +                external = initiative.discussion_url
  26.208 +              }
  26.209 +            end
  26.210 +          else
  26.211 +            slot.put(encode.html(initiative.discussion_url))
  26.212 +          end
  26.213 +          slot.put(" ")
  26.214 +          if initiator and initiator.accepted and not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked then
  26.215 +            ui.link{
  26.216 +              attr   = { class = "actions" },
  26.217 +              text   = _"(change URL)",
  26.218 +              module = "initiative",
  26.219 +              view   = "edit",
  26.220 +              id     = initiative.id
  26.221 +            }
  26.222 +          end
  26.223 +        end
  26.224 +      }
  26.225 +    end
  26.226 +  }
  26.227 +end
  26.228 +
  26.229 +
  26.230 +
  26.231 +execute.view{
  26.232 +  module = "initiative",
  26.233 +  view = "show_tab",
  26.234 +  params = {
  26.235 +    initiative = initiative,
  26.236 +    initiator = initiator
  26.237 +  }
  26.238 +}
  26.239 +

    27.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    27.2 +++ b/app/main/initiative/_show_voting.lua	Sat Feb 20 22:10:31 2010 +0100
    27.3 @@ -0,0 +1,112 @@
    27.4 +local initiative = param.get("initiative", "table")
    27.5 +
    27.6 +
    27.7 +local battled_initiatives = Initiative:new_selector()
    27.8 +  :add_field("winning_battle.count", "winning_count")
    27.9 +  :add_field("losing_battle.count", "losing_count")
   27.10 +  :join("battle", "winning_battle", { "winning_battle.winning_initiative_id = ? AND winning_battle.losing_initiative_id = initiative.id", initiative.id })
   27.11 +  :join("battle", "losing_battle", { "losing_battle.losing_initiative_id = ? AND losing_battle.winning_initiative_id = initiative.id", initiative.id })
   27.12 +  :add_order_by("rank")
   27.13 +  :exec()
   27.14 +
   27.15 +local number_of_initiatives = Initiative:new_selector()
   27.16 +  :add_where{ "issue_id = ?", initiative.issue_id }
   27.17 +  :add_where("admitted")
   27.18 +  :count()
   27.19 +
   27.20 +if initiative.revoked then
   27.21 +  slot.put(_"Not voted (revoked from initiator)")
   27.22 +elseif initiative.admitted == false then
   27.23 +  slot.put(_"Not voted (not admitted)")
   27.24 +else
   27.25 +  if number_of_initiatives > 1 then
   27.26 +    ui.container{
   27.27 +      attr = { class = "heading first" },
   27.28 +      content = _"This initiative compared to alternative initiatives"
   27.29 +    }
   27.30 +
   27.31 +    ui.list{
   27.32 +      records = battled_initiatives,
   27.33 +      columns = {
   27.34 +        {
   27.35 +          content = function()
   27.36 +            slot.put(_"This initiative")
   27.37 +          end
   27.38 +        },
   27.39 +        {
   27.40 +          content = function(record)
   27.41 +            local population = initiative.issue.voter_count
   27.42 +            local value = record.winning_count
   27.43 +            ui.bargraph{
   27.44 +              class = "bargraph bargraph50",
   27.45 +              max_value = population,
   27.46 +              width = 50,
   27.47 +              bars = {
   27.48 +                { color = "#aaa", value = population - value },
   27.49 +                { color = "#444", value = value },
   27.50 +              }
   27.51 +            }
   27.52 +          end
   27.53 +        },
   27.54 +        {
   27.55 +          content = function(record)
   27.56 +            slot.put(record.winning_count)
   27.57 +          end
   27.58 +        },
   27.59 +        {
   27.60 +          content = function(record)
   27.61 +            if record.winning_count == record.losing_count then
   27.62 +              ui.image{ static = "icons/16/bullet_blue.png" }
   27.63 +            elseif record.winning_count > record.losing_count then
   27.64 +              ui.image{ static = "icons/16/resultset_previous.png" }
   27.65 +            else
   27.66 +              ui.image{ static = "icons/16/resultset_next.png" }
   27.67 +            end
   27.68 +          end
   27.69 +        },
   27.70 +        {
   27.71 +          field_attr = { style = "text-align: right;" },
   27.72 +          content = function(record)
   27.73 +            slot.put(record.losing_count)
   27.74 +          end
   27.75 +        },
   27.76 +        {
   27.77 +          content = function(record)
   27.78 +            local population = initiative.issue.voter_count
   27.79 +            local value = record.losing_count
   27.80 +            ui.bargraph{
   27.81 +              class = "bargraph bargraph50",
   27.82 +              max_value = population,
   27.83 +              width = 50,
   27.84 +              bars = {
   27.85 +                { color = "#444", value = value },
   27.86 +                { color = "#aaa", value = population - value },
   27.87 +              }
   27.88 +            }
   27.89 +          end
   27.90 +        },
   27.91 +        {
   27.92 +          name = "name"
   27.93 +        }
   27.94 +      }
   27.95 +    }
   27.96 +  end
   27.97 +
   27.98 +  ui.container{
   27.99 +    attr = { class = "heading" },
  27.100 +    content = _"Member voting"
  27.101 +  }
  27.102 +
  27.103 +  execute.view{
  27.104 +    module = "member",
  27.105 +    view = "_list",
  27.106 +    params = {
  27.107 +      initiative = initiative,
  27.108 +      members_selector =  initiative.issue:get_reference_selector("direct_voters")
  27.109 +        :left_join("vote", nil, { "vote.initiative_id = ? AND vote.member_id = member.id", initiative.id })
  27.110 +        :add_field("direct_voter.weight as voter_weight")
  27.111 +        :add_field("coalesce(vote.grade, 0) as grade")
  27.112 +    }
  27.113 +  }
  27.114 +
  27.115 +end

    28.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    28.2 +++ b/app/main/initiative/_suggestions.lua	Sat Feb 20 22:10:31 2010 +0100
    28.3 @@ -0,0 +1,26 @@
    28.4 +local initiative = param.get("initiative", "table")
    28.5 +
    28.6 +if not initiative.issue.fully_frozen and not initiative.issue.closed and not initiative.revoked then
    28.7 +  ui.link{
    28.8 +    content = function()
    28.9 +      ui.image{ static = "icons/16/comment_add.png" }
   28.10 +      slot.put(_"Add new suggestion")
   28.11 +    end,
   28.12 +    module = "suggestion",
   28.13 +    view = "new",
   28.14 +    params = {
   28.15 +      initiative_id = initiative.id
   28.16 +    }
   28.17 +  }
   28.18 +end
   28.19 +
   28.20 +execute.view{
   28.21 +  module = "suggestion",
   28.22 +  view = "_list",
   28.23 +  params = {
   28.24 +    initiative = initiative,
   28.25 +    suggestions_selector = initiative:get_reference_selector("suggestions"),
   28.26 +    tab_id = param.get("tab_id")
   28.27 +  }
   28.28 +}
   28.29 +

    29.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    29.2 +++ b/app/main/initiative/list_rss.lua	Sat Feb 20 22:10:31 2010 +0100
    29.3 @@ -0,0 +1,29 @@
    29.4 +slot.set_layout("atom")
    29.5 +
    29.6 +request.force_absolute_baseurl()
    29.7 +
    29.8 +local initiatives = Initiative:new_selector()
    29.9 +  :add_order_by("id DESC")
   29.10 +  :limit(25)
   29.11 +  :exec()
   29.12 +
   29.13 +for i, initiative in ipairs(initiatives) do
   29.14 +  ui.tag{
   29.15 +    tag = "entry",
   29.16 +    content = function()
   29.17 +      ui.tag{ tag = "category", attr = { term = initiative.issue.area.name } }
   29.18 +      ui.tag{ tag = "author", content = initiative.current_draft.author.name }
   29.19 +      ui.tag{ tag = "title", content = initiative.name }
   29.20 +      ui.tag{ tag = "link", attr = { 
   29.21 +        href = encode.url{
   29.22 +          module = "initiative",
   29.23 +          view = "show",
   29.24 +          id = initiative.id
   29.25 +        }
   29.26 +      } }
   29.27 +      ui.tag{ tag = "id",  content = "initiative_" .. tostring(initiative_id) }
   29.28 +      ui.tag{ tag = "updated",  content = tostring(initiative.created) }
   29.29 +      ui.tag{ tag = "content",  content = initiative.current_draft.draft }
   29.30 +    end
   29.31 +  }
   29.32 +end
   29.33 \ No newline at end of file

    30.1 --- a/app/main/initiative/new.lua	Tue Feb 02 00:31:06 2010 +0100
    30.2 +++ b/app/main/initiative/new.lua	Sat Feb 20 22:10:31 2010 +0100
    30.3 @@ -12,7 +12,7 @@
    30.4  end
    30.5  
    30.6  if issue_id then
    30.7 -  slot.put_into("title", _"Add new initiative to issue")
    30.8 +  slot.put_into("title", _"Add alternative initiative to issue")
    30.9  else
   30.10    slot.put_into("title", _"Create new issue")
   30.11  end

    31.1 --- a/app/main/initiative/show.lua	Tue Feb 02 00:31:06 2010 +0100
    31.2 +++ b/app/main/initiative/show.lua	Sat Feb 20 22:10:31 2010 +0100
    31.3 @@ -1,535 +1,36 @@
    31.4 -local initiative = Initiative:new_selector():add_where{ "id = ?", param.get_id()}:single_object_mode():exec()
    31.5 -
    31.6 -slot.select("actions", function()
    31.7 -  ui.link{
    31.8 -    content = function()
    31.9 -      ui.image{ static = "icons/16/script.png" }
   31.10 -      slot.put(_"Show all initiatives")
   31.11 -    end,
   31.12 -    module = "issue",
   31.13 -    view = "show",
   31.14 -    id = initiative.issue.id
   31.15 -  }
   31.16 -end)
   31.17 -
   31.18 -execute.view{
   31.19 -  module = "issue",
   31.20 -  view = "_show_head",
   31.21 -  params = { issue = initiative.issue }
   31.22 -}
   31.23 -
   31.24 -if initiative.revoked then
   31.25 -  ui.container{
   31.26 -    attr = { class = "revoked_info" },
   31.27 -    content = function()
   31.28 -      slot.put(_("This initiative has been revoked at #{revoked}", { revoked = format.timestamp(initiative.revoked) }))
   31.29 -      local suggested_initiative = initiative.suggested_initiative
   31.30 -      if suggested_initiative then
   31.31 -        slot.put("<br /><br />")
   31.32 -        slot.put(_("The initiators suggest to support the following initiative:"))
   31.33 -        slot.put("<br />")
   31.34 -        ui.link{
   31.35 -          content = _("Issue ##{id}", { id = suggested_initiative.issue.id } ) .. ": " .. encode.html(suggested_initiative.name),
   31.36 -          module = "initiative",
   31.37 -          view = "show",
   31.38 -          id = suggested_initiative.id
   31.39 -        }
   31.40 -      end
   31.41 -    end
   31.42 -  }
   31.43 -end
   31.44 -
   31.45 -local initiator = Initiator:by_pk(initiative.id, app.session.member.id)
   31.46 -
   31.47 ---slot.put_into("html_head", '<link rel="alternate" type="application/rss+xml" title="RSS" href="../show/' .. tostring(initiative.id) .. '.rss" />')
   31.48 -
   31.49 -
   31.50 -slot.select("actions", function()
   31.51 -  if not initiative.issue.fully_frozen and not initiative.issue.closed then
   31.52 -    ui.link{
   31.53 -      attr = { class = "action" },
   31.54 -      content = function()
   31.55 -        ui.image{ static = "icons/16/script_add.png" }
   31.56 -        slot.put(_"Create alternative initiative")
   31.57 -      end,
   31.58 -      module = "initiative",
   31.59 -      view = "new",
   31.60 -      params = { issue_id = initiative.issue.id }
   31.61 -    }
   31.62 -  end
   31.63 -end)
   31.64 -
   31.65 -slot.put_into("sub_title", encode.html(_"Initiative: '#{name}'":gsub("#{name}", initiative.shortened_name) ))
   31.66 -
   31.67 -slot.select("support", function()
   31.68 -  ui.container{
   31.69 -    attr = { class = "actions" },
   31.70 -    content = function()
   31.71 -      execute.view{
   31.72 -        module = "supporter",
   31.73 -        view = "_show_box",
   31.74 -        params = { initiative = initiative }
   31.75 -      }
   31.76 -      if initiator and initiator.accepted and not initiative.issue.fully_frozen and not initiative.issue.closed and not initiative.revoked then
   31.77 -        ui.link{
   31.78 -          attr = { class = "action", style = "float: left;" },
   31.79 -          content = function()
   31.80 -            ui.image{ static = "icons/16/script_delete.png" }
   31.81 -            slot.put(_"Revoke initiative")
   31.82 -          end,
   31.83 -          module = "initiative",
   31.84 -          view = "revoke",
   31.85 -          id = initiative.id
   31.86 -        }
   31.87 -      end
   31.88 -    end
   31.89 -  }
   31.90 -end)
   31.91 -
   31.92 -util.help("initiative.show")
   31.93 +local initiative = param.get("initiative", "table")
   31.94  
   31.95 -if initiator and initiator.accepted == nil then
   31.96 -  ui.container{
   31.97 -    attr = { class = "initiator_invite_info" },
   31.98 -    content = function()
   31.99 -      slot.put(_"You are invited to become initiator of this initiative.")
  31.100 -      slot.put(" ")
  31.101 -      ui.link{
  31.102 -        content = function()
  31.103 -          ui.image{ static = "icons/16/tick.png" }
  31.104 -          slot.put(_"Accept invitation")
  31.105 -        end,
  31.106 -        module = "initiative",
  31.107 -        action = "accept_invitation",
  31.108 -        id = initiative.id,
  31.109 -        routing = {
  31.110 -          default = {
  31.111 -            mode = "redirect",
  31.112 -            module = request.get_module(),
  31.113 -            view = request.get_view(),
  31.114 -            id = param.get_id_cgi(),
  31.115 -            params = param.get_all_cgi()
  31.116 -          }
  31.117 -        }
  31.118 -      }
  31.119 -      slot.put(" ")
  31.120 -      ui.link{
  31.121 -        content = function()
  31.122 -          ui.image{ static = "icons/16/cross.png" }
  31.123 -          slot.put(_"Refuse invitation")
  31.124 -        end,
  31.125 -        module = "initiative",
  31.126 -        action = "reject_initiator_invitation",
  31.127 -        params = {
  31.128 -          initiative_id = initiative.id,
  31.129 -          member_id = app.session.member.id
  31.130 -        },
  31.131 -        routing = {
  31.132 -          default = {
  31.133 -            mode = "redirect",
  31.134 -            module = request.get_module(),
  31.135 -            view = request.get_view(),
  31.136 -            id = param.get_id_cgi(),
  31.137 -            params = param.get_all_cgi()
  31.138 -          }
  31.139 -        }
  31.140 -      }
  31.141 -    end
  31.142 -  }
  31.143 -  slot.put("<br />")
  31.144 -end
  31.145 -
  31.146 -if (initiative.discussion_url and #initiative.discussion_url > 0)
  31.147 -  or (initiator and initiator.accepted and not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked) then
  31.148 -  ui.container{
  31.149 -    attr = { class = "vertical" },
  31.150 -    content = function()
  31.151 -      ui.container{
  31.152 -        attr = { class = "ui_field_label" },
  31.153 -        content = _"Discussion with initiators"
  31.154 -      }
  31.155 -      ui.tag{
  31.156 -        tag = "span",
  31.157 -        content = function()
  31.158 -          if initiative.discussion_url:find("^https?://") then
  31.159 -            if initiative.discussion_url and #initiative.discussion_url > 0 then
  31.160 -              ui.link{
  31.161 -                attr = {
  31.162 -                  class = "actions",
  31.163 -                  target = "_blank",
  31.164 -                  title = initiative.discussion_url
  31.165 -                },
  31.166 -                content = function()
  31.167 -                  slot.put(encode.html(initiative.discussion_url))
  31.168 -                end,
  31.169 -                external = initiative.discussion_url
  31.170 -              }
  31.171 -            end
  31.172 -          else
  31.173 -            slot.put(encode.html(initiative.discussion_url))
  31.174 -          end
  31.175 -          slot.put(" ")
  31.176 -          if initiator and initiator.accepted and not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked then
  31.177 -            ui.link{
  31.178 -              attr = { class = "actions" },
  31.179 -              content = _"(change URL)",
  31.180 -              module = "initiative",
  31.181 -              view = "edit",
  31.182 -              id = initiative.id
  31.183 -            }
  31.184 -          end
  31.185 -        end
  31.186 -      }
  31.187 -    end
  31.188 -  }
  31.189 +if not initiative then
  31.190 +  initiative = Initiative:new_selector():add_where{ "id = ?", param.get_id()}:single_object_mode():exec()
  31.191  end
  31.192  
  31.193 -
  31.194 -ui.container{
  31.195 -  attr = {  id = "add_suggestion_form", class = "hidden_inline_form" },
  31.196 -  content = function()
  31.197 -
  31.198 -    ui.link{
  31.199 -      content = _"Close",
  31.200 -      attr = {
  31.201 -        onclick = "document.getElementById('add_suggestion_form').style.display='none';return(false)",
  31.202 -        style = "float: right;"
  31.203 -      }
  31.204 -    }
  31.205 -
  31.206 -    ui.field.text{ attr = { class = "head" }, value = _"Add new suggestion" }
  31.207 -
  31.208 -
  31.209 -    ui.form{
  31.210 -      module = "suggestion",
  31.211 -      action = "add",
  31.212 -      params = { initiative_id = initiative.id },
  31.213 -      routing = {
  31.214 -        default = {
  31.215 -          mode = "redirect",
  31.216 -          module = "initiative",
  31.217 -          view = "show",
  31.218 -          id = initiative.id,
  31.219 -          params = { tab = "suggestion" }
  31.220 -        }
  31.221 -      },
  31.222 -      attr = { class = "vertical" },
  31.223 -      content = function()
  31.224 -        local supported = Supporter:by_pk(initiative.id, app.session.member.id) and true or false
  31.225 -        if not supported then
  31.226 -          ui.field.text{
  31.227 -            attr = { class = "warning" },
  31.228 -            value = _"You are currently not supporting this initiative. By adding suggestions to this initiative you will automatically become a potential supporter."
  31.229 -          }
  31.230 -        end
  31.231 -        ui.field.text{ label = _"Title (80 chars max)",        name = "name" }
  31.232 -        ui.field.text{ label = _"Description", name = "description", multiline = true }
  31.233 -        ui.field.select{ 
  31.234 -          label = _"Degree", 
  31.235 -          name = "degree",
  31.236 -          foreign_records = { 
  31.237 -            { id =  1, name = _"should"},
  31.238 -            { id =  2, name = _"must"},
  31.239 -          },
  31.240 -          foreign_id = "id",
  31.241 -          foreign_name = "name"
  31.242 -        }
  31.243 -        ui.submit{ text = _"Commit suggestion" }
  31.244 -      end
  31.245 -    }
  31.246 -  end
  31.247 -}
  31.248 -
  31.249 -local supporter = app.session.member:get_reference_selector("supporters")
  31.250 -  :add_where{ "initiative_id = ?", initiative.id }
  31.251 -  :optional_object_mode()
  31.252 -  :exec()
  31.253 -
  31.254 -if supporter then
  31.255 -  local old_draft_id = supporter.draft_id
  31.256 -  local new_draft_id = initiative.current_draft.id
  31.257 -  if old_draft_id ~= new_draft_id then
  31.258 -    ui.container{
  31.259 -      attr = { class = "draft_updated_info" },
  31.260 -      content = function()
  31.261 -        slot.put(_"The draft of this initiative has been updated!")
  31.262 -        slot.put(" ")
  31.263 -        ui.link{
  31.264 -          content = _"Show diff",
  31.265 -          module = "draft",
  31.266 -          view = "diff",
  31.267 -          params = {
  31.268 -            old_draft_id = old_draft_id,
  31.269 -            new_draft_id = new_draft_id
  31.270 -          }
  31.271 -        }
  31.272 -        slot.put(" ")
  31.273 -        ui.link{
  31.274 -          content = _"Refresh support to current draft",
  31.275 -          module = "initiative",
  31.276 -          action = "add_support",
  31.277 -          id = initiative.id,
  31.278 -          routing = {
  31.279 -            default = {
  31.280 -              mode = "redirect",
  31.281 -              module = "initiative",
  31.282 -              view = "show",
  31.283 -              id = initiative.id
  31.284 -            }
  31.285 -          }
  31.286 -        }
  31.287 -      end
  31.288 -    }
  31.289 -  end
  31.290 -end
  31.291 -
  31.292 -
  31.293 -local current_draft_name = _"Current draft"
  31.294 -if initiative.issue.half_frozen then
  31.295 -  current_draft_name = _"Voting proposal"
  31.296 -end
  31.297 -
  31.298 -if initiative.issue.state == "finished" then
  31.299 -  current_draft_name = _"Voted proposal"
  31.300 -end
  31.301 -
  31.302 -local tabs = {
  31.303 -  {
  31.304 -    name = "current_draft",
  31.305 -    label = current_draft_name,
  31.306 -    content = function()
  31.307 -      if initiator and initiator.accepted and not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked then
  31.308 -        ui.link{
  31.309 -          content = function()
  31.310 -            ui.image{ static = "icons/16/script_add.png" }
  31.311 -            slot.put(_"Edit draft")
  31.312 -          end,
  31.313 -          module = "draft",
  31.314 -          view = "new",
  31.315 -          params = { initiative_id = initiative.id }
  31.316 -        }
  31.317 -      end
  31.318 -      execute.view{ module = "draft", view = "_show", params = { draft = initiative.current_draft } }
  31.319 -    end
  31.320 -  }
  31.321 -}
  31.322 -
  31.323 -if initiative.issue.ranks_available then
  31.324 -  tabs[#tabs+1] = {
  31.325 -    name = "voter",
  31.326 -    label = _"Voter",
  31.327 -    content = function()
  31.328 -      execute.view{
  31.329 -        module = "member",
  31.330 -        view = "_list",
  31.331 -        params = {
  31.332 -          initiative = initiative,
  31.333 -          members_selector =  initiative.issue:get_reference_selector("direct_voters")
  31.334 -            :left_join("vote", nil, { "vote.initiative_id = ? AND vote.member_id = member.id", initiative.id })
  31.335 -            :add_field("direct_voter.weight as voter_weight")
  31.336 -            :add_field("coalesce(vote.grade, 0) as grade")
  31.337 -        }
  31.338 -      }
  31.339 -    end
  31.340 -  }
  31.341 -end
  31.342 -
  31.343 -local suggestion_count = initiative:get_reference_selector("suggestions"):count()
  31.344 -
  31.345 -tabs[#tabs+1] = {
  31.346 -  name = "suggestion",
  31.347 -  label = _"Suggestions" .. " (" .. tostring(suggestion_count) .. ")",
  31.348 -  content = function()
  31.349 -    execute.view{
  31.350 -      module = "suggestion",
  31.351 -      view = "_list",
  31.352 -      params = {
  31.353 -        initiative = initiative,
  31.354 -        suggestions_selector = initiative:get_reference_selector("suggestions")
  31.355 -      }
  31.356 +if request.get_json_request_slots() then
  31.357 +  execute.view{
  31.358 +    module = "initiative",
  31.359 +    view   = "show_partial",
  31.360 +    params = {
  31.361 +      initiative = initiative
  31.362      }
  31.363 -    slot.put("<br />")
  31.364 -    if not initiative.issue.fully_frozen and not initiative.issue.closed and not initiative.revoked then
  31.365 -      ui.link{
  31.366 -        content = function()
  31.367 -          ui.image{ static = "icons/16/comment_add.png" }
  31.368 -          slot.put(_"Add new suggestion")
  31.369 -        end,
  31.370 -        attr = { onclick = "document.getElementById('add_suggestion_form').style.display='block';return(false)" },
  31.371 -        static = "#"
  31.372 -      }
  31.373 -    end
  31.374 -  end
  31.375 -}
  31.376 -
  31.377 -local members_selector = initiative:get_reference_selector("supporting_members_snapshot")
  31.378 -          :join("issue", nil, "issue.id = direct_supporter_snapshot.issue_id")
  31.379 -          :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")
  31.380 -          :add_field("direct_interest_snapshot.weight")
  31.381 -          :add_where("direct_supporter_snapshot.event = issue.latest_snapshot_event")
  31.382 -          :add_where("direct_supporter_snapshot.satisfied")
  31.383 -
  31.384 -local tmp = db:query("SELECT count(1) AS count, sum(weight) AS weight FROM (" .. tostring(members_selector) .. ") as subquery", "object")
  31.385 -local direct_satisfied_supporter_count = tmp.count
  31.386 -local indirect_satisfied_supporter_count = (tmp.weight or 0) - tmp.count
  31.387 -
  31.388 -local count_string
  31.389 -if indirect_satisfied_supporter_count > 0 then
  31.390 -  count_string = "(" .. tostring(direct_satisfied_supporter_count) .. "+" .. tostring(indirect_satisfied_supporter_count) .. ")"
  31.391 -else
  31.392 -  count_string = "(" .. tostring(direct_satisfied_supporter_count) .. ")"
  31.393 -end
  31.394 -
  31.395 -tabs[#tabs+1] = {
  31.396 -  name = "satisfied_supporter",
  31.397 -  label = _"Supporter" .. " " .. count_string,
  31.398 -  content = function()
  31.399 -    execute.view{
  31.400 -      module = "member",
  31.401 -      view = "_list",
  31.402 -      params = {
  31.403 -        initiative = initiative,
  31.404 -        members_selector = members_selector
  31.405 -      }
  31.406 -    }
  31.407 -  end
  31.408 -}
  31.409 -
  31.410 -local members_selector = initiative:get_reference_selector("supporting_members_snapshot")
  31.411 -          :join("issue", nil, "issue.id = direct_supporter_snapshot.issue_id")
  31.412 -          :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")
  31.413 -          :add_field("direct_interest_snapshot.weight")
  31.414 -          :add_where("direct_supporter_snapshot.event = issue.latest_snapshot_event")
  31.415 -          :add_where("NOT direct_supporter_snapshot.satisfied")
  31.416 -
  31.417 -local tmp = db:query("SELECT count(1) AS count, sum(weight) AS weight FROM (" .. tostring(members_selector) .. ") as subquery", "object")
  31.418 -local direct_potential_supporter_count = tmp.count
  31.419 -local indirect_potential_supporter_count = (tmp.weight or 0) - tmp.count
  31.420 -
  31.421 -local count_string
  31.422 -if indirect_potential_supporter_count > 0 then
  31.423 -  count_string = "(" .. tostring(direct_potential_supporter_count) .. "+" .. tostring(indirect_potential_supporter_count) .. ")"
  31.424 -else
  31.425 -  count_string = "(" .. tostring(direct_potential_supporter_count) .. ")"
  31.426 -end
  31.427 -
  31.428 -tabs[#tabs+1] = {
  31.429 -  name = "supporter",
  31.430 -  label = _"Potential supporter" .. " " .. count_string,
  31.431 -  content = function()
  31.432 -    execute.view{
  31.433 -      module = "member",
  31.434 -      view = "_list",
  31.435 -      params = {
  31.436 -        initiative = initiative,
  31.437 -        members_selector = members_selector
  31.438 -      }
  31.439 +  }
  31.440 +elseif
  31.441 +  config.user_tab_mode == "accordeon" or
  31.442 +  config.user_tab_mode == "accordeon_first_expanded" or
  31.443 +  config.user_tab_mode == "accordeon_all_expanded"
  31.444 +then
  31.445 +  execute.view{
  31.446 +    module = "issue",
  31.447 +    view   = "show",
  31.448 +    id     = initiative.issue_id,
  31.449 +    params = {
  31.450 +      for_initiative_id = initiative.id
  31.451      }
  31.452 -  end
  31.453 -}
  31.454 -
  31.455 -local initiator_count = initiative:get_reference_selector("initiators"):add_where("accepted"):count()
  31.456 -
  31.457 -tabs[#tabs+1] = {
  31.458 -  name = "initiators",
  31.459 -  label = _"Initiators" .. " (" .. tostring(initiator_count) .. ")",
  31.460 -  content = function()
  31.461 -     if initiator and initiator.accepted and not initiative.issue.fully_frozen and not initiative.issue.closed and not initiative.revoked then
  31.462 -      ui.link{
  31.463 -        attr = { class = "action" },
  31.464 -        content = function()
  31.465 -          ui.image{ static = "icons/16/user_add.png" }
  31.466 -          slot.put(_"Invite initiator")
  31.467 -        end,
  31.468 -        module = "initiative",
  31.469 -        view = "add_initiator",
  31.470 -        params = { initiative_id = initiative.id }
  31.471 -      }
  31.472 -      if initiator_count > 1 then
  31.473 -        ui.link{
  31.474 -          content = function()
  31.475 -            ui.image{ static = "icons/16/user_delete.png" }
  31.476 -            slot.put(_"Remove initiator")
  31.477 -          end,
  31.478 -          module = "initiative",
  31.479 -          view = "remove_initiator",
  31.480 -          params = { initiative_id = initiative.id }
  31.481 -        }
  31.482 -      end
  31.483 -    end
  31.484 -    if initiator and initiator.accepted == false then
  31.485 -        ui.link{
  31.486 -          content = function()
  31.487 -            ui.image{ static = "icons/16/user_delete.png" }
  31.488 -            slot.put(_"Cancel refuse of invitation")
  31.489 -          end,
  31.490 -          module = "initiative",
  31.491 -          action = "remove_initiator",
  31.492 -          params = {
  31.493 -            initiative_id = initiative.id,
  31.494 -            member_id = app.session.member.id
  31.495 -          },
  31.496 -          routing = {
  31.497 -            ok = {
  31.498 -              mode = "redirect",
  31.499 -              module = "initiative",
  31.500 -              view = "show",
  31.501 -              id = initiative.id
  31.502 -            }
  31.503 -          }
  31.504 -        }
  31.505 -    end
  31.506 -    local members_selector = initiative:get_reference_selector("initiating_members")
  31.507 -      :add_field("initiator.accepted", "accepted")
  31.508 -    if not (initiator and initiator.accepted) then
  31.509 -      members_selector:add_where("accepted")
  31.510 -    end
  31.511 -    execute.view{
  31.512 -      module = "member",
  31.513 -      view = "_list",
  31.514 -      params = {
  31.515 -        members_selector = members_selector,
  31.516 -        initiator = initiator
  31.517 -      }
  31.518 +  }
  31.519 +else
  31.520 +  execute.view{
  31.521 +    module = "initiative",
  31.522 +    view   = "show_static",
  31.523 +    params = {
  31.524 +      initiative = initiative
  31.525      }
  31.526 -  end
  31.527 -}
  31.528 -
  31.529 -local drafts_count = initiative:get_reference_selector("drafts"):count()
  31.530 -
  31.531 -tabs[#tabs+1] = {
  31.532 -  name = "drafts",
  31.533 -  label = _"Draft history" .. " (" .. tostring(drafts_count) .. ")",
  31.534 -  content = function()
  31.535 -    execute.view{ module = "draft", view = "_list", params = { drafts = initiative.drafts } }
  31.536 -  end
  31.537 -}
  31.538 -
  31.539 -tabs[#tabs+1] = {
  31.540 -  name = "details",
  31.541 -  label = _"Details",
  31.542 -  content = function()
  31.543 -    ui.form{
  31.544 -      attr = { class = "vertical" },
  31.545 -      record = initiative,
  31.546 -      readonly = true,
  31.547 -      content = function()
  31.548 -        ui.field.text{ label = _"Issue policy", value = initiative.issue.policy.name }
  31.549 -        ui.field.text{
  31.550 -          label = _"Created at",
  31.551 -          value = tostring(initiative.created)
  31.552 -        }
  31.553 -        ui.field.text{
  31.554 -          label = _"Created at",
  31.555 -          value = format.timestamp(initiative.created)
  31.556 -        }
  31.557 ---         ui.field.date{ label = _"Revoked at", name = "revoked" }
  31.558 -        ui.field.boolean{ label = _"Admitted", name = "admitted" }
  31.559 -      end
  31.560 -    }
  31.561 -  end
  31.562 -}
  31.563 -
  31.564 -
  31.565 -ui.tabs(tabs)
  31.566 -
  31.567 +  }
  31.568 +end
  31.569 \ No newline at end of file

    32.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    32.2 +++ b/app/main/initiative/show_partial.lua	Sat Feb 20 22:10:31 2010 +0100
    32.3 @@ -0,0 +1,31 @@
    32.4 +local initiative = param.get("initiative", "table")
    32.5 +local expanded = param.get("expanded", atom.boolean)
    32.6 +
    32.7 +if not initiative then
    32.8 +  initiative = Initiative:by_id(param.get_id())
    32.9 +  expanded = true
   32.10 +end
   32.11 +
   32.12 +-- TODO performance
   32.13 +local initiator = Initiator:by_pk(initiative.id, app.session.member.id)
   32.14 +
   32.15 +ui.partial{
   32.16 +  module = "initiative",
   32.17 +  view = "show",
   32.18 +  id = initiative.id,
   32.19 +  target = "initiative_content_" .. tostring(initiative.id) .. "_content",
   32.20 +  content = function()
   32.21 +    if expanded then
   32.22 +      execute.view{
   32.23 +        module = "initiative",
   32.24 +        view = "_show",
   32.25 +        params = {
   32.26 +          initiative = initiative,
   32.27 +          initiator = initiator
   32.28 +        }
   32.29 +      }
   32.30 +    else
   32.31 +      slot.put(" ")
   32.32 +    end
   32.33 +  end
   32.34 +}

    33.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    33.2 +++ b/app/main/initiative/show_static.lua	Sat Feb 20 22:10:31 2010 +0100
    33.3 @@ -0,0 +1,49 @@
    33.4 +local initiative = param.get("initiative", "table")
    33.5 +
    33.6 +if not initiative then
    33.7 +  initiative = Initiative:new_selector():add_where{ "id = ?", param.get_id()}:single_object_mode():exec()
    33.8 +end
    33.9 +
   33.10 +slot.select("actions", function()
   33.11 +  ui.link{
   33.12 +    content = function()
   33.13 +      ui.image{ static = "icons/16/script.png" }
   33.14 +      slot.put(_"Show alternative initiatives")
   33.15 +    end,
   33.16 +    module = "issue",
   33.17 +    view = "show",
   33.18 +    id = initiative.issue.id
   33.19 +  }
   33.20 +end)
   33.21 +
   33.22 +execute.view{
   33.23 +  module = "issue",
   33.24 +  view = "_show_head",
   33.25 +  params = { issue = initiative.issue }
   33.26 +}
   33.27 +
   33.28 +--slot.put_into("html_head", '<link rel="alternate" type="application/rss+xml" title="RSS" href="../show/' .. tostring(initiative.id) .. '.rss" />')
   33.29 +
   33.30 +
   33.31 +slot.select("actions", function()
   33.32 +  if not initiative.issue.fully_frozen and not initiative.issue.closed then
   33.33 +    ui.link{
   33.34 +      image  = { static = "icons/16/script_add.png" },
   33.35 +      attr   = { class = "action" },
   33.36 +      text   = _"Create alternative initiative",
   33.37 +      module = "initiative",
   33.38 +      view   = "new",
   33.39 +      params = { issue_id = initiative.issue.id }
   33.40 +    }
   33.41 +  end
   33.42 +end)
   33.43 +
   33.44 +slot.put_into("sub_title", encode.html(_"Initiative: '#{name}'":gsub("#{name}", initiative.shortened_name) ))
   33.45 +
   33.46 +execute.view{
   33.47 +  module = "initiative",
   33.48 +  view = "show_partial",
   33.49 +  params = {
   33.50 +    initiative = initiative
   33.51 +  }
   33.52 +}
   33.53 \ No newline at end of file

    34.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    34.2 +++ b/app/main/initiative/show_support.lua	Sat Feb 20 22:10:31 2010 +0100
    34.3 @@ -0,0 +1,43 @@
    34.4 +local initiative = param.get("initiative", "table") or Initiative:by_id(param.get_id())
    34.5 +
    34.6 +-- TODO performance
    34.7 +local initiator = Initiator:by_pk(initiative.id, app.session.member.id)
    34.8 +
    34.9 +ui.partial{
   34.10 +  module = "initiative",
   34.11 +  view = "show_support",
   34.12 +  id = initiative.id,
   34.13 +  target = "initiative_" .. tostring(initiative.id) .. "_support",
   34.14 +  content = function()
   34.15 +    ui.container{
   34.16 +      attr = {
   34.17 +        class = "slot_support vote_info",
   34.18 +      },
   34.19 +      content = function()
   34.20 +        ui.container{
   34.21 +          attr = { class = "actions" },
   34.22 +          content = function()
   34.23 +            execute.view{
   34.24 +              module = "supporter",
   34.25 +              view = "_show_box",
   34.26 +              params = { initiative = initiative }
   34.27 +            }
   34.28 +            if initiator and initiator.accepted and not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked then
   34.29 +              ui.link{
   34.30 +                attr = { class = "action", style = "float: left;" },
   34.31 +                content = function()
   34.32 +                  ui.image{ static = "icons/16/script_delete.png" }
   34.33 +                  slot.put(_"Revoke initiative")
   34.34 +                end,
   34.35 +                module = "initiative",
   34.36 +                view = "revoke",
   34.37 +                id = initiative.id
   34.38 +              }
   34.39 +            end
   34.40 +          end
   34.41 +        }
   34.42 +      end
   34.43 +    }
   34.44 +    slot.put("<div style='clear: left;'></div>")
   34.45 +  end
   34.46 +}

    35.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    35.2 +++ b/app/main/initiative/show_tab.lua	Sat Feb 20 22:10:31 2010 +0100
    35.3 @@ -0,0 +1,175 @@
    35.4 +local initiative = param.get("initiative", "table")
    35.5 +local initiator = param.get("initiator", "table")
    35.6 +
    35.7 +if not initiative then
    35.8 +  initiative = Initiative:by_id(param.get("initiative_id", atom.number))
    35.9 +end
   35.10 +
   35.11 +if not initiator then
   35.12 +  initiator = Initiator:by_pk(initiative.id, app.session.member.id)
   35.13 +end
   35.14 +
   35.15 +local current_draft_name = _"Current draft"
   35.16 +if initiative.issue.half_frozen then
   35.17 +  current_draft_name = _"Voting proposal"
   35.18 +end
   35.19 +
   35.20 +if initiative.issue.state == "finished" then
   35.21 +  current_draft_name = _"Voted proposal"
   35.22 +end
   35.23 +
   35.24 +local tabs = {
   35.25 +  {
   35.26 +    name = "current_draft",
   35.27 +    label = current_draft_name,
   35.28 +    icon = { static = "icons/16/script.png" },
   35.29 +    module = "initiative",
   35.30 +    view = "_current_draft",
   35.31 +    params = {
   35.32 +      initiative = initiative,
   35.33 +      initiator = initiator
   35.34 +    }
   35.35 +  }
   35.36 +}
   35.37 +
   35.38 +if initiative.issue.ranks_available then
   35.39 +  tabs[#tabs+1] = {
   35.40 +    name = "voting",
   35.41 +    label = _"Voting details",
   35.42 +    icon = { static = "icons/16/email_open.png" },
   35.43 +    module = "initiative",
   35.44 +    view = "_show_voting",
   35.45 +    params = {
   35.46 +      initiative = initiative
   35.47 +    }
   35.48 +  }
   35.49 +end
   35.50 +
   35.51 +local suggestion_count = initiative:get_reference_selector("suggestions"):count()
   35.52 +
   35.53 +tabs[#tabs+1] = {
   35.54 +  name = "suggestions",
   35.55 +  label = _"Suggestions" .. " (" .. tostring(suggestion_count) .. ")",
   35.56 +  icon = { static = "icons/16/comments.png" },
   35.57 +  module = "initiative",
   35.58 +  view = "_suggestions",
   35.59 +  params = {
   35.60 +    initiative = initiative
   35.61 +  }
   35.62 +}
   35.63 +
   35.64 +local members_selector = initiative:get_reference_selector("supporting_members_snapshot")
   35.65 +          :join("issue", nil, "issue.id = direct_supporter_snapshot.issue_id")
   35.66 +          :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")
   35.67 +          :add_field("direct_interest_snapshot.weight")
   35.68 +          :add_where("direct_supporter_snapshot.event = issue.latest_snapshot_event")
   35.69 +          :add_where("direct_supporter_snapshot.satisfied")
   35.70 +          :add_field("direct_supporter_snapshot.informed", "is_informed")
   35.71 +
   35.72 +local tmp = db:query("SELECT count(1) AS count, sum(weight) AS weight FROM (" .. tostring(members_selector) .. ") as subquery", "object")
   35.73 +local direct_satisfied_supporter_count = tmp.count
   35.74 +local indirect_satisfied_supporter_count = (tmp.weight or 0) - tmp.count
   35.75 +
   35.76 +local count_string
   35.77 +if indirect_satisfied_supporter_count > 0 then
   35.78 +  count_string = "(" .. tostring(direct_satisfied_supporter_count) .. "+" .. tostring(indirect_satisfied_supporter_count) .. ")"
   35.79 +else
   35.80 +  count_string = "(" .. tostring(direct_satisfied_supporter_count) .. ")"
   35.81 +end
   35.82 +
   35.83 +tabs[#tabs+1] = {
   35.84 +  name = "satisfied_supporter",
   35.85 +  label = _"Supporter" .. " " .. count_string,
   35.86 +  icon = { static = "icons/16/thumb_up_green.png" },
   35.87 +  module = "member",
   35.88 +  view = "_list",
   35.89 +  params = {
   35.90 +    initiative = initiative,
   35.91 +    members_selector = members_selector
   35.92 +  }
   35.93 +}
   35.94 +
   35.95 +local members_selector = initiative:get_reference_selector("supporting_members_snapshot")
   35.96 +          :join("issue", nil, "issue.id = direct_supporter_snapshot.issue_id")
   35.97 +          :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")
   35.98 +          :add_field("direct_interest_snapshot.weight")
   35.99 +          :add_where("direct_supporter_snapshot.event = issue.latest_snapshot_event")
  35.100 +          :add_where("NOT direct_supporter_snapshot.satisfied")
  35.101 +          :add_field("direct_supporter_snapshot.informed", "is_informed")
  35.102 +
  35.103 +local tmp = db:query("SELECT count(1) AS count, sum(weight) AS weight FROM (" .. tostring(members_selector) .. ") as subquery", "object")
  35.104 +local direct_potential_supporter_count = tmp.count
  35.105 +local indirect_potential_supporter_count = (tmp.weight or 0) - tmp.count
  35.106 +
  35.107 +local count_string
  35.108 +if indirect_potential_supporter_count > 0 then
  35.109 +  count_string = "(" .. tostring(direct_potential_supporter_count) .. "+" .. tostring(indirect_potential_supporter_count) .. ")"
  35.110 +else
  35.111 +  count_string = "(" .. tostring(direct_potential_supporter_count) .. ")"
  35.112 +end
  35.113 +
  35.114 +tabs[#tabs+1] = {
  35.115 +  name = "supporter",
  35.116 +  label = _"Potential supporter" .. " " .. count_string,
  35.117 +  icon = { static = "icons/16/thumb_up.png" },
  35.118 +  module = "member",
  35.119 +  view = "_list",
  35.120 +  params = {
  35.121 +    initiative = initiative,
  35.122 +    members_selector = members_selector
  35.123 +  }
  35.124 +}
  35.125 +
  35.126 +local initiators_members_selector = initiative:get_reference_selector("initiating_members")
  35.127 +  :add_field("initiator.accepted", "accepted")
  35.128 +
  35.129 +if not (initiator and initiator.accepted) then
  35.130 +  initiators_members_selector:add_where("initiator.accepted")
  35.131 +end
  35.132 +
  35.133 +local initiator_count = initiators_members_selector:count()
  35.134 +
  35.135 +tabs[#tabs+1] = {
  35.136 +  name = "initiators",
  35.137 +  label = _"Initiators" .. " (" .. tostring(initiator_count) .. ")",
  35.138 +  icon = { static = "icons/16/user_edit.png" },
  35.139 +  module = "initiative",
  35.140 +  view = "_initiators",
  35.141 +  params = {
  35.142 +    initiative = initiative,
  35.143 +    initiator = initiator,
  35.144 +    initiators_members_selector = initiators_members_selector
  35.145 +  }
  35.146 +}
  35.147 +
  35.148 +local drafts_count = initiative:get_reference_selector("drafts"):count()
  35.149 +
  35.150 +tabs[#tabs+1] = {
  35.151 +  name = "drafts",
  35.152 +  label = _"Draft history" .. " (" .. tostring(drafts_count) .. ")",
  35.153 +  icon = { static = "icons/16/script.png" },
  35.154 +  module = "draft",
  35.155 +  view = "_list",
  35.156 +  params = { drafts = initiative.drafts }
  35.157 +}
  35.158 +
  35.159 +tabs[#tabs+1] = {
  35.160 +  name = "details",
  35.161 +  label = _"Details",
  35.162 +  icon = { static = "icons/16/magnifier.png" },
  35.163 +  module = "initiative",
  35.164 +  view = "_details",
  35.165 +  params = {
  35.166 +    initiative = initiative,
  35.167 +    members_selector = members_selector
  35.168 +  }
  35.169 +}
  35.170 +
  35.171 +tabs.module = "initiative"
  35.172 +tabs.view = "show_tab"
  35.173 +tabs.static_params = {
  35.174 +  initiative_id = initiative.id
  35.175 +}
  35.176 +
  35.177 +ui.tabs(tabs)
  35.178 +

    36.1 --- a/app/main/interest/_show_box.lua	Tue Feb 02 00:31:06 2010 +0100
    36.2 +++ b/app/main/interest/_show_box.lua	Sat Feb 20 22:10:31 2010 +0100
    36.3 @@ -11,7 +11,7 @@
    36.4      content = function()
    36.5          ui.container{
    36.6            attr = { 
    36.7 -            class = "head head_active",
    36.8 +            class = "head head_active" .. (interest.autoreject and " head_autoreject" or ""),
    36.9              onclick = "document.getElementById('interest_content').style.display = 'block';"
   36.10            },
   36.11            content = function()
   36.12 @@ -19,6 +19,13 @@
   36.13                static = "icons/16/eye.png"
   36.14              }
   36.15              slot.put(_"Your are interested")
   36.16 +
   36.17 +            if interest.autoreject then
   36.18 +              ui.image{
   36.19 +                static = "icons/16/thumb_down_red.png"
   36.20 +              }
   36.21 +            end
   36.22 +
   36.23              ui.image{
   36.24                static = "icons/16/dropdown.png"
   36.25              }
   36.26 @@ -40,10 +47,10 @@
   36.27              }
   36.28              if issue.state ~= "finished" and issue.state ~= "cancelled" and issue.state ~= "voting" then
   36.29                ui.link{
   36.30 -                content = _"Remove my interest",
   36.31 -                module = "interest",
   36.32 -                action = "update",
   36.33 -                params = { issue_id = issue.id, delete = true },
   36.34 +                text    = _"Remove my interest",
   36.35 +                module  = "interest",
   36.36 +                action  = "update",
   36.37 +                params  = { issue_id = issue.id, delete = true },
   36.38                  routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
   36.39                }
   36.40                slot.put("<br />")
   36.41 @@ -53,10 +60,10 @@
   36.42                ui.field.text{ value = _"Autoreject is on." }
   36.43                if issue.state ~= "finished" and issue.state ~= "cancelled" then
   36.44                  ui.link{
   36.45 -                  content = _"Remove autoreject",
   36.46 -                  module = "interest",
   36.47 -                  action = "update",
   36.48 -                  params = { issue_id = issue.id, autoreject = false },
   36.49 +                  text    = _"Remove autoreject",
   36.50 +                  module  = "interest",
   36.51 +                  action  = "update",
   36.52 +                  params  = { issue_id = issue.id, autoreject = false },
   36.53                    routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
   36.54                  }
   36.55                end
   36.56 @@ -64,10 +71,10 @@
   36.57                ui.field.text{ value = _"Autoreject is off." }
   36.58                if issue.state ~= "finished" and issue.state ~= "cancelled" then
   36.59                  ui.link{
   36.60 -                  content = _"Set autoreject",
   36.61 -                  module = "interest",
   36.62 -                  action = "update",
   36.63 -                  params = { issue_id = issue.id, autoreject = true },
   36.64 +                  text    = _"Set autoreject",
   36.65 +                  module  = "interest",
   36.66 +                  action  = "update",
   36.67 +                  params  = { issue_id = issue.id, autoreject = true },
   36.68                    routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
   36.69                  }
   36.70                end
   36.71 @@ -80,13 +87,11 @@
   36.72  else
   36.73    if not issue.closed and not issue.fully_frozen then
   36.74      ui.link{
   36.75 -      content = function()
   36.76 -        ui.image{ static = "icons/16/user_add.png" }
   36.77 -        slot.put(_"Add my interest")
   36.78 -      end,
   36.79 -      module = "interest",
   36.80 -      action = "update",
   36.81 -      params = { issue_id = issue.id },
   36.82 +      image   = { static = "icons/16/user_add.png" },
   36.83 +      text    = _"Add my interest",
   36.84 +      module  = "interest",
   36.85 +      action  = "update",
   36.86 +      params  = { issue_id = issue.id },
   36.87        routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
   36.88      }
   36.89    end

    37.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    37.2 +++ b/app/main/issue/_details.lua	Sat Feb 20 22:10:31 2010 +0100
    37.3 @@ -0,0 +1,37 @@
    37.4 +local issue = param.get("issue", "table")
    37.5 +
    37.6 +local policy = issue.policy
    37.7 +ui.form{
    37.8 +  record = issue,
    37.9 +  readonly = true,
   37.10 +  attr = { class = "vertical" },
   37.11 +  content = function()
   37.12 +    ui.field.text{ label = _"Population", name = "population" }
   37.13 +    ui.field.text{ label = _"State", name = "state" }
   37.14 +    ui.field.timestamp{ label = _"Created at",            name = "created" }
   37.15 +    ui.field.text{      label = _"Admission time",        value = policy.admission_time }
   37.16 +    ui.field.text{
   37.17 +      label = _"Issue quorum",
   37.18 +      value = format.percentage(policy.issue_quorum_num / policy.issue_quorum_den)
   37.19 +    }
   37.20 +    ui.field.timestamp{ label = _"Accepted at",              name = "accepted" }
   37.21 +    ui.field.text{      label = _"Discussion time",       value = policy.discussion_time }
   37.22 +    ui.field.vote_now{   label = _"Vote now", name = "vote_now" }
   37.23 +    ui.field.vote_later{ label = _"Vote later", name = "vote_later" }
   37.24 +    ui.field.timestamp{ label = _"Half frozen at",           name = "half_frozen" }
   37.25 +    ui.field.text{      label = _"Verification time",     value = policy.verification_time }
   37.26 +    ui.field.text{
   37.27 +      label   = _"Initiative quorum",
   37.28 +      value = format.percentage(policy.initiative_quorum_num / policy.initiative_quorum_den)
   37.29 +    }
   37.30 +    ui.field.timestamp{ label = _"Fully frozen at",          name = "fully_frozen" }
   37.31 +    ui.field.text{      label = _"Voting time",           value = policy.voting_time }
   37.32 +    ui.field.timestamp{ label = _"Closed",                name = "closed" }
   37.33 +  end
   37.34 +}
   37.35 +ui.form{
   37.36 +  record = issue.policy,
   37.37 +  readonly = true,
   37.38 +  content = function()
   37.39 +  end
   37.40 +}

    38.1 --- a/app/main/issue/_list.lua	Tue Feb 02 00:31:06 2010 +0100
    38.2 +++ b/app/main/issue/_list.lua	Sat Feb 20 22:10:31 2010 +0100
    38.3 @@ -4,347 +4,310 @@
    38.4    :left_join("interest", "_interest", { "_interest.issue_id = issue.id AND _interest.member_id = ?", app.session.member.id} )
    38.5    :add_field("(_interest.member_id NOTNULL)", "is_interested")
    38.6  
    38.7 -local ui_filter = ui.filter
    38.8 -if param.get("filter", atom.boolean) == false then
    38.9 -  ui_filter = function(args) args.content() end
   38.10 -end
   38.11 +ui.add_partial_param_names{
   38.12 +  "filter",
   38.13 +  "filter_open",
   38.14 +  "filter_voting",
   38.15 +  "filter_interest",
   38.16 +  "issue_list" 
   38.17 +}
   38.18  
   38.19 -if param.get("no_filter", atom.boolean) then
   38.20 -  ui_filter = function(args) args.content() end
   38.21 -end
   38.22 +local filters = {}
   38.23  
   38.24 -local filter_voting = false
   38.25 -ui_filter{
   38.26 -  selector = issues_selector,
   38.27 -  filters = {
   38.28 +filters[#filters+1] = {
   38.29 +  label = _"Filter",
   38.30 +  {
   38.31 +    name = "open",
   38.32 +    label = _"Open",
   38.33 +    selector_modifier = function(selector)
   38.34 +        selector:add_where("issue.closed ISNULL")
   38.35 +    end
   38.36 +  },
   38.37 +  {
   38.38 +    name = "new",
   38.39 +    label = _"New",
   38.40 +    selector_modifier = function(selector)
   38.41 +      selector:add_where("issue.accepted ISNULL AND issue.closed ISNULL")
   38.42 +    end
   38.43 +  },
   38.44 +  {
   38.45 +    name = "accepted",
   38.46 +    label = _"In discussion",
   38.47 +    selector_modifier = function(selector)
   38.48 +      selector:add_where("issue.accepted NOTNULL AND issue.half_frozen ISNULL AND issue.closed ISNULL")
   38.49 +    end
   38.50 +  },
   38.51 +  {
   38.52 +    name = "half_frozen",
   38.53 +    label = _"Frozen",
   38.54 +    selector_modifier = function(selector)
   38.55 +      selector:add_where("issue.half_frozen NOTNULL AND issue.fully_frozen ISNULL")
   38.56 +    end
   38.57 +  },
   38.58 +  {
   38.59 +    name = "frozen",
   38.60 +    label = _"Voting",
   38.61 +    selector_modifier = function(selector)
   38.62 +      selector:add_where("issue.fully_frozen NOTNULL AND issue.closed ISNULL")
   38.63 +      filter_voting = true
   38.64 +    end
   38.65 +  },
   38.66 +  {
   38.67 +    name = "finished",
   38.68 +    label = _"Finished",
   38.69 +    selector_modifier = function(selector)
   38.70 +      selector:add_where("issue.closed NOTNULL AND issue.fully_frozen NOTNULL")
   38.71 +    end
   38.72 +  },
   38.73 +  {
   38.74 +    name = "cancelled",
   38.75 +    label = _"Cancelled",
   38.76 +    selector_modifier = function(selector)
   38.77 +      selector:add_where("issue.closed NOTNULL AND issue.accepted ISNULL")
   38.78 +    end
   38.79 +  },
   38.80 +  {
   38.81 +    name = "any",
   38.82 +    label = _"Any",
   38.83 +    selector_modifier = function(selector) end
   38.84 +  },
   38.85 +}
   38.86 +
   38.87 +
   38.88 +if param.get("filter") == "frozen" then
   38.89 +  filters[#filters+1] = {
   38.90 +    label = _"Filter",
   38.91 +    name = "filter_voting",
   38.92      {
   38.93 -      type = "boolean",
   38.94 -      name = "open",
   38.95 -      label = _"Open",
   38.96 -      selector_modifier = function(selector, value)
   38.97 -        if value then
   38.98 -          selector:add_where("issue.closed ISNULL")
   38.99 -        end
  38.100 -      end
  38.101 +      name = "any",
  38.102 +      label = _"Any",
  38.103 +      selector_modifier = function()  end
  38.104      },
  38.105      {
  38.106 -      type = "boolean",
  38.107 -      name = "new",
  38.108 -      label = _"New",
  38.109 -      selector_modifier = function(selector, value)
  38.110 -        if value then
  38.111 -          selector:add_where("issue.accepted ISNULL AND issue.closed ISNULL")
  38.112 -        end
  38.113 +      name = "not_voted",
  38.114 +      label = _"Not voted",
  38.115 +      selector_modifier = function(selector)
  38.116 +        selector:left_join("direct_voter", nil, { "direct_voter.issue_id = issue.id AND direct_voter.member_id = ?", app.session.member.id })
  38.117 +        selector:add_where("direct_voter.member_id ISNULL")
  38.118        end
  38.119      },
  38.120      {
  38.121 -      type = "boolean",
  38.122 -      name = "accepted",
  38.123 -      label = _"In discussion",
  38.124 -      selector_modifier = function(selector, value)
  38.125 -        if value then
  38.126 -          selector:add_where("issue.accepted NOTNULL AND issue.half_frozen ISNULL AND issue.closed ISNULL")
  38.127 -        end
  38.128 -      end
  38.129 -    },
  38.130 -    {
  38.131 -      type = "boolean",
  38.132 -      name = "half_frozen",
  38.133 -      label = _"Frozen",
  38.134 -      selector_modifier = function(selector, value)
  38.135 -        if value then
  38.136 -          selector:add_where("issue.half_frozen NOTNULL AND issue.fully_frozen ISNULL")
  38.137 -        end
  38.138 +      name = "voted",
  38.139 +      label = _"Voted",
  38.140 +      selector_modifier = function(selector)
  38.141 +        selector:join("direct_voter", nil, { "direct_voter.issue_id = issue.id AND direct_voter.member_id = ?", app.session.member.id })
  38.142        end
  38.143      },
  38.144 +  }
  38.145 +end
  38.146 +
  38.147 +
  38.148 +filters[#filters+1] = {
  38.149 +  label = _"Filter",
  38.150 +  name = "filter_interest",
  38.151 +  {
  38.152 +    name = "any",
  38.153 +    label = _"Any",
  38.154 +    selector_modifier = function()  end
  38.155 +  },
  38.156 +  {
  38.157 +    name = "my",
  38.158 +    label = _"Interested",
  38.159 +    selector_modifier = function(selector)
  38.160 +      selector:join("interest", "filter_interest", { "filter_interest.issue_id = issue.id AND filter_interest.member_id = ? ", app.session.member.id })
  38.161 +    end
  38.162 +  },
  38.163 +  {
  38.164 +    name = "supported",
  38.165 +    label = _"Supported",
  38.166 +    selector_modifier = function(selector)
  38.167 +      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 })
  38.168 +    end
  38.169 +  },
  38.170 +  {
  38.171 +    name = "potentially_supported",
  38.172 +    label = _"Potential supported",
  38.173 +    selector_modifier = function(selector)
  38.174 +      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 })
  38.175 +    end
  38.176 +  },
  38.177 +  {
  38.178 +    name = "initiated",
  38.179 +    label = _"Initiated",
  38.180 +    selector_modifier = function(selector)
  38.181 +      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 })
  38.182 +    end
  38.183 +  },
  38.184 +}
  38.185 +
  38.186 +if not param.get("no_sort", atom.boolean) then
  38.187 +  filters[#filters+1] = {
  38.188 +    label = _"Order by",
  38.189 +    name = "issue_list",
  38.190      {
  38.191 -      type = "boolean",
  38.192 -      name = "frozen",
  38.193 -      label = _"Voting",
  38.194 -      selector_modifier = function(selector, value)
  38.195 -        if value then
  38.196 -          selector:add_where("issue.fully_frozen NOTNULL AND issue.closed ISNULL")
  38.197 -          filter_voting = true
  38.198 -        end
  38.199 -      end
  38.200 -    },
  38.201 -    {
  38.202 -      type = "boolean",
  38.203 -      name = "finished",
  38.204 -      label = _"Finished",
  38.205 -      selector_modifier = function(selector, value)
  38.206 -        if value then
  38.207 -          selector:add_where("issue.closed NOTNULL AND issue.fully_frozen NOTNULL")
  38.208 -        end
  38.209 +      name = "max_potential_support",
  38.210 +      label = _"Max potential support",
  38.211 +      selector_modifier = function(selector)
  38.212 +        selector:add_order_by("(SELECT max(supporter_count) FROM initiative WHERE initiative.issue_id = issue.id) DESC")
  38.213        end
  38.214      },
  38.215      {
  38.216 -      type = "boolean",
  38.217 -      name = "cancelled",
  38.218 -      label = _"Cancelled",
  38.219 -      selector_modifier = function(selector, value)
  38.220 -        if value then
  38.221 -          selector:add_where("issue.closed NOTNULL AND issue.accepted ISNULL")
  38.222 -        end
  38.223 +      name = "max_support",
  38.224 +      label = _"Max support",
  38.225 +      selector_modifier = function(selector)
  38.226 +        selector:add_order_by("(SELECT max(satisfied_supporter_count) FROM initiative WHERE initiative.issue_id = issue.id) DESC")
  38.227 +      end
  38.228 +    },
  38.229 +    {
  38.230 +      name = "population",
  38.231 +      label = _"Population",
  38.232 +      selector_modifier = function(selector)
  38.233 +        selector:add_order_by("issue.population DESC")
  38.234 +      end
  38.235 +    },
  38.236 +    {
  38.237 +      name = "newest",
  38.238 +      label = _"Newest",
  38.239 +      selector_modifier = function(selector)
  38.240 +        selector:add_order_by("issue.created DESC")
  38.241        end
  38.242      },
  38.243 -  },
  38.244 -  content = function()
  38.245 -    local ui_filter = ui.filter
  38.246 -    if not filter_voting then
  38.247 -      ui_filter = function(args) args.content() end
  38.248 -    end
  38.249 -    if param.get("no_filter", atom.boolean) then
  38.250 -      ui_filter = function(args) args.content() end
  38.251 -    end
  38.252 -    ui_filter{
  38.253 -      selector = issues_selector,
  38.254 -      name = "filter_voting",
  38.255 -      filters = {
  38.256 -        {
  38.257 -          type = "boolean",
  38.258 -          name = "any",
  38.259 -          label = _"Any",
  38.260 -          selector_modifier = function()  end
  38.261 -        },
  38.262 -        {
  38.263 -          type = "boolean",
  38.264 -          name = "not_voted",
  38.265 -          label = _"Not voted",
  38.266 -          selector_modifier = function(selector, value)
  38.267 -            if value then
  38.268 -              selector:left_join("direct_voter", nil, { "direct_voter.issue_id = issue.id AND direct_voter.member_id = ?", app.session.member.id })
  38.269 -              selector:add_where("direct_voter.member_id ISNULL")
  38.270 -            end
  38.271 -          end
  38.272 -        },
  38.273 -        {
  38.274 -          type = "boolean",
  38.275 -          name = "voted",
  38.276 -          label = _"Voted",
  38.277 -          selector_modifier = function(selector, value)
  38.278 -            if value then
  38.279 -              selector:join("direct_voter", nil, { "direct_voter.issue_id = issue.id AND direct_voter.member_id = ?", app.session.member.id })
  38.280 -            end
  38.281 -          end
  38.282 -        },
  38.283 -      },
  38.284 -      content = function()
  38.285 -        local ui_filter = ui.filter
  38.286 -        if param.get("filter", atom.boolean) == false then
  38.287 -          ui_filter = function(args) args.content() end
  38.288 -        end
  38.289 -        ui_filter{
  38.290 -          selector = issues_selector,
  38.291 -          name = "filter_interest",
  38.292 -          filters = {
  38.293 -            {
  38.294 -              type = "boolean",
  38.295 -              name = "any",
  38.296 -              label = _"Any",
  38.297 -              selector_modifier = function()  end
  38.298 -            },
  38.299 -            {
  38.300 -              type = "boolean",
  38.301 -              name = "my",
  38.302 -              label = _"Interested",
  38.303 -              selector_modifier = function(selector, value)
  38.304 -                if value then
  38.305 -                  selector:join("interest", "filter_interest", { "filter_interest.issue_id = issue.id AND filter_interest.member_id = ? ", app.session.member.id })
  38.306 -                end
  38.307 -              end
  38.308 -            },
  38.309 -            {
  38.310 -              type = "boolean",
  38.311 -              name = "supported",
  38.312 -              label = _"Supported",
  38.313 -              selector_modifier = function(selector, value)
  38.314 -                if value then
  38.315 -                  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 })
  38.316 -                end
  38.317 -              end
  38.318 -            },
  38.319 -            {
  38.320 -              type = "boolean",
  38.321 -              name = "potentially_supported",
  38.322 -              label = _"Potential supported",
  38.323 -              selector_modifier = function(selector, value)
  38.324 -                if value then
  38.325 -                  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 })
  38.326 -                end
  38.327 -              end
  38.328 -            },
  38.329 -            {
  38.330 -              type = "boolean",
  38.331 -              name = "initiated",
  38.332 -              label = _"Initiated",
  38.333 -              selector_modifier = function(selector, value)
  38.334 -                if value then
  38.335 -                  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 })
  38.336 -                end
  38.337 +    {
  38.338 +      name = "oldest",
  38.339 +      label = _"Oldest",
  38.340 +      selector_modifier = function(selector)
  38.341 +        selector:add_order_by("issue.created")
  38.342 +      end
  38.343 +    }
  38.344 +  }
  38.345 +end
  38.346 +
  38.347 +filters.content = function()
  38.348 +  local ui_paginate = ui.paginate
  38.349 +  if param.get("per_page") == "all" then
  38.350 +    ui_paginate = function(args) args.content() end
  38.351 +  end
  38.352 +  ui_paginate{
  38.353 +    per_page = tonumber(param.get("per_page")),
  38.354 +    selector = issues_selector,
  38.355 +    content = function()
  38.356 +      local highlight_string = param.get("highlight_string", "string")
  38.357 +      local issues = issues or issues_selector:exec()
  38.358 +      -- issues:load(initiatives)
  38.359 +      ui.list{
  38.360 +        attr = { class = "issues" },
  38.361 +        records = issues,
  38.362 +        columns = {
  38.363 +          {
  38.364 +            label = _"Issue",
  38.365 +            content = function(record)
  38.366 +              if not param.get("for_area_list", atom.boolean) then
  38.367 +                ui.field.text{
  38.368 +                  value = record.area.name
  38.369 +                }
  38.370 +                slot.put("<br />")
  38.371                end
  38.372 -            },
  38.373 -          },
  38.374 -          content = function()
  38.375 -            local ui_order = ui.order
  38.376 -            if param.get("no_sort", atom.boolean) then
  38.377 -              ui_order = function(args) args.content() end
  38.378 -            end
  38.379 -            ui_order{
  38.380 -              name = "issue_list",
  38.381 -              selector = issues_selector,
  38.382 -              options = {
  38.383 -                {
  38.384 -                  name = "max_potential_support",
  38.385 -                  label = _"Max potential support",
  38.386 -                  selector_modifier = function(selector)
  38.387 -                    selector:add_order_by("(SELECT max(supporter_count) FROM initiative WHERE initiative.issue_id = issue.id) DESC")
  38.388 -                  end
  38.389 -                },
  38.390 -                {
  38.391 -                  name = "max_support",
  38.392 -                  label = _"Max support",
  38.393 -                  selector_modifier = function(selector)
  38.394 -                    selector:add_order_by("(SELECT max(satisfied_supporter_count) FROM initiative WHERE initiative.issue_id = issue.id) DESC")
  38.395 -                  end
  38.396 -                },
  38.397 -                {
  38.398 -                  name = "population",
  38.399 -                  label = _"Population",
  38.400 -                  order_by = "issue.population DESC"
  38.401 -                },
  38.402 -                {
  38.403 -                  name = "newest",
  38.404 -                  label = _"Newest",
  38.405 -                  order_by = "issue.created DESC"
  38.406 -                },
  38.407 -                {
  38.408 -                  name = "oldest",
  38.409 -                  label = _"Oldest",
  38.410 -                  order_by = "issue.created"
  38.411 +              if record.is_interested then
  38.412 +                local label = _"You are interested in this issue",
  38.413 +                ui.image{
  38.414 +                  attr = { alt = label, title = label },
  38.415 +                  static = "icons/16/eye.png"
  38.416                  }
  38.417 -              },
  38.418 -              content = function()
  38.419 -                local ui_paginate = ui.paginate
  38.420 -                if param.get("per_page") == "all" then
  38.421 -                  ui_paginate = function(args) args.content() end
  38.422 -                end
  38.423 -                ui_paginate{
  38.424 -                  per_page = tonumber(param.get("per_page")),
  38.425 -                  selector = issues_selector,
  38.426 -                  content = function()
  38.427 -                    local highlight_string = param.get("highlight_string", "string")
  38.428 -                    local issues = issues or issues_selector:exec()
  38.429 -        --            issues:load(initiatives)
  38.430 -                    ui.list{
  38.431 -                      attr = { class = "issues" },
  38.432 -                      records = issues,
  38.433 -                      columns = {
  38.434 -                        {
  38.435 -                          label = _"Issue",
  38.436 -                          content = function(record)
  38.437 -                            if not param.get("for_area_list", atom.boolean) then
  38.438 -                              ui.field.text{
  38.439 -                                value = record.area.name
  38.440 -                              }
  38.441 -                              slot.put("<br />")
  38.442 -                            end
  38.443 -                            if record.is_interested then
  38.444 -                              local label = _"You are interested in this issue",
  38.445 -                              ui.image{
  38.446 -                                attr = { alt = label, title = label },
  38.447 -                                static = "icons/16/eye.png"
  38.448 -                              }
  38.449 -                              slot.put("&nbsp;")
  38.450 -                            end
  38.451 -                            ui.link{
  38.452 -                              text = _("Issue ##{id}", { id = tostring(record.id) }),
  38.453 -                              module = "issue",
  38.454 -                              view = "show",
  38.455 -                              id = record.id
  38.456 -                            }
  38.457 -                            if record.state == "new" then
  38.458 -                              ui.image{
  38.459 -                                static = "icons/16/new.png"
  38.460 -                              }
  38.461 -                            end
  38.462 -                            slot.put("<br />")
  38.463 -                            slot.put("<br />")
  38.464 -                            if record.old_state then
  38.465 -                              ui.field.text{ value = format.time(record.sort) }
  38.466 -                              ui.field.text{ value = Issue:get_state_name_for_state(record.old_state) .. " > " .. Issue:get_state_name_for_state(record.new_state) }
  38.467 -                            else
  38.468 -                            end
  38.469 -                          end
  38.470 -                        },
  38.471 -                        {
  38.472 -                          label = _"State",
  38.473 -                          content = function(record)
  38.474 -                            if record.state == "voting" then
  38.475 -                              ui.link{
  38.476 -                                content = _"Voting",
  38.477 -                                module = "vote",
  38.478 -                                view = "list",
  38.479 -                                params = { issue_id = record.id }
  38.480 -                              }
  38.481 -                            else
  38.482 -                              ui.field.issue_state{ value = record.state }
  38.483 -                            end
  38.484 -                          end
  38.485 -                        },
  38.486 -                        {
  38.487 -                          label = _"Initiatives",
  38.488 -                          content = function(record)
  38.489 -                            local initiatives_selector = record:get_reference_selector("initiatives")
  38.490 -                            local highlight_string = param.get("highlight_string")
  38.491 -                            if highlight_string then
  38.492 -                              initiatives_selector:add_field( {'"highlight"("initiative"."name", ?)', highlight_string }, "name_highlighted")
  38.493 -                            end
  38.494 -                            execute.view{
  38.495 -                              module = "initiative",
  38.496 -                              view = "_list",
  38.497 -                              params = {
  38.498 -                                issue = record,
  38.499 -                                initiatives_selector = initiatives_selector,
  38.500 -                                highlight_string = highlight_string,
  38.501 -                                per_page = param.get("initiatives_per_page", atom.number),
  38.502 -                                no_sort = param.get("initiatives_no_sort", atom.boolean)
  38.503 -                              }
  38.504 -                            }
  38.505 -                          end
  38.506 -                        },
  38.507 -                      }
  38.508 -                    }
  38.509 -                  end
  38.510 +                slot.put("&nbsp;")
  38.511 +              end
  38.512 +              ui.link{
  38.513 +                text = _("Issue ##{id}", { id = tostring(record.id) }),
  38.514 +                module = "issue",
  38.515 +                view = "show",
  38.516 +                id = record.id
  38.517 +              }
  38.518 +              if record.state == "new" then
  38.519 +                ui.image{
  38.520 +                  static = "icons/16/new.png"
  38.521                  }
  38.522                end
  38.523 -            }
  38.524 -          end
  38.525 +              slot.put("<br />")
  38.526 +              slot.put("<br />")
  38.527 +              if record.old_state then
  38.528 +                ui.field.text{ value = format.time(record.sort) }
  38.529 +                ui.field.text{ value = Issue:get_state_name_for_state(record.old_state) .. " > " .. Issue:get_state_name_for_state(record.new_state) }
  38.530 +              else
  38.531 +              end
  38.532 +            end
  38.533 +          },
  38.534 +          {
  38.535 +            label = _"State",
  38.536 +            content = function(record)
  38.537 +              if record.state == "voting" then
  38.538 +                ui.link{
  38.539 +                  content = _"Voting",
  38.540 +                  module = "vote",
  38.541 +                  view = "list",
  38.542 +                  params = { issue_id = record.id }
  38.543 +                }
  38.544 +              else
  38.545 +                ui.field.issue_state{ value = record.state }
  38.546 +              end
  38.547 +            end
  38.548 +          },
  38.549 +          {
  38.550 +            label = _"Initiatives",
  38.551 +            content = function(record)
  38.552 +              local initiatives_selector = record:get_reference_selector("initiatives")
  38.553 +              local highlight_string = param.get("highlight_string")
  38.554 +              if highlight_string then
  38.555 +                initiatives_selector:add_field( {'"highlight"("initiative"."name", ?)', highlight_string }, "name_highlighted")
  38.556 +              end
  38.557 +              execute.view{
  38.558 +                module = "initiative",
  38.559 +                view = "_list",
  38.560 +                params = {
  38.561 +                  issue = record,
  38.562 +                  initiatives_selector = initiatives_selector,
  38.563 +                  highlight_string = highlight_string,
  38.564 +                  per_page = tonumber(app.session.member:get_setting_value("initiatives_preview_limit") or 3),
  38.565 +                  no_sort = true,
  38.566 +                  limit = tonumber(app.session.member:get_setting_value("initiatives_preview_limit") or 3)
  38.567 +                }
  38.568 +              }
  38.569 +            end
  38.570 +          },
  38.571          }
  38.572 -      end
  38.573 +      }
  38.574 +    end
  38.575 +  }
  38.576 +end
  38.577 +
  38.578 +filters.selector = issues_selector
  38.579 +filters.label = _"Change filters and order"
  38.580 +
  38.581 +if param.get("no_filter", atom.boolean) then
  38.582 +  filters.content()
  38.583 +else
  38.584 +  ui.filters(filters)
  38.585 +end
  38.586 +
  38.587 +if param.get("legend", atom.boolean) ~= false then
  38.588 +  local filter = param.get_all_cgi().filter
  38.589 +  if not filter or filter == "any" or filter ~= "finished" then
  38.590 +    ui.bargraph_legend{
  38.591 +      width = 25,
  38.592 +      bars = {
  38.593 +        { color = "#0a0", label = _"Supporter" },
  38.594 +        { color = "#777", label = _"Potential supporter" },
  38.595 +        { color = "#ddd", label = _"No support at all" },
  38.596 +      }
  38.597      }
  38.598 -    if param.get("legend", atom.boolean) ~= false then
  38.599 -      local filter = param.get_all_cgi().filter
  38.600 -      if not filter or filter == "any" or filter ~= "finished" then
  38.601 -        ui.bargraph_legend{
  38.602 -          width = 25,
  38.603 -          bars = {
  38.604 -            { color = "#0a0", label = _"Supporter" },
  38.605 -            { color = "#777", label = _"Potential supporter" },
  38.606 -            { color = "#ddd", label = _"No support at all" },
  38.607 -          }
  38.608 -        }
  38.609 -      end
  38.610 -      if not filter or filter == "any" or filter == "finished" then
  38.611 -        ui.bargraph_legend{
  38.612 -          width = 25,
  38.613 -          bars = {
  38.614 -            { color = "#0a0", label = _"Yes" },
  38.615 -            { color = "#aaa", label = _"Abstention" },
  38.616 -            { color = "#a00", label = _"No" },
  38.617 -          }
  38.618 -        }
  38.619 -      end
  38.620 -    end
  38.621    end
  38.622 -}
  38.623 +  if not filter or filter == "any" or filter == "finished" then
  38.624 +    ui.bargraph_legend{
  38.625 +      width = 25,
  38.626 +      bars = {
  38.627 +        { color = "#0a0", label = _"Yes" },
  38.628 +        { color = "#aaa", label = _"Abstention" },
  38.629 +        { color = "#a00", label = _"No" },
  38.630 +      }
  38.631 +    }
  38.632 +  end
  38.633 +end
  38.634 +

    39.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    39.2 +++ b/app/main/issue/_list_initiatives.lua	Sat Feb 20 22:10:31 2010 +0100
    39.3 @@ -0,0 +1,10 @@
    39.4 +local issue = param.get("issue", "table")
    39.5 +
    39.6 +execute.view{
    39.7 +  module = "initiative",
    39.8 +  view = "_list",
    39.9 +  params = { 
   39.10 +    issue = issue,
   39.11 +    initiatives_selector = issue:get_reference_selector("initiatives")
   39.12 +  }
   39.13 +}

    40.1 --- a/app/main/issue/_show_box.lua	Tue Feb 02 00:31:06 2010 +0100
    40.2 +++ b/app/main/issue/_show_box.lua	Sat Feb 20 22:10:31 2010 +0100
    40.3 @@ -2,6 +2,10 @@
    40.4  
    40.5  slot.select("issue_info", function()
    40.6    ui.field.text{ 
    40.7 +    label = _"Policy",
    40.8 +    value = issue.policy.name 
    40.9 +  }
   40.10 +  ui.field.text{ 
   40.11      label = _"State",
   40.12      value = issue.state_name 
   40.13    }

    41.1 --- a/app/main/issue/_show_head.lua	Tue Feb 02 00:31:06 2010 +0100
    41.2 +++ b/app/main/issue/_show_head.lua	Sat Feb 20 22:10:31 2010 +0100
    41.3 @@ -1,33 +1,47 @@
    41.4  local issue = param.get("issue", "table")
    41.5  
    41.6 +local direct_voter = DirectVoter:by_pk(issue.id, app.session.member.id)
    41.7 +
    41.8  slot.put_into("html_head", '<link rel="alternate" type="application/rss+xml" title="RSS" href="../show/' .. tostring(issue.id) .. '.rss" />')
    41.9  
   41.10  slot.select("path", function()
   41.11 +end)
   41.12 +
   41.13 +slot.select("title", function()
   41.14    ui.link{
   41.15 -    content = _"Area '#{name}'":gsub("#{name}", issue.area.name),
   41.16 +    content = issue.area.name,
   41.17      module = "area",
   41.18      view = "show",
   41.19      id = issue.area.id
   41.20    }
   41.21 -end)
   41.22 -
   41.23 -slot.select("title", function()
   41.24 +  slot.put(" &middot; ")
   41.25    ui.link{
   41.26 -    content = _"Issue ##{id} (#{policy_name})":gsub("#{id}", issue.id):gsub("#{policy_name}", issue.policy.name),
   41.27 +    content = _("Issue ##{id}", { id = issue.id }),
   41.28      module = "issue",
   41.29      view = "show",
   41.30      id = issue.id
   41.31    }
   41.32 +  slot.put(" &middot; ")
   41.33 +  ui.tag{
   41.34 +    tag = "span",
   41.35 +    content = issue.state_name,
   41.36 +  }
   41.37  end)
   41.38  
   41.39  
   41.40  slot.select("actions", function()
   41.41  
   41.42    if issue.state == 'voting' then
   41.43 +    local text
   41.44 +    if not direct_voter then
   41.45 +      text = _"Vote now"
   41.46 +    else
   41.47 +      text = _"Change vote"
   41.48 +    end
   41.49      ui.link{
   41.50        content = function()
   41.51          ui.image{ static = "icons/16/email_open.png" }
   41.52 -        slot.put(_"Vote now")
   41.53 +        slot.put(text)
   41.54        end,
   41.55        module = "vote",
   41.56        view = "list",
   41.57 @@ -78,7 +92,7 @@
   41.58  --  ui.twitter("http://example.com/t" .. tostring(issue.id))
   41.59  
   41.60  
   41.61 -if issue.state == 'voting' then
   41.62 +if issue.state == 'voting' and not direct_voter then
   41.63    ui.container{
   41.64      attr = { class = "voting_active_info" },
   41.65      content = function()