styling fix in the responses inbox

4 files changed, 28 insertions, 23 deletions

diff --git a/askbot/media/style/style.css b/askbot/media/style/style.css
index 928b1c00..b08a76cd 100644
--- a/askbot/media/style/style.css
+++ b/askbot/media/style/style.css
@@ -2876,6 +2876,15 @@ ul#related-tags li {
   line-height: 24px;
   padding-bottom: 6px;
 }
+.user-profile-page.inbox-forum .message,
+.user-profile-page.inbox-flags .message {
+  border-bottom: 1px solid #ccc;
+  padding: 12px 0;
+}
+.user-profile-page.inbox-forum .message:last-child,
+.user-profile-page.inbox-flags .message:last-child {
+  border: none;
+}
 .user-profile-page.inbox-forum input[type="checkbox"] {
   display: none;
 }
@@ -2909,13 +2918,6 @@ ul#related-tags li {
 .user-profile-page.inbox-flags .messages {
   margin-bottom: 14px;
 }
-.user-profile-page.inbox-flags .message {
-  border-bottom: 1px solid #ccc;
-  padding: 12px 0;
-}
-.user-profile-page.inbox-flags .message:last-child {
-  border: none;
-}
 .user-profile-page.inbox-flags .select-items {
   margin-bottom: 10px;
 }
diff --git a/askbot/media/style/style.less b/askbot/media/style/style.less
index 1de3698d..f9bdccbc 100644
--- a/askbot/media/style/style.less
+++ b/askbot/media/style/style.less
@@ -2999,6 +2999,13 @@ ul#related-tags li {
         line-height: 24px;
         padding-bottom: 6px;
     }
+    .message {
+        border-bottom: 1px solid #ccc;
+        padding: 12px 0;
+    }
+    .message:last-child {
+        border: none;
+    }
 }
 
 .user-profile-page.inbox-forum {
@@ -3041,13 +3048,6 @@ ul#related-tags li {
     .messages {
         margin-bottom: 14px;
     }
-    .message {
-        border-bottom: 1px solid #ccc;
-        padding: 12px 0;
-    }
-    .message:last-child {
-        border: none;
-    }
     .select-items {
         margin-bottom: 10px;
     }
diff --git a/askbot/templates/user_inbox/responses.html b/askbot/templates/user_inbox/responses.html
index 57f4de00..dd27ef06 100644
--- a/askbot/templates/user_inbox/responses.html
+++ b/askbot/templates/user_inbox/responses.html
@@ -6,18 +6,20 @@
 {% block inbox_content %}
     <div class="messages">
     {% for message in messages %}{# messages are grouped by question, using the "nested_messages" #}
-        <div 
-            class="message{% if message.is_new %} highlight new{% else %} seen{% endif %}"
+        <div class="message{% if message.is_new %} highlight new{% else %} seen{% endif %}"
             data-message-id="{{ message.id }}"
         >
             <h2>"{{ message.title.strip()|escape}}"</h2>
             {{ macros.inbox_message_snippet(message) }}
-            {# "nested" messages are further response messages to the same question #}
-            {% for followup_message in message.followup_messages %}
-                {{ macros.inbox_message_snippet(followup_message) }}
-            {% endfor %}
         </div>
-        <div class="clearfix"></div>
+        {# "nested" messages are further response messages to the same question #}
+        {% for followup_message in message.followup_messages %}
+            <div class="message{% if message.is_new %} highlight new{% else %} seen{% endif %}"
+                data-message-id="{{ message.id }}"
+            >
+                {{ macros.inbox_message_snippet(followup_message) }}
+            </div>
+        {% endfor %}
     {% endfor %}
     </div>
 {% endblock %}
diff --git a/askbot/views/users.py b/askbot/views/users.py
index 83aed098..d5a7f8ad 100644
--- a/askbot/views/users.py
+++ b/askbot/views/users.py
@@ -792,6 +792,7 @@ def user_responses(request, user, context):
             continue#a temp plug due to bug in the comment deletion
 
         act = memo.activity
+        ip_addr = None
         if act.activity_type == const.TYPE_ACTIVITY_MARK_OFFENSIVE:
             #todo: two issues here - flags are stored differently
             #from activity of new posts and edits
@@ -799,12 +800,12 @@ def user_responses(request, user, context):
             act_user = act.content_object.author
             act_message = _('post was flagged as offensive')
             act_type = 'flag'
-            ip_addr = None
         else:
             act_user = act.user
             act_message = act.get_activity_type_display()
             act_type = 'edit'
-            ip_addr = act.content_object.ip_addr
+            if section == 'flags':
+                ip_addr = act.content_object.ip_addr
 
         response = {
             'id': memo.id,