1.1 --- a/app/main/area/_head.lua	Fri May 18 19:44:41 2012 +0200
     1.2 +++ b/app/main/area/_head.lua	Fri May 18 21:03:10 2012 +0200
     1.3 @@ -24,7 +24,7 @@
     1.4  
     1.5        if membership then
     1.6          
     1.7 -        ui.tag{ content = _"You are member" }
     1.8 +        ui.tag{ content = _"You are participating in this area" }
     1.9          
    1.10          slot.put(" ")
    1.11          
    1.12 @@ -35,7 +35,15 @@
    1.13              module  = "membership",
    1.14              action  = "update",
    1.15              params  = { area_id = area.id, delete = true },
    1.16 -            routing = { default = { mode = "redirect", module = "area", view = "show", id = area.id } }
    1.17 +            routing = {
    1.18 +              default = {
    1.19 +                mode = "redirect",
    1.20 +                module = request.get_module(),
    1.21 +                view = request.get_view(),
    1.22 +                id = param.get_id_cgi(),
    1.23 +                params = param.get_all_cgi()
    1.24 +              }
    1.25 +            }
    1.26            }
    1.27            slot.put(")")
    1.28          end }
    1.29 @@ -44,16 +52,17 @@
    1.30  
    1.31        elseif app.session.member:has_voting_right_for_unit_id(area.unit_id) then
    1.32          ui.link{
    1.33 -          text   = _"Become a member",
    1.34 +          text   = _"Participate in this area",
    1.35            module = "membership",
    1.36            action = "update",
    1.37            params = { area_id = area.id },
    1.38            routing = {
    1.39              default = {
    1.40                mode = "redirect",
    1.41 -              module = "area",
    1.42 -              view = "show",
    1.43 -              id = area.id
    1.44 +              module = request.get_module(),
    1.45 +              view = request.get_view(),
    1.46 +              id = param.get_id_cgi(),
    1.47 +              params = param.get_all_cgi()
    1.48              }
    1.49            }
    1.50          }

     2.1 --- a/app/main/interest/_show_box.lua	Fri May 18 19:44:41 2012 +0200
     2.2 +++ b/app/main/interest/_show_box.lua	Fri May 18 21:03:10 2012 +0200
     2.3 @@ -17,7 +17,15 @@
     2.4        module  = "interest",
     2.5        action  = "update",
     2.6        params  = { issue_id = issue.id, delete = true },
     2.7 -      routing = { default = { mode = "redirect", module = initiative and "initiative" or "issue", view = "show", id = initiative and initiative.id or issue.id } }
     2.8 +      routing = {
     2.9 +        default = {
    2.10 +          mode = "redirect",
    2.11 +          module = request.get_module(),
    2.12 +          view = request.get_view(),
    2.13 +          id = param.get_id_cgi(),
    2.14 +          params = param.get_all_cgi()
    2.15 +        }
    2.16 +      }
    2.17      }
    2.18      slot.put(") ")
    2.19    end
    2.20 @@ -28,7 +36,15 @@
    2.21        module  = "interest",
    2.22        action  = "update",
    2.23        params  = { issue_id = issue.id },
    2.24 -      routing = { default = { mode = "redirect", module = initiative and "initiative" or "issue", view = "show", id = initiative and initiative.id or issue.id } }
    2.25 +      routing = {
    2.26 +        default = {
    2.27 +          mode = "redirect",
    2.28 +          module = request.get_module(),
    2.29 +          view = request.get_view(),
    2.30 +          id = param.get_id_cgi(),
    2.31 +          params = param.get_all_cgi()
    2.32 +        }
    2.33 +      }
    2.34      }
    2.35      slot.put(" ")
    2.36    end

     3.1 --- a/app/main/issue/_show.lua	Fri May 18 19:44:41 2012 +0200
     3.2 +++ b/app/main/issue/_show.lua	Fri May 18 21:03:10 2012 +0200
     3.3 @@ -24,13 +24,6 @@
     3.4  
     3.5    execute.view{ module = "delegation", view = "_info", params = { issue = issue } }
     3.6  
     3.7 -  if for_listing then
     3.8 -    ui.container{ attr = { class = "context" }, content = function()
     3.9 -      ui.tag{ content = issue.area.unit.name }
    3.10 -      slot.put(" · ")
    3.11 -      ui.tag{ content = issue.area.name }
    3.12 -    end }
    3.13 -  end
    3.14    ui.container{ attr = { class = "title" }, content = function()
    3.15      
    3.16      ui.link{
    3.17 @@ -43,6 +36,13 @@
    3.18        view = "show",
    3.19        id = issue.id
    3.20      }
    3.21 +    if for_listing then
    3.22 +      ui.tag{ attr = { class = "extra" }, content = function()
    3.23 +        ui.tag{ content = issue.area.unit.name }
    3.24 +        slot.put(" · ")
    3.25 +        ui.tag{ content = issue.area.name }
    3.26 +      end }
    3.27 +    end
    3.28    end }
    3.29    
    3.30    ui.tag{

     4.1 --- a/app/main/member/_event_list.lua	Fri May 18 19:44:41 2012 +0200
     4.2 +++ b/app/main/member/_event_list.lua	Fri May 18 21:03:10 2012 +0200
     4.3 @@ -5,7 +5,7 @@
     4.4  
     4.5    ui.link{
     4.6      attr = { class = events == "personal" and "ui_tabs_link active" or nil },
     4.7 -    text = _"Personal timeline",
     4.8 +    text = _"My areas and issues",
     4.9      module = "index", view = "index", params = { tab = "timeline", events = "personal" }
    4.10    }
    4.11    
    4.12 @@ -13,7 +13,7 @@
    4.13  
    4.14    ui.link{
    4.15      attr = { class = events == "global" and "active" or nil },
    4.16 -    text = _"Global timeline",
    4.17 +    text = _"Everything",
    4.18      module = "index", view = "index", params = { tab = "timeline", events = "global" }
    4.19    }
    4.20  end }

     5.1 --- a/app/main/member/_show.lua	Fri May 18 19:44:41 2012 +0200
     5.2 +++ b/app/main/member/_show.lua	Fri May 18 21:03:10 2012 +0200
     5.3 @@ -145,7 +145,7 @@
     5.4  if show_as_homepage then
     5.5    tabs[#tabs+1] = {
     5.6      name = "timeline",
     5.7 -    label = _"Events",
     5.8 +    label = _"Latest events",
     5.9      module = "member",
    5.10      view = "_event_list",
    5.11      params = { }

     6.1 --- a/app/main/unit/_head.lua	Fri May 18 19:44:41 2012 +0200
     6.2 +++ b/app/main/unit/_head.lua	Fri May 18 21:03:10 2012 +0200
     6.3 @@ -21,12 +21,8 @@
     6.4    ui.container{ attr = { class = "content" }, content = function()
     6.5  
     6.6      if app.session.member_id and app.session.member:has_voting_right_for_unit_id(unit.id) then
     6.7 -      ui.tag{ content = _"You have voting privileges" }
     6.8 -      slot.put(" · ")
     6.9 +      ui.tag{ content = _"You have voting privileges for this unit" }
    6.10      end
    6.11 -  
    6.12 -    ui.tag{ content = "1234 Stimmberechtigte" }
    6.13 -      
    6.14    end }
    6.15    
    6.16  end }

     7.1 --- a/app/main/unit/show.lua	Fri May 18 19:44:41 2012 +0200
     7.2 +++ b/app/main/unit/show.lua	Fri May 18 21:03:10 2012 +0200
     7.3 @@ -61,7 +61,7 @@
     7.4  
     7.5  tabs[#tabs+1] = {
     7.6    name = "timeline",
     7.7 -  label = _"Events",
     7.8 +  label = _"Latest events",
     7.9    module = "event",
    7.10    view = "_list",
    7.11    params = { for_unit = unit }

     8.1 --- a/static/style.css	Fri May 18 19:44:41 2012 +0200
     8.2 +++ b/static/style.css	Fri May 18 21:03:10 2012 +0200
     8.3 @@ -282,7 +282,7 @@
     8.4  
     8.5  .page_head {
     8.6    background-color: #fff;
     8.7 -  margin: 0px 10px 0 10px;
     8.8 +  margin: 0px 10px 2ex 10px;
     8.9    border: 1px solid #aaa;
    8.10    border-radius: 0 0 8px 8px;
    8.11    box-shadow: #777 0px 5px 5px -5px;
    8.12 @@ -291,7 +291,7 @@
    8.13  
    8.14  .page_head .area_head,
    8.15  .page_head .issue {
    8.16 -  border-top: 1px solid #000;
    8.17 +  xborder-top: 1px solid #000;
    8.18  }
    8.19  
    8.20  .page_head .unit_head .title,
    8.21 @@ -299,18 +299,23 @@
    8.22  .issue .context,
    8.23  .issue .title,
    8.24  .initiative_head .title {
    8.25 -  margin: 8px;
    8.26 +  padding: 8px 16px 2px 16px;
    8.27  }
    8.28  
    8.29  .page_head .unit_head .content,
    8.30  .page_head .area_head .content,
    8.31  .issue .content,
    8.32  .initiative_head .content {
    8.33 -  margin: 0px 8px 8px 8px;
    8.34 +  padding: 2px 16px 8px 16px;
    8.35 +}
    8.36 +
    8.37 +.page_head .initiative_list,
    8.38 +.issue .initiative_list {
    8.39 +  padding-left: 8px;
    8.40  }
    8.41  
    8.42  .issue .content.actions {
    8.43 -  margin-bottom: 2.5ex;
    8.44 +  margin-bottom: 1ex;
    8.45  }
    8.46  
    8.47  
    8.48 @@ -330,9 +335,30 @@
    8.49    font-size: 75%;
    8.50  }
    8.51  
    8.52 +.page_head .unit_head .content,
    8.53 +.page_head .area_head .content,
    8.54 +.page_head .area_head .content a,
    8.55 +.page_head .issue .content.actions,
    8.56 +.page_head .issue .content.actions a,
    8.57 +.issues .issue .content.actions,
    8.58 +.issues .issue .content.actions a {
    8.59 +  color: #777;
    8.60 +}
    8.61  
    8.62 -.initiative_head {
    8.63 -  margin-top: 10px;
    8.64 +.page_head .unit_head .title,
    8.65 +.page_head .area_head .title,
    8.66 +.issue .title {
    8.67 +  background-color: #eee;
    8.68 +  background-image: linear-gradient(top, #eee 0%, #f7f7f7 10%, #fff 100%);
    8.69 +  background-image: -o-linear-gradient(top, #eee 0%, #f7f7f7 10%, #fff 100%);
    8.70 +  background-image: -moz-linear-gradient(top, #eee 0%, #f7f7f7 10%, #fff 100%);
    8.71 +  background-image: -webkit-linear-gradient(top, #eee 0%, #f7f7f7 10%, #fff 100%);
    8.72 +  background-image: -ms-linear-gradient(top, #eee 0%, #f7f7f7 10%, #fff 100%);
    8.73 +}
    8.74 +
    8.75 +.page_head .area_head .title,
    8.76 +.page_head .issue .title {
    8.77 +  border-top: 1px solid #ddd;
    8.78  }
    8.79  
    8.80  
    8.81 @@ -649,49 +675,6 @@
    8.82  }
    8.83  
    8.84  
    8.85 -
    8.86 -/*************************************************************************
    8.87 - * Tables
    8.88 - */
    8.89 -
    8.90 -
    8.91 -table a.action {
    8.92 -  font-size: 70%;
    8.93 -  line-height: 190%;
    8.94 -  padding: 0.5ex;
    8.95 -  color: #777;
    8.96 -}
    8.97 -
    8.98 -table a.active {
    8.99 -  color: #fff; 
   8.100 -}
   8.101 -
   8.102 -th {
   8.103 -  text-align: left;
   8.104 -}
   8.105 -
   8.106 -tr:hover td {
   8.107 -  background-color: #f2f2f2;
   8.108 -}
   8.109 -
   8.110 -.nohover tr:hover td {
   8.111 -  background-color: #fff;
   8.112 -}
   8.113 -
   8.114 -.initiatives_list .nohover tr:hover td {
   8.115 -  background-color: #f2f2f2;
   8.116 -}
   8.117 -
   8.118 -.nohover table tr:hover td {
   8.119 -  background-color: #f2f2f2;
   8.120 -}
   8.121 -
   8.122 -
   8.123 -tr table tr:hover td {
   8.124 -  background-color: #fff;
   8.125 -}
   8.126 -
   8.127 -
   8.128  /*************************************************************************
   8.129   * Positive / Negtive votes
   8.130   */
   8.131 @@ -876,7 +859,6 @@
   8.132  
   8.133  .issues .issue {
   8.134    margin-top: 10px;
   8.135 -  background-color: #fcfcfc;
   8.136    overflow: hidden;
   8.137    border: 1px solid #aaa;
   8.138    border-radius: 8px;
   8.139 @@ -893,16 +875,6 @@
   8.140    margin-bottom: 1ex;
   8.141  }
   8.142  
   8.143 -.issue.interested .issue_info,
   8.144 -.issue.interested_by_delegation .issue_info  {
   8.145 -  background-color: #dfeaff;
   8.146 -  background-image: linear-gradient(top, #dfeaff 0%, #fcfcfc 66%);
   8.147 -  background-image: -o-linear-gradient(top, #dfeaff 0%, #fcfcfc 66%);
   8.148 -  background-image: -moz-linear-gradient(top, #dfeaff 0%, #fcfcfc 66%);
   8.149 -  background-image: -webkit-linear-gradient(top, #dfeaff 50%, #fcfcfc 100%);
   8.150 -  background-image: -ms-linear-gradient(top, #dfeaff 0%, #fcfcfc 66%);
   8.151 -}
   8.152 -
   8.153  .event_list .event .issue_id,
   8.154  .issue .issue_info .issue_id {
   8.155    font-size: 125%;
   8.156 @@ -1049,14 +1021,6 @@
   8.157    padding: 2px;
   8.158  }
   8.159  
   8.160 -.xmember_thumb a {
   8.161 -  position: absolute;
   8.162 -  top: 0;
   8.163 -  left: 0;
   8.164 -  padding: 0;
   8.165 -  margin: 0;
   8.166 -}
   8.167 -
   8.168  .member_thumb a:hover div {
   8.169    background-color: #444;
   8.170    color: #fff;
   8.171 @@ -1109,8 +1073,12 @@
   8.172    opacity: 0.4;
   8.173  }
   8.174  
   8.175 +.member_thumb {
   8.176 +  border: 2px solid #fff;
   8.177 +}
   8.178 +
   8.179  .member_thumb.in_delegation_chain {
   8.180 -  background-color: #cdf;
   8.181 +  border: 2px solid #fa0;
   8.182  }
   8.183  
   8.184  .member_statement,
   8.185 @@ -1437,7 +1405,8 @@
   8.186    padding: 0;
   8.187  }
   8.188  
   8.189 -.slot_initiatives_list,
   8.190 +.initiative_head,
   8.191 +.issues .issue,
   8.192  .ui_tabs_links a,
   8.193  .draft_content,
   8.194  .help,