From 84d7650aa13b0a01ba5af760d37b009278b10432 Mon Sep 17 00:00:00 2001
From: Brandon DeRosier <bdero@mit.edu>
Date: Sat, 10 Jan 2015 10:35:03 -0500
Subject: [PATCH 1/2] Fix detailed gitlog

- Make the correct (latest) gitlog show up instead of the second
- Show gitlogs for each entry when viewing detailed information for
  single course
---
 lms/templates/sysadmin_dashboard_gitlogs.html | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/lms/templates/sysadmin_dashboard_gitlogs.html b/lms/templates/sysadmin_dashboard_gitlogs.html
index 9d1e224209..8a214902a0 100644
--- a/lms/templates/sysadmin_dashboard_gitlogs.html
+++ b/lms/templates/sysadmin_dashboard_gitlogs.html
@@ -111,24 +111,26 @@ textarea {
                 <td><a href="${reverse('gitlogs_detail', kwargs={'course_id': unicode(cil.course_id)})}">${cil.course_id | h}</a></td>
                 <td>${cil.git_log}</td>
               </tr>
-          %endfor
-          ## Show the full log if viewing information about a specific course
-          %if course_id is not None:
-              <tr>
-                <td colspan="3">
-                  <pre>
-                    %if cil is not None:
+
+              ## Show the full log of the latest import if viewing logs for a specific course
+              %if course_id is not None:
+                  <tr>
+                    <td colspan="3">
+                      <pre>
                         ${cil.import_log | h}
-                    %else:
-                        ## Translators: git is a version-control system; see http://git-scm.com/about
-                        ${_('No git import logs have been recorded for this course.')}
-                    %endif
-                  </pre>
-                </td>
-              </tr>
-          %endif
+                      </pre>
+                    </td>
+                  </tr>
+              %endif
+          %endfor
         </tbody>
       </table>
+
+      ## If viewing a single course and there are no logs available, let the user know
+      %if course_id is not None and cil is None:
+        ## Translators: git is a version-control system; see http://git-scm.com/about
+        ${_('No git import logs have been recorded for this course.')}
+      %endif
     </section>
   </div>
 </section>

From a6dc7061cdb5fc15dec4d304340ee707c29f8f6d Mon Sep 17 00:00:00 2001
From: Brandon DeRosier <bdero@mit.edu>
Date: Thu, 15 Jan 2015 02:21:33 -0500
Subject: [PATCH 2/2] Collapsible import logs

- Increase maximum focused logs to 5
- Import logs render for all entries in the focused gitlog view
- `+`/`-` toggle buttons for collapsible gitlogs
---
 lms/templates/sysadmin_dashboard_gitlogs.html | 45 +++++++++++++++----
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/lms/templates/sysadmin_dashboard_gitlogs.html b/lms/templates/sysadmin_dashboard_gitlogs.html
index 8a214902a0..7f8608ac28 100644
--- a/lms/templates/sysadmin_dashboard_gitlogs.html
+++ b/lms/templates/sysadmin_dashboard_gitlogs.html
@@ -12,6 +12,23 @@
   <%static:css group='style-course'/>
   <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js')}"></script>
   <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.axislabels.js')}"></script>
+  <script>
+      $(function() {
+          $(".toggle-import-log").click(function(e) {
+              var self = $(this);
+              var id = self.data("import-log");
+              $("#import-log-" + id).toggle({
+                  duration: 200
+              });
+              if (self.html() === "[ + ]") {
+                  self.html("[ &#8722; ]");
+              } else {
+                  self.html("[ + ]");
+              }
+              e.preventDefault();
+          });
+      });
+  </script>
 </%block>
 <style type="text/css">
 a.active-section {
@@ -42,6 +59,9 @@ table.stat_table td {
 	border-color: #666666;
 	background-color: #ffffff;
 }
+.import-log {
+    display: none;
+}
 
 a.selectedmode { background-color: yellow; }
 
@@ -82,11 +102,11 @@ textarea {
           %endif
       %endif
 
-      <table class="stat_table">
+      <table class="stat_table" width="100%">
         <thead>
           <tr>
-            <th>${_('Date')}</th>
-            <th>${_('Course ID')}</th>
+            <th width="15%">${_('Date')}</th>
+            <th width="15%">${_('Course ID')}</th>
             ## Translators: Git is a version-control system; see http://git-scm.com/about
             <th>${_('Git Action')}</th>
           </tr>
@@ -96,11 +116,11 @@ textarea {
           if course_id == None:
               logs = cilset[:10]
           else:
-              logs = cilset[:2]
+              logs = cilset[:5]
 
           cil = None
           %>
-          % for cil in logs:
+          % for index, cil in enumerate(logs):
               <%
                   # Appropriate datetime string for current locale and timezone
                   date = get_time_display(cil.created.replace(tzinfo=UTC),
@@ -108,13 +128,22 @@ textarea {
               %>
               <tr>
                 <td>${date}</td>
-                <td><a href="${reverse('gitlogs_detail', kwargs={'course_id': unicode(cil.course_id)})}">${cil.course_id | h}</a></td>
-                <td>${cil.git_log}</td>
+                <td>
+                  <a href="${reverse('gitlogs_detail', kwargs={'course_id': unicode(cil.course_id)})}">
+                    ${cil.course_id | h}
+                  </a>
+                </td>
+                <td>
+                  %if course_id is not None:
+                      <a class="toggle-import-log" data-import-log="${index}" href="#">[ + ]</a>
+                  %endif
+                  ${cil.git_log}
+                </td>
               </tr>
 
               ## Show the full log of the latest import if viewing logs for a specific course
               %if course_id is not None:
-                  <tr>
+                  <tr class="import-log" id="import-log-${index}">
                     <td colspan="3">
                       <pre>
                         ${cil.import_log | h}