Merge lp:~mabac/launchpad-work-items-tracker/remove-html-extensions into lp:~linaro-automation/launchpad-work-items-tracker/linaro

[Mattias Backman]

Hi,

This branch removes the .html extension from the generated card and lane pages.

It also removes the leading blank line from the base.html template. The reason we need it is that IS has enabled some magic apache trick that will show pages without extensions if the content "looks like" html. That heuristic fails if there is a blank line before any tags.

Thanks,

Mattias

[lp:~mabac/launchpad-work-items-tracker/remove-html-extensions]

317. By Mattias Backman on 2011-12-15

Revert removing the leading blank line.

[Mattias Backman (mabac)]

IS changed their solution so we don't need to remove the blank line anymore.

[Guilherme Salgado (salgado)]

I'm not sure I understand why we're doing this. Is this something we
wanted to do and now we can as they've changed apache to detect the
content-type of extensionless files?

[Mattias Backman (mabac)]

We need the changes that are left in the branch. That is generate the files without the .html extension. I reverted the other change.

Unmerged revisions

317. By Mattias Backman on 2011-12-15

Revert removing the leading blank line.

316. By Mattias Backman on 2011-12-14

Remove .html extension from lane and card reports.

315. By Mattias Backman on 2011-12-14

Remove leading blank line in the base.html template.

=== modified file 'report_tools.py'
--- report_tools.py	2011-12-12 07:35:35 +0000
+++ report_tools.py	2011-12-15 12:12:50 +0000
@@ -205,7 +205,7 @@
 
 def roadmap_pages(my_path, database, basename, config, lane, root=None):
     cfg = load_config(config)
-    fh = open(basename + '.html', 'w')
+    fh = open(basename, 'w')
     try:
         args = [os.path.join(my_path, 'html-report'), '-d', database]
         args += ['--report-type', 'roadmap_page']
@@ -214,7 +214,7 @@
             args += ['--root', root]
         report_args(args, theme=get_theme(cfg))
         proc = Popen(args, stdout=fh)
-        print basename + '.html'
+        print basename
         proc.wait()
     finally:
         fh.close()
@@ -222,7 +222,7 @@
 
 def roadmap_cards(my_path, database, basename, config, card, root=None):
     cfg = load_config(config)
-    fh = open(basename + '.html', 'w')
+    fh = open(basename, 'w')
     try:
         args = [os.path.join(my_path, 'html-report'), '-d', database]
         args += ['--report-type', 'roadmap_card']
@@ -231,7 +231,7 @@
             args += ['--root', root]
         report_args(args, theme=get_theme(cfg))
         proc = Popen(args, stdout=fh)
-        print basename + '.html'
+        print basename
         proc.wait()
     finally:
         fh.close()

=== modified file 'templates/roadmap_card.html'
--- templates/roadmap_card.html	2011-12-14 12:34:43 +0000
+++ templates/roadmap_card.html	2011-12-15 12:12:50 +0000
@@ -23,7 +23,7 @@
 % endfor
 </table>
 </div>
-<h2>${card.status} in <a href="../lane/${lane}.html">${lane}</a></h2>
+<h2>${card.status} in <a href="../lane/${lane}">${lane}</a></h2>
 <p>
 <ul>
     <li>Card ID: <a href="${card.url}">${card.roadmap_id}</a>

=== modified file 'templates/roadmap_lane.html'
--- templates/roadmap_lane.html	2011-12-12 09:17:20 +0000
+++ templates/roadmap_lane.html	2011-12-15 12:12:50 +0000
@@ -9,7 +9,7 @@
 Lane to view:
 <select name="laneselect" onchange="window.location=this.value;">
 % for lane in lanes:
-<option value="${lane.name}.html"${' selected="selected"' if lane.name == lane_title else ''}>${lane.name}${' (current)' if lane.is_current else ''}</option>
+<option value="${lane.name}"${' selected="selected"' if lane.name == lane_title else ''}>${lane.name}${' (current)' if lane.is_current else ''}</option>
 % endfor
 </select>
 
@@ -25,7 +25,7 @@
 % for card_dict in status['cards']:
     <tr>
     <td>
-        <a href="../card/${card_dict['card'].roadmap_id if card_dict['card'].roadmap_id != '' else card_dict['card'].card_id}.html">${card_dict['card'].name}</a>
+        <a href="../card/${card_dict['card'].roadmap_id if card_dict['card'].roadmap_id != '' else card_dict['card'].card_id}">${card_dict['card'].name}</a>
     </td>
     <td>${status['name']}</td>
     <td>${card_dict['card'].team}</td><td align=right>${card_dict['card'].priority}</td>