community_engine 2.3.2 → 3.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (580) hide show
  1. checksums.yaml +13 -5
  2. data/.travis.yml +5 -4
  3. data/CHANGELOG +43 -5
  4. data/Gemfile +1 -16
  5. data/README.markdown +22 -19
  6. data/UPGRADING.markdown +10 -0
  7. data/about.yml +1 -1
  8. data/app/assets/javascripts/community_engine.js +187 -18
  9. data/app/assets/javascripts/cropper.js +86 -565
  10. data/app/assets/javascripts/forum.js +26 -71
  11. data/app/assets/javascripts/jquery.migrate.js +521 -0
  12. data/app/assets/stylesheets/_colors.css.scss +100 -0
  13. data/app/assets/stylesheets/_font.css.scss +17 -0
  14. data/app/assets/stylesheets/_forms.css.scss +20 -0
  15. data/app/assets/stylesheets/_forum.css.scss +0 -0
  16. data/app/assets/stylesheets/_grid.css.scss +7 -0
  17. data/app/assets/stylesheets/_layers.css.scss +7 -0
  18. data/app/assets/stylesheets/_layout.css.scss +28 -0
  19. data/app/assets/stylesheets/community_engine.css.scss +18 -0
  20. data/app/assets/stylesheets/cropper.css +6 -182
  21. data/app/controllers/activities_controller.rb +10 -10
  22. data/app/controllers/admin_controller.rb +23 -23
  23. data/app/controllers/ads_controller.rb +16 -5
  24. data/app/controllers/albums_controller.rb +11 -5
  25. data/app/controllers/base_controller.rb +5 -8
  26. data/app/controllers/categories_controller.rb +31 -31
  27. data/app/controllers/clippings_controller.rb +18 -12
  28. data/app/controllers/comments_controller.rb +17 -8
  29. data/app/controllers/events_controller.rb +25 -21
  30. data/app/controllers/favorites_controller.rb +12 -12
  31. data/app/controllers/forums_controller.rb +20 -9
  32. data/app/controllers/friendships_controller.rb +41 -48
  33. data/app/controllers/homepage_features_controller.rb +11 -5
  34. data/app/controllers/invitations_controller.rb +15 -9
  35. data/app/controllers/messages_controller.rb +25 -19
  36. data/app/controllers/metro_areas_controller.rb +9 -3
  37. data/app/controllers/moderators_controller.rb +1 -1
  38. data/app/controllers/monitorships_controller.rb +2 -2
  39. data/app/controllers/pages_controller.rb +16 -4
  40. data/app/controllers/password_resets_controller.rb +0 -1
  41. data/app/controllers/photos_controller.rb +32 -30
  42. data/app/controllers/posts_controller.rb +33 -17
  43. data/app/controllers/rsvps_controller.rb +8 -4
  44. data/app/controllers/sb_posts_controller.rb +22 -18
  45. data/app/controllers/sessions_controller.rb +2 -1
  46. data/app/controllers/sitemap_controller.rb +8 -8
  47. data/app/controllers/statistics_controller.rb +9 -8
  48. data/app/controllers/tags_controller.rb +26 -24
  49. data/app/controllers/topics_controller.rb +10 -6
  50. data/app/controllers/users_controller.rb +63 -34
  51. data/app/helpers/base_helper.rb +119 -29
  52. data/app/helpers/friendships_helper.rb +3 -3
  53. data/app/helpers/posts_helper.rb +5 -7
  54. data/app/models/acts_as_taggable_on/tag.rb +12 -13
  55. data/app/models/ad.rb +2 -5
  56. data/app/models/album.rb +0 -2
  57. data/app/models/category.rb +6 -7
  58. data/app/models/clipping.rb +2 -5
  59. data/app/models/clipping_image.rb +5 -5
  60. data/app/models/comment.rb +4 -5
  61. data/app/models/country.rb +2 -4
  62. data/app/models/event.rb +1 -2
  63. data/app/models/favorite.rb +5 -10
  64. data/app/models/forum.rb +0 -2
  65. data/app/models/friendship.rb +3 -5
  66. data/app/models/friendship_status.rb +0 -2
  67. data/app/models/homepage_feature.rb +4 -6
  68. data/app/models/invitation.rb +6 -8
  69. data/app/models/message.rb +25 -26
  70. data/app/models/message_thread.rb +1 -1
  71. data/app/models/metro_area.rb +0 -2
  72. data/app/models/page.rb +0 -2
  73. data/app/models/photo.rb +8 -8
  74. data/app/models/poll.rb +7 -9
  75. data/app/models/post.rb +11 -15
  76. data/app/models/role.rb +1 -2
  77. data/app/models/rsvp.rb +0 -3
  78. data/app/models/sb_post.rb +14 -9
  79. data/app/models/state.rb +0 -2
  80. data/app/models/topic.rb +5 -6
  81. data/app/models/user.rb +50 -63
  82. data/app/models/vote.rb +1 -1
  83. data/app/views/activities/_activity.html.haml +9 -9
  84. data/app/views/activities/destroy.js.erb +1 -0
  85. data/app/views/activities/index.html.haml +13 -13
  86. data/app/views/activities/network.html.haml +10 -13
  87. data/app/views/admin/comments.html.haml +48 -70
  88. data/app/views/admin/events.html.haml +20 -27
  89. data/app/views/admin/messages.html.haml +2 -3
  90. data/app/views/admin/update.js.erb +1 -0
  91. data/app/views/admin/users.html.haml +51 -66
  92. data/app/views/ads/_form.html.haml +21 -0
  93. data/app/views/ads/edit.html.haml +6 -46
  94. data/app/views/ads/index.html.haml +25 -39
  95. data/app/views/ads/new.html.haml +4 -43
  96. data/app/views/ads/show.html.haml +18 -35
  97. data/app/views/albums/_form.html.haml +17 -12
  98. data/app/views/albums/edit.html.haml +12 -14
  99. data/app/views/albums/new.html.haml +8 -13
  100. data/app/views/albums/show.html.haml +25 -32
  101. data/app/views/base/_homepage_banner_message.html.haml +5 -19
  102. data/app/views/base/advertise.html.haml +5 -8
  103. data/app/views/base/site_index.html.haml +25 -27
  104. data/app/views/categories/_form.html.haml +8 -0
  105. data/app/views/categories/_menu_item.html.haml +13 -0
  106. data/app/views/categories/_tips.html.haml +2 -2
  107. data/app/views/categories/edit.html.haml +3 -33
  108. data/app/views/categories/index.html.haml +18 -28
  109. data/app/views/categories/new.html.haml +3 -8
  110. data/app/views/categories/show.html.haml +33 -36
  111. data/app/views/clippings/_clipping.html.haml +10 -17
  112. data/app/views/clippings/_favorite.html.haml +14 -0
  113. data/app/views/clippings/_form.html.haml +15 -0
  114. data/app/views/clippings/_images.html.haml +1 -1
  115. data/app/views/clippings/_menu_item.html.haml +6 -0
  116. data/app/views/clippings/edit.html.haml +12 -23
  117. data/app/views/clippings/index.html.haml +29 -30
  118. data/app/views/clippings/load_images_from_uri.js.erb +1 -0
  119. data/app/views/clippings/new.html.haml +9 -26
  120. data/app/views/clippings/new_clipping.html.haml +30 -77
  121. data/app/views/clippings/show.html.haml +48 -53
  122. data/app/views/clippings/site_index.html.haml +19 -32
  123. data/app/views/comments/_comment.html.haml +40 -40
  124. data/app/views/comments/_comment_form.html.haml +22 -46
  125. data/app/views/comments/_edit_form.html.haml +13 -28
  126. data/app/views/comments/create.js.erb +25 -0
  127. data/app/views/comments/destroy.js.erb +3 -0
  128. data/app/views/comments/edit.js.erb +11 -0
  129. data/app/views/comments/index.html.haml +12 -22
  130. data/app/views/comments/update.js.erb +14 -0
  131. data/app/views/events/_event.html.haml +26 -24
  132. data/app/views/events/_form.html.haml +18 -0
  133. data/app/views/events/_menu_item.html.haml +6 -0
  134. data/app/views/events/_subscribe.html.haml +1 -1
  135. data/app/views/events/edit.html.haml +7 -32
  136. data/app/views/events/index.html.haml +11 -19
  137. data/app/views/events/new.html.haml +2 -31
  138. data/app/views/events/show.html.haml +54 -24
  139. data/app/views/favorites/create.js.erb +10 -0
  140. data/app/views/favorites/destroy.js.erb +6 -0
  141. data/app/views/favorites/index.html.haml +6 -8
  142. data/app/views/forums/_form.html.haml +10 -20
  143. data/app/views/forums/_menu_item.html.haml +6 -0
  144. data/app/views/forums/edit.html.haml +8 -10
  145. data/app/views/forums/index.html.haml +56 -64
  146. data/app/views/forums/new.html.haml +5 -8
  147. data/app/views/forums/show.html.haml +65 -72
  148. data/app/views/friendships/_friendship.html.haml +14 -16
  149. data/app/views/friendships/accepted.html.haml +7 -11
  150. data/app/views/friendships/create.js.haml +1 -0
  151. data/app/views/friendships/denied.html.haml +4 -8
  152. data/app/views/friendships/pending.html.haml +4 -6
  153. data/app/views/friendships/show.html.haml +10 -11
  154. data/app/views/homepage_features/_form.html.haml +6 -0
  155. data/app/views/homepage_features/edit.html.haml +5 -30
  156. data/app/views/homepage_features/index.html.haml +22 -28
  157. data/app/views/homepage_features/new.html.haml +2 -30
  158. data/app/views/homepage_features/show.html.haml +27 -29
  159. data/app/views/invitations/index.html.haml +8 -0
  160. data/app/views/invitations/new.html.haml +21 -30
  161. data/app/views/kaminari/bootstrap/_first_page.html.erb +13 -0
  162. data/app/views/kaminari/bootstrap/_gap.html.erb +8 -0
  163. data/app/views/kaminari/bootstrap/_last_page.html.erb +13 -0
  164. data/app/views/kaminari/bootstrap/_next_page.html.erb +13 -0
  165. data/app/views/kaminari/bootstrap/_page.html.erb +12 -0
  166. data/app/views/kaminari/bootstrap/_paginator.html.erb +25 -0
  167. data/app/views/kaminari/bootstrap/_prev_page.html.erb +13 -0
  168. data/app/views/layouts/application.html.haml +26 -37
  169. data/app/views/messages/_form.html.haml +6 -12
  170. data/app/views/messages/_inbox.html.haml +34 -39
  171. data/app/views/messages/_menu_item.html.haml +11 -0
  172. data/app/views/messages/_sent.html.haml +22 -33
  173. data/app/views/messages/_sidebar_nav.html.haml +12 -9
  174. data/app/views/messages/index.html.haml +2 -2
  175. data/app/views/messages/new.html.haml +2 -9
  176. data/app/views/messages/show.html.haml +28 -36
  177. data/app/views/metro_areas/_form.html.haml +6 -0
  178. data/app/views/metro_areas/edit.html.haml +6 -14
  179. data/app/views/metro_areas/index.html.haml +19 -26
  180. data/app/views/metro_areas/new.html.haml +4 -14
  181. data/app/views/metro_areas/show.html.haml +13 -21
  182. data/app/views/moderators/_toggle.html.haml +6 -0
  183. data/app/views/moderators/create.js.erb +5 -0
  184. data/app/views/moderators/destroy.js.erb +1 -0
  185. data/app/views/monitorships/create.js.erb +1 -0
  186. data/app/views/monitorships/destroy.js.erb +1 -0
  187. data/app/views/pages/_form.html.haml +16 -23
  188. data/app/views/pages/edit.html.haml +2 -14
  189. data/app/views/pages/index.html.haml +32 -32
  190. data/app/views/pages/new.html.haml +5 -12
  191. data/app/views/pages/show.html.haml +4 -8
  192. data/app/views/password_resets/edit.html.haml +6 -14
  193. data/app/views/password_resets/new.html.haml +7 -11
  194. data/app/views/photo_manager/index.html.haml +45 -43
  195. data/app/views/photos/_form.html.haml +24 -0
  196. data/app/views/photos/_manage_photos.html.haml +14 -6
  197. data/app/views/photos/_show_image_list.html.haml +2 -2
  198. data/app/views/photos/create.js.erb +1 -0
  199. data/app/views/photos/edit.html.haml +10 -38
  200. data/app/views/photos/index.html.haml +20 -20
  201. data/app/views/photos/manage_photos.js.erb +5 -0
  202. data/app/views/photos/new.html.haml +11 -49
  203. data/app/views/photos/recent.html.haml +6 -6
  204. data/app/views/photos/show.html.haml +48 -52
  205. data/app/views/polls/_edit.html.haml +6 -10
  206. data/app/views/polls/_excerpt.html.haml +3 -4
  207. data/app/views/polls/_new.html.haml +10 -9
  208. data/app/views/polls/_poll_ui.html.haml +30 -34
  209. data/app/views/posts/_author_profile.html.haml +12 -11
  210. data/app/views/posts/_favorited_post.html.haml +8 -10
  211. data/app/views/posts/_form.html.haml +40 -0
  212. data/app/views/posts/_menu_item.html.haml +6 -0
  213. data/app/views/posts/_post.html.haml +27 -24
  214. data/app/views/posts/_send_to_friend.html.haml +26 -0
  215. data/app/views/posts/edit.html.haml +11 -48
  216. data/app/views/posts/featured.html.haml +7 -12
  217. data/app/views/posts/index.html.haml +14 -18
  218. data/app/views/posts/manage.html.haml +44 -59
  219. data/app/views/posts/new.html.haml +9 -64
  220. data/app/views/posts/popular.html.haml +25 -30
  221. data/app/views/posts/preview.html.haml +27 -26
  222. data/app/views/posts/recent.html.haml +20 -27
  223. data/app/views/posts/send_to_friend.js.erb +3 -0
  224. data/app/views/posts/show.html.haml +67 -76
  225. data/app/views/rsvps/_form.html.haml +3 -0
  226. data/app/views/rsvps/edit.html.haml +3 -9
  227. data/app/views/rsvps/new.html.haml +3 -9
  228. data/app/views/sb_posts/_dummy_forum_post.html.haml +13 -0
  229. data/app/views/sb_posts/_edit.html.haml +6 -0
  230. data/app/views/sb_posts/_edit_script.js.erb +14 -0
  231. data/app/views/sb_posts/_reply_form.html.haml +14 -35
  232. data/app/views/sb_posts/_reply_script.js.erb +13 -0
  233. data/app/views/sb_posts/_sb_post.html.haml +31 -33
  234. data/app/views/sb_posts/create.js.erb +30 -0
  235. data/app/views/sb_posts/destroy.js.erb +2 -0
  236. data/app/views/sb_posts/edit.html.erb +4 -4
  237. data/app/views/sb_posts/edit.js.erb +14 -0
  238. data/app/views/sb_posts/index.html.haml +3 -16
  239. data/app/views/sb_posts/monitored.html.erb +3 -9
  240. data/app/views/sb_posts/update.js.erb +11 -0
  241. data/app/views/sessions/_menu_item.html.haml +28 -0
  242. data/app/views/sessions/new.html.haml +19 -24
  243. data/app/views/shared/_add_friend_link.html.haml +9 -0
  244. data/app/views/shared/_admin_nav.html.haml +6 -8
  245. data/app/views/shared/_contact.html.haml +1 -1
  246. data/app/views/shared/_end_javascript.html.haml +4 -4
  247. data/app/views/shared/_explore.html.haml +7 -6
  248. data/app/views/shared/_footer_content.html.haml +12 -10
  249. data/app/views/shared/_footer_links.html.haml +18 -0
  250. data/app/views/shared/_friend_link.html.haml +25 -0
  251. data/app/views/shared/_header.html.haml +22 -42
  252. data/app/views/shared/_jumbotron.html.haml +3 -0
  253. data/app/views/shared/_load_tinymce.js.erb +15 -0
  254. data/app/views/shared/_location_chooser.html.haml +26 -17
  255. data/app/views/shared/_login_sidebar.html.haml +6 -5
  256. data/app/views/shared/_messages.html.haml +6 -8
  257. data/app/views/shared/_scripts_and_styles.html.haml +1 -2
  258. data/app/views/shared/_sidebar.html.haml +1 -0
  259. data/app/views/shared/_tag_auto_complete.html.haml +19 -0
  260. data/app/views/shared/_widget.html.haml +3 -0
  261. data/app/views/sitemap/index.html.haml +15 -20
  262. data/app/views/statistics/index.html.haml +32 -40
  263. data/app/views/tags/edit.html.haml +12 -19
  264. data/app/views/tags/index.html.haml +16 -25
  265. data/app/views/tags/manage.html.haml +24 -33
  266. data/app/views/tags/show.html.haml +52 -58
  267. data/app/views/topics/_form.html.haml +23 -25
  268. data/app/views/topics/_recent_topics_sidebar.haml +1 -1
  269. data/app/views/topics/edit.html.haml +7 -9
  270. data/app/views/topics/new.html.haml +6 -21
  271. data/app/views/topics/show.html.haml +48 -106
  272. data/app/views/user_notifier/follow_up_comment_notice.text.erb +1 -1
  273. data/app/views/user_notifier/message_notification.text.erb +1 -1
  274. data/app/views/user_notifier/new_forum_post_notice.text.erb +1 -1
  275. data/app/views/users/_dashboard_nav.html.haml +36 -39
  276. data/app/views/users/_menu_item.html.haml +6 -0
  277. data/app/views/users/_omniauth_connect.html.haml +4 -4
  278. data/app/views/users/_profile_completeness.html.haml +3 -3
  279. data/app/views/users/_profile_user_info_sidebar.html.haml +40 -43
  280. data/app/views/users/_search_options.html.haml +9 -7
  281. data/app/views/users/_sidebar_user.html.haml +1 -1
  282. data/app/views/users/_user.html.haml +27 -28
  283. data/app/views/users/crop_profile_photo.html.haml +30 -37
  284. data/app/views/users/dashboard.html.haml +37 -41
  285. data/app/views/users/edit.html.haml +53 -71
  286. data/app/views/users/edit_account.html.haml +44 -64
  287. data/app/views/users/forgot_username.html.haml +6 -12
  288. data/app/views/users/index.html.haml +4 -14
  289. data/app/views/users/invite.html.haml +14 -25
  290. data/app/views/users/new.html.haml +27 -48
  291. data/app/views/users/resend_activation.html.haml +7 -12
  292. data/app/views/users/show.html.haml +88 -90
  293. data/app/views/users/signup_completed.html.haml +7 -7
  294. data/app/views/users/statistics.html.haml +17 -18
  295. data/app/views/users/update.js.erb +1 -0
  296. data/app/views/users/upload_profile_photo.html.haml +10 -15
  297. data/app/views/users/welcome_about.html.haml +54 -61
  298. data/app/views/users/welcome_invite.html.haml +16 -25
  299. data/app/views/users/welcome_photo.html.haml +18 -27
  300. data/app/views/votes/create.js.erb +5 -0
  301. data/community_engine.gemspec +49 -41
  302. data/config/application_config.rb +13 -16
  303. data/config/initializers/mce_options.rb +9 -32
  304. data/config/initializers/recaptcha_constants.rb +2 -2
  305. data/config/locales/de-DE.yml +1 -17
  306. data/config/locales/en.yml +18 -32
  307. data/config/locales/es-AR.yml +2 -14
  308. data/config/locales/es-ES.yml +0 -6
  309. data/config/locales/es-MX.yml +1 -9
  310. data/config/locales/fr-FR.yml +3 -17
  311. data/config/locales/ja-JP.yml +2 -18
  312. data/config/locales/ru-RU.yml +3 -21
  313. data/config/locales/sr-CP.yml +0 -4
  314. data/config/locales/sv-SE.yml +3 -20
  315. data/config/routes.rb +37 -42
  316. data/db/migrate/016_add_metro_areas.rb +2 -2
  317. data/db/migrate/039_create_activities_table.rb +2 -2
  318. data/db/migrate/056_create_roles.rb +8 -6
  319. data/db/migrate/069_create_pages.rb +3 -3
  320. data/db/migrate/081_upgrade_to_friendly_id_5x.rb +25 -0
  321. data/db/migrate/082_upgrade_to_acts_as_commentable_4x.rb +29 -0
  322. data/lib/activity_tracker.rb +3 -0
  323. data/{vendor/plugins/activity_tracker/lib → lib/activity_tracker}/activity.rb +6 -6
  324. data/{vendor/plugins/activity_tracker/lib → lib/activity_tracker}/activity_tracker.rb +0 -0
  325. data/{vendor/plugins/acts_as_publishable/init.rb → lib/acts_as_publishable.rb} +1 -1
  326. data/{vendor/plugins/acts_as_publishable/lib → lib/acts_as_publishable}/acts_as_publishable.rb +3 -3
  327. data/lib/community_engine.rb +31 -9
  328. data/lib/community_engine/engine.rb +17 -1
  329. data/lib/community_engine/engines_extensions.rb +1 -3
  330. data/lib/community_engine/version.rb +3 -3
  331. data/{config/initializers → lib/paperclip_processors}/cropper.rb +3 -3
  332. data/lib/resource_feeder.rb +3 -0
  333. data/{vendor/plugins/resource_feeder/lib → lib}/resource_feeder/atom.rb +0 -0
  334. data/{vendor/plugins/resource_feeder/lib → lib}/resource_feeder/rss.rb +0 -0
  335. data/{vendor/plugins/white_list/init.rb → lib/white_list.rb} +1 -1
  336. data/{vendor/plugins/white_list/lib → lib/white_list}/white_list_helper.rb +0 -0
  337. data/test/fixtures/messages.yml +2 -2
  338. data/test/functional/admin_controller_test.rb +11 -11
  339. data/test/functional/ads_controller_test.rb +11 -11
  340. data/test/functional/albums_controller_test.rb +4 -4
  341. data/test/functional/categories_controller_test.rb +4 -4
  342. data/test/functional/clippings_controller_test.rb +4 -4
  343. data/test/functional/comments_controller_test.rb +20 -16
  344. data/test/functional/events_controller_test.rb +6 -6
  345. data/test/functional/forums_controller_test.rb +8 -8
  346. data/test/functional/friendships_controller_test.rb +13 -18
  347. data/test/functional/homepage_features_controller_test.rb +5 -5
  348. data/test/functional/messages_controller_test.rb +6 -2
  349. data/test/functional/metro_areas_controller_test.rb +7 -7
  350. data/test/functional/moderators_controller_test.rb +1 -1
  351. data/test/functional/pages_controller_test.rb +2 -2
  352. data/test/functional/password_reset_controller_test.rb +2 -2
  353. data/test/functional/photos_controller_test.rb +16 -15
  354. data/test/functional/posts_controller_test.rb +4 -4
  355. data/test/functional/rsvps_controller_test.rb +6 -6
  356. data/test/functional/sb_posts_controller_test.rb +53 -50
  357. data/test/functional/sessions_controller_test.rb +4 -1
  358. data/test/functional/tags_controller_test.rb +1 -1
  359. data/test/functional/topics_controller_test.rb +10 -10
  360. data/test/functional/users_controller_test.rb +32 -19
  361. data/test/functional/votes_controller_test.rb +1 -1
  362. data/test/test_helper.rb +3 -1
  363. data/test/testapp/config/application.rb +1 -9
  364. data/test/testapp/config/environments/development.rb +1 -2
  365. data/test/testapp/config/environments/production.rb +2 -0
  366. data/test/testapp/config/environments/test.rb +1 -2
  367. data/test/testapp/config/initializers/omniauth.rb +3 -3
  368. data/test/testapp/config/initializers/secret_token.rb +1 -0
  369. data/test/testapp/db/schema.rb +143 -152
  370. data/test/unit/category_test.rb +2 -2
  371. data/test/unit/comment_test.rb +64 -53
  372. data/test/unit/event_test.rb +4 -4
  373. data/test/unit/forum_test.rb +1 -1
  374. data/test/unit/message_test.rb +7 -1
  375. data/test/unit/page_test.rb +2 -2
  376. data/test/unit/post_test.rb +47 -47
  377. data/test/unit/sb_post_test.rb +24 -20
  378. data/test/unit/topic_test.rb +7 -6
  379. data/test/unit/user_test.rb +75 -52
  380. data/vendor/assets/javascripts/.gitkeep +0 -0
  381. data/vendor/assets/javascripts/jcrop/jquery.Jcrop.js +1699 -0
  382. data/vendor/assets/javascripts/jcrop/jquery.color.js +661 -0
  383. data/vendor/assets/javascripts/tag-it/tag-it.js +597 -0
  384. data/vendor/assets/stylesheets/.gitkeep +0 -0
  385. data/vendor/assets/stylesheets/jcrop/Jcrop.gif +0 -0
  386. data/vendor/assets/stylesheets/jcrop/jquery.Jcrop.min.css +28 -0
  387. data/vendor/assets/stylesheets/tag-it/tag-it.css +69 -0
  388. data/vendor/assets/stylesheets/tag-it/tagit.ui-zendesk.css +107 -0
  389. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/acts_as_publishable/README +0 -0
  390. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/acts_as_publishable/Rakefile +0 -0
  391. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/acts_as_publishable/generators/publishing/publishing_generator.rb +0 -0
  392. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/acts_as_publishable/generators/publishing/templates/migration.rb +0 -0
  393. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/acts_as_publishable/install.rb +0 -0
  394. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/acts_as_publishable/test/acts_as_publishable_test.rb +0 -0
  395. data/vendor/{plugins/activity_tracker → converted2.3plugins_to_lib_leftovers/acts_as_publishable}/uninstall.rb +0 -0
  396. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/resource_feeder/README +0 -0
  397. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/resource_feeder/Rakefile +0 -0
  398. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/resource_feeder/test/atom_feed_test.rb +0 -0
  399. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/resource_feeder/test/rss_feed_test.rb +0 -0
  400. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/resource_feeder/test/test_helper.rb +0 -0
  401. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/white_list/README +0 -0
  402. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/white_list/Rakefile +0 -0
  403. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/white_list/test/white_list_test.rb +0 -0
  404. metadata +348 -302
  405. data/app/assets/images/bg_h6btn.gif +0 -0
  406. data/app/assets/images/bg_navbar.gif +0 -0
  407. data/app/assets/images/clearbits/bg_rounded.gif +0 -0
  408. data/app/assets/images/clearbits/comment.gif +0 -0
  409. data/app/assets/images/clearbits/lock.gif +0 -0
  410. data/app/assets/images/clearbits/smile.gif +0 -0
  411. data/app/assets/images/close.gif +0 -0
  412. data/app/assets/images/cropper/marqueeHoriz.gif +0 -0
  413. data/app/assets/images/cropper/marqueeVert.gif +0 -0
  414. data/app/assets/images/feed.png +0 -0
  415. data/app/assets/images/icons/31.png +0 -0
  416. data/app/assets/images/icons/52.png +0 -0
  417. data/app/assets/images/icons/accept.png +0 -0
  418. data/app/assets/images/icons/activity_default.png +0 -0
  419. data/app/assets/images/icons/add.png +0 -0
  420. data/app/assets/images/icons/book.png +0 -0
  421. data/app/assets/images/icons/bullet_arrow_down.png +0 -0
  422. data/app/assets/images/icons/bullet_arrow_down_50.png +0 -0
  423. data/app/assets/images/icons/clipping.png +0 -0
  424. data/app/assets/images/icons/comment.png +0 -0
  425. data/app/assets/images/icons/comments.png +0 -0
  426. data/app/assets/images/icons/date.png +0 -0
  427. data/app/assets/images/icons/delete.png +0 -0
  428. data/app/assets/images/icons/email.png +0 -0
  429. data/app/assets/images/icons/email_edit.png +0 -0
  430. data/app/assets/images/icons/email_go.png +0 -0
  431. data/app/assets/images/icons/email_open.png +0 -0
  432. data/app/assets/images/icons/group_go.png +0 -0
  433. data/app/assets/images/icons/heart.png +0 -0
  434. data/app/assets/images/icons/heart_add.png +0 -0
  435. data/app/assets/images/icons/heart_off.png +0 -0
  436. data/app/assets/images/icons/page_white.png +0 -0
  437. data/app/assets/images/icons/page_white_magnify.png +0 -0
  438. data/app/assets/images/icons/picture.png +0 -0
  439. data/app/assets/images/icons/poll.png +0 -0
  440. data/app/assets/images/icons/post.png +0 -0
  441. data/app/assets/images/icons/printer.png +0 -0
  442. data/app/assets/images/icons/rss.png +0 -0
  443. data/app/assets/images/icons/slides.png +0 -0
  444. data/app/assets/images/icons/tag_blue.png +0 -0
  445. data/app/assets/images/icons/user.png +0 -0
  446. data/app/assets/images/icons/user_add.png +0 -0
  447. data/app/assets/images/icons/user_edit.png +0 -0
  448. data/app/assets/images/icons/user_go.png +0 -0
  449. data/app/assets/images/icons/vote.png +0 -0
  450. data/app/assets/images/icons/world.png +0 -0
  451. data/app/assets/images/icons/wrench.png +0 -0
  452. data/app/assets/images/logo.gif +0 -0
  453. data/app/assets/images/reply_background.png +0 -0
  454. data/app/assets/images/search.gif +0 -0
  455. data/app/assets/images/thumb.gif +0 -0
  456. data/app/assets/javascripts/builder.js +0 -136
  457. data/app/assets/javascripts/calendarview.js +0 -839
  458. data/app/assets/javascripts/lightbox.js +0 -151
  459. data/app/assets/javascripts/prototip-min.js +0 -27
  460. data/app/assets/javascripts/rails.js +0 -202
  461. data/app/assets/javascripts/tinymce/plugins/curblyadvimage/css/advimage.css +0 -84
  462. data/app/assets/javascripts/tinymce/plugins/curblyadvimage/editor_plugin.js +0 -52
  463. data/app/assets/javascripts/tinymce/plugins/curblyadvimage/editor_plugin_src.js +0 -45
  464. data/app/assets/javascripts/tinymce/plugins/curblyadvimage/image.htm +0 -180
  465. data/app/assets/javascripts/tinymce/plugins/curblyadvimage/img/sample.gif +0 -0
  466. data/app/assets/javascripts/tinymce/plugins/curblyadvimage/js/functions.js +0 -508
  467. data/app/assets/javascripts/tinymce/plugins/curblyadvimage/langs/en.js +0 -3
  468. data/app/assets/javascripts/tinymce/plugins/curblyadvimage/langs/en_dlg.js +0 -43
  469. data/app/assets/javascripts/tinymce/plugins/tinyautosave/editor_plugin.js +0 -8
  470. data/app/assets/javascripts/tinymce/plugins/tinyautosave/editor_plugin_src.js +0 -1001
  471. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress.gif +0 -0
  472. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress10.gif +0 -0
  473. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress11.gif +0 -0
  474. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress12.gif +0 -0
  475. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress2.gif +0 -0
  476. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress3.gif +0 -0
  477. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress4.gif +0 -0
  478. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress5.gif +0 -0
  479. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress6.gif +0 -0
  480. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress7.gif +0 -0
  481. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress8.gif +0 -0
  482. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress9.gif +0 -0
  483. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/restore.gif +0 -0
  484. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/restore.png +0 -0
  485. data/app/assets/javascripts/tinymce/plugins/tinyautosave/langs/da.js +0 -5
  486. data/app/assets/javascripts/tinymce/plugins/tinyautosave/langs/en.js +0 -5
  487. data/app/assets/stylesheets/community_engine.css +0 -6
  488. data/app/assets/stylesheets/forum.css +0 -605
  489. data/app/assets/stylesheets/prototip.css +0 -73
  490. data/app/assets/stylesheets/reset-fonts-grids.css +0 -8
  491. data/app/assets/stylesheets/screen.css +0 -977
  492. data/app/helpers/monitorships_helper.rb +0 -2
  493. data/app/views/activities/_icon.html.haml +0 -14
  494. data/app/views/activities/destroy.js.rjs +0 -1
  495. data/app/views/clippings/_meta.html.haml +0 -26
  496. data/app/views/clippings/load_images_from_uri.js.rjs +0 -1
  497. data/app/views/comments/create.js.rjs +0 -20
  498. data/app/views/comments/edit.js.rjs +0 -7
  499. data/app/views/comments/update.js.rjs +0 -9
  500. data/app/views/favorites/create.js.rjs +0 -17
  501. data/app/views/favorites/destroy.js.rjs +0 -14
  502. data/app/views/favorites/show.html.haml +0 -13
  503. data/app/views/friendships/_friendships.html.erb +0 -14
  504. data/app/views/friendships/index.html.erb +0 -3
  505. data/app/views/friendships/index.xml.builder +0 -29
  506. data/app/views/invitations/index.html.erb +0 -16
  507. data/app/views/moderators/_toggle.html.erb +0 -14
  508. data/app/views/moderators/create.js.rjs +0 -5
  509. data/app/views/moderators/destroy.js.rjs +0 -1
  510. data/app/views/monitorships/create.js.rjs +0 -4
  511. data/app/views/monitorships/destroy.js.rjs +0 -4
  512. data/app/views/photos/manage_photos.js.rjs +0 -5
  513. data/app/views/polls/_polls_sidebar.html.haml +0 -8
  514. data/app/views/posts/_send_to_friend.html.erb +0 -29
  515. data/app/views/sb_posts/_dummy_forum_post.html.erb +0 -13
  516. data/app/views/sb_posts/_edit.html.erb +0 -31
  517. data/app/views/sb_posts/create.js.rjs +0 -16
  518. data/app/views/sb_posts/edit.js.rjs +0 -6
  519. data/app/views/sb_posts/update.js.rjs +0 -5
  520. data/app/views/shared/_user_menu.html.haml +0 -21
  521. data/app/views/votes/create.js.rjs +0 -6
  522. data/db/migrate/090_add_comment_role.rb +0 -15
  523. data/vendor/plugins/activity_tracker/README +0 -4
  524. data/vendor/plugins/activity_tracker/Rakefile +0 -22
  525. data/vendor/plugins/activity_tracker/generators/activity_migration/USAGE +0 -13
  526. data/vendor/plugins/activity_tracker/generators/activity_migration/activity_migration_generator.rb +0 -11
  527. data/vendor/plugins/activity_tracker/generators/activity_migration/templates/migration.rb +0 -17
  528. data/vendor/plugins/activity_tracker/init.rb +0 -1
  529. data/vendor/plugins/activity_tracker/install.rb +0 -1
  530. data/vendor/plugins/activity_tracker/tasks/activity_tracker_tasks.rake +0 -4
  531. data/vendor/plugins/activity_tracker/test/abstract_unit.rb +0 -47
  532. data/vendor/plugins/activity_tracker/test/activity_tracker_test.rb +0 -48
  533. data/vendor/plugins/activity_tracker/test/database.yml +0 -18
  534. data/vendor/plugins/activity_tracker/test/debug.log +0 -3329
  535. data/vendor/plugins/activity_tracker/test/fixtures/test_post.rb +0 -5
  536. data/vendor/plugins/activity_tracker/test/fixtures/test_posts.yml +0 -3
  537. data/vendor/plugins/activity_tracker/test/fixtures/test_user.rb +0 -4
  538. data/vendor/plugins/activity_tracker/test/fixtures/test_users.yml +0 -6
  539. data/vendor/plugins/activity_tracker/test/schema.rb +0 -21
  540. data/vendor/plugins/acts_as_list/README +0 -23
  541. data/vendor/plugins/acts_as_list/init.rb +0 -3
  542. data/vendor/plugins/acts_as_list/lib/active_record/acts/list.rb +0 -256
  543. data/vendor/plugins/acts_as_list/test/list_test.rb +0 -332
  544. data/vendor/plugins/acts_as_publishable/uninstall.rb +0 -1
  545. data/vendor/plugins/auto_complete/README +0 -23
  546. data/vendor/plugins/auto_complete/Rakefile +0 -22
  547. data/vendor/plugins/auto_complete/init.rb +0 -2
  548. data/vendor/plugins/auto_complete/lib/auto_complete.rb +0 -47
  549. data/vendor/plugins/auto_complete/lib/auto_complete_macros_helper.rb +0 -143
  550. data/vendor/plugins/auto_complete/test/auto_complete_test.rb +0 -67
  551. data/vendor/plugins/enumerations_mixin/.gitignore +0 -1
  552. data/vendor/plugins/enumerations_mixin/Gemfile +0 -1
  553. data/vendor/plugins/enumerations_mixin/LICENSE +0 -20
  554. data/vendor/plugins/enumerations_mixin/README.md +0 -120
  555. data/vendor/plugins/enumerations_mixin/README_ENUMERATIONS +0 -163
  556. data/vendor/plugins/enumerations_mixin/Rakefile +0 -14
  557. data/vendor/plugins/enumerations_mixin/VERSION +0 -1
  558. data/vendor/plugins/enumerations_mixin/enumerations_mixin.gemspec +0 -44
  559. data/vendor/plugins/enumerations_mixin/examples/virtual_enumerations_sample.rb +0 -76
  560. data/vendor/plugins/enumerations_mixin/init.rb +0 -21
  561. data/vendor/plugins/enumerations_mixin/lib/active_record/acts/enumerated.rb +0 -180
  562. data/vendor/plugins/enumerations_mixin/lib/active_record/aggregations/has_enumerated.rb +0 -60
  563. data/vendor/plugins/enumerations_mixin/lib/active_record/virtual_enumerations.rb +0 -68
  564. data/vendor/plugins/enumerations_mixin/lib/enumerations_mixin.rb +0 -12
  565. data/vendor/plugins/enumerations_mixin/virtual_enumerations_sample.rb +0 -76
  566. data/vendor/plugins/prototype_legacy_helper/README.markdown +0 -13
  567. data/vendor/plugins/prototype_legacy_helper/init.rb +0 -1
  568. data/vendor/plugins/prototype_legacy_helper/lib/prototype_legacy_helper.rb +0 -432
  569. data/vendor/plugins/prototype_legacy_helper/test/test_prototype_helper.rb +0 -297
  570. data/vendor/plugins/resource_feeder/init.rb +0 -2
  571. data/vendor/plugins/resource_feeder/lib/resource_feeder.rb +0 -2
  572. data/vendor/plugins/respond_to_parent/MIT-LICENSE +0 -20
  573. data/vendor/plugins/respond_to_parent/README +0 -47
  574. data/vendor/plugins/respond_to_parent/Rakefile +0 -22
  575. data/vendor/plugins/respond_to_parent/init.rb +0 -1
  576. data/vendor/plugins/respond_to_parent/install.rb +0 -1
  577. data/vendor/plugins/respond_to_parent/lib/responds_to_parent.rb +0 -70
  578. data/vendor/plugins/respond_to_parent/test/responds_to_parent_test.rb +0 -10
  579. data/vendor/plugins/respond_to_parent/test/test_helper.rb +0 -6
  580. data/vendor/plugins/respond_to_parent/uninstall.rb +0 -1
@@ -0,0 +1,100 @@
1
+
2
+ /* Colors to be used in the rest of the file */
3
+ $black: #000;
4
+ $gray: #555;
5
+ $grayDark: #333;
6
+ $grayDarker: #222;
7
+ $grayLight: #999;
8
+ $grayLighter: #ccc;
9
+ $grayLightness: #ddd;
10
+ $grayLightest: #eee;
11
+ $grayLightVery: #f5f5f5;
12
+ $grayLightExtremely: #f9f9f9;
13
+ $white: #fff;
14
+ $blue: #049cdb;
15
+ $blueDark: #0064cd;
16
+ $green: #46a546;
17
+ $red: #9d261d;
18
+ $yellow: #ffc40d;
19
+ $orange: #f89406;
20
+ $pink: #c3325f;
21
+ $purple: #7a43b6;
22
+
23
+
24
+ /* Assignments of colors to useful variable names */
25
+ $bodyBackground: $white;
26
+ $textColor: $grayDark;
27
+ $linkColor: $blue;
28
+ $linkColorHover: darken($linkColor, 15%);
29
+
30
+ $tableBackground: transparent;
31
+ $tableBackgroundAccent: $grayLightExtremely;
32
+ $tableBackgroundHover: $grayLightVery;
33
+ $tableBorder: $grayLightness;
34
+ $hrBorder: $grayLightest;
35
+
36
+ $btnBackground: $white;
37
+ $btnBackgroundHighlight: darken($btnBackground, 10%);
38
+ $btnBorder: $grayLighter;
39
+ $btnDangerBackground: $red;
40
+ $btnDangerBackgroundHighlight: darken($btnDangerBackground, 10%);
41
+ $btnInfoBackground: $blue;
42
+ $btnInfoBackgroundHighlight: darken($btnInfoBackground, 10%);
43
+ $btnInverseBackground: $gray;
44
+ $btnInverseBackgroundHighlight: darken($gray, 10%);
45
+ $btnPrimaryBackground: $blueDark;
46
+ $btnPrimaryBackgroundHighlight: darken($btnPrimaryBackground, 10%);
47
+ $btnSuccessBackground: $green;
48
+ $btnSuccessBackgroundHighlight: darken($btnSuccessBackground, 10%);
49
+ $btnWarningBackground: $orange;
50
+ $btnWarningBackgroundHighlight: darken($btnWarningBackground, 10%);
51
+
52
+ $inputBackground: $white;
53
+ $inputBorder: $grayLighter;
54
+ $inputBorderRadius: 3px;
55
+ $inputDisabledBackground: $grayLightest;
56
+ $formActionsBackground: $grayLightVery;
57
+ $placeholderText: $grayLight;
58
+
59
+ $dropdownBackground: $white;
60
+ $dropdownBorder: fadeout($black, .2);
61
+ $dropdownDividerBottom: $white;
62
+ $dropdownDividerTop: $grayLightest;
63
+ $dropdownLinkBackgroundHover: $linkColor;
64
+ $dropdownLinkColor: $grayDark;
65
+ $dropdownLinkColorHover: $white;
66
+
67
+ $iconSpritePath: '../../img/glyphicons-halflings.png';
68
+ $iconWhiteSpritePath: '../../img/glyphicons-halflings-white.png';
69
+
70
+ $navbarBackground: $grayDarker;
71
+ $navbarBackgroundHighlight: $grayDark;
72
+ $navbarLinkColor: $grayLight;
73
+ $navbarLinkColorHover: $white;
74
+ $navbarBrandColor: $navbarLinkColor;
75
+ $navbarHeight: 40px;
76
+ $navbarLinkBackgroundActive: $navbarBackground;
77
+ $navbarLinkBackgroundHover: transparent;
78
+ $navbarLinkColorActive: $navbarLinkColorHover;
79
+ $navbarSearchBackground: lighten($navbarBackground, 25%);
80
+ $navbarSearchBackgroundFocus: $white;
81
+ $navbarSearchBorder: darken($navbarSearchBackground, 30%);
82
+ $navbarSearchPlaceholderColor: $grayLighter;
83
+ $navbarText: $grayLight;
84
+
85
+ $jumbotronUnitBackground: $grayLightest;
86
+ $jumbotronUnitHeadingColor: inherit;
87
+ $jumbotronUnitLeadColor: inherit;
88
+
89
+ $warningBackground: lighten($orange, 50%);
90
+ $warningBorder: darken($warningBackground, 3%);
91
+ $warningText: $orange;
92
+ $errorBackground: lighten($red, 50%);
93
+ $errorBorder: darken($errorBackground, 3%);
94
+ $errorText: $red;
95
+ $successBackground: lighten($green, 50%);
96
+ $successBorder: darken($successBackground, 3%);
97
+ $successText: $green;
98
+ $infoBackground: lighten($blue, 50%);
99
+ $infoBorder: darken($infoBackground, 3%);
100
+ $infoText: $blue;
@@ -0,0 +1,17 @@
1
+ $sansFontFamily: 'Helvetica Neue', Helvetica, Arial, sans-serif;
2
+ $serifFontFamily: Georgia, 'Times New Roman', Times, serif;
3
+ $monoFontFamily: Menlo, Monaco, Consolas, 'Courier New', monospace;
4
+ $baseFontSize: 13px;
5
+ $baseFontFamily: $sansFontFamily;
6
+ $baseLineHeight: 18px;
7
+ $altFontFamily: $serifFontFamily;
8
+ $headingsFontFamily: $sansFontFamily;
9
+ $headingsFontWeight: bold;
10
+
11
+
12
+
13
+ .css1 { font-size: 1.0em; }
14
+ .css2 { font-size: 1.2em; }
15
+ .css3 { font-size: 1.4em; }
16
+ .css4 { font-size: 1.6em; }
17
+ .css5 { font-size: 1.8em; }
@@ -0,0 +1,20 @@
1
+ @import 'rails_bootstrap_forms';
2
+
3
+ .rich_text_editor {
4
+ width: 100%;
5
+ }
6
+
7
+
8
+ .required {
9
+ font-weight: bold;
10
+ &:before {
11
+ color: $red;
12
+ content: '(*Required) ';
13
+ display: inline;
14
+ }
15
+ }
16
+
17
+
18
+ form.button_to, form.button_to div {
19
+ display: inline;
20
+ }
File without changes
@@ -0,0 +1,7 @@
1
+
2
+ $gridColumnWidth: 70px;
3
+ $gridColumns: 12;
4
+ $gridGutterWidth: 30px;
5
+ $gridRowWidth: ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1));
6
+ $fluidGridColumnWidth: 6.382978723%;
7
+ $fluidGridGutterWidth: 2.127659574%;
@@ -0,0 +1,7 @@
1
+
2
+ $zindexDropdown: 1000;
3
+ $zindexFixedNavbar: 1030;
4
+ $zindexModal: 1050;
5
+ $zindexModalBackdrop: 1040;
6
+ $zindexPopover: 1010;
7
+ $zindexTooltip: 1020;
@@ -0,0 +1,28 @@
1
+ @import 'bootstrap-sprockets';
2
+ @import 'bootstrap';
3
+
4
+ body {
5
+ padding-top: 60px;
6
+ }
7
+
8
+
9
+ // .row-fluid [class*='span'].pull-right, .row [class*='span'].pull-right{
10
+ // float: right;
11
+ // }
12
+ // .row>[class*='span']:first-child {
13
+ // margin-left: 0;
14
+ // }
15
+
16
+
17
+ .clear-right {
18
+ clear: right;
19
+ }
20
+
21
+ .clear-left {
22
+ clear: left;
23
+ }
24
+
25
+ .clear-all, .clear-both {
26
+ clear: both;
27
+ }
28
+
@@ -0,0 +1,18 @@
1
+ /*
2
+ *= require jquery-ui
3
+ */
4
+
5
+ @import 'font';
6
+ @import 'colors';
7
+ @import 'grid';
8
+ @import 'layers';
9
+
10
+ @import 'layout';
11
+ @import 'font-awesome';
12
+
13
+ @import 'forms';
14
+ @import 'forum';
15
+ @import 'lightbox';
16
+ @import 'cropper';
17
+
18
+
@@ -1,182 +1,6 @@
1
- .imgCrop_wrap {
2
- /* width: 500px; @done_in_js */
3
- /* height: 375px; @done_in_js */
4
- position: relative;
5
- cursor: crosshair;
6
- }
7
-
8
- /* an extra classname is applied for Opera < 9.0 to fix it's lack of opacity support */
9
- .imgCrop_wrap.opera8 .imgCrop_overlay,
10
- .imgCrop_wrap.opera8 .imgCrop_clickArea {
11
- background-color: transparent;
12
- }
13
-
14
- /* fix for IE displaying all boxes at line-height by default, although they are still 1 pixel high until we combine them with the pointless span */
15
- .imgCrop_wrap,
16
- .imgCrop_wrap * {
17
- font-size: 0;
18
- }
19
-
20
- .imgCrop_overlay {
21
- background-color: #000;
22
- opacity: 0.5;
23
- filter:alpha(opacity=50);
24
- position: absolute;
25
- width: 100%;
26
- height: 100%;
27
- }
28
-
29
- .imgCrop_selArea {
30
- position: absolute;
31
- /* @done_in_js
32
- top: 20px;
33
- left: 20px;
34
- width: 200px;
35
- height: 200px;
36
- background: transparent url(castle.jpg) no-repeat -210px -110px;
37
- */
38
- cursor: move;
39
- z-index: 2;
40
- }
41
-
42
- /* clickArea is all a fix for IE 5.5 & 6 to allow the user to click on the given area */
43
- .imgCrop_clickArea {
44
- width: 100%;
45
- height: 100%;
46
- background-color: #FFF;
47
- opacity: 0.01;
48
- filter:alpha(opacity=01);
49
- }
50
-
51
- .imgCrop_marqueeHoriz {
52
- position: absolute;
53
- width: 100%;
54
- height: 1px;
55
- background: transparent url(/assets/cropper/marqueeHoriz.gif) repeat-x 0 0;
56
- z-index: 3;
57
- }
58
-
59
- .imgCrop_marqueeVert {
60
- position: absolute;
61
- height: 100%;
62
- width: 1px;
63
- background: transparent url(/assets/cropper/marqueeVert.gif) repeat-y 0 0;
64
- z-index: 3;
65
- }
66
-
67
- /*
68
- * FIX MARCHING ANTS IN IE
69
- * As IE <6 tries to load background images we can uncomment the follwoing hack
70
- * to remove that issue, not as pretty - but is anything in IE?
71
- * And yes I do know that 'filter' is evil, but it will make it look semi decent in IE
72
- *
73
- * html .imgCrop_marqueeHoriz,
74
- * html .imgCrop_marqueeVert {
75
- background: transparent;
76
- filter: Invert;
77
- }
78
- * html .imgCrop_marqueeNorth { border-top: 1px dashed #000; }
79
- * html .imgCrop_marqueeEast { border-right: 1px dashed #000; }
80
- * html .imgCrop_marqueeSouth { border-bottom: 1px dashed #000; }
81
- * html .imgCrop_marqueeWest { border-left: 1px dashed #000; }
82
- */
83
-
84
- .imgCrop_marqueeNorth { top: 0; left: 0; }
85
- .imgCrop_marqueeEast { top: 0; right: 0; }
86
- .imgCrop_marqueeSouth { bottom: 0px; left: 0; }
87
- .imgCrop_marqueeWest { top: 0; left: 0; }
88
-
89
-
90
- .imgCrop_handle {
91
- position: absolute;
92
- border: 1px solid #333;
93
- width: 6px;
94
- height: 6px;
95
- background: #FFF;
96
- opacity: 0.5;
97
- filter:alpha(opacity=50);
98
- z-index: 4;
99
- }
100
-
101
- /* fix IE 5 box model */
102
- * html .imgCrop_handle {
103
- width: 8px;
104
- height: 8px;
105
- wid\th: 6px;
106
- hei\ght: 6px;
107
- }
108
-
109
- .imgCrop_handleN {
110
- top: -3px;
111
- left: 0;
112
- /* margin-left: 49%; @done_in_js */
113
- cursor: n-resize;
114
- }
115
-
116
- .imgCrop_handleNE {
117
- top: -3px;
118
- right: -3px;
119
- cursor: ne-resize;
120
- }
121
-
122
- .imgCrop_handleE {
123
- top: 0;
124
- right: -3px;
125
- /* margin-top: 49%; @done_in_js */
126
- cursor: e-resize;
127
- }
128
-
129
- .imgCrop_handleSE {
130
- right: -3px;
131
- bottom: -3px;
132
- cursor: se-resize;
133
- }
134
-
135
- .imgCrop_handleS {
136
- right: 0;
137
- bottom: -3px;
138
- /* margin-right: 49%; @done_in_js */
139
- cursor: s-resize;
140
- }
141
-
142
- .imgCrop_handleSW {
143
- left: -3px;
144
- bottom: -3px;
145
- cursor: sw-resize;
146
- }
147
-
148
- .imgCrop_handleW {
149
- top: 0;
150
- left: -3px;
151
- /* margin-top: 49%; @done_in_js */
152
- cursor: w-resize;
153
- }
154
-
155
- .imgCrop_handleNW {
156
- top: -3px;
157
- left: -3px;
158
- cursor: nw-resize;
159
- }
160
-
161
- /**
162
- * Create an area to click & drag around on as the default browser behaviour is to let you drag the image
163
- */
164
- .imgCrop_dragArea {
165
- width: 100%;
166
- height: 100%;
167
- z-index: 200;
168
- position: absolute;
169
- top: 0;
170
- left: 0;
171
- }
172
-
173
- .imgCrop_previewWrap {
174
- /* width: 200px; @done_in_js */
175
- /* height: 200px; @done_in_js */
176
- overflow: hidden;
177
- position: relative;
178
- }
179
-
180
- .imgCrop_previewWrap img {
181
- position: absolute;
182
- }
1
+ /*
2
+ * the following required file can be found at vendor/assets/stylesheets/jcrop/jquery.Jcrop.min.css
3
+ *= require jcrop/jquery.Jcrop.min
4
+ */
5
+
6
+ #store { position: absolute; left: -5000px; }
@@ -1,34 +1,34 @@
1
1
  class ActivitiesController < BaseController
2
2
  before_filter :login_required, :except => :index
3
3
  before_filter :find_user, :only => :network
4
-
4
+
5
5
  before_filter :require_current_user, :except => [:index, :destroy]
6
6
  before_filter :require_ownership_or_moderator, :only => :destroy
7
-
8
-
7
+
8
+
9
9
  def network
10
10
  @activities = @user.network_activity(:per_page => 15, :page => params[:page])
11
11
  end
12
-
12
+
13
13
  def index
14
14
  @activities = User.recent_activity(:per_page => 30, :page => params[:page], :limit => 1000)
15
- @popular_tags = popular_tags(30)
15
+ @popular_tags = popular_tags(30).to_a
16
16
  end
17
-
17
+
18
18
  def destroy
19
19
  @activity = Activity.find(params[:id])
20
20
  @activity.destroy
21
-
21
+
22
22
  respond_to do |format|
23
23
  format.html {redirect_to :back and return}
24
24
  format.js
25
25
  end
26
26
  end
27
-
27
+
28
28
  private
29
29
  def require_ownership_or_moderator
30
- @activity = Activity.find(params[:id])
31
-
30
+ @activity = Activity.find(params[:id])
31
+
32
32
  unless @activity && @activity.can_be_deleted_by?(current_user)
33
33
  redirect_to :controller => 'sessions', :action => 'new' and return false
34
34
  end
@@ -1,6 +1,6 @@
1
1
  class AdminController < BaseController
2
2
  before_filter :admin_required
3
-
3
+
4
4
  def clear_cache
5
5
  case Rails.cache
6
6
  when ActiveSupport::Cache::FileStore
@@ -11,33 +11,33 @@ class AdminController < BaseController
11
11
  end
12
12
  flash[:notice] = :cache_cleared.l
13
13
  else
14
- Rails.logger.warn("Cache not swept: you must override AdminController#clear_cache to support #{Rails.cache}")
14
+ Rails.logger.warn("Cache not swept: you must override AdminController#clear_cache to support #{Rails.cache}")
15
15
  end
16
- redirect_to admin_dashboard_path and return
16
+ redirect_to admin_dashboard_path and return
17
17
  end
18
-
18
+
19
19
  def events
20
20
  @events = Event.order('start_time DESC').page(params[:page])
21
21
  end
22
-
22
+
23
23
  def messages
24
24
  @user = current_user
25
25
  @messages = Message.order('created_at DESC').page(params[:page]).per(50)
26
26
  end
27
-
27
+
28
28
  def users
29
29
  @users = User.recent
30
30
  user = User.arel_table
31
31
 
32
- if params['login']
33
- @users = @users.where('`users`.login LIKE ?', "%#{params['login']}%")
32
+ if params['login']
33
+ @users = @users.where(user[:login].matches("%#{params['login']}%"))
34
34
  end
35
35
  if params['email']
36
- @users = @users.where('`users`.email LIKE ?', "%#{params['email']}%")
37
- end
36
+ @users = @users.where(user[:email].matches("%#{params['email']}%"))
37
+ end
38
38
 
39
39
  @users = @users.page(params[:page]).per(100)
40
-
40
+
41
41
  respond_to do |format|
42
42
  format.html
43
43
  format.xml {
@@ -45,36 +45,36 @@ class AdminController < BaseController
45
45
  }
46
46
  end
47
47
  end
48
-
48
+
49
49
  def comments
50
- @search = Comment.search(params[:search])
51
- @search.meta_sort ||= 'created_at.desc'
52
- @comments = @search.page(params[:page]).per(100)
50
+ @search = Comment.search(params[:q])
51
+ @comments = @search.result.distinct
52
+ @comments = @comments.order("created_at DESC").page(params[:page]).per(100)
53
53
  end
54
-
54
+
55
55
  def activate_user
56
56
  user = User.find(params[:id])
57
57
  user.activate
58
58
  flash[:notice] = :the_user_was_activated.l
59
59
  redirect_to :action => :users
60
60
  end
61
-
61
+
62
62
  def deactivate_user
63
63
  user = User.find(params[:id])
64
64
  user.deactivate
65
65
  flash[:notice] = :the_user_was_deactivated.l
66
66
  redirect_to :action => :users
67
- end
68
-
67
+ end
68
+
69
69
  def subscribers
70
- @users = User.find(:all, :conditions => ["notify_community_news = ? AND users.activated_at IS NOT NULL", (params[:unsubs] ? false : true)])
71
-
70
+ @users = User.where("notify_community_news = ? AND users.activated_at IS NOT NULL", (params[:unsubs] ? false : true))
71
+
72
72
  respond_to do |format|
73
73
  format.xml {
74
74
  render :xml => @users.to_xml(:only => [:login, :email])
75
75
  }
76
76
  end
77
-
77
+
78
78
  end
79
-
79
+
80
80
  end