liquid_feedback_frontend
changeset 462:ba310961ba34
Make public_access mode working
author | bsw |
---|---|
date | Tue Mar 13 11:59:58 2012 +0100 (2012-03-13) |
parents | 6e0ce04ade9d |
children | c79be8347e93 |
files | app/main/_filter_view/30_navigation.lua app/main/index/index.lua app/main/unit/_list.lua static/style.css |
line diff
1.1 --- a/app/main/_filter_view/30_navigation.lua Mon Mar 12 23:39:31 2012 +0100 1.2 +++ b/app/main/_filter_view/30_navigation.lua Tue Mar 13 11:59:58 2012 +0100 1.3 @@ -2,14 +2,12 @@ 1.4 1.5 slot.select('navigation', function() 1.6 1.7 - if config.public_access or app.session.member_id then 1.8 - ui.link{ 1.9 - attr = { class = "logolf" }, 1.10 - content = _"Home", 1.11 - module = 'index', 1.12 - view = 'index' 1.13 - } 1.14 - end 1.15 + ui.link{ 1.16 + attr = { class = "logolf" }, 1.17 + content = _"Home", 1.18 + module = 'index', 1.19 + view = 'index' 1.20 + } 1.21 1.22 if app.session.member_id then 1.23 ui.link{
2.1 --- a/app/main/index/index.lua Mon Mar 12 23:39:31 2012 +0100 2.2 +++ b/app/main/index/index.lua Tue Mar 13 11:59:58 2012 +0100 2.3 @@ -25,7 +25,57 @@ 2.4 } 2.5 end 2.6 2.7 - execute.view{ module = "unit", view = "_list" } 2.8 + local open_issues_selector = Issue:new_selector() 2.9 + :add_where("issue.closed ISNULL") 2.10 + :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()") 2.11 + 2.12 + local closed_issues_selector = Issue:new_selector() 2.13 + :add_where("issue.closed NOTNULL") 2.14 + :add_order_by("issue.closed DESC") 2.15 + 2.16 + 2.17 + local tabs = { 2.18 + module = "index", 2.19 + view = "index" 2.20 + } 2.21 + 2.22 + tabs[#tabs+1] = { 2.23 + name = "units", 2.24 + label = _"Units", 2.25 + module = "unit", 2.26 + view = "_list" 2.27 + } 2.28 + 2.29 + tabs[#tabs+1] = { 2.30 + name = "timeline", 2.31 + label = _"Events", 2.32 + module = "event", 2.33 + view = "_list", 2.34 + params = { global = true } 2.35 + } 2.36 + 2.37 + tabs[#tabs+1] = { 2.38 + name = "open", 2.39 + label = _"Open issues", 2.40 + module = "issue", 2.41 + view = "_list", 2.42 + params = { 2.43 + for_state = "open", 2.44 + issues_selector = open_issues_selector 2.45 + } 2.46 + } 2.47 + tabs[#tabs+1] = { 2.48 + name = "closed", 2.49 + label = _"Closed issues", 2.50 + module = "issue", 2.51 + view = "_list", 2.52 + params = { 2.53 + for_state = "closed", 2.54 + issues_selector = closed_issues_selector 2.55 + } 2.56 + } 2.57 + 2.58 + ui.tabs(tabs) 2.59 2.60 else 2.61
3.1 --- a/app/main/unit/_list.lua Mon Mar 12 23:39:31 2012 +0100 3.2 +++ b/app/main/unit/_list.lua Tue Mar 13 11:59:58 2012 +0100 3.3 @@ -1,15 +1,20 @@ 3.4 local units = Unit:get_flattened_tree{ active = true } 3.5 3.6 -ui.list{ 3.7 - records = units, 3.8 - columns = { 3.9 - { 3.10 - content = function(unit) 3.11 - for i = 1, unit.depth - 1 do 3.12 - slot.put(" ") 3.13 - end 3.14 - ui.link{ text = unit.name, module = "unit", view = "show", id = unit.id } 3.15 - end 3.16 +ui.container{ attr = { class = "box" }, content = function() 3.17 + 3.18 + ui.list{ 3.19 + attr = { class = "unit_list" }, 3.20 + records = units, 3.21 + columns = { 3.22 + { 3.23 + content = function(unit) 3.24 + for i = 1, unit.depth - 1 do 3.25 + slot.put(" ") 3.26 + end 3.27 + ui.link{ text = unit.name, module = "unit", view = "show", id = unit.id } 3.28 + end 3.29 + } 3.30 } 3.31 } 3.32 -} 3.33 \ No newline at end of file 3.34 + 3.35 +end } 3.36 \ No newline at end of file
4.1 --- a/static/style.css Mon Mar 12 23:39:31 2012 +0100 4.2 +++ b/static/style.css Tue Mar 13 11:59:58 2012 +0100 4.3 @@ -852,6 +852,14 @@ 4.4 4.5 4.6 /************************************************************************* 4.7 + * Unit list 4.8 + */ 4.9 + 4.10 +.unit_list a { 4.11 + font-weight: bold; 4.12 +} 4.13 + 4.14 +/************************************************************************* 4.15 * Area list 4.16 */ 4.17