1.1 --- a/app/main/_layout/default.html	Mon Feb 27 16:19:11 2012 +0100
     1.2 +++ b/app/main/_layout/default.html	Mon Feb 27 18:06:11 2012 +0100
     1.3 @@ -33,9 +33,6 @@
     1.4      <div class="logo" id="logo">
     1.5        <!-- WEBMCP SLOT logo -->
     1.6      </div>
     1.7 -    <div class="issue_info" id="issue_info">
     1.8 -      <!-- WEBMCP SLOT issue_info -->
     1.9 -    </div>
    1.10      <div class="help_hidden" id="help_hidden">
    1.11        <!-- WEBMCP SLOT help_hidden -->
    1.12      </div>
    1.13 @@ -50,6 +47,7 @@
    1.14          <!-- WEBMCP SLOT interest -->
    1.15        </div>
    1.16        <!-- WEBMCP SLOT actions -->
    1.17 +      <div style="clear: left;"></div>
    1.18      </div>
    1.19      <div class="initiatives_list" id="initiatives_list">
    1.20        <!-- WEBMCP SLOT initiatives_list -->

     2.1 --- a/app/main/initiative/_show.lua	Mon Feb 27 16:19:11 2012 +0100
     2.2 +++ b/app/main/initiative/_show.lua	Mon Feb 27 18:06:11 2012 +0100
     2.3 @@ -32,87 +32,98 @@
     2.4      attr = { class = "initiative_name" },
     2.5      content = _("Initiative i#{id}: #{name}", { id = initiative.id, name = initiative.name })
     2.6    }
     2.7 -end )
     2.8  
     2.9 -if app.session.member_id or config.public_access == "pseudonym" or config.public_access == "full" then
    2.10 -  ui.tag{
    2.11 -    attr = { class = "initiator_names" },
    2.12 -    content = function()
    2.13 -      for i, initiator in ipairs(initiators) do
    2.14 -        slot.put(" ")
    2.15 -        ui.link{
    2.16 -          content = function ()
    2.17 -            execute.view{
    2.18 -              module = "member_image",
    2.19 -              view = "_show",
    2.20 -              params = {
    2.21 -                member = initiator,
    2.22 -                image_type = "avatar",
    2.23 -                show_dummy = true,
    2.24 -                class = "micro_avatar",
    2.25 -                popup_text = text
    2.26 +  if app.session.member_id or config.public_access == "pseudonym" or config.public_access == "full" then
    2.27 +    ui.tag{
    2.28 +      attr = { class = "initiator_names" },
    2.29 +      content = function()
    2.30 +        for i, initiator in ipairs(initiators) do
    2.31 +          slot.put(" ")
    2.32 +          ui.link{
    2.33 +            content = function ()
    2.34 +              execute.view{
    2.35 +                module = "member_image",
    2.36 +                view = "_show",
    2.37 +                params = {
    2.38 +                  member = initiator,
    2.39 +                  image_type = "avatar",
    2.40 +                  show_dummy = true,
    2.41 +                  class = "micro_avatar",
    2.42 +                  popup_text = text
    2.43 +                }
    2.44                }
    2.45 -            }
    2.46 -          end,
    2.47 -          module = "member", view = "show", id = initiator.id
    2.48 -        }
    2.49 -        slot.put(" ")
    2.50 -        ui.link{
    2.51 -          text = initiator.name,
    2.52 -          module = "member", view = "show", id = initiator.id
    2.53 -        }
    2.54 -        if not initiator.accepted then
    2.55 -          ui.tag{ attr = { title = _"Not accepted yet" }, content = "?" }
    2.56 +            end,
    2.57 +            module = "member", view = "show", id = initiator.id
    2.58 +          }
    2.59 +          slot.put(" ")
    2.60 +          ui.link{
    2.61 +            text = initiator.name,
    2.62 +            module = "member", view = "show", id = initiator.id
    2.63 +          }
    2.64 +          if not initiator.accepted then
    2.65 +            ui.tag{ attr = { title = _"Not accepted yet" }, content = "?" }
    2.66 +          end
    2.67          end
    2.68        end
    2.69 -    end
    2.70 -  }
    2.71 -end
    2.72 +    }
    2.73 +  end
    2.74  
    2.75 -if initiator and initiator.accepted and not initiative.issue.fully_frozen and not initiative.issue.closed and not initiative.revoked then
    2.76 -  slot.put(" · ")
    2.77 -  ui.link{
    2.78 -    attr = { class = "action" },
    2.79 -    content = function()
    2.80 -      slot.put(_"Invite initiator")
    2.81 -    end,
    2.82 -    module = "initiative",
    2.83 -    view = "add_initiator",
    2.84 -    params = { initiative_id = initiative.id }
    2.85 -  }
    2.86 -  if #initiators > 1 then
    2.87 +  if initiator and initiator.accepted and not initiative.issue.fully_frozen and not initiative.issue.closed and not initiative.revoked then
    2.88      slot.put(" · ")
    2.89      ui.link{
    2.90 +      attr = { class = "action" },
    2.91        content = function()
    2.92 -        slot.put(_"Remove initiator")
    2.93 +        slot.put(_"Invite initiator")
    2.94        end,
    2.95        module = "initiative",
    2.96 -      view = "remove_initiator",
    2.97 +      view = "add_initiator",
    2.98        params = { initiative_id = initiative.id }
    2.99      }
   2.100 +    if #initiators > 1 then
   2.101 +      slot.put(" · ")
   2.102 +      ui.link{
   2.103 +        content = function()
   2.104 +          slot.put(_"Remove initiator")
   2.105 +        end,
   2.106 +        module = "initiative",
   2.107 +        view = "remove_initiator",
   2.108 +        params = { initiative_id = initiative.id }
   2.109 +      }
   2.110 +    end
   2.111 +  end
   2.112 +  if initiator and initiator.accepted == false then
   2.113 +      slot.put(" · ")
   2.114 +      ui.link{
   2.115 +        text   = _"Cancel refuse of invitation",
   2.116 +        module = "initiative",
   2.117 +        action = "remove_initiator",
   2.118 +        params = {
   2.119 +          initiative_id = initiative.id,
   2.120 +          member_id = app.session.member.id
   2.121 +        },
   2.122 +        routing = {
   2.123 +          ok = {
   2.124 +            mode = "redirect",
   2.125 +            module = "initiative",
   2.126 +            view = "show",
   2.127 +            id = initiative.id
   2.128 +          }
   2.129 +        }
   2.130 +      }
   2.131 +  end
   2.132 +  if app.session.member_id then
   2.133 +    execute.view{
   2.134 +      module = "supporter",
   2.135 +      view = "_show_box",
   2.136 +      params = {
   2.137 +        initiative = initiative
   2.138 +      }
   2.139 +    }
   2.140    end
   2.141 -end
   2.142 -if initiator and initiator.accepted == false then
   2.143 -    slot.put(" · ")
   2.144 -    ui.link{
   2.145 -      text   = _"Cancel refuse of invitation",
   2.146 -      module = "initiative",
   2.147 -      action = "remove_initiator",
   2.148 -      params = {
   2.149 -        initiative_id = initiative.id,
   2.150 -        member_id = app.session.member.id
   2.151 -      },
   2.152 -      routing = {
   2.153 -        ok = {
   2.154 -          mode = "redirect",
   2.155 -          module = "initiative",
   2.156 -          view = "show",
   2.157 -          id = initiative.id
   2.158 -        }
   2.159 -      }
   2.160 -    }
   2.161 -end
   2.162 -  
   2.163 +
   2.164 +end )
   2.165 +
   2.166 +
   2.167  util.help("initiative.show")
   2.168  
   2.169  
   2.170 @@ -234,16 +245,6 @@
   2.171  end
   2.172  
   2.173  
   2.174 -if app.session.member_id then
   2.175 -  execute.view{
   2.176 -    module = "supporter",
   2.177 -    view = "_show_box",
   2.178 -    params = {
   2.179 -      initiative = initiative
   2.180 -    }
   2.181 -  }
   2.182 -end
   2.183 -
   2.184  local supporter
   2.185  
   2.186  if app.session.member_id then

     3.1 --- a/static/style.css	Mon Feb 27 16:19:11 2012 +0100
     3.2 +++ b/static/style.css	Mon Feb 27 18:06:11 2012 +0100
     3.3 @@ -121,6 +121,7 @@
     3.4    line-height: 100%;
     3.5    padding-left: 10px;
     3.6    overflow: hidden;
     3.7 +  box-shadow: #aaa 0 0 5px;
     3.8  }
     3.9  
    3.10  .topbar .logolf {
    3.11 @@ -198,12 +199,36 @@
    3.12   * Title of current page including path and actions
    3.13   */
    3.14  
    3.15 +.title,
    3.16 +.title2,
    3.17 +.actions {
    3.18 +  background-color: #eee;
    3.19 +  margin-left: 10px;
    3.20 +  margin-right: 10px;
    3.21 +}
    3.22 +
    3.23 +.actions {
    3.24 +  border-radius: 0 0 8px 8px;
    3.25 +}
    3.26 +
    3.27 +.initiative_head .actions {
    3.28 +  background-color: #fff;
    3.29 +  margin: 0px;
    3.30 +}
    3.31 +
    3.32 +.initiatives_list {
    3.33 +  margin-top: 1ex;
    3.34 +  margin-left: 10px;
    3.35 +  margin-right: 10px;
    3.36 +  background-color: #f7f7f7;
    3.37 +  border-radius: 8px;
    3.38 +}
    3.39 +
    3.40  .title {
    3.41 -  background-color: #ddd;
    3.42 -  background: -webkit-gradient(linear, left top, left bottom, 
    3.43 -    color-stop(15%,#ddd), color-stop(50%,#fff)
    3.44 -  );
    3.45 -  text-shadow: #fff 0px 0px 3px;
    3.46 +  box-shadow: inset #888 0px 5px 6px -5px;
    3.47 +}
    3.48 +
    3.49 +.title {
    3.50    color: #000;
    3.51    padding: 1.5ex 1em 0 1em;
    3.52  }
    3.53 @@ -232,8 +257,6 @@
    3.54  }
    3.55  
    3.56  .slot_initiatives_list {
    3.57 -  border-top: 1px solid #aaa;
    3.58 -  border-bottom: 1px solid #aaa;
    3.59    padding-top: 1ex;
    3.60    padding-bottom: 1ex;
    3.61  }
    3.62 @@ -253,8 +276,8 @@
    3.63  .actions {
    3.64    font-size: 75%;
    3.65    line-height: 220%;
    3.66 -  margin-top: 2ex;
    3.67 -  margin-bottom: 2ex;
    3.68 +  padding-top: 2ex;
    3.69 +  padding-bottom: 1ex;
    3.70  }
    3.71  
    3.72  .interest {
    3.73 @@ -273,43 +296,14 @@
    3.74  }
    3.75  
    3.76  .slot_initiative_head  {
    3.77 -  background: -webkit-gradient(linear, left top, left bottom, 
    3.78 -    color-stop(0%,#e7e7e7), color-stop(66%,#fff));
    3.79    padding-left: 1em;
    3.80 -  padding-top: 1ex;
    3.81 -  text-shadow: #fff 0px 0px 3px;
    3.82 +  padding-top: 2ex;
    3.83  }
    3.84  
    3.85  .initiative_name {
    3.86    font-weight: bold;
    3.87    font-size: 125%;
    3.88  }
    3.89 -
    3.90 -.content_navigation {
    3.91 -  font-size: 75%;
    3.92 -  background-color: #eee;
    3.93 -  margin-bottom: 2ex;
    3.94 -  padding-left: 1em;
    3.95 -}
    3.96 -
    3.97 -.content_navigation div,
    3.98 -.content_navigation a {
    3.99 -  display: inline-block;
   3.100 -  padding: 3px 0.5em 3px 0.0em;
   3.101 -  margin-right: 1em;
   3.102 -  vertical-align: middle;
   3.103 -}
   3.104 -
   3.105 -.content_navigation a:hover {
   3.106 -  background-color: #d7d7d7;
   3.107 -}
   3.108 -
   3.109 -.content_navigation_seperator {
   3.110 -  height: 1.4em;
   3.111 -  border-left: 1px solid black;
   3.112 -}
   3.113 -
   3.114 -
   3.115  .actions a {
   3.116    float: left;
   3.117  }
   3.118 @@ -370,6 +364,7 @@
   3.119  .actions .supporter,
   3.120  .actions .potential_supporter {
   3.121    border-radius: 5px;
   3.122 +  border: 1px solid #fff;
   3.123  }
   3.124  
   3.125  .delegation .head_active,
   3.126 @@ -430,6 +425,8 @@
   3.127    border-radius: 0 5px 5px 5px;
   3.128    padding: 1em;
   3.129    width: 35em;
   3.130 +  border: 1px solid #fff;
   3.131 +  border-top: none;
   3.132  }
   3.133  
   3.134  .vote_info .delegation_arrow {
   3.135 @@ -481,8 +478,8 @@
   3.136   */
   3.137  
   3.138  .main {
   3.139 -  margin-left: 1em;
   3.140 -  margin-right: 1em;
   3.141 +  margin-left: 10px;
   3.142 +  margin-right: 10px;
   3.143  }
   3.144  
   3.145  /*************************************************************************
   3.146 @@ -490,7 +487,7 @@
   3.147   */
   3.148  
   3.149  .ui_tabs_links {
   3.150 -  margin-top: 2ex;
   3.151 +  margin-top: 3ex;
   3.152    margin-bottom: 1ex;
   3.153    font-size: 75%;
   3.154  }
   3.155 @@ -498,7 +495,7 @@
   3.156  .ui_tabs_links a {
   3.157    padding: 1ex;
   3.158    line-height: 300%;
   3.159 -  background-color: #e7e7e7;
   3.160 +  background-color: #eee;
   3.161    white-space: nowrap;
   3.162    border-radius: 5px;
   3.163    margin-right: 5px;
   3.164 @@ -750,15 +747,19 @@
   3.165  }
   3.166  
   3.167  tr:hover td {
   3.168 -  background-color: #ddd;
   3.169 +  background-color: #eee;
   3.170  }
   3.171  
   3.172  .nohover tr:hover td {
   3.173    background-color: #fff;
   3.174  }
   3.175  
   3.176 +.initiatives_list .nohover tr:hover td {
   3.177 +  background-color: #f7f7f7;
   3.178 +}
   3.179 +
   3.180  .nohover table tr:hover td {
   3.181 -  background-color: #ddd;
   3.182 +  background-color: #eee;
   3.183  }
   3.184  
   3.185  
   3.186 @@ -996,8 +997,7 @@
   3.187  .member_statement,
   3.188  .draft_content,
   3.189  .suggestion_content {
   3.190 -  background-color: #eee;
   3.191 -  xbackground: -webkit-gradient(linear, left top, right bottom, color-stop(0%,#f7f7f7), color-stop(100%,#e5e5e5));
   3.192 +  background-color: #f7f7f7;
   3.193    padding: 1ex;
   3.194    border-radius: 8px;
   3.195  }