Merge pull request #391 from open-craft/eugeny/username-wrapper

Added wrapper around username and labels to allow for nowrap styling

common/static/coffee/spec/discussion/discussion_spec_helper.coffee

@@ -586,6 +586,7 @@ browser and pasting the output.  When that file changes, this one should be rege
 </script>
 
 <script aria-hidden="true" type="text/template" id="post-user-display-template">
+  <span class="username-wrapper">
     <% if (username) { %>
     <a href="<%- user_url %>" class="username"><%- username %></a>
         <% if (is_community_ta) { %>
@@ -596,5 +597,6 @@ browser and pasting the output.  When that file changes, this one should be rege
     <% } else { %>
     anonymous
     <% } %>
+  </span>
 </script>
 """)

common/templates/discussion/_underscore_templates.html

@@ -596,14 +596,16 @@ ${secondaryAction("delete", "remove", _("Delete"))}
 </script>
 
 <script aria-hidden="true" type="text/template" id="post-user-display-template">
-    ${"<% if (username) { %>"}
-    <a href="${'<%- user_url %>'}" class="username">${'<%- username %>'}</a>
-        ${"<% if (is_community_ta) { %>"}
-        <span class="user-label-community-ta">${_("Community TA")}</span>
-        ${"<% } else if (is_staff) { %>"}
-        <span class="user-label-staff">${_("Staff")}</span>
+    <span class="username-wrapper">
+        ${"<% if (username) { %>"}
+        <a href="${'<%- user_url %>'}" class="username">${'<%- username %>'}</a>
+            ${"<% if (is_community_ta) { %>"}
+            <span class="user-label-community-ta">${_("Community TA")}</span>
+            ${"<% } else if (is_staff) { %>"}
+            <span class="user-label-staff">${_("Staff")}</span>
+            ${"<% } %>"}
+        ${"<% } else { %>"}
+            ${_('anonymous') | h}
         ${"<% } %>"}
-    ${"<% } else { %>"}
-    ${_('anonymous') | h}
-    ${"<% } %>"}
+    </span>
 </script>