answer_group show view improvements

robertbrook · Apr 24, 2008 · 86b606e · 86b606e
1 parent 8c51dd5
commit 86b606e
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 9 deletions.
diff --git a/app/helpers/answer_groups_helper.rb b/app/helpers/answer_groups_helper.rb
@@ -15,4 +15,13 @@ def link_to_source_file group
   def question_introduction question
     "<span class='asking_member'>#{question.member}</span> asked Her Majesty's Government:"
   end
+
+  def answering_member answer
+    answering = ["<span class='answering'>"]
+    answering << "<span class='role'>#{answer.role}</span> (" if answer.role
+    answering << "<span class='member'>#{answer.member}</span>"
+    answering << ")" if answer.role
+    answering << ":</span>"
+    answering.join('')
+  end
 end
diff --git a/app/views/answer_groups/index.haml b/app/views/answer_groups/index.haml
@@ -1,4 +1,4 @@
-%h1 Written Answers
+- @title = 'Written Answers'
 
 %table
   %tbody

diff --git a/app/views/answer_groups/show.haml b/app/views/answer_groups/show.haml
@@ -10,5 +10,6 @@
             = question_introduction(question)
           %blockquote
             = question.text
-      - answer
+      = answering_member(answer)
+      = answer.text
 = link_to 'Back', answer_groups_path
diff --git a/app/views/layouts/application.haml b/app/views/layouts/application.haml
@@ -2,17 +2,16 @@
 %html
   %head
     %title Lords Q+A
-    <link rel="stylesheet" href="http://yui.yahooapis.com/2.5.1/build/reset-fonts-grids/reset-fonts-grids.css" type="text/css">
-    <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.5.1/build/assets/skins/sam/skin.css"> 
-    <style type="text/css">#custom-doc { width: 66%; min-width: 740px; font-size:138.5%}</style>
+    - # %link{ :rel=>"stylesheet", :href=>"http://yui.yahooapis.com/2.5.1/build/reset-fonts-grids/reset-fonts-grids.css", :type=>"text/css" }
+    - # %link{ :rel=>"stylesheet", :type=>"text/css", :href=>"http://yui.yahooapis.com/2.5.1/build/assets/skins/sam/skin.css" }
+    %style{ :type=>"text/css"}
+      = "#custom-doc { width: 66%; min-width: 740px; font-size: 1.3em; margin-left: 5em}"
+      = ".asking_member, .answering { font-weight: bold }"
   %body
     #custom-doc.yui-t7
       #hd
-        %h1 Title
+        %h1= @title
       #bd
         %div.yui-g
           = yield
     #ft
-      Footer
-
-
diff --git a/spec/helpers/answer_groups_helper_spec.rb b/spec/helpers/answer_groups_helper_spec.rb
@@ -17,4 +17,14 @@
     question = mock_model(Question, :member => 'member')
     question_introduction(question).should == "<span class='asking_member'>member</span> asked Her Majesty's Government:"
   end
+
+  it 'should format answering member role and name' do
+    answer = mock_model(Answer, :role => 'role', :member => 'member')
+    answering_member(answer).should == "<span class='answering'><span class='role'>role</span> (<span class='member'>member</span>):</span>"
+  end
+
+  it 'should format answering member role and name' do
+    answer = mock_model(Answer, :member => 'member', :role => nil)
+    answering_member(answer).should == "<span class='answering'><span class='member'>member</span>:</span>"
+  end
 end