1.1 --- a/app/main/suggestion/show.lua	Thu Feb 11 15:45:56 2021 +0100
     1.2 +++ b/app/main/suggestion/show.lua	Thu Feb 11 15:48:02 2021 +0100
     1.3 @@ -23,106 +23,48 @@
     1.4  initiative.issue:load_everything_for_member_id(app.session.member_id)
     1.5  
     1.6  
     1.7 -execute.view{ module = "issue", view = "_sidebar_state", params = {
     1.8 -  initiative = initiative
     1.9 -} }
    1.10 +
    1.11 +execute.view{ module = "issue", view = "_head", params = { issue = initiative.issue, link_issue = true } }
    1.12  
    1.13 -execute.view { 
    1.14 -  module = "issue", view = "_sidebar_issue", 
    1.15 -  params = {
    1.16 -    issue = initiative.issue,
    1.17 -    highlight_initiative_id = initiative.id
    1.18 -  }
    1.19 -}
    1.20 +ui.grid{ content = function()
    1.21 +  ui.cell_main{ content = function()
    1.22  
    1.23 -execute.view {
    1.24 -  module = "issue", view = "_sidebar_whatcanido",
    1.25 -  params = { initiative = initiative }
    1.26 -}
    1.27 -
    1.28 -execute.view { 
    1.29 -  module = "issue", view = "_sidebar_members", params = {
    1.30 -    issue = initiative.issue, initiative = initiative
    1.31 -  }
    1.32 -}
    1.33 +    ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function()
    1.34 +      ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
    1.35 +        ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = suggestion.name }
    1.36 +      end }
    1.37  
    1.38 -
    1.39 -
    1.40 -execute.view {
    1.41 -  module = "issue", view = "_head", params = {
    1.42 -    issue = initiative.issue
    1.43 -  }
    1.44 -}
    1.45 -
    1.46 -
    1.47 -ui.section( function()
    1.48 -  ui.sectionHead( function()
    1.49 -    ui.link{
    1.50 -      module = "initiative", view = "show", id = initiative.id,
    1.51 -      content = function ()
    1.52 -        ui.heading { 
    1.53 -          level = 1,
    1.54 -          content = initiative.display_name
    1.55 +      ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function()
    1.56 +        if app.session:has_access("authors_pseudonymous") and suggestion.author then 
    1.57 +          util.micro_avatar(suggestion.author)
    1.58 +        end
    1.59 +        execute.view{
    1.60 +          module = "suggestion", view = "_collective_rating", params = {
    1.61 +            suggestion = suggestion
    1.62 +          }
    1.63          }
    1.64 -      end
    1.65 -    }
    1.66 -    ui.heading { level = 2, content = _("Suggestion for improvement #{id}", { id = suggestion.id }) }
    1.67 -  end )
    1.68 -  ui.sectionRow( function()
    1.69 +      end }
    1.70  
    1.71 -    ui.heading{ level = 2, content = suggestion.name }
    1.72 -    if app.session:has_access("authors_pseudonymous") and suggestion.author then 
    1.73 -      util.micro_avatar(suggestion.author)
    1.74 -    end
    1.75 -  end )
    1.76 -  ui.sectionRow( function()
    1.77 -    ui.container{
    1.78 -      attr = { class = "suggestion_content wiki" },
    1.79 -      content = function()
    1.80 +      ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function()
    1.81          slot.put(suggestion:get_content("html"))
    1.82 -      end
    1.83 -    }
    1.84 -    
    1.85 -  end )
    1.86 -end )
    1.87 -
    1.88 -ui.section( function()
    1.89 -  ui.sectionHead( function()
    1.90 -    ui.heading { level = 2, content = _"Collective rating" }
    1.91 -  end )
    1.92 -  ui.sectionRow( function()
    1.93 +      end }
    1.94  
    1.95 -    execute.view{
    1.96 -      module = "suggestion",
    1.97 -      view = "_list_element",
    1.98 -      params = {
    1.99 -        suggestions_selector = Suggestion:new_selector():add_where{ "id = ?", suggestion.id },
   1.100 -        initiative = suggestion.initiative,
   1.101 -        show_name = false,
   1.102 -        show_filter = false
   1.103 -      }
   1.104 -    }
   1.105 -  end)
   1.106 -end)
   1.107 -  
   1.108 -if app.session:has_access("all_pseudonymous") then
   1.109 -  ui.section( function()
   1.110 -    ui.sectionHead( function()
   1.111 -      ui.heading { level = 2, content = _"Individual ratings" }
   1.112 -    end )
   1.113 -    ui.sectionRow( function()
   1.114 +      if app.session:has_access("all_pseudonymous") then
   1.115 +        ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function()
   1.116 +          execute.view{
   1.117 +            module = "opinion",
   1.118 +            view = "_list",
   1.119 +            params = { 
   1.120 +              opinions_selector = Opinion:new_selector()
   1.121 +                :add_where{ "suggestion_id = ?", suggestion.id }
   1.122 +                :join("member", nil, "member.id = opinion.member_id")
   1.123 +                :add_order_by("member.id DESC")
   1.124 +            }
   1.125 +          }
   1.126 +        end }
   1.127 +      end
   1.128  
   1.129 -      execute.view{
   1.130 -        module = "opinion",
   1.131 -        view = "_list",
   1.132 -        params = { 
   1.133 -          opinions_selector = Opinion:new_selector()
   1.134 -            :add_where{ "suggestion_id = ?", suggestion.id }
   1.135 -            :join("member", nil, "member.id = opinion.member_id")
   1.136 -            :add_order_by("member.id DESC")
   1.137 -        }
   1.138 -      }
   1.139 +    end }
   1.140 +  end }
   1.141 +end }
   1.142  
   1.143 -    end)
   1.144 -  end)
   1.145 -end
   1.146 \ No newline at end of file