typo 4.0.3 → 4.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (652) hide show
  1. data/CHANGES-4.1 +83 -0
  2. data/MAINTAINERS +3 -7
  3. data/README +1 -1
  4. data/{components/sidebars/README → README.SIDEBARS} +3 -0
  5. data/Rakefile +1 -1
  6. data/TODO-4.1 +16 -0
  7. data/app/apis/blogger_service.rb +3 -3
  8. data/app/apis/meta_weblog_service.rb +4 -21
  9. data/app/apis/movable_type_service.rb +5 -5
  10. data/app/controllers/accounts_controller.rb +6 -3
  11. data/app/controllers/admin/blacklist_controller.rb +1 -1
  12. data/app/controllers/admin/cache_controller.rb +3 -7
  13. data/app/controllers/admin/content_controller.rb +46 -24
  14. data/app/controllers/admin/feedback_controller.rb +3 -3
  15. data/app/controllers/admin/general_controller.rb +3 -3
  16. data/app/controllers/admin/pages_controller.rb +7 -3
  17. data/app/controllers/admin/sidebar_controller.rb +19 -26
  18. data/app/controllers/admin/textfilters_controller.rb +3 -1
  19. data/app/controllers/admin/themes_controller.rb +1 -1
  20. data/app/controllers/admin/users_controller.rb +1 -1
  21. data/app/controllers/application.rb +25 -27
  22. data/app/controllers/articles_controller.rb +14 -18
  23. data/app/controllers/content_controller.rb +7 -7
  24. data/app/controllers/live_controller.rb +1 -1
  25. data/app/controllers/redirect_controller.rb +2 -0
  26. data/app/controllers/textfilter_controller.rb +0 -3
  27. data/app/controllers/theme_controller.rb +10 -5
  28. data/app/controllers/xml_controller.rb +7 -9
  29. data/app/helpers/admin/base_helper.rb +10 -5
  30. data/app/helpers/admin/content_helper.rb +6 -0
  31. data/app/helpers/admin/feedback_helper.rb +1 -1
  32. data/app/helpers/admin/pages_helper.rb +5 -0
  33. data/app/helpers/application_helper.rb +84 -51
  34. data/app/helpers/articles_helper.rb +29 -29
  35. data/app/helpers/mail_helper.rb +3 -2
  36. data/app/helpers/sidebar_helper.rb +25 -16
  37. data/app/helpers/xml_helper.rb +0 -16
  38. data/app/models/article.rb +90 -32
  39. data/app/models/blog.rb +82 -74
  40. data/app/models/blog_sweeper.rb +33 -8
  41. data/app/models/categorization.rb +4 -0
  42. data/app/models/category.rb +21 -4
  43. data/app/models/comment.rb +23 -21
  44. data/app/models/content.rb +106 -64
  45. data/app/models/content_state/base.rb +12 -3
  46. data/app/models/content_state/draft.rb +2 -3
  47. data/app/models/content_state/factory.rb +1 -1
  48. data/app/models/content_state/ham.rb +0 -1
  49. data/app/models/content_state/just_marked_as_ham.rb +8 -1
  50. data/app/models/content_state/just_marked_as_spam.rb +4 -1
  51. data/app/models/content_state/just_presumed_ham.rb +14 -14
  52. data/app/models/content_state/just_published.rb +11 -18
  53. data/app/models/content_state/just_withdrawn.rb +11 -0
  54. data/app/models/content_state/new.rb +0 -1
  55. data/app/models/content_state/presumed_ham.rb +9 -3
  56. data/app/models/content_state/presumed_spam.rb +4 -1
  57. data/app/models/content_state/publication_pending.rb +4 -4
  58. data/app/models/content_state/published.rb +7 -8
  59. data/app/models/content_state/spam.rb +0 -1
  60. data/app/models/content_state/unclassified.rb +12 -3
  61. data/app/models/content_state/withdrawn.rb +5 -6
  62. data/app/models/email_notifier.rb +1 -1
  63. data/app/models/feedback.rb +31 -11
  64. data/app/models/notification.rb +4 -0
  65. data/app/models/notification_mailer.rb +8 -8
  66. data/app/models/page.rb +19 -5
  67. data/app/models/ping.rb +27 -40
  68. data/app/models/sidebar.rb +241 -11
  69. data/app/models/tag.rb +12 -1
  70. data/app/models/text_filter.rb +33 -39
  71. data/app/models/theme.rb +9 -0
  72. data/app/models/trackback.rb +1 -5
  73. data/app/models/user.rb +7 -5
  74. data/app/views/accounts/login.rhtml +19 -15
  75. data/app/views/accounts/logout.rhtml +4 -4
  76. data/app/views/accounts/signup.rhtml +9 -9
  77. data/app/views/admin/base/_recent_comments.rhtml +2 -2
  78. data/app/views/admin/base/_recent_trackbacks.rhtml +2 -2
  79. data/app/views/admin/blacklist/_blacklist_patterns.rhtml +4 -4
  80. data/app/views/admin/blacklist/_form.rhtml +3 -3
  81. data/app/views/admin/blacklist/_quick_post.rhtml +7 -6
  82. data/app/views/admin/blacklist/destroy.rhtml +5 -5
  83. data/app/views/admin/blacklist/edit.rhtml +7 -7
  84. data/app/views/admin/blacklist/list.rhtml +2 -2
  85. data/app/views/admin/cache/list.rhtml +2 -2
  86. data/app/views/admin/categories/_categories.rhtml +3 -3
  87. data/app/views/admin/categories/_form.rhtml +1 -1
  88. data/app/views/admin/categories/_quick_post.rhtml +5 -5
  89. data/app/views/admin/categories/destroy.rhtml +7 -7
  90. data/app/views/admin/categories/edit.rhtml +6 -6
  91. data/app/views/admin/categories/list.rhtml +7 -4
  92. data/app/views/admin/categories/reorder.rhtml +1 -1
  93. data/app/views/admin/categories/show.rhtml +6 -6
  94. data/app/views/admin/comments/_form.rhtml +4 -4
  95. data/app/views/admin/comments/comments.rhtml +1 -1
  96. data/app/views/admin/comments/destroy.rhtml +6 -6
  97. data/app/views/admin/comments/edit.rhtml +8 -8
  98. data/app/views/admin/comments/list.rhtml +11 -11
  99. data/app/views/admin/comments/new.rhtml +7 -7
  100. data/app/views/admin/comments/show.rhtml +7 -7
  101. data/app/views/admin/content/_articles.rhtml +12 -10
  102. data/app/views/admin/content/_attachment.rhtml +15 -17
  103. data/app/views/admin/content/_form.rhtml +68 -45
  104. data/app/views/admin/content/_pages.rhtml +2 -2
  105. data/app/views/admin/content/_quick_post.rhtml +6 -6
  106. data/app/views/admin/content/_show_categories.rhtml +2 -2
  107. data/app/views/admin/content/_show_resources.rhtml +2 -2
  108. data/app/views/admin/content/destroy.rhtml +8 -8
  109. data/app/views/admin/content/edit.rhtml +8 -26
  110. data/app/views/admin/content/list.rhtml +4 -4
  111. data/app/views/admin/content/new.rhtml +5 -25
  112. data/app/views/admin/content/preview.rhtml +9 -2
  113. data/app/views/admin/content/show.rhtml +10 -9
  114. data/app/views/admin/feedback/_item.rhtml +2 -2
  115. data/app/views/admin/feedback/list.rhtml +21 -20
  116. data/app/views/admin/general/index.rhtml +261 -239
  117. data/app/views/admin/general/update_database.rhtml +15 -15
  118. data/app/views/admin/pages/_form.rhtml +32 -15
  119. data/app/views/admin/pages/_pages.rhtml +9 -8
  120. data/app/views/admin/pages/_quick_post.rhtml +2 -2
  121. data/app/views/admin/pages/destroy.rhtml +7 -7
  122. data/app/views/admin/pages/edit.rhtml +7 -26
  123. data/app/views/admin/pages/list.rhtml +4 -3
  124. data/app/views/admin/pages/new.rhtml +5 -22
  125. data/app/views/admin/pages/preview.rhtml +1 -1
  126. data/app/views/admin/pages/show.rhtml +5 -5
  127. data/app/views/admin/resources/_itunes_category_edit.rhtml +2 -2
  128. data/app/views/admin/resources/_metadata_add.rhtml +13 -13
  129. data/app/views/admin/resources/_metadata_edit.rhtml +14 -14
  130. data/app/views/admin/resources/_mime_edit.rhtml +5 -5
  131. data/app/views/admin/resources/_pages.rhtml +2 -2
  132. data/app/views/admin/resources/_resources.rhtml +8 -8
  133. data/app/views/admin/resources/destroy.rhtml +7 -7
  134. data/app/views/admin/resources/list.rhtml +6 -3
  135. data/app/views/admin/resources/new.rhtml +7 -3
  136. data/app/views/admin/shared/_edit.rhtml +17 -0
  137. data/app/views/admin/sidebar/_active.rhtml +5 -5
  138. data/app/views/admin/sidebar/_availables.rhtml +1 -1
  139. data/app/views/admin/sidebar/_publish.rhtml +1 -1
  140. data/app/views/admin/sidebar/_target.rhtml +1 -1
  141. data/app/views/admin/sidebar/index.rhtml +9 -5
  142. data/app/views/admin/textfilters/_form.rhtml +13 -5
  143. data/app/views/admin/textfilters/_macros.rhtml +4 -4
  144. data/app/views/admin/textfilters/_textfilters.rhtml +6 -6
  145. data/app/views/admin/textfilters/destroy.rhtml +5 -8
  146. data/app/views/admin/textfilters/edit.rhtml +2 -5
  147. data/app/views/admin/textfilters/list.rhtml +4 -2
  148. data/app/views/admin/textfilters/macro_help.rhtml +1 -1
  149. data/app/views/admin/textfilters/new.rhtml +9 -7
  150. data/app/views/admin/textfilters/show.rhtml +5 -5
  151. data/app/views/admin/textfilters/show_help.rhtml +3 -3
  152. data/app/views/admin/themes/index.rhtml +8 -2
  153. data/app/views/admin/trackbacks/_form.rhtml +4 -4
  154. data/app/views/admin/trackbacks/destroy.rhtml +4 -4
  155. data/app/views/admin/trackbacks/edit.rhtml +6 -6
  156. data/app/views/admin/trackbacks/list.rhtml +10 -10
  157. data/app/views/admin/trackbacks/new.rhtml +6 -6
  158. data/app/views/admin/trackbacks/show.rhtml +8 -8
  159. data/app/views/admin/users/_form.rhtml +10 -10
  160. data/app/views/admin/users/_user.rhtml +6 -6
  161. data/app/views/admin/users/destroy.rhtml +7 -7
  162. data/app/views/admin/users/edit.rhtml +9 -5
  163. data/app/views/admin/users/list.rhtml +2 -2
  164. data/app/views/admin/users/new.rhtml +9 -7
  165. data/app/views/admin/users/show.rhtml +10 -10
  166. data/app/views/articles/_article.rhtml +3 -3
  167. data/app/views/articles/_comment.rhtml +3 -3
  168. data/app/views/articles/_comment_box.rhtml +6 -6
  169. data/app/views/articles/_trackback.rhtml +1 -1
  170. data/app/views/articles/archives.rhtml +3 -3
  171. data/app/views/articles/comment_preview.rhtml +2 -2
  172. data/app/views/articles/groupings.rhtml +1 -1
  173. data/app/views/articles/index.rhtml +2 -2
  174. data/app/views/articles/read.rhtml +15 -15
  175. data/app/views/articles/view_page.rhtml +1 -1
  176. data/app/views/layouts/administration.rhtml +11 -17
  177. data/app/views/layouts/minimal.rhtml +13 -0
  178. data/app/views/live/search.rhtml +1 -1
  179. data/app/views/notification_mailer/_mail_footer.rhtml +2 -2
  180. data/app/views/notification_mailer/article.rhtml +1 -1
  181. data/app/views/notification_mailer/comment.rhtml +4 -4
  182. data/app/views/settings/done.rhtml +1 -1
  183. data/app/views/settings/install.rhtml +3 -3
  184. data/app/views/shared/_search.rhtml +4 -4
  185. data/app/views/xml/_atom10_item_article.rxml +9 -7
  186. data/app/views/xml/_atom10_item_comment.rxml +2 -3
  187. data/app/views/xml/_atom10_item_trackback.rxml +1 -1
  188. data/app/views/xml/_googlesitemap_item_article.rxml +2 -2
  189. data/app/views/xml/_googlesitemap_item_category.rxml +1 -1
  190. data/app/views/xml/_googlesitemap_item_page.rxml +2 -2
  191. data/app/views/xml/_googlesitemap_item_tag.rxml +2 -2
  192. data/app/views/xml/_itunes_item_resource.rxml +2 -4
  193. data/app/views/xml/_rss20_item_article.rxml +4 -10
  194. data/app/views/xml/_rss20_item_comment.rxml +2 -2
  195. data/app/views/xml/rsd.rxml +4 -4
  196. data/bin/typo +0 -1
  197. data/config/boot.rb +4 -3
  198. data/config/environment.rb +37 -28
  199. data/config/environments/test.rb +1 -1
  200. data/config/routes.rb +6 -5
  201. data/db/migrate/051_fix_canonical_server_url.rb +17 -0
  202. data/db/migrate/052_remove_cached_html.rb +11 -0
  203. data/db/migrate/053_promote_canonical_server_url.rb +22 -0
  204. data/db/migrate/054_upgrade_sidebar_objects.rb +26 -0
  205. data/db/migrate/055_link_sidebars_to_blog.rb +17 -0
  206. data/db/migrate/056_create_notifications.rb +32 -0
  207. data/db/migrate/057_add_categorization_model.rb +45 -0
  208. data/db/migrate/058_separate_entries_and_feedback.rb +68 -0
  209. data/db/migrate/059_cleanup_feedback_table.rb +25 -0
  210. data/db/migrate/060_cleanup_contents_table.rb +29 -0
  211. data/db/migrate/061_convert_title_prefix_setting.rb +25 -0
  212. data/db/schema.mysql.sql +139 -108
  213. data/db/schema.postgresql.sql +140 -108
  214. data/db/schema.rb +97 -75
  215. data/db/schema.sqlite.sql +140 -108
  216. data/db/schema.sqlserver.sql +144 -109
  217. data/db/schema_version +1 -1
  218. data/lang/fr_FR.rb +469 -0
  219. data/lib/email_notify.rb +4 -4
  220. data/lib/generators/sidebar/sidebar_generator.rb +15 -6
  221. data/lib/generators/sidebar/templates/Rakefile +22 -0
  222. data/lib/generators/sidebar/templates/content.rhtml +10 -0
  223. data/lib/generators/sidebar/templates/init.rb +4 -0
  224. data/lib/generators/sidebar/templates/sidebar.rb +16 -0
  225. data/lib/generators/sidebar/templates/unit_test.rb +8 -0
  226. data/lib/jabber_notify.rb +8 -7
  227. data/lib/memory_profiler.rb +60 -0
  228. data/lib/rails_patch/active_record.rb +0 -27
  229. data/lib/route_cache.rb +15 -0
  230. data/lib/sidebars/component_plugin.rb +3 -0
  231. data/lib/sidebars/consolidated_plugin.rb +26 -0
  232. data/lib/sidebars/plugin.rb +8 -13
  233. data/lib/spam_protection.rb +35 -23
  234. data/lib/tasks/release.rake +7 -7
  235. data/lib/text_filter_plugin.rb +55 -15
  236. data/lib/typo_deprecated.rb +19 -0
  237. data/lib/typo_version.rb +1 -1
  238. data/public/images/bracket.gif +0 -0
  239. data/public/images/cancel.png +0 -0
  240. data/public/images/checked.png +0 -0
  241. data/public/images/delete.png +0 -0
  242. data/public/images/edit.png +0 -0
  243. data/public/images/help.png +0 -0
  244. data/public/images/show.png +0 -0
  245. data/public/javascripts/codecollapse.js +8 -0
  246. data/public/javascripts/controls.js +41 -23
  247. data/public/javascripts/dragdrop.js +105 -76
  248. data/public/javascripts/effects.js +293 -163
  249. data/public/javascripts/prototype.js +900 -391
  250. data/public/stylesheets/administration.css +390 -318
  251. data/public/stylesheets/codecollapse.css +3 -0
  252. data/public/stylesheets/minimal.css +142 -0
  253. data/public/stylesheets/textmate/dawn.css +209 -0
  254. data/public/stylesheets/textmate/iplastic.css +142 -0
  255. data/public/stylesheets/textmate/space_cadet.css +99 -0
  256. data/public/stylesheets/textmate/textmate.css +48 -0
  257. data/public/stylesheets/textmate/twilight.css +227 -0
  258. data/script/process/inspector +3 -0
  259. data/spec/controllers/accounts_controller_spec.rb +184 -0
  260. data/spec/controllers/articles_controller_spec.rb +47 -0
  261. data/spec/fixtures/articles_tags.yml +19 -0
  262. data/spec/fixtures/blacklist_patterns.yml +10 -0
  263. data/spec/fixtures/blogs.yml +77 -0
  264. data/spec/fixtures/categories.yml +35 -0
  265. data/{test/fixtures/articles_categories.yml → spec/fixtures/categorizations.yml} +0 -0
  266. data/spec/fixtures/contents.yml +215 -0
  267. data/spec/fixtures/feedback.yml +159 -0
  268. data/spec/fixtures/notifications.yml +0 -0
  269. data/spec/fixtures/page_caches.yml +7 -0
  270. data/spec/fixtures/redirects.yml +13 -0
  271. data/spec/fixtures/resources.yml +24 -0
  272. data/spec/fixtures/sidebars.yml +12 -0
  273. data/spec/fixtures/tags.yml +13 -0
  274. data/spec/fixtures/text_filters.yml +42 -0
  275. data/spec/fixtures/triggers.yml +1 -0
  276. data/spec/fixtures/users.yml +56 -0
  277. data/spec/fixtures/whiteboards.yml +13 -0
  278. data/spec/helpers/admin_base_helper_spec.rb +13 -0
  279. data/spec/models/amazon_sidebar_spec.rb +40 -0
  280. data/spec/models/audioscrobbler_spec.rb +134 -0
  281. data/spec/models/blog_spec.rb +28 -0
  282. data/spec/models/cache_support_spec.rb +55 -0
  283. data/spec/models/category_spec.rb +48 -0
  284. data/spec/models/configuration_spec.rb +108 -0
  285. data/spec/models/content_state_spec.rb +1010 -0
  286. data/spec/models/delegate_to_content_state_spec.rb +126 -0
  287. data/spec/models/delicious_spec.rb +101 -0
  288. data/spec/models/flickr_spec.rb +128 -0
  289. data/spec/models/metafragment_spec.rb +65 -0
  290. data/spec/models/page_cache_spec.rb +35 -0
  291. data/spec/models/page_spec.rb +88 -0
  292. data/spec/models/ping_spec.rb +133 -0
  293. data/spec/models/redirect_spec.rb +17 -0
  294. data/spec/models/resource_spec.rb +43 -0
  295. data/spec/models/static_sidebar_spec.rb +17 -0
  296. data/spec/models/tag_spec.rb +54 -0
  297. data/spec/models/text_filter_spec.rb +38 -0
  298. data/spec/models/theme_spec.rb +45 -0
  299. data/spec/models/trackback_spec.rb +60 -0
  300. data/spec/models/trigger_spec.rb +41 -0
  301. data/spec/models/user_spec.rb +105 -0
  302. data/test/fixtures/blogs.yml +5 -4
  303. data/test/fixtures/categorizations.yml +31 -0
  304. data/test/fixtures/contents.yml +2 -160
  305. data/test/fixtures/feedback.yml +159 -0
  306. data/test/fixtures/sidebars.yml +11 -4
  307. data/test/functional/accounts_controller_test.rb +6 -10
  308. data/test/functional/admin/article_preview_test.rb +21 -6
  309. data/test/functional/admin/blacklist_controller_test.rb +11 -11
  310. data/test/functional/admin/categories_controller_test.rb +13 -13
  311. data/test/functional/admin/comments_controller_test.rb +21 -21
  312. data/test/functional/admin/content_controller_test.rb +30 -38
  313. data/test/functional/admin/feedback_controller_test.rb +12 -12
  314. data/test/functional/admin/general_controller_test.rb +2 -2
  315. data/test/functional/admin/pages_controller_test.rb +3 -18
  316. data/test/functional/admin/resources_controller_test.rb +7 -7
  317. data/test/functional/admin/textfilters_controller_test.rb +2 -2
  318. data/test/functional/admin/themes_controller_test.rb +1 -1
  319. data/test/functional/admin/trackbacks_controller_test.rb +21 -21
  320. data/test/functional/admin/users_controller_test.rb +21 -18
  321. data/test/functional/articles_controller_test.rb +62 -46
  322. data/test/functional/backend_controller_test.rb +6 -6
  323. data/test/functional/redirect_controller_test.rb +3 -3
  324. data/test/functional/textfilter_controller_test.rb +10 -12
  325. data/test/functional/theme_controller_test.rb +1 -1
  326. data/test/functional/xml_controller_test.rb +7 -5
  327. data/test/mocks/themes/azure/layouts/default.rhtml +2 -2
  328. data/test/test_helper.rb +75 -0
  329. data/test/unit/amazon_sidebar_test.rb +36 -0
  330. data/test/unit/article_test.rb +36 -4
  331. data/test/unit/blog_test.rb +5 -36
  332. data/test/unit/cache_support_test.rb +62 -0
  333. data/test/unit/category_test.rb +6 -1
  334. data/test/unit/comment_test.rb +34 -9
  335. data/test/unit/content_state/factory_test.rb +8 -0
  336. data/test/unit/content_state/feedback_states_test.rb +71 -0
  337. data/test/unit/magnolia_test.rb +1 -1
  338. data/test/unit/notification_test.rb +10 -0
  339. data/test/unit/page_test.rb +20 -0
  340. data/test/unit/ping_test.rb +1 -1
  341. data/test/unit/sidebar_test.rb +2 -7
  342. data/test/unit/static_sidebar_test.rb +19 -0
  343. data/test/unit/tag_test.rb +6 -1
  344. data/test/unit/text_filter_test.rb +21 -21
  345. data/test/unit/theme_test.rb +1 -1
  346. data/test/unit/trackback_test.rb +16 -1
  347. data/themes/azure/layouts/default.rhtml +2 -2
  348. data/themes/scribbish/layouts/default.rhtml +2 -2
  349. data/themes/scribbish/stylesheets/content.css +6 -8
  350. data/themes/scribbish/views/articles/_article.rhtml +10 -10
  351. data/themes/scribbish/views/articles/_comment.rhtml +16 -12
  352. data/themes/scribbish/views/articles/_comment_form.rhtml +25 -22
  353. data/themes/scribbish/views/articles/_search.rhtml +14 -13
  354. data/themes/scribbish/views/articles/comment_preview.rhtml +3 -3
  355. data/themes/scribbish/views/articles/index.rhtml +1 -1
  356. data/themes/scribbish/views/articles/read.rhtml +8 -8
  357. data/vendor/cached_model/History.txt +30 -0
  358. data/vendor/cached_model/LICENSE.txt +30 -0
  359. data/vendor/cached_model/Manifest.txt +7 -0
  360. data/vendor/cached_model/README.txt +96 -0
  361. data/vendor/cached_model/Rakefile +25 -0
  362. data/vendor/cached_model/lib/cached_model.rb +287 -0
  363. data/vendor/cached_model/test/test_cached_model.rb +593 -0
  364. data/vendor/flickr/flickr.rb +1 -1
  365. data/vendor/memcache-client/History.txt +25 -0
  366. data/vendor/memcache-client/LICENSE.txt +30 -0
  367. data/vendor/memcache-client/Manifest.txt +8 -0
  368. data/vendor/memcache-client/README.txt +46 -0
  369. data/vendor/memcache-client/Rakefile +23 -0
  370. data/vendor/memcache-client/lib/memcache.rb +491 -0
  371. data/vendor/memcache-client/lib/memcache_util.rb +71 -0
  372. data/vendor/memcache-client/test/test_mem_cache.rb +284 -0
  373. data/vendor/plugins/action_view_patch/Rakefile +22 -0
  374. data/vendor/plugins/action_view_patch/init.rb +1 -0
  375. data/vendor/plugins/action_view_patch/lib/action_view_patch.rb +18 -0
  376. data/vendor/plugins/action_view_patch/test/action_view_patch_test.rb +56 -0
  377. data/vendor/plugins/aimpresence_sidebar/Rakefile +22 -0
  378. data/vendor/plugins/aimpresence_sidebar/init.rb +4 -0
  379. data/vendor/plugins/aimpresence_sidebar/lib/aimpresence_sidebar.rb +21 -0
  380. data/vendor/plugins/aimpresence_sidebar/test/aimpresence_sidebar_test.rb +33 -0
  381. data/vendor/plugins/aimpresence_sidebar/views/content.rhtml +4 -0
  382. data/vendor/plugins/amazon_sidebar/init.rb +5 -0
  383. data/vendor/plugins/amazon_sidebar/lib/amazon_sidebar.rb +16 -0
  384. data/vendor/plugins/amazon_sidebar/views/content.rhtml +4 -0
  385. data/vendor/plugins/archives_sidebar/Rakefile +22 -0
  386. data/vendor/plugins/archives_sidebar/init.rb +5 -0
  387. data/{components/plugins/sidebars/archives_controller.rb → vendor/plugins/archives_sidebar/lib/archives_sidebar.rb} +7 -6
  388. data/vendor/plugins/archives_sidebar/test/archives_sidebar_test.rb +8 -0
  389. data/{components/plugins/sidebars/archives → vendor/plugins/archives_sidebar/views}/content.rhtml +2 -2
  390. data/vendor/plugins/audioscrobbler_sidebar/Rakefile +22 -0
  391. data/vendor/plugins/audioscrobbler_sidebar/init.rb +5 -0
  392. data/{app/models/aggregations → vendor/plugins/audioscrobbler_sidebar/lib}/audioscrobbler.rb +0 -0
  393. data/{components/plugins/sidebars/audioscrobbler_controller.rb → vendor/plugins/audioscrobbler_sidebar/lib/audioscrobbler_sidebar.rb} +7 -4
  394. data/vendor/plugins/audioscrobbler_sidebar/test/audioscrobbler_sidebar_test.rb +8 -0
  395. data/{components/plugins/sidebars/audioscrobbler → vendor/plugins/audioscrobbler_sidebar/views}/content.rhtml +4 -4
  396. data/vendor/plugins/backpack_sidebar/Rakefile +22 -0
  397. data/vendor/plugins/backpack_sidebar/init.rb +5 -0
  398. data/{app/models/aggregations → vendor/plugins/backpack_sidebar/lib}/backpack.rb +0 -0
  399. data/{components/plugins/sidebars/backpack_controller.rb → vendor/plugins/backpack_sidebar/lib/backpack_sidebar.rb} +6 -3
  400. data/vendor/plugins/backpack_sidebar/test/backpack_sidebar_test.rb +8 -0
  401. data/{components/plugins/sidebars/backpack → vendor/plugins/backpack_sidebar/views}/content.rhtml +4 -4
  402. data/vendor/plugins/category_sidebar/Rakefile +22 -0
  403. data/vendor/plugins/category_sidebar/init.rb +5 -0
  404. data/{components/plugins/sidebars/category_controller.rb → vendor/plugins/category_sidebar/lib/category_sidebar.rb} +3 -5
  405. data/vendor/plugins/category_sidebar/test/category_sidebar_test.rb +8 -0
  406. data/vendor/plugins/category_sidebar/views/content.rhtml +10 -0
  407. data/vendor/plugins/delicious_sidebar/Rakefile +22 -0
  408. data/vendor/plugins/delicious_sidebar/init.rb +5 -0
  409. data/{app/models/aggregations → vendor/plugins/delicious_sidebar/lib}/delicious.rb +0 -0
  410. data/{components/plugins/sidebars/delicious_controller.rb → vendor/plugins/delicious_sidebar/lib/delicious_sidebar.rb} +16 -10
  411. data/vendor/plugins/delicious_sidebar/test/delicious_sidebar_test.rb +8 -0
  412. data/vendor/plugins/delicious_sidebar/views/content.rhtml +20 -0
  413. data/vendor/plugins/flickr_sidebar/Rakefile +22 -0
  414. data/vendor/plugins/flickr_sidebar/init.rb +5 -0
  415. data/{app/models/aggregations → vendor/plugins/flickr_sidebar/lib}/flickr.rb +1 -1
  416. data/vendor/plugins/flickr_sidebar/lib/flickr_sidebar.rb +15 -0
  417. data/vendor/plugins/flickr_sidebar/test/flickr_sidebar_test.rb +8 -0
  418. data/{components/plugins/sidebars/flickr → vendor/plugins/flickr_sidebar/views}/content.rhtml +5 -5
  419. data/vendor/plugins/fortythree_sidebar/Rakefile +22 -0
  420. data/vendor/plugins/fortythree_sidebar/init.rb +5 -0
  421. data/{app/models/aggregations → vendor/plugins/fortythree_sidebar/lib}/fortythree.rb +0 -0
  422. data/{components/plugins/sidebars/fortythree_controller.rb → vendor/plugins/fortythree_sidebar/lib/fortythree_sidebar.rb} +5 -4
  423. data/vendor/plugins/fortythree_sidebar/test/fortythree_sidebar_test.rb +8 -0
  424. data/vendor/plugins/fortythree_sidebar/views/content.rhtml +8 -0
  425. data/vendor/plugins/fortythreeplaces_sidebar/Rakefile +22 -0
  426. data/vendor/plugins/fortythreeplaces_sidebar/init.rb +5 -0
  427. data/vendor/plugins/fortythreeplaces_sidebar/lib/fortythree.rb +62 -0
  428. data/{components/plugins/sidebars/fortythreeplaces_controller.rb → vendor/plugins/fortythreeplaces_sidebar/lib/fortythreeplaces_sidebar.rb} +5 -4
  429. data/vendor/plugins/fortythreeplaces_sidebar/test/fortythreeplaces_sidebar_test.rb +8 -0
  430. data/vendor/plugins/fortythreeplaces_sidebar/views/content.rhtml +8 -0
  431. data/vendor/plugins/haml/MIT-LICENSE +20 -0
  432. data/vendor/plugins/haml/REFERENCE +662 -0
  433. data/vendor/plugins/haml/Rakefile +171 -0
  434. data/vendor/plugins/haml/VERSION +1 -0
  435. data/vendor/plugins/haml/bin/haml +18 -0
  436. data/vendor/plugins/haml/init.rb +3 -0
  437. data/vendor/plugins/haml/lib/haml/buffer.rb +224 -0
  438. data/vendor/plugins/haml/lib/haml/engine.rb +557 -0
  439. data/vendor/plugins/haml/lib/haml/helpers.rb +220 -0
  440. data/vendor/plugins/haml/lib/haml/helpers/action_view_mods.rb +54 -0
  441. data/vendor/plugins/haml/lib/haml/template.rb +138 -0
  442. data/vendor/plugins/haml/test/benchmark.rb +62 -0
  443. data/vendor/plugins/haml/test/engine_test.rb +93 -0
  444. data/vendor/plugins/haml/test/helper_test.rb +105 -0
  445. data/vendor/plugins/haml/test/mocks/article.rb +6 -0
  446. data/vendor/plugins/haml/test/profile.rb +45 -0
  447. data/vendor/plugins/haml/test/results/content_for_layout.xhtml +16 -0
  448. data/vendor/plugins/haml/test/results/eval_suppressed.xhtml +2 -0
  449. data/vendor/plugins/haml/test/results/helpers.xhtml +50 -0
  450. data/vendor/plugins/haml/test/results/helpful.xhtml +5 -0
  451. data/vendor/plugins/haml/test/results/just_stuff.xhtml +38 -0
  452. data/vendor/plugins/haml/test/results/list.xhtml +12 -0
  453. data/vendor/plugins/haml/test/results/original_engine.xhtml +24 -0
  454. data/vendor/plugins/haml/test/results/partials.xhtml +20 -0
  455. data/vendor/plugins/haml/test/results/silent_script.xhtml +74 -0
  456. data/vendor/plugins/haml/test/results/standard.xhtml +42 -0
  457. data/vendor/plugins/haml/test/results/tag_parsing.xhtml +28 -0
  458. data/vendor/plugins/haml/test/results/very_basic.xhtml +7 -0
  459. data/vendor/plugins/haml/test/results/whitespace_handling.xhtml +51 -0
  460. data/vendor/plugins/haml/test/rhtml/standard.rhtml +51 -0
  461. data/vendor/plugins/haml/test/runner.rb +15 -0
  462. data/vendor/plugins/haml/test/template_test.rb +137 -0
  463. data/vendor/plugins/haml/test/templates/_partial.haml +7 -0
  464. data/vendor/plugins/haml/test/templates/_text_area.haml +3 -0
  465. data/vendor/plugins/haml/test/templates/content_for_layout.haml +10 -0
  466. data/vendor/plugins/haml/test/templates/eval_suppressed.haml +5 -0
  467. data/vendor/plugins/haml/test/templates/helpers.haml +39 -0
  468. data/vendor/plugins/haml/test/templates/helpful.haml +6 -0
  469. data/vendor/plugins/haml/test/templates/just_stuff.haml +34 -0
  470. data/vendor/plugins/haml/test/templates/list.haml +12 -0
  471. data/vendor/plugins/haml/test/templates/original_engine.haml +17 -0
  472. data/vendor/plugins/haml/test/templates/partialize.haml +1 -0
  473. data/vendor/plugins/haml/test/templates/partials.haml +12 -0
  474. data/vendor/plugins/haml/test/templates/silent_script.haml +40 -0
  475. data/vendor/plugins/haml/test/templates/standard.haml +40 -0
  476. data/vendor/plugins/haml/test/templates/tag_parsing.haml +24 -0
  477. data/vendor/plugins/haml/test/templates/very_basic.haml +4 -0
  478. data/vendor/plugins/haml/test/templates/whitespace_handling.haml +66 -0
  479. data/vendor/plugins/localization/CHANGELOG +1 -0
  480. data/vendor/plugins/localization/README +85 -0
  481. data/vendor/plugins/localization/init.rb +3 -0
  482. data/vendor/plugins/localization/lib/localization.rb +46 -0
  483. data/vendor/plugins/magnolia_sidebar/Rakefile +22 -0
  484. data/vendor/plugins/magnolia_sidebar/init.rb +5 -0
  485. data/{app/models/aggregations/magnolia.rb → vendor/plugins/magnolia_sidebar/lib/magnolia_aggregation.rb} +0 -0
  486. data/vendor/plugins/magnolia_sidebar/lib/magnolia_sidebar.rb +16 -0
  487. data/vendor/plugins/magnolia_sidebar/test/magnolia_sidebar_test.rb +8 -0
  488. data/vendor/plugins/magnolia_sidebar/views/content.rhtml +12 -0
  489. data/vendor/plugins/recent_comments_sidebar/Rakefile +22 -0
  490. data/vendor/plugins/recent_comments_sidebar/init.rb +5 -0
  491. data/vendor/plugins/recent_comments_sidebar/lib/recent_comments_sidebar.rb +16 -0
  492. data/vendor/plugins/recent_comments_sidebar/test/recent_comments_sidebar_test.rb +8 -0
  493. data/{components/plugins/sidebars/recent_comments → vendor/plugins/recent_comments_sidebar/views}/content.rhtml +2 -2
  494. data/vendor/plugins/static_sidebar/init.rb +4 -0
  495. data/{components/plugins/sidebars/static_controller.rb → vendor/plugins/static_sidebar/lib/static_sidebar.rb} +4 -7
  496. data/vendor/plugins/static_sidebar/views/content.rhtml +2 -0
  497. data/vendor/plugins/tada_sidebar/Rakefile +22 -0
  498. data/vendor/plugins/tada_sidebar/init.rb +5 -0
  499. data/{app/models/aggregations → vendor/plugins/tada_sidebar/lib}/tada.rb +0 -0
  500. data/{components/plugins/sidebars/tada_controller.rb → vendor/plugins/tada_sidebar/lib/tada_sidebar.rb} +8 -4
  501. data/vendor/plugins/tada_sidebar/test/tada_sidebar_test.rb +8 -0
  502. data/{components/plugins/sidebars/tada → vendor/plugins/tada_sidebar/views}/content.rhtml +4 -4
  503. data/vendor/plugins/tag_sidebar/Rakefile +22 -0
  504. data/vendor/plugins/tag_sidebar/init.rb +5 -0
  505. data/vendor/plugins/tag_sidebar/lib/tag_sidebar.rb +24 -0
  506. data/vendor/plugins/tag_sidebar/test/tag_sidebar_test.rb +8 -0
  507. data/vendor/plugins/tag_sidebar/views/content.rhtml +8 -0
  508. data/vendor/plugins/technorati_sidebar/Rakefile +22 -0
  509. data/vendor/plugins/technorati_sidebar/init.rb +5 -0
  510. data/{app/models/aggregations → vendor/plugins/technorati_sidebar/lib}/technorati.rb +0 -0
  511. data/{components/plugins/sidebars/technorati_controller.rb → vendor/plugins/technorati_sidebar/lib/technorati_sidebar.rb} +8 -4
  512. data/vendor/plugins/technorati_sidebar/test/technorati_sidebar_test.rb +8 -0
  513. data/vendor/plugins/technorati_sidebar/views/content.rhtml +8 -0
  514. data/vendor/plugins/typo_textfilter_amazon/README +5 -0
  515. data/vendor/plugins/typo_textfilter_amazon/Rakefile +22 -0
  516. data/vendor/plugins/typo_textfilter_amazon/init.rb +4 -0
  517. data/vendor/plugins/typo_textfilter_amazon/install.rb +1 -0
  518. data/vendor/plugins/typo_textfilter_amazon/lib/typo_textfilter_amazon.rb +45 -0
  519. data/vendor/plugins/typo_textfilter_amazon/tasks/typo_textfilter_amazon_tasks.rake +4 -0
  520. data/vendor/plugins/typo_textfilter_amazon/test/typo_textfilter_amazon_test.rb +8 -0
  521. data/vendor/plugins/typo_textfilter_code/README +4 -0
  522. data/vendor/plugins/typo_textfilter_code/Rakefile +22 -0
  523. data/vendor/plugins/typo_textfilter_code/init.rb +4 -0
  524. data/vendor/plugins/typo_textfilter_code/install.rb +1 -0
  525. data/vendor/plugins/typo_textfilter_code/lib/typo_textfilter_code.rb +62 -0
  526. data/vendor/plugins/typo_textfilter_code/tasks/typo_textfilter_code_tasks.rake +4 -0
  527. data/vendor/plugins/typo_textfilter_code/test/typo_textfilter_code_test.rb +8 -0
  528. data/vendor/plugins/typo_textfilter_flickr/README +4 -0
  529. data/vendor/plugins/typo_textfilter_flickr/Rakefile +22 -0
  530. data/vendor/plugins/typo_textfilter_flickr/init.rb +4 -0
  531. data/vendor/plugins/typo_textfilter_flickr/install.rb +1 -0
  532. data/vendor/plugins/typo_textfilter_flickr/lib/typo_textfilter_flickr.rb +79 -0
  533. data/vendor/plugins/typo_textfilter_flickr/tasks/typo_textfilter_flickr_tasks.rake +4 -0
  534. data/vendor/plugins/typo_textfilter_flickr/test/typo_textfilter_flickr_test.rb +8 -0
  535. data/vendor/plugins/typo_textfilter_htmlfilter/README +4 -0
  536. data/vendor/plugins/typo_textfilter_htmlfilter/Rakefile +22 -0
  537. data/vendor/plugins/typo_textfilter_htmlfilter/init.rb +2 -0
  538. data/vendor/plugins/typo_textfilter_htmlfilter/install.rb +1 -0
  539. data/vendor/plugins/typo_textfilter_htmlfilter/lib/typo_textfilter_htmlfilter.rb +12 -0
  540. data/vendor/plugins/typo_textfilter_htmlfilter/tasks/typo_textfilter_htmlfilter_tasks.rake +4 -0
  541. data/vendor/plugins/typo_textfilter_htmlfilter/test/typo_textfilter_htmlfilter_test.rb +8 -0
  542. data/vendor/plugins/typo_textfilter_lightbox/README +4 -0
  543. data/vendor/plugins/typo_textfilter_lightbox/Rakefile +22 -0
  544. data/vendor/plugins/typo_textfilter_lightbox/init.rb +2 -0
  545. data/vendor/plugins/typo_textfilter_lightbox/install.rb +1 -0
  546. data/{components/plugins/textfilters/lightbox_controller.rb → vendor/plugins/typo_textfilter_lightbox/lib/typo_textfilter_lightbox.rb} +64 -61
  547. data/vendor/plugins/typo_textfilter_lightbox/tasks/typo_textfilter_lightbox_tasks.rake +4 -0
  548. data/vendor/plugins/typo_textfilter_lightbox/test/typo_textfilter_lightbox_test.rb +8 -0
  549. data/vendor/plugins/typo_textfilter_markdown/README +4 -0
  550. data/vendor/plugins/typo_textfilter_markdown/Rakefile +22 -0
  551. data/vendor/plugins/typo_textfilter_markdown/init.rb +2 -0
  552. data/vendor/plugins/typo_textfilter_markdown/install.rb +1 -0
  553. data/{components/plugins/textfilters/markdown_controller.rb → vendor/plugins/typo_textfilter_markdown/lib/typo_textfilter_markdown.rb} +13 -9
  554. data/vendor/plugins/typo_textfilter_markdown/tasks/typo_textfilter_markdown_tasks.rake +4 -0
  555. data/vendor/plugins/typo_textfilter_markdown/test/typo_textfilter_markdown_test.rb +8 -0
  556. data/vendor/plugins/typo_textfilter_none/README +4 -0
  557. data/vendor/plugins/typo_textfilter_none/Rakefile +22 -0
  558. data/vendor/plugins/typo_textfilter_none/init.rb +2 -0
  559. data/vendor/plugins/typo_textfilter_none/install.rb +1 -0
  560. data/vendor/plugins/typo_textfilter_none/lib/typo_textfilter_none.rb +12 -0
  561. data/vendor/plugins/typo_textfilter_none/tasks/typo_textfilter_none_tasks.rake +4 -0
  562. data/vendor/plugins/typo_textfilter_none/test/typo_textfilter_none_test.rb +8 -0
  563. data/vendor/plugins/typo_textfilter_smartypants/README +4 -0
  564. data/vendor/plugins/typo_textfilter_smartypants/Rakefile +22 -0
  565. data/vendor/plugins/typo_textfilter_smartypants/init.rb +2 -0
  566. data/vendor/plugins/typo_textfilter_smartypants/install.rb +1 -0
  567. data/vendor/plugins/typo_textfilter_smartypants/lib/typo_textfilter_smartypants.rb +12 -0
  568. data/vendor/plugins/typo_textfilter_smartypants/tasks/typo_textfilter_smartypants_tasks.rake +4 -0
  569. data/vendor/plugins/typo_textfilter_smartypants/test/typo_textfilter_smartypants_test.rb +8 -0
  570. data/vendor/plugins/typo_textfilter_sparkline/README +4 -0
  571. data/vendor/plugins/typo_textfilter_sparkline/Rakefile +22 -0
  572. data/vendor/plugins/typo_textfilter_sparkline/init.rb +2 -0
  573. data/vendor/plugins/typo_textfilter_sparkline/install.rb +1 -0
  574. data/vendor/plugins/typo_textfilter_sparkline/lib/typo_textfilter_sparkline.rb +92 -0
  575. data/vendor/plugins/typo_textfilter_sparkline/tasks/typo_textfilter_sparkline_tasks.rake +4 -0
  576. data/vendor/plugins/typo_textfilter_sparkline/test/typo_textfilter_sparkline_test.rb +8 -0
  577. data/vendor/plugins/typo_textfilter_textile/README +4 -0
  578. data/vendor/plugins/typo_textfilter_textile/Rakefile +22 -0
  579. data/vendor/plugins/typo_textfilter_textile/init.rb +2 -0
  580. data/vendor/plugins/typo_textfilter_textile/install.rb +1 -0
  581. data/vendor/plugins/typo_textfilter_textile/lib/typo_textfilter_textile.rb +18 -0
  582. data/vendor/plugins/typo_textfilter_textile/tasks/typo_textfilter_textile_tasks.rake +4 -0
  583. data/vendor/plugins/typo_textfilter_textile/test/typo_textfilter_textile_test.rb +8 -0
  584. data/vendor/plugins/typo_textfilter_textile_and_markdown/README +4 -0
  585. data/vendor/plugins/typo_textfilter_textile_and_markdown/Rakefile +22 -0
  586. data/vendor/plugins/typo_textfilter_textile_and_markdown/init.rb +2 -0
  587. data/vendor/plugins/typo_textfilter_textile_and_markdown/install.rb +1 -0
  588. data/vendor/plugins/typo_textfilter_textile_and_markdown/lib/typo_textfilter_textile_and_markdown.rb +12 -0
  589. data/vendor/plugins/typo_textfilter_textile_and_markdown/tasks/typo_textfilter_textile_and_markdown_tasks.rake +4 -0
  590. data/vendor/plugins/typo_textfilter_textile_and_markdown/test/typo_textfilter_textile_and_markdown_test.rb +8 -0
  591. data/vendor/plugins/typo_textfilter_tmcode/README +4 -0
  592. data/vendor/plugins/typo_textfilter_tmcode/Rakefile +22 -0
  593. data/vendor/plugins/typo_textfilter_tmcode/init.rb +3 -0
  594. data/vendor/plugins/typo_textfilter_tmcode/install.rb +1 -0
  595. data/vendor/plugins/typo_textfilter_tmcode/lib/typo_textfilter_tmcode.rb +86 -0
  596. data/vendor/plugins/typo_textfilter_tmcode/tasks/typo_textfilter_tmcode_tasks.rake +4 -0
  597. data/vendor/plugins/typo_textfilter_tmcode/test/typo_textfilter_tmcode_test.rb +8 -0
  598. data/vendor/plugins/upcoming_sidebar/Rakefile +22 -0
  599. data/vendor/plugins/upcoming_sidebar/init.rb +5 -0
  600. data/{app/models/aggregations → vendor/plugins/upcoming_sidebar/lib}/upcoming.rb +0 -0
  601. data/vendor/plugins/upcoming_sidebar/lib/upcoming_sidebar.rb +15 -0
  602. data/vendor/plugins/upcoming_sidebar/test/upcoming_sidebar_test.rb +8 -0
  603. data/{components/plugins/sidebars/upcoming → vendor/plugins/upcoming_sidebar/views}/content.rhtml +3 -3
  604. data/vendor/plugins/xbox_sidebar/Rakefile +22 -0
  605. data/vendor/plugins/xbox_sidebar/init.rb +5 -0
  606. data/{components/plugins/sidebars/xbox_controller.rb → vendor/plugins/xbox_sidebar/lib/xbox_sidebar.rb} +1 -1
  607. data/vendor/plugins/xbox_sidebar/test/xbox_sidebar_test.rb +8 -0
  608. data/vendor/plugins/xbox_sidebar/views/content.rhtml +2 -0
  609. data/vendor/plugins/xml_sidebar/Rakefile +22 -0
  610. data/vendor/plugins/xml_sidebar/init.rb +5 -0
  611. data/{components/plugins/sidebars/xml_controller.rb → vendor/plugins/xml_sidebar/lib/xml_sidebar.rb} +1 -1
  612. data/vendor/plugins/xml_sidebar/test/xml_sidebar_test.rb +8 -0
  613. data/vendor/plugins/xml_sidebar/views/content.rhtml +12 -0
  614. metadata +505 -101
  615. data/app/controllers/sidebar_controller.rb +0 -50
  616. data/app/models/content_observer.rb +0 -5
  617. data/components/plugins/sidebars/aimpresence/content.rhtml +0 -4
  618. data/components/plugins/sidebars/aimpresence_controller.rb +0 -10
  619. data/components/plugins/sidebars/amazon/content.rhtml +0 -4
  620. data/components/plugins/sidebars/amazon_controller.rb +0 -17
  621. data/components/plugins/sidebars/category/content.rhtml +0 -10
  622. data/components/plugins/sidebars/delicious/content.rhtml +0 -20
  623. data/components/plugins/sidebars/flickr_controller.rb +0 -16
  624. data/components/plugins/sidebars/fortythree/content.rhtml +0 -8
  625. data/components/plugins/sidebars/fortythreeplaces/content.rhtml +0 -8
  626. data/components/plugins/sidebars/magnolia/content.rhtml +0 -12
  627. data/components/plugins/sidebars/magnolia_controller.rb +0 -17
  628. data/components/plugins/sidebars/recent_comments_controller.rb +0 -23
  629. data/components/plugins/sidebars/static/content.rhtml +0 -2
  630. data/components/plugins/sidebars/tag/content.rhtml +0 -8
  631. data/components/plugins/sidebars/tag_controller.rb +0 -18
  632. data/components/plugins/sidebars/technorati/content.rhtml +0 -8
  633. data/components/plugins/sidebars/upcoming_controller.rb +0 -11
  634. data/components/plugins/sidebars/xbox/content.rhtml +0 -2
  635. data/components/plugins/sidebars/xml/content.rhtml +0 -12
  636. data/components/plugins/textfilters/amazon_controller.rb +0 -39
  637. data/components/plugins/textfilters/code_controller.rb +0 -59
  638. data/components/plugins/textfilters/flickr_controller.rb +0 -75
  639. data/components/plugins/textfilters/htmlfilter_controller.rb +0 -8
  640. data/components/plugins/textfilters/macropost_controller.rb +0 -14
  641. data/components/plugins/textfilters/macropre_controller.rb +0 -14
  642. data/components/plugins/textfilters/none_controller.rb +0 -8
  643. data/components/plugins/textfilters/smartypants_controller.rb +0 -8
  644. data/components/plugins/textfilters/sparkline_controller.rb +0 -88
  645. data/components/plugins/textfilters/textile_and_markdown_controller.rb +0 -8
  646. data/components/plugins/textfilters/textile_controller.rb +0 -14
  647. data/db/schema.mysql-v3.sql +0 -218
  648. data/lib/generators/sidebar/templates/components/plugins/sidebars/controller_template.rb +0 -20
  649. data/lib/generators/sidebar/templates/components/plugins/sidebars/views/content_template.rhtml +0 -4
  650. data/lib/rails_patch/components.rb +0 -14
  651. data/public/images/checked.gif +0 -0
  652. data/test/unit/observer_test.rb +0 -40
@@ -1,138 +1,136 @@
1
- /*
2
- * =GENERAL/MASTER CONTAINERS
3
- */
1
+ /* @group General/Master Containers */
4
2
 
5
- body {
3
+ body {
6
4
  margin: 0;
7
5
  font: 1em/1.6em Verdana, Helvetica, Arial, sans-serif;
8
6
  text-align: center;
9
7
  color: #000;
10
- }
11
-
8
+ }
12
9
 
13
- #container {
10
+ #container {
14
11
  text-align: left;
15
12
  font-size: 70%;
16
13
  margin: 0 auto;
17
- }
14
+ }
18
15
 
19
- #header {
16
+ #header {
20
17
  height: 92px;
21
18
  color: #fff;
22
- }
19
+ }
23
20
 
24
- #overall {
21
+ #overall {
25
22
  background: #fff;
26
23
  width: 85%;
27
24
  margin: 0 auto;
28
- }
25
+ }
29
26
 
30
- #content {
27
+ #content {
31
28
  background: #fff;
32
29
  margin: 5px 0 0 0;
33
30
  padding: 10px;
34
- }
31
+ }
35
32
 
36
- #main {
33
+ #main {
37
34
  padding-left: 10px;
38
- }
35
+ }
39
36
 
40
37
  #info {
41
38
  float: right;
42
39
  margin-right: 20px;
43
40
  margin-top: 5px;
44
41
  font-size: 80%;
45
- }
42
+ }
46
43
 
47
- #footer {
44
+ #footer {
48
45
  margin-top: 7px;
49
46
  height: 35px;
50
47
  text-align: center;
51
- }
48
+ }
52
49
 
53
- /*
54
- * =UTILITY
55
- */
50
+ /* @end */
56
51
 
57
- form {
52
+ /* @group Utility */
53
+
54
+ form {
58
55
  margin: 0;
59
56
  padding: 0;
60
- }
57
+ }
58
+
59
+ img {
60
+ border: none;
61
+ }
61
62
 
62
- img { border: none; }
63
+ a {
64
+ color: #8D805D;
65
+ text-decoration: none;
66
+ }
63
67
 
64
- a {
65
- color: #8D805D;
66
- text-decoration: none;
67
- }
68
+ a:hover {
69
+ color: #333;
70
+ }
68
71
 
69
- a:hover {
70
- color: #333;
71
- }
72
+ hr {
73
+ border: none;
74
+ border-bottom: 1px solid #7D8692;
75
+ }
72
76
 
73
- hr {
74
- border: none;
75
- border-bottom: 1px solid #7D8692;
76
- }
77
- /*
78
- * =PRIMARY NAVIGATION
79
- */
80
-
81
-
82
- #tabs-container {
83
- height: 20px;
84
- width: auto;
85
- padding: 14px 0 0 100px;
86
- margin-top: -40px;
87
- border-bottom: 1px solid #637987;
88
- background: #F8F7EF;
89
- }
90
-
91
- #tabs {
92
- padding: 0;
93
- margin: 0 0 0 40px;
94
- font: normal 100% Georgia, Garamond, Times ;
95
- line-height: normal;
96
- text-transform: uppercase;
97
- }
98
-
99
- #tabs li {
100
- list-style: none;
101
- margin: 0;
102
- padding: 0;
103
- display: inline;
104
- }
105
-
106
- #tabs li a {
107
- padding: 3px 8px 3px 8px;
108
- margin-left: 3px;
109
- background: #F8F7EF;
110
- text-decoration: none;
111
- color: #003;
112
- line-height: normal;
113
- }
114
-
115
- #tabs li a:hover {
116
- color: #993300;
117
- border-top: 12px solid #E8E4D3;
118
- }
119
-
120
- #tabs li a.active {
121
- color: #993300;
122
- border-top: 12px solid #E8E4D3;
123
- background: #F8F7EF;
124
- }
125
-
126
- #tabs li a.active:hover {
127
- color: #777;
128
- background: #fff;
129
- border-color: #637987;
130
- }
77
+ /* @end */
131
78
 
79
+ /* @group Primary Navigation */
132
80
 
133
- /*
134
- * =TASKS LINKS
135
- */
81
+ #tabs-container {
82
+ height: 20px;
83
+ width: auto;
84
+ padding: 14px 0 0 100px;
85
+ margin-top: -40px;
86
+ border-bottom: 1px solid #637987;
87
+ background: #F8F7EF;
88
+ }
89
+
90
+ #tabs {
91
+ padding: 0;
92
+ margin: 0 0 0 40px;
93
+ font: normal 100% Georgia, Garamond, Times;
94
+ line-height: normal;
95
+ text-transform: uppercase;
96
+ }
97
+
98
+ #tabs li {
99
+ list-style: none;
100
+ margin: 0;
101
+ padding: 0;
102
+ display: inline;
103
+ }
104
+
105
+ #tabs li a {
106
+ padding: 3px 8px 3px 8px;
107
+ margin-left: 3px;
108
+ background: #F8F7EF;
109
+ text-decoration: none;
110
+ color: #003;
111
+ line-height: normal;
112
+ }
113
+
114
+ #tabs li a:hover {
115
+ color: #993300;
116
+ border-top: 12px solid #E8E4D3;
117
+ }
118
+
119
+ #tabs li a.active {
120
+ color: #993300;
121
+ border-top: 12px solid #E8E4D3;
122
+ background: #F8F7EF;
123
+ }
124
+
125
+ #tabs li a.active:hover {
126
+ color: #777;
127
+ background: #fff;
128
+ border-color: #637987;
129
+ }
130
+
131
+ /* @end */
132
+
133
+ /* @group Tasks Links */
136
134
 
137
135
  .tasks {
138
136
  background: #F8F7EF;
@@ -140,18 +138,18 @@
140
138
  border-bottom: 1px dotted #C2C0BB;
141
139
  padding: 5px;
142
140
  margin-bottom: 15px;
143
- }
141
+ }
144
142
 
145
143
  .tasks ul {
146
144
  list-style: none;
147
145
  margin: 0;
148
146
  padding: 0;
149
- }
147
+ }
150
148
 
151
149
  .tasks ul li {
152
150
  display: inline;
153
151
  line-height: normal;
154
- }
152
+ }
155
153
 
156
154
  .tasks li a {
157
155
  display: block;
@@ -159,251 +157,309 @@
159
157
  padding: 2px 5px;
160
158
  margin-right: 5px;
161
159
  text-decoration: none;
162
- }
160
+ }
163
161
 
164
162
  .tasks li a:hover {
165
163
  background: #637987;
166
164
  color: #fff;
167
- }
165
+ }
168
166
 
167
+ /* @end */
169
168
 
170
- /*
171
- * =HEADINGS
172
- */
173
-
174
- h2 {
175
- font: normal 170% Georgia, Times, Helvetica;
176
- color: #930;
177
- padding: 5px 0 0 5px;
178
- }
179
-
180
- h3 {
181
- font-size: 130%;
182
- padding: 5px;
183
- margin-bottom: 0;
184
- }
185
-
186
- #header h1 {
187
- background: #EDEBD5;
188
- margin: 0;
189
- padding: 14px 0 12px 100px;
190
- border-bottom: 1px dashed #A9A585;
191
- border-top: 4px solid #4A4902;
192
- font: normal 200% Georgia, Garamond, Times ;
193
- text-transform: uppercase;
194
- letter-spacing: 0.08em;
195
- }
196
-
197
- #header h1 a {
198
- color: #000;
199
- margin: 10px 0 10px 0;
200
- text-decoration: none;
201
- border: none;
202
- }
203
-
204
- .form h3, h3 {
205
- background: #333;
206
- color: #fff;
207
- font-weight: normal;
208
- }
209
-
210
- .form h4 {
211
- padding: 2px;
212
- margin: 0;
213
- font-size: 120%;
214
- }
215
-
216
- .tasks h3 {
217
- font: normal 120%/normal "Trebuchet MS", Arial, Verdana;
218
- background: transparent;
219
- margin: 0 0 5px 0;
220
- padding: 0;
221
- color: #4A611C;
222
- }
223
-
224
- .set h3 {
225
- background: none;
226
- margin: 0 0 5px 0;
227
- color: #1F273F;
228
- }
229
- /*
230
- * =TABLE LISTINGS
231
- */
169
+ /* @group Headings */
170
+
171
+ h2 {
172
+ font: normal 170% Georgia, Times, Helvetica;
173
+ color: #930;
174
+ padding: 5px 0 0 5px;
175
+ }
176
+
177
+ h3 {
178
+ font-size: 130%;
179
+ padding: 5px;
180
+ margin-bottom: 0;
181
+ }
182
+
183
+ #header h1 {
184
+ background: #EDEBD5;
185
+ margin: 0;
186
+ padding: 14px 0 12px 100px;
187
+ border-bottom: 1px dashed #A9A585;
188
+ border-top: 4px solid #4A4902;
189
+ font: normal 200% Georgia, Garamond, Times;
190
+ text-transform: uppercase;
191
+ letter-spacing: 0.08em;
192
+ }
193
+
194
+ #header h1 a {
195
+ color: #000;
196
+ margin: 10px 0 10px 0;
197
+ text-decoration: none;
198
+ border: none;
199
+ }
232
200
 
233
- .list { clear: left; }
201
+ .form h3, h3 {
202
+ background: #333;
203
+ color: #fff;
204
+ font-weight: normal;
205
+ }
234
206
 
235
- .list table {
236
- width: 98%;
237
- }
207
+ .form h4 {
208
+ padding: 2px;
209
+ margin: 0;
210
+ font-size: 120%;
211
+ }
238
212
 
239
- .list table th {
240
- text-align: left;
241
- font-weight: bold;
242
- border-bottom: 4px solid #ccc;
243
- }
213
+ .tasks h3 {
214
+ font: normal 120%/normal "Trebuchet MS", Arial, Verdana;
215
+ background: transparent;
216
+ margin: 0 0 5px 0;
217
+ padding: 0;
218
+ color: #4A611C;
219
+ }
244
220
 
245
- .list table tr td {
246
- padding: 0 2px;
247
- }
221
+ .set h3 {
222
+ background: none;
223
+ margin: 0 0 5px 0;
224
+ color: #1F273F;
225
+ }
248
226
 
249
- tr.shade {
250
- background: #E4E4D7;
251
- }
227
+ /* @end */
228
+
229
+ /* @group Table Listings */
230
+
231
+ .operation {
232
+ width: 25px;
233
+ text-align: center;
234
+ }
235
+
236
+ .list {
237
+ clear: left;
238
+ }
239
+
240
+ .list table {
241
+ width: 98%;
242
+ }
243
+
244
+ .list table th {
245
+ text-align: left;
246
+ font-weight: bold;
247
+ border-bottom: 4px solid #ccc;
248
+ }
249
+
250
+ .list table tr td {
251
+ padding: 0 2px;
252
+ }
253
+
254
+ tr.shade {
255
+ background: #E4E4D7;
256
+ }
257
+
258
+ /* @end */
259
+
260
+ /* @group Form Elements */
252
261
 
253
- /*
254
- * =FORM ELEMENTS
255
- */
256
262
  label {
257
263
  font-weight: bold;
258
- }
264
+ }
259
265
 
260
266
  .form {
261
267
  border: 1px solid #C2C0BB;
262
268
  background: #F8F7EF;
263
269
  margin-bottom: 10px;
264
270
  padding: 0 0 0 10px;
265
- }
271
+ }
266
272
 
267
273
  .form div {
268
274
  padding: 5px;
269
- }
275
+ }
270
276
 
271
277
  .form input {
272
- font-family: Georgia;
273
- font-size: 1em;
274
- letter-spacing: 0.02em;
278
+ font-family: Georgia;
279
+ font-size: 1em;
280
+ letter-spacing: 0.02em;
275
281
  }
276
282
 
277
283
  .form textarea {
278
- width: 350px;
279
- font-family: Georgia;
280
- line-height: 1.1em;
281
- font-size: 1em;
282
- letter-spacing: 0.02em;
283
- word-spacing: 0.05em;
284
+ width: 350px;
285
+ font-family: Georgia;
286
+ line-height: 1.1em;
287
+ font-size: 1em;
288
+ letter-spacing: 0.02em;
289
+ word-spacing: 0.05em;
284
290
  }
285
291
 
286
292
  #blog_name {
287
293
  font-size: 130%;
288
294
  }
289
295
 
290
- /*
291
- * =POPUPS/TOOLTIPS
292
- */
296
+ /* @end */
297
+
298
+ /* @group Popups/Tooltips */
293
299
 
294
- .tip-catlist {
300
+ .tip-catlist {
295
301
  width: 200px;
296
302
  background: #EEF1FE;
297
303
  border: 2px solid #C2D2E7;
298
304
  padding: 5px;
299
- }
305
+ }
300
306
 
307
+ /* @end */
301
308
 
302
- /*
303
- * =LIVE PREVIEW
304
- */
309
+ /* @group Live Preview */
305
310
 
306
311
  #preview, #preview_extended {
307
312
  background: #fff;
308
313
  border: 1px dashed #ccc;
309
- padding: 5px;
310
- z-index: 9999;
314
+ padding: 0 0 0 5px;
311
315
  width: 50%;
316
+ height: 500px;
312
317
  float: right;
313
- clear: right;
314
318
  margin-bottom: 10px;
315
319
  line-height: 1.5em;
316
320
  letter-spacing: 0.02em;
317
- word-spacing: 0.05em;
318
- font-size: 0.95em;
319
- }
321
+ word-spacing: 0.05em;
322
+ font-size: 0.95em;
323
+ }
320
324
 
321
- /*
322
- *=GENERAL SETTINGS SCREEN
323
- */
325
+ /* @end */
326
+
327
+ /* @group General Settings Screen */
324
328
 
325
329
  .set {
326
330
  background: #F8F7EF;
327
- border: 1px dotted #7D8692;
328
331
  padding: 0 10px 5px 10px;
329
332
  margin-bottom: 10px;
330
333
  position: relative;
331
334
  }
332
335
 
333
336
  #gensettings {
337
+ /* Nothing here */
338
+ }
339
+
340
+ legend {
341
+ font-size: 130%;
342
+ text-transform: capitalize;
343
+ }
334
344
 
345
+ .admin ul {
346
+ margin: 0;
347
+ padding: 0;
335
348
  }
336
349
 
337
- /*
338
- * =SIDEBAR
339
- */
350
+ .admin li {
351
+ list-style: none;
352
+ padding: 5px;
353
+ margin: 0;
354
+ clear: both;
355
+ }
356
+
357
+ .admin li p {
358
+ line-height: 1.6em;
359
+ }
360
+
361
+ .admin li.checkbox {
362
+ line-height: 1.4em;
363
+ }
364
+
365
+ .admin label.float {
366
+ display: block;
367
+ float: left;
368
+ width: 200px;
369
+ margin-left: 0;
370
+ margin-right: 12px;
371
+ padding: 0;
372
+ text-align: right;
373
+ }
340
374
 
375
+ .admin label.block {
376
+ display: block;
377
+ }
341
378
 
342
- #sidebar-config {
379
+ .admin input.float {
380
+ width: auto;
381
+ }
382
+
383
+ .admin span.float {
384
+ margin-left: 212px;
385
+ padding: 0;
386
+ display: block;
387
+ clear: both;
388
+ }
389
+
390
+ .mandatory {
391
+ color: #f00;
392
+ }
393
+
394
+ /* @end */
395
+
396
+ /* @group Sidebar */
397
+
398
+ #sidebar-config {
343
399
  /* Safari Fix */
344
- border-top: 5px solid #fff;
345
- }
346
-
347
- #sidebar-config p {
348
- margin: 0;
349
- padding-left: 5px;
350
- }
351
-
352
- #available {
353
- float: left;
354
- width: 300px;
355
- }
356
-
357
- #active, #cnt-active {
358
- width: 300px;
359
- min-height: 200px;
360
- }
361
-
362
- #cnt-active {
363
- margin-left: 320px;
364
- background: #F8F7EF;
365
- }
366
-
367
- #available {
368
- background: #F8F7EF;
369
- padding-bottom: 10px;
370
- }
371
-
372
- #active {
373
- background: #F8F7EF;
374
- padding-bottom: 10px;
375
- }
376
-
377
- #available h3, #active h3, #cnt-active h3 {
378
- background: #E4E4D7;
379
- color: #333;
380
- margin: 0 0 10px 0;
381
- padding: 2px 5px;
382
- }
383
-
384
- .dropbox {
385
- width: 270px;
386
- }
387
-
388
- .handle {
389
- cursor: move;
390
- font-size: 130%;
391
- font-weight: normal;
392
- padding-left: 5px;
393
- margin: 0;
394
- }
395
-
396
- .dragitem, .dropitem {
397
- margin: 0 0 5px 12px;
398
- }
399
-
400
- .dragitem {
401
- border: 1px solid #9cabba;
402
- border-top: 1px solid #bacddf;
403
- border-left: 1px solid #bacddf;
404
- background: #fff;
405
- width: 270px;
406
- }
400
+ border-top: 5px solid #fff;
401
+ }
402
+
403
+ #sidebar-config p {
404
+ margin: 0;
405
+ padding-left: 5px;
406
+ }
407
+
408
+ #available {
409
+ float: left;
410
+ width: 300px;
411
+ }
412
+
413
+ #active, #cnt-active {
414
+ width: 300px;
415
+ min-height: 200px;
416
+ }
417
+
418
+ #cnt-active {
419
+ margin-left: 320px;
420
+ background: #F8F7EF;
421
+ }
422
+
423
+ #available {
424
+ background: #F8F7EF;
425
+ padding-bottom: 10px;
426
+ }
427
+
428
+ #active {
429
+ background: #F8F7EF;
430
+ padding-bottom: 10px;
431
+ }
432
+
433
+ #available h3, #active h3, #cnt-active h3 {
434
+ background: #E4E4D7;
435
+ color: #333;
436
+ margin: 0 0 10px 0;
437
+ padding: 2px 5px;
438
+ }
439
+
440
+ .dropbox {
441
+ width: 270px;
442
+ }
443
+
444
+ .handle {
445
+ cursor: move;
446
+ font-size: 130%;
447
+ font-weight: normal;
448
+ padding-left: 5px;
449
+ margin: 0;
450
+ }
451
+
452
+ .dragitem, .dropitem {
453
+ margin: 0 0 5px 12px;
454
+ }
455
+
456
+ .dragitem {
457
+ border: 1px solid #9cabba;
458
+ border-top: 1px solid #bacddf;
459
+ border-left: 1px solid #bacddf;
460
+ background: #fff;
461
+ width: 270px;
462
+ }
407
463
 
408
464
  .handle {
409
465
  background: #f7f7f7;
@@ -416,37 +472,48 @@ label {
416
472
  }
417
473
 
418
474
  /*
419
- * =MISC
420
- */
475
+
476
+ @end */
477
+
478
+ /* @group Miscellaneous */
479
+
421
480
  .form p {
422
481
  margin: 0;
423
482
  padding: 0 0 5px;
424
- }
483
+ }
425
484
 
426
485
  #info {
427
- color: #4A4902;
486
+ color: #4A4902;
428
487
  }
429
488
 
430
489
  #info a {
431
490
  color: #4A4902;
432
- }
491
+ }
433
492
 
434
493
  #info a:hover {
435
494
  border-bottom: 1px dotted #222;
436
- }
495
+ }
437
496
 
438
497
  .form p>small {
439
498
  color: gray;
440
499
  }
441
500
 
442
- .form .note {
501
+ .form .note {
443
502
  font-style: italic;
444
503
  font-size: 90%;
445
- }
504
+ }
505
+
506
+ .r {
507
+ text-align: right;
508
+ }
446
509
 
447
- .r { text-align: right; }
448
- .c { text-align: center; }
449
- .space { margin: 10px; }
510
+ .c {
511
+ text-align: center;
512
+ }
513
+
514
+ .space {
515
+ margin: 10px;
516
+ }
450
517
 
451
518
  .errorExplanation {
452
519
  background: #FFE6E6;
@@ -484,9 +551,10 @@ label {
484
551
  .theme h3 {
485
552
  margin: 0;
486
553
  }
487
- /*
488
- *=Users
489
- */
554
+
555
+ /* @end */
556
+
557
+ /* @group Users */
490
558
 
491
559
  div#users {
492
560
  background: #F8F7EF;
@@ -523,9 +591,10 @@ div.user {
523
591
  margin: 0;
524
592
  padding: 5px;
525
593
  }
526
- /*
527
- *=MISC CONTAINERS
528
- */
594
+
595
+ /* @end */
596
+
597
+ /* @group Misc Containers */
529
598
 
530
599
  #quick-post {
531
600
  background: #EDEBD5;
@@ -536,18 +605,18 @@ div.user {
536
605
  }
537
606
 
538
607
  #quick-post input {
539
- font-family: Georgia;
540
- font-size: 13px;
541
- letter-spacing: 0.02em;
608
+ font-family: Georgia;
609
+ font-size: 13px;
610
+ letter-spacing: 0.02em;
542
611
  }
543
612
 
544
613
  #quick-post textarea {
545
- width: 350px;
546
- font-family: Georgia;
547
- line-height: 14px;
548
- font-size: 12px;
549
- letter-spacing: 0.02em;
550
- word-spacing: 0.05em;
614
+ width: 350px;
615
+ font-family: Georgia;
616
+ line-height: 14px;
617
+ font-size: 12px;
618
+ letter-spacing: 0.02em;
619
+ word-spacing: 0.05em;
551
620
  }
552
621
 
553
622
  #quick-navigate {
@@ -558,7 +627,9 @@ div.user {
558
627
  border-top: none;
559
628
  }
560
629
 
561
- #advanced { line-height: 1.3em; }
630
+ #advanced {
631
+ line-height: 1.3em;
632
+ }
562
633
 
563
634
  #advanced label {
564
635
  clear: left;
@@ -568,17 +639,17 @@ div.user {
568
639
 
569
640
  #loginform {
570
641
  width: 300px;
571
- margin-left: auto;
572
- margin-right: auto;
642
+ margin-left: auto;
643
+ margin-right: auto;
573
644
  padding: 100px;
574
645
  }
575
646
 
576
647
  #loginform input {
577
- margin-bottom: 10px;
648
+ margin-bottom: 10px;
578
649
  }
579
650
 
580
651
  #loginform div.form {
581
- padding:10px;
652
+ padding: 10px;
582
653
  }
583
654
 
584
655
  #loginform .fieldWithErrors {
@@ -594,17 +665,17 @@ div.user {
594
665
  }
595
666
 
596
667
  #flash .notice {
597
- font-size: 11px;
598
- color: #fff;
599
- background: #637987;
600
- border-top: 1px solid #336699;
601
- border-bottom: 1px solid #336699;
668
+ font-size: 11px;
669
+ color: #fff;
670
+ background: #637987;
671
+ border-top: 1px solid #336699;
672
+ border-bottom: 1px solid #336699;
602
673
  }
603
674
 
604
675
  #flash .error {
605
- background: #e99;
606
- border-top: 1px solid #822;
607
- border-bottom: 1px solid #822;
676
+ background: #e99;
677
+ border-top: 1px solid #822;
678
+ border-bottom: 1px solid #822;
608
679
  }
609
680
 
610
681
  #category_list {
@@ -620,9 +691,9 @@ div.user {
620
691
  border-bottom: 1px dotted #ccc;
621
692
  }
622
693
 
623
- /*
624
- * Feedback
625
- */
694
+ /* @end */
695
+
696
+ /* @group Feedback */
626
697
 
627
698
  .feedbackbody td {
628
699
  border-bottom: 1px dotted #ccc;
@@ -645,6 +716,7 @@ div.user {
645
716
  }
646
717
 
647
718
  .spam .state {
648
- font-weight: bold
719
+ font-weight: bold
649
720
  }
650
721
 
722
+ /* @end */