projects / Plinn.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b5f944c)
realis--
authorBenoît Pin <benoit.pin@gmail.com>
Mon, 1 Sep 2014 18:16:31 +0000 (20:16 +0200)
committerBenoît Pin <benoit.pin@gmail.com>
Mon, 1 Sep 2014 18:16:31 +0000 (20:16 +0200)
profiles/photo/actions.xml patch | blob | history
skins/photo_theme/customer_join_form.py patch | blob | history
skins/photo_theme/customer_join_template.pt patch | blob | history
skins/photo_theme/homepage_dispatcher.py patch | blob | history
skins/photo_theme/realis_main_macros.pt [deleted file] patch | blob | history

diff --git a/profiles/photo/actions.xml b/profiles/photo/actions.xml
index 2d65f6a..d011cb2 100644 (file)
--- a/profiles/photo/actions.xml
+++ b/profiles/photo/actions.xml
@@ -295,7 +295,7 @@
   </object>
   <object name="about" meta_type="CMF Action" i18n:domain="plinn">
    <property name="title" i18n:translate="">About</property>
   </object>
   <object name="about" meta_type="CMF Action" i18n:domain="plinn">
    <property name="title" i18n:translate="">About</property>
-   <property name="description">realis</property>
+   <property name="description"></property>
    <property name="url_expr">string:${portal_url}/about</property>
    <property name="icon_expr"></property>
    <property name="available_expr"></property>
    <property name="url_expr">string:${portal_url}/about</property>
    <property name="icon_expr"></property>
    <property name="available_expr"></property>
diff --git a/skins/photo_theme/customer_join_form.py b/skins/photo_theme/customer_join_form.py
index a1e3111..13422ea 100755 (executable)
--- 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
 ##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')
 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 (file)
--- a/skins/photo_theme/customer_join_template.pt
+++ b/skins/photo_theme/customer_join_template.pt
@@ -2,7 +2,7 @@
   <head>
     <meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
   </head>
   <head>
     <meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
   </head>
-  <body metal:fill-slot="main_no_tabs" i18n:domain="realis"
+  <body metal:fill-slot="main_no_tabs" i18n:domain="plinn"
         tal:omit-tag="">
     <div tal:condition="python:options.get('came_from', '').endswith('/my_cart')"
          tal:define="step_authentication python:True" tal:omit-tag="">
         tal:omit-tag="">
     <div tal:condition="python:options.get('came_from', '').endswith('/my_cart')"
          tal:define="step_authentication python:True" tal:omit-tag="">
diff --git a/skins/photo_theme/homepage_dispatcher.py b/skins/photo_theme/homepage_dispatcher.py
index 443c164..de5cb66 100755 (executable)
--- 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)
 
                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
 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 (file)
index c5e1bfa..0000000
--- a/skins/photo_theme/realis_main_macros.pt
+++ /dev/null
@@ -1,33 +0,0 @@
-<html xmlns:tal="http://xml.zope.org/namespaces/tal" xmlns:metal="http://xml.zope.org/namespaces/metal">
-  <head>
-    <title>Macros realis</title>
-    <meta http-equiv="content-type" content="text/html;charset=utf-8" />
-  </head>
-  <body>
-    <div metal:define-macro="search_bar"
-         style="vertical-align:middle">
-      <form action="search" method="get" tal:attributes="action string:${portal_url}/search">
-        <div id="quicksearch" i18n:domain="cmf_default">
-          <span i18n:translate="" tal:omit-tag="">Search</span>
-          <input name="SearchableText" type="text" size="16" />
-          <input name="portal_type:list" type="hidden" value="Photo" />
-          <input type="image" tal:attributes="src string:${portal_url}/topic_icon.gif"
-                 width="16" height="16" alt="Search" i18n:attributes="alt"/>
-          <!--
-            <a tal:attributes="href string:${portal_url}/search_form" i18n:translate="">Advanced search</a>
-          -->
-        </div>
-      </form>
-      <div id="quickuser">
-          <span tal:define="uname python: (isAnon and [''] or [member.getMemberFullName(nameBefore=0)])[0]" tal:content="uname" style="font-weight:bold">bob</span>
-          &nbsp;&nbsp;&nbsp;&nbsp;
-          <span tal:repeat="action user_actions">
-          <a href="#" tal:attributes="href action/url" tal:content="action/title">Login</a>
-          <span tal:condition="not: repeat/action/end" tal:omit-tag=""> | </span>
-          </span>
-          <span tal:condition="nothing"><a href="join_form" i18n:translate="">Join</a></span>
-      </div>
-      <br clear="all"/>
-    </div>
-  </body>
-</html>
Plinn content management system