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
@@ -1,22 +0,0 @@
1
- <% form_tag({ :action => "update" }, :id => id, :enctype => "multipart/form-data") do %>
2
- <div class="form">
3
- <b><%= _("Resource MetaData")%></b><br />
4
- <input type="checkbox" name="resource[itunes_metadata]" value="1"><%= _("Set iTunes metadata for this enclosure")%></input><br />
5
- <label for="resource_itunes_author_<%= id %>"><%= _("Author")%>:</label><br />
6
- <input name="resource[itunes_author]" size="25" id="resource_itunes_author_<%= id %>" type="text" value="<%= this_blog.itunes_author %>" /><br />
7
- <label for="resource_itunes_subtitle_<%= id %>"><%= _("Subtitle")%>:</label><br />
8
- <%= text_field 'resource', "itunes_subtitle", :id => "resource_itunes_subtitle_#{id}" %><br />
9
- <label for="resource_itunes_duration_<%= id %>"><%= _("Duration")%>:</label><br />
10
- <%= text_field 'resource', "itunes_duration", :id => "resource_itunes_duration_#{id}", "size" => 8 %> (HH:MM:SS)<br />
11
- <label for="resource_itunes_summary_<%= id %>"><%= _("Summary")%>:</label><br />
12
- <%= text_area 'resource', "itunes_summary", :id => "resource_itunes_summary_#{id}", :rows => 5 %><br />
13
- <label for="resource_itunes_category_<%= id %>"><%= _("Category")%>:</label><br />
14
- <%= render :partial => "itunes_category_add", :locals => { :id => id } %><br />
15
- <label for="resource_itunes_keywords_<%= id %>"><%= _("Key Words")%>:</label><br />
16
- <%= text_field 'resource', "itunes_keywords", :id => "resource_itunes_keywords_#{id}" %><small>(<%= _("seperate with spaces")%>)</small><br />
17
- <input name="resource[itunes_explicit]" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.itunes_explicit%>><%=_("Explicit")%></input><input name="resource[itunes_explicit]" type="hidden" value="0" />
18
- <br />
19
- <input name="resource[id]" type="hidden" value="<%= id %>" />
20
- <%= save(_("Save")) %> <%= _("or")%> <a href="#" onclick="new Effect.BlindUp('add-resource-metadata-<%= id %>', {duration: 0.4}); return false;" ><%= _("Cancel")%></a>
21
- </div>
22
- <% end %>
@@ -1,22 +0,0 @@
1
- <% form_tag({ :action => "update" }, :id => id, :enctype => "multipart/form-data") do %>
2
- <div class="form">
3
- <b><%= _("Resource MetaData")%></b><br />
4
- <%= link_to _("Remove iTunes Metadata"), { :action => "remove_itunes_metadata", :id => resource.id}, :confirm => _("Are you sure?")%><br />
5
- <label for="resource_itunes_author_<%= id %>"><%= _("Author")%>:</label><br />
6
- <input name="resource[itunes_author]" size="25" id="resource_itunes_author_<%= id %>" type="text" value="<%=h resource.itunes_author %>" /><br />
7
- <label for="resource_itunes_subtitle_<%= id %>"><%= _("Subtitle")%>:</label><br />
8
- <input name="resource[itunes_subtitle]" size="25" id="resource_itunes_subtitle_<%= id %>" type="text" value="<%=h resource.itunes_subtitle %>" /><br />
9
- <label for="resource_itunes_duration_<%= id %>"><%= _("Duration")%>:</label><br />
10
- <input name="resource[itunes_duration]" size="8" id="resource_itunes_duration_<%= id %>" type="text" value="<%=h resource.itunes_duration %>" /><small>(HH:MM:SS)</small><br />
11
- <label for="resource_itunes_summary_<%= id %>"><%= _("Summary")%>:</label><br />
12
- <textarea name="resource[itunes_summary]" id="resource_itunes_summary_<%= id %>" rows="5" cols="35"><%=h resource.itunes_summary %></textarea><br />
13
- <label for="resource_itunes_category_<%= id %>"><%= _("Category")%>:</label><br />
14
- <%= render :partial => "itunes_category_edit", :locals => { :categories => resource.itunes_category, :id => id } %><br />
15
- <label for="resource_itunes_keywords_<%= id %>"><%= _("Key Words")%>:</label><br />
16
- <input name="resource[itunes_keywords]" size="25" id="resource_itunes_keywords_<%= id %>" type="text" value="<%=h resource.itunes_keywords %>" /><small>(<%= _("seperate with spaces")%>)</small><br />
17
- <input name="resource[itunes_explicit]" type="checkbox" value="1" <%= 'checked="checked"' if resource.itunes_explicit%>><%= _("Explicit")%></input><input name="resource[itunes_explicit]" type="hidden" value="0" />
18
- <br />
19
- <input name="resource[id]" type="hidden" value="<%= id %>" />
20
- <%= save(<%=_("Save")) %> <%= _("or")> <a href="#" onclick="new Effect.BlindUp('edit-resource-metadata-<%= id %>', {duration: 0.4}); return false;" ><%= _("Cancel") %></a>
21
- </div>
22
- <% end %>
@@ -1,72 +0,0 @@
1
- Arts & Entertainment:
2
- - Architecture
3
- - Books
4
- - Design
5
- - Entertainment
6
- - Games
7
- - Performing Arts
8
- - Photography
9
- - Poetry
10
- - Science Fiction
11
- - Audio Blogs
12
- Business:
13
- - Careers
14
- - Finance
15
- - Investing
16
- - Management
17
- - Marketing
18
- Comedy:
19
- Education:
20
- - K12
21
- - Higher Education
22
- Food:
23
- Health:
24
- - Diet & Nutrition
25
- - Fitness
26
- - Relationships
27
- - SelfHelp
28
- - Sexuality
29
- International:
30
- - Australian
31
- - Belgian
32
- - Brazilian
33
- - Canadian
34
- - Chinese
35
- - Dutch
36
- - French
37
- - German
38
- - Hebrew
39
- - Italian
40
- - Japanese
41
- - Norwegian
42
- - Polish
43
- - Portuguese
44
- - Spanish
45
- - Swedish
46
- Movies & Television:
47
- Music:
48
- News:
49
- Politics:
50
- Public Radio:
51
- Religion & Spirituality:
52
- - Buddhism
53
- - Christianity
54
- - Islam
55
- - Judaism
56
- - New Age
57
- - Philosophy
58
- - Spirituality
59
- Science:
60
- Sports:
61
- Talk Radio:
62
- Technology:
63
- - Computers
64
- - Developers
65
- - Gadgets
66
- - Information Technology
67
- - News
68
- - Operating Systems
69
- - Podcasting
70
- - Smart Phones
71
- - Text/Speech
72
- - Travel
Binary file
@@ -1,34 +0,0 @@
1
- --Do not remove this if you are using--
2
- Auther : Remiz Rahnas
3
- Auther URL : http://www.htmlremix.com
4
- Version : 2
5
- Published date : 2009/07/16
6
- Changes : Updates for support of IE8
7
- <public:attach event="oncontentready" onevent="oncontentready('v08vnSVo78t4JfjH')" />
8
- <script type="text/javascript">
9
- function oncontentready(classID) {
10
- if (!this.className.match(classID)) {
11
- if (!document.namespaces.v) {
12
- document.namespaces.add("v", "urn:schemas-microsoft-com:vml");
13
- }
14
- this.className = this.className.concat(' ', classID);
15
- var arcSize = Math.min(parseInt(this.currentStyle['-moz-border-radius'] ||
16
- this.currentStyle['moz-border-radius'] ||
17
- this.currentStyle['border-radius']) /
18
- Math.min(this.offsetWidth, this.offsetHeight), 1);
19
- var strokeColor = this.currentStyle.borderColor; var strokeWeight = this.currentStyle.borderWidth; this.style.border = 'none';
20
- var fillColor = this.currentStyle.backgroundColor; var fillSrc = this.currentStyle.backgroundImage.replace(/^url\("(.+)"\)$/, '$1'); this.style.background = 'transparent';
21
- var margin = this.currentStyle.margin; this.style.margin = '0';
22
- var styleFloat = this.currentStyle.styleFloat; this.style.styleFloat = 'none';
23
- var clear = this.currentStyle.clear; this.style.clear = 'none';
24
- var position = this.currentStyle.position; this.style.position = 'static';
25
- var left = this.currentStyle.left; this.style.left = '0';
26
- var right = this.currentStyle.right; this.style.right = '0';
27
- var top = this.currentStyle.top; this.style.top = '0';
28
- var bottom = this.currentStyle.bottom; this.style.bottom = '0';
29
- var width = this.currentStyle.width; this.style.width = '100%';
30
- var height = this.currentStyle.height; this.style.height = '100%';
31
- this.outerHTML = '<div class="' + classID + '" style="background: transparent; border: none; padding: 0; margin: ' + margin + '; float: ' + styleFloat + '; clear: ' + clear + '; position: ' + position + '; left: ' + left + '; right: ' + right + '; top: ' + top + '; bottom: ' + bottom + '; width: ' + width + '; height: ' + height + ';"><v:roundrect arcsize="' + arcSize + '" stroked="false" style="behavior: url(#default#VML); display: inline-block; width: '+width+'; height: '+height+'; antialias: true; padding: ' + strokeWeight + 'px;"><v:fill color="' + fillColor + '" src="' + fillSrc + '" type="tile" style="behavior: url(#default#VML);" />' + this.outerHTML + '</v:roundrect></div>';
32
- }
33
- }
34
- </script>
@@ -1,54 +0,0 @@
1
- require File.dirname(__FILE__) + '/../../spec_helper'
2
-
3
- describe Admin::BlacklistController do
4
- before do
5
- request.session = { :user => users(:tobi).id }
6
- end
7
-
8
- it "test_index" do
9
- get :index
10
- assert_template 'index'
11
- end
12
-
13
- it "test_list" do
14
- get :index
15
- assert_template 'index'
16
- assert_template_has 'blacklist_patterns'
17
- end
18
-
19
- it "test_create" do
20
- num_blacklist_patterns = BlacklistPattern.count
21
-
22
- post :new, 'blacklist_pattern' => { }
23
- assert_response :redirect, :action => 'index'
24
-
25
- assert_equal num_blacklist_patterns + 1, BlacklistPattern.count
26
- end
27
-
28
- it "test_edit" do
29
- get :edit, 'id' => blacklist_patterns(:first_blacklist_pattern).id
30
- assert_template 'edit'
31
- assert_template_has('blacklist_pattern')
32
- assert assigns(:blacklist_pattern).valid?
33
- end
34
-
35
- it "test_update" do
36
- post :edit, 'id' => blacklist_patterns(:first_blacklist_pattern).id
37
- assert_response :redirect, :action => 'index'
38
- end
39
-
40
- it "test_destroy" do
41
- pattern_id = blacklist_patterns(:first_blacklist_pattern).id
42
- assert_not_nil BlacklistPattern.find(pattern_id)
43
-
44
- get :destroy, 'id' => pattern_id
45
- assert_response :success
46
-
47
- post :destroy, 'id' => pattern_id
48
- assert_response :redirect, :action => 'index'
49
-
50
- assert_raise(ActiveRecord::RecordNotFound) {
51
- blacklist_pattern = BlacklistPattern.find(pattern_id)
52
- }
53
- end
54
- end
@@ -1,12 +0,0 @@
1
- require File.dirname(__FILE__) + "/../spec_helper"
2
-
3
- describe BlacklistPattern, 'from Test::Unit' do
4
- before do
5
- @blacklist_pattern = BlacklistPattern.find(:first)
6
- end
7
-
8
- # Replace this with your real tests.
9
- it "test_truth" do
10
- assert_kind_of BlacklistPattern, @blacklist_pattern
11
- end
12
- end
@@ -1,8 +0,0 @@
1
- # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
2
- first_blacklist_pattern:
3
- type: StringPattern
4
- pattern: poker
5
-
6
- another_blacklist_pattern:
7
- type: RegexPattern
8
- pattern: ^Texas