typo 5.1.98 → 5.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (84) hide show
  1. data/app/controllers/admin/blacklist_controller.rb +9 -3
  2. data/app/controllers/admin/content_controller.rb +1 -1
  3. data/app/controllers/admin/feedback_controller.rb +9 -0
  4. data/app/controllers/admin/themes_controller.rb +46 -0
  5. data/app/controllers/comments_controller.rb +5 -1
  6. data/app/helpers/admin/base_helper.rb +2 -1
  7. data/app/helpers/admin/feedback_helper.rb +3 -0
  8. data/app/helpers/application_helper.rb +2 -1
  9. data/app/helpers/theme_helper.rb +5 -1
  10. data/app/models/article.rb +8 -3
  11. data/app/models/blacklist_pattern.rb +2 -0
  12. data/app/models/feedback.rb +7 -1
  13. data/app/views/admin/blacklist/_blacklist_patterns.html.erb +10 -10
  14. data/app/views/admin/blacklist/_form.html.erb +1 -1
  15. data/app/views/admin/blacklist/_quick_post.html.erb +2 -1
  16. data/app/views/admin/categories/_form.html.erb +1 -1
  17. data/app/views/admin/categories/new.html.erb +1 -1
  18. data/app/views/admin/content/_form.html.erb +21 -8
  19. data/app/views/admin/content/index.html.erb +2 -2
  20. data/app/views/admin/dashboard/_comments.html.erb +3 -3
  21. data/app/views/admin/dashboard/_inbound.html.erb +2 -2
  22. data/app/views/admin/dashboard/_popular.html.erb +2 -2
  23. data/app/views/admin/dashboard/_posts.html.erb +2 -2
  24. data/app/views/admin/dashboard/_sysinfo.html.erb +4 -4
  25. data/app/views/admin/dashboard/_typo_dev.html.erb +1 -1
  26. data/app/views/admin/feedback/_button.html.erb +1 -0
  27. data/app/views/admin/feedback/_form.html.erb +1 -1
  28. data/app/views/admin/feedback/_item.html.erb +7 -7
  29. data/app/views/admin/feedback/article.html.erb +1 -1
  30. data/app/views/admin/feedback/edit.html.erb +1 -1
  31. data/app/views/admin/pages/_form.html.erb +2 -2
  32. data/app/views/admin/settings/feedback.html.erb +3 -3
  33. data/app/views/admin/settings/index.html.erb +3 -3
  34. data/app/views/admin/settings/read.html.erb +1 -1
  35. data/app/views/admin/settings/seo.html.erb +1 -1
  36. data/app/views/admin/settings/update_database.html.erb +2 -2
  37. data/app/views/admin/sidebar/index.html.erb +5 -5
  38. data/app/views/admin/themes/catalogue.html.erb +25 -0
  39. data/app/views/admin/themes/editor.html.erb +1 -4
  40. data/app/views/admin/themes/index.html.erb +1 -1
  41. data/app/views/admin/users/index.html.erb +6 -6
  42. data/app/views/articles/_article.html.erb +1 -1
  43. data/app/views/articles/_comment.html.erb +1 -1
  44. data/app/views/articles/comment_preview.html.erb +1 -1
  45. data/app/views/layouts/administration.html.erb +0 -1
  46. data/app/views/trackbacks/trackback.xml.builder +4 -0
  47. data/app/views/xml/feed.atom.builder +1 -1
  48. data/config/environment.rb +2 -0
  49. data/config/initializers/access_rules.rb +1 -0
  50. data/lang/fr_FR.rb +4 -0
  51. data/lib/spam_protection.rb +0 -18
  52. data/lib/tasks/release.rake +3 -1
  53. data/lib/typo_version.rb +1 -1
  54. data/public/javascripts/fckeditor/fckconfig.js +21 -14
  55. data/public/javascripts/fckeditor/fckeditor.js +1 -1
  56. data/public/javascripts/quicktags.js +2 -2
  57. data/public/robots.txt +0 -11
  58. data/public/stylesheets/administration.css +163 -280
  59. data/spec/controllers/articles_controller_spec.rb +8 -0
  60. data/spec/controllers/xml_controller_spec.rb +7 -0
  61. data/spec/models/comment_spec.rb +1 -1
  62. data/spec/models/trackback_spec.rb +4 -1
  63. data/spec/views/articles/index_spec.rb +0 -1
  64. data/themes/dirtylicious/views/articles/_article.html.erb +2 -2
  65. data/themes/dirtylicious/views/articles/_comment.html.erb +1 -1
  66. data/themes/dirtylicious/views/articles/comment_preview.html.erb +1 -1
  67. data/themes/dirtylicious/views/articles/read.html.erb +9 -3
  68. data/themes/scribbish/views/articles/_article.html.erb +2 -2
  69. data/themes/scribbish/views/articles/_comment.html.erb +1 -1
  70. data/themes/scribbish/views/articles/read.html.erb +9 -3
  71. data/themes/standard_issue/views/articles/_article.html.erb +3 -3
  72. data/themes/standard_issue/views/articles/_comment.html.erb +1 -1
  73. data/themes/standard_issue/views/articles/comment_preview.html.erb +1 -1
  74. data/themes/standard_issue/views/articles/read.html.erb +8 -3
  75. data/themes/typographic/views/articles/_article.html.erb +3 -3
  76. data/themes/typographic/views/articles/_comment.html.erb +1 -1
  77. data/themes/typographic/views/articles/comment_preview.html.erb +1 -1
  78. data/themes/typographic/views/articles/read.html.erb +6 -2
  79. data/vendor/plugins/fckeditor/app/controllers/fckeditor_controller.rb +8 -7
  80. data/vendor/plugins/fckeditor/lib/fckeditor_version.rb +1 -1
  81. data/vendor/plugins/xml_sidebar/lib/xml_sidebar.rb +11 -2
  82. data/vendor/plugins/xml_sidebar/views/content.rhtml +6 -6
  83. metadata +176 -157
  84. data/vendor/plugins/fckeditor/Rakefile +0 -72
@@ -1,72 +0,0 @@
1
- require 'rake'
2
- require 'rake/testtask'
3
- require 'rake/packagetask'
4
- require 'rake/rdoctask'
5
- require 'find'
6
-
7
- desc 'Default: run unit tests.'
8
- task :default => :test
9
-
10
- desc 'Test the fckeditor plugin.'
11
- Rake::TestTask.new(:test) do |t|
12
- t.libs << 'lib'
13
- t.pattern = 'test/**/*_test.rb'
14
- t.verbose = true
15
- end
16
-
17
- desc 'Generate documentation for the fckeditor plugin.'
18
- Rake::RDocTask.new(:rdoc) do |rdoc|
19
- rdoc.rdoc_dir = 'rdoc'
20
- rdoc.title = 'Fckeditor'
21
- rdoc.options << '--line-numbers' << '--inline-source'
22
- rdoc.rdoc_files.include('README')
23
- rdoc.rdoc_files.include('lib/**/*.rb')
24
- end
25
-
26
- # Globals
27
- require 'lib/fckeditor_version'
28
- PKG_NAME = 'fckeditor_plugin'
29
- PKG_VERSION = FckeditorVersion.current
30
-
31
- PKG_FILES = ['README', 'CHANGELOG', 'init.rb', 'install.rb']
32
- PKG_DIRECTORIES = ['app/', 'lib/', 'public/', 'tasks/', 'test/']
33
- PKG_DIRECTORIES.each do |dir|
34
- Find.find(dir) do |f|
35
- if FileTest.directory?(f) and f =~ /\.svn/
36
- Find.prune
37
- else
38
- PKG_FILES << f
39
- end
40
- end
41
- end
42
-
43
- # Tasks
44
- task :package
45
- Rake::PackageTask.new(PKG_NAME, PKG_VERSION) do |p|
46
- p.need_tar = true
47
- p.package_files = PKG_FILES
48
- end
49
-
50
- # "Gem" part of the Rakefile
51
- begin
52
- require 'rake/gempackagetask'
53
-
54
- spec = Gem::Specification.new do |s|
55
- s.platform = Gem::Platform::RUBY
56
- s.summary = "FCKeditor plugin for Rails"
57
- s.name = PKG_NAME
58
- s.version = PKG_VERSION
59
- s.requirements << 'none'
60
- s.files = PKG_FILES
61
- s.description = "Adds FCKeditor helpers and code to Rails application"
62
- end
63
-
64
- desc "Create gem package for FCKeditor plugin"
65
- task :package_gem
66
- Rake::GemPackageTask.new(spec) do |pkg|
67
- pkg.need_zip = true
68
- pkg.need_tar = true
69
- end
70
- rescue LoadError
71
- end
72
-