Merge branch 'develop' of github.com:UPCnet/genweb6.core into develop

Author: claudiaandreu-ithinkupc

CHANGES.rst

@@ -2,12 +2,39 @@ Changelog
 =========
 
 
-1.63 (unreleased)
+1.65 (unreleased)
 -----------------
 
 - Nothing changed yet.
 
 
+1.64 (2025-03-10)
+-----------------
+
+* [FIX] Solucionar error TOO_MANY_REDIRECTS SSO in portlet [Iago López]
+* [FIX] Solucionar error TOO_MANY_REDIRECTS SSO [Iago López]
+* [UPD] Cambio de literal Title line [Iago López]
+* [FIX] Header viewlet [Iago López]
+
+1.63 (2025-03-07)
+-----------------
+
+* [UPD] Añadir icono al nuevo contenido existing content [Iago López]
+* [FIX] Solucionar error TOO_MANY_REDIRECTS SSO [Pilar Marinas]
+* [UPD] Añadir nuevos directorios en el robots.txt [Iago López]
+* [UPD] Cambios controlpanel cabecera [Iago López]
+* [UPD] Quitar collective.behavior.seo [Iago López]
+* [UPD] Cambios controlpanel cabecera [Iago López]
+* [ADD] new tiny format for headers [Clàudia Andreu]
+* Merge branch 'develop' of github.com:UPCnet/genweb6.core into develop [Clàudia Andreu]
+* [UPD] fields in header-controlpanel [Clàudia Andreu]
+* [UPD] Quitar collective.behavior.seo y traer funcionalidad necesaria en el paquete [Iago López]
+* [UPD] Quitar twitter del compartir [Iago López]
+* [FIX] way of scan paths in linkchecker_intranet [Alberto Durán]
+* [FIX] linkchecker intranet view to be more verbose [Alberto Durán]
+* Merge branch 'develop' of github.com:UPCnet/genweb6.core into develop [Clàudia Andreu]
+* [ADD] New content type- existing content [Clàudia Andreu]
+
 1.62 (2025-02-18)
 -----------------
 

setup.py

@@ -14,7 +14,7 @@
 
 setup(
     name='genweb6.core',
-    version='1.63.dev0',
+    version='1.65.dev0',
     description="Genweb 6 Core package",
     long_description=long_description,
     # Get more from https://pypi.org/classifiers/

src/genweb6/core/behaviors/seo.py

@@ -26,24 +26,24 @@ class ISeo(model.Schema, IDexteritySchema):
     """
 
     model.fieldset(
-      "seofields", _("SEO"), fields=["seo_robots"],
+      "seofields", _("SEO"), fields=["seo_title", "seo_description", "seo_robots"],
+    )
+
+    seo_title = schema.TextLine(
+        title=_("SEO Title"),
+        description=_("S'utilitza al títol de la secció 'head' de la pàgina web"),
+        required=False,
+    )
+
+    seo_description = schema.Text(
+        title=_("SEO Description"),
+        description=_("S'utilitza a la descripció de la secció 'head' de la pàgina web"),
+        required=False,
     )
 
     seo_robots = schema.Choice(
         title=_("Metatag Robots"),
-        description=_(
-            "seo_robots_help",
-            default=(
-                "Select options that hint search engines how "
-                "to treat this content. Typically listings are to "
-                "navigate the site, but add little to no value in its "
-                "own and should be set to 'noindex, follow'. In some "
-                "cases you want a listing to be indexed. E.g. when "
-                "publishing a Top 10 recipes list with extra content "
-                "above and below the list, in which case you would use "
-                "'index,follow'."
-            ),
-        ),
+        description=_("<ul><li><span class='fw-bold'>No value (per defecte):</span> Els motors de cerca indexen la pàgina i segueixen els enllaços (comportament per defecte).</li><li><span class='fw-bold'>index, nofollow:</span> Indexa la pàgina, però no segueix els enllaços que conté.</li><li><span class='fw-bold'>noindex, follow:</span> No indexa la pàgina, però sí que segueix els enllaços.</li><li><span class='fw-bold'>index, follow:</span> Indexa la pàgina i segueix els enllaços (equivalent a no especificar res).</li><li><span class='fw-bold'>noindex:</span> No indexa la pàgina i no segueix els enllaços.</li><li><span class='fw-bold'>noindex, nofollow:</span> No indexa la pàgina ni segueix els enllaços.</li></ul>"),
         vocabulary=seoRobotsVocabulary,
         required=False,
     )
@@ -58,6 +58,22 @@ class Seo(object):
     def __init__(self, context):
         self.context = context
 
+    def _set_seo_title(self, value):
+        self.context.seo_title = value
+
+    def _get_seo_title(self):
+        return getattr(self.context, 'seo_title', None)
+
+    seo_title = property(_get_seo_title, _set_seo_title)
+
+    def _set_seo_description(self, value):
+        self.context.seo_description = value
+
+    def _get_seo_description(self):
+        return getattr(self.context, 'seo_description', None)
+
+    seo_description = property(_get_seo_description, _set_seo_description)
+
     def _set_seo_robots(self, value):
         self.context.seo_robots = value
 

src/genweb6/core/browser/helpers/helpers_touchers.py

@@ -796,7 +796,7 @@ class setup_robots_txt(BrowserView):
 
     def __call__(self):
         registry = getUtility(IRegistry)
-        registry["plone.robots_txt"] = 'Sitemap: {portal_url}/sitemap.xml.gz\r\n\r\n# Define access-restrictions for robots/spiders\r\n# http://www.robotstxt.org/wc/norobots.html\r\n\r\n\r\n\r\n# By default we allow robots to access all areas of our site\r\n# already accessible to anonymous users\r\n\r\nUser-agent: *\r\nDisallow: */noindex-upc/*\r\nDisallow: /*sendto_form$\r\nDisallow: /*folder_factories$\r\nDisallow: */ca/shared/*\r\nDisallow: */es/shared/*\r\nDisallow: */en/shared/*\r\nDisallow: */plantilles/*\r\n\r\n\r\n\r\n# Add Googlebot-specific syntax extension to exclude forms\r\n# that are repeated for each piece of content in the site\r\n# the wildcard is only supported by Googlebot\r\n# http://www.google.com/support/webmasters/bin/answer.py?answer=40367&ctx=sibling\r\n\r\nUser-Agent: Googlebot\r\nDisallow: /*?\r\nDisallow: /*atct_album_view$\r\nDisallow: /*folder_factories$\r\nDisallow: /*folder_summary_view$\r\nDisallow: /*login_form$\r\nDisallow: /*mail_password_form$\r\nDisallow: /@@search\r\nDisallow: /*search_rss$\r\nDisallow: /*sendto_form$\r\nDisallow: /*summary_view$\r\nDisallow: /*thumbnail_view$\r\nDisallow: /*view$'
+        registry["plone.robots_txt"] = 'Sitemap: {portal_url}/sitemap.xml.gz\r\n\r\n# Define access-restrictions for robots/spiders\r\n# http://www.robotstxt.org/wc/norobots.html\r\n\r\n\r\n\r\n# By default we allow robots to access all areas of our site\r\n# already accessible to anonymous users\r\n\r\nUser-agent: *\r\nDisallow: */noindex-upc/*\r\nDisallow: /*sendto_form$\r\nDisallow: /*folder_factories$\r\nDisallow: */ca/shared/*\r\nDisallow: */es/shared/*\r\nDisallow: */en/shared/*\r\nDisallow: */plantilles/*\r\nDisallow: */ca/banners-ca/*\r\nDisallow: */es/banners-es/*\r\nDisallow: */en/banners-en/*\r\nDisallow: */ca/logosfooter-ca/*\r\nDisallow: */es/logosfooter-es/*\r\nDisallow: */en/logosfooter-en/*\r\n\r\n\r\n\r\n# Add Googlebot-specific syntax extension to exclude forms\r\n# that are repeated for each piece of content in the site\r\n# the wildcard is only supported by Googlebot\r\n# http://www.google.com/support/webmasters/bin/answer.py?answer=40367&ctx=sibling\r\n\r\nUser-Agent: Googlebot\r\nDisallow: /*?\r\nDisallow: /*atct_album_view$\r\nDisallow: /*folder_factories$\r\nDisallow: /*folder_summary_view$\r\nDisallow: /*login_form$\r\nDisallow: /*mail_password_form$\r\nDisallow: /@@search\r\nDisallow: /*search_rss$\r\nDisallow: /*sendto_form$\r\nDisallow: /*summary_view$\r\nDisallow: /*thumbnail_view$\r\nDisallow: /*view$'
         transaction.commit()
         return 'OK'
 

src/genweb6/core/browser/setup_view.py

@@ -1539,7 +1539,7 @@ def setGenwebProperties(self):
 
     def setPloneProperties(self):
         registry = getUtility(IRegistry)
-        registry["plone.robots_txt"] = 'Sitemap: {portal_url}/sitemap.xml.gz\r\n\r\n# Define access-restrictions for robots/spiders\r\n# http://www.robotstxt.org/wc/norobots.html\r\n\r\n\r\n\r\n# By default we allow robots to access all areas of our site\r\n# already accessible to anonymous users\r\n\r\nUser-agent: *\r\nDisallow: */noindex-upc/*\r\nDisallow: /*sendto_form$\r\nDisallow: /*folder_factories$\r\nDisallow: */ca/shared/*\r\nDisallow: */es/shared/*\r\nDisallow: */en/shared/*\r\nDisallow: */plantilles/*\r\n\r\n\r\n\r\n# Add Googlebot-specific syntax extension to exclude forms\r\n# that are repeated for each piece of content in the site\r\n# the wildcard is only supported by Googlebot\r\n# http://www.google.com/support/webmasters/bin/answer.py?answer=40367&ctx=sibling\r\n\r\nUser-Agent: Googlebot\r\nDisallow: /*?\r\nDisallow: /*atct_album_view$\r\nDisallow: /*folder_factories$\r\nDisallow: /*folder_summary_view$\r\nDisallow: /*login_form$\r\nDisallow: /*mail_password_form$\r\nDisallow: /@@search\r\nDisallow: /*search_rss$\r\nDisallow: /*sendto_form$\r\nDisallow: /*summary_view$\r\nDisallow: /*thumbnail_view$\r\nDisallow: /*view$'
+        registry["plone.robots_txt"] = 'Sitemap: {portal_url}/sitemap.xml.gz\r\n\r\n# Define access-restrictions for robots/spiders\r\n# http://www.robotstxt.org/wc/norobots.html\r\n\r\n\r\n\r\n# By default we allow robots to access all areas of our site\r\n# already accessible to anonymous users\r\n\r\nUser-agent: *\r\nDisallow: */noindex-upc/*\r\nDisallow: /*sendto_form$\r\nDisallow: /*folder_factories$\r\nDisallow: */ca/shared/*\r\nDisallow: */es/shared/*\r\nDisallow: */en/shared/*\r\nDisallow: */plantilles/*\r\nDisallow: */ca/banners-ca/*\r\nDisallow: */es/banners-es/*\r\nDisallow: */en/banners-en/*\r\nDisallow: */ca/logosfooter-ca/*\r\nDisallow: */es/logosfooter-es/*\r\nDisallow: */en/logosfooter-en/*\r\n\r\n\r\n\r\n# Add Googlebot-specific syntax extension to exclude forms\r\n# that are repeated for each piece of content in the site\r\n# the wildcard is only supported by Googlebot\r\n# http://www.google.com/support/webmasters/bin/answer.py?answer=40367&ctx=sibling\r\n\r\nUser-Agent: Googlebot\r\nDisallow: /*?\r\nDisallow: /*atct_album_view$\r\nDisallow: /*folder_factories$\r\nDisallow: /*folder_summary_view$\r\nDisallow: /*login_form$\r\nDisallow: /*mail_password_form$\r\nDisallow: /@@search\r\nDisallow: /*search_rss$\r\nDisallow: /*sendto_form$\r\nDisallow: /*summary_view$\r\nDisallow: /*thumbnail_view$\r\nDisallow: /*view$'
         acl = api.portal.get_tool("acl_users")
         acl.session.timeout = 12*3600
         transaction.commit()

src/genweb6/core/browser/viewlets.py

@@ -200,13 +200,22 @@ def getLogosHeader(self):
         else:
             secondary_logo_responsive = secondary_logo
 
-        lang = self.pref_lang()
-        is_ca = lang not in ['es', 'en']
+        logo_alt = getattr(header_config, 'logo_alt', "")
+        logo_url = getattr(header_config, 'logo_url', None)
+        secondary_logo_alt = getattr(header_config, 'secondary_logo_alt', "")
+        secondary_logo_url = getattr(header_config, 'secondary_logo_url', None)
 
-        logo_alt = getattr(header_config, 'logo_alt' if is_ca else 'logo_alt_' + lang, "")
-        logo_url = getattr(header_config, 'logo_url' if is_ca else 'logo_url_' + lang, None)
-        secondary_logo_alt = getattr(header_config, 'secondary_logo_alt' if is_ca else 'secondary_logo_alt_' + lang, "")
-        secondary_logo_url = getattr(header_config, 'secondary_logo_url' if is_ca else 'secondary_logo_url_' + lang, None)
+        lang = self.pref_lang()
+        if lang == 'es':
+            logo_alt = getattr(header_config, 'logo_alt_es', "") or logo_alt
+            logo_url = getattr(header_config, 'logo_url_es', None) or logo_url
+            secondary_logo_alt = getattr(header_config, 'secondary_logo_alt_es', "") or secondary_logo_alt
+            secondary_logo_url = getattr(header_config, 'secondary_logo_url_es', None) or secondary_logo_url
+        elif lang == 'en':
+            logo_alt = getattr(header_config, 'logo_alt_en', "") or logo_alt
+            logo_url = getattr(header_config, 'logo_url_en', None) or logo_url
+            secondary_logo_alt = getattr(header_config, 'secondary_logo_alt_en', "") or secondary_logo_alt
+            secondary_logo_url = getattr(header_config, 'secondary_logo_url_en', None) or secondary_logo_url
 
         return {"logo": logo,
                 "logo_responsive": logo_responsive,

src/genweb6/core/content/existing_content/existing_content.py

@@ -1,34 +1,32 @@
-from zope.interface import implementer
+# -*- coding: utf-8 -*-
+
+from AccessControl.SecurityManagement import getSecurityManager
+from Products.Five.browser import BrowserView
+
+from bs4 import BeautifulSoup
+from plone import api
+from plone.autoform import directives
 from plone.dexterity.content import Container
-from plone.supermodel import model
-from zope import schema
 from plone.dexterity.content import Container
-from plone.app.content.interfaces import INameFromTitle
-from zope.component import hooks
+from plone.supermodel import model
+from pyquery import PyQuery as pq
+from requests.exceptions import ReadTimeout
+from requests.exceptions import RequestException
+from z3c.relationfield.relation import RelationValue
 from z3c.relationfield.schema import RelationChoice
-from genweb6.core import GenwebMessageFactory as _
-from plone.autoform import directives
+from zope import schema
 from zope.interface import Invalid
+from zope.interface import implementer
 from zope.interface import invariant
-from plone import api
-from z3c.relationfield.relation import RelationValue
-from requests.exceptions import ReadTimeout
-from requests.exceptions import RequestException
-from bs4 import BeautifulSoup
-from Products.Five.browser import BrowserView
-from plone.dexterity.interfaces import IDexteritySchema
-from AccessControl.SecurityManagement import getSecurityManager
-from zope.interface import provider
-from plone.autoform.interfaces import IFormFieldProvider
+
+from genweb6.core import GenwebMessageFactory as _
 from genweb6.core.portlets.new_existing_content.new_existing_content import NewContentPortletJSFieldWidget
-from pyquery import PyQuery as pq
 from genweb6.core.validations import validate_externalurl
 
 import DateTime
+import logging
 import re
 import requests
-import time
-import logging
 
 logger = logging.getLogger("genweb6.core")
 
@@ -80,13 +78,13 @@ class ExistingContent(Container):
     """ Implementación de ExistingContent """
 
 class ExistingContentView(BrowserView):
-    
+
     def __init__(self, context, request):
         super().__init__(context, request)
         self.data = {}
 
     def check_configuration_error(self):
-        
+
         pm = api.portal.get_tool(name='portal_membership')
         user = pm.getAuthenticatedMember()
         roles = user.getRoles()