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.
Files changed (74) hide show
  1. data/.gitignore +1 -0
  2. data/README.rdoc +1 -0
  3. data/base/app/assets/javascripts/activities.js.erb +10 -2
  4. data/base/app/assets/stylesheets/activities.css +6 -4
  5. data/base/app/helpers/contacts_helper.rb +4 -2
  6. data/base/app/models/tie.rb +1 -1
  7. data/{events/app/views/activities/_index.html.erb → base/app/views/activities/_filter.html.erb} +1 -12
  8. data/base/app/views/activities/_options.html.erb +9 -6
  9. data/base/app/views/comments/_new.html.erb +16 -15
  10. data/base/app/views/profiles/_profile.html.erb +4 -0
  11. data/base/app/views/settings/_contacts.html.erb +16 -0
  12. data/base/app/views/settings/_index.html.erb +1 -0
  13. data/base/app/views/toolbar/_logo.html.erb +7 -0
  14. data/base/app/views/toolbar/_profile.html.erb +8 -1
  15. data/base/config/locales/en.yml +7 -23
  16. data/base/lib/social_stream/base/version.rb +1 -1
  17. data/base/lib/tasks/db/populate.rake +1 -1
  18. data/events/config/locales/en.yml +0 -9
  19. data/events/config/routes.rb +0 -16
  20. data/events/lib/social_stream/events/version.rb +1 -1
  21. data/events/social_stream-events.gemspec +1 -1
  22. data/lib/social_stream/version.rb +1 -1
  23. data/social_stream.gemspec +2 -1
  24. metadata +40 -73
  25. data/base/lib/tasks/resque.rake +0 -3
  26. data/events/app/assets/javascripts/settings.js +0 -20
  27. data/events/app/assets/stylesheets/activities.css +0 -4
  28. data/events/app/assets/stylesheets/settings.css +0 -4
  29. data/events/app/assets/stylesheets/tie.css +0 -4
  30. data/events/app/assets/stylesheets/users.css +0 -4
  31. data/events/app/controllers/activities_controller.rb +0 -42
  32. data/events/app/controllers/calendar_events_controller.rb +0 -157
  33. data/events/app/controllers/settings_controller.rb +0 -70
  34. data/events/app/views/activities/_activity.html.erb +0 -5
  35. data/events/app/views/activities/_child.html.erb +0 -18
  36. data/events/app/views/activities/_comments.html.erb +0 -3
  37. data/events/app/views/activities/_options.html.erb +0 -15
  38. data/events/app/views/activities/_root.html.erb +0 -37
  39. data/events/app/views/activities/_wall.html.erb +0 -5
  40. data/events/app/views/activities/_walls.html.erb +0 -34
  41. data/events/app/views/activities/documents.js.erb +0 -1
  42. data/events/app/views/activities/index.js.erb +0 -1
  43. data/events/app/views/calendar_events/_calendar.html.erb +0 -0
  44. data/events/app/views/calendar_events/_edit_form.html.erb +0 -58
  45. data/events/app/views/calendar_events/_form.html.erb +0 -65
  46. data/events/app/views/calendar_events/available.html.erb +0 -81
  47. data/events/app/views/calendar_events/create.js.erb +0 -18
  48. data/events/app/views/calendar_events/edit.js.erb +0 -1
  49. data/events/app/views/calendar_events/index.html.erb +0 -162
  50. data/events/app/views/calendar_events/move.js.erb +0 -0
  51. data/events/app/views/calendar_events/new.js.erb +0 -9
  52. data/events/app/views/calendar_events/resize.js.erb +0 -0
  53. data/events/app/views/calendar_events/schedule.html.erb +0 -143
  54. data/events/app/views/kaminari/_first_page.html.erb +0 -11
  55. data/events/app/views/kaminari/_gap.html.erb +0 -8
  56. data/events/app/views/kaminari/_last_page.html.erb +0 -11
  57. data/events/app/views/kaminari/_next_page.html.erb +0 -11
  58. data/events/app/views/kaminari/_page.html.erb +0 -12
  59. data/events/app/views/kaminari/_paginator.html.erb +0 -23
  60. data/events/app/views/kaminari/_prev_page.html.erb +0 -11
  61. data/events/app/views/profiles/_profile.html.erb +0 -40
  62. data/events/app/views/settings/_contacto.html.erb +0 -24
  63. data/events/app/views/settings/_header.html.erb +0 -8
  64. data/events/app/views/settings/_index.html.erb +0 -16
  65. data/events/app/views/settings/_manage.html.erb +0 -25
  66. data/events/app/views/settings/_settings.html.erb +0 -49
  67. data/events/app/views/settings/delete_relation.js.erb +0 -3
  68. data/events/app/views/settings/index.html.erb +0 -38
  69. data/events/app/views/settings/manage.html.erb +0 -31
  70. data/events/app/views/settings/show.html.erb +0 -15
  71. data/events/app/views/settings/update_relation.js.erb +0 -1
  72. data/events/app/views/toolbar/_home.html.erb +0 -11
  73. data/events/app/views/toolbar/_logo.html.erb +0 -23
  74. data/events/app/views/toolbar/_profile.html.erb +0 -21
File without changes
@@ -1,9 +0,0 @@
1
- page.replace_html 'create_event', :partial => 'form'
2
- page<< "$('#create_event_dialog').dialog({
3
- title: 'Agregar horario',
4
- modal: true,
5
- width: 500,
6
- close: function(event, ui) { $('#create_event_dialog').dialog('destroy') }
7
-
8
- });
9
- "
File without changes
@@ -1,143 +0,0 @@
1
- <% content_for :headers do -%>
2
- <%= javascript_include_tag :defaults, 'jquery', 'jquery-ui', 'fullcalendar' %>
3
- <%= stylesheet_link_tag 'jquery-ui', 'fullcalendar' %>
4
- <% end -%>
5
-
6
- <% content_for :javascript do %>
7
- var room_id = <%=@room.id%>
8
- $(document).ready(function(){
9
- $('#calendar').fullCalendar({
10
- monthNames: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio',
11
- 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
12
- monthNamesShort: ['Ene', 'Feb', 'Mar', 'Abr', 'May', 'Jun',
13
- 'Jul', 'Ago', 'Sep', 'Oct', 'Nov', 'Dic'],
14
- dayNames: ['Domingo', 'Lunes', 'Martes', 'Miercoles', 'Jueves', 'Viernes', 'Sabado'],
15
- dayNamesShort: ['Dom', 'Lun', 'Mar', 'Mie', 'Jue', 'Vie', 'Sab'],
16
- buttonText: {
17
- prev: '&nbsp;&#9668;&nbsp;', // left triangle
18
- next: '&nbsp;&#9658;&nbsp;', // right triangle
19
- prevYear: '&nbsp;&lt;&lt;&nbsp;', // <<
20
- nextYear: '&nbsp;&gt;&gt;&nbsp;', // >>
21
- today: 'Hoy',
22
- month: 'Mes',
23
- week: 'Semana',
24
- day: 'Dia'
25
- },
26
- firstDay: 1,
27
- allDayText: 'Todo el dia',
28
- axisFormat: 'HH:mm G\'M\'\'T\' <%= escape_javascript(Time.zone.formatted_offset) %>',
29
- ignoreTimezone: true,
30
- allowCalEventOverlap: false,
31
- selectable: true,
32
- selectHelper: true,
33
- select: function(start, end, allDay) {
34
- var title = "No disponible";
35
-
36
- if (dateScheduleAvailable(start, end, allDay)) {
37
- /*
38
- $('#calendar').fullCalendar('renderEvent', {
39
- title: title,
40
- start: start,
41
- end: end,
42
- editable: true,
43
- allDay: allDay,
44
- className: 'not-available'
45
- }, false // make the event "stick"
46
- );
47
- */
48
- //createNotAvailableEvent(title, start, end, allDay, room_id);
49
- jQuery.ajax({
50
- data: 'start=' + start + '&end=' + end + '&room_id=' + room_id + '&allDay=' + allDay,
51
- dataType: 'script',
52
- type: 'get',
53
- url: "/calendar_events/new"
54
- });
55
- }
56
- $('#calendar').fullCalendar('unselect');
57
- },
58
- editable: true,
59
- header: {
60
- left: 'prev,next today',
61
- center: 'title',
62
- right: 'month,agendaWeek,agendaDay'
63
- },
64
- defaultView: 'agendaWeek',
65
- height: 500,
66
- columnFormat: {
67
- month: 'ddd',
68
- week: 'ddd d/M',
69
- day: 'dddd d/M'
70
- },
71
- slotMinutes: 30,
72
- loading: function(bool){
73
- if (bool)
74
- //$('#loading').show();
75
- $('#loading').hide();
76
- else
77
- $('#loading').hide();
78
- },
79
-
80
- eventSources: [
81
- '/calendar_events/get_schedule_events?room_id='+room_id,
82
- '/calendar_events/get_room_reservations_events?room_id='+room_id
83
- ],
84
- timeFormat: 'HH:mm t{ - HH:mm t} ',
85
- dragOpacity: "0.5",
86
- eventDrop: function(event, dayDelta, minuteDelta, allDay, revertFunc){
87
- if (dateScheduleAvailable(event.start, event.end, allDay))
88
- {
89
- moveEvent(event, dayDelta, minuteDelta, allDay);
90
- }
91
- else
92
- {
93
- revertFunc();
94
- }
95
- },
96
-
97
- eventResize: function(event, dayDelta, minuteDelta, revertFunc){
98
- if (dateScheduleAvailable(event.start, event.end, false))
99
- {
100
- resizeEvent(event, dayDelta, minuteDelta);
101
- }
102
- else
103
- {
104
- revertFunc();
105
- }
106
- },
107
-
108
- eventClick: function(event, jsEvent, view){
109
- if (event.editable) {
110
- showEventDetails(event);
111
- } else {
112
- showEventDescription(event);
113
- }
114
- }
115
- // }
116
- });
117
- });
118
-
119
- <% end %>
120
-
121
- <p>
122
- <%= link_to_remote 'Agregar horario NO disponible',
123
- :url => {:action => :new, :params => {:room_id => @room.id}},
124
- :before => "$('#loading').show()",
125
- :complete => "$('#loading').hide()"
126
- %>
127
- </p>
128
-
129
- <div><div id='calendar'></div></div>
130
-
131
- <div id = "desc_dialog" style ="display:none;">
132
- <div id = "event_desc"></div>
133
- <br/>
134
- <br/>
135
- <div id = "event_actions">
136
- <span id = "edit_event"></span>
137
- <span id = "delete_event"></span>
138
- </div>
139
- </div>
140
- <div id = "create_event_dialog" style ="display:none;">
141
- <div id = "create_event">
142
- </div>
143
- </div>
@@ -1,11 +0,0 @@
1
- <%# Link to the "First" page
2
- - available local variables
3
- url: url to the first page
4
- current_page: a page object for the currently displayed page
5
- num_pages: total number of pages
6
- per_page: number of items to fetch per page
7
- remote: data-remote
8
- -%>
9
- <span class="first">
10
- <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote %>
11
- </span>
@@ -1,8 +0,0 @@
1
- <%# Non-link tag that stands for skipped pages...
2
- - available local variables
3
- current_page: a page object for the currently displayed page
4
- num_pages: total number of pages
5
- per_page: number of items to fetch per page
6
- remote: data-remote
7
- -%>
8
- <span class="page gap"><%= raw(t 'views.pagination.truncate') %></span>
@@ -1,11 +0,0 @@
1
- <%# Link to the "Last" page
2
- - available local variables
3
- url: url to the last page
4
- current_page: a page object for the currently displayed page
5
- num_pages: total number of pages
6
- per_page: number of items to fetch per page
7
- remote: data-remote
8
- -%>
9
- <span class="last">
10
- <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote} %>
11
- </span>
@@ -1,11 +0,0 @@
1
- <%# Link to the "Next" page
2
- - available local variables
3
- url: url to the next page
4
- current_page: a page object for the currently displayed page
5
- num_pages: total number of pages
6
- per_page: number of items to fetch per page
7
- remote: data-remote
8
- -%>
9
- <span class="next">
10
- <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
11
- </span>
@@ -1,12 +0,0 @@
1
- <%# Link showing page number
2
- - available local variables
3
- page: a page object for "this" page
4
- url: url to this page
5
- current_page: a page object for the currently displayed page
6
- num_pages: total number of pages
7
- per_page: number of items to fetch per page
8
- remote: data-remote
9
- -%>
10
- <span class="page<%= ' current' if page.current? %>">
11
- <%= link_to_unless page.current?, page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
12
- </span>
@@ -1,23 +0,0 @@
1
- <%# The container tag
2
- - available local variables
3
- current_page: a page object for the currently displayed page
4
- num_pages: total number of pages
5
- per_page: number of items to fetch per page
6
- remote: data-remote
7
- paginator: the paginator that renders the pagination tags inside
8
- -%>
9
- <%= paginator.render do -%>
10
- <nav class="pagination">
11
- <%= first_page_tag unless current_page.first? %>
12
- <%= prev_page_tag unless current_page.first? %>
13
- <% each_page do |page| -%>
14
- <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
15
- <%= page_tag page %>
16
- <% elsif !page.was_truncated? -%>
17
- <%= gap_tag %>
18
- <% end -%>
19
- <% end -%>
20
- <%= next_page_tag unless current_page.last? %>
21
- <%= last_page_tag unless current_page.last? %>
22
- </nav>
23
- <% end -%>
@@ -1,11 +0,0 @@
1
- <%# Link to the "Previous" page
2
- - available local variables
3
- url: url to the previous page
4
- current_page: a page object for the currently displayed page
5
- num_pages: total number of pages
6
- per_page: number of items to fetch per page
7
- remote: data-remote
8
- -%>
9
- <span class="prev">
10
- <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
11
- </span>
@@ -1,40 +0,0 @@
1
- <div class="space_center"></div>
2
- <h2><%=t('menu.information')%></h2>
3
- <div class="space_center"></div>
4
-
5
- <% if (!is_personal_empty?) or(is_owner?)%>
6
- <%= render :partial=> "personal"%>
7
- <%end%>
8
-
9
- <% if @profile.subject.subject_type == 'Event' %>
10
- <%= render :partial=> "outline", :locals => {:profile => @profile} %>
11
- <% end %>
12
-
13
- <% if (!is_contact_empty?) or(is_owner?)%>
14
- <%= render :partial=> "contact"%>
15
- <%end%>
16
- <% if (@profile.experience?) or(is_owner?)%>
17
- <%= render :partial=> "experience"%>
18
- <%end%>
19
- <% if is_owner? %>
20
- <div class="space_center"></div>
21
- <div class="block" id="avatar_info">
22
- <div class="header">
23
- <div class="header_text">
24
- <%= t('avatar.profile_change')%>
25
- </div>
26
- <div class="header_icon_right">
27
- <%= link_to (image_tag('btn/edit.png')), :controller => "avatars" , :action => "index" %>
28
- </div>
29
- </div>
30
- <div class="content">
31
- <div class="row">
32
- </div>
33
- </div>
34
- </div>
35
- <% end %>
36
- <div class="space_center"></div>
37
- <% if (@profile.subject.tag_list.count > 0) or (is_owner?) %>
38
- <%= render :partial=>"tags"%>
39
- <% end %>
40
-
@@ -1,24 +0,0 @@
1
- <% variable=current_subject.ties_to(contact).to_a %>
2
- <% temporal='' %>
3
- <% variable.each do |temp| %>
4
- <% temporal=temp.relation_id %>
5
- <% end %>
6
-
7
- <div class="label" id="contact<%=contact.actor_id.to_s%>">
8
- <div class="logo">
9
- <%= link_to image_tag(contact.logo.url , :size => "50x50", :alt => contact.name), contact %>
10
- </div>
11
- <div class="sub-block">
12
- <div class="name black" >
13
- <%=link_to(truncate_name(contact.name), contact)%>
14
- </div>
15
- <div class="link">
16
- <%= form_tag "/settings/update_relation/"+contact.actor_id.to_s, :method => :post ,:id=> 'form_'+contact.actor_id.to_s, :class => "tie_form",:remote=> true do %>
17
- <%= select "manage","contacts",current_subject.relation_customs.collect{|r| [r.name, r.id]}, {:selected=>temporal},{:onchange=>'$(\'#form_'+contact.actor_id.to_s+'\').submit();'} %>
18
- <% end %>
19
- </div>
20
- </div>
21
- <div class="link">
22
- <%= link_to t('actor.delete'),{:controller => :settings , :action => :delete_relation,:id=>contact.actor_id.to_s}, :confirm => t('actor.confirm_delete'), :remote => true %>
23
- <%= link_to image_tag("btn/trash.png" , :alt => contact.name),{:controller => :settings , :action => :delete_relation,:id=>contact.actor_id.to_s}, :confirm => t('actor.confirm_delete'), :remote => true%>
24
- </div>
@@ -1,8 +0,0 @@
1
- <%= link_to t('contact.all_n', :count => current_subject.contact_subjects(:direction => :sent).count), contacts_path %> -
2
- <% Actor.distinct_initials.
3
- contacted_from(current_subject).
4
- merge(Tie.related_by(current_subject.relation_customs.find_by_id(params[:relation]))).
5
- distinct_initials.
6
- each do |l| %>
7
- <%= link_to l.initial,{:letter => l.initial,:page => 1},:class => "contact_letter_link" %>
8
- <% end %>
@@ -1,16 +0,0 @@
1
- <%= location(link_to(image_tag("btn/btn_config.png", :class => "btn_config")+t('account.one')+": "+t('account.settings')))%>
2
- <br class="clearfloat" />
3
- <div class="space_center">
4
- </div>
5
- <h2><%= t('settings.for')%> <%= current_subject.name %></h2>
6
- <div class="space_center">
7
- </div>
8
- <%= render :partial => "notifications" %>
9
-
10
- <% if current_subject.respond_to? :authentication_token%>
11
- <%= render :partial => "api_key" %>
12
- <% end %>
13
-
14
-
15
- <%= render :partial => "settings" %>
16
-
@@ -1,25 +0,0 @@
1
- <% if params[:pending].present? %>
2
- <h2><%= t('contact.pending.other') %></h2>
3
- <% else %>
4
- <h2><%= t('contact.addressbook') %></h2>
5
- <% end %>
6
-
7
- <div class="space_center"></div>
8
- <% cont=0; %>
9
- <% @cs.each do |contact| %>
10
- <% if (cont%2) == 0 %>
11
- <% cont+=1; %>
12
- <div class="row">
13
- <% end %>
14
- <%= render :partial => "settings/contacto", :locals => {:contact => contact} %>
15
- </div>
16
- <% end %>
17
-
18
- <% if ((cont%2) != 0) %>
19
- <div class="label"></div>
20
- </div>
21
- <% end %>
22
-
23
- <div class="row">
24
- <%= paginate @cs %>
25
- </div>
@@ -1,49 +0,0 @@
1
- <div class="block" id="manage_settings">
2
- <div class="header">
3
- <div class="header_text">
4
- <%= t('settings.manage.name')%>
5
- </div>
6
- <div class="header_icon_right">
7
- <%= link_to (image_tag('btn/edit.png')), :controller => :settings , :action => :manage%>
8
- </div>
9
- </div>
10
- <div class="content" id="contact_settings_briefing">
11
- <div class="form_row">
12
- <%= t('settings.manage.briefing')%>
13
- </div>
14
- </div>
15
- <div class="content" id="contact_settings_content" style="display:none;">
16
- <div class="settings_block">
17
- <div class="form_row">
18
- <%=t('settings.manage.explanation') %>:
19
- </div>
20
- <div class="form_sub_row">
21
- <div id="my_conferences">
22
- <div id="contacts" class="block">
23
- <div class="search_field_wrapper">
24
- <input type="text" value="Search by name" id="search_field" class="search_input" />
25
- <%= image_tag("btn/search.png",:size=>"20x20",:id=>"search_button") %>
26
- </div>
27
- <div class="space_center"></div>
28
- <div class="row" >
29
- <div class="center">
30
- <%= link_to t('contact.all_n', :count => current_subject.contact_subjects(:direction => :sent).count), contacts_path %> -
31
- <% Actor.distinct_initials.
32
- contacted_from(current_subject).
33
- merge(Tie.related_by(current_subject.relation_customs.find_by_id(params[:relation]))).
34
- distinct_initials.
35
- each do |l| %>
36
- <%= link_to l.initial,{:letter => l.initial,:page => 1},:class => "contact_letter_link" %>
37
- <% end %>
38
- </div>
39
- </div>
40
- <div class="space_center"></div>
41
-
42
- <div id="list_contacts_ajax" class="tab_content block">
43
- </div>
44
- </div>
45
- </div>
46
- </div>
47
- </div>
48
- </div>
49
- </div>
@@ -1,3 +0,0 @@
1
- $("#list_contacts_ajax").html("<%= escape_javascript(render :partial => 'settings/manage', :locals => {:cs => @cs}) %>");
2
- $("#header_contacts").html("<%= escape_javascript(render :partial => 'settings/header') %>");
3
-
@@ -1,38 +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">
20
- <%= link_to t('contact.all_n', :count => current_subject.contact_subjects(:direction => :sent).count), contacts_path %> -
21
- <% Actor.distinct_initials.
22
- contacted_from(current_subject).
23
- merge(Tie.related_by(current_subject.relation_customs.find_by_id(params[:relation]))).
24
- distinct_initials.
25
- each do |l| %>
26
- <%= link_to l.initial,{:letter => l.initial,:page => 1},:class => "contact_letter_link" %>
27
- <% end %>
28
- </div>
29
- </div>
30
- <div class="space_center"></div>
31
- <div id="list_contacts_ajax" class="tab_content block">
32
- <%= render :partial => "contacts/index"%>
33
- </div>
34
- <div class="space_center"></div>
35
- </div>
36
- </div>
37
-
38
- <div class="space_center"></div>