social_stream-base 2.0.0.beta3 → 2.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/assets/javascripts/social_stream/object.js +4 -4
- data/app/assets/javascripts/social_stream/tag.js +1 -2
- data/app/assets/javascripts/social_stream/wall.js +6 -2
- data/app/assets/stylesheets/social_stream/base/adjust/_adjust.css.sass +4 -1
- data/app/assets/stylesheets/social_stream/base/profile/_profile.css.sass +12 -13
- data/app/assets/stylesheets/social_stream/base/profile/layout/_profile.css.sass +48 -31
- data/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-1200px-min.css.sass +2 -2
- data/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-767px-max.css.sass +4 -11
- data/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-768px-979px.css.sass +4 -5
- data/app/assets/stylesheets/social_stream/base/responsive/_responsive-1200px-min.css.sass +1 -25
- data/app/assets/stylesheets/social_stream/base/responsive/_responsive-767px-max.css.sass +0 -18
- data/app/assets/stylesheets/social_stream/base/responsive/_responsive-768px-979px.css.sass +1 -15
- data/app/controllers/conversations_controller.rb +0 -12
- data/app/views/devise/sessions/new.html.erb +1 -0
- data/app/views/layouts/_header_signed_out.erb +0 -2
- data/app/views/permissions/_index.html.erb +1 -1
- data/app/views/profiles/_avatar.html.erb +10 -11
- data/app/views/profiles/_comunication-info.html.erb +36 -36
- data/app/views/profiles/_experience.html.erb +16 -16
- data/app/views/profiles/_personal.html.erb +9 -11
- data/app/views/profiles/_profile.html.erb +25 -33
- data/app/views/profiles/_tags.html.erb +9 -8
- data/config/locales/en.yml +3 -3
- data/config/locales/es.yml +38 -7
- data/lib/generators/social_stream/base/templates/initializer.rb +1 -5
- data/lib/social_stream/base/version.rb +1 -1
- data/lib/social_stream/controllers/objects.rb +5 -3
- data/lib/tasks/db/populate.rake +1 -0
- data/social_stream-base.gemspec +1 -1
- metadata +6 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1f681843094d843a366613ea257bd210c929df88
|
|
4
|
+
data.tar.gz: 766f9f46ce33c10b437f3ebe4f5e1d1428ddb743
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ff7cc4294acf5f340b883dd8be40461f829c54200d762f3f25022fa13fc69876fe3a2a190e9403159ec0943b9d667dafaaff64069c925b684c8afc6c7d6108b7
|
|
7
|
+
data.tar.gz: 26c2c1a5ea6b0c9b4358de9c3419a27428f23a70824486c3d7772053423bb07d1bc9b81536d67a7d925c521d01895a0ac016b8f0fd1558ff1af30c489a580f1d
|
|
@@ -66,12 +66,12 @@ SocialStream.Object = (function(SS, $, undefined){
|
|
|
66
66
|
return icon + ' ' + text + ' <b class="caret"></b>';
|
|
67
67
|
};
|
|
68
68
|
|
|
69
|
-
var changeRelationSelect = function(type) {
|
|
70
|
-
$('[name$="[relation_ids][]"]').attr('name', type + '[relation_ids][]');
|
|
69
|
+
var changeRelationSelect = function(type, selector) {
|
|
70
|
+
$('[name$="[relation_ids][]"]', selector).attr('name', type + '[relation_ids][]');
|
|
71
71
|
};
|
|
72
72
|
|
|
73
|
-
var changeOwner = function(type) {
|
|
74
|
-
$('[name$="[owner_id]"]').attr('name', type + '[owner_id]');
|
|
73
|
+
var changeOwner = function(type, selector) {
|
|
74
|
+
$('[name$="[owner_id]"]', selector).attr('name', type + '[owner_id]');
|
|
75
75
|
};
|
|
76
76
|
|
|
77
77
|
callback.register('show',
|
|
@@ -32,14 +32,13 @@ SocialStream.Tag = (function(SS, $, undefined) {
|
|
|
32
32
|
};
|
|
33
33
|
|
|
34
34
|
var select2InitSelection = function(element, callback) {
|
|
35
|
-
var selection = $(element).val().split(",").map(function(el) {
|
|
35
|
+
var selection = $(element).val().split(", ").map(function(el) {
|
|
36
36
|
return { id: el, text: el };
|
|
37
37
|
});
|
|
38
38
|
|
|
39
39
|
callback(selection);
|
|
40
40
|
};
|
|
41
41
|
|
|
42
|
-
|
|
43
42
|
return {
|
|
44
43
|
select2: select2
|
|
45
44
|
};
|
|
@@ -30,6 +30,11 @@ SocialStream.Wall = (function(SS, $, undefined){
|
|
|
30
30
|
}
|
|
31
31
|
};
|
|
32
32
|
|
|
33
|
+
var changeParams = function(type) {
|
|
34
|
+
SS.Object.changeOwner(type, $('.wall_input form'));
|
|
35
|
+
SS.Object.changeRelationSelect(type, $('.wall_input form'));
|
|
36
|
+
};
|
|
37
|
+
|
|
33
38
|
callback.register('show',
|
|
34
39
|
initInputAutosize,
|
|
35
40
|
SS.Object.new_);
|
|
@@ -39,7 +44,6 @@ SocialStream.Wall = (function(SS, $, undefined){
|
|
|
39
44
|
|
|
40
45
|
return callback.extend({
|
|
41
46
|
changeAction: changeAction,
|
|
42
|
-
|
|
43
|
-
changeRelationSelect: SS.Object.changeRelationSelect
|
|
47
|
+
changeParams: changeParams
|
|
44
48
|
});
|
|
45
49
|
}) (SocialStream, jQuery);
|
|
@@ -15,16 +15,19 @@
|
|
|
15
15
|
input,
|
|
16
16
|
textarea
|
|
17
17
|
background-color: #f9f9f9
|
|
18
|
-
.
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
18
|
+
.briefing
|
|
19
|
+
background-color: white
|
|
20
|
+
color: $gray
|
|
21
|
+
span
|
|
22
|
+
@include border-radius(5px)
|
|
23
|
+
background-color: #D9EDF7
|
|
24
|
+
border: 1px solid #BCE8F1
|
|
25
|
+
color: #3A87AD
|
|
26
|
+
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5)
|
|
24
27
|
p
|
|
28
|
+
border-top: 5px solid #f9f9f9
|
|
25
29
|
background-color: none
|
|
26
|
-
|
|
27
|
-
padding-left: 1px
|
|
30
|
+
|
|
28
31
|
|
|
29
32
|
form.edit_profile
|
|
30
33
|
input
|
|
@@ -37,11 +40,7 @@
|
|
|
37
40
|
padding-top: 14px
|
|
38
41
|
input
|
|
39
42
|
&[type="file"]
|
|
40
|
-
|
|
41
|
-
border: none
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
43
|
+
|
|
45
44
|
h5
|
|
46
45
|
color: $grayLighter
|
|
47
46
|
font-size: 17px
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
@import 'avatars_for_rails'
|
|
2
2
|
|
|
3
3
|
#profile
|
|
4
|
+
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
5
|
+
float: left
|
|
6
|
+
margin-left: 2%
|
|
4
7
|
#profile-info
|
|
5
8
|
@include grid-core-span(7, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
6
9
|
float: left
|
|
@@ -10,25 +13,34 @@
|
|
|
10
13
|
.comunication-info,
|
|
11
14
|
.experience,
|
|
12
15
|
.avatar
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
.
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
padding:
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
16
|
+
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
17
|
+
margin-left: 0px
|
|
18
|
+
.briefing
|
|
19
|
+
padding: 1px 0px 16px
|
|
20
|
+
min-height: 32px
|
|
21
|
+
span
|
|
22
|
+
margin-left: 11px
|
|
23
|
+
padding: 3px 8px 3px 7px
|
|
24
|
+
p
|
|
25
|
+
margin: -15px 26px 0 14px
|
|
26
|
+
padding: 20px 0px 5px 0px
|
|
27
|
+
width: 100%
|
|
28
|
+
.empty
|
|
29
|
+
float: left
|
|
30
|
+
padding: 8px 27px 9px 27px
|
|
31
|
+
.update
|
|
32
|
+
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
33
|
+
background-color: $white
|
|
34
|
+
margin-left: 0px
|
|
35
|
+
padding: 12px 0px 3px 0px !important
|
|
36
|
+
form.edit_profile
|
|
37
|
+
padding: 0 14px
|
|
24
38
|
input
|
|
25
39
|
&[type="submit"]
|
|
26
40
|
float: right
|
|
27
|
-
margin-top: 10px
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
padding: 0px 27px 9px 27px
|
|
31
|
-
float: right
|
|
41
|
+
margin-top: -10px
|
|
42
|
+
margin-right: 9px
|
|
43
|
+
|
|
32
44
|
|
|
33
45
|
.personal,
|
|
34
46
|
.comunication-info,
|
|
@@ -37,21 +49,13 @@
|
|
|
37
49
|
&[type="text"],
|
|
38
50
|
&[type="tel"],
|
|
39
51
|
&[type="email"]
|
|
40
|
-
width: 95
|
|
52
|
+
width: 95% !important
|
|
41
53
|
|
|
42
54
|
|
|
43
55
|
textarea
|
|
44
|
-
width: 95
|
|
56
|
+
width: 95% !important
|
|
45
57
|
|
|
46
|
-
|
|
47
|
-
.accordion-body
|
|
48
|
-
.accordion-inner
|
|
49
|
-
form
|
|
50
|
-
margin: 0 0 10px
|
|
51
|
-
input
|
|
52
|
-
&[type="submit"]
|
|
53
|
-
float: right
|
|
54
|
-
margin-top: 2px
|
|
58
|
+
|
|
55
59
|
.experience
|
|
56
60
|
.briefing
|
|
57
61
|
p
|
|
@@ -72,12 +76,13 @@
|
|
|
72
76
|
margin: 16px
|
|
73
77
|
p
|
|
74
78
|
@include border-radius (15px)
|
|
75
|
-
margin: -15px 11px 0
|
|
76
|
-
padding: 12px 10px 11px
|
|
79
|
+
margin: -15px 11px 0 5px
|
|
80
|
+
padding: 12px 10px 11px 27px
|
|
77
81
|
width: 325px
|
|
82
|
+
.update
|
|
83
|
+
margin-left: 22px
|
|
84
|
+
|
|
78
85
|
|
|
79
|
-
.accordion
|
|
80
|
-
margin-top: 20px
|
|
81
86
|
|
|
82
87
|
|
|
83
88
|
#profile_birthday_3i,
|
|
@@ -91,5 +96,17 @@
|
|
|
91
96
|
display: inline
|
|
92
97
|
h4
|
|
93
98
|
display: inline-block
|
|
99
|
+
.update
|
|
100
|
+
.jcrop-holder
|
|
101
|
+
width: 100% !important
|
|
102
|
+
div
|
|
103
|
+
img
|
|
104
|
+
max-width: 90%
|
|
105
|
+
max-height: 90%
|
|
106
|
+
margin: 0 auto
|
|
107
|
+
position: relative
|
|
108
|
+
div
|
|
109
|
+
img
|
|
110
|
+
visibility: hidden !important
|
|
94
111
|
|
|
95
112
|
|
data/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-767px-max.css.sass
CHANGED
|
@@ -19,7 +19,9 @@
|
|
|
19
19
|
.comunication-info,
|
|
20
20
|
.experience,
|
|
21
21
|
.avatar
|
|
22
|
-
|
|
22
|
+
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
23
|
+
.update
|
|
24
|
+
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
23
25
|
|
|
24
26
|
|
|
25
27
|
|
|
@@ -29,14 +31,5 @@
|
|
|
29
31
|
|
|
30
32
|
@media (max-width: 480px)
|
|
31
33
|
|
|
32
|
-
|
|
33
|
-
#profile-info
|
|
34
|
-
.tags,
|
|
35
|
-
.personal,
|
|
36
|
-
.comunication-info,
|
|
37
|
-
.experience,
|
|
38
|
-
.avatar
|
|
39
|
-
width: 96% !important
|
|
40
|
-
.accordion-heading
|
|
41
|
-
min-height: 40px
|
|
34
|
+
|
|
42
35
|
|
data/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-768px-979px.css.sass
CHANGED
|
@@ -10,13 +10,12 @@
|
|
|
10
10
|
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
11
11
|
|
|
12
12
|
#profile-info
|
|
13
|
-
@include grid-core-span(
|
|
14
|
-
float: left !important
|
|
15
|
-
margin: 0 0 0 2.5% !important
|
|
16
|
-
width: 80% !important
|
|
13
|
+
@include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
17
14
|
.tags,
|
|
18
15
|
.personal,
|
|
19
16
|
.comunication-info,
|
|
20
17
|
.experience,
|
|
21
18
|
.avatar
|
|
22
|
-
|
|
19
|
+
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
20
|
+
.update
|
|
21
|
+
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
@@ -96,31 +96,7 @@
|
|
|
96
96
|
a
|
|
97
97
|
font-size: 16px !important
|
|
98
98
|
|
|
99
|
-
|
|
100
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
101
|
-
margin-left: 0px
|
|
102
|
-
#toolbar
|
|
103
|
-
@include grid-core-span(2, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
104
|
-
float: left
|
|
105
|
-
margin-left: 0px
|
|
106
|
-
#profile-info
|
|
107
|
-
@include grid-core-span(7, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
108
|
-
float: left
|
|
109
|
-
margin-left: 2%
|
|
110
|
-
.tags,
|
|
111
|
-
.personal,
|
|
112
|
-
.comunication-info,
|
|
113
|
-
.experience,
|
|
114
|
-
.avatar
|
|
115
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
116
|
-
margin-left: 0px
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
.update
|
|
120
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
99
|
+
|
|
124
100
|
|
|
125
101
|
#documents
|
|
126
102
|
#toolbar
|
|
@@ -70,24 +70,6 @@
|
|
|
70
70
|
|
|
71
71
|
|
|
72
72
|
|
|
73
|
-
#profile
|
|
74
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
75
|
-
margin-left: 0px
|
|
76
|
-
|
|
77
|
-
#profile-info
|
|
78
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
79
|
-
float: none
|
|
80
|
-
margin: 0px auto 0px
|
|
81
|
-
.tags,
|
|
82
|
-
.personal,
|
|
83
|
-
.comunication-info,
|
|
84
|
-
.experience,
|
|
85
|
-
.avatar
|
|
86
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
87
|
-
.update
|
|
88
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
89
|
-
|
|
90
|
-
|
|
91
73
|
|
|
92
74
|
#relation_customs
|
|
93
75
|
#toolbar
|
|
@@ -55,21 +55,7 @@
|
|
|
55
55
|
width: 127px
|
|
56
56
|
margin-left: 3px
|
|
57
57
|
|
|
58
|
-
|
|
59
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
60
|
-
|
|
61
|
-
#profile-info
|
|
62
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
63
|
-
float: none
|
|
64
|
-
margin: 0px auto 0px
|
|
65
|
-
.tags,
|
|
66
|
-
.personal,
|
|
67
|
-
.comunication-info,
|
|
68
|
-
.experience,
|
|
69
|
-
.avatar
|
|
70
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
71
|
-
.update
|
|
72
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
58
|
+
|
|
73
59
|
|
|
74
60
|
|
|
75
61
|
|
|
@@ -27,18 +27,6 @@ class ConversationsController < ApplicationController
|
|
|
27
27
|
@receipts.mark_as_read
|
|
28
28
|
end
|
|
29
29
|
|
|
30
|
-
def new
|
|
31
|
-
|
|
32
|
-
end
|
|
33
|
-
|
|
34
|
-
def edit
|
|
35
|
-
|
|
36
|
-
end
|
|
37
|
-
|
|
38
|
-
def create
|
|
39
|
-
|
|
40
|
-
end
|
|
41
|
-
|
|
42
30
|
def update
|
|
43
31
|
if params[:untrash].present?
|
|
44
32
|
@conversation.untrash(@actor)
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
<% default_permissions.each do |p| %>
|
|
11
11
|
<li>
|
|
12
12
|
<%= check_box_tag 'relation_custom[permission_ids][]', p.id, @relation.permission_ids.include?(p.id), id: "checkbox_relation_#{ @relation.id }_permission_#{ p.id }" %>
|
|
13
|
-
<%= label_tag "checkbox_relation_#{ @relation.id }_permission_#{ p.id }", p.description(:brief, subject: current_subject) %>
|
|
13
|
+
<%= label_tag "checkbox_relation_#{ @relation.id }_permission_#{ p.id }", p.description(:brief, subject: current_subject), title: p.description(:detailed, subject: current_subject, state: (@relation.permission_ids.include?(p.id) ? 'positive' : 'negative'), relation: @relation.name) %>
|
|
14
14
|
</li>
|
|
15
15
|
<% end %>
|
|
16
16
|
</ul>
|
|
@@ -1,16 +1,15 @@
|
|
|
1
|
-
<section class="
|
|
2
|
-
<
|
|
3
|
-
|
|
1
|
+
<section class="avatar">
|
|
2
|
+
<header>
|
|
3
|
+
<%= render partial: 'edit_icon' %>
|
|
4
|
+
<h4>
|
|
4
5
|
<%= t('avatar.profile_change') %>
|
|
5
|
-
</
|
|
6
|
-
</
|
|
6
|
+
</h4>
|
|
7
|
+
</header>
|
|
7
8
|
<% if can? :update, @profile %>
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
as: :avatarable %>
|
|
9
|
+
<div class="update">
|
|
10
|
+
<%= render partial: 'avatars/form',
|
|
11
|
+
object: @profile.actor,
|
|
12
|
+
as: :avatarable %>
|
|
13
13
|
</div>
|
|
14
14
|
<% end %>
|
|
15
|
-
</div>
|
|
16
15
|
</section>
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
<section class="
|
|
2
|
-
<
|
|
3
|
-
|
|
1
|
+
<section class="comunication-info">
|
|
2
|
+
<header>
|
|
3
|
+
<%= render partial: 'edit_icon' %>
|
|
4
|
+
<h4>
|
|
4
5
|
<%= t('profile.contact') %>
|
|
5
|
-
</
|
|
6
|
-
|
|
6
|
+
</h4>
|
|
7
|
+
</header>
|
|
8
|
+
<div class="briefing">
|
|
7
9
|
<% if @profile.contact_present? %>
|
|
8
10
|
<% if @profile.phone? %>
|
|
9
11
|
<h5>
|
|
@@ -54,45 +56,43 @@
|
|
|
54
56
|
<% end %>
|
|
55
57
|
</div>
|
|
56
58
|
|
|
57
|
-
|
|
58
59
|
<% if can? :update, @profile %>
|
|
59
|
-
<div
|
|
60
|
-
<div class="accordion-inner">
|
|
61
|
-
<%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
|
|
62
|
-
<h6>
|
|
63
|
-
<%= f.label :phone, t('profile.phone') %>
|
|
64
|
-
</h6>
|
|
65
|
-
<%= f.phone_field :phone %>
|
|
60
|
+
<div class="update">
|
|
66
61
|
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
62
|
+
<%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
|
|
63
|
+
<h6>
|
|
64
|
+
<%= f.label :phone, t('profile.phone') %>
|
|
65
|
+
</h6>
|
|
66
|
+
<%= f.phone_field :phone %>
|
|
71
67
|
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
68
|
+
<h6>
|
|
69
|
+
<%= f.label :mobile, t('profile.mobile') %>
|
|
70
|
+
</h6>
|
|
71
|
+
<%= f.phone_field :mobile %>
|
|
76
72
|
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
73
|
+
<h6>
|
|
74
|
+
<%= f.label :fax, t('profile.fax') %>
|
|
75
|
+
</h6>
|
|
76
|
+
<%= f.phone_field :fax %>
|
|
81
77
|
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
78
|
+
<h6>
|
|
79
|
+
<%= f.label :address, t('profile.address') %>
|
|
80
|
+
</h6>
|
|
81
|
+
<%= f.text_field :address %>
|
|
85
82
|
|
|
86
|
-
|
|
83
|
+
<h6>
|
|
84
|
+
<%= f.label :email, t('profile.email') %>
|
|
85
|
+
</h6>
|
|
87
86
|
|
|
88
|
-
|
|
89
|
-
<%= f.label :website, t('profile.website') %>
|
|
90
|
-
</h6>
|
|
91
|
-
<%= f.text_field :website, :class => "url" %>
|
|
87
|
+
<%= f.email_field :email, :class => "email" %>
|
|
92
88
|
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
89
|
+
<h6>
|
|
90
|
+
<%= f.label :website, t('profile.website') %>
|
|
91
|
+
</h6>
|
|
92
|
+
<%= f.text_field :website, :class => "url" %>
|
|
93
|
+
|
|
94
|
+
<%= f.submit :class => "btn" %>
|
|
95
|
+
<% end %>
|
|
96
96
|
<% end %>
|
|
97
97
|
</div>
|
|
98
98
|
</section>
|
|
@@ -1,27 +1,27 @@
|
|
|
1
|
-
<section class="
|
|
2
|
-
<
|
|
3
|
-
|
|
1
|
+
<section class="experience">
|
|
2
|
+
<header>
|
|
3
|
+
<%= render partial: 'edit_icon' %>
|
|
4
|
+
<h4>
|
|
4
5
|
<%= t("profile.#{ @profile.subject.class.to_s.downcase }.experience") %>
|
|
5
|
-
</
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
<% if @profile.experience? %>
|
|
9
|
-
<%= simple_format @profile.experience %>
|
|
10
|
-
<% else %>
|
|
11
|
-
<%= render partial: 'empty' %>
|
|
12
|
-
<% end %>
|
|
6
|
+
</h4>
|
|
7
|
+
</header>
|
|
13
8
|
|
|
9
|
+
<div class="briefing">
|
|
10
|
+
<% if @profile.experience? %>
|
|
11
|
+
<%= simple_format @profile.experience %>
|
|
12
|
+
<% else %>
|
|
13
|
+
<%= render partial: 'empty' %>
|
|
14
|
+
<% end %>
|
|
14
15
|
</div>
|
|
16
|
+
|
|
15
17
|
<% if can? :update, @profile %>
|
|
16
|
-
<div
|
|
17
|
-
<div class="accordion-inner">
|
|
18
|
+
<div class="update">
|
|
18
19
|
<%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
|
|
19
|
-
|
|
20
20
|
<%= f.text_area :experience, :maxlength => 246, :rows => 5 %>
|
|
21
21
|
|
|
22
22
|
<%= f.submit :class => "btn" %>
|
|
23
23
|
<% end %>
|
|
24
|
-
<% end %>
|
|
25
24
|
</div>
|
|
26
|
-
|
|
25
|
+
<% end %>
|
|
26
|
+
|
|
27
27
|
</section>
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
<section class="
|
|
2
|
-
<
|
|
3
|
-
|
|
1
|
+
<section class="personal">
|
|
2
|
+
<header>
|
|
3
|
+
<%= render partial: 'edit_icon' %>
|
|
4
|
+
<h4>
|
|
4
5
|
<%= t("profile.#{ @profile.subject.class.to_s.downcase }.info") %>
|
|
5
|
-
</
|
|
6
|
-
|
|
6
|
+
</h4>
|
|
7
|
+
</header>
|
|
8
|
+
<div class="briefing">
|
|
7
9
|
<% if @profile.personal_present? %>
|
|
8
10
|
<% if @profile.organization? %>
|
|
9
11
|
<h5>
|
|
@@ -61,15 +63,12 @@
|
|
|
61
63
|
<% end %>
|
|
62
64
|
</div>
|
|
63
65
|
|
|
64
|
-
<div
|
|
65
|
-
|
|
66
|
-
<% if can? :update, @profile %>
|
|
67
|
-
|
|
66
|
+
<div class="update">
|
|
67
|
+
<% if can? :update, @profile %>
|
|
68
68
|
<%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
|
|
69
69
|
<h6>
|
|
70
70
|
<span class="required">*</span>
|
|
71
71
|
<%= f.label t('*actor.name') %>
|
|
72
|
-
|
|
73
72
|
</h6>
|
|
74
73
|
|
|
75
74
|
<%= f.text_field :name, :class => "required" %>
|
|
@@ -103,6 +102,5 @@
|
|
|
103
102
|
<%= f.submit :class => "btn" %>
|
|
104
103
|
<% end %>
|
|
105
104
|
<% end %>
|
|
106
|
-
</div>
|
|
107
105
|
</div>
|
|
108
106
|
</section>
|
|
@@ -2,39 +2,31 @@
|
|
|
2
2
|
<h2 class="colorfont">
|
|
3
3
|
<%= t('profile.one') %>
|
|
4
4
|
</h2>
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
<%= render partial: "tags" %>
|
|
9
|
-
<% end %>
|
|
10
|
-
</div>
|
|
11
|
-
<div class="accordion-group">
|
|
12
|
-
<% if can?(:update, @profile) || @profile.personal_present? %>
|
|
13
|
-
<%= render partial: "personal" %>
|
|
14
|
-
<% end %>
|
|
15
|
-
</div>
|
|
16
|
-
<div class="accordion-group">
|
|
17
|
-
<% if can?(:update, @profile) || @profile.contact_present? %>
|
|
18
|
-
<%= render :partial => "comunication-info" %>
|
|
19
|
-
<% end %>
|
|
20
|
-
</div>
|
|
21
|
-
<div class="accordion-group">
|
|
22
|
-
<% if can?(:update, @profile) || @profile.experience? %>
|
|
23
|
-
<%= render :partial => "experience" %>
|
|
24
|
-
<% end %>
|
|
25
|
-
</div>
|
|
26
|
-
<div class="accordion-group">
|
|
27
|
-
<% if can?(:update, @profile) || @profile.personal_present? %>
|
|
28
|
-
<%= render :partial => "avatar" %>
|
|
29
|
-
<% end %>
|
|
30
|
-
</div>
|
|
5
|
+
<% if can?(:update, @profile) || @profile.tags_present? %>
|
|
6
|
+
<%= render partial: "tags" %>
|
|
7
|
+
<% end %>
|
|
31
8
|
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
9
|
+
<% if can?(:update, @profile) || @profile.personal_present? %>
|
|
10
|
+
<%= render partial: "personal" %>
|
|
11
|
+
<% end %>
|
|
12
|
+
|
|
13
|
+
<% if can?(:update, @profile) || @profile.contact_present? %>
|
|
14
|
+
<%= render :partial => "comunication-info" %>
|
|
15
|
+
<% end %>
|
|
16
|
+
|
|
17
|
+
<% if can?(:update, @profile) || @profile.experience? %>
|
|
18
|
+
<%= render :partial => "experience" %>
|
|
19
|
+
<% end %>
|
|
20
|
+
|
|
21
|
+
<% if can?(:update, @profile) || @profile.personal_present? %>
|
|
22
|
+
<%= render :partial => "avatar" %>
|
|
23
|
+
<% end %>
|
|
24
|
+
|
|
25
|
+
<%= javascript_tag do %>
|
|
26
|
+
$(function() {
|
|
27
|
+
SocialStream.Profile.show({
|
|
28
|
+
section: "<%= params[:section ] %>"
|
|
37
29
|
});
|
|
38
|
-
|
|
39
|
-
|
|
30
|
+
});
|
|
31
|
+
<% end %>
|
|
40
32
|
</div>
|
|
@@ -1,22 +1,23 @@
|
|
|
1
|
-
<section class="tags
|
|
2
|
-
<
|
|
3
|
-
|
|
1
|
+
<section class="tags">
|
|
2
|
+
<header>
|
|
3
|
+
<%= render partial: 'edit_icon' %>
|
|
4
|
+
<h4>
|
|
4
5
|
<%= t('profile.tags.other') %>
|
|
5
|
-
</
|
|
6
|
+
</h4>
|
|
7
|
+
</header>
|
|
8
|
+
<div class="briefing">
|
|
6
9
|
<% if @profile.subject.tag_list.count > 0 %>
|
|
7
10
|
<%= tag_list @profile.subject %>
|
|
8
11
|
<% else %>
|
|
9
12
|
<%= render partial: 'empty' %>
|
|
10
13
|
<% end %>
|
|
11
|
-
<% if can?(:update, @profile) %>
|
|
12
14
|
</div>
|
|
13
|
-
|
|
14
|
-
<div class="
|
|
15
|
+
<% if can?(:update, @profile) %>
|
|
16
|
+
<div class="update">
|
|
15
17
|
<%= form_for(@profile, :url => [ @profile.subject, :profile ]) do |f| %>
|
|
16
18
|
<%= f.text_field :tag_list, "data-path" => tags_path(format: :json) %>
|
|
17
19
|
<%= f.submit :class => "btn" %>
|
|
18
20
|
<% end %>
|
|
19
21
|
</div>
|
|
20
22
|
<% end %>
|
|
21
|
-
</div>
|
|
22
23
|
</section>
|
data/config/locales/en.yml
CHANGED
|
@@ -518,8 +518,8 @@ en:
|
|
|
518
518
|
marked as public
|
|
519
519
|
represent:
|
|
520
520
|
nil:
|
|
521
|
-
positive: They WILL BE ABLE to change session and act as %{
|
|
522
|
-
negative: They WILL NOT BE ABLE to change session and act as %{
|
|
521
|
+
positive: They WILL BE ABLE to change session and act as %{name}
|
|
522
|
+
negative: They WILL NOT BE ABLE to change session and act as %{name}
|
|
523
523
|
notify:
|
|
524
524
|
nil:
|
|
525
525
|
positive: Activities WILL BE notified to contacts at %{name}
|
|
@@ -605,7 +605,7 @@ en:
|
|
|
605
605
|
one: Settings
|
|
606
606
|
password_change:
|
|
607
607
|
briefing: Change your password
|
|
608
|
-
success: Your settings
|
|
608
|
+
success: Your settings were correctly changed
|
|
609
609
|
share: Share
|
|
610
610
|
sign_in: Sign in
|
|
611
611
|
sign_out: Sign out
|
data/config/locales/es.yml
CHANGED
|
@@ -504,8 +504,8 @@ es:
|
|
|
504
504
|
detailed:
|
|
505
505
|
create:
|
|
506
506
|
activity:
|
|
507
|
-
positive: PODRÁN publicar actividades en vuestro muro
|
|
508
|
-
negative: NO PODRÁN publicar actividades en vuestro muro
|
|
507
|
+
positive: Los contactos en %{relation} PODRÁN publicar actividades en vuestro muro
|
|
508
|
+
negative: Los contactos en %{relation} NO PODRÁN publicar actividades en vuestro muro
|
|
509
509
|
follow:
|
|
510
510
|
nil:
|
|
511
511
|
positive: Las actividades de los contactos en %{relation} APARECERÁN
|
|
@@ -514,18 +514,49 @@ es:
|
|
|
514
514
|
en vuestra página de inicio
|
|
515
515
|
read:
|
|
516
516
|
activity:
|
|
517
|
-
positive: PODRÁN leer las publicaciones que aparezcan en vuestro muro,
|
|
518
|
-
salvo las que
|
|
519
|
-
negative: NO PODRÁN leer las publicaciones que aparezcan en vuestro
|
|
517
|
+
positive: Los contactos en %{relation} PODRÁN leer las publicaciones que aparezcan en vuestro muro,
|
|
518
|
+
salvo las que compartáis solo con otros roles
|
|
519
|
+
negative: Los contactos en %{relation} NO PODRÁN leer las publicaciones que aparezcan en vuestro
|
|
520
520
|
muro, salvo las que marques como públicas
|
|
521
521
|
represent:
|
|
522
522
|
nil:
|
|
523
|
-
positive: PODRÁN cambiar sesión para actuar en nombre de %{name}
|
|
524
|
-
negative: NO PODRÁN cambiar sesión para actuar en nombre de %{name}
|
|
523
|
+
positive: Los contactos en %{relation} PODRÁN cambiar sesión para actuar en nombre de %{name}
|
|
524
|
+
negative: Los contactos en %{relation} NO PODRÁN cambiar sesión para actuar en nombre de %{name}
|
|
525
525
|
notify:
|
|
526
526
|
nil:
|
|
527
527
|
positive: Las actividades SE NOTIFICARÁN a los contactos en %{relation}
|
|
528
528
|
negative: Las actividades NO SE NOTIFICARÁN a los contactos en %{relation}
|
|
529
|
+
user:
|
|
530
|
+
brief:
|
|
531
|
+
create:
|
|
532
|
+
activity: Publicar en tu muro
|
|
533
|
+
read:
|
|
534
|
+
activity: Leer tu muro
|
|
535
|
+
represent:
|
|
536
|
+
nil: Administrarte
|
|
537
|
+
notify:
|
|
538
|
+
nil: Notificarles
|
|
539
|
+
detailed:
|
|
540
|
+
create:
|
|
541
|
+
activity:
|
|
542
|
+
positive: Los contactos en %{relation} PODRÁN publicar actividades en tu muro
|
|
543
|
+
negative: Los contactos en %{relation} NO PODRÁN publicar actividades en tu muro
|
|
544
|
+
follow:
|
|
545
|
+
nil:
|
|
546
|
+
positive: Las actividades de los contactos en %{relation} APARECERÁN
|
|
547
|
+
en tu página de inicio
|
|
548
|
+
negative: Las actividades de los contactos en %{relation} NO APARECERÁN
|
|
549
|
+
en tu página de inicio
|
|
550
|
+
read:
|
|
551
|
+
activity:
|
|
552
|
+
positive: Los contactos en %{relation} PODRÁN leer las publicaciones que aparezcan en tu muro,
|
|
553
|
+
salvo las que compartáis solo con otros roles
|
|
554
|
+
negative: Los contactos en %{relation} NO PODRÁN leer las publicaciones que aparezcan en tu
|
|
555
|
+
muro, salvo las que marques como públicas
|
|
556
|
+
represent:
|
|
557
|
+
nil:
|
|
558
|
+
positive: Los contactos en %{relation} PODRÁN cambiar sesión para actuar en tu nombre
|
|
559
|
+
negative: Los contactos en %{relation} NO PODRÁN cambiar sesión para actuar en tu nombre
|
|
529
560
|
of_relation:
|
|
530
561
|
choose: Permisos para <strong>%{name}</strong>
|
|
531
562
|
postit: Gestiona los permisos de tus contactos y crea nuevos roles
|
|
@@ -13,9 +13,8 @@ SocialStream.setup do |config|
|
|
|
13
13
|
|
|
14
14
|
# Type of activities managed by actors
|
|
15
15
|
# Remember you must add an "activity_object_id" foreign key column to your migration!
|
|
16
|
-
# Be sure to add the other modules of Social Stream you might be using (e.g. :document, :event, :link ).
|
|
17
16
|
#
|
|
18
|
-
# config.objects
|
|
17
|
+
# config.objects += [ :foo, :bar ]
|
|
19
18
|
|
|
20
19
|
# Form for activity objects to be loaded
|
|
21
20
|
# You can write your own activity objects
|
|
@@ -50,6 +49,3 @@ SocialStream.setup do |config|
|
|
|
50
49
|
# Cleditor controls. It is used in new message editor, for example
|
|
51
50
|
# config.cleditor_controls = "bold italic underline strikethrough subscript superscript | size style | bullets | image link unlink"
|
|
52
51
|
end
|
|
53
|
-
|
|
54
|
-
# You can customize toolbar, sidebar and location bar from here
|
|
55
|
-
# See https://github.com/ging/social_stream/wiki/How-to-customize-the-toolbar,-sidebar-and-location
|
|
@@ -57,15 +57,17 @@ module SocialStream
|
|
|
57
57
|
|
|
58
58
|
private
|
|
59
59
|
|
|
60
|
+
# Memoize pattern to retrieve objects collection
|
|
60
61
|
def collection
|
|
61
62
|
collection_variable_get ||
|
|
62
63
|
collection_variable_set(build_collection)
|
|
63
64
|
end
|
|
64
65
|
|
|
66
|
+
# Uses the {ActivityObject#collection} method to retrieve the objects collection
|
|
65
67
|
def build_collection
|
|
66
|
-
self.class.model_class.
|
|
67
|
-
collection(profile_subject, current_subject).
|
|
68
|
-
page(params[:page])
|
|
68
|
+
self.class.model_class. # @posts = Post.
|
|
69
|
+
collection(profile_subject, current_subject). # collection(profile_subject, current_subject).
|
|
70
|
+
page(params[:page]) # page(params[:page])
|
|
69
71
|
end
|
|
70
72
|
end
|
|
71
73
|
|
data/lib/tasks/db/populate.rake
CHANGED
data/social_stream-base.gemspec
CHANGED
|
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
|
|
|
31
31
|
# Slug generation
|
|
32
32
|
s.add_runtime_dependency('stringex', '~> 1.5.1')
|
|
33
33
|
# Avatar attachments
|
|
34
|
-
s.add_runtime_dependency('avatars_for_rails', '~> 1.0.
|
|
34
|
+
s.add_runtime_dependency('avatars_for_rails', '~> 1.0.7')
|
|
35
35
|
# jQuery
|
|
36
36
|
s.add_runtime_dependency('jquery-rails', '>= 1.0.9')
|
|
37
37
|
# Select2 javascript library
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: social_stream-base
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.0.0
|
|
4
|
+
version: 2.0.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- GING - DIT - UPM
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2013-
|
|
11
|
+
date: 2013-05-17 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: deep_merge
|
|
@@ -128,14 +128,14 @@ dependencies:
|
|
|
128
128
|
requirements:
|
|
129
129
|
- - ~>
|
|
130
130
|
- !ruby/object:Gem::Version
|
|
131
|
-
version: 1.0.
|
|
131
|
+
version: 1.0.7
|
|
132
132
|
type: :runtime
|
|
133
133
|
prerelease: false
|
|
134
134
|
version_requirements: !ruby/object:Gem::Requirement
|
|
135
135
|
requirements:
|
|
136
136
|
- - ~>
|
|
137
137
|
- !ruby/object:Gem::Version
|
|
138
|
-
version: 1.0.
|
|
138
|
+
version: 1.0.7
|
|
139
139
|
- !ruby/object:Gem::Dependency
|
|
140
140
|
name: jquery-rails
|
|
141
141
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -1236,9 +1236,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
1236
1236
|
version: '0'
|
|
1237
1237
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1238
1238
|
requirements:
|
|
1239
|
-
- - '
|
|
1239
|
+
- - '>='
|
|
1240
1240
|
- !ruby/object:Gem::Version
|
|
1241
|
-
version:
|
|
1241
|
+
version: '0'
|
|
1242
1242
|
requirements: []
|
|
1243
1243
|
rubyforge_project:
|
|
1244
1244
|
rubygems_version: 2.0.0
|