1.1 --- a/app/main/issue/_show_head.lua	Tue Feb 07 20:03:31 2012 +0100
     1.2 +++ b/app/main/issue/_show_head.lua	Tue Feb 07 22:30:48 2012 +0100
     1.3 @@ -16,36 +16,67 @@
     1.4  end)
     1.5  
     1.6  slot.select("title", function()
     1.7 -  if not config.single_unit_id then
     1.8 -    ui.link{
     1.9 -      content = issue.area.unit.name,
    1.10 -      module = "area",
    1.11 -      view = "list",
    1.12 -      params = { unit_id = issue.area.unit_id }
    1.13 -    }
    1.14 +  ui.link{
    1.15 +    content = _("Issue ##{id}", { id = issue.id }),
    1.16 +    module = "issue",
    1.17 +    view = "show",
    1.18 +    id = issue.id
    1.19 +  }
    1.20      slot.put(" · ")
    1.21 -  end
    1.22    ui.link{
    1.23      content = issue.area.name,
    1.24      module = "area",
    1.25      view = "show",
    1.26      id = issue.area.id
    1.27    }
    1.28 -  slot.put(" · ")
    1.29 -  ui.link{
    1.30 -    content = _("Issue ##{id}", { id = issue.id }),
    1.31 -    module = "issue",
    1.32 -    view = "show",
    1.33 -    id = issue.id
    1.34 -  }
    1.35 -  slot.put(" · ")
    1.36 -  ui.tag{
    1.37 -    tag = "span",
    1.38 -    content = issue.state_name,
    1.39 -  }
    1.40 +  if not config.single_unit_id then
    1.41 +    slot.put(" · ")
    1.42 +    ui.link{
    1.43 +      content = issue.area.unit.name,
    1.44 +      module = "area",
    1.45 +      view = "list",
    1.46 +      params = { unit_id = issue.area.unit_id }
    1.47 +    }
    1.48 +  end
    1.49  end)
    1.50  
    1.51  
    1.52 +slot.select("title2", function()
    1.53 +  ui.tag{
    1.54 +    tag = "div",
    1.55 +    content = function()
    1.56 +      ui.tag{
    1.57 +        content = function()
    1.58 +          ui.link{
    1.59 +            text = issue.policy.name,
    1.60 +            module = "policy",
    1.61 +            view = "show",
    1.62 +            id = issue.policy.id
    1.63 +          }
    1.64 +        end
    1.65 +      }
    1.66 +      slot.put(" · ")
    1.67 +      ui.tag{ content = issue.state_name }
    1.68 +
    1.69 +      slot.put(" · ")
    1.70 +      local time_left = issue.state_time_left
    1.71 +      if time_left then
    1.72 +        ui.tag{ content = _("#{time_left} left", { time_left = time_left }) }
    1.73 +      end
    1.74 +
    1.75 +      slot.put(" · ")
    1.76 +      local next_state_names = issue.next_states_names
    1.77 +      if next_state_names then
    1.78 +        ui.tag{ content = _("Next state: #{state}", { state = next_state_names }) }
    1.79 +      end
    1.80 +    end
    1.81 +  }
    1.82 +
    1.83 +  
    1.84 +end)
    1.85 +
    1.86 +
    1.87 +    --[[
    1.88  slot.select("content_navigation", function()
    1.89  
    1.90    if app.session.member_id then
    1.91 @@ -117,7 +148,6 @@
    1.92        end
    1.93      end
    1.94  
    1.95 -    --[[
    1.96      records = issues_selector:exec()
    1.97  
    1.98      for i,cissue in ipairs(records) do
    1.99 @@ -162,11 +192,11 @@
   1.100        mk_link(-1, _("Previous initiative"), "resultset_previous.png", "initiative")
   1.101        mk_link(1, _("Next initiative"), "resultset_next.png", "initiative")
   1.102      end
   1.103 -    --]]
   1.104    end
   1.105  end
   1.106  
   1.107  )
   1.108 +    --]]
   1.109  
   1.110  slot.select("actions", function()
   1.111  
   1.112 @@ -221,11 +251,9 @@
   1.113  end)
   1.114  
   1.115  
   1.116 -execute.view{
   1.117 -  module = "issue",
   1.118 -  view = "_show_box",
   1.119 -  params = { issue = issue }
   1.120 -}
   1.121 +local issue = param.get("issue", "table")
   1.122 +
   1.123 +
   1.124  
   1.125  --  ui.twitter("http://example.com/t" .. tostring(issue.id))
   1.126