ActionItem24: checkpoint

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1124 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem24: checkpoint
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1124 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent 331957a6
Showing 14 changed files with 58 additions and 92 deletions Show diff stats
app/controllers/my_profile/cms/README
app/controllers/my_profile/cms/text_html.rb
app/controllers/my_profile/cms_controller.rb
app/models/tiny_mce_article.rb
app/views/cms/_article.rhtml
app/views/cms/_tiny_mce_article.rhtml
app/views/cms/edit.rhtml
app/views/cms/new.rhtml
app/views/cms/select_article_type.rhtml
app/views/cms/text_html_edit.rhtml
app/views/cms/text_html_new.rhtml
test/functional/cms_controller_test.rb
test/test_helper.rb
test/unit/tiny_mce_article_test.rb
@@ -1,46 +0,0 @@
-CMS editors for Noosfero
-========================
-
-This directory contains code for custom content editors in Noosfero.
-
-Creating a new editor
-=====================
-
-:: File structure
-
-Let's say that you are implementingn and editor for type, say, "foo/bar". Then
-you have to create:
-
-  * app/controllers/my_profile/cms/foo_bar.html
-  * app/views/cms/foo_bar_*.rhtml (one view for each action you define in the
-    controller class, if applicable).
-
-:: Coding conventions
-
-You file must add methods to CmsController class. They are going to be loaded
-after the cms_controller.rb file itself, to you don't need to care about
-declaring the superclass:
-
-  class CmsController
-    def foo_bar_edit
-      # code for preparing the "edit" view
-    end
-
-    def foo_bar_new
-      # code for preparing the "new" view
-    end
-
-    # etc ...
-  end
-
-Note that *all* of your actions must be prefixed with the content type (e.g.
-"foor_bar_" for "foo/bar"), in order to avoid conflicts.
-
-The views for those actions can be thrown in app/views/cms/, just like other
-views for this controller.
-
-Limitations
-===========
-
-
-
@@ -1,5 +0,0 @@
-class CmsController
-
-  # add eventual helper methods you need for editing your type of article. 
-
-end
@@ -26,8 +26,6 @@ class CmsController &lt; MyProfileController
         return
       end
     end
-
-    render :action => "#{mime_type_to_action_name(@article.mime_type)}_edit"
   end
   def new
@@ -47,7 +45,7 @@ class CmsController &lt; MyProfileController
       end
     end
-    render :action => "#{mime_type_to_action_name(type)}_new"
+    render :action => 'edit'
   end
   post_only :set_home_page
@@ -0,0 +1,2 @@
+class TinyMceArticle < Article
+end
@@ -0,0 +1 @@
+_tiny_mce_article.rhtml
 \ No newline at end of file
@@ -0,0 +1,9 @@
+
+<%= f.text_field('name', :size => '64') %>
+
+<%= f.text_field('tag_list', :size => 64, :title => _('Separate tags with commas')) %>
+
+<%= f.text_area('abstract', :cols => 64, :rows => 5) %>
+
+<%= f.text_area('body', :cols => 64) %>
+
@@ -0,0 +1,15 @@
+
+
+<%= render :file => 'shared/tiny_mce' %>
+
+<%= error_messages_for 'article' %>
+
+<% labelled_form_for 'article', @article do |f| %>
+
+  <%= hidden_field_tag('parent_id', params[:parent_id]) if params[:parent_id] %>
+
+  <%= render :partial => partial_for_class(@article.class), :locals => { :f => f } %>
+
+  <%= design_display_button_submit('save', _('Save')) %>
+  <%= design_display_button('cancel', _('Cancel'), :action => (@article.parent ? 'view' : 'index'), :id => @article.parent) %>
+<% end %>
@@ -1,9 +0,0 @@
-<p>
-  <%= _('Choose the type of article:') %>
-</p>
-
-<ul>
-<% CmsController.available_types.each do |item| %>
-  <li><%= link_to_new_article(item) %></li>
-<% end %>
-</ul>
@@ -0,0 +1,9 @@
+<p>
+  <%= _('Choose the type of article:') %>
+</p>
+
+<ul>
+<% CmsController.available_types.each do |item| %>
+  <li><%= link_to_new_article(item) %></li>
+<% end %>
+</ul>
@@ -1 +0,0 @@
-text_html_new.rhtml
 \ No newline at end of file
@@ -1,20 +0,0 @@
-<%= render :file => 'shared/tiny_mce' %>
-
-<%= error_messages_for 'article' %>
-
-<% labelled_form_for 'article', @article do |f| %>
-
-  <%= hidden_field_tag('parent_id', params[:parent_id]) if params[:parent_id] %>
-
-  <%= f.text_field('name', :size => '64') %>
-
-  <%= f.text_field('tag_list', :size => 64, :title => _('Separate tags with commas')) %>
-
-  <%= f.text_area('abstract', :cols => 64, :rows => 5) %>
-
-  <%= f.text_area('body', :cols => 64) %>
-
-  <%= design_display_button_submit('save', _('Save')) %>
-  <%= design_display_button('cancel', _('Cancel'), :action => (@article.parent ? 'view' : 'index'), :id => @article.parent) %>
-
-<% end %>
@@ -47,20 +47,20 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     a.save!
     get :edit, :profile => profile.identifier, :id => a.id
-    assert_template 'text_html_edit'
-  end
-
-  should 'be able to type a new document' do
-    get :new, :profile => profile.identifier
-    assert_template 'text_html_new'
+    assert_template 'edit'
   end
   should 'be able to create a new document' do
     get :new, :profile => profile.identifier
-    assert_template 'text_html_new'
+    assert_template 'select_article_type'
     assert_tag :tag => 'form', :attributes => { :action => "/myprofile/#{profile.identifier}/cms/new", :method => /post/i }
   end
+  should 'present edit screen after choosing article type' do
+    get :new, :profile => profile.identifier, :article_type => 'Article'
+    assert_template 'edit'
+  end
+
   should 'be able to save a save a document' do
     assert_difference Article, :count do
       post :new, :profile => profile.identifier, :article => { :name => 'a test article', :body => 'the text of the article ...' }
@@ -125,7 +125,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     get :edit, :profile => profile.identifier, :id => a.id
     assert_response :success
-    assert_template 'text_html_edit'
+    assert_template 'edit'
   end
   should 'convert mime-types to action names' do
@@ -103,6 +103,10 @@ class Test::Unit::TestCase
     object.valid?
     assert !object.errors.invalid?(attribute)
   end
+  
+  def assert_subclass(parent, child)
+    assert_equal parent, child.superclass, "Class #{child} expected to be a subclass of #{parent}"
+  end
   private
@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class TinyMceArticleTest < Test::Unit::TestCase
+
+  should 'be an article' do
+    assert_subclass Article, TinyMceArticle
+  end
+
+end
	@@ -1,46 +0,0 @@	@@ -1,46 +0,0 @@
1	-CMS editors for Noosfero
2	-========================
3	-
4	-This directory contains code for custom content editors in Noosfero.
5	-
6	-Creating a new editor
7	-=====================
8	-
9	-:: File structure
10	-
11	-Let's say that you are implementingn and editor for type, say, "foo/bar". Then
12	-you have to create:
13	-
14	- * app/controllers/my_profile/cms/foo_bar.html
15	- * app/views/cms/foo_bar_*.rhtml (one view for each action you define in the
16	- controller class, if applicable).
17	-
18	-:: Coding conventions
19	-
20	-You file must add methods to CmsController class. They are going to be loaded
21	-after the cms_controller.rb file itself, to you don't need to care about
22	-declaring the superclass:
23	-
24	- class CmsController
25	- def foo_bar_edit
26	- # code for preparing the "edit" view
27	- end
28	-
29	- def foo_bar_new
30	- # code for preparing the "new" view
31	- end
32	-
33	- # etc ...
34	- end
35	-
36	-Note that all of your actions must be prefixed with the content type (e.g.
37	-"foor_bar_" for "foo/bar"), in order to avoid conflicts.
38	-
39	-The views for those actions can be thrown in app/views/cms/, just like other
40	-views for this controller.
41	-
42	-Limitations
43	-===========
44	-
45	-
46	-
	@@ -1,5 +0,0 @@	@@ -1,5 +0,0 @@
1	-class CmsController
2	-
3	- # add eventual helper methods you need for editing your type of article.
4	-
5	-end
@@ -0,0 +1,2 @@		@@ -0,0 +1,2 @@
	1	+class TinyMceArticle < Article
	2	+end
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+_tiny_mce_article.rhtml
0	\ No newline at end of file	2	\ No newline at end of file
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+
	2	+<%= f.text_field('name', :size => '64') %>
	3	+
	4	+<%= f.text_field('tag_list', :size => 64, :title => _('Separate tags with commas')) %>
	5	+
	6	+<%= f.text_area('abstract', :cols => 64, :rows => 5) %>
	7	+
	8	+<%= f.text_area('body', :cols => 64) %>
	9	+
@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
	1	+
	2	+
	3	+<%= render :file => 'shared/tiny_mce' %>
	4	+
	5	+<%= error_messages_for 'article' %>
	6	+
	7	+<% labelled_form_for 'article', @article do \|f\| %>
	8	+
	9	+ <%= hidden_field_tag('parent_id', params[:parent_id]) if params[:parent_id] %>
	10	+
	11	+ <%= render :partial => partial_for_class(@article.class), :locals => { :f => f } %>
	12	+
	13	+ <%= design_display_button_submit('save', _('Save')) %>
	14	+ <%= design_display_button('cancel', _('Cancel'), :action => (@article.parent ? 'view' : 'index'), :id => @article.parent) %>
	15	+<% end %>
	@@ -1,9 +0,0 @@	@@ -1,9 +0,0 @@
1	-<p>
2	- <%= _('Choose the type of article:') %>
3	-</p>
4	-
5	-<ul>
6	-<% CmsController.available_types.each do \|item\| %>
7	- <li><%= link_to_new_article(item) %></li>
8	-<% end %>
9	-</ul>
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+<p>
	2	+ <%= _('Choose the type of article:') %>
	3	+</p>
	4	+
	5	+<ul>
	6	+<% CmsController.available_types.each do \|item\| %>
	7	+ <li><%= link_to_new_article(item) %></li>
	8	+<% end %>
	9	+</ul>
	@@ -1 +0,0 @@		@@ -1 +0,0 @@
1	-text_html_new.rhtml
2	\ No newline at end of file	0	\ No newline at end of file
	@@ -1,20 +0,0 @@	@@ -1,20 +0,0 @@
1	-<%= render :file => 'shared/tiny_mce' %>
2	-
3	-<%= error_messages_for 'article' %>
4	-
5	-<% labelled_form_for 'article', @article do \|f\| %>
6	-
7	- <%= hidden_field_tag('parent_id', params[:parent_id]) if params[:parent_id] %>
8	-
9	- <%= f.text_field('name', :size => '64') %>
10	-
11	- <%= f.text_field('tag_list', :size => 64, :title => _('Separate tags with commas')) %>
12	-
13	- <%= f.text_area('abstract', :cols => 64, :rows => 5) %>
14	-
15	- <%= f.text_area('body', :cols => 64) %>
16	-
17	- <%= design_display_button_submit('save', _('Save')) %>
18	- <%= design_display_button('cancel', _('Cancel'), :action => (@article.parent ? 'view' : 'index'), :id => @article.parent) %>
19	-
20	-<% end %>