diff -r kzexp_zwook_beta_3/zwo_bo/admin/css/index_html kzexp_zwook_beta_4/zwo_bo/admin/css/index_html
52d51
<   hlptxt2=''
54,56c53,54
<     hlptxt=' poplink(\''+help+'\');'
<     hlptxt2='killlink();'
<   rett='<a href="'+url+'" onMouseover="'+hlptxt+'rollit('
---
>     hlptxt=' title="aide"'
>   rett='<a href="'+url+'"'+hlptxt+' onMouseover="rollit('
58c56
<   rett=rett+')" onMouseout="'+hlptxt2+'rollit('
---
>   rett=rett+')" onMouseout="rollit('
115,117d112
< old=context.zwook.version
< idold=string.replace(old,'.','_')
< 
diff -r kzexp_zwook_beta_3/zwo_bo/admin/groups/creer kzexp_zwook_beta_4/zwo_bo/admin/groups/creer
17c17
< lis=context.zwo_info.groups
---
> lis=mem["zwo_info"].groups
19,21c19,20
< if nomz in lis.objectIds('Folder'): 
<   print context.standard_html_header()
<   print '<font face="Arial" size="+1" color="red">Un utilisateur de ce nom existe déja, veuillez en choisir un autre</font>'
---
> if nomz in mem["zwo_info"].groups.objectIds(): 
>   print '<font face="Arial" size="+1" color="red">Un groupe de ce nom existe déja, veuillez en choisir un autre</font>'
23d21
<   print context.standard_html_footer()
diff -r kzexp_zwook_beta_3/zwo_bo/admin/groups/etape1/index_html kzexp_zwook_beta_4/zwo_bo/admin/groups/etape1/index_html
48d47
<   hlptxt2=''
50,52c49,50
<     hlptxt=' poplink(\''+help+'\');'
<     hlptxt2='killlink();'
<   rett='<a href="'+url+'" onMouseover="'+hlptxt+'rollit('
---
>     hlptxt=' title="aide"'
>   rett='<a href="'+url+'"'+hlptxt+' onMouseover="rollit('
54c52
<   rett=rett+')" onMouseout="'+hlptxt2+'rollit('
---
>   rett=rett+')" onMouseout="rollit('
73,78d70
< titre='<a href="../" style="color:'+pr['color_txt_menu']+';text-decoration:none">RETOUR</a>'
< html=''
< prnt=prnt+context.zwo_bo.menu(zwu,pr,'nav',titre,html)
< prnt=prnt+spm
< 
< # MENU OPTIONS ADMIN
88a81,83
> html=html+'<a href="../../groups" style="color:'+pr['color_txt_menu']+';text-decoration:none">'
> html=html+' Groupes.</a><br />'
> 
diff -r kzexp_zwook_beta_3/zwo_bo/admin/groups/index_html kzexp_zwook_beta_4/zwo_bo/admin/groups/index_html
52d51
<   hlptxt2=''
54,56c53,54
<     hlptxt=' poplink(\''+help+'\');'
<     hlptxt2='killlink();'
<   rett='<a href="'+url+'" onMouseover="'+hlptxt+'rollit('
---
>     hlptxt=' title="aide"'
>   rett='<a href="'+url+'"'+hlptxt+' onMouseover="rollit('
58c56
<   rett=rett+')" onMouseout="'+hlptxt2+'rollit('
---
>   rett=rett+')" onMouseout="rollit('
94a93,95
> html=html+'<a href="../groups" style="color:'+pr['color_txt_menu']+';text-decoration:none">'
> html=html+' Groupes.</a><br />'
> 
diff -r kzexp_zwook_beta_3/zwo_bo/admin/index_html kzexp_zwook_beta_4/zwo_bo/admin/index_html
52d51
<   hlptxt2=''
54,56c53,54
<     hlptxt=' poplink(\''+help+'\');'
<     hlptxt2='killlink();'
<   rett='<a href="'+url+'" onMouseover="'+hlptxt+'rollit('
---
>     hlptxt=' title="aide"'
>   rett='<a href="'+url+'"'+hlptxt+' onMouseover="rollit('
58c56
<   rett=rett+')" onMouseout="'+hlptxt2+'rollit('
---
>   rett=rett+')" onMouseout="rollit('
80a79,81
> html=html+'<a href="./" style="color:'+pr['color_txt_menu']+';text-decoration:none">'
> html=html+' Parametres généraux.</a><br />'
> 
diff -r kzexp_zwook_beta_3/zwo_bo/admin/modules/detail kzexp_zwook_beta_4/zwo_bo/admin/modules/detail
50d49
<   hlptxt2=''
52,54c51,52
<     hlptxt=' poplink(\''+help+'\');'
<     hlptxt2='killlink();'
<   rett='<a href="'+url+'" onMouseover="'+hlptxt+'rollit('
---
>     hlptxt=' title="aide"'
>   rett='<a href="'+url+'"'+hlptxt+' onMouseover="rollit('
56c54
<   rett=rett+')" onMouseout="'+hlptxt2+'rollit('
---
>   rett=rett+')" onMouseout="rollit('
diff -r kzexp_zwook_beta_3/zwo_bo/admin/modules/detailok kzexp_zwook_beta_4/zwo_bo/admin/modules/detailok
13a14,20
> try:
>   n=int(note)
> except:
>   print 'Opération non éffectué : "note" doit être un chiffre entier.<br />'
>   print '<a href="./">retour</a>.<br />'
>   return printed
>   
diff -r kzexp_zwook_beta_3/zwo_bo/admin/modules/index_html kzexp_zwook_beta_4/zwo_bo/admin/modules/index_html
50d49
<   hlptxt2=''
52,54c51,52
<     hlptxt=' poplink(\''+help+'\');'
<     hlptxt2='killlink();'
<   rett='<a href="'+url+'" onMouseover="'+hlptxt+'rollit('
---
>     hlptxt=' title="aide"'
>   rett='<a href="'+url+'"'+hlptxt+' onMouseover="rollit('
56c54
<   rett=rett+')" onMouseout="'+hlptxt2+'rollit('
---
>   rett=rett+')" onMouseout="rollit('
81a80,82
> html=html+'<a href="../users" style="color:'+pr['color_txt_menu']+';text-decoration:none">'
> html=html+' Utilisateurs.</a><br />'
> 
85,90c86,88
< html=html+'<a href="../users" style="color:'+pr['color_txt_menu']+';text-decoration:none">'
< html=html+' Utilisateurs.</a><br />'
< """
< html=html+'<a href="../upgrades" style="color:'+pr['color_txt_menu']+';text-decoration:none">'
< html=html+' Upgrade.</a><br />'
< """
---
> html=html+'<a href="../modules" style="color:'+pr['color_txt_menu']+';text-decoration:none">'
> html=html+' Modules.</a><br />'
> 
diff -r kzexp_zwook_beta_3/zwo_bo/admin/users/config_params_user/home kzexp_zwook_beta_4/zwo_bo/admin/users/config_params_user/home
13a14,30
> print '<font face="arial" size="-1"><br />'
> lis=context.zwo_info.users
> print '<ul>'
> if lis.avatar:
>   print '<li>Les Avatars<a href="detruire_b?nom=avatar">(detruire)</a> [<a href="modif_bank_avatar">Modifier les avatars</a>]</li>'
> else:
>   print '<li>Les Avatars<a href="ajoute_b?nom=avatar">(ajouter)</a> [<a href="modif_bank_avatar">Modifier les avatars</a>]</li>'
> 
> if lis.email:
>   print '<li>Les e-mails<a href="detruire_b?nom=email">(detruire)</a></li>'
> else:
>   print '<li>Les e-mails<a href="ajoute_b?nom=email">(ajouter)</a></li>'
> print '</ul>'
> print '</font>'
> return printed
> 
> """
17a35
> 
104a123
> """
diff -r kzexp_zwook_beta_3/zwo_bo/admin/users/config_params_user/index_html kzexp_zwook_beta_4/zwo_bo/admin/users/config_params_user/index_html
48d47
<   hlptxt2=''
50,52c49,50
<     hlptxt=' poplink(\''+help+'\');'
<     hlptxt2='killlink();'
<   rett='<a href="'+url+'" onMouseover="'+hlptxt+'rollit('
---
>     hlptxt=' title="aide"'
>   rett='<a href="'+url+'"'+hlptxt+' onMouseover="rollit('
54c52
<   rett=rett+')" onMouseout="'+hlptxt2+'rollit('
---
>   rett=rett+')" onMouseout="rollit('
73,79d70
< titre='<a href="../" style="color:'+pr['color_txt_menu']+';text-decoration:none">RETOUR USERS</a>'
< html=''
< prnt=prnt+context.zwo_bo.menu(zwu,pr,'nav',titre,html)
< prnt=prnt+spm
< 
< 
< # MENU OPTIONS ADMIN
86a78,80
> html=html+'<a href="../../users" style="color:'+pr['color_txt_menu']+';text-decoration:none">'
> html=html+' Utilisateurs.</a><br />'
> 
diff -r kzexp_zwook_beta_3/zwo_bo/admin/users/config_params_user/modif_bank_avatar kzexp_zwook_beta_4/zwo_bo/admin/users/config_params_user/modif_bank_avatar
48d47
<   hlptxt2=''
50,52c49,50
<     hlptxt=' poplink(\''+help+'\');'
<     hlptxt2='killlink();'
<   rett='<a href="'+url+'" onMouseover="'+hlptxt+'rollit('
---
>     hlptxt=' title="aide"'
>   rett='<a href="'+url+'"'+hlptxt+' onMouseover="rollit('
54c52
<   rett=rett+')" onMouseout="'+hlptxt2+'rollit('
---
>   rett=rett+')" onMouseout="rollit('
73,79d70
< titre='<a href="../" style="color:'+pr['color_txt_menu']+';text-decoration:none">RETOUR</a>'
< html=''
< prnt=prnt+context.zwo_bo.menu(zwu,pr,'nav',titre,html)
< prnt=prnt+spm
< 
< 
< # MENU OPTIONS ADMIN
86a78,80
> html=html+'<a href="../../users" style="color:'+pr['color_txt_menu']+';text-decoration:none">'
> html=html+' Utilisateurs.</a><br />'
> 
diff -r kzexp_zwook_beta_3/zwo_bo/admin/users/etape1/index_html kzexp_zwook_beta_4/zwo_bo/admin/users/etape1/index_html
48d47
<   hlptxt2=''
50,52c49,50
<     hlptxt=' poplink(\''+help+'\');'
<     hlptxt2='killlink();'
<   rett='<a href="'+url+'" onMouseover="'+hlptxt+'rollit('
---
>     hlptxt=' title="aide"'
>   rett='<a href="'+url+'"'+hlptxt+' onMouseover="rollit('
54c52
<   rett=rett+')" onMouseout="'+hlptxt2+'rollit('
---
>   rett=rett+')" onMouseout="rollit('
73,79d70
< titre='<a href="../" style="color:'+pr['color_txt_menu']+';text-decoration:none">RETOUR</a>'
< html=''
< prnt=prnt+context.zwo_bo.menu(zwu,pr,'nav',titre,html)
< prnt=prnt+spm
< 
< 
< # MENU OPTIONS ADMIN
86a78,80
> html=html+'<a href="../../users" style="color:'+pr['color_txt_menu']+';text-decoration:none">'
> html=html+' Utilisateurs.</a><br />'
> 
diff -r kzexp_zwook_beta_3/zwo_bo/admin/users/etape1/modif_avatar kzexp_zwook_beta_4/zwo_bo/admin/users/etape1/modif_avatar
48d47
<   hlptxt2=''
50,52c49,50
<     hlptxt=' poplink(\''+help+'\');'
<     hlptxt2='killlink();'
<   rett='<a href="'+url+'" onMouseover="'+hlptxt+'rollit('
---
>     hlptxt=' title="aide"'
>   rett='<a href="'+url+'"'+hlptxt+' onMouseover="rollit('
54c52
<   rett=rett+')" onMouseout="'+hlptxt2+'rollit('
---
>   rett=rett+')" onMouseout="rollit('
86a85,87
> html=html+'<a href="../../users" style="color:'+pr['color_txt_menu']+';text-decoration:none">'
> html=html+' Utilisateurs.</a><br />'
> 
diff -r kzexp_zwook_beta_3/zwo_bo/admin/users/index_html kzexp_zwook_beta_4/zwo_bo/admin/users/index_html
18,19d17
< 
< 
55d52
<   hlptxt2=''
57,59c54,55
<     hlptxt=' poplink(\''+help+'\');'
<     hlptxt2='killlink();'
<   rett='<a href="'+url+'" onMouseover="'+hlptxt+'rollit('
---
>     hlptxt=' title="aide"'
>   rett='<a href="'+url+'"'+hlptxt+' onMouseover="rollit('
61c57
<   rett=rett+')" onMouseout="'+hlptxt2+'rollit('
---
>   rett=rett+')" onMouseout="rollit('
86a83,85
> html=html+'<a href="../users" style="color:'+pr['color_txt_menu']+';text-decoration:none">'
> html=html+' Utilisateurs.</a><br />'
> 
197a197,202
> html=html+'<a href="config_params_user">Configuration avatars et email.</a>'
> html=html+'</font>'
> html=html+'<br /><br />'
> 
> """
> html=html+'<font face="arial" size="-1">'
200a206
> """
diff -r kzexp_zwook_beta_3/zwo_bo/arbo/deplaceok kzexp_zwook_beta_4/zwo_bo/arbo/deplaceok
41d40
< 
53d51
< 
96,98d93
< 
< 
< 
132c127,128
< 
---
> err=[]
> noerr=[]
137,138c133,141
<      context.zwo_lib.zwo_cpy(lp[i],rep,l[i])
<      lp[i].manage_delObjects([l[i]])
---
>      dec=string.split(rep.absolute_url(),lp[i][l[i]].absolute_url()+'/')
>      if l[i] in rep.objectIds():
>        err.append('Un repertoire '+l[i]+' existe déja et ne sera pas délacer.')
>      elif (dec and len(dec)>1 ):
>        err.append('Le repertoire '+l[i]+' contient la destination et ne sera pas délacer.')
>      else:  
>        noerr.append('Repertoire '+l[i]+' délacer.')
>        context.zwo_lib.zwo_cpy(lp[i],rep,l[i])
>        lp[i].manage_delObjects([l[i]])
142c145,152
< context.REQUEST.RESPONSE.redirect(rep.absolute_url()+'/zwo_bo/arbo')
---
> if len(err)>0:
>   print '<br />'.join(err)
>   print '<br />'
>   print '<br />'.join(noerr)
>   print '<br /><a href="./">Retour</a>'
>   return printed
> else:
>   context.REQUEST.RESPONSE.redirect(rep.absolute_url()+'/zwo_bo/arbo')
diff -r kzexp_zwook_beta_3/zwo_bo/arbo/detruire_pages kzexp_zwook_beta_4/zwo_bo/arbo/detruire_pages
24,26d23
< html='<form action="detruireok" method="post">'
< 
< html=html+'<table border="0" cellspacing="0" cellpadding="0">'
31a29
> html=""
39c37,40
<   l.append(r)
---
>   if s=="zwook":
>     html=html+'La page d\'acceuil ne peux être détruite !! <br />'
>   else:
>     l.append(r)
40a42
> checkok=0
43,50c45,58
<     html=html+'<tr><td align="right"><font size="-1" face="Arial">'
<     html=html+l[i].title_or_id()
<     html=html+'&nbsp;</font></td></tr>'
< html=html+'</table>'
< 
< html=html+'<input type="submit" value="Validez">'
< html=html+'<input type="hidden" name="pgs" value="'+pgs+'">'
< html=html+'</form>'
---
>     checkok=1
>     
> if checkok==1: 
>   html=html+'<form action="detruireok" method="post">'
>   html=html+'<table border="0" cellspacing="0" cellpadding="0">'
>   for i in range(len(ll)):
>     if ll[i]<>'' and ll[i]<>'action' and len(string.split(ll[i],'*')) >1:
>       html=html+'<tr><td align="right"><font size="-1" face="Arial">'
>       html=html+l[i].title_or_id()
>       html=html+'&nbsp;</font></td></tr>'
>   html=html+'</table>'
>   html=html+'<input type="submit" value="Validez">'
>   html=html+'<input type="hidden" name="pgs" value="'+pgs+'">'
>   html=html+'</form>'
diff -r kzexp_zwook_beta_3/zwo_bo/arbo/detruireok kzexp_zwook_beta_4/zwo_bo/arbo/detruireok
39,47c39,45
<     if len(lch)<=minirac:
<       minirac=len(lch)
<       redirrep=p 
<     l.append(r.getId())
<     lp.append(p)
< 
< 
<     if context.zwo_lib.check_edit_rep(mem,p)==0:
<       return "Vous n'avez pas le droit."
---
>       if len(lch)<=minirac:
>         minirac=len(lch)
>         redirrep=p 
>       l.append(r.getId())
>       lp.append(p)
>       if context.zwo_lib.check_edit_rep(mem,p)==0:
>         return "Vous n'avez pas le droit."
diff -r kzexp_zwook_beta_3/zwo_bo/arbo/droits kzexp_zwook_beta_4/zwo_bo/arbo/droits
48d47
<   hlptxt2=''
50,52c49,50
<     hlptxt=' poplink(\''+help+'\');'
<     hlptxt2='killlink();'
<   rett='<a href="'+url+'" onMouseover="'+hlptxt+'rollit('
---
>     hlptxt=' title="aide"'
>   rett='<a href="'+url+'"'+hlptxt+' onMouseover="rollit('
54c52
<   rett=rett+')" onMouseout="'+hlptxt2+'rollit('
---
>   rett=rett+')" onMouseout="rollit('
72,88c70
< titre='<a href="./" style="color:'+pr['color_t_nav']+';text-decoration:none">RETOUR PAGES</a>'
< prnt=prnt+context.zwo_bo.menu(zwu,pr,'nav',titre)
< prnt=prnt+spm
< 
< # MENU ACTION PAGES
< titre ="OPTIONS PAGES"
< 
< html='<font size="-1" face="Arial">'
< 
< html=html+roll('goskin',"skins",zwui+'rond_skin.gif',zwui+'r_rond_skin.gif')
< html=html+'<a href="skins" style="color:'+pr['color_txt_menu']+';text-decoration:none">'
< html=html+' Configurer les skins.</a><br />'
< html=html+roll('gorefer',"refers",zwui+'rond_refer.gif',zwui+'r_rond_refer.gif')
< html=html+'<a href="refers" style="color:'+pr['color_txt_menu']+';text-decoration:none">'
< html=html+' Meta et référencement.</a><br />'
< 
< html=html+'</font>'
---
> prnt=prnt+context.menucarte(zwui,zwu,pr,roll)
90d71
< prnt=prnt+context.zwo_bo.menu(zwu,pr,'nav',titre,html)
diff -r kzexp_zwook_beta_3/zwo_bo/arbo/droits_local kzexp_zwook_beta_4/zwo_bo/arbo/droits_local
102d101
<   hlptxt2=''
104,106c103,104
<     hlptxt=' poplink(\''+help+'\');'
<     hlptxt2='killlink();'
<   rett='<a href="'+url+'" onMouseover="'+hlptxt+'rollit('
---
>     hlptxt=' title="aide"'
>   rett='<a href="'+url+'"'+hlptxt+' onMouseover="rollit('
108c106
<   rett=rett+')" onMouseout="'+hlptxt2+'rollit('
---
>   rett=rett+')" onMouseout="rollit('
diff -r kzexp_zwook_beta_3/zwo_bo/arbo/dupliquer_pages kzexp_zwook_beta_4/zwo_bo/arbo/dupliquer_pages
24,26d23
< html='<form action="dupliquerok" method="post">'
< 
< html=html+'<table border="0" cellspacing="0" cellpadding="0">'
30a28
> 
32a31,32
> html=""
> 
39c39,42
<   l.append(r)
---
>   if s=="zwook":
>     html=html+'La page d\'acceuil ne peux être dupliqué !! <br />'
>   else:
>     l.append(r)
40a44
> checkok=0
43,48c47,60
<     html=html+'<tr><td align="right"><font size="-1" face="Arial">'
<     html=html+l[i].title_or_id()
<     html=html+'&nbsp;</font></td><td align="left"><font size="-1" face="Arial">'
<     html=html+'<input type="text" name="'+ll[i]+'" value="new_'+l[i].title_or_id()+'">'
<     html=html+'</font></td></tr>'
< html=html+'</table>'
---
>     checkok=1
>     
> if checkok==1:
>   html=html+'<form action="dupliquerok" method="post">'
>   html=html+'<table border="0" cellspacing="0" cellpadding="0">'
> 
>   for i in range(len(ll)):
>     if ll[i]<>'' and ll[i]<>'action' and len(string.split(ll[i],'*')) >1:
>       html=html+'<tr><td align="right"><font size="-1" face="Arial">'
>       html=html+l[i].title_or_id()
>       html=html+'&nbsp;</font></td><td align="left"><font size="-1" face="Arial">'
>       html=html+'<input type="text" name="'+ll[i]+'" value="new_'+l[i].title_or_id()+'">'
>       html=html+'</font></td></tr>'
>   html=html+'</table>'
50,51c62,63
< html=html+'<input type="submit" value="Validez">'
< html=html+'</form>'
---
>   html=html+'<input type="submit" value="Validez">'
>   html=html+'</form>'
diff -r kzexp_zwook_beta_3/zwo_bo/arbo/dupliquerok kzexp_zwook_beta_4/zwo_bo/arbo/dupliquerok
48a49,50
> err=[]
> noerr=[]
55,59c57,74
<     p.manage_addFolder('zwo_temp')
<     context.zwo_lib.zwo_cpy(p,p['zwo_temp'],old,newid)
<     context.zwo_lib.zwo_cpy(p['zwo_temp'],p,newid)
<     p[newid].manage_changeProperties(title=new)
<     p.manage_delObjects(['zwo_temp'])
---
>     if newid in p.objectIds():
>       err.append(newid+' : Nom de repertoire déja utilisé. Duplication abandonné')
>     else:  
>       noerr.append(newid+' : Duplication Ok')
>       p.manage_addFolder('zwo_temp')
>       context.zwo_lib.zwo_cpy(p,p['zwo_temp'],old,newid)
>       context.zwo_lib.zwo_cpy(p['zwo_temp'],p,newid)
>       p[newid].manage_changeProperties(title=new)
>       p.manage_delObjects(['zwo_temp'])
> 
> if len(err)>0:
>   print ' Action(s) non effectué(s) :<br />'
>   print '<br />'.join(err)
>   if len(noerr):
>     print '<br /> Action(s) effectué(s) :<br />'
>     print '<br />'.join(noerr)
>   print '<a href="./"> Retour </a>'
>   return printed
diff -r kzexp_zwook_beta_3/zwo_bo/arbo/index_html kzexp_zwook_beta_4/zwo_bo/arbo/index_html
49d48
<   hlptxt2=''
51,53c50,51
<     hlptxt=' poplink(\''+help+'\');'
<     hlptxt2='killlink();'
<   rett='<a href="'+url+'" onMouseover="'+hlptxt+'rollit('
---
>     hlptxt=' title="aide"'
>   rett='<a href="'+url+'"'+hlptxt+' onMouseover="rollit('
55c53
<   rett=rett+')" onMouseout="'+hlptxt2+'rollit('
---
>   rett=rett+')" onMouseout="rollit('
73,76d70
< # MENU ACTION PAGES
< titre ="CARTES"
< 
< html='<font size="-1" face="Arial">'
78,86c72
< html=html+roll('godroit',"droits",zwui+'rond_droit.gif',zwui+'r_rond_droit.gif')
< html=html+'<a href="javascript:checkonerep(\'droits\');" style="color:'+pr['color_txt_menu']+';text-decoration:none">'
< html=html+' Carte des droits.</a><br />'
< html=html+roll('goskin',"skins",zwui+'rond_skin.gif',zwui+'r_rond_skin.gif')
< html=html+'<a href="javascript:checkonerep(\'skins\');" style="color:'+pr['color_txt_menu']+';text-decoration:none">'
< html=html+' Carte des skins.</a><br />'
< html=html+roll('gorefer',"refers",zwui+'rond_refer.gif',zwui+'r_rond_refer.gif')
< html=html+'<a href="javascript:checkonerep(\'refers\');" style="color:'+pr['color_txt_menu']+';text-decoration:none">'
< html=html+' Carte du référencement.</a><br />'
---
> # MENU ACTION PAGES
88c74
< html=html+'</font>'
---
> prnt=prnt+context.menucarte(zwui,zwu,pr,roll,1)
90d75
< prnt=prnt+context.zwo_bo.menu(zwu,pr,'nav',titre,html)
139c124
<     action_sel(action);
---
>       action_sel(action);
Only in kzexp_zwook_beta_4/zwo_bo/arbo: menucarte
diff -r kzexp_zwook_beta_3/zwo_bo/arbo/refers kzexp_zwook_beta_4/zwo_bo/arbo/refers
48d47
<   hlptxt2=''
50,52c49,50
<     hlptxt=' poplink(\''+help+'\');'
<     hlptxt2='killlink();'
<   rett='<a href="'+url+'" onMouseover="'+hlptxt+'rollit('
---
>     hlptxt=' title="aide"'
>   rett='<a href="'+url+'"'+hlptxt+' onMouseover="rollit('
54c52
<   rett=rett+')" onMouseout="'+hlptxt2+'rollit('
---
>   rett=rett+')" onMouseout="rollit('
72,90c70
< titre='<a href="./" style="color:'+pr['color_t_nav']+';text-decoration:none">RETOUR PAGES</a>'
< prnt=prnt+context.zwo_bo.menu(zwu,pr,'nav',titre)
< prnt=prnt+spm
< 
< # MENU ACTION PAGES
< titre ="OPTIONS PAGES"
< 
< html='<font size="-1" face="Arial">'
< 
< html=html+roll('godroit',"droits",zwui+'rond_droit.gif',zwui+'r_rond_droit.gif')
< html=html+'<a href="droits" style="color:'+pr['color_txt_menu']+';text-decoration:none">'
< html=html+' Configurer les droits.</a><br />'
< html=html+roll('goskin',"skins",zwui+'rond_skin.gif',zwui+'r_rond_skin.gif')
< html=html+'<a href="skins" style="color:'+pr['color_txt_menu']+';text-decoration:none">'
< html=html+' Configurer les skins.</a><br />'
< 
< html=html+'</font>'
< 
< prnt=prnt+context.zwo_bo.menu(zwu,pr,'nav',titre,html)
---
> prnt=prnt+context.menucarte(zwui,zwu,pr,roll)
diff -r kzexp_zwook_beta_3/zwo_bo/arbo/renommerok kzexp_zwook_beta_4/zwo_bo/arbo/renommerok
11a12,22
> roles=mem['user_roles_id']
> 
> def check(r):
>   cf=r.zwo_dossier
>   s_list_a=cf.groupes_editeurs
>   list_a=string.split(s_list_a,'&')
>   for a in list_a:
>     if a<>'':
>       if a in roles:
>         return 1
>   return 0
26,27c37,38
<     r='0'  
<     l.append(r)
---
>     p=zwo
>     l.append('0')
36,46c47,48
< roles=mem['user_roles_id']
< def check(r):
<   cf=r.zwo_dossier
<   s_list_a=cf.groupes_editeurs
<   list_a=string.split(s_list_a,'&')
<   for a in list_a:
<     if a<>'':
<       if a in roles:
<         return 1
<   return 0
< 
---
>   if context.zwo_lib.check_edit_rep(mem,p)==0:
>     return "Vous n'avez pas le droit."
48,50c50,51
< if context.zwo_lib.check_edit_rep(mem,p)==0:
<   return "Vous n'avez pas le droit."
<       
---
> err=[]      
> noerr=[]      
53,54c54,56
<     new=dico['zwook']
<     zwo.manage_changeProperties(title=new)
---
>     if check(zwo)==1:
>       new=dico['zwook']
>       zwo.manage_changeProperties(title=new)
59c61
<       new=dico[l]
---
>       new=dico[l]      
61c63,67
<       context.zwo_lib.zwo_rename(p,old,newid)
---
>       if newid in p.objectIds():
>         err.append('Impossible de renomer '+old+' en '+newid+' déja présent ici')
>       else:  
>         noerr.append('renomer ok : '+old+' en '+newid)
>         context.zwo_lib.zwo_rename(p,old,newid)
64c70,77
< context.REQUEST.RESPONSE.redirect(mem['zwo_url']+'/zwo_bo/arbo')
---
> if len(err)>0:
>   print '<br />'.join(err)
>   print '<br />'
>   print '<br />'.join(noerr)
>   print '<br /><a href="./">retour</a>'
>   return printed
> else:
>   context.REQUEST.RESPONSE.redirect(mem['zwo_url']+'/zwo_bo/arbo')
diff -r kzexp_zwook_beta_3/zwo_bo/arbo/skins kzexp_zwook_beta_4/zwo_bo/arbo/skins
49d48
<   hlptxt2=''
51,53c50,51
<     hlptxt=' poplink(\''+help+'\');'
<     hlptxt2='killlink();'
<   rett='<a href="'+url+'" onMouseover="'+hlptxt+'rollit('
---
>     hlptxt=' title="aide"'
>   rett='<a href="'+url+'"'+hlptxt+' onMouseover="rollit('
55c53
<   rett=rett+')" onMouseout="'+hlptxt2+'rollit('
---
>   rett=rett+')" onMouseout="rollit('
73,91c71
< titre='<a href="./" style="color:'+pr['color_t_nav']+';text-decoration:none">RETOUR PAGES</a>'
< prnt=prnt+context.zwo_bo.menu(zwu,pr,'nav',titre)
< prnt=prnt+spm
< 
< # MENU ACTION PAGES
< titre ="OPTIONS PAGES"
< 
< html='<font size="-1" face="Arial">'
< 
< html=html+roll('godroit',"droits",zwui+'rond_droit.gif',zwui+'r_rond_droit.gif')
< html=html+'<a href="droits" style="color:'+pr['color_txt_menu']+';text-decoration:none">'
< html=html+' Configurer les droits.</a><br />'
< html=html+roll('gorefer',"refers",zwui+'rond_refer.gif',zwui+'r_rond_refer.gif')
< html=html+'<a href="refers" style="color:'+pr['color_txt_menu']+';text-decoration:none">'
< html=html+' Meta et référencement.</a><br />'
< 
< html=html+'</font>'
< 
< prnt=prnt+context.zwo_bo.menu(zwu,pr,'nav',titre,html)
---
> prnt=prnt+context.menucarte(zwui,zwu,pr,roll)
diff -r kzexp_zwook_beta_3/zwo_bo/arbo/valid_sel kzexp_zwook_beta_4/zwo_bo/arbo/valid_sel
39c39
<     rp=string.split(pgs,'**action')[0]
---
>     rp=string.split(pgs,'action**')[1]
46c46
<     rp=string.split(pgs,'**action')[0]
---
>     rp=string.split(pgs,'action**')[1]
53,54c53,54
<     rp=string.split(pgs,'**action')[0]
<     context.REQUEST.RESPONSE.redirect('change_ref')
---
>     rp=string.split(pgs,'action**')[1]
>     context.REQUEST.RESPONSE.redirect('change_ref?rp='+rp)
diff -r kzexp_zwook_beta_3/zwo_bo/autour kzexp_zwook_beta_4/zwo_bo/autour
112,156d111
< ret=ret+"""
< <div class=popperlink id=topdecklink></div>
< <style type="text/css">
< <!--
< .popperlink {position:absolute;visibility:hidden}
< //-->
< </style>
< 
< <SCRIPT LANGUAGE="JavaScript">
< <!-- 
< domok = document.getElementById;
< if (domok)
< {
< skn = document.getElementById("topdecklink").style;
< if(navigator.appName.substring(0,3) == "Net")
< document.captureEvents(Event.MOUSEMOVE);
< document.onmousemove = get_mouse;
< }
< function poplink(msg)
< {
< var content ="<table border=0 cellpadding=0 cellspacing=0 bgcolor=#000000><tr><td><table width=100% border=0 cellpadding=2 cellspacing=1><tr><td bgcolor=#FFFFFF><font color=#000000 size=2 face='verdana'><center>"+msg+"</center></td></tr></table></td></tr></table>";
< if (domok)
< {
< document.getElementById("topdecklink").innerHTML = content;
< skn.visibility = "visible";
< }
< }
< function get_mouse(e)
< {
< var x = (navigator.appName.substring(0,3) == "Net") ? e.pageX : event.x+document.body.scrollLeft;
< var y = (navigator.appName.substring(0,3) == "Net") ? e.pageY : event.y+document.body.scrollTop;
< skn.left = x - 22;
< skn.top = y+20;
< }
< 
< function killlink()
< {
< if (domok) skn.visibility = "hidden";
< }
< 
< //-->
< </SCRIPT>
< 
< 
< """
181d135
<   hlptxt2=''
183,185c137,138
<     hlptxt=' poplink(\''+help+'\');'
<     hlptxt2='killlink();'
<   rett='<a href="'+url+'" onMouseover="'+hlptxt+'rollit('
---
>     hlptxt=' title="aide"'
>   rett='<a href="'+url+'"'+hlptxt+' onMouseover="rollit('
187c140
<   rett=rett+')" onMouseout="'+hlptxt2+'rollit('
---
>   rett=rett+')" onMouseout="rollit('
diff -r kzexp_zwook_beta_3/zwo_bo/configbox kzexp_zwook_beta_4/zwo_bo/configbox
18c18
<   uo.manage_addProperty('configbox',[id+'='+typ],'lines')  
---
>   uo.manage_addProperty('configbox',[id+'='+typ],'lines')
diff -r kzexp_zwook_beta_3/zwo_bo/edit/index_html kzexp_zwook_beta_4/zwo_bo/edit/index_html
57d56
<   hlptxt2=''
59,61c58,59
<     hlptxt=' poplink(\''+help+'\');'
<     hlptxt2='killlink();'
<   rett='<a href="'+url+'" onMouseover="'+hlptxt+'rollit('
---
>     hlptxt=' title="aide"'
>   rett='<a href="'+url+'"'+hlptxt+' onMouseover="rollit('
63c61
<   rett=rett+')" onMouseout="'+hlptxt2+'rollit('
---
>   rett=rett+')" onMouseout="rollit('
267c265
<         html=html+'<a href="ajout_element?type='+moduleid+'" onmouseover="poplink(\''+modulet+'\');" onmouseout="killlink();">'+img+'</a> '
---
>         html=html+'<a href="ajout_element?type='+moduleid+'" title="'+modulet+'">'+img+'</a> '
diff -r kzexp_zwook_beta_3/zwo_bo/edit/insertpageok kzexp_zwook_beta_4/zwo_bo/edit/insertpageok
7c7
< ##parameters=nompage
---
> ##parameters=nompage=''
19a20,22
> if nompage=="":
>   return '<html><body>Précisez un nom de page !!!</body></html>'
>   
25,26d27
< 
< 
diff -r kzexp_zwook_beta_3/zwo_bo/edit/placeok kzexp_zwook_beta_4/zwo_bo/edit/placeok
73a74,90
> err=[]
> #check si id existe déja.
> if case=="mem":
>   for i in idobjs:
>     if i in repuser['mem_cut'].objectIds():    
>       err.append(i+' ne peux être déplacer car son identifiant est déja utilisé dans la memoire perso')
> else:
>   for i in idobjsmem:
>     if i in rep.objectIds():    
>       err.append(i+' ne peux être déplacer car son identifiant est déja utilisé dans cette page')
> 
> if len(err)>0:
>   print '<br />'.join(err)
>   print '<br /><a href="./">Retour</a>'
>   return printed
>   
> 
diff -r kzexp_zwook_beta_3/zwo_bo/edit/renommerok kzexp_zwook_beta_4/zwo_bo/edit/renommerok
48a49,51
> err=[]
> noerr=[]
> 
54,57c57,64
<     context.zwo_lib.zwo_rename(rep,old,newid)
<     rep[newid].manage_changeProperties(title=new)
<     t=renameintab(tabl,old,newid)
<     tabl=t
---
>     if newid in rep.objectIds():
>       err.append(' Un élément possede déja l\'indentifiant '+newid+' : renommage de '+old+' annulé.')
>     else:
>       noerr.append(' Renommer '+old+' en  '+newid+' OK.')
>       context.zwo_lib.zwo_rename(rep,old,newid)
>       rep[newid].manage_changeProperties(title=new)
>       t=renameintab(tabl,old,newid)
>       tabl=t
62,63c69,74
<     context.zwo_lib.zwo_rename(rep,old,newid)
<     rep[newid].manage_changeProperties(title=new)
---
>     if newid in rep.objectIds():
>       err.append(' Un élément possede déja l\'indentifiant '+newid+' : renommage de '+old+' annulé.')
>     else:
>       noerr.append(' Renommer '+old+' en  '+newid+' OK.')
>       context.zwo_lib.zwo_rename(rep,old,newid)
>       rep[newid].manage_changeProperties(title=new)
68,69c79,84
<     context.zwo_lib.zwo_rename(repusercut,old,newid)
<     repusercut[newid].manage_changeProperties(title=new)
---
>     if newid in repusercut.objectIds():
>       err.append(' Un élément possede déja l\'indentifiant '+newid+' : renommage de '+old+' annulé.')
>     else:
>       noerr.append(' Renommer '+old+' en  '+newid+' OK.')
>       context.zwo_lib.zwo_rename(repusercut,old,newid)
>       repusercut[newid].manage_changeProperties(title=new)
71a87,94
> 
> if len(err)>0:
>   print '<br />'.join(err)
>   print '<br />'
>   print '<br />'.join(noerr)
>   print '<br /><a href="./">Retour</a>'
>   return printed
>   
diff -r kzexp_zwook_beta_3/zwo_bo/skin/index_html kzexp_zwook_beta_4/zwo_bo/skin/index_html
90d89
<   hlptxt2=''
92,94c91,92
<     hlptxt=' poplink(\''+help+'\');'
<     hlptxt2='killlink();'
<   rett='<a href="'+url+'" onMouseover="'+hlptxt+'rollit('
---
>     hlptxt=' title="aide"'
>   rett='<a href="'+url+'"'+hlptxt+' onMouseover="rollit('
96c94
<   rett=rett+')" onMouseout="'+hlptxt2+'rollit('
---
>   rett=rett+')" onMouseout="rollit('
198c196
<             html=html+'<a href="ajout_element?type='+moduleid+'" onmouseover="poplink(\''+modulet+'\');" onmouseout="killlink();">'+img+'</a> '
---
>             html=html+'<a href="ajout_element?type='+moduleid+'" title="'+modulet+'">'+img+'</a> '
diff -r kzexp_zwook_beta_3/zwo_bo/skin/placeok kzexp_zwook_beta_4/zwo_bo/skin/placeok
24a25,27
> err=[]
> noerr=[]
> 
86a90,104
> #check si id existe déja.
> if case=="mem":
>   for i in idobjs:
>     if i in repuser['mem_cut'].objectIds():    
>       err.append(i+' ne peux être déplacer car son identifiant est déja utilisé dans la memoire perso')
> else:
>   for i in idobjsmem:
>     if i in rep.objectIds():    
>       err.append(i+' ne peux être déplacer car son identifiant est déja utilisé dans ce skin')
> 
> if len(err)>0:
>   print '<br />'.join(err)
>   print '<br /><a href="./">Retour</a>'
>   return printed
> 
diff -r kzexp_zwook_beta_3/zwo_bo/skin/renommerok kzexp_zwook_beta_4/zwo_bo/skin/renommerok
65a66,68
> err=[]
> noerr=[]
> 
71,74c74,81
<     context.zwo_lib.zwo_rename(rep,old,newid)
<     rep[newid].manage_changeProperties(title=new)
<     t=renameintab(tabl,old,newid)
<     tabl=t
---
>     if newid in rep.objectIds():
>       err.append(' Un élément possede déja l\'indentifiant '+newid+' : renommage de '+old+' annulé.')
>     else:
>       noerr.append(' Renommer '+old+' en  '+newid+' OK.')
>       context.zwo_lib.zwo_rename(rep,old,newid)
>       rep[newid].manage_changeProperties(title=new)
>       t=renameintab(tabl,old,newid)
>       tabl=t
79,80c86,91
<     context.zwo_lib.zwo_rename(rep,old,newid)
<     rep[newid].manage_changeProperties(title=new)
---
>     if newid in rep.objectIds():
>       err.append(' Un élément possede déja l\'indentifiant '+newid+' : renommage de '+old+' annulé.')
>     else:
>       noerr.append(' Renommer '+old+' en  '+newid+' OK.')
>       context.zwo_lib.zwo_rename(rep,old,newid)
>       rep[newid].manage_changeProperties(title=new)
85,86c96,101
<     context.zwo_lib.zwo_rename(repusercut,old,newid)
<     repusercut[newid].manage_changeProperties(title=new)
---
>     if newid in repusercut.objectIds():
>       err.append(' Un élément possede déja l\'indentifiant '+newid+' : renommage de '+old+' annulé.')
>     else:
>       noerr.append(' Renommer '+old+' en  '+newid+' OK.')
>       context.zwo_lib.zwo_rename(repusercut,old,newid)
>       repusercut[newid].manage_changeProperties(title=new)
88a104,111
> 
> if len(err)>0:
>   print '<br />'.join(err)
>   print '<br />'
>   print '<br />'.join(noerr)
>   print '<br /><a href="./">Retour</a>'
>   return printed
> 
diff -r kzexp_zwook_beta_3/zwo_bo/skin/skins/detruireok kzexp_zwook_beta_4/zwo_bo/skin/skins/detruireok
23c23
< def checkinrep(r,oldskin,newskin):
---
> def checkinrep(r,oldskin,newskin):  
28,30c28,35
<     r.zwo_dossier.manage_changeProperties(skin=newskin)
<     numno="0"
<     r.zwo_dossier.manage_changeProperties(new_skin=numno)
---
>     if r.absolute_url()==mem["zwo_url"]:
>       r.zwo_dossier.manage_changeProperties(skin=newskin)
>       numno="1"
>       r.zwo_dossier.manage_changeProperties(new_skin=numno)
>     else:
>       r.zwo_dossier.manage_changeProperties(skin=newskin)
>       numno="0"
>       r.zwo_dossier.manage_changeProperties(new_skin=numno)
diff -r kzexp_zwook_beta_3/zwo_bo/skin/skins/dupliquerok kzexp_zwook_beta_4/zwo_bo/skin/skins/dupliquerok
16a17,19
> err=[]
> noerr=[]
> 
21,23c24,30
<   context.zwo_lib.zwo_cpy(repskins,repskins['zwo_temp'],old,newid)
<   context.zwo_lib.zwo_cpy(repskins['zwo_temp'],repskins,newid)
<   repskins[newid].manage_changeProperties(title=new)
---
>   if newid in repskins.objectIds():
>     err.append('il existe déja un skin '+newid+", duplication annulé.")
>   else:
>     noerr.append('Duplication de '+old+' en '+newid+" : OK.")
>     context.zwo_lib.zwo_cpy(repskins,repskins['zwo_temp'],old,newid)
>     context.zwo_lib.zwo_cpy(repskins['zwo_temp'],repskins,newid)
>     repskins[newid].manage_changeProperties(title=new)
26a34,41
> if len(err)>0:
>   print '<br />'.join(err)
>   print '<br />'
>   print '<br />'.join(noerr)
>   print '<a href="../">Retour</a>'
>   return printed
> 
> 
diff -r kzexp_zwook_beta_3/zwo_bo/skin/skins/index_html kzexp_zwook_beta_4/zwo_bo/skin/skins/index_html
48d47
<   hlptxt2=''
50,52c49,50
<     hlptxt=' poplink(\''+help+'\');'
<     hlptxt2='killlink();'
<   rett='<a href="'+url+'" onMouseover="'+hlptxt+'rollit('
---
>     hlptxt=' title="aide"'
>   rett='<a href="'+url+'"'+hlptxt+' onMouseover="rollit('
54c52
<   rett=rett+')" onMouseout="'+hlptxt2+'rollit('
---
>   rett=rett+')" onMouseout="rollit('
diff -r kzexp_zwook_beta_3/zwo_bo/skin/skins/newskinok kzexp_zwook_beta_4/zwo_bo/skin/skins/newskinok
15,16c15,18
< if 'config_zwook' not in roli or 'skin_editor' not in roli:
<   context.REQUEST.RESPONSE.redirect('../../../')
---
> 
> if not 'config_zwook' in roli :
>   if not 'skin_editor' in roli:
>     context.REQUEST.RESPONSE.redirect('../../../')
21d22
<   print context.standard_html_header()
23,24c24
<   print '<a href="./">Retour</a>'
<   print context.standard_html_footer()
---
>   print '<a href="../">Retour</a>'
diff -r kzexp_zwook_beta_3/zwo_bo/skin/skins/renommerok kzexp_zwook_beta_4/zwo_bo/skin/skins/renommerok
23a24,26
> err=[]
> noerr=[]
> 
25,27c28,34
<     old=k
<     new=dico[k]
<     newid=context.zwo_lib.mix_id_zope(new)
---
>   old=k
>   new=dico[k]
>   newid=context.zwo_lib.mix_id_zope(new)
>   if newid in repskins.objectIds():
>     err.append(old+" ne peux être renomer car "+newid+" existe déja.")
>   else:
>     noerr.append(old+" renommer en "+newid+" : OK.")
31a39,45
> if len(err)>0:
>   print '<br />'.join(err)
>   print '<br />'
>   print '<br />'.join(noerr)
>   print '<br /><a href="../">retour</a>'
>   return printed
>   
Only in kzexp_zwook_beta_4/zwo_images/bo: r_rond_dossier.gif
Only in kzexp_zwook_beta_4/zwo_images/bo: rond_dossier.gif
Only in kzexp_zwook_beta_3/zwo_images/modules: forums
diff -r kzexp_zwook_beta_3/zwo_lib/mix_id_zope kzexp_zwook_beta_4/zwo_lib/mix_id_zope
40a41,51
> 
> if idinit!='' and c=="":
>   c="vide"
> 
> if c[0]=='_':
>   c='x'+c
> 
> l=len(c)
> if c[l-1]=='_':
>   c=c+'x'
> 
diff -r kzexp_zwook_beta_3/zwo_lib/standard_html_footer kzexp_zwook_beta_4/zwo_lib/standard_html_footer
106c106
<     ppc.append(' style="color:%s;"' % textcolor)      
---
>       ppc.append(' style="color:%s;"' % textcolor)      
240c240
<   couleurtextetab="#000000"
---
>   couleurtextetab=""
diff -r kzexp_zwook_beta_3/zwo_lib/standard_html_header kzexp_zwook_beta_4/zwo_lib/standard_html_header
218c218
<     ppc.append(' style="color:%s"' % textcolor)      
---
>       ppc.append(' style="color:%s"' % textcolor)      
352c352
<   couleurtextetab="#000000"
---
>   couleurtextetab=""
diff -r kzexp_zwook_beta_3/zwo_lib/standard_html_home kzexp_zwook_beta_4/zwo_lib/standard_html_home
102c102
<   ppc.append(' style="color:%s;"' % textcolor)      
---
>     ppc.append(' style="color:%s;"' % textcolor)      
227c227
<   couleurtextetab="#000000"
---
>   couleurtextetab=""