pythonDrive
diff --git a/‎bootcamp/qa/urls.py‎
Lines changed: 0 additions & 2 deletions b/‎bootcamp/qa/urls.py‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎bootcamp/qa/views.py‎
Lines changed: 0 additions & 13 deletions b/‎bootcamp/qa/views.py‎
Lines changed: 0 additions & 13 deletions
diff --git a/‎bootcamp/templates/qa/answer_sample.html‎
Lines changed: 2 additions & 2 deletions b/‎bootcamp/templates/qa/answer_sample.html‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎bootcamp/templates/qa/question_detail.html‎
Lines changed: 10 additions & 2 deletions b/‎bootcamp/templates/qa/question_detail.html‎
Lines changed: 10 additions & 2 deletions
@@ -7,8 +7,6 @@
     url(r'^$', views.QuestionListView.as_view(), name='index'),
     url(r'^question-detail/(?P<slug>[-_\w]+)/$',
         views.QuestionDetailView.as_view(), name='question_detail'),
-    url(r'^answer-detail/(?P<uuid_id>\d+)/$',
-        views.AnswerDetailView.as_view(), name='answer_detail'),
     url(r'^ask-question/$', views.CreateQuestionView.as_view(),
         name='ask_question'),
     url(r'^propose-answer/(?P<question_id>\d+)/$',
 
@@ -17,26 +17,13 @@ class QuestionListView(LoginRequiredMixin, ListView):
     context_object_name = "questions"
 
 
-class AnswerListView(LoginRequiredMixin, ListView):
-    model = Answer
-    paginate_by = 5
-    context_object_name = "answers"
-
-
 class QuestionDetailView(LoginRequiredMixin, DetailView):
     """View to call a given Question object and to render all the details about
     that Question."""
     model = Question
     context_object_name = 'question'
 
 
-class AnswerDetailView(LoginRequiredMixin, DetailView):
-    """View to call a given Answer object and to render all the details about
-    that Answer."""
-    model = Answer
-    context_object_name = 'answer'
-
-
 class CreateQuestionView(LoginRequiredMixin, CreateView):
     """
     View to handle the creation of a new question
 
@@ -3,9 +3,9 @@
 <div class="row answer" answer-id="{{ answer.id }}">
   {% csrf_token %}
   <div class="col-md-2 options">
-    <i class="fa fa-chevron-up vote up-vote answer-vote {% if user in answer.get_up_voters %}voted{% endif %}" aria-hidden="true" title="{% trans 'Click to up vote; click again to toggle' %}"></i>
+    <i class="fa fa-chevron-up vote up-vote answer-vote {% if request.user in answer.get_up_voters %}voted{% endif %}" aria-hidden="true" title="{% trans 'Click to up vote; click again to toggle' %}"></i>
     <span class="votes">{{ answer.count_votes }}</span>
-    <i class="fa fa-chevron-down vote down-vote answer-vote {% if user in answer.get_down_voters %}voted{% endif %}" aria-hidden="true" title="{% trans 'Click to down vote; click again to toggle' %}"></i>
+    <i class="fa fa-chevron-down vote down-vote answer-vote {% if request.user in answer.get_down_voters %}voted{% endif %}" aria-hidden="true" title="{% trans 'Click to down vote; click again to toggle' %}"></i>
     {% if answer.is_answer and user == question.user %}
       <i class="fa fa-check accept accepted" aria-hidden="true" title="{% trans 'Click to unaccept the answer' %}"></i>
     {% elif answer.is_answer %}
 
@@ -24,12 +24,15 @@ <h1>{{ question.title }}</h1>
     </div>
     <div class="row">
       <div class="col-md-2">
-        <div class="question-info text-center">
+        <div class="question-info options">
           <h3>{{ question.count_answers }}</h3>
           <small class="text-secondary">{% trans 'Answers' %}</small>
           <h3>{{ question.count_likers }}</h3>
+          <a href="#" style="text-decoration: none;"><h3><i class="text-danger fa fa-heart{% if request.user not in question.get_likers %}-o{% endif %}" aria-hidden="true"></i></h3></a>
           <small class="text-secondary">{% trans 'Likes' %}</small>
+          <i class="fa fa-chevron-up vote up-vote answer-vote{% if request.user in question.get_upvoters %} voted{% endif %}" aria-hidden="true" title="{% trans 'Click to up vote; click again to toggle' %}"></i>
           <h3>{{ question.count_votes }}</h3>
+          <i class="fa fa-chevron-down vote down-vote answer-vote{% if request.user in question.get_downvoters %} voted{% endif %}" aria-hidden="true" title="{% trans 'Click to down vote; click again to toggle' %}"></i>
           <small class="text-secondary">{% trans 'Votes' %}</small>
         </div>
       </div>
@@ -62,7 +65,7 @@ <h3>{{ question.count_votes }}</h3>
             <label for="answerFormTA">{% trans 'Submit an answer' %}</label>
             <textarea class="form-control" id="answerFormTA" rows="3"></textarea>
           </div>
-          <button type="submit" class="btn btn-primary pull-right">{% trans "Post Your Answer"%}</button>
+          <button type="submit" class="btn btn-primary pull-right">{% trans "Submit an answer"%}</button>
         </form>
       </div>
     </div>
@@ -73,6 +76,11 @@ <h1>{% trans 'Answers' %}</h1>
       <ul class="col-md-12">
         {% for answer in question.answer_set.all %}
           {% include 'qa/answer_sample.html' with answer=answer %}
+        {% empty %}
+          <div class="text-center">
+            <h4>{% trans 'There are no answers yet.' %}</h4>
+            <p>{% trans 'Submit your answer now.' %}</p>
+          </div>
         {% endfor %}
       </ul>
     </div>