social_stream 2.0.0.beta2 → 2.0.0.beta3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (227) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -0
  3. data/README.rdoc +5 -4
  4. data/Rakefile +1 -1
  5. data/base/app/assets/images/icons/files_ico-50.png +0 -0
  6. data/base/app/assets/images/icons/files_ico-70.png +0 -0
  7. data/base/app/assets/images/logos/medium/group.png +0 -0
  8. data/base/app/assets/images/logos/medium/user.png +0 -0
  9. data/base/app/assets/images/logos/original/group.png +0 -0
  10. data/base/app/assets/images/logos/original/user.png +0 -0
  11. data/base/app/assets/images/logos/small/group.png +0 -0
  12. data/base/app/assets/images/logos/small/user.png +0 -0
  13. data/base/app/assets/javascripts/social_stream/contact.js +23 -56
  14. data/base/app/assets/javascripts/social_stream/object.js +5 -0
  15. data/base/app/assets/javascripts/social_stream/relation_customs.js +1 -1
  16. data/base/app/assets/javascripts/social_stream/wall.js +1 -0
  17. data/base/app/assets/stylesheets/social_stream-base.css.sass +81 -2
  18. data/base/app/assets/stylesheets/social_stream/base/adjust.css.sass +5 -0
  19. data/base/app/assets/stylesheets/social_stream/base/{_adjust.css.sass → adjust/_adjust.css.sass} +1 -5
  20. data/base/app/assets/stylesheets/social_stream/base/adjust/layout/_adjust.css.sass +10 -0
  21. data/base/app/assets/stylesheets/social_stream/base/buttons.css.sass +2 -0
  22. data/base/app/assets/stylesheets/social_stream/base/{_buttons.scss.sass → buttons/_buttons.scss.sass} +0 -0
  23. data/base/app/assets/stylesheets/social_stream/base/contacts.css.sass +10 -0
  24. data/base/app/assets/stylesheets/social_stream/base/contacts/_contacts.css.sass +12 -7
  25. data/base/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass +35 -27
  26. data/base/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-1200px-min.css.sass +13 -3
  27. data/base/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-767px-max.css.sass +38 -3
  28. data/base/app/assets/stylesheets/social_stream/base/conversation.css.sass +10 -0
  29. data/base/app/assets/stylesheets/social_stream/base/conversation/_conversation.css.sass +3 -3
  30. data/base/app/assets/stylesheets/social_stream/base/conversation/layout/_conversation.css.sass +3 -0
  31. data/base/app/assets/stylesheets/social_stream/base/conversation/responsive/_responsive-767px-max.css.sass +4 -1
  32. data/base/app/assets/stylesheets/social_stream/base/explore.css.sass +18 -0
  33. data/base/app/assets/stylesheets/social_stream/base/explore/_explore.css.sass +8 -3
  34. data/base/app/assets/stylesheets/social_stream/base/explore/layout/_explore-search.css.sass +1 -0
  35. data/base/app/assets/stylesheets/social_stream/base/explore/layout/_explore-timeline.css.sass +9 -5
  36. data/base/app/assets/stylesheets/social_stream/base/explore/layout/_explore.css.sass +4 -5
  37. data/base/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-1200px-min.css.sass +12 -10
  38. data/base/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-767px-max.css.sass +2 -0
  39. data/base/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-768px-979px.css.sass +2 -0
  40. data/base/app/assets/stylesheets/social_stream/base/footer.css.sass +2 -0
  41. data/base/app/assets/stylesheets/social_stream/base/footer/layout/_footer.css.sass +4 -3
  42. data/base/app/assets/stylesheets/social_stream/base/frontpage_devise.css.sass +16 -0
  43. data/base/app/assets/stylesheets/social_stream/base/groups/_groups.css.sass +17 -0
  44. data/base/app/assets/stylesheets/social_stream/base/{_groups.css.sass → groups/layout/_groups.css.sass} +2 -7
  45. data/base/app/assets/stylesheets/social_stream/base/icons.css.sass +2 -0
  46. data/base/app/assets/stylesheets/social_stream/base/icons/icon.css.css +52 -38
  47. data/base/app/assets/stylesheets/social_stream/base/jquery-ui.css.sass +10 -0
  48. data/base/app/assets/stylesheets/social_stream/base/{_jquery-ui.css.sass → jquery-ui/_jquery-ui.css.sass} +0 -0
  49. data/base/app/assets/stylesheets/social_stream/base/layouts.css.sass +2 -0
  50. data/base/app/assets/stylesheets/social_stream/base/layouts/_header.css.sass +10 -5
  51. data/base/app/assets/stylesheets/social_stream/base/layouts/_layout.css.sass +4 -2
  52. data/base/app/assets/stylesheets/social_stream/base/logo.css.sass +7 -0
  53. data/base/app/assets/stylesheets/social_stream/base/mixins.css.sass +10 -0
  54. data/base/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass +11 -12
  55. data/base/app/assets/stylesheets/social_stream/base/mixins/_colorfont.css.sass +2 -1
  56. data/base/app/assets/stylesheets/social_stream/base/notifications.css.sass +10 -0
  57. data/base/app/assets/stylesheets/social_stream/base/profile.css.sass +10 -0
  58. data/base/app/assets/stylesheets/social_stream/base/profile/_profile.css.sass +29 -19
  59. data/base/app/assets/stylesheets/social_stream/base/profile/layout/_profile.css.sass +42 -47
  60. data/base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-1200px-min.css.sass +2 -4
  61. data/base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-767px-max.css.sass +12 -4
  62. data/base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-768px-979px.css.sass +4 -5
  63. data/base/app/assets/stylesheets/social_stream/base/responsive.css.sass +6 -0
  64. data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-1200px-min.css.sass +7 -4
  65. data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-767px-max.css.sass +1 -2
  66. data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-768px-979px.css.sass +4 -1
  67. data/base/app/assets/stylesheets/social_stream/base/search.css.sass +2 -0
  68. data/base/app/assets/stylesheets/social_stream/base/select2.css.sass +5 -0
  69. data/base/app/assets/stylesheets/social_stream/base/settings.css.sass +10 -0
  70. data/base/app/assets/stylesheets/social_stream/base/settings/_settings.css.sass +1 -2
  71. data/base/app/assets/stylesheets/social_stream/base/settings/layout/_settings.css.sass +5 -0
  72. data/base/app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-767px-max.css.sass +2 -1
  73. data/base/app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-768px-979px.css.sass +4 -2
  74. data/base/app/assets/stylesheets/social_stream/base/sidebar.css.sass +8 -0
  75. data/base/app/assets/stylesheets/social_stream/base/sidebar/_sidebar.css.sass +1 -1
  76. data/base/app/assets/stylesheets/social_stream/base/sidebar/layout/_sidebar.css.sass +4 -1
  77. data/base/app/assets/stylesheets/social_stream/base/timeline.css.sass +14 -0
  78. data/base/app/assets/stylesheets/social_stream/base/timeline/_timeline.css.sass +4 -9
  79. data/base/app/assets/stylesheets/social_stream/base/timeline/_wrapper_activities.css.sass +4 -2
  80. data/base/app/assets/stylesheets/social_stream/base/timeline/layout/_timeline.css.sass +34 -0
  81. data/base/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-1200px-min.css.sass +14 -0
  82. data/base/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-767px-max.css.sass +28 -0
  83. data/base/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-768px-979px.css.sass +14 -0
  84. data/base/app/assets/stylesheets/social_stream/base/toolbar.css.sass +10 -0
  85. data/base/app/assets/stylesheets/social_stream/base/toolbar/_toolbar.css.sass +28 -8
  86. data/base/app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-1200px-min.css.sass +1 -2
  87. data/base/app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-767px-max.css.sass +14 -2
  88. data/base/app/assets/stylesheets/social_stream/bootstrap-rewrite/_button-groups.scss +1 -1
  89. data/base/app/assets/stylesheets/social_stream/bootstrap-rewrite/_forms.scss +8 -0
  90. data/base/app/assets/stylesheets/social_stream/bootstrap-rewrite/_nav.scss +4 -0
  91. data/base/app/assets/stylesheets/social_stream/fonts/JosefinSlabOverlay.ttf +0 -0
  92. data/base/app/assets/stylesheets/social_stream/fonts/JosefinSlabRegular-Outline.ttf +0 -0
  93. data/base/app/assets/stylesheets/social_stream/fonts/JosefinSlabRegular.ttf +0 -0
  94. data/base/app/assets/stylesheets/social_stream/fonts/colorfont.css +4 -4
  95. data/base/app/assets/stylesheets/social_stream/fonts/fonts.css +4 -4
  96. data/base/app/assets/stylesheets/social_stream/fonts/social-stream:fonts:colorfont.css.sass +5 -0
  97. data/base/app/assets/stylesheets/social_stream/fonts/social-stream:fonts:fonts.css.sass +5 -0
  98. data/base/app/controllers/repositories_controller.rb +2 -3
  99. data/base/app/helpers/contacts_helper.rb +30 -17
  100. data/base/app/models/activity_object.rb +16 -17
  101. data/base/app/models/profile.rb +0 -4
  102. data/base/app/views/activities/_root.html.erb +1 -1
  103. data/base/app/views/activities/_timeline_modal.html.erb +2 -2
  104. data/base/app/views/contacts/_contact.html.erb +2 -2
  105. data/base/app/views/contacts/index.html.erb +6 -0
  106. data/base/app/views/explore/_followed.html.erb +6 -6
  107. data/base/app/views/groups/{_new.html.erb → _form.html.erb} +4 -7
  108. data/base/app/views/groups/_new_modal.html.erb +11 -0
  109. data/base/app/views/groups/new.html.erb +5 -1
  110. data/base/app/views/layouts/_footer.html.erb +1 -1
  111. data/base/app/views/layouts/application.html.erb +7 -8
  112. data/base/app/views/profiles/_avatar.html.erb +9 -9
  113. data/base/app/views/profiles/_comunication-info.html.erb +8 -8
  114. data/base/app/views/profiles/_experience.html.erb +15 -15
  115. data/base/app/views/profiles/_personal.html.erb +13 -12
  116. data/base/app/views/profiles/_profile.html.erb +33 -26
  117. data/base/app/views/profiles/_tags.html.erb +8 -12
  118. data/base/app/views/subjects/_subject.html.erb +1 -1
  119. data/base/app/views/toolbar/_logo.html.erb +6 -7
  120. data/base/app/views/toolbar/_profile.html.erb +9 -12
  121. data/base/config/locales/en.yml +462 -444
  122. data/base/config/locales/es.yml +464 -461
  123. data/base/config/locales/pt.yml +504 -379
  124. data/base/config/locales/zh.yml +479 -409
  125. data/base/lib/social_stream/base/version.rb +1 -1
  126. data/base/lib/social_stream/population/actor.rb +10 -0
  127. data/base/lib/social_stream/search.rb +11 -2
  128. data/base/lib/tasks/db/populate.rake +57 -16
  129. data/base/social_stream-base.gemspec +1 -1
  130. data/base/spec/views/profiles_spec.rb +5 -3
  131. data/documents/app/assets/javascripts/social_stream/audio.js.erb +5 -5
  132. data/documents/app/assets/javascripts/social_stream/documents.timeline.js +24 -6
  133. data/documents/app/assets/javascripts/social_stream/documents.wall.js +37 -32
  134. data/documents/app/assets/javascripts/social_stream/video.js +33 -0
  135. data/documents/app/assets/stylesheets/social_stream/documents/create/layout/_new.css.sass +3 -0
  136. data/documents/app/assets/stylesheets/social_stream/documents/documents/layout/_documents.css.sass +12 -7
  137. data/documents/app/assets/stylesheets/social_stream/documents/responsive/_responsive-1200px-min.css.sass +8 -1
  138. data/documents/app/assets/stylesheets/social_stream/documents/responsive/_responsive-767px-max.css.sass +27 -2
  139. data/documents/app/assets/stylesheets/social_stream/documents/show/_show.css.sass +29 -0
  140. data/documents/app/assets/stylesheets/social_stream/documents/show/layout/_show.css.sass +36 -0
  141. data/documents/app/assets/stylesheets/social_stream/documents/timeline/_audios.css.sass +27 -12
  142. data/documents/app/views/audios/_audio_processed.html.erb +5 -46
  143. data/documents/app/views/audios/_audio_show.html.erb +16 -57
  144. data/documents/app/views/audios/_player.html.erb +42 -0
  145. data/documents/app/views/common_documents/_index.html.erb +3 -5
  146. data/documents/app/views/videos/_player.html.erb +36 -0
  147. data/documents/app/views/videos/_video_processed.html.erb +5 -43
  148. data/documents/app/views/videos/_video_show.html.erb +10 -60
  149. data/documents/config/locales/en.yml +67 -67
  150. data/documents/config/locales/es.yml +67 -64
  151. data/documents/config/locales/zh.yml +90 -0
  152. data/documents/lib/generators/social_stream/documents/templates/initializer.rb +1 -1
  153. data/documents/lib/social_stream-documents.rb +1 -1
  154. data/documents/lib/social_stream/documents/version.rb +1 -1
  155. data/documents/social_stream-documents.gemspec +1 -1
  156. data/events/app/assets/javascripts/social_stream/fullcalendar.js +14 -2
  157. data/events/app/assets/stylesheets/social_stream/events/responsive/_responsive-767px-max.css.sass +12 -9
  158. data/events/app/controllers/events_controller.rb +7 -1
  159. data/events/app/views/events/_details.html.erb +18 -16
  160. data/events/app/views/events/_show_modal.html.erb +10 -0
  161. data/events/app/views/sidebar/_calendar.html.erb +1 -1
  162. data/events/config/locales/en.yml +32 -31
  163. data/events/config/locales/es.yml +32 -32
  164. data/events/config/locales/zh.yml +57 -0
  165. data/events/lib/social_stream/events/version.rb +1 -1
  166. data/events/social_stream-events.gemspec +1 -1
  167. data/lib/social_stream/components.rb +4 -0
  168. data/lib/social_stream/version.rb +1 -1
  169. data/lib/tasks/i18n.rake +55 -0
  170. data/linkser/app/assets/javascripts/social_stream/linkser.wall.js +12 -6
  171. data/linkser/app/assets/stylesheets/social_stream/linkser/repository/layout/_repository.css.sass +1 -0
  172. data/linkser/app/assets/stylesheets/social_stream/linkser/timeline/layout/_timeline-link.css.sass +6 -1
  173. data/linkser/app/views/links/_new_activity.html.erb +0 -1
  174. data/linkser/app/views/links/_timeline.html.erb +1 -1
  175. data/linkser/config/locales/en.yml +12 -11
  176. data/linkser/config/locales/es.yml +12 -11
  177. data/linkser/config/locales/zh.yml +17 -0
  178. data/linkser/lib/social_stream/linkser/version.rb +1 -1
  179. data/linkser/social_stream-linkser.gemspec +1 -1
  180. data/linkser/vendor/assets/jplayer.blue.monday.video.play.hover.png +0 -0
  181. data/linkser/vendor/assets/jplayer.blue.monday.video.play.png +0 -0
  182. data/linkser/vendor/assets/stylesheets/jplayer.blue.monday.png +0 -0
  183. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/applications/_applications-oauth2server.css.sass +1 -1
  184. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/show/_show-oauth2server.css.sass +1 -1
  185. data/oauth2_server/app/views/site/clients/show.html.erb +5 -1
  186. data/oauth2_server/config/locales/en.yml +16 -15
  187. data/oauth2_server/config/locales/es.yml +20 -19
  188. data/oauth2_server/config/locales/zh.yml +30 -0
  189. data/oauth2_server/lib/social_stream/oauth2_server/version.rb +1 -1
  190. data/oauth2_server/social_stream-oauth2_server.gemspec +1 -1
  191. data/ostatus/Rakefile +1 -2
  192. data/ostatus/config/locales/en.yml +34 -33
  193. data/ostatus/config/locales/zh.yml +35 -0
  194. data/ostatus/lib/social_stream/ostatus/version.rb +1 -1
  195. data/ostatus/social_stream-ostatus.gemspec +1 -1
  196. data/places/config/locales/en.yml +58 -67
  197. data/places/config/locales/es.yml +60 -61
  198. data/presence/app/assets/stylesheets/social_stream/presence/_toolbar-chat.css.sass +2 -2
  199. data/presence/config/locales/en.yml +45 -43
  200. data/presence/config/locales/es.yml +45 -43
  201. data/presence/config/locales/zh.yml +69 -0
  202. data/presence/lib/social_stream/presence/version.rb +1 -1
  203. data/presence/social_stream-presence.gemspec +1 -1
  204. data/social_stream.gemspec +7 -7
  205. metadata +68 -44
  206. data/base/app/assets/stylesheets/social_stream/fonts/BreeSerif-Regular.ttf +0 -0
  207. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Original.ttf +0 -0
  208. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Outline.ttf +0 -0
  209. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Overlay.ttf +0 -0
  210. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Original.ttf +0 -0
  211. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Outline.ttf +0 -0
  212. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Overlay.ttf +0 -0
  213. data/base/app/assets/stylesheets/social_stream/fonts/RockSalt.ttf +0 -0
  214. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SIL OFL Font License - Source Sans Pro.txt +0 -93
  215. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Black.otf +0 -0
  216. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-BlackIt.otf +0 -0
  217. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Bold.otf +0 -0
  218. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-BoldIt.otf +0 -0
  219. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-ExtraLight.otf +0 -0
  220. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf +0 -0
  221. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-It.otf +0 -0
  222. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Light.otf +0 -0
  223. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-LightIt.otf +0 -0
  224. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Regular.otf +0 -0
  225. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Semibold.otf +0 -0
  226. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf +0 -0
  227. data/documents/app/assets/javascripts/social_stream/video.js.erb +0 -42
@@ -1,93 +0,0 @@
1
- Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
2
-
3
- This Font Software is licensed under the SIL Open Font License, Version 1.1.
4
-
5
- This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
6
-
7
-
8
- -----------------------------------------------------------
9
- SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
10
- -----------------------------------------------------------
11
-
12
- PREAMBLE
13
- The goals of the Open Font License (OFL) are to stimulate worldwide
14
- development of collaborative font projects, to support the font creation
15
- efforts of academic and linguistic communities, and to provide a free and
16
- open framework in which fonts may be shared and improved in partnership
17
- with others.
18
-
19
- The OFL allows the licensed fonts to be used, studied, modified and
20
- redistributed freely as long as they are not sold by themselves. The
21
- fonts, including any derivative works, can be bundled, embedded,
22
- redistributed and/or sold with any software provided that any reserved
23
- names are not used by derivative works. The fonts and derivatives,
24
- however, cannot be released under any other type of license. The
25
- requirement for fonts to remain under this license does not apply
26
- to any document created using the fonts or their derivatives.
27
-
28
- DEFINITIONS
29
- "Font Software" refers to the set of files released by the Copyright
30
- Holder(s) under this license and clearly marked as such. This may
31
- include source files, build scripts and documentation.
32
-
33
- "Reserved Font Name" refers to any names specified as such after the
34
- copyright statement(s).
35
-
36
- "Original Version" refers to the collection of Font Software components as
37
- distributed by the Copyright Holder(s).
38
-
39
- "Modified Version" refers to any derivative made by adding to, deleting,
40
- or substituting -- in part or in whole -- any of the components of the
41
- Original Version, by changing formats or by porting the Font Software to a
42
- new environment.
43
-
44
- "Author" refers to any designer, engineer, programmer, technical
45
- writer or other person who contributed to the Font Software.
46
-
47
- PERMISSION & CONDITIONS
48
- Permission is hereby granted, free of charge, to any person obtaining
49
- a copy of the Font Software, to use, study, copy, merge, embed, modify,
50
- redistribute, and sell modified and unmodified copies of the Font
51
- Software, subject to the following conditions:
52
-
53
- 1) Neither the Font Software nor any of its individual components,
54
- in Original or Modified Versions, may be sold by itself.
55
-
56
- 2) Original or Modified Versions of the Font Software may be bundled,
57
- redistributed and/or sold with any software, provided that each copy
58
- contains the above copyright notice and this license. These can be
59
- included either as stand-alone text files, human-readable headers or
60
- in the appropriate machine-readable metadata fields within text or
61
- binary files as long as those fields can be easily viewed by the user.
62
-
63
- 3) No Modified Version of the Font Software may use the Reserved Font
64
- Name(s) unless explicit written permission is granted by the corresponding
65
- Copyright Holder. This restriction only applies to the primary font name as
66
- presented to the users.
67
-
68
- 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
69
- Software shall not be used to promote, endorse or advertise any
70
- Modified Version, except to acknowledge the contribution(s) of the
71
- Copyright Holder(s) and the Author(s) or with their explicit written
72
- permission.
73
-
74
- 5) The Font Software, modified or unmodified, in part or in whole,
75
- must be distributed entirely under this license, and must not be
76
- distributed under any other license. The requirement for fonts to
77
- remain under this license does not apply to any document created
78
- using the Font Software.
79
-
80
- TERMINATION
81
- This license becomes null and void if any of the above conditions are
82
- not met.
83
-
84
- DISCLAIMER
85
- THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
86
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
87
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
88
- OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
89
- COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
90
- INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
91
- DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
92
- FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
93
- OTHER DEALINGS IN THE FONT SOFTWARE.
@@ -1,42 +0,0 @@
1
- //= require social_stream/callback
2
-
3
- SocialStream.Video = (function(SS, $, undefined){
4
- var callback = new SS.Callback();
5
-
6
- var initJplayer = function(){
7
- $(".jp-video .jp-jplayer").each(function() {
8
- $(this).jPlayer({
9
- ready: function () {
10
- $(this).jPlayer("setMedia", {
11
- webmv: $(this).closest(".video").find(".video-webm").attr("href"), // Defines the webm url
12
- flv: $(this).closest(".video").find(".video-flv").attr("href"), // Defines the flv url
13
- mp4: $(this).closest(".video").find(".video-mp4").attr("href") // Defines the mp4 url
14
- });
15
- },
16
- solution:"flash, html",
17
- preload: "none",
18
- supplied: "webmv, flv, mp4",
19
- swfPath: "<%= asset_path "" %>",
20
- cssSelectorAncestor: "#" + $(this).closest(".video-full").attr("id")
21
- })
22
- });
23
-
24
- $(".video .format-links").hide();
25
- $(".video-full").hide();
26
-
27
- $(".video .play_over").click(function(){
28
- var video = $(this).closest(".video")
29
- video.find(".thumb").hide();
30
- video.find(".text").hide();
31
- video.find(".jp-video-play").hide();
32
- video.find(".video-full").show();
33
- video.find(".jp-jplayer").jPlayer("play", 0);
34
- });
35
- }
36
-
37
- callback.register('show', initJplayer);
38
-
39
- return callback.extend({
40
- });
41
-
42
- })(SocialStream, jQuery);