# HG changeset patch
# User Thierry Florac <tflorac@ulthar.net>
# Date 1547025857 -3600
# Node ID 91b2ec075f2b1044c2729e92c30ac14e5f66fc3c
# Parent  c00a39cd7f011eafabba8b20d162342d123aac1b
Replace "++oid++" URLs with new shorter "/+/{oid}" syntax

diff -r c00a39cd7f01 -r 91b2ec075f2b src/pyams_default_theme/shared/blog/__init__.py
--- a/src/pyams_default_theme/shared/blog/__init__.py	Wed Jan 09 10:22:32 2019 +0100
+++ b/src/pyams_default_theme/shared/blog/__init__.py	Wed Jan 09 10:24:17 2019 +0100
@@ -16,7 +16,7 @@
 from pyams_content.shared.blog.interfaces import IBlogFolder
 from pyams_sequence.interfaces import ISequentialIdInfo
 from pyams_skin.layer import IPyAMSUserLayer
-from pyams_utils.adapter import adapter_config, ContextRequestAdapter
+from pyams_utils.adapter import ContextRequestAdapter, adapter_config
 from pyams_utils.interfaces.url import ICanonicalURL
 from pyams_utils.traversing import get_parent
 from pyams_utils.url import absolute_url
@@ -29,7 +29,7 @@
     def get_url(self, view_name=None, query=None):
         parent = get_parent(self.context, IBlogFolder)
         return absolute_url(parent, self.request,
-                            '++oid++{0}::{1}{2}{3}'.format(
+                            '+/{0}::{1}{2}{3}'.format(
                                 ISequentialIdInfo(self.context).get_base_oid().strip(),
                                 self.context.content_url,
                                 '/{}'.format(view_name) if view_name else '.html',
diff -r c00a39cd7f01 -r 91b2ec075f2b src/pyams_default_theme/shared/common/types.py
--- a/src/pyams_default_theme/shared/common/types.py	Wed Jan 09 10:22:32 2019 +0100
+++ b/src/pyams_default_theme/shared/common/types.py	Wed Jan 09 10:24:17 2019 +0100
@@ -35,7 +35,7 @@
             source = data_type.get_source_folder()
             if source is not None:
                 return absolute_url(source, self.request,
-                                    '++oid++{0}::{1}{2}{3}'.format(
+                                    '+/{0}::{1}{2}{3}'.format(
                                         ISequentialIdInfo(self.context).get_base_oid().strip(),
                                         self.context.content_url,
                                         '/{}'.format(view_name) if view_name else '.html',
diff -r c00a39cd7f01 -r 91b2ec075f2b src/pyams_default_theme/shared/common/url.py
--- a/src/pyams_default_theme/shared/common/url.py	Wed Jan 09 10:22:32 2019 +0100
+++ b/src/pyams_default_theme/shared/common/url.py	Wed Jan 09 10:24:17 2019 +0100
@@ -26,7 +26,7 @@
 
     def get_url(self, view_name=None, query=None):
         return absolute_url(self.request.root, self.request,
-                            '++oid++{0}::{1}{2}{3}'.format(
+                            '+/{0}::{1}{2}{3}'.format(
                                 ISequentialIdInfo(self.context).get_base_oid().strip(),
                                 self.context.content_url,
                                 '/{}'.format(view_name) if view_name else '.html',
@@ -39,7 +39,7 @@
 
     def get_url(self, display_context=None, view_name=None, query=None):
         return absolute_url(display_context, self.request,
-                            '++oid++{0}::{1}{2}{3}'.format(
+                            '+/{0}::{1}{2}{3}'.format(
                                 ISequentialIdInfo(self.context).get_base_oid().strip(),
                                 self.context.content_url,
                                 '/{}'.format(view_name) if view_name else '.html',
diff -r c00a39cd7f01 -r 91b2ec075f2b src/pyams_default_theme/shared/site/__init__.py
--- a/src/pyams_default_theme/shared/site/__init__.py	Wed Jan 09 10:22:32 2019 +0100
+++ b/src/pyams_default_theme/shared/site/__init__.py	Wed Jan 09 10:24:17 2019 +0100
@@ -15,7 +15,7 @@
 from zope.interface import Interface
 
 from pyams_content.shared.site import IWfSiteTopic
-from pyams_content.shared.site.interfaces import ISiteFolder, ISiteManager, ISiteContainer
+from pyams_content.shared.site.interfaces import ISiteContainer, ISiteFolder, ISiteManager
 from pyams_default_theme.viewlet.breadcrumb import BreadcrumbsAdapter
 from pyams_i18n.interfaces import II18n
 from pyams_sequence.interfaces import ISequentialIdInfo
@@ -23,7 +23,7 @@
 from pyams_skin.interfaces.viewlet import IBreadcrumbs
 from pyams_skin.layer import IPyAMSUserLayer
 from pyams_skin.metas import ContentMeta, HTMLTagMeta
-from pyams_utils.adapter import ContextRequestViewAdapter, adapter_config, ContextRequestAdapter
+from pyams_utils.adapter import ContextRequestAdapter, ContextRequestViewAdapter, adapter_config
 from pyams_utils.interfaces.url import ICanonicalURL
 from pyams_utils.traversing import get_parent
 from pyams_utils.url import absolute_url
@@ -54,7 +54,7 @@
     def get_url(self, view_name=None, query=None):
         parent = get_parent(self.context, ISiteContainer)
         return absolute_url(parent, self.request,
-                            '++oid++{0}::{1}{2}{3}'.format(
+                            '+/{0}::{1}{2}{3}'.format(
                                 ISequentialIdInfo(self.context).get_base_oid().strip(),
                                 self.context.content_url,
                                 '/{}'.format(view_name) if view_name else '.html',