Merge lp:~mabac/launchpad-work-items-tracker/linaro-roadmap-frontpage into lp:launchpad-work-items-tracker

[Mattias Backman]

Hi,

This branch removes the roadmap.html front page and adds a drop down selector on the lane view pages.

Also make the cards in the lanes view equal width by setting all of them to occupy 45% screen width.

Thanks,

Mattias

[James Westby (james-w)]

review: Approve

Unmerged revisions

308. By Mattias Backman on 2011-10-19

Make the current lane default in the selection dropdown.

307. By Mattias Backman on 2011-10-18

Make all card equal width in lane view.

306. By Mattias Backman on 2011-10-18

Put a lane selector on top of the Lane views.

305. By Mattias Backman on 2011-10-18

Don't generate roadmap.html.

304. By Mattias Backman on 2011-10-13

Mark lane as current based on name.

303. By Mattias Backman on 2011-10-13

Merge get-priority.

302. By Mattias Backman on 2011-10-13

Add is_current to Lane.

301. By Mattias Backman on 2011-10-12

Ignore the Legend and Deferred lanes as well as Summits cards. Also change the board id.

300. By Mattias Backman on 2011-10-10

Add Roadmap cards to Linaro roadmap reporting.

299. By Mattias Backman on 2011-09-29

Use the same lock for collect_roadmap as is used for collect.

=== modified file 'collect_roadmap'
--- collect_roadmap	2011-10-19 15:17:01 +0000
+++ collect_roadmap	2011-10-19 15:17:02 +0000
@@ -75,6 +75,10 @@
         assert node['parent_id'] == root_node_id
         model_lane = Lane(unicode_or_None(node['name']),
                           node['id'])
+        if model_lane.name == '2011Q3':
+            model_lane.is_current = True
+        else:
+            model_lane.is_current = False
         collector.store_lane(model_lane)
         node_id = node['id']
         if node_id in nodes:
 
=== modified file 'generate-all'
--- generate-all	2011-10-19 15:17:01 +0000
+++ generate-all	2011-10-19 15:17:02 +0000
@@ -170,11 +170,6 @@
 basename = os.path.join(opts.output_dir, 'index')
 report_tools.status_overview(my_path, opts.database, basename, opts.config, root=opts.root)
 
-# roadmap overview
-basename = os.path.join(opts.output_dir, 'roadmap')
-report_tools.roadmap_overview(my_path, opts.database, basename, opts.config,
-                              root=opts.root)
-
 # roadmap lanes
 for lane in report_tools.lanes(store):
     basename = os.path.join(opts.output_dir, 'roadmap-' + lane.name)
 
=== modified file 'html-report'
--- html-report	2011-10-19 15:17:01 +0000
+++ html-report	2011-10-19 15:17:02 +0000
@@ -478,13 +478,15 @@
 
         data = self.template_data(store, opts)
         lane = report_tools.lane(store, opts.lane).one()
+        lanes = report_tools.lanes(store)
         statuses = []
         for status, cards in report_tools.statuses(store, lane):
             statuses.append(dict(name=status, cards=cards))
             
         data.update(dict(statuses=statuses))
         data.update(dict(page_type="roadmap_lane"))
-        data.update(dict(lane=title))
+        data.update(dict(lane_title=title))
+        data.update(dict(lanes=lanes))
         print report_tools.fill_template(
             "roadmap_lane.html", data, theme=opts.theme)
 
 
=== modified file 'lpworkitems/database.py'
--- lpworkitems/database.py	2011-10-19 15:17:01 +0000
+++ lpworkitems/database.py	2011-10-19 15:17:02 +0000
@@ -93,6 +93,7 @@
     store.execute('''CREATE TABLE lane (
         name VARCHAR(200) NOT NULL,
         lane_id NOT NULL,
+        is_current BOOLEAN,
         cards REFERENCES card(card_id)
         )''')
 
@@ -225,6 +226,7 @@
         store.execute('ALTER TABLE card ADD COLUMN contact VARCHAR(50)')
         store.execute('ALTER TABLE card ADD COLUMN description BLOB')
         store.execute('ALTER TABLE card ADD COLUMN acceptance_criteria BLOB')
+        store.execute('ALTER TABLE lane ADD COLUMN is_current BOOLEAN')
         store.execute('UPDATE version SET db_layout_ref = 13')
 
 
 
=== modified file 'lpworkitems/models_roadmap.py'
--- lpworkitems/models_roadmap.py	2011-10-19 15:17:01 +0000
+++ lpworkitems/models_roadmap.py	2011-10-19 15:17:02 +0000
@@ -2,7 +2,7 @@
 import re
 from utils import unicode_or_None
 
-from storm.locals import Date, Reference, ReferenceSet, Unicode, Int
+from storm.locals import Date, Reference, ReferenceSet, Unicode, Int, Bool
 
 
 class Card(object):
@@ -35,6 +35,7 @@
 
     name = Unicode()
     lane_id = Int(primary=True)
+    is_current = Bool()
     cards = ReferenceSet(lane_id, Card.lane_id)
 
     def __init__(self, name, lane_id):
 
=== modified file 'templates/roadmap_lane.html'
--- templates/roadmap_lane.html	2011-10-19 15:17:01 +0000
+++ templates/roadmap_lane.html	2011-10-19 15:17:02 +0000
@@ -6,8 +6,15 @@
 import report_tools
 %>
 
+Lane to view:
+<select name="laneselect" onchange="window.location=this.value;">
+% for lane in lanes:
+<option value="roadmap-${lane.name}.html"${' selected="selected"' if lane.name == lane_title else ''}>${lane.name}${' (current)' if lane.is_current else ''}</option>
+% endfor
+</select>
+
 <%def name="title()">
-Progress for ${lane}
+Progress for ${lane_title}
 </%def>
 
 <h1>${title()}</h1>
@@ -16,7 +23,7 @@
 <p><b>${status['name']}</b>
 % for card in status['cards']:
 
-<table>
+<table width="45%">
 <thead>
     <tr><th>
         <a href="roadmap-card-${card.roadmap_id}.html">${card.name}</a>