From klm at zope.com Mon Jan 14 14:56:07 2002 From: klm at zope.com (Ken Manheimer) Date: Sun Aug 10 17:02:05 2008 Subject: [zopeorg-checkins] CVS: Products/ZWiki - Diff.py:1.2 Message-ID: <200201141956.g0EJu7i19632@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZWiki In directory cvs.zope.org:/tmp/cvs-serv19618 Modified Files: Diff.py Log Message: .textDiff(): Comment out application of TextFormatter to wrap long lines. This had the effect of removing all leading whitespace - particularly undesirable in the structured-text context of wiki pages! (I don't see a lot of point to this in the first place, but i didn't actually know why it was there in the first place - i just left it in when adopting simon's stuff. I hope i'm not missing some way it's key...) I also increased the threshold for abbreviated lines to 500 (from 50). ._abbreviateDiffLines(): Changed the default maxlines to 50 (from 5). === Products/ZWiki/Diff.py 1.1 => 1.2 === b = b or self.lasttext(versionsBack=revB) - # wrap (but don't fill or pad) long lines - formatter = TextFormatter.TextFormatter(( - {'width':70, 'fill':0, 'pad':0}, - )) - a=formatter.compose((a,)) - b=formatter.compose((b,)) +## # wrap (but don't fill or pad) long lines +## formatter = TextFormatter.TextFormatter(( +## {'width':70, 'fill':0, 'pad':0}, +## )) +## a=formatter.compose((a,)) +## b=formatter.compose((b,)) a = split(a,'\n') b = split(b,'\n') @@ -87,7 +87,7 @@ r.append('') elif tag == 'insert': r.append('++added:') - r = r + self._abbreviateDiffLines(b[blo:bhi],'',50) + r = r + self._abbreviateDiffLines(b[blo:bhi],'',500) r.append('') elif tag == 'equal': pass @@ -96,7 +96,7 @@ return join(r, '\n')+'\n' - def _abbreviateDiffLines(self,lines,prefix,maxlines=5): + def _abbreviateDiffLines(self,lines,prefix,maxlines=50): output = [] if maxlines and len(lines) > maxlines: extra = len(lines) - maxlines From klm at zope.com Tue Jan 15 14:19:57 2002 From: klm at zope.com (Ken Manheimer) Date: Sun Aug 10 17:02:05 2008 Subject: [zopeorg-checkins] CVS: Products/ZWiki - ZWikiPage.py:1.71 Message-ID: <200201151919.g0FJJvQ27682@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZWiki In directory cvs.zope.org:/tmp/cvs-serv27674 Modified Files: ZWikiPage.py Log Message: Some MTAs apparently don't accept email with the empty "<>" To header address - probably for anti-spam purposes. Anway, we're now setting the To address to that of the sender - my testing shows this is overridden by the explicit mailhost recipients argument, so this should cause no harm... === Products/ZWiki/ZWikiPage.py 1.70 => 1.71 === NOTIFICATION_TEMPLATE = \ """From: "Wikis on %(wiki_host)s for %(who)s" <%(from_email)s> -Sender: %(sender_email)s -To: Wiki notification recipients <> +Sender: <%(sender_email)s> +To: "Wiki %(id)s subscribers" <%(sender_email)s> Subject: Wiki: %(who)s %(qualifier)s %(id)s X-Wiki-URL: %(url)s List-Unsubscribe: %(subscribe_url)s -List-Subscribe: %(subscribe_url)s +List-Subscribe: %(subscribe_url)s%(optional_headers)s Wiki page %(qualifier)s by %(who)s: %(url)s @@ -1433,11 +1433,15 @@ wiki_host = REQUEST.BASE0 if wiki_host[:7] == 'http://': wiki_host = wiki_host[7:] - sender_email = "" + sender_email = "wikis@" + string.split(wiki_host, ':')[0] from_email = (self.notificationFromAddr() or sender_email) subscribe_url = self.absolute_url() + "/subscribeform" + # optional_headers must start with a newline! + optional_headers = ("\nX-Wiki-Notifications-Debug: %s" + % recipients) + userobj = getSecurityManager().getUser() userid = str(userobj) if (userobj is None) or (userid == str(self.acl_users._nobody)): @@ -1458,6 +1462,8 @@ 'delim': SECTION_DELIM, 'text': mailouttext, 'who': who, + 'optional_headers': + optional_headers, } self.MailHost.send(msg, mto=recipients) return None From mj at zope.com Mon Jan 28 14:48:03 2002 From: mj at zope.com (Martijn Pieters) Date: Sun Aug 10 17:02:05 2008 Subject: [zopeorg-checkins] CVS: INSTALL.txt,NONE,1.1 INSTALL.txt,NONE,1.1 Message-ID: <200201281948.g0SJm3B06592@cvs.baymountain.com> Update of /cvs-zopeorg In directory cvs.zope.org:/tmp/cvs-serv6507 Added Files: INSTALL.txt Log Message: Initial installation instructions for a Zope.org sandbox setup. From mj at zope.com Mon Jan 28 16:23:16 2002 From: mj at zope.com (Martijn Pieters) Date: Sun Aug 10 17:02:05 2008 Subject: [zopeorg-checkins] CVS: INSTALL.txt,1.1,1.2 INSTALL.txt,1.1,1.2 Message-ID: <200201282123.g0SLNGX17899@cvs.baymountain.com> Update of /cvs-zopeorg In directory cvs.zope.org:/tmp/cvs-serv17878 Modified Files: INSTALL.txt Log Message: Added Rewriter URL From mj at zope.com Mon Jan 28 16:40:51 2002 From: mj at zope.com (Martijn Pieters) Date: Sun Aug 10 17:02:05 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg - ZopeOrgMembershipTool.py:1.2 Message-ID: <200201282140.g0SLepi26530@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg In directory cvs.zope.org:/tmp/cvs-serv26453 Modified Files: ZopeOrgMembershipTool.py Log Message: Reactivated "Set Start Page" action. === Products/ZopeOrg/ZopeOrgMembershipTool.py 1.1 => 1.2 === -# def listActions( self, info=None ): -# """ Lists actions available to the user. """ -# actions_list = None -# base_list = MembershipTool.listActions( self, info ) or [] + def listActions( self, info=None ): + """ Lists actions available to the user. """ + actions_list = None + base_list = LDAPMembershipTool.listActions( self, info ) or [] -# actions_list = [ ActionInformation( -# id='Set Start Page', -# action=Expression( -# text='string: ${object_url}/setStartPage'), -# condition=Expression('member'), -# permissions=[], -# category='user'), ] + base_list + actions_list = [ ActionInformation( + id='Set Start Page', + action=Expression( + text='string: ${object_url}/setStartPage'), + condition=Expression('member'), + permissions=[], + category='user'), ] + base_list -# return actions_list + return actions_list InitializeClass( ZopeOrgMembershipTool ) From mj at zope.com Mon Jan 28 16:42:50 2002 From: mj at zope.com (Martijn Pieters) Date: Sun Aug 10 17:02:05 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg - ZopeOrgMembershipTool.py:1.3 Message-ID: <200201282142.g0SLgoE27074@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg In directory cvs.zope.org:/tmp/cvs-serv27049 Modified Files: ZopeOrgMembershipTool.py Log Message: Remove obsolete import === Products/ZopeOrg/ZopeOrgMembershipTool.py 1.2 => 1.3 === from Products.CMFCore.CMFCorePermissions import AddPortalContent, View from ZopeOrgPermissions import AnointMaintainer, DemoteMaintainer -import Products.CMFCore.MembershipTool from Products.CMFCore.ActionInformation import ActionInformation from Products.CMFCore.Expression import Expression from Products.CMFCore.PortalFolder import manage_addPortalFolder From mj at zope.com Tue Jan 29 10:35:05 2002 From: mj at zope.com (Martijn Pieters) Date: Sun Aug 10 17:02:05 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg - SoftwareProduct.py:1.25 Message-ID: <200201291535.g0TFZ5J28185@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg In directory cvs.zope.org:/tmp/cvs-serv28081 Modified Files: SoftwareProduct.py Log Message: Fix Software Product === Products/ZopeOrg/SoftwareProduct.py 1.24 => 1.25 === return -1 * cmp(a.getVersionNormalized(), b.getVersionNormalized()) - def __call__(self): - ''' - Invokes the default view. - ''' - view = self._getDefaultView() - if getattr(aq_base(view), 'isDocTemp', 0): - return apply(view, (self, self.REQUEST)) - else: - return view() - - index_html = None # This special value informs ZPublisher to use __call__ - - security.declareProtected(CMFCorePermissions.View, 'view') - def view(self): - ''' - Returns the default view even if index_html is overridden. - ''' - return self() - - # Must override these because of inheritance structure... WAAA def objectItems(self, spec=None): """ instead of SimpleItem.objectItems...""" From mj at zope.com Tue Jan 29 10:35:05 2002 From: mj at zope.com (Martijn Pieters) Date: Sun Aug 10 17:02:05 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg/skins/zopeorg - swproduct_view.pt:1.10 Message-ID: <200201291535.g0TFZ5528187@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg/skins/zopeorg In directory cvs.zope.org:/tmp/cvs-serv28081/skins/zopeorg Modified Files: swproduct_view.pt Log Message: Fix Software Product === Products/ZopeOrg/skins/zopeorg/swproduct_view.pt 1.9 => 1.10 ===

-
Update of /cvs-zopeorg/Products/ZopeOrg/skins/zopeorg In directory cvs.zope.org:/tmp/cvs-serv7727/skins/zopeorg Modified Files: main_template.pt Log Message: Fix typo in td attribute name === Products/ZopeOrg/skins/zopeorg/main_template.pt 1.18 => 1.19 === -
+
From mj at zope.com Tue Jan 29 12:15:56 2002 From: mj at zope.com (Martijn Pieters) Date: Sun Aug 10 17:02:06 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg/skeleton/News - local_html.pt:1.11 Message-ID: <200201291715.g0THFue05396@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg/skeleton/News In directory cvs.zope.org:/tmp/cvs-serv4441/skeleton/News Modified Files: local_html.pt Log Message: Fix the news page; TitleOrId is now a Python Script that needs to explicitely be told not to call Title and getID; they are catalog brains attributes in this instance. === Products/ZopeOrg/skeleton/News/local_html.pt 1.10 => 1.11 === From mj at zope.com Tue Jan 29 15:00:18 2002 From: mj at zope.com (Martijn Pieters) Date: Sun Aug 10 17:02:06 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg/skins/software_product - swrelease_view.dtml:1.2 Message-ID: <200201292000.g0TK0IM07243@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg/skins/software_product In directory cvs.zope.org:/tmp/cvs-serv7192/skins/software_product Modified Files: swrelease_view.dtml Log Message: Also correct the DTML version for completeness. === Products/ZopeOrg/skins/software_product/swrelease_view.dtml 1.1 => 1.2 === - + - + From mj at zope.com Tue Jan 29 15:09:16 2002 From: mj at zope.com (Martijn Pieters) Date: Sun Aug 10 17:02:06 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg/skins/zopeorg - swrelease_view.pt:1.4 Message-ID: <200201292009.g0TK9Gh10081@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg/skins/zopeorg In directory cvs.zope.org:/tmp/cvs-serv9934/skins/zopeorg Modified Files: swrelease_view.pt Log Message: Fix all views this time. === Products/ZopeOrg/skins/zopeorg/swrelease_view.pt 1.3 => 1.4 ===
- +

Title + tal:content="python:zopeNews.TitleOrId(dontCall=1)" class="bTitle">Title
Description

 - + Update of /cvs-zopeorg/Products/ZopeOrg/skins/zopeorg In directory cvs.zope.org:/tmp/cvs-serv5923/skins/zopeorg Modified Files: swproduct_view.pt Log Message: Fix date display on Software Products to be more ISO like. === Products/ZopeOrg/skins/zopeorg/swproduct_view.pt 1.10 => 1.11 === + tal:content="python:rel.creation_date.strftime('%Y/%m/%d %H:%M:%S')"/>
/download"> KB /viewMD5">MD5 From mj at zope.com Tue Jan 29 15:09:16 2002 From: mj at zope.com (Martijn Pieters) Date: Sun Aug 10 17:02:06 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg/skins/software_product - swproduct_view.dtml:1.2 Message-ID: <200201292009.g0TK9Gq10082@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg/skins/software_product In directory cvs.zope.org:/tmp/cvs-serv9934/skins/software_product Modified Files: swproduct_view.dtml Log Message: Fix all views this time. === Products/ZopeOrg/skins/software_product/swproduct_view.dtml 1.1 => 1.2 ===
/view_swrelease">
- + From mj at zope.com Tue Jan 29 15:23:23 2002 From: mj at zope.com (Martijn Pieters) Date: Sun Aug 10 17:02:06 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg/skins/zopeorg - swproduct_view.pt:1.12 Message-ID: <200201292023.g0TKNNj14714@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg/skins/zopeorg In directory cvs.zope.org:/tmp/cvs-serv14694/zopeorg Modified Files: swproduct_view.pt Log Message: Fix Software Release batching. === Products/ZopeOrg/skins/zopeorg/swproduct_view.pt 1.11 => 1.12 === + tal:attributes="href python:'%s?b_start=%s'% (request['URL'],p.first)"> + tal:attributes="href python:'%s?b_start=%s'% (request['URL'],batch.end)"> From mj at zope.com Tue Jan 29 16:27:55 2002 From: mj at zope.com (Martijn Pieters) Date: Sun Aug 10 17:02:06 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg/skins/zopeorg_membership - mail_password_template.dtml:1.2 maintainer_invitation_template.dtml:1.3 Message-ID: <200201292127.g0TLRtx05871@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg/skins/zopeorg_membership In directory cvs.zope.org:/tmp/cvs-serv5804/skins/zopeorg_membership Modified Files: mail_password_template.dtml maintainer_invitation_template.dtml Log Message: Fix member email lookup for emai ltemplates. === Products/ZopeOrg/skins/zopeorg_membership/mail_password_template.dtml 1.1 => 1.2 === From: "&dtml-email_from_name;" <&dtml-email_from_address;> -To: +To: Errors-to: <&dtml-email_from_address;> Subject: Membership reminder === Products/ZopeOrg/skins/zopeorg_membership/maintainer_invitation_template.dtml 1.2 => 1.3 === From: "&dtml-email_from_name;" <&dtml-email_from_address;> -To: +To: Errors-to: <&dtml-email_from_address;> Subject: You are invited to become a Maintainer on zope.org From mj at zope.com Tue Jan 29 16:30:05 2002 From: mj at zope.com (Martijn Pieters) Date: Sun Aug 10 17:02:06 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg/skins/zopeorg_membership - mail_password_template.dtml:1.3 Message-ID: <200201292130.g0TLU5Y07017@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg/skins/zopeorg_membership In directory cvs.zope.org:/tmp/cvs-serv6375/skins/zopeorg_membership Modified Files: mail_password_template.dtml Log Message: Whoops, typo === Products/ZopeOrg/skins/zopeorg_membership/mail_password_template.dtml 1.2 => 1.3 === From: "&dtml-email_from_name;" <&dtml-email_from_address;> -To: +To: Errors-to: <&dtml-email_from_address;> Subject: Membership reminder From mj at zope.com Thu Jan 31 14:43:06 2002 From: mj at zope.com (Martijn Pieters) Date: Sun Aug 10 17:02:06 2008 Subject: [zopeorg-checkins] CVS: Products/PythonJobs/skins/pyjobs - job_edit_form.pt:1.2 job_view.pt:1.2 jobsfolder_add_form.pt:1.2 Message-ID: <200201311943.g0VJh6R18073@cvs.baymountain.com> Update of /cvs-zopeorg/Products/PythonJobs/skins/pyjobs In directory cvs.zope.org:/tmp/cvs-serv17939/skins/pyjobs Modified Files: job_edit_form.pt job_view.pt jobsfolder_add_form.pt Log Message: Fix job previews. === Products/PythonJobs/skins/pyjobs/job_edit_form.pt 1.1.1.1 => 1.2 ===
-
+

=== Products/PythonJobs/skins/pyjobs/job_view.pt 1.1.1.1 => 1.2 === " > -

+