# HG changeset patch # User bsw # Date 1331636398 -3600 # Node ID ba310961ba349c119b8fa5f6711d2b67255f2852 # Parent 6e0ce04ade9dcc64fe2b5f3a1cd7da31740480a0 Make public_access mode working diff -r 6e0ce04ade9d -r ba310961ba34 app/main/_filter_view/30_navigation.lua --- a/app/main/_filter_view/30_navigation.lua Mon Mar 12 23:39:31 2012 +0100 +++ b/app/main/_filter_view/30_navigation.lua Tue Mar 13 11:59:58 2012 +0100 @@ -2,14 +2,12 @@ slot.select('navigation', function() - if config.public_access or app.session.member_id then - ui.link{ - attr = { class = "logolf" }, - content = _"Home", - module = 'index', - view = 'index' - } - end + ui.link{ + attr = { class = "logolf" }, + content = _"Home", + module = 'index', + view = 'index' + } if app.session.member_id then ui.link{ diff -r 6e0ce04ade9d -r ba310961ba34 app/main/index/index.lua --- a/app/main/index/index.lua Mon Mar 12 23:39:31 2012 +0100 +++ b/app/main/index/index.lua Tue Mar 13 11:59:58 2012 +0100 @@ -25,7 +25,57 @@ } end - execute.view{ module = "unit", view = "_list" } + local open_issues_selector = Issue:new_selector() + :add_where("issue.closed ISNULL") + :add_order_by("coalesce(issue.fully_frozen + issue.voting_time, issue.half_frozen + issue.verification_time, issue.accepted + issue.discussion_time, issue.created + issue.admission_time) - now()") + + local closed_issues_selector = Issue:new_selector() + :add_where("issue.closed NOTNULL") + :add_order_by("issue.closed DESC") + + + local tabs = { + module = "index", + view = "index" + } + + tabs[#tabs+1] = { + name = "units", + label = _"Units", + module = "unit", + view = "_list" + } + + tabs[#tabs+1] = { + name = "timeline", + label = _"Events", + module = "event", + view = "_list", + params = { global = true } + } + + tabs[#tabs+1] = { + name = "open", + label = _"Open issues", + module = "issue", + view = "_list", + params = { + for_state = "open", + issues_selector = open_issues_selector + } + } + tabs[#tabs+1] = { + name = "closed", + label = _"Closed issues", + module = "issue", + view = "_list", + params = { + for_state = "closed", + issues_selector = closed_issues_selector + } + } + + ui.tabs(tabs) else diff -r 6e0ce04ade9d -r ba310961ba34 app/main/unit/_list.lua --- a/app/main/unit/_list.lua Mon Mar 12 23:39:31 2012 +0100 +++ b/app/main/unit/_list.lua Tue Mar 13 11:59:58 2012 +0100 @@ -1,15 +1,20 @@ local units = Unit:get_flattened_tree{ active = true } -ui.list{ - records = units, - columns = { - { - content = function(unit) - for i = 1, unit.depth - 1 do - slot.put("     ") - end - ui.link{ text = unit.name, module = "unit", view = "show", id = unit.id } - end +ui.container{ attr = { class = "box" }, content = function() + + ui.list{ + attr = { class = "unit_list" }, + records = units, + columns = { + { + content = function(unit) + for i = 1, unit.depth - 1 do + slot.put("     ") + end + ui.link{ text = unit.name, module = "unit", view = "show", id = unit.id } + end + } } } -} \ No newline at end of file + +end } \ No newline at end of file diff -r 6e0ce04ade9d -r ba310961ba34 static/style.css --- a/static/style.css Mon Mar 12 23:39:31 2012 +0100 +++ b/static/style.css Tue Mar 13 11:59:58 2012 +0100 @@ -852,6 +852,14 @@ /************************************************************************* + * Unit list + */ + +.unit_list a { + font-weight: bold; +} + +/************************************************************************* * Area list */