Revert "back and forth between experiments"

This reverts commit 238f9b02275d0d4f51402bc64d71283ce0d38424.

Conflicts:
	karmaworld/templates/notes/note_list_entry.html

diff --git a/karmaworld/templates/courses/course_list_entry.html b/karmaworld/templates/courses/course_list_entry.html
index ec883756c74bfe7afc2d83391499cd1ce25811ab..ac70db09e51434a47772388292a712a3ce46aa75 100644 (file)
--- a/karmaworld/templates/courses/course_list_entry.html
+++ b/karmaworld/templates/courses/course_list_entry.html
@@ -5,8 +5,8 @@
   <td class="no-display">{{ course.get_popularity|stringformat:"010g" }}</td>
 
   <td class="small-8 columns large-4 slim"><span>Updated {{ course.updated_at|date:"b d, o"|capfirst }}</span></td>
-  <td class="small-4 columns large-2 large-offset-2 slim"><span>{{ course.file_count }} Note{{ course.file_count|pluralize }}</span></td>
-  <td class="small-4 columns large-2 large-offset-1 slim"><span>{{ course.get_popularity }} Thank{{ course.get_popularity|pluralize }}</span></td>
+  <td class="small-4 columns large-2 large-offset-2 slim"><span>{{ course.file_count }} Notes</span></td>
+  <td class="small-4 columns large-2 large-offset-1 slim"><span>{{ course.get_popularity }} Thanks</span></td>
 
   <td class="small-12 large-5 columns">
     <a href="{{ course.get_absolute_url }}">{% if course.department %}{{course.department.name}}: {% endif %}{{ course.name }}</a> 

diff --git a/karmaworld/templates/notes/note_list_entry.html b/karmaworld/templates/notes/note_list_entry.html
index 1f26c990ecc8173f23530b73ca51c8d7d2da396b..9a71c246c798b228234d166759a4ae21cf27ab7e 100644 (file)
--- a/karmaworld/templates/notes/note_list_entry.html
+++ b/karmaworld/templates/notes/note_list_entry.html
@@ -1,9 +1,8 @@
 <tr>
   <td class="no-display"><!-- this spot solely for the Sort By header --></td>
-  <td class="no-display">{{ note.thanks|stringformat:"010g" }}</td>
-
   <td class="small-8 columns large-4 slim">{{ note.uploaded_at|date:"l M d o"|capfirst }}</td>
-  <td class="small-4 columns large-2 large-offset-2 slim"><span>{{ note.thanks }} Thank{{ note.thanks|pluralize }}</span></td>
+  <td class="small-4 columns large-2 large-offset-2 slim">{{ note.thanks }}</td>
+
   <td class="small-12 large-5 columns">
     <a href="{{ note.get_absolute_url }}">{{ note.name }}</a>
   </td>