# HG changeset patch
# User bsw
# Date 1279108724 -7200
# Node ID 07177cd8c2563f5e0058f6ec501219a5758e1af5
# Parent  06984568801f6c426c1a0717ceda2ac83a44ad60
Member history: Show active flag changes, internal changes for core v1.2.0

diff -r 06984568801f -r 07177cd8c256 app/main/member/history.lua
--- a/app/main/member/history.lua	Thu Jul 08 21:11:56 2010 +0200
+++ b/app/main/member/history.lua	Wed Jul 14 13:58:44 2010 +0200
@@ -14,6 +14,15 @@
   }
 end)
 
+ui.form{
+  attr = { class = "vertical" },
+  content = function()
+    ui.field.text{ label = _"Current name", value = member.name }
+    ui.field.text{ label = _"Current status", value = member.active and _'activated' or _'deactivated' }
+  end
+}
+
+
 local entries = member:get_reference_selector("history_entries"):add_order_by("id DESC"):exec()
 
 ui.tag{
@@ -28,47 +37,32 @@
         }
         ui.tag{
           tag = "th",
-          content = _("Used until")
-        }
-      end
-    }
-    ui.tag{
-      tag = "tr",
-      content = function()
-        ui.tag{
-          tag = "td",
-          content = member.name
+          content = _("Status")
         }
         ui.tag{
-          tag = "td",
-          content = _"continuing"
+          tag = "th",
+          content = _("until")
         }
       end
     }
     for i, entry in ipairs(entries) do
-      local display = false
-      if (i == 1) then
-        if entry.name ~= member.name then
-          display = true
+      ui.tag{
+        tag = "tr",
+        content = function()
+          ui.tag{
+            tag = "td",
+            content = entry.name
+          }
+          ui.tag{
+            tag = "td",
+            content =  member.active and _'activated' or _'deactivated',
+          }
+          ui.tag{
+            tag = "td",
+            content = format.timestamp(entry["until"])
+          }
         end
-      elseif entry.name ~= entries[i-1].name then
-        display = true
-      end
-      if display then
-        ui.tag{
-          tag = "tr",
-          content = function()
-            ui.tag{
-              tag = "td",
-              content = entry.name
-            }
-            ui.tag{
-              tag = "td",
-              content = format.timestamp(entry["until"])
-            }
-          end
-        }
-      end
+      }
     end
   end
 }
diff -r 06984568801f -r 07177cd8c256 config/default.lua
--- a/config/default.lua	Thu Jul 08 21:11:56 2010 +0200
+++ b/config/default.lua	Wed Jul 14 13:58:44 2010 +0200
@@ -1,5 +1,5 @@
 config.app_name = "LiquidFeedback"
-config.app_version = "beta19"
+config.app_version = "beta20"
 
 config.app_title = config.app_name .. " (" .. request.get_config_name() .. " environment)"
 
diff -r 06984568801f -r 07177cd8c256 locale/translations.de.lua
--- a/locale/translations.de.lua	Thu Jul 08 21:11:56 2010 +0200
+++ b/locale/translations.de.lua	Wed Jul 14 13:58:44 2010 +0200
@@ -110,6 +110,8 @@
 ["Create new issue"] = "Neues Thema anlegen";
 ["Created at"] = "Erzeugt am/um";
 ["Current draft"] = "Aktueller Entwurf";
+["Current name"] = "Aktueller Name";
+["Current status"] = "Aktueller Status";
 ["Current votings in areas you are member of and issues you are interested in:"] = "Jetzt laufende Abstimmungen zu Themen aus Deinen Themenbereichen oder solchen an denen Du interessiert bist:";
 ["Currently no API key is set."] = "Zur Zeit ist kein API-Schlüssel festgelegt.";
 ["Date"] = "Datum";
@@ -438,6 +440,7 @@
 ["Sorry, your contingent for creating initiatives has been used up. Please try again later."] = "Sorry, Dein Antragskontingent ist zur Zeit ausgeschöpft. Bitte versuche es später erneut!";
 ["State"] = "Zustand";
 ["Statement"] = "Statement";
+["Status"] = false;
 ["Step 1/5: Invite code"] = "Schritt 1/5: Invite-Code";
 ["Step 2/5: Email address"] = "Schritt 2/5: E-Mail-Adresse";
 ["Step 3/5: Username"] = "Schritt 3/5: Benutzername";
@@ -510,7 +513,6 @@
 ["Unknown author"] = "Unbekannter Autor";
 ["Updated drafts"] = "Neue Entwürfe";
 ["Upload images"] = "Bilder hochladen";
-["Used until"] = "Benutzt bis";
 ["Verification time"] = "Zeit für die Überprüfung";
 ["Version"] = "Version";
 ["Vote later"] = "Später abstimmen";
@@ -587,8 +589,9 @@
 ["Z-A"] = "Z-A";
 ["[Registered members only]"] = "[nur für Registrierte]";
 ["[not displayed public]"] = "[nicht öffentlich]";
+["activated"] = "aktiviert";
 ["and #{count} more initiatives"] = "und #{count} weitere Initiativen";
-["continuing"] = "andauernd";
+["deactivated"] = "deaktiviert";
 ["delete<br /><br />"] = "löschen<br /><br />";
 ["disabled"] = "ausgeschaltet";
 ["email"] = "E-Mail";
@@ -603,5 +606,6 @@
 ["should"] = "soll";
 ["should not"] = "soll nicht";
 ["to reset your password please click on the following link:\n\n"] = "um Dein Kennwort zurückzusetzen klicke bitte den folgenden Link an:\n\n";
+["until"] = "bis";
 ["xmpp"] = "Jabber (XMPP)";
 }
diff -r 06984568801f -r 07177cd8c256 locale/translations.en.lua
--- a/locale/translations.en.lua	Thu Jul 08 21:11:56 2010 +0200
+++ b/locale/translations.en.lua	Wed Jul 14 13:58:44 2010 +0200
@@ -110,6 +110,8 @@
 ["Create new issue"] = false;
 ["Created at"] = false;
 ["Current draft"] = false;
+["Current name"] = false;
+["Current status"] = false;
 ["Current votings in areas you are member of and issues you are interested in:"] = false;
 ["Currently no API key is set."] = false;
 ["Date"] = false;
@@ -438,6 +440,7 @@
 ["Sorry, your contingent for creating initiatives has been used up. Please try again later."] = false;
 ["State"] = false;
 ["Statement"] = false;
+["Status"] = false;
 ["Step 1/5: Invite code"] = false;
 ["Step 2/5: Email address"] = false;
 ["Step 3/5: Username"] = false;
@@ -510,7 +513,6 @@
 ["Unknown author"] = false;
 ["Updated drafts"] = false;
 ["Upload images"] = false;
-["Used until"] = false;
 ["Verification time"] = false;
 ["Version"] = false;
 ["Vote later"] = false;
@@ -587,8 +589,9 @@
 ["Z-A"] = false;
 ["[Registered members only]"] = false;
 ["[not displayed public]"] = false;
+["activated"] = false;
 ["and #{count} more initiatives"] = false;
-["continuing"] = false;
+["deactivated"] = false;
 ["delete<br /><br />"] = false;
 ["disabled"] = false;
 ["email"] = false;
@@ -603,5 +606,6 @@
 ["should"] = false;
 ["should not"] = false;
 ["to reset your password please click on the following link:\n\n"] = false;
+["until"] = false;
 ["xmpp"] = false;
 }
diff -r 06984568801f -r 07177cd8c256 locale/translations.eo.lua
--- a/locale/translations.eo.lua	Thu Jul 08 21:11:56 2010 +0200
+++ b/locale/translations.eo.lua	Wed Jul 14 13:58:44 2010 +0200
@@ -110,6 +110,8 @@
 ["Create new issue"] = "Krei novan temon";
 ["Created at"] = "Kreita je";
 ["Current draft"] = "Aktuala skizo";
+["Current name"] = false;
+["Current status"] = false;
 ["Current votings in areas you are member of and issues you are interested in:"] = "Aktualaj voĉdonoj pri temoj en kiuj vi membras kaj kiuj vin interesas:";
 ["Currently no API key is set."] = "Nuntempe ne ekzistas API-ŝlosilo";
 ["Date"] = "Dato";
@@ -438,6 +440,7 @@
 ["Sorry, your contingent for creating initiatives has been used up. Please try again later."] = "Pardonu, via kontingento por krei iniciatojn estas aktuale elĉerpita. Bonvolu provi pli malfrue denove!";
 ["State"] = "Stato";
 ["Statement"] = "Deklaro";
+["Status"] = false;
 ["Step 1/5: Invite code"] = "Paŝo 1/5: Invitokodo";
 ["Step 2/5: Email address"] = "Paŝo 2/5: Retadreso";
 ["Step 3/5: Username"] = "Paŝo 3/5: Uzantnomo";
@@ -510,7 +513,6 @@
 ["Unknown author"] = "Aŭtoro nekonata";
 ["Updated drafts"] = "Skizoj ĝisdatigitaj";
 ["Upload images"] = "Alŝuti bildojn";
-["Used until"] = "Uzita ĝis";
 ["Verification time"] = "Tempo por la kontrolo";
 ["Version"] = "Versio";
 ["Vote later"] = "Baloti pli malfrue";
@@ -587,8 +589,9 @@
 ["Z-A"] = "Z-A";
 ["[Registered members only]"] = "[Nur registritaj membroj]";
 ["[not displayed public]"] = "[ne afiŝita publike]";
+["activated"] = false;
 ["and #{count} more initiatives"] = "kaj #{count} pliaj iniciatoj";
-["continuing"] = "kontinue";
+["deactivated"] = false;
 ["delete<br /><br />"] = "forviŝi<br /><br />";
 ["disabled"] = "malaktiva";
 ["email"] = "retpoŝto";
@@ -603,5 +606,6 @@
 ["should"] = "devus";
 ["should not"] = "ne devus";
 ["to reset your password please click on the following link:\n\n"] = "por remeti vian pasvorton bonvolu klaki sekvan ligilon:\n\n";
+["until"] = false;
 ["xmpp"] = "Jabber (XMPP)";
 }
diff -r 06984568801f -r 07177cd8c256 locale/translations.fr.lua
--- a/locale/translations.fr.lua	Thu Jul 08 21:11:56 2010 +0200
+++ b/locale/translations.fr.lua	Wed Jul 14 13:58:44 2010 +0200
@@ -110,6 +110,8 @@
 ["Create new issue"] = false;
 ["Created at"] = false;
 ["Current draft"] = false;
+["Current name"] = false;
+["Current status"] = false;
 ["Current votings in areas you are member of and issues you are interested in:"] = false;
 ["Currently no API key is set."] = false;
 ["Date"] = false;
@@ -438,6 +440,7 @@
 ["Sorry, your contingent for creating initiatives has been used up. Please try again later."] = false;
 ["State"] = false;
 ["Statement"] = false;
+["Status"] = false;
 ["Step 1/5: Invite code"] = false;
 ["Step 2/5: Email address"] = false;
 ["Step 3/5: Username"] = false;
@@ -510,7 +513,6 @@
 ["Unknown author"] = false;
 ["Updated drafts"] = false;
 ["Upload images"] = false;
-["Used until"] = false;
 ["Verification time"] = false;
 ["Version"] = false;
 ["Vote later"] = false;
@@ -587,8 +589,9 @@
 ["Z-A"] = false;
 ["[Registered members only]"] = false;
 ["[not displayed public]"] = false;
+["activated"] = false;
 ["and #{count} more initiatives"] = false;
-["continuing"] = false;
+["deactivated"] = false;
 ["delete<br /><br />"] = false;
 ["disabled"] = false;
 ["email"] = false;
@@ -603,5 +606,6 @@
 ["should"] = false;
 ["should not"] = false;
 ["to reset your password please click on the following link:\n\n"] = false;
+["until"] = false;
 ["xmpp"] = false;
 }