From: Benoît Pin Date: Mon, 1 Sep 2014 18:16:31 +0000 (+0200) Subject: realis-- X-Git-Url: https://scm.cri.mines-paristech.fr/git/Plinn.git/commitdiff_plain/c67cc6b720fe34909cebe9532c61d2c8e631d3f9?ds=inline;hp=b5f944c62ef5fcb4cc038b68b281ca950d855ce1 realis-- --- diff --git a/profiles/photo/actions.xml b/profiles/photo/actions.xml index 2d65f6a..d011cb2 100644 --- a/profiles/photo/actions.xml +++ b/profiles/photo/actions.xml @@ -295,7 +295,7 @@ About - realis + string:${portal_url}/about diff --git a/skins/photo_theme/customer_join_form.py b/skins/photo_theme/customer_join_form.py index a1e3111..13422ea 100755 --- a/skins/photo_theme/customer_join_form.py +++ b/skins/photo_theme/customer_join_form.py @@ -1,6 +1,6 @@ ##parameters=add='' from Products.CMFCore.utils import getToolByName -from Products.realis.utils import translate +from Products.Plinn.utils import translate from ZTUtils import make_query as mq _ = lambda msg : translate(msg, context) ptool = getToolByName(script, 'portal_properties') diff --git a/skins/photo_theme/customer_join_template.pt b/skins/photo_theme/customer_join_template.pt index 5c2a95c..acbf54c 100644 --- a/skins/photo_theme/customer_join_template.pt +++ b/skins/photo_theme/customer_join_template.pt @@ -2,7 +2,7 @@ -
diff --git a/skins/photo_theme/homepage_dispatcher.py b/skins/photo_theme/homepage_dispatcher.py index 443c164..de5cb66 100755 --- a/skins/photo_theme/homepage_dispatcher.py +++ b/skins/photo_theme/homepage_dispatcher.py @@ -17,14 +17,4 @@ if came_from : came_from = '%s?%s&%s' % (url, qs, mq(portal_status_message=_('Login success'))) return resp.redirect(came_from) -# else : -# from Products.realis.utils import searchContentsWithLocalRolesForAuthenticatedUser as search -# results = search(context, portal_type='Portfolio') -# if results : -# atool = getToolByName(context, 'portal_actions') -# return context.setRedirect(atool, 'user/my_albums', portal_status_message=_('Login success')) -# else : -# utool = getToolByName(context, 'portal_url') -# return resp.redirect('%s?%s' % (utool(), mq(portal_status_message=_('Login success')))) - return resp.redirect('%s?%s' % (utool(), mq(portal_status_message=_('Login success')))) \ No newline at end of file diff --git a/skins/photo_theme/realis_main_macros.pt b/skins/photo_theme/realis_main_macros.pt deleted file mode 100644 index c5e1bfa..0000000 --- a/skins/photo_theme/realis_main_macros.pt +++ /dev/null @@ -1,33 +0,0 @@ - - - Macros realis - - - -
-
-
- Search - - - - -
-
-
- bob -      - - Login -  |  - - Join -
-
-
- -