1.1 --- a/app/main/member/history.lua	Thu Jul 08 21:11:56 2010 +0200
     1.2 +++ b/app/main/member/history.lua	Wed Jul 14 13:58:44 2010 +0200
     1.3 @@ -14,6 +14,15 @@
     1.4    }
     1.5  end)
     1.6  
     1.7 +ui.form{
     1.8 +  attr = { class = "vertical" },
     1.9 +  content = function()
    1.10 +    ui.field.text{ label = _"Current name", value = member.name }
    1.11 +    ui.field.text{ label = _"Current status", value = member.active and _'activated' or _'deactivated' }
    1.12 +  end
    1.13 +}
    1.14 +
    1.15 +
    1.16  local entries = member:get_reference_selector("history_entries"):add_order_by("id DESC"):exec()
    1.17  
    1.18  ui.tag{
    1.19 @@ -28,47 +37,32 @@
    1.20          }
    1.21          ui.tag{
    1.22            tag = "th",
    1.23 -          content = _("Used until")
    1.24 -        }
    1.25 -      end
    1.26 -    }
    1.27 -    ui.tag{
    1.28 -      tag = "tr",
    1.29 -      content = function()
    1.30 -        ui.tag{
    1.31 -          tag = "td",
    1.32 -          content = member.name
    1.33 +          content = _("Status")
    1.34          }
    1.35          ui.tag{
    1.36 -          tag = "td",
    1.37 -          content = _"continuing"
    1.38 +          tag = "th",
    1.39 +          content = _("until")
    1.40          }
    1.41        end
    1.42      }
    1.43      for i, entry in ipairs(entries) do
    1.44 -      local display = false
    1.45 -      if (i == 1) then
    1.46 -        if entry.name ~= member.name then
    1.47 -          display = true
    1.48 +      ui.tag{
    1.49 +        tag = "tr",
    1.50 +        content = function()
    1.51 +          ui.tag{
    1.52 +            tag = "td",
    1.53 +            content = entry.name
    1.54 +          }
    1.55 +          ui.tag{
    1.56 +            tag = "td",
    1.57 +            content =  member.active and _'activated' or _'deactivated',
    1.58 +          }
    1.59 +          ui.tag{
    1.60 +            tag = "td",
    1.61 +            content = format.timestamp(entry["until"])
    1.62 +          }
    1.63          end
    1.64 -      elseif entry.name ~= entries[i-1].name then
    1.65 -        display = true
    1.66 -      end
    1.67 -      if display then
    1.68 -        ui.tag{
    1.69 -          tag = "tr",
    1.70 -          content = function()
    1.71 -            ui.tag{
    1.72 -              tag = "td",
    1.73 -              content = entry.name
    1.74 -            }
    1.75 -            ui.tag{
    1.76 -              tag = "td",
    1.77 -              content = format.timestamp(entry["until"])
    1.78 -            }
    1.79 -          end
    1.80 -        }
    1.81 -      end
    1.82 +      }
    1.83      end
    1.84    end
    1.85  }

     2.1 --- a/config/default.lua	Thu Jul 08 21:11:56 2010 +0200
     2.2 +++ b/config/default.lua	Wed Jul 14 13:58:44 2010 +0200
     2.3 @@ -1,5 +1,5 @@
     2.4  config.app_name = "LiquidFeedback"
     2.5 -config.app_version = "beta19"
     2.6 +config.app_version = "beta20"
     2.7  
     2.8  config.app_title = config.app_name .. " (" .. request.get_config_name() .. " environment)"
     2.9  

     3.1 --- a/locale/translations.de.lua	Thu Jul 08 21:11:56 2010 +0200
     3.2 +++ b/locale/translations.de.lua	Wed Jul 14 13:58:44 2010 +0200
     3.3 @@ -110,6 +110,8 @@
     3.4  ["Create new issue"] = "Neues Thema anlegen";
     3.5  ["Created at"] = "Erzeugt am/um";
     3.6  ["Current draft"] = "Aktueller Entwurf";
     3.7 +["Current name"] = "Aktueller Name";
     3.8 +["Current status"] = "Aktueller Status";
     3.9  ["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:";
    3.10  ["Currently no API key is set."] = "Zur Zeit ist kein API-Schlüssel festgelegt.";
    3.11  ["Date"] = "Datum";
    3.12 @@ -438,6 +440,7 @@
    3.13  ["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!";
    3.14  ["State"] = "Zustand";
    3.15  ["Statement"] = "Statement";
    3.16 +["Status"] = false;
    3.17  ["Step 1/5: Invite code"] = "Schritt 1/5: Invite-Code";
    3.18  ["Step 2/5: Email address"] = "Schritt 2/5: E-Mail-Adresse";
    3.19  ["Step 3/5: Username"] = "Schritt 3/5: Benutzername";
    3.20 @@ -510,7 +513,6 @@
    3.21  ["Unknown author"] = "Unbekannter Autor";
    3.22  ["Updated drafts"] = "Neue Entwürfe";
    3.23  ["Upload images"] = "Bilder hochladen";
    3.24 -["Used until"] = "Benutzt bis";
    3.25  ["Verification time"] = "Zeit für die Überprüfung";
    3.26  ["Version"] = "Version";
    3.27  ["Vote later"] = "Später abstimmen";
    3.28 @@ -587,8 +589,9 @@
    3.29  ["Z-A"] = "Z-A";
    3.30  ["[Registered members only]"] = "[nur für Registrierte]";
    3.31  ["[not displayed public]"] = "[nicht öffentlich]";
    3.32 +["activated"] = "aktiviert";
    3.33  ["and #{count} more initiatives"] = "und #{count} weitere Initiativen";
    3.34 -["continuing"] = "andauernd";
    3.35 +["deactivated"] = "deaktiviert";
    3.36  ["delete<br /><br />"] = "löschen<br /><br />";
    3.37  ["disabled"] = "ausgeschaltet";
    3.38  ["email"] = "E-Mail";
    3.39 @@ -603,5 +606,6 @@
    3.40  ["should"] = "soll";
    3.41  ["should not"] = "soll nicht";
    3.42  ["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";
    3.43 +["until"] = "bis";
    3.44  ["xmpp"] = "Jabber (XMPP)";
    3.45  }

     4.1 --- a/locale/translations.en.lua	Thu Jul 08 21:11:56 2010 +0200
     4.2 +++ b/locale/translations.en.lua	Wed Jul 14 13:58:44 2010 +0200
     4.3 @@ -110,6 +110,8 @@
     4.4  ["Create new issue"] = false;
     4.5  ["Created at"] = false;
     4.6  ["Current draft"] = false;
     4.7 +["Current name"] = false;
     4.8 +["Current status"] = false;
     4.9  ["Current votings in areas you are member of and issues you are interested in:"] = false;
    4.10  ["Currently no API key is set."] = false;
    4.11  ["Date"] = false;
    4.12 @@ -438,6 +440,7 @@
    4.13  ["Sorry, your contingent for creating initiatives has been used up. Please try again later."] = false;
    4.14  ["State"] = false;
    4.15  ["Statement"] = false;
    4.16 +["Status"] = false;
    4.17  ["Step 1/5: Invite code"] = false;
    4.18  ["Step 2/5: Email address"] = false;
    4.19  ["Step 3/5: Username"] = false;
    4.20 @@ -510,7 +513,6 @@
    4.21  ["Unknown author"] = false;
    4.22  ["Updated drafts"] = false;
    4.23  ["Upload images"] = false;
    4.24 -["Used until"] = false;
    4.25  ["Verification time"] = false;
    4.26  ["Version"] = false;
    4.27  ["Vote later"] = false;
    4.28 @@ -587,8 +589,9 @@
    4.29  ["Z-A"] = false;
    4.30  ["[Registered members only]"] = false;
    4.31  ["[not displayed public]"] = false;
    4.32 +["activated"] = false;
    4.33  ["and #{count} more initiatives"] = false;
    4.34 -["continuing"] = false;
    4.35 +["deactivated"] = false;
    4.36  ["delete<br /><br />"] = false;
    4.37  ["disabled"] = false;
    4.38  ["email"] = false;
    4.39 @@ -603,5 +606,6 @@
    4.40  ["should"] = false;
    4.41  ["should not"] = false;
    4.42  ["to reset your password please click on the following link:\n\n"] = false;
    4.43 +["until"] = false;
    4.44  ["xmpp"] = false;
    4.45  }

     5.1 --- a/locale/translations.eo.lua	Thu Jul 08 21:11:56 2010 +0200
     5.2 +++ b/locale/translations.eo.lua	Wed Jul 14 13:58:44 2010 +0200
     5.3 @@ -110,6 +110,8 @@
     5.4  ["Create new issue"] = "Krei novan temon";
     5.5  ["Created at"] = "Kreita je";
     5.6  ["Current draft"] = "Aktuala skizo";
     5.7 +["Current name"] = false;
     5.8 +["Current status"] = false;
     5.9  ["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:";
    5.10  ["Currently no API key is set."] = "Nuntempe ne ekzistas API-ŝlosilo";
    5.11  ["Date"] = "Dato";
    5.12 @@ -438,6 +440,7 @@
    5.13  ["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!";
    5.14  ["State"] = "Stato";
    5.15  ["Statement"] = "Deklaro";
    5.16 +["Status"] = false;
    5.17  ["Step 1/5: Invite code"] = "Paŝo 1/5: Invitokodo";
    5.18  ["Step 2/5: Email address"] = "Paŝo 2/5: Retadreso";
    5.19  ["Step 3/5: Username"] = "Paŝo 3/5: Uzantnomo";
    5.20 @@ -510,7 +513,6 @@
    5.21  ["Unknown author"] = "Aŭtoro nekonata";
    5.22  ["Updated drafts"] = "Skizoj ĝisdatigitaj";
    5.23  ["Upload images"] = "Alŝuti bildojn";
    5.24 -["Used until"] = "Uzita ĝis";
    5.25  ["Verification time"] = "Tempo por la kontrolo";
    5.26  ["Version"] = "Versio";
    5.27  ["Vote later"] = "Baloti pli malfrue";
    5.28 @@ -587,8 +589,9 @@
    5.29  ["Z-A"] = "Z-A";
    5.30  ["[Registered members only]"] = "[Nur registritaj membroj]";
    5.31  ["[not displayed public]"] = "[ne afiŝita publike]";
    5.32 +["activated"] = false;
    5.33  ["and #{count} more initiatives"] = "kaj #{count} pliaj iniciatoj";
    5.34 -["continuing"] = "kontinue";
    5.35 +["deactivated"] = false;
    5.36  ["delete<br /><br />"] = "forviŝi<br /><br />";
    5.37  ["disabled"] = "malaktiva";
    5.38  ["email"] = "retpoŝto";
    5.39 @@ -603,5 +606,6 @@
    5.40  ["should"] = "devus";
    5.41  ["should not"] = "ne devus";
    5.42  ["to reset your password please click on the following link:\n\n"] = "por remeti vian pasvorton bonvolu klaki sekvan ligilon:\n\n";
    5.43 +["until"] = false;
    5.44  ["xmpp"] = "Jabber (XMPP)";
    5.45  }

     6.1 --- a/locale/translations.fr.lua	Thu Jul 08 21:11:56 2010 +0200
     6.2 +++ b/locale/translations.fr.lua	Wed Jul 14 13:58:44 2010 +0200
     6.3 @@ -110,6 +110,8 @@
     6.4  ["Create new issue"] = false;
     6.5  ["Created at"] = false;
     6.6  ["Current draft"] = false;
     6.7 +["Current name"] = false;
     6.8 +["Current status"] = false;
     6.9  ["Current votings in areas you are member of and issues you are interested in:"] = false;
    6.10  ["Currently no API key is set."] = false;
    6.11  ["Date"] = false;
    6.12 @@ -438,6 +440,7 @@
    6.13  ["Sorry, your contingent for creating initiatives has been used up. Please try again later."] = false;
    6.14  ["State"] = false;
    6.15  ["Statement"] = false;
    6.16 +["Status"] = false;
    6.17  ["Step 1/5: Invite code"] = false;
    6.18  ["Step 2/5: Email address"] = false;
    6.19  ["Step 3/5: Username"] = false;
    6.20 @@ -510,7 +513,6 @@
    6.21  ["Unknown author"] = false;
    6.22  ["Updated drafts"] = false;
    6.23  ["Upload images"] = false;
    6.24 -["Used until"] = false;
    6.25  ["Verification time"] = false;
    6.26  ["Version"] = false;
    6.27  ["Vote later"] = false;
    6.28 @@ -587,8 +589,9 @@
    6.29  ["Z-A"] = false;
    6.30  ["[Registered members only]"] = false;
    6.31  ["[not displayed public]"] = false;
    6.32 +["activated"] = false;
    6.33  ["and #{count} more initiatives"] = false;
    6.34 -["continuing"] = false;
    6.35 +["deactivated"] = false;
    6.36  ["delete<br /><br />"] = false;
    6.37  ["disabled"] = false;
    6.38  ["email"] = false;
    6.39 @@ -603,5 +606,6 @@
    6.40  ["should"] = false;
    6.41  ["should not"] = false;
    6.42  ["to reset your password please click on the following link:\n\n"] = false;
    6.43 +["until"] = false;
    6.44  ["xmpp"] = false;
    6.45  }