# HG changeset patch
# User bsw
# Date 1330187691 -3600
# Node ID 44f9a09ea51cddd01903edf898f82f4e3ba2f9df
# Parent  24f8920e05f102f172f4bc53770382951107dfbf
Changed colors again, fixed language setting handling for Core 2.0

diff -r 24f8920e05f1 -r 44f9a09ea51c app/main/_filter/20_session.lua
--- a/app/main/_filter/20_session.lua	Sat Feb 25 12:48:49 2012 +0100
+++ b/app/main/_filter/20_session.lua	Sat Feb 25 17:34:51 2012 +0100
@@ -11,11 +11,6 @@
 
 request.set_csrf_secret(app.session.additional_secret)
 
-if not app.session.member.lang then
-  app.session.member.lang = app.session.lang or config.default_lang or "en"
-  app.session.member:save()
-end
-
-locale.set{lang = app.session.member.lang }
+locale.set{ lang = app.session.lang or config.default_lang or "en" }
 
 execute.inner()
diff -r 24f8920e05f1 -r 44f9a09ea51c app/main/index/_action/login.lua
--- a/app/main/index/_action/login.lua	Sat Feb 25 12:48:49 2012 +0100
+++ b/app/main/index/_action/login.lua	Sat Feb 25 17:34:51 2012 +0100
@@ -54,6 +54,11 @@
   member.last_login = "now"
   member.last_activity = "now"
   member.active = true
+  if member.lang == nil then
+    member.lang = app.session.lang
+  else
+    app.session.lang = member.lang
+  end
   member:save()
   app.session.member = member
   app.session:save()
diff -r 24f8920e05f1 -r 44f9a09ea51c app/main/index/_action/set_lang.lua
--- a/app/main/index/_action/set_lang.lua	Sat Feb 25 12:48:49 2012 +0100
+++ b/app/main/index/_action/set_lang.lua	Sat Feb 25 17:34:51 2012 +0100
@@ -2,7 +2,7 @@
 if lang == "de" or lang == "en" or lang == "eo" then
   app.session.lang = param.get("lang")
   app.session:save()
-  if app.session.member then
+  if app.session.member_id then
     app.session.member.lang = app.session.lang
     app.session.member:save()
   end
diff -r 24f8920e05f1 -r 44f9a09ea51c app/main/initiative/_list_element.lua
--- a/app/main/initiative/_list_element.lua	Sat Feb 25 12:48:49 2012 +0100
+++ b/app/main/initiative/_list_element.lua	Sat Feb 25 17:34:51 2012 +0100
@@ -110,6 +110,24 @@
                   id      = id,
                   params  = params,
                 }
+                  
+                if initiative.is_supporter then
+                  slot.put(" ")
+                  local label = _"You are supporter of this initiative"
+                  ui.image{
+                    attr = { alt = label, title = label },
+                    static = "icons/16/thumb_up_green.png"
+                  }
+                end
+                
+                if initiative.is_supporter_via_delegation then
+                  slot.put(" ")
+                  local label = _"You are supporter of this initiative via delegation"
+                  ui.image{
+                    attr = { alt = label, title = label },
+                    static = "icons/16/thumb_up_green.png"
+                  }
+                end
     
                 if initiative.is_initiator then
                   slot.put(" ")
diff -r 24f8920e05f1 -r 44f9a09ea51c app/main/member/show_tab.lua
--- a/app/main/member/show_tab.lua	Sat Feb 25 12:48:49 2012 +0100
+++ b/app/main/member/show_tab.lua	Sat Feb 25 17:34:51 2012 +0100
@@ -171,7 +171,9 @@
   view = "_list",
   params = {
     issues_selector = issues_selector, for_member = member,
-    filter_interest = member.id ~= app.session.member_id and "my" or nil
+  },
+  link_params = {
+    filter_interest = (member.id ~= app.session.member_id) and "my" or nil,
   },
 }
   
diff -r 24f8920e05f1 -r 44f9a09ea51c env/ui/tabs.lua
--- a/env/ui/tabs.lua	Sat Feb 25 12:48:49 2012 +0100
+++ b/env/ui/tabs.lua	Sat Feb 25 17:34:51 2012 +0100
@@ -10,6 +10,12 @@
         attr = { class = "ui_tabs_links" },
         content = function()
           for i, tab in ipairs(tabs) do
+            local params = param.get_all_cgi()
+            if tab.link_params then
+              for key, value in pairs(tab.link_params) do
+                params[key] = value
+              end
+            end
             params["tab"] = i > 1 and tab.name or nil
             ui.link{
               attr = { 
diff -r 24f8920e05f1 -r 44f9a09ea51c static/style.css
--- a/static/style.css	Sat Feb 25 12:48:49 2012 +0100
+++ b/static/style.css	Sat Feb 25 17:34:51 2012 +0100
@@ -369,22 +369,16 @@
 }
 
 .delegation .head_active,
-.interest .head_active,
-.actions .supporter,
-.actions .potential_supporter {
+.interest .head_active {
   background-color: #cdf;
 }
 
-.interest .head_active {
-  background-color: #fec;
-}
-
 .actions .supporter {
-  background-color: #cfd;
+  background-color: #cdf;
 }
 
 .actions .potential_supporter {
-  background-color: #fec;
+  background-color: #cdf;
 }
 
 .slot_support .head_initiator {
@@ -834,7 +828,7 @@
 .issues .issue.interested .issue_info,
 .issues .issue.interested_by_delegation .issue_info  {
   background: -webkit-gradient(linear, left top, left bottom,
-    color-stop(0%,#fec), color-stop(66%,#fff));
+    color-stop(0%,#cdf), color-stop(66%,#fff));
 }
 
 .issues .issue .issue_info .issue_id {
@@ -872,15 +866,13 @@
 }
 
 .initiative_link.supported {
-  background-color: #cfd;
+  background-color: #cdf;
   border-radius: 5px;
-  xbackground: -webkit-radial-gradient(center, ellipse cover, #cfd 50%,#fff 100%); /* Chrome10+,Safari5.1+ */
 }
 
 .initiative_link.potentially_supported {
-  background-color: #fec;
+  background-color: #cdf;
   border-radius: 5px;
-  xbackground: -webkit-radial-gradient(center, ellipse cover, #fec 50%,#fff 100%); /* Chrome10+,Safari5.1+ */
 }
 
 .lang_chooser {