1.1 --- a/meta/any.langs/admin.yaml	Thu Aug 02 23:55:57 2007 +0200
     1.2 +++ b/meta/any.langs/admin.yaml	Sat Sep 22 02:03:02 2007 +0200
     1.3 @@ -9,12 +9,16 @@
     1.4      adm_user_edited: "User “%(name)s” edited."
     1.5      adm_delete_group: "Delete group"
     1.6      adm_new_group: "Add group"
     1.7 +    adm_new_user: "Add user"
     1.8      adm_group_create: "Create"
     1.9 +    adm_usr_create: "Create"
    1.10      adm_group_addto: "add to group"
    1.11      adm_group_delfrom: "remove from group"
    1.12      adm_group_created: "created group “%s”"
    1.13 +    adm_group_created: "created user “%s”"
    1.14      adm_group_deleted: "deleted group “%s”"
    1.15      adm_err_set_grpname: "Please enter the desired group name."
    1.16 +    adm_err_set_usrname: "Please enter the desired user name."
    1.17      adm_err_select_grp: "Please select a group."
    1.18  
    1.19      adm_cfg_title: "admin panel: configuration"
    1.20 @@ -57,12 +61,16 @@
    1.21      adm_user_edited: "Benutzer „%(name)s” bearbeitet.."
    1.22      adm_delete_group: "Gruppe entfernen"
    1.23      adm_new_group: "Neue Gruppe"
    1.24 +    adm_new_user: "Neuer Benutzer"
    1.25      adm_group_create: "Erstellen"
    1.26 +    adm_usr_create: "Erstellen"
    1.27      adm_group_addto: "zu Gruppe hinzufügen"
    1.28      adm_group_delfrom: "aus Gruppe entfernen"
    1.29      adm_group_created: "Gruppe „%s” erstellt."
    1.30 +    adm_user_created: "Benutzer „%s” erstellt."
    1.31      adm_group_deleted: "Gruppe „%s” entfernt."
    1.32      adm_err_set_grpname: "Bitte geben Sie den gewünschten Gruppennamen ein."
    1.33 +    adm_err_set_usrname: "Bitte geben Sie den gewünschten Benutzernahmen ein."
    1.34      adm_err_select_grp: "Bitte wählen Sie eine Gruppe aus."
    1.35  
    1.36      adm_cfg_title: "Administrationspanel: Konfiguration"

     2.1 --- a/modules/admin.py	Thu Aug 02 23:55:57 2007 +0200
     2.2 +++ b/modules/admin.py	Sat Sep 22 02:03:02 2007 +0200
     2.3 @@ -83,6 +83,13 @@
     2.4              elif action == 'editusr':
     2.5                  frmactn = req.mk_uri(req.split_uri[:urilevel+1]+['u_'+info])
     2.6                  return req['user'].edit_profile(int(info),frmactn,True)
     2.7 +            elif action == 'newusr':
     2.8 +                if 'usrname' not in flds or not flds['usrname']:
     2.9 +                    t.kw_set_vars(info=req.xlate("adm_err_set_usrname"))
    2.10 +                else:
    2.11 +                    req['user'].add_user(flds['usrname'])
    2.12 +                    t.kw_set_vars(info=req.xlate("adm_user_created")
    2.13 +                        % flds['usrname'])
    2.14              elif action == 'newgrp':
    2.15                  if 'grpname' not in flds or not flds['grpname']:
    2.16                      t.kw_set_vars(info=req.xlate("adm_err_set_grpname"))
    2.17 @@ -106,10 +113,10 @@
    2.18                  uid,group = info.split('/',1)
    2.19                  uid = int(uid)
    2.20                  req['user'].delete_from_group(uid,group)
    2.21 -            elif flds.has_key('action') and flds['action'] == 'reallydel':
    2.22 +            elif action == 'reallydel':
    2.23                  t.kw_set_vars(info=req.xlate('adm_deleted_user') 
    2.24 -                    % {'name': req['user'].get_name(id), 'id':id})
    2.25 -                req['user'].delete_user(id)
    2.26 +                    % {'name': req['user'].get_name(int(info)), 'id':info})
    2.27 +                req['user'].delete_user(int(info))
    2.28          elif len(req.split_uri) > urilevel+1 and \
    2.29              req.split_uri[urilevel+1][:2] == 'u_':
    2.30              id = int(req.split_uri[urilevel+1][2:])

     3.1 --- a/templates/admin_user.atpl	Thu Aug 02 23:55:57 2007 +0200
     3.2 +++ b/templates/admin_user.atpl	Sat Sep 22 02:03:02 2007 +0200
     3.3 @@ -4,9 +4,9 @@
     3.4  <h1>$(xlate adm_user_title)</h1>
     3.5  
     3.6  $(begin if del_q)
     3.7 -<p class="danger"><form method="post" action="${formaction}/${del_id}">
     3.8 -${del_q}<input type="submit" name="submit" value="$(xlate _yes)"/>
     3.9 -<input type="hidden" name="action" value="reallydel"/>
    3.10 +<p class="danger"><form method="post" action="${formaction}">
    3.11 +${del_q}
    3.12 +<button type="submit" name="submit" value="reallydel:${del_id}">$(xlate _yes)</button>
    3.13  <a href="${formaction}">$(xlate _no)</a></form></p>
    3.14  $(end)
    3.15  
    3.16 @@ -20,7 +20,9 @@
    3.17  <button type="submit" name="submit" value="delgrp:">$(xlate adm_delete_group)
    3.18  </button><br/>
    3.19  <strong>$(xlate adm_new_group)</strong>: <input type="text" name="grpname"/>
    3.20 -<button type="submit" name="submit" value="newgrp:">$(xlate adm_group_create)</button></p>
    3.21 +<button type="submit" name="submit" value="newgrp:">$(xlate adm_group_create)</button><br/>
    3.22 +<strong>$(xlate adm_new_user)</strong>: <input type="text" name="usrname"/>
    3.23 +<button type="submit" name="submit" value="newusr:">$(xlate adm_usr_create)</button></p>
    3.24  <br/><br/>
    3.25  <div>
    3.26  $(begin repeat users)