social_stream-base 0.9.16 → 0.9.18
Sign up to get free protection for your applications and to get access to all the features.
- data/app/assets/images/tipsy.gif +0 -0
- data/app/assets/javascripts/activities.js.erb +23 -0
- data/app/assets/javascripts/invitations.js +7 -0
- data/app/assets/javascripts/profiles.js +4 -1
- data/app/assets/stylesheets/activities.css.scss +10 -5
- data/app/assets/stylesheets/base.css.scss +3 -2
- data/app/assets/stylesheets/frontpage.css.scss +2 -1
- data/app/assets/stylesheets/header.css.scss +5 -4
- data/app/controllers/groups_controller.rb +0 -6
- data/app/controllers/search_controller.rb +0 -4
- data/app/controllers/users_controller.rb +1 -6
- data/app/models/activity.rb +21 -7
- data/app/models/actor.rb +5 -3
- data/app/views/activities/_new.html.erb +13 -3
- data/app/views/activities/_options.html.erb +13 -4
- data/app/views/conversations/show.html.erb +1 -1
- data/app/views/conversations/show.js.erb +1 -1
- data/app/views/devise/registrations/edit.html.erb +1 -1
- data/app/views/devise/registrations/new.html.erb +1 -1
- data/app/views/devise/shared/_links.erb +6 -6
- data/app/views/frontpage/index.html.erb +3 -3
- data/app/views/groups/_new.html.erb +1 -1
- data/app/views/groups/show.html.erb +0 -5
- data/app/views/invitations/_new.html.erb +0 -5
- data/app/views/layouts/_header.erb +5 -44
- data/app/views/layouts/_header_signed_in.erb +44 -0
- data/app/views/layouts/_header_signed_out.erb +36 -0
- data/app/views/layouts/frontpage.html.erb +1 -1
- data/app/views/messages/_form.html.erb +3 -3
- data/app/views/messages/new.html.erb +2 -2
- data/app/views/messages/new.js.erb +1 -1
- data/app/views/posts/create.js.erb +2 -0
- data/app/views/profiles/edit.html.erb +6 -4
- data/app/views/search/index.html.erb +0 -4
- data/app/views/users/show.html.erb +0 -5
- data/config/locales/en.yml +33 -4
- data/config/locales/es.yml +33 -4
- data/lib/generators/social_stream/base/templates/initializer.rb +3 -0
- data/lib/social_stream/base/version.rb +1 -1
- data/lib/social_stream/models/object.rb +2 -1
- data/lib/social_stream-base.rb +4 -1
- data/social_stream-base.gemspec +3 -3
- data/spec/dummy/config/initializers/social_stream.rb +3 -0
- data/vendor/assets/javascripts/jquery.tipsy.js +104 -0
- data/vendor/assets/stylesheets/tipsy.css +7 -0
- metadata +18 -25
- data/app/assets/images/frontpage/join.gif +0 -0
- data/app/assets/stylesheets/ad_next.png +0 -0
- data/app/assets/stylesheets/ad_prev.png +0 -0
- data/app/assets/stylesheets/ad_scroll_back.png +0 -0
- data/app/assets/stylesheets/ad_scroll_forward.png +0 -0
- data/app/assets/stylesheets/jquery.ad-gallery.css +0 -171
- data/app/assets/stylesheets/loader.gif +0 -0
- data/app/views/frontpage/_header.html.erb +0 -30
- data/app/views/frontpage/_social_networks.html.erb +0 -5
- data/app/views/groups/_show_frontpage.html.erb +0 -11
- data/app/views/search/_index_frontpage.html.erb +0 -13
- data/app/views/users/_show_frontpage.html.erb +0 -11
@@ -1,171 +0,0 @@
|
|
1
|
-
.ad-gallery {
|
2
|
-
width: 320px;
|
3
|
-
}
|
4
|
-
|
5
|
-
.ad-gallery, .ad-gallery * {
|
6
|
-
margin: 0;
|
7
|
-
padding: 0;
|
8
|
-
}
|
9
|
-
|
10
|
-
.ad-gallery .ad-image-wrapper {
|
11
|
-
width: 100%;
|
12
|
-
height: 210px;
|
13
|
-
/*margin-bottom: 10px;*/
|
14
|
-
position: relative;
|
15
|
-
overflow: hidden;
|
16
|
-
}
|
17
|
-
.ad-gallery .ad-image-wrapper .ad-loader {
|
18
|
-
position: absolute;
|
19
|
-
z-index: 3;
|
20
|
-
top: 2px;
|
21
|
-
left: 48%;
|
22
|
-
border: 1px solid #CCC;
|
23
|
-
}
|
24
|
-
.ad-gallery .ad-image-wrapper .ad-next {
|
25
|
-
position: absolute;
|
26
|
-
right: 0;
|
27
|
-
top: 0px;
|
28
|
-
width: 25%;
|
29
|
-
height: 95%;
|
30
|
-
cursor: pointer;
|
31
|
-
display: block;
|
32
|
-
z-index: 100;
|
33
|
-
}
|
34
|
-
.ad-gallery .ad-image-wrapper .ad-prev {
|
35
|
-
position: absolute;
|
36
|
-
left: 0;
|
37
|
-
top: 0px;
|
38
|
-
width: 25%;
|
39
|
-
height: 95%;
|
40
|
-
cursor: pointer;
|
41
|
-
display: block;
|
42
|
-
z-index: 150;
|
43
|
-
}
|
44
|
-
.ad-gallery .ad-image-wrapper .ad-prev, .ad-gallery .ad-image-wrapper .ad-next {
|
45
|
-
/* Or else IE will hide it */
|
46
|
-
background: url(non-existing.jpg)\9
|
47
|
-
}
|
48
|
-
.ad-gallery .ad-image-wrapper .ad-prev .ad-prev-image, .ad-gallery .ad-image-wrapper .ad-next .ad-next-image {
|
49
|
-
background: url(ad_prev.png);
|
50
|
-
width: 30px;
|
51
|
-
height: 30px;
|
52
|
-
display: none;
|
53
|
-
position: absolute;
|
54
|
-
/*top: 47%;*/
|
55
|
-
top:80px;
|
56
|
-
left: 0;
|
57
|
-
z-index: 101;
|
58
|
-
}
|
59
|
-
.ad-gallery .ad-image-wrapper .ad-next .ad-next-image {
|
60
|
-
background: url(ad_next.png);
|
61
|
-
width: 30px;
|
62
|
-
height: 30px;
|
63
|
-
right: 0;
|
64
|
-
left: auto;
|
65
|
-
}
|
66
|
-
.ad-gallery .ad-image-wrapper .ad-image {
|
67
|
-
position: absolute;
|
68
|
-
overflow: hidden;
|
69
|
-
top: 0;
|
70
|
-
left: 0;
|
71
|
-
z-index: 9;
|
72
|
-
}
|
73
|
-
.ad-gallery .ad-image-wrapper .ad-image a img {
|
74
|
-
border: 0;
|
75
|
-
}
|
76
|
-
.ad-gallery .ad-image-wrapper .ad-image .ad-image-description {
|
77
|
-
position: absolute;
|
78
|
-
bottom: 0px;
|
79
|
-
left: 0px;
|
80
|
-
padding: 7px;
|
81
|
-
text-align: left;
|
82
|
-
width: 100%;
|
83
|
-
z-index: 2;
|
84
|
-
background: url(opa75.png);
|
85
|
-
color: #000;
|
86
|
-
}
|
87
|
-
* html .ad-gallery .ad-image-wrapper .ad-image .ad-image-description {
|
88
|
-
background: none;
|
89
|
-
filter:progid:DXImageTransform.Microsoft.AlphaImageLoader (enabled=true, sizingMethod=scale, src='opa75.png');
|
90
|
-
}
|
91
|
-
.ad-gallery .ad-image-wrapper .ad-image .ad-image-description .ad-description-title {
|
92
|
-
display: block;
|
93
|
-
}
|
94
|
-
.ad-gallery .ad-controls {
|
95
|
-
height: 15px;
|
96
|
-
}
|
97
|
-
.ad-gallery .ad-info {
|
98
|
-
float: left;
|
99
|
-
}
|
100
|
-
.ad-gallery .ad-slideshow-controls {
|
101
|
-
float: right;
|
102
|
-
}
|
103
|
-
.ad-gallery .ad-slideshow-controls .ad-slideshow-start, .ad-gallery .ad-slideshow-controls .ad-slideshow-stop {
|
104
|
-
padding-left: 5px;
|
105
|
-
cursor: pointer;
|
106
|
-
}
|
107
|
-
.ad-gallery .ad-slideshow-controls .ad-slideshow-countdown {
|
108
|
-
padding-left: 5px;
|
109
|
-
font-size: 0.9em;
|
110
|
-
}
|
111
|
-
.ad-gallery .ad-slideshow-running .ad-slideshow-start {
|
112
|
-
cursor: default;
|
113
|
-
font-style: italic;
|
114
|
-
}
|
115
|
-
.ad-gallery .ad-nav {
|
116
|
-
width: 100%;
|
117
|
-
position: relative;
|
118
|
-
}
|
119
|
-
.ad-gallery .ad-forward, .ad-gallery .ad-back {
|
120
|
-
position: absolute;
|
121
|
-
top: 0;
|
122
|
-
height: 100%;
|
123
|
-
z-index: 10;
|
124
|
-
}
|
125
|
-
/* IE 6 doesn't like height: 100% */
|
126
|
-
* html .ad-gallery .ad-forward, .ad-gallery .ad-back {
|
127
|
-
height: 100px;
|
128
|
-
}
|
129
|
-
.ad-gallery .ad-back {
|
130
|
-
cursor: pointer;
|
131
|
-
left: -20px;
|
132
|
-
width: 13px;
|
133
|
-
display: block;
|
134
|
-
background: url(ad_scroll_back.png) 0px 22px no-repeat;
|
135
|
-
}
|
136
|
-
.ad-gallery .ad-forward {
|
137
|
-
cursor: pointer;
|
138
|
-
display: block;
|
139
|
-
right: -20px;
|
140
|
-
width: 13px;
|
141
|
-
background: url(ad_scroll_forward.png) 0px 22px no-repeat;
|
142
|
-
}
|
143
|
-
.ad-gallery .ad-nav .ad-thumbs {
|
144
|
-
overflow: hidden;
|
145
|
-
width: 100%;
|
146
|
-
}
|
147
|
-
.ad-gallery .ad-thumbs .ad-thumb-list {
|
148
|
-
float: left;
|
149
|
-
width: 9000px;
|
150
|
-
list-style: none;
|
151
|
-
}
|
152
|
-
.ad-gallery .ad-thumbs li {
|
153
|
-
float: left;
|
154
|
-
/* padding-right: 5px;*/
|
155
|
-
}
|
156
|
-
.ad-gallery .ad-thumbs li a {
|
157
|
-
display: block;
|
158
|
-
}
|
159
|
-
.ad-gallery .ad-thumbs li a img {
|
160
|
-
border: 3px solid #CCC;
|
161
|
-
display: block;
|
162
|
-
}
|
163
|
-
.ad-gallery .ad-thumbs li a.ad-active img {
|
164
|
-
border: 3px solid #616161;
|
165
|
-
}
|
166
|
-
/* Can't do display none, since Opera won't load the images then */
|
167
|
-
.ad-preloads {
|
168
|
-
position: absolute;
|
169
|
-
left: -9000px;
|
170
|
-
top: -9000px;
|
171
|
-
}
|
Binary file
|
@@ -1,30 +0,0 @@
|
|
1
|
-
<div id="headerFront">
|
2
|
-
<div class="banner_top">
|
3
|
-
<div id="logo"><%= link_to(image_tag('logo.png', :alt => t('site.name')), '/'); %></div>
|
4
|
-
<div class="div_login">
|
5
|
-
<%= form_for User.new, :as => :user, :url => user_session_path do |f| -%>
|
6
|
-
<div id="login_data">
|
7
|
-
<div class="login_data_block">
|
8
|
-
<span><%= f.label :email %></span>
|
9
|
-
<%= f.email_field :email, :class => "input_username" %>
|
10
|
-
</div>
|
11
|
-
<div class="login_data_block">
|
12
|
-
<span><%= f.label :password %></span>
|
13
|
-
<%= f.password_field :password, :class => "input_username" %>
|
14
|
-
</div>
|
15
|
-
</div>
|
16
|
-
<div>
|
17
|
-
<%= f.submit t(:sign_in), :class => 'other_blue'%>
|
18
|
-
</div>
|
19
|
-
<% end -%>
|
20
|
-
<div class="subtexto">
|
21
|
-
<%= link_to t('sign_up'), new_user_registration_path, :class => "register_link" %>
|
22
|
-
<span>|</span>
|
23
|
-
<%= link_to t('forgot_password'), new_user_password_path, :class => "register_link" %>
|
24
|
-
|
25
|
-
<%= render :partial => 'frontpage/social_networks' %>
|
26
|
-
</div>
|
27
|
-
</div>
|
28
|
-
<br class="clearfloat" />
|
29
|
-
</div>
|
30
|
-
</div>
|
@@ -1,11 +0,0 @@
|
|
1
|
-
<nav id="toolbar">
|
2
|
-
<div id="toolbarContent" class="block">
|
3
|
-
<div class="space_center"></div>
|
4
|
-
<%= yield :toolbar %>
|
5
|
-
</div>
|
6
|
-
</nav>
|
7
|
-
<div id= "center_body" class="frontpage_view">
|
8
|
-
<section id="content">
|
9
|
-
<%= render :partial => 'show' %>
|
10
|
-
</section>
|
11
|
-
</div>
|
@@ -1,13 +0,0 @@
|
|
1
|
-
<nav id="toolbar">
|
2
|
-
<div id="toolbarContent" class="block">
|
3
|
-
<div class="space_center"></div>
|
4
|
-
</div>
|
5
|
-
</nav>
|
6
|
-
<div id= "center_body">
|
7
|
-
<section id="content">
|
8
|
-
<%= render :partial => 'index' %>
|
9
|
-
</section>
|
10
|
-
</div>
|
11
|
-
<aside id="sidebar">
|
12
|
-
<div id="sidebarContent"></div>
|
13
|
-
</aside>
|
@@ -1,11 +0,0 @@
|
|
1
|
-
<nav id="toolbar">
|
2
|
-
<div id="toolbarContent" class="block">
|
3
|
-
<div class="space_center"></div>
|
4
|
-
<%= yield :toolbar %>
|
5
|
-
</div>
|
6
|
-
</nav>
|
7
|
-
<div id= "center_body" class="frontpage_view">
|
8
|
-
<section id="content">
|
9
|
-
<%= render :partial => 'show' %>
|
10
|
-
</section>
|
11
|
-
</div>
|