Merge branch 'adolfo' into user-groups

2 files changed, 3 insertions, 7 deletions

diff --git a/askbot/skins/default/templates/embed/askbot_widget.js b/askbot/skins/default/templates/embed/askbot_widget.js
index fa5fe731..8c358855 100755
--- a/askbot/skins/default/templates/embed/askbot_widget.js
+++ b/askbot/skins/default/templates/embed/askbot_widget.js
@@ -11,7 +11,6 @@ var {{variable_name}} = {
     var html = {{variable_name}}.createButton();
     var link = document.createElement('link');
     link.setAttribute("rel", "stylesheet");
-    //link.setAttribute("href", 'http://{{host}}{{"/style/askbot-modal.css"|media}}');
     link.setAttribute("href", 'http://{{host}}{%url render_ask_widget_css widget.id%}');
 
     //creating the div
@@ -43,8 +42,8 @@ var {{variable_name}} = {
 
     var body = document.getElementsByTagName('body')[0];
     if (body){
-      body.insertBefore(motherDiv, body.firstChild);
-      body.insertBefore(link, body.firstChild);
+      body.appendChild(link);
+      body.appendChild(motherDiv);
     }
   },
   createButton: function() {
@@ -72,4 +71,4 @@ var onload_functions = function(){
 }
 
 window.onload = onload_functions();
-document.write({{variable_name}}.createButton().outerHTML);
\ No newline at end of file
+document.write({{variable_name}}.createButton().outerHTML);
diff --git a/askbot/views/widgets.py b/askbot/views/widgets.py
index 41913d39..6cde73d6 100644
--- a/askbot/views/widgets.py
+++ b/askbot/views/widgets.py
@@ -202,7 +202,6 @@ def delete_widget(request, model, widget_id):
         return render_into_skin('embed/delete_widget.html',
                 {'widget': widget, 'widget_name': model}, request)
 
-@cache_page(60*30)
 def render_ask_widget_js(request, widget_id):
     widget = get_object_or_404(models.AskWidget, pk=widget_id)
     variable_name = "AskbotAskWidget%d" % widget.id
@@ -213,7 +212,6 @@ def render_ask_widget_js(request, widget_id):
     content =  content_tpl.render(Context(context_dict))
     return HttpResponse(content, mimetype='text/javascript')
 
-@cache_page(60*30)
 def render_ask_widget_css(request, widget_id):
     widget = get_object_or_404(models.AskWidget, pk=widget_id)
     variable_name = "AskbotAskWidget%d" % widget.id
@@ -225,7 +223,6 @@ def render_ask_widget_css(request, widget_id):
     content =  content_tpl.render(Context(context_dict))
     return HttpResponse(content, mimetype='text/css')
 
-@cache_page(60*30)
 def question_widget(request, widget_id):
     """Returns the first x questions based on certain tags.
     @returns template with those questions listed."""