anchor.diff:          <% end %>
         <% end %>
       </p>
  -    <% if @assignment.discussion_topic.grade_replies_separately %>
  -      <% @initial_posts = @assignment.discussion_topic.discussion_entries.active.initial_posts.for_user(@user) %>
  -      <% @reply_posts = @assignment.discussion_topic.discussion_entries.active.reply_posts.for_user(@user) %>
  -      <% if @assignment.discussion_topic.for_group_discussion? %>
  -        <% @initial_posts = @assignment.discussion_topic.child_topics.map{|t| t.discussion_entries.active.initial_posts.for_user(@user) }.flatten.sort_by{|e| e.created_at} %>
  -        <% @reply_posts = @assignment.discussion_topic.child_topics.map{|t| t.discussion_entries.active.reply_posts.for_user(@user) }.flatten.sort_by{|e| e.created_at} %>
  +    <% if discussion_topic.grade_replies_separately %>
  +      <% @initial_posts = discussion_topic.discussion_entries.active.initial_posts.for_user(@user) %>
  +      <% @reply_posts = discussion_topic.discussion_entries.active.reply_posts.for_user(@user) %>
  +      <% if discussion_topic.for_group_discussion? %>
  +        <% @initial_posts = discussion_topic.child_topics.map{|t| t.discussion_entries.active.initial_posts.for_user(@user) }.flatten.sort_by{|e| e.created_at} %>
  +        <% @reply_posts = discussion_topic.child_topics.map{|t| t.discussion_entries.active.reply_posts.for_user(@user) }.flatten.sort_by{|e| e.created_at} %>
         <% end %>
         <% @initial_posts.each do |entry| %>
           <%= render :partial => 'discussion_topics/entry', :object => entry, :locals => {:out_of_context => true, :skip_sub_entries => true, :link_to_headless => true, :hide_student_names => params[:hide_student_name], :assignment_visible_to_user => assignment_visible_to_user, :initial_posts_only => true} %>
  
positive.code:         <%= render :partial => 'discussion_topics/entry', :object => entry, :locals => {:out_of_context => true, :skip_sub_entries => true, :link_to_headless => true, :hide_student_names => params[:hide_student_name], :assignment_visible_to_user => assignment_visible_to_user, :reply_posts_only => true} %>
        <% end %>
      <% else %>
        <% @entries = @assignment.discussion_topic.discussion_entries.active.for_user(@user) %>
        <% if @assignment.discussion_topic.for_group_discussion? %>
          <% @entries = @assignment.discussion_topic.child_topics.map{|t| t.discussion_entries.active.for_user(@user) }.flatten.sort_by{|e| e.created_at} %>
        <% end %>
        <% @entries.each do |entry| %>
          <%= render :partial => 'discussion_topics/entry', :object => entry, :locals => {:out_of_context => true, :skip_sub_entries => true, :link_to_headless => true, :hide_student_names => params[:hide_student_name], :assignment_visible_to_user => assignment_visible_to_user} %>
        <% end %>
      <% end %>
      <div style="text-align: center; font-size: 1.2em; margin-top: 10px; display: none;">
        <a href="<%= context_url(@assignment.context, :context_discussion_topic_url, @assignment.discussion_topic.id, :headless => 1, :combined => 1) %>" class="forward"><%= t('show_entire_discussion', 'Show the Entire Discussion') %></a>
      </div>
    </div>
  <% elsif @submission.submission_type == "online_url" %>
  
negative.code: <% user_name = params[:hide_student_name] ? t(:anonymous_username, "This Student") : context_user_name(@context, @submission.user) %>
  <% content_for :page_title do %><%= join_title @assignment.title, context_user_name(@context, @submission.user) %><% end %>
  
  <% if @assignment.submission_types == 'discussion_topic' && (@assignment.discussion_topic || @assignment.reply_assignment?) %>
    <div style="width: 600px; margin: 10px auto;">
      <p>
        <% discussion_topic = @assignment.discussion_topic || @assignment.reply_assignment? %>
        <% if assignment_visible_to_user = @assignment.visible_to_user?(@current_user)%>
          <% if discussion_topic.for_group_discussion? && (group = discussion_topic.group_category.group_for(@user)) %>
            <%= t('group_discussion_submission_description',
                    "The submissions for this assignment are posts in the assignment's discussion for this group. Below are the discussion posts for %{user}, or you can *view the full group discussion*.",
                    :user => user_name,
                    :wrapper => "<a id='discussion_view_link' href=\"#{context_url(group, :context_discussion_topics_url, :root_discussion_topic_id => discussion_topic.id, :hide_student_names => params[:hide_student_name], :student_id => @submission.user.id, :headless => 1)}\"><b>\\1</b></a>") %>
          <% else %>
            <%= t('discussion_submission_description',
                    "The submissions for this assignment are posts in the assignment's discussion. Below are the discussion posts for %{user}, or you can *view the full discussion*.",
                    :user => user_name,
                    :wrapper => "<a id='discussion_view_link' href=\"#{context_url(@assignment.context, :context_discussion_topic_url, discussion_topic.id, :hide_student_names => params[:hide_student_name], :student_id => @submission.user.id, :headless => 1)}\"><b>\\1</b></a>") %>
          <% end %>
        <% else %>
          <% if discussion_topic.for_group_discussion? && (group = discussion_topic.group_category.group_for(@user)) %>
            <%= t('group_discussion_submission_description_without_link',
                    "The submissions for this assignment are posts in the assignment's discussion for this group. Below are the discussion posts for %{user}.",
                    :user => user_name) %>
  