# HG changeset patch
# User bsw
# Date 1300031613 -3600
# Node ID 7ea52c7105034a8c26c3eef10c804d992de6b217
# Parent  73dbc9e2bfd408a157517a5cac9b17172773469d
Some little changes for next generation frontend

diff -r 73dbc9e2bfd4 -r 7ea52c710503 app/main/_layout/lf2.html
--- a/app/main/_layout/lf2.html	Sat Mar 12 19:22:50 2011 +0100
+++ b/app/main/_layout/lf2.html	Sun Mar 13 16:53:33 2011 +0100
@@ -9,9 +9,9 @@
 
   <div class="topbox line1">
     <a>LiquidFeedback</a>
-    <a>Musterorganisation</a> 
+    <a>Example organisation</a> 
     <div class="right">
-      <a href="__BASEURL__/lf2/settings.html">Einstellungen</a>
+      <a href="__BASEURL__/lf2/settings.html">Settings</a>
       <a href="__BASEURL__/lf2/">Logout</a>
     </div>
     <br style="clear: both;" />
@@ -27,7 +27,7 @@
   <!-- WEBMCP SLOTNODIV leftright_post -->
 
   <div class="layout_trace" id="layout_trace" style="xdisplay: none">
-    <div id="trace_show" onclick="document.getElementById('trace_content').style.display='block';this.style.display='none';">TRACE</div>
+    <div id="trace_show" style="display: none" onclick="document.getElementById('trace_content').style.display='block';this.style.display='none';">TRACE</div>
       <div id="trace_content" style="display: none;">
           <tt id="system_error"><!-- WEBMCP SLOT system_error --></tt>
           <div id="trace">&nbsp;</div><hr />
diff -r 73dbc9e2bfd4 -r 7ea52c710503 app/main/initiative/_action/create.lua
--- a/app/main/initiative/_action/create.lua	Sat Mar 12 19:22:50 2011 +0100
+++ b/app/main/initiative/_action/create.lua	Sun Mar 13 16:53:33 2011 +0100
@@ -82,6 +82,7 @@
   issue = Issue:new()
   issue.area_id = area.id
   issue.policy_id = policy_id
+  issue.state = "admission"
   issue:save()
 end
 
diff -r 73dbc9e2bfd4 -r 7ea52c710503 app/main/lf2/_filter_view/10_topnav.lua
--- a/app/main/lf2/_filter_view/10_topnav.lua	Sat Mar 12 19:22:50 2011 +0100
+++ b/app/main/lf2/_filter_view/10_topnav.lua	Sun Mar 13 16:53:33 2011 +0100
@@ -1,6 +1,11 @@
 execute.inner()
 
 local phase = app.topnav_phase
+
+if not phase then
+  return
+end
+
 local order = app.topnav_order
 
 local area_id = app.topnav_area_id
diff -r 73dbc9e2bfd4 -r 7ea52c710503 app/main/lf2/_initiative_support.lua
--- a/app/main/lf2/_initiative_support.lua	Sat Mar 12 19:22:50 2011 +0100
+++ b/app/main/lf2/_initiative_support.lua	Sun Mar 13 16:53:33 2011 +0100
@@ -23,10 +23,9 @@
           slot.put(" ")
           ui.tag{ content = _"Your are potential supporter" }
         end
-      end }
-      ui.box_col{ class = "right", content = function()
+        slot.put(" &middot; ")
         ui.link{
-          text    = _"Remove support",
+          text    = _"revoke",
           module  = "initiative",
           action  = "remove_support",
           id      = initiative.id,
diff -r 73dbc9e2bfd4 -r 7ea52c710503 app/main/lf2/_issue.lua
--- a/app/main/lf2/_issue.lua	Sat Mar 12 19:22:50 2011 +0100
+++ b/app/main/lf2/_issue.lua	Sun Mar 13 16:53:33 2011 +0100
@@ -74,8 +74,8 @@
   end }
 
   if #trustees > 1 then
-    ui.box_row{ class = "head2", content = function()
-      ui.box_col{ class = "head left", content = function()
+    ui.box_row{ class = "", content = function()
+      ui.box_col{ class = "left", content = function()
         execute.view{ module = "lf2", view = "_avatars", params = { members = trustees, arrows = true, size = "small", issue_id = issue.id } }
       end }
     end }
@@ -97,24 +97,16 @@
             routing = { default = { mode = "redirect", module = "lf2", view = "issue", id = issue.id } }
           }
         end
-        if #trustees == 1 then
-          ui.link{
-            text = _"Set issue delegation",
-            module = "lf2", view = "delegation", params = { issue_id = issue.id }
-          }    
-        end
         slot.put(" &middot; ")
-        if not issue.closed and not issue.fully_frozen then
-          if trustees[1].scope_out == "issue" then
-            text = _"Change or revoke issue delegation"
-          else
-            text = _"Set issue delegation"
-          end  
-          ui.link{
-            text = text,
-            module = "lf2", view = "delegation", params = { issue_id = issue.id }
-          }    
-        end
+        if trustees[1].scope_out == "issue" then
+          text = _"Change or revoke issue delegation"
+        else
+          text = _"Set issue delegation"
+        end  
+        ui.link{
+          text = text,
+          module = "lf2", view = "delegation", params = { issue_id = issue.id }
+        }    
       end }
 
     end }
@@ -125,7 +117,7 @@
       ui.link{
         module = "lf2", view = "index", id = issue.area.unit_id,
         params = { phase = issue.phase },
-        text = issue.area.unit.name
+        text = issue.area.unit.name_with_path
       }
     end }
     ui.box_col{ class = "policy_name right", content = function()
diff -r 73dbc9e2bfd4 -r 7ea52c710503 app/main/lf2/_sidebar_issue.lua
--- a/app/main/lf2/_sidebar_issue.lua	Sat Mar 12 19:22:50 2011 +0100
+++ b/app/main/lf2/_sidebar_issue.lua	Sun Mar 13 16:53:33 2011 +0100
@@ -24,47 +24,40 @@
 ui.box{ class = "issue", content = function()
 
   ui.box_row{ class = "issue_id head", content = function() ui.box_col{ class = "head", content = function()
-    if interest then
-      local text
-      if issue.close then
-        text = _"You were interested in this issue"
-      else
-        text = _"You are interested in this issue"
-      end
-      ui.image{ attr = { title = text, alt = text}, static = "lf2/icon_star.png" }
-      slot.put(" ")
-    elseif delegating_interest then
-      local text
-      if issue.closed then
-        text = _"Someone in your delegation chain was interested"
-      else
-        text = _"Someone in your delegation chain is interested"
-      end
-      ui.image{ attr = { title = text, alt = text}, static = "lf2/icon_delegated_star.png" }
-      slot.put(" ")
-    end
     ui.link{
       module = "lf2", view = "issue", id = issue.id,
       content = _("Issue ##{id}", { id = issue.id })
     }
   end } end }
 
-  if #trustees > 1 then
-    ui.box_row{ class = "delegation", content = function() ui.box_col{ content = function()
-      execute.view{ module = "lf2", view = "_avatars", params = { members = trustees, arrows = true, size = "small", issue_id = issue.id } }
-    end } end }
-  end
-
   if not issue.closed then
     ui.box_row{ class = "interest", content = function() ui.box_col{ content = function()
       if interest then
+        local text
+        if issue.close then
+          text = _"You were interested"
+        else
+          text = _"You are interested"
+        end
+        ui.image{ static = "lf2/icon_star.png" }
+        slot.put(" ")
+        ui.tag{ content = text }
+        slot.put(" &middot; ")
         ui.link{
           module = "interest", action = "update", params = { issue_id = issue.id, delete = true },
           routing = { default = {
             mode = "redirect", module = "lf2", view = initiative_id and "initiative" or "issue", id = initiative_id or issue.id,
           } },
-          content = _"Remove my interest"
+          content = _"remove"
         }
+      elseif delegating_interest then
+        local text
+        if issue.closed then
+          text = _"Someone in your delegation chain was interested"
+        else
+          text = _"Someone in your delegation chain is interested"
+        end
+        ui.image{ attr = { title = text, alt = text}, static = "lf2/icon_delegated_star.png" }
       else
         ui.link{
           module = "interest", action = "update", params = { issue_id = issue.id },
@@ -77,18 +70,24 @@
     end } end }
   end
 
+  if #trustees > 1 then
+    ui.box_row{ class = "delegation", content = function() ui.box_col{ content = function()
+      execute.view{ module = "lf2", view = "_avatars", params = { members = trustees, arrows = true, size = "small", issue_id = issue.id } }
+    end } end }
+  end
+
   if not issue.closed then
     ui.box_row{ class = "interest", content = function() ui.box_col{ content = function()
       if #trustees > 1 and trustees[1].scope_out == "issue" then
         ui.link{
           module = "lf2", view = "delegation", params = { issue_id = issue.id, initiative_id = initiative_id },
-          content = _"Set issue delegation"
-        }
+          content = _"Change or remove delegation"
+        }   
       else
         ui.link{
           module = "lf2", view = "delegation", params = { issue_id = issue.id, initiative_id = initiative_id },
-          content = _"Change or remove delegation"
-        }   
+          content = _"Set issue delegation"
+        }
       end
 
     end } end }
diff -r 73dbc9e2bfd4 -r 7ea52c710503 app/main/lf2/_sidebar_unit.lua
--- a/app/main/lf2/_sidebar_unit.lua	Sat Mar 12 19:22:50 2011 +0100
+++ b/app/main/lf2/_sidebar_unit.lua	Sun Mar 13 16:53:33 2011 +0100
@@ -81,7 +81,7 @@
   if member_areas_selector:count() > 0 then
     ui.box{ content = function()
       ui.box_row{ class = "head", content = function() ui.box_col{ class = "head", content = function()
-        ui.link{ text = _"Areas, you are member of", module = "lf2", view = "index" }
+        ui.link{ text = _"Areas, you are member of", module = "lf2", view = "index", id = unit.id }
       end } end }
 
       execute.view{
@@ -97,7 +97,8 @@
   if other_areas_selector:count() > 0 then
     ui.box{ content = function()
       ui.box_row{ class = "head", content = function() ui.box_col{ class = "head", content = function()
-        ui.link{ content = _"Areas", module = "lf2", view = "index" }
+        --ui.link{ content = _"Areas", module = "lf2", view = "index", view = "index", id = unit.id }
+        ui.tag{ content = _"Areas" }
       end } end }
 
       execute.view{
diff -r 73dbc9e2bfd4 -r 7ea52c710503 app/main/lf2/delegation.lua
--- a/app/main/lf2/delegation.lua	Sat Mar 12 19:22:50 2011 +0100
+++ b/app/main/lf2/delegation.lua	Sun Mar 13 16:53:33 2011 +0100
@@ -43,7 +43,7 @@
         mode = "redirect",
         module = "lf2",
         view = area and "area" or initiative and "initiative" or issue and "issue" or "index",
-        id = area and area.id or initiative and initiative.id or issue and issue.id or nil,
+        id = area and area.id or initiative and initiative.id or issue and issue.id or unit.id,
       }
     },
     content = function()
diff -r 73dbc9e2bfd4 -r 7ea52c710503 app/main/lf2/settings.lua
--- a/app/main/lf2/settings.lua	Sat Mar 12 19:22:50 2011 +0100
+++ b/app/main/lf2/settings.lua	Sun Mar 13 16:53:33 2011 +0100
@@ -5,24 +5,23 @@
 
 
 ui.box{ content = function()
-  ui.box_row{ content = function()
-    ui.box_col{ content = function()
-      ui.link{ module = "lf2", view = "settings_password", text = _"Change your password" }
-    end }
-    ui.box_col{ content = function()
-      ui.link{ module = "lf2", view = "settings_name", text = _"Member name" }
-    end }
-    ui.box_col{ content = function()
-      ui.link{ module = "lf2", view = "settings_email", text = _"Change your email address" }
-    end }
-    ui.box_col{ content = function()
-      ui.link{ module = "lf2", view = "settings_privacy", text = _"Privacy settings" }
-    end }
-    ui.box_col{ content = function()
-      ui.link{ module = "lf2", view = "settings_api", text = _"API settings" }
-    end }
-    ui.box_col{ content = function()
-      ui.link{ module = "lf2", view = "settings_", text = _"" }
-    end }
-  end }
+  ui.box_row{ class = "head", content = function() ui.box_col{ class = "head", content = _"Member settings" } end }
+  ui.box_row{ content = function() ui.box_col{ content = function()
+    ui.link{ module = "lf2", view = "settings_password", text = _"Change password" }
+  end } end }
+  ui.box_row{ content = function() ui.box_col{ content = function()
+    ui.link{ module = "lf2", view = "settings_name", text = _"Change member or login name" }
+  end } end }
+  ui.box_row{ content = function() ui.box_col{ content = function()
+    ui.link{ module = "lf2", view = "settings_email", text = _"Change notification email address" }
+  end } end }
+  ui.box_row{ content = function() ui.box_col{ content = function()
+    ui.link{ module = "lf2", view = "settings_privacy", text = _"Privacy settings" }
+  end } end }
+  ui.box_row{ content = function() ui.box_col{ content = function()
+    ui.link{ module = "lf2", view = "settings_api", text = _"API settings" }
+  end } end }
+  ui.box_row{ content = function() ui.box_col{ content = function()
+    ui.link{ module = "lf2", view = "settings_", text = _"" }
+  end } end }
 end }
\ No newline at end of file
diff -r 73dbc9e2bfd4 -r 7ea52c710503 model/issue.lua
--- a/model/issue.lua	Sat Mar 12 19:22:50 2011 +0100
+++ b/model/issue.lua	Sun Mar 13 16:53:33 2011 +0100
@@ -276,12 +276,13 @@
 
 function Issue:get_state_name_for_state(value)
   local state_name_table = {
-    new          = _"New",
+    admission    = _"New",
     accepted     = _"Discussion",
     frozen       = _"Frozen",
     voting       = _"Voting",
     finished     = _"Finished",
-    cancelled    = _"Cancelled"
+    cancelled    = _"Cancelled",
+    canceled_issue_not_accepted = _"Cancelled"
   }
   return state_name_table[value] or value or ''
 end
@@ -364,6 +365,7 @@
   return selector
 end
 
+--[[
 function Issue.object_get:state()
   if self.closed then
     if self.fully_frozen then
@@ -382,6 +384,7 @@
   end
 
 end
+--]]
 
 function Issue.object_get:phase()
   local state = self.state
@@ -400,7 +403,7 @@
   local state = self.state
   local last_event_time
   local duration
-  if state == "new" then
+  if state == "admission" then
     last_event_time = self.created
     duration = self.admission_time
   elseif state == "accepted" then
diff -r 73dbc9e2bfd4 -r 7ea52c710503 model/unit.lua
--- a/model/unit.lua	Sat Mar 12 19:22:50 2011 +0100
+++ b/model/unit.lua	Sun Mar 13 16:53:33 2011 +0100
@@ -51,3 +51,12 @@
 
   return list
 end
+
+function Unit.object_get:name_with_path()
+  local name = ""
+  if self.parent then
+    name = self.parent.name_with_path .. " / "
+  end
+  name = name .. self.name
+  return name
+end
diff -r 73dbc9e2bfd4 -r 7ea52c710503 static/lf2.css
--- a/static/lf2.css	Sat Mar 12 19:22:50 2011 +0100
+++ b/static/lf2.css	Sun Mar 13 16:53:33 2011 +0100
@@ -90,24 +90,29 @@
  * Margins und paddings 
  */
 
+.topbox { margin: 0 1% 0 1%; }
+
+.topbox
+        { margin-bottom: 1ex; }
+
 .topbox a
-        { margin: 0 0 0 0.5em; padding: 0.7ex 0.5em 0.3ex 0.5em; }
+        { margin: 0 0.5em 0 0; padding: 0.3ex 0.5em 0.3ex 0.5em; }
 
 .topbox select
         { margin: 0.5ex 0 0.5ex 0; padding: 0.3ex 0.2em 0.2ex 0.2em;}
 
 .topbox .right a,
 .topbox .right span
-        { margin: 0 0.5em 0 0; padding: 0.7ex 0.5em 0.3ex 0.3em; }
+        { margin: 0 0 0 0.5em; padding: 0.3ex 0.5em 0.3ex 0.3em; }
 
 .slot_default
-        { margin: 2ex 1% 2ex 32%; }
+        { margin: 0 1% 2ex 32%; }
 
 .sidebar_right .slot_default
-        { margin: 2ex 32% 2ex 1%; }
+        { margin: 0 32% 2ex 1%; }
 
 .slot_sidebar
-        { margin: 2ex 1% 2ex 1%; }
+        { margin: 0 1% 2ex 1%; }
 
 .sidebar_right .slot_sidebar
         { margin: 0 1% 2ex 1%; }
@@ -130,16 +135,17 @@
  */
 
 body
-        { background-color: #27C9FF; color: #000 }
+        { background-color: #27C9FF; color: #000; }
+
+.topbox.line1
+        { background-color: #444; }
 
 .topbox.line1,
-.topbox.line1 a,
-.topbox.line1 select
-        { background-color: #444; color: #fff; }
+.topbox.line1 a
+        {  color: #fff; }
 
-.topbox.line2,
 .topbox.line2 a
-        { color: #000;    }
+        { background-color: #27C9FF; color: #000;    }
 .topbox.line2 span.inactive
         { opacity: 0.2; }
 .topbox a.active
@@ -154,10 +160,11 @@
 .box a  { color: #068; }
 
 .box .row.head,
-.box .row.head2,
+.box .row.head2
+        { background-color: #e7f0ff; }
+
 .box .row.active
-/*        { background-color: #D7F5FF;}*/
-        { background-color: #e7f0ff;}
+        { background-color: #f1F2F8; }
 
 .box .row.head .col.head
         { color: #444;    }
@@ -184,32 +191,34 @@
         
 .box.issue .row.unit_name
         { border-bottom-color: #ccc; }
-        
+
 
 /* 
  * Rounded corners 
  */
 
-.box    { border-radius: 1ex; -moz-border-radius: 1ex;
-          -webkit-box-shadow: 1px 1px 3px #11576F; -moz-box-shadow: 0 0 2px 1px #444; }
+.box    { border-radius: 0.8ex; -moz-border-radius: 0.8ex;
+          -webkit-box-shadow: 1px 1px 2px #11576F; -moz-box-shadow: 0 0 2px 1px #444; }
 
 .box .row:first-child.head,
 .box .row:first-child.head2
-        { border-radius: 1ex 1ex 0   0  ; }
+        { border-radius: 0.8ex 0.8ex 0   0  ; }
 .box .row:last-child
-        { border-radius: 0   0   1ex 1ex; }
+        { border-radius: 0   0   0.8ex 0.8ex; }
 
 .box .row:first-child:last-child.head,
 .box .row:first-child:last-child.head2
-        { border-radius: 1ex 1ex 1ex 1ex; }
+        { border-radius: 0.8ex 0.8ex 0.8ex 0.8ex; }
 
-.topbox.line1 
-        { -webkit-box-shadow: 0 2px 3px #444; -moz-box-shadow: 0 2px 3px #444; }
+.topbox.line1
+        { border-radius: 0 0 0.8ex 0.8ex;
+          -webkit-box-shadow: 1px 1px 2px #11576F; -moz-box-shadow: 1px 1px 2px #444; }
 
+.topbox a
+        { border-radius: 0.8ex; }
+        
 .topbox a.active
-        { border-radius: 0 0 1ex 1ex;
-          -webkit-box-shadow: 1px 1px 3px #11576F, inset 0px 7px 3px -5px #444;
-          -moz-box-shadow: 2px 2px 3px 0px #444;
+        { -webkit-box-shadow: 1px 1px 2px #11576F; -moz-box-shadow: 1px 1px 2px 0px #444;
         }
 
 /*