social_stream 0.23.4 → 0.24.0
Sign up to get free protection for your applications and to get access to all the features.
- data/base/app/assets/images/flags/pt.png +0 -0
- data/base/app/assets/javascripts/social_stream.toolbar.js +41 -0
- data/base/app/assets/stylesheets/settings.css +1 -0
- data/base/app/controllers/activity_actions_controller.rb +44 -0
- data/base/app/controllers/followers_controller.rb +39 -0
- data/base/app/helpers/activities_helper.rb +10 -10
- data/base/app/helpers/activity_actions_helper.rb +35 -0
- data/base/app/helpers/contacts_helper.rb +1 -1
- data/base/app/helpers/followers_helper.rb +5 -0
- data/base/app/helpers/toolbar_helper.rb +55 -68
- data/base/app/models/activity_action.rb +28 -0
- data/base/app/models/activity_object.rb +11 -2
- data/base/app/models/actor.rb +23 -33
- data/base/app/models/contact.rb +32 -43
- data/base/app/models/group.rb +2 -6
- data/base/app/models/relation.rb +1 -1
- data/base/app/models/relation/follow.rb +14 -0
- data/base/app/models/tie.rb +30 -30
- data/base/app/models/user.rb +8 -0
- data/base/app/views/activities/_options.html.erb +0 -1
- data/base/app/views/activity_actions/_follow_form.html.erb +10 -0
- data/base/app/views/activity_actions/_follow_sentence.html.erb +3 -0
- data/base/app/views/activity_actions/_update_form.js.erb +2 -0
- data/base/app/views/activity_actions/create.js.erb +1 -0
- data/base/app/views/activity_actions/update.js.erb +1 -0
- data/base/app/views/avatars/index.html.erb +1 -1
- data/base/app/views/cheesecake/index.html.erb +1 -1
- data/base/app/views/contacts/{_link.html.erb → _link_custom.html.erb} +0 -0
- data/base/app/views/contacts/_link_follow.html.erb +12 -0
- data/base/app/views/contacts/edit.html.erb +1 -1
- data/base/app/views/contacts/index.html.erb +1 -1
- data/base/app/views/contacts/index.js.erb +1 -1
- data/base/app/views/contacts/new.html.erb +1 -1
- data/base/app/views/conversations/index.html.erb +1 -1
- data/base/app/views/conversations/index.js.erb +1 -1
- data/base/app/views/conversations/show.html.erb +1 -1
- data/base/app/views/conversations/show.js.erb +1 -1
- data/base/app/views/devise/registrations/edit.html.erb +1 -1
- data/base/app/views/followers/destroy.js.erb +1 -0
- data/base/app/views/followers/index.html.erb +5 -0
- data/base/app/views/followers/update.js.erb +1 -0
- data/base/app/views/groups/_show.html.erb +1 -1
- data/base/app/views/groups/new.html.erb +1 -1
- data/base/app/views/layouts/_header_dropdown_menu.html.erb +5 -3
- data/base/app/views/messages/new.html.erb +1 -1
- data/base/app/views/messages/new.js.erb +1 -1
- data/base/app/views/objects/_show.html.erb +1 -1
- data/base/app/views/profiles/edit.html.erb +1 -1
- data/base/app/views/profiles/show.html.erb +1 -1
- data/base/app/views/relation/customs/index.html.erb +1 -1
- data/base/app/views/settings/index.html.erb +1 -1
- data/base/app/views/settings/index.js.erb +1 -0
- data/base/app/views/ties/index.html.erb +1 -1
- data/base/app/views/toolbar/_logo.html.erb +0 -7
- data/base/app/views/users/_show.html.erb +1 -1
- data/base/config/locales/en.yml +16 -6
- data/base/config/locales/es.yml +15 -6
- data/base/config/locales/pt.yml +507 -0
- data/base/config/locales/rails.pt.yml +192 -0
- data/base/config/routes.rb +20 -7
- data/base/db/migrate/20120316093946_create_activity_actions.rb +15 -0
- data/base/db/migrate/20120316113728_activity_action_follow.rb +23 -0
- data/base/lib/generators/social_stream/base/install_generator.rb +0 -4
- data/base/lib/generators/social_stream/base/templates/initializer.rb +7 -0
- data/base/lib/inherited_resources/social_stream.rb +18 -0
- data/base/lib/rails/social_stream.rb +23 -0
- data/base/lib/social_stream-base.rb +7 -3
- data/base/lib/social_stream/base/dependencies.rb +3 -2
- data/base/lib/social_stream/base/engine.rb +6 -6
- data/base/lib/social_stream/base/version.rb +1 -1
- data/base/lib/social_stream/models/channeled.rb +8 -0
- data/base/lib/social_stream/models/object.rb +1 -3
- data/base/lib/social_stream/models/subtype.rb +31 -25
- data/base/lib/social_stream/models/supertype.rb +54 -19
- data/base/lib/social_stream/views/toolbar/base.rb +143 -0
- data/base/lib/tasks/db/populate.rake +1 -1
- data/base/social_stream-base.gemspec +1 -3
- data/base/spec/dummy/config/initializers/social_stream.rb +7 -0
- data/base/spec/models/activity_action_spec.rb +26 -0
- data/base/spec/models/tie_spec.rb +2 -2
- data/documents/app/views/common_documents/_headers.html.erb +1 -1
- data/documents/lib/social_stream-documents.rb +4 -2
- data/documents/lib/social_stream/documents/engine.rb +3 -3
- data/documents/lib/social_stream/documents/version.rb +1 -1
- data/documents/lib/social_stream/views/toolbar/documents.rb +28 -0
- data/documents/social_stream-documents.gemspec +1 -1
- data/events/app/assets/javascripts/social_stream.event.js +33 -0
- data/events/app/assets/stylesheets/events.css.scss +37 -0
- data/events/app/views/events/_event.html.erb +3 -44
- data/events/app/views/events/_event_date.html.erb +20 -0
- data/events/app/views/events/_event_date_sidebar.html.erb +14 -0
- data/events/app/views/events/_event_details.html.erb +21 -0
- data/events/app/views/events/_event_poster.html.erb +9 -0
- data/events/app/views/events/_event_sidebar.html.erb +10 -0
- data/events/app/views/events/index.html.erb +1 -1
- data/events/app/views/events/index.js.erb +1 -1
- data/events/config/locales/en.yml +6 -0
- data/events/config/locales/es.yml +7 -0
- data/events/lib/social_stream/events/version.rb +1 -1
- data/events/social_stream-events.gemspec +2 -2
- data/lib/social_stream/version.rb +1 -1
- data/linkser/lib/social_stream/linkser/version.rb +1 -1
- data/linkser/social_stream-linkser.gemspec +1 -1
- data/presence/app/assets/images/games/sfighter/abobo/abobo.png +0 -0
- data/presence/app/assets/images/games/sfighter/abobo/abobo_block_81x130x1.png +0 -0
- data/presence/app/assets/images/games/sfighter/abobo/abobo_die_156x119x1.png +0 -0
- data/presence/app/assets/images/games/sfighter/abobo/abobo_hit_108x120x3.png +0 -0
- data/presence/app/assets/images/games/sfighter/abobo/abobo_idle_100x121x3.png +0 -0
- data/presence/app/assets/images/games/sfighter/abobo/abobo_kick_137x130x2.png +0 -0
- data/presence/app/assets/images/games/sfighter/abobo/abobo_punch_131x170x4.png +0 -0
- data/presence/app/assets/images/games/sfighter/abobo/abobo_walk_backward_94x126x6.png +0 -0
- data/presence/app/assets/images/games/sfighter/abobo/abobo_walk_forward_94x126x6.png +0 -0
- data/presence/app/assets/images/games/sfighter/cvs/cvs_block_69x99x2.png +0 -0
- data/presence/app/assets/images/games/sfighter/cvs/cvs_die_150x110x1.png +0 -0
- data/presence/app/assets/images/games/sfighter/cvs/cvs_hit_59x103x1.png +0 -0
- data/presence/app/assets/images/games/sfighter/cvs/cvs_idle_59x106x6.png +0 -0
- data/presence/app/assets/images/games/sfighter/cvs/cvs_kick_156x106x9.png +0 -0
- data/presence/app/assets/images/games/sfighter/cvs/cvs_punch_120x104x6.png +0 -0
- data/presence/app/assets/images/games/sfighter/cvs/cvs_walk_backward_58x106x5.png +0 -0
- data/presence/app/assets/images/games/sfighter/cvs/cvs_walk_forward_58x106x5.png +0 -0
- data/presence/app/assets/images/games/sfighter/stage/background1.png +0 -0
- data/presence/app/assets/images/games/sfighter/stage/background2.png +0 -0
- data/presence/app/assets/images/games/sfighter/stage/background3.png +0 -0
- data/presence/app/assets/images/games/sfighter/stage/foreground.png +0 -0
- data/presence/app/assets/images/games/sfighter/stage/ground.png +0 -0
- data/presence/app/assets/images/games/sfighter/thumbnail.png +0 -0
- data/presence/app/assets/images/games/ter/classic_circle.png +0 -0
- data/presence/app/assets/images/games/ter/classic_thumbnail.png +0 -0
- data/presence/app/assets/images/games/ter/modern_thumbnail.png +0 -0
- data/presence/app/assets/images/webcam.png +0 -0
- data/presence/app/assets/javascripts/jquery.ui.chatbox.sstreampresence.js +2 -2
- data/presence/app/assets/javascripts/presence_XmppClient.js.erb +3 -1
- data/presence/app/assets/javascripts/presence_game.js.erb +13 -6
- data/presence/app/assets/javascripts/presence_game_comunication.js.erb +83 -13
- data/presence/app/assets/javascripts/presence_game_factory.js.erb +47 -0
- data/presence/app/assets/javascripts/presence_game_interface.js.erb +143 -53
- data/presence/app/assets/javascripts/presence_game_sfighter.js.erb +583 -0
- data/presence/app/assets/javascripts/presence_game_ter.js.erb +20 -9
- data/presence/app/assets/javascripts/presence_uiManager.js.erb +0 -2
- data/presence/app/assets/javascripts/presence_utilities.js +1 -1
- data/presence/app/assets/javascripts/presence_videochat.js.erb +5 -0
- data/presence/app/assets/javascripts/social_stream-presence.js +1 -0
- data/presence/app/assets/stylesheets/chat.css.scss +59 -6
- data/presence/config/locales/en.yml +1 -1
- data/presence/config/locales/es.yml +1 -1
- data/presence/lib/social_stream-presence.rb +4 -0
- data/presence/lib/social_stream/presence/engine.rb +6 -0
- data/presence/lib/social_stream/presence/version.rb +1 -1
- data/presence/lib/social_stream/views/toolbar/presence.rb +28 -0
- data/presence/social_stream-presence.gemspec +1 -1
- data/social_stream.gemspec +5 -5
- metadata +92 -41
- data/base/app/assets/javascripts/toolbar.js +0 -22
- data/base/app/views/layouts/_settings.html.erb +0 -18
- data/base/app/views/toolbar/_home.html.erb +0 -15
- data/base/app/views/toolbar/_messages.html.erb +0 -15
- data/base/app/views/toolbar/_profile.html.erb +0 -28
- data/base/lib/generators/social_stream/base/templates/navigation.rb +0 -4
- data/base/lib/social_stream/toolbar_config/base.rb +0 -94
- data/documents/lib/social_stream/toolbar_config/documents.rb +0 -27
- data/events/lib/social_stream/toolbar_config/events.rb +0 -22
@@ -1,22 +0,0 @@
|
|
1
|
-
function initMenu() {
|
2
|
-
$('.toolbar_menu ul li ul').hide();
|
3
|
-
$('.toolbar_menu li a').click( function() {
|
4
|
-
$(this).next().slideToggle('normal');
|
5
|
-
}
|
6
|
-
);
|
7
|
-
//Logo menu for current subject
|
8
|
-
//Full Caption Sliding (Hidden to Visible)
|
9
|
-
$('.logo_grid.logo_full').hover( function() {
|
10
|
-
$(".logo_menu", this).stop().animate({top:'101px'},{queue:false,duration:160});
|
11
|
-
}, function() {
|
12
|
-
$(".logo_menu", this).stop().animate({top:'1119px'},{queue:false,duration:160});
|
13
|
-
});
|
14
|
-
}
|
15
|
-
|
16
|
-
function expandSubMenu(id) {
|
17
|
-
$('#' + id + '_menu').next().show();
|
18
|
-
}
|
19
|
-
|
20
|
-
$(document).ready(function() {
|
21
|
-
initMenu();
|
22
|
-
});
|
@@ -1,18 +0,0 @@
|
|
1
|
-
<div id="settings_menu">
|
2
|
-
<ul class="sf-menu" >
|
3
|
-
<li class="current" id="account">
|
4
|
-
<a href="#" class="sf-with-ul" id="btn_menu_settings">
|
5
|
-
<%= t('settings.one') %>
|
6
|
-
<span class="sf-sub-indicator"> »</span>
|
7
|
-
</a>
|
8
|
-
<ul>
|
9
|
-
<li>
|
10
|
-
<%= link_to t('settings.one'), settings_path %>
|
11
|
-
</li>
|
12
|
-
<li class="current">
|
13
|
-
<%= link_to t('account.privacy'), relation_customs_path %>
|
14
|
-
</li>
|
15
|
-
</ul>
|
16
|
-
</li>
|
17
|
-
</ul>
|
18
|
-
</div>
|
@@ -1,15 +0,0 @@
|
|
1
|
-
<%= render :partial => 'toolbar/subject' %>
|
2
|
-
|
3
|
-
<div class="block space_center">
|
4
|
-
</div>
|
5
|
-
|
6
|
-
<div id="menu_lateral" class="toolbar_menu">
|
7
|
-
<%= yield(:toolbar_menu).empty? ? home_toolbar_menu : yield(:toolbar_menu)%>
|
8
|
-
</div>
|
9
|
-
|
10
|
-
<% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
|
11
|
-
<%= render :partial => 'chat/index' , :locals => {:flow => false } %>
|
12
|
-
<% end %>
|
13
|
-
|
14
|
-
<div class="block space_center">
|
15
|
-
</div>
|
@@ -1,15 +0,0 @@
|
|
1
|
-
<%= render :partial => 'toolbar/subject' %>
|
2
|
-
|
3
|
-
<div class="block space_center">
|
4
|
-
</div>
|
5
|
-
|
6
|
-
<div id="menu_lateral" class="toolbar_menu">
|
7
|
-
<%= messages_toolbar_menu %>
|
8
|
-
</div>
|
9
|
-
|
10
|
-
<div class="block space_center">
|
11
|
-
</div>
|
12
|
-
|
13
|
-
<% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
|
14
|
-
<%= render :partial => 'chat/index' , :locals => {:flow => false } %>
|
15
|
-
<% end %>
|
@@ -1,28 +0,0 @@
|
|
1
|
-
<%= render :partial => 'toolbar/logo', :locals => { :subject => subject } %>
|
2
|
-
|
3
|
-
<div class="block space_center">
|
4
|
-
</div>
|
5
|
-
|
6
|
-
<div id="menu_lateral" class="toolbar_menu">
|
7
|
-
<%= yield(:toolbar_menu).empty? ? profile_toolbar_menu(subject) : yield(:toolbar_menu) %>
|
8
|
-
</div>
|
9
|
-
|
10
|
-
<div class="block space_center">
|
11
|
-
</div>
|
12
|
-
|
13
|
-
<% if subject.subject_type == 'Event' %>
|
14
|
-
<% subject.relation_customs.each do |temp| %>
|
15
|
-
<%= render :partial => 'toolbar/organizer', :locals => { :subject => subject,:tie=> temp } %>
|
16
|
-
<% end %>
|
17
|
-
<%= render :partial => 'toolbar/suscribed', :locals => { :subject => subject } %>
|
18
|
-
<% else %>
|
19
|
-
<%= render :partial => 'subjects/contacts', :locals => { :subject => subject } %>
|
20
|
-
<% end %>
|
21
|
-
|
22
|
-
<div class="block space_center">
|
23
|
-
</div>
|
24
|
-
|
25
|
-
<% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
|
26
|
-
<%= render :partial => 'chat/index' , :locals => {:flow => true , :group => @group } %>
|
27
|
-
<% end %>
|
28
|
-
|
@@ -1,94 +0,0 @@
|
|
1
|
-
module SocialStream
|
2
|
-
module ToolbarConfig
|
3
|
-
module Base
|
4
|
-
# Base toolbar items
|
5
|
-
def home_toolbar_items
|
6
|
-
Array.new.tap do |items|
|
7
|
-
#Contacts
|
8
|
-
items << {
|
9
|
-
:key => :contacts,
|
10
|
-
:name => image_tag("btn/btn_friend.png")+t('contact.other'),
|
11
|
-
:url => "#",
|
12
|
-
:options => {:link => {:id => "contacts_menu"}},
|
13
|
-
:items => [
|
14
|
-
{:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.current'), :url => contacts_path},
|
15
|
-
{:key => :contacts_graph, :name => image_tag("btn/btn_friend.png")+t('contact.graph.one'), :url => ties_path},
|
16
|
-
{:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.pending.other'), :url => pending_contacts_path},
|
17
|
-
{:key => :invitations, :name => image_tag("btn/btn_invitation.png")+t('invitation.toolbar'), :url => new_invitation_path}
|
18
|
-
]
|
19
|
-
}
|
20
|
-
|
21
|
-
# Groups
|
22
|
-
items << {
|
23
|
-
:key => :groups,
|
24
|
-
:name => image_tag("btn/btn_group.png") + t('group.other'),
|
25
|
-
:url => '#',
|
26
|
-
:options => { :link => { :id => "groups_menu" } },
|
27
|
-
:items => [
|
28
|
-
{:key => :new_group ,:name => image_tag("btn/btn_group.png")+t('group.new.action'),:url => new_group_path}
|
29
|
-
]
|
30
|
-
}
|
31
|
-
end
|
32
|
-
end
|
33
|
-
|
34
|
-
# Builds the default profile toolbar items
|
35
|
-
def profile_toolbar_items(subject = current_subject)
|
36
|
-
Array.new.tap do |items|
|
37
|
-
#Information button
|
38
|
-
items << {
|
39
|
-
:key => :subject_info,
|
40
|
-
:name => image_tag("btn/btn_edit.png")+t('menu.information'),
|
41
|
-
:url => [subject, :profile]
|
42
|
-
}
|
43
|
-
|
44
|
-
if subject != current_subject
|
45
|
-
#Like button
|
46
|
-
items << {
|
47
|
-
:key => :like_button,
|
48
|
-
:name => link_like_params(subject)[0],
|
49
|
-
:url => link_like_params(subject)[1],
|
50
|
-
:options => {:link => link_like_params(subject)[2]}
|
51
|
-
}
|
52
|
-
|
53
|
-
if user_signed_in?
|
54
|
-
#Relation button
|
55
|
-
items << {
|
56
|
-
:key => :subject_relation,
|
57
|
-
:name => image_tag("btn/btn_friend.png") + current_subject.contact_to!(subject).status,
|
58
|
-
:url => edit_contact_path(current_subject.contact_to!(subject))
|
59
|
-
}
|
60
|
-
|
61
|
-
#Send message button
|
62
|
-
items << {:key => :send_message,
|
63
|
-
:name => image_tag("btn/btn_send.png")+t('message.send'),
|
64
|
-
:url => new_message_path(:receiver => subject.slug)
|
65
|
-
}
|
66
|
-
end
|
67
|
-
end
|
68
|
-
end
|
69
|
-
end
|
70
|
-
|
71
|
-
def messages_toolbar_items
|
72
|
-
Array.new.tap do |items|
|
73
|
-
# Messages
|
74
|
-
items << { :key => :message_new,
|
75
|
-
:name => image_tag("btn/message_new.png")+ t('message.new'),
|
76
|
-
:url => new_message_path,
|
77
|
-
:options => {:link =>{:remote=> false}}}
|
78
|
-
items << { :key => :message_inbox,
|
79
|
-
:name => image_tag("btn/message_inbox.png")+t('message.inbox')+' (' + current_subject.unread_messages_count.to_s + ')',
|
80
|
-
:url => conversations_path,
|
81
|
-
:options => {:link =>{:remote=> false}}}
|
82
|
-
items << { :key => :message_sentbox,
|
83
|
-
:name => image_tag("btn/message_sentbox.png")+t('message.sentbox'),
|
84
|
-
:url => conversations_path(:box => :sentbox),
|
85
|
-
:options => {:link =>{:remote=> false}}}
|
86
|
-
items << { :key => :message_trash,
|
87
|
-
:name => image_tag("btn/message_trash.png")+t('message.trash'),
|
88
|
-
:url => conversations_path(:box => :trash)}
|
89
|
-
end
|
90
|
-
end
|
91
|
-
end
|
92
|
-
end
|
93
|
-
end
|
94
|
-
|
@@ -1,27 +0,0 @@
|
|
1
|
-
module SocialStream
|
2
|
-
module ToolbarConfig
|
3
|
-
module Documents
|
4
|
-
def profile_toolbar_items(subject = current_subject)
|
5
|
-
items = super
|
6
|
-
|
7
|
-
items << {
|
8
|
-
:key => :documents,
|
9
|
-
:name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("document.title.other"),
|
10
|
-
:url => polymorphic_path([subject, Document.new]),
|
11
|
-
:options => {:link => {:id => "documents_menu"}}
|
12
|
-
}
|
13
|
-
end
|
14
|
-
|
15
|
-
def home_toolbar_items
|
16
|
-
items = super
|
17
|
-
|
18
|
-
items << {
|
19
|
-
:key => :documents,
|
20
|
-
:name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("document.title.other"),
|
21
|
-
:url => polymorphic_path([current_subject, Document.new]),
|
22
|
-
:options => {:link => {:id => "documents_menu"}}
|
23
|
-
}
|
24
|
-
end
|
25
|
-
end
|
26
|
-
end
|
27
|
-
end
|
@@ -1,22 +0,0 @@
|
|
1
|
-
module SocialStream
|
2
|
-
module ToolbarConfig
|
3
|
-
module Events
|
4
|
-
def profile_toolbar_items(subject = current_subject)
|
5
|
-
items = super
|
6
|
-
|
7
|
-
if SocialStream.activity_forms.include?(:event) &&
|
8
|
-
subject.is_a?(Event) &&
|
9
|
-
subject.agenda.present?
|
10
|
-
|
11
|
-
items.insert(1, {
|
12
|
-
:key => :outline_info,
|
13
|
-
:name => image_tag("btn/btn_outline.png")+t('menu.outline'),
|
14
|
-
:url => agenda_path(subject)
|
15
|
-
})
|
16
|
-
end
|
17
|
-
|
18
|
-
items
|
19
|
-
end
|
20
|
-
end
|
21
|
-
end
|
22
|
-
end
|