diff options
| author | Benjamin Kellermann <Benjamin.Kellermann@gmx.de> | 2010-05-26 10:16:55 +0200 |
|---|---|---|
| committer | Benjamin Kellermann <Benjamin.Kellermann@gmx.de> | 2010-05-26 10:16:55 +0200 |
| commit | 0eb5d613713942e0eac9fbcaf69ae7d73a2921b5 (patch) | |
| tree | cdf2e4e275a4e74268fa8eb4a6203af960948e1e | |
| parent | 09e012e27c8d69bd22996b6069c71c72c7dd9b57 (diff) | |
possibility to immediately delete users
| -rwxr-xr-x | invite_participants.rb | 4 | ||||
| -rw-r--r-- | locale/de/dudle.po | 12 | ||||
| -rw-r--r-- | locale/sv/dudle.po | 7 | ||||
| -rw-r--r-- | poll.rb | 20 |
4 files changed, 18 insertions, 25 deletions
diff --git a/invite_participants.rb b/invite_participants.rb index 7005128..e5db1ea 100755 --- a/invite_participants.rb +++ b/invite_participants.rb @@ -26,8 +26,8 @@ load "../dudle.rb" $d = Dudle.new unless $cgi.include?("cancel") - if $cgi.include?("delete_participant_confirm") - $d.table.delete($cgi["delete_participant_confirm"]) + if $cgi.include?("deleteuser") + $d.table.delete($cgi["edituser"]) elsif $cgi.include?("add_participant") $d.table.add_participant($cgi["olduser"],$cgi["add_participant"],{}) end diff --git a/locale/de/dudle.po b/locale/de/dudle.po index 5fe5904..820f29c 100644 --- a/locale/de/dudle.po +++ b/locale/de/dudle.po @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-05-25 16:15+0200\n" -"PO-Revision-Date: 2010-05-25 16:16+0100\n" +"POT-Creation-Date: 2010-05-26 08:56+0200\n" +"PO-Revision-Date: 2010-05-26 08:58+0100\n" "Last-Translator: Benjamin Kellermann <Benjamin.Kellermann@tu-dresden.de>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -455,12 +455,12 @@ msgid "Reload" msgstr "Neu laden" #: poll.rb:71 -msgid "Edit user %{user}" -msgstr "Bearbeite Teilnehmer %{user}" +msgid "Edit user %{user}..." +msgstr "Bearbeite Teilnehmer %{user}..." #: poll.rb:75 -msgid "Delete user %{user}" -msgstr "Lösche Teilnehmer %{user}" +msgid "Delete user %{user}..." +msgstr "Lösche Teilnehmer %{user}..." #: poll.rb:122 msgid "Total" diff --git a/locale/sv/dudle.po b/locale/sv/dudle.po index 7a617b6..d4df56a 100644 --- a/locale/sv/dudle.po +++ b/locale/sv/dudle.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-05-25 16:15+0200\n" +"POT-Creation-Date: 2010-05-26 08:56+0200\n" "PO-Revision-Date: \n" "Last-Translator: Benjamin Kellermann <Benjamin.Kellermann@tu-dresden.de>\n" "Language-Team: \n" @@ -463,12 +463,13 @@ msgid "Reload" msgstr "Ladda om" #: poll.rb:71 -msgid "Edit user %{user}" +#, fuzzy +msgid "Edit user %{user}..." msgstr "Redigera användare %{user}" #: poll.rb:75 #, fuzzy -msgid "Delete user %{user}" +msgid "Delete user %{user}..." msgstr "Redigera användare %{user}" #: poll.rb:122 @@ -68,11 +68,11 @@ class Poll if link ret += "<td><span class='edituser'>" ret += "<a title='" - ret += _("Edit user %{user}") % {:user => CGI.escapeHTML(participant)} + ret += _("Edit user %{user}...") % {:user => CGI.escapeHTML(participant)} ret += "' href=\"?edituser=#{CGI.escapeHTML(CGI.escape(participant))}\">" ret += EDIT ret += "</a> | <a title='" - ret += _("Delete user %{user}") % {:user => CGI.escapeHTML(participant)} + ret += _("Delete user %{user}...") % {:user => CGI.escapeHTML(participant)} ret += "' href=\"?deleteuser&edituser=#{CGI.escapeHTML(CGI.escape(participant))}\">" ret += "#{DELETE}</a>" ret += "</span></td>" @@ -160,7 +160,7 @@ class Poll end def invite_to_html - edituser = $cgi["edituser"] + edituser = $cgi["edituser"] unless $cgi.include?("deleteuser") invitestr = _("Invite") namestr = _("Name") ret = <<HEAD @@ -177,16 +177,8 @@ HEAD if edituser == participant ret += "<tr id='add_participant'>" - if $cgi.include?("deleteuser") - ret += "<td class='name' colspan='2'>" - ret += _("Delete %{user}?") % {:user => $cgi["edituser"]} - ret += "<input type='hidden' name='delete_participant_confirm' value='#{$cgi["edituser"]}' />" - ret += "</td>" - ret += save_input(edituser, "", _("Confirm")) - else - ret += add_participant_input(edituser) - ret += save_input(edituser,invitestr) - end + ret += add_participant_input(edituser) + ret += save_input(edituser,invitestr) else ret += "<tr class='participantrow'>" ret += userstring(participant,!has_voted) @@ -195,7 +187,7 @@ HEAD } unless @data.keys.include?(edituser) - ret += "<tr id='add_participant_row'>" + ret += "<tr id='add_participant'>" ret += add_participant_input(edituser) ret += save_input(edituser,invitestr) ret += "</tr>" |