social_stream-base 0.9.11 → 0.9.12
Sign up to get free protection for your applications and to get access to all the features.
- data/app/assets/images/btn/arrow_session_change.png +0 -0
- data/app/assets/images/btn/header_notifications.png +0 -0
- data/app/assets/stylesheets/frontpage.css +1 -1
- data/app/assets/stylesheets/header.css +19 -40
- data/app/assets/stylesheets/search.css +6 -2
- data/app/views/layouts/_header.erb +26 -23
- data/app/views/layouts/_header_dropdown_menu.html.erb +22 -0
- data/app/views/layouts/_header_dropdown_menu_sessions.html.erb +13 -0
- data/app/views/layouts/_representation.html.erb +0 -3
- data/app/views/layouts/_settings.html.erb +1 -1
- data/config/locales/en.yml +1 -1
- data/lib/social_stream/base/version.rb +1 -1
- metadata +197 -341
Binary file
|
Binary file
|
@@ -8,7 +8,7 @@
|
|
8
8
|
.div_busqueda #find_button{ width:15px; border:0px; height:15px;}
|
9
9
|
.div_busqueda .a_border{ border-right:thin solid; color:#0656a4; padding:0px 7px; text-decoration:underline;}
|
10
10
|
.div_busqueda a{ color:#0656a4; padding:0px 7px; text-decoration:underline;}
|
11
|
-
#espacio_busqueda { width:
|
11
|
+
#espacio_busqueda { width:652px; margin-left:20px; height:45px; margin-bottom:0px; float:left;
|
12
12
|
display:inline;}
|
13
13
|
#form_busqueda{ padding-top:3px;}
|
14
14
|
span.find{ padding-right:5px;}
|
@@ -20,9 +20,8 @@
|
|
20
20
|
.div_login .subtexto{ padding-top: 8px; height:12px; font-size: 11px; }
|
21
21
|
.div_login .a_border{ border-right:thin solid; padding-right:7px; text-decoration:underline; }
|
22
22
|
#new_representation { display: inline-block;}
|
23
|
-
#header_notifications{
|
24
|
-
#
|
25
|
-
border-radius: 6px; padding: 4px 9px 4px 9px;}
|
23
|
+
#header_notifications a{color: white; background: transparent url('btn/header_notifications.png') no-repeat center center;padding: 4px 8px 6px 7px;}
|
24
|
+
#header_inbox_count a{ color: white; background-color: #879eb5; padding: 2px 5px 2px 5px;}
|
26
25
|
#representation { display: inline; padding-left:3px; padding-right:3px;}
|
27
26
|
.txt_config {color: #fff; vertical-align: top; display: inline; padding-top: 2px; border-right: thin solid;
|
28
27
|
padding-right: 3px;}
|
@@ -30,46 +29,26 @@
|
|
30
29
|
|
31
30
|
|
32
31
|
/******** MENU HEADER *******/
|
33
|
-
#menu_home{
|
32
|
+
#menu_home, .menu_home {vertical-align: top; }
|
34
33
|
#menu_home a {color:white;}
|
35
|
-
#menu_home
|
36
|
-
#menu_home ul{
|
37
|
-
#menu_home ul li{
|
38
|
-
|
39
|
-
li.btn_menu_home{background: transparent url("btn/btn_home.png") no-repeat left center;}
|
40
|
-
li.btn_menu_profile{background: transparent url("btn/btn_profile.png") no-repeat left center;}
|
41
|
-
li.btn_menu_browse{background: transparent url("btn/btn_browse.png") no-repeat left center;}
|
42
|
-
#btn_menu_settings{background: transparent url("btn/btn_config.png") no-repeat left center;}
|
43
|
-
#btn_menu_account{background: transparent url("btn/btn_account.png") no-repeat left center;}
|
44
|
-
#btn_menu_account_logout{background: transparent url("btn/btn_exit.png") no-repeat left center;}
|
45
|
-
|
46
|
-
#menu_account{ vertical-align: top; height:23px; }
|
47
|
-
#menu_account span { float:right; padding-right: 5px; vertical-align: top; padding-top: 5px;}
|
48
|
-
#menu_account ul{ list-style: none; margin: 0px; float:left;}
|
49
|
-
#menu_account ul li{ line-height:20px; padding:5px 0px 5px 20px; vertical-align:top;}
|
50
|
-
|
51
|
-
#menu_pipe{ vertical-align: top; height:23px; }
|
52
|
-
#menu_pipe span { float:right; padding-right: 5px; vertical-align: top; padding-top: 5px;}
|
53
|
-
#menu_pipe ul{ list-style: none; margin: 0px; float:left;}
|
54
|
-
#menu_pipe ul li{ line-height:20px; padding:5px 0px 5px 0px; vertical-align:top;}
|
55
|
-
|
56
|
-
|
57
|
-
#account, #representation_li,#current_user_info, #representations_menu, #account_menu, #settings_menu {display:inline-block;vertical-align: top; height:22px; color:#FFF;}
|
58
|
-
#representation_li{margin-left:10px;}
|
59
|
-
#representation_text{display:inline;margin-left:2px;color:#FFF;}
|
60
|
-
#current_user_info a{color:white;}
|
61
|
-
li.btn_menu_representation{}
|
62
|
-
#menu_home ul li.pipe,#menu_account ul li.pipe{padding:0px 3px 0px 3px; margin:0px;}
|
63
|
-
.menu_white{display:inline-block; color:#fff;}
|
64
|
-
.white_link{padding-top:3px; vertical-align:top; display:inline-block;}
|
65
|
-
.black{color:#000; font-weight:bold;}
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
34
|
+
#menu_home a:hover {text-decoration: none;}
|
35
|
+
#menu_home ul {list-style: none; margin: 0px; float:left;}
|
36
|
+
#menu_home ul li {line-height:20px; vertical-align:top;}
|
70
37
|
|
38
|
+
#header_dropdown_menu,.header_dropdown_li {width: 180px;display:inline-block;vertical-align: top; height:22px; color:#FFF;}
|
71
39
|
|
40
|
+
#header_dropdown_menu ul li {width: 180px;line-height: 15px;}
|
41
|
+
#header_dropdown_menu ul li a{padding: .40em 1em .70em 2.5em;}
|
42
|
+
#header_dropdown_menu ul li a:hover{color:#1F4A75;}
|
43
|
+
#header_dropdown_menu ul li ul li a{padding: .40em 1em .70em 1em;}
|
44
|
+
#header_dropdown_menu ul li ul li ul li a{padding: .40em 1em .70em 2.5em;}
|
45
|
+
#header_dropdown_menu ul li ul li ul{position: absolute; left: -180px;}
|
46
|
+
#header_dropdown_menu a.session_change{background: transparent url('btn/arrow_session_change.png') no-repeat 3px 6px;}
|
72
47
|
|
48
|
+
#menu_home ul li.pipe,#menu_account ul li.pipe{padding:0; margin:0;font-size: 20px;font-weight: bold;}
|
49
|
+
.menu_white{display:inline-block; color:#fff;}
|
50
|
+
.white_link{padding-top:3px; vertical-align:top; display:inline-block;}
|
51
|
+
.black{color:#000; font-weight:bold;}
|
73
52
|
|
74
53
|
|
75
54
|
/*** ESSENTIAL STYLES ***/
|
@@ -131,7 +110,7 @@ ul.sf-menu li li li.sfHover ul {
|
|
131
110
|
/*margin-bottom: 1em; */
|
132
111
|
}
|
133
112
|
.sf-menu a {
|
134
|
-
padding: .40em 1em .70em
|
113
|
+
padding: .40em 1em .70em 1em;
|
135
114
|
text-decoration:none;
|
136
115
|
}
|
137
116
|
.sf-menu a, .sf-menu a:visited { /* visited pseudo selector so IE6 applies text colour*/
|
@@ -2,7 +2,7 @@
|
|
2
2
|
/********************************* Header **************/
|
3
3
|
#header_search {
|
4
4
|
float: left;
|
5
|
-
padding: 1px
|
5
|
+
padding: 1px 0 0 10px;
|
6
6
|
z-index: 2001;
|
7
7
|
}
|
8
8
|
#header_search_input, #global_search_input {
|
@@ -14,7 +14,11 @@
|
|
14
14
|
#header_search_input {
|
15
15
|
border: solid 1px #dedede;
|
16
16
|
height: 16px;
|
17
|
-
width:
|
17
|
+
width: 200px;
|
18
|
+
}
|
19
|
+
.banner_busqueda #header_search_input {
|
20
|
+
border: solid 1px #aaa;
|
21
|
+
height: 20px;
|
18
22
|
}
|
19
23
|
#global_search_input {
|
20
24
|
border: solid 1px #aeaeae;
|
@@ -2,39 +2,42 @@
|
|
2
2
|
<div class="banner_top banner_top_height">
|
3
3
|
<div id="header_left">
|
4
4
|
<div id="logo_txt">
|
5
|
-
<%= link_to(image_tag('header-logo.png', :alt => t('site.name')), root_path) %>
|
5
|
+
<%= link_to(image_tag('header-logo.png', :alt => t('site.name')), root_path) %>
|
6
6
|
</div>
|
7
|
-
<% if user_signed_in? %>
|
8
|
-
<div class="menu_list menu_white" id="menu_home">
|
9
|
-
<ul>
|
10
|
-
<li class="btn_menu_profile"><%= link_to(t('profile.one'), current_subject)%></li>
|
11
|
-
<li id="header_notifications">
|
12
|
-
<%= link_to( current_subject.mailbox.notifications.not_trashed.unread.count.to_s, notifications_path) %>
|
13
|
-
</li>
|
14
|
-
</ul>
|
15
|
-
</div>
|
16
|
-
<% end %>
|
17
7
|
</div>
|
18
8
|
<% if user_signed_in? %>
|
19
9
|
<%= render :partial => 'layouts/search' %>
|
20
10
|
<%end%>
|
21
11
|
<div id="header_right">
|
22
12
|
<% if user_signed_in? %>
|
23
|
-
|
24
|
-
<div class="menu_list menu_white" id="menu_pipe" >
|
25
|
-
<ul>
|
26
|
-
<li class="pipe">|</li>
|
27
|
-
</ul>
|
28
|
-
</div>
|
29
|
-
<%= render :partial => 'layouts/settings' %>
|
30
|
-
|
31
|
-
<div class="menu_list menu_white" id="menu_pipe" >
|
13
|
+
<div class="menu_list menu_white" id="menu_home">
|
32
14
|
<ul>
|
33
|
-
<li
|
15
|
+
<li>
|
16
|
+
<%= link_to(t('home'), root_path)%>
|
17
|
+
</li>
|
18
|
+
<li class="pipe">·</li>
|
19
|
+
<li>
|
20
|
+
<%= link_to(t('profile.one'), current_subject)%>
|
21
|
+
</li>
|
22
|
+
<li class="pipe">·</li>
|
23
|
+
<li>
|
24
|
+
<%= link_to(t('message.inbox'), conversations_path) %>
|
25
|
+
<span id="header_inbox_count">
|
26
|
+
<%= link_to(current_subject.mailbox.inbox(:unread => true).count.to_s, conversations_path) %>
|
27
|
+
</span>
|
28
|
+
</li>
|
29
|
+
<li class="pipe">·</li>
|
30
|
+
<li>
|
31
|
+
<span id="header_notifications">
|
32
|
+
<%= link_to( current_subject.mailbox.notifications.not_trashed.unread.count.to_s, notifications_path) %>
|
33
|
+
</span>
|
34
|
+
</li>
|
35
|
+
<li class="pipe">·</li>
|
36
|
+
<li>
|
37
|
+
<%= render :partial => 'layouts/header_dropdown_menu' %>
|
38
|
+
</li>
|
34
39
|
</ul>
|
35
40
|
</div>
|
36
|
-
<%= render :partial => 'layouts/account' %>
|
37
|
-
|
38
41
|
<% end %>
|
39
42
|
</div>
|
40
43
|
</div>
|
@@ -0,0 +1,22 @@
|
|
1
|
+
<div id="header_dropdown_menu">
|
2
|
+
<ul class="sf-menu" >
|
3
|
+
<li class="header_dropdown_li">
|
4
|
+
<a href="#" class="sf-with-ul" id="current_subject_avatar_img" style="background: transparent url('<%= image_path current_subject.logo.url(:representation)%>') no-repeat left top;"><%= truncate_name current_subject.name %><span class="sf-sub-indicator"> »</span></a>
|
5
|
+
<ul>
|
6
|
+
<%= render :partial => 'layouts/header_dropdown_menu_sessions'%>
|
7
|
+
<li>
|
8
|
+
<%= link_to t('account.edit'), edit_user_registration_path %>
|
9
|
+
</li>
|
10
|
+
<li>
|
11
|
+
<%= link_to t('settings.main'), settings_path, :id => "btn_menu_settings" %>
|
12
|
+
</li>
|
13
|
+
<li>
|
14
|
+
<%= link_to t('account.privacy'), relation_customs_path %>
|
15
|
+
</li>
|
16
|
+
<li>
|
17
|
+
<%= link_to t('sign_out'), destroy_user_session_path, :method => :delete %>
|
18
|
+
</li>
|
19
|
+
</ul>
|
20
|
+
</li>
|
21
|
+
</ul>
|
22
|
+
</div>
|
@@ -0,0 +1,13 @@
|
|
1
|
+
<% representations = current_user.represented.unshift(current_user) - [current_subject] %>
|
2
|
+
<% unless representations.empty? %>
|
3
|
+
<li>
|
4
|
+
<%= link_to "Switch session", "javascript:;", :class=>"session_change" %>
|
5
|
+
<ul>
|
6
|
+
<% representations.each do |representation| %>
|
7
|
+
<li>
|
8
|
+
<%= link_to truncate_name(representation.name), { :s => representation.slug }, { :style => "background: transparent url('#{ image_path representation.logo.url(:representation)}') no-repeat left center;margin-left:2px;" } %>
|
9
|
+
</li>
|
10
|
+
<% end %>
|
11
|
+
</ul>
|
12
|
+
</li>
|
13
|
+
<% end %>
|
@@ -11,9 +11,6 @@
|
|
11
11
|
<% representations = current_user.represented.unshift(current_user) - [current_subject] %>
|
12
12
|
|
13
13
|
<% if !representations.empty? %>
|
14
|
-
|
15
|
-
<span id="representation_text"><%= t('representation.action') %></span>
|
16
|
-
|
17
14
|
<div id="representations_menu">
|
18
15
|
<ul class="sf-menu" >
|
19
16
|
<li id="representation_li">
|
data/config/locales/en.yml
CHANGED
metadata
CHANGED
@@ -1,464 +1,326 @@
|
|
1
|
-
--- !ruby/object:Gem::Specification
|
1
|
+
--- !ruby/object:Gem::Specification
|
2
2
|
name: social_stream-base
|
3
|
-
version: !ruby/object:Gem::Version
|
4
|
-
|
3
|
+
version: !ruby/object:Gem::Version
|
4
|
+
version: 0.9.12
|
5
5
|
prerelease:
|
6
|
-
segments:
|
7
|
-
- 0
|
8
|
-
- 9
|
9
|
-
- 11
|
10
|
-
version: 0.9.11
|
11
6
|
platform: ruby
|
12
|
-
authors:
|
7
|
+
authors:
|
13
8
|
- GING - DIT - UPM
|
14
9
|
- CISE - ESPOL
|
15
10
|
autorequire:
|
16
11
|
bindir: bin
|
17
12
|
cert_chain: []
|
18
|
-
|
19
|
-
date: 2011-09-29 00:00:00 +02:00
|
13
|
+
date: 2011-09-29 00:00:00.000000000 +02:00
|
20
14
|
default_executable:
|
21
|
-
dependencies:
|
22
|
-
- !ruby/object:Gem::Dependency
|
15
|
+
dependencies:
|
16
|
+
- !ruby/object:Gem::Dependency
|
23
17
|
name: rails
|
24
|
-
|
25
|
-
requirement: &id001 !ruby/object:Gem::Requirement
|
18
|
+
requirement: &75516460 !ruby/object:Gem::Requirement
|
26
19
|
none: false
|
27
|
-
requirements:
|
28
|
-
- -
|
29
|
-
- !ruby/object:Gem::Version
|
30
|
-
hash: 3
|
31
|
-
segments:
|
32
|
-
- 3
|
33
|
-
- 1
|
34
|
-
- 0
|
20
|
+
requirements:
|
21
|
+
- - ! '>='
|
22
|
+
- !ruby/object:Gem::Version
|
35
23
|
version: 3.1.0
|
36
24
|
type: :runtime
|
37
|
-
version_requirements: *id001
|
38
|
-
- !ruby/object:Gem::Dependency
|
39
|
-
name: ancestry
|
40
25
|
prerelease: false
|
41
|
-
|
26
|
+
version_requirements: *75516460
|
27
|
+
- !ruby/object:Gem::Dependency
|
28
|
+
name: ancestry
|
29
|
+
requirement: &75516210 !ruby/object:Gem::Requirement
|
42
30
|
none: false
|
43
|
-
requirements:
|
31
|
+
requirements:
|
44
32
|
- - ~>
|
45
|
-
- !ruby/object:Gem::Version
|
46
|
-
hash: 25
|
47
|
-
segments:
|
48
|
-
- 1
|
49
|
-
- 2
|
50
|
-
- 3
|
33
|
+
- !ruby/object:Gem::Version
|
51
34
|
version: 1.2.3
|
52
35
|
type: :runtime
|
53
|
-
version_requirements: *id002
|
54
|
-
- !ruby/object:Gem::Dependency
|
55
|
-
name: foreigner
|
56
36
|
prerelease: false
|
57
|
-
|
37
|
+
version_requirements: *75516210
|
38
|
+
- !ruby/object:Gem::Dependency
|
39
|
+
name: foreigner
|
40
|
+
requirement: &75515980 !ruby/object:Gem::Requirement
|
58
41
|
none: false
|
59
|
-
requirements:
|
42
|
+
requirements:
|
60
43
|
- - ~>
|
61
|
-
- !ruby/object:Gem::Version
|
62
|
-
hash: 57
|
63
|
-
segments:
|
64
|
-
- 0
|
65
|
-
- 9
|
66
|
-
- 1
|
44
|
+
- !ruby/object:Gem::Version
|
67
45
|
version: 0.9.1
|
68
46
|
type: :runtime
|
69
|
-
version_requirements: *id003
|
70
|
-
- !ruby/object:Gem::Dependency
|
71
|
-
name: devise
|
72
47
|
prerelease: false
|
73
|
-
|
48
|
+
version_requirements: *75515980
|
49
|
+
- !ruby/object:Gem::Dependency
|
50
|
+
name: devise
|
51
|
+
requirement: &75515750 !ruby/object:Gem::Requirement
|
74
52
|
none: false
|
75
|
-
requirements:
|
53
|
+
requirements:
|
76
54
|
- - ~>
|
77
|
-
- !ruby/object:Gem::Version
|
78
|
-
hash: 13
|
79
|
-
segments:
|
80
|
-
- 1
|
81
|
-
- 4
|
82
|
-
- 5
|
55
|
+
- !ruby/object:Gem::Version
|
83
56
|
version: 1.4.5
|
84
57
|
type: :runtime
|
85
|
-
version_requirements: *id004
|
86
|
-
- !ruby/object:Gem::Dependency
|
87
|
-
name: inherited_resources
|
88
58
|
prerelease: false
|
89
|
-
|
59
|
+
version_requirements: *75515750
|
60
|
+
- !ruby/object:Gem::Dependency
|
61
|
+
name: inherited_resources
|
62
|
+
requirement: &75515520 !ruby/object:Gem::Requirement
|
90
63
|
none: false
|
91
|
-
requirements:
|
64
|
+
requirements:
|
92
65
|
- - ~>
|
93
|
-
- !ruby/object:Gem::Version
|
94
|
-
hash: 27
|
95
|
-
segments:
|
96
|
-
- 1
|
97
|
-
- 3
|
98
|
-
- 0
|
66
|
+
- !ruby/object:Gem::Version
|
99
67
|
version: 1.3.0
|
100
68
|
type: :runtime
|
101
|
-
version_requirements: *id005
|
102
|
-
- !ruby/object:Gem::Dependency
|
103
|
-
name: stringex
|
104
69
|
prerelease: false
|
105
|
-
|
70
|
+
version_requirements: *75515520
|
71
|
+
- !ruby/object:Gem::Dependency
|
72
|
+
name: stringex
|
73
|
+
requirement: &75515290 !ruby/object:Gem::Requirement
|
106
74
|
none: false
|
107
|
-
requirements:
|
75
|
+
requirements:
|
108
76
|
- - ~>
|
109
|
-
- !ruby/object:Gem::Version
|
110
|
-
hash: 27
|
111
|
-
segments:
|
112
|
-
- 1
|
113
|
-
- 3
|
114
|
-
- 0
|
77
|
+
- !ruby/object:Gem::Version
|
115
78
|
version: 1.3.0
|
116
79
|
type: :runtime
|
117
|
-
version_requirements: *id006
|
118
|
-
- !ruby/object:Gem::Dependency
|
119
|
-
name: avatars_for_rails
|
120
80
|
prerelease: false
|
121
|
-
|
81
|
+
version_requirements: *75515290
|
82
|
+
- !ruby/object:Gem::Dependency
|
83
|
+
name: avatars_for_rails
|
84
|
+
requirement: &75515060 !ruby/object:Gem::Requirement
|
122
85
|
none: false
|
123
|
-
requirements:
|
86
|
+
requirements:
|
124
87
|
- - ~>
|
125
|
-
- !ruby/object:Gem::Version
|
126
|
-
hash: 29
|
127
|
-
segments:
|
128
|
-
- 0
|
129
|
-
- 1
|
130
|
-
- 3
|
88
|
+
- !ruby/object:Gem::Version
|
131
89
|
version: 0.1.3
|
132
90
|
type: :runtime
|
133
|
-
version_requirements: *id007
|
134
|
-
- !ruby/object:Gem::Dependency
|
135
|
-
name: jquery-rails
|
136
91
|
prerelease: false
|
137
|
-
|
92
|
+
version_requirements: *75515060
|
93
|
+
- !ruby/object:Gem::Dependency
|
94
|
+
name: jquery-rails
|
95
|
+
requirement: &75514830 !ruby/object:Gem::Requirement
|
138
96
|
none: false
|
139
|
-
requirements:
|
97
|
+
requirements:
|
140
98
|
- - ~>
|
141
|
-
- !ruby/object:Gem::Version
|
142
|
-
hash: 5
|
143
|
-
segments:
|
144
|
-
- 1
|
145
|
-
- 0
|
146
|
-
- 9
|
99
|
+
- !ruby/object:Gem::Version
|
147
100
|
version: 1.0.9
|
148
101
|
type: :runtime
|
149
|
-
version_requirements: *id008
|
150
|
-
- !ruby/object:Gem::Dependency
|
151
|
-
name: cancan
|
152
102
|
prerelease: false
|
153
|
-
|
103
|
+
version_requirements: *75514830
|
104
|
+
- !ruby/object:Gem::Dependency
|
105
|
+
name: cancan
|
106
|
+
requirement: &75514600 !ruby/object:Gem::Requirement
|
154
107
|
none: false
|
155
|
-
requirements:
|
108
|
+
requirements:
|
156
109
|
- - ~>
|
157
|
-
- !ruby/object:Gem::Version
|
158
|
-
hash: 7
|
159
|
-
segments:
|
160
|
-
- 1
|
161
|
-
- 6
|
162
|
-
- 4
|
110
|
+
- !ruby/object:Gem::Version
|
163
111
|
version: 1.6.4
|
164
112
|
type: :runtime
|
165
|
-
version_requirements: *id009
|
166
|
-
- !ruby/object:Gem::Dependency
|
167
|
-
name: kaminari
|
168
113
|
prerelease: false
|
169
|
-
|
114
|
+
version_requirements: *75514600
|
115
|
+
- !ruby/object:Gem::Dependency
|
116
|
+
name: kaminari
|
117
|
+
requirement: &75514370 !ruby/object:Gem::Requirement
|
170
118
|
none: false
|
171
|
-
requirements:
|
119
|
+
requirements:
|
172
120
|
- - ~>
|
173
|
-
- !ruby/object:Gem::Version
|
174
|
-
hash: 39
|
175
|
-
segments:
|
176
|
-
- 0
|
177
|
-
- 12
|
178
|
-
- 4
|
121
|
+
- !ruby/object:Gem::Version
|
179
122
|
version: 0.12.4
|
180
123
|
type: :runtime
|
181
|
-
version_requirements: *id010
|
182
|
-
- !ruby/object:Gem::Dependency
|
183
|
-
name: omniauth
|
184
124
|
prerelease: false
|
185
|
-
|
125
|
+
version_requirements: *75514370
|
126
|
+
- !ruby/object:Gem::Dependency
|
127
|
+
name: omniauth
|
128
|
+
requirement: &75514140 !ruby/object:Gem::Requirement
|
186
129
|
none: false
|
187
|
-
requirements:
|
130
|
+
requirements:
|
188
131
|
- - ~>
|
189
|
-
- !ruby/object:Gem::Version
|
190
|
-
hash: 27
|
191
|
-
segments:
|
192
|
-
- 0
|
193
|
-
- 2
|
194
|
-
- 6
|
132
|
+
- !ruby/object:Gem::Version
|
195
133
|
version: 0.2.6
|
196
134
|
type: :runtime
|
197
|
-
version_requirements: *id011
|
198
|
-
- !ruby/object:Gem::Dependency
|
199
|
-
name: oauth-plugin
|
200
135
|
prerelease: false
|
201
|
-
|
136
|
+
version_requirements: *75514140
|
137
|
+
- !ruby/object:Gem::Dependency
|
138
|
+
name: oauth-plugin
|
139
|
+
requirement: &75513910 !ruby/object:Gem::Requirement
|
202
140
|
none: false
|
203
|
-
requirements:
|
141
|
+
requirements:
|
204
142
|
- - ~>
|
205
|
-
- !ruby/object:Gem::Version
|
206
|
-
hash: -223651605
|
207
|
-
segments:
|
208
|
-
- 0
|
209
|
-
- 4
|
210
|
-
- 0
|
211
|
-
- pre
|
212
|
-
- 1
|
143
|
+
- !ruby/object:Gem::Version
|
213
144
|
version: 0.4.0.pre1
|
214
145
|
type: :runtime
|
215
|
-
version_requirements: *id012
|
216
|
-
- !ruby/object:Gem::Dependency
|
217
|
-
name: mailboxer
|
218
146
|
prerelease: false
|
219
|
-
|
147
|
+
version_requirements: *75513910
|
148
|
+
- !ruby/object:Gem::Dependency
|
149
|
+
name: mailboxer
|
150
|
+
requirement: &75513690 !ruby/object:Gem::Requirement
|
220
151
|
none: false
|
221
|
-
requirements:
|
152
|
+
requirements:
|
222
153
|
- - ~>
|
223
|
-
- !ruby/object:Gem::Version
|
224
|
-
hash: 13
|
225
|
-
segments:
|
226
|
-
- 0
|
227
|
-
- 5
|
228
|
-
- 3
|
154
|
+
- !ruby/object:Gem::Version
|
229
155
|
version: 0.5.3
|
230
156
|
type: :runtime
|
231
|
-
version_requirements: *id013
|
232
|
-
- !ruby/object:Gem::Dependency
|
233
|
-
name: acts-as-taggable-on
|
234
157
|
prerelease: false
|
235
|
-
|
158
|
+
version_requirements: *75513690
|
159
|
+
- !ruby/object:Gem::Dependency
|
160
|
+
name: acts-as-taggable-on
|
161
|
+
requirement: &75513460 !ruby/object:Gem::Requirement
|
236
162
|
none: false
|
237
|
-
requirements:
|
163
|
+
requirements:
|
238
164
|
- - ~>
|
239
|
-
- !ruby/object:Gem::Version
|
240
|
-
hash: 3
|
241
|
-
segments:
|
242
|
-
- 2
|
243
|
-
- 0
|
244
|
-
- 6
|
165
|
+
- !ruby/object:Gem::Version
|
245
166
|
version: 2.0.6
|
246
167
|
type: :runtime
|
247
|
-
version_requirements: *id014
|
248
|
-
- !ruby/object:Gem::Dependency
|
249
|
-
name: formtastic
|
250
168
|
prerelease: false
|
251
|
-
|
169
|
+
version_requirements: *75513460
|
170
|
+
- !ruby/object:Gem::Dependency
|
171
|
+
name: formtastic
|
172
|
+
requirement: &75513230 !ruby/object:Gem::Requirement
|
252
173
|
none: false
|
253
|
-
requirements:
|
174
|
+
requirements:
|
254
175
|
- - ~>
|
255
|
-
- !ruby/object:Gem::Version
|
256
|
-
hash: 25
|
257
|
-
segments:
|
258
|
-
- 1
|
259
|
-
- 2
|
260
|
-
- 3
|
176
|
+
- !ruby/object:Gem::Version
|
261
177
|
version: 1.2.3
|
262
178
|
type: :runtime
|
263
|
-
version_requirements: *id015
|
264
|
-
- !ruby/object:Gem::Dependency
|
265
|
-
name: simple-navigation
|
266
179
|
prerelease: false
|
267
|
-
|
180
|
+
version_requirements: *75513230
|
181
|
+
- !ruby/object:Gem::Dependency
|
182
|
+
name: simple-navigation
|
183
|
+
requirement: &75545180 !ruby/object:Gem::Requirement
|
268
184
|
none: false
|
269
|
-
requirements:
|
270
|
-
- -
|
271
|
-
- !ruby/object:Gem::Version
|
272
|
-
|
273
|
-
segments:
|
274
|
-
- 0
|
275
|
-
version: "0"
|
185
|
+
requirements:
|
186
|
+
- - ! '>='
|
187
|
+
- !ruby/object:Gem::Version
|
188
|
+
version: '0'
|
276
189
|
type: :runtime
|
277
|
-
version_requirements: *id016
|
278
|
-
- !ruby/object:Gem::Dependency
|
279
|
-
name: resque
|
280
190
|
prerelease: false
|
281
|
-
|
191
|
+
version_requirements: *75545180
|
192
|
+
- !ruby/object:Gem::Dependency
|
193
|
+
name: resque
|
194
|
+
requirement: &75544910 !ruby/object:Gem::Requirement
|
282
195
|
none: false
|
283
|
-
requirements:
|
196
|
+
requirements:
|
284
197
|
- - ~>
|
285
|
-
- !ruby/object:Gem::Version
|
286
|
-
hash: 81
|
287
|
-
segments:
|
288
|
-
- 1
|
289
|
-
- 17
|
290
|
-
- 1
|
198
|
+
- !ruby/object:Gem::Version
|
291
199
|
version: 1.17.1
|
292
200
|
type: :runtime
|
293
|
-
version_requirements: *id017
|
294
|
-
- !ruby/object:Gem::Dependency
|
295
|
-
name: modernizr-rails
|
296
201
|
prerelease: false
|
297
|
-
|
202
|
+
version_requirements: *75544910
|
203
|
+
- !ruby/object:Gem::Dependency
|
204
|
+
name: modernizr-rails
|
205
|
+
requirement: &75544660 !ruby/object:Gem::Requirement
|
298
206
|
none: false
|
299
|
-
requirements:
|
207
|
+
requirements:
|
300
208
|
- - ~>
|
301
|
-
- !ruby/object:Gem::Version
|
302
|
-
hash: 3
|
303
|
-
segments:
|
304
|
-
- 2
|
305
|
-
- 0
|
306
|
-
- 6
|
209
|
+
- !ruby/object:Gem::Version
|
307
210
|
version: 2.0.6
|
308
211
|
type: :runtime
|
309
|
-
version_requirements: *id018
|
310
|
-
- !ruby/object:Gem::Dependency
|
311
|
-
name: thinking-sphinx
|
312
212
|
prerelease: false
|
313
|
-
|
213
|
+
version_requirements: *75544660
|
214
|
+
- !ruby/object:Gem::Dependency
|
215
|
+
name: thinking-sphinx
|
216
|
+
requirement: &75544430 !ruby/object:Gem::Requirement
|
314
217
|
none: false
|
315
|
-
requirements:
|
218
|
+
requirements:
|
316
219
|
- - ~>
|
317
|
-
- !ruby/object:Gem::Version
|
318
|
-
hash: 1
|
319
|
-
segments:
|
320
|
-
- 2
|
321
|
-
- 0
|
322
|
-
- 7
|
220
|
+
- !ruby/object:Gem::Version
|
323
221
|
version: 2.0.7
|
324
222
|
type: :runtime
|
325
|
-
version_requirements: *id019
|
326
|
-
- !ruby/object:Gem::Dependency
|
327
|
-
name: capybara
|
328
223
|
prerelease: false
|
329
|
-
|
224
|
+
version_requirements: *75544430
|
225
|
+
- !ruby/object:Gem::Dependency
|
226
|
+
name: capybara
|
227
|
+
requirement: &75544200 !ruby/object:Gem::Requirement
|
330
228
|
none: false
|
331
|
-
requirements:
|
229
|
+
requirements:
|
332
230
|
- - ~>
|
333
|
-
- !ruby/object:Gem::Version
|
334
|
-
hash: 1
|
335
|
-
segments:
|
336
|
-
- 0
|
337
|
-
- 3
|
338
|
-
- 9
|
231
|
+
- !ruby/object:Gem::Version
|
339
232
|
version: 0.3.9
|
340
233
|
type: :development
|
341
|
-
version_requirements: *id020
|
342
|
-
- !ruby/object:Gem::Dependency
|
343
|
-
name: sqlite3-ruby
|
344
234
|
prerelease: false
|
345
|
-
|
235
|
+
version_requirements: *75544200
|
236
|
+
- !ruby/object:Gem::Dependency
|
237
|
+
name: sqlite3-ruby
|
238
|
+
requirement: &75544010 !ruby/object:Gem::Requirement
|
346
239
|
none: false
|
347
|
-
requirements:
|
348
|
-
- -
|
349
|
-
- !ruby/object:Gem::Version
|
350
|
-
|
351
|
-
segments:
|
352
|
-
- 0
|
353
|
-
version: "0"
|
240
|
+
requirements:
|
241
|
+
- - ! '>='
|
242
|
+
- !ruby/object:Gem::Version
|
243
|
+
version: '0'
|
354
244
|
type: :development
|
355
|
-
version_requirements: *id021
|
356
|
-
- !ruby/object:Gem::Dependency
|
357
|
-
name: ruby-debug
|
358
245
|
prerelease: false
|
359
|
-
|
246
|
+
version_requirements: *75544010
|
247
|
+
- !ruby/object:Gem::Dependency
|
248
|
+
name: ruby-debug19
|
249
|
+
requirement: &75543770 !ruby/object:Gem::Requirement
|
360
250
|
none: false
|
361
|
-
requirements:
|
362
|
-
- -
|
363
|
-
- !ruby/object:Gem::Version
|
364
|
-
|
365
|
-
segments:
|
366
|
-
- 0
|
367
|
-
version: "0"
|
251
|
+
requirements:
|
252
|
+
- - ! '>='
|
253
|
+
- !ruby/object:Gem::Version
|
254
|
+
version: '0'
|
368
255
|
type: :development
|
369
|
-
version_requirements: *id022
|
370
|
-
- !ruby/object:Gem::Dependency
|
371
|
-
name: rspec-rails
|
372
256
|
prerelease: false
|
373
|
-
|
257
|
+
version_requirements: *75543770
|
258
|
+
- !ruby/object:Gem::Dependency
|
259
|
+
name: rspec-rails
|
260
|
+
requirement: &75543520 !ruby/object:Gem::Requirement
|
374
261
|
none: false
|
375
|
-
requirements:
|
262
|
+
requirements:
|
376
263
|
- - ~>
|
377
|
-
- !ruby/object:Gem::Version
|
378
|
-
hash: 21
|
379
|
-
segments:
|
380
|
-
- 2
|
381
|
-
- 6
|
382
|
-
- 1
|
264
|
+
- !ruby/object:Gem::Version
|
383
265
|
version: 2.6.1
|
384
266
|
type: :development
|
385
|
-
version_requirements: *id023
|
386
|
-
- !ruby/object:Gem::Dependency
|
387
|
-
name: factory_girl
|
388
267
|
prerelease: false
|
389
|
-
|
268
|
+
version_requirements: *75543520
|
269
|
+
- !ruby/object:Gem::Dependency
|
270
|
+
name: factory_girl
|
271
|
+
requirement: &75543270 !ruby/object:Gem::Requirement
|
390
272
|
none: false
|
391
|
-
requirements:
|
273
|
+
requirements:
|
392
274
|
- - ~>
|
393
|
-
- !ruby/object:Gem::Version
|
394
|
-
hash: 31
|
395
|
-
segments:
|
396
|
-
- 1
|
397
|
-
- 3
|
398
|
-
- 2
|
275
|
+
- !ruby/object:Gem::Version
|
399
276
|
version: 1.3.2
|
400
277
|
type: :development
|
401
|
-
version_requirements: *id024
|
402
|
-
- !ruby/object:Gem::Dependency
|
403
|
-
name: forgery
|
404
278
|
prerelease: false
|
405
|
-
|
279
|
+
version_requirements: *75543270
|
280
|
+
- !ruby/object:Gem::Dependency
|
281
|
+
name: forgery
|
282
|
+
requirement: &75543040 !ruby/object:Gem::Requirement
|
406
283
|
none: false
|
407
|
-
requirements:
|
284
|
+
requirements:
|
408
285
|
- - ~>
|
409
|
-
- !ruby/object:Gem::Version
|
410
|
-
hash: 11
|
411
|
-
segments:
|
412
|
-
- 0
|
413
|
-
- 4
|
414
|
-
- 2
|
286
|
+
- !ruby/object:Gem::Version
|
415
287
|
version: 0.4.2
|
416
288
|
type: :development
|
417
|
-
version_requirements: *id025
|
418
|
-
- !ruby/object:Gem::Dependency
|
419
|
-
name: ci_reporter
|
420
289
|
prerelease: false
|
421
|
-
|
290
|
+
version_requirements: *75543040
|
291
|
+
- !ruby/object:Gem::Dependency
|
292
|
+
name: ci_reporter
|
293
|
+
requirement: &75542810 !ruby/object:Gem::Requirement
|
422
294
|
none: false
|
423
|
-
requirements:
|
295
|
+
requirements:
|
424
296
|
- - ~>
|
425
|
-
- !ruby/object:Gem::Version
|
426
|
-
hash: 7
|
427
|
-
segments:
|
428
|
-
- 1
|
429
|
-
- 6
|
430
|
-
- 4
|
297
|
+
- !ruby/object:Gem::Version
|
431
298
|
version: 1.6.4
|
432
299
|
type: :development
|
433
|
-
version_requirements: *id026
|
434
|
-
- !ruby/object:Gem::Dependency
|
435
|
-
name: nifty-generators
|
436
300
|
prerelease: false
|
437
|
-
|
301
|
+
version_requirements: *75542810
|
302
|
+
- !ruby/object:Gem::Dependency
|
303
|
+
name: nifty-generators
|
304
|
+
requirement: &75542580 !ruby/object:Gem::Requirement
|
438
305
|
none: false
|
439
|
-
requirements:
|
306
|
+
requirements:
|
440
307
|
- - ~>
|
441
|
-
- !ruby/object:Gem::Version
|
442
|
-
hash: 5
|
443
|
-
segments:
|
444
|
-
- 0
|
445
|
-
- 4
|
446
|
-
- 5
|
308
|
+
- !ruby/object:Gem::Version
|
447
309
|
version: 0.4.5
|
448
310
|
type: :development
|
449
|
-
|
450
|
-
|
451
|
-
|
452
|
-
|
453
|
-
|
311
|
+
prerelease: false
|
312
|
+
version_requirements: *75542580
|
313
|
+
description: ! 'Social Stream is a Ruby on Rails engine providing your application
|
314
|
+
with social networking features and activity streams.
|
315
|
+
|
316
|
+
|
317
|
+
This gem packages the basic functionality, along with basic actors (user, group)
|
318
|
+
and activity objects (post and comments)'
|
454
319
|
email:
|
455
320
|
executables: []
|
456
|
-
|
457
321
|
extensions: []
|
458
|
-
|
459
322
|
extra_rdoc_files: []
|
460
|
-
|
461
|
-
files:
|
323
|
+
files:
|
462
324
|
- .gitignore
|
463
325
|
- .rspec
|
464
326
|
- .yardopts
|
@@ -482,6 +344,7 @@ files:
|
|
482
344
|
- app/assets/images/btn/_notes/btn_certificates.png.mno
|
483
345
|
- app/assets/images/btn/activity.png
|
484
346
|
- app/assets/images/btn/arrowBlue.png
|
347
|
+
- app/assets/images/btn/arrow_session_change.png
|
485
348
|
- app/assets/images/btn/arrows-ffffff.png
|
486
349
|
- app/assets/images/btn/bold.png
|
487
350
|
- app/assets/images/btn/btn_account.png
|
@@ -537,6 +400,7 @@ files:
|
|
537
400
|
- app/assets/images/btn/flag.png
|
538
401
|
- app/assets/images/btn/group_left.png
|
539
402
|
- app/assets/images/btn/group_right.png
|
403
|
+
- app/assets/images/btn/header_notifications.png
|
540
404
|
- app/assets/images/btn/index_71.png
|
541
405
|
- app/assets/images/btn/info.png
|
542
406
|
- app/assets/images/btn/italic.png
|
@@ -802,6 +666,8 @@ files:
|
|
802
666
|
- app/views/layouts/_flash.html.erb
|
803
667
|
- app/views/layouts/_footer.html.erb
|
804
668
|
- app/views/layouts/_header.erb
|
669
|
+
- app/views/layouts/_header_dropdown_menu.html.erb
|
670
|
+
- app/views/layouts/_header_dropdown_menu_sessions.html.erb
|
805
671
|
- app/views/layouts/_representation.html.erb
|
806
672
|
- app/views/layouts/_search.html.erb
|
807
673
|
- app/views/layouts/_settings.html.erb
|
@@ -1047,36 +913,26 @@ files:
|
|
1047
913
|
has_rdoc: true
|
1048
914
|
homepage: http://social-stream.dit.upm.es/
|
1049
915
|
licenses: []
|
1050
|
-
|
1051
916
|
post_install_message:
|
1052
917
|
rdoc_options: []
|
1053
|
-
|
1054
|
-
require_paths:
|
918
|
+
require_paths:
|
1055
919
|
- lib
|
1056
|
-
required_ruby_version: !ruby/object:Gem::Requirement
|
920
|
+
required_ruby_version: !ruby/object:Gem::Requirement
|
1057
921
|
none: false
|
1058
|
-
requirements:
|
1059
|
-
- -
|
1060
|
-
- !ruby/object:Gem::Version
|
1061
|
-
|
1062
|
-
|
1063
|
-
- 0
|
1064
|
-
version: "0"
|
1065
|
-
required_rubygems_version: !ruby/object:Gem::Requirement
|
922
|
+
requirements:
|
923
|
+
- - ! '>='
|
924
|
+
- !ruby/object:Gem::Version
|
925
|
+
version: '0'
|
926
|
+
required_rubygems_version: !ruby/object:Gem::Requirement
|
1066
927
|
none: false
|
1067
|
-
requirements:
|
1068
|
-
- -
|
1069
|
-
- !ruby/object:Gem::Version
|
1070
|
-
|
1071
|
-
segments:
|
1072
|
-
- 0
|
1073
|
-
version: "0"
|
928
|
+
requirements:
|
929
|
+
- - ! '>='
|
930
|
+
- !ruby/object:Gem::Version
|
931
|
+
version: '0'
|
1074
932
|
requirements: []
|
1075
|
-
|
1076
933
|
rubyforge_project:
|
1077
934
|
rubygems_version: 1.6.2
|
1078
935
|
signing_key:
|
1079
936
|
specification_version: 3
|
1080
937
|
summary: Basic features for Social Stream, the core for building social network websites
|
1081
938
|
test_files: []
|
1082
|
-
|