social_stream-base 0.6.8 → 0.7.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (397) hide show
  1. data/.travis.yml +1 -0
  2. data/app/assets/images/btn/activity.png +0 -0
  3. data/app/assets/images/btn/post.png +0 -0
  4. data/app/assets/images/icons/favicon.ico +0 -0
  5. data/app/{views/activities/_jquery.html.erb → assets/javascripts/activities.js.erb} +24 -15
  6. data/app/assets/javascripts/ckeditor.rails.js.erb +4 -0
  7. data/app/assets/javascripts/contacts.js +10 -0
  8. data/app/assets/javascripts/conversations.js +3 -0
  9. data/app/assets/javascripts/groups.js +5 -0
  10. data/app/assets/javascripts/invitations.js +1 -0
  11. data/app/assets/javascripts/{main.js → layouts.js} +4 -11
  12. data/app/assets/javascripts/messages.js +3 -0
  13. data/app/assets/javascripts/profiles.js +6 -0
  14. data/app/{views/relation/customs/_jquery.erb → assets/javascripts/relation_customs.js} +12 -2
  15. data/app/assets/javascripts/settings.js +1 -1
  16. data/app/assets/javascripts/social_stream-base.js +6 -0
  17. data/app/assets/javascripts/toolbar.js +1 -0
  18. data/app/assets/javascripts/users.js +2 -0
  19. data/app/assets/stylesheets/base.css +18 -2
  20. data/app/controllers/contacts_controller.rb +18 -10
  21. data/app/helpers/notifications_helper.rb +13 -5
  22. data/app/models/activity.rb +14 -15
  23. data/app/models/actor.rb +7 -1
  24. data/app/models/relation.rb +1 -1
  25. data/app/models/tie.rb +1 -1
  26. data/app/views/activities/_index.html.erb +3 -9
  27. data/app/views/activities/_new.html.erb +8 -0
  28. data/app/views/contacts/_form.html.erb +0 -15
  29. data/app/views/contacts/_index.html.erb +7 -4
  30. data/app/views/contacts/index.html.erb +0 -4
  31. data/app/views/conversations/show.html.erb +0 -1
  32. data/app/views/conversations/show.js.erb +1 -3
  33. data/app/views/groups/_new.html.erb +0 -1
  34. data/app/views/groups/_sidebar_index.html.erb +0 -2
  35. data/app/views/groups/index.html.erb +0 -1
  36. data/app/views/groups/new.html.erb +0 -1
  37. data/app/views/invitation_mailer/send_invitation.html.erb +73 -65
  38. data/app/views/invitations/new.html.erb +1 -2
  39. data/app/views/layouts/_header.erb +1 -4
  40. data/app/views/layouts/application.html.erb +1 -1
  41. data/app/views/layouts/frontpage.html.erb +0 -2
  42. data/app/views/message_mailer/new_message_email.html.erb +20 -0
  43. data/app/views/message_mailer/new_message_email.text.erb +10 -0
  44. data/app/views/message_mailer/reply_message_email.html.erb +20 -0
  45. data/app/views/message_mailer/reply_message_email.text.erb +10 -0
  46. data/app/views/messages/new.html.erb +0 -1
  47. data/app/views/messages/new.js.erb +0 -2
  48. data/app/views/notification_mailer/new_notification_email.html.erb +2 -5
  49. data/app/views/notification_mailer/new_notification_email.text.erb +2 -4
  50. data/app/views/notifications/activities/_like_subject.html.erb +2 -2
  51. data/app/views/profiles/edit.html.erb +0 -8
  52. data/app/views/relation/customs/index.html.erb +0 -5
  53. data/app/views/settings/index.html.erb +1 -2
  54. data/app/views/settings/index.js.erb +0 -1
  55. data/app/views/toolbar/_home.html.erb +0 -1
  56. data/app/views/toolbar/_profile.html.erb +0 -1
  57. data/app/views/users/index.html.erb +0 -4
  58. data/config/locales/en.yml +12 -3
  59. data/lib/generators/social_stream/base/install_generator.rb +6 -0
  60. data/lib/social_stream-base.rb +2 -0
  61. data/lib/social_stream/base/version.rb +1 -1
  62. data/social_stream-base.gemspec +2 -0
  63. data/spec/controllers/posts_controller_spec.rb +19 -0
  64. data/spec/dummy/public/favicon.ico +0 -0
  65. data/spec/models/activity_authorization_spec.rb +10 -0
  66. data/spec/models/tie_spec.rb +10 -0
  67. data/{app → vendor}/assets/javascripts/ajax.paginate.js +0 -0
  68. data/{app → vendor}/assets/javascripts/ckeditor/.htaccess +0 -0
  69. data/{app → vendor}/assets/javascripts/ckeditor/adapters/jquery.js +0 -0
  70. data/vendor/assets/javascripts/ckeditor/ckeditor.js +147 -0
  71. data/vendor/assets/javascripts/ckeditor/ckeditor_basic.js +8 -0
  72. data/{app → vendor}/assets/javascripts/ckeditor/ckeditor_basic_source.js +1 -1
  73. data/{app → vendor}/assets/javascripts/ckeditor/ckeditor_source.js +1 -1
  74. data/{app → vendor}/assets/javascripts/ckeditor/config.js +0 -0
  75. data/vendor/assets/javascripts/ckeditor/contents.css +25 -0
  76. data/{app → vendor}/assets/javascripts/ckeditor/images/spacer.gif +0 -0
  77. data/{app → vendor}/assets/javascripts/ckeditor/lang/_languages.js +1 -1
  78. data/vendor/assets/javascripts/ckeditor/lang/_translationstatus.txt +61 -0
  79. data/vendor/assets/javascripts/ckeditor/lang/af.js +6 -0
  80. data/vendor/assets/javascripts/ckeditor/lang/ar.js +6 -0
  81. data/vendor/assets/javascripts/ckeditor/lang/bg.js +6 -0
  82. data/vendor/assets/javascripts/ckeditor/lang/bn.js +6 -0
  83. data/vendor/assets/javascripts/ckeditor/lang/bs.js +6 -0
  84. data/vendor/assets/javascripts/ckeditor/lang/ca.js +6 -0
  85. data/vendor/assets/javascripts/ckeditor/lang/cs.js +6 -0
  86. data/vendor/assets/javascripts/ckeditor/lang/cy.js +6 -0
  87. data/vendor/assets/javascripts/ckeditor/lang/da.js +6 -0
  88. data/vendor/assets/javascripts/ckeditor/lang/de.js +6 -0
  89. data/vendor/assets/javascripts/ckeditor/lang/el.js +6 -0
  90. data/vendor/assets/javascripts/ckeditor/lang/en-au.js +6 -0
  91. data/vendor/assets/javascripts/ckeditor/lang/en-ca.js +6 -0
  92. data/vendor/assets/javascripts/ckeditor/lang/en-gb.js +6 -0
  93. data/vendor/assets/javascripts/ckeditor/lang/en.js +6 -0
  94. data/vendor/assets/javascripts/ckeditor/lang/eo.js +6 -0
  95. data/vendor/assets/javascripts/ckeditor/lang/es.js +6 -0
  96. data/vendor/assets/javascripts/ckeditor/lang/et.js +6 -0
  97. data/vendor/assets/javascripts/ckeditor/lang/eu.js +6 -0
  98. data/vendor/assets/javascripts/ckeditor/lang/fa.js +6 -0
  99. data/vendor/assets/javascripts/ckeditor/lang/fi.js +6 -0
  100. data/vendor/assets/javascripts/ckeditor/lang/fo.js +6 -0
  101. data/vendor/assets/javascripts/ckeditor/lang/fr-ca.js +6 -0
  102. data/vendor/assets/javascripts/ckeditor/lang/fr.js +6 -0
  103. data/vendor/assets/javascripts/ckeditor/lang/gl.js +6 -0
  104. data/vendor/assets/javascripts/ckeditor/lang/gu.js +6 -0
  105. data/vendor/assets/javascripts/ckeditor/lang/he.js +6 -0
  106. data/vendor/assets/javascripts/ckeditor/lang/hi.js +6 -0
  107. data/vendor/assets/javascripts/ckeditor/lang/hr.js +6 -0
  108. data/vendor/assets/javascripts/ckeditor/lang/hu.js +6 -0
  109. data/vendor/assets/javascripts/ckeditor/lang/is.js +6 -0
  110. data/vendor/assets/javascripts/ckeditor/lang/it.js +6 -0
  111. data/vendor/assets/javascripts/ckeditor/lang/ja.js +6 -0
  112. data/vendor/assets/javascripts/ckeditor/lang/ka.js +6 -0
  113. data/vendor/assets/javascripts/ckeditor/lang/km.js +6 -0
  114. data/vendor/assets/javascripts/ckeditor/lang/ko.js +6 -0
  115. data/vendor/assets/javascripts/ckeditor/lang/lt.js +6 -0
  116. data/vendor/assets/javascripts/ckeditor/lang/lv.js +6 -0
  117. data/vendor/assets/javascripts/ckeditor/lang/mn.js +6 -0
  118. data/vendor/assets/javascripts/ckeditor/lang/ms.js +6 -0
  119. data/vendor/assets/javascripts/ckeditor/lang/nb.js +6 -0
  120. data/vendor/assets/javascripts/ckeditor/lang/nl.js +6 -0
  121. data/vendor/assets/javascripts/ckeditor/lang/no.js +6 -0
  122. data/vendor/assets/javascripts/ckeditor/lang/pl.js +6 -0
  123. data/vendor/assets/javascripts/ckeditor/lang/pt-br.js +6 -0
  124. data/vendor/assets/javascripts/ckeditor/lang/pt.js +6 -0
  125. data/vendor/assets/javascripts/ckeditor/lang/ro.js +6 -0
  126. data/vendor/assets/javascripts/ckeditor/lang/ru.js +6 -0
  127. data/vendor/assets/javascripts/ckeditor/lang/sk.js +6 -0
  128. data/vendor/assets/javascripts/ckeditor/lang/sl.js +6 -0
  129. data/vendor/assets/javascripts/ckeditor/lang/sr-latn.js +6 -0
  130. data/vendor/assets/javascripts/ckeditor/lang/sr.js +6 -0
  131. data/vendor/assets/javascripts/ckeditor/lang/sv.js +6 -0
  132. data/vendor/assets/javascripts/ckeditor/lang/th.js +6 -0
  133. data/vendor/assets/javascripts/ckeditor/lang/tr.js +6 -0
  134. data/vendor/assets/javascripts/ckeditor/lang/uk.js +6 -0
  135. data/vendor/assets/javascripts/ckeditor/lang/vi.js +6 -0
  136. data/vendor/assets/javascripts/ckeditor/lang/zh-cn.js +6 -0
  137. data/vendor/assets/javascripts/ckeditor/lang/zh.js +6 -0
  138. data/{app → vendor}/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js +1 -1
  139. data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/lang/en.js +6 -0
  140. data/{app → vendor}/assets/javascripts/ckeditor/plugins/a11yhelp/lang/he.js +0 -0
  141. data/{app → vendor}/assets/javascripts/ckeditor/plugins/about/dialogs/about.js +1 -1
  142. data/{app → vendor}/assets/javascripts/ckeditor/plugins/about/dialogs/logo_ckeditor.png +0 -0
  143. data/{app → vendor}/assets/javascripts/ckeditor/plugins/adobeair/plugin.js +0 -0
  144. data/vendor/assets/javascripts/ckeditor/plugins/ajax/plugin.js +6 -0
  145. data/vendor/assets/javascripts/ckeditor/plugins/autogrow/plugin.js +6 -0
  146. data/vendor/assets/javascripts/ckeditor/plugins/bbcode/plugin.js +9 -0
  147. data/vendor/assets/javascripts/ckeditor/plugins/clipboard/dialogs/paste.js +7 -0
  148. data/{app → vendor}/assets/javascripts/ckeditor/plugins/colordialog/dialogs/colordialog.js +0 -0
  149. data/vendor/assets/javascripts/ckeditor/plugins/devtools/lang/en.js +6 -0
  150. data/vendor/assets/javascripts/ckeditor/plugins/devtools/plugin.js +6 -0
  151. data/{app → vendor}/assets/javascripts/ckeditor/plugins/dialog/dialogDefinition.js +0 -0
  152. data/{app → vendor}/assets/javascripts/ckeditor/plugins/div/dialogs/div.js +0 -0
  153. data/vendor/assets/javascripts/ckeditor/plugins/docprops/dialogs/docprops.js +10 -0
  154. data/vendor/assets/javascripts/ckeditor/plugins/docprops/plugin.js +6 -0
  155. data/{app → vendor}/assets/javascripts/ckeditor/plugins/find/dialogs/find.js +3 -2
  156. data/vendor/assets/javascripts/ckeditor/plugins/flash/dialogs/flash.js +9 -0
  157. data/{app → vendor}/assets/javascripts/ckeditor/plugins/flash/images/placeholder.png +0 -0
  158. data/{app → vendor}/assets/javascripts/ckeditor/plugins/forms/dialogs/button.js +0 -0
  159. data/{app → vendor}/assets/javascripts/ckeditor/plugins/forms/dialogs/checkbox.js +0 -0
  160. data/{app → vendor}/assets/javascripts/ckeditor/plugins/forms/dialogs/form.js +0 -0
  161. data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/hiddenfield.js +6 -0
  162. data/{app → vendor}/assets/javascripts/ckeditor/plugins/forms/dialogs/radio.js +0 -0
  163. data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/select.js +9 -0
  164. data/{app → vendor}/assets/javascripts/ckeditor/plugins/forms/dialogs/textarea.js +0 -0
  165. data/{app → vendor}/assets/javascripts/ckeditor/plugins/forms/dialogs/textfield.js +0 -0
  166. data/{app → vendor}/assets/javascripts/ckeditor/plugins/forms/images/hiddenfield.gif +0 -0
  167. data/vendor/assets/javascripts/ckeditor/plugins/iframe/dialogs/iframe.js +7 -0
  168. data/{app → vendor}/assets/javascripts/ckeditor/plugins/iframe/images/placeholder.png +0 -0
  169. data/vendor/assets/javascripts/ckeditor/plugins/iframedialog/plugin.js +6 -0
  170. data/vendor/assets/javascripts/ckeditor/plugins/image/dialogs/image.js +13 -0
  171. data/vendor/assets/javascripts/ckeditor/plugins/link/dialogs/anchor.js +6 -0
  172. data/vendor/assets/javascripts/ckeditor/plugins/link/dialogs/link.js +12 -0
  173. data/{app → vendor}/assets/javascripts/ckeditor/plugins/link/images/anchor.gif +0 -0
  174. data/vendor/assets/javascripts/ckeditor/plugins/liststyle/dialogs/liststyle.js +7 -0
  175. data/{app → vendor}/assets/javascripts/ckeditor/plugins/pagebreak/images/pagebreak.gif +0 -0
  176. data/vendor/assets/javascripts/ckeditor/plugins/pastefromword/filter/default.js +11 -0
  177. data/vendor/assets/javascripts/ckeditor/plugins/pastetext/dialogs/pastetext.js +6 -0
  178. data/{app → vendor}/assets/javascripts/ckeditor/plugins/placeholder/dialogs/placeholder.js +0 -0
  179. data/{app → vendor}/assets/javascripts/ckeditor/plugins/placeholder/lang/en.js +0 -0
  180. data/vendor/assets/javascripts/ckeditor/plugins/placeholder/lang/he.js +6 -0
  181. data/{app → vendor}/assets/javascripts/ckeditor/plugins/placeholder/placeholder.gif +0 -0
  182. data/vendor/assets/javascripts/ckeditor/plugins/placeholder/plugin.js +6 -0
  183. data/vendor/assets/javascripts/ckeditor/plugins/scayt/dialogs/options.js +8 -0
  184. data/{app → vendor}/assets/javascripts/ckeditor/plugins/scayt/dialogs/toolbar.css +0 -0
  185. data/{app → vendor}/assets/javascripts/ckeditor/plugins/showblocks/images/block_address.png +0 -0
  186. data/{app → vendor}/assets/javascripts/ckeditor/plugins/showblocks/images/block_blockquote.png +0 -0
  187. data/{app → vendor}/assets/javascripts/ckeditor/plugins/showblocks/images/block_div.png +0 -0
  188. data/{app → vendor}/assets/javascripts/ckeditor/plugins/showblocks/images/block_h1.png +0 -0
  189. data/{app → vendor}/assets/javascripts/ckeditor/plugins/showblocks/images/block_h2.png +0 -0
  190. data/{app → vendor}/assets/javascripts/ckeditor/plugins/showblocks/images/block_h3.png +0 -0
  191. data/{app → vendor}/assets/javascripts/ckeditor/plugins/showblocks/images/block_h4.png +0 -0
  192. data/{app → vendor}/assets/javascripts/ckeditor/plugins/showblocks/images/block_h5.png +0 -0
  193. data/{app → vendor}/assets/javascripts/ckeditor/plugins/showblocks/images/block_h6.png +0 -0
  194. data/{app → vendor}/assets/javascripts/ckeditor/plugins/showblocks/images/block_p.png +0 -0
  195. data/{app → vendor}/assets/javascripts/ckeditor/plugins/showblocks/images/block_pre.png +0 -0
  196. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/dialogs/smiley.js +1 -1
  197. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/images/angel_smile.gif +0 -0
  198. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/images/angry_smile.gif +0 -0
  199. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/images/broken_heart.gif +0 -0
  200. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/images/confused_smile.gif +0 -0
  201. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/images/cry_smile.gif +0 -0
  202. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/images/devil_smile.gif +0 -0
  203. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/images/embaressed_smile.gif +0 -0
  204. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/images/envelope.gif +0 -0
  205. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/images/heart.gif +0 -0
  206. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/images/kiss.gif +0 -0
  207. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/images/lightbulb.gif +0 -0
  208. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/images/omg_smile.gif +0 -0
  209. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/images/regular_smile.gif +0 -0
  210. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/images/sad_smile.gif +0 -0
  211. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/images/shades_smile.gif +0 -0
  212. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/images/teeth_smile.gif +0 -0
  213. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/images/thumbs_down.gif +0 -0
  214. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/images/thumbs_up.gif +0 -0
  215. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/images/tounge_smile.gif +0 -0
  216. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif +0 -0
  217. data/{app → vendor}/assets/javascripts/ckeditor/plugins/smiley/images/wink_smile.gif +0 -0
  218. data/{app → vendor}/assets/javascripts/ckeditor/plugins/specialchar/dialogs/specialchar.js +1 -1
  219. data/vendor/assets/javascripts/ckeditor/plugins/specialchar/lang/en.js +6 -0
  220. data/{app → vendor}/assets/javascripts/ckeditor/plugins/styles/styles/default.js +0 -0
  221. data/vendor/assets/javascripts/ckeditor/plugins/stylesheetparser/plugin.js +6 -0
  222. data/vendor/assets/javascripts/ckeditor/plugins/table/dialogs/table.js +9 -0
  223. data/vendor/assets/javascripts/ckeditor/plugins/tableresize/plugin.js +7 -0
  224. data/{app → vendor}/assets/javascripts/ckeditor/plugins/tabletools/dialogs/tableCell.js +1 -1
  225. data/{app → vendor}/assets/javascripts/ckeditor/plugins/templates/dialogs/templates.js +1 -1
  226. data/{app → vendor}/assets/javascripts/ckeditor/plugins/templates/templates/default.js +0 -0
  227. data/{app → vendor}/assets/javascripts/ckeditor/plugins/templates/templates/images/template1.gif +0 -0
  228. data/{app → vendor}/assets/javascripts/ckeditor/plugins/templates/templates/images/template2.gif +0 -0
  229. data/{app → vendor}/assets/javascripts/ckeditor/plugins/templates/templates/images/template3.gif +0 -0
  230. data/{app → vendor}/assets/javascripts/ckeditor/plugins/uicolor/dialogs/uicolor.js +0 -0
  231. data/{app → vendor}/assets/javascripts/ckeditor/plugins/uicolor/lang/en.js +0 -0
  232. data/{app → vendor}/assets/javascripts/ckeditor/plugins/uicolor/lang/he.js +0 -0
  233. data/{app → vendor}/assets/javascripts/ckeditor/plugins/uicolor/plugin.js +0 -0
  234. data/{app → vendor}/assets/javascripts/ckeditor/plugins/uicolor/uicolor.gif +0 -0
  235. data/{app → vendor}/assets/javascripts/ckeditor/plugins/uicolor/yui/assets/hue_bg.png +0 -0
  236. data/{app → vendor}/assets/javascripts/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png +0 -0
  237. data/{app → vendor}/assets/javascripts/ckeditor/plugins/uicolor/yui/assets/picker_mask.png +0 -0
  238. data/{app → vendor}/assets/javascripts/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png +0 -0
  239. data/{app → vendor}/assets/javascripts/ckeditor/plugins/uicolor/yui/assets/yui.css +0 -0
  240. data/{app → vendor}/assets/javascripts/ckeditor/plugins/uicolor/yui/yui.js +0 -0
  241. data/{app → vendor}/assets/javascripts/ckeditor/plugins/wsc/dialogs/ciframe.html +0 -0
  242. data/{app → vendor}/assets/javascripts/ckeditor/plugins/wsc/dialogs/tmpFrameset.html +0 -0
  243. data/{app → vendor}/assets/javascripts/ckeditor/plugins/wsc/dialogs/wsc.css +0 -0
  244. data/{app → vendor}/assets/javascripts/ckeditor/plugins/wsc/dialogs/wsc.js +0 -0
  245. data/vendor/assets/javascripts/ckeditor/plugins/xml/plugin.js +6 -0
  246. data/vendor/assets/javascripts/ckeditor/skins/kama/dialog.css +10 -0
  247. data/vendor/assets/javascripts/ckeditor/skins/kama/editor.css +13 -0
  248. data/{app → vendor}/assets/javascripts/ckeditor/skins/kama/icons.png +0 -0
  249. data/{app → vendor}/assets/javascripts/ckeditor/skins/kama/icons_rtl.png +0 -0
  250. data/{app → vendor}/assets/javascripts/ckeditor/skins/kama/images/dialog_sides.gif +0 -0
  251. data/{app → vendor}/assets/javascripts/ckeditor/skins/kama/images/dialog_sides.png +0 -0
  252. data/{app → vendor}/assets/javascripts/ckeditor/skins/kama/images/dialog_sides_rtl.png +0 -0
  253. data/{app → vendor}/assets/javascripts/ckeditor/skins/kama/images/mini.gif +0 -0
  254. data/{app → vendor}/assets/javascripts/ckeditor/skins/kama/images/noimage.png +0 -0
  255. data/{app → vendor}/assets/javascripts/ckeditor/skins/kama/images/sprites.png +0 -0
  256. data/{app → vendor}/assets/javascripts/ckeditor/skins/kama/images/sprites_ie6.png +0 -0
  257. data/{app → vendor}/assets/javascripts/ckeditor/skins/kama/images/toolbar_start.gif +0 -0
  258. data/vendor/assets/javascripts/ckeditor/skins/kama/skin.js +7 -0
  259. data/{app → vendor}/assets/javascripts/ckeditor/skins/kama/templates.css +0 -0
  260. data/vendor/assets/javascripts/ckeditor/skins/office2003/dialog.css +9 -0
  261. data/{app → vendor}/assets/javascripts/ckeditor/skins/office2003/editor.css +5 -5
  262. data/{app → vendor}/assets/javascripts/ckeditor/skins/office2003/icons.png +0 -0
  263. data/{app → vendor}/assets/javascripts/ckeditor/skins/office2003/icons_rtl.png +0 -0
  264. data/{app → vendor}/assets/javascripts/ckeditor/skins/office2003/images/dialog_sides.gif +0 -0
  265. data/{app → vendor}/assets/javascripts/ckeditor/skins/office2003/images/dialog_sides.png +0 -0
  266. data/{app → vendor}/assets/javascripts/ckeditor/skins/office2003/images/dialog_sides_rtl.png +0 -0
  267. data/{app → vendor}/assets/javascripts/ckeditor/skins/office2003/images/mini.gif +0 -0
  268. data/{app → vendor}/assets/javascripts/ckeditor/skins/office2003/images/noimage.png +0 -0
  269. data/{app → vendor}/assets/javascripts/ckeditor/skins/office2003/images/sprites.png +0 -0
  270. data/{app → vendor}/assets/javascripts/ckeditor/skins/office2003/images/sprites_ie6.png +0 -0
  271. data/vendor/assets/javascripts/ckeditor/skins/office2003/skin.js +6 -0
  272. data/{app → vendor}/assets/javascripts/ckeditor/skins/office2003/templates.css +0 -0
  273. data/{app → vendor}/assets/javascripts/ckeditor/skins/v2/dialog.css +3 -3
  274. data/{app → vendor}/assets/javascripts/ckeditor/skins/v2/editor.css +4 -4
  275. data/{app → vendor}/assets/javascripts/ckeditor/skins/v2/icons.png +0 -0
  276. data/{app → vendor}/assets/javascripts/ckeditor/skins/v2/icons_rtl.png +0 -0
  277. data/{app → vendor}/assets/javascripts/ckeditor/skins/v2/images/dialog_sides.gif +0 -0
  278. data/{app → vendor}/assets/javascripts/ckeditor/skins/v2/images/dialog_sides.png +0 -0
  279. data/{app → vendor}/assets/javascripts/ckeditor/skins/v2/images/dialog_sides_rtl.png +0 -0
  280. data/{app → vendor}/assets/javascripts/ckeditor/skins/v2/images/mini.gif +0 -0
  281. data/{app → vendor}/assets/javascripts/ckeditor/skins/v2/images/noimage.png +0 -0
  282. data/{app → vendor}/assets/javascripts/ckeditor/skins/v2/images/sprites.png +0 -0
  283. data/{app → vendor}/assets/javascripts/ckeditor/skins/v2/images/sprites_ie6.png +0 -0
  284. data/{app → vendor}/assets/javascripts/ckeditor/skins/v2/images/toolbar_start.gif +0 -0
  285. data/vendor/assets/javascripts/ckeditor/skins/v2/skin.js +6 -0
  286. data/{app → vendor}/assets/javascripts/ckeditor/skins/v2/templates.css +0 -0
  287. data/vendor/assets/javascripts/ckeditor/themes/default/theme.js +8 -0
  288. data/{app → vendor}/assets/javascripts/hoverIntent.js +0 -0
  289. data/vendor/assets/javascripts/jqcloud-0.1.3.js +87 -0
  290. data/{app → vendor}/assets/javascripts/jquery.ba-url.js +0 -0
  291. data/{app → vendor}/assets/javascripts/jquery.fcbkcomplete.js +0 -0
  292. data/{app → vendor}/assets/javascripts/jquery.livequery.js +0 -0
  293. data/{app → vendor}/assets/javascripts/jquery.scrollTo.min.js +0 -0
  294. data/{app → vendor}/assets/javascripts/jquery.validate.js +0 -0
  295. data/{app → vendor}/assets/javascripts/menu.js +0 -0
  296. data/{app → vendor}/assets/javascripts/superfish.js +0 -0
  297. data/{app → vendor}/assets/javascripts/ui.checkbox.js +0 -0
  298. metadata +288 -257
  299. data/app/assets/javascripts/ckeditor/ckeditor.js +0 -141
  300. data/app/assets/javascripts/ckeditor/ckeditor_basic.js +0 -8
  301. data/app/assets/javascripts/ckeditor/contents.css +0 -45
  302. data/app/assets/javascripts/ckeditor/lang/_translationstatus.txt +0 -60
  303. data/app/assets/javascripts/ckeditor/lang/af.js +0 -6
  304. data/app/assets/javascripts/ckeditor/lang/ar.js +0 -6
  305. data/app/assets/javascripts/ckeditor/lang/bg.js +0 -6
  306. data/app/assets/javascripts/ckeditor/lang/bn.js +0 -6
  307. data/app/assets/javascripts/ckeditor/lang/bs.js +0 -6
  308. data/app/assets/javascripts/ckeditor/lang/ca.js +0 -6
  309. data/app/assets/javascripts/ckeditor/lang/cs.js +0 -6
  310. data/app/assets/javascripts/ckeditor/lang/cy.js +0 -6
  311. data/app/assets/javascripts/ckeditor/lang/da.js +0 -6
  312. data/app/assets/javascripts/ckeditor/lang/de.js +0 -6
  313. data/app/assets/javascripts/ckeditor/lang/el.js +0 -6
  314. data/app/assets/javascripts/ckeditor/lang/en-au.js +0 -6
  315. data/app/assets/javascripts/ckeditor/lang/en-ca.js +0 -6
  316. data/app/assets/javascripts/ckeditor/lang/en-gb.js +0 -6
  317. data/app/assets/javascripts/ckeditor/lang/en.js +0 -6
  318. data/app/assets/javascripts/ckeditor/lang/eo.js +0 -6
  319. data/app/assets/javascripts/ckeditor/lang/es.js +0 -6
  320. data/app/assets/javascripts/ckeditor/lang/et.js +0 -6
  321. data/app/assets/javascripts/ckeditor/lang/eu.js +0 -6
  322. data/app/assets/javascripts/ckeditor/lang/fa.js +0 -6
  323. data/app/assets/javascripts/ckeditor/lang/fi.js +0 -6
  324. data/app/assets/javascripts/ckeditor/lang/fo.js +0 -6
  325. data/app/assets/javascripts/ckeditor/lang/fr-ca.js +0 -6
  326. data/app/assets/javascripts/ckeditor/lang/fr.js +0 -6
  327. data/app/assets/javascripts/ckeditor/lang/gl.js +0 -6
  328. data/app/assets/javascripts/ckeditor/lang/gu.js +0 -6
  329. data/app/assets/javascripts/ckeditor/lang/he.js +0 -6
  330. data/app/assets/javascripts/ckeditor/lang/hi.js +0 -6
  331. data/app/assets/javascripts/ckeditor/lang/hr.js +0 -6
  332. data/app/assets/javascripts/ckeditor/lang/hu.js +0 -6
  333. data/app/assets/javascripts/ckeditor/lang/is.js +0 -6
  334. data/app/assets/javascripts/ckeditor/lang/it.js +0 -6
  335. data/app/assets/javascripts/ckeditor/lang/ja.js +0 -6
  336. data/app/assets/javascripts/ckeditor/lang/km.js +0 -6
  337. data/app/assets/javascripts/ckeditor/lang/ko.js +0 -6
  338. data/app/assets/javascripts/ckeditor/lang/lt.js +0 -6
  339. data/app/assets/javascripts/ckeditor/lang/lv.js +0 -6
  340. data/app/assets/javascripts/ckeditor/lang/mn.js +0 -6
  341. data/app/assets/javascripts/ckeditor/lang/ms.js +0 -6
  342. data/app/assets/javascripts/ckeditor/lang/nb.js +0 -6
  343. data/app/assets/javascripts/ckeditor/lang/nl.js +0 -6
  344. data/app/assets/javascripts/ckeditor/lang/no.js +0 -6
  345. data/app/assets/javascripts/ckeditor/lang/pl.js +0 -6
  346. data/app/assets/javascripts/ckeditor/lang/pt-br.js +0 -6
  347. data/app/assets/javascripts/ckeditor/lang/pt.js +0 -6
  348. data/app/assets/javascripts/ckeditor/lang/ro.js +0 -6
  349. data/app/assets/javascripts/ckeditor/lang/ru.js +0 -6
  350. data/app/assets/javascripts/ckeditor/lang/sk.js +0 -6
  351. data/app/assets/javascripts/ckeditor/lang/sl.js +0 -6
  352. data/app/assets/javascripts/ckeditor/lang/sr-latn.js +0 -6
  353. data/app/assets/javascripts/ckeditor/lang/sr.js +0 -6
  354. data/app/assets/javascripts/ckeditor/lang/sv.js +0 -6
  355. data/app/assets/javascripts/ckeditor/lang/th.js +0 -6
  356. data/app/assets/javascripts/ckeditor/lang/tr.js +0 -6
  357. data/app/assets/javascripts/ckeditor/lang/uk.js +0 -6
  358. data/app/assets/javascripts/ckeditor/lang/vi.js +0 -6
  359. data/app/assets/javascripts/ckeditor/lang/zh-cn.js +0 -6
  360. data/app/assets/javascripts/ckeditor/lang/zh.js +0 -6
  361. data/app/assets/javascripts/ckeditor/plugins/a11yhelp/lang/en.js +0 -6
  362. data/app/assets/javascripts/ckeditor/plugins/autogrow/plugin.js +0 -6
  363. data/app/assets/javascripts/ckeditor/plugins/clipboard/dialogs/paste.js +0 -7
  364. data/app/assets/javascripts/ckeditor/plugins/flash/dialogs/flash.js +0 -9
  365. data/app/assets/javascripts/ckeditor/plugins/forms/dialogs/hiddenfield.js +0 -6
  366. data/app/assets/javascripts/ckeditor/plugins/forms/dialogs/select.js +0 -9
  367. data/app/assets/javascripts/ckeditor/plugins/iframe/dialogs/iframe.js +0 -7
  368. data/app/assets/javascripts/ckeditor/plugins/iframedialog/plugin.js +0 -6
  369. data/app/assets/javascripts/ckeditor/plugins/image/dialogs/image.js +0 -13
  370. data/app/assets/javascripts/ckeditor/plugins/link/dialogs/anchor.js +0 -6
  371. data/app/assets/javascripts/ckeditor/plugins/link/dialogs/link.js +0 -11
  372. data/app/assets/javascripts/ckeditor/plugins/liststyle/dialogs/liststyle.js +0 -6
  373. data/app/assets/javascripts/ckeditor/plugins/pastefromword/filter/default.js +0 -10
  374. data/app/assets/javascripts/ckeditor/plugins/pastetext/dialogs/pastetext.js +0 -6
  375. data/app/assets/javascripts/ckeditor/plugins/placeholder/plugin.js +0 -6
  376. data/app/assets/javascripts/ckeditor/plugins/scayt/dialogs/options.js +0 -8
  377. data/app/assets/javascripts/ckeditor/plugins/specialchar/lang/en.js +0 -6
  378. data/app/assets/javascripts/ckeditor/plugins/table/dialogs/table.js +0 -9
  379. data/app/assets/javascripts/ckeditor/plugins/tableresize/plugin.js +0 -7
  380. data/app/assets/javascripts/ckeditor/skins/kama/dialog.css +0 -9
  381. data/app/assets/javascripts/ckeditor/skins/kama/editor.css +0 -13
  382. data/app/assets/javascripts/ckeditor/skins/kama/skin.js +0 -7
  383. data/app/assets/javascripts/ckeditor/skins/office2003/dialog.css +0 -9
  384. data/app/assets/javascripts/ckeditor/skins/office2003/skin.js +0 -6
  385. data/app/assets/javascripts/ckeditor/skins/v2/skin.js +0 -6
  386. data/app/assets/javascripts/ckeditor/themes/default/theme.js +0 -8
  387. data/app/assets/javascripts/jqcloud-0.1.3.min.js +0 -11
  388. data/app/assets/javascripts/jquery.boxy.js +0 -570
  389. data/app/assets/javascripts/jquery.fcbkcomplete.min.js +0 -2
  390. data/app/assets/javascripts/menu-collapsed.js +0 -42
  391. data/app/assets/javascripts/modernizr.min.js +0 -4
  392. data/app/assets/javascripts/rails.js +0 -158
  393. data/app/assets/javascripts/ui.dropdownchecklist.js +0 -922
  394. data/app/views/contacts/_edit.html.erb +0 -76
  395. data/app/views/home/_menu.html.erb +0 -46
  396. data/app/views/posts/_header.html.erb +0 -1
  397. data/app/views/subjects/_tabs.html.erb +0 -38
@@ -1,20 +1,5 @@
1
1
  <% content_for :headers do %>
2
2
  <%= stylesheet_link_tag "contacts.css", :media => "screen, projection" %>
3
- <%= javascript_include_tag 'ui.checkbox'%>
4
- <% end %>
5
-
6
- <%= javascript_tag do %>
7
- $(function() {
8
- $('input[id^="relation_custom"]').checkBox();
9
- })
10
-
11
- function checkBoxEnable(id) {
12
- $('div[contain$=' + id + ']').addClass("checked-option");
13
- }
14
-
15
- function checkBoxDisable(id) {
16
- $('div[contain$='+id+']').removeClass("checked-option");
17
- }
18
3
  <% end %>
19
4
 
20
5
  <div id="contact-form">
@@ -1,11 +1,14 @@
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>
1
8
  <% cont=0; %>
2
9
 
3
10
  <% @contacts.each do |contact| %>
4
- <% if params[:pending].present? %>
5
- <% contact = contact.sender.subject %>
6
- <% else %>
7
11
  <% contact = contact.receiver.subject %>
8
- <% end %>
9
12
  <% if (cont%2) == 0 %>
10
13
  <% cont+=1; %>
11
14
  <div class="row">
@@ -2,10 +2,6 @@
2
2
  <%= t('contact.other')%>
3
3
  <%end%>
4
4
 
5
- <% content_for :headers do %>
6
- <%= javascript_include_tag 'jquery.ba-url','ajax.paginate' %>
7
- <% end %>
8
-
9
5
  <% content_for :sidebar do %>
10
6
  <%= render :partial => 'home/sidebar' %>
11
7
  <% end %>
@@ -10,7 +10,6 @@
10
10
 
11
11
  <% content_for :headers do %>
12
12
  <%= stylesheet_link_tag "messages.css", :media => "screen, projection" %>
13
- <%= javascript_include_tag 'ckeditor/ckeditor.js','ckeditor/adapters/jquery.js','jquery.scrollTo.min.js', 'jquery.validate' %>
14
13
  <% end %>
15
14
 
16
15
  <% content_for :javascript do %>
@@ -2,8 +2,6 @@ $("#content").html("<%= escape_javascript(render :partial => 'show') %>");
2
2
 
3
3
  $("head").append($("<%= escape_javascript(stylesheet_link_tag "messages.css", :media => "screen, projection") %>"));
4
4
 
5
- $("head").append($("<%= escape_javascript(javascript_include_tag 'ckeditor/ckeditor.js','ckeditor/adapters/jquery.js','jquery.scrollTo.min.js', 'jquery.validate') %>"));
6
-
7
5
  <%= toolbar :option => :messages %>
8
6
 
9
7
  $('.cont_conversation').validate();
@@ -38,4 +36,4 @@ $('.cont_conversation').validate();
38
36
  }else{
39
37
  $.scrollTo('#message_<%= @conversation.last_message.id %>',1500,{axis:'y'});
40
38
  }
41
- <% end %>
39
+ <% end %>
@@ -1,6 +1,5 @@
1
1
  <% content_for :headers do %>
2
2
  <%= stylesheet_link_tag "fcbkComplete.css", :media => "screen, projection" %>
3
- <%= javascript_include_tag 'jquery.fcbkcomplete.min', 'jquery.validate' %>
4
3
  <% end %>
5
4
 
6
5
  <% content_for :javascript do %>
@@ -14,8 +14,6 @@
14
14
 
15
15
  <%= render :partial => 'contacts/suggestions_and_pendings' %>
16
16
 
17
- <%= javascript_include_tag "jqcloud-0.1.3.min.js" %>
18
-
19
17
  <% tags = ActivityObject.tag_counts %>
20
18
 
21
19
  <script type="text/javascript">
@@ -2,7 +2,6 @@
2
2
  <%= t('group.other') %>
3
3
  <%end%>
4
4
  <% content_for :headers do -%>
5
- <%= javascript_include_tag 'jqcloud-0.1.3.min','jquery.ba-url','ajax.paginate' %>
6
5
  <%= stylesheet_link_tag 'smoothness/jquery-ui-1.8.4.custom' %>
7
6
  <% end -%>
8
7
 
@@ -3,7 +3,6 @@
3
3
  <%end%>
4
4
  <% content_for :headers do %>
5
5
  <%= stylesheet_link_tag "fcbkComplete.css", :media => "screen, projection" %>
6
- <%= javascript_include_tag 'jquery.fcbkcomplete.min', 'jquery.validate' %>
7
6
  <% end %>
8
7
 
9
8
  <% toolbar :option => 'groups' %>
@@ -1,71 +1,79 @@
1
- <div>
2
- <div>
3
- <div style="padding: 10px 5px 5px 5px;">
4
- <span id="name" style="font-weight: bold;"><%= @sender.name %></span> has invited you to <%= link_to( t('socialstream'), new_user_registration_url)%>
5
- </div>
6
- <div style="position: static;padding: 5px; border: #2A3890 solid 2px; background-color: #E1EEF5; margin:10px; min-height: 125px; width: 500px;">
7
- <div style="float:left; margin-right:7px; border: thin solid #D4E4EA; background-color: white; max-height: 119px;">
8
- <img src="http://<%= ActionMailer::Base.default_url_options[:host] +@sender.logo.url(:profile)%>" alt="<%=@sender.name%>">
9
- </div>
10
- <div style=" margin: 5px 5px 5px 5px;">
11
- <p style="font-weight: bold; "><%= @sender.name %>
12
- <% if @sender.profile.organization? %>
13
- <br/><span style="color: #6C6D6F; font-weight: normal;"><%= @sender.profile.organization%></span>
14
- <% end %>
15
- </p>
16
- <% if @message.blank? %>
17
- <p style="text-align: justify;"><%= t('invitation.join_me')%></p>
18
- <%else%>
19
- <p style="text-align: justify; font-style: italic;">"<%= @message%>"</p>
20
- <%end%>
21
- </div>
22
- </div>
23
- </div>
24
- <div style="padding: 10px 5px 5px 5px;">
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+ <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
5
+ </head>
6
+ <body>
25
7
  <div>
26
8
  <div>
27
- <%= t('frontpage.share.default')%>:
9
+ <div style="padding: 10px 5px 5px 5px;">
10
+ <span id="name" style="font-weight: bold;"><%= @sender.name %></span> has invited you to <%= link_to( t('socialstream'), new_user_registration_url)%>
11
+ </div>
12
+ <div style="position: static;padding: 5px; border: #2A3890 solid 2px; background-color: #E1EEF5; margin:10px; min-height: 125px; width: 500px;">
13
+ <div style="float:left; margin-right:7px; border: thin solid #D4E4EA; background-color: white; max-height: 119px;">
14
+ <img src="http://<%= ActionMailer::Base.default_url_options[:host] +@sender.logo.url(:profile)%>" alt="<%=@sender.name%>">
15
+ </div>
16
+ <div style=" margin: 5px 5px 5px 5px;">
17
+ <p style="font-weight: bold; "><%= @sender.name %>
18
+ <% if @sender.profile.organization? %>
19
+ <br/><span style="color: #6C6D6F; font-weight: normal;"><%= @sender.profile.organization%></span>
20
+ <% end %>
21
+ </p>
22
+ <% if @message.blank? %>
23
+ <p style="text-align: justify;"><%= t('invitation.join_me')%></p>
24
+ <%else%>
25
+ <p style="text-align: justify; font-style: italic;">"<%= @message%>"</p>
26
+ <%end%>
27
+ </div>
28
+ </div>
28
29
  </div>
29
- <div>
30
- <ul>
31
- <li>
32
- <%= t('frontpage.share.sentence1') %>
33
- </li>
34
- <li>
35
- <%= t('frontpage.share.sentence2') %>
36
- </li>
37
- </ul>
38
- </div>
39
- </div>
40
-
41
- <div>
42
- <div>
43
- <%= t('frontpage.meet.default')%>:
44
- </div>
45
- <div>
46
- <ul>
47
- <li>
48
- <%= t('frontpage.meet.sentence1') %>
49
- </li>
50
- </ul>
51
- </div>
52
- </div>
53
-
54
- <div>
55
- <div>
56
- <%= t('frontpage.collaborate.default')%>:
57
- </div>
58
- <div>
59
- <ul>
60
- <li>
61
- <%= t('frontpage.collaborate.sentence1') %>
62
- </li>
63
- <li>
64
- <%= t('frontpage.collaborate.sentence2') %>
65
- </li>
66
- </ul>
30
+ <div style="padding: 10px 5px 5px 5px;">
31
+ <div>
32
+ <div>
33
+ <%= t('frontpage.share.default')%>:
34
+ </div>
35
+ <div>
36
+ <ul>
37
+ <li>
38
+ <%= t('frontpage.share.sentence1') %>
39
+ </li>
40
+ <li>
41
+ <%= t('frontpage.share.sentence2') %>
42
+ </li>
43
+ </ul>
44
+ </div>
45
+ </div>
46
+
47
+ <div>
48
+ <div>
49
+ <%= t('frontpage.meet.default')%>:
50
+ </div>
51
+ <div>
52
+ <ul>
53
+ <li>
54
+ <%= t('frontpage.meet.sentence1') %>
55
+ </li>
56
+ </ul>
57
+ </div>
58
+ </div>
59
+
60
+ <div>
61
+ <div>
62
+ <%= t('frontpage.collaborate.default')%>:
63
+ </div>
64
+ <div>
65
+ <ul>
66
+ <li>
67
+ <%= t('frontpage.collaborate.sentence1') %>
68
+ </li>
69
+ <li>
70
+ <%= t('frontpage.collaborate.sentence2') %>
71
+ </li>
72
+ </ul>
73
+ </div>
74
+ </div>
67
75
  </div>
68
76
  </div>
69
- </div>
70
- </div>
77
+ </body>
78
+ </html>
71
79
 
@@ -5,7 +5,6 @@
5
5
  <% end %>
6
6
 
7
7
  <% content_for :headers do %>
8
- <%= javascript_include_tag 'jquery.validate' %>
9
8
  <%= stylesheet_link_tag "jquery-ui", :media => "screen, projection" %>
10
9
  <% end %>
11
10
 
@@ -13,4 +12,4 @@
13
12
  link_to(image_tag("btn/btn_invitation.png", :class => "menu_icon")+t('invitation.other'), new_invitation_path)
14
13
  ) %>
15
14
 
16
- <%= render :partial => 'new' %>
15
+ <%= render :partial => 'new' %>
@@ -1,6 +1,3 @@
1
- <% content_for :headers do %>
2
- <%= javascript_include_tag 'hoverIntent','superfish' %>
3
- <% end %>
4
1
  <div id="headerFront">
5
2
  <div class="banner_top banner_top_height">
6
3
  <div id="header_left">
@@ -39,4 +36,4 @@
39
36
  <% end %>
40
37
  </div>
41
38
  </div>
42
- </div>
39
+ </div>
@@ -8,7 +8,7 @@
8
8
  <meta name="description" content= "<%= yield(:description).empty? ? t('frontpage.main_title') : yield(:description) %>" >
9
9
  <%= stylesheet_link_tag "base", "header","home","footer",
10
10
  :media => "screen, projection" %>
11
- <%= javascript_include_tag 'jquery.min', 'jquery-ui.min','rails', 'jquery.livequery', 'ui.dropdownchecklist','modernizr.min'%>
11
+ <%= javascript_include_tag 'application' %>
12
12
 
13
13
  <%= yield :headers %>
14
14
 
@@ -8,8 +8,6 @@
8
8
  <meta name="description" content= "<%= yield(:description).empty? ? "Home" : yield(:description) %>" >
9
9
  <%= stylesheet_link_tag "header","frontpage", "base", "footer",
10
10
  :media => "screen, projection" %>
11
- <%= javascript_include_tag 'jquery', 'jquery.livequery' %>
12
-
13
11
  <%= favicon_link_tag "icons/favicon.ico" %>
14
12
 
15
13
  <% if protect_against_forgery? %>
@@ -0,0 +1,20 @@
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+ <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
5
+ </head>
6
+ <body>
7
+ <h1>You have a new message: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %></h1>
8
+ <p>
9
+ You have received a new message:
10
+ </p>
11
+ <blockquote>
12
+ <p>
13
+ <%= raw @message.body %>
14
+ </p>
15
+ </blockquote>
16
+ <p>
17
+ Visit <%= link_to root_url,root_url %> and go to your inbox for more info.
18
+ </p>
19
+ </body>
20
+ </html>
@@ -0,0 +1,10 @@
1
+ You have a new message: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %>
2
+ ===============================================
3
+
4
+ You have received a new message:
5
+
6
+ -----------------------------------------------
7
+ <%= @message.body.html_safe? ? @message.body : strip_tags(@message.body) %>
8
+ -----------------------------------------------
9
+
10
+ Visit <%= root_url %> and go to your inbox for more info.
@@ -0,0 +1,20 @@
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+ <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
5
+ </head>
6
+ <body>
7
+ <h1>You have a new reply: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %></h1>
8
+ <p>
9
+ You have received a new reply:
10
+ </p>
11
+ <blockquote>
12
+ <p>
13
+ <%= raw @message.body %>
14
+ </p>
15
+ </blockquote>
16
+ <p>
17
+ Visit <%= link_to root_url,root_url %> and go to your inbox for more info.
18
+ </p>
19
+ </body>
20
+ </html>
@@ -0,0 +1,10 @@
1
+ You have a new reply: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %>
2
+ ===============================================
3
+
4
+ You have received a new reply:
5
+
6
+ -----------------------------------------------
7
+ <%= @message.body.html_safe? ? @message.body : strip_tags(@message.body) %>
8
+ -----------------------------------------------
9
+
10
+ Visit <%= root_url %> and go to your inbox for more info.
@@ -10,7 +10,6 @@
10
10
  <% content_for :headers do %>
11
11
  <%= stylesheet_link_tag "messages.css", :media => "screen, projection" %>
12
12
  <%= stylesheet_link_tag "fcbkComplete.css", :media => "screen, projection" %>
13
- <%= javascript_include_tag 'jquery.fcbkcomplete.min','jquery.validate','ckeditor/ckeditor.js','ckeditor/adapters/jquery.js' %>
14
13
  <% end %>
15
14
 
16
15
  <% content_for :javascript do %>
@@ -3,8 +3,6 @@ $("#content").html("<%= escape_javascript(render :partial => 'new') %>");
3
3
  $("head").append($("<%= escape_javascript(stylesheet_link_tag "messages.css", :media => "screen, projection") %>"));
4
4
  $("head").append($("<%= escape_javascript(stylesheet_link_tag "fcbkComplete.css", :media => "screen, projection") %>"));
5
5
 
6
- $("head").append($("<%= escape_javascript(javascript_include_tag 'jquery.fcbkcomplete.min','jquery.validate','ckeditor/ckeditor.js','ckeditor/adapters/jquery.js') %>"));
7
-
8
6
  <%= toolbar :option => :messages %>
9
7
 
10
8
 
@@ -5,17 +5,14 @@
5
5
  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
6
6
  </head>
7
7
  <body>
8
- <h1>You have a new notification: <%= strip_tags decode_notification @notification.subject,@notification.object %></h1>
9
- <p>
10
- You have received a new notification:
11
- </p>
8
+ <h1><%= raw decode_notification @notification.subject,@notification.object %></h1>
12
9
  <blockquote>
13
10
  <p>
14
11
  <%= raw decode_notification @notification.body,@notification.object %>
15
12
  </p>
16
13
  </blockquote>
17
14
  <p>
18
- Visit <%= link_to root_url,root_url %> and go to your notifications for more info.
15
+ Visit <%= link_to notifications_url,notifications_url %> and check all your notifications.
19
16
  </p>
20
17
  </body>
21
18
  </html>
@@ -1,11 +1,9 @@
1
1
  <% self.class.send :include, NotificationsHelper %>
2
- You have a new notification: <%= strip_tags decode_notification @notification.subject,@notification.object %>
2
+ <%= strip_tags decode_notification @notification.subject,@notification.object %>
3
3
  ===============================================
4
-
5
- You have received a new notification:
6
4
 
7
5
  -----------------------------------------------
8
6
  <%= strip_tags decode_notification @notification.body,@notification.object %>
9
7
  -----------------------------------------------
10
8
 
11
- Visit <%= root_url %> and go to your notifications for more info.
9
+ Visit <%= link_to notifications_url,notifications_url %> and check all your notifications.
@@ -1,5 +1,5 @@
1
1
  <% if activity.direct_object.is_a? Actor %>
2
- %{sender.name} is now your fan.
2
+ %{sender} is now your fan.
3
3
  <% else %>
4
- %{sender.name} likes your %{object.name}
4
+ %{sender} likes your %{object.name}
5
5
  <% end %>
@@ -6,13 +6,6 @@
6
6
 
7
7
  <% content_for :headers do %>
8
8
  <%= stylesheet_link_tag "jquery-ui", :media => "screen, projection" %>
9
- <%= javascript_include_tag 'jquery.validate' %>
10
- <% end %>
11
-
12
- <% content_for :javascript do %>
13
- $(function() {
14
- $(".edit_profile").validate();
15
- });
16
9
  <% end %>
17
10
 
18
11
  <%if params[:section].present?
@@ -48,7 +41,6 @@ end %>
48
41
  <% if !params[:section].present? or params[:section].eql?("tags") %>
49
42
  <% content_for :headers do %>
50
43
  <%= stylesheet_link_tag "fcbkComplete.css", :media => "screen, projection" %>
51
- <%= javascript_include_tag 'jquery.fcbkcomplete.min', 'jquery.validate' %>
52
44
  <% end %>
53
45
 
54
46
  <% content_for :javascript do %>