diff -r kzexp_zwook_beta_2/zwo_bo/edit/dupliquer_elements kzexp_zwook_beta_3/zwo_bo/edit/dupliquer_elements 42a43,60 > inrep=rep.objectIds() > inrepmem=repuser['mem_cut'].objectIds() > def returnnewid(oldid): > i=2 > newid=oldid+'_2' > while newid in inrep: > i=i+1 > newid=oldid+'_'+str(i) > return newid > > def returnnewidmem(oldid): > i=2 > newid=oldid+'_2' > while newid in inrepmem: > i=i+1 > newid=oldid+'_'+str(i) > return newid > 48c66,67 < html=html+'' --- > newid=returnnewid(rep[i].title_or_id()) > html=html+'' 57c76,77 < html=html+'' --- > newid=returnnewid(rep[i].title_or_id()) > html=html+'' 65c85,86 < html=html+'' --- > newid=returnnewidmem(repuser['mem_cut'][i].title_or_id()) > html=html+'' diff -r kzexp_zwook_beta_2/zwo_bo/edit/dupliquerok kzexp_zwook_beta_3/zwo_bo/edit/dupliquerok 22a23,24 > erreurs=[] > 33,35c35,40 < context.zwo_lib.zwo_cpy(rep,rep['zwo_temp'],old,newid) < context.zwo_lib.zwo_cpy(rep['zwo_temp'],rep,newid) < rep[newid].manage_changeProperties(title=new) --- > if not newid in rep.objectIds(): > context.zwo_lib.zwo_cpy(rep,rep['zwo_temp'],old,newid) > context.zwo_lib.zwo_cpy(rep['zwo_temp'],rep,newid) > rep[newid].manage_changeProperties(title=new) > else: > erreurs.append("Duplication impossible : "+newid+" existe déja") 40,42c45,50 < context.zwo_lib.zwo_cpy(repusercut,repusercut['zwo_temp'],old,newid) < context.zwo_lib.zwo_cpy(repusercut['zwo_temp'],repusercut,newid) < repusercut[newid].manage_changeProperties(title=new) --- > if not newid in repusercut.objectIds(): > context.zwo_lib.zwo_cpy(repusercut,repusercut['zwo_temp'],old,newid) > context.zwo_lib.zwo_cpy(repusercut['zwo_temp'],repusercut,newid) > repusercut[newid].manage_changeProperties(title=new) > else: > erreurs.append("Duplication impossible : "+newid+" existe déja") 58,60c66,71 < context.zwo_lib.zwo_cpy(rep,rep['zwo_temp'],old,newid) < context.zwo_lib.zwo_cpy(rep['zwo_temp'],rep,newid) < rep[newid].manage_changeProperties(title=new) --- > if not newid in rep.objectIds(): > context.zwo_lib.zwo_cpy(rep,rep['zwo_temp'],old,newid) > context.zwo_lib.zwo_cpy(rep['zwo_temp'],rep,newid) > rep[newid].manage_changeProperties(title=new) > else: > erreurs.append("Duplication impossible : "+newid+" existe déja") 63a75,82 > > if len(erreurs)>0: > print "Certaines duplications n'ont pu être effectués :
" > for i in erreurs: > print str(i)+'
' > print 'Retour' > return printed > diff -r kzexp_zwook_beta_2/zwo_bo/edit/index_html kzexp_zwook_beta_3/zwo_bo/edit/index_html 551,557c551,558 < eli=el_obj.getId() < el=el_obj.title_or_id() < type=el_obj.element < urlimgtyp="/zwo_images/bo/iconnu.gif" < if type in context.zwo_modules.objectIds(): < if 'icone.png' in context.zwo_modules[type].objectIds(): < urlimgtyp="/zwo_modules/"+type+"/icone.png" --- > if el_obj.hasProperty("element"): > eli=el_obj.getId() > el=el_obj.title_or_id() > type=el_obj.element > urlimgtyp="/zwo_images/bo/iconnu.gif" > if type in context.zwo_modules.objectIds(): > if 'icone.png' in context.zwo_modules[type].objectIds(): > urlimgtyp="/zwo_modules/"+type+"/icone.png" 559c560 < html=html+'' --- > html=html+'' 561,562c562,563 < html=html+'' < html=html+' '+el+'' --- > html=html+'' > html=html+' '+el+'' diff -r kzexp_zwook_beta_2/zwo_bo/skin/dupliquer_elements kzexp_zwook_beta_3/zwo_bo/skin/dupliquer_elements 39a40,56 > inrep=rep.objectIds() > inrepmem=repuser['mem_cut'].objectIds() > def returnnewid(oldid): > i=2 > newid=oldid+'_2' > while newid in inrep: > i=i+1 > newid=oldid+'_'+str(i) > return newid > > def returnnewidmem(oldid): > i=2 > newid=oldid+'_2' > while newid in inrepmem: > i=i+1 > newid=oldid+'_'+str(i) > return newid 55c72,73 < html=html+'' --- > newid=returnnewid(rep[i].title_or_id()) > html=html+'' 64c82,83 < html=html+'' --- > newid=returnnewid(rep[i].title_or_id()) > html=html+'' 72c91,92 < html=html+'' --- > newid=returnnewidmem(repuser['mem_cut'][i].title_or_id()) > html=html+'' diff -r kzexp_zwook_beta_2/zwo_bo/skin/dupliquerok kzexp_zwook_beta_3/zwo_bo/skin/dupliquerok 39a40,41 > erreurs=[] > 50,52c52,57 < context.zwo_lib.zwo_cpy(rep,rep['zwo_temp'],old,newid) < context.zwo_lib.zwo_cpy(rep['zwo_temp'],rep,newid) < rep[newid].manage_changeProperties(title=new) --- > if not newid in rep.objectIds(): > context.zwo_lib.zwo_cpy(rep,rep['zwo_temp'],old,newid) > context.zwo_lib.zwo_cpy(rep['zwo_temp'],rep,newid) > rep[newid].manage_changeProperties(title=new) > else: > erreurs.append("Duplication impossible : "+newid+" existe déja") 57,60c62,67 < context.zwo_lib.zwo_cpy(repusercut,repusercut['zwo_temp'],old,newid) < context.zwo_lib.zwo_cpy(repusercut['zwo_temp'],repusercut,newid) < repusercut[newid].manage_changeProperties(title=new) < --- > if not newid in repusercut.objectIds(): > context.zwo_lib.zwo_cpy(repusercut,repusercut['zwo_temp'],old,newid) > context.zwo_lib.zwo_cpy(repusercut['zwo_temp'],repusercut,newid) > repusercut[newid].manage_changeProperties(title=new) > else: > erreurs.append("Duplication impossible : "+newid+" existe déja") 74,76c81,87 < context.zwo_lib.zwo_cpy(rep,rep['zwo_temp'],old,newid) < context.zwo_lib.zwo_cpy(rep['zwo_temp'],rep,newid) < rep[newid].manage_changeProperties(title=new) --- > if not newid in rep.objectIds(): > context.zwo_lib.zwo_cpy(rep,rep['zwo_temp'],old,newid) > context.zwo_lib.zwo_cpy(rep['zwo_temp'],rep,newid) > rep[newid].manage_changeProperties(title=new) > else: > erreurs.append("Duplication impossible : "+newid+" existe déja") > 79a91,98 > > if len(erreurs)>0: > print "Certaines duplications n'ont pu être effectués :
" > for i in erreurs: > print str(i)+'
' > print 'Retour' > return printed > diff -r kzexp_zwook_beta_2/zwo_bo/skin/index_html kzexp_zwook_beta_3/zwo_bo/skin/index_html 15,18c15,19 < """ < if zwu[-6:]=='/zwook': < zwu=zwu[:-5] < """ --- > > if len(string.split(mem['url'],zwu))<2: > context.REQUEST.RESPONSE.redirect(mem['zwo_url']+'/zwo_bo/skin'); > return > diff -r kzexp_zwook_beta_2/zwo_bo/skin/list_element kzexp_zwook_beta_3/zwo_bo/skin/list_element 16c16,26 < if listrepurl[2]=='skin': --- > > idskin="" > flag=0 > for i in listrepurl: > if flag==1: > idskin=i > flag=0 > if i=='skins': > flag=1 > > if idskin=='': 18,19c28 < else: < idskin=listrepurl[3] --- > diff -r kzexp_zwook_beta_2/zwo_lib/standard_html_footer kzexp_zwook_beta_3/zwo_lib/standard_html_footer 106,107c106,107 < if textcolor: < ppc.append(' style="color:%s"' % textcolor) --- > ppc.append(' style="color:%s;"' % textcolor) > 112c112 < aff.append('.Skinbordure%s{border: %s px solid %s;}' % (idcase,pcase,pc['couleurcadre'])) --- > aff.append('.Skinbordure%s{border:%spx solid %s;}' % (idcase,pcase,pc['couleurcadre'])) 121,124c121 < #aff.append('\n\n \n' % (afppc,afpccc,margeint,afppc,afppcc)) < aff.append('\n' % (afppc,afppcc,afpccc)) < aff.append('
') < aff.append('\n' % (afppc,afppcc)) --- > aff.append('\n
\n \n' ) 136,137c133,134 < #if margeint<>'0': < # aff.append('\n \n
') --- > if margeint<>'0': > aff.append('\n \n') 177c174 < except Exception, ex_txt: --- > except Exception, e_txt: 243c240 < couleurtextetab=None --- > couleurtextetab="#000000" diff -r kzexp_zwook_beta_2/zwo_lib/standard_html_header kzexp_zwook_beta_3/zwo_lib/standard_html_header 26a27 > 122c123 < js="""