questions#show styling

dominic · dominic · commit 7c6187d7d929 · 2011-09-18T00:17:00.000-04:00
diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss
@@ -40,11 +40,11 @@ header .topbar-inner {
 
 .two-column {
   #content {
-    @include columns(13);
+    @include columns(11);
   }
   
   #sidebar {
-    @include columns(3, true);
+    @include columns(5, true);
   }
   
 }
diff --git a/app/assets/stylesheets/lib/bootstrap/patterns.scss b/app/assets/stylesheets/lib/bootstrap/patterns.scss
@@ -403,7 +403,7 @@ a.menu:after,
 footer {
   margin-top: $baseline - 1;
   padding-top: $baseline - 1;
-  border-top: 1px solid #eee;
+  border-top: 1px solid #ddd;
 }
 
 
diff --git a/app/assets/stylesheets/questions.css.scss b/app/assets/stylesheets/questions.css.scss
@@ -1,5 +1,12 @@
 .questions, .question {
+  h1 {
+    line-height: 1.1;
+    margin-bottom: 0.15em;
+  }
   .meta {
+    a { 
+      font-style: italic;
+    }
     font-style: italic;
     padding-bottom: 0.75em;
   }
@@ -11,7 +18,7 @@
     @include clearfix;
     list-style-type: none;
     padding-bottom: 1em;
-    border-bottom: 1px solid #eee;
+    border-bottom: 1px solid #ddd;
     margin-bottom: 1em;
 
     .answer-count {
@@ -33,7 +40,7 @@
       }
     
     .summary {
-      @include columns(11, last);
+      @include columns(9, last);
       
       h2 {
         line-height: 1;
@@ -47,7 +54,36 @@
 }
 
 .question {
+  color: #555;
+  p {
+    font-size: 1.15em;
+    line-height: 1.5;
+    margin-bottom: 1.25em;
+  }
+  
+  h2 {
+    margin-top: 0.5em;
+    padding-bottom: 0.5em;
+    border-bottom: 1px solid #bbb;
+  }
+
+  .answers {
+    margin: 0;
+    .answer {
+      position: relative;
+      list-style-type: none;
+      padding: 1em 1em 0;
+      border-bottom: 1px solid #ddd;
+      margin-bottom: 1em;
+      
+      .links {
+        position: absolute;
+        top: 1em;
+        right: 1em;
+      }
+    }
+  }
   .selected-answer{
-  	background-color:yellow;
+  	background: #ffc;
   }  
 }
diff --git a/app/models/question.rb b/app/models/question.rb
@@ -8,8 +8,6 @@ class Question
 
   belongs_to :user
   many :answers
-  
-  one :answer, :in => :solution_id
 
   validates_presence_of :title, :description
 
diff --git a/app/views/answers/_list.html.haml b/app/views/answers/_list.html.haml
@@ -1,14 +1,17 @@
 %li.answer{:class => list.id == @question.solution_id && 'selected-answer'}
-  .author 
-    Answered by #{list.user.username if list.user} 
+  - if list.user
+    .meta 
+      #{link_to list.user.username, ""} says
   .description
-    = list.description
+    != RDiscount.new(list.description).to_html
   
-  - if can? :update, list
-    = link_to 'Edit', edit_question_answer_path(@question, list)
-  - if can? :destroy, list
-    = link_to 'Delete', question_answer_path(@question, list), :confirm => 'Are you sure?', :method => :delete
-  - if can? :update, @question
+  .links
+    - if can? :update, list
+      = link_to 'Edit', edit_question_answer_path(@question, list)
+    - if can? :destroy, list
+      = link_to 'Delete', question_answer_path(@question, list), :confirm => 'Are you sure?', :method => :delete
+    
+  - if can?(:update, @question) && (@question.solution_id != list.id)
     = simple_form_for(@question, :url => question_path(@question)) do |f|
       = f.hidden_field :solution_id, :value => list.id
-      = f.button :submit, :value => "This answer is correct", :class => "primary btn"
+      = f.button :submit, :value => "This answers my question!", :class => "primary btn"
diff --git a/app/views/questions/_list.html.haml b/app/views/questions/_list.html.haml
@@ -10,4 +10,4 @@
       
       %span.date= time_ago_in_words(list.created_at)
       ago
-    .description= truncate(list.description, :length => 200)
+    .description= truncate(list.description, :length => 150)
diff --git a/app/views/questions/show.html.haml b/app/views/questions/show.html.haml
@@ -3,6 +3,7 @@
   = resource.title
 
 - content_for :sidebar do
+  &nbsp;
   - if can? :update, resource
     = link_to 'Edit', edit_resource_path
   - if can? :destroy, resource
@@ -21,8 +22,9 @@
 .description
   != RDiscount.new(resource.description).to_html
 
-%h2 Answers
+%h2= resource.answers.count == 1 ? "1 response" : "#{resource.answers.count} responses"
 %ul.answers  
   = render :partial => "answers/list", :collection => resource.answers
 
-= render :partial => "answers/form"
+- if can? :create, Answer
+  = render :partial => "answers/form"

Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,11 @@ header .topbar-inner {`
`40`	`40`
`41`	`41`	`.two-column {`
`42`	`42`	`#content {`
`43`		`- @include columns(13);`
	`43`	`+ @include columns(11);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`#sidebar {`
`47`		`- @include columns(3, true);`
	`47`	`+ @include columns(5, true);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ a.menu:after,`
`403`	`403`	`footer {`
`404`	`404`	`margin-top: $baseline - 1;`
`405`	`405`	`padding-top: $baseline - 1;`
`406`		`- border-top: 1px solid #eee;`
	`406`	`+ border-top: 1px solid #ddd;`
`407`	`407`	`}`
`408`	`408`
`409`	`409`