Menu
▾
▴
[Collective-checkins] r36593 - in PloneGazette/branches/complexity-reduction: . i18n skins/PloneGazette
|
From: mj <svn...@pl...> - 2007-01-31 15:53:42
|
Author: mj
Date: Wed Jan 31 15:53:22 2007
New Revision: 36593
Removed:
PloneGazette/branches/complexity-reduction/skins/PloneGazette/testLynx.pt
Modified:
PloneGazette/branches/complexity-reduction/Newsletter.py
PloneGazette/branches/complexity-reduction/NewsletterTheme.py
PloneGazette/branches/complexity-reduction/PNLUtils.py
PloneGazette/branches/complexity-reduction/README.txt
PloneGazette/branches/complexity-reduction/i18n/plonegazette.pot
PloneGazette/branches/complexity-reduction/i18n/plonegazette_da.po
PloneGazette/branches/complexity-reduction/i18n/plonegazette_de.po
PloneGazette/branches/complexity-reduction/i18n/plonegazette_es.po
PloneGazette/branches/complexity-reduction/i18n/plonegazette_fr.po
PloneGazette/branches/complexity-reduction/i18n/plonegazette_it.po
PloneGazette/branches/complexity-reduction/i18n/plonegazette_nl.po
PloneGazette/branches/complexity-reduction/i18n/plonegazette_pt-br.po
PloneGazette/branches/complexity-reduction/i18n/plonegazette_ro.po
PloneGazette/branches/complexity-reduction/skins/PloneGazette/NewsletterTheme_edit.cpy
PloneGazette/branches/complexity-reduction/skins/PloneGazette/NewsletterTheme_editForm.cpt
PloneGazette/branches/complexity-reduction/skins/PloneGazette/Newsletter_sendForm.pt
PloneGazette/branches/complexity-reduction/skins/PloneGazette/Newsletter_testForm.pt
PloneGazette/branches/complexity-reduction/skins/PloneGazette/validate_newslettertheme_edit.vpy
Log:
Rely on portal_transforms to do the html-to-text transformation
Modified: PloneGazette/branches/complexity-reduction/Newsletter.py
==============================================================================
--- PloneGazette/branches/complexity-reduction/Newsletter.py (original)
+++ PloneGazette/branches/complexity-reduction/Newsletter.py Wed Jan 31 15:53:22 2007
@@ -125,7 +125,6 @@
'name': 'Send',
'action': 'string:${object_url}/Newsletter_sendForm',
'permissions': (ChangeNewsletter,),
- 'condition': 'python: object.canBeSent()', # Requires Plone 2.x
'category': 'object'
},
{
@@ -275,78 +274,44 @@
###################
-
- security.declarePublic('canBeSent')
- def canBeSent(self):
- """Because of Lynx (can't provide owner authentication)
- we can only send publicly available newsletters"""
-
- if nobody.has_permission('View', self):
- return 1
- return 0
+ security.declarePublic('renderTextHTML')
+ def renderTextHTML(self, html=True, footer_url=None):
+ """Makes the HTML part for MUA of the newsletter
- security.declarePublic('testMUAHtml')
- def testMUAHtml(self, REQUEST=None):
- """Makes the HTML part for MUA of the newsletter"""
+ """
- if not REQUEST:
- REQUEST = self.REQUEST
theme = self.getTheme()
template = theme.getRenderTemplate()
newsletterFooter = theme.newsletterFooter
- if newsletterFooter.find('%(url)s') != -1:
- newsletterFooter = theme.newsletterFooter.replace('%(url)s', theme.absolute_url() + '/xxx')
+ if '%(url)s' in newsletterFooter and footer_url is not None:
+ newsletterFooter = newsletterFooter.replace('%(url)s', footer_url)
- # Modification par jerome : customisation de Newsletter_testForm pour ajouter une query_string
- # quand on veut avoir la prévisualisation en html.
- if REQUEST.has_key('html'):
- query_html = 1
- else:
- query_html = 0
- data = template(id=self.id, body=self.cooked_text, description=self.description, newsletterFooter=newsletterFooter, html=query_html, title=self.title, date=self.dateEmitted)
- REQUEST.RESPONSE.setHeader('Content-Type', 'text/html; charset=%s' % self.ploneCharset())
+ data = template(id=self.id, body=self.cooked_text,
+ description=self.description,
+ newsletterFooter=newsletterFooter, html=html,
+ title=self.title, date=self.dateEmitted)
return data
- def _runLynx(self, url, charset = None):
- """Run Lynx on an url"""
- # get the good lynx command
- theme = self.getTheme()
- lynxcommand = theme.lynxCommand
- if not lynxcommand:
- lynxcommand = LYNX_COMMAND
- # get the good lynx options
- try:
- lynxoptions = theme.lynxOptions
- except:
- lynxoptions = None
- if not lynxoptions:
- lynxoptions = LYNX_OPTIONS
-
- if (charset) and ("lynx" in lynxcommand):
- lynxoptions += " -display_charset=%s " % charset
-
- return commands.getstatusoutput('%s %s %s' % (lynxcommand, lynxoptions, url))
-
- security.declarePublic('testMUATextPlain')
- def testMUATextPlain(self, REQUEST=None):
+ security.declarePublic('renderTextPlain')
+ def renderTextPlain(self, footer_url=None):
"""Makes the text/plain part for MUA of the newsletter"""
- if not REQUEST:
- REQUEST = self.REQUEST
- nlUrl = self.absolute_url() + '/testMUAHtml'
- charset = self.ploneCharset()
-
- status, output = self._runLynx(charset = charset, url = nlUrl)
- REQUEST.RESPONSE.setHeader('Content-Type', 'text/plain; charset=%s' % charset)
+ html = self.renderTextHTML(html=False, footer_url)
+
+ # Convert to text/html, preferring lynx_dump if available
+ transform_tool = getToolByName(self, 'portal_transforms')
+ lynxAvailable = 'lynx_dump' in transform_tool.objectIds()
+ if lynxAvailable:
+ text = transform_tool('lynx_dump', html)
+ else:
+ text = transform_tool.convertToData('text/plain', html)
- return output
+ return text
security.declareProtected(ChangeNewsletter, 'testSendToMe')
def testSendToMe(self, REQUEST=None):
"""Sends HTML/mixed and plain text newsletter to the author"""
-
- translate = self.translate
- if not REQUEST:
+ if REQUEST is None:
REQUEST = self.REQUEST
theme = self.getTheme()
email = theme.testEmail
@@ -373,35 +338,6 @@
## Sending newsletter ##
########################
- security.declarePublic('getHTMLTemplate')
- def getHTMLTemplate(self, html=None, REQUEST=None):
- """Returns a MIME mixed message suitable to a dict formatter"""
-
- if not REQUEST:
- REQUEST = self.REQUEST
- theme = self.getTheme()
- template = theme.getRenderTemplate()
- newsletterFooter = theme.newsletterFooter
- if html:
- query_html = 1
- else:
- query_html = 0
-
- text = self.urlTransform(self.cooked_text)
- htmlTpl = template(id=self.id, body=text, description=self.description, newsletterFooter=newsletterFooter, html=query_html, title=self.title, date=self.dateEmitted)
- REQUEST.RESPONSE.setHeader('Content-Type', 'text/html; charset=%s' % self.ploneCharset())
- return escPercent(htmlTpl)
-
- security.declarePublic('getPlaintextTemplate')
- def getPlaintextTemplate(self):
- """Returns a MIME mail plain text message suitable to a dict formatter"""
-
- nlUrl = self.absolute_url() + '/getHTMLTemplate'
- charset = self.ploneCharset()
-
- status, output = self._runLynx(url = nlUrl, charset = charset)
- return escPercent(output)
-
security.declareProtected(ChangeNewsletter, 'sendToRecipients')
def sendToRecipients(self, recipients):
"""Send the newsletter to a list of recipients
@@ -411,12 +347,9 @@
format is 'HTML' to receive HTML/mixed mail
editurl is the user preference URL"""
- htmlTpl = self.getHTMLTemplate(html='1')
- if htmlTpl.find('%(url)s') != -1:
- hasurl = 1
- else:
- hasurl = 0
- plaintextTpl = self.getPlaintextTemplate()
+ htmlTpl = escPercent(self.renderTextHTML())
+ hasurl = '%(url)s' in htmlTpl
+ plaintextTpl = self.renderTextPlain()
theme = self.getTheme()
mailFrom = theme.authorEmail
charset = self.ploneCharset()
Modified: PloneGazette/branches/complexity-reduction/NewsletterTheme.py
==============================================================================
--- PloneGazette/branches/complexity-reduction/NewsletterTheme.py (original)
+++ PloneGazette/branches/complexity-reduction/NewsletterTheme.py Wed Jan 31 15:53:22 2007
@@ -204,8 +204,6 @@
self._v_renderTemplate = None
self.extraRecipients = ''
self._v_extraRecipients = None
- self.lynxCommand = ''
- self.lynxOptions = ''
self.subscriber_folder_id = ''
return
@@ -236,7 +234,7 @@
security.declareProtected(ChangeNewsletterTheme, 'edit')
def edit(self, title='', default_format='', testEmail='', authorEmail='', replyto='',
activationMailSubject='', activationMailTemplate='', newsletterFooter='', notify=False,
- renderTemplate='', extraRecipients='', lynxCommand='', subscriber_folder_id='', lynxOptions = ''):
+ renderTemplate='', extraRecipients='', subscriber_folder_id=''):
"""Changes values"""
self.title = title.strip()
@@ -252,8 +250,6 @@
self.extraRecipients = extraRecipients.strip()
dummy = self.getRenderTemplate(recompile=1)
dummy = self.getExtraRecipients(recompile=1)
- self.lynxCommand = lynxCommand
- self.lynxOptions = lynxOptions
self.reindexObject()
self.subscriber_folder_id = subscriber_folder_id
return
@@ -466,20 +462,6 @@
return errors
return
- def checkLynxCommandFromEditForm(self, lynxCommand, lynxOptions, state=None, errors=None):
- translate = self.translate
- if not self.checkLynx(command=lynxCommand, options=lynxOptions):
- msg = translate('Please ask the system administrator the command that runs Lynx', domain='plonegazette')
- if errors is not None:
- errors['lynxCommand'] = msg
- if state is not None:
- state.setError('lynxCommand', msg)
- if state is not None:
- return state
- elif errors is not None:
- return errors
- return
-
##############
## Utilities #
##############
@@ -509,28 +491,6 @@
return 0
- security.declarePublic('checkLynx')
- def checkLynx(self, command='', options=''):
- """Guess if the above "LYNX_COMMAND" is valid
- returns True if valid"""
-
- if not command:
- command = self.lynxCommand
- if not command:
- command = LYNX_COMMAND
- try:
- if not options:
- options = self.lynxOptions
- except:
- pass
- if not options:
- options = LYNX_OPTIONS
- command = command + " " + options + " " + self.absolute_url() + "/../testLynx"
- status, output = commands.getstatusoutput(command)
- if status:
- return False
- return "Lynx test OK" in output
-
security.declareProtected(ChangeNewsletterTheme, 'getSmtp')
def getSmtp(self):
"""Returns a usable SMTP server"""
Modified: PloneGazette/branches/complexity-reduction/PNLUtils.py
==============================================================================
--- PloneGazette/branches/complexity-reduction/PNLUtils.py (original)
+++ PloneGazette/branches/complexity-reduction/PNLUtils.py Wed Jan 31 15:53:22 2007
@@ -22,14 +22,6 @@
global _mailAddrRx
return _mailAddrRx.match(someAddr.strip()) != None
-# Shell command that runs Lynx. "lynx" may be enough in most Unix systems.
-# Zope/Windows users may use something like "C:\\Program Files\\lynx\\lynx.exe" or "C:\\Progra~1\lynx\lynx.bat"
-# depending on their installation.
-
-LYNX_COMMAND = "lynx"
-
-LYNX_OPTIONS = "-nolist -dump"
-
from AccessControl import SpecialUsers
def ownerOfObject(obj):
Modified: PloneGazette/branches/complexity-reduction/README.txt
==============================================================================
--- PloneGazette/branches/complexity-reduction/README.txt (original)
+++ PloneGazette/branches/complexity-reduction/README.txt Wed Jan 31 15:53:22 2007
@@ -8,10 +8,9 @@
o Archetypes 1.2.5 or later
- o Lynx must be installed on your system. You may change the value of
- "LYNX_COMMAND" in the module "PNLUtils.py" to fit your system. This
- has been tested with Lynx 2.8.5 and may or may not work with earlier
- versions. http://lynx.isc.org/release
+ o PortalTransforms is used to convert HTML newsletters to their plaintext
+ equivalents. For best results, ensure that the lynx_dump transform is
+ available.
o MaildropHost (optional) : this product is highly recommanded for
mass mailing. http://www.dataflake.org/software/maildrophost
@@ -93,16 +92,6 @@
o PNL Add Subscriber, PNL Change Subscriber
- FAQ :
-
- - Lynx and Windows : If Lynx is installed inside "Program Files"
- directory, the command "C:\Program Files\lynx\lynx.bat" will not
- work. In this case, replace it by "C:\Progra~1\lynx\lynx.bat"
- (thanks to Graeme for this issue ;-) ). If it is not working,
- edit the "lynx.bat" file and replace "%HOME%" with the absolute
- lynx installed path, "C:\Progra~1\lynx" for example (many thanks
- to Xzav that fixed this bug).
-
More informations :
You will find more informations on zope village website :
Modified: PloneGazette/branches/complexity-reduction/i18n/plonegazette.pot
==============================================================================
--- PloneGazette/branches/complexity-reduction/i18n/plonegazette.pot (original)
+++ PloneGazette/branches/complexity-reduction/i18n/plonegazette.pot Wed Jan 31 15:53:22 2007
@@ -160,32 +160,6 @@
msgid "help_extraRecipients"
msgstr ""
-# <label i18n:translate="label_lynxCommand">Lynx shell command</label>
-msgid "label_lynxCommand"
-msgstr ""
-
-# <div class="formHelp"
-# i18n:translate="help_lynxCommand">
-# Enter the system command that runs Lynx.<br />
-# If this field is empty, we assume that "lynx" is fine (this is ok for most Unix).<br />
-# Otherwise, ask the system administrator of this server.
-# </div>
-msgid "help_lynxCommand"
-msgstr ""
-
-# <label i18n:translate="label_lynxOptions">Lynx options</label>
-msgid "label_lynxOptions"
-msgstr ""
-
-# <div i18n:translate="help_lynxOptions"
-# class="formHelp">
-# Enter options to give to Lynx (or other browser) to generate plain text output.<br />
-# If this field is empty, we assume that "-nolist -dump" is fine (this is ok for most Unix).<br />
-# Otherwise, ask the system administrator of this server.
-# </div>
-msgid "help_lynxOptions"
-msgstr ""
-
# <span i18n:translate="" tal:content="format" />
msgid "HTML"
msgstr ""
@@ -311,13 +285,6 @@
msgid "preview_plaintext_link"
msgstr ""
-# <p tal:condition="not:canbesent"
-# i18n:translate="newsletter_test_warning_message">
-# You can't test or send this newsletter because it's not publicly available. Change its status for this.
-# </p>
-msgid "newsletter_test_warning_message"
-msgstr ""
-
##############################################################
##
## Newsletter
@@ -405,13 +372,6 @@
msgid "heading_send_newsletter"
msgstr ""
-# <p tal:condition="not:canbesent"
-# i18n:translate="send_newsletter_warning_message">
-# <b>WARNING</b> : This newsletter should be publicly available before sending it !
-# </p>
-msgid "send_newsletter_warning_message"
-msgstr ""
-
# <span tal:omit-tag="" i18n:translate="">You're about to send this newsletter to</span>
msgid "You're about to send this newsletter to"
msgstr ""
@@ -690,9 +650,6 @@
msgid "TALES compilation error: "
msgstr ""
-msgid "Please ask the system administrator the command that runs Lynx"
-msgstr ""
-
msgid "You must first create a large plone folder"
msgstr ""
Modified: PloneGazette/branches/complexity-reduction/i18n/plonegazette_da.po
==============================================================================
--- PloneGazette/branches/complexity-reduction/i18n/plonegazette_da.po (original)
+++ PloneGazette/branches/complexity-reduction/i18n/plonegazette_da.po Wed Jan 31 15:53:22 2007
@@ -138,19 +138,6 @@
msgid "help_extraRecipients"
msgstr "Skriv et TALES-udtryk, der finder yderligere modtagere af nyhedsbrevet.<br /> Hvis du ikke ved, hvad et TALES-udtryk er for noget, kan du bare lade v med at udfylde feltet.<br /> Vien skal v i en Python-liste af <b>(email, html, editurl)</b> tuples. <b>html</b> skal have vien 1 eller 0 (ren tekst i det tilfe). <b>editurl</b> is en URL ptedet, hvor abonnenterne kan re deres indstillinger.<br /> <b>Bem:</b> Brug et udtryk som nocall:here/myTemplate"
-# <label i18n:translate="label_lynxCommand">Lynx shell command</label>
-msgid "label_lynxCommand"
-msgstr "Lynxkommando"
-
-# <div class="formHelp"
-# i18n:translate="help_lynxCommand">
-# Enter the system command that runs Lynx.<br />
-# If this field is empty, we assume that "lynx" is fine (this is ok for most Unix).<br />
-# Otherwise, ask the system administrator of this server.
-# </div>
-msgid "help_lynxCommand"
-msgstr "Skriv den systemkommando, der starter programmer Lynx.<br />Hvis feltet er tomt, bruger systemet lynx (det virker som regel).<br /> Ellers mu spsystemadministratoren."
-
# <span i18n:translate="" tal:content="format" />
msgid "HTML"
msgstr "HTML"
@@ -283,14 +270,6 @@
msgid "preview_plaintext_link"
msgstr "Klik her for at forhsvise nyhedsbrevet i ren tekst i et nyt vindue."
-#NEW
-# <p tal:condition="not:canbesent"
-# i18n:translate="newsletter_test_warning_message">
-# You can't test or send this newsletter because it's not publicly available. Change its status for this.
-# </p>
-msgid "newsletter_test_warning_message"
-msgstr ""
-
##############################################################
##
## Newsletter
@@ -385,13 +364,6 @@
msgid "heading_send_newsletter"
msgstr "Send nyhedsbrev"
-# <p tal:condition="not:canbesent"
-# i18n:translate="send_newsletter_warning_message">
-# <b>WARNING</b> : This newsletter should be publicly available before sending it !
-# </p>
-msgid "send_newsletter_warning_message"
-msgstr "<b>ADVARSEL</b>: Dette nyhedsbrev bre offentligt tilgeligt, f sender det!"
-
# <span tal:omit-tag="" i18n:translate="">You're about to send this newsletter to</span>
msgid "You're about to send this newsletter to"
msgstr "Du er ved at sende dette nyhedsbrev til"
@@ -680,9 +652,6 @@
msgid "TALES compilation error: "
msgstr "TALES fejl:"
-msgid "Please ask the system administrator the command that runs Lynx"
-msgstr "Spystemadministratoren om kommandoen til Lynx"
-
# NEW
msgid "You must first create a large plone folder"
msgstr ""
Modified: PloneGazette/branches/complexity-reduction/i18n/plonegazette_de.po
==============================================================================
--- PloneGazette/branches/complexity-reduction/i18n/plonegazette_de.po (original)
+++ PloneGazette/branches/complexity-reduction/i18n/plonegazette_de.po Wed Jan 31 15:53:22 2007
@@ -174,19 +174,6 @@
msgid "help_extraRecipients"
msgstr "Sie kn ine TALES-Expression zusliche Abonnenten fen Newsletter eintragen. Wenn Sie nicht wissen, was eine TALES-Expression oder ein Template ist, lassen Sie dieses Feld frei. Der Wert, der von der Expression zureben wird erfolgt in Form von einer (Python) Liste von (email, html, editurl) Tuples. Html kann 1 oder 0 (Standardtext in diesem Fall) sein. Editurl ist eine URL, wo der Empfer seine Eigenschaften ern kann. In TALES-Expressions ist das Object \"here\".<br />Warnung: benutzen Sie eine \"nocall\" Expression wie \"nocall:here/myTemplate\""
-# <label i18n:translate="label_lynxCommand">Lynx shell command</label>
-msgid "label_lynxCommand"
-msgstr "Kommandozeilenbefehl fx"
-
-# <div class="formHelp"
-# i18n:translate="help_lynxCommand">
-# Enter the system command that runs Lynx.<br />
-# If this field is empty, we assume that "lynx" is fine (this is ok for most Unix).<br />
-# Otherwise, ask the system administrator of this server.
-# </div>
-msgid "help_lynxCommand"
-msgstr "Geben Sie den Kommandozeilenbefehl fLynx</b> ein.<br /> Sollte</b> ein.<br /> Sollte \"Lynx\" in Ordnung sein (das ist ist bei den meisten Unix-Systemen der Fall), tragen Sie nichts ein.<br /> Sollten Sie nicht sicher sein, fragen Sie den Systemadministrator ihres Servers."
-
# <span i18n:translate="" tal:content="format" />
msgid "HTML"
msgstr ""
@@ -316,13 +303,6 @@
msgid "preview_plaintext_link"
msgstr "Bitte klicken Sie hier um eine Vorschau des <b>Newsletter im Text-Format</b> in einem neuen Fenster zu sehen"
-# <p tal:condition="not:canbesent"
-# i18n:translate="newsletter_test_warning_message">
-# You can't test or send this newsletter because it's not publicly available. Change its status for this.
-# </p>
-msgid "newsletter_test_warning_message"
-msgstr "Sie kn diesen Newsletter nicht testen oder versenden, da sein Status verntlicht sein muss."
-
##############################################################
##
## Newsletter
@@ -411,13 +391,6 @@
msgid "heading_send_newsletter"
msgstr "Newsletter senden"
-# <p tal:condition="not:canbesent"
-# i18n:translate="send_newsletter_warning_message">
-# <b>WARNING</b> : This newsletter should be publicly available before sending it !
-# </p>
-msgid "send_newsletter_warning_message"
-msgstr "<b>WARNUNG</b> : Dieser Newsletter sollte verntlicht sein, bevor Sie ihn senden !"
-
# <span tal:omit-tag="" i18n:translate="">You're about to send this newsletter to</span>
msgid "You're about to send this newsletter to"
msgstr "Sie senden diesen Newsletter an"
@@ -696,9 +669,6 @@
msgid "TALES compilation error: "
msgstr "TALES Kompilations-Fehler"
-msgid "Please ask the system administrator the command that runs Lynx"
-msgstr "Bitte fragen Sie Ihren Systemadministrator nach der Befehlszeile, die Lynx startet."
-
# NEW
msgid "You must first create a large plone folder"
msgstr ""
Modified: PloneGazette/branches/complexity-reduction/i18n/plonegazette_es.po
==============================================================================
--- PloneGazette/branches/complexity-reduction/i18n/plonegazette_es.po (original)
+++ PloneGazette/branches/complexity-reduction/i18n/plonegazette_es.po Wed Jan 31 15:53:22 2007
@@ -139,19 +139,6 @@
msgid "help_extraRecipients"
msgstr "Ingrese una expresiALES para encontrar recipientes adicionales para la gacetilla. Si no sabe qus una expresiALES o una plantilla, deje vaceste campo. El valor devuelto por esta expresiiene que ser de la forma (en Python) de una lista de tuplas (email,html,editurl). html puede ser 1 o 0 (en cuyo caso se trata de texto plano). editurl es un URL en donde el recipiente puede cambiar sus preferencias. In esta expresiALES, 'here' es este objeto. Advertencia: use una expresinocall', como 'nocall:here/miplantilla'"
-# <label i18n:translate="label_lynxCommand">Lynx shell command</label>
-msgid "label_lynxCommand"
-msgstr "Comando para ejecutar lynx"
-
-# <div class="formHelp"
-# i18n:translate="help_lynxCommand">
-# Enter the system command that runs Lynx.<br />
-# If this field is empty, we assume that "lynx" is fine (this is ok for most Unix).<br />
-# Otherwise, ask the system administrator of this server.
-# </div>
-msgid "help_lynxCommand"
-msgstr "Ingrese el comando necesario para ejecutar lynx. Si este campo estac se asume 'lynx' (lo que es correcto para la mayorde los sistemas Unix). Si este no es el caso, prege al administrador del servidor."
-
# <span i18n:translate="" tal:content="format" />
msgid "HTML"
msgstr ""
@@ -284,13 +271,6 @@
msgid "preview_plaintext_link"
msgstr "Haga click aquara abrir la vista previa de la <b>gacetilla en formato Texto</b> (como se veren el cliente de correo) en una nueva ventana."
-# <p tal:condition="not:canbesent"
-# i18n:translate="newsletter_test_warning_message">
-# You can't test or send this newsletter because it's not publicly available. Change its status for this.
-# </p>
-msgid "newsletter_test_warning_message"
-msgstr "Usted no puede verificar o enviar esta gacetilla porque no es de acceso po. Cambie el estado de la misma para poder realizar estas acciones."
-
##############################################################
##
## Newsletter
@@ -384,13 +364,6 @@
msgid "heading_send_newsletter"
msgstr "Enviar la gacetilla"
-# <p tal:condition="not:canbesent"
-# i18n:translate="send_newsletter_warning_message">
-# <b>WARNING</b> : This newsletter should be publicly available before sending it !
-# </p>
-msgid "send_newsletter_warning_message"
-msgstr "<b>ADVERTENCIA</b> : Esta gacetilla debe ser accesible pamente antes de ser enviada !"
-
# <span tal:omit-tag="" i18n:translate="">You're about to send this newsletter to</span>
msgid "You're about to send this newsletter to"
msgstr "est punto de enviar esta gacetilla a"
@@ -688,10 +661,6 @@
msgstr ""
# NEW
-msgid "Please ask the system administrator the command that runs Lynx"
-msgstr ""
-
-# NEW
msgid "You must first create a large plone folder"
msgstr ""
Modified: PloneGazette/branches/complexity-reduction/i18n/plonegazette_fr.po
==============================================================================
--- PloneGazette/branches/complexity-reduction/i18n/plonegazette_fr.po (original)
+++ PloneGazette/branches/complexity-reduction/i18n/plonegazette_fr.po Wed Jan 31 15:53:22 2007
@@ -138,19 +138,6 @@
msgid "help_extraRecipients"
msgstr "Entrez une expression TALES qui trouvera des destinataires supplntaires de vos newsletter.<br /> Si vous ne savez pas ce qu'est une expression TALES ou une template, laissez ce champ vide.<br /> La valeur retournpar cette expression doit e sous la forme (python) d'une liste (email, html, editurl) de tuples. html pourra prendre comme valeur 1 ou 0 (texte brut dans ce dernier cas). editurl est une url ou le destinataire pourra changer ces prrences.<br /> Dans cette expression TALES, \"here\" est cet objet. <br /><b>Attention : utiliser une expression prx\"nocall\" comme ceci : \"nocall:here/myTemplate\"</b>"
-# <label i18n:translate="label_lynxCommand">Lynx shell command</label>
-msgid "label_lynxCommand"
-msgstr "Commande Shell Lynx"
-
-# <div class="formHelp"
-# i18n:translate="help_lynxCommand">
-# Enter the system command that runs Lynx.<br />
-# If this field is empty, we assume that "lynx" is fine (this is ok for most Unix).<br />
-# Otherwise, ask the system administrator of this server.
-# </div>
-msgid "help_lynxCommand"
-msgstr "Entrez la commande syst qui drre lynx.<br /> Si ce champ reste vide, nous supposons que \"lynx\" est ok (c'est ok la plupart du temps pour les systs unix).<br /> Sinon demandez 'administrateur syst du serveur."
-
# <span i18n:translate="" tal:content="format" />
msgid "HTML"
msgstr "HTML"
@@ -281,13 +268,6 @@
msgid "preview_plaintext_link"
msgstr "Pour prsualiser <b>la newsletter en texte brut</b> dans une nouvelle fene."
-# <p tal:condition="not:canbesent"
-# i18n:translate="newsletter_test_warning_message">
-# You can't test or send this newsletter because it's not publicly available. Change its status for this.
-# </p>
-msgid "newsletter_test_warning_message"
-msgstr "Vous ne pouvez pas envoyer cette newsletter car elle n'est pas publi"
-
##############################################################
##
## Newsletter
@@ -378,13 +358,6 @@
msgid "heading_send_newsletter"
msgstr "Envoyer la newsletter"
-# <p tal:condition="not:canbesent"
-# i18n:translate="send_newsletter_warning_message">
-# <b>WARNING</b> : This newsletter should be publicly available before sending it !
-# </p>
-msgid "send_newsletter_warning_message"
-msgstr "b>ATTENTION</b> : Cette newsletter doit e publivant d'e envoy!"
-
# <span tal:omit-tag="" i18n:translate="">You're about to send this newsletter to</span>
msgid "You're about to send this newsletter to"
msgstr "Vous s sur le point d'envoyer cette newsletter
@@ -665,9 +638,6 @@
msgid "TALES compilation error: "
msgstr "Erreur de compilation TALES : "
-msgid "Please ask the system administrator the command that runs Lynx"
-msgstr "Veuillez demander a l'administrateur du serveur la commande permettant d'utiliser Lynx"
-
msgid "You must first create a large plone folder"
msgstr 'Vous devez avant mettre en place le "Large Plone Folder" devant stocker les utilisateurs'
Modified: PloneGazette/branches/complexity-reduction/i18n/plonegazette_it.po
==============================================================================
--- PloneGazette/branches/complexity-reduction/i18n/plonegazette_it.po (original)
+++ PloneGazette/branches/complexity-reduction/i18n/plonegazette_it.po Wed Jan 31 15:53:22 2007
@@ -163,32 +163,6 @@
msgid "help_extraRecipients"
msgstr "Inserite un'espressione TALES che troverestinatari supplementari per la vostra newsletter.<br /> Se ignorate il significato di espressione TALES o di template, lasciate questo campo vuoto.<br /> Il valore restituito da questa espressione dovrssere sotto forma (python) di una lista (email, html, editurl) tuples. html potrver valore 1 o 0 (formato Testo in quest'ultimo caso). editurl n url dove il destinatario potrambiare le proprie preferenze.<br /> In questa espressione TALES, \"here\" uesto oggetto. <br /><b>Attenzione : utilizzate un'espressione \"nocall\" come : \"nocall:here/myTemplate\"</b>"
-# <label i18n:translate="label_lynxCommand">Lynx shell command</label>
-msgid "label_lynxCommand"
-msgstr "Comando Lynx"
-
-# <div class="formHelp"
-# i18n:translate="help_lynxCommand">
-# Enter the system command that runs Lynx.<br />
-# If this field is empty, we assume that "lynx" is fine (this is ok for most Unix).<br />
-# Otherwise, ask the system administrator of this server.
-# </div>
-msgid "help_lynxCommand"
-msgstr "Inserite il comando di sistema che invoca Lynx.<br /> Se il campo uoto, supponiamo che \"lynx\" vada bene.<br /> Per informazioni chiedete all'amministratore di sistema."
-
-# <label i18n:translate="label_lynxOptions">Lynx options</label>
-msgid "label_lynxOptions"
-msgstr "Opzioni Lynx"
-
-# <div i18n:translate="help_lynxOptions"
-# class="formHelp">
-# Enter options to give to Lynx (or other browser) to generate plain text output.<br />
-# If this field is empty, we assume that "-nolist -dump" is fine (this is ok for most Unix).<br />
-# Otherwise, ask the system administrator of this server.
-# </div>
-msgid "help_lynxOptions"
-msgstr "Inserite le opzioni per Lynx (o altro browser) per far generare testo in uscita.<br/> Se il campo uoto, si assume che \"-nolist -dumo\" sia corretto (va bene per la maggior parte degli Unix).<br/> Altrimenti, chiedere all'amministratore di sistema del server."
-
# <span i18n:translate="" tal:content="format" />
msgid "HTML"
msgstr "HTML"
@@ -312,13 +286,6 @@
msgid "preview_plaintext_link"
msgstr "Clicca qui per vedere un'anteprima della newsletter <b>in formato Testo</b> in una nuova finestra."
-# <p tal:condition="not:canbesent"
-# i18n:translate="newsletter_test_warning_message">
-# You can't test or send this newsletter because it's not publicly available. Change its status for this.
-# </p>
-msgid "newsletter_test_warning_message"
-msgstr "Non potete inviare questa newsletter perchon tata ancora pubblicata. Cambiate il suo stato per inviarla."
-
##############################################################
##
## Newsletter
@@ -400,13 +367,6 @@
msgid "heading_send_newsletter"
msgstr "Inviare la newsletter"
-# <p tal:condition="not:canbesent"
-# i18n:translate="send_newsletter_warning_message">
-# <b>WARNING</b> : This newsletter should be publicly available before sending it !
-# </p>
-msgid "send_newsletter_warning_message"
-msgstr "<b>ATTENZIONE</b> : Questa newsletter dovrebbe essere disponibile a tutti prima di inviarla !"
-
# <span tal:omit-tag="" i18n:translate="">You're about to send this newsletter to</span>
msgid "You're about to send this newsletter to"
msgstr "State per inviare questa newsletter a"
@@ -660,9 +620,6 @@
msgid "TALES compilation error: "
msgstr "Errore nella compilazione TALES"
-msgid "Please ask the system administrator the command that runs Lynx"
-msgstr "Per favore, chiedete all'amministratore di sistema il comando per lanciare Lynx"
-
msgid "You must first create a large plone folder"
msgstr "Prima dovete create un \"Newsletter Large Folder\""
Modified: PloneGazette/branches/complexity-reduction/i18n/plonegazette_nl.po
==============================================================================
--- PloneGazette/branches/complexity-reduction/i18n/plonegazette_nl.po (original)
+++ PloneGazette/branches/complexity-reduction/i18n/plonegazette_nl.po Wed Jan 31 15:53:22 2007
@@ -157,32 +157,6 @@
msgid "help_extraRecipients"
msgstr "Voer een TALES-expressie in die additionele ontvangers van de nieuwsbrief zoekt.<br/>Als u niet weet wat een TALES-expressie of tempalte is, laat deze regel leeg.<br/>De waarde die door deze expressie wordt teruggegeven moet in een (Python)formaat van een lijst zijn of <b>(email, html, editurl)</b> tuples. <b>html</b> mag 1 of 0 zijn (dit laatste staat voor gewone tekst). In de TALES-expressie is \"here\" het huidige object.<br/><b>Waarschuwing: gebruik een \"nocall\"-expressie zoals \"nocall:/here/myTemplate\"</b>"
-# <label i18n:translate="label_lynxCommand">Lynx shell command</label>
-msgid "label_lynxCommand"
-msgstr "Commando voor Lynx"
-
-# <div class="formHelp"
-# i18n:translate="help_lynxCommand">
-# Enter the system command that runs Lynx.<br />
-# If this field is empty, we assume that "lynx" is fine (this is ok for most Unix).<br />
-# Otherwise, ask the system administrator of this server.
-# </div>
-msgid "help_lynxCommand"
-msgstr "Voer het systeemcommando in voor <b>Lynx</b>.<br /> Als dit veld leeg is wordt aangeomen dat \"lynx\" correct is (dit is zo voor de meeste unix).<br/>Indien onduidelijk, vraag het uw systeembeheerder."
-
-# <label i18n:translate="label_lynxOptions">Lynx options</label>
-msgid "label_lynxOptions"
-msgstr "Lynx opties"
-
-# <div i18n:translate="help_lynxOptions"
-# class="formHelp">
-# Enter options to give to Lynx (or other browser) to generate plain text output.<br />
-# If this field is empty, we assume that "-nolist -dump" is fine (this is ok for most Unix).<br />
-# Otherwise, ask the system administrator of this server.
-# </div>
-msgid "help_lynxOptions"
-msgstr "Voer de opties voor Lynx (of een andere browser) om gewone tekst te genereren.<br />Indien dit veld wordt leeggelaten, wordt aangenomen dat \"-nolist -dump\" in orde is (dit is correct voor de meeste Unix).<br />Voor meer informatie, vraag het uw systeembeheerder."
-
# <span i18n:translate="" tal:content="format" />
msgid "HTML"
msgstr "HTML"
@@ -306,13 +280,6 @@
msgid "preview_plaintext_link"
msgstr "Klik hier om een voorbeeld van de <b>nieuwsbrief in gewoon tekstformaat</b> in een nieuw venster te zien"
-# <p tal:condition="not:canbesent"
-# i18n:translate="newsletter_test_warning_message">
-# You can't test or send this newsletter because it's not publicly available. Change its status for this.
-# </p>
-msgid "newsletter_test_warning_message"
-msgstr "Het is niet mogelijk deze nieuwsbrief te testen of te verzenden omdat deze nog niet publiekelijke toegankelijk is. Verander de status van de nieuwsbrief."
-
##############################################################
##
## Newsletter
@@ -394,13 +361,6 @@
msgid "heading_send_newsletter"
msgstr "Nieuwsbrief versturen"
-# <p tal:condition="not:canbesent"
-# i18n:translate="send_newsletter_warning_message">
-# <b>WARNING</b> : This newsletter should be publicly available before sending it !
-# </p>
-msgid "send_newsletter_warning_message"
-msgstr "<b>WAARSCHUWING:</b> Deze nieuwsbrief moet publiekelijk toegankelijk zijn alvorens deze verzonden kan worden !"
-
# <span tal:omit-tag="" i18n:translate="">You're about to send this newsletter to</span>
msgid "You're about to send this newsletter to"
msgstr "U verzend de nieuwsbrief aan"
@@ -661,9 +621,6 @@
msgid "TALES compilation error: "
msgstr "TALES compilatiefout:"
-msgid "Please ask the system administrator the command that runs Lynx"
-msgstr "Vraag uw systeembeheerder naar het commando dat Lynx opstart"
-
# NEW
msgid "You must first create a large plone folder"
msgstr "U moet eerst een grote plone map (Large Plone Folder) aanmaken"
Modified: PloneGazette/branches/complexity-reduction/i18n/plonegazette_pt-br.po
==============================================================================
--- PloneGazette/branches/complexity-reduction/i18n/plonegazette_pt-br.po (original)
+++ PloneGazette/branches/complexity-reduction/i18n/plonegazette_pt-br.po Wed Jan 31 15:53:22 2007
@@ -161,32 +161,6 @@
msgid "help_extraRecipients"
msgstr "Insira um expressTALES para encontrar recebedores adicionais para o boletim. Se nsabe o que ma expressTALES, deixe este campo vazio. O valor desta expressdeve ser a forma em Python de uma lista de tuplas (email, html, editurl). html pode ser 1 o 0 (neste caso se trata de texto plano). editurl ma URL onde o recebedor pode mudar suas preferias. Nesta expressTALES, 'here' objeto. Advertia: use uma express'nocall', como 'nocall:here/meumodelo'"
-# <label i18n:translate="label_lynxCommand">Lynx shell command</label>
-msgid "label_lynxCommand"
-msgstr "Comando para executar lynx"
-
-# <div class="formHelp"
-# i18n:translate="help_lynxCommand">
-# Enter the system command that runs Lynx.<br />
-# If this field is empty, we assume that "lynx" is fine (this is ok for most Unix).<br />
-# Otherwise, ask the system administrator of this server.
-# </div>
-msgid "help_lynxCommand"
-msgstr "Informe o comando necesso para executar o lynx. Se este campo estiver vazio, o valor assumido serlynx' (padrpara a maioria dos sistemas Unix). Sen pergunte ao administrador do sistema."
-
-# <label i18n:translate="label_lynxOptions">Lynx options</label>
-msgid "label_lynxOptions"
-msgstr "Ops do Lynx"
-
-# <div i18n:translate="help_lynxOptions"
-# class="formHelp">
-# Enter options to give to Lynx (or other browser) to generate plain text output.<br />
-# If this field is empty, we assume that "-nolist -dump" is fine (this is ok for most Unix).<br />
-# Otherwise, ask the system administrator of this server.
-# </div>
-msgid "help_lynxOptions"
-msgstr "Informe as ops para que o Lynx (ou outro browser) gere texto puro. Se este campo estiver vazio, ssumido que -nolist -dump valor (funciona para a maioria dos Unix). Senpergunte ao administrador do sistema."
-
# <span i18n:translate="" tal:content="format" />
msgid "HTML"
msgstr "HTML"
@@ -314,13 +288,6 @@
msgid "preview_plaintext_link"
msgstr "Clique aqui para prisualizar do <b>boletim em formato Texto Plano</b> (como se veria no cliente de email) em uma nova janela."
-# <p tal:condition="not:canbesent"
-# i18n:translate="newsletter_test_warning_message">
-# You can't test or send this newsletter because it's not publicly available. Change its status for this.
-# </p>
-msgid "newsletter_test_warning_message"
-msgstr "Nossl testar ou enviar o boletim porque nestublicamente visl. Altere o status para isso."
-
##############################################################
##
## Newsletter
@@ -421,13 +388,6 @@
msgid "heading_send_newsletter"
msgstr "Enviar o boletim"
-# <p tal:condition="not:canbesent"
-# i18n:translate="send_newsletter_warning_message">
-# <b>WARNING</b> : This newsletter should be publicly available before sending it !
-# </p>
-msgid "send_newsletter_warning_message"
-msgstr "<b>AVISO</b> : Este boletim precisa estar disponl publicamente antes do envio !"
-
# <span tal:omit-tag="" i18n:translate="">You're about to send this newsletter to</span>
msgid "You're about to send this newsletter to"
msgstr "Vocstrestes a enviar este boletim a"
@@ -707,9 +667,6 @@
msgid "TALES compilation error: "
msgstr "Erro de compila TALES: "
-msgid "Please ask the system administrator the command that runs Lynx"
-msgstr "Por favor pergunte ao administrador do sistema sobre a localiza do Lynx"
-
# NEW
msgid "You must first create a large plone folder"
msgstr "Voceve primeiro criar um large plone folder"
Modified: PloneGazette/branches/complexity-reduction/i18n/plonegazette_ro.po
==============================================================================
--- PloneGazette/branches/complexity-reduction/i18n/plonegazette_ro.po (original)
+++ PloneGazette/branches/complexity-reduction/i18n/plonegazette_ro.po Wed Jan 31 15:53:22 2007
@@ -133,19 +133,6 @@
msgid "help_extraRecipients"
msgstr "Introdu o expresie TALES care intoarce extra recipienti pentru buletin.<br/>Daca nu stii ce este o expresie TALES sau un template, lasa acest camp gol. <br/>Valoarea intoarsa de expresie trebuie sa fie de forma unei liste Python de tuple-uri de forma <b>(email, html, editurl)</b>. <b>html</b> poate avea valoarea de 1 sau 0 (in acest caz, text simplu). In acea expresie TALES, \"here\" este acest obiect.<br /><b>Atentie: foloseste o expresie \"nocall\" de forma \"nocall:/here/myTemplate\"</b>"
-# <label i18n:translate="label_lynxCommand">Lynx shell command</label>
-msgid "label_lynxCommand"
-msgstr "Comanda Lynx"
-
-# <div class="formHelp"
-# i18n:translate="help_lynxCommand">
-# Enter the system command that runs Lynx.<br />
-# If this field is empty, we assume that "lynx" is fine (this is ok for most Unix).<br />
-# Otherwise, ask the system administrator of this server.
-# </div>
-msgid "help_lynxCommand"
-msgstr "Introdu comanda de sistem ce ruleaza Lynx <br/>Daca acest camp este gol, va fi considerat in mod implicit \"lynx\" (ceea ce este OK pentru majoritatea sistemelor Unix).<br/>Daca nu functioneaza, contacteaza administratorul sistemului pentru detalii despre server."
-
# <span i18n:translate="" tal:content="format" />
msgid "HTML"
msgstr "HTML"
@@ -267,13 +254,6 @@
msgid "preview_plaintext_link"
msgstr "Apasa aici pentru a previzualiza <b>buletinul in format Text</b> (asa cum ar fi vizualizat intr-un client de email) intr-o fereastra noua."
-# <p tal:condition="not:canbesent"
-# i18n:translate="newsletter_test_warning_message">
-# You can't test or send this newsletter because it's not publicly available. Change its status for this.
-# </p>
-msgid "newsletter_test_warning_message"
-msgstr "Nu poti testa sau trimite acest buletin deoarece nu este disponibil public. Modifica-i starea pentru a fi public."
-
# #############################################################
# #
# # Newsletter
@@ -355,13 +335,6 @@
msgid "heading_send_newsletter"
msgstr "Trimite buletin electronic"
-# <p tal:condition="not:canbesent"
-# i18n:translate="send_newsletter_warning_message">
-# <b>WARNING</b> : This newsletter should be publicly available before sending it !
-# </p>
-msgid "send_newsletter_warning_message"
-msgstr " <b>ATENTIE</b> : Buletinul electronic ar trebui sa fie public inainte de a il trimite!"
-
# <span tal:omit-tag="" i18n:translate="">You're about to send this newsletter to</span>
msgid "You're about to send this newsletter to"
msgstr "Esti pe cale de a trimite acest buletin la"
@@ -622,9 +595,6 @@
msgid "TALES compilation error: "
msgstr "Eroare de compilare TALES:"
-msgid "Please ask the system administrator the command that runs Lynx"
-msgstr "Te rog sa contactezi administratorul tau de system in legatura cu comanda ce ruleaza Lynx"
-
msgid "You must first create a large plone folder"
msgstr "Trebuie intai sa creezi un Large Folder in Plone"
Modified: PloneGazette/branches/complexity-reduction/skins/PloneGazette/NewsletterTheme_edit.cpy
==============================================================================
--- PloneGazette/branches/complexity-reduction/skins/PloneGazette/NewsletterTheme_edit.cpy (original)
+++ PloneGazette/branches/complexity-reduction/skins/PloneGazette/NewsletterTheme_edit.cpy Wed Jan 31 15:53:22 2007
@@ -5,7 +5,7 @@
##bind script=script
##bind state=state
##bind subpath=traverse_subpath
-##parameters=id='', title=None, description=None, default_format='', body='', testEmail='', authorEmail='', replyto='', activationMailSubject='', activationMailTemplate='', newsletterFooter='', notify=0, renderTemplate='', extraRecipients='', lynxCommand='', lynxOptions='', subscriber_folder_id=''
+##parameters=id='', title=None, description=None, default_format='', body='', testEmail='', authorEmail='', replyto='', activationMailSubject='', activationMailTemplate='', newsletterFooter='', notify=0, renderTemplate='', extraRecipients='', subscriber_folder_id=''
##title=Edit content and metadata
##
if not id:
@@ -25,8 +25,6 @@
notify=notify,
renderTemplate=renderTemplate,
extraRecipients=extraRecipients,
- lynxCommand=lynxCommand,
- lynxOptions=lynxOptions,
subscriber_folder_id=subscriber_folder_id)
new_context.plone_utils.contentEdit(new_context,
Modified: PloneGazette/branches/complexity-reduction/skins/PloneGazette/NewsletterTheme_editForm.cpt
==============================================================================
--- PloneGazette/branches/complexity-reduction/skins/PloneGazette/NewsletterTheme_editForm.cpt (original)
+++ PloneGazette/branches/complexity-reduction/skins/PloneGazette/NewsletterTheme_editForm.cpt Wed Jan 31 15:53:22 2007
@@ -380,56 +380,6 @@
</div>
- <!-- lynxCommand Field -->
-
- <div class="field"
- tal:define="error errors/lynxCommand|nothing;
- lynxCommand request/lynxCommand|here/lynxCommand|nothing"
- tal:attributes="class python:test(error, 'field error', 'field')">
-
- <label i18n:translate="label_lynxCommand">Lynx shell command</label>
- <div i18n:translate="help_lynxCommand"
- class="formHelp">
- Enter the system command that runs Lynx.<br />
- If this field is empty, we assume that "lynx" is fine (this is ok for most Unix).<br />
- Otherwise, ask the system administrator of this server.
- </div>
-
- <div tal:content="structure error">Validation error output</div>
- <input type="text"
- name="lynxCommand"
- value="#"
- size="60"
- tal:attributes="value lynxCommand;
- tabindex tabindex/next" />
-
- </div>
-
- <!-- lynxOptions Field -->
-
- <div class="field"
- tal:define="error errors/lynxOptions|nothing;
- lynxOptions request/lynxOptions|here/lynxOptions|nothing"
- tal:attributes="class python:test(error, 'field error', 'field')">
-
- <label i18n:translate="label_lynxOptions">Lynx options</label>
- <div i18n:translate="help_lynxOptions"
- class="formHelp">
- Enter options to give to Lynx (or other browser) to generate plain text output.<br />
- If this field is empty, we assume that "-nolist -dump" is fine (this is ok for most Unix).<br />
- Otherwise, ask the system administrator of this server.
- </div>
-
- <div tal:content="structure error">Validation error output</div>
- <input type="text"
- name="lynxOptions"
- value="#"
- size="60"
- tal:attributes="value lynxOptions;
- tabindex tabindex/next" />
-
- </div>
-
<div class="field"
tal:define="error errors/subscriber_folder_id|nothing;
subscriber_folder_id request/subscriber_folder_id|here/subscriber_folder_id | nothing"
Modified: PloneGazette/branches/complexity-reduction/skins/PloneGazette/Newsletter_sendForm.pt
==============================================================================
--- PloneGazette/branches/complexity-reduction/skins/PloneGazette/Newsletter_sendForm.pt (original)
+++ PloneGazette/branches/complexity-reduction/skins/PloneGazette/Newsletter_sendForm.pt Wed Jan 31 15:53:22 2007
@@ -11,20 +11,12 @@
<body>
<div metal:fill-slot="main"
- i18n:domain="plonegazette"
- tal:define="canbesent here/canBeSent">
+ i18n:domain="plonegazette">
<h1 i18n:translate="heading_send_newsletter">
Send newsletter
</h1>
- <p tal:condition="not:canbesent"
- i18n:translate="send_newsletter_warning_message">
- <b>WARNING</b> : This newsletter should be publicly available before sending it !
- </p>
-
- <span tal:condition="canbesent">
-
<p tal:define="stats python:here.getTheme().subscriberStats()[0]">
<span tal:omit-tag="" i18n:translate="">You're about to send this newsletter to</span> <span tal:replace="stats/totalactive">120</span> <span tal:omit-tag="" i18n:translate="">subscriber(s)</span>.
<span tal:replace="stats/htmlactive">100</span> <span tal:omit-tag="" i18n:translate="">will receive it in HTML when</span>
@@ -44,7 +36,6 @@
i18n:attributes="value" />
</form>
- </span>
<div tal:define="errors options/errors1|nothing"
tal:condition="errors">
Modified: PloneGazette/branches/complexity-reduction/skins/PloneGazette/Newsletter_testForm.pt
==============================================================================
--- PloneGazette/branches/complexity-reduction/skins/PloneGazette/Newsletter_testForm.pt (original)
+++ PloneGazette/branches/complexity-reduction/skins/PloneGazette/Newsletter_testForm.pt Wed Jan 31 15:53:22 2007
@@ -11,8 +11,7 @@
<body>
<div metal:fill-slot="main"
- i18n:domain="plonegazette"
- tal:define="canbesent here/canBeSent">
+ i18n:domain="plonegazette">
<h1 i18n:translate="heading_test_newsletter">
Test Newsletter
@@ -20,7 +19,7 @@
<p>
<a href="#" target="_blank"
- tal:attributes="href string:${here/absolute_url}/testMUAHtml?html=1">
+ tal:attributes="href string:${here/absolute_url}/renderTextHTML?footer_url=${here/absolute_url}/xxx">
<span tal:omit-tag="" i18n:translate="preview_html_link">
Click here to see the preview of the <b>HTML newsletter</b> (as displayed in a MUA) in a new window.
</span>
@@ -29,21 +28,14 @@
<p>
<a href="#" target="_blank"
- tal:attributes="href string:${here/absolute_url}/testMUATextPlain">
+ tal:attributes="href string:${here/absolute_url}/renderTextPlain?footer_url=${here/absolute_url}/xxx">
<span tal:omit-tag="" i18n:translate="preview_plaintext_link">
Click here to see the preview of the <b>plain text newsletter</b> (as displayed in a MUA) in a new window.
</span>
</a>
</p>
- <p tal:condition="not:canbesent"
- i18n:translate="newsletter_test_warning_message">
- You can't test or send this newsletter because it's not publicly available.
- Change its status for this.
- </p>
-
- <p tal:define="testmail python:here.getTheme().testEmail"
- tal:condition="canbesent">
+ <p tal:define="testmail python:here.getTheme().testEmail">
<a href="#"
tal:attributes="href string:${here/absolute_url}/testSendToMe">
<span tal:omit-tag="" i18n:translate="test_send_newsletter_link">Click here to <b>send this newsletter</b> as plain text and HTML to</span>
Modified: PloneGazette/branches/complexity-reduction/skins/PloneGazette/validate_newslettertheme_edit.vpy
==============================================================================
--- PloneGazette/branches/complexity-reduction/skins/PloneGazette/validate_newslettertheme_edit.vpy (original)
+++ PloneGazette/branches/complexity-reduction/skins/PloneGazette/validate_newslettertheme_edit.vpy Wed Jan 31 15:53:22 2007
@@ -5,7 +5,7 @@
##bind script=script
##bind state=state
##bind subpath=traverse_subpath
-##parameters=title='', testEmail='',authorEmail='', replyto='', activationMailSubject='', activationMailTemplate='', lynxCommand='', lynxOptions='', subscriber_folder_id=''
+##parameters=title='', testEmail='',authorEmail='', replyto='', activationMailSubject='', activationMailTemplate='', subscriber_folder_id=''
##title=Validates a Newsletter Theme edit_form contents
##
@@ -48,7 +48,6 @@
talExpressions = [(name, context.REQUEST[name].strip()) for name in ('renderTemplate', 'extraRecipients')]
context.checkTalExpressions(talExpressions, state=state)
-context.checkLynxCommandFromEditForm(lynxCommand, lynxOptions, state=state)
if subscriber_folder_id and subscriber_folder_id not in context.objectIds('NewsletterBTree'):
state.setError('subscriber_folder_id', translate('You must first create a large plone folder', domain='plonegazette'))
|