social_stream 0.9.7 → 0.10.0
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +1 -0
- data/README.rdoc +1 -0
- data/base/app/assets/javascripts/activities.js.erb +10 -2
- data/base/app/assets/stylesheets/activities.css +6 -4
- data/base/app/helpers/contacts_helper.rb +4 -2
- data/base/app/models/tie.rb +1 -1
- data/{events/app/views/activities/_index.html.erb → base/app/views/activities/_filter.html.erb} +1 -12
- data/base/app/views/activities/_options.html.erb +9 -6
- data/base/app/views/comments/_new.html.erb +16 -15
- data/base/app/views/profiles/_profile.html.erb +4 -0
- data/base/app/views/settings/_contacts.html.erb +16 -0
- data/base/app/views/settings/_index.html.erb +1 -0
- data/base/app/views/toolbar/_logo.html.erb +7 -0
- data/base/app/views/toolbar/_profile.html.erb +8 -1
- data/base/config/locales/en.yml +7 -23
- data/base/lib/social_stream/base/version.rb +1 -1
- data/base/lib/tasks/db/populate.rake +1 -1
- data/events/config/locales/en.yml +0 -9
- data/events/config/routes.rb +0 -16
- 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 +2 -1
- metadata +40 -73
- data/base/lib/tasks/resque.rake +0 -3
- data/events/app/assets/javascripts/settings.js +0 -20
- data/events/app/assets/stylesheets/activities.css +0 -4
- data/events/app/assets/stylesheets/settings.css +0 -4
- data/events/app/assets/stylesheets/tie.css +0 -4
- data/events/app/assets/stylesheets/users.css +0 -4
- data/events/app/controllers/activities_controller.rb +0 -42
- data/events/app/controllers/calendar_events_controller.rb +0 -157
- data/events/app/controllers/settings_controller.rb +0 -70
- data/events/app/views/activities/_activity.html.erb +0 -5
- data/events/app/views/activities/_child.html.erb +0 -18
- data/events/app/views/activities/_comments.html.erb +0 -3
- data/events/app/views/activities/_options.html.erb +0 -15
- data/events/app/views/activities/_root.html.erb +0 -37
- data/events/app/views/activities/_wall.html.erb +0 -5
- data/events/app/views/activities/_walls.html.erb +0 -34
- data/events/app/views/activities/documents.js.erb +0 -1
- data/events/app/views/activities/index.js.erb +0 -1
- data/events/app/views/calendar_events/_calendar.html.erb +0 -0
- data/events/app/views/calendar_events/_edit_form.html.erb +0 -58
- data/events/app/views/calendar_events/_form.html.erb +0 -65
- data/events/app/views/calendar_events/available.html.erb +0 -81
- data/events/app/views/calendar_events/create.js.erb +0 -18
- data/events/app/views/calendar_events/edit.js.erb +0 -1
- data/events/app/views/calendar_events/index.html.erb +0 -162
- data/events/app/views/calendar_events/move.js.erb +0 -0
- data/events/app/views/calendar_events/new.js.erb +0 -9
- data/events/app/views/calendar_events/resize.js.erb +0 -0
- data/events/app/views/calendar_events/schedule.html.erb +0 -143
- data/events/app/views/kaminari/_first_page.html.erb +0 -11
- data/events/app/views/kaminari/_gap.html.erb +0 -8
- data/events/app/views/kaminari/_last_page.html.erb +0 -11
- data/events/app/views/kaminari/_next_page.html.erb +0 -11
- data/events/app/views/kaminari/_page.html.erb +0 -12
- data/events/app/views/kaminari/_paginator.html.erb +0 -23
- data/events/app/views/kaminari/_prev_page.html.erb +0 -11
- data/events/app/views/profiles/_profile.html.erb +0 -40
- data/events/app/views/settings/_contacto.html.erb +0 -24
- data/events/app/views/settings/_header.html.erb +0 -8
- data/events/app/views/settings/_index.html.erb +0 -16
- data/events/app/views/settings/_manage.html.erb +0 -25
- data/events/app/views/settings/_settings.html.erb +0 -49
- data/events/app/views/settings/delete_relation.js.erb +0 -3
- data/events/app/views/settings/index.html.erb +0 -38
- data/events/app/views/settings/manage.html.erb +0 -31
- data/events/app/views/settings/show.html.erb +0 -15
- data/events/app/views/settings/update_relation.js.erb +0 -1
- data/events/app/views/toolbar/_home.html.erb +0 -11
- data/events/app/views/toolbar/_logo.html.erb +0 -23
- data/events/app/views/toolbar/_profile.html.erb +0 -21
|
@@ -1,31 +0,0 @@
|
|
|
1
|
-
<% content_for :title do%>
|
|
2
|
-
<%= t('contact.other')%>
|
|
3
|
-
<%end%>
|
|
4
|
-
|
|
5
|
-
<% content_for :sidebar do %>
|
|
6
|
-
<%= render :partial => 'home/sidebar' %>
|
|
7
|
-
<% end %>
|
|
8
|
-
|
|
9
|
-
<% toolbar :option => :contacts %>
|
|
10
|
-
|
|
11
|
-
<div id="my_conferences">
|
|
12
|
-
<div id="contacts" class="block">
|
|
13
|
-
<div class="search_field_wrapper">
|
|
14
|
-
<input type="text" value="Search by name" id="search_field" class="search_input" />
|
|
15
|
-
<%= image_tag("btn/search.png",:size=>"20x20",:id=>"search_button") %>
|
|
16
|
-
</div>
|
|
17
|
-
<div class="space_center"></div>
|
|
18
|
-
<div class="row" >
|
|
19
|
-
<div class="center" id="header_contacts">
|
|
20
|
-
<%= render :partial => "settings/header"%>
|
|
21
|
-
</div>
|
|
22
|
-
</div>
|
|
23
|
-
<div class="space_center"></div>
|
|
24
|
-
<div id="list_contacts_ajax" class="tab_content block">
|
|
25
|
-
<%= render :partial => "settings/manage"%>
|
|
26
|
-
</div>
|
|
27
|
-
<div class="space_center"></div>
|
|
28
|
-
</div>
|
|
29
|
-
</div>
|
|
30
|
-
|
|
31
|
-
<div class="space_center"></div>
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
<% content_for :title do %>
|
|
2
|
-
<%=t('settings.one')%>
|
|
3
|
-
<% end %>
|
|
4
|
-
|
|
5
|
-
<% content_for :sidebar do %>
|
|
6
|
-
<%= render :partial => 'home/sidebar' %>
|
|
7
|
-
<% end %>
|
|
8
|
-
|
|
9
|
-
<% toolbar %>
|
|
10
|
-
|
|
11
|
-
<% content_for :javascript do %>
|
|
12
|
-
|
|
13
|
-
<% end %>
|
|
14
|
-
|
|
15
|
-
<%= render :partial => 'index' %>
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
$("#contact<%= @receiver.id.to_s %>").html("<%= escape_javascript(render :partial => 'settings/contacto', :locals => {:contact => @receiver}) %>");
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
<%= render :partial => 'toolbar/logo', :locals => {:subject => current_subject} %>
|
|
2
|
-
|
|
3
|
-
<div class="block space_center">
|
|
4
|
-
</div>
|
|
5
|
-
|
|
6
|
-
<div id="menu_lateral" class="toolbar_menu">
|
|
7
|
-
<%= yield(:toolbar_menu).empty? ? home_toolbar_menu : yield(:toolbar_menu)%>
|
|
8
|
-
</div>
|
|
9
|
-
|
|
10
|
-
<div class="block space_center">
|
|
11
|
-
</div>
|
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
<div id="logo_index">
|
|
2
|
-
<% if subject == current_subject %>
|
|
3
|
-
<div class="center">
|
|
4
|
-
<span class="title_bold" ><%= subject.name %></span>
|
|
5
|
-
<div class="logo_grid logo_full">
|
|
6
|
-
<%= link_to image_tag(subject.logo.url(:profile), :alt => subject.name , :size => "119x119", :id => "current_avatar_img"), subject %>
|
|
7
|
-
<div class="logo_menu logo_caption">
|
|
8
|
-
<%= link_to t('avatar.profile_change'), avatars_path %>
|
|
9
|
-
</div>
|
|
10
|
-
</div>
|
|
11
|
-
</div>
|
|
12
|
-
<% else %>
|
|
13
|
-
<div class="center"><span class="title_bold" ><%= subject.name %></span></div>
|
|
14
|
-
<%= link_to image_tag(subject.logo.url, :alt => subject.name , :size => "119x119"), subject %>
|
|
15
|
-
<% end %>
|
|
16
|
-
</div>
|
|
17
|
-
<% if subject.subject_type == 'Event' %>
|
|
18
|
-
<% @founder = Actor.normalize(subject.founder_id) %>
|
|
19
|
-
<div id="founder">
|
|
20
|
-
<div id="created"><%=t('actor.created')%></div>
|
|
21
|
-
<div id="thumb"><%= link_to(image_tag(@founder.logo.url(:representation), :width => 20, :height => 20, :class => 'menu_icon', :id=> 'current_user_avatar_img'), @founder.subject ) %></div>
|
|
22
|
-
</div>
|
|
23
|
-
<% end %>
|
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
<%= render :partial => 'toolbar/logo', :locals => { :subject => subject } %>
|
|
2
|
-
|
|
3
|
-
<div class="block space_center">
|
|
4
|
-
</div>
|
|
5
|
-
|
|
6
|
-
<div id="menu_lateral" class="toolbar_menu">
|
|
7
|
-
<%= yield(:toolbar_menu).empty? ? profile_toolbar_menu(subject) : yield(:toolbar_menu) %>
|
|
8
|
-
</div>
|
|
9
|
-
|
|
10
|
-
<div class="block space_center">
|
|
11
|
-
</div>
|
|
12
|
-
<% if subject.subject_type == 'Event' %>
|
|
13
|
-
<% subject.relation_customs.each do |temp| %>
|
|
14
|
-
<%= render :partial => 'toolbar/organizer', :locals => { :subject => subject,:tie=> temp } %>
|
|
15
|
-
<% end %>
|
|
16
|
-
<%= render :partial => 'toolbar/suscribed', :locals => { :subject => subject } %>
|
|
17
|
-
<% end %>
|
|
18
|
-
<div class="block space_center">
|
|
19
|
-
</div>
|
|
20
|
-
|
|
21
|
-
|