Fixed i18n and editing of groups.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5482 b35dd754-fafc-0310-a699-88a17e54d16e

src/i18n/wildfire_i18n_cs_CZ.properties

@@ -428,17 +428,6 @@ group.create.invalid_group_name=Neplatn\u00e9 jm\u00e9no skupiny.
 group.create.invalid_group_info=Skupina ji\u017e existuje - pros\u00edm vyberte jin\u00e9 jm\u00e9no.
 group.create.label_description=Popis:
 group.create.invalid_description=Neplatn\u00fd popis.
-group.create.label_initial_member=V\u00fdchoz\u00ed \u010dlen(i):
-group.create.share_groups_title=Sd\u00edlen\u00e9 skupiny seznamu
-group.create.share_groups_info=N\u00e1aleduj\u00edc\u00ed formul\u00e1\u0159 m\u016f\u017eete pou\u017e\u00edt pro zobrazen\u00ed t\u00e9to skupiny v u\u017eivatelsk\u00fdch seznamech. Vyberte \
-        jefnu ze t\u0159ech mo\u017enost\u00ed, kdo m\u00e1 vid\u011bt tuto skupinu ve sv\u00fdch seznamech.
-group.create.disable_share_group=Zak\u00e1zat sd\u00edlen\u00ed skupiny v seznamech
-group.create.enable_share_group=Povolit sd\u00edlen\u00ed skupiny v seznamech
-group.create.group_display_name=Zobrazovan\u00e9 jm\u00e9no skupiny
-group.create.enter_a_group_name=Zadejte jm\u00e9no skupiny pro zobrazen\u00ed
-group.create.show_group_in_all_users=Zobrazovat skupinu v seznamech v\u0161ech u\u017eivatel\u016f.
-group.create.show_group_in_group_members=Zobrazovat skupinu v seznamech skupin u\u017eivatel\u016f
-group.create.show_group_in_roster_group=Zobrazovat skupinu v \u010dlensk\u00fdch seznamech t\u011bchto skupin:
 group.create.required_fields=Po\u017eadovan\u00e1 pole
 group.create.create=Vytvo\u0159it skupinu
 
@@ -454,6 +443,7 @@ group.delete.delete=Smazat skupinu
 group.edit.title=Upravit skupinu
 group.edit.form_info=Upravit nastaven\u00ed skupiny a p\u0159idat nebo odebrat \u010dleny skupiny a administr\u00e1tory pou\u017eit\u00edm n\u00e1sleduj\u00edc\u00edho \
         formul\u00e1\u0159e.
+group.edit.details_info=Edit group settings below.
 group.edit.update=Informace o skupin\u011b byly \u00fasp\u011b\u0161n\u011b aktualizov\u00e1ny.
 group.edit.update_add_user=U\u017eivatel(\u00e9) \u00fasp\u011b\u0161n\u011b p\u0159id\u00e1n(i).
 group.edit.update_del_user=U\u017eivatel(\u00e9) \u00fasp\u011b\u0161n\u011b smaz\u00e1n(i).

src/i18n/wildfire_i18n_de.properties

@@ -429,18 +429,6 @@ group.create.invalid_group_name=Ung\u00fcltiger Gruppenname.
 group.create.invalid_group_info=Gruppe bereits vorhanden - bitte einen anderen Namen benutzen.
 group.create.label_description=Beschreibung:
 group.create.invalid_description=Ung\u00fcltige Beschreibung.
-group.create.label_initial_member=Anf\u00e4ngliche(s) Mitglied(er):
-group.create.share_groups_title=Gemeinsame Rostergruppen
-group.create.share_groups_info=Das Formular unten kann benutzt werden um diese Gruppe in den Rostern von \
-        Benutzern anzuzeigen. Eine der drei Optionen ausw\u00e4hlen um festzulegen wer diese Gruppe im Roster \
-	sehen soll.
-group.create.disable_share_group=Gemeinsame Rostergruppen deaktivieren
-group.create.enable_share_group=Gemeinsame Rostergruppen aktivieren
-group.create.group_display_name=Gruppenname der angezeigt wird
-group.create.enter_a_group_name=Gruppenname der angezeigt wird eingeben
-group.create.show_group_in_all_users=Gruppe im Roster aller Benutzer anzeigen
-group.create.show_group_in_group_members=Gruppe im Roster der Gruppenmitglieder anzeigen
-group.create.show_group_in_roster_group=Gruppe im Roster der Mitglieder folgender Gruppen anzeigen:
 group.create.required_fields=Ben\u00f6tigte Felder
 group.create.create=Gruppe anlegen
 

src/i18n/wildfire_i18n_en.properties

@@ -111,6 +111,8 @@
 ##      Added section: 'setup.ldap.*'
 ##      Added key: 'muc.service-name'
 ##      Updated section: 'group.edit.*'
+##      Updated key: 'group.create.form' (note, old translations left in place and need updates)
+##      Deleted keys from: 'group.create.*'
 
 # Wildfire
 
@@ -523,24 +525,14 @@ error.serverdown.login=Login to the admin console
 
 group.create.title=Create Group
 group.create.error=Error creating the group. Please check your error logs.
-group.create.form=Use the form below to create a group.
+group.create.form=Use the form below to create your new group. Once you've created the group you \
+   will proceed to another screen where you can add members and set up group contact list.
 group.create.new_group_title=Create New Group
 group.create.group_name=Group Name:
 group.create.invalid_group_name=Invalid group name.
 group.create.invalid_group_info=Group already exists - please choose a different name.
 group.create.label_description=Description:
 group.create.invalid_description=Invalid description.
-group.create.label_initial_member=Initial Member(s):
-group.create.share_groups_title=Shared Roster Groups
-group.create.share_groups_info=You can use the form below to show this group in users' rosters. Select \
-        from one of three options for who should see this group in their rosters.
-group.create.disable_share_group=Disable sharing group in rosters
-group.create.enable_share_group=Enable sharing group in rosters
-group.create.group_display_name=Group Display Name
-group.create.enter_a_group_name=Enter a Group Display Name.
-group.create.show_group_in_all_users=Show group in all users' rosters.
-group.create.show_group_in_group_members=Show group in group members' rosters
-group.create.show_group_in_roster_group=Show group to members' rosters of these groups:
 group.create.required_fields=Required fields
 group.create.create=Create Group
 
@@ -556,6 +548,7 @@ group.delete.delete=Delete Group
 group.edit.title=Edit Group
 group.edit.form_info=Edit group settings and add or remove group members and administrators using the \
         forms below.
+group.edit.details_info=Edit group settings below.
 group.edit.update=Group information updated successfully.
 group.edit.update_add_user=User(s) added successfully.
 group.edit.update_del_user=User(s) deleted successfully.

src/i18n/wildfire_i18n_es.properties

@@ -409,16 +409,6 @@ group.create.invalid_group_name=Nombre de grupo no v\u00e1lido.
 group.create.invalid_group_info=El grupo ya existe - por favor elija un nombre diferente.
 group.create.label_description=Descripci\u00f3n:
 group.create.invalid_description=Descripci\u00f3n no v\u00e1lida.
-group.create.label_initial_member=Miembro(s) Inicial(es):
-group.create.share_groups_title=Grupos de Contactos Compartidos
-group.create.share_groups_info=Puede usar el siguiente formulario para mostrar este grupo en las listas de contactos de los usuarios. Seleccione una de las tres opciones para determinar qui\u00e9n ver\u00e1 a este grupo entre sus contactos.
-group.create.disable_share_group=Deshabilitar compartimiento del grupo en las listas de contactos
-group.create.enable_share_group=Habilitar compartimiento del grupo en las listas de contactos
-group.create.group_display_name=Nombre exhibido para el grupo
-group.create.enter_a_group_name=Introduzca el nombre a exhibir para el grupo.
-group.create.show_group_in_all_users=Mostrar el grupo en las listas de contactos de todos los usuarios.
-group.create.show_group_in_group_members=Mostrar el grupo en las listas de contactos de sus miembros.
-group.create.show_group_in_roster_group=Mostrar el grupo en las listas de contactos de los miembros de estos grupos:
 group.create.required_fields=Campos Requeridos
 group.create.create=Crear Grupo
 
@@ -433,6 +423,7 @@ group.delete.delete=Borrar Grupo
 
 group.edit.title=Editar Grupo
 group.edit.form_info=Para editar la configuraci\u00f3n de los grupos y agregar o eliminar miembros y administradores de los mismos use los formularios siguientes.
+group.edit.details_info=Edit group settings below.
 group.edit.update=Informaci\u00f3n del grupo actualizada con \u00e9xito.
 group.edit.update_add_user=Usuario(s) ingresado(s) con \u00e9xito.
 group.edit.update_del_user=Usuario(s) borrado(s) con \u00e9xito.

src/i18n/wildfire_i18n_fr.properties

@@ -233,27 +233,19 @@ global.showing=Afficher
 global.stop=Arr\u00eater
 global.unlimited=illimit\u00e9
 global.yes=Oui
+
 group.create.create=Cr\u00e9er un Groupe
-group.create.disable_share_group=D\u00e9sactiver le groupe partag\u00e9 dans la liste de contacts
-group.create.enable_share_group=Activer le groupe partag\u00e9 dans la liste de contacts
 group.create.enter_a_group_name=Saisisser un Nom d'affichage pour le Groupe.
 group.create.error=Erreur lors de la cr\u00e9ation du groupe.Veuillez v\u00e9rifier le journal des erreurs.
 group.create.form=Utilisez le formulaire ci-dessous pour cr\u00e9er un groupe.
-group.create.group_display_name=Nom du groupe affich\u00e9 aux utilisateurs
 group.create.group_name=Nom du Groupe :
 group.create.invalid_description=Description invalide.
 group.create.invalid_group_info=Le Groupe existe d\u00e9j\u00e0 - veuillez choisir un nom diff\u00e9rent.
 group.create.invalid_group_name=Nom du groupe invalide.
 group.create.label_description=Description :
-group.create.label_initial_member=Membre(s) Initial(aux) :
 group.create.new_group_title=Cr\u00e9er un Nouveau Groupe
 group.create.required_fields=Champs requis
-group.create.share_groups_info=Vous pouvez utiliser le formulaire ci-dessous pour afficher  ce groupe de personnes \u00e0 la liste des groupes de l'utilisateur. S\u00e9lectionnez une des trois options pour laquelle  vous devriez voir ce groupe dans leurs groupes de personnes.
-group.create.share_groups_title=Groupe de contacts partag\u00e9
-group.create.show_group_in_all_users=Afficher le groupe dans la liste de contacts de tous les     utilisateurs.
-group.create.show_group_in_group_members=Afficher le groupe dans la liste de contacts de tous les     membres de celui-ci.
-group.create.show_group_in_roster_group=Afficher le groupe dans la liste de contacts des     membres de ces groupes :
-# Group create Page
+
 group.create.title=Cr\u00e9er un Groupe
 group.delete.delete=Supprimer le Groupe
 group.delete.hint_info=Etes-vous s\u00fbr de vouloir supprimer ce groupe
@@ -265,6 +257,7 @@ group.delete.title=Supprimer le Groupe
 group.edit.title=Edit Group
 group.edit.form_info=Edit group settings and add or remove group members and administrators using the \
         forms below.
+group.edit.details_info=Edit group settings below.
 group.edit.update=Group information updated successfully.
 group.edit.update_add_user=User(s) added successfully.
 group.edit.update_del_user=User(s) deleted successfully.

src/i18n/wildfire_i18n_nl.properties

@@ -426,17 +426,6 @@ group.create.invalid_group_name=Ongeldige naam voor een groep.
 group.create.invalid_group_info=De groep bestaat reeds - kies een andere naam.
 group.create.label_description=Omschrijving:
 group.create.invalid_description=Ongeldige omschrijving.
-group.create.label_initial_member=Initile Leden:
-group.create.share_groups_title=Gedeelde groepen
-group.create.share_groups_info=Gebruik het onderstaande formulier om deze groep in de contactenlijst van gebruikers te tonen. \
-        Kies n van de drie mogenlijkheden om te bepalen wie de groep in hun contactenlijst moet zien.
-group.create.disable_share_group=Gedeelde groep in de contactenlijst uitschakelen
-group.create.enable_share_group=Gedeelde groep in de contactenlijst inschakelen
-group.create.group_display_name=Getoonde naam voor de groep
-group.create.enter_a_group_name=Geef een naam op voor de groep.
-group.create.show_group_in_all_users=Toon de groep in de contactenlijsten van alle gebruikers.
-group.create.show_group_in_group_members=Toon de groep enkel aan leden van de groep
-group.create.show_group_in_roster_group=Toon de groep aan leden van de volgende groepen:
 group.create.required_fields=Vereiste velden
 group.create.create=Nieuwe groep toevoegen
 
@@ -452,6 +441,7 @@ group.delete.delete=Groep verwijderen
 group.edit.title=Groep wijzigen
 group.edit.form_info=Gebruik onderstaande formulieren om de groepsinstellingen te wijzigen en groepsleden en beheerders \
          toe te voegen of te verwijderen.
+group.edit.details_info=Edit group settings below.
 group.edit.update=Groepsinformatie is succesvol gewijzigd.
 group.edit.update_add_user=Gebruiker(s) succesvol toegevoegd.
 group.edit.update_del_user=Gebruiker(s) succesvol verwijderd.

src/i18n/wildfire_i18n_pl_PL.properties

@@ -429,17 +429,6 @@ group.create.invalid_group_name=Nieprawid\u0142owa nazwa grupy.
 group.create.invalid_group_info=Grupa o takiej nazwie ju\u017c istnieje - prosz\u0119 wybra\u0107 inn\u0105 nazw\u0119.
 group.create.label_description=Opis:
 group.create.invalid_description=Nieprawid\u0142owy opis.
-group.create.label_initial_member=Cz\u0142onkowie grupy:
-group.create.share_groups_title=Grupy wsp\u00f3\u0142dzielone w rosterze
-group.create.share_groups_info=Dzi\u0119ki poni\u017cszemu formularzowi mo\u017cna ustawi\u0107 wy\u015bwietlanie tej grupy w rosterach u\u017cytkownik\u00f3w. \
-        Dost\u0119pne s\u0105 trzy opcje okre\u015blaj\u0105ce kto ma widzie\u0107 t\u0105 grup\u0119 na swojej li\u015bcie kontakt\u00f3w.
-group.create.disable_share_group=Wy\u0142\u0105cz wsp\u00f3\u0142dzielenie grupy w rosterze
-group.create.enable_share_group=W\u0142\u0105cz wsp\u00f3\u0142dzielenie grupy w rosterze
-group.create.group_display_name=Wy\u015bwietlana nazwa grupy
-group.create.enter_a_group_name=Wprowad\u017a wy\u015bwietlan\u0105 nazw\u0119 grupy.
-group.create.show_group_in_all_users=Wy\u015bwietlaj grup\u0119 w rosterach wszystkich u\u017cytkownik\u00f3w.
-group.create.show_group_in_group_members=Wy\u015bwietlaj grup\u0119 w rosterach jej cz\u0142onk\u00f3w
-group.create.show_group_in_roster_group=Wy\u015bwietlaj grup\u0119 w rosterach cz\u0142onk\u00f3w nast\u0119puj\u0105cych grup:
 group.create.required_fields=Pola wymagane
 group.create.create=Utw\u00f3rz grup\u0119
 
@@ -454,6 +443,7 @@ group.delete.delete=Usu\u0144
 
 group.edit.title=Modyfikuj grup\u0119
 group.edit.form_info=Poni\u017cszy formularz umo\u017cliwia edycj\u0119 ustawie\u0144 grup, dodawanie oraz usuwanie cz\u0142onk\u00f3w i administrator\u00f3w.
+group.edit.details_info=Edit group settings below.
 group.edit.update=Dokonano zmiany informacji o grupie.
 group.edit.update_add_user=Dodano u\u017cytkownika(\u00f3w).
 group.edit.update_del_user=Usuni\u0119to u\u017cytkownika(\u00f3w).

src/i18n/wildfire_i18n_pt_BR.properties

@@ -426,17 +426,6 @@ group.create.invalid_group_name=Nome do Grupo Inv\u00e1lido.
 group.create.invalid_group_info=Grupo j\u00e1 existe - por favor escolha um nome diferente.
 group.create.label_description=Descri\u00e7\u00e3o:
 group.create.invalid_description=Descri\u00e7\u00e3o Inv\u00e1lida.
-group.create.label_initial_member=Membro(s) Inicial(is):
-group.create.share_groups_title=Grupos de Contatos Compartilhados
-group.create.share_groups_info=Voc\u00ea pode utilizar o formul\u00e1rio abaixo para mostrar este grupo nos contatos dos usu\u00e1rios. \
-        Selecione uma das tr\u00eas op\u00e7\u00f5es para quem poder\u00e1 ver este grupo em seus contatos.
-group.create.disable_share_group=Desativar o compartilhamento de grupo nos contatos
-group.create.enable_share_group=Ativar o compartilhamento de grupo nos contatos
-group.create.group_display_name=Nome de exibi\u00e7\u00e3o para o Grupo
-group.create.enter_a_group_name=Digite um Nome de exibi\u00e7\u00e3o para o Grupo.
-group.create.show_group_in_all_users=Mostrar grupo nos contatos de todos os usu\u00e1rios.
-group.create.show_group_in_group_members=Mostrar grupo nos contatos nos membros
-group.create.show_group_in_roster_group=Mostrar grupos nos contatos dos membros desses grupos:
 group.create.required_fields=Campos Requeridos
 group.create.create=Criar Grupo
 
@@ -452,6 +441,7 @@ group.delete.delete=Apagar Grupo
 group.edit.title=Editar Grupo
 group.edit.form_info=Edita as configura\u00e7\u00f5es do grupo e adiciona ou remove membros de grupos e administradores usando o \
         formul\u00e1rio abaixo.
+group.edit.details_info=Edit group settings below.
 group.edit.update=Informa\u00e7\u00e3o do Grupo atualizado com sucesso.
 group.edit.update_add_user=Usu\u00e1rio(s) adicionado(s) com sucesso.
 group.edit.update_del_user=Usu\u00e1rio(s) apagado(s) com sucesso.

src/i18n/wildfire_i18n_zh_CN.properties

@@ -411,16 +411,6 @@ group.create.invalid_group_name=\u65e0\u6548\u7ec4\u540d\u3002
 group.create.invalid_group_info=\u7ec4\u5df2\u5b58\u5728 \uff0d \u8bf7\u9009\u62e9\u522b\u7684\u540d\u79f0\u3002
 group.create.label_description=\u63cf\u8ff0\uff1a
 group.create.invalid_description=\u65e0\u6548\u63cf\u8ff0\u3002
-group.create.label_initial_member=\u521d\u59cb\u6210\u5458\uff1a
-group.create.share_groups_title=\u5171\u4eab\u7684\u540d\u5355\u7ec4
-group.create.share_groups_info=\u60a8\u53ef\u4ee5\u4f7f\u7528\u4e0b\u9762\u7684\u8868\u5355\u4ee5\u5728\u7528\u6237\u7684\u540d\u5355\u4e2d\u663e\u793a\u8be5\u7ec4\u3002\u4e3a\u7528\u6237\u9009\u62e9\u4e09\u4e2a\u9009\u9879\u4e4b\u4e00\uff0c\u8fd9\u4e9b\u7528\u6237\u5c06\u5728\u5176\u540d\u5355\u4e2d\u770b\u5230\u8be5\u7ec4\u3002
-group.create.disable_share_group=\u7981\u7528\u540d\u5355\u4e2d\u7684\u5171\u4eab\u7ec4
-group.create.enable_share_group=\u542f\u7528\u540d\u5355\u4e2d\u7684\u5171\u4eab\u7ec4
-group.create.group_display_name=\u7ec4\u663e\u793a\u540d\u79f0
-group.create.enter_a_group_name=\u8f93\u5165\u201c\u7ec4\u663e\u793a\u540d\u79f0\u201d\u3002
-group.create.show_group_in_all_users=\u5728\u6240\u6709\u7528\u6237\u7684\u540d\u5355\u4e2d\u663e\u793a\u7ec4\u3002
-group.create.show_group_in_group_members=\u5728\u7ec4\u6210\u5458\u7684\u540d\u5355\u4e2d\u663e\u793a\u7ec4\u3002
-group.create.show_group_in_roster_group=\u5728\u8fd9\u4e9b\u7ec4\u7684\u6210\u5458\u7684\u540d\u5355\u4e2d\u663e\u793a\u7ec4\uff1a
 group.create.required_fields=\u5fc5\u586b\u5b57\u6bb5
 group.create.create=\u521b\u5efa\u7ec4
 
@@ -435,6 +425,7 @@ group.delete.delete=\u5220\u9664\u7ec4
 
 group.edit.title=\u7f16\u8f91\u7ec4
 group.edit.form_info=\u4f7f\u7528\u4e0b\u9762\u7684\u8868\u5355\u7f16\u8f91\u7ec4\u8bbe\u7f6e\u53ca\u6dfb\u52a0\u6216\u9664\u53bb\u7ec4\u6210\u5458\u548c\u7ba1\u7406\u5458\u3002
+group.edit.details_info=Edit group settings below.
 group.edit.update=\u5df2\u6210\u529f\u66f4\u65b0\u7ec4\u4fe1\u606f\u3002
 group.edit.update_add_user=\u5df2\u6210\u529f\u6dfb\u52a0\u7528\u6237\u3002
 group.edit.update_del_user=\u5df2\u6210\u529f\u5220\u9664\u7528\u6237\u3002

src/web/group-create.jsp

@@ -25,7 +25,10 @@
 <%  webManager.init(request, response, session, application, out); %>
 
 <%  // Get parameters //
+    String groupName = ParamUtils.getParameter(request, "group");
+
     boolean create = request.getParameter("create") != null;
+    boolean edit = request.getParameter("edit") != null;
     boolean cancel = request.getParameter("cancel") != null;
     String name = ParamUtils.getParameter(request, "name");
     String description = ParamUtils.getParameter(request, "description");
@@ -34,7 +37,12 @@
 
     // Handle a cancel
     if (cancel) {
+        if (groupName == null) {
             response.sendRedirect("group-summary.jsp");
+        }
+        else {
+            response.sendRedirect("group-edit.jsp?group=" + URLEncoder.encode(groupName, "UTF-8"));    
+        }
         return;
     }
     // Handle a request to create a group:
@@ -68,12 +76,56 @@
             }
         }
     }
+    // Handle a request to edit a group:
+    if (edit) {
+        // Validate
+        if (name == null) {
+            errors.put("name", "");
+        }
+        // do a create if there were no errors
+        if (errors.size() == 0) {
+            try {
+                Group group = webManager.getGroupManager().getGroup(groupName);
+                group.setName(name);
+                if (description != null) {
+                    group.setDescription(description);
+                }
+
+                // Successful, so redirect
+                response.sendRedirect("group-edit.jsp?groupChanged=true&group=" + URLEncoder.encode(group.getName(), "UTF-8"));
+                return;
+            }
+            catch (Exception e) {
+                errors.put("general", "");
+                Log.error(e);
+            }
+        }
+    }
 %>
 
 <html>
 <head>
-<title><fmt:message key="group.create.title"/></title>
+<title><%
+           // If editing the group.
+           if (groupName != null) {
+        %>
+        <fmt:message key="group.edit.title" />
+        <% }
+           // Otherwise creating a new group.
+           else {
+        %>
+        <fmt:message key="group.create.title" />
+        <% } %>
+</title>
+
+<% if (groupName == null) { %>
 <meta name="pageID" content="group-create"/>
+<% }
+   else { %>
+<meta name="subPageID" content="group-edit"/>
+<meta name="extraParams" content="<%= "group="+URLEncoder.encode(groupName, "UTF-8") %>"/>
+<% } %>
+    
 <meta name="helpPage" content="create_a_group.html"/>
 </head>
 <body>
@@ -98,16 +150,38 @@
 <%  } %>
 
 <p>
-Use the form below to create your new group. Once you've created the group you will proceed to another
-screen where you can add members and set up group contact list.
-<!--<fmt:message key="group.create.form" />-->
+    <%
+        // If editing the group.
+        if (groupName != null) {
+    %>
+    <fmt:message key="group.edit.details_info" />
+    <% }
+       // Otherwise creating a new group.
+       else {
+    %>
+    <fmt:message key="group.create.form" />
+    <% } %>
 </p>
 
 <form name="f" action="group-create.jsp" method="post">
 
+   <% if (groupName != null) { %>
+    <input type="hidden" name="group" value="<%= groupName %>" id="existingName">
+   <% } %>
+
     <!-- BEGIN create group -->
 	<div class="jive-contentBoxHeader">
+        <%
+            // If editing the group.
+            if (groupName != null) {
+        %>
+        <fmt:message key="group.edit.title" />
+        <% }
+           // Otherwise creating a new group.
+           else {
+        %>
         <fmt:message key="group.create.new_group_title" />
+        <% } %>
     </div>
 	<div class="jive-contentBox">
 		<table cellpadding="3" cellspacing="0" border="0">
@@ -162,9 +236,18 @@ screen where you can add members and set up group contact list.
 	<tr>
 		<td></td>
 		<td>
-
+            <%
+               // If editing the group.
+               if (groupName != null) {
+            %>
+            <input type="submit" name="edit" value="<fmt:message key="group.edit.title" />">
+            <% }
+               // Otherwise creating a new group.
+               else {
+            %>
             <input type="submit" name="create" value="<fmt:message key="group.create.create" />">
-<input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
+            <% } %>
+            <input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
 		</td>
 	</tr>
     </table>

src/web/group-edit.jsp

@@ -299,8 +299,8 @@
 	<!-- BEGIN group name and description -->
 	<div class="jive-contentBox-plain">
 		<div class="jive-contentBox-toolbox">
-			<a href="group-create.jsp?group=<%= group.getName()%>" class="jive-link-edit"><fmt:message key="group.edit.edit_details" /></a>
-			<a href="group-delete.jsp?group=<%= group.getName()%>" class="jive-link-delete"><fmt:message key="group.edit.delete" /></a>
+			<a href="group-create.jsp?group=<%= URLEncoder.encode(group.getName(), "UTF-8")%>&name=<%= URLEncoder.encode(group.getName(), "UTF-8")%>&description=<%= URLEncoder.encode(group.getDescription(), "UTF-8")%>" class="jive-link-edit"><fmt:message key="group.edit.edit_details" /></a>
+			<a href="group-delete.jsp?group=<%= URLEncoder.encode(group.getName(), "UTF-8")%>" class="jive-link-delete"><fmt:message key="group.edit.delete" /></a>
 		</div>
 
 		<h3>