From cb53449c564dc94a9eed16bc2a99006a78a1ec5a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Fri, 17 Apr 2015 10:43:56 +0200
Subject: [PATCH 1/1] Remaniement du formulaire de configuration du portail.
---
.../Plinn/locales/en/LC_MESSAGES/plinn.mo | Bin 51476 -> 51292 bytes
.../Plinn/locales/en/LC_MESSAGES/plinn.po | 86 +++++++------
.../Plinn/locales/fr/LC_MESSAGES/plinn.mo | Bin 55361 -> 55086 bytes
.../Plinn/locales/fr/LC_MESSAGES/plinn.po | 92 +++++++-------
Products/Plinn/locales/plinn.pot | 58 ++++-----
.../skins/custom_generic/reconfig_form.py | 1 -
.../skins/custom_generic/reconfig_template.pt | 113 +++++++++++-------
7 files changed, 192 insertions(+), 158 deletions(-)
diff --git a/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo
index 5a02e61fe352a456c3f339e98218e65fb87c66c0..d596a79bc2026b633e0aff15a3db55c5226fbb3d 100644
GIT binary patch
delta 15725
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
bsrdXy!Hngflu7kgObhw{HlWh)-_84f;sF(L
delta 15880
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
M|4n4{mdnNe2bo4q+yDRo
diff --git a/Products/Plinn/locales/en/LC_MESSAGES/plinn.po b/Products/Plinn/locales/en/LC_MESSAGES/plinn.po
index efb623e..a22fbc7 100644
--- a/Products/Plinn/locales/en/LC_MESSAGES/plinn.po
+++ b/Products/Plinn/locales/en/LC_MESSAGES/plinn.po
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 2.0 beta 1\n"
-"POT-Creation-Date: Fri Apr 17 09:59:32 2015\n"
+"POT-Creation-Date: Fri Apr 17 10:39:07 2015\n"
"PO-Revision-Date: 2015-04-15 17:00+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
@@ -946,7 +946,7 @@ msgstr "Preferred languages"
msgid "Please enter language codes separated by spaces."
msgstr "Please enter language codes separated by spaces."
-#: n/skins/custom_generic/reconfig_template.pt:7
+#: n/skins/custom_generic/reconfig_template.pt:9
msgid "Configure the Portal"
msgstr "Configure the Portal"
@@ -964,11 +964,11 @@ msgid ""
msgstr ""
"When the portal generates mail, it uses this name as its (apparent) sender."
-#: n/skins/custom_generic/reconfig_template.pt:28
+#: n/skins/custom_generic/reconfig_template.pt:30
msgid "Portal 'From' address"
msgstr "Portal 'From' address"
-#: n/skins/custom_generic/reconfig_template.pt:33
+#: n/skins/custom_generic/reconfig_template.pt:35
msgid ""
"When the portal generates mail, it uses this address as its (apparent) "
"return address."
@@ -976,27 +976,27 @@ msgstr ""
"When the portal generates mail, it uses this address as its (apparent) "
"return address."
-#: n/skins/custom_generic/reconfig_template.pt:39
+#: n/skins/custom_generic/reconfig_template.pt:43
msgid "SMTP server"
msgstr "SMTP server"
-#: n/skins/custom_generic/reconfig_template.pt:44
+#: n/skins/custom_generic/reconfig_template.pt:48
msgid "This is the address of your local SMTP (out-going mail) server."
msgstr "This is the address of your local SMTP (out-going mail) server."
-#: n/skins/custom_generic/reconfig_template.pt:50
+#: n/skins/custom_generic/reconfig_template.pt:56
msgid "Portal title"
msgstr "Portal title"
-#: n/skins/custom_generic/reconfig_template.pt:54
+#: n/skins/custom_generic/reconfig_template.pt:61
msgid "This is the title which appears at the top of every portal page."
msgstr "This is the title which appears at the top of every portal page."
-#: n/skins/custom_generic/reconfig_template.pt:60
+#: n/skins/custom_generic/reconfig_template.pt:69
msgid "Portal description"
msgstr "Portal description"
-#: n/skins/custom_generic/reconfig_template.pt:64
+#: n/skins/custom_generic/reconfig_template.pt:73
msgid ""
"This description is made available via syndicated content and elsewhere. It "
"should be fairly brief."
@@ -1004,63 +1004,53 @@ msgstr ""
"This description is made available via syndicated content and elsewhere. It "
"should be fairly brief."
-#: n/skins/custom_generic/reconfig_template.pt:70
+#: n/skins/custom_generic/reconfig_template.pt:81
msgid "Keywords"
msgstr "Keywords"
-#: n/skins/custom_generic/reconfig_template.pt:74
+#: n/skins/custom_generic/reconfig_template.pt:85
msgid ""
"Keywords describing the portal. Type one keyword (or expression) per line."
msgstr ""
"Keywords describing the portal. Type one keyword (or expression) per line."
-#: n/skins/custom_generic/reconfig_template.pt:79
+#: n/skins/custom_generic/reconfig_template.pt:93
msgid "Copyright notice"
msgstr "Copyright notice"
-#: n/skins/custom_generic/reconfig_template.pt:83
+#: n/skins/custom_generic/reconfig_template.pt:98
msgid "Copyright notice displayed on the portal footer."
msgstr "Copyright notice displayed on the portal footer."
-#: n/skins/custom_generic/reconfig_template.pt:88
-msgid "Password policy"
-msgstr "Password policy"
+#: n/skins/custom_generic/reconfig_template.pt:105
+msgid "Registration policy"
+msgstr "Registration policy"
-#: n/skins/custom_generic/reconfig_template.pt:92
-msgid "Generate and email members' initial password"
-msgstr "Generate and email members' initial password"
+#: n/skins/custom_generic/reconfig_template.pt:110
+msgid "Send email to new members to validate their registrations"
+msgstr "Send email to new members to validate their registrations"
-#: n/skins/custom_generic/reconfig_template.pt:97
-msgid "Allow members to select their initial password"
-msgstr "Allow members to select their initial password"
+#: n/skins/custom_generic/reconfig_template.pt:118
+msgid "Allow new members to select their initial passwords"
+msgstr "Allow new members to select their initial passwords"
-#: n/skins/custom_generic/reconfig_template.pt:102
-msgid "Portal default encoding"
-msgstr "Portal default encoding"
-
-#: n/skins/custom_generic/reconfig_template.pt:107
-msgid ""
-"Charset used to decode portal content strings. If empty, 'ascii' is used."
-msgstr ""
-"Charset used to decode portal content strings. If empty, 'ascii' is used."
-
-#: n/skins/custom_generic/reconfig_template.pt:113
+#: n/skins/custom_generic/reconfig_template.pt:125
msgid "Thumbnails size"
msgstr "Thumbnails size"
-#: n/skins/custom_generic/reconfig_template.pt:119
+#: n/skins/custom_generic/reconfig_template.pt:130
msgid "This is the size of the thumbnails in the photo album, in pixels."
msgstr "This is the size of the thumbnails in the photo album, in pixels."
-#: n/skins/custom_generic/reconfig_template.pt:124
+#: n/skins/custom_generic/reconfig_template.pt:138
msgid "Default ajax options"
msgstr "Default ajax options"
-#: n/skins/custom_generic/reconfig_template.pt:128
+#: n/skins/custom_generic/reconfig_template.pt:143
msgid "Enable handling of all clicks over links"
msgstr "Enable handling of all clicks over links"
-#: n/skins/custom_generic/reconfig_template.pt:133
+#: n/skins/custom_generic/reconfig_template.pt:149
msgid "Enable handling of all forms submissions"
msgstr "Enable handling of all forms submissions"
@@ -2953,6 +2943,26 @@ msgstr "Directory"
msgid "Configure portal"
msgstr "Configure portal"
+#~ msgid "Registration option"
+#~ msgstr "Registration option"
+
+#~ msgid "Password policy"
+#~ msgstr "Password policy"
+
+#~ msgid "Generate and email members' initial password"
+#~ msgstr "Generate and email members' initial password"
+
+#~ msgid "Allow members to select their initial password"
+#~ msgstr "Allow members to select their initial password"
+
+#~ msgid "Portal default encoding"
+#~ msgstr "Portal default encoding"
+
+#~ msgid ""
+#~ "Charset used to decode portal content strings. If empty, 'ascii' is used."
+#~ msgstr ""
+#~ "Charset used to decode portal content strings. If empty, 'ascii' is used."
+
#~ msgid "\"%s\" username not found."
#~ msgstr "\"%s\" username not found."
diff --git a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo
index e7103f57701328a50815ae17c98979ae141c4cb2..9bd1fc3fc3c85702af128a1161761b5ab2456219 100644
GIT binary patch
delta 15815
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
delta 16027
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
diff --git a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
index e075be8..2f92760 100644
--- a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
+++ b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Plinn 2.0\n"
-"POT-Creation-Date: Fri Apr 17 09:59:32 2015\n"
+"POT-Creation-Date: Fri Apr 17 10:39:07 2015\n"
"PO-Revision-Date: 2015-04-15 15:06+0200\n"
"Last-Translator: Benoît PIN\n"
"Language-Team: CRI http://cri.ensmp.fr\n"
@@ -34,7 +34,8 @@ msgstr "Votre mot de passe doit comporter au moins 8 caractères."
#: n/RegistrationTool.py:236
msgid "Your password and confirmation did not match. Please try again."
-msgstr "Votre mot de passe et sa confirmation sont différents. Essayez à nouveau."
+msgstr ""
+"Votre mot de passe et sa confirmation sont différents. Essayez à nouveau."
#: n/RegistrationTool.py:288
msgid "Complete your registration on the %s website"
@@ -946,7 +947,7 @@ msgstr "Préférences linguistiques"
msgid "Please enter language codes separated by spaces."
msgstr "Veuillez entrer les codes de langues, séparés par des espaces."
-#: n/skins/custom_generic/reconfig_template.pt:7
+#: n/skins/custom_generic/reconfig_template.pt:9
msgid "Configure the Portal"
msgstr "Configurer le portail"
@@ -964,38 +965,38 @@ msgid ""
msgstr ""
"Lorsque le portail envoie un mail, il utilise ce nom pour l'expéditeur."
-#: n/skins/custom_generic/reconfig_template.pt:28
+#: n/skins/custom_generic/reconfig_template.pt:30
msgid "Portal 'From' address"
msgstr "Email d'expéditeur"
-#: n/skins/custom_generic/reconfig_template.pt:33
+#: n/skins/custom_generic/reconfig_template.pt:35
msgid ""
"When the portal generates mail, it uses this address as its (apparent) "
"return address."
msgstr ""
"Lorsque le portail envoie un mail, il utilise cette adresse d'expédition."
-#: n/skins/custom_generic/reconfig_template.pt:39
+#: n/skins/custom_generic/reconfig_template.pt:43
msgid "SMTP server"
msgstr "Serveur SMTP"
-#: n/skins/custom_generic/reconfig_template.pt:44
+#: n/skins/custom_generic/reconfig_template.pt:48
msgid "This is the address of your local SMTP (out-going mail) server."
msgstr "Ceci est l'adresse de votre serveur SMTP (courrier sortant)."
-#: n/skins/custom_generic/reconfig_template.pt:50
+#: n/skins/custom_generic/reconfig_template.pt:56
msgid "Portal title"
msgstr "Titre du portail"
-#: n/skins/custom_generic/reconfig_template.pt:54
+#: n/skins/custom_generic/reconfig_template.pt:61
msgid "This is the title which appears at the top of every portal page."
msgstr "Ceci est le titre qui apparaîtra en haut de chaque page."
-#: n/skins/custom_generic/reconfig_template.pt:60
+#: n/skins/custom_generic/reconfig_template.pt:69
msgid "Portal description"
msgstr "Description du portail"
-#: n/skins/custom_generic/reconfig_template.pt:64
+#: n/skins/custom_generic/reconfig_template.pt:73
msgid ""
"This description is made available via syndicated content and elsewhere. It "
"should be fairly brief."
@@ -1003,65 +1004,54 @@ msgstr ""
"Cette description est visible via les canaux de diffusion et partout "
"ailleurs. Il est recommandé d'être concis."
-#: n/skins/custom_generic/reconfig_template.pt:70
+#: n/skins/custom_generic/reconfig_template.pt:81
msgid "Keywords"
msgstr "Mots clés"
-#: n/skins/custom_generic/reconfig_template.pt:74
+#: n/skins/custom_generic/reconfig_template.pt:85
msgid ""
"Keywords describing the portal. Type one keyword (or expression) per line."
msgstr ""
"Mots clés décrivant le portail. Entrez un mot (ou expression) par ligne."
-#: n/skins/custom_generic/reconfig_template.pt:79
+#: n/skins/custom_generic/reconfig_template.pt:93
msgid "Copyright notice"
msgstr "Mention légale"
-#: n/skins/custom_generic/reconfig_template.pt:83
+#: n/skins/custom_generic/reconfig_template.pt:98
msgid "Copyright notice displayed on the portal footer."
msgstr "Mention légale affichée sur le pied de page du portail."
-#: n/skins/custom_generic/reconfig_template.pt:88
-msgid "Password policy"
-msgstr "Option des mots de passe"
-
-#: n/skins/custom_generic/reconfig_template.pt:92
-msgid "Generate and email members' initial password"
-msgstr "Générer et envoyer par e-mail les mots de passe initiaux aux membres"
+#: n/skins/custom_generic/reconfig_template.pt:105
+msgid "Registration policy"
+msgstr "Modalité d'inscription"
-#: n/skins/custom_generic/reconfig_template.pt:97
-msgid "Allow members to select their initial password"
-msgstr "Autoriser les membres à choisir leur mot de passe initial"
+#: n/skins/custom_generic/reconfig_template.pt:110
+msgid "Send email to new members to validate their registrations"
+msgstr "Envoyer un email aux nouveaux membres pour valider leurs inscriptions"
-#: n/skins/custom_generic/reconfig_template.pt:102
-msgid "Portal default encoding"
-msgstr "Encodage par défaut du portail"
+#: n/skins/custom_generic/reconfig_template.pt:118
+msgid "Allow new members to select their initial passwords"
+msgstr "Permettre aux nouveaux membre de choisir leurs mots de passe initiaux"
-#: n/skins/custom_generic/reconfig_template.pt:107
-msgid ""
-"Charset used to decode portal content strings. If empty, 'ascii' is used."
-msgstr ""
-"Encodage utilisé par le portail pour décoder les textes des contenus. Si ce "
-"champ est laissé vide, c'est l'encodage ascii qui sera utilisé."
-
-#: n/skins/custom_generic/reconfig_template.pt:113
+#: n/skins/custom_generic/reconfig_template.pt:125
msgid "Thumbnails size"
msgstr "Taille des vignettes"
-#: n/skins/custom_generic/reconfig_template.pt:119
+#: n/skins/custom_generic/reconfig_template.pt:130
msgid "This is the size of the thumbnails in the photo album, in pixels."
msgstr ""
"C'est la taille, en pixels, utilisée pour les vignettes des albums photo."
-#: n/skins/custom_generic/reconfig_template.pt:124
+#: n/skins/custom_generic/reconfig_template.pt:138
msgid "Default ajax options"
msgstr "Options ajax par défaut"
-#: n/skins/custom_generic/reconfig_template.pt:128
+#: n/skins/custom_generic/reconfig_template.pt:143
msgid "Enable handling of all clicks over links"
msgstr "Activer l'interception de tous les clicks sur les liens"
-#: n/skins/custom_generic/reconfig_template.pt:133
+#: n/skins/custom_generic/reconfig_template.pt:149
msgid "Enable handling of all forms submissions"
msgstr "Activer l'interception de tous les envois de formulaires"
@@ -2972,6 +2962,28 @@ msgstr "Annuaire"
msgid "Configure portal"
msgstr "Configurer portail"
+#~ msgid "Registration option"
+#~ msgstr "Option d'inscription"
+
+#~ msgid "Password policy"
+#~ msgstr "Option des mots de passe"
+
+#~ msgid "Generate and email members' initial password"
+#~ msgstr ""
+#~ "Générer et envoyer par e-mail les mots de passe initiaux aux membres"
+
+#~ msgid "Allow members to select their initial password"
+#~ msgstr "Autoriser les membres à choisir leur mot de passe initial"
+
+#~ msgid "Portal default encoding"
+#~ msgstr "Encodage par défaut du portail"
+
+#~ msgid ""
+#~ "Charset used to decode portal content strings. If empty, 'ascii' is used."
+#~ msgstr ""
+#~ "Encodage utilisé par le portail pour décoder les textes des contenus. Si "
+#~ "ce champ est laissé vide, c'est l'encodage ascii qui sera utilisé."
+
#~ msgid "\"%s\" username not found."
#~ msgstr "Nom : « %s » non trouvé."
diff --git a/Products/Plinn/locales/plinn.pot b/Products/Plinn/locales/plinn.pot
index 8c18e8a..2b3fa42 100644
--- a/Products/Plinn/locales/plinn.pot
+++ b/Products/Plinn/locales/plinn.pot
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 2.0 beta 1\n"
-"POT-Creation-Date: Fri Apr 17 09:59:32 2015\n"
+"POT-Creation-Date: Fri Apr 17 10:39:07 2015\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
@@ -887,7 +887,7 @@ msgstr ""
msgid "Please enter language codes separated by spaces."
msgstr ""
-#: n/skins/custom_generic/reconfig_template.pt:7
+#: n/skins/custom_generic/reconfig_template.pt:9
msgid "Configure the Portal"
msgstr ""
@@ -903,91 +903,83 @@ msgstr ""
msgid "When the portal generates mail, it uses this name as its (apparent) sender."
msgstr ""
-#: n/skins/custom_generic/reconfig_template.pt:28
+#: n/skins/custom_generic/reconfig_template.pt:30
msgid "Portal 'From' address"
msgstr ""
-#: n/skins/custom_generic/reconfig_template.pt:33
+#: n/skins/custom_generic/reconfig_template.pt:35
msgid "When the portal generates mail, it uses this address as its (apparent) return address."
msgstr ""
-#: n/skins/custom_generic/reconfig_template.pt:39
+#: n/skins/custom_generic/reconfig_template.pt:43
msgid "SMTP server"
msgstr ""
-#: n/skins/custom_generic/reconfig_template.pt:44
+#: n/skins/custom_generic/reconfig_template.pt:48
msgid "This is the address of your local SMTP (out-going mail) server."
msgstr ""
-#: n/skins/custom_generic/reconfig_template.pt:50
+#: n/skins/custom_generic/reconfig_template.pt:56
msgid "Portal title"
msgstr ""
-#: n/skins/custom_generic/reconfig_template.pt:54
+#: n/skins/custom_generic/reconfig_template.pt:61
msgid "This is the title which appears at the top of every portal page."
msgstr ""
-#: n/skins/custom_generic/reconfig_template.pt:60
+#: n/skins/custom_generic/reconfig_template.pt:69
msgid "Portal description"
msgstr ""
-#: n/skins/custom_generic/reconfig_template.pt:64
+#: n/skins/custom_generic/reconfig_template.pt:73
msgid "This description is made available via syndicated content and elsewhere. It should be fairly brief."
msgstr ""
-#: n/skins/custom_generic/reconfig_template.pt:70
+#: n/skins/custom_generic/reconfig_template.pt:81
msgid "Keywords"
msgstr ""
-#: n/skins/custom_generic/reconfig_template.pt:74
+#: n/skins/custom_generic/reconfig_template.pt:85
msgid "Keywords describing the portal. Type one keyword (or expression) per line."
msgstr ""
-#: n/skins/custom_generic/reconfig_template.pt:79
+#: n/skins/custom_generic/reconfig_template.pt:93
msgid "Copyright notice"
msgstr ""
-#: n/skins/custom_generic/reconfig_template.pt:83
+#: n/skins/custom_generic/reconfig_template.pt:98
msgid "Copyright notice displayed on the portal footer."
msgstr ""
-#: n/skins/custom_generic/reconfig_template.pt:88
-msgid "Password policy"
+#: n/skins/custom_generic/reconfig_template.pt:105
+msgid "Registration policy"
msgstr ""
-#: n/skins/custom_generic/reconfig_template.pt:92
-msgid "Generate and email members' initial password"
+#: n/skins/custom_generic/reconfig_template.pt:110
+msgid "Send email to new members to validate their registrations"
msgstr ""
-#: n/skins/custom_generic/reconfig_template.pt:97
-msgid "Allow members to select their initial password"
+#: n/skins/custom_generic/reconfig_template.pt:118
+msgid "Allow new members to select their initial passwords"
msgstr ""
-#: n/skins/custom_generic/reconfig_template.pt:102
-msgid "Portal default encoding"
-msgstr ""
-
-#: n/skins/custom_generic/reconfig_template.pt:107
-msgid "Charset used to decode portal content strings. If empty, 'ascii' is used."
-msgstr ""
-
-#: n/skins/custom_generic/reconfig_template.pt:113
+#: n/skins/custom_generic/reconfig_template.pt:125
msgid "Thumbnails size"
msgstr ""
-#: n/skins/custom_generic/reconfig_template.pt:119
+#: n/skins/custom_generic/reconfig_template.pt:130
msgid "This is the size of the thumbnails in the photo album, in pixels."
msgstr ""
-#: n/skins/custom_generic/reconfig_template.pt:124
+#: n/skins/custom_generic/reconfig_template.pt:138
msgid "Default ajax options"
msgstr ""
-#: n/skins/custom_generic/reconfig_template.pt:128
+#: n/skins/custom_generic/reconfig_template.pt:143
msgid "Enable handling of all clicks over links"
msgstr ""
-#: n/skins/custom_generic/reconfig_template.pt:133
+#: n/skins/custom_generic/reconfig_template.pt:149
msgid "Enable handling of all forms submissions"
msgstr ""
diff --git a/Products/Plinn/skins/custom_generic/reconfig_form.py b/Products/Plinn/skins/custom_generic/reconfig_form.py
index 8a0c540..1b9292d 100644
--- a/Products/Plinn/skins/custom_generic/reconfig_form.py
+++ b/Products/Plinn/skins/custom_generic/reconfig_form.py
@@ -29,7 +29,6 @@ options['form'] = { 'action': target,
'keywords': '\n'.join(ptool.getProperty('keywords', [])),
'copyright_notice': ptool.getProperty('copyright_notice'),
'validate_email': ptool.getProperty('validate_email'),
- 'default_charset': ptool.getProperty('default_charset', ''),
'slide_size' : ptool.getProperty('slide_size', ''),
'listButtonInfos': tuple(buttons),
'ajax_rootClickHandler' : ajax_config & 1 == 1,
diff --git a/Products/Plinn/skins/custom_generic/reconfig_template.pt b/Products/Plinn/skins/custom_generic/reconfig_template.pt
index 22425ae..ed96bbf 100644
--- a/Products/Plinn/skins/custom_generic/reconfig_template.pt
+++ b/Products/Plinn/skins/custom_generic/reconfig_template.pt
@@ -1,52 +1,67 @@
-<?xml version="1.0" encoding="utf-8"?>
-<html xmlns:tal="http://xml.zope.org/namespaces/tal" xmlns:metal="http://xml.zope.org/namespaces/metal" xmlns:i18n="http://xml.zope.org/namespaces/i18n" metal:use-macro="context/main_template/macros/master">
+<html xmlns:tal="http://xml.zope.org/namespaces/tal"
+ xmlns:metal="http://xml.zope.org/namespaces/metal"
+ xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+ metal:use-macro="context/main_template/macros/master">
<head>
<meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
</head>
<body metal:fill-slot="main_no_tabs" i18n:domain="plinn" tal:omit-tag="" tal:define="form options/form">
<h1 i18n:translate="">Configure the Portal</h1>
<div class="config">
- <p i18n:translate="">This form is used to set the portal configuration
- options.</p>
+ <p i18n:translate="">
+ This form is used to set the portal configuration options.
+ </p>
<form method="post" tal:attributes="action form/action">
<table class="TwoColumnForm">
<tr>
<th i18n:translate="">Portal 'From' name</th>
<td>
- <input name="email_from_name" value="" tal:attributes="value form/email_from_name"/>
+ <input name="email_from_name" value=""
+ tal:attributes="value form/email_from_name"/>
<dl class="FieldHelp">
- <dd i18n:translate="">When the portal generates mail, it uses this name as
- its (apparent) sender.</dd>
+ <dd i18n:translate="">
+ When the portal generates mail, it uses this name as its
+ (apparent) sender.
+ </dd>
</dl>
</td>
</tr>
<tr>
<th i18n:translate="">Portal 'From' address</th>
<td>
- <input name="email_from_address" value="" tal:attributes="value form/email_from_address"/>
+ <input name="email_from_address" value=""
+ tal:attributes="value form/email_from_address"/>
<dl class="FieldHelp">
- <dd i18n:translate="">When the portal generates mail, it uses this address
- as its (apparent) return address.</dd>
+ <dd i18n:translate="">
+ When the portal generates mail, it uses this address as its
+ (apparent) return address.
+ </dd>
</dl>
</td>
</tr>
<tr>
<th i18n:translate="">SMTP server</th>
<td>
- <input name="smtp_server" value="" tal:attributes="value form/smtp_server"/>
+ <input name="smtp_server" value=""
+ tal:attributes="value form/smtp_server"/>
<dl class="FieldHelp">
- <dd i18n:translate="">This is the address of your local SMTP (out-going
- mail) server.</dd>
+ <dd i18n:translate="">
+ This is the address of your local SMTP (out-going mail)
+ server.
+ </dd>
</dl>
</td>
</tr>
<tr>
<th i18n:translate="">Portal title</th>
<td>
- <input name="title" value="" tal:attributes="value form/title"/>
+ <input name="title" value=""
+ tal:attributes="value form/title"/>
<dl class="FieldHelp">
- <dd i18n:translate="">This is the title which appears at the top of every
- portal page.</dd>
+ <dd i18n:translate="">
+ This is the title which appears at the top of every portal
+ page.
+ </dd>
</dl>
</td>
</tr>
@@ -55,8 +70,10 @@
<td class="TextField">
<textarea name="description" rows="3" cols="40" tal:content="form/description"/>
<dl class="FieldHelp">
- <dd i18n:translate=""> This description is made available via syndicated
- content and elsewhere. It should be fairly brief.</dd>
+ <dd i18n:translate="">
+ This description is made available via syndicated content and
+ elsewhere. It should be fairly brief.
+ </dd>
</dl>
</td>
</tr>
@@ -65,66 +82,70 @@
<td class="TextField">
<textarea name="keywords:lines" rows="6" cols="40" tal:content="form/keywords"/>
<dl class="FieldHelp">
- <dd i18n:translate="">Keywords describing the portal. Type one keyword (or expression) per line.</dd>
+ <dd i18n:translate="">
+ Keywords describing the portal. Type one keyword (or
+ expression) per line.
+ </dd>
</dl>
</td>
</tr>
- <tr i18n:domain="plinn">
+ <tr>
<th i18n:translate="">Copyright notice</th>
<td class="TextField">
- <input name="copyright_notice" value="" tal:attributes="value form/copyright_notice"/>
+ <input name="copyright_notice" value=""
+ tal:attributes="value form/copyright_notice"/>
<dl class="FieldHelp">
- <dd i18n:translate="">Copyright notice displayed on the portal footer.</dd>
+ <dd i18n:translate="">
+ Copyright notice displayed on the portal footer.
+ </dd>
</dl>
</td>
</tr>
<tr>
- <th i18n:translate="">Password policy</th>
+ <th i18n:translate="">Registration policy</th>
<td>
<label>
- <input type="radio" name="validate_email:boolean" value="True" tal:attributes="checked form/validate_email"/>
- <tal:span i18n:translate="">Generate and email members' initial
- password</tal:span>
+ <input type="radio" name="validate_email:boolean" value="True"
+ tal:attributes="checked form/validate_email"/>
+ <span i18n:translate="" tal:omit-tag="">
+ Send email to new members to validate their registrations
+ </span>
</label>
<br/>
<label>
- <input type="radio" name="validate_email:boolean" value="False" tal:attributes="checked not:form/validate_email"/>
- <tal:span i18n:translate="">Allow members to select their initial
- password</tal:span>
+ <input type="radio" name="validate_email:boolean" value="False"
+ tal:attributes="checked not:form/validate_email"/>
+ <span i18n:translate="" tal:omit-tag="">
+ Allow new members to select their initial passwords
+ </span>
</label>
</td>
</tr>
<tr>
- <th i18n:translate="">Portal default encoding</th>
+ <th i18n:translate="">Thumbnails size</th>
<td>
- <input name="default_charset" value="" disabled="disabled" tal:attributes="value form/default_charset"/>
+ <input name="slide_size:int" value=""
+ tal:attributes="value form/slide_size" size="5"/>
<dl class="FieldHelp">
- <dd i18n:translate="">Charset used to decode portal content strings.
- If empty, 'ascii' is used.</dd>
+ <dd i18n:translate="">
+ This is the size of the thumbnails in the photo album, in
+ pixels.
+ </dd>
</dl>
</td>
</tr>
<tr>
- <th i18n:translate="">
- Thumbnails size
- </th>
- <td>
- <input name="slide_size:int" value="" tal:attributes="value form/slide_size" size="5"/>
- <dl class="FieldHelp">
- <dd i18n:translate="">This is the size of the thumbnails in the photo album, in pixels.</dd>
- </dl>
- </td>
- </tr>
- <tr i18n:domain="plinn">
<th i18n:translate="">Default ajax options</th>
<td>
<label>
- <input type="checkbox" name="ajax_rootClickHandler:boolean" tal:attributes="checked form/ajax_rootClickHandler"/>
+ <input type="checkbox" name="ajax_rootClickHandler:boolean"
+ tal:attributes="checked form/ajax_rootClickHandler"/>
<span i18n:translate="" tal:omit-tag="">Enable handling of all clicks over links</span>
</label>
<br/>
<label>
- <input type="checkbox" name="ajax_autoFormManager:boolean" tal:attributes="checked form/ajax_autoFormManager"/>
+ <input type="checkbox" name="ajax_autoFormManager:boolean"
+ tal:attributes="checked form/ajax_autoFormManager"/>
<span i18n:translate="" tal:omit-tag="">Enable handling of all forms submissions</span>
</label>
</td>
--
2.20.1