1.1 --- a/app/main/index/about.lua	Thu Jun 23 03:30:57 2016 +0200
     1.2 +++ b/app/main/index/about.lua	Sun Jul 15 14:07:29 2018 +0200
     1.3 @@ -1,103 +1,104 @@
     1.4  ui.title(_"About site")
     1.5  
     1.6 -ui.section( function()
     1.7 +ui.grid{ content = function()
     1.8 +  ui.cell_full{ content = function()
     1.9  
    1.10 -  ui.sectionHead( function()
    1.11 -    ui.heading{ level = 1, content = _"About site" }
    1.12 -  end )
    1.13 -
    1.14 -  ui.sectionRow( function()
    1.15 +    ui.container { attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function()
    1.16  
    1.17 -    ui.heading{ level = 3, content = _"This service is provided by:" }
    1.18 -    slot.put(config.app_service_provider)
    1.19 -
    1.20 -  end )
    1.21 -
    1.22 -  ui.sectionRow( function()
    1.23 -
    1.24 -    ui.heading{ level = 3, content = _"This service is provided using the following software components:" }
    1.25 +      ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
    1.26 +        ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"This service is provided by:" }
    1.27 +      end }
    1.28 +      ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function()
    1.29 +        slot.put(config.app_service_provider)
    1.30 +      end }
    1.31 +    end }
    1.32 +        
    1.33 +    ui.container { attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, 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 = _"This service is provided using the following software components:" }
    1.36 +      end }
    1.37 +      ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function()
    1.38  
    1.39 -    local tmp = {
    1.40 -      {
    1.41 -        name = "LiquidFeedback Frontend",
    1.42 -        url = "http://www.public-software-group.org/liquid_feedback",
    1.43 -        version = config.app_version,
    1.44 -        license = "MIT/X11",
    1.45 -        license_url = "http://www.public-software-group.org/licenses"
    1.46 -      },
    1.47 -      {
    1.48 -        name = "LiquidFeedback Core",
    1.49 -        url = "http://www.public-software-group.org/liquid_feedback",
    1.50 -        version = db:query("SELECT * from liquid_feedback_version;")[1].string,
    1.51 -        license = "MIT/X11",
    1.52 -        license_url = "http://www.public-software-group.org/licenses"
    1.53 -      },
    1.54 -      {
    1.55 -        name = "WebMCP",
    1.56 -        url = "http://www.public-software-group.org/webmcp",
    1.57 -        version = WEBMCP_VERSION or _WEBMCP_VERSION,
    1.58 -        license = "MIT/X11",
    1.59 -        license_url = "http://www.public-software-group.org/licenses"
    1.60 -      }
    1.61 -    }
    1.62 -    
    1.63 -    if _MOONBRIDGE_VERSION then
    1.64 -      tmp[#tmp+1] = {
    1.65 -        name = "Moonbridge",
    1.66 -        url = "http://www.public-software-group.org/moonbridge",
    1.67 -        version = _MOONBRIDGE_VERSION,
    1.68 -        license = "MIT/X11",
    1.69 -        license_url = "http://www.public-software-group.org/licenses"
    1.70 -      }
    1.71 -    end
    1.72 -    
    1.73 -    tmp[#tmp+1] = {
    1.74 -      name = "Lua",
    1.75 -      url = "http://www.lua.org",
    1.76 -      version = _VERSION:gsub("Lua ", ""),
    1.77 -      license = "MIT/X11",
    1.78 -      license_url = "http://www.lua.org/license.html"
    1.79 -    }
    1.80 -    
    1.81 -    tmp[#tmp+1] = {
    1.82 -      name = "PostgreSQL",
    1.83 -      url = "http://www.postgresql.org/",
    1.84 -      version = db:query("SELECT version();")[1].version:gsub("PostgreSQL ", ""):gsub("on.*", ""),
    1.85 -      license = "PostgreSQL License",
    1.86 -      license_url = "http://www.postgresql.org/about/licence"
    1.87 -    }
    1.88 +        local tmp = {
    1.89 +          {
    1.90 +            name = "LiquidFeedback Frontend",
    1.91 +            url = "http://www.public-software-group.org/liquid_feedback",
    1.92 +            version = config.app_version,
    1.93 +            license = "MIT/X11",
    1.94 +            license_url = "http://www.public-software-group.org/licenses"
    1.95 +          },
    1.96 +          {
    1.97 +            name = "LiquidFeedback Core",
    1.98 +            url = "http://www.public-software-group.org/liquid_feedback",
    1.99 +            version = db:query("SELECT * from liquid_feedback_version;")[1].string,
   1.100 +            license = "MIT/X11",
   1.101 +            license_url = "http://www.public-software-group.org/licenses"
   1.102 +          },
   1.103 +          {
   1.104 +            name = "WebMCP",
   1.105 +            url = "http://www.public-software-group.org/webmcp",
   1.106 +            version = WEBMCP_VERSION or _WEBMCP_VERSION,
   1.107 +            license = "MIT/X11",
   1.108 +            license_url = "http://www.public-software-group.org/licenses"
   1.109 +          }
   1.110 +        }
   1.111 +        
   1.112 +        if _MOONBRIDGE_VERSION then
   1.113 +          tmp[#tmp+1] = {
   1.114 +            name = "Moonbridge",
   1.115 +            url = "http://www.public-software-group.org/moonbridge",
   1.116 +            version = _MOONBRIDGE_VERSION,
   1.117 +            license = "MIT/X11",
   1.118 +            license_url = "http://www.public-software-group.org/licenses"
   1.119 +          }
   1.120 +        end
   1.121 +        
   1.122 +        tmp[#tmp+1] = {
   1.123 +          name = "Lua",
   1.124 +          url = "http://www.lua.org",
   1.125 +          version = _VERSION:gsub("Lua ", ""),
   1.126 +          license = "MIT/X11",
   1.127 +          license_url = "http://www.lua.org/license.html"
   1.128 +        }
   1.129 +        
   1.130 +        tmp[#tmp+1] = {
   1.131 +          name = "PostgreSQL",
   1.132 +          url = "http://www.postgresql.org/",
   1.133 +          version = db:query("SELECT version();")[1].version:gsub("PostgreSQL ", ""):gsub("on.*", ""),
   1.134 +          license = "PostgreSQL License",
   1.135 +          license_url = "http://www.postgresql.org/about/licence"
   1.136 +        }
   1.137  
   1.138 -    ui.list{
   1.139 -      records = tmp,
   1.140 -      columns = {
   1.141 -        {
   1.142 -          content = function(record) 
   1.143 -            ui.link{
   1.144 -              content = record.name,
   1.145 -              external = record.url
   1.146 +        ui.list{
   1.147 +          records = tmp,
   1.148 +          columns = {
   1.149 +            {
   1.150 +              content = function(record) 
   1.151 +                ui.link{
   1.152 +                  content = record.name,
   1.153 +                  external = record.url
   1.154 +                }
   1.155 +              end
   1.156 +            },
   1.157 +            {
   1.158 +              content = function(record) ui.field.text{ value = record.version } end
   1.159 +            },
   1.160 +            {
   1.161 +              content = function(record) 
   1.162 +                ui.link{
   1.163 +                  content = record.license,
   1.164 +                  external = record.license_url
   1.165 +                }
   1.166 +              end
   1.167 +
   1.168              }
   1.169 -          end
   1.170 -        },
   1.171 -        {
   1.172 -          content = function(record) ui.field.text{ value = record.version } end
   1.173 -        },
   1.174 -        {
   1.175 -          content = function(record) 
   1.176 -            ui.link{
   1.177 -              content = record.license,
   1.178 -              external = record.license_url
   1.179 -            }
   1.180 -          end
   1.181 +          }
   1.182 +        }
   1.183  
   1.184 -        }
   1.185 -      }
   1.186 -    }
   1.187 -
   1.188 -  end )
   1.189 -
   1.190 -  ui.sectionRow( function()
   1.191 -    ui.heading{ level = 3, content = "3rd party license information:" }
   1.192 -    slot.put('Some of the icons used in Liquid Feedback are from <a href="http://www.famfamfam.com/lab/icons/silk/">Silk icon set 1.3</a> by Mark James. His work is licensed under a <a href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution 2.5 License.</a>')
   1.193 -
   1.194 -  end )
   1.195 -end )
   1.196 +        slot.put("<br />")
   1.197 +        ui.container{ content = "3rd party license information:" }
   1.198 +        slot.put('Some of the icons used in Liquid Feedback are from <a href="http://www.famfamfam.com/lab/icons/silk/">Silk icon set 1.3</a> by Mark James. His work is licensed under a <a href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution 2.5 License.</a>')
   1.199 +      end }
   1.200 +    end }
   1.201 +  end }
   1.202 +end }