ECHO_content/ECHO_collection.py - diff

Return to ECHO_collection.py CVS log

Up to [Repository] / ECHO_content

Diff for /ECHO_content/ECHO_collection.py between versions 1.290 and 1.292

version 1.290, 2007/07/19 14:13:13	version 1.292, 2007/09/18 14:13:49
Line 2016 def manage_addECHO_linkForm(self):	Line 2016 def manage_addECHO_linkForm(self):
return pt()	return pt()


def manage_addECHO_link(self,id,title,label,description="",contentType="",responsible="",link="",weight="",coords=[],credits=None,RESPONSE=None):	def manage_addECHO_link(self,id,title,label,description="",contentType="",responsible="",link="",weight="",coords=[],credits=None,linkType="external",RESPONSE=None):
"""Add an external Link"""	"""Add an external Link"""

newObj=ECHO_link(id,link,title,label,description,contentType,responsible,credits,weight,coords)	newObj=ECHO_link(id,link,title,label,description,contentType,responsible,credits,weight,coords,linkType)

self._setObject(id,newObj)	self._setObject(id,newObj)

Line 3755 class ECHO_root(Folder,Persistent,Implic	Line 3755 class ECHO_root(Folder,Persistent,Implic

def formatAscii(self,str,url=None):	def formatAscii(self,str,url=None):
"""ersetze ascii umbrueche durch <br>"""	"""ersetze ascii umbrueche durch <br>"""
#url=None
	if not str:
	return ""

if url:	if url:

retStr=""	retStr=""
Line 3767 class ECHO_root(Folder,Persistent,Implic	Line 3770 class ECHO_root(Folder,Persistent,Implic
retStr+="""<a href="%s">%s</a><br/>"""%(strUrl,word)	retStr+="""<a href="%s">%s</a><br/>"""%(strUrl,word)
str=retStr	str=retStr
if str:	if str:
return re.sub(r"[\n]","<br/>",str)	str = re.sub(r"[\n]","<br/>",str)
	return unicodify(str)
else:	else:
return ""	return u""

link2html=vlp_xmlhelpers.link2html	link2html=vlp_xmlhelpers.link2html
related2html=vlp_xmlhelpers.related2html	related2html=vlp_xmlhelpers.related2html

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.290
changed lines
	Added in v.1.292