Merge branch 'develop' of https://github.com/localprojects/Change-By-Us…

… into develop

controllers/home.py

@@ -48,7 +48,7 @@ def GET(self, action=None, param0=None):
         # TODO: This should be consolidated with the twitter & facebook actions
         elif (action == 'login'):
             return self.showLogin()
-
+        
         # Twetter-related actions
         elif action == 'twitter':
             return self._twitter_action(action=param0)
@@ -77,7 +77,9 @@ def GET(self, action=None, param0=None):
             # This is the default for all pages.  We should check
             # if there is a matching template, and if not, throw
             # a 404.
-            template = os.path.dirname(__file__) + '/../templates/%s' + action + '.html'
+
+            template = os.path.dirname(__file__) + '/../templates/' + action + '.html'
+            print template
             if not os.path.exists(template):
                 return self.not_found()
             else:
@@ -192,6 +194,9 @@ def showLogin(self):
             return self.render('login')
         else:
             return self.redirect('/')
+
+    def showFeedback(self):
+        return self.render('feedback')
 
     # if in beta mode and user is not logged in show splash
     # otherwise redirect homepage

framework/controller.py

@@ -19,6 +19,7 @@
 import framework.util as util
 import giveaminute.user as mUser
 import giveaminute.models as models
+import jinja2
 
 class Controller (object):
 
@@ -183,11 +184,11 @@ def request(self, var):
 
         if isinstance(var, basestring):
             #var = util.strip_html(var)
-            var = escape(var)
+            var = jinja2.escape(var).encode('ascii','xmlcharrefreplace')
             var = var.strip()
             if len(var) == 0: return None
             var = util.safeuni(var)
-
+            
         return var
 
     def render(self, template_name, template_values=None, suffix="html", content_type = "text/html", status="200 OK"):

static/js/pages/project.conversation.js

@@ -8,6 +8,7 @@ tc.gam = tc.gam || {};
 tc.gam.project_widgets = tc.gam.project_widgets || {};
 
 tc.gam.project_widgets.conversation = function(options){
+	tc.util.log('project.conversation');
     var dom = options.dom,
         MEDIA_MSGS_TO_LOAD = 100, //TODO See https://github.com/codeforamerica/cbu/wiki/Compromises for details
         components = {
@@ -298,7 +299,8 @@ tc.gam.project_widgets.conversation = function(options){
                                 return false;
                             }
 
-                            dom.find('#message-'+message_id).remove();
+                            //dom.find('#message-'+message_id).remove();
+                            tc.jQ('li.message-'+message_id).remove();
 //                            n_messages = dom.find('.comment-stack').children().length;
 //                            dom.find('.comment-counter').text(n_messages);
                         }
@@ -388,10 +390,10 @@ tc.gam.project_widgets.conversation = function(options){
     };
 
     function generate_message_markup(data){
-        tc.util.dump(data);
+    	tc.util.dump(data);
         var $thumb,
-            markup = tc.jQ("<li class='message-markup'></li>").append(tc.jQ('.template-content.message-markup').clone().children());
-        markup.attr('id','message-'+data.message_id);
+            markup = tc.jQ("<li class='message-markup message-" + data.message_id + "'></li>").append(tc.jQ('.template-content.message-markup').clone().children());
+        //markup.attr('id','message-'+data.message_id);
         //markup.find('img').attr('src','/images/'++'/'++'.png')
         markup.find('a.close').hide();//.attr('href','#remove,'+data.message_id);
         markup.find('p.message-text').html(handlers.construct_links(data.message));

static/js/pages/project.home.js

@@ -22,5 +22,41 @@ tc.gam.project_widgets.home = function(options) {
         }
     });
 
+    var handlers = {
+    	remove_comment:function(e){
+            e.preventDefault();
+
+            var message_id = tc.jQ(this).attr('data-message_id');
+
+            options.app.components.modal.show({
+                app:options.app,
+                source_element:tc.jQ('.modal-content.remove-message'),
+                submit:function(){
+                    tc.jQ.ajax({
+                        type:'POST',
+                        url:'/project/message/remove',
+                        data:{
+                            message_id: message_id
+                        },
+                        dataType:'text',
+                        success:function(data,ts,xhr){
+//                            var n_messages;
+                            if(data == 'False'){
+                                return false;
+                            }
+
+                            //$('#message-'+message_id).remove();
+                            tc.jQ('li.message-'+message_id).remove();
+//                            n_messages = dom.find('.comment-stack').children().length;
+//                            dom.find('.comment-counter').text(n_messages);
+                        }
+                    });
+                }
+            });
+        }
+    }
+
+    dom.find('a.close').unbind('click').bind('click', handlers.remove_comment);
+
     return self;
 };

templates/project/conversation_message.html

@@ -7,7 +7,7 @@
  #       'message'.
  #}
 
-                <li class=" " id='message-{{ message.message_id }}'>
+                <li class="message-{{ message.message_id }}">
                     {% if d.template_data.project_user.data.is_project_admin or d.template_data and d.template_data.user and d.template_data.user.is_admin %}
                         <a class="close" href="#" data-message_id="{{ message.message_id }}"><span>Close</span></a>
                     {% endif %}