# HG changeset patch # User bsw # Date 1337367790 -7200 # Node ID 305329da1c75784b7beb191a9111d16a444df7db # Parent 4cee33ad5e16d93fd3ab71771e16541352e28fb7 Wording and css changes diff -r 4cee33ad5e16 -r 305329da1c75 app/main/area/_head.lua --- a/app/main/area/_head.lua Fri May 18 19:44:41 2012 +0200 +++ b/app/main/area/_head.lua Fri May 18 21:03:10 2012 +0200 @@ -24,7 +24,7 @@ if membership then - ui.tag{ content = _"You are member" } + ui.tag{ content = _"You are participating in this area" } slot.put(" ") @@ -35,7 +35,15 @@ module = "membership", action = "update", params = { area_id = area.id, delete = true }, - routing = { default = { mode = "redirect", module = "area", view = "show", id = area.id } } + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = param.get_id_cgi(), + params = param.get_all_cgi() + } + } } slot.put(")") end } @@ -44,16 +52,17 @@ elseif app.session.member:has_voting_right_for_unit_id(area.unit_id) then ui.link{ - text = _"Become a member", + text = _"Participate in this area", module = "membership", action = "update", params = { area_id = area.id }, routing = { default = { mode = "redirect", - module = "area", - view = "show", - id = area.id + module = request.get_module(), + view = request.get_view(), + id = param.get_id_cgi(), + params = param.get_all_cgi() } } } diff -r 4cee33ad5e16 -r 305329da1c75 app/main/interest/_show_box.lua --- a/app/main/interest/_show_box.lua Fri May 18 19:44:41 2012 +0200 +++ b/app/main/interest/_show_box.lua Fri May 18 21:03:10 2012 +0200 @@ -17,7 +17,15 @@ module = "interest", action = "update", params = { issue_id = issue.id, delete = true }, - routing = { default = { mode = "redirect", module = initiative and "initiative" or "issue", view = "show", id = initiative and initiative.id or issue.id } } + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = param.get_id_cgi(), + params = param.get_all_cgi() + } + } } slot.put(") ") end @@ -28,7 +36,15 @@ module = "interest", action = "update", params = { issue_id = issue.id }, - routing = { default = { mode = "redirect", module = initiative and "initiative" or "issue", view = "show", id = initiative and initiative.id or issue.id } } + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = param.get_id_cgi(), + params = param.get_all_cgi() + } + } } slot.put(" ") end diff -r 4cee33ad5e16 -r 305329da1c75 app/main/issue/_show.lua --- a/app/main/issue/_show.lua Fri May 18 19:44:41 2012 +0200 +++ b/app/main/issue/_show.lua Fri May 18 21:03:10 2012 +0200 @@ -24,13 +24,6 @@ execute.view{ module = "delegation", view = "_info", params = { issue = issue } } - if for_listing then - ui.container{ attr = { class = "context" }, content = function() - ui.tag{ content = issue.area.unit.name } - slot.put(" · ") - ui.tag{ content = issue.area.name } - end } - end ui.container{ attr = { class = "title" }, content = function() ui.link{ @@ -43,6 +36,13 @@ view = "show", id = issue.id } + if for_listing then + ui.tag{ attr = { class = "extra" }, content = function() + ui.tag{ content = issue.area.unit.name } + slot.put(" · ") + ui.tag{ content = issue.area.name } + end } + end end } ui.tag{ diff -r 4cee33ad5e16 -r 305329da1c75 app/main/member/_event_list.lua --- a/app/main/member/_event_list.lua Fri May 18 19:44:41 2012 +0200 +++ b/app/main/member/_event_list.lua Fri May 18 21:03:10 2012 +0200 @@ -5,7 +5,7 @@ ui.link{ attr = { class = events == "personal" and "ui_tabs_link active" or nil }, - text = _"Personal timeline", + text = _"My areas and issues", module = "index", view = "index", params = { tab = "timeline", events = "personal" } } @@ -13,7 +13,7 @@ ui.link{ attr = { class = events == "global" and "active" or nil }, - text = _"Global timeline", + text = _"Everything", module = "index", view = "index", params = { tab = "timeline", events = "global" } } end } diff -r 4cee33ad5e16 -r 305329da1c75 app/main/member/_show.lua --- a/app/main/member/_show.lua Fri May 18 19:44:41 2012 +0200 +++ b/app/main/member/_show.lua Fri May 18 21:03:10 2012 +0200 @@ -145,7 +145,7 @@ if show_as_homepage then tabs[#tabs+1] = { name = "timeline", - label = _"Events", + label = _"Latest events", module = "member", view = "_event_list", params = { } diff -r 4cee33ad5e16 -r 305329da1c75 app/main/unit/_head.lua --- a/app/main/unit/_head.lua Fri May 18 19:44:41 2012 +0200 +++ b/app/main/unit/_head.lua Fri May 18 21:03:10 2012 +0200 @@ -21,12 +21,8 @@ ui.container{ attr = { class = "content" }, content = function() if app.session.member_id and app.session.member:has_voting_right_for_unit_id(unit.id) then - ui.tag{ content = _"You have voting privileges" } - slot.put(" · ") + ui.tag{ content = _"You have voting privileges for this unit" } end - - ui.tag{ content = "1234 Stimmberechtigte" } - end } end } diff -r 4cee33ad5e16 -r 305329da1c75 app/main/unit/show.lua --- a/app/main/unit/show.lua Fri May 18 19:44:41 2012 +0200 +++ b/app/main/unit/show.lua Fri May 18 21:03:10 2012 +0200 @@ -61,7 +61,7 @@ tabs[#tabs+1] = { name = "timeline", - label = _"Events", + label = _"Latest events", module = "event", view = "_list", params = { for_unit = unit } diff -r 4cee33ad5e16 -r 305329da1c75 static/style.css --- a/static/style.css Fri May 18 19:44:41 2012 +0200 +++ b/static/style.css Fri May 18 21:03:10 2012 +0200 @@ -282,7 +282,7 @@ .page_head { background-color: #fff; - margin: 0px 10px 0 10px; + margin: 0px 10px 2ex 10px; border: 1px solid #aaa; border-radius: 0 0 8px 8px; box-shadow: #777 0px 5px 5px -5px; @@ -291,7 +291,7 @@ .page_head .area_head, .page_head .issue { - border-top: 1px solid #000; + xborder-top: 1px solid #000; } .page_head .unit_head .title, @@ -299,18 +299,23 @@ .issue .context, .issue .title, .initiative_head .title { - margin: 8px; + padding: 8px 16px 2px 16px; } .page_head .unit_head .content, .page_head .area_head .content, .issue .content, .initiative_head .content { - margin: 0px 8px 8px 8px; + padding: 2px 16px 8px 16px; +} + +.page_head .initiative_list, +.issue .initiative_list { + padding-left: 8px; } .issue .content.actions { - margin-bottom: 2.5ex; + margin-bottom: 1ex; } @@ -330,9 +335,30 @@ font-size: 75%; } +.page_head .unit_head .content, +.page_head .area_head .content, +.page_head .area_head .content a, +.page_head .issue .content.actions, +.page_head .issue .content.actions a, +.issues .issue .content.actions, +.issues .issue .content.actions a { + color: #777; +} -.initiative_head { - margin-top: 10px; +.page_head .unit_head .title, +.page_head .area_head .title, +.issue .title { + background-color: #eee; + background-image: linear-gradient(top, #eee 0%, #f7f7f7 10%, #fff 100%); + background-image: -o-linear-gradient(top, #eee 0%, #f7f7f7 10%, #fff 100%); + background-image: -moz-linear-gradient(top, #eee 0%, #f7f7f7 10%, #fff 100%); + background-image: -webkit-linear-gradient(top, #eee 0%, #f7f7f7 10%, #fff 100%); + background-image: -ms-linear-gradient(top, #eee 0%, #f7f7f7 10%, #fff 100%); +} + +.page_head .area_head .title, +.page_head .issue .title { + border-top: 1px solid #ddd; } @@ -649,49 +675,6 @@ } - -/************************************************************************* - * Tables - */ - - -table a.action { - font-size: 70%; - line-height: 190%; - padding: 0.5ex; - color: #777; -} - -table a.active { - color: #fff; -} - -th { - text-align: left; -} - -tr:hover td { - background-color: #f2f2f2; -} - -.nohover tr:hover td { - background-color: #fff; -} - -.initiatives_list .nohover tr:hover td { - background-color: #f2f2f2; -} - -.nohover table tr:hover td { - background-color: #f2f2f2; -} - - -tr table tr:hover td { - background-color: #fff; -} - - /************************************************************************* * Positive / Negtive votes */ @@ -876,7 +859,6 @@ .issues .issue { margin-top: 10px; - background-color: #fcfcfc; overflow: hidden; border: 1px solid #aaa; border-radius: 8px; @@ -893,16 +875,6 @@ margin-bottom: 1ex; } -.issue.interested .issue_info, -.issue.interested_by_delegation .issue_info { - background-color: #dfeaff; - background-image: linear-gradient(top, #dfeaff 0%, #fcfcfc 66%); - background-image: -o-linear-gradient(top, #dfeaff 0%, #fcfcfc 66%); - background-image: -moz-linear-gradient(top, #dfeaff 0%, #fcfcfc 66%); - background-image: -webkit-linear-gradient(top, #dfeaff 50%, #fcfcfc 100%); - background-image: -ms-linear-gradient(top, #dfeaff 0%, #fcfcfc 66%); -} - .event_list .event .issue_id, .issue .issue_info .issue_id { font-size: 125%; @@ -1049,14 +1021,6 @@ padding: 2px; } -.xmember_thumb a { - position: absolute; - top: 0; - left: 0; - padding: 0; - margin: 0; -} - .member_thumb a:hover div { background-color: #444; color: #fff; @@ -1109,8 +1073,12 @@ opacity: 0.4; } +.member_thumb { + border: 2px solid #fff; +} + .member_thumb.in_delegation_chain { - background-color: #cdf; + border: 2px solid #fa0; } .member_statement, @@ -1437,7 +1405,8 @@ padding: 0; } -.slot_initiatives_list, +.initiative_head, +.issues .issue, .ui_tabs_links a, .draft_content, .help,