Merge lp:~mabac/launchpad-work-items-tracker/change-home-page into lp:~linaro-automation/launchpad-work-items-tracker/linaro

[Mattias Backman]

Hi,

This branch changes the status.linaro.org home page to be a copy of the current lane report.

We also remove some leftover templates and functions from the first go at a roadmap front page.

To complete the change we also need to change the config at mombin:/etc/apache2/sites-enabled/status.linaro.org to read

    RedirectMatch ^/$ http://status.linaro.org/lane/

Thanks,

Mattias

=== modified file 'generate-all'
--- generate-all	2011-12-16 13:47:32 +0000
+++ generate-all	2011-12-21 15:35:31 +0000
@@ -107,6 +107,28 @@
     else:
         raise
 
+# roadmap lanes
+for lane in report_tools.lanes(store):
+    basename = os.path.join(lanessubdir, lane.name)
+    report_tools.roadmap_pages(my_path, opts.database, basename, opts.config,
+                               lane, root=opts.root)
+
+# roadmap cards
+for card in report_tools.cards(store):
+    if card.roadmap_id != '':
+        page_name = card.roadmap_id
+    else:
+        page_name = str(card.card_id)
+    basename = os.path.join(cardssubdir, page_name)
+    report_tools.roadmap_cards(my_path, opts.database, basename, opts.config,
+                               card, root=opts.root)
+
+# roadmap front page
+basename = os.path.join(lanessubdir, 'index')
+lane = report_tools.current_lane(store)
+report_tools.roadmap_pages(my_path, opts.database, basename, opts.config,
+                           lane, root=opts.root)
+
 for u in users:
     for m in milestones:
         target = u + '-' + m
@@ -174,26 +196,10 @@
     basename = os.path.join(opts.output_dir, status)
     report_tools.workitem_list(my_path, opts.database, basename, opts.config, status, root=opts.root)
 
-# front page
+# cycle front page
 basename = os.path.join(opts.output_dir, 'index')
 report_tools.status_overview(my_path, opts.database, basename, opts.config, root=opts.root)
 
-# roadmap lanes
-for lane in report_tools.lanes(store):
-    basename = os.path.join(lanessubdir, lane.name)
-    report_tools.roadmap_pages(my_path, opts.database, basename, opts.config,
-                               lane, root=opts.root)
-
-# roadmap cards
-for card in report_tools.cards(store):
-    if card.roadmap_id != '':
-        page_name = card.roadmap_id
-    else:
-        page_name = str(card.card_id)
-    basename = os.path.join(cardssubdir, page_name)
-    report_tools.roadmap_cards(my_path, opts.database, basename, opts.config,
-                               card, root=opts.root)
-
 def copy_files(source_dir):
     for filename in os.listdir(source_dir):
         dest = open(os.path.join(opts.output_dir, filename), 'w')
 
=== modified file 'html-report'
--- html-report	2011-12-20 11:07:39 +0000
+++ html-report	2011-12-21 15:35:31 +0000
@@ -459,22 +459,6 @@
         print report_tools.fill_template(
             "workitem_list.html", data, theme=opts.theme)
 
-    def roadmap(self, store, opts):
-        if not opts.title:
-            title = 'Linaro Roadmap'
-        else:
-            title = opts.title
-
-        data = self.template_data(store, opts)
-        lanes = report_tools.lanes(store)
-            
-        data.update(dict(lanes=lanes))
-        data.update(dict(page_title=title))
-        data.update(dict(page_type="roadmap"))
-        print report_tools.fill_template(
-            "roadmap.html", data, theme=opts.theme)
-
-
     def roadmap_page(self, store, opts):
         if opts.lane is None:
             print "<h1>Error, no lane specified.</h1>"
 
=== modified file 'report_tools.py'
--- report_tools.py	2011-12-19 14:19:45 +0000
+++ report_tools.py	2011-12-21 15:35:31 +0000
@@ -188,22 +188,6 @@
         fh.close()
 
 
-def roadmap_overview(my_path, database, basename, config, root=None):
-    cfg = load_config(config)
-    fh = open(basename + '.html', 'w')
-    try:
-        args = [os.path.join(my_path, 'html-report'), '-d', database]
-        args += ['--report-type', 'roadmap']
-        if root:
-            args += ['--root', root]
-        report_args(args, theme=get_theme(cfg))
-        proc = Popen(args, stdout=fh)
-        print basename + '.html'
-        proc.wait()
-    finally:
-        fh.close()
-
-
 def roadmap_pages(my_path, database, basename, config, lane, root=None):
     cfg = load_config(config)
     fh = open(basename + '.html', 'w')
@@ -989,6 +973,10 @@
         return store.find(Lane, Lane.lane_id == id).one()
 
 
+def current_lane(store):
+    return store.find(Lane, Lane.is_current).one()
+
+
 def lane_cards(store, lane):
     return lane.cards
 
 
=== modified file 'templates/body.html'
--- templates/body.html	2011-07-15 14:05:40 +0000
+++ templates/body.html	2011-12-21 15:35:31 +0000
@@ -12,7 +12,7 @@
 % if page_type == "overview":
    active
 % endif
-	    " title="Overview" id="overview_nav"><a href="${util.url('')}">Overview</a></li>
+	    " title="Roadmap" id="overview_nav"><a href="${root}../lane/">Roadmap</a></li>
 	    <li class="link
 % if page_type == "about":
    active
 
=== removed file 'templates/roadmap.html'
--- templates/roadmap.html	2011-09-19 09:27:31 +0000
+++ templates/roadmap.html	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<%inherit file="body.html"/>
-<%namespace name="util" file="util.html"/>
-<%namespace name="terminology" file="terminology.html"/>
-
-<%!
-import report_tools
-%>
-
-<%def name="title()">
-${page_title}
-</%def>
-
-<h1>${title()}</h1>
-<p>
-% for lane in lanes:
-<p><a href="roadmap-${lane.name}.html">Progress for ${lane.name}</a>
-% endfor