From 62ac29b175a502632e52a22d199da9ad5f01294f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Wed, 9 Jul 2014 15:27:33 +0200 Subject: [PATCH 01/16] =?utf8?q?Mise=20=C3=A0=20jour=20des=20en-t=C3=AAtes?= =?utf8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Folder.py | 2 +- skins/ajax_scripts/ajax_form_manager.js | 2 +- skins/ajax_scripts/javascript_events_api.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Folder.py b/Folder.py index 9b30e53..8ed3cc3 100644 --- a/Folder.py +++ b/Folder.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ####################################################################################### # Plinn - http://plinn.org # -# Copyright (C) 2005-2007 Benoît PIN # +# Copyright (C) 2005-2014 Benoît Pin # # # # This program is free software; you can redistribute it and/or # # modify it under the terms of the GNU General Public License # diff --git a/skins/ajax_scripts/ajax_form_manager.js b/skins/ajax_scripts/ajax_form_manager.js index 248f183..acca796 100644 --- a/skins/ajax_scripts/ajax_form_manager.js +++ b/skins/ajax_scripts/ajax_form_manager.js @@ -1,4 +1,4 @@ -// (c) Benoît PIN 2006-2007 +// (c) Benoît PIN 2006-2014 // http://plinn.org // Licence GPL // diff --git a/skins/ajax_scripts/javascript_events_api.js b/skins/ajax_scripts/javascript_events_api.js index a442250..174491e 100644 --- a/skins/ajax_scripts/javascript_events_api.js +++ b/skins/ajax_scripts/javascript_events_api.js @@ -1,4 +1,4 @@ -// (c) Benoît PIN 2006-2009 +// (c) Benoît PIN 2006-2014 // http://plinn.org // Licence GPL // -- 2.20.1 From 497dc01810e6f02731c0e13fa43a63384e9261ef Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Thu, 10 Jul 2014 14:43:44 +0200 Subject: [PATCH 02/16] Spaces -> tabs --- skins/ajax_scripts/javascript_events_api.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/skins/ajax_scripts/javascript_events_api.js b/skins/ajax_scripts/javascript_events_api.js index 174491e..94960c0 100644 --- a/skins/ajax_scripts/javascript_events_api.js +++ b/skins/ajax_scripts/javascript_events_api.js @@ -6,7 +6,7 @@ // Meta functions for events management. var addListener; /* (ob, eventName, listenerFunction, group) add event listener eventName without "on" prefix. - * optionally, listeners can be grouped to make removing convenient. + * optionally, listeners can be grouped to make removing convenient. */ var removeListener; // (ob, eventName, listenerFunction, group) remove event listener. var removeGroupListeners; // (group) remove all listeners in group. @@ -29,7 +29,7 @@ var getCopyOfNode; /* (node) returns a clone of the given node. var copyPrototype; // (descendant, parent) lightwheight javascript inheritance if (!history.pushState) { - history.pushState = function(){}; + history.pushState = function(){}; } (function(){ @@ -226,12 +226,12 @@ function _build_clearSelection() { buildMetaFunctions(); addListener(window, 'load', function(evt) { - // html5 facade - if (!document.body.classList) { - var nop = function(){}; - var fakeDOMTokenList = {'length':0, 'item':nop, 'contains':nop, 'add':nop, 'remove':nop, 'toggle':nop}; - Element.prototype.classList = fakeDOMTokenList; - } + // html5 facade + if (!document.body.classList) { + var nop = function(){}; + var fakeDOMTokenList = {'length':0, 'item':nop, 'contains':nop, 'add':nop, 'remove':nop, 'toggle':nop}; + Element.prototype.classList = fakeDOMTokenList; + } }); -- 2.20.1 From 9f74f9ce0087b9e2406458847fb7e68863a7be2a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Thu, 10 Jul 2014 15:13:29 +0200 Subject: [PATCH 03/16] =?utf8?q?Ajout=20m=C3=A9thodes=20getWindowScrollX,?= =?utf8?q?=20getWindowScrollY.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- skins/ajax_scripts/javascript_events_api.js | 28 +++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/skins/ajax_scripts/javascript_events_api.js b/skins/ajax_scripts/javascript_events_api.js index 94960c0..b4df40e 100644 --- a/skins/ajax_scripts/javascript_events_api.js +++ b/skins/ajax_scripts/javascript_events_api.js @@ -45,6 +45,8 @@ function buildMetaFunctions() { disablePropagation = _build_disablePropagation(); getWindowWidth = _build_getWindowWidth(); getWindowHeight = _build_getWindowHeight(); + getWindowScrollX = _build_getWindowScrollX(); + getWindowScrollY = _build_getWindowScrollY(); clearSelection = _build_clearSelection(); } @@ -210,6 +212,32 @@ function _build_getWindowHeight() { } } +function _build_getWindowScrollX() { + if (window.scrollX !== undefined) { + return function(){ + return window.scrollX; + }; + } + else { + return function(){ + return document.body.scrollLeft; + }; + } +} + +function _build_getWindowScrollY() { + if (window.scrollY !== undefined) { + return function(){ + return window.scrollY; + }; + } + else { + return function(){ + return document.body.scrollTop; + }; + } +} + function _build_clearSelection() { if (document.selection) { return function() { -- 2.20.1 From 628970a411a24c0e46ce892094a523e0e0f23698 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Thu, 10 Jul 2014 15:52:27 +0200 Subject: [PATCH 04/16] bugfix --- skins/ajax_scripts/javascript_events_api.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skins/ajax_scripts/javascript_events_api.js b/skins/ajax_scripts/javascript_events_api.js index b4df40e..2539fd9 100644 --- a/skins/ajax_scripts/javascript_events_api.js +++ b/skins/ajax_scripts/javascript_events_api.js @@ -220,7 +220,7 @@ function _build_getWindowScrollX() { } else { return function(){ - return document.body.scrollLeft; + return document.documentElement.scrollLeft; }; } } @@ -233,7 +233,7 @@ function _build_getWindowScrollY() { } else { return function(){ - return document.body.scrollTop; + return document.documentElement.scrollTop; }; } } -- 2.20.1 From 0da80716bf55ac81a418680dd36cf721dcb3c29d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Fri, 11 Jul 2014 09:50:36 +0200 Subject: [PATCH 05/16] Slides / thumbnails plus grandes. --- profiles/photo/properties.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/profiles/photo/properties.xml b/profiles/photo/properties.xml index 854f3ec..7ef7fb6 100644 --- a/profiles/photo/properties.xml +++ b/profiles/photo/properties.xml @@ -27,8 +27,8 @@ 2 - 192 - 222 + 278 + 300 #484848 25 100 -- 2.20.1 From 8a303e66fd249f6bb2f9ba0522eca355fe401ab6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Wed, 16 Jul 2014 11:33:07 +0200 Subject: [PATCH 06/16] =?utf8?q?Tabs=20->=204=20=C3=97=20spaces?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- __init__.py | 130 ++++++++++++++++++++++++++-------------------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/__init__.py b/__init__.py index 16c9e72..d4f4f53 100755 --- a/__init__.py +++ b/__init__.py @@ -1,21 +1,21 @@ # -*- coding: utf-8 -*- ####################################################################################### -# Plinn - http://plinn.org # -# Copyright (C) 2005-2007 Benoît PIN # -# # -# This program is free software; you can redistribute it and/or # -# modify it under the terms of the GNU General Public License # -# as published by the Free Software Foundation; either version 2 # -# of the License, or (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program; if not, write to the Free Software # -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # +# Plinn - http://plinn.org # +# Copyright (C) 2005-2007 Benoît PIN # +# # +# This program is free software; you can redistribute it and/or # +# modify it under the terms of the GNU General Public License # +# as published by the Free Software Foundation; either version 2 # +# of the License, or (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program; if not, write to the Free Software # +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ####################################################################################### """ Plinn implementation of CMFCore. @@ -51,14 +51,14 @@ contentClasses = (File.File, Folder.PlinnFolder, HugePlinnFolder.HugePlinnFolder contentConstructors = (File.addFile, Folder.manage_addPlinnFolder, HugePlinnFolder.manage_addHugePlinnFolder, Topic.addTopic) tools = ( MembershipTool.MembershipTool - , MemberDataTool.MemberDataTool - , GroupsTool.GroupsTool - , GroupDataTool.GroupDataTool - , RegistrationTool.RegistrationTool - , CalendarTool.CalendarTool - , AttachmentTool.AttachmentTool - , catalog.CatalogTool - ) + , MemberDataTool.MemberDataTool + , GroupsTool.GroupsTool + , GroupDataTool.GroupDataTool + , RegistrationTool.RegistrationTool + , CalendarTool.CalendarTool + , AttachmentTool.AttachmentTool + , catalog.CatalogTool + ) # register files extensions registerFileExtension('ttf', FSFile) @@ -66,32 +66,32 @@ registerFileExtension('eot', FSFile) registerFileExtension('cur', FSFile) def initialize(registrar) : - - allow_module('quopri') - allow_module('Products.Plinn.PloneMisc') - allow_class(IndexIterator) - allow_class(Batch) - - core_cmf_utils.ContentInit( - 'Plinn', - content_types = contentClasses, - permission = AddPortalContent, - extra_constructors = contentConstructors, - ).initialize(registrar) - - core_cmf_utils.ToolInit('Plinn Tool', - tools = tools, - icon = 'tool.gif' - ).initialize(registrar) - - + + allow_module('quopri') + allow_module('Products.Plinn.PloneMisc') + allow_class(IndexIterator) + allow_class(Batch) + + core_cmf_utils.ContentInit( + 'Plinn', + content_types = contentClasses, + permission = AddPortalContent, + extra_constructors = contentConstructors, + ).initialize(registrar) + + core_cmf_utils.ToolInit('Plinn Tool', + tools = tools, + icon = 'tool.gif' + ).initialize(registrar) + + # Monkey... # all tags are good ! validTags = default_cmf_utils.NASTY_TAGS.copy() for tag in validTags.keys() : - validTags[tag] = 1 + validTags[tag] = 1 VALID_TAGS = {'font': 1, 'param' : 1, 'iframe' : 1} @@ -113,27 +113,27 @@ from urllib import quote from Products.CMFCore.utils import getToolByName def getIcon(self, relative_to_portal=0): - """ - Using this method allows the content class - creator to grab icons on the fly instead of using a fixed - attribute on the class. - """ - ti = self.getTypeInfo() - if ti is not None: - icon = quote(ti.getIcon()) - if icon: - if relative_to_portal: - return icon - else: - # Relative to REQUEST['BASEPATH1'] - portal_url = getToolByName( self, 'portal_url' ) - res = portal_url(relative=1) + '/' + icon - while res[:1] == '/': - res = res[1:] - return res - return 'misc_/OFSP/dtmldoc.gif' - -icon = getIcon # For the ZMI + """ + Using this method allows the content class + creator to grab icons on the fly instead of using a fixed + attribute on the class. + """ + ti = self.getTypeInfo() + if ti is not None: + icon = quote(ti.getIcon()) + if icon: + if relative_to_portal: + return icon + else: + # Relative to REQUEST['BASEPATH1'] + portal_url = getToolByName( self, 'portal_url' ) + res = portal_url(relative=1) + '/' + icon + while res[:1] == '/': + res = res[1:] + return res + return 'misc_/OFSP/dtmldoc.gif' + +icon = getIcon # For the ZMI from Products.CMFCore.DynamicType import DynamicType DynamicType.getIcon = getIcon -- 2.20.1 From fc06e9578d3d8b09689be7c58a92eec7b0175a57 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Wed, 16 Jul 2014 11:36:00 +0200 Subject: [PATCH 07/16] =?utf8?q?try=20/=20except=20pour=20d=C3=A9marrer=20?= =?utf8?q?sans=20Solr.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- __init__.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/__init__.py b/__init__.py index d4f4f53..fe63530 100755 --- a/__init__.py +++ b/__init__.py @@ -38,7 +38,11 @@ import GroupDataTool import RegistrationTool import CalendarTool import AttachmentTool -import catalog +try : + import catalog + __solr_ok = True +except ImportError : + __solr_ok = False from PloneMisc import IndexIterator, Batch import patch @@ -57,8 +61,9 @@ tools = ( MembershipTool.MembershipTool , RegistrationTool.RegistrationTool , CalendarTool.CalendarTool , AttachmentTool.AttachmentTool - , catalog.CatalogTool ) +if __solr_ok : + tools += (catalog.CatalogTool,) # register files extensions registerFileExtension('ttf', FSFile) -- 2.20.1 From d85cf9e640d2823901d8c98132e08967e52c41b6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Wed, 16 Jul 2014 13:57:03 +0200 Subject: [PATCH 08/16] Solr optionnel. --- profiles.zcml | 7 ++ profiles/default/catalog.xml | 2 +- profiles/default/toolset.xml | 2 +- profiles/solr/catalog.xml | 132 ++++++++++++++++++++++++++++ profiles/solr/componentregistry.xml | 9 ++ profiles/solr/toolset.xml | 5 ++ 6 files changed, 155 insertions(+), 2 deletions(-) create mode 100644 profiles/solr/catalog.xml create mode 100644 profiles/solr/componentregistry.xml create mode 100644 profiles/solr/toolset.xml diff --git a/profiles.zcml b/profiles.zcml index e72a243..d3422ef 100644 --- a/profiles.zcml +++ b/profiles.zcml @@ -16,4 +16,11 @@ description="Profile for a photo based Plinn site." for="Products.CMFCore.interfaces.ISiteRoot" /> + diff --git a/profiles/default/catalog.xml b/profiles/default/catalog.xml index 41914e7..10f32c2 100644 --- a/profiles/default/catalog.xml +++ b/profiles/default/catalog.xml @@ -1,5 +1,5 @@ - + + class="Products.CMFCore.CatalogTool.CatalogTool"/> + + + + + + + + + + + + + + + True + + + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + + + True + + + True + + + True + + + + + + + + + + + + + + + + + + + + + + + + + + + True + + + + + + + + + + + + + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/profiles/solr/componentregistry.xml b/profiles/solr/componentregistry.xml new file mode 100644 index 0000000..096b6d3 --- /dev/null +++ b/profiles/solr/componentregistry.xml @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/profiles/solr/toolset.xml b/profiles/solr/toolset.xml new file mode 100644 index 0000000..31c40a3 --- /dev/null +++ b/profiles/solr/toolset.xml @@ -0,0 +1,5 @@ + + + + -- 2.20.1 From ac1b519455256a4680c3221787a4ae1b77212248 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Mon, 21 Jul 2014 15:03:50 +0200 Subject: [PATCH 09/16] =?utf8?q?IHM=20pour=20=C3=A9dition=20des=20indexes?= =?utf8?q?=20d=C3=A9l=C3=A9gu=C3=A9s=20=C3=A0=20Solr.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- catalog.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/catalog.py b/catalog.py index 0a457f8..026bb04 100644 --- a/catalog.py +++ b/catalog.py @@ -5,7 +5,7 @@ from Products.CMFCore.interfaces import IIndexableObject from Products.CMFCore.CatalogTool import CatalogTool as BaseCatalogTool from Products.CMFCore.CatalogTool import IndexableObjectWrapper from Products.PageTemplates.PageTemplateFile import PageTemplateFile -from Products.CMFCore.permissions import ModifyPortalContent +from Products.CMFCore.permissions import ModifyPortalContent, ManagePortal from zope.component import queryMultiAdapter from Products.ZCatalog.Catalog import Catalog import transaction @@ -43,7 +43,8 @@ class CatalogTool(BaseCatalogTool) : manage_options = (BaseCatalogTool.manage_options[:5] + ({'label' : 'Solr', 'action' : 'manage_solr'},) + BaseCatalogTool.manage_options[5:]) - manage_solr = PageTemplateFile('www/manage_solr', globals()) + manage_solr = PageTemplateFile('www/manage_solr', globals(), __name__='manage_solr') + def __init__(self, idxs=[]) : @@ -52,6 +53,18 @@ class CatalogTool(BaseCatalogTool) : self.solr_url = 'http://localhost:8983/solr' self.delegatedIndexes = ('Title', 'Description', 'SearchableText') + security.declarePublic('getDelegatedIndexes') + def getDelegatedIndexes(self) : + """ read the method name """ + return self.delegatedIndexes + + security.declareProtected(ManagePortal, 'setDelegatedIndexes') + def setDelegatedIndexes(self, indexes, REQUEST=None) : + """setDelegatedIndexes documentation""" + self.delegatedIndexes = tuple([i.strip() for i in indexes if i.strip()]) + if REQUEST : + REQUEST.RESPONSE.redirect(self.absolute_url() + '/manage_solr?manage_tabs_message=Saved changes.') + def _getSolrConnection(self) : if not hasattr(self, _VOLATILE_SOLR_NAME) : con = SolrConnection(self.solr_url) -- 2.20.1 From 7605edef0b1cb8ee9ecf72d38e301e8977168b86 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Mon, 21 Jul 2014 16:01:54 +0200 Subject: [PATCH 10/16] Ajout formulaire de configuration des indexes Solr. --- www/manage_solr.zpt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 www/manage_solr.zpt diff --git a/www/manage_solr.zpt b/www/manage_solr.zpt new file mode 100644 index 0000000..3903698 --- /dev/null +++ b/www/manage_solr.zpt @@ -0,0 +1,18 @@ +header +tabs +
+

Configure Solr delegated indexes

+

+ Enter names of indexes to delegate to Solr. + One per line. +

+
+
+ +
+
+footer + + -- 2.20.1 From 9124e5aa275ab5911b712ccd3938b5b7f079dda7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Mon, 21 Jul 2014 16:35:16 +0200 Subject: [PATCH 11/16] Localisation. --- catalog.py | 2 +- locales/en/LC_MESSAGES/plinn.mo | Bin 2348 -> 2348 bytes locales/en/LC_MESSAGES/plinn.po | 16 ++++++++++++---- locales/fr/LC_MESSAGES/plinn.mo | Bin 42184 -> 42418 bytes locales/fr/LC_MESSAGES/plinn.po | 18 +++++++++++++----- locales/plinn.pot | 23 ++++++++++++++++------- www/{manage_solr.zpt => manage_solr.pt} | 0 7 files changed, 42 insertions(+), 17 deletions(-) rename www/{manage_solr.zpt => manage_solr.pt} (100%) diff --git a/catalog.py b/catalog.py index 026bb04..f2736cb 100644 --- a/catalog.py +++ b/catalog.py @@ -43,7 +43,7 @@ class CatalogTool(BaseCatalogTool) : manage_options = (BaseCatalogTool.manage_options[:5] + ({'label' : 'Solr', 'action' : 'manage_solr'},) + BaseCatalogTool.manage_options[5:]) - manage_solr = PageTemplateFile('www/manage_solr', globals(), __name__='manage_solr') + manage_solr = PageTemplateFile('www/manage_solr.pt', globals(), __name__='manage_solr') diff --git a/locales/en/LC_MESSAGES/plinn.mo b/locales/en/LC_MESSAGES/plinn.mo index 65d19a21bba39d4732e6b78bf899d563bb503a49..a3b9f893eae4d3ea81b4401789d5ddf720de58cc 100644 GIT binary patch delta 28 jcmZ1@v_@!yI~%`OX^w)Cp@N~Am9e3fk@@B@wrflPcH;-; delta 28 jcmZ1@v_@!yI~%`mVx@wik%E!2m9dGHsoCZ*wrflPcAp33 diff --git a/locales/en/LC_MESSAGES/plinn.po b/locales/en/LC_MESSAGES/plinn.po index 740eca6..9bbb2ad 100644 --- a/locales/en/LC_MESSAGES/plinn.po +++ b/locales/en/LC_MESSAGES/plinn.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Plinn 2.0\n" -"POT-Creation-Date: Mon May 12 23:42:25 2014\n" +"POT-Creation-Date: Mon Jul 21 16:31:27 2014\n" "PO-Revision-Date: 2013-11-28 13:12+0100\n" "Last-Translator: Benoît PIN\n" "Language-Team: CRI http://cri.ensmp.fr\n" @@ -171,7 +171,7 @@ msgstr "" #: n/skins/content/topic_edit_template.pt:26 #: n/skins/custom_content/document_edit_template.pt:23 #: n/skins/custom_content/event_edit_template.pt:135 -#: n/skins/generic/search_results_template.pt:87 +#: n/skins/generic/search_results_template.pt:87 n/www/manage_solr.pt:13 msgid "Save" msgstr "" @@ -683,12 +683,12 @@ msgstr "" msgid "Comments:" msgstr "" -#. Default: "Previous${number}" +#. Default: "previous ${number}" #: n/skins/generic/batch_macros.pt:26 msgid "batch_previous_x_items" msgstr "" -#. Default: "Next${number}items" +#. Default: "next ${number}" #: n/skins/generic/batch_macros.pt:32 msgid "batch_next_x_items" msgstr "" @@ -1414,6 +1414,14 @@ msgstr "" msgid "(No description)" msgstr "" +#: n/www/manage_solr.pt:4 +msgid "Configure Solr delegated indexes" +msgstr "" + +#: n/www/manage_solr.pt:5 +msgid "Enter names of indexes to delegate to Solr. One per line." +msgstr "" + # from plinn-manual msgid "${month}/${day}/${year}  ${hour}:${minute}:${second}" msgstr "" diff --git a/locales/fr/LC_MESSAGES/plinn.mo b/locales/fr/LC_MESSAGES/plinn.mo index a837fd74fa1c892f9d0a2cfb2f1ec86a6516bfd7..0819851d5542cea3e1e56f4c6449313daa77c1eb 100644 GIT binary patch delta 13378 zcmYk>2V7V6{>SknASh07Ad2_{K}2zY6WoFe_ueQ8Dh@DL?w@JynXA&w(p;r!Y3|Hb zYHFrsR#$VBrtOZYjQq*xyB{sDYh9uNu5SMoWCfe2N-SWPP{6ny3yMp&ClTeAo%K1zoTL_QUNs#o|>G z9mkJyZPfFLsQ#K-xosl*uchchKn-Wwjb~8mpn*HUFw~M) zv2s1sfLov@)ZOl2;Z|@Sn*MxE z6fcQdv9hSM(-tdZnmGqGT4PX{V<5CRulG#H>OZyqBqbsNi zKVvusH**IPkFk{NV<~(FbN3Q83P(IZ(96*3hS>x zz83E5R01`CTBxOMjOwr*YNmZr4Guy-9A%C}txj z?bR_g+yn`CZuc!h1jhb13mTm(jQ8SN0{peIj-EWTSr~~?APgHwpsP;3=(WrrW zr<2i)W}=pKsa4o!@dK#u!%5T`xnkZ!4Lq=wyE2iej;f#rUen?Y(3f&DYGAD_-Uj?6 zsFmuET7ltK&OxtcFqMpEx)3$96{w1Dpbp7K)CXq^7R1A-vvLa6@b{>d`2*GAL)4b$ zYwNC1Flt~Cs1I6gRQ;}PS%2+$ZvvXha4e6bFaj52JnqBUvwSzm;CD?=VG34(YPH0E>XSExu;|Zvl zEk?~`6>3YiV-Y-U<;$r0_fQ=c?BotO7`2k#C^DK^O>B(yPz{gA;y4X;YL}qS#AZ}O zZ=<$sH|n+AkDA%%sP=AJ`7WxXhp4mT*V!FlQH<65A4W!Bu$HLb>pmEVD^TzGQ4GUx zP#yk-n&CgFJrC^SHe3odfC{J%t6Mw?*HBJD9lGnN587??*ZcpNj2iUm>NZ#$HPUie z45KYx2eqe7u@bgNbvV}IGtH%_fvvUsTTlbvi)!}}7RQextc_V1jjv%7Jb_ivuR9+#tbrUiXAFA#kU2_5?`0S# z?iMz{D2(XocGwa%z*N){c14|$-l&13qZ%HH192PbtQ6_x8iabT6lw*_p;oqXFVILe2dMgAp(c10wdX%# zC_Y9FxRlm^7@6{@5zR#nWFe}7Rj8S-L3OkpHK0AH0e*n0cMi2u7g2}#23Ek|Z~+$U z>z3D`25=BpqW2OR9ggAs9Oo5Wg&nYFfA`DiMIEABr~yW&xdVwsb(nw}a5D_Xwx|zM z8fqoSp`M$7rEm(W-ZBi=`@fNlMsx!8o_~v~_!vuI&;a+78;y#$M(u5ymB(XA$_r8T z-@vl?K58JJp*s8l)z2flUvi+f#>?wKMoZf;H^3o8HQ2?Cepk_21eQ_05 z#MP*Q9!52M0YA&f;ldS^_YHQRZ$HGfC#s`#)N|9ZIxa`PQO+?hnZ{(w4R!zBt`Ejj zegSou_Mi^YC)gUVq3T!8;)e)_U@C6Gs(268Q3XCKItvM?m1=@&Cl&Qp3_#uYjwhof zo{8G)SIrGrkn&sThr2NV_hTR)MJ@eV)N>b6_rJFC4b*FT$I8xdcSQqGhcX0d-|Hlj zQ3J`S22xQY?1CQ5LM`=t)M0wv+<`i5hfy;=kLB>D#h;kPMz|~KLA75SRlgyI>;3PT zo8j;AScn^oP&0o8HNy?4Gq4r4HQTWsUc*2P8R^!KMAeTo6Og0f)JL7AB#gmS+=rvl zpZ=Yy+3tf0s1epj?Nw7NcSp^vKNi7>7N3K9U6-Ji`VCYE`!N}BU`ve7alfD=FqZNX zj8i@Is=?c2v<3H3Gk%{DGWNm3I1{zEORfAKYJeZ2p1**_ z@H(oW-$$|jdhihe4J6=Mw}Vos0fnO;h{i;$WAPl+Z^d{kFUKItt5FSaGxuN}%12P` z{E7Nb_>XoEb<}9qUrQZpfySr?lC9hxbtbx?-jX!bci=fxy)~#auo1NqJ5lw&Ms4LS zRJ~tN6Z{J+Vg51v!eX44Om8y%QHN|VYKae`2T!1WwQgY~K1IC^kz?Hzs*hUQCK!Yr zP=|0Jw!*=vZ~r@}Lwg$QW4>{2f8HcA`k*w%2#)JiR0HeAyDPI1HNyj_8GU4)Lw(sU zp=Nv^H2~*1*I?9=N1P(!$V7!Q$ z$u0C?_yqTU6Vz6;L_L>-C28>Bu@n}ZDh3C!>ZMVtq`p@>HBpc^0a{ z;*;H_jxej?4&sT(52$k&wUX_oxE*vs59JKhjAx+^-(u93y^r1!WR8;2l3v2ncn7tY zPf-I4n(FRhDAuJMgQ}N?dVU;gX7f<>*P&K)GipV)S$wa>KQvEFW&Kt0Gyxy{6t%|} zP#t`Q>fkrjp88I6<8i2tl2HR~i&~-nR?bFk-E`EbY3diqt?2AO*DoJuN;MIfPzkG8r9` zIjE5>!*aM9^#R#~4e(=Zjy^M7TVMp`xmX$BLM{2{SP#EP4J2%)Ya}+KTp4v{hULm~ zP9dWeSd6~-5^6weuq14Fj^Kc!mwHu8VyN9qPs^Uo0fX1T+ zItSIkYI7T^gTttqpF;hZoktCzz!LZQGN|@qk$PSyfsB?S(G55$s3mNR`qFj8{5Tl3 zmm^Rejm5$^4b{;CE1y6;e*x9eCDilZqR!Cwn21qJ_4cs;X=GXvScLj?Uczp8ABSR_ z7nvo#hcVcG8HXt!zj_!)dChXS!&9h^&YBld1O5s%kn5;JdKX7xixq4I{X4tJsNz1< z(jCEKcoK`_Wz}+Gt?QmYULkL_3oqU z{e$W+_+{2#?`71>e5J4>CZPUPm_}F&-^I?DjJ_NMUJ$1hcE(G%0Atp;|M`9w`cMve z)g3@t)CxqQ;t8m?rw*3J)?PB2(E!vE4ML4P3$-$1P+K$swe*WnXX6!A{jKH>)Njc9 zsF__x&GfF7pQ6rE&|0^hNYuc*)yb%XhNz|MjOri_b*QpY6=$FZwiJuvYOIc1?fzG& zncYSW>~GW=dWt%<{;#?11fjOL0)DIazcQH+0s-sXJ*t43X$)#0wNNukMs?iX;u)yt z#-cvG3sFnF1y%2D)XE;P_+j%XYC!lH{Ai&#!SkMQ2lK{ul9Vq1rDIfCs12(0o&qL z)WBjly773_9yda5Q8M~sSFDIVQCl(@%i>Fz53Bp|)g#5Jz;!Dh>%Yzl;|L5V&zqL} zmyP|Z!PS8WRudmgzNrFS9Z6G(Rpj2v+z1~rTwwWRENAU16h=K=TZy%BvrZEEN!tI@ zWKLUfF!_U|6C?)htJJ!cQ^Azzex%}B>}lgo#Dag=pc#tW2BTKzL_*lA#8D>}=_d`hey zeq=#yaWK#Oq0XN(i3-K6;TI^!k*1K!S&XdH%^KEMZ!`IR+?$URC_f>!B9$W6&Yt<4 zvNnAq=_j&nu`a0&_lHq_m3${3`roFC|8uS4MrkVP7fM%k%BM)Wx)5K8FH%mljudZ2 zd8jg6jYxNMbN~NGe(uLpe=W8nC6hnG?f#now*>x0L0`MPYdD#q#PhC7Wd5T3HtMsg zODA1dRpLcxP_NVjQU}r@V){n(B(AUPJ0$&`VFQjKy+nRL={GNb=<-leSAWX<200^e zAgMliAMSP1O|Gh><@QW|;w^Kd?jI9~e?Xc+ns4#W)G0`6Z{=Ft>qycSLGoVak2wTt zVJsDOJ+TTk%@m9OY~?;~wcI~Fmfwt-mTyS?XRK}->g%TuQYDLB#@{IO!DE2Jr;0wi6JTyp;#zp}F}K9+n2>0?q+Vzq5Bz3^vZ=~gd*{F|gb zR<6nYgOnq!f3oh?jT_sj)YlqPbUo#_@T^6&JC$MU2k>RcsW zgM2m?B|S$fMAEgGcu)LB-~UEb-a?@~=__tbBo!y7>u*vG^1bi?@oHF@@?r9MR~s^2 ziM6z66#v`q7dNL8`;wG5+p@%WliK|^!p+H~C8S^Nq5I_1NxCMIVo61~SJgV2sT*A3 z#99+8VbATruSwHM?{oiIQa|0JP8A$Pb}p&A+R=zw6TGepcHP0=+&qWdNy*%+fqk(D z=~kcGBK||_NBW6)UyMav1#vB=Qg4vOZsy)`|5yXwz1-+b3Zl|i1Y*cP#!I9h z?4jD^?~%T@GFj)U<*ShA(cJ5r#ojfC5N%6(jq)}0v-sEKL&^JU{~wd-O&Vf1TVO-d z>r~RUll(r6CY>i$pnL$cNV;~D3NV7_b4$DpW*{;By-`}T*Op#&*mTsDLcSL%oAeRs zD6!wMEdGhQ;z?IXF}5o8_50t}3L#eM4A!AiC5tzu9BKDv5idr1NYd4WRG52rNQFpk zNLNU@{=f*!KW~Oxo5d(M$jvkVG%|_qGfpe3P?_>p(yJEl$^-XF?~{T_x|ZTOQZ0Mt z7_m~6mt!cgS>#)i@~+$DN09{6#ux<&ikh25O<)|8ed8kcWyBxk37b{8Lf|D*lJ^?<7C+FA&r959Y^w zI1RriC6Ve=-e7eoI{V1)vT_v9cURD^xx|l?Qb`$l|8-ro$^*&2NIFH*^)4xal*s*g z_zCF|`2?%~E#(oU+oUBH+hP)O9+DqMIzj#yY)|qfA7CpHqQ6fKAkdhU!_DvTFzG|m zUCLp4fXZhvYS-F?f(6PA882^6S=kwx6Eer_dOhiaZ>{X~ zk(pyWIfL_}p0PRqt*X49t?ucVo#`2sIodNKD?79Lu3?S)7Y-OVDnqU9I-7bjv_$)y zY)|UA5uSv2Pkh~^TJcE<^_FkS2rp8vnnh|=t(mavLPo(t6*VFnqSM@QcruP}9dUf? zka5Sij`19SJ-5GIU*sJ1OLQw`=ZqY~fbwcnBkuuPvHI0L-LpNT(lxvx8sCz!J&F|? SnU&k#u$*zDcio$L$@70`sbVhx delta 13154 zcmYk@3w%%YAII@yV`CR=Y|Ldg!{(Bi+ic9-Z<|~*bC;IzC)fFxa>^x=Tyl*HxfEGs z36V>sNG=tHv?3(e3is?1~~j^jG32;ynjfk}84Yh#&4juVIJSQUq0X?y{La0!;cH!&19 zVk!I(OX3%(37x`X_$O)t_fQik+E}`d6YL8Z6{fK*R=EXt)7A!NGogaVf8*( zhV~Jt0l26K&p{IEEW|KeipszSEXDJkj|en_!>9|tM?LtmI^a!Is{NC_nODMK>hTzf z4Nx=cgdx}s%i#djb-Aeib5RpqjvCl%bd}2W1WNJy=69$8-9_E7coXjd5vUtg!XlV} zT7p_w1sh@>_Oy1t6w*vR1U0}g)bq+)JuZd(D;2e9(2djVL`T#Bx}q{L04w7t&@M$ zfqjF@%vq~nM-B8IY9b*`z4PT!Gp>%xL_O5rX@vE#olBt9OvLgy88yNss0XdEdLC*9 zTT!XrjoK>(7>(D^m+EHT1Hw?7t}5!f8mRjvqVAuDnwZ;`Kx^LzHIQdf8JUI}&>Yl^ z-am5wPiu}=lvdsag-9H31kO|1rxz1Dq-FO*lt=3zIP3A|| zeh8JauTXo&k588bj4+#{W;_&6;0V+JTc&#x%0$(Bp_Xbemel({hCnxb4wZogs1D0e z1KWTa@eb6Qe~wDwaa5+xpi+Dh)$ays=6|Ce=+}bv$57NJZGg&XXY{@Q*#zn^45M)_ zY9Q}oP27qR_#^58w^1|oZ|U_5#B$V2qB2+m_24?F2_##+9cl@>q28Jy=xRn!6X=06 z?8F?@%+{jLZ^8`Rg_?QsR^BEnje1Zls=W?s<_)n9rl4l}I1arBQpL3~C^iP%}?NEmb<| zd08$&F@hXaCPttJkc*nxbkq&zqh`Ja^(FI;o!^6c&>=g29E(x^9`%5;<_*-q{zgs6 zY3F6s4JA;=ny3@Ws1JrVs7;b>jz*1q1}ZZvuo%9D8hDxGA4D0bfj)-1@mLJRN#;~*e+dIe9vqB2u}TAC}U8{D<_q8+^cVW{>t7RRqp znL3Tiz$L3+MNQx?24aa$_Wp+vsADv0lT<|ws5+Lwrl{AiE$YUDQJHxX^}q?J0Zc|c zU@mH4Z(t>S57qw&>UBJhn#jdYtbb*KD>TGni3~4AwXr_+{;1T=Lk-|H)C0F;5bm@3 zm*xr7%nC3DFIqh?)7#9YFo*UUs68?}ll%u0ETBO*UV$O_wsqKwT9RGp`v^wO;I^F) z?CibQB{78dXsg$@dQ((JI-u^Kg>7*V4#9OUfo2-?FyBm=hWv(b7GfM8MLqZ?`qr$A zHW2NT{ut^(<4}9YMGf#ptcgodA7J}1MeqL!f;u#m>gK)Y%}|@> z5%leL)D0%0)_gkZ#`91EScZDwdTZZ`%c<`{ZMweQy$`g(sDb99?)NMP@qFhc0^M*i zmco_36OOYPwWd3<1|C2?@P@VDH-me411pa@ABP%vebjxEu{5?sWx6{mqkS+y@Ba`2 z&1^X8Etr71a0%+QT!k9>T2#M{sElnx{;}ko$Lbi>lP?xb$6DxOYutdH@jCXwW{-Hk zGnSxxfrbwVs^M$wKs|6DYJ~eyDLjH2`Ek@h&Y*7mGY-P|EbqFR=4{k;^H3RFjLPh4 ztLLL8vNwzTmm@etgTBvyMy2pRhGA%LZ%{@w^zq6V@C^}syTfOlayeuj~F z3YE#0&U7dOGr&yG}NNI_6>-oQ?X(U1{x~pw{-3)qlsb)B^{4 z{VQPw>h(|q$v{2uQPhJb*!j7rrP+X*&^BM)Wfv0YhKGF(>;=@?-9V+>8RVt7G-~G2 zsQwA40jHrhXE#*)IMk+_iCVfjs1K+`s9nFx>Kmm?!*&9#;isq+e~lX9S=0b7Tm3F- z6ZsGJ3`WhU3|7M!jK#L7j10B*DX8n-LhYSRr~$r@t~T3;1X{Z58nsFa>T z-RK5tV0TcN3VhUSFOQl)jMWpd3iV`E=CUvv2cz!y+@q|&2C%?7u0_3W`!OC1FcAZW zc&TfQ8hJ~sjO|gG%R$|E9BMDUg4zpjqf)=e&L2We;4&%`e+(i28rdBhG@~MqdAm0Z z$0k_g}@*usQX`SQAgU1W5!B zP@5^~32zg%#SYZ_pe|UAE$|$6!nk4Hex0x!MwNRTa1vTSNSP}bM`%~sDR3?|B2Dk~;e;aCPzA%5q zV4m+3|CcwivZxtGqd!(dElmO@V;>B{S5Px~9o7FWGY{DsPCjbpTQMH@<957;%G|n< z-gS8xsP{jgKx?&A4R{PSvy&K#x2)Z7l=s~bgi3WK)B_q~YwU;Za3xm7U$7b>sVH@iE@Nh{93#>45rt z=#ARUxu^_JvidyK^^3-ke|1SWZ6+oLk@2xE@_PSo5$JUb{kON~HBmF`jJlvd#$ygD zQ!k@#uoR!b^{APLKjkf1CDantNA+)mx=$Buf>~CdhqLtlFD1|oyMf9`z-02Tkws1R zF06#Lsn&{{kH0qXTUhISsIb4LgE)O;Hy{PMsnBSrvRABys8pv;`jJUT5G~&Cc zR6Rh=u*7qol~DssLS5Jdbzw79Mp~f;kcG;?a8&zKs7*KrwMUkr2DTO}Vjl9Axz0g? zrZk+wRv7WTXK#$9z8n+qBUH*SVlv)A4J2`jXCrJ$y(wzXJZsKHWndL*0vk{RdKW9` z{og^L_x(6(gy&HmucBt~o3-D=3e<~E^}fxjpq8Qzs$T|b39{^b4k{C4F&1Z->#-*F zL+JbW|7`+wyoVY<*fg(06xOBQ8q;wsw!$r_Ox(s844Cd+7mu2GB5EmHqHkcRCCtJ& z9DsVx6m+W-%p%x@o9)EN7rcy2K&5UvDrIv}7ru(sa24wM&rqB6s+|v*;jM8=)LyEE z+N{mZUe-Qp2KmP+tgsXg|kJ{gs|)2Ig)ebF0GG-@C<%uLjM z$6{4uSR7l;@^*IyYS#`xe|#F%e=_QZ)3FxL z$4a;hgYXn;&zwiSB@a+MBEP*qyD9%SsU@>Y5R^STExAq<{d*2mqKLT}}irQ4OQ6qgF^?=Rh$EXJ!N6owd z^=)wwBc7pwO{WpFU^LFYO-1jT501~s!Os0Yo$5L}3Q&?>8+ zM%~~S)Pt^|uD^xaLw7L+Q|Eeb&vf7-vEQ^;h7$2baM(`qUAf?gO zh2;nmu_CHt2C8Eg>OuWbGni!Or=l`57ejFu>cL;2`W?f{coKD=KT&(>FI1*N7u%2C z#pGWN$u#ie#%X~X&`wnQ9@GsFU<4jRW$GeokKDBS->7~;OT2#Js0SusElkDDn1l5( za;Z1Kj!Vh^do&ECp*2Rm%I`bukKOPJ@&-C-Y>**%5dH9><=z15p)!z)YVUyIn1PWv z05zcrs0=-Y8n}zf%!>-NMsrZ9Uya%vn@|_*G54dsL=K^5b`6!02Ud@G&3pagQTJ(r z8dw|D{kx+wHxzaM@u)rJP9spqrKpju!;-ie>*5|ee;qZmd#HhxdfnSZ5vWaD33Z=% z)Y3J=0&I@uu<{$;5;Z~%Fbx@q>vSa0jIvP=9^svEocTf-b7&W8MPy;w>evMj^ z6Q~T_K@He%mG|XT0d>EIsLVD+ZPK&FM7@7U|o z5Wvaq6dl(n)rhZI$IjH3SX|oryhC085mHBgJU~gN1XF&c?O#}&(ubnuD~&q-rVOT3 zrL>}r4^78?-%j?W($eD5#LX=JfOrP+>y)CDO_WXyWFG3MPyCP<`o45(SvwySz7Hs! znofzLUrWjW;*RvGhWoYtg~!`8{zj=%*kI~ievh)%Zrq2PG^S)zCeSv6b8*Bvf~c>f z%p#uZYau&Wne)f2-h+6z#mRd9i&l9A`381QQU+SvP_rsG9YiU~#mn#o+G}GY>K!PL z5$h;I{4()atM~DmodntokHdEE1*!S3A(%_~(0WY5j$F_MJ6mVHugxjtt=gMeDEF*Bg7`h+bN@KsiMTQCr*SR1O}I&0%D?~7sTK9ZoD8GwW1NIZ*xLG};|j`T z$~a0p&fTVbM!WU>1L|Yfci_gigJSTG)2dgv=<(e2@X-OKv_uXM!h7Z zK5-9xlM<`%-!lY@Xw1PmIG7U603xZsMLe3)kT@PM;4IY9oIW}-DbM>NUSH1bp*(K& zvc$EC`E}>}!cwyzZI4iTsbc%jd6k9)s^d||=ahU(pgp7!?Vsob$8(fB)L)}Crp%`F zpiHIccm*#}N>D=W`akVl0q1v7W>UY1?Oi$?BG9psM*Su$XBSHr)Jc>-4MLXg&3e z!ch~iqWw$CH^j|ozfIhe@*zdXf3cPq`u;ZI??%d4N(K7=hx3W}sP(_A_kWbH>;M0Z z;$&s3cBZo*MMpW>(hUo;yLQ0nPU9S93 zr$cq@jXM5CxkI^0J&Lk}GKTtgJKxYQ&ZRz*_Tv;CC8?)#?qNHxwsypMcAe@?i0dfe z*gCA$dCFbNE0nJ||28J#S&Hv#?nwUr`X!3z-$*^=pMR@)uaIJ6 zbH?S2&+nG;c~qI66LMl&jvgBmlN6KGI5nwWYJ)}#YUf0UCOwpt5<|67Qtf(4`Mq*V b1n18jy|ZZklnGr+E$FhmRDQv<<1zmOLth+E diff --git a/locales/fr/LC_MESSAGES/plinn.po b/locales/fr/LC_MESSAGES/plinn.po index b1c2847..a8d742e 100755 --- a/locales/fr/LC_MESSAGES/plinn.po +++ b/locales/fr/LC_MESSAGES/plinn.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Plinn 2.0\n" -"POT-Creation-Date: Mon May 12 23:42:25 2014\n" -"PO-Revision-Date: 2014-05-12 23:42+0200\n" +"POT-Creation-Date: Mon Jul 21 16:31:27 2014\n" +"PO-Revision-Date: 2014-07-21 16:33+0200\n" "Last-Translator: Benoît PIN\n" "Language-Team: CRI http://cri.ensmp.fr\n" "Language: \n" @@ -179,7 +179,7 @@ msgstr "Ajouter" #: n/skins/content/topic_edit_template.pt:26 #: n/skins/custom_content/document_edit_template.pt:23 #: n/skins/custom_content/event_edit_template.pt:135 -#: n/skins/generic/search_results_template.pt:87 +#: n/skins/generic/search_results_template.pt:87 n/www/manage_solr.pt:13 msgid "Save" msgstr "Enregistrer" @@ -717,12 +717,12 @@ msgstr "Annuler" msgid "Comments:" msgstr "Commentaires :" -#. Default: "Previous${number}" +#. Default: "previous ${number}" #: n/skins/generic/batch_macros.pt:26 msgid "batch_previous_x_items" msgstr "${number} précédents" -#. Default: "Next${number}items" +#. Default: "next ${number}" #: n/skins/generic/batch_macros.pt:32 msgid "batch_next_x_items" msgstr "${number} suivants" @@ -1483,6 +1483,14 @@ msgstr "(Sans titre)" msgid "(No description)" msgstr "(Sans description)" +#: n/www/manage_solr.pt:4 +msgid "Configure Solr delegated indexes" +msgstr "Configurer les index délégués à Solr" + +#: n/www/manage_solr.pt:5 +msgid "Enter names of indexes to delegate to Solr. One per line." +msgstr "Entrer les noms des index à déléguer à Solr. Un par ligne." + msgid "${month}/${day}/${year}  ${hour}:${minute}:${second}" msgstr "${day}/${month}/${year}  ${hour}:${minute}:${second}" diff --git a/locales/plinn.pot b/locales/plinn.pot index 1695fb6..f14e010 100644 --- a/locales/plinn.pot +++ b/locales/plinn.pot @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: 2.0 beta 1\n" -"POT-Creation-Date: Mon May 12 23:42:25 2014\n" +"POT-Creation-Date: Mon Jul 21 16:31:27 2014\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: Zope 3 Developers \n" @@ -115,11 +115,11 @@ msgid "Cancel delete mode" msgstr "" #: n/skins/content/changes_history_template.pt:24 -msgid "« later revisions" +msgid "\302\253 later revisions" msgstr "" #: n/skins/content/changes_history_template.pt:28 -msgid "earlier revisions »" +msgid "earlier revisions \302\273" msgstr "" #: n/skins/content/changes_history_template.pt:37 @@ -186,6 +186,7 @@ msgstr "" #: n/skins/custom_content/document_edit_template.pt:23 #: n/skins/custom_content/event_edit_template.pt:135 #: n/skins/generic/search_results_template.pt:87 +#: n/www/manage_solr.pt:13 msgid "Save" msgstr "" @@ -687,12 +688,12 @@ msgid "Comments:" msgstr "" #: n/skins/generic/batch_macros.pt:26 -#. Default: "Previous${number}" +#. Default: "previous ${number}" msgid "batch_previous_x_items" msgstr "" #: n/skins/generic/batch_macros.pt:32 -#. Default: "Next${number}items" +#. Default: "next ${number}" msgid "batch_next_x_items" msgstr "" @@ -1255,7 +1256,7 @@ msgid "Restore this revision" msgstr "" #: n/skins/generic/revision_context_header.pt:22 -msgid "← previous revision" +msgid "\342\206\220 previous revision" msgstr "" #: n/skins/generic/revision_context_header.pt:27 @@ -1263,7 +1264,7 @@ msgid "current revision" msgstr "" #: n/skins/generic/revision_context_header.pt:29 -msgid "next revision →" +msgid "next revision \342\206\222" msgstr "" #: n/skins/generic/search.py:109 @@ -1420,6 +1421,14 @@ msgstr "" msgid "(No description)" msgstr "" +#: n/www/manage_solr.pt:4 +msgid "Configure Solr delegated indexes" +msgstr "" + +#: n/www/manage_solr.pt:5 +msgid "Enter names of indexes to delegate to Solr. One per line." +msgstr "" + # from plinn-manual msgid "${month}/${day}/${year}  ${hour}:${minute}:${second}" diff --git a/www/manage_solr.zpt b/www/manage_solr.pt similarity index 100% rename from www/manage_solr.zpt rename to www/manage_solr.pt -- 2.20.1 From a23495c46f185990eddd43e372d6b83fad403af4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Tue, 22 Jul 2014 09:49:35 +0200 Subject: [PATCH 12/16] lint --- skins/generic/search_form.pt | 236 +++++++++++++++++++---------------- 1 file changed, 126 insertions(+), 110 deletions(-) diff --git a/skins/generic/search_form.pt b/skins/generic/search_form.pt index b2e86cd..d130798 100644 --- a/skins/generic/search_form.pt +++ b/skins/generic/search_form.pt @@ -1,116 +1,132 @@ - -
- -
- -

Search inside portal

- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Full Text - -
-
For a simple text search, enter your search term - here. Multiple words may be found by combining - them with AND and OR. This will - find text in items' contents, title and - description. -
-
-
Title
Description - -
-
You may also search the items' descriptions and - titles specifically. Multiple words may be found - by combining them with AND and OR. -
-
-
Review Status - -
-
If you wish to constrain results to items in certain states, select them from this list.
-
-
Find new items since... - -
-
You may find only recent items by selecting a time-frame.
-
-
Item type - -
-
You may limit your results to particular kinds of - items by selecting them above. To find all kinds - of items, do not select anything. -
-
-
Creator - -
-
To find items by a particular user, enter one or more of his properties (login, name, email...).
-
-

- -
-
- -
-
- - \ No newline at end of file + +
+
+

Search inside portal

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Full Text + +
+
+ For a simple text search, enter your search term here. + Multiple words may be found by combining them with + AND and OR. This will find text in items' + contents, title and description. +
+
+
Title + +
Description + +
+
+ You may also search the items' descriptions and titles + specifically. Multiple words may be found by combining them + with AND and OR. +
+
+
Review Status + +
+
+ If you wish to constrain results to items in certain + states, select them from this list. +
+
+
Find new items since... + +
+
+ You may find only recent items by selecting a time-frame. +
+
+
Item type + +
+
+ You may limit your results to particular kinds of items by + selecting them above. To find all kinds of items, do not + select anything. +
+
+
Creator + +
+
+ To find items by a particular user, enter one or more of + his properties (login, name, email...). +
+
+
+
+ 		+ +
+
+
+
+ + -- 2.20.1 From 55eea9a336dd3e6ad94e38822dbc49145e15424d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Tue, 22 Jul 2014 18:31:30 +0200 Subject: [PATCH 13/16] =?utf8?q?Ajout=20styles=20pour=20l'=C3=A9diteur=20c?= =?utf8?q?keditor.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- skins/generic/plinn_ckeditor_styles.js.dtml | 26 +++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 skins/generic/plinn_ckeditor_styles.js.dtml diff --git a/skins/generic/plinn_ckeditor_styles.js.dtml b/skins/generic/plinn_ckeditor_styles.js.dtml new file mode 100644 index 0000000..2d4711e --- /dev/null +++ b/skins/generic/plinn_ckeditor_styles.js.dtml @@ -0,0 +1,26 @@ +// { +// name: 'Name displayed in the Styles drop-down list', +// element: 'HTML element name (for example "span")', +// styles: { +// 'css-style1': 'desired value', +// 'css-style2': 'desired value', +// ... +// } +// attributes: { +// 'attribute-name1': 'desired value', +// 'attribute-name2': 'desired value', +// ... +// } +// } +//The name and element values are required, while other values are optional. + +CKEDITOR.stylesSet.add( 'plinn_styles', [ + { name: 'Coins arrondis', + element: 'div', + attributes : {'class' : 'news_box'} + }, + { name: 'cellule arrondie', + element: 'td', + attributes : {'class' : 'news_box'} + }, +]); -- 2.20.1 From e957cc2a18fd2363fe6451c2cff2edd452379f66 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Wed, 23 Jul 2014 07:13:04 +0200 Subject: [PATCH 14/16] =?utf8?q?Introduction=20de=20r=C3=A8gles=20de=20sty?= =?utf8?q?le=20sp=C3=A9cifiques=20aux=20contenus=20pour=20utilisation=20vi?= =?utf8?q?a=20ckeditor.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- skins/generic/base_properties.props | 2 ++ skins/generic/content_style.css.dtml | 7 +++++++ skins/generic/global_plinn_style.css.dtml | 3 +++ skins/generic/plinn_ckeditor_styles.js.dtml | 13 +++++++++---- skins/photo_theme/base_properties.props | 2 ++ skins/photo_theme/global_plinn_style.css.dtml | 3 +++ 6 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 skins/generic/content_style.css.dtml mode change 100755 => 100644 skins/photo_theme/base_properties.props diff --git a/skins/generic/base_properties.props b/skins/generic/base_properties.props index c0a8ac2..53d55c9 100644 --- a/skins/generic/base_properties.props +++ b/skins/generic/base_properties.props @@ -63,3 +63,5 @@ boxeHeaderBackgroundColor:string=#fff twoColumnFormFontColor:string=#000 twoColumnFormBackground:string=#ddd + +borderRadius:int=7 diff --git a/skins/generic/content_style.css.dtml b/skins/generic/content_style.css.dtml new file mode 100644 index 0000000..0748908 --- /dev/null +++ b/skins/generic/content_style.css.dtml @@ -0,0 +1,7 @@ +/* */ + +.rounded-corners { + border-radius: &dtml-borderRadius;px; +} + +/* */ \ No newline at end of file diff --git a/skins/generic/global_plinn_style.css.dtml b/skins/generic/global_plinn_style.css.dtml index 63963ce..6f5e53a 100644 --- a/skins/generic/global_plinn_style.css.dtml +++ b/skins/generic/global_plinn_style.css.dtml @@ -4,5 +4,8 @@ /* plinn_style.css */ +/* content_style.css */ + + /* Portfolio */ diff --git a/skins/generic/plinn_ckeditor_styles.js.dtml b/skins/generic/plinn_ckeditor_styles.js.dtml index 2d4711e..1fca357 100644 --- a/skins/generic/plinn_ckeditor_styles.js.dtml +++ b/skins/generic/plinn_ckeditor_styles.js.dtml @@ -15,12 +15,17 @@ //The name and element values are required, while other values are optional. CKEDITOR.stylesSet.add( 'plinn_styles', [ - { name: 'Coins arrondis', + { name: 'Bloc arrondi', element: 'div', - attributes : {'class' : 'news_box'} + attributes : {'class' : 'rounded-corners'} }, - { name: 'cellule arrondie', + { name: 'Cellule arrondie', element: 'td', - attributes : {'class' : 'news_box'} + attributes : {'class' : 'rounded-corners'} }, + { name: 'Image arrondie', + element: 'img', + attributes : {'class' : 'rounded-corners'} + }, + ]); diff --git a/skins/photo_theme/base_properties.props b/skins/photo_theme/base_properties.props old mode 100755 new mode 100644 index a32b6ea..471a272 --- a/skins/photo_theme/base_properties.props +++ b/skins/photo_theme/base_properties.props @@ -63,3 +63,5 @@ boxeHeaderBackgroundColor:string=#484848 twoColumnFormFontColor:string=#fff twoColumnFormBackground:string=#3A3A3A + +borderRadius:int=7 diff --git a/skins/photo_theme/global_plinn_style.css.dtml b/skins/photo_theme/global_plinn_style.css.dtml index a5f5f3d..ab58319 100755 --- a/skins/photo_theme/global_plinn_style.css.dtml +++ b/skins/photo_theme/global_plinn_style.css.dtml @@ -4,6 +4,9 @@ /* plinn_style.css */ +/* content_style.css */ + + /* Portfolio */ -- 2.20.1 From c7fa7959f1718394c772a187bb124780f86fa2f3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Thu, 24 Jul 2014 11:04:25 +0200 Subject: [PATCH 15/16] correction commentaire. --- utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils.py b/utils.py index 024c975..6b3b697 100755 --- a/utils.py +++ b/utils.py @@ -230,7 +230,7 @@ def getPreferredLanguages(context): security.declarePublic('getBestTranslationLanguage') def getBestTranslationLanguage(langs, context): """ returns best translation language according - availables languages (param langs) + to available languages (param langs) and user preferences (retrieves by context) """ request = getattr(context, 'REQUEST', None) -- 2.20.1 From fff8677b8b6361b58f21c9384a8dc602feb5af05 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Tue, 29 Jul 2014 17:55:05 +0200 Subject: [PATCH 16/16] Ajout classes pour bordure et fond standards. --- skins/generic/content_style.css.dtml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/skins/generic/content_style.css.dtml b/skins/generic/content_style.css.dtml index 0748908..a723a03 100644 --- a/skins/generic/content_style.css.dtml +++ b/skins/generic/content_style.css.dtml @@ -4,4 +4,13 @@ border-radius: &dtml-borderRadius;px; } +.std-border { + border: &dtml-tabsBorderWidth; solid &dtml-tabsBorderColor;; +} + +.std-background { + padding: &dtml-borderRadius;px; + background: &dtml-backgroundColor;; +} + /* */ \ No newline at end of file -- 2.20.1