social_stream 0.1.2 → 0.1.3
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile.lock +7 -3
- data/app/controllers/users_controller.rb +11 -0
- data/app/models/actor.rb +1 -1
- data/app/views/groups/_index.html.erb +34 -0
- data/app/views/groups/_middle_index.html.erb +0 -0
- data/app/views/groups/_right_index.html.erb +0 -0
- data/app/views/groups/index.html.erb +109 -0
- data/app/views/home/index.html.erb +1 -1
- data/app/views/{groups → users}/_groups.html.erb +2 -2
- data/app/views/users/_index.html.erb +28 -0
- data/app/views/users/_middle_index.html.erb +0 -0
- data/app/views/users/_right_index.html.erb +0 -0
- data/app/views/users/index.html.erb +89 -0
- data/app/views/users/show.html.erb +1 -1
- data/config/locales/en.yml +12 -5
- data/lib/social_stream/version.rb +1 -1
- metadata +13 -4
data/Gemfile.lock
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: .
|
|
3
3
|
specs:
|
|
4
|
-
social_stream (0.
|
|
5
|
-
atd-ancestry
|
|
4
|
+
social_stream (0.1.2)
|
|
5
|
+
atd-ancestry
|
|
6
6
|
devise (~> 1.1.3)
|
|
7
7
|
inherited_resources (~> 1.1.2)
|
|
8
|
+
jquery-rails (~> 0.2.4)
|
|
8
9
|
paperclip (~> 2.3.4)
|
|
9
10
|
stringex (~> 1.2.0)
|
|
10
11
|
|
|
@@ -69,6 +70,8 @@ GEM
|
|
|
69
70
|
inherited_resources (1.1.2)
|
|
70
71
|
has_scope (~> 0.5.0)
|
|
71
72
|
responders (~> 0.6.0)
|
|
73
|
+
jquery-rails (0.2.4)
|
|
74
|
+
rails (~> 3.0)
|
|
72
75
|
json_pure (1.4.6)
|
|
73
76
|
linecache (0.43)
|
|
74
77
|
mail (2.2.7)
|
|
@@ -137,12 +140,13 @@ PLATFORMS
|
|
|
137
140
|
ruby
|
|
138
141
|
|
|
139
142
|
DEPENDENCIES
|
|
140
|
-
atd-ancestry
|
|
143
|
+
atd-ancestry
|
|
141
144
|
cancan
|
|
142
145
|
capybara (>= 0.3.9)
|
|
143
146
|
devise (~> 1.1.3)
|
|
144
147
|
factory_girl
|
|
145
148
|
inherited_resources (~> 1.1.2)
|
|
149
|
+
jquery-rails (~> 0.2.4)
|
|
146
150
|
paperclip (~> 2.3.4)
|
|
147
151
|
rails (= 3.0.0)
|
|
148
152
|
rspec-rails (>= 2.0.0.beta)
|
data/app/models/actor.rb
CHANGED
|
@@ -134,7 +134,7 @@ class Actor < ActiveRecord::Base
|
|
|
134
134
|
|
|
135
135
|
return nil unless candidate.present?
|
|
136
136
|
|
|
137
|
-
sent_ties.build :receiver_id => candidate.id,
|
|
137
|
+
sent_ties.build :receiver_id => candidate.actor.id,
|
|
138
138
|
:relation => Relation.mode(subject_type, candidate.class).find_by_name(SuggestedRelations[candidate.class.to_s])
|
|
139
139
|
end
|
|
140
140
|
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
<% cont=0; %>
|
|
2
|
+
|
|
3
|
+
<% Group.alphabetic.all.each do |group| %>
|
|
4
|
+
|
|
5
|
+
<% if (cont%2) == 0
|
|
6
|
+
cont+=1; %>
|
|
7
|
+
<div class="wrap_post">
|
|
8
|
+
<% end %>
|
|
9
|
+
|
|
10
|
+
<div class="post_browse">
|
|
11
|
+
<div class="post_picture"><%= link_to (image_tag(group.logo.url , :size => "50x50", :alt => group.name )),home_path %></div>
|
|
12
|
+
<div class="post_browse_content_people content_size">
|
|
13
|
+
<div class="post_browse_title content_size" >
|
|
14
|
+
<%= link_to group.name, group %>
|
|
15
|
+
</div>
|
|
16
|
+
<div class="content_size">
|
|
17
|
+
<%= tie_link(current_user.sent_ties.build(:receiver => group.actor,
|
|
18
|
+
:relation => Relation.mode(current_user.class,
|
|
19
|
+
group.class).find_by_name("follower"))) %>
|
|
20
|
+
</div>
|
|
21
|
+
</div>
|
|
22
|
+
</div>
|
|
23
|
+
|
|
24
|
+
<% if ((cont%2) == 0) %>
|
|
25
|
+
</div>
|
|
26
|
+
<% end %>
|
|
27
|
+
|
|
28
|
+
<% end %>
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
<% if ((cont%2) != 0) %>
|
|
32
|
+
</div>
|
|
33
|
+
<% end %>
|
|
34
|
+
|
|
File without changes
|
|
File without changes
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
<% content_for :middle do %>
|
|
2
|
+
<%= render :partial => "groups/middle_index" %>
|
|
3
|
+
<% end %>
|
|
4
|
+
|
|
5
|
+
<% content_for :right do %>
|
|
6
|
+
<%= render :partial => "groups/right_index" %>
|
|
7
|
+
<% end %>
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
<div id="map_location" class="content_size">
|
|
11
|
+
Your are here ><img src="images/btn/btn_browse.png" class="btn_config"%> <%=t('browse')%>: <span id="name_group"><%= t('group.other')%></span>
|
|
12
|
+
</div>
|
|
13
|
+
<div id="by_options" class="content_size"><%=link_to ( t('user.by'),users_path )%> </div>
|
|
14
|
+
<br class="clearfloat" />
|
|
15
|
+
<div class="space_center">
|
|
16
|
+
</div>
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
<div class="space_center">
|
|
20
|
+
</div>
|
|
21
|
+
|
|
22
|
+
<div id="my_conferences">
|
|
23
|
+
<div id="tabconference_browse" class="widget content_size">
|
|
24
|
+
<ul class="tabconference_browse">
|
|
25
|
+
<li>
|
|
26
|
+
<a href="#spaces"> <%= t('group.other')%> (<%=Group.count%>) </a>
|
|
27
|
+
</li>
|
|
28
|
+
<li>
|
|
29
|
+
<a href="#most_popular"> <%= t('group.popular.most')%></a>
|
|
30
|
+
</li>
|
|
31
|
+
<li>
|
|
32
|
+
<a href="#most_voted"> <%= t('group.voted.most')%> </a>
|
|
33
|
+
</li>
|
|
34
|
+
</ul>
|
|
35
|
+
<div id="spaces" class="tabconference_browse">
|
|
36
|
+
<div class="space_center">
|
|
37
|
+
</div>
|
|
38
|
+
<div class="letters" class="content_size">
|
|
39
|
+
<a href="#">A</a>
|
|
40
|
+
<a href="#">B</a>
|
|
41
|
+
<a href="#">C</a>
|
|
42
|
+
<a href="#">D</a>
|
|
43
|
+
<a href="#">E</a>
|
|
44
|
+
<a href="#">F</a>
|
|
45
|
+
<a href="#">G</a>
|
|
46
|
+
<a href="#">H</a>
|
|
47
|
+
<a href="#">I</a>
|
|
48
|
+
<a href="#">J</a>
|
|
49
|
+
<a href="#">K</a>
|
|
50
|
+
<a href="#">L</a>
|
|
51
|
+
<a href="#">M</a>
|
|
52
|
+
<a href="#">N</a>
|
|
53
|
+
<a href="#">O</a>
|
|
54
|
+
<a href="#">P</a>
|
|
55
|
+
<a href="#">Q</a>
|
|
56
|
+
<a href="#">R</a>
|
|
57
|
+
<a href="#">S</a>
|
|
58
|
+
<a href="#">T</a>
|
|
59
|
+
<a href="#">U</a>
|
|
60
|
+
<a href="#">V</a>
|
|
61
|
+
<a href="#">W</a>
|
|
62
|
+
<a href="#">X</a>
|
|
63
|
+
<a href="#">Y</a>
|
|
64
|
+
<a href="#">Z</a>
|
|
65
|
+
</div>
|
|
66
|
+
<div class="space_center" class="content_size">
|
|
67
|
+
|
|
68
|
+
</div>
|
|
69
|
+
<%= render :partial => "groups/index"%>
|
|
70
|
+
<div class="space_center">
|
|
71
|
+
</div>
|
|
72
|
+
<div class="letters" class="content_size">
|
|
73
|
+
<a href="#">First</a>
|
|
74
|
+
<a href="#"><<</a>
|
|
75
|
+
<a href="#">1</a>
|
|
76
|
+
<a href="#">2</a>
|
|
77
|
+
<a href="#">3</a>
|
|
78
|
+
4 <a href="#">5</a>
|
|
79
|
+
<a href="#">6</a>
|
|
80
|
+
... <a href="#">>></a>
|
|
81
|
+
<a href="#">Last</a>
|
|
82
|
+
</div>
|
|
83
|
+
<div class="space_center">
|
|
84
|
+
</div>
|
|
85
|
+
</div>
|
|
86
|
+
|
|
87
|
+
<div id="most_popular" class="tabconference_browse">
|
|
88
|
+
<div class="space_center">
|
|
89
|
+
</div>
|
|
90
|
+
|
|
91
|
+
<div class="space_center">
|
|
92
|
+
Most popular groups
|
|
93
|
+
</div>
|
|
94
|
+
</div>
|
|
95
|
+
<div id="most_voted" class="tabconference_browse">
|
|
96
|
+
<div class="space_center">
|
|
97
|
+
</div>
|
|
98
|
+
|
|
99
|
+
<div class="space_center">
|
|
100
|
+
Most voted groups
|
|
101
|
+
</div>
|
|
102
|
+
</div>
|
|
103
|
+
</div>
|
|
104
|
+
</div>
|
|
105
|
+
|
|
106
|
+
|
|
107
|
+
<br class="clearfloat" />
|
|
108
|
+
<div class="space_center">
|
|
109
|
+
</div>
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
<div class="space_center">
|
|
13
13
|
</div>
|
|
14
14
|
<div id="my_groups">
|
|
15
|
-
<%= render :partial => "
|
|
15
|
+
<%= render :partial => "users/groups" %>
|
|
16
16
|
</div>
|
|
17
17
|
<%= render :partial => "activities/activities",
|
|
18
18
|
:locals => { :activities => current_user.wall,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<% if current_user.recent_groups.any? %>
|
|
2
2
|
<div id="groups_title" class="content_size">
|
|
3
|
-
<%=t('group.
|
|
3
|
+
<%=t('group.my') %> (<span id="group_count"><%=current_user.recent_groups.count%></span>)
|
|
4
4
|
</div>
|
|
5
5
|
<div id="groups_list" class="content_size">
|
|
6
6
|
<% if (current_user.recent_groups.count) > 10 %>
|
|
@@ -20,4 +20,4 @@
|
|
|
20
20
|
</div>
|
|
21
21
|
<% end %>
|
|
22
22
|
</div>
|
|
23
|
-
<% end %>
|
|
23
|
+
<% end %>
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
<% cont=0; %>
|
|
2
|
+
|
|
3
|
+
<% User.alphabetic.all.each do |user| %>
|
|
4
|
+
|
|
5
|
+
<% if (cont%2) == 0
|
|
6
|
+
cont+=1; %>
|
|
7
|
+
<div class="wrap_post">
|
|
8
|
+
<% end %>
|
|
9
|
+
|
|
10
|
+
<div class="post_browse">
|
|
11
|
+
<div class="post_picture"><%= link_to (image_tag(user.logo.url , :size => "50x50", :alt => user.name )),user %></div>
|
|
12
|
+
<div class="post_browse_content_people content_size">
|
|
13
|
+
<div class="post_browse_title content_size" ><%=link_to(user.name, user)%></div>
|
|
14
|
+
<div class="content_size">+ <a href="#">Add as contact</a></div>
|
|
15
|
+
</div>
|
|
16
|
+
</div>
|
|
17
|
+
|
|
18
|
+
<% if ((cont%2) == 0) %>
|
|
19
|
+
</div>
|
|
20
|
+
<% end %>
|
|
21
|
+
|
|
22
|
+
<% end %>
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
<% if ((cont%2) != 0) %>
|
|
26
|
+
</div>
|
|
27
|
+
<% end %>
|
|
28
|
+
|
|
File without changes
|
|
File without changes
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
<% content_for :middle do %>
|
|
2
|
+
<%= render :partial => "users/middle_index" %>
|
|
3
|
+
<% end %>
|
|
4
|
+
|
|
5
|
+
<% content_for :right do %>
|
|
6
|
+
<%= render :partial => "users/right_index" %>
|
|
7
|
+
<% end %>
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
<div id="map_location" class="content_size">
|
|
11
|
+
Your are here ><img src="images/btn/btn_browse.png" class="btn_config" /> <%= t('browse') %>: <span id="name_group"><%= t('user.other')%></span>
|
|
12
|
+
</div>
|
|
13
|
+
<div id="by_options" class="content_size"><%=link_to(t('group.by'),groups_path)%></div>
|
|
14
|
+
<br class="clearfloat" />
|
|
15
|
+
<div class="space_center">
|
|
16
|
+
</div>
|
|
17
|
+
|
|
18
|
+
<div class="space_center">
|
|
19
|
+
</div>
|
|
20
|
+
|
|
21
|
+
<div id="my_conferences">
|
|
22
|
+
<div id="tabconference_browse" class="widget content_size">
|
|
23
|
+
<ul class="tabconference_browse">
|
|
24
|
+
<li>
|
|
25
|
+
<a href="#contacts"> <%= t('user.other')%> (<%=User.count%>) </a>
|
|
26
|
+
</li>
|
|
27
|
+
</ul>
|
|
28
|
+
<div id="contacts" class="tabconference_browse">
|
|
29
|
+
<div class="space_center">
|
|
30
|
+
</div>
|
|
31
|
+
<div class="letters" class="content_size">
|
|
32
|
+
<a href="#">A</a>
|
|
33
|
+
<a href="#">B</a>
|
|
34
|
+
<a href="#">C</a>
|
|
35
|
+
<a href="#">D</a>
|
|
36
|
+
<a href="#">E</a>
|
|
37
|
+
<a href="#">F</a>
|
|
38
|
+
<a href="#">G</a>
|
|
39
|
+
<a href="#">H</a>
|
|
40
|
+
<a href="#">I</a>
|
|
41
|
+
<a href="#">J</a>
|
|
42
|
+
<a href="#">K</a>
|
|
43
|
+
<a href="#">L</a>
|
|
44
|
+
<a href="#">M</a>
|
|
45
|
+
<a href="#">N</a>
|
|
46
|
+
<a href="#">O</a>
|
|
47
|
+
<a href="#">P</a>
|
|
48
|
+
<a href="#">Q</a>
|
|
49
|
+
<a href="#">R</a>
|
|
50
|
+
<a href="#">S</a>
|
|
51
|
+
<a href="#">T</a>
|
|
52
|
+
<a href="#">U</a>
|
|
53
|
+
<a href="#">V</a>
|
|
54
|
+
<a href="#">W</a>
|
|
55
|
+
<a href="#">X</a>
|
|
56
|
+
<a href="#">Y</a>
|
|
57
|
+
<a href="#">Z</a>
|
|
58
|
+
</div>
|
|
59
|
+
<div class="space_center" class="content_size">
|
|
60
|
+
|
|
61
|
+
</div>
|
|
62
|
+
<%= render :partial => "users/index"%>
|
|
63
|
+
|
|
64
|
+
<div class="space_center">
|
|
65
|
+
</div>
|
|
66
|
+
<div class="letters" class="content_size">
|
|
67
|
+
<a href="#">First</a>
|
|
68
|
+
<a href="#"><<</a>
|
|
69
|
+
<a href="#">1</a>
|
|
70
|
+
<a href="#">2</a>
|
|
71
|
+
<a href="#">3</a>
|
|
72
|
+
4 <a href="#">5</a>
|
|
73
|
+
<a href="#">6</a>
|
|
74
|
+
... <a href="#">>></a>
|
|
75
|
+
<a href="#">Last</a>
|
|
76
|
+
</div>
|
|
77
|
+
<div class="space_center">
|
|
78
|
+
</div>
|
|
79
|
+
</div>
|
|
80
|
+
|
|
81
|
+
|
|
82
|
+
</div>
|
|
83
|
+
</div>
|
|
84
|
+
|
|
85
|
+
|
|
86
|
+
<br class="clearfloat" />
|
|
87
|
+
<div class="space_center">
|
|
88
|
+
</div>
|
|
89
|
+
|
data/config/locales/en.yml
CHANGED
|
@@ -56,12 +56,15 @@ en:
|
|
|
56
56
|
sentence2: "Posts, comments and activities"
|
|
57
57
|
stats: "%{users} users and %{groups} groups registered"
|
|
58
58
|
group:
|
|
59
|
+
all: "All Groups"
|
|
60
|
+
by: "By Groups"
|
|
61
|
+
my: "My Groups"
|
|
62
|
+
one: "Group"
|
|
59
63
|
other: "Groups"
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
one: Group
|
|
64
|
+
popular:
|
|
65
|
+
most: "Most popular"
|
|
66
|
+
voted:
|
|
67
|
+
most: "Most voted"
|
|
65
68
|
home: "Home"
|
|
66
69
|
inbox:
|
|
67
70
|
one: "Inbox"
|
|
@@ -88,4 +91,8 @@ en:
|
|
|
88
91
|
all: All
|
|
89
92
|
time:
|
|
90
93
|
ago: "%{time} ago"
|
|
94
|
+
user:
|
|
95
|
+
by: "By Users"
|
|
96
|
+
one: "User"
|
|
97
|
+
other: "Users"
|
|
91
98
|
|
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: social_stream
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
hash:
|
|
4
|
+
hash: 29
|
|
5
5
|
prerelease: false
|
|
6
6
|
segments:
|
|
7
7
|
- 0
|
|
8
8
|
- 1
|
|
9
|
-
-
|
|
10
|
-
version: 0.1.
|
|
9
|
+
- 3
|
|
10
|
+
version: 0.1.3
|
|
11
11
|
platform: ruby
|
|
12
12
|
authors:
|
|
13
13
|
- Antonio Tapiador
|
|
@@ -137,6 +137,7 @@ files:
|
|
|
137
137
|
- app/controllers/likes_controller.rb
|
|
138
138
|
- app/controllers/posts_controller.rb
|
|
139
139
|
- app/controllers/ties_controller.rb
|
|
140
|
+
- app/controllers/users_controller.rb
|
|
140
141
|
- app/helpers/activities_helper.rb
|
|
141
142
|
- app/helpers/groups_helper.rb
|
|
142
143
|
- app/helpers/ties_helper.rb
|
|
@@ -174,11 +175,14 @@ files:
|
|
|
174
175
|
- app/views/groups/_follow.html.erb
|
|
175
176
|
- app/views/groups/_followers.html.erb
|
|
176
177
|
- app/views/groups/_group.html.erb
|
|
177
|
-
- app/views/groups/
|
|
178
|
+
- app/views/groups/_index.html.erb
|
|
178
179
|
- app/views/groups/_logo.html.erb
|
|
180
|
+
- app/views/groups/_middle_index.html.erb
|
|
179
181
|
- app/views/groups/_middle_show.html.erb
|
|
182
|
+
- app/views/groups/_right_index.html.erb
|
|
180
183
|
- app/views/groups/_right_show.html.erb
|
|
181
184
|
- app/views/groups/_tabs.html.erb
|
|
185
|
+
- app/views/groups/index.html.erb
|
|
182
186
|
- app/views/groups/show.html.erb
|
|
183
187
|
- app/views/home/_contacts.html.erb
|
|
184
188
|
- app/views/home/_location.html.erb
|
|
@@ -205,11 +209,16 @@ files:
|
|
|
205
209
|
- app/views/ties/new.html.erb
|
|
206
210
|
- app/views/ties/new.js.erb
|
|
207
211
|
- app/views/users/_contacts.html.erb
|
|
212
|
+
- app/views/users/_groups.html.erb
|
|
213
|
+
- app/views/users/_index.html.erb
|
|
208
214
|
- app/views/users/_logo.html.erb
|
|
209
215
|
- app/views/users/_menu.html.erb
|
|
216
|
+
- app/views/users/_middle_index.html.erb
|
|
210
217
|
- app/views/users/_middle_show.html.erb
|
|
211
218
|
- app/views/users/_profile.html.erb
|
|
219
|
+
- app/views/users/_right_index.html.erb
|
|
212
220
|
- app/views/users/_right_show.html.erb
|
|
221
|
+
- app/views/users/index.html.erb
|
|
213
222
|
- app/views/users/show.html.erb
|
|
214
223
|
- config/locales/en.yml
|
|
215
224
|
- config/routes.rb
|