# HG changeset patch
# User bsw
# Date 1330362371 -3600
# Node ID 56dc44366c3819c875ac98fd03c4424fd087b8bc
# Parent  5e6bdf07e3a10a1aef40787cb6b3ce0ba1b31b79
More color changes again...

diff -r 5e6bdf07e3a1 -r 56dc44366c38 app/main/_layout/default.html
--- a/app/main/_layout/default.html	Mon Feb 27 16:19:11 2012 +0100
+++ b/app/main/_layout/default.html	Mon Feb 27 18:06:11 2012 +0100
@@ -33,9 +33,6 @@
     <div class="logo" id="logo">
       <!-- WEBMCP SLOT logo -->
     </div>
-    <div class="issue_info" id="issue_info">
-      <!-- WEBMCP SLOT issue_info -->
-    </div>
     <div class="help_hidden" id="help_hidden">
       <!-- WEBMCP SLOT help_hidden -->
     </div>
@@ -50,6 +47,7 @@
         <!-- WEBMCP SLOT interest -->
       </div>
       <!-- WEBMCP SLOT actions -->
+      <div style="clear: left;"></div>
     </div>
     <div class="initiatives_list" id="initiatives_list">
       <!-- WEBMCP SLOT initiatives_list -->
diff -r 5e6bdf07e3a1 -r 56dc44366c38 app/main/initiative/_show.lua
--- a/app/main/initiative/_show.lua	Mon Feb 27 16:19:11 2012 +0100
+++ b/app/main/initiative/_show.lua	Mon Feb 27 18:06:11 2012 +0100
@@ -32,87 +32,98 @@
     attr = { class = "initiative_name" },
     content = _("Initiative i#{id}: #{name}", { id = initiative.id, name = initiative.name })
   }
-end )
 
-if app.session.member_id or config.public_access == "pseudonym" or config.public_access == "full" then
-  ui.tag{
-    attr = { class = "initiator_names" },
-    content = function()
-      for i, initiator in ipairs(initiators) do
-        slot.put(" ")
-        ui.link{
-          content = function ()
-            execute.view{
-              module = "member_image",
-              view = "_show",
-              params = {
-                member = initiator,
-                image_type = "avatar",
-                show_dummy = true,
-                class = "micro_avatar",
-                popup_text = text
+  if app.session.member_id or config.public_access == "pseudonym" or config.public_access == "full" then
+    ui.tag{
+      attr = { class = "initiator_names" },
+      content = function()
+        for i, initiator in ipairs(initiators) do
+          slot.put(" ")
+          ui.link{
+            content = function ()
+              execute.view{
+                module = "member_image",
+                view = "_show",
+                params = {
+                  member = initiator,
+                  image_type = "avatar",
+                  show_dummy = true,
+                  class = "micro_avatar",
+                  popup_text = text
+                }
               }
-            }
-          end,
-          module = "member", view = "show", id = initiator.id
-        }
-        slot.put(" ")
-        ui.link{
-          text = initiator.name,
-          module = "member", view = "show", id = initiator.id
-        }
-        if not initiator.accepted then
-          ui.tag{ attr = { title = _"Not accepted yet" }, content = "?" }
+            end,
+            module = "member", view = "show", id = initiator.id
+          }
+          slot.put(" ")
+          ui.link{
+            text = initiator.name,
+            module = "member", view = "show", id = initiator.id
+          }
+          if not initiator.accepted then
+            ui.tag{ attr = { title = _"Not accepted yet" }, content = "?" }
+          end
         end
       end
-    end
-  }
-end
+    }
+  end
 
-if initiator and initiator.accepted and not initiative.issue.fully_frozen and not initiative.issue.closed and not initiative.revoked then
-  slot.put(" &middot; ")
-  ui.link{
-    attr = { class = "action" },
-    content = function()
-      slot.put(_"Invite initiator")
-    end,
-    module = "initiative",
-    view = "add_initiator",
-    params = { initiative_id = initiative.id }
-  }
-  if #initiators > 1 then
+  if initiator and initiator.accepted and not initiative.issue.fully_frozen and not initiative.issue.closed and not initiative.revoked then
     slot.put(" &middot; ")
     ui.link{
+      attr = { class = "action" },
       content = function()
-        slot.put(_"Remove initiator")
+        slot.put(_"Invite initiator")
       end,
       module = "initiative",
-      view = "remove_initiator",
+      view = "add_initiator",
       params = { initiative_id = initiative.id }
     }
+    if #initiators > 1 then
+      slot.put(" &middot; ")
+      ui.link{
+        content = function()
+          slot.put(_"Remove initiator")
+        end,
+        module = "initiative",
+        view = "remove_initiator",
+        params = { initiative_id = initiative.id }
+      }
+    end
+  end
+  if initiator and initiator.accepted == false then
+      slot.put(" &middot; ")
+      ui.link{
+        text   = _"Cancel refuse of invitation",
+        module = "initiative",
+        action = "remove_initiator",
+        params = {
+          initiative_id = initiative.id,
+          member_id = app.session.member.id
+        },
+        routing = {
+          ok = {
+            mode = "redirect",
+            module = "initiative",
+            view = "show",
+            id = initiative.id
+          }
+        }
+      }
+  end
+  if app.session.member_id then
+    execute.view{
+      module = "supporter",
+      view = "_show_box",
+      params = {
+        initiative = initiative
+      }
+    }
   end
-end
-if initiator and initiator.accepted == false then
-    slot.put(" &middot; ")
-    ui.link{
-      text   = _"Cancel refuse of invitation",
-      module = "initiative",
-      action = "remove_initiator",
-      params = {
-        initiative_id = initiative.id,
-        member_id = app.session.member.id
-      },
-      routing = {
-        ok = {
-          mode = "redirect",
-          module = "initiative",
-          view = "show",
-          id = initiative.id
-        }
-      }
-    }
-end
-  
+
+end )
+
+
 util.help("initiative.show")
 
 
@@ -234,16 +245,6 @@
 end
 
 
-if app.session.member_id then
-  execute.view{
-    module = "supporter",
-    view = "_show_box",
-    params = {
-      initiative = initiative
-    }
-  }
-end
-
 local supporter
 
 if app.session.member_id then
diff -r 5e6bdf07e3a1 -r 56dc44366c38 static/style.css
--- a/static/style.css	Mon Feb 27 16:19:11 2012 +0100
+++ b/static/style.css	Mon Feb 27 18:06:11 2012 +0100
@@ -121,6 +121,7 @@
   line-height: 100%;
   padding-left: 10px;
   overflow: hidden;
+  box-shadow: #aaa 0 0 5px;
 }
 
 .topbar .logolf {
@@ -198,12 +199,36 @@
  * Title of current page including path and actions
  */
 
+.title,
+.title2,
+.actions {
+  background-color: #eee;
+  margin-left: 10px;
+  margin-right: 10px;
+}
+
+.actions {
+  border-radius: 0 0 8px 8px;
+}
+
+.initiative_head .actions {
+  background-color: #fff;
+  margin: 0px;
+}
+
+.initiatives_list {
+  margin-top: 1ex;
+  margin-left: 10px;
+  margin-right: 10px;
+  background-color: #f7f7f7;
+  border-radius: 8px;
+}
+
 .title {
-  background-color: #ddd;
-  background: -webkit-gradient(linear, left top, left bottom, 
-    color-stop(15%,#ddd), color-stop(50%,#fff)
-  );
-  text-shadow: #fff 0px 0px 3px;
+  box-shadow: inset #888 0px 5px 6px -5px;
+}
+
+.title {
   color: #000;
   padding: 1.5ex 1em 0 1em;
 }
@@ -232,8 +257,6 @@
 }
 
 .slot_initiatives_list {
-  border-top: 1px solid #aaa;
-  border-bottom: 1px solid #aaa;
   padding-top: 1ex;
   padding-bottom: 1ex;
 }
@@ -253,8 +276,8 @@
 .actions {
   font-size: 75%;
   line-height: 220%;
-  margin-top: 2ex;
-  margin-bottom: 2ex;
+  padding-top: 2ex;
+  padding-bottom: 1ex;
 }
 
 .interest {
@@ -273,43 +296,14 @@
 }
 
 .slot_initiative_head  {
-  background: -webkit-gradient(linear, left top, left bottom, 
-    color-stop(0%,#e7e7e7), color-stop(66%,#fff));
   padding-left: 1em;
-  padding-top: 1ex;
-  text-shadow: #fff 0px 0px 3px;
+  padding-top: 2ex;
 }
 
 .initiative_name {
   font-weight: bold;
   font-size: 125%;
 }
-
-.content_navigation {
-  font-size: 75%;
-  background-color: #eee;
-  margin-bottom: 2ex;
-  padding-left: 1em;
-}
-
-.content_navigation div,
-.content_navigation a {
-  display: inline-block;
-  padding: 3px 0.5em 3px 0.0em;
-  margin-right: 1em;
-  vertical-align: middle;
-}
-
-.content_navigation a:hover {
-  background-color: #d7d7d7;
-}
-
-.content_navigation_seperator {
-  height: 1.4em;
-  border-left: 1px solid black;
-}
-
-
 .actions a {
   float: left;
 }
@@ -370,6 +364,7 @@
 .actions .supporter,
 .actions .potential_supporter {
   border-radius: 5px;
+  border: 1px solid #fff;
 }
 
 .delegation .head_active,
@@ -430,6 +425,8 @@
   border-radius: 0 5px 5px 5px;
   padding: 1em;
   width: 35em;
+  border: 1px solid #fff;
+  border-top: none;
 }
 
 .vote_info .delegation_arrow {
@@ -481,8 +478,8 @@
  */
 
 .main {
-  margin-left: 1em;
-  margin-right: 1em;
+  margin-left: 10px;
+  margin-right: 10px;
 }
 
 /*************************************************************************
@@ -490,7 +487,7 @@
  */
 
 .ui_tabs_links {
-  margin-top: 2ex;
+  margin-top: 3ex;
   margin-bottom: 1ex;
   font-size: 75%;
 }
@@ -498,7 +495,7 @@
 .ui_tabs_links a {
   padding: 1ex;
   line-height: 300%;
-  background-color: #e7e7e7;
+  background-color: #eee;
   white-space: nowrap;
   border-radius: 5px;
   margin-right: 5px;
@@ -750,15 +747,19 @@
 }
 
 tr:hover td {
-  background-color: #ddd;
+  background-color: #eee;
 }
 
 .nohover tr:hover td {
   background-color: #fff;
 }
 
+.initiatives_list .nohover tr:hover td {
+  background-color: #f7f7f7;
+}
+
 .nohover table tr:hover td {
-  background-color: #ddd;
+  background-color: #eee;
 }
 
 
@@ -996,8 +997,7 @@
 .member_statement,
 .draft_content,
 .suggestion_content {
-  background-color: #eee;
-  xbackground: -webkit-gradient(linear, left top, right bottom, color-stop(0%,#f7f7f7), color-stop(100%,#e5e5e5));
+  background-color: #f7f7f7;
   padding: 1ex;
   border-radius: 8px;
 }