Merge branch 'master' into subtask

ui.py

@@ -12,6 +12,7 @@ palette = [
     ('header', 'bold,light green', ''),
     ('secondary', 'light gray', ''),
     ('task', 'light green', ''),
+    ('project', 'yellow', ''),
     ('section', 'white', 'dark green'),
     ('workspace', 'white', 'dark blue'),
     ('pager', 'standout', ''),
@@ -71,8 +72,8 @@ class ProjectList(urwid.ListBox):
         self.projects = projects
 
         body = urwid.SimpleFocusListWalker(
-            [ProjectIcon({'name': 'My Tasks', 'id': None},
-                         self.loadProject),
+            [urwid.AttrMap(ProjectIcon({'name': 'My Tasks', 'id': None},
+                         self.loadProject), 'project'),
              None]
         )
         super(ProjectList, self).__init__(body)
@@ -82,8 +83,8 @@ class ProjectList(urwid.ListBox):
         self.body.pop()
         for i in range(50):
             try:
-                self.body.append(ProjectIcon(self.projects.next(),
-                                             self.loadProject))
+                self.body.append(urwid.AttrMap(ProjectIcon(self.projects.next(),
+                                             self.loadProject), 'project'))
             except StopIteration:
                 return
 
@@ -267,19 +268,23 @@ class AssigneeTypeAhead(urwid.Pile):
 
 class ProjectTypeAhead(urwid.Pile):
     def __init__(self, task):
-        projects = [ProjectIcon(project, self.loadProject)
+        projects = [urwid.AttrMap(ProjectIcon(project, self.loadProject),
+                                  'project')
                     for project in task['projects']]
 
-        self.edit = urwid.Edit('Add Project: ')
-        project.append(self.edit)
-        
-
-
         if task['parent'] != None:
             parent = TaskEdit(task['parent'])
             urwid.connect_signal(parent, 'updatetask', self.updateSubtask)
             urwid.connect_signal(parent, 'details', self.showDetails)
-            projects.append(urwid.AttrMap(parent, 'task'))
+
+            #Remap enter to load details of parent
+            urwid.connect_signal(parent, 'newtask', self.showDetails)
+            projects.append(parent)
+        projects = [ProjectIcon(project, self.loadProject)
+                    for project in task['projects']]
+
+        self.edit = urwid.Edit('Add Project: ')
+        project.append(self.edit)
 
 class TaskDetails(urwid.ListBox):
     def __init__(self, task, stories, subtasks):
@@ -300,7 +305,6 @@ class TaskDetails(urwid.ListBox):
         urwid.connect_signal(assignee_type_ahead, 'usertypeahead',
                              self.userTypeAhead)
         urwid.connect_signal(assignee_type_ahead, 'assigntask', self.assignTask)
-
     
         all_subtasks = [t for t in subtasks]
         subtask_list = TaskList(all_subtasks)