Revert "optimizations"

This reverts commit eac74d7. Reason: the change that defines the newpostbox_view globally on the activity stream seems to cause LocationError Conflicts: plonesocial/activitystream/browser/prototype/post.html
cosent · Mar 4, 2015 · b5e3358 · b5e3358
1 parent aac2b6a
commit b5e3358
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/plonesocial/activitystream/browser/prototype/activity-stream.html b/plonesocial/activitystream/browser/prototype/activity-stream.html
@@ -7,14 +7,9 @@
 
   <!-- https://github.com/ploneintranet/ploneintranet.theme/blob/master/prototype/_includes/activity-stream.html -->
   <metal:macro define-macro="main">
-    <tal:define define="
-        newpostbox_view nocall:here/@@newpostbox.tile;
-        toLocalizedTime nocall:toLocalizedTime|here/@@plone/toLocalizedTime;
-      ">
-      <tal:loop tal:repeat="activity_provider activity_providers|view/activity_providers">
-        <metal:block use-macro="here/@@post.html/main" />
-      </tal:loop>
-    </tal:define>
+    <tal:loop tal:repeat="activity_provider activity_providers|view/activity_providers">
+      <metal:block use-macro="here/@@post.html/main" />
+    </tal:loop>
   </metal:macro>
 
 </body>

diff --git a/plonesocial/activitystream/browser/prototype/comment.html b/plonesocial/activitystream/browser/prototype/comment.html
@@ -16,14 +16,14 @@
                        userid provider/userid;
                        avatar_img string:${portal_url}/portal_memberdata/portraits/${userid};
                        avatar_name userid;
-                       toLocalizedTime nocall:toLocalizedTime|here/@@plone/toLocalizedTime;
+                       tlt nocall:here/@@plone/toLocalizedTime;
                    "
                    >
                     <metal:block use-macro="here/@@avatar.html/main" />
                     <h4 class="name" tal:content="string:${provider/Creator}">
                         User Name
                     </h4>
-                    <time class="date" tal:content="python:toLocalizedTime(provider.date)">1 hour ago</time>
+                    <time class="date" tal:content="python:tlt(provider.date)">1 hour ago</time>
                 </a>
             </div>
             <section class="comment-content" tal:content="structure provider/text">

diff --git a/plonesocial/activitystream/browser/prototype/post.html b/plonesocial/activitystream/browser/prototype/post.html
@@ -108,6 +108,7 @@ <h4 tal:content="activity_provider/Creator" class="name">
       </div>
   </tal:commentable>
 
+
 </div>
 </metal:macro>