# HG changeset patch # User bsw # Date 1329073406 -3600 # Node ID f460555c98969f9cd4156f8202d61b84a2a5f354 # Parent fc14e76afe3104027f1e49488c3a26d33d534fae Code cleanup diff -r fc14e76afe31 -r f460555c9896 app/main/_filter/21_auth.lua --- a/app/main/_filter/21_auth.lua Sun Feb 12 13:42:08 2012 +0100 +++ b/app/main/_filter/21_auth.lua Sun Feb 12 20:03:26 2012 +0100 @@ -1,7 +1,8 @@ local auth_needed = not ( request.get_module() == 'index' and ( - request.get_view() == "login" + request.get_view() == "index" + or request.get_view() == "login" or request.get_action() == "login" or request.get_view() == "register" or request.get_action() == "register" @@ -18,24 +19,13 @@ if config.public_access then if - request.get_module() == "unit" and ( - request.get_view() == "list" - or request.get_view() == "show" - or request.get_view() == "show_tab" - ) - or request.get_module() == "area" and ( - request.get_view() == "list" - or request.get_view() == "show" - or request.get_view() == "show_tab" + request.get_module() == "area" and ( + request.get_view() == "list" or request.get_view() == "show" ) or request.get_module() == "policy" and request.get_view() == "show" or request.get_module() == "policy" and request.get_view() == "list" or request.get_module() == "issue" and request.get_view() == "show" - or request.get_module() == "issue" and request.get_view() == "show_tab" or request.get_module() == "initiative" and request.get_view() == "show" - or request.get_module() == "initiative" and request.get_view() == "show_partial" - or request.get_module() == "initiative" and request.get_view() == "show_tab" - or request.get_module() == "initiative" and request.get_view() == "show.rss" or request.get_module() == "suggestion" and request.get_view() == "show" or request.get_module() == "draft" and request.get_view() == "diff" then diff -r fc14e76afe31 -r f460555c9896 app/main/_filter_view/30_navigation.lua --- a/app/main/_filter_view/30_navigation.lua Sun Feb 12 13:42:08 2012 +0100 +++ b/app/main/_filter_view/30_navigation.lua Sun Feb 12 20:03:26 2012 +0100 @@ -2,27 +2,22 @@ slot.select('navigation', function() + ui.link{ + text = _"Home", + module = 'index', + view = 'index' + } + if app.session.member then - ui.link{ --- image = { static = "icons/16/house.png" }, - text = _"Home", - module = 'index', - view = 'index' - } - end - - if app.session.member or config.public_access then if not config.single_unit_id then ui.link{ --- image = { static = "icons/16/package.png" }, text = _"Units", module = 'unit', view = 'list' } else ui.link{ --- image = { static = "icons/16/package.png" }, text = _"Areas", module = 'area', view = 'list' @@ -32,7 +27,6 @@ if app.session.member == nil then ui.link{ --- image = { static = "icons/16/key.png" }, text = _"Login", module = 'index', view = 'login', @@ -43,19 +37,16 @@ } } ui.link{ --- image = { static = "icons/16/book_edit.png" }, text = _"Registration", module = 'index', view = 'register' } ui.link{ --- image = { static = "icons/16/key_forgot.png" }, text = _"Reset password", module = 'index', view = 'reset_password' } ui.link{ --- image = { static = "icons/16/information.png" }, text = _"About / Impressum", module = 'index', view = 'about' @@ -63,14 +54,12 @@ else ui.link{ --- image = { static = "icons/16/time.png" }, text = _"Timeline", module = "timeline", view = "index" } ui.link{ --- image = { static = "icons/16/group.png" }, text = _"Members", module = 'member', view = 'list', @@ -78,7 +67,6 @@ } ui.link{ --- image = { static = "icons/16/book_edit.png" }, text = _"Contacts", module = 'contact', view = 'list' @@ -91,7 +79,6 @@ } ui.link{ --- image = { static = "icons/16/information.png" }, text = _"About", module = 'index', view = 'about' @@ -103,7 +90,6 @@ ui.link{ attr = { class = { "admin_only" } }, --- image = { static = "icons/16/cog.png" }, text = _"Admin", module = 'admin', view = 'index' diff -r fc14e76afe31 -r f460555c9896 app/main/_filter_view/34_stylesheet.lua --- a/app/main/_filter_view/34_stylesheet.lua Sun Feb 12 13:42:08 2012 +0100 +++ b/app/main/_filter_view/34_stylesheet.lua Sun Feb 12 20:03:26 2012 +0100 @@ -11,48 +11,7 @@ slot.put_into("stylesheet_url", config.absolute_base_url .. "static/style.css") end -if os.getenv("HTTP_USER_AGENT") and os.getenv("HTTP_USER_AGENT"):find("Android.*AppleWebKit.*Mobile Safari") then - slot.select("html_head", function() - ui.tag{ - tag = "style", - content = "body, td, th { font-size: 16px; };" - } - end) -end - -if app.session.member then - local tab_mode = app.session.member:get_setting_value("tab_mode") - if tab_mode then - config.user_tab_mode = tab_mode - end -else - config.user_tab_mode = "accordeon_first_expanded" -end - -local web20 = config.user_tab_mode == "accordeon" - or config.user_tab_mode == "accordeon_first_expanded" - or config.user_tab_mode == "accordeon_all_expanded" - -if web20 then - ui.enable_partial_loading() -end - -if request.get_json_request_slots() then - slot.set_layout("blank") -end - -if request.get_module() ~= "api" and request.get_view() ~= "list_rss" and request.get_module() ~= "sitemap" then - ui.container{ - attr = { - class = web20 and "web20" or "web10" - }, - content = function() - execute.inner() - end - } -else - execute.inner() -end +execute.inner() if config.footer_html then slot.put_into("footer", config.footer_html) diff -r fc14e76afe31 -r f460555c9896 app/main/index/index.lua --- a/app/main/index/index.lua Sun Feb 12 13:42:08 2012 +0100 +++ b/app/main/index/index.lua Sun Feb 12 20:03:26 2012 +0100 @@ -44,18 +44,34 @@ slot.put_into("title", encode.html(config.app_title)) -if app.session.member then - app.html_title.title = app.session.member.name +if app.session.member_id then + util.help("index.index", _"Home") + + execute.view{ + module = "member", + view = "_show", + params = { + member = app.session.member, + show_as_homepage = true + } + } + +elseif config.public_access then + if config.motd_public then + local help_text = config.motd_public + ui.container{ + attr = { class = "wiki motd" }, + content = function() + slot.put(format.wiki_text(help_text)) + end + } + end + + execute.view{ module = "unit", view = "_list" } + +else + + ui.tag{ content = _"Closed user group, please login to participate." } + end - -util.help("index.index", _"Home") - -execute.view{ - module = "member", - view = "_show", - params = { - member = app.session.member, - show_as_homepage = true - } -} diff -r fc14e76afe31 -r f460555c9896 app/main/initiative/_current_draft.lua --- a/app/main/initiative/_current_draft.lua Sun Feb 12 13:42:08 2012 +0100 +++ b/app/main/initiative/_current_draft.lua Sun Feb 12 20:03:26 2012 +0100 @@ -3,7 +3,7 @@ if initiator and initiator.accepted and not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked then ui.link{ - attr = { style = "float: right;" }, + attr = { class = "actions" }, content = function() ui.image{ static = "icons/16/script_add.png" } slot.put(_"Edit draft") @@ -16,7 +16,7 @@ if initiator and initiator.accepted and not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked then ui.link{ - attr = { class = "action", style = "float: right;" }, + attr = { class = "actions" }, content = function() ui.image{ static = "icons/16/script_delete.png" } slot.put(_"Revoke initiative") diff -r fc14e76afe31 -r f460555c9896 app/main/initiative/_show.lua --- a/app/main/initiative/_show.lua Sun Feb 12 13:42:08 2012 +0100 +++ b/app/main/initiative/_show.lua Sun Feb 12 20:03:26 2012 +0100 @@ -30,24 +30,26 @@ attr = { class = "initiative_name" }, content = _("Initiative i#{id}: #{name}", { id = initiative.id, name = initiative.name }) } - ui.tag{ - attr = { class = "initiator_names" }, - content = function() - ui.tag{ content = _"by" } - slot.put(" ") - for i, initiator in ipairs(initiators) do - if i == #initiators and i > 1 then - slot.put(" ", _"and", " ") - elseif i > 1 then - slot.put(", ") + if app.session.member_id or config.public_access == "pseudonym" or config.public_access == "full" then + ui.tag{ + attr = { class = "initiator_names" }, + content = function() + ui.tag{ content = _"by" } + slot.put(" ") + for i, initiator in ipairs(initiators) do + if i == #initiators and i > 1 then + slot.put(" ", _"and", " ") + elseif i > 1 then + slot.put(", ") + end + ui.link{ + text = initiator.name, + module = "member", view = "show", id = initiator.id + } end - ui.link{ - text = initiator.name, - module = "member", view = "show", id = initiator.id - } end - end - } + } + end if initiator and initiator.accepted and not initiative.issue.fully_frozen and not initiative.issue.closed and not initiative.revoked then slot.put(" · ") diff -r fc14e76afe31 -r f460555c9896 app/main/issue/_filters.lua --- a/app/main/issue/_filters.lua Sun Feb 12 13:42:08 2012 +0100 +++ b/app/main/issue/_filters.lua Sun Feb 12 20:03:26 2012 +0100 @@ -5,11 +5,9 @@ filters[#filters+1] = { name = "filter", { - name = "open", - label = _"Open", - selector_modifier = function(selector) - selector:add_where("issue.closed ISNULL") - end + name = "any", + label = _"Any state", + selector_modifier = function(selector) end }, { name = "new", @@ -53,12 +51,7 @@ selector_modifier = function(selector) selector:add_where("issue.closed NOTNULL AND issue.fully_frozen ISNULL") end - }, - { - name = "any", - label = _"Any", - selector_modifier = function(selector) end - }, + } } @@ -94,7 +87,7 @@ name = "initiated", label = _"Initiated", selector_modifier = function(selector) - selector:add_where({ "EXISTS (SELECT 1 FROM initiative JOIN initiator ON initiator.initiative_id = initiative.id AND initiator.member_id = ? WHERE initiative.issue_id = issue.id)", app.session.member.id }) + selector:add_where({ "EXISTS (SELECT 1 FROM initiative JOIN initiator ON initiator.initiative_id = initiative.id AND initiator.member_id = ? AND initiator.accepted WHERE initiative.issue_id = issue.id)", app.session.member.id }) end }, } @@ -104,6 +97,7 @@ local filter = { name = "order" } local text = _"Time left" + local f = param.get_all_cgi()["filter"] if f == "finished" or f == "cancelled" then text = _"Recently closed" end @@ -115,6 +109,14 @@ end } + filter[#filter+1] = { + name = "latest", + label = _"Latest", + selector_modifier = function(selector) + selector:add_order_by("issue.created DESC") + end + } + filter[#filter+1] = { name = "max_potential_support", label = _"Supporter count", @@ -123,14 +125,6 @@ end } - filter[#filter+1] = { - name = "newest", - label = _"Newest", - selector_modifier = function(selector) - selector:add_order_by("issue.created DESC") - end - } - filters[#filters+1] = filter end diff -r fc14e76afe31 -r f460555c9896 app/main/member/_list_supported_initiatives.lua --- a/app/main/member/_list_supported_initiatives.lua Sun Feb 12 13:42:08 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,106 +0,0 @@ -local initiatives_selector = param.get("initiatives_selector", "table") -local member = param.get("member", "table") - -local filters = { - { - label = _"Filter", - { - name = "open", - label = _"Open", - selector_modifier = function(selector) - selector:add_where("issue.closed ISNULL") - end - }, - { - name = "new", - label = _"New", - selector_modifier = function(selector) - selector:add_where("issue.accepted ISNULL AND issue.closed ISNULL") - end - }, - { - name = "accepted", - label = _"In discussion", - selector_modifier = function(selector) - selector:add_where("issue.accepted NOTNULL AND issue.half_frozen ISNULL AND issue.closed ISNULL") - end - }, - { - name = "half_frozen", - label = _"Frozen", - selector_modifier = function(selector) - selector:add_where("issue.half_frozen NOTNULL AND issue.fully_frozen ISNULL") - end - }, - { - name = "frozen", - label = _"Voting", - selector_modifier = function(selector) - selector:add_where("issue.fully_frozen NOTNULL AND issue.closed ISNULL") - filter_voting = true - end - }, - { - name = "finished", - label = _"Finished", - selector_modifier = function(selector) - selector:add_where("issue.closed NOTNULL AND issue.fully_frozen NOTNULL") - end - }, - { - name = "cancelled", - label = _"Cancelled", - selector_modifier = function(selector) - selector:add_where("issue.closed NOTNULL AND issue.fully_frozen ISNULL") - end - }, - { - name = "any", - label = _"Any", - selector_modifier = function(selector) end - }, - } -} - - -if member then - filters[#filters+1] = { - label = _"Support", - name = "support", - { - name = "any", - label = _"Any", - selector_modifier = function(selector) - end - }, - { - name = "potential", - label = _"Potential supported", - selector_modifier = function(selector) - -- not even having is_potential_supporter is working here :-( hopefully the optimizer will work it out... - selector:add_where({"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)))", member.id }) - end - }, - { - name = "supporter", - label = _"Supporter", - selector_modifier = function(selector) - selector:add_where({"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)))", member.id }) - end - }, - } -end - -filters.label = _"Filter" -filters.name = "filter_voting" -filters.selector = initiatives_selector -filters.content = function() - execute.view{ - module = "initiative", - view = "_list", - params = { initiatives_selector = initiatives_selector } - } - end - - -ui.filters(filters) diff -r fc14e76afe31 -r f460555c9896 app/main/member/show_tab.lua --- a/app/main/member/show_tab.lua Sun Feb 12 13:42:08 2012 +0100 +++ b/app/main/member/show_tab.lua Sun Feb 12 20:03:26 2012 +0100 @@ -161,37 +161,26 @@ params = { areas_selector = areas_selector, member = member }, } -local issues_selector = member:get_reference_selector("issues") +local issues_selector = Issue:new_selector() tabs[#tabs+1] = { name = "issues", label = _"Issues" .. " (" .. tostring(issues_selector:count()) .. ")", icon = { static = "icons/16/folder.png" }, module = "issue", view = "_list", - params = { issues_selector = issues_selector }, + params = { issues_selector = issues_selector, filter_interest = "my" }, } - -local supported_initiatives_selector = member:get_reference_selector("supported_initiatives") - + +local outgoing_delegations_selector = member:get_reference_selector("outgoing_delegations") + :left_join("issue", "_member_showtab_issue", "_member_showtab_issue.id = delegation.issue_id") + :add_where("_member_showtab_issue.closed ISNULL") tabs[#tabs+1] = { - name = "supported_initiatives", - label = _"Supported" .. " (" .. tostring(supported_initiatives_selector:count()) .. ")", - icon = { static = "icons/16/thumb_up_green.png" }, - module = "member", - view = "_list_supported_initiatives", - params = { initiatives_selector = supported_initiatives_selector, - member = member }, -} - -local initiated_initiatives_selector = member:get_reference_selector("initiated_initiatives"):add_where("initiator.accepted = true") -tabs[#tabs+1] = { - name = "initiatied_initiatives", - label = _"Initiated" .. " (" .. tostring(initiated_initiatives_selector:count()) .. ")", - icon = { static = "icons/16/user_edit.png" }, - module = "member", - view = "_list_supported_initiatives", - params = { initiatives_selector = initiated_initiatives_selector, - member = member}, + name = "outgoing_delegations", + label = _"Outgoing delegations" .. " (" .. tostring(outgoing_delegations_selector:count()) .. ")", + icon = { static = "icons/16/table_go.png" }, + module = "delegation", + view = "_list", + params = { delegations_selector = outgoing_delegations_selector, outgoing = true }, } local incoming_delegations_selector = member:get_reference_selector("incoming_delegations") @@ -206,18 +195,6 @@ params = { delegations_selector = incoming_delegations_selector, incoming = true }, } -local outgoing_delegations_selector = member:get_reference_selector("outgoing_delegations") - :left_join("issue", "_member_showtab_issue", "_member_showtab_issue.id = delegation.issue_id") - :add_where("_member_showtab_issue.closed ISNULL") -tabs[#tabs+1] = { - name = "outgoing_delegations", - label = _"Outgoing delegations" .. " (" .. tostring(outgoing_delegations_selector:count()) .. ")", - icon = { static = "icons/16/table_go.png" }, - module = "delegation", - view = "_list", - params = { delegations_selector = outgoing_delegations_selector, outgoing = true }, -} - local contacts_selector = member:get_reference_selector("saved_members"):add_where("public") tabs[#tabs+1] = { name = "contacts", diff -r fc14e76afe31 -r f460555c9896 app/main/suggestion/_list.lua --- a/app/main/suggestion/_list.lua Sun Feb 12 13:42:08 2012 +0100 +++ b/app/main/suggestion/_list.lua Sun Feb 12 20:03:26 2012 +0100 @@ -32,10 +32,8 @@ end ui_filters{ - label = _"Show filter", selector = suggestions_selector, { - label = _"Order by", { name = "plus_unfulfilled", label = _"requested", diff -r fc14e76afe31 -r f460555c9896 app/main/unit/_list.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/unit/_list.lua Sun Feb 12 20:03:26 2012 +0100 @@ -0,0 +1,12 @@ +local units = Unit:get_flattened_tree{ active = true } + +ui.list{ + records = units, + columns = { + { + content = function(unit) + ui.link{ text = unit.name, module = "area", view = "list", params = { unit_id = unit.id } } + end + } + } +} \ No newline at end of file diff -r fc14e76afe31 -r f460555c9896 app/main/unit/list.lua --- a/app/main/unit/list.lua Sun Feb 12 13:42:08 2012 +0100 +++ b/app/main/unit/list.lua Sun Feb 12 20:03:26 2012 +0100 @@ -1,26 +1,5 @@ -local units = Unit:get_flattened_tree{ active = true } - slot.put_into("title", _"Unit list") -if not app.session.member_id and config.motd_public then - local help_text = config.motd_public - ui.container{ - attr = { class = "wiki motd" }, - content = function() - slot.put(format.wiki_text(help_text)) - end - } -end - util.help("unit.list", _"Unit list") -ui.list{ - records = units, - columns = { - { - content = function(unit) - ui.link{ text = unit.name, module = "area", view = "list", params = { unit_id = unit.id } } - end - } - } -} \ No newline at end of file +execute.view{ module = "unit", view = "_list" } \ No newline at end of file diff -r fc14e76afe31 -r f460555c9896 env/ui/field/issue_state.lua --- a/env/ui/field/issue_state.lua Sun Feb 12 13:42:08 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -function ui.field.issue_state(args) - ui.form_element(args, {fetch_value = true}, function(args) - local value = args.value - local state_name = Issue:get_state_name_for_state(value) - ui.tag{ - attr = { class = "vote_now" }, - content = function() - ui.tag{ - attr = { class = "value" }, - content = tostring(state_name) - } - end - } - end) -end diff -r fc14e76afe31 -r f460555c9896 env/ui/field/negative_votes.lua --- a/env/ui/field/negative_votes.lua Sun Feb 12 13:42:08 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -function ui.field.negative_votes(args) - ui.form_element(args, {fetch_value = true}, function(args) - local value = args.value - ui.container{ - attr = { class = "negative_votes" }, - content = function() - ui.tag{ - attr = { class = "value" }, - content = function() - slot.put(tostring(value) .. ' ') - end - } - end - } - end) -end diff -r fc14e76afe31 -r f460555c9896 env/ui/field/positive_votes.lua --- a/env/ui/field/positive_votes.lua Sun Feb 12 13:42:08 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -function ui.field.positive_votes(args) - ui.form_element(args, {fetch_value = true}, function(args) - local value = args.value - ui.container{ - attr = { class = "positive_votes" }, - content = function() - ui.tag{ - attr = { class = "value" }, - content = function() - slot.put(tostring(value) .. ' ') - end - } - end - } - end) -end diff -r fc14e76afe31 -r f460555c9896 env/ui/field/potential_initiative_weight.lua --- a/env/ui/field/potential_initiative_weight.lua Sun Feb 12 13:42:08 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -function ui.field.potential_initiative_weight(args) - ui.form_element(args, {fetch_value = true}, function(args) - local value = args.value - ui.tag{ - attr = { class = "potential_weight" }, - content = function() - ui.tag{ - attr = { class = "value" }, - content = "(" .. tostring(value) .. ")" - } - end - } - end) -end \ No newline at end of file diff -r fc14e76afe31 -r f460555c9896 env/ui/field/potential_issue_weight.lua --- a/env/ui/field/potential_issue_weight.lua Sun Feb 12 13:42:08 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -function ui.field.potential_issue_weight(args) - ui.form_element(args, {fetch_value = true}, function(args) - local value = args.value - ui.tag{ - attr = { class = "potential_weight" }, - content = function() - ui.tag{ - attr = { class = "value" }, - content = tostring(value) - } - end - } - end) -end \ No newline at end of file diff -r fc14e76afe31 -r f460555c9896 env/ui/field/satisfaction_informed.lua --- a/env/ui/field/satisfaction_informed.lua Sun Feb 12 13:42:08 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -function ui.field.satisfaction_informed(args) - ui.form_element(args, {fetch_value = true}, function(args) - local value = args.value - ui.tag{ - attr = { class = "satisfaction_informed" }, - content = function() - ui.tag{ - attr = { class = "value" }, - content = function() - slot.put(tostring(value) .. ' ') - ui.image{ - static = "icons/16/thumb_up_green.png" - } - end - } - end - } - end) -end - diff -r fc14e76afe31 -r f460555c9896 env/ui/field/satisfaction_total.lua --- a/env/ui/field/satisfaction_total.lua Sun Feb 12 13:42:08 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -function ui.field.satisfaction_total(args) - ui.form_element(args, {fetch_value = true}, function(args) - local value = args.value - ui.tag{ - attr = { class = "satisfaction_total" }, - content = function() - ui.tag{ - attr = { class = "value" }, - content = function() - slot.put("(") - slot.put(tostring(value) .. ' ') - ui.image{ - static = "icons/16/thumb_up_green.png" - } - slot.put(")") - end - } - end - } - end) -end - diff -r fc14e76afe31 -r f460555c9896 env/ui/field/vote_later.lua --- a/env/ui/field/vote_later.lua Sun Feb 12 13:42:08 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -function ui.field.vote_later(args) - ui.form_element(args, {fetch_value = true}, function(args) - local value = args.value - ui.tag{ - attr = { class = "vote_later" }, - content = function() - ui.tag{ - attr = { class = "value" }, - content = tostring(value) - } - end - } - end) -end diff -r fc14e76afe31 -r f460555c9896 env/ui/field/vote_now.lua --- a/env/ui/field/vote_now.lua Sun Feb 12 13:42:08 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -function ui.field.vote_now(args) - ui.form_element(args, {fetch_value = true}, function(args) - local value = args.value - ui.tag{ - attr = { class = "vote_now" }, - content = function() - ui.tag{ - attr = { class = "value" }, - content = tostring(value) - } - end - } - end) -end diff -r fc14e76afe31 -r f460555c9896 model/initiative.lua --- a/model/initiative.lua Sun Feb 12 13:42:08 2012 +0100 +++ b/model/initiative.lua Sun Feb 12 20:03:26 2012 +0100 @@ -127,7 +127,6 @@ :add_group_by('"initiative"."satisfied_informed_supporter_count"') :add_group_by('"initiative"."positive_votes"') :add_group_by('"initiative"."negative_votes"') - :add_group_by('"initiative"."agreed"') :add_group_by('"initiative"."rank"') :add_group_by('"initiative"."suggested_initiative_id"') :add_group_by('"initiative"."text_search_data"') diff -r fc14e76afe31 -r f460555c9896 model/issue.lua --- a/model/issue.lua Sun Feb 12 13:42:08 2012 +0100 +++ b/model/issue.lua Sun Feb 12 20:03:26 2012 +0100 @@ -140,8 +140,6 @@ :add_group_by('"issue"."snapshot"') :add_group_by('"issue"."latest_snapshot_event"') :add_group_by('"issue"."population"') - :add_group_by('"issue"."vote_now"') - :add_group_by('"issue"."vote_later"') :add_group_by('"issue"."voter_count"') :add_group_by('"issue"."admission_time"') :add_group_by('"issue"."discussion_time"') diff -r fc14e76afe31 -r f460555c9896 static/style.css --- a/static/style.css Sun Feb 12 13:42:08 2012 +0100 +++ b/static/style.css Sun Feb 12 20:03:26 2012 +0100 @@ -636,6 +636,7 @@ .ui_filter { overflow: hidden; + margin-bottom: 1ex; } .ui_filter_closed_head,