typo 5.4.3 → 5.4.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (155) hide show
  1. data/CHANGELOG +21 -8
  2. data/README +2 -2
  3. data/app/controllers/accounts_controller.rb +6 -10
  4. data/app/controllers/admin/content_controller.rb +2 -3
  5. data/app/controllers/admin/profiles_controller.rb +0 -1
  6. data/app/controllers/admin/resources_controller.rb +6 -20
  7. data/app/controllers/articles_controller.rb +5 -5
  8. data/app/controllers/setup_controller.rb +45 -0
  9. data/app/controllers/xml_controller.rb +0 -9
  10. data/app/helpers/admin/base_helper.rb +50 -33
  11. data/app/helpers/admin/categories_helper.rb +12 -0
  12. data/app/helpers/admin/feedback_helper.rb +10 -0
  13. data/app/helpers/application_helper.rb +13 -0
  14. data/app/models/blog.rb +0 -10
  15. data/app/models/content.rb +4 -3
  16. data/app/models/feedback.rb +1 -0
  17. data/app/models/feedback/states.rb +2 -1
  18. data/app/models/resource.rb +0 -26
  19. data/app/models/user.rb +2 -2
  20. data/app/views/accounts/confirm.html.erb +1 -16
  21. data/app/views/accounts/login.html.erb +9 -17
  22. data/app/views/accounts/recover_password.html.erb +5 -8
  23. data/app/views/accounts/signup.html.erb +1 -0
  24. data/app/views/admin/categories/_categories.html.erb +11 -3
  25. data/app/views/admin/categories/index.html.erb +6 -9
  26. data/app/views/admin/categories/reorder.html.erb +5 -3
  27. data/app/views/admin/content/_article_list.html.erb +9 -4
  28. data/app/views/admin/content/_drafts.html.erb +7 -5
  29. data/app/views/admin/content/_form.html.erb +91 -83
  30. data/app/views/admin/content/_images.html.erb +4 -0
  31. data/app/views/admin/content/_visual_editor.html.erb +1 -0
  32. data/app/views/admin/content/index.html.erb +35 -38
  33. data/app/views/admin/dashboard/_comments.html.erb +17 -12
  34. data/app/views/admin/dashboard/_inbound.html.erb +11 -4
  35. data/app/views/admin/dashboard/_overview.html.erb +18 -8
  36. data/app/views/admin/dashboard/_popular.html.erb +17 -12
  37. data/app/views/admin/dashboard/_posts.html.erb +18 -13
  38. data/app/views/admin/dashboard/_typo_dev.html.erb +10 -6
  39. data/app/views/admin/dashboard/_welcome.html.erb +17 -3
  40. data/app/views/admin/dashboard/index.html.erb +9 -16
  41. data/app/views/admin/feedback/_button.html.erb +7 -7
  42. data/app/views/admin/feedback/_form.html.erb +28 -28
  43. data/app/views/admin/feedback/_item.html.erb +10 -3
  44. data/app/views/admin/feedback/article.html.erb +6 -5
  45. data/app/views/admin/feedback/index.html.erb +35 -37
  46. data/app/views/admin/pages/_form.html.erb +30 -42
  47. data/app/views/admin/pages/_pages.html.erb +15 -34
  48. data/app/views/admin/pages/_visual_editor.html.erb +1 -0
  49. data/app/views/admin/pages/index.html.erb +13 -6
  50. data/app/views/admin/profiles/index.html.erb +6 -4
  51. data/app/views/admin/resources/_upload.html.erb +15 -8
  52. data/app/views/admin/resources/images.html.erb +1 -1
  53. data/app/views/admin/resources/index.html.erb +1 -17
  54. data/app/views/admin/settings/_submit.html.erb +1 -1
  55. data/app/views/admin/settings/feedback.html.erb +96 -91
  56. data/app/views/admin/settings/index.html.erb +74 -74
  57. data/app/views/admin/settings/seo.html.erb +67 -66
  58. data/app/views/admin/settings/update_database.html.erb +24 -24
  59. data/app/views/admin/settings/write.html.erb +24 -70
  60. data/app/views/admin/sidebar/_active.html.erb +9 -8
  61. data/app/views/admin/sidebar/_available.html.erb +5 -3
  62. data/app/views/admin/sidebar/index.html.erb +12 -12
  63. data/app/views/admin/themes/catalogue.html.erb +16 -3
  64. data/app/views/admin/themes/index.html.erb +23 -13
  65. data/app/views/admin/users/_form.html.erb +180 -175
  66. data/app/views/admin/users/edit.html.erb +4 -5
  67. data/app/views/admin/users/index.html.erb +4 -3
  68. data/app/views/admin/users/new.html.erb +5 -7
  69. data/app/views/layouts/accounts.html.erb +7 -9
  70. data/app/views/layouts/administration.html.erb +21 -27
  71. data/app/views/layouts/setup.html.erb +18 -0
  72. data/app/views/notification_mailer/notif_user.html.erb +14 -12
  73. data/app/views/setup/confirm.html.erb +1 -0
  74. data/app/views/setup/index.html.erb +17 -0
  75. data/app/views/shared/_confirm.html.erb +16 -0
  76. data/config/environment.rb +3 -2
  77. data/config/initializers/access_rules.rb +0 -1
  78. data/config/routes.rb +4 -3
  79. data/db/migrate/087_drop_blacklist_patterns.rb +14 -0
  80. data/db/migrate/088_drop_session_table.rb +14 -0
  81. data/db/schema.rb +29 -37
  82. data/doc/Installer.txt +3 -3
  83. data/lib/spam_protection.rb +0 -10
  84. data/lib/tasks/release.rake +1 -1
  85. data/lib/typo_version.rb +1 -1
  86. data/public/images/admin/ui-bg_diagonals-thick_90_eeeeee_40x40.png +0 -0
  87. data/public/images/admin/ui-bg_flat_15_cd0a0a_40x100.png +0 -0
  88. data/public/images/admin/ui-bg_glass_100_e4f1fb_1x400.png +0 -0
  89. data/public/images/admin/ui-bg_glass_80_d7ebf9_1x400.png +0 -0
  90. data/public/images/admin/ui-bg_highlight-hard_100_f2f5f7_1x100.png +0 -0
  91. data/public/images/admin/ui-bg_highlight-hard_70_000000_1x100.png +0 -0
  92. data/public/images/admin/ui-bg_highlight-soft_100_deedf7_1x100.png +0 -0
  93. data/public/images/admin/ui-bg_highlight-soft_25_ffef8f_1x100.png +0 -0
  94. data/public/images/admin/ui-bg_highlight-soft_50_116088_1x100.png +0 -0
  95. data/public/images/admin/ui-icons_2694e8_256x240.png +0 -0
  96. data/public/images/admin/ui-icons_2e83ff_256x240.png +0 -0
  97. data/public/images/admin/ui-icons_3d80b3_256x240.png +0 -0
  98. data/public/images/admin/ui-icons_72a7cf_256x240.png +0 -0
  99. data/public/images/admin/ui-icons_ffffff_256x240.png +0 -0
  100. data/public/javascripts/lightbox.js +2 -2
  101. data/public/stylesheets/accounts.css +119 -0
  102. data/public/stylesheets/administration.css +598 -625
  103. data/spec/controllers/accounts_controller_spec.rb +94 -12
  104. data/spec/controllers/admin/categories_controller_spec.rb +0 -11
  105. data/spec/controllers/admin/profiles_controller_spec.rb +2 -2
  106. data/spec/controllers/admin/resources_controller_spec.rb +15 -2
  107. data/spec/controllers/articles_controller_spec.rb +27 -0
  108. data/spec/controllers/routes/xml_routing_spec.rb +0 -8
  109. data/spec/controllers/setup_controller_spec.rb +24 -0
  110. data/spec/controllers/xml_controller_spec.rb +0 -7
  111. data/spec/models/comment_spec.rb +37 -7
  112. data/spec/models/configuration_spec.rb +0 -11
  113. data/spec/models/trackback_spec.rb +0 -8
  114. data/spec/models/user_spec.rb +9 -0
  115. data/spec/spec_helper.rb +1 -1
  116. data/test/fixtures/blogs.yml +0 -8
  117. data/test/fixtures/users.yml +1 -0
  118. data/vendor/plugins/upload_progress/lib/upload_progress_helper.rb +1 -1
  119. metadata +26 -38
  120. data/app/controllers/admin/blacklist_controller.rb +0 -47
  121. data/app/helpers/admin/blacklist_helper.rb +0 -2
  122. data/app/models/blacklist_pattern.rb +0 -24
  123. data/app/views/admin/base/_recent_comments.html.erb +0 -10
  124. data/app/views/admin/base/_recent_trackbacks.html.erb +0 -10
  125. data/app/views/admin/blacklist/_blacklist_patterns.html.erb +0 -16
  126. data/app/views/admin/blacklist/_form.html.erb +0 -14
  127. data/app/views/admin/blacklist/_quick_post.html.erb +0 -9
  128. data/app/views/admin/blacklist/destroy.html.erb +0 -10
  129. data/app/views/admin/blacklist/edit.html.erb +0 -10
  130. data/app/views/admin/blacklist/index.html.erb +0 -10
  131. data/app/views/admin/dashboard/_sysinfo.html.erb +0 -11
  132. data/app/views/admin/resources/_itunes_category_add.html.erb +0 -11
  133. data/app/views/admin/resources/_itunes_category_edit.html.erb +0 -32
  134. data/app/views/admin/resources/_metadata_add.html.erb +0 -22
  135. data/app/views/admin/resources/_metadata_edit.html.erb +0 -22
  136. data/config/iTunes.yml +0 -72
  137. data/db/typo_dev +0 -0
  138. data/public/images/admin/blue_block_bottom_left.jpg +0 -0
  139. data/public/images/admin/blue_block_bottom_right.jpg +0 -0
  140. data/public/images/admin/blue_block_top_left.jpg +0 -0
  141. data/public/images/admin/blue_block_top_right.jpg +0 -0
  142. data/public/images/admin/editor_active_top_left.jpg +0 -0
  143. data/public/images/admin/editor_active_top_right.jpg +0 -0
  144. data/public/images/admin/editor_bottom_left.jpg +0 -0
  145. data/public/images/admin/editor_bottom_right.jpg +0 -0
  146. data/public/images/admin/input_text_left.jpg +0 -0
  147. data/public/images/admin/input_text_right.jpg +0 -0
  148. data/public/images/admin/input_text_small_left.jpg +0 -0
  149. data/public/images/admin/input_text_small_right.jpg +0 -0
  150. data/public/images/admin/publisher_bottom.jpg +0 -0
  151. data/public/images/admin/publisher_top.jpg +0 -0
  152. data/public/stylesheets/border-radius-ie8.htc +0 -34
  153. data/spec/controllers/admin/blacklist_controller_spec.rb +0 -54
  154. data/spec/models/blacklist_pattern_spec.rb +0 -12
  155. data/test/fixtures/blacklist_patterns.yml +0 -8
data/app/views/admin/users/edit.html.erb CHANGED
@@ -1,7 +1,6 @@
1
- <% @page_heading = _('Edit User') %>
2
- <% subtabs_for(:settings) %>
3
- <% form_tag :action=>"edit", :id => @user.id do %>
1
+ <% @page_heading = _('Edit User') %>
2
+ <% subtabs_for(:settings) %>
4
3
 
4
+ <% form_tag :action=>"edit", :id => @user.id do %>
5
5
  <%= render :partial => "form" %>
6
-
7
- <% end %>
6
+ <% end %>
data/app/views/admin/users/index.html.erb CHANGED
@@ -1,4 +1,5 @@
1
- <% @page_heading = _('Users') + ' <span> &raquo; '+ link_to(_('add new'), :action=>'new') +'</span>' %>
1
+ <% @page_heading = _('Users') %>
2
+ <% @link_to_new = link_to(_("New User"), {:action => 'new'}, :id => 'dialog-link', :class => 'ui-state-default ui-corner-all') %>
2
3
  <% subtabs_for(:settings) %>
3
4
 
4
5
  <table>
@@ -15,12 +16,12 @@
15
16
  <tr <%= alternate_class %>>
16
17
  <td><%= link_to_edit user.login, user%></td>
17
18
  <td> <%= user.name %></td>
18
- <td><%= mail_to user.email, user.login%></td>
19
+ <td><%= mail_to user.email, user.email%></td>
19
20
  <td><%= _(user.profile.nicename) %></td>
20
21
  <td><%= Article.count :conditions => "user_id = #{user.id}" %></td>
21
22
  <td><%= Comment.count :conditions => "user_id = #{user.id}" %></td>
22
23
  <td class='<%= user.state %>'><%= _("%s user", user.state)%></td>
23
24
  </tr>
24
25
  <% end -%>
25
- <%= display_pagination(@users, 8)%>
26
+ <%= display_pagination(@users, 7)%>
26
27
  </table>
data/app/views/admin/users/new.html.erb CHANGED
@@ -1,8 +1,6 @@
1
- <% @page_heading = _('Add User') %>
2
- <% content_for('tasks') do %>
3
- <%= subtab _("Users"), "", {:controller=>"users", :action=>"index"} %>
4
- <% end%>
5
- <% form_tag :action=>"new" do %>
1
+ <% @page_heading = _('Add User') %>
2
+ <% subtabs_for(:settings) %>
6
3
 
7
- <%= render :partial => "form" %>
8
- <% end %>
4
+ <% form_tag :action=>"new" do %>
5
+ <%= render :partial => "admin/users/form" %>
6
+ <% end %>
data/app/views/layouts/accounts.html.erb CHANGED
@@ -5,16 +5,14 @@
5
5
  <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
6
6
  <title><%= @page_title %></title>
7
7
  <meta http-equiv="imagetoolbar" content="no" />
8
- <%= stylesheet_link_tag "administration.css" %>
9
- <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls", "typo" %>
8
+ <%= stylesheet_link_tag "accounts" %>
10
9
  </head>
11
-
12
- <body style='background: #023;'>
13
- <div id='logincontainer'>
14
- <div id='innerlogin'>
15
- <%= yield %>
16
- </div>
10
+ <body>
11
+ <div id='logincontainer'>
12
+ <div class='inner'>
13
+ <%= yield %>
17
14
  </div>
18
- </body>
15
+ </div>
16
+ </body>
19
17
  </html>
20
18
 
data/app/views/layouts/administration.html.erb CHANGED
@@ -10,42 +10,36 @@
10
10
  <%= javascript_include_tag "prototype", "effects", "builder", "dragdrop", "controls", "typo", "lightbox", "quicktags", "growler", "typo_carousel", "administration", :ckeditor %>
11
11
  <%= calendar_date_select_includes %>
12
12
  </head>
13
-
14
13
  <body>
15
14
  <div id='header'>
16
15
  <h1><%= link_to this_blog.blog_name, this_blog.base_url %></h1>
17
16
  </div>
18
- <div id='menu'>
19
- <ul id='tabs'>
20
- <li <%='class="current"' if controller.controller_name == 'dashboard' %>><%= link_to _('Dashboard'), :controller => '/admin' %></li>
21
- <% for pm in current_user.project_modules %>
22
- <%= content_tag :li, (link_to _(pm.menus.first.name ), pm.menus.first.url), :class => send("class_#{pm.name}") %>
23
- <% end %>
24
- </ul>
25
- <%= link_to _("%s &raquo;", "Log out"), {:controller => "/accounts", :action=>"logout"}, :id => 'logout' %>
26
- </div>
27
- <% unless (@_first_render =~ /login|signup|logout/) %>
28
- <div id="submenu">
29
- <ul>
17
+ <%= link_to _("%s &raquo;", "Log out"), {:controller => "/accounts", :action=>"logout"}, :id => 'logout' %>
18
+
19
+
20
+ <div id='container' class='ui-tabs ui-widget ui-widget-content ui-corner-all'>
21
+ <div id='menu' class='ui-widget-header ui-corner-all'>
22
+ <ul id='tabs' class='ui-tabs-nav ui-helper-reset ui-helper-clearfix '>
23
+ <%= content_tag :li, (link_to _('Dashboard'), :controller => '/admin'), :class => class_dashboard %>
24
+ <% for pm in current_user.project_modules %>
25
+ <%= content_tag :li, (link_to _(pm.menus.first.name ), pm.menus.first.url), :class => send("class_#{pm.name}") %>
26
+ <% end %>
27
+ </ul>
28
+ <ul class='ui-tabs-nav ui-helper-reset ui-helper-clearfix submenu'>
30
29
  <%= yield :tasks %>
31
30
  </ul>
32
31
  </div>
33
- <% end %>
34
-
35
- <div id='content'>
36
- <% if flash[:notice] or flash[:error] %>
37
- <div id="flash">
38
- <%= render_flash rescue nil %>
39
- </div>
40
- <% end %>
41
32
 
42
- <%= show_page_heading %>
43
- <%= yield %>
44
- </div>
45
-
46
- <div id="footer">
47
- <%= link_to(this_blog.blog_name, this_blog.base_url) %> <%= _("is proudly powered by")%> Typo <%=h TYPO_VERSION %>
33
+ <div id='content' class='ui-tabs-panel'>
34
+ <%= render_the_flash %>
35
+
36
+ <%= show_page_heading %>
37
+ <%= yield %>
38
+ </div>
48
39
  </div>
49
40
 
41
+ <div id="footer">
42
+ <%= link_to(this_blog.blog_name, this_blog.base_url) %> <%= _("is proudly powered by")%> Typo <%=h TYPO_VERSION %>
43
+ </div>
50
44
  </body>
51
45
  </html>
data/app/views/layouts/setup.html.erb ADDED
@@ -0,0 +1,18 @@
1
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
2
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3
+ <html xmlns="http://www.w3.org/1999/xhtml">
4
+ <head>
5
+ <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
6
+ <title><%= @page_title %></title>
7
+ <meta http-equiv="imagetoolbar" content="no" />
8
+ <%= stylesheet_link_tag "accounts" %>
9
+ </head>
10
+ <body>
11
+ <div id='setupcontainer'>
12
+ <div class='inner'>
13
+ <%= yield %>
14
+ </div>
15
+ </div>
16
+ </body>
17
+ </html>
18
+
data/app/views/notification_mailer/notif_user.html.erb CHANGED
@@ -1,12 +1,14 @@
1
- <p>You account is create on <a href="<%= @blog.base_url%>"><%= @blog.blog_name %></a></p>
2
-
3
- <%= render :partial => 'mail_header' %>
4
-
5
- <p>All information about your account are :</p>
6
-
7
- <ul>
8
- <li>Login : <%= h @user.login %></li>
9
- <li>Password : <%= h @user.password %></li>
10
- </ul>
11
-
12
- </div>
1
+ <html>
2
+ <body>
3
+ <p>Your <a href="<%= @blog.base_url%>"><%= @blog.blog_name %></a> account has been created.</p>
4
+
5
+ <%= render :partial => 'mail_header' %>
6
+ <p>Your credentials appear below.</p>
7
+
8
+ <ul>
9
+ <li>Login: <%= h @user.login %></li>
10
+ <li>Password: <%= h @user.password %></li>
11
+ </ul>
12
+ </div>
13
+ </body>
14
+ </html>
data/app/views/setup/confirm.html.erb ADDED
@@ -0,0 +1 @@
1
+ <%= render :partial => 'shared/confirm'%>
data/app/views/setup/index.html.erb ADDED
@@ -0,0 +1,17 @@
1
+ <%= content_tag :h3, link_to(image_tag("/images/admin/typologo.gif", :alt=>"Typo website"), "http://typosphere.org") %>
2
+
3
+ <div id="flash"><%= error_messages_for 'setup' %></div>
4
+
5
+ <% form_tag :action=> 'index' do %>
6
+ <h1><%= _("Welcome")%></h1>
7
+ <p><%= _("Welcome to your %s blog setup. Just fill in your blog title and your email, and Typo will take care of everything else", link_to("Typo", 'http://typosphere.org'))%></p>
8
+ <h3><label for="user_login"><%= _("Blog name") %>:</label></h3>
9
+ <p class='input_text_title'>
10
+ <%= text_field(:setting, :blog_name, {:class => 'title large'})%>
11
+ </p>
12
+ <h3><label for="user_email"><%= _("Your email")%>:</label></h3>
13
+ <p class='input_text_title'>
14
+ <%= text_field(:setting, :email, {:class => 'title large'})%>
15
+ </p>
16
+ <p><input type="submit" id="submit" class='save large' value="<%= _('Save')%>" /></p>
17
+ <% end %>
data/app/views/shared/_confirm.html.erb ADDED
@@ -0,0 +1,16 @@
1
+ <%= content_tag :h3, link_to(image_tag("/images/admin/typologo.gif", :alt=>"Typo website"), "http://typosphere.org") %>
2
+
3
+ <h1><%= _("Congratulation!") %></h1>
4
+ <p><%= _("You have successfully signed up") %></p>
5
+ <p>
6
+ <%= _("<strong>Login:</strong> %s", current_user.login)%>
7
+ </p>
8
+ <p>
9
+ <%= _("<strong>Password:</strong> %s", session[:tmppass]) %>
10
+ </p>
11
+ <p>
12
+ <%= _("Don't lose the mail sent at %s or you won't be able to login anymore", current_user.email)%>
13
+ </p>
14
+ <p>
15
+ <%= _("Proceed to %s", link_to(_("admin"), :controller => 'admin/content/new')) %>
16
+ </p>
data/config/environment.rb CHANGED
@@ -51,8 +51,9 @@ Rails::Initializer.run do |config|
51
51
 
52
52
  # Use the database for sessions instead of the file system
53
53
  # (create the session table with 'rake create_sessions_table')
54
- config.action_controller.session_store = :active_record_store
55
-
54
+ # config.action_controller.session_store = :active_record_store
55
+ config.action_controller.session = { :key => "_typo_session", :secret => "8d7879bd56b9470b659cdcae88792622" }
56
+
56
57
  # Disable use of the Accept header, since it causes bad results with our
57
58
  # static caching (e.g., caching an atom feed as index.html).
58
59
  config.action_controller.use_accept_header = false
data/config/initializers/access_rules.rb CHANGED
@@ -92,7 +92,6 @@ AccessControl.map :require => [ :admin, :publisher, :contributor ] do |map|
92
92
  project.submenu "Write", { :controller => "admin/settings", :action => "write" }
93
93
  project.submenu "Feedback", { :controller => "admin/settings", :action => "feedback" }
94
94
  project.submenu "SEO", { :controller => "admin/settings", :action => "seo" }
95
- project.submenu "Blacklist", { :controller => "admin/blacklist", :action => "index" }
96
95
  project.submenu "Users", { :controller => "admin/users", :action => "index" }
97
96
  project.submenu "", { :controller => "admin/users", :action => "show" }
98
97
  project.submenu "", { :controller => "admin/users", :action => "new" }
data/config/routes.rb CHANGED
@@ -19,7 +19,6 @@ ActionController::Routing::Routes.draw do |map|
19
19
  map.atom 'articles.atom', :controller => 'articles', :action => 'index', :format => 'atom'
20
20
 
21
21
  map.with_options :controller => 'xml', :path_prefix => 'xml' do |controller|
22
- controller.xml 'itunes/feed.xml', :action => 'itunes'
23
22
  controller.xml 'articlerss/:id/feed.xml', :action => 'articlerss'
24
23
  controller.xml 'commentrss/feed.xml', :action => 'commentrss'
25
24
  controller.xml 'trackbackrss/feed.xml', :action => 'trackbackrss'
@@ -41,7 +40,9 @@ ActionController::Routing::Routes.draw do |map|
41
40
  map.search '/search/:q.:format', :controller => "articles", :action => "search"
42
41
  map.search_base '/search/', :controller => "articles", :action => "search"
43
42
  map.connect '/archives/', :controller => "articles", :action => "archives"
44
-
43
+ map.connect '/setup', :controller => 'setup', :action => 'index'
44
+ map.connect '/setup/confirm', :controller => 'setup', :action => 'confirm'
45
+
45
46
  # I thinks it's useless. More investigating
46
47
  map.connect "trackbacks/:id/:day/:month/:year",
47
48
  :controller => 'trackbacks', :action => 'create', :conditions => {:method => :post}
@@ -94,7 +95,7 @@ ActionController::Routing::Routes.draw do |map|
94
95
  map.connect "#{i}/:action/:id", :controller => i, :id => nil
95
96
  end
96
97
 
97
- %w{advanced blacklist cache categories comments content profiles feedback general pages
98
+ %w{advanced cache categories comments content profiles feedback general pages
98
99
  resources sidebar textfilters themes trackbacks users settings tags }.each do |i|
99
100
  map.connect "/admin/#{i}", :controller => "admin/#{i}", :action => 'index'
100
101
  map.connect "/admin/#{i}/:action/:id", :controller => "admin/#{i}", :action => nil, :id => nil
data/db/migrate/087_drop_blacklist_patterns.rb ADDED
@@ -0,0 +1,14 @@
1
+ class DropBlacklistPatterns < ActiveRecord::Migration
2
+ def self.up
3
+ drop_table :blacklist_patterns
4
+ end
5
+
6
+ def self.down
7
+ create_table :blacklist_patterns do |t|
8
+ t.column :type, :string
9
+ t.column :pattern, :string
10
+ end
11
+
12
+ add_index :blacklist_patterns, :pattern
13
+ end
14
+ end
data/db/migrate/088_drop_session_table.rb ADDED
@@ -0,0 +1,14 @@
1
+ class DropSessionTable < ActiveRecord::Migration
2
+ def self.up
3
+ drop_table :sessions
4
+ end
5
+
6
+ def self.down
7
+ create_table :sessions do |t|
8
+ t.column :sessid, :string
9
+ t.column :data, :text
10
+ t.column :created_at, :datetime
11
+ t.column :updated_at, :datetime
12
+ end
13
+ end
14
+ end
data/db/schema.rb CHANGED
@@ -9,20 +9,13 @@
9
9
  #
10
10
  # It's strongly recommended to check this file into your version control system.
11
11
 
12
- ActiveRecord::Schema.define(:version => 86) do
12
+ ActiveRecord::Schema.define(:version => 88) do
13
13
 
14
14
  create_table "articles_tags", :id => false, :force => true do |t|
15
15
  t.integer "article_id"
16
16
  t.integer "tag_id"
17
17
  end
18
18
 
19
- create_table "blacklist_patterns", :force => true do |t|
20
- t.string "type"
21
- t.string "pattern"
22
- end
23
-
24
- add_index "blacklist_patterns", ["pattern"], :name => "index_blacklist_patterns_on_pattern"
25
-
26
19
  create_table "blogs", :force => true do |t|
27
20
  t.text "settings"
28
21
  t.string "base_url"
@@ -38,14 +31,14 @@ ActiveRecord::Schema.define(:version => 86) do
38
31
 
39
32
  create_table "categories", :force => true do |t|
40
33
  t.string "name"
41
- t.integer "position"
34
+ t.integer "position", :default => 0, :null => false
42
35
  t.string "permalink"
43
36
  t.text "keywords"
44
37
  t.text "description"
45
38
  t.integer "parent_id"
46
39
  end
47
40
 
48
- add_index "categories", ["permalink"], :name => "index_categories_on_permalink"
41
+ add_index "categories", ["permalink"], :name => "categories_permalink_index"
49
42
 
50
43
  create_table "categorizations", :force => true do |t|
51
44
  t.integer "article_id"
@@ -77,8 +70,8 @@ ActiveRecord::Schema.define(:version => 86) do
77
70
  t.integer "parent_id"
78
71
  end
79
72
 
80
- add_index "contents", ["published"], :name => "index_contents_on_published"
81
- add_index "contents", ["text_filter_id"], :name => "index_contents_on_text_filter_id"
73
+ add_index "contents", ["published"], :name => "contents_published_index"
74
+ add_index "contents", ["text_filter_id"], :name => "contents_text_filter_id_index"
82
75
 
83
76
  create_table "feedback", :force => true do |t|
84
77
  t.string "type"
@@ -103,8 +96,8 @@ ActiveRecord::Schema.define(:version => 86) do
103
96
  t.boolean "status_confirmed"
104
97
  end
105
98
 
106
- add_index "feedback", ["article_id"], :name => "index_feedback_on_article_id"
107
- add_index "feedback", ["text_filter_id"], :name => "index_feedback_on_text_filter_id"
99
+ add_index "feedback", ["article_id"], :name => "feedback_article_id_index"
100
+ add_index "feedback", ["text_filter_id"], :name => "feedback_text_filter_id_index"
108
101
 
109
102
  create_table "notifications", :force => true do |t|
110
103
  t.integer "content_id"
@@ -114,10 +107,10 @@ ActiveRecord::Schema.define(:version => 86) do
114
107
  end
115
108
 
116
109
  create_table "page_caches", :force => true do |t|
117
- t.string "name"
110
+ t.string "name", :null => false
118
111
  end
119
112
 
120
- add_index "page_caches", ["name"], :name => "index_page_caches_on_name"
113
+ add_index "page_caches", ["name"], :name => "name"
121
114
 
122
115
  create_table "pings", :force => true do |t|
123
116
  t.integer "article_id"
@@ -125,7 +118,7 @@ ActiveRecord::Schema.define(:version => 86) do
125
118
  t.datetime "created_at"
126
119
  end
127
120
 
128
- add_index "pings", ["article_id"], :name => "index_pings_on_article_id"
121
+ add_index "pings", ["article_id"], :name => "article_id"
129
122
 
130
123
  create_table "profiles", :force => true do |t|
131
124
  t.string "label"
@@ -165,20 +158,12 @@ ActiveRecord::Schema.define(:version => 86) do
165
158
  t.string "description"
166
159
  end
167
160
 
168
- create_table "sessions", :force => true do |t|
169
- t.string "sessid"
170
- t.text "data"
171
- t.datetime "created_at"
172
- t.datetime "updated_at"
173
- end
174
-
175
- add_index "sessions", ["sessid"], :name => "index_sessions_on_sessid"
176
-
177
161
  create_table "sidebars", :force => true do |t|
178
- t.integer "active_position"
179
- t.text "config"
180
- t.integer "staged_position"
181
- t.string "type"
162
+ t.integer "active_position"
163
+ t.text "config"
164
+ t.integer "staged_position"
165
+ t.datetime "updated_at"
166
+ t.string "type"
182
167
  end
183
168
 
184
169
  create_table "sitealizer", :force => true do |t|
@@ -206,6 +191,11 @@ ActiveRecord::Schema.define(:version => 86) do
206
191
  t.text "params"
207
192
  end
208
193
 
194
+ create_table "text_link_ads_rss", :force => true do |t|
195
+ t.string "html", :limit => 1024
196
+ t.integer "post_id"
197
+ end
198
+
209
199
  create_table "triggers", :force => true do |t|
210
200
  t.integer "pending_item_id"
211
201
  t.string "pending_item_type"
@@ -214,10 +204,10 @@ ActiveRecord::Schema.define(:version => 86) do
214
204
  end
215
205
 
216
206
  create_table "users", :force => true do |t|
217
- t.string "login"
218
- t.string "password"
219
- t.text "email"
220
- t.text "name"
207
+ t.string "login", :limit => 80
208
+ t.string "password", :limit => 40
209
+ t.string "name", :limit => 80
210
+ t.string "email", :limit => 80
221
211
  t.boolean "notify_via_email"
222
212
  t.boolean "notify_on_new_articles"
223
213
  t.boolean "notify_on_comments"
@@ -226,9 +216,9 @@ ActiveRecord::Schema.define(:version => 86) do
226
216
  t.integer "profile_id"
227
217
  t.string "remember_token"
228
218
  t.datetime "remember_token_expires_at"
229
- t.string "text_filter_id", :default => "1"
230
- t.string "editor", :default => "simple"
231
- t.string "state", :default => "active"
219
+ t.string "text_filter_id", :default => "1"
220
+ t.string "editor", :default => "simple"
221
+ t.string "state", :default => "active"
232
222
  t.string "firstname"
233
223
  t.string "lastname"
234
224
  t.string "nickname"
@@ -247,4 +237,6 @@ ActiveRecord::Schema.define(:version => 86) do
247
237
  t.datetime "last_connection"
248
238
  end
249
239
 
240
+ add_index "users", ["login"], :name => "login", :unique => true
241
+
250
242
  end