typo 4.1 → 4.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (251) hide show
  1. data/Rakefile +1 -1
  2. data/TODO-4.2 +14 -0
  3. data/TODO.MULTIUSERS +45 -0
  4. data/app/controllers/admin/base_controller.rb +18 -0
  5. data/app/controllers/admin/general_controller.rb +14 -0
  6. data/app/controllers/application.rb +2 -1
  7. data/app/controllers/articles_controller.rb +18 -21
  8. data/app/helpers/admin/base_helper.rb +4 -4
  9. data/app/helpers/admin/feedback_helper.rb +3 -3
  10. data/app/helpers/application_helper.rb +2 -6
  11. data/app/helpers/sidebar_helper.rb +2 -2
  12. data/app/models/blog.rb +9 -1
  13. data/app/models/category.rb +9 -9
  14. data/app/models/comment.rb +1 -1
  15. data/app/models/content_state/presumed_ham.rb +2 -2
  16. data/app/models/resource.rb +2 -0
  17. data/app/views/admin/categories/_categories.rhtml +10 -6
  18. data/app/views/admin/categories/edit.rhtml +3 -1
  19. data/app/views/admin/comments/_form.rhtml +3 -3
  20. data/app/views/admin/comments/list.rhtml +7 -5
  21. data/app/views/admin/comments/new.rhtml +3 -1
  22. data/app/views/admin/comments/show.rhtml +3 -1
  23. data/app/views/admin/content/_articles.rhtml +1 -1
  24. data/app/views/admin/content/_form.rhtml +4 -2
  25. data/app/views/admin/content/new.rhtml +1 -0
  26. data/app/views/admin/content/preview.rhtml +8 -8
  27. data/app/views/admin/feedback/_item.rhtml +3 -1
  28. data/app/views/admin/feedback/list.rhtml +4 -4
  29. data/app/views/admin/general/index.rhtml +14 -1
  30. data/app/views/admin/pages/_form.rhtml +1 -1
  31. data/app/views/admin/pages/destroy.rhtml +1 -1
  32. data/app/views/admin/pages/new.rhtml +1 -0
  33. data/app/views/admin/shared/_edit.rhtml +2 -2
  34. data/app/views/layouts/administration.rhtml +5 -2
  35. data/app/views/layouts/minimal.rhtml +134 -2
  36. data/config/boot.rb +1 -1
  37. data/config/environment.rb +11 -3
  38. data/config/environments/test.rb +0 -7
  39. data/config/routes.rb +3 -0
  40. data/db/migrate/004_add_sidebars.rb +21 -3
  41. data/db/migrate/056_create_notifications.rb +1 -1
  42. data/db/migrate/062_add_sitealizer_plugin.rb +18 -0
  43. data/db/schema.mysql-v3.sql +217 -0
  44. data/db/schema.mysql.sql +31 -5
  45. data/db/schema.postgresql.sql +31 -6
  46. data/db/schema.rb +17 -7
  47. data/db/schema.sqlite.sql +31 -6
  48. data/db/schema.sqlserver.sql +32 -6
  49. data/db/schema_version +1 -1
  50. data/lang/de_DE.rb +493 -0
  51. data/lang/fr_FR.rb +28 -4
  52. data/lang/ro_RO.rb +554 -0
  53. data/lib/tasks/release.rake +7 -7
  54. data/lib/typo_version.rb +1 -1
  55. data/public/images/sitealizer/bar.gif +0 -0
  56. data/public/images/sitealizer/uv.png +0 -0
  57. data/public/images/sitealizer/vh.png +0 -0
  58. data/public/javascripts/tiny_mce/blank.htm +9 -0
  59. data/public/javascripts/tiny_mce/langs/en.js +41 -0
  60. data/public/javascripts/tiny_mce/license.txt +504 -0
  61. data/public/javascripts/tiny_mce/themes/advanced/about.htm +52 -0
  62. data/public/javascripts/tiny_mce/themes/advanced/anchor.htm +33 -0
  63. data/public/javascripts/tiny_mce/themes/advanced/charmap.htm +53 -0
  64. data/public/javascripts/tiny_mce/themes/advanced/color_picker.htm +13 -0
  65. data/public/javascripts/tiny_mce/themes/advanced/css/editor_content.css +58 -0
  66. data/public/javascripts/tiny_mce/themes/advanced/css/editor_popup.css +331 -0
  67. data/public/javascripts/tiny_mce/themes/advanced/css/editor_ui.css +97 -0
  68. data/public/javascripts/tiny_mce/themes/advanced/docs/en/about.htm +31 -0
  69. data/public/javascripts/tiny_mce/themes/advanced/docs/en/common_buttons.htm +162 -0
  70. data/public/javascripts/tiny_mce/themes/advanced/docs/en/create_accessible_content.htm +45 -0
  71. data/public/javascripts/tiny_mce/themes/advanced/docs/en/images/insert_anchor_window.gif +0 -0
  72. data/public/javascripts/tiny_mce/themes/advanced/docs/en/images/insert_image_window.gif +0 -0
  73. data/public/javascripts/tiny_mce/themes/advanced/docs/en/images/insert_link_window.gif +0 -0
  74. data/public/javascripts/tiny_mce/themes/advanced/docs/en/images/insert_table_window.gif +0 -0
  75. data/public/javascripts/tiny_mce/themes/advanced/docs/en/index.htm +27 -0
  76. data/public/javascripts/tiny_mce/themes/advanced/docs/en/insert_anchor_button.htm +32 -0
  77. data/public/javascripts/tiny_mce/themes/advanced/docs/en/insert_image_button.htm +65 -0
  78. data/public/javascripts/tiny_mce/themes/advanced/docs/en/insert_link_button.htm +33 -0
  79. data/public/javascripts/tiny_mce/themes/advanced/docs/en/insert_table_button.htm +71 -0
  80. data/public/javascripts/tiny_mce/themes/advanced/docs/en/style.css +28 -0
  81. data/public/javascripts/tiny_mce/themes/advanced/editor_template.js +1 -0
  82. data/public/javascripts/tiny_mce/themes/advanced/editor_template_src.js +1534 -0
  83. data/public/javascripts/tiny_mce/themes/advanced/image.htm +100 -0
  84. data/public/javascripts/tiny_mce/themes/advanced/images/anchor.gif +0 -0
  85. data/public/javascripts/tiny_mce/themes/advanced/images/anchor_symbol.gif +0 -0
  86. data/public/javascripts/tiny_mce/themes/advanced/images/backcolor.gif +0 -0
  87. data/public/javascripts/tiny_mce/themes/advanced/images/bold.gif +0 -0
  88. data/public/javascripts/tiny_mce/themes/advanced/images/bold_de_se.gif +0 -0
  89. data/public/javascripts/tiny_mce/themes/advanced/images/bold_es.gif +0 -0
  90. data/public/javascripts/tiny_mce/themes/advanced/images/bold_fr.gif +0 -0
  91. data/public/javascripts/tiny_mce/themes/advanced/images/bold_ru.gif +0 -0
  92. data/public/javascripts/tiny_mce/themes/advanced/images/bold_tw.gif +0 -0
  93. data/public/javascripts/tiny_mce/themes/advanced/images/browse.gif +0 -0
  94. data/public/javascripts/tiny_mce/themes/advanced/images/bullist.gif +0 -0
  95. data/public/javascripts/tiny_mce/themes/advanced/images/button_menu.gif +0 -0
  96. data/public/javascripts/tiny_mce/themes/advanced/images/buttons.gif +0 -0
  97. data/public/javascripts/tiny_mce/themes/advanced/images/cancel_button_bg.gif +0 -0
  98. data/public/javascripts/tiny_mce/themes/advanced/images/charmap.gif +0 -0
  99. data/public/javascripts/tiny_mce/themes/advanced/images/cleanup.gif +0 -0
  100. data/public/javascripts/tiny_mce/themes/advanced/images/close.gif +0 -0
  101. data/public/javascripts/tiny_mce/themes/advanced/images/code.gif +0 -0
  102. data/public/javascripts/tiny_mce/themes/advanced/images/color.gif +0 -0
  103. data/public/javascripts/tiny_mce/themes/advanced/images/copy.gif +0 -0
  104. data/public/javascripts/tiny_mce/themes/advanced/images/custom_1.gif +0 -0
  105. data/public/javascripts/tiny_mce/themes/advanced/images/cut.gif +0 -0
  106. data/public/javascripts/tiny_mce/themes/advanced/images/forecolor.gif +0 -0
  107. data/public/javascripts/tiny_mce/themes/advanced/images/help.gif +0 -0
  108. data/public/javascripts/tiny_mce/themes/advanced/images/hr.gif +0 -0
  109. data/public/javascripts/tiny_mce/themes/advanced/images/image.gif +0 -0
  110. data/public/javascripts/tiny_mce/themes/advanced/images/indent.gif +0 -0
  111. data/public/javascripts/tiny_mce/themes/advanced/images/insert_button_bg.gif +0 -0
  112. data/public/javascripts/tiny_mce/themes/advanced/images/italic.gif +0 -0
  113. data/public/javascripts/tiny_mce/themes/advanced/images/italic_de_se.gif +0 -0
  114. data/public/javascripts/tiny_mce/themes/advanced/images/italic_es.gif +0 -0
  115. data/public/javascripts/tiny_mce/themes/advanced/images/italic_ru.gif +0 -0
  116. data/public/javascripts/tiny_mce/themes/advanced/images/italic_tw.gif +0 -0
  117. data/public/javascripts/tiny_mce/themes/advanced/images/justifycenter.gif +0 -0
  118. data/public/javascripts/tiny_mce/themes/advanced/images/justifyfull.gif +0 -0
  119. data/public/javascripts/tiny_mce/themes/advanced/images/justifyleft.gif +0 -0
  120. data/public/javascripts/tiny_mce/themes/advanced/images/justifyright.gif +0 -0
  121. data/public/javascripts/tiny_mce/themes/advanced/images/link.gif +0 -0
  122. data/public/javascripts/tiny_mce/themes/advanced/images/menu_check.gif +0 -0
  123. data/public/javascripts/tiny_mce/themes/advanced/images/newdocument.gif +0 -0
  124. data/public/javascripts/tiny_mce/themes/advanced/images/numlist.gif +0 -0
  125. data/public/javascripts/tiny_mce/themes/advanced/images/opacity.png +0 -0
  126. data/public/javascripts/tiny_mce/themes/advanced/images/outdent.gif +0 -0
  127. data/public/javascripts/tiny_mce/themes/advanced/images/paste.gif +0 -0
  128. data/public/javascripts/tiny_mce/themes/advanced/images/redo.gif +0 -0
  129. data/public/javascripts/tiny_mce/themes/advanced/images/removeformat.gif +0 -0
  130. data/public/javascripts/tiny_mce/themes/advanced/images/separator.gif +0 -0
  131. data/public/javascripts/tiny_mce/themes/advanced/images/spacer.gif +0 -0
  132. data/public/javascripts/tiny_mce/themes/advanced/images/statusbar_resize.gif +0 -0
  133. data/public/javascripts/tiny_mce/themes/advanced/images/strikethrough.gif +0 -0
  134. data/public/javascripts/tiny_mce/themes/advanced/images/sub.gif +0 -0
  135. data/public/javascripts/tiny_mce/themes/advanced/images/sup.gif +0 -0
  136. data/public/javascripts/tiny_mce/themes/advanced/images/underline.gif +0 -0
  137. data/public/javascripts/tiny_mce/themes/advanced/images/underline_es.gif +0 -0
  138. data/public/javascripts/tiny_mce/themes/advanced/images/underline_fr.gif +0 -0
  139. data/public/javascripts/tiny_mce/themes/advanced/images/underline_ru.gif +0 -0
  140. data/public/javascripts/tiny_mce/themes/advanced/images/underline_tw.gif +0 -0
  141. data/public/javascripts/tiny_mce/themes/advanced/images/undo.gif +0 -0
  142. data/public/javascripts/tiny_mce/themes/advanced/images/unlink.gif +0 -0
  143. data/public/javascripts/tiny_mce/themes/advanced/images/visualaid.gif +0 -0
  144. data/public/javascripts/tiny_mce/themes/advanced/images/xp/tab_bg.gif +0 -0
  145. data/public/javascripts/tiny_mce/themes/advanced/images/xp/tab_end.gif +0 -0
  146. data/public/javascripts/tiny_mce/themes/advanced/images/xp/tab_sel_bg.gif +0 -0
  147. data/public/javascripts/tiny_mce/themes/advanced/images/xp/tab_sel_end.gif +0 -0
  148. data/public/javascripts/tiny_mce/themes/advanced/images/xp/tabs_bg.gif +0 -0
  149. data/public/javascripts/tiny_mce/themes/advanced/jscripts/about.js +75 -0
  150. data/public/javascripts/tiny_mce/themes/advanced/jscripts/anchor.js +74 -0
  151. data/public/javascripts/tiny_mce/themes/advanced/jscripts/charmap.js +326 -0
  152. data/public/javascripts/tiny_mce/themes/advanced/jscripts/color_picker.js +108 -0
  153. data/public/javascripts/tiny_mce/themes/advanced/jscripts/image.js +81 -0
  154. data/public/javascripts/tiny_mce/themes/advanced/jscripts/link.js +70 -0
  155. data/public/javascripts/tiny_mce/themes/advanced/jscripts/source_editor.js +60 -0
  156. data/public/javascripts/tiny_mce/themes/advanced/langs/en.js +82 -0
  157. data/public/javascripts/tiny_mce/themes/advanced/link.htm +100 -0
  158. data/public/javascripts/tiny_mce/themes/advanced/source_editor.htm +32 -0
  159. data/public/javascripts/tiny_mce/tiny_mce.js +1 -0
  160. data/public/javascripts/tiny_mce/tiny_mce_popup.js +288 -0
  161. data/public/javascripts/tiny_mce/tiny_mce_src.js +7284 -0
  162. data/public/javascripts/tiny_mce/utils/editable_selects.js +61 -0
  163. data/public/javascripts/tiny_mce/utils/form_utils.js +210 -0
  164. data/public/javascripts/tiny_mce/utils/mclayer.js +210 -0
  165. data/public/javascripts/tiny_mce/utils/mctabs.js +74 -0
  166. data/public/javascripts/tiny_mce/utils/validate.js +219 -0
  167. data/public/stylesheets/administration.css +5 -1
  168. data/public/stylesheets/minimal.css +1 -0
  169. data/test/functional/admin/categories_controller_test.rb +2 -2
  170. data/test/functional/xml_controller_test.rb +72 -40
  171. data/test/test_helper.rb +1 -17
  172. data/test/unit/article_test.rb +1 -1
  173. data/test/unit/trigger_test.rb +1 -1
  174. data/themes/scribbish/views/articles/_comment.rhtml +13 -17
  175. data/themes/scribbish/views/articles/_comment_form.rhtml +7 -5
  176. data/themes/scribbish/views/articles/_comment_list.rhtml +7 -0
  177. data/themes/scribbish/views/articles/read.rhtml +1 -1
  178. data/vendor/plugins/aimpresence_sidebar/views/content.rhtml +1 -1
  179. data/vendor/plugins/archives_sidebar/views/content.rhtml +1 -1
  180. data/vendor/plugins/audioscrobbler_sidebar/MAINTAINERS +26 -0
  181. data/vendor/plugins/audioscrobbler_sidebar/MIT-LICENSE +21 -0
  182. data/vendor/plugins/audioscrobbler_sidebar/README +27 -0
  183. data/vendor/plugins/backpack_sidebar/MAINTAINERS +26 -0
  184. data/vendor/plugins/backpack_sidebar/MIT-LICENSE +21 -0
  185. data/vendor/plugins/backpack_sidebar/README +27 -0
  186. data/vendor/plugins/category_sidebar/views/content.rhtml +1 -1
  187. data/vendor/plugins/sitealizer/CHANGELOG +6 -0
  188. data/vendor/plugins/sitealizer/LICENSE +22 -0
  189. data/vendor/plugins/sitealizer/README +82 -0
  190. data/vendor/plugins/sitealizer/Rakefile +22 -0
  191. data/vendor/plugins/sitealizer/init.rb +24 -0
  192. data/vendor/plugins/sitealizer/install.rb +22 -0
  193. data/vendor/plugins/sitealizer/lib/app/assets/images/bar.gif +0 -0
  194. data/vendor/plugins/sitealizer/lib/app/assets/images/uv.png +0 -0
  195. data/vendor/plugins/sitealizer/lib/app/assets/images/vh.png +0 -0
  196. data/vendor/plugins/sitealizer/lib/app/controllers/sitealizer_controller.rb +118 -0
  197. data/vendor/plugins/sitealizer/lib/app/models/site_tracker.rb +145 -0
  198. data/vendor/plugins/sitealizer/lib/app/views/layouts/sitealizer.rhtml +66 -0
  199. data/vendor/plugins/sitealizer/lib/app/views/sitealizer/_browsers.rhtml +23 -0
  200. data/vendor/plugins/sitealizer/lib/app/views/sitealizer/_daily_stats.rhtml +67 -0
  201. data/vendor/plugins/sitealizer/lib/app/views/sitealizer/_hits_summary.rhtml +0 -0
  202. data/vendor/plugins/sitealizer/lib/app/views/sitealizer/_hosts.rhtml +21 -0
  203. data/vendor/plugins/sitealizer/lib/app/views/sitealizer/_keywords.rhtml +19 -0
  204. data/vendor/plugins/sitealizer/lib/app/views/sitealizer/_languages.rhtml +21 -0
  205. data/vendor/plugins/sitealizer/lib/app/views/sitealizer/_main_frame.rhtml +84 -0
  206. data/vendor/plugins/sitealizer/lib/app/views/sitealizer/_monthly_hits.rhtml +67 -0
  207. data/vendor/plugins/sitealizer/lib/app/views/sitealizer/_page_urls.rhtml +20 -0
  208. data/vendor/plugins/sitealizer/lib/app/views/sitealizer/_platforms.rhtml +21 -0
  209. data/vendor/plugins/sitealizer/lib/app/views/sitealizer/_referers.rhtml +22 -0
  210. data/vendor/plugins/sitealizer/lib/app/views/sitealizer/_robots.rhtml +19 -0
  211. data/vendor/plugins/sitealizer/lib/app/views/sitealizer/_search_engines.rhtml +19 -0
  212. data/vendor/plugins/sitealizer/lib/app/views/sitealizer/hourly_stats.rhtml +39 -0
  213. data/vendor/plugins/sitealizer/lib/app/views/sitealizer/index.rhtml +8 -0
  214. data/vendor/plugins/sitealizer/lib/app/views/sitealizer/login.rhtml +20 -0
  215. data/vendor/plugins/sitealizer/lib/app/views/sitealizer/menu.rhtml +74 -0
  216. data/vendor/plugins/sitealizer/lib/app/views/sitealizer/referrer_stats.rhtml +20 -0
  217. data/vendor/plugins/sitealizer/lib/app/views/sitealizer/search_stats.rhtml +25 -0
  218. data/vendor/plugins/sitealizer/lib/app/views/sitealizer/summary.rhtml +22 -0
  219. data/vendor/plugins/sitealizer/lib/app/views/sitealizer/visitor_info.rhtml +30 -0
  220. data/vendor/plugins/sitealizer/lib/config.yml +18 -0
  221. data/vendor/plugins/sitealizer/lib/sitealizer/parser.rb +347 -0
  222. data/vendor/plugins/sitealizer/lib/sitealizer.rb +78 -0
  223. data/vendor/plugins/sitealizer/lib/tasks/sitealizer.rake +36 -0
  224. data/vendor/plugins/sitealizer/test/fixtures/sitealizer.yml +89 -0
  225. data/vendor/plugins/sitealizer/test/sitealizer_controller_test.rb +208 -0
  226. data/vendor/plugins/sitealizer/test/sitealizer_parser_test.rb +169 -0
  227. data/vendor/plugins/sitealizer/test/test_helper.rb +7 -0
  228. data/vendor/plugins/tada_sidebar/MAINTAINERS +26 -0
  229. data/vendor/plugins/tada_sidebar/MIT-LICENSE +21 -0
  230. data/vendor/plugins/tada_sidebar/README +27 -0
  231. data/vendor/plugins/tag_sidebar/views/content.rhtml +1 -1
  232. data/vendor/plugins/tiny_mce/README +10 -0
  233. data/vendor/plugins/tiny_mce/Rakefile +22 -0
  234. data/vendor/plugins/tiny_mce/TODO +2 -0
  235. data/vendor/plugins/tiny_mce/changelog +1017 -0
  236. data/vendor/plugins/tiny_mce/init.rb +3 -0
  237. data/vendor/plugins/tiny_mce/install.rb +1 -0
  238. data/vendor/plugins/tiny_mce/lib/tiny_mce.rb +36 -0
  239. data/vendor/plugins/tiny_mce/lib/tiny_mce_helper.rb +48 -0
  240. data/vendor/plugins/tiny_mce/tasks/tiny_mce.rake +40 -0
  241. data/vendor/plugins/tiny_mce/test/helper_testcase.rb +38 -0
  242. data/vendor/plugins/tiny_mce/test/tiny_mce_helper_test.rb +67 -0
  243. data/vendor/plugins/tiny_mce/test/tiny_mce_test.rb +85 -0
  244. data/vendor/plugins/tiny_mce/tiny_mce_options.yml +121 -0
  245. data/vendor/plugins/xbox_sidebar/MAINTAINERS +26 -0
  246. data/vendor/plugins/xbox_sidebar/MIT-LICENSE +21 -0
  247. data/vendor/plugins/xbox_sidebar/README +27 -0
  248. data/vendor/plugins/xml_sidebar/lib/xml_sidebar.rb +1 -1
  249. data/vendor/plugins/xml_sidebar/views/content.rhtml +4 -4
  250. metadata +220 -4
  251. data/TODO-4.1 +0 -16
data/db/schema.rb CHANGED
@@ -2,7 +2,7 @@
2
2
  # migrations feature of ActiveRecord to incrementally modify your database, and
3
3
  # then regenerate this schema definition.
4
4
 
5
- ActiveRecord::Schema.define(:version => 61) do
5
+ ActiveRecord::Schema.define(:version => 62) do
6
6
 
7
7
  create_table "articles_tags", :id => false, :force => true do |t|
8
8
  t.column "article_id", :integer
@@ -14,7 +14,7 @@ ActiveRecord::Schema.define(:version => 61) do
14
14
  t.column "pattern", :string
15
15
  end
16
16
 
17
- add_index "blacklist_patterns", ["pattern"], :name => "blacklist_patterns_pattern_index"
17
+ add_index "blacklist_patterns", ["pattern"], :name => "index_blacklist_patterns_on_pattern"
18
18
 
19
19
  create_table "blogs", :force => true do |t|
20
20
  t.column "settings", :text
@@ -27,7 +27,7 @@ ActiveRecord::Schema.define(:version => 61) do
27
27
  t.column "permalink", :string
28
28
  end
29
29
 
30
- add_index "categories", ["permalink"], :name => "categories_permalink_index"
30
+ add_index "categories", ["permalink"], :name => "index_categories_on_permalink"
31
31
 
32
32
  create_table "categorizations", :force => true do |t|
33
33
  t.column "article_id", :integer
@@ -59,7 +59,7 @@ ActiveRecord::Schema.define(:version => 61) do
59
59
  t.column "state", :text
60
60
  end
61
61
 
62
- add_index "contents", ["blog_id"], :name => "contents_blog_id_index"
62
+ add_index "contents", ["blog_id"], :name => "index_contents_on_blog_id"
63
63
  add_index "contents", ["published"], :name => "index_contents_on_published"
64
64
  add_index "contents", ["text_filter_id"], :name => "index_contents_on_text_filter_id"
65
65
 
@@ -101,7 +101,7 @@ ActiveRecord::Schema.define(:version => 61) do
101
101
  t.column "name", :string
102
102
  end
103
103
 
104
- add_index "page_caches", ["name"], :name => "page_caches_name_index"
104
+ add_index "page_caches", ["name"], :name => "index_page_caches_on_name"
105
105
 
106
106
  create_table "pings", :force => true do |t|
107
107
  t.column "article_id", :integer
@@ -109,7 +109,7 @@ ActiveRecord::Schema.define(:version => 61) do
109
109
  t.column "created_at", :datetime
110
110
  end
111
111
 
112
- add_index "pings", ["article_id"], :name => "pings_article_id_index"
112
+ add_index "pings", ["article_id"], :name => "index_pings_on_article_id"
113
113
 
114
114
  create_table "redirects", :force => true do |t|
115
115
  t.column "from_path", :string
@@ -140,7 +140,7 @@ ActiveRecord::Schema.define(:version => 61) do
140
140
  t.column "updated_at", :datetime
141
141
  end
142
142
 
143
- add_index "sessions", ["sessid"], :name => "sessions_sessid_index"
143
+ add_index "sessions", ["sessid"], :name => "index_sessions_on_sessid"
144
144
 
145
145
  create_table "sidebars", :force => true do |t|
146
146
  t.column "active_position", :integer
@@ -150,6 +150,16 @@ ActiveRecord::Schema.define(:version => 61) do
150
150
  t.column "blog_id", :integer
151
151
  end
152
152
 
153
+ create_table "sitealizer", :force => true do |t|
154
+ t.column "path", :string
155
+ t.column "ip", :string
156
+ t.column "referer", :string
157
+ t.column "language", :string
158
+ t.column "user_agent", :string
159
+ t.column "created_at", :datetime
160
+ t.column "created_on", :date
161
+ end
162
+
153
163
  create_table "tags", :force => true do |t|
154
164
  t.column "name", :string
155
165
  t.column "created_at", :datetime
data/db/schema.sqlite.sql CHANGED
@@ -155,6 +155,17 @@ CREATE TABLE sidebars (
155
155
  "blog_id" integer DEFAULT NULL
156
156
  );
157
157
 
158
+ CREATE TABLE sitealizer (
159
+ "id" INTEGER PRIMARY KEY NOT NULL,
160
+ "path" varchar(255) DEFAULT NULL,
161
+ "ip" varchar(255) DEFAULT NULL,
162
+ "referer" varchar(255) DEFAULT NULL,
163
+ "language" varchar(255) DEFAULT NULL,
164
+ "user_agent" varchar(255) DEFAULT NULL,
165
+ "created_at" datetime DEFAULT NULL,
166
+ "created_on" date DEFAULT NULL
167
+ );
168
+
158
169
  CREATE TABLE tags (
159
170
  "id" INTEGER PRIMARY KEY NOT NULL,
160
171
  "name" varchar(255) DEFAULT NULL,
@@ -210,6 +221,25 @@ CREATE INDEX "index_sessions_on_sessid" ON sessions ("sessid");
210
221
 
211
222
  -- data
212
223
 
224
+ INSERT INTO sidebars ("config", "staged_position", "type", "active_position", "blog_id") VALUES('--- !map:HashWithIndifferentAccess
225
+ empty: false
226
+ count: true', NULL, NULL, 0, NULL);
227
+ INSERT INTO sidebars ("config", "staged_position", "type", "active_position", "blog_id") VALUES('--- !map:HashWithIndifferentAccess
228
+ title: Links
229
+ body: |+
230
+ <ul>
231
+ <li><a href="http://www.typosphere.org" title="Typo">Typo</a></li>
232
+ <li><a href="http://scottstuff.net" title="Scottstuff">scottstuff.net</a></li>
233
+ <li><a href="http://www.bofh.org.uk" title="Just a Summary">Just A Summary</a></li>
234
+ <li><a href="http://kevin.sb.org/">Kevin Ballard</a></li>
235
+ <li><a href="http://fredericdevillamil.com">Frédéric de Villamil</a></li>
236
+ <li><a href="http://typoforums.org" title="Typo Forums">Typo Forums</a></li>
237
+ </ul>', NULL, NULL, 1, NULL);
238
+ INSERT INTO sidebars ("config", "staged_position", "type", "active_position", "blog_id") VALUES('--- !map:HashWithIndifferentAccess
239
+ format: rss20
240
+ trackbacks: true
241
+ comments: true
242
+ articles: true', NULL, NULL, 2, NULL);
213
243
  INSERT INTO text_filters ("name", "filters", "description", "params", "markup") VALUES('none', '--- []
214
244
 
215
245
  ', 'None', '--- {}
@@ -236,15 +266,10 @@ INSERT INTO text_filters ("name", "filters", "description", "params", "markup")
236
266
 
237
267
  ', 'textile');
238
268
 
239
- INSERT INTO sidebars ("id", "active_position", "config", "staged_position", "type", "blog_id") VALUES (1, 0, '--- !map:HashWithIndifferentAccess \nempty: false\ncount: true\n', 0, 'CategorySidebar', 1);
240
- INSERT INTO sidebars ("id", "active_position", "config", "staged_position", "type", "blog_id") VALUES (2, 2, '--- !map:HashWithIndifferentAccess \nformat: rss20\ntrackbacks: false\ncomments: true\narticles: true\n', 2, 'XmlSidebar', 1);
241
- INSERT INTO sidebars ("id", "active_position", "config", "staged_position", "type", "blog_id") VALUES (3, 1, '--- !map:HashWithIndifferentAccess \nbody: "<ul>\\n <li><a href=\\"http://www.typosphere.org\\" title=\\"Typo\\">Typo</a></li>\\n <li><a href=\\"http://blog.leetsoft.com\\" title=\\"too-biased\\">too-biased</a></li>\\n <li><a href=\\"http://blog.remor.com/\\" title=\\"seth hall\\">Seth Hall</a></li>\\n <li><a href=\\"http://scottstuff.net\\" title=\\"Scottstuff\\">scottstuff.net</a></li>\\n <li><a href=\\"http://www.bofh.org.uk\\" title=\\"Just a Summary\\">Just A Summary</a></li>\\n <li><a href=\\"http://nubyonrails.com\\" title=\\"Topfunky\\">Topfunky</a></li>\\n <li><a href=\\"http://planettypo.com\\" title=\\"PlanetTypo\\">PlanetTypo</a></li>\\n <li><a href=\\"http://typoforums.org\\" title=\\"Typo Forums\\">Typo Forums</a></li>\\n <li><a href=\\"http://fredericdevillamil.com\\" title=\\"Fr\\xC3\\xA9d\\xC3\\xA9ric de Villamil\\">Fr\\xC3\\xA9d\\xC3\\xA9ric de Villamil</a></li>\\n\\\n </ul>\\n"\ntitle: Links\n', NULL, 'StaticSidebar', 1);
242
-
243
-
244
269
  -- schema version meta-info
245
270
 
246
271
  CREATE TABLE schema_info (
247
272
  "version" integer DEFAULT NULL
248
273
  );
249
274
 
250
- insert into schema_info (version) values (61);
275
+ insert into schema_info (version) values (62);
@@ -168,6 +168,18 @@ CREATE TABLE sidebars (
168
168
  [blog_id] integer DEFAULT NULL
169
169
  );
170
170
 
171
+ CREATE TABLE sitealizer (
172
+ [id] int NOT NULL IDENTITY(1,
173
+ 1) PRIMARY KEY,
174
+ [path] varchar(255) DEFAULT NULL,
175
+ [ip] varchar(255) DEFAULT NULL,
176
+ [referer] varchar(255) DEFAULT NULL,
177
+ [language] varchar(255) DEFAULT NULL,
178
+ [user_agent] varchar(255) DEFAULT NULL,
179
+ [created_at] datetime DEFAULT NULL,
180
+ [created_on] datetime DEFAULT NULL
181
+ );
182
+
171
183
  CREATE TABLE tags (
172
184
  [id] int NOT NULL IDENTITY(1,
173
185
  1) PRIMARY KEY,
@@ -227,6 +239,25 @@ CREATE INDEX [index_sessions_on_sessid] ON sessions ([sessid]);
227
239
 
228
240
  -- data
229
241
 
242
+ INSERT INTO sidebars ([config], [staged_position], [type], [active_position], [blog_id]) VALUES('--- !map:HashWithIndifferentAccess
243
+ empty: false
244
+ count: true', NULL, NULL, 0, NULL);
245
+ INSERT INTO sidebars ([config], [staged_position], [type], [active_position], [blog_id]) VALUES('--- !map:HashWithIndifferentAccess
246
+ title: Links
247
+ body: |+
248
+ <ul>
249
+ <li><a href="http://www.typosphere.org" title="Typo">Typo</a></li>
250
+ <li><a href="http://scottstuff.net" title="Scottstuff">scottstuff.net</a></li>
251
+ <li><a href="http://www.bofh.org.uk" title="Just a Summary">Just A Summary</a></li>
252
+ <li><a href="http://kevin.sb.org/">Kevin Ballard</a></li>
253
+ <li><a href="http://fredericdevillamil.com">Frédéric de Villamil</a></li>
254
+ <li><a href="http://typoforums.org" title="Typo Forums">Typo Forums</a></li>
255
+ </ul>', NULL, NULL, 1, NULL);
256
+ INSERT INTO sidebars ([config], [staged_position], [type], [active_position], [blog_id]) VALUES('--- !map:HashWithIndifferentAccess
257
+ format: rss20
258
+ trackbacks: true
259
+ comments: true
260
+ articles: true', NULL, NULL, 2, NULL);
230
261
  INSERT INTO text_filters ([name], [filters], [description], [params], [markup]) VALUES('none', '--- []
231
262
 
232
263
  ', 'None', '--- {}
@@ -253,15 +284,10 @@ INSERT INTO text_filters ([name], [filters], [description], [params], [markup])
253
284
 
254
285
  ', 'textile');
255
286
 
256
- INSERT INTO sidebars ([id], [active_position], [config], [staged_position], [type], [blog_id]) VALUES (1, 0, '--- !map:HashWithIndifferentAccess \nempty: false\ncount: true\n', 0, 'CategorySidebar', 1);
257
- INSERT INTO sidebars ([id], [active_position], [config], [staged_position], [type], [blog_id]) VALUES (2, 2, '--- !map:HashWithIndifferentAccess \nformat: rss20\ntrackbacks: false\ncomments: true\narticles: true\n', 2, 'XmlSidebar', 1);
258
- INSERT INTO sidebars ([id], [active_position], [config], [staged_position], [type], [blog_id]) VALUES (3, 1, '--- !map:HashWithIndifferentAccess \nbody: "<ul>\\n <li><a href=\\"http://www.typosphere.org\\" title=\\"Typo\\">Typo</a></li>\\n <li><a href=\\"http://blog.leetsoft.com\\" title=\\"too-biased\\">too-biased</a></li>\\n <li><a href=\\"http://blog.remor.com/\\" title=\\"seth hall\\">Seth Hall</a></li>\\n <li><a href=\\"http://scottstuff.net\\" title=\\"Scottstuff\\">scottstuff.net</a></li>\\n <li><a href=\\"http://www.bofh.org.uk\\" title=\\"Just a Summary\\">Just A Summary</a></li>\\n <li><a href=\\"http://nubyonrails.com\\" title=\\"Topfunky\\">Topfunky</a></li>\\n <li><a href=\\"http://planettypo.com\\" title=\\"PlanetTypo\\">PlanetTypo</a></li>\\n <li><a href=\\"http://typoforums.org\\" title=\\"Typo Forums\\">Typo Forums</a></li>\\n <li><a href=\\"http://fredericdevillamil.com\\" title=\\"Fr\\xC3\\xA9d\\xC3\\xA9ric de Villamil\\">Fr\\xC3\\xA9d\\xC3\\xA9ric de Villamil</a></li>\\n\\\n </ul>\\n"\ntitle: Links\n', NULL, 'StaticSidebar', 1);
259
-
260
-
261
287
  -- schema version meta-info
262
288
 
263
289
  CREATE TABLE schema_info (
264
290
  [version] integer DEFAULT NULL
265
291
  );
266
292
 
267
- insert into schema_info (version) values (61);
293
+ insert into schema_info (version) values (62);
data/db/schema_version CHANGED
@@ -1 +1 @@
1
- 61
1
+ 62