Merge lp:~gesha/linaro-license-protection/update-dir-template into lp:~linaro-automation/linaro-license-protection/trunk

[Georgy Redkozubov]

After switching to the new django-based server almost all build scripts that rely on regexp patterns for searching builds failed.
This branch updates links part of dir_template.html so it looks like in page produced by apache before switching to django-based version of server.

[Fathi Boudra (fboudra)]

Looks good to me.

review: Approve

=== modified file 'license_protected_downloads/tests/test_views.py'
--- license_protected_downloads/tests/test_views.py	2012-08-24 14:17:02 +0000
+++ license_protected_downloads/tests/test_views.py	2012-08-26 08:45:23 +0000
@@ -266,8 +266,8 @@
 
         # If we have access to the file, we will get an X-Sendfile response
         self.assertContains(response,
-            r"<th></th><th>Name</th><th>License</th><th>Last modified</th>"
-            "<th>Size</th>")
+            r"<th></th><th>Name</th><th>Last modified</th>"
+            "<th>Size</th><th>License</th>")
 
     def test_not_found_file(self):
         target_file = "12qwaszx"

=== modified file 'license_protected_downloads/views.py'
--- license_protected_downloads/views.py	2012-08-24 14:13:10 +0000
+++ license_protected_downloads/views.py	2012-08-26 08:45:23 +0000
@@ -54,7 +54,8 @@
         file = os.path.join(path, file)
 
         if os.path.exists(file):
-            mtime = time.ctime(os.path.getmtime(file))
+            mtime = time.strftime('%d-%b-%Y %H:%M',
+                                  time.localtime(os.path.getmtime(file)))
         else:
             # If the file we are looking at doesn't exist (broken symlink for
             # example), it doesn't have a mtime.

=== modified file 'templates/dir_template.html'
--- templates/dir_template.html	2012-07-27 18:57:32 +0000
+++ templates/dir_template.html	2012-08-26 08:45:23 +0000
@@ -4,7 +4,7 @@
 {{ header_content|safe }}
 <table>
   <tr>
-    <th></th><th>Name</th><th>License</th><th>Last modified</th><th>Size</th>
+    <th></th><th>Name</th><th>Last modified</th><th>Size</th><th>License</th>
     <tr><th colspan="5"><hr></th>
   </tr>
   {% if up_dir != None %}
@@ -20,11 +20,7 @@
   {% endif %}
 
 {% for value in dirlist %}
-  <tr>
-    <td>
-       <img src="{{ STATIC_URL }}/static/{{ value.type }}.png" alt="{{ value.type }}"/>
-    </td>
-    <td><a href="{{ value.url }}">{{ value.name }}</a></td>
+  <tr><td valign="top"><img src="{{ STATIC_URL }}/static/{{ value.type }}.png" alt="{{ value.type }}"/></td><td><a href="{{ value.url }}">{{ value.name }}</a></td><td align="right">{{ value.mtime }}  </td><td align="right"> {% if value.type != 'folder' %}{{ value.size }}{% endif %}</td>
     <td>
       {% if value.license_digest_list == "OPEN" %}
         <i>open</i>
@@ -34,8 +30,6 @@
       {% endfor %}
       {% endif %}
     </td>
-    <td>{{ value.mtime }}</td>
-    <td>{% if value.type != 'folder' %}{{ value.size }}{% endif %}</td>
   </tr>
 {% endfor %}
 </table>