Fix proposal edition layout

Victor Costa
1 parent 9f2ce2c2
Showing 3 changed files with 17 additions and 3 deletions Show diff stats
lib/proposals_discussion_plugin.rb
public/style.css
test/unit/proposals_discussion_plugin_test.rb
@@ -13,7 +13,7 @@ class ProposalsDiscussionPlugin &lt; Noosfero::Plugin
   end
   def content_types
-    if context.respond_to?(:params) && context.params
+    if context.respond_to?(:params) && context.params.kind_of?(Hash) && context.params[:controller] == 'cms' && context.params[:action] == 'new'
       types = []
       parent_id = context.params[:parent_id]
       parent = parent_id ? context.profile.articles.find(parent_id) : nil
@@ -132,8 +132,11 @@
   position: relative;
 }
+form .proposals-discussion-plugin .title {
+  width: 50%;
+}
 form .proposals-discussion-plugin textarea {
-  width: 98%;
+  width: 100%;
 }
 form .proposals-discussion-plugin .abstract textarea {
@@ -5,7 +5,7 @@ class ProposalsDiscussionPluginTest &lt; ActiveSupport::TestCase
   def setup
     @plugin = ProposalsDiscussionPlugin.new
     @profile = fast_create(Community)
-    @params = {}
+    @params = {:controller => 'cms', :action => 'new'}
     @plugin.stubs(:context).returns(self)
   end
@@ -43,6 +43,17 @@ class ProposalsDiscussionPluginTest &lt; ActiveSupport::TestCase
     assert_not_includes plugin.content_types, ProposalsDiscussionPlugin::Proposal
   end
+  should 'return all content types if the context controller is not cms' do
+    params[:controller] = 'content_viewer'
+    assert_equal [ProposalsDiscussionPlugin::Discussion, ProposalsDiscussionPlugin::Topic, ProposalsDiscussionPlugin::Proposal], plugin.content_types
+  end
+
+  should 'return all content types if the context controller is cms and action is not new' do
+    params[:controller] = 'cms'
+    params[:action] = 'edit'
+    assert_equal [ProposalsDiscussionPlugin::Discussion, ProposalsDiscussionPlugin::Topic, ProposalsDiscussionPlugin::Proposal], plugin.content_types
+  end
+
   should 'remove new button from content page for a discussion' do
     page = fast_create(ProposalsDiscussionPlugin::Discussion, :profile_id => @profile.id)
     assert plugin.content_remove_new(page)
	@@ -13,7 +13,7 @@ class ProposalsDiscussionPlugin < Noosfero::Plugin		@@ -13,7 +13,7 @@ class ProposalsDiscussionPlugin < Noosfero::Plugin
13	end	13	end
14		14
15	def content_types	15	def content_types
16	- if context.respond_to?(:params) && context.params	16	+ if context.respond_to?(:params) && context.params.kind_of?(Hash) && context.params[:controller] == 'cms' && context.params[:action] == 'new'
17	types = []	17	types = []
18	parent_id = context.params[:parent_id]	18	parent_id = context.params[:parent_id]
19	parent = parent_id ? context.profile.articles.find(parent_id) : nil	19	parent = parent_id ? context.profile.articles.find(parent_id) : nil