re-ordering columns, prioritizing course name

diff --git a/karmaworld/assets/css/course_list_table.css b/karmaworld/assets/css/course_list_table.css
index d80f7e740822258b55c00a9af99abd3ed6f617a3..4a4b6dc75a22d7e1d5efcf497ce4e958b1a17d16 100644 (file)
--- a/karmaworld/assets/css/course_list_table.css
+++ b/karmaworld/assets/css/course_list_table.css
@@ -63,12 +63,15 @@ th.note-count {
 }
 
 th.school-name {
+  display: none;
 }
 
 th.course-name {
+  display: none;
 }
 
 th.instructor-name {
+  display: none;
 }
 
 
@@ -108,7 +111,7 @@ table#course_list tr:nth-child(even)
   /*background: url(../img/dashboard_activity_alt_on_bg.gif);*/
 }
 
-/* underline all linksin the table body */
+/* underline all links in the table body */
 table#course_list tbody td a {
   text-decoration: underline;
 }
@@ -118,30 +121,31 @@ table#course_list tbody tr {
   width: 840px;
 }
 
-/* hack - Provide positioning for the "sort by text" */
+/***************
+Slim Row
+***************/
 table.dataTable td.sort_by {
+  /* hack - Provide positioning for the "sort by text" */
   display:none;
 }
 
 td.date {
   font-size: 12px; 
-  width: 200px;
+  width: 405px;
 }
 
 td.note-count {
   font-size: 12px;
-  width: 600px; /* 100% minus td.date width -- make sure the next line wraps */
-}
-
-td.school-name {
-  width: 200px; /* make this the same as td.date -- line up the artificial columns */
+  width: 400px; /* 100% minus td.date width -- make sure the next line wraps */
 }
 
+/***************
+Fat Row
+***************/
 td.course-name {
   width: 340px;
 }
 
-
 table#course_list td div.upload {
   width: 45px;
   height: 45px;
@@ -152,6 +156,17 @@ table#course_list td div.upload {
   margin-top: -8px;
 }
 
+td.school-name {
+  width: 200px; /* make this the same as td.date -- line up the artificial columns */
+}
+
+td.instructor-name {
+  width:200px;
+}
+
+
+
+
 table#course_list td div.upload i { 
   display: block;
   cursor: pointer;
@@ -164,6 +179,4 @@ table#course_list tr:hover td div.upload {
   visibility: visible;
 }
 
-td.instructor-name {
-  width:200px;
-}
+

diff --git a/karmaworld/templates/courses/course_list.html b/karmaworld/templates/courses/course_list.html
index 7cf00bee1ad13039782621ee16e7d2218560e33f..e8d9ecdd780c73e983e17b47130772fffa33c71a 100644 (file)
--- a/karmaworld/templates/courses/course_list.html
+++ b/karmaworld/templates/courses/course_list.html
@@ -107,8 +107,8 @@ $(document).ready(function() {
             <th class="sort_by">Sort by:</th>
             <th class="date"> Date </th>
             <th class="note-count"> #Notes </th>
-            <th class="school-name"> Institution </th>
             <th class="course-name"> Course Name </th>
+            <th class="school-name"> Institution </th>
             <th class="instructor-name"> Instructor </th>
           </tr>
         </thead>
@@ -118,9 +118,9 @@ $(document).ready(function() {
             <td class="sort_by"></td>
             <td class="date slim">        {{ course.updated_at|date:"F d, o" }} </td> <!-- https://docs.djangoproject.com/en/1.4/ref/templates/builtins/#date -->
             <td class="note-count slim">  {{ course.file_count }} </td>
-            <td class="school-name">      {{ course.school.name }} </td>
             <td class="course-name">      <a href="{{ course.get_absolute_url }}">{{ course.name }}</a> </td>
             <td class="upload">           <div class="upload"><a href="{{ course.get_absolute_url }}#upload-note"><i class="icon-upload"></i></a></div></td>
+            <td class="school-name">      {{ course.school.name }} </td>
             <td class="instructor-name">  {{ course.instructor_name }} </td>
           </tr>
         {% endfor %}