community_engine 2.0.0.beta2 → 2.0.0.beta3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/Gemfile +4 -0
- data/README.markdown +3 -3
- data/about.yml +1 -1
- data/app/assets/javascripts/tinymce/plugins/tinyautosave/editor_plugin.js +8 -0
- data/app/assets/javascripts/tinymce/plugins/tinyautosave/editor_plugin_src.js +1001 -0
- data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress.gif +0 -0
- data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress10.gif +0 -0
- data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress11.gif +0 -0
- data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress12.gif +0 -0
- data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress2.gif +0 -0
- data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress3.gif +0 -0
- data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress4.gif +0 -0
- data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress5.gif +0 -0
- data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress6.gif +0 -0
- data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress7.gif +0 -0
- data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress8.gif +0 -0
- data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress9.gif +0 -0
- data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/restore.gif +0 -0
- data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/restore.png +0 -0
- data/app/assets/javascripts/tinymce/plugins/tinyautosave/langs/da.js +5 -0
- data/app/assets/javascripts/tinymce/plugins/tinyautosave/langs/en.js +5 -0
- data/app/assets/{javascripts → stylesheets}/cropper.css +0 -0
- data/app/controllers/comments_controller.rb +1 -1
- data/app/controllers/forums_controller.rb +3 -6
- data/app/controllers/moderators_controller.rb +2 -5
- data/app/controllers/sb_posts_controller.rb +1 -11
- data/app/controllers/tags_controller.rb +1 -2
- data/app/controllers/topics_controller.rb +1 -2
- data/app/helpers/base_helper.rb +1 -1
- data/app/models/photo.rb +5 -5
- data/app/models/tag.rb +36 -0
- data/app/models/user.rb +2 -2
- data/app/views/activities/index.html.haml +1 -1
- data/app/views/admin/events.html.haml +1 -1
- data/app/views/photos/edit.html.haml +1 -1
- data/app/views/photos/show.html.haml +2 -2
- data/app/views/posts/show.html.haml +1 -0
- data/app/views/sb_posts/index.html.haml +10 -5
- data/app/views/shared/_footer_content.html.haml +1 -1
- data/app/views/tags/index.html.haml +1 -1
- data/app/views/tags/manage.html.haml +5 -3
- data/app/views/topics/show.html.haml +6 -1
- data/app/views/users/crop_profile_photo.html.haml +1 -0
- data/community_engine.gemspec +3 -5
- data/config/initializers/recaptcha_constants.rb +2 -2
- data/config/locales/en.yml +1 -1
- data/config/locales/ru-RU.yml +1656 -54
- data/config/locales/sv-SE.yml +212 -4
- data/config/routes.rb +1 -1
- data/lib/community_engine.rb +3 -2
- data/lib/community_engine/engine.rb +8 -6
- data/lib/community_engine/version.rb +1 -1
- data/test/fixtures/taggings.yml +11 -1
- data/test/fixtures/tags.yml +9 -1
- data/test/functional/admin_controller_test.rb +8 -0
- data/test/functional/forums_controller_test.rb +1 -1
- data/test/functional/sb_posts_controller_test.rb +15 -19
- data/test/functional/tags_controller_test.rb +21 -1
- data/test/test_helper.rb +1 -1
- data/test/testapp/db/schema.rb +1 -0
- data/test/unit/tag_test.rb +2 -2
- metadata +75 -69
- data/app/views/sb_posts/index.xml.builder +0 -20
- data/lib/tag_hacks.rb +0 -24
data/lib/tag_hacks.rb
DELETED
|
@@ -1,24 +0,0 @@
|
|
|
1
|
-
Tag.instance_eval do
|
|
2
|
-
|
|
3
|
-
def popular(limit = 20, type = nil)
|
|
4
|
-
tags = Tag.counts(:at_least => 0).limit(limit).order('count DESC')
|
|
5
|
-
tags = tags.where("taggings.taggable_type = ?", type.capitalize) if type
|
|
6
|
-
tags
|
|
7
|
-
end
|
|
8
|
-
|
|
9
|
-
end
|
|
10
|
-
|
|
11
|
-
Tag.class_eval do
|
|
12
|
-
|
|
13
|
-
def to_param
|
|
14
|
-
URI.escape(self.name, /[\/.?#]/)
|
|
15
|
-
end
|
|
16
|
-
|
|
17
|
-
def related_tags(limit = 10)
|
|
18
|
-
taggable_ids = self.taggings.find(:all, :limit => 10).collect{|t| t.taggable_id }
|
|
19
|
-
return [] if taggable_ids.blank?
|
|
20
|
-
|
|
21
|
-
Tag.where("tags.id != '#{self.id}'").select("tags.id, tags.name, COUNT(tags.id) as count").joins(:taggings).where({:taggings => {:taggable_id => taggable_ids}}).group("tags.id, tags.name").order("count DESC").limit(limit)
|
|
22
|
-
end
|
|
23
|
-
|
|
24
|
-
end
|