diff --git a/Gruntfile.js b/Gruntfile.js index 253f8a5..b8d4d01 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -18,12 +18,16 @@ module.exports = function (grunt) { css: { src: ['stylesheets/theme.css'], dest: 'stylesheets/theme-concat.css', + }, + js: { + src: ['js/main/*.js'], + dest: 'js/theme-concat.js', } }, cssmin: { - css : { - src : ["stylesheets/theme-concat.css"], - dest : "stylesheets/theme-patents.min.css", + css: { + src: ["stylesheets/theme-concat.css"], + dest: "stylesheets/theme-patents.min.css", } }, watch: { @@ -33,17 +37,36 @@ module.exports = function (grunt) { ], tasks: ['compass:css', 'concat:css', 'cssmin:css'] }, + js: { + // files: [ + // 'js/main/*' + // ], + // tasks: ['concat:js', 'uglify:mainjs'] + files: [ + 'js/widgets/*' + ], + tasks: ['uglify:js'] + }, + }, uglify: { js: { - files: {} - } + files: { + 'js/widget-maxlengthtext.min.js': 'js/widgets/maxlengthtext.js', + } + }, + // mainjs: { + // files: { + // 'js/theme-patents.min.js': 'js/theme-concat.js' + // } + // } + }, browserSync: { plone: { bsFiles: { - src : [ - 'stylesheets/*.css' + src: [ + 'stylesheets/*.css' ] }, options: { diff --git a/README.rst b/README.rst index 191face..909b164 100644 --- a/README.rst +++ b/README.rst @@ -113,6 +113,8 @@ Crea la estructura de patentes en la página. Parámetros: - ``recreate_subjects`` [bool]: Si se activa, se recrean las etiquetas de las ofertas tecnológicas. +- ``patents_folder`` [string]: Nombre de la carpeta que contendrá la carpeta de ofertas tecnológicas. +- ``techoffer_folder`` [string]: Nombre de la carpeta que contendrá todas las ofertas tecnológicas, el formularió de creación de una oferta y la coleccion de ofertas en estado borrador. Funconamiento: - Se crea la carpeta ``patents`` @@ -123,4 +125,6 @@ Funconamiento: y, al enviar, crea una nueva oferta dentro de la carpeta ``patents/ofreta-tecnologica`` - Se crea la colección ``patents/ofreta-tecnologica/technological-offers-to-review`` - Esta colección recopila todas las ofertas en estado "Borrador" - \ No newline at end of file + +Ejemplo: +``localhost:8080/Plone/configure_techoffer?recreate_subjects=True&patents_folder=patents&techoffer_folder=oferta-tecnologica`` \ No newline at end of file diff --git a/src/genweb6/patents/browser/views.py b/src/genweb6/patents/browser/views.py index 81d37d4..0508b68 100644 --- a/src/genweb6/patents/browser/views.py +++ b/src/genweb6/patents/browser/views.py @@ -105,6 +105,12 @@ def __call__(self): recreate_subjects = self.request.form.get('recreate_subjects', '') recreate_subjects = recreate_subjects and recreate_subjects.lower() == 'true' + patents_folder = self.request.form.get('patents_folder', 'patents') + patents_folder = patents_folder.strip("/") + + techoffer_folder = self.request.form.get('techoffer_folder', 'nova-oferta-tecnologica') + techoffer_folder = techoffer_folder.strip("/") + qi = get_installer(self.context) required_products = [ @@ -129,25 +135,25 @@ def __call__(self): with open(xml_config_path / 'ActionModel.xml', 'r') as f: actions_model = f.read() - patents = api.content.get('/ca/patents') + patents = api.content.get("/ca/" + patents_folder) logger.info("Getting patents folder") if not patents: - logger.info("Patents folder not found, creating it at /ca/patents") + logger.info(f"Patents folder not found, creating it at /ca/{patents_folder}") patents = api.content.create( type='Folder', - id='patents', + id=patents_folder, title='Patents', container=api.content.get('/ca') ) - techoffer = patents.get("nova-oferta-tecnologica") + techoffer = patents.get(techoffer_folder) logger.info("Getting technological offer folder") if not techoffer: logger.info("Technological offer folder not found, creating it at " + - " /ca/patents/nova-oferta-tecnologica") + f" /ca/{patents_folder}/{techoffer_folder}") techoffer = api.content.create( type='Folder', - id='nova-oferta-tecnologica', + id=techoffer_folder, title='Oferta Tecnològica/Technological Offer (Nova versió)', container=patents, subject=tags diff --git a/src/genweb6/patents/browser/xml_form_config/FieldsModel.xml b/src/genweb6/patents/browser/xml_form_config/FieldsModel.xml index 11f35cd..b6ad2d9 100644 --- a/src/genweb6/patents/browser/xml_form_config/FieldsModel.xml +++ b/src/genweb6/patents/browser/xml_form_config/FieldsModel.xml @@ -1,13 +1,17 @@ - + Màxim 150 caràcters./A maximum of 150 characters is allowed. + 150 Title + - + Màxim 500 caràcters./A maximum of 500 characters is allowed. + 500 False Description + - @@ -20,24 +24,24 @@ Categoria/Category genweb6.patents.vocabularies.parent_categories - - challenge_description + + Màxim 1100 caràcters. Pots veure el nombre de caràcters actuals clicant sobre el recompte de paraules que és a sota dreta d'aquesta caixa de text/A maximum of 1100 characters is allowed. You can see the current number of characters by clicking on the word count that is below on the right side of this text box. The Challenge - - technology_description + + Màxim 1100 caràcters. Pots veure el nombre de caràcters actuals clicant sobre el recompte de paraules que és a sota dreta d'aquesta caixa de text/A maximum of 1100 characters is allowed. You can see the current number of characters by clicking on the word count that is below on the right side of this text box. Technology - - advantages_description + + Màxim 1100 caràcters. Pots veure el nombre de caràcters actuals clicant sobre el recompte de paraules que és a sota dreta d'aquesta caixa de text/A maximum of 1100 characters is allowed. You can see the current number of characters by clicking on the word count that is below on the right side of this text box. Innovative advantages - dev_stage_description + Màxim 500 caràcters. Pots veure el nombre de caràcters actuals clicant sobre el recompte de paraules que és a sota dreta d'aquesta caixa de text/A maximum of 500 characters is allowed. You can see the current number of characters by clicking on the word count that is below on the right side of this text box. Current stage of development - applications_description + Màxim 500 caràcters. Pots veure el nombre de caràcters actuals clicant sobre el recompte de paraules que és a sota dreta d'aquesta caixa de text/A maximum of 500 characters is allowed. You can see the current number of characters by clicking on the word count that is below on the right side of this text box. Applications and Target Market @@ -46,9 +50,11 @@ First picture - + Màxim 200 caràcters./A maximum of 200 characters is allowed. + 200 False Comentari de la primera imatge/First picture caption + @@ -56,9 +62,11 @@ Second picture - + Màxim 200 caràcters./A maximum of 200 characters is allowed. + 200 False Second image caption + Technology available to be licensed diff --git a/src/genweb6/patents/configure.zcml b/src/genweb6/patents/configure.zcml index 13efe72..1fdd7ed 100644 --- a/src/genweb6/patents/configure.zcml +++ b/src/genweb6/patents/configure.zcml @@ -17,6 +17,7 @@ + diff --git a/src/genweb6/patents/content/techoffer/techoffer.pt b/src/genweb6/patents/content/techoffer/techoffer.pt index fceee72..2bd62c4 100644 --- a/src/genweb6/patents/content/techoffer/techoffer.pt +++ b/src/genweb6/patents/content/techoffer/techoffer.pt @@ -13,7 +13,8 @@
+ class="print-only mb-0" id='head-upc-logo' width="200" + style="margin-bottom: 0.5rem !important;"/> -

+

-

+

- Ref. Ref.

@@ -52,6 +53,13 @@
+
+

+

+ + Ref: +

+

The Challenge

@@ -85,14 +93,18 @@ class="span3"> - +
+ +

- +
+ +

diff --git a/src/genweb6/patents/content/techoffer/techoffer.py b/src/genweb6/patents/content/techoffer/techoffer.py index 827f656..f8dd7c2 100644 --- a/src/genweb6/patents/content/techoffer/techoffer.py +++ b/src/genweb6/patents/content/techoffer/techoffer.py @@ -11,6 +11,11 @@ from zope import schema from zope.interface import implementer, invariant, Invalid # noqa F401 from genweb6.patents.validators import maxLengthValidatorNoTags +from plone.autoform import directives +from genweb6.patents.widgets.maxlengthtextfield.maxlengthtextfield import MaxLengthTextFieldWidget +from genweb6.patents.widgets.maxlengthtextareafield.maxlengthtextareafield import ( + MaxLengthTextAreaFieldWidget +) def max_length_validator(max_length): @@ -32,17 +37,21 @@ def validator(value): class ITechOffer(model.Schema, IDexteritySchema): textindexer.searchable('title') + directives.widget('title', MaxLengthTextFieldWidget) title = schema.TextLine( title=_(u"Title"), - description=u"", - required=True + description=_(u"max_length_textfield_info", mapping={'max': 150}), + required=True, + max_length=150 ) textindexer.searchable('description') + directives.widget('description', MaxLengthTextAreaFieldWidget) description = schema.Text( title=_(u"Description"), - description=u"", - required=False + description=_(u"max_length_textfield_info", mapping={'max': 500}), + required=False, + max_length=500 ) textindexer.searchable('ref_num') @@ -55,35 +64,35 @@ class ITechOffer(model.Schema, IDexteritySchema): textindexer.searchable('challenge') challenge = RichText( title=_(u"The Challenge"), - description=_(u"challenge_description"), - constraint=max_length_validator(1500) + description=_(u"max_length_info", mapping={'max': 1100}), + constraint=max_length_validator(1100) ) textindexer.searchable('technology') technology = RichText( title=_(u"Technology"), - description=_(u"technology_description"), - constraint=max_length_validator(1500) + description=_(u"max_length_info", mapping={"max": 1100}), + constraint=max_length_validator(1100) ) textindexer.searchable('advantages') advantages = RichText( title=_(u"Innovative advantages"), - description=_(u"advantages_description"), - constraint=max_length_validator(1500) + description=_(u"max_length_info", mapping={"max": 1100}), + constraint=max_length_validator(1100) ) textindexer.searchable('dev_stage') dev_stage = RichText( title=_(u"Current stage of development"), - description=_(u"dev_stage_description"), + description=_(u"max_length_info", mapping={"max": 500}), constraint=max_length_validator(500) ) textindexer.searchable('applications') applications = RichText( title=_(u"Applications and Target Market"), - description=_(u"applications_description"), + description=_(u"max_length_info", mapping={"max": 500}), constraint=max_length_validator(500) ) @@ -97,17 +106,26 @@ class ITechOffer(model.Schema, IDexteritySchema): title=_(u"First picture"), required=False ) + + directives.widget('caption1', MaxLengthTextFieldWidget) caption1 = schema.TextLine( title=_(u"First picture caption"), - required=False + required=False, + description=_(u"max_length_textfield_info", mapping={'max': 200}), + max_length=200 + ) image2 = namedfile.NamedBlobImage( title=_(u"Second picture"), required=False ) + + directives.widget('caption2', MaxLengthTextFieldWidget) caption2 = schema.TextLine( title=_(u"Second image caption"), - required=False + required=False, + description=_(u"max_length_textfield_info", mapping={'max': 200}), + max_length=200 ) opportunity = schema.Choice( @@ -116,7 +134,8 @@ class ITechOffer(model.Schema, IDexteritySchema): ) other_opportunity = schema.TextLine( title=_(u"Specify Business Opportunity"), - description=_(u"Fill this field if you selected 'Others' for 'Business Opportunity'"), + description=_( + u"Fill this field if you selected 'Others' for 'Business Opportunity'"), required=False ) diff --git a/src/genweb6/patents/locales/ca/LC_MESSAGES/genweb6.patents.po b/src/genweb6/patents/locales/ca/LC_MESSAGES/genweb6.patents.po index 85b529e..4250b59 100644 --- a/src/genweb6/patents/locales/ca/LC_MESSAGES/genweb6.patents.po +++ b/src/genweb6/patents/locales/ca/LC_MESSAGES/genweb6.patents.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-02-15 08:55+0000\n" +"POT-Creation-Date: 2024-05-03 09:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,64 +15,72 @@ msgstr "" "Domain: genweb6.patents\n" "Language: ca\n" -#: ../content/techoffer/techoffer.py:134 -msgid "'Specify business opportunity' field required when 'Others' is selected for 'Business Opportunity'" -msgstr "El camp 'Especifca la Oportunitat de negoci' és requerit si s'ha seleccionat 'Altres' en 'Oportunitats de negoci'/'Specify business opportunity' field required when 'Others' is selected for 'Business Opportunity'" +#: ../content/techoffer/techoffer.py:149 +msgid "'Specify business opportunity' field required when 'Others'is selected for 'Business Opportunity'" +msgstr "" -#: ../content/techoffer/techoffer.pt:64 -#: ../content/techoffer/techoffer.py:87 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.pt:81 +#: ../content/techoffer/techoffer.py:96 msgid "Applications and Target Market" msgstr "Aplicacions i mercat objectiu/Applications and target market" -#: ../content/techoffer/techoffer.pt:90 -#: ../content/techoffer/techoffer.py:116 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.pt:108 +#: ../content/techoffer/techoffer.py:130 msgid "Business Opportunity" msgstr "Oportunitats de negoci/Business opportunity" -#: ../content/techoffer/techoffer.pt:94 +#: ../content/techoffer/techoffer.pt:115 msgid "Contact" msgstr "Contacte/Contact" -#: ../content/techoffer/techoffer.pt:62 -#: ../content/techoffer/techoffer.py:80 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.pt:77 +#: ../content/techoffer/techoffer.py:89 msgid "Current stage of development" msgstr "Fase actual de desenvolupament/Current stage of development" -#: ../content/techoffer/techoffer.py:45 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:53 msgid "Description" msgstr "Descripció/Description" -#: ../content/techoffer/techoffer.py:121 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:135 msgid "Fill this field if you selected 'Others' for 'Business Opportunity'" msgstr "Omple aquest camp si has seleccionat 'Altres' per 'Oportunitats de negoci'/Fill this field if you selected 'Others' for 'Business opportunity'" -#: ../content/techoffer/techoffer.py:99 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:108 msgid "First picture" msgstr "Primera imatge/First picture" -#: ../content/techoffer/techoffer.py:103 +#: ../content/techoffer/techoffer.py:112 msgid "First picture caption" msgstr "Comentari de la primera imatge/First picture caption" -#: ../content/techoffer/techoffer.pt:60 -#: ../content/techoffer/techoffer.py:73 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.pt:73 +#: ../content/techoffer/techoffer.py:82 msgid "Innovative advantages" msgstr "Avantatges innovadores/Innovative advantages" -#: ../configure.zcml:39 +#: ../configure.zcml:41 msgid "Installs the genweb6.patents add-on." msgstr "Instal·lar paquet genweb6.patents/Installs the genweb6.patents add-on." -#: ../content/techoffer/techoffer.py:93 +#: ../content/techoffer/techoffer.py:102 msgid "Lead Image" msgstr "Imatge principal/Lead image" -#: ../vocabularies.py:43 +#: ../vocabularies.py:44 msgid "Others" msgstr "Altres/Others" -#: ../content/techoffer/techoffer.pt:92 -#: ../content/techoffer/techoffer.py:126 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.pt:111 +#: ../content/techoffer/techoffer.py:141 msgid "Patent Status" msgstr "Estat de la propietat intel·lectual i industrial/Intelectual property status" @@ -80,23 +88,27 @@ msgstr "Estat de la propietat intel·lectual i industrial/Intelectual property s msgid "Pendent offers to review" msgstr "Ofertes pendents de revisar" -#: ../content/techoffer/techoffer.py:52 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:61 msgid "Reference number" msgstr "Número de referència/Reference number" -#: ../content/techoffer/techoffer.py:111 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:123 msgid "Second image caption" msgstr "Comentari de la segona imatge/Second image caption" -#: ../content/techoffer/techoffer.py:107 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:119 msgid "Second picture" msgstr "Segona imatge/Second picture" -#: ../content/techoffer/techoffer.pt:97 +#: ../content/techoffer/techoffer.pt:120 msgid "See more technologies at" msgstr "Veu més tecnologies a/See more technologies at" -#: ../content/techoffer/techoffer.py:120 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:134 msgid "Specify Business Opportunity" msgstr "Especifca la oportunitat de negoci/Specify business opportunity" @@ -108,56 +120,39 @@ msgstr "Oferta tecnològica" msgid "Technological Offer Filter" msgstr "Filtre d'Oferta tecnológica" -#: ../content/techoffer/techoffer.py:66 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:75 msgid "Technology" msgstr "Tecnologia/Technology" -#: ../content/techoffer/techoffer.pt:56 -#: ../content/techoffer/techoffer.py:59 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.pt:65 +#: ../content/techoffer/techoffer.py:68 msgid "The Challenge" msgstr "El repte/The challenge" -#: ../content/techoffer/techoffer.pt:58 +#: ../content/techoffer/techoffer.pt:69 msgid "The Technology" msgstr "La tecnologia/The technology" -#: ../content/techoffer/techoffer.py:38 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:44 msgid "Title" msgstr "Títol/Title" -#: ../configure.zcml:48 +#: ../configure.zcml:50 msgid "Uninstalls the genweb6.patents add-on." msgstr "Desinstal·lar paquet genweb6.patents" -#: ../browser/xml_form_config/FieldsModel.xml -#: ../content/techoffer/techoffer.py:74 -msgid "advantages_description" -msgstr "Màxim 1500 caràcters. Pots veure el nombre de caràcters actuals clicant sobre el recompte de paraules que és a sota dreta d'aquesta caixa de text/A maximum of 1500 characters is allowed. You can see the current number of characters by clicking on the word count that is below on the right side of this text box." - -#: ../browser/xml_form_config/FieldsModel.xml -#: ../content/techoffer/techoffer.py:88 -msgid "applications_description" -msgstr "Màxim 500 caràcters. Pots veure el nombre de caràcters actuals clicant sobre el recompte de paraules que és a sota dreta d'aquesta caixa de text/A maximum of 500 characters is allowed. You can see the current number of characters by clicking on the word count that is below on the right side of this text box." - -#: ../browser/xml_form_config/FieldsModel.xml -#: ../content/techoffer/techoffer.py:60 -msgid "challenge_description" -msgstr "Màxim 1500 caràcters. Pots veure el nombre de caràcters actuals clicant sobre el recompte de paraules que és a sota dreta d'aquesta caixa de text/A maximum of 1500 characters is allowed. You can see the current number of characters by clicking on the word count that is below on the right side of this text box." - -#: ../browser/xml_form_config/FieldsModel.xml -#: ../content/techoffer/techoffer.py:81 -msgid "dev_stage_description" -msgstr "Màxim 500 caràcters. Pots veure el nombre de caràcters actuals clicant sobre el recompte de paraules que és a sota dreta d'aquesta caixa de text/A maximum of 500 characters is allowed. You can see the current number of characters by clicking on the word count that is below on the right side of this text box." - -#: ../content/techoffer/techoffer.pt:107 +#: ../content/techoffer/techoffer.pt:131 msgid "filed under:" msgstr "arxivat sota:" -#: ../configure.zcml:39 +#: ../configure.zcml:41 msgid "genweb6.patents" msgstr "" -#: ../configure.zcml:48 +#: ../configure.zcml:50 msgid "genweb6.patents (uninstall)" msgstr "" @@ -166,12 +161,20 @@ msgstr "" msgid "label_tags" msgstr "Etiquetes" +#. Default: "Maximum length of ${max} characters exceeded." +#: ../widgets/maxlengthtextfield/maxlengthtextfield.py:25 +msgid "max_length_exceeded" +msgstr "S'ha arribat al máxim de ${max} caràcters permessos./Maximum length of ${max} characters reached." + +#: ../content/techoffer/techoffer.py:69 +msgid "max_length_info" +msgstr "Màxim ${max} caràcters. Pots veure el nombre de caràcters actuals clicant sobre el recompte de paraules que és a sota dreta d'aquesta caixa de text/A maximum of ${max} characters is allowed. You can see the current number of characters by clicking on the word count that is below on the right side of this text box." + +#: ../content/techoffer/techoffer.py:45 +msgid "max_length_textfield_info" +msgstr "Màxim ${max} caràcters/A maximum of ${max} characters is allowed" + #. Default: "Cerca" #: ../browser/views_templates/techoffer_filter/techoffer_filter.pt:25 msgid "search" msgstr "Filtre" - -#: ../browser/xml_form_config/FieldsModel.xml -#: ../content/techoffer/techoffer.py:67 -msgid "technology_description" -msgstr "Màxim 1500 caràcters. Pots veure el nombre de caràcters actuals clicant sobre el recompte de paraules que és a sota dreta d'aquesta caixa de text/A maximum of 1500 characters is allowed. You can see the current number of characters by clicking on the word count that is below on the right side of this text box." diff --git a/src/genweb6/patents/locales/en/LC_MESSAGES/genweb6.patents.po b/src/genweb6/patents/locales/en/LC_MESSAGES/genweb6.patents.po index 0a5a20e..8fb78bb 100644 --- a/src/genweb6/patents/locales/en/LC_MESSAGES/genweb6.patents.po +++ b/src/genweb6/patents/locales/en/LC_MESSAGES/genweb6.patents.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-02-15 08:55+0000\n" +"POT-Creation-Date: 2024-05-03 09:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,64 +14,72 @@ msgstr "" "Preferred-Encodings: utf-8 latin1\n" "Domain: genweb6.patents\n" -#: ../content/techoffer/techoffer.py:134 -msgid "'Specify business opportunity' field required when 'Others' is selected for 'Business Opportunity'" +#: ../content/techoffer/techoffer.py:149 +msgid "'Specify business opportunity' field required when 'Others'is selected for 'Business Opportunity'" msgstr "" -#: ../content/techoffer/techoffer.pt:64 -#: ../content/techoffer/techoffer.py:87 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.pt:81 +#: ../content/techoffer/techoffer.py:96 msgid "Applications and Target Market" msgstr "" -#: ../content/techoffer/techoffer.pt:90 -#: ../content/techoffer/techoffer.py:116 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.pt:108 +#: ../content/techoffer/techoffer.py:130 msgid "Business Opportunity" msgstr "" -#: ../content/techoffer/techoffer.pt:94 +#: ../content/techoffer/techoffer.pt:115 msgid "Contact" msgstr "" -#: ../content/techoffer/techoffer.pt:62 -#: ../content/techoffer/techoffer.py:80 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.pt:77 +#: ../content/techoffer/techoffer.py:89 msgid "Current stage of development" msgstr "" -#: ../content/techoffer/techoffer.py:45 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:53 msgid "Description" msgstr "" -#: ../content/techoffer/techoffer.py:121 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:135 msgid "Fill this field if you selected 'Others' for 'Business Opportunity'" msgstr "" -#: ../content/techoffer/techoffer.py:99 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:108 msgid "First picture" msgstr "" -#: ../content/techoffer/techoffer.py:103 +#: ../content/techoffer/techoffer.py:112 msgid "First picture caption" msgstr "" -#: ../content/techoffer/techoffer.pt:60 -#: ../content/techoffer/techoffer.py:73 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.pt:73 +#: ../content/techoffer/techoffer.py:82 msgid "Innovative advantages" msgstr "" -#: ../configure.zcml:39 +#: ../configure.zcml:41 msgid "Installs the genweb6.patents add-on." msgstr "" -#: ../content/techoffer/techoffer.py:93 +#: ../content/techoffer/techoffer.py:102 msgid "Lead Image" msgstr "" -#: ../vocabularies.py:43 +#: ../vocabularies.py:44 msgid "Others" msgstr "" -#: ../content/techoffer/techoffer.pt:92 -#: ../content/techoffer/techoffer.py:126 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.pt:111 +#: ../content/techoffer/techoffer.py:141 msgid "Patent Status" msgstr "" @@ -79,23 +87,27 @@ msgstr "" msgid "Pendent offers to review" msgstr "" -#: ../content/techoffer/techoffer.py:52 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:61 msgid "Reference number" msgstr "" -#: ../content/techoffer/techoffer.py:111 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:123 msgid "Second image caption" msgstr "" -#: ../content/techoffer/techoffer.py:107 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:119 msgid "Second picture" msgstr "" -#: ../content/techoffer/techoffer.pt:97 +#: ../content/techoffer/techoffer.pt:120 msgid "See more technologies at" msgstr "" -#: ../content/techoffer/techoffer.py:120 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:134 msgid "Specify Business Opportunity" msgstr "" @@ -107,56 +119,39 @@ msgstr "" msgid "Technological Offer Filter" msgstr "" -#: ../content/techoffer/techoffer.py:66 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:75 msgid "Technology" msgstr "" -#: ../content/techoffer/techoffer.pt:56 -#: ../content/techoffer/techoffer.py:59 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.pt:65 +#: ../content/techoffer/techoffer.py:68 msgid "The Challenge" msgstr "" -#: ../content/techoffer/techoffer.pt:58 +#: ../content/techoffer/techoffer.pt:69 msgid "The Technology" msgstr "" -#: ../content/techoffer/techoffer.py:38 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:44 msgid "Title" msgstr "" -#: ../configure.zcml:48 +#: ../configure.zcml:50 msgid "Uninstalls the genweb6.patents add-on." msgstr "" -#: ../browser/xml_form_config/FieldsModel.xml -#: ../content/techoffer/techoffer.py:74 -msgid "advantages_description" -msgstr "" - -#: ../browser/xml_form_config/FieldsModel.xml -#: ../content/techoffer/techoffer.py:88 -msgid "applications_description" -msgstr "" - -#: ../browser/xml_form_config/FieldsModel.xml -#: ../content/techoffer/techoffer.py:60 -msgid "challenge_description" -msgstr "" - -#: ../browser/xml_form_config/FieldsModel.xml -#: ../content/techoffer/techoffer.py:81 -msgid "dev_stage_description" -msgstr "" - -#: ../content/techoffer/techoffer.pt:107 +#: ../content/techoffer/techoffer.pt:131 msgid "filed under:" msgstr "" -#: ../configure.zcml:39 +#: ../configure.zcml:41 msgid "genweb6.patents" msgstr "" -#: ../configure.zcml:48 +#: ../configure.zcml:50 msgid "genweb6.patents (uninstall)" msgstr "" @@ -165,12 +160,20 @@ msgstr "" msgid "label_tags" msgstr "" +#. Default: "Maximum length of ${max} characters exceeded." +#: ../widgets/maxlengthtextfield/maxlengthtextfield.py:25 +msgid "max_length_exceeded" +msgstr "" + +#: ../content/techoffer/techoffer.py:69 +msgid "max_length_info" +msgstr "" + +#: ../content/techoffer/techoffer.py:45 +msgid "max_length_textfield_info" +msgstr "" + #. Default: "Cerca" #: ../browser/views_templates/techoffer_filter/techoffer_filter.pt:25 msgid "search" msgstr "" - -#: ../browser/xml_form_config/FieldsModel.xml -#: ../content/techoffer/techoffer.py:67 -msgid "technology_description" -msgstr "" diff --git a/src/genweb6/patents/locales/genweb6.patents.pot b/src/genweb6/patents/locales/genweb6.patents.pot index d19d154..312e896 100644 --- a/src/genweb6/patents/locales/genweb6.patents.pot +++ b/src/genweb6/patents/locales/genweb6.patents.pot @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-02-15 08:55+0000\n" +"POT-Creation-Date: 2024-05-03 09:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,64 +17,72 @@ msgstr "" "Preferred-Encodings: utf-8 latin1\n" "Domain: genweb6.patents\n" -#: ../content/techoffer/techoffer.py:134 -msgid "'Specify business opportunity' field required when 'Others' is selected for 'Business Opportunity'" +#: ../content/techoffer/techoffer.py:149 +msgid "'Specify business opportunity' field required when 'Others'is selected for 'Business Opportunity'" msgstr "" -#: ../content/techoffer/techoffer.pt:64 -#: ../content/techoffer/techoffer.py:87 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.pt:81 +#: ../content/techoffer/techoffer.py:96 msgid "Applications and Target Market" msgstr "" -#: ../content/techoffer/techoffer.pt:90 -#: ../content/techoffer/techoffer.py:116 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.pt:108 +#: ../content/techoffer/techoffer.py:130 msgid "Business Opportunity" msgstr "" -#: ../content/techoffer/techoffer.pt:94 +#: ../content/techoffer/techoffer.pt:115 msgid "Contact" msgstr "" -#: ../content/techoffer/techoffer.pt:62 -#: ../content/techoffer/techoffer.py:80 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.pt:77 +#: ../content/techoffer/techoffer.py:89 msgid "Current stage of development" msgstr "" -#: ../content/techoffer/techoffer.py:45 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:53 msgid "Description" msgstr "" -#: ../content/techoffer/techoffer.py:121 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:135 msgid "Fill this field if you selected 'Others' for 'Business Opportunity'" msgstr "" -#: ../content/techoffer/techoffer.py:99 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:108 msgid "First picture" msgstr "" -#: ../content/techoffer/techoffer.py:103 +#: ../content/techoffer/techoffer.py:112 msgid "First picture caption" msgstr "" -#: ../content/techoffer/techoffer.pt:60 -#: ../content/techoffer/techoffer.py:73 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.pt:73 +#: ../content/techoffer/techoffer.py:82 msgid "Innovative advantages" msgstr "" -#: ../configure.zcml:39 +#: ../configure.zcml:41 msgid "Installs the genweb6.patents add-on." msgstr "" -#: ../content/techoffer/techoffer.py:93 +#: ../content/techoffer/techoffer.py:102 msgid "Lead Image" msgstr "" -#: ../vocabularies.py:43 +#: ../vocabularies.py:44 msgid "Others" msgstr "" -#: ../content/techoffer/techoffer.pt:92 -#: ../content/techoffer/techoffer.py:126 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.pt:111 +#: ../content/techoffer/techoffer.py:141 msgid "Patent Status" msgstr "" @@ -82,23 +90,27 @@ msgstr "" msgid "Pendent offers to review" msgstr "" -#: ../content/techoffer/techoffer.py:52 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:61 msgid "Reference number" msgstr "" -#: ../content/techoffer/techoffer.py:111 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:123 msgid "Second image caption" msgstr "" -#: ../content/techoffer/techoffer.py:107 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:119 msgid "Second picture" msgstr "" -#: ../content/techoffer/techoffer.pt:97 +#: ../content/techoffer/techoffer.pt:120 msgid "See more technologies at" msgstr "" -#: ../content/techoffer/techoffer.py:120 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:134 msgid "Specify Business Opportunity" msgstr "" @@ -110,56 +122,39 @@ msgstr "" msgid "Technological Offer Filter" msgstr "" -#: ../content/techoffer/techoffer.py:66 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:75 msgid "Technology" msgstr "" -#: ../content/techoffer/techoffer.pt:56 -#: ../content/techoffer/techoffer.py:59 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.pt:65 +#: ../content/techoffer/techoffer.py:68 msgid "The Challenge" msgstr "" -#: ../content/techoffer/techoffer.pt:58 +#: ../content/techoffer/techoffer.pt:69 msgid "The Technology" msgstr "" -#: ../content/techoffer/techoffer.py:38 +#: ../browser/xml_form_config/FieldsModel.xml +#: ../content/techoffer/techoffer.py:44 msgid "Title" msgstr "" -#: ../configure.zcml:48 +#: ../configure.zcml:50 msgid "Uninstalls the genweb6.patents add-on." msgstr "" -#: ../browser/xml_form_config/FieldsModel.xml -#: ../content/techoffer/techoffer.py:74 -msgid "advantages_description" -msgstr "" - -#: ../browser/xml_form_config/FieldsModel.xml -#: ../content/techoffer/techoffer.py:88 -msgid "applications_description" -msgstr "" - -#: ../browser/xml_form_config/FieldsModel.xml -#: ../content/techoffer/techoffer.py:60 -msgid "challenge_description" -msgstr "" - -#: ../browser/xml_form_config/FieldsModel.xml -#: ../content/techoffer/techoffer.py:81 -msgid "dev_stage_description" -msgstr "" - -#: ../content/techoffer/techoffer.pt:107 +#: ../content/techoffer/techoffer.pt:131 msgid "filed under:" msgstr "" -#: ../configure.zcml:39 +#: ../configure.zcml:41 msgid "genweb6.patents" msgstr "" -#: ../configure.zcml:48 +#: ../configure.zcml:50 msgid "genweb6.patents (uninstall)" msgstr "" @@ -168,12 +163,20 @@ msgstr "" msgid "label_tags" msgstr "" +#. Default: "Maximum length of ${max} characters exceeded." +#: ../widgets/maxlengthtextfield/maxlengthtextfield.py:25 +msgid "max_length_exceeded" +msgstr "" + +#: ../content/techoffer/techoffer.py:69 +msgid "max_length_info" +msgstr "" + +#: ../content/techoffer/techoffer.py:45 +msgid "max_length_textfield_info" +msgstr "" + #. Default: "Cerca" #: ../browser/views_templates/techoffer_filter/techoffer_filter.pt:25 msgid "search" msgstr "" - -#: ../browser/xml_form_config/FieldsModel.xml -#: ../content/techoffer/techoffer.py:67 -msgid "technology_description" -msgstr "" diff --git a/src/genweb6/patents/theme/js/widget-maxlengthtext.min.js b/src/genweb6/patents/theme/js/widget-maxlengthtext.min.js new file mode 100644 index 0000000..f4bde40 --- /dev/null +++ b/src/genweb6/patents/theme/js/widget-maxlengthtext.min.js @@ -0,0 +1 @@ +$(document).ready(function(){console.log("max length text widget loaded"),$(".maxlengthtext-widget").each(function(){const a=$(this).attr("maxlength");function e(e){var t;e.value.length>=a?(t=e.getAttribute("data-maxlength-exceeded-text")||"The maximum length has been exceeded.",0${t}`).insertAfter(e)):$(`em[data-for=${e.id}]`).remove()}e(this),$(this).on("input",()=>{e(this)})})}); \ No newline at end of file diff --git a/src/genweb6/patents/theme/js/widgets/maxlengthtext.js b/src/genweb6/patents/theme/js/widgets/maxlengthtext.js new file mode 100644 index 0000000..eb3e8dd --- /dev/null +++ b/src/genweb6/patents/theme/js/widgets/maxlengthtext.js @@ -0,0 +1,27 @@ + +$(document).ready(function() { + console.log("max length text widget loaded"); + $(".maxlengthtext-widget").each(function() { + const max_length = $(this).attr("maxlength"); + + function updateFeedback(input) { + if (input.value.length >= max_length) { + /* Add an error message sibling if does not exist */ + const err_text = input.getAttribute("data-maxlength-exceeded-text") || "The maximum length has been exceeded."; + if(!$(`em[data-for=${input.id}]`).length > 0){ + $(`${err_text}`) + .insertAfter(input); + } + } + else { + /* Remove the error message sibling */ + $(`em[data-for=${input.id}]`).remove(); + } + } + + // Initial check in case the input is already filled + updateFeedback(this); + + $(this).on("input", () => { updateFeedback(this); }); + }); +}); diff --git a/src/genweb6/patents/theme/scss/_techoffer.scss b/src/genweb6/patents/theme/scss/_techoffer.scss index c2fdb21..00905d5 100644 --- a/src/genweb6/patents/theme/scss/_techoffer.scss +++ b/src/genweb6/patents/theme/scss/_techoffer.scss @@ -1,5 +1,6 @@ -body.portaltype-techoffer { +body.portaltype-techoffer, +form[class~="++add++TechOffer"] { /*Make all grid-sized elements block level again*/ .print-only { @@ -10,6 +11,15 @@ body.portaltype-techoffer { margin-top: 2rem; } + .to-image { + width: fit-content; + margin: 0 auto; + } + + .info-feedback { + color: #b2b2b2; + } + @media only screen and (max-width: 639px){ .row-fluid [class*="span"] { @@ -53,40 +63,52 @@ body.portaltype-techoffer { h1 { margin-top: 0px !important; - margin-bottom: 0px !important; - font-size: 16px !important; + margin-bottom: 10px !important; + font-size: 20px !important; + text-align: center !important; } h3, h4 { font-size: 12px !important; margin-bottom: 0.2rem !important; - margin-top: 0.2rem !important; - } - h4 { margin-top: 1rem !important; - } + } #parent-fieldname-text { margin-top: 10px !important; } - + .content-description { + font-size: 11px !important; + } #content-core, #main-container, .row-fluid [class*="span"]{ margin-bottom: 0px !important; padding-bottom: 0px !important; } - .box, header, p { + .box, header { margin-bottom: 0px !important; } + + header.print-only { + text-align: justify !important; + } .box { - padding: 5px !important; + padding: 0px !important; text-align: justify !important; + border: unset !important; } .card { padding: 2px !important; + padding-left: 5px !important; margin: 0 !important; + border-radius: 0 !important; + } + + .to-image img { + max-height: 210px !important; + width: auto !important; } .print-only { @@ -98,6 +120,7 @@ body.portaltype-techoffer { #head-upc-logo, img#head-upc-logo{ margin-bottom: 1rem !important; max-width: 250px; + } .print-no-break { diff --git a/src/genweb6/patents/theme/stylesheets/theme-concat.css b/src/genweb6/patents/theme/stylesheets/theme-concat.css index 7a24ba4..a76e2bb 100644 --- a/src/genweb6/patents/theme/stylesheets/theme-concat.css +++ b/src/genweb6/patents/theme/stylesheets/theme-concat.css @@ -1,18 +1,33 @@ /* line 2, ../scss/_techoffer.scss */ -body.portaltype-techoffer { +body.portaltype-techoffer, +form[class~="++add++TechOffer"] { /*Make all grid-sized elements block level again*/ } -/* line 5, ../scss/_techoffer.scss */ -body.portaltype-techoffer .print-only { +/* line 6, ../scss/_techoffer.scss */ +body.portaltype-techoffer .print-only, +form[class~="++add++TechOffer"] .print-only { display: none; } -/* line 9, ../scss/_techoffer.scss */ -body.portaltype-techoffer .h-not-first > h3 { +/* line 10, ../scss/_techoffer.scss */ +body.portaltype-techoffer .h-not-first > h3, +form[class~="++add++TechOffer"] .h-not-first > h3 { margin-top: 2rem; } +/* line 14, ../scss/_techoffer.scss */ +body.portaltype-techoffer .to-image, +form[class~="++add++TechOffer"] .to-image { + width: fit-content; + margin: 0 auto; +} +/* line 19, ../scss/_techoffer.scss */ +body.portaltype-techoffer .info-feedback, +form[class~="++add++TechOffer"] .info-feedback { + color: #b2b2b2; +} @media only screen and (max-width: 639px) { - /* line 15, ../scss/_techoffer.scss */ - body.portaltype-techoffer .row-fluid [class*="span"] { + /* line 25, ../scss/_techoffer.scss */ + body.portaltype-techoffer .row-fluid [class*="span"], + form[class~="++add++TechOffer"] .row-fluid [class*="span"] { float: none !important; display: block !important; width: auto !important; @@ -21,13 +36,14 @@ body.portaltype-techoffer .h-not-first > h3 { } @media print { /* line 2, ../scss/_techoffer.scss */ - body.portaltype-techoffer { + body.portaltype-techoffer, + form[class~="++add++TechOffer"] { background: white; font-size: 11px !important; padding: 0px !important; line-height: normal !important; } - /* line 31, ../scss/_techoffer.scss */ + /* line 41, ../scss/_techoffer.scss */ body.portaltype-techoffer #above-content-wrapper, body.portaltype-techoffer #content-header, body.portaltype-techoffer #back-to-top, @@ -36,70 +52,113 @@ body.portaltype-techoffer .h-not-first > h3 { body.portaltype-techoffer #techoffer-tags-list, body.portaltype-techoffer #social_tags, body.portaltype-techoffer .portalMessage, - body.portaltype-techoffer .no-print { + body.portaltype-techoffer .no-print, + form[class~="++add++TechOffer"] #above-content-wrapper, + form[class~="++add++TechOffer"] #content-header, + form[class~="++add++TechOffer"] #back-to-top, + form[class~="++add++TechOffer"] #portal-column-one, + form[class~="++add++TechOffer"] #global_statusmessage, + form[class~="++add++TechOffer"] #techoffer-tags-list, + form[class~="++add++TechOffer"] #social_tags, + form[class~="++add++TechOffer"] .portalMessage, + form[class~="++add++TechOffer"] .no-print { display: none !important; } - /* line 43, ../scss/_techoffer.scss */ - body.portaltype-techoffer .container { + /* line 53, ../scss/_techoffer.scss */ + body.portaltype-techoffer .container, + form[class~="++add++TechOffer"] .container { margin: 0px !important; padding: 0px !important; max-width: 100% !important; } - /* line 49, ../scss/_techoffer.scss */ - body.portaltype-techoffer a, body.portaltype-techoffer a:visited { + /* line 59, ../scss/_techoffer.scss */ + body.portaltype-techoffer a, body.portaltype-techoffer a:visited, + form[class~="++add++TechOffer"] a, + form[class~="++add++TechOffer"] a:visited { color: black !important; text-decoration: none !important; } - /* line 54, ../scss/_techoffer.scss */ - body.portaltype-techoffer h1 { + /* line 64, ../scss/_techoffer.scss */ + body.portaltype-techoffer h1, + form[class~="++add++TechOffer"] h1 { margin-top: 0px !important; - margin-bottom: 0px !important; - font-size: 16px !important; - } - /* line 60, ../scss/_techoffer.scss */ - body.portaltype-techoffer h3, body.portaltype-techoffer h4 { + margin-bottom: 10px !important; + font-size: 20px !important; + text-align: center !important; + } + /* line 71, ../scss/_techoffer.scss */ + body.portaltype-techoffer h3, body.portaltype-techoffer h4, + form[class~="++add++TechOffer"] h3, + form[class~="++add++TechOffer"] h4 { font-size: 12px !important; margin-bottom: 0.2rem !important; - margin-top: 0.2rem !important; - } - /* line 65, ../scss/_techoffer.scss */ - body.portaltype-techoffer h4 { margin-top: 1rem !important; } - /* line 69, ../scss/_techoffer.scss */ - body.portaltype-techoffer #parent-fieldname-text { + /* line 77, ../scss/_techoffer.scss */ + body.portaltype-techoffer #parent-fieldname-text, + form[class~="++add++TechOffer"] #parent-fieldname-text { margin-top: 10px !important; } - /* line 73, ../scss/_techoffer.scss */ - body.portaltype-techoffer #content-core, body.portaltype-techoffer #main-container, body.portaltype-techoffer .row-fluid [class*="span"] { + /* line 80, ../scss/_techoffer.scss */ + body.portaltype-techoffer .content-description, + form[class~="++add++TechOffer"] .content-description { + font-size: 11px !important; + } + /* line 83, ../scss/_techoffer.scss */ + body.portaltype-techoffer #content-core, body.portaltype-techoffer #main-container, body.portaltype-techoffer .row-fluid [class*="span"], + form[class~="++add++TechOffer"] #content-core, + form[class~="++add++TechOffer"] #main-container, + form[class~="++add++TechOffer"] .row-fluid [class*="span"] { margin-bottom: 0px !important; padding-bottom: 0px !important; } - /* line 78, ../scss/_techoffer.scss */ - body.portaltype-techoffer .box, body.portaltype-techoffer header, body.portaltype-techoffer p { + /* line 88, ../scss/_techoffer.scss */ + body.portaltype-techoffer .box, body.portaltype-techoffer header, + form[class~="++add++TechOffer"] .box, + form[class~="++add++TechOffer"] header { margin-bottom: 0px !important; } - /* line 82, ../scss/_techoffer.scss */ - body.portaltype-techoffer .box { - padding: 5px !important; + /* line 92, ../scss/_techoffer.scss */ + body.portaltype-techoffer header.print-only, + form[class~="++add++TechOffer"] header.print-only { + text-align: justify !important; + } + /* line 96, ../scss/_techoffer.scss */ + body.portaltype-techoffer .box, + form[class~="++add++TechOffer"] .box { + padding: 0px !important; text-align: justify !important; + border: unset !important; } - /* line 87, ../scss/_techoffer.scss */ - body.portaltype-techoffer .card { + /* line 102, ../scss/_techoffer.scss */ + body.portaltype-techoffer .card, + form[class~="++add++TechOffer"] .card { padding: 2px !important; + padding-left: 5px !important; margin: 0 !important; + border-radius: 0 !important; } - /* line 92, ../scss/_techoffer.scss */ - body.portaltype-techoffer .print-only { + /* line 109, ../scss/_techoffer.scss */ + body.portaltype-techoffer .to-image img, + form[class~="++add++TechOffer"] .to-image img { + max-height: 210px !important; + width: auto !important; + } + /* line 114, ../scss/_techoffer.scss */ + body.portaltype-techoffer .print-only, + form[class~="++add++TechOffer"] .print-only { display: initial !important; } - /* line 98, ../scss/_techoffer.scss */ - body.portaltype-techoffer #head-upc-logo, body.portaltype-techoffer img#head-upc-logo { + /* line 120, ../scss/_techoffer.scss */ + body.portaltype-techoffer #head-upc-logo, body.portaltype-techoffer img#head-upc-logo, + form[class~="++add++TechOffer"] #head-upc-logo, + form[class~="++add++TechOffer"] img#head-upc-logo { margin-bottom: 1rem !important; max-width: 250px; } - /* line 103, ../scss/_techoffer.scss */ - body.portaltype-techoffer .print-no-break { + /* line 126, ../scss/_techoffer.scss */ + body.portaltype-techoffer .print-no-break, + form[class~="++add++TechOffer"] .print-no-break { break-inside: avoid !important; } } diff --git a/src/genweb6/patents/theme/stylesheets/theme-patents.min.css b/src/genweb6/patents/theme/stylesheets/theme-patents.min.css index 5c689fe..58ad7ac 100644 --- a/src/genweb6/patents/theme/stylesheets/theme-patents.min.css +++ b/src/genweb6/patents/theme/stylesheets/theme-patents.min.css @@ -1 +1 @@ -body.portaltype-techoffer .print-only{display:none}body.portaltype-techoffer .h-not-first>h3{margin-top:2rem}@media only screen and (max-width:639px){body.portaltype-techoffer .row-fluid [class*=span]{float:none!important;display:block!important;width:auto!important;margin-left:0!important}}@media print{body.portaltype-techoffer{background:#fff;font-size:11px!important;padding:0!important;line-height:normal!important}body.portaltype-techoffer #above-content-wrapper,body.portaltype-techoffer #back-to-top,body.portaltype-techoffer #content-header,body.portaltype-techoffer #global_statusmessage,body.portaltype-techoffer #portal-column-one,body.portaltype-techoffer #social_tags,body.portaltype-techoffer #techoffer-tags-list,body.portaltype-techoffer .no-print,body.portaltype-techoffer .portalMessage{display:none!important}body.portaltype-techoffer .container{margin:0!important;padding:0!important;max-width:100%!important}body.portaltype-techoffer a,body.portaltype-techoffer a:visited{color:#000!important;text-decoration:none!important}body.portaltype-techoffer h1{margin-top:0!important;margin-bottom:0!important;font-size:16px!important}body.portaltype-techoffer h3,body.portaltype-techoffer h4{font-size:12px!important;margin-bottom:.2rem!important;margin-top:.2rem!important}body.portaltype-techoffer h4{margin-top:1rem!important}body.portaltype-techoffer #parent-fieldname-text{margin-top:10px!important}body.portaltype-techoffer #content-core,body.portaltype-techoffer #main-container,body.portaltype-techoffer .row-fluid [class*=span]{margin-bottom:0!important;padding-bottom:0!important}body.portaltype-techoffer .box,body.portaltype-techoffer header,body.portaltype-techoffer p{margin-bottom:0!important}body.portaltype-techoffer .box{padding:5px!important;text-align:justify!important}body.portaltype-techoffer .card{padding:2px!important;margin:0!important}body.portaltype-techoffer .print-only{display:initial!important}body.portaltype-techoffer #head-upc-logo,body.portaltype-techoffer img#head-upc-logo{margin-bottom:1rem!important;max-width:250px}body.portaltype-techoffer .print-no-break{break-inside:avoid!important}} \ No newline at end of file +body.portaltype-techoffer .print-only,form[class~="++add++TechOffer"] .print-only{display:none}body.portaltype-techoffer .h-not-first>h3,form[class~="++add++TechOffer"] .h-not-first>h3{margin-top:2rem}body.portaltype-techoffer .to-image,form[class~="++add++TechOffer"] .to-image{width:fit-content;margin:0 auto}body.portaltype-techoffer .info-feedback,form[class~="++add++TechOffer"] .info-feedback{color:#b2b2b2}@media only screen and (max-width:639px){body.portaltype-techoffer .row-fluid [class*=span],form[class~="++add++TechOffer"] .row-fluid [class*=span]{float:none!important;display:block!important;width:auto!important;margin-left:0!important}}@media print{body.portaltype-techoffer,form[class~="++add++TechOffer"]{background:#fff;font-size:11px!important;padding:0!important;line-height:normal!important}body.portaltype-techoffer #above-content-wrapper,body.portaltype-techoffer #back-to-top,body.portaltype-techoffer #content-header,body.portaltype-techoffer #global_statusmessage,body.portaltype-techoffer #portal-column-one,body.portaltype-techoffer #social_tags,body.portaltype-techoffer #techoffer-tags-list,body.portaltype-techoffer .no-print,body.portaltype-techoffer .portalMessage,form[class~="++add++TechOffer"] #above-content-wrapper,form[class~="++add++TechOffer"] #back-to-top,form[class~="++add++TechOffer"] #content-header,form[class~="++add++TechOffer"] #global_statusmessage,form[class~="++add++TechOffer"] #portal-column-one,form[class~="++add++TechOffer"] #social_tags,form[class~="++add++TechOffer"] #techoffer-tags-list,form[class~="++add++TechOffer"] .no-print,form[class~="++add++TechOffer"] .portalMessage{display:none!important}body.portaltype-techoffer .container,form[class~="++add++TechOffer"] .container{margin:0!important;padding:0!important;max-width:100%!important}body.portaltype-techoffer a,body.portaltype-techoffer a:visited,form[class~="++add++TechOffer"] a,form[class~="++add++TechOffer"] a:visited{color:#000!important;text-decoration:none!important}body.portaltype-techoffer h1,form[class~="++add++TechOffer"] h1{margin-top:0!important;margin-bottom:10px!important;font-size:20px!important;text-align:center!important}body.portaltype-techoffer h3,body.portaltype-techoffer h4,form[class~="++add++TechOffer"] h3,form[class~="++add++TechOffer"] h4{font-size:12px!important;margin-bottom:.2rem!important;margin-top:1rem!important}body.portaltype-techoffer #parent-fieldname-text,form[class~="++add++TechOffer"] #parent-fieldname-text{margin-top:10px!important}body.portaltype-techoffer .content-description,form[class~="++add++TechOffer"] .content-description{font-size:11px!important}body.portaltype-techoffer #content-core,body.portaltype-techoffer #main-container,body.portaltype-techoffer .row-fluid [class*=span],form[class~="++add++TechOffer"] #content-core,form[class~="++add++TechOffer"] #main-container,form[class~="++add++TechOffer"] .row-fluid [class*=span]{margin-bottom:0!important;padding-bottom:0!important}body.portaltype-techoffer .box,body.portaltype-techoffer header,form[class~="++add++TechOffer"] .box,form[class~="++add++TechOffer"] header{margin-bottom:0!important}body.portaltype-techoffer header.print-only,form[class~="++add++TechOffer"] header.print-only{text-align:justify!important}body.portaltype-techoffer .box,form[class~="++add++TechOffer"] .box{padding:0!important;text-align:justify!important;border:unset!important}body.portaltype-techoffer .card,form[class~="++add++TechOffer"] .card{padding:2px!important;padding-left:5px!important;margin:0!important;border-radius:0!important}body.portaltype-techoffer .to-image img,form[class~="++add++TechOffer"] .to-image img{max-height:210px!important;width:auto!important}body.portaltype-techoffer .print-only,form[class~="++add++TechOffer"] .print-only{display:initial!important}body.portaltype-techoffer #head-upc-logo,body.portaltype-techoffer img#head-upc-logo,form[class~="++add++TechOffer"] #head-upc-logo,form[class~="++add++TechOffer"] img#head-upc-logo{margin-bottom:1rem!important;max-width:250px}body.portaltype-techoffer .print-no-break,form[class~="++add++TechOffer"] .print-no-break{break-inside:avoid!important}} \ No newline at end of file diff --git a/src/genweb6/patents/theme/stylesheets/theme.css b/src/genweb6/patents/theme/stylesheets/theme.css index 7a24ba4..a76e2bb 100644 --- a/src/genweb6/patents/theme/stylesheets/theme.css +++ b/src/genweb6/patents/theme/stylesheets/theme.css @@ -1,18 +1,33 @@ /* line 2, ../scss/_techoffer.scss */ -body.portaltype-techoffer { +body.portaltype-techoffer, +form[class~="++add++TechOffer"] { /*Make all grid-sized elements block level again*/ } -/* line 5, ../scss/_techoffer.scss */ -body.portaltype-techoffer .print-only { +/* line 6, ../scss/_techoffer.scss */ +body.portaltype-techoffer .print-only, +form[class~="++add++TechOffer"] .print-only { display: none; } -/* line 9, ../scss/_techoffer.scss */ -body.portaltype-techoffer .h-not-first > h3 { +/* line 10, ../scss/_techoffer.scss */ +body.portaltype-techoffer .h-not-first > h3, +form[class~="++add++TechOffer"] .h-not-first > h3 { margin-top: 2rem; } +/* line 14, ../scss/_techoffer.scss */ +body.portaltype-techoffer .to-image, +form[class~="++add++TechOffer"] .to-image { + width: fit-content; + margin: 0 auto; +} +/* line 19, ../scss/_techoffer.scss */ +body.portaltype-techoffer .info-feedback, +form[class~="++add++TechOffer"] .info-feedback { + color: #b2b2b2; +} @media only screen and (max-width: 639px) { - /* line 15, ../scss/_techoffer.scss */ - body.portaltype-techoffer .row-fluid [class*="span"] { + /* line 25, ../scss/_techoffer.scss */ + body.portaltype-techoffer .row-fluid [class*="span"], + form[class~="++add++TechOffer"] .row-fluid [class*="span"] { float: none !important; display: block !important; width: auto !important; @@ -21,13 +36,14 @@ body.portaltype-techoffer .h-not-first > h3 { } @media print { /* line 2, ../scss/_techoffer.scss */ - body.portaltype-techoffer { + body.portaltype-techoffer, + form[class~="++add++TechOffer"] { background: white; font-size: 11px !important; padding: 0px !important; line-height: normal !important; } - /* line 31, ../scss/_techoffer.scss */ + /* line 41, ../scss/_techoffer.scss */ body.portaltype-techoffer #above-content-wrapper, body.portaltype-techoffer #content-header, body.portaltype-techoffer #back-to-top, @@ -36,70 +52,113 @@ body.portaltype-techoffer .h-not-first > h3 { body.portaltype-techoffer #techoffer-tags-list, body.portaltype-techoffer #social_tags, body.portaltype-techoffer .portalMessage, - body.portaltype-techoffer .no-print { + body.portaltype-techoffer .no-print, + form[class~="++add++TechOffer"] #above-content-wrapper, + form[class~="++add++TechOffer"] #content-header, + form[class~="++add++TechOffer"] #back-to-top, + form[class~="++add++TechOffer"] #portal-column-one, + form[class~="++add++TechOffer"] #global_statusmessage, + form[class~="++add++TechOffer"] #techoffer-tags-list, + form[class~="++add++TechOffer"] #social_tags, + form[class~="++add++TechOffer"] .portalMessage, + form[class~="++add++TechOffer"] .no-print { display: none !important; } - /* line 43, ../scss/_techoffer.scss */ - body.portaltype-techoffer .container { + /* line 53, ../scss/_techoffer.scss */ + body.portaltype-techoffer .container, + form[class~="++add++TechOffer"] .container { margin: 0px !important; padding: 0px !important; max-width: 100% !important; } - /* line 49, ../scss/_techoffer.scss */ - body.portaltype-techoffer a, body.portaltype-techoffer a:visited { + /* line 59, ../scss/_techoffer.scss */ + body.portaltype-techoffer a, body.portaltype-techoffer a:visited, + form[class~="++add++TechOffer"] a, + form[class~="++add++TechOffer"] a:visited { color: black !important; text-decoration: none !important; } - /* line 54, ../scss/_techoffer.scss */ - body.portaltype-techoffer h1 { + /* line 64, ../scss/_techoffer.scss */ + body.portaltype-techoffer h1, + form[class~="++add++TechOffer"] h1 { margin-top: 0px !important; - margin-bottom: 0px !important; - font-size: 16px !important; - } - /* line 60, ../scss/_techoffer.scss */ - body.portaltype-techoffer h3, body.portaltype-techoffer h4 { + margin-bottom: 10px !important; + font-size: 20px !important; + text-align: center !important; + } + /* line 71, ../scss/_techoffer.scss */ + body.portaltype-techoffer h3, body.portaltype-techoffer h4, + form[class~="++add++TechOffer"] h3, + form[class~="++add++TechOffer"] h4 { font-size: 12px !important; margin-bottom: 0.2rem !important; - margin-top: 0.2rem !important; - } - /* line 65, ../scss/_techoffer.scss */ - body.portaltype-techoffer h4 { margin-top: 1rem !important; } - /* line 69, ../scss/_techoffer.scss */ - body.portaltype-techoffer #parent-fieldname-text { + /* line 77, ../scss/_techoffer.scss */ + body.portaltype-techoffer #parent-fieldname-text, + form[class~="++add++TechOffer"] #parent-fieldname-text { margin-top: 10px !important; } - /* line 73, ../scss/_techoffer.scss */ - body.portaltype-techoffer #content-core, body.portaltype-techoffer #main-container, body.portaltype-techoffer .row-fluid [class*="span"] { + /* line 80, ../scss/_techoffer.scss */ + body.portaltype-techoffer .content-description, + form[class~="++add++TechOffer"] .content-description { + font-size: 11px !important; + } + /* line 83, ../scss/_techoffer.scss */ + body.portaltype-techoffer #content-core, body.portaltype-techoffer #main-container, body.portaltype-techoffer .row-fluid [class*="span"], + form[class~="++add++TechOffer"] #content-core, + form[class~="++add++TechOffer"] #main-container, + form[class~="++add++TechOffer"] .row-fluid [class*="span"] { margin-bottom: 0px !important; padding-bottom: 0px !important; } - /* line 78, ../scss/_techoffer.scss */ - body.portaltype-techoffer .box, body.portaltype-techoffer header, body.portaltype-techoffer p { + /* line 88, ../scss/_techoffer.scss */ + body.portaltype-techoffer .box, body.portaltype-techoffer header, + form[class~="++add++TechOffer"] .box, + form[class~="++add++TechOffer"] header { margin-bottom: 0px !important; } - /* line 82, ../scss/_techoffer.scss */ - body.portaltype-techoffer .box { - padding: 5px !important; + /* line 92, ../scss/_techoffer.scss */ + body.portaltype-techoffer header.print-only, + form[class~="++add++TechOffer"] header.print-only { + text-align: justify !important; + } + /* line 96, ../scss/_techoffer.scss */ + body.portaltype-techoffer .box, + form[class~="++add++TechOffer"] .box { + padding: 0px !important; text-align: justify !important; + border: unset !important; } - /* line 87, ../scss/_techoffer.scss */ - body.portaltype-techoffer .card { + /* line 102, ../scss/_techoffer.scss */ + body.portaltype-techoffer .card, + form[class~="++add++TechOffer"] .card { padding: 2px !important; + padding-left: 5px !important; margin: 0 !important; + border-radius: 0 !important; } - /* line 92, ../scss/_techoffer.scss */ - body.portaltype-techoffer .print-only { + /* line 109, ../scss/_techoffer.scss */ + body.portaltype-techoffer .to-image img, + form[class~="++add++TechOffer"] .to-image img { + max-height: 210px !important; + width: auto !important; + } + /* line 114, ../scss/_techoffer.scss */ + body.portaltype-techoffer .print-only, + form[class~="++add++TechOffer"] .print-only { display: initial !important; } - /* line 98, ../scss/_techoffer.scss */ - body.portaltype-techoffer #head-upc-logo, body.portaltype-techoffer img#head-upc-logo { + /* line 120, ../scss/_techoffer.scss */ + body.portaltype-techoffer #head-upc-logo, body.portaltype-techoffer img#head-upc-logo, + form[class~="++add++TechOffer"] #head-upc-logo, + form[class~="++add++TechOffer"] img#head-upc-logo { margin-bottom: 1rem !important; max-width: 250px; } - /* line 103, ../scss/_techoffer.scss */ - body.portaltype-techoffer .print-no-break { + /* line 126, ../scss/_techoffer.scss */ + body.portaltype-techoffer .print-no-break, + form[class~="++add++TechOffer"] .print-no-break { break-inside: avoid !important; } } diff --git a/src/genweb6/patents/validators.py b/src/genweb6/patents/validators.py index 84019d4..a2fac61 100644 --- a/src/genweb6/patents/validators.py +++ b/src/genweb6/patents/validators.py @@ -28,5 +28,5 @@ def maxLengthNoTags500(value, **kwargs): return maxLegnthNoTagsGeneric(500, value, **kwargs) -def maxLengthNoTags1500(value, **kwargs): - return maxLegnthNoTagsGeneric(1500, value, **kwargs) +def maxLengthNoTags1100(value, **kwargs): + return maxLegnthNoTagsGeneric(1100, value, **kwargs) diff --git a/src/genweb6/patents/validators.zcml b/src/genweb6/patents/validators.zcml index 2e45521..c906d66 100644 --- a/src/genweb6/patents/validators.zcml +++ b/src/genweb6/patents/validators.zcml @@ -5,8 +5,8 @@ component=".validators.maxLengthNoTags500" /> diff --git a/src/genweb6/patents/widgets/__init__.py b/src/genweb6/patents/widgets/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/genweb6/patents/widgets/configure.zcml b/src/genweb6/patents/widgets/configure.zcml new file mode 100644 index 0000000..0374b4a --- /dev/null +++ b/src/genweb6/patents/widgets/configure.zcml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + diff --git a/src/genweb6/patents/widgets/maxlengthtextareafield/__init__.py b/src/genweb6/patents/widgets/maxlengthtextareafield/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/genweb6/patents/widgets/maxlengthtextareafield/maxlengthtextareafield.pt b/src/genweb6/patents/widgets/maxlengthtextareafield/maxlengthtextareafield.pt new file mode 100644 index 0000000..09803ce --- /dev/null +++ b/src/genweb6/patents/widgets/maxlengthtextareafield/maxlengthtextareafield.pt @@ -0,0 +1,42 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/genweb6/patents/widgets/maxlengthtextareafield/maxlengthtextareafield.py b/src/genweb6/patents/widgets/maxlengthtextareafield/maxlengthtextareafield.py new file mode 100644 index 0000000..a7f4897 --- /dev/null +++ b/src/genweb6/patents/widgets/maxlengthtextareafield/maxlengthtextareafield.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from zope.interface import implementer_only + +import z3c.form.browser.text +import z3c.form.interfaces +import z3c.form.widget +import zope.schema.interfaces + +from genweb6.patents import _ +from genweb6.patents.widgets.maxlengthtextfield.maxlengthtextfield import MaxLengthTextFieldWidget + + +class IMaxLengthTextAreaFieldWidget(z3c.form.interfaces.ITextWidget): + pass + + +@implementer_only(IMaxLengthTextAreaFieldWidget) +class MaxLengthTextAreaFieldWidget(MaxLengthTextFieldWidget): + pass diff --git a/src/genweb6/patents/widgets/maxlengthtextfield/__init__.py b/src/genweb6/patents/widgets/maxlengthtextfield/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/genweb6/patents/widgets/maxlengthtextfield/maxlengthtextfield.pt b/src/genweb6/patents/widgets/maxlengthtextfield/maxlengthtextfield.pt new file mode 100644 index 0000000..d106dcf --- /dev/null +++ b/src/genweb6/patents/widgets/maxlengthtextfield/maxlengthtextfield.pt @@ -0,0 +1,42 @@ + + + + + + + + \ No newline at end of file diff --git a/src/genweb6/patents/widgets/maxlengthtextfield/maxlengthtextfield.py b/src/genweb6/patents/widgets/maxlengthtextfield/maxlengthtextfield.py new file mode 100644 index 0000000..546c574 --- /dev/null +++ b/src/genweb6/patents/widgets/maxlengthtextfield/maxlengthtextfield.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +from zope.interface import implementer_only + +import z3c.form.browser.text +import z3c.form.interfaces +import z3c.form.widget +import zope.schema.interfaces + +from genweb6.patents import _ + + +class IMaxLengthTextFieldWidget(z3c.form.interfaces.ITextWidget): + pass + + +@implementer_only(IMaxLengthTextFieldWidget) +class MaxLengthTextFieldWidget(z3c.form.browser.text.TextWidget): + klass = u'maxlengthtext-widget' + + def update(self): + super().update() + z3c.form.browser.widget.addFieldClass(self) + + self.max_length = self.field.max_length + self.max_length_exceeded_text = _( + "max_length_exceeded", + default=u"Maximum length of ${max} characters exceeded.", + mapping={'max': self.max_length} + )