diff -r 91671766a701 -r 6a12fb7e4963 app/main/api/initiative.lua --- a/app/main/api/initiative.lua Thu Aug 19 15:37:51 2010 +0200 +++ b/app/main/api/initiative.lua Mon Aug 30 21:52:19 2010 +0200 @@ -7,10 +7,15 @@ local state = param.get("state") local agreed = param.get("agreed") local rank = param.get("rank") -local search = param.get("search") -local search_context = param.get("search_context") or "full" +--local search = param.get("search") +--local search_context = param.get("search_context") or "full" local limit = param.get("limit", atom.integer) local order = param.get("order") +local render_draft = param.get("render_draft") + +if render_draft and render_draft ~= "html" then + error("unsupported render target, only 'html' is supported right now") +end local initiatives_selector = Initiative:new_selector() :join("issue", nil, "issue.id = initiative.issue_id") @@ -53,11 +58,13 @@ initiatives_selector:add_where{ "initiative.rank = ?", rank } end +--[[ if search then if search_context == "full" then elseif search_context == "title" then end end +--]] if order == "supporter_count" then initiatives_selector:add_order_by("initiative.supporter_count") @@ -154,7 +161,13 @@ return format.timestamp(record.created) end }, - { name = "revoked", field = "initiative.revoked" }, + { + name = "revoked", + field = "initiative.revoked", + func = function(record) + return format.timestamp(record.revoked) + end + }, { name = "suggested_initiative_id", field = "initiative.suggested_initiative_id" }, { name = "admitted", field = "initiative.admitted" }, { name = "issue_population", field = "issue.population" }, @@ -185,14 +198,18 @@ { name = "current_draft_content", func = function(record) - return record.current_draft.content + if render_draft then + return record.current_draft:get_content(render_draft) + else + return record.current_draft.content + end end } } util.autoapi{ relation_name = "initiative", - selector = initiatives_selector, - fields = fields, - api_engine = api_engine + selector = initiatives_selector, + fields = fields, + api_engine = api_engine } \ No newline at end of file diff -r 91671766a701 -r 6a12fb7e4963 app/main/api/suggestion.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/api/suggestion.lua Mon Aug 30 21:52:19 2010 +0200 @@ -0,0 +1,56 @@ +local id = param.get("id") +local min_id = param.get("min_id") +local max_id = param.get("max_id") +local initiative_id = param.get("initiative_id") +local order = param.get("order") +local limit = param.get("limit", atom.integer) + +local suggestions_selector = Suggestion:new_selector() + +if id then + suggestions_selector:add_where{"suggestion.id = ?", id} +end + +if min_id then + suggestions_selector:add_where{"suggestion.id >= ?", min_id} +end + +if max_id then + suggestions_selector:add_where{"suggestion.id <= ?", max_id} +end + +if order == "id_desc" then + suggestions_selector:add_order_by("suggestion.id DESC") +else + suggestions_selector:add_order_by("suggestion.id") +end + +if limit then + suggestions_selector:limit(limit) +end + +local api_engine = param.get("api_engine") or "xml" + +local fields = { + + { name = "id", field = "suggestion.id" }, + { name = "initiative_id", field = "suggestion.initiative_id" }, + { name = "name", field = "suggestion.name" }, + { name = "description", field = "suggestion.description" }, + { name = "minus2_unfulfilled_count", field = "suggestion.minus2_unfulfilled_count" }, + { name = "minus2_fulfilled_count", field = "suggestion.minus2_fulfilled_count" }, + { name = "minus1_unfulfilled_count", field = "suggestion.minus1_unfulfilled_count" }, + { name = "minus1_fulfilled_count", field = "suggestion.minus1_fulfilled_count" }, + { name = "plus1_unfulfilled_count", field = "suggestion.plus1_unfulfilled_count" }, + { name = "plus1_fulfilled_count", field = "suggestion.plus1_fulfilled_count" }, + { name = "plus2_unfulfilled_count", field = "suggestion.plus2_unfulfilled_count" }, + { name = "plus2_fulfilled_count", field = "suggestion.plus2_fulfilled_count" }, + +} + +util.autoapi{ + relation_name = "suggestion", + selector = suggestions_selector, + fields = fields, + api_engine = api_engine +} \ No newline at end of file diff -r 91671766a701 -r 6a12fb7e4963 app/main/draft/_action/add.lua --- a/app/main/draft/_action/add.lua Thu Aug 19 15:37:51 2010 +0200 +++ b/app/main/draft/_action/add.lua Mon Aug 30 21:52:19 2010 +0200 @@ -34,6 +34,9 @@ error("invalid formatting engine!") end +if param.get("preview") then + return false +end local draft = Draft:new() draft.author_id = app.session.member.id diff -r 91671766a701 -r 6a12fb7e4963 app/main/draft/diff.lua --- a/app/main/draft/diff.lua Thu Aug 19 15:37:51 2010 +0200 +++ b/app/main/draft/diff.lua Mon Aug 30 21:52:19 2010 +0200 @@ -22,92 +22,73 @@ local old_draft = Draft:by_id(old_draft_id) local new_draft = Draft:by_id(new_draft_id) +local old_draft_content = string.gsub(string.gsub(old_draft.content, "\n", " ###ENTER###\n"), " ", "\n") +local new_draft_content = string.gsub(string.gsub(new_draft.content, "\n", " ###ENTER###\n"), " ", "\n") + local key = multirand.string(26, "123456789bcdfghjklmnpqrstvwxyz"); local old_draft_filename = encode.file_path(request.get_app_basepath(), 'tmp', "diff-" .. key .. "-old.tmp") local new_draft_filename = encode.file_path(request.get_app_basepath(), 'tmp', "diff-" .. key .. "-new.tmp") local old_draft_file = assert(io.open(old_draft_filename, "w")) -old_draft_file:write(old_draft.content) +old_draft_file:write(old_draft_content) old_draft_file:write("\n") old_draft_file:close() local new_draft_file = assert(io.open(new_draft_filename, "w")) -new_draft_file:write(new_draft.content) +new_draft_file:write(new_draft_content) new_draft_file:write("\n") new_draft_file:close() -local output, err, status = os.pfilter(nil, "sh", "-c", "diff -U 100000 '" .. old_draft_filename .. "' '" .. new_draft_filename .. "' | grep -v ^--- | grep -v ^+++ | grep -v ^@") +local output, err, status = os.pfilter(nil, "sh", "-c", "diff -U 1000000000 '" .. old_draft_filename .. "' '" .. new_draft_filename .. "' | grep -v ^--- | grep -v ^+++ | grep -v ^@") os.remove(old_draft_filename) os.remove(new_draft_filename) +local last_state = "first_run" + +local function process_line(line) + local state_char = string.sub(line, 1, 1) + local state + if state_char == "+" then + state = "added" + elseif state_char == "-" then + state = "removed" + elseif state_char == " " then + state = "unchanged" + end + local state_changed = false + if state ~= last_state then + if last_state ~= "first_run" then + slot.put(" ") + end + last_state = state + state_changed = true + slot.put("") + end + + line = string.sub(line, 2, #line) + if line ~= "###ENTER###" then + if not state_changed then + slot.put(" ") + end + slot.put(line) + else + slot.put("
") + end +end + if not status then ui.field.text{ value = _"The drafts do not differ" } else - slot.put('') - slot.put('') - - local last_state = "unchanged" - local lines = {} - local removed_lines = nil - - local function process_line(line) - local state = "unchanged" - local char = line:sub(1,1) - line = line:sub(2) - state = "unchanged" - if char == "-" then - state = "-" - elseif char == "+" then - state = "+" - elseif char == "!" then - state = "eof" + ui.container{ + tag = "div", + attr = { class = "diff" }, + content = function() + output = output:gsub("[^\n\r]+", function(line) + process_line(line) + end) end - if last_state == "unchanged" then - if state == "unchanged" then - lines[#lines+1] = line - elseif (state == "-") or (state == "+") or (state == "eof") then - local text = table.concat(lines, "\n") - slot.put("") - lines = { line } - end - elseif last_state == "-" then - if state == "-" then - lines[#lines+1] = line - elseif state == "+" then - removed_lines = lines - lines = { line } - elseif (state == "unchanged") or (state == "eof") then - local text = table.concat(lines,"\n") - slot.put('") - lines = { line } - end - elseif last_state == "+" then - if state == "+" then - lines[#lines+1] = line - elseif (state == "-") or (state == "unchanged") or (state == "eof") then - if removed_lines then - local text = table.concat(lines, "\n") - local removed_text = table.concat(removed_lines, "\n") - slot.put('") - else - local text = table.concat(lines, "\n") - slot.put('") - end - removed_lines = nil - lines = { line } - end - end - last_state = state - end - - output = output .. " " - output = output:gsub("[^\n\r]+", function(line) - process_line(line) - end) - process_line("!") - - slot.put("

-' .. _"Old draft revision" .. '
+' .. _"New draft revision" .. '
 ", encode.html_newlines(encode.html(text)), "
-', encode.html_newlines(encode.html(text)), "
-', encode.html_newlines(encode.html(removed_text)), '
+', encode.html_newlines(encode.html(text)), "
+', encode.html_newlines(encode.html(text)), "

") + } end diff -r 91671766a701 -r 6a12fb7e4963 app/main/draft/new.lua --- a/app/main/draft/new.lua Thu Aug 19 15:37:51 2010 +0200 +++ b/app/main/draft/new.lua Mon Aug 30 21:52:19 2010 +0200 @@ -14,6 +14,8 @@ } end) + + ui.form{ record = initiative.current_draft, attr = { class = "vertical" }, @@ -21,7 +23,7 @@ action = "add", params = { initiative_id = initiative.id }, routing = { - default = { + ok = { mode = "redirect", module = "initiative", view = "show", @@ -31,6 +33,22 @@ content = function() ui.field.text{ label = _"Author", value = app.session.member.name, readonly = true } + + if param.get("preview") then + ui.container{ + attr = { class = "draft_content wiki" }, + content = function() + slot.put(format.wiki_text(param.get("content"), param.get("formatting_engine"))) + end + } + slot.put("
") + ui.submit{ text = _"Save" } + slot.put("
") + slot.put("
") + end + slot.put("
") + + ui.field.select{ label = _"Wiki engine", name = "formatting_engine", @@ -45,9 +63,11 @@ label = _"Content", name = "content", multiline = true, - attr = { style = "height: 50ex;" } + attr = { style = "height: 50ex;" }, + value = param.get("content") } + ui.submit{ name = "preview", text = _"Preview" } ui.submit{ text = _"Save" } end } diff -r 91671766a701 -r 6a12fb7e4963 app/main/initiative/_action/create.lua --- a/app/main/initiative/_action/create.lua Thu Aug 19 15:37:51 2010 +0200 +++ b/app/main/initiative/_action/create.lua Mon Aug 30 21:52:19 2010 +0200 @@ -54,6 +54,9 @@ error("invalid formatting engine!") end +if param.get("preview") then + return +end local initiative = Initiative:new() diff -r 91671766a701 -r 6a12fb7e4963 app/main/initiative/new.lua --- a/app/main/initiative/new.lua Thu Aug 19 15:37:51 2010 +0200 +++ b/app/main/initiative/new.lua Mon Aug 30 21:52:19 2010 +0200 @@ -41,7 +41,7 @@ foreign_records = tmp, foreign_id = "id", foreign_name = "name", - value = (area.default_policy or {}).id + value = area.default_policy and area.default_policy.id or param.get("policy_id", atom.integer) } ui.tag{ tag = "div", @@ -70,9 +70,57 @@ end } end + + if param.get("preview") then + ui.heading{ level = 1, content = encode.html(param.get("name")) } + local discussion_url = param.get("discussion_url") + ui.container{ + attr = { class = "ui_field_label" }, + content = _"Discussion with initiators" + } + ui.tag{ + tag = "span", + content = function() + if discussion_url:find("^https?://") then + if discussion_url and #discussion_url > 0 then + ui.link{ + attr = { + class = "actions", + target = "_blank", + title = discussion_url + }, + content = discussion_url, + external = discussion_url + } + end + else + slot.put(encode.html(discussion_url)) + end + end + } + ui.container{ + attr = { class = "draft_content wiki" }, + content = function() + slot.put(format.wiki_text(param.get("draft"), param.get("formatting_engine"))) + end + } + slot.put("
") + ui.submit{ text = _"Save" } + slot.put("
") + slot.put("
") + end slot.put("
") - ui.field.text{ label = _"Title of initiative", name = "name" } - ui.field.text{ label = _"Discussion URL", name = "discussion_url" } + + ui.field.text{ + label = _"Title of initiative", + name = "name", + value = param.get("name") + } + ui.field.text{ + label = _"Discussion URL", + name = "discussion_url", + value = param.get("discussion_url") + } ui.field.select{ label = _"Wiki engine", name = "formatting_engine", @@ -81,9 +129,17 @@ { id = "compat", name = _"Traditional wiki syntax" } }, foreign_id = "id", - foreign_name = "name" + foreign_name = "name", + value = param.get("formatting_engine") } - ui.field.text{ label = _"Draft", name = "draft", multiline = true, attr = { style = "height: 50ex;" } } + ui.field.text{ + label = _"Draft", + name = "draft", + multiline = true, + attr = { style = "height: 50ex;" }, + value = param.get("draft") + } + ui.submit{ name = "preview", text = _"Preview" } ui.submit{ text = _"Save" } end } \ No newline at end of file diff -r 91671766a701 -r 6a12fb7e4963 app/main/member/_list_supported_initiatives.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/member/_list_supported_initiatives.lua Mon Aug 30 21:52:19 2010 +0200 @@ -0,0 +1,72 @@ +local initiatives_selector = param.get("initiatives_selector", "table") + +ui.filters{ + label = _"Filter", + name = "filter_voting", + selector = initiatives_selector, + { + 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 + }, + }, + content = function() + execute.view{ + module = "initiative", + view = "_list", + params = { initiatives_selector = initiatives_selector } + } + end +} diff -r 91671766a701 -r 6a12fb7e4963 app/main/member/history.lua --- a/app/main/member/history.lua Thu Aug 19 15:37:51 2010 +0200 +++ b/app/main/member/history.lua Mon Aug 30 21:52:19 2010 +0200 @@ -55,7 +55,7 @@ } ui.tag{ tag = "td", - content = member.active and _'activated' or _'deactivated', + content = entry.active and _'activated' or _'deactivated', } ui.tag{ tag = "td", diff -r 91671766a701 -r 6a12fb7e4963 app/main/member/show_tab.lua --- a/app/main/member/show_tab.lua Thu Aug 19 15:37:51 2010 +0200 +++ b/app/main/member/show_tab.lua Mon Aug 30 21:52:19 2010 +0200 @@ -152,12 +152,13 @@ } local supported_initiatives_selector = member:get_reference_selector("supported_initiatives") + tabs[#tabs+1] = { name = "supported_initiatives", label = _"Supported initiatives" .. " (" .. tostring(supported_initiatives_selector:count()) .. ")", icon = { static = "icons/16/thumb_up_green.png" }, - module = "initiative", - view = "_list", + module = "member", + view = "_list_supported_initiatives", params = { initiatives_selector = supported_initiatives_selector }, } @@ -166,8 +167,8 @@ name = "initiatied_initiatives", label = _"Initiated initiatives" .. " (" .. tostring(initiated_initiatives_selector:count()) .. ")", icon = { static = "icons/16/user_edit.png" }, - module = "initiative", - view = "_list", + module = "member", + view = "_list_supported_initiatives", params = { initiatives_selector = initiated_initiatives_selector }, } diff -r 91671766a701 -r 6a12fb7e4963 app/main/opinion/_action/update.lua --- a/app/main/opinion/_action/update.lua Thu Aug 19 15:37:51 2010 +0200 +++ b/app/main/opinion/_action/update.lua Mon Aug 30 21:52:19 2010 +0200 @@ -28,7 +28,7 @@ if opinion then opinion:destroy() end - slot.put_into("notice", _"Your opinion has been deleted") + slot.put_into("notice", _"Your rating has been deleted") return end @@ -52,4 +52,4 @@ opinion:save() -slot.put_into("notice", _"Your opinion has been updated") +slot.put_into("notice", _"Your rating has been updated") diff -r 91671766a701 -r 6a12fb7e4963 app/main/suggestion/_list.lua --- a/app/main/suggestion/_list.lua Thu Aug 19 15:37:51 2010 +0200 +++ b/app/main/suggestion/_list.lua Mon Aug 30 21:52:19 2010 +0200 @@ -84,21 +84,20 @@ end }, { - label = _"Collective opinion", + label = _"Collective opinion of supporters", label_attr = { style = "width: 101px;" }, content = function(record) if record.minus2_unfulfilled_count then - local max_value = record.initiative.issue.population + local max_value = record.initiative.supporter_count ui.bargraph{ max_value = max_value, - width = 50, + width = 100, bars = { - { color = "#ddd", value = max_value - record.minus2_unfulfilled_count - record.minus1_unfulfilled_count - record.minus2_fulfilled_count - record.minus1_fulfilled_count }, + { color = "#0a0", value = record.plus2_unfulfilled_count + record.plus2_fulfilled_count }, + { color = "#8f8", value = record.plus1_unfulfilled_count + record.plus1_fulfilled_count }, + { color = "#eee", value = max_value - record.minus2_unfulfilled_count - record.minus1_unfulfilled_count - record.minus2_fulfilled_count - record.minus1_fulfilled_count - record.plus1_unfulfilled_count - record.plus2_unfulfilled_count - record.plus1_fulfilled_count - record.plus2_fulfilled_count}, { color = "#f88", value = record.minus1_unfulfilled_count + record.minus1_fulfilled_count }, { color = "#a00", value = record.minus2_unfulfilled_count + record.minus2_fulfilled_count }, - { color = "#0a0", value = record.plus2_unfulfilled_count + record.plus2_fulfilled_count }, - { color = "#8f8", value = record.plus1_unfulfilled_count + record.plus1_fulfilled_count }, - { color = "#ddd", value = max_value - record.plus1_unfulfilled_count - record.plus2_unfulfilled_count - record.plus1_fulfilled_count - record.plus2_fulfilled_count }, } } end @@ -106,6 +105,7 @@ }, { label = _"My opinion", + label_attr = { style = "width: 130px; font-style: italic;" }, content = function(record) local degree local opinion @@ -120,67 +120,53 @@ content = function() if app.session.member_id then if initiative.issue.state == "voting" or initiative.issue.state == "closed" then - ui.tag{ - tag = "span", - attr = { class = "action" .. (degree == -2 and " active_red2" or "") }, - content = _"must not" - } - ui.tag{ - tag = "span", - attr = { class = "action" .. (degree == -1 and " active_red1" or "") }, - content = _"should not" - } - ui.tag{ - tag = "span", - attr = { class = "action" .. (degree == nil and " active" or "") }, - content = _"neutral" - } - ui.tag{ - tag = "span", - attr = { class = "action" .. (degree == 1 and " active_green1" or "") }, - content = _"should" - } - ui.tag{ - tag = "span", - attr = { class = "action" .. (degree == 2 and " active_green2" or "") }, - content = _"must" - } + if degree == -2 then + ui.tag{ + tag = "span", + attr = { + class = "action" .. (degree == -2 and " active_red2" or "") + }, + content = _"must not" + } + end + if degree == -1 then + ui.tag{ + tag = "span", + attr = { class = "action" .. (degree == -1 and " active_red1" or "") }, + content = _"should not" + } + end + if degree == nil then + ui.tag{ + tag = "span", + attr = { class = "action" .. (degree == nil and " active" or "") }, + content = _"neutral" + } + end + if degree == 1 then + ui.tag{ + tag = "span", + attr = { class = "action" .. (degree == 1 and " active_green1" or "") }, + content = _"should" + } + end + if degree == 2 then + ui.tag{ + tag = "span", + attr = { class = "action" .. (degree == 2 and " active_green2" or "") }, + content = _"must" + } + end else ui.link{ - attr = { class = "action" .. (degree == -2 and " active_red2" or "") }, - text = _"must not", + attr = { class = "action" .. (degree == 2 and " active_green2" or "") }, + text = _"must", module = "opinion", action = "update", routing = { default = { mode = "redirect", module = request.get_module(), view = request.get_view(), id = param.get_id_cgi(), params = param.get_all_cgi() } }, params = { suggestion_id = record.id, - degree = -2 - }, - partial = partial - } - slot.put(" ") - ui.link{ - attr = { class = "action" .. (degree == -1 and " active_red1" or "") }, - text = _"should not", - module = "opinion", - action = "update", - routing = { default = { mode = "redirect", module = request.get_module(), view = request.get_view(), id = param.get_id_cgi(), params = param.get_all_cgi() } }, - params = { - suggestion_id = record.id, - degree = -1 - }, - partial = partial - } - slot.put(" ") - ui.link{ - attr = { class = "action" .. (degree == nil and " active" or "") }, - text = _"neutral", - module = "opinion", - action = "update", - routing = { default = { mode = "redirect", module = request.get_module(), view = request.get_view(), id = param.get_id_cgi(), params = param.get_all_cgi() } }, - params = { - suggestion_id = record.id, - delete = true + degree = 2 }, partial = partial } @@ -199,14 +185,40 @@ } slot.put(" ") ui.link{ - attr = { class = "action" .. (degree == 2 and " active_green2" or "") }, - text = _"must", + attr = { class = "action" .. (degree == nil and " active" or "") }, + text = _"neutral", module = "opinion", action = "update", routing = { default = { mode = "redirect", module = request.get_module(), view = request.get_view(), id = param.get_id_cgi(), params = param.get_all_cgi() } }, params = { suggestion_id = record.id, - degree = 2 + delete = true + }, + partial = partial + } + slot.put(" ") + ui.link{ + attr = { class = "action" .. (degree == -1 and " active_red1" or "") }, + text = _"should not", + module = "opinion", + action = "update", + routing = { default = { mode = "redirect", module = request.get_module(), view = request.get_view(), id = param.get_id_cgi(), params = param.get_all_cgi() } }, + params = { + suggestion_id = record.id, + degree = -1 + }, + partial = partial + } + slot.put(" ") + ui.link{ + attr = { class = "action" .. (degree == -2 and " active_red2" or "") }, + text = _"must not", + module = "opinion", + action = "update", + routing = { default = { mode = "redirect", module = request.get_module(), view = request.get_view(), id = param.get_id_cgi(), params = param.get_all_cgi() } }, + params = { + suggestion_id = record.id, + degree = -2 }, partial = partial } @@ -219,71 +231,48 @@ end }, { - content = function(record) - local opinion - if app.session.member_id then - opinion = Opinion:by_pk(app.session.member.id, record.id) - end - if opinion and not opinion.fulfilled then - ui.image{ static = "icons/16/cross.png" } - end - end - }, - { label = _"Suggestion currently not implemented", label_attr = { style = "width: 101px;" }, content = function(record) if record.minus2_unfulfilled_count then - local max_value = record.initiative.issue.population + local max_value = record.initiative.supporter_count ui.bargraph{ max_value = max_value, - width = 50, + width = 100, bars = { - { color = "#ddd", value = max_value - record.minus2_unfulfilled_count - record.minus1_unfulfilled_count }, - { color = "#f88", value = record.minus1_unfulfilled_count }, - { color = "#a00", value = record.minus2_unfulfilled_count }, { color = "#0a0", value = record.plus2_unfulfilled_count }, { color = "#8f8", value = record.plus1_unfulfilled_count }, - { color = "#ddd", value = max_value - record.plus1_unfulfilled_count - record.plus2_unfulfilled_count }, + { color = "#eee", value = max_value - record.minus2_unfulfilled_count - record.minus1_unfulfilled_count - record.plus1_unfulfilled_count - record.plus2_unfulfilled_count }, + { color = "#f88", value = record.minus1_unfulfilled_count }, + { color = "#a00", value = record.minus2_unfulfilled_count }, } } end end }, { - content = function(record) - local opinion - if app.session.member_id then - opinion = Opinion:by_pk(app.session.member.id, record.id) - end - if opinion and opinion.fulfilled then - ui.image{ static = "icons/16/tick.png" } - end - end - }, - { label = _"Suggestion currently implemented", label_attr = { style = "width: 101px;" }, content = function(record) if record.minus2_fulfilled_count then - local max_value = record.initiative.issue.population + local max_value = record.initiative.supporter_count ui.bargraph{ max_value = max_value, - width = 50, + width = 100, bars = { - { color = "#ddd", value = max_value - record.minus2_fulfilled_count - record.minus1_fulfilled_count }, + { color = "#0a0", value = record.plus2_fulfilled_count }, + { color = "#8f8", value = record.plus1_fulfilled_count }, + { color = "#eee", value = max_value - record.minus2_fulfilled_count - record.minus1_fulfilled_count - record.plus1_fulfilled_count - record.plus2_fulfilled_count}, { color = "#f88", value = record.minus1_fulfilled_count }, { color = "#a00", value = record.minus2_fulfilled_count }, - { color = "#0a0", value = record.plus2_fulfilled_count }, - { color = "#8f8", value = record.plus1_fulfilled_count }, - { color = "#ddd", value = max_value - record.plus1_fulfilled_count - record.plus2_fulfilled_count }, } } end end }, { - label_attr = { style = "width: 200px;" }, + label = app.session.member_id and _"I consider suggestion as" or nil, + label_attr = { style = "width: 100px; font-style: italic;" }, content = function(record) local degree local opinion @@ -294,48 +283,38 @@ degree = opinion.degree end if opinion then - if not opinion.fulfilled then - local text = "" - if opinion.degree > 0 then - text = _"Mark suggestion as implemented and express satisfaction" - else - text = _"Mark suggestion as implemented and express dissatisfaction" - end - ui.link{ - attr = { class = "action" }, - text = text, - module = "opinion", - action = "update", - routing = { default = { mode = "redirect", module = request.get_module(), view = request.get_view(), id = param.get_id_cgi(), params = param.get_all_cgi() } }, - params = { - suggestion_id = record.id, - fulfilled = true - }, - partial = partial - } - else - if opinion.degree > 0 then - text = _"Mark suggestion as not implemented and express dissatisfaction" - else - text = _"Mark suggestion as not implemented and express satisfaction" - end - ui.link{ - attr = { class = "action" }, - text = text, - module = "opinion", - action = "update", - routing = { default = { mode = "redirect", module = request.get_module(), view = request.get_view(), id = param.get_id_cgi(), params = param.get_all_cgi() } }, - params = { - suggestion_id = record.id, - fulfilled = false - }, - partial = partial - } - end + + ui.link{ + attr = { class = opinion.fulfilled and "action active" or "action" }, + text = _"implemented", + module = "opinion", + action = "update", + routing = { default = { mode = "redirect", module = request.get_module(), view = request.get_view(), id = param.get_id_cgi(), params = param.get_all_cgi() } }, + params = { + suggestion_id = record.id, + fulfilled = true + }, + partial = partial + } + slot.put("
") + ui.link{ + attr = { class = not opinion.fulfilled and "action active" or "action" }, + text = _"not implemented", + module = "opinion", + action = "update", + routing = { default = { mode = "redirect", module = request.get_module(), view = request.get_view(), id = param.get_id_cgi(), params = param.get_all_cgi() } }, + params = { + suggestion_id = record.id, + fulfilled = false + }, + partial = partial + } + end end }, { + label = app.session.member_id and _"So I'm" or nil, content = function(record) local opinion if app.session.member_id then @@ -343,9 +322,14 @@ end if opinion then if (opinion.fulfilled and opinion.degree > 0) or (not opinion.fulfilled and opinion.degree < 0) then - ui.image{ static = "icons/16/thumb_up_green.png" } + local title = _"satisfied" + ui.image{ attr = { alt = title, title = title }, static = "icons/emoticon_happy.png" } + elseif opinion.degree == 1 or opinion.degree == -1 then + local title = _"a bit unsatisfied" + ui.image{ attr = { alt = title, title = title }, static = "icons/emoticon_unhappy.png" } else - ui.image{ static = "icons/16/thumb_down_red.png" } + local title = _"more unsatisfied" + ui.image{ attr = { alt = title, title = title }, static = "icons/emoticon_unhappy_red.png" } end end end diff -r 91671766a701 -r 6a12fb7e4963 app/main/vote/list.lua --- a/app/main/vote/list.lua Thu Aug 19 15:37:51 2010 +0200 +++ b/app/main/vote/list.lua Mon Aug 30 21:52:19 2010 +0200 @@ -73,7 +73,7 @@ end end -local initiatives = issue:get_reference_selector("initiatives"):add_where("initiative.admitted"):exec() +local initiatives = issue:get_reference_selector("initiatives"):add_where("initiative.admitted"):add_order_by("initiative.satisfied_supporter_count DESC"):exec() local min_grade = -1; local max_grade = 1; diff -r 91671766a701 -r 6a12fb7e4963 config/default.lua --- a/config/default.lua Thu Aug 19 15:37:51 2010 +0200 +++ b/config/default.lua Mon Aug 30 21:52:19 2010 +0200 @@ -1,5 +1,5 @@ config.app_name = "LiquidFeedback" -config.app_version = "beta26" +config.app_version = "beta27" config.app_title = config.app_name .. " (" .. request.get_config_name() .. " environment)" diff -r 91671766a701 -r 6a12fb7e4963 locale/translations.de.lua --- a/locale/translations.de.lua Thu Aug 19 15:37:51 2010 +0200 +++ b/locale/translations.de.lua Mon Aug 30 21:52:19 2010 +0200 @@ -95,7 +95,7 @@ ["Choose member"] = "Mitglied auswählen"; ["Click for details"] = "Klicke für Details"; ["Closed"] = "geschlossen"; -["Collective opinion"] = "Meinungsbild"; +["Collective opinion of supporters"] = "Meinungsbild der Unterstützer"; ["Commit suggestion"] = "Anregung speichern"; ["Compare"] = "Vergleichen"; ["Confirm"] = "Bestätigen"; @@ -155,9 +155,7 @@ ["Email address confirmation"] = "Bestätigung der E-Mail-Adresse"; ["Email address is confirmed now"] = "E-Mail-Adresse ist jetzt bestätigt"; ["Email address too short!"] = "E-Mail-Adresse ist zu kurz!"; -["Email confirmation request"] = "Bestätigung Deiner E-Mail-Adresse"; ["Email unconfirmed"] = "Unbestätigte E-Mail-Adresse"; -["Empty help text: #{id}.#{lang}.txt"] = "Leerer Hilfe-Text: #{id}.#{lang}.txt"; ["Error while converting image. Please note, that only JPG files are supported!"] = "Fehler beim Konvertieren des Bilds. Bitte beachte, dass nur JPG-Dateien unterstützt werden."; ["Error while resolving openid. Internal message: '#{errmsg}'"] = "Fehler beim Auflösen der OpenID. Interne Fehlermeldung: '#{errmsg}'"; ["Error while updating member, database reported:

(#{errormessage})"] = "Fehler beim aktualisieren des Mitglieds, die Datenbank berichtet folgenden Fehler:

(#{errormessage})"; @@ -179,9 +177,8 @@ ["Help for: #{text}"] = "Hilfe zu: #{text}"; ["Hide"] = "Verstecken"; ["Hide filter details"] = "Filter-Details verstecken"; -["Hide this help message"] = "Diesen Hilfetext ausblenden"; ["Home"] = "Startseite"; -["I accept the terms of use by checking the following checkbox:"] = "Ich akzeptiere die Nutzungsbedingungen durch Auswahl der folgenden Ankreuzbox:"; +["I consider suggestion as"] = "Ich halte die Anregung für"; ["Id"] = "Id"; ["Ident number"] = "Ident-Nummer"; ["If this link is not working, please open following url in your web browser:\n\n"] = "Sollte der Link nicht funktionieren, öffne bitte die folgenden URL in Deinem Web-Browser:\n\n"; @@ -235,7 +232,6 @@ ["JavaScript is disabled or not available."] = "JavaScript ist abgeschaltet oder nicht verfügbar."; ["Last author"] = "Letzter Autor"; ["Last snapshot:"] = "Letzte Auszählung:"; -["Legend:"] = "Legende:"; ["License"] = "Lizenz"; ["Locked?"] = "Gesperrt?"; ["Login"] = "Anmeldung"; @@ -246,10 +242,6 @@ ["Majority"] = "Mehrheit"; ["Manage filter"] = "Filter verwalten"; ["Manage timeline filters"] = "Zeitachsen-Filter verwalten"; -["Mark suggestion as implemented and express dissatisfaction"] = "Anregung als umgesetzt markieren und Unzufriedenheit ausdrücken"; -["Mark suggestion as implemented and express satisfaction"] = "Anregung als umgesetzt markieren und Zufriedenheit ausdrücken"; -["Mark suggestion as not implemented and express dissatisfaction"] = "Anregung als nicht umgesetzt markieren und Unzufriedenheit ausdrücken"; -["Mark suggestion as not implemented and express satisfaction"] = "Anregung als nicht umgesetzt markieren und Zufriedenheit ausdrücken"; ["Max potential support"] = "Max. potentielle Unterstützer"; ["Max support"] = "Max. Unterstützer"; ["Member"] = "Mitglied"; @@ -277,7 +269,6 @@ ["Membership updated"] = "Mitgliedschaft aktualisiert"; ["Memberships"] = "Mitgliedschaften"; ["Message of the day"] = "Hinweise"; -["Missing help text: #{id}.#{lang}.txt"] = "Fehlender Hilfe-Text: #{id}.#{lang}.txt"; ["Mobile phone"] = "Mobiltelefon"; ["Monday"] = "Montag"; ["Move down"] = "Runter schieben"; @@ -288,7 +279,6 @@ ["New address"] = "Neue E-Mail-Adresse"; ["New draft"] = "Neuer Entwurf"; ["New draft has been added to initiative"] = "Neuer Entwurf wurde der Initiative hinzugefügt"; -["New draft revision"] = "Neue Revision des Entwurfs"; ["New initiative"] = "Neue Initiative"; ["New issue"] = "Neues Thema"; ["New password"] = "Neues Kennwort"; @@ -317,11 +307,9 @@ ["Number of incoming delegations, follow link to see more details"] = "Anzahl eingehender Delegationen, Link folgen für mehr Details"; ["Number of initiatives to preview"] = "Anzahl der Initiativen in der Vorschau"; ["OK"] = "OK"; -["Old draft revision"] = "Alte Revision des Entwurfs"; ["Old password"] = "Altes Kennwort"; ["Old password is wrong"] = "Das alte Kennwort ist falsch"; ["Oldest"] = "Älteste"; -["On that page please enter the confirmation code:\n\n"] = "Auf dieser Seite gib bitte folgenden Bestätigungscode ein:\n\n"; ["On that page please enter the reset code:\n\n"] = "Auf dieser Seite gib bitte den folgenden Rücksetzcode ein:\n\n"; ["One issue"] = "Ein Thema"; ["One issue you are interested in"] = "Ein Thema, das Dich interessiert"; @@ -350,7 +338,6 @@ ["Please choose a policy"] = "Bitte wähle ein Regelwerk"; ["Please choose two different versions of the draft to compare"] = "Bitte wähle zwei verschiedene Versionen des Drafts, um sie zu vergleichen."; ["Please choose two versions of the draft to compare"] = "Bitte wähle zwei Versionen des Drafts, um sie zu vergleichen."; -["Please confirm your email address by clicking the following link:\n\n"] = "Bitte bestätige Deine E-Mail-Adresse, indem Du den folgenden Link anklickst:\n\n"; ["Please enter the email reset code you have received:"] = "Bitte gib den Rücksetzcode ein, den Du erhalten hast:"; ["Please enter the invite code you've received."] = "Bitte gib den Invite-Code ein, den Du erhalten hast."; ["Please enter your email address. This address will be used for automatic notifications (if you request them) and in case you've lost your password. This address will not be published. After registration you will receive an email with a confirmation link."] = "Bitte gib Deine E-Mail-Adresse ein. Diese Adresse wird für automatische Benachrichtigungen (wenn Du diese anforderst) sowie zum Zurücksetzen des Kennworts verwendet. Diese Adresse wird nicht veröffentlicht. Nach Abschluß der Registration wirst Du eine E-Mail mit einem Link zum Bestätigen der Adresse erhalten."; @@ -364,6 +351,7 @@ ["Potential support"] = "Potentielle Unterstützung"; ["Potential supported"] = "Potentiell unterstützt"; ["Potential supporter"] = "Potentielle Unterstützer"; +["Preview"] = "Vorschau"; ["Previous initiative"] = "Vorherige Initiative"; ["Previous issue"] = "Vorheriges Thema"; ["Profession"] = "Beruf"; @@ -431,6 +419,7 @@ ["Show member"] = "Mitglied anzeigen"; ["Show name history"] = "Namenshistorie zeigen"; ["Show only events which match... (or associtated)"] = "Zeige nur Ereignisse welche folgendes erfüllen... (oder-verknüpft)"; +["So I'm"] = "Also bin ich"; ["Software"] = "Software"; ["Some JavaScript based functions (voting in particular) will not work.\nFor this beta, please use a current version of Firefox, Safari, Opera(?), Konqueror or another (more) standard compliant browser.\nAlternative access without JavaScript will be available soon."] = "Einige auf JavaScript basierende Funktionen (insbesondere der Abstimmung) sind nicht benutzbar.\nFür diese Beta verwende bitte eine aktuelle Version von Firefox, Safari, Opera(?), Konqueror oder einen anderen (mehr) den Standards entsprechenden Browser.\nEin alternativer Zugriff ohne JavaScript wird bald zur Verfügung stehen."; ["Sorry, but there is not confirmed email address for your account. Please contact the administrator or support."] = "Sorry, aber für diesen Account ist keine bestätigte E-Mail-Adresse hinterlegt. Bitte wende Dich an den Administrator oder den Support."; @@ -462,7 +451,6 @@ ["Supported initiatives"] = "Unterstützte Initiativen"; ["Supporter"] = "Unterstützer"; ["Tabs"] = "Registerkarten"; -["Terms accepted"] = "Bedingungen akzeptiert"; ["Terms of use"] = "Nutzungsbedingungen"; ["The API key has been changed too fast."] = "Der API-Schlüssel wurde zu schnell geändert."; ["The code you've entered is invalid"] = "Der Code, den Du eingeben hast, ist nicht gültig!"; @@ -510,7 +498,6 @@ ["Tuesday"] = "Dienstag"; ["Type of tabs"] = "Tabulatortyp"; ["Unconfirmed address"] = "Unbestätigte E-Mail"; -["Unknown author"] = "Unbekannter Autor"; ["Updated drafts"] = "Neue Entwürfe"; ["Upload images"] = "Bilder hochladen"; ["Verification time"] = "Zeit für die Überprüfung"; @@ -557,7 +544,6 @@ ["You didn't saved any member as contact yet."] = "Du hast noch kein Mitglied als Kontakt gespeichert!"; ["You have saved this member as contact"] = "Du hast das Mitglied als Kontakt gespeichert"; ["You have saved this member as contact."] = "Du hast das Mitglied als Kontakt gespeichert."; -["You have to accept the terms of use to complete registration."] = "Du musst die Nutzungsbedingungen akzeptieren um die Registration abzuschliessen."; ["You have to mark 'Are you sure' to revoke!"] = "Zum Zurückziehen musst Du 'Sicher?' auswählen"; ["You need to be logged in, to use all features of this system."] = "Du musst eingeloggt sein, um alle Funktionen dieses Systems nutzen zu können."; ["You want to vote later"] = "Du willst später abstimmen"; @@ -576,10 +562,10 @@ ["Your global delegation has been updated."] = "Deine globale Delegation wurde geändert"; ["Your login has been changed to '#{login}'"] = "Dein Anmeldename wurde auf '#{login}' geändert"; ["Your name has been changed"] = "Dein Name wurde geändert"; -["Your opinion has been deleted"] = "Deine Meinung wurde gelöscht"; -["Your opinion has been updated"] = "Deine Meinung wurde aktualisiert"; ["Your page has been updated"] = "Deine Seite wurde aktualisiert"; ["Your password has been updated successfully"] = "Das Kennwort wurde erfolgreich geändert"; +["Your rating has been deleted"] = "Deine Bewertung wurde gelöscht"; +["Your rating has been updated"] = "Deine Bewertung wurde aktualisiert"; ["Your suggestion has been added"] = "Deine Anregung wurde hinzufügt"; ["Your support has been added to this initiative"] = "Deine Unterstützung wurde der Initiative hinzugefügt"; ["Your support has been removed from this initiative"] = "Deine Unterstützung wurde der Initiave entzogen"; @@ -589,20 +575,24 @@ ["Z-A"] = "Z-A"; ["[Registered members only]"] = "[nur für Registrierte]"; ["[not displayed public]"] = "[nicht öffentlich]"; +["a bit unsatisfied"] = "etwas unzufrieden"; ["activated"] = "aktiviert"; ["and #{count} more initiatives"] = "und #{count} weitere Initiativen"; ["deactivated"] = "deaktiviert"; -["delete

"] = "löschen

"; ["disabled"] = "ausgeschaltet"; ["email"] = "E-Mail"; +["implemented"] = "umgesetzt"; ["last 24 hours"] = "letzte 24 Stunden"; ["login name"] = "Anmeldename"; +["more unsatisfied"] = "sehr unzufrieden"; ["must"] = "muss"; ["must not"] = "darf nicht"; ["must/should"] = "muss/soll"; ["must/should not"] = "muss/soll nicht"; ["neutral"] = "neutral"; +["not implemented"] = "nicht umgesetzt"; ["requested"] = "angefragt"; +["satisfied"] = "zufrieden"; ["should"] = "soll"; ["should not"] = "soll nicht"; ["to reset your password please click on the following link:\n\n"] = "um Dein Kennwort zurückzusetzen klicke bitte den folgenden Link an:\n\n"; diff -r 91671766a701 -r 6a12fb7e4963 locale/translations.en.lua --- a/locale/translations.en.lua Thu Aug 19 15:37:51 2010 +0200 +++ b/locale/translations.en.lua Mon Aug 30 21:52:19 2010 +0200 @@ -95,7 +95,7 @@ ["Choose member"] = false; ["Click for details"] = false; ["Closed"] = false; -["Collective opinion"] = false; +["Collective opinion of supporters"] = false; ["Commit suggestion"] = false; ["Compare"] = false; ["Confirm"] = false; @@ -155,9 +155,7 @@ ["Email address confirmation"] = false; ["Email address is confirmed now"] = false; ["Email address too short!"] = false; -["Email confirmation request"] = false; ["Email unconfirmed"] = false; -["Empty help text: #{id}.#{lang}.txt"] = false; ["Error while converting image. Please note, that only JPG files are supported!"] = false; ["Error while resolving openid. Internal message: '#{errmsg}'"] = false; ["Error while updating member, database reported:

(#{errormessage})"] = false; @@ -179,9 +177,8 @@ ["Help for: #{text}"] = false; ["Hide"] = false; ["Hide filter details"] = false; -["Hide this help message"] = false; ["Home"] = false; -["I accept the terms of use by checking the following checkbox:"] = false; +["I consider suggestion as"] = false; ["Id"] = false; ["Ident number"] = false; ["If this link is not working, please open following url in your web browser:\n\n"] = false; @@ -235,7 +232,6 @@ ["JavaScript is disabled or not available."] = false; ["Last author"] = false; ["Last snapshot:"] = false; -["Legend:"] = false; ["License"] = false; ["Locked?"] = false; ["Login"] = false; @@ -246,10 +242,6 @@ ["Majority"] = false; ["Manage filter"] = false; ["Manage timeline filters"] = false; -["Mark suggestion as implemented and express dissatisfaction"] = false; -["Mark suggestion as implemented and express satisfaction"] = false; -["Mark suggestion as not implemented and express dissatisfaction"] = false; -["Mark suggestion as not implemented and express satisfaction"] = false; ["Max potential support"] = false; ["Max support"] = false; ["Member"] = false; @@ -277,7 +269,6 @@ ["Membership updated"] = false; ["Memberships"] = false; ["Message of the day"] = false; -["Missing help text: #{id}.#{lang}.txt"] = false; ["Mobile phone"] = false; ["Monday"] = false; ["Move down"] = false; @@ -288,7 +279,6 @@ ["New address"] = false; ["New draft"] = false; ["New draft has been added to initiative"] = false; -["New draft revision"] = false; ["New initiative"] = false; ["New issue"] = false; ["New password"] = false; @@ -317,11 +307,9 @@ ["Number of incoming delegations, follow link to see more details"] = false; ["Number of initiatives to preview"] = false; ["OK"] = false; -["Old draft revision"] = false; ["Old password"] = false; ["Old password is wrong"] = false; ["Oldest"] = false; -["On that page please enter the confirmation code:\n\n"] = false; ["On that page please enter the reset code:\n\n"] = false; ["One issue"] = false; ["One issue you are interested in"] = false; @@ -350,7 +338,6 @@ ["Please choose a policy"] = false; ["Please choose two different versions of the draft to compare"] = false; ["Please choose two versions of the draft to compare"] = false; -["Please confirm your email address by clicking the following link:\n\n"] = false; ["Please enter the email reset code you have received:"] = false; ["Please enter the invite code you've received."] = false; ["Please enter your email address. This address will be used for automatic notifications (if you request them) and in case you've lost your password. This address will not be published. After registration you will receive an email with a confirmation link."] = false; @@ -364,6 +351,7 @@ ["Potential support"] = false; ["Potential supported"] = false; ["Potential supporter"] = false; +["Preview"] = false; ["Previous initiative"] = false; ["Previous issue"] = false; ["Profession"] = false; @@ -431,6 +419,7 @@ ["Show member"] = false; ["Show name history"] = false; ["Show only events which match... (or associtated)"] = false; +["So I'm"] = false; ["Software"] = false; ["Some JavaScript based functions (voting in particular) will not work.\nFor this beta, please use a current version of Firefox, Safari, Opera(?), Konqueror or another (more) standard compliant browser.\nAlternative access without JavaScript will be available soon."] = false; ["Sorry, but there is not confirmed email address for your account. Please contact the administrator or support."] = false; @@ -462,7 +451,6 @@ ["Supported initiatives"] = false; ["Supporter"] = false; ["Tabs"] = false; -["Terms accepted"] = false; ["Terms of use"] = false; ["The API key has been changed too fast."] = false; ["The code you've entered is invalid"] = false; @@ -510,7 +498,6 @@ ["Tuesday"] = false; ["Type of tabs"] = false; ["Unconfirmed address"] = false; -["Unknown author"] = false; ["Updated drafts"] = false; ["Upload images"] = false; ["Verification time"] = false; @@ -557,7 +544,6 @@ ["You didn't saved any member as contact yet."] = false; ["You have saved this member as contact"] = false; ["You have saved this member as contact."] = false; -["You have to accept the terms of use to complete registration."] = false; ["You have to mark 'Are you sure' to revoke!"] = false; ["You need to be logged in, to use all features of this system."] = false; ["You want to vote later"] = false; @@ -576,10 +562,10 @@ ["Your global delegation has been updated."] = false; ["Your login has been changed to '#{login}'"] = false; ["Your name has been changed"] = false; -["Your opinion has been deleted"] = false; -["Your opinion has been updated"] = false; ["Your page has been updated"] = false; ["Your password has been updated successfully"] = false; +["Your rating has been deleted"] = false; +["Your rating has been updated"] = false; ["Your suggestion has been added"] = false; ["Your support has been added to this initiative"] = false; ["Your support has been removed from this initiative"] = false; @@ -589,20 +575,24 @@ ["Z-A"] = false; ["[Registered members only]"] = false; ["[not displayed public]"] = false; +["a bit unsatisfied"] = false; ["activated"] = false; ["and #{count} more initiatives"] = false; ["deactivated"] = false; -["delete

"] = false; ["disabled"] = false; ["email"] = false; +["implemented"] = false; ["last 24 hours"] = false; ["login name"] = false; +["more unsatisfied"] = false; ["must"] = false; ["must not"] = false; ["must/should"] = false; ["must/should not"] = false; ["neutral"] = false; +["not implemented"] = false; ["requested"] = false; +["satisfied"] = false; ["should"] = false; ["should not"] = false; ["to reset your password please click on the following link:\n\n"] = false; diff -r 91671766a701 -r 6a12fb7e4963 locale/translations.eo.lua --- a/locale/translations.eo.lua Thu Aug 19 15:37:51 2010 +0200 +++ b/locale/translations.eo.lua Mon Aug 30 21:52:19 2010 +0200 @@ -95,7 +95,7 @@ ["Choose member"] = "Elekti membron"; ["Click for details"] = "Klaki por detaloj"; ["Closed"] = "Fermita"; -["Collective opinion"] = "Opinioresumo"; +["Collective opinion of supporters"] = false; ["Commit suggestion"] = "Enmeti sugeston"; ["Compare"] = "Kompari"; ["Confirm"] = "Konfirmi"; @@ -155,9 +155,7 @@ ["Email address confirmation"] = "Konfirmo de la retadreson"; ["Email address is confirmed now"] = "Retadreso nun estas konfirmita"; ["Email address too short!"] = "Retadreso estas tro mallonga!"; -["Email confirmation request"] = "Konfirmopeto de via retadreso"; ["Email unconfirmed"] = false; -["Empty help text: #{id}.#{lang}.txt"] = "Malplena helpoteksto: #{id}.#{lang}.txt"; ["Error while converting image. Please note, that only JPG files are supported!"] = false; ["Error while resolving openid. Internal message: '#{errmsg}'"] = "Eraro dum trovado de openid. Interna mesaĝo: '#{errmsg}'"; ["Error while updating member, database reported:

(#{errormessage})"] = "Eraro dum ĝisdatigo de la membro, la datumbazo raportas sekvan eraron:

(#{errormessage})"; @@ -179,9 +177,8 @@ ["Help for: #{text}"] = "Helpo por: #{text}"; ["Hide"] = "Kaŝi"; ["Hide filter details"] = "Kaŝi filtrodetalojn"; -["Hide this help message"] = "Kaŝi tiun ĉi helpotekston"; ["Home"] = "Ĉefpaĝo"; -["I accept the terms of use by checking the following checkbox:"] = "Mi akceptas la uzokondiĉojn per la selekto de la sekva markobutono:"; +["I consider suggestion as"] = false; ["Id"] = "Identigilo"; ["Ident number"] = "Identonumero"; ["If this link is not working, please open following url in your web browser:\n\n"] = "Se tiu ligilo ne funkcias, bonvolu malfermi la sekvan URLon per via retumilo:\n\n"; @@ -235,7 +232,6 @@ ["JavaScript is disabled or not available."] = "JavaScript ne estas ŝaltita aŭ disponebla."; ["Last author"] = "Lasta aŭtoro"; ["Last snapshot:"] = "Lasta fulmrigardo:"; -["Legend:"] = "Legendo:"; ["License"] = "Licenco"; ["Locked?"] = "Ĉu blokita?"; ["Login"] = "Ensaluti"; @@ -246,10 +242,6 @@ ["Majority"] = "Plimulto"; ["Manage filter"] = "Administri filtrilojn"; ["Manage timeline filters"] = "Administri tempolinio-filtrilojn"; -["Mark suggestion as implemented and express dissatisfaction"] = "Marki sugeston kiel realigitan kaj esprimi malkontentecon"; -["Mark suggestion as implemented and express satisfaction"] = "Marki sugeston kiel realigitan kaj esprimi kontentecon"; -["Mark suggestion as not implemented and express dissatisfaction"] = "Marki sugeston kiel ne realigitan kaj esprimi malkontentecon"; -["Mark suggestion as not implemented and express satisfaction"] = "Marki sugeston kiel ne realigitan kaj esprimi kontentecon"; ["Max potential support"] = "Maksimumo da eblaj subtenantoj"; ["Max support"] = "Maksimuma subteno"; ["Member"] = "Membro"; @@ -277,7 +269,6 @@ ["Membership updated"] = "Membreco ĝisdatigita"; ["Memberships"] = "Membrecoj"; ["Message of the day"] = "Mesaĝoj"; -["Missing help text: #{id}.#{lang}.txt"] = "Mankas helpoteksto: #{id}.#{lang}.txt"; ["Mobile phone"] = "Poŝtelefono"; ["Monday"] = "Lundo"; ["Move down"] = "Movi malsupren"; @@ -288,7 +279,6 @@ ["New address"] = false; ["New draft"] = "Nova skizo"; ["New draft has been added to initiative"] = "La nova skizo estas aldonita al la iniciato"; -["New draft revision"] = "Nova revizio de la skizo"; ["New initiative"] = "Nova iniciato"; ["New issue"] = "Nova temo"; ["New password"] = "Nova pasvorto"; @@ -317,11 +307,9 @@ ["Number of incoming delegations, follow link to see more details"] = "Nombro de alvenantaj delegacioj, sekvu ligilon por pli da detaloj"; ["Number of initiatives to preview"] = "Nombro de iniciatoj por antaŭmontri"; ["OK"] = "Bone"; -["Old draft revision"] = "Malnova revizio de la skizo"; ["Old password"] = "Malnova pasvorto"; ["Old password is wrong"] = "La malnova pasvorto estas malĝusta"; ["Oldest"] = "Plej malnova"; -["On that page please enter the confirmation code:\n\n"] = "Bonvolu enigi sur tiu paĝo la konfirmokodon:\n\n"; ["On that page please enter the reset code:\n\n"] = "Bonvolu enigu sur tiu paĝo la remetokodon:\n\n"; ["One issue"] = "Unu temo"; ["One issue you are interested in"] = "Unu temo, kiu vin interesas"; @@ -350,7 +338,6 @@ ["Please choose a policy"] = "Bonvolu elekti regularon"; ["Please choose two different versions of the draft to compare"] = "Bonvolu elekti du malsamajn versiojn de la skizo por kompari ilin."; ["Please choose two versions of the draft to compare"] = "Bonvolu elekti du versiojn de la skizo por kompari ili."; -["Please confirm your email address by clicking the following link:\n\n"] = "Bonvolu konfirmi vian retadreson klakante sekvan ligilon:\n\n"; ["Please enter the email reset code you have received:"] = "Bonvolu enigi retpoŝtoremetokodon, kiun vi ricevis:"; ["Please enter the invite code you've received."] = "Bonvolu enigi la invitokodon, kiun vi ricevis."; ["Please enter your email address. This address will be used for automatic notifications (if you request them) and in case you've lost your password. This address will not be published. After registration you will receive an email with a confirmation link."] = "Bonvolu enigi vian retadreson. Tiu adreso estas uzita por aŭtomataj sciigoj (se vi petas tiajn) kaj por remeti la pasvorton. Tiu adreso ne estos publikigita. Post la fino de la registrado, vi ricevos retpoŝton kun ligilo al la konfirmo de la adreso."; @@ -364,6 +351,7 @@ ["Potential support"] = "Eventuala subteno"; ["Potential supported"] = "Eble subtenota"; ["Potential supporter"] = "Eventuala subtenonto"; +["Preview"] = false; ["Previous initiative"] = "Antaŭa initciato"; ["Previous issue"] = "Antaŭa temo"; ["Profession"] = "Profesio"; @@ -431,6 +419,7 @@ ["Show member"] = "Montri membron"; ["Show name history"] = "Montri nomohistorion"; ["Show only events which match... (or associtated)"] = "Montri nur eventojn, kiuj kongruas... (aŭ kunligitaj)"; +["So I'm"] = false; ["Software"] = "Programaro"; ["Some JavaScript based functions (voting in particular) will not work.\nFor this beta, please use a current version of Firefox, Safari, Opera(?), Konqueror or another (more) standard compliant browser.\nAlternative access without JavaScript will be available soon."] = "Kelkaj funkcioj bazitaj je JavaScript (precipe la voĉdono) ne funkcios.\nBonvolu, uzi por tiu betaversio aktualan version de Firefox, Safari, Opera(?), Konqueror aŭ alian (pli) normokonforman retumilon.\nAlternativa atingo sen JavaScript estos baldaŭ disponebla."; ["Sorry, but there is not confirmed email address for your account. Please contact the administrator or support."] = "Pardonu, por tiu konto ne ekzistas konfirmita retadreson. Bonvolu vin turni al administranto aŭ al la helpantaro."; @@ -462,7 +451,6 @@ ["Supported initiatives"] = "Iniciatoj subtenitaj"; ["Supporter"] = "Subtenantoj"; ["Tabs"] = "Langetoj"; -["Terms accepted"] = "Kondiĉoj akceptitaj"; ["Terms of use"] = "Uzokondiĉoj"; ["The API key has been changed too fast."] = "La API-ŝlosilo estas ŝanĝita tro rapide."; ["The code you've entered is invalid"] = "La kodo, kiun vi enigis ne estas valida!"; @@ -510,7 +498,6 @@ ["Tuesday"] = "Mardo"; ["Type of tabs"] = "Tipo de langetoj"; ["Unconfirmed address"] = false; -["Unknown author"] = "Aŭtoro nekonata"; ["Updated drafts"] = "Skizoj ĝisdatigitaj"; ["Upload images"] = "Alŝuti bildojn"; ["Verification time"] = "Tempo por la kontrolo"; @@ -557,7 +544,6 @@ ["You didn't saved any member as contact yet."] = "Vi ankoraŭ ne konservis membron kiel kontakton!"; ["You have saved this member as contact"] = "Vi konservis membron kiel kontakton"; ["You have saved this member as contact."] = "Vi konservis membron kiel kontakton."; -["You have to accept the terms of use to complete registration."] = "Vi devas akcepti la uzokondiĉojn por fini la registradon."; ["You have to mark 'Are you sure' to revoke!"] = "Por nuligi vi devas elekti 'Certa?'"; ["You need to be logged in, to use all features of this system."] = "Vi devas esti ensalutinta por uzi ĉiujn funkciojn de tiu sistemo."; ["You want to vote later"] = "Vi volas baloti pli malfrue"; @@ -576,10 +562,10 @@ ["Your global delegation has been updated."] = "Via ĝenerala delegacio estas ĝisdatigita"; ["Your login has been changed to '#{login}'"] = "Via salutnomo estas ĝisdatigita al '#{login}'"; ["Your name has been changed"] = "Via nomo estas ĝisdatigita"; -["Your opinion has been deleted"] = "Via opinio estas viŝita"; -["Your opinion has been updated"] = "Via opinio estas ĝisdatigita"; ["Your page has been updated"] = "Via paĝo estas ĝisdatigita"; ["Your password has been updated successfully"] = "Via pasvorto estas sukcese ĝisdatigita"; +["Your rating has been deleted"] = false; +["Your rating has been updated"] = false; ["Your suggestion has been added"] = "Via sugesto estas aldonita"; ["Your support has been added to this initiative"] = "Via subteno estas aldonita al la iniciato"; ["Your support has been removed from this initiative"] = "Via subteno estas forigita de la iniciato"; @@ -589,20 +575,24 @@ ["Z-A"] = "Z-A"; ["[Registered members only]"] = "[Nur registritaj membroj]"; ["[not displayed public]"] = "[ne afiŝita publike]"; +["a bit unsatisfied"] = false; ["activated"] = false; ["and #{count} more initiatives"] = "kaj #{count} pliaj iniciatoj"; ["deactivated"] = false; -["delete

"] = "forviŝi

"; ["disabled"] = "malaktiva"; ["email"] = "retpoŝto"; +["implemented"] = false; ["last 24 hours"] = "lastaj 24 horoj"; ["login name"] = "Salutnomo"; +["more unsatisfied"] = false; ["must"] = "devas"; ["must not"] = "ne rajtas"; ["must/should"] = "devus"; ["must/should not"] = "ne devus"; ["neutral"] = "neŭtrala"; +["not implemented"] = false; ["requested"] = "petita"; +["satisfied"] = false; ["should"] = "devus"; ["should not"] = "ne devus"; ["to reset your password please click on the following link:\n\n"] = "por remeti vian pasvorton bonvolu klaki sekvan ligilon:\n\n"; diff -r 91671766a701 -r 6a12fb7e4963 locale/translations.fr.lua --- a/locale/translations.fr.lua Thu Aug 19 15:37:51 2010 +0200 +++ b/locale/translations.fr.lua Mon Aug 30 21:52:19 2010 +0200 @@ -95,7 +95,7 @@ ["Choose member"] = false; ["Click for details"] = false; ["Closed"] = false; -["Collective opinion"] = false; +["Collective opinion of supporters"] = false; ["Commit suggestion"] = false; ["Compare"] = false; ["Confirm"] = false; @@ -155,9 +155,7 @@ ["Email address confirmation"] = false; ["Email address is confirmed now"] = false; ["Email address too short!"] = false; -["Email confirmation request"] = false; ["Email unconfirmed"] = false; -["Empty help text: #{id}.#{lang}.txt"] = false; ["Error while converting image. Please note, that only JPG files are supported!"] = false; ["Error while resolving openid. Internal message: '#{errmsg}'"] = false; ["Error while updating member, database reported:

(#{errormessage})"] = false; @@ -179,9 +177,8 @@ ["Help for: #{text}"] = false; ["Hide"] = false; ["Hide filter details"] = false; -["Hide this help message"] = false; ["Home"] = false; -["I accept the terms of use by checking the following checkbox:"] = false; +["I consider suggestion as"] = false; ["Id"] = false; ["Ident number"] = false; ["If this link is not working, please open following url in your web browser:\n\n"] = false; @@ -235,7 +232,6 @@ ["JavaScript is disabled or not available."] = false; ["Last author"] = false; ["Last snapshot:"] = false; -["Legend:"] = false; ["License"] = false; ["Locked?"] = false; ["Login"] = false; @@ -246,10 +242,6 @@ ["Majority"] = false; ["Manage filter"] = false; ["Manage timeline filters"] = false; -["Mark suggestion as implemented and express dissatisfaction"] = false; -["Mark suggestion as implemented and express satisfaction"] = false; -["Mark suggestion as not implemented and express dissatisfaction"] = false; -["Mark suggestion as not implemented and express satisfaction"] = false; ["Max potential support"] = false; ["Max support"] = false; ["Member"] = false; @@ -277,7 +269,6 @@ ["Membership updated"] = false; ["Memberships"] = false; ["Message of the day"] = false; -["Missing help text: #{id}.#{lang}.txt"] = false; ["Mobile phone"] = false; ["Monday"] = false; ["Move down"] = false; @@ -288,7 +279,6 @@ ["New address"] = false; ["New draft"] = false; ["New draft has been added to initiative"] = false; -["New draft revision"] = false; ["New initiative"] = false; ["New issue"] = false; ["New password"] = false; @@ -317,11 +307,9 @@ ["Number of incoming delegations, follow link to see more details"] = false; ["Number of initiatives to preview"] = false; ["OK"] = false; -["Old draft revision"] = false; ["Old password"] = false; ["Old password is wrong"] = false; ["Oldest"] = false; -["On that page please enter the confirmation code:\n\n"] = false; ["On that page please enter the reset code:\n\n"] = false; ["One issue"] = false; ["One issue you are interested in"] = false; @@ -350,7 +338,6 @@ ["Please choose a policy"] = false; ["Please choose two different versions of the draft to compare"] = false; ["Please choose two versions of the draft to compare"] = false; -["Please confirm your email address by clicking the following link:\n\n"] = false; ["Please enter the email reset code you have received:"] = false; ["Please enter the invite code you've received."] = false; ["Please enter your email address. This address will be used for automatic notifications (if you request them) and in case you've lost your password. This address will not be published. After registration you will receive an email with a confirmation link."] = false; @@ -364,6 +351,7 @@ ["Potential support"] = false; ["Potential supported"] = false; ["Potential supporter"] = false; +["Preview"] = false; ["Previous initiative"] = false; ["Previous issue"] = false; ["Profession"] = false; @@ -431,6 +419,7 @@ ["Show member"] = false; ["Show name history"] = false; ["Show only events which match... (or associtated)"] = false; +["So I'm"] = false; ["Software"] = false; ["Some JavaScript based functions (voting in particular) will not work.\nFor this beta, please use a current version of Firefox, Safari, Opera(?), Konqueror or another (more) standard compliant browser.\nAlternative access without JavaScript will be available soon."] = false; ["Sorry, but there is not confirmed email address for your account. Please contact the administrator or support."] = false; @@ -462,7 +451,6 @@ ["Supported initiatives"] = false; ["Supporter"] = false; ["Tabs"] = false; -["Terms accepted"] = false; ["Terms of use"] = false; ["The API key has been changed too fast."] = false; ["The code you've entered is invalid"] = false; @@ -510,7 +498,6 @@ ["Tuesday"] = false; ["Type of tabs"] = false; ["Unconfirmed address"] = false; -["Unknown author"] = false; ["Updated drafts"] = false; ["Upload images"] = false; ["Verification time"] = false; @@ -557,7 +544,6 @@ ["You didn't saved any member as contact yet."] = false; ["You have saved this member as contact"] = false; ["You have saved this member as contact."] = false; -["You have to accept the terms of use to complete registration."] = false; ["You have to mark 'Are you sure' to revoke!"] = false; ["You need to be logged in, to use all features of this system."] = false; ["You want to vote later"] = false; @@ -576,10 +562,10 @@ ["Your global delegation has been updated."] = false; ["Your login has been changed to '#{login}'"] = false; ["Your name has been changed"] = false; -["Your opinion has been deleted"] = false; -["Your opinion has been updated"] = false; ["Your page has been updated"] = false; ["Your password has been updated successfully"] = false; +["Your rating has been deleted"] = false; +["Your rating has been updated"] = false; ["Your suggestion has been added"] = false; ["Your support has been added to this initiative"] = false; ["Your support has been removed from this initiative"] = false; @@ -589,20 +575,24 @@ ["Z-A"] = false; ["[Registered members only]"] = false; ["[not displayed public]"] = false; +["a bit unsatisfied"] = false; ["activated"] = false; ["and #{count} more initiatives"] = false; ["deactivated"] = false; -["delete

"] = false; ["disabled"] = false; ["email"] = false; +["implemented"] = false; ["last 24 hours"] = false; ["login name"] = false; +["more unsatisfied"] = false; ["must"] = false; ["must not"] = false; ["must/should"] = false; ["must/should not"] = false; ["neutral"] = false; +["not implemented"] = false; ["requested"] = false; +["satisfied"] = false; ["should"] = false; ["should not"] = false; ["to reset your password please click on the following link:\n\n"] = false; diff -r 91671766a701 -r 6a12fb7e4963 static/icons/emoticon_happy.png --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/static/icons/emoticon_happy.png Mon Aug 30 21:52:19 2010 +0200 @@ -0,0 +1,37 @@ +--- emoticon_happy.png ++++ emoticon_happy.png +GIT binary patch +literal 1646 +zc$@)l29f!RP)P000>X1^@s6#OZ}&00001b5ch_0Itp) +z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igc0 +z5)U+k{Yei100r(zL_t(Y$DNjIjFim7q=!2kw*tJC^ZM#1+5XX458}C&$`~Zj}MGZjP-7NAQd!Mi9=;(T6e|yL3G-?VVlL(o_56bXW3^P)WzyKjYYf6@bVQ7R1Kn39D +ziP@7zebc=iJ)LJJ-#A=4&3q0PMtafeS68fBU!(m=5M?0BDOv{IJwIn<_oHOM`MCvgi?8`?0-gAw%`AoSDr7cybiK&XYH0Xw>;db{YzmwgozLl +z4jul4OMSx(k4&=v%@gzRD7*HYAeS$3{O<#tIx~%yGL(=|8ltVPrM4P+)5 +zs;d*R@Q_6)A?fQMU-;9DeWPKBkPHl7S(xt|D1O0CX114QEgLqz{9IL30=&8-ooZaV +zzFGT&fC>*&2Wah4U7cKr&7_m__Pu^SosNUnp{?h?Sd%o?v}9sJd|LuIp1U@aZmQJY +z^t@f&`OO?QZR{c%jbIp(`!=mbt0G$2Y`*sv0IDhztnbMnf&dW&pj0RzX$n~$jczsp +zV$sO*GSiF--$NS?C-uxVll7}jfQTWhrS=i7i#F}hEkZ&7$bj2#ivtEa$bt6I+5u(p;HDH>6%dY# +z@I3H5@ICPTFptVZ$XKNb;Cp&n`5K`dgkdmv#ipe>1fU%dkr1ji5TLaS%0ep(JPYAC +z2-iWnF2my%-$)7~h6Wi$d3Ig`6n*QQ?bx=k9i(khlQ7tSppU@Mqtq-q$cIw%-(VK4 +z=D;l?Z5!d(2*=^{g*hgsV<7>^SxP6(o;NyZ91eUViGyo1A!+YS);{D5-?`jf- +z0fg4nS2{Eb#z`(aa%B{E`$yV4q}K_KTZE#TbHE8?7=Ig8%>k07*qoM6N<$f~MFfCjbBd + diff -r 91671766a701 -r 6a12fb7e4963 static/icons/emoticon_unhappy.png --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/static/icons/emoticon_unhappy.png Mon Aug 30 21:52:19 2010 +0200 @@ -0,0 +1,39 @@ +--- emoticon_unhappy.png ++++ emoticon_unhappy.png +GIT binary patch +literal 1735 +zc$@*p1~~bNP)P000>X1^@s6#OZ}&00001b5ch_0Itp) +z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igc0 +z5)C$A#Y&+700u`%L_t(Y$BmY2j8#_^$A5dDbMBpc=fW^^XPC~Ena(gBUUdc#6bjTD +zpzYYkv=vmo5Nv7UE2dwJCPb6QsMS_#)DKo$454U&DpVAqEs8}_5S5`K%41;4Yj|Ad +z-g(@6Ui+NA{cwj1M1rj3;{tFK(;K)O~h*F +zF_DK>J|Ze1qcqe`q5s(XgU9x7`P!4O*7tS~CRfLlPry65dvv&PXJSFI8Z^cLp3}7^y{_r;r9lyZLjs}d55GsPe +zB~i%B?2M0pXkN{cqi-Azjsr-5#&Z*&?0Rt7<7W5_!g3IngR~R8`kTG1`QEEMvHBYf +znjdhVBe{=3`Q-8+DAta1QCLXc;o4l_+1ANlc?71#jsXD=j~`oOa1 +z?c!OCu*$sB1}njD-`)>E5Gr>4<#5?AZGQLe5sWba{QkgM0E{ItV~NnG4>7B|r$wgg +z)&R%}eG}%ibj+M;+#CW^NtQ8&d|{~aJy;m7_^%FKFN?t;?*{ehvYK>EI)6oGo2Rb? +zkhM)6%af*r)*7Q@FcIhop%pEYnkxHSnz9i22(4&quCMr8o9iIbNHhXd2~?ar%A}6@ +z4eM4V8)a?t^o3^l;uv^{i4`UaFpX#>#n(N_Mr`G>SjtYw_^Fky&^ +z0@|~Jy&KjL`Yv6K9-!irV{;H9Wvp3tGF3g!cms%7W26Vtfsk?y=!ivA +z(jXKj2tY^ZI7CDq(;E~d+tpw;;fpQUn2X24}6*3GFfkODILZVDeWb2c5sc^YpCL3Fg7a(JS21rB@ +zE3kZ!HvPGfeJ5N7U4gG)d=l;%AFybm&xFWFlmdhwAbf=^BU~fVZWQ)fpPHfDCr|s> +zgIqoZ0%W8?7%(w$9I$Rrj`e@OLTDV)RY_7wi%~b?;HeV3PlilN1l%or7!9z3@VcDq +znmHYZ`47(j>+5!L@cb6fSl>*K`a)pPDn^6~ok*~D?cL@bEN +za`*~t?Y+QAs>nmt!A+glw03df@V1Lz*iam?y{YEt$>aNv%&wo@t#f_IWQ0jN{39Q* +zVs0z#RRzc&FK>(tLYIR`1d4fqVt!|ee~#92+4E_1;<1b;C?uS4Xz=XXN~{0%>iWe! +zkA3x>)WIFnBrHhU=tLSJRJk8j!YdctH5G|iRpg4a%fbNk?4|7K-SMA&XAa%>+-8gg +zuzaQ4KXiPsv$gw?ZtKDcWS|gHi10%QBSaV@{16dD2rodC0<1VjXme8l0H&#v)5^{D +z_3eNBD;xbwl~(`8ThNfq@2smyENkk#zd__aK*SmmYh)B7qiF0Mm;K__v)oK<=W@2m +zeS7z7-&(bCXglS>aD8aK*B?hJ9N3)Agr97l^Js&WzX(yt9hs1rX$$Dn@yMGyHvHtv +zTSs03)c;IIfWzmMd$8}~h9I~Lx2CG36t?d|91$nSp`;*JDyS1D4~`x> +zbYS}n?+ktWs>`W6z7pMN3-7hsdOE8fZmdZz&eYV+aI9o{csO^pIO_Mlch=p${bP000>X1^@s6#OZ}&00001b5ch_0Itp) +z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igc0 +z5)LC7HT{VI00u@$L_t(Y$BmY2a8*|o$A5dDbDw$VCe5SGC66XFwBaGGq=YFQpp~}T +zht#%T94tDcqvQC+u``U$IF63mN*#5aYNt3#rKR8y#VS;A7%2l4awRcKOS=}sir3vJ_bH`F50$G +zj*YN$NF9eoZ4AEm?$r6e@BYpc=O%u4!yw(A4YjSG{ld}KPv6_Z#4v=TV44UaP#T2q +zfor2}3+-5FD+ie@V#-3sE6G$Q?00tl=JiM3y}U(SS!iC +z0r6r)B!-L?73NSFOcSI;2mxB7l>+S}RDejOiH=X3_4hyAabQbN<*rojt&atH>4jnz +zmwskpS{5bI(f|!;#jYbKIX!fRW%bo)-$%GUWb=e4 +zW@MuCzPnb9^_<(2a(V$IK+WD;p6GaV(_?z%zlcx>VTO?5Fs~du!q#8E!sFlmF2gw+ +z8H*#MQT{!6g=b&h$yfi-&7px|M8qg;KuSnWaEmL7>z3a0%iXn@0P?rbM_BymrXQOl +zLxmrO1jB?-n7_Pz9014lIB@c8;kXQwzna)&P+_GCXbJ-2&)ltKqV0j7bE2s|3<>*m)tR42f(5rIczb=AB*SzQU9LTZK38ZnolIM>T< +z9i7$N7e{JjMN4~^9vxZWfbXGQ2W?wyd1wOwHHicdt?Vek*0y-6>u!po5yBypXI9*S +zRvJ8oPyr~TkWng4qN=V`Vy-lc$`Xyt%pwd2yfDhPk%kGt#7g?Y1U|}j5w1nM;h{|zopq2|4=f*SAAA9GwKb)Qp^ZhRHJzR{gi)^Y7RrL`uaY&4$Aky&Li>`WE_O;AuSi-f$$c<;{_gmNL?^<<70!ev?i%D +z4l)p^s~R;YAs8luIhUhTd8Pt^t)NuGBJHpyuqn^lh#3cwa}b_Hs%wL|Dj&FKjL#RT +zrshxGx0VY7AVK=7kgf^{JcsQA6a2n^9M=dDk3@)t3^K0IiByh5vo5ze4!34(a3qGi +z5P7ss{H(K)S}zZ_3zm&A +z1%7>kvmWfdbcI>przV)oBpfCk3f$?Dp>6Y0|EKn< +zbsIN7cQE$1!%`a>OpS`i5uR1hqiYx~v@RgX2jO}1aK$tWzyQ>SH5@+H{o&Eer|;Ek7YCy0w{){Hcll +z_m4mJ&GYu?ywvY`3#zTu{>rf2RCjk*wYYc*p#(w+WT270F3f>0*stHU(M?Il>Pqwf +zc=OdCZ0?)hca<>nP3u@T@V(jLHxfGcx%v$otBsLya6N8nNQqv35B+3j|J=RfSKqie +z`y$|dqB8=V&3O3}BO^QNCI=eJ)~{(qhq?FSEh +z>qn!xmjUbl-c|sRie&4=n|BS5| +cy^)Xq0YuRrvY|Pk^#A|>07*qoM6N<$g4$w9?EnA( + diff -r 91671766a701 -r 6a12fb7e4963 static/style.css --- a/static/style.css Thu Aug 19 15:37:51 2010 +0200 +++ b/static/style.css Mon Aug 30 21:52:19 2010 +0200 @@ -935,12 +935,14 @@ padding: 1ex; } -.diff .added { +.diff_added { background-color: #cfc; + text-decoration: underline; } -.diff .removed { +.diff_removed { background-color: #fcc; + text-decoration: line-through; } .slot_issue_info {