1.1 --- a/app/main/area/_list.lua	Mon Mar 05 11:15:22 2012 +0100
     1.2 +++ b/app/main/area/_list.lua	Mon Mar 05 11:16:41 2012 +0100
     1.3 @@ -32,6 +32,38 @@
     1.4  
     1.5  ui.container{ attr = { class = "area_list" }, content = function()
     1.6  
     1.7 +  ui.container{ attr = { class = "area head" }, content = function()
     1.8 +
     1.9 +    ui.container{ attr = { class = "phases" }, content = function()
    1.10 +
    1.11 +      ui.container{ attr = { class = "admission" }, content = function()
    1.12 +        ui.image{ static = "icons/16/new.png" }
    1.13 +      end }
    1.14 +
    1.15 +      ui.container{ attr = { class = "discussion" }, content = function()
    1.16 +        ui.image{ static = "icons/16/comments.png" }
    1.17 +      end }
    1.18 +
    1.19 +      ui.container{ attr = { class = "verification" }, content = function()
    1.20 +        ui.image{ static = "icons/16/lock.png" }
    1.21 +      end }
    1.22 +
    1.23 +      ui.container{ attr = { class = "voting" }, content = function()
    1.24 +        ui.image{ static = "icons/16/email_open.png" }
    1.25 +      end }
    1.26 +
    1.27 +      ui.container{ attr = { class = "finished" }, content = function()
    1.28 +        ui.image{ static = "icons/16/tick.png" }
    1.29 +      end }
    1.30 +
    1.31 +      ui.container{ attr = { class = "cancelled" }, content = function()
    1.32 +        ui.image{ static = "icons/16/cross.png" }
    1.33 +      end }
    1.34 +
    1.35 +    end }
    1.36 +
    1.37 +  end }
    1.38 +    
    1.39    for i, area in ipairs(areas_selector:exec()) do
    1.40  
    1.41      ui.container{ attr = { class = "area" }, content = function()
    1.42 @@ -164,7 +196,7 @@
    1.43  
    1.44        end }
    1.45        
    1.46 -      slot.put("<br />")
    1.47 +      slot.put("<br style='clear: right;' />")
    1.48      end }
    1.49      
    1.50    end

     2.1 --- a/app/main/initiative/_action/revoke.lua	Mon Mar 05 11:15:22 2012 +0100
     2.2 +++ b/app/main/initiative/_action/revoke.lua	Mon Mar 05 11:16:41 2012 +0100
     2.3 @@ -40,6 +40,7 @@
     2.4    return false
     2.5  end
     2.6  
     2.7 +initiative.revoked_by_member_id = app.session.member_id
     2.8  initiative.revoked = "now"
     2.9  initiative:save()
    2.10  

     3.1 --- a/static/style.css	Mon Mar 05 11:15:22 2012 +0100
     3.2 +++ b/static/style.css	Mon Mar 05 11:16:41 2012 +0100
     3.3 @@ -843,24 +843,38 @@
     3.4   */
     3.5  
     3.6  .member_area_list {
     3.7 -  margin-bottom: 2ex;
     3.8 +  margin-bottom: 0ex;
     3.9  }
    3.10  
    3.11  .member_area_list .unit_head {
    3.12    font-size: 120%;
    3.13    font-weight: bold;
    3.14    line-height: 200%;
    3.15 +  float: left;
    3.16 +  clear: both;
    3.17  }
    3.18  
    3.19  .member_area_list .unit_delegatee {
    3.20    float: left;
    3.21  }
    3.22  
    3.23 +.area_list {
    3.24 +  margin-bottom: 4ex;
    3.25 +}
    3.26  .area_list .area {
    3.27    line-height: 28px;
    3.28    clear: both;
    3.29  }
    3.30  
    3.31 +.area_list .area.head {
    3.32 +  line-height: 16px;
    3.33 +  clear: none;
    3.34 +}
    3.35 +
    3.36 +.area_list .area.head .phases {
    3.37 +  margin-top: 2ex;
    3.38 +}
    3.39 +
    3.40  .area_list .area img {
    3.41    vertical-align: middle;
    3.42  }
    3.43 @@ -883,7 +897,6 @@
    3.44  
    3.45  .area_list .area .phases {
    3.46    float: right;
    3.47 -  margin-bottom: 2ex;
    3.48  }
    3.49  
    3.50  .area_list .area .phases div {