added related questions to the widgets

4 files changed, 54 insertions, 6 deletions

diff --git a/askbot/models/widgets.py b/askbot/models/widgets.py
index 2258e77e..3a123323 100644
--- a/askbot/models/widgets.py
+++ b/askbot/models/widgets.py
@@ -56,6 +56,12 @@ class AskWidget(models.Model):
     inner_style = models.TextField(default=DEFAULT_INNER_STYLE, blank=True)
     outer_style= models.TextField(default=DEFAULT_OUTER_STYLE, blank=True)
 
+    def get_related_questions(self):
+        if self.tag:
+            pass
+        else:
+            pass
+
     class Meta:
         app_label = 'askbot'
 
diff --git a/askbot/skins/default/templates/embed/ask_by_widget.html b/askbot/skins/default/templates/embed/ask_by_widget.html
index f5c2a0a2..dddb4aa6 100644
--- a/askbot/skins/default/templates/embed/ask_by_widget.html
+++ b/askbot/skins/default/templates/embed/ask_by_widget.html
@@ -20,14 +20,47 @@
       float: right; 
       font-size: 130%;
     }
+
+    .title{
+      font-family: 'Open Sans Condensed', Arial, sans-serif; 
+      font-size: 25px;
+      margin-bottom: 10px;
+    }
+
+    .related-questions{
+      margin-bottom: 10px;
+    }
+
+    .related-questions p, a{
+      font-size: 110%;
+      margin:0;
+    }
+
+    .related-questions a{
+      text-decoration: none;
+      font-size: 80%;
+      color: #000;
+      margin-left: 15px;
+    }
+    {{widget.inner_style}}
   </style>
 {%endblock%}
 
 {%block body%}
+<div class="title">{{widget.title}}</div>
 <form action="." method="POST" accept-charset="utf-8">
   {% csrf_token %}
-  <p>{{form.title}}</p>
-    {{form.text}}
+  <label>{%trans%}Please enter a descriptive title for your question{%endtrans%}</label>
+  {{form.title}}
+  {% if related_questions %}
+  <div class='related-questions'>
+    <p>{%trans%}Related questions: {%endtrans%}
+    {%for question in related_questions %}
+      <div class='question'><a href="{{question.get_absolute_url()}}">{{question.title}}</a></div>
+    {%endfor%}
+  </div>
+  {%endif%}
+  {{form.text}}
   {% if form.ask_anonymously %}
     <p>{{form.ask_anonymously.label_tag()}}: {{form.ask_anonymously}}</p>
   {%endif%}
diff --git a/askbot/skins/default/templates/embed/askbot_widget.css b/askbot/skins/default/templates/embed/askbot_widget.css
index 1e4129b3..ae42193d 100755
--- a/askbot/skins/default/templates/embed/askbot_widget.css
+++ b/askbot/skins/default/templates/embed/askbot_widget.css
@@ -12,9 +12,9 @@
 #{{variable_name}} div{
      width:600px;
      {%if widget.include_text_field%}
-     height:400px;
+     height:525px;
      {%else%}
-     height:160px;
+     height:310px;
      {%endif%}
      margin: 100px auto;
      background-color: #fff;
@@ -25,5 +25,5 @@
 
 #{{variable_name}} iframe{
      width:600px;
-     height:400px;
+     height:550px;
 }
diff --git a/askbot/views/widgets.py b/askbot/views/widgets.py
index 9bd5e669..99ddd404 100644
--- a/askbot/views/widgets.py
+++ b/askbot/views/widgets.py
@@ -60,6 +60,12 @@ def ask_widget(request, widget_id):
 
     widget = get_object_or_404(models.AskWidget, id=widget_id)
 
+    if widget.tag:
+        related_questions = models.Thread.objects.filter(tags=widget.tag,
+                                                         accepted_answer__isnull=False)[:3]
+    else:
+        related_questions = models.Thread.objects.filter(accepted_answer__isnull=False)[:3]
+
     if request.method == "POST":
         form = forms.AskWidgetForm(include_text=widget.include_text_field,
                 data=request.POST)
@@ -118,7 +124,10 @@ def ask_widget(request, widget_id):
 
         form = forms.AskWidgetForm(include_text=widget.include_text_field)
 
-    data = {'form': form, 'widget': widget}
+    data = {
+            'form': form, 'widget': widget,
+            'related_questions': related_questions
+           }
     return render_into_skin('embed/ask_by_widget.html', data, request)
 
 @login_required