Fixed templates and migration

6 files changed, 55 insertions, 14 deletions

diff --git a/askbot/migrations/0135_auto__add_questionwidget__add_askwidget.py b/askbot/migrations/0135_auto__add_questionwidget__add_askwidget.py
index a2e67352..19ceb582 100644
--- a/askbot/migrations/0135_auto__add_questionwidget__add_askwidget.py
+++ b/askbot/migrations/0135_auto__add_questionwidget__add_askwidget.py
@@ -15,9 +15,9 @@ class Migration(SchemaMigration):
             ('question_number', self.gf('django.db.models.fields.PositiveIntegerField')(default=7)),
             ('tagnames', self.gf('django.db.models.fields.CharField')(max_length=50)),
             ('group', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['askbot.Tag'], null=True, blank=True)),
-            ('search_query', self.gf('django.db.models.fields.CharField')(max_length=50)),
+            ('search_query', self.gf('django.db.models.fields.CharField')(max_length=50, null=True, blank=True)),
             ('order_by', self.gf('django.db.models.fields.CharField')(default='-added_at', max_length=18)),
-            ('style', self.gf('django.db.models.fields.TextField')(default='', blank=True)),
+            ('style', self.gf('django.db.models.fields.TextField')(default='', blank=True, null=True)),
         ))
         db.send_create_signal('askbot', ['QuestionWidget'])
 
diff --git a/askbot/models/widgets.py b/askbot/models/widgets.py
index 928cb76e..04056614 100644
--- a/askbot/models/widgets.py
+++ b/askbot/models/widgets.py
@@ -12,6 +12,38 @@ DEFAULT_INNER_STYLE = ''
 
 DEFAULT_OUTER_STYLE = ''
 
+DEFAULT_QUESTION_STYLE = '''
+@import url('http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz:300,400,700');
+body {
+    overflow: hidden;
+}
+
+#container {
+    width: 200px;
+    height: 350px;
+}
+ul {
+    list-style: none;
+    padding: 5px;
+    margin: 5px;
+}
+li {
+    border-bottom: #CCC 1px solid;
+    padding-bottom: 5px;
+    padding-top: 5px;
+}
+li:last-child {
+    border: none;
+}
+a {
+    text-decoration: none;
+    color: #464646;
+    font-family: 'Yanone Kaffeesatz', sans-serif;
+    font-size: 15px;
+}
+'''
+
+
 class AskWidget(models.Model):
     '''stores widgets styles and options'''
     title = models.CharField(max_length=100)
@@ -31,8 +63,8 @@ class AskWidget(models.Model):
         return "Widget: %s" % self.title
 
 SEARCH_ORDER_BY = (
-                    ('-added_at', _('date ascendant')),
-                    ('added_at', _('date descendant')),
+                    ('-added_at', _('date descendant')),
+                    ('added_at', _('date ascendant')),
                     ('-last_activity_at', _('activity descendant')),
                     ('last_activity_at', _('activity ascendant')),
                     ('-answer_count', _('answers descendant')),
@@ -46,11 +78,12 @@ class QuestionWidget(models.Model):
     question_number = models.PositiveIntegerField(default=7)
     tagnames = models.CharField(_('tags'), max_length=50)
     group = models.ForeignKey(Tag, null=True, blank=True)
-    search_query = models.CharField(max_length=50)
+    search_query = models.CharField(max_length=50,
+            null=True, blank=True)
     order_by = models.CharField(max_length=18,
             choices=SEARCH_ORDER_BY, default='-added_at')
     style = models.TextField(_('css for the widget'),
-            default=DEFAULT_INNER_STYLE, blank=True)
+            default=DEFAULT_QUESTION_STYLE, blank=True)
 
     class Meta:
         app_label = 'askbot'
@@ -86,10 +119,5 @@ class CreateQuestionWidgetForm(forms.ModelForm, FormWithHideableFields):
     group = forms.ModelChoiceField(queryset=get_groups().exclude(name__startswith='_internal'),
             required=False)
 
-    #def __init__(self, *args, **kwargs):
-    #    super(CreateQuestionWidgetForm, self).__init__(*args, **kwargs)
-    #    if not askbot_settings.GROUPS_ENABLED:
-    #        self.hide_field('group')
-
     class Meta:
         model = QuestionWidget
diff --git a/askbot/skins/default/templates/embed/list_widgets.html b/askbot/skins/default/templates/embed/list_widgets.html
index fcba7fc4..4b9df209 100644
--- a/askbot/skins/default/templates/embed/list_widgets.html
+++ b/askbot/skins/default/templates/embed/list_widgets.html
@@ -10,6 +10,7 @@
     <th>Code</th>
     <th>Actions</th>
   </tr>
+  {% if widget_name == 'ask' %}
   {%for widget in widgets%}
     <tr>
       <td>{{widget.title}}</td>
@@ -17,6 +18,16 @@
       <td><a href="{% url edit_widget widget_name, widget.id %}">Edit</a> | <a href="{% url delete_widget widget_name, widget.id %}">Delete</a></td>
     </tr>
   {%endfor%}
+  {%else%}
+  {%for widget in widgets%}
+    <tr>
+      <td>{{widget.title}}</td>
+      <td> &lt;iframe src="http://{{request.get_host()}}{% url question_widget widget.id%}" /&gt;</td> 
+      <td><a href="{% url edit_widget widget_name, widget.id %}">Edit</a> | <a href="{% url delete_widget widget_name, widget.id %}">Delete</a></td>
+    </tr>
+  {%endfor%}
+
+  {%endif%}
 </table>
 
 {% endblock %}
diff --git a/askbot/skins/default/templates/embed/question_widget.html b/askbot/skins/default/templates/embed/question_widget.html
index 6857b4a2..92e29aa0 100644
--- a/askbot/skins/default/templates/embed/question_widget.html
+++ b/askbot/skins/default/templates/embed/question_widget.html
@@ -11,7 +11,7 @@
     <div id="container">
         <ul>
             {% for thread in threads %}
-                <li><a href="{{settings.APP_URL|strip_path}}{{ thread.get_absolute_url() }}">
+                <li><a href="{{settings.APP_URL|strip_path}}{{ thread.get_absolute_url() }}" target="_blank">
                   {{ thread.title|escape }}</a></li>
             {% endfor %}
         </ul>
diff --git a/askbot/skins/default/templates/embed/widget_form.html b/askbot/skins/default/templates/embed/widget_form.html
index a658050c..65128d8e 100644
--- a/askbot/skins/default/templates/embed/widget_form.html
+++ b/askbot/skins/default/templates/embed/widget_form.html
@@ -1,8 +1,8 @@
 {% extends "one_column_body.html" %}
 <!-- create_ask_widget.html -->
-{% block title %}{% trans %}Create an {{widget_name}} widget{% endtrans %}{% endblock %}
+{% block title %}{% trans %}{{action}} an {{widget_name}} widget{% endtrans %}{% endblock %}
 {% block content %}
-<h1 class="section-title">{% trans %}Create an {{widget_name}} widget{% endtrans %}</h1>
+<h1 class="section-title">{% trans %}{{action}} an {{widget_name}} widget{% endtrans %}</h1>
 {#% if form.non_field_errors() %}
   {{ form.non_field_errors() }}
 {% endif %#}
diff --git a/askbot/views/widgets.py b/askbot/views/widgets.py
index 423b01ee..b1344aef 100644
--- a/askbot/views/widgets.py
+++ b/askbot/views/widgets.py
@@ -156,6 +156,7 @@ def create_widget(request, model):
         form = form_class()
 
     data = {'form': form,
+            'action': 'edit',
             'widget_name': model}
 
     return render_into_skin('embed/widget_form.html', data, request)
@@ -175,6 +176,7 @@ def edit_widget(request, model, widget_id):
         form = form_class(instance=widget)
 
     data = {'form': form,
+            'action': 'edit',
             'widget_name': model}
     return render_into_skin('embed/widget_form.html', data, request)