social_stream 0.10.4 → 0.11.0
Sign up to get free protection for your applications and to get access to all the features.
- data/base/app/assets/javascripts/activities.js.erb +0 -2
- data/base/app/assets/javascripts/search.js.erb +0 -4
- data/base/app/assets/stylesheets/_colors.scss +22 -0
- data/base/app/assets/stylesheets/{activities.css → activities.css.scss} +20 -23
- data/base/app/assets/stylesheets/{base.css → base.css.scss} +43 -35
- data/base/app/assets/stylesheets/{contacts.css → contacts.css.scss} +5 -3
- data/base/app/assets/stylesheets/footer.css.scss +22 -0
- data/base/app/assets/stylesheets/{frontpage.css → frontpage.css.scss} +7 -13
- data/base/app/assets/stylesheets/{header.css → header.css.scss} +23 -20
- data/base/app/assets/stylesheets/search.css +15 -17
- data/base/app/assets/stylesheets/toolbar.css +7 -0
- data/base/app/controllers/invitations_controller.rb +2 -0
- data/base/app/controllers/search_controller.rb +27 -45
- data/base/app/helpers/contacts_helper.rb +1 -5
- data/base/app/helpers/search_helper.rb +4 -4
- data/base/app/models/actor.rb +1 -3
- data/base/app/views/activity_objects/_activity_object.html.erb +1 -1
- data/base/app/views/contacts/_link.html.erb +9 -0
- data/base/app/views/frontpage/_caracteristics.html.erb +23 -0
- data/base/app/views/frontpage/index.html.erb +3 -25
- data/base/app/views/groups/_index.html.erb +1 -1
- data/base/app/views/invitation_mailer/send_invitation.html.erb +3 -3
- data/base/app/views/invitation_mailer/send_invitation.text.erb +3 -2
- data/base/app/views/invitations/_new.html.erb +2 -2
- data/base/app/views/layouts/_header_dropdown_menu.html.erb +1 -1
- data/base/app/views/layouts/_header_dropdown_menu_sessions.html.erb +1 -1
- data/base/app/views/posts/_new_activity.html.erb +1 -1
- data/base/app/views/posts/_new_activity_fields.erb +6 -0
- data/base/app/views/search/_extended_search.html.erb +14 -0
- data/base/app/views/search/_form.html.erb +25 -13
- data/base/app/views/search/_header_search.html.erb +7 -13
- data/base/app/views/search/_index.html.erb +1 -6
- data/base/app/views/search/_index_frontpage.html.erb +2 -18
- data/base/app/views/search/index.js.erb +1 -1
- data/base/app/views/subjects/_subject_with_details.html.erb +1 -1
- data/base/app/views/toolbar/_home.html.erb +1 -1
- data/base/app/views/toolbar/_messages.html.erb +1 -1
- data/base/app/views/toolbar/_subject.html.erb +10 -0
- data/base/app/views/users/_index.html.erb +1 -1
- data/base/config/locales/en.yml +13 -22
- data/base/config/locales/es.yml +356 -0
- data/base/lib/generators/social_stream/base/templates/initializer.rb +6 -0
- data/base/lib/social_stream/base/version.rb +1 -1
- data/base/lib/social_stream/models/object.rb +7 -1
- data/base/lib/social_stream-base.rb +8 -0
- data/base/social_stream-base.gemspec +2 -0
- data/base/spec/controllers/invitations_controller_spec.rb +34 -0
- data/base/spec/dummy/config/initializers/social_stream.rb +6 -0
- data/base/spec/support/thinking-sphinx.rb +10 -0
- data/documents/app/models/audio.rb +10 -1
- data/documents/app/models/document.rb +11 -0
- data/documents/app/models/picture.rb +10 -1
- data/documents/app/models/video.rb +9 -0
- data/documents/app/views/audios/_audio_with_details.html.erb +3 -0
- data/documents/app/views/documents/_document_with_details.html.erb +13 -0
- data/documents/app/views/pictures/_picture_with_details.html.erb +2 -0
- data/documents/app/views/videos/_video_with_details.html.erb +2 -0
- data/documents/config/locales/en.yml +0 -7
- data/documents/config/locales/es.yml +38 -0
- data/documents/db/migrate/20111005112707_add_title_and_description_to_document.rb +11 -0
- data/documents/lib/social_stream/documents/version.rb +1 -1
- data/documents/social_stream-documents.gemspec +1 -1
- data/events/app/views/events/_new_activity_fields.html.erb +5 -0
- data/events/lib/social_stream/events/version.rb +1 -1
- data/events/social_stream-events.gemspec +1 -1
- data/lib/social_stream/version.rb +1 -1
- data/social_stream.gemspec +3 -3
- data/spec/support/components.rb +1 -1
- metadata +35 -24
- data/base/app/assets/stylesheets/footer.css +0 -26
- data/base/app/views/search/_focus_search.html.erb +0 -17
- data/base/app/views/search/_global_search.html.erb +0 -19
- data/events/app/views/events/_jquery.html.erb +0 -125
@@ -1,26 +0,0 @@
|
|
1
|
-
#sponsor-wrapper{ text-align:right; vertical-align:middle;}
|
2
|
-
#sponsor{width:960px;margin:0 auto;color:#666; }
|
3
|
-
|
4
|
-
#footer{width: 960px;margin-left: auto;margin-right: auto;padding: 0;position: relative; text-align:center;
|
5
|
-
clear:left;font-size:0.9166em;line-height:1.6363;color:#666;padding:0.75em 0;}
|
6
|
-
#footer ul, #sponsor ul{list-style-type:none;margin:0 0.5em; }
|
7
|
-
#footer ul li,#sponsor ul li{display:inline-block;margin-right:0.25em;position:relative;}
|
8
|
-
#footer ul li#trade_mark,#sponsor ul li#trademark{font-weight:bold;color:#111;}
|
9
|
-
#footer ul li#trade_mark_logo{font-weight:normal;}
|
10
|
-
#footer a, #sponsor a{color:#666;}
|
11
|
-
#footer a:hover, #sponsor a:hover{color:#444; text-decoration: underline;}
|
12
|
-
#footer .icon,#global .icon{margin-bottom:-4px;}
|
13
|
-
#footer-wrapper{background-color:#e1eef5;}
|
14
|
-
#footer_right{font-weight:normal;}
|
15
|
-
#footer_right{ font-size: 10px; line-height: 1.1em;}
|
16
|
-
|
17
|
-
|
18
|
-
#footerFront { width: 100%; padding: 0; background: #E1EEF5;}
|
19
|
-
.banner_footer { width: 960px; margin-left: auto; margin-right: auto; padding: 0; position: relative;}
|
20
|
-
.banner_footer #footer_content { text-align: center; color: #ccc;}
|
21
|
-
.banner_footer { width: 960px; color: #0656a4; margin-left: auto; margin-right: auto; padding-top: 2px;
|
22
|
-
position: relative;}
|
23
|
-
.banner_footer .a_border { border-right: thin solid; color: #0656a4; padding: 0px 7px; text-decoration: underline;}
|
24
|
-
.banner_footer a { color: #0656a4; padding: 0px 7px; text-decoration: underline;}
|
25
|
-
|
26
|
-
.rowfooter{float:right;}
|
@@ -1,17 +0,0 @@
|
|
1
|
-
<div class="title">
|
2
|
-
<%= @search_class_sym.to_s.capitalize.pluralize %>
|
3
|
-
</div>
|
4
|
-
<br class="clearfloat" />
|
5
|
-
<% if @search_result.empty? %>
|
6
|
-
<div class="subject_with_details">
|
7
|
-
<%= I18n.t('search.no_subject_found', :subject => @search_class_sym.to_s) %>
|
8
|
-
</div>
|
9
|
-
<% else %>
|
10
|
-
<% total = 0 %>
|
11
|
-
<% @search_result.each do |subject|%>
|
12
|
-
<div class="subject_search_results block left">
|
13
|
-
<%= subject_with_details subject %>
|
14
|
-
</div>
|
15
|
-
<% end %>
|
16
|
-
<%= paginate @search_result %>
|
17
|
-
<% end %>
|
@@ -1,19 +0,0 @@
|
|
1
|
-
<% SocialStream.subjects.each do |subject_type| %>
|
2
|
-
<div class="subject_search_results block <%= cycle "left", "right" %>">
|
3
|
-
<div class="title">
|
4
|
-
<%= subject_type.to_s.capitalize.pluralize %>
|
5
|
-
</div>
|
6
|
-
<% if @search_result[subject_type].empty? %>
|
7
|
-
<div class="subject_with_details">
|
8
|
-
<%= I18n.t('search.no_subject_found', :subject => subject_type.to_s) %>
|
9
|
-
</div>
|
10
|
-
<% else %>
|
11
|
-
<% @search_result[subject_type].each do |subject|%>
|
12
|
-
<%= subject_with_details subject %>
|
13
|
-
<% end %>
|
14
|
-
<div class="subject_with_details">
|
15
|
-
<%= focus_search_link(I18n.t('search.all_subject_results', :subject => subject_type.to_s.pluralize, :count => @search_result[(subject_type.to_s+"_total").to_sym].to_s),subject_type.to_s,params[:search_query]) %>
|
16
|
-
</div>
|
17
|
-
<% end %>
|
18
|
-
</div>
|
19
|
-
<% end %>
|
@@ -1,125 +0,0 @@
|
|
1
|
-
//javascript for main activities input
|
2
|
-
title = "<%= t('activity.input') %>";
|
3
|
-
$("#input_activities").click(function(){
|
4
|
-
if(this.value == title){
|
5
|
-
this.value="";
|
6
|
-
$("#masterSubmitButton").show();
|
7
|
-
}
|
8
|
-
});
|
9
|
-
|
10
|
-
//initial state
|
11
|
-
$('#wrapper_activities_header form').hide();
|
12
|
-
$('#new_post').show();
|
13
|
-
|
14
|
-
//clicks on headers
|
15
|
-
$('.activities_title_header').live('click',function(){
|
16
|
-
$('.activities_title_header').removeClass('selected');
|
17
|
-
$(this).addClass('selected');
|
18
|
-
$('#wrapper_activities_header form').hide();
|
19
|
-
$('#new_'+this.id.split("_")[1]).show();
|
20
|
-
});
|
21
|
-
|
22
|
-
//submit
|
23
|
-
$('#masterSubmitButton').live('click',function(){
|
24
|
-
$('.liveAdded').remove();
|
25
|
-
$('#wrapper_activities_header form:visible').append(
|
26
|
-
$('<input/>')
|
27
|
-
.addClass('liveAdded')
|
28
|
-
.attr('type', 'hidden')
|
29
|
-
.attr('name', $('#wrapper_activities_header form:visible')
|
30
|
-
.attr('id').split('_')[1]+'[_relation_ids][]')
|
31
|
-
.val($('#security option:selected').attr('value')));
|
32
|
-
$('#wrapper_activities_header form:visible').submit();
|
33
|
-
});
|
34
|
-
|
35
|
-
|
36
|
-
//javascript for comments
|
37
|
-
$(".input_new_comments").val("<%= t('comment.input') %>");
|
38
|
-
$(".activities_comment_btn").hide();
|
39
|
-
|
40
|
-
//usa livequery para usar el javascript luego de una accion con AJAX
|
41
|
-
$(".input_new_comments").livequery("click",function(){
|
42
|
-
if(this.value == "<%= t('comment.input') %>"){
|
43
|
-
$(this).val("");
|
44
|
-
}
|
45
|
-
$(".activities_comment_btn").hide();
|
46
|
-
$(this).parent(".new_comment").children(".activities_comment_btn").show();
|
47
|
-
});
|
48
|
-
$(".input_new_comments").livequery("blur",function(){
|
49
|
-
if(this.value == ""){
|
50
|
-
$(".activities_comment_btn").hide();
|
51
|
-
$(this).val("<%= t('comment.input') %>");
|
52
|
-
}
|
53
|
-
});
|
54
|
-
|
55
|
-
$(".input_new_comments").click(function(){
|
56
|
-
if(this.value == "<%= t('comment.input') %>"){
|
57
|
-
$(this).val("");
|
58
|
-
}
|
59
|
-
$(".activities_comment_btn").hide();
|
60
|
-
$(this).parent(".new_comment").children(".activities_comment_btn").show();
|
61
|
-
});
|
62
|
-
|
63
|
-
//javascript for tocomment option
|
64
|
-
$(".to_comment").livequery("click", function(){
|
65
|
-
$(this).parents(".activity_content").find(".input_new_comments").click();
|
66
|
-
$(this).parents(".activity_content").find(".input_new_comments").focus();
|
67
|
-
return false;
|
68
|
-
});
|
69
|
-
$(".to_comment").livequery("blur", function(){
|
70
|
-
$(this).parents(".activity_content").find(".input_new_comments").blur();
|
71
|
-
return false;
|
72
|
-
});
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
//move he last list item before the first item. The purpose of this is if the user clicks to slide left he will be able to see the last item.
|
83
|
-
$('#carousel_ul li:first').before($('#carousel_ul li:last'));
|
84
|
-
|
85
|
-
|
86
|
-
//when user clicks the image for sliding right
|
87
|
-
$('#right_scroll img').livequery("click",function(){
|
88
|
-
|
89
|
-
//get the width of the items ( i like making the jquery part dynamic, so if you change the width in the css you won't have o change it here too ) '
|
90
|
-
var item_width = $('#carousel_ul li').outerWidth() + 10;
|
91
|
-
|
92
|
-
//calculae the new left indent of the unordered list
|
93
|
-
var left_indent = parseInt($('#carousel_ul').css('left')) - item_width;
|
94
|
-
|
95
|
-
//make the sliding effect using jquery's anumate function '
|
96
|
-
$('#carousel_ul:not(:animated)').animate({'left' : left_indent},500,function(){
|
97
|
-
|
98
|
-
//get the first list item and put it after the last list item (that's how the infinite effects is made) '
|
99
|
-
$('#carousel_ul li:last').after($('#carousel_ul li:first'));
|
100
|
-
|
101
|
-
//and get the left indent to the default -210px
|
102
|
-
$('#carousel_ul').css({'left' : '-210px'});
|
103
|
-
});
|
104
|
-
});
|
105
|
-
|
106
|
-
//when user clicks the image for sliding left
|
107
|
-
$('#left_scroll img').livequery("click",function(){
|
108
|
-
|
109
|
-
var item_width = $('#carousel_ul li').outerWidth() + 10;
|
110
|
-
|
111
|
-
/* same as for sliding right except that it's current left indent + the item width (for the sliding right it's - item_width) */
|
112
|
-
var left_indent = parseInt($('#carousel_ul').css('left')) + item_width;
|
113
|
-
|
114
|
-
$('#carousel_ul:not(:animated)').animate({'left' : left_indent},500,function(){
|
115
|
-
|
116
|
-
/* when sliding to left we are moving the last item before the first list item */
|
117
|
-
$('#carousel_ul li:first').before($('#carousel_ul li:last'));
|
118
|
-
|
119
|
-
/* and again, when we make that change we are setting the left indent of our unordered list to the default -210px */
|
120
|
-
$('#carousel_ul').css({'left' : '-210px'});
|
121
|
-
});
|
122
|
-
|
123
|
-
|
124
|
-
});
|
125
|
-
|