1 files changed, 31 insertions, 38 deletions
diff --git a/askbot/skins/default/templates/user_profile/user_inbox.html b/askbot/skins/default/templates/user_profile/user_inbox.html
index e7e3dbfe..cda45027 100644
--- a/askbot/skins/default/templates/user_profile/user_inbox.html
+++ b/askbot/skins/default/templates/user_profile/user_inbox.html
@@ -1,5 +1,8 @@
 {% extends "user_profile/user.html" %}
 {% import "macros.html" as macros %}
+{% block before_css %}
+    <link href="{{'/bootstrap/css/bootstrap.css'|media}}" rel="stylesheet" type="text/css" />
+{% endblock %}
 <!-- user_responses.html -->
 {#
 This template accepts a list of response list
@@ -44,63 +47,53 @@ inbox_section - forum|flags
         </a>
     </div>
     {% endif %}
-    {% if inbox_section == 'forum' %}
     <div id="re_tools">
         <strong>{% trans %}select:{% endtrans %}</strong>
         <a id="sel_all">{% trans %}all{% endtrans %}</a> |
         <a id="sel_seen">{% trans %}seen{% endtrans %}</a> |
         <a id="sel_new">{% trans %}new{% endtrans %}</a> |
         <a id="sel_none">{% trans %}none{% endtrans %}</a><br />
-        <button id="re_mark_seen">{% trans %}mark as seen{% endtrans %}</button>
-        <button id="re_mark_new">{% trans %}mark as new{% endtrans %}</button>
-        <button id="re_dismiss">{% trans %}dismiss{% endtrans %}</button>
+        <div class="btn-group">
+        {% if inbox_section == 'forum' %}
+            <a class="btn" id="re_mark_seen">{% trans %}mark as seen{% endtrans %}</a>
+            <a class="btn" id="re_mark_new">{% trans %}mark as new{% endtrans %}</a>
+            <a class="btn" id="re_dismiss">{% trans %}dismiss{% endtrans %}</a>
+        {% else %}
+            <a class="btn" id="re_remove_flag">{% trans %}remove flags/approve{% endtrans %}</a>
+            <a  
+                class="btn"
+                id="re_delete_post"
+            >{% trans %}delete post{% endtrans %}</a>
+        {% endif %}
+        </div>
     </div>
-    {% endif %}
+    {% include "user_profile/reject_post_dialog.html" %}
     <div id="responses">
     {% for response in responses %}
-              <div class="response-parent">
-                <p class="headline">
+        <div class="response-parent">
+            <p class="headline">
                 <strong>"{{ response.response_title.strip()|escape}}"</strong>
-                </p>
-                <div id="re_{{response.id}}" class="re{% if response.is_new %} new highlight{% else %} seen{% endif %}">
-                {% if inbox_section == 'forum' %}<input type="checkbox" />{% endif %}
-                <div class="face">
-                {{ macros.gravatar(response.user, 48) }}
-                </div>
-                <a style="font-size:12px" href="{{ response.user.get_absolute_url() }}">{{ response.user.username }}</a>
-                <a style="text-decoration:none;" href="{{ response.response_url }}">
-                    {{ response.response_type }}
-                    ({{ response.timestamp|diff_date(True) }}):<br/>
-                    {{ response.response_snippet}}
-                </a>
-                </div>
-                {% if response.nested_responses %}
-                {%for nested_response in response.nested_responses %}
-                <div id="re_{{nested_response.id}}" class="re{% if nested_response.is_new %} new highlight{% else %} seen{% endif %}">
-                {% if inbox_section == 'forum' %}<input type="checkbox" />{% endif %}
-                <div class="face">
-                {{ macros.gravatar(nested_response.user, 48) }}
-                </div>
-                <a style="font-size:12px" href="{{ nested_response.user.get_absolute_url() }}">{{ nested_response.user.username }}</a>
-                <a style="text-decoration:none;" href="{{ nested_response.response_url }}">
-                    {{ nested_response.response_type }}
-                    ({{ nested_response.timestamp|diff_date(True) }}):<br/>
-                    {{ nested_response.response_snippet}}
-                </a>
-                </div>
-                {%endfor%}
-                {%endif%}
-              </div>
+            </p>
+            {{ macros.inbox_post_snippet(response, inbox_section) }}
+            {% for nested_response in response.nested_responses %}
+                {{ macros.inbox_post_snippet(nested_response, inbox_section) }}
+            {%endfor%}
+        </div>
     {% endfor %}
     </div>
     </div>
 {% endblock %}
 {% block userjs %}
-    <script type="text/javascript" src="{{'/js/user.js'|media}}"></script>
     <script type="text/javascript">
         var askbot = askbot || {};
         askbot['urls'] = askbot['urls'] || {};
         askbot['urls']['manageInbox'] = '{% url manage_inbox %}';
+        askbot['urls']['save_post_reject_reason'] = '{% url save_post_reject_reason %}';
+        askbot['urls']['delete_post_reject_reason'] = '{% url delete_post_reject_reason %}';
+        $(document).ready(function(){
+            setup_inbox();
+        });
     </script>
+    <script type="text/javascript" src="{{'/bootstrap/js/bootstrap.js'|media}}" />
 <!-- end user_responses.html -->
 {% endblock %}