Skip to content

Commit 6d6e6ec

Browse files
maartenklingjaroel
authored andcommitted
ajax load, remove debug info
1 parent 7612e3a commit 6d6e6ec

File tree

9 files changed

+45
-17
lines changed

9 files changed

+45
-17
lines changed

CONTRIBUTORS.rst

+2
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ Contributors
66
* Leonardo J. Caballero G.
77
* Thomas Desvenain
88
* Hector Velarde
9+
* Maarten Kling
10+
* Roel Bruggink

plonesocial/activitystream/browser/configure.zcml

+11-6
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
factory=".activity_provider.StatusActivityProvider"
2424
/>
2525

26-
<adapter
26+
<adapter
2727
factory=".activity_provider.ContentActivityProvider"
2828
/>
2929

30-
<adapter
30+
<adapter
3131
factory=".activity_provider.DiscussionActivityProvider"
3232
/>
3333

34-
<adapter
34+
<adapter
3535
name="plonesocial.activitystream.stream_provider"
3636
factory=".stream_provider.StreamProvider"
3737
/>
@@ -67,13 +67,18 @@
6767

6868
<!-- complex portlet-based view separated out for clear config -->
6969
<include file="activitystream_portal.zcml" />
70-
71-
70+
71+
7272
<browser:resourceDirectory
7373
name="plonesocial.activitystream.stylesheets"
7474
directory="stylesheets"
7575
layer=".interfaces.IPlonesocialActivitystreamLayer"
7676
/>
77-
77+
78+
<browser:resourceDirectory
79+
name="plonesocial.activitystream.javascripts"
80+
directory="javascripts"
81+
layer=".interfaces.IPlonesocialActivitystreamLayer"
82+
/>
7883

7984
</configure>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
;(function($) {
2+
$(document).ready(function(){
3+
$('.reply a').click(function(event) {
4+
event.preventDefault();
5+
var url = "/@@status/" + $(this).attr('data-reply') + '/';
6+
// replace a > div.reply > div.activityItem
7+
$(this).parent().parent().load(url + ' .conversation');
8+
$(this).parent().parent().removeClass('activityItem');
9+
});
10+
});
11+
}(jQuery));
12+
var jq = jQuery;

plonesocial/activitystream/browser/templates/contentactivity_provider.pt

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<div i18n:domain="plonesocial.activitystream"
22
tal:attributes="class string:activityItem ${view/render_type}">
33

4-
I am a content activity provider
5-
64
<div class="activityAvatar">
75
<a href=""
86
tal:attributes="href view/author_home_url">

plonesocial/activitystream/browser/templates/conversation.pt

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
<div class="plonesocial activitystream">
1616
<h1 class="documentFirstHeading" i18n:translate=""
17-
tal:content="view/title">Updates</h1>
18-
17+
tal:content="view/title">Conversation</h1>
18+
1919
<tal:block replace="structure view/statusconversation_provider" />
2020
</div>
2121

plonesocial/activitystream/browser/templates/discussionactivity_provider.pt

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<div i18n:domain="plonesocial.activitystream"
22
tal:attributes="class string:activityItem ${view/render_type}">
33

4-
I am a discussion activity provider
5-
64
<div class="activityAvatar">
75
<a href=""
86
tal:attributes="href view/author_home_url">

plonesocial/activitystream/browser/templates/statusactivity_provider.pt

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<div i18n:domain="plonesocial.activitystream"
22
tal:attributes="class string:activityItem ${view/render_type}">
33

4-
I am a statusactivity provider
5-
<span tal:content="view/status_id" />
6-
74
<div class="activityAvatar">
85
<a href=""
96
tal:attributes="href view/author_home_url">
@@ -50,8 +47,10 @@ I am a statusactivity provider
5047

5148
</div>
5249

53-
<div><a tal:attributes="href string:@@status/${view/status_id}"
54-
>conversation</a>
50+
<div class="reply">
51+
<a i18n:translate=""
52+
tal:attributes="href string:@@status/${view/status_id};
53+
data-reply string:${view/status_id};">Reply</a>
5554
</div>
5655

5756

plonesocial/activitystream/locales/nl/LC_MESSAGES/plonesocial.activitystream.po

+2
Original file line numberDiff line numberDiff line change
@@ -116,3 +116,5 @@ msgstr "zegt:"
116116
msgid "manage_activitystream_portlets"
117117
msgstr "Activiteiten stroom portlets beheren"
118118

119+
msgid "Conversation"
120+
msgstr "Reacties"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0"?>
2+
<object name="portal_javascripts">
3+
4+
<javascript id="++resource++plonesocial.activitystream.javascripts/main.js"
5+
cacheable="True"
6+
compression="safe"
7+
cookable="True"
8+
enabled="True"
9+
authenticated="True"
10+
inline="False"/>
11+
12+
</object>

0 commit comments

Comments
 (0)