# HG changeset patch
# User bsw
# Date 1331747695 -3600
# Node ID 4e5bb26f0335bea705cae18dac47c8e3a532eadc
# Parent df5572f67c3be2243aebddc2468df123f8ce82d6
Notifications settings page is much easier now
diff -r df5572f67c3b -r 4e5bb26f0335 app/main/member/settings_notification.lua
--- a/app/main/member/settings_notification.lua Wed Mar 14 18:41:56 2012 +0100
+++ b/app/main/member/settings_notification.lua Wed Mar 14 18:54:55 2012 +0100
@@ -26,92 +26,93 @@
}
},
content = function()
- ui.tag{ tag = "p", _"Send me notifications about issues in following phases:" }
+ ui.tag{ tag = "p", content = _"I like to receive notifications about events in my areas and issues:" }
ui.container{ content = function()
ui.tag{
tag = "input",
attr = {
- type = "radio", name = "notify_level", value = "voting",
- checked = app.session.member.notify_level == 'voting' and "checked" or nil
+ id = "notify_level_none",
+ type = "radio", name = "notify_level", value = "none",
+ checked = app.session.member.notify_level == 'none' and "checked" or nil
}
}
- ui.tag{ content = _"Voting phase" }
- ui.tag{ tag = "ul", content = function()
- ui.tag{ tag = "li", content = _"Voting of an issue in one of my areas or I'm interested in starts" }
- end }
+ ui.tag{
+ tag = "label", attr = { ['for'] = "notify_level_none" },
+ content = _"No notifications at all"
+ }
end }
-
+
+ slot.put("
")
+
ui.container{ content = function()
ui.tag{
tag = "input",
attr = {
- type = "radio", name = "notify_level", value = "verification",
- checked = app.session.member.notify_level == 'verification' and "checked" or nil
+ id = "notify_level_all",
+ type = "radio", name = "notify_level", value = "all",
+ checked = app.session.member.notify_level == 'all' and "checked" or nil
}
}
- ui.tag{ content = _"Frozen and voting phase" }
- ui.tag{ tag = "ul", content = function()
- ui.tag{ tag = "li", content = _"An issue in one of my areas or I'm interested in enters phase 'frozen'" }
- ui.tag{ tag = "li", content = _"A new initiative is created in an issue I'm interested in" }
- ui.tag{ tag = "li", content = _"Voting of an issue in one of my areas or I'm interested in starts" }
- end }
+ ui.tag{
+ tag = "label", attr = { ['for'] = "notify_level_all" },
+ content = _"All of them"
+ }
end }
+
+ slot.put("
")
ui.container{ content = function()
ui.tag{
tag = "input",
attr = {
+ id = "notify_level_discussion",
type = "radio", name = "notify_level", value = "discussion",
checked = app.session.member.notify_level == 'discussion' and "checked" or nil
}
}
- ui.tag{ content = _"Discussion, frozen and voting phase" }
- ui.tag{ tag = "ul", content = function()
- ui.tag{ tag = "li", content = _"An issue in one of my areas or I'm interested in enters phase 'discussion'" }
- ui.tag{ tag = "li", content = _"A new initiative is created in an issue I'm interested in" }
- ui.tag{ tag = "li", content = _"The draft of an initiative I'm supporting is updated" }
- ui.tag{ tag = "li", content = _"An initiative I was supporting is revoked" }
- ui.tag{ tag = "li", content = _"A new suggestion is created in an initiative I'm supporting" }
- ui.tag{ tag = "li", content = _"An issue in one of my areas or I'm interested in enters phase 'frozen'" }
- ui.tag{ tag = "li", content = _"Voting of an issue in one of my areas or I'm interested in starts" }
- end }
+ ui.tag{
+ tag = "label", attr = { ['for'] = "notify_level_discussion" },
+ content = _"Only for issues reaching the discussion phase"
+ }
end }
+ slot.put("
")
+
ui.container{ content = function()
ui.tag{
tag = "input",
attr = {
- type = "radio", name = "notify_level", value = "all",
- checked = app.session.member.notify_level == 'all' and "checked" or nil
+ id = "notify_level_verification",
+ type = "radio", name = "notify_level", value = "verification",
+ checked = app.session.member.notify_level == 'verification' and "checked" or nil
}
}
- ui.tag{ content = _"Any phase" }
- ui.tag{ tag = "ul", content = function()
- ui.tag{ tag = "li", content = _"A new issue is created in one of my areas" }
- ui.tag{ tag = "li", content = _"An issue in one of my areas or i'm interested in enters phase 'discussion'" }
- ui.tag{ tag = "li", content = _"A new initiative is created in an issue I'm interested in" }
- ui.tag{ tag = "li", content = _"The draft of an initiative I'm supporting is updated" }
- ui.tag{ tag = "li", content = _"An initiative I was supporting is revoked" }
- ui.tag{ tag = "li", content = _"A new suggestion is created in an initiative I'm supporting" }
- ui.tag{ tag = "li", content = _"An issue in one of my areas or I'm interested in enters phase 'frozen'" }
- ui.tag{ tag = "li", content = _"Voting of an issue in one of my areas or I'm interested in starts" }
- end }
+ ui.tag{
+ tag = "label", attr = { ['for'] = "notify_level_verification" },
+ content = _"Only for issues reaching the frozen phase"
+ }
end }
+
+ slot.put("
")
ui.container{ content = function()
ui.tag{
tag = "input",
attr = {
- type = "radio", name = "notify_level", value = "none",
- checked = app.session.member.notify_level == 'none' and "checked" or nil
+ id = "notify_level_voting",
+ type = "radio", name = "notify_level", value = "voting",
+ checked = app.session.member.notify_level == 'voting' and "checked" or nil
}
}
- ui.tag{ content = _"No notifications at all" }
+ ui.tag{
+ tag = "label", attr = { ['for'] = "notify_level_voting" },
+ content = _"Only for issues reaching the voting phase"
+ }
end }
+ slot.put("
")
-
ui.submit{ value = _"Change notification settings" }
end
}
diff -r df5572f67c3b -r 4e5bb26f0335 locale/translations.de.lua
--- a/locale/translations.de.lua Wed Mar 14 18:41:56 2012 +0100
+++ b/locale/translations.de.lua Wed Mar 14 18:54:55 2012 +0100
@@ -12,9 +12,6 @@
["(new window)"] = "(neues Fenster)";
["+ #{weight}"] = "+ #{weight}";
["+getElementById("] = false;
-["A new initiative is created in an issue I'm interested in"] = "Neue Initiative in einem Thema, das mich interessiert";
-["A new issue is created in one of my areas"] = "Neues Thema in einem Themenbereich, in dem ich Mitglied bin";
-["A new suggestion is created in an initiative I'm supporting"] = "Neue Anregung zu einer Initiative, die ich unterstütze";
["A-Z"] = "A-Z";
["API key"] = "API-Schlüssel";
["API key has been deleted"] = "API-Schlüssel wurde gelöscht";
@@ -41,11 +38,8 @@
["Admitted"] = "zugelassen";
["All areas"] = "Alle Themenbereiche";
["All issues"] = "Alle Themen";
+["All of them"] = "Alle Benachrichtigungen";
["All units"] = "Alle Gliederungen";
-["An initiative I was supporting is revoked"] = "Eine von mir unterstützte Initiative wird zurückgezogen";
-["An issue in one of my areas or I'm interested in enters phase 'discussion'"] = "Ein Thema, das in einem meiner Themenbereiche ist oder das mich interessiert, wechselt in die Phase 'Diskussion'";
-["An issue in one of my areas or I'm interested in enters phase 'frozen'"] = "Ein Thema, das in einem meiner Themenbereiche ist oder das mich interessiert, wechselt in die Phase 'Eingefroren'";
-["An issue in one of my areas or i'm interested in enters phase 'discussion'"] = "Ein Thema, das in einem meiner Themenbereiche ist oder das mich interessiert, wechselt in die Phase 'Diskussion'";
["Any"] = "Alle";
["Any phase"] = "Alle Phasen";
["Any state"] = "Alle Zustände";
@@ -183,7 +177,6 @@
["Discussion starts soon"] = "Diskussion startet in Kürze";
["Discussion time"] = "Zeit für die Diskussion";
["Discussion with initiators"] = "Diskussion mit den Initiatoren";
-["Discussion, frozen and voting phase"] = "Diskussions-, Eingefroren- und Abstimmphase";
["Display settings"] = "Anzeige-Einstellungen";
["Download"] = "Download";
["Download database export"] = "Datenbankexport herunterladen";
@@ -219,7 +212,6 @@
["Finished without winner"] = "Abgeschlossen ohne Gewinner";
["Friday"] = "Freitag";
["Frozen"] = "Eingefroren";
-["Frozen and voting phase"] = "Eingefroren- und Abstimmphase";
["Fully frozen at"] = "Ganz eingefroren am/um";
["Generate / change API key"] = "API-Schlüssel erzeugen/ändern";
["Generate API key"] = "API-Schlüssel erzeugen";
@@ -238,6 +230,7 @@
["History"] = "Historie";
["Home"] = "Startseite";
["I consider suggestion as"] = "Ich halte die Anregung für";
+["I like to receive notifications about events in my areas and issues:"] = "Ich möchte Benachrichtigungen über Ereignisse in meinen Themenbereichen und Themen erhalten:";
["Id"] = "Id";
["Ident number"] = "Ident-Nummer";
["Identification"] = "Identifikation";
@@ -397,6 +390,9 @@
["One issue"] = "Ein Thema";
["One issue you are interested in"] = "Ein Thema, das Dich interessiert";
["One step back"] = "Ein Schritt zurück";
+["Only for issues reaching the discussion phase"] = "Nur für Themen, die die Diskussion erreichen.";
+["Only for issues reaching the frozen phase"] = "Nur für Themen, die die Phase Eingefroren erreichen.";
+["Only for issues reaching the voting phase"] = "Nur für Themen, die die Abstimmung erreichen.";
["Open"] = "Offen";
["Open initiatives you are supporting which has been updated their draft:"] = "Offene, von dir unterstützte Initiativen, deren Antragstext aktualisiert wurde:";
["Open issues"] = "Offene Themen";
@@ -484,7 +480,6 @@
["Search results for: '#{search}'"] = "Suchergebnisse für: '#{search}'";
["Select language \"#{langcode}\""] = "Sprache \"#{langcode}\" wählen";
["Send invite?"] = "Einladung schicken?";
-["Send me notifications about issues in following phases:"] = "Ich möchte in folgenden Phasen Benachrichtigungen erhalten:";
["Set URL"] = "URL setzen";
["Set area delegation"] = "Delegation für Themenbereich festlegen";
["Set delegation for Area '#{name}'"] = "Delegation für Themenbereich '#{name}' festlegen";
@@ -548,7 +543,6 @@
["Terms of use"] = "Nutzungsbedingungen";
["The API key has been changed too fast."] = "Der API-Schlüssel wurde zu schnell geändert.";
["The code you've entered is invalid"] = "Der Code, den Du eingeben hast, ist nicht gültig!";
-["The draft of an initiative I'm supporting is updated"] = "Der Antragstext einer von dir unterstützten Initiative wurde aktualisiert";
["The draft of this initiative has been updated!"] = "Der Entwurfstext der Initiative wurde aktualisiert!";
["The drafts do not differ"] = "Die Entwürfe unterscheiden sich nicht";
["The initiators suggest to support the following initiative:"] = "Die Initiatoren empfehlen folgende Initiative zu unterstützen:";
@@ -617,8 +611,6 @@
["Voting for this issue has already begun."] = "Die Abstimmung für dieses Thema hat schon begonnen.";
["Voting for this issue is currently running!"] = "Über dieses Thema wird gerade abgestimmt!";
["Voting has not started yet."] = "Die Abstimmung hat noch nicht begonnen.";
-["Voting of an issue in one of my areas or I'm interested in starts"] = "Für ein Thema, das in meinen Themenbereichen ist oder das mich interessiert, beginnt die Abstimmung";
-["Voting phase"] = "Abstimmungsphase";
["Voting privileges"] = "Abstimmberechtigung";
["Voting proposal"] = "Abstimmungsvorlage";
["Voting started"] = "Abstimmung begonnen";