1.1 --- a/app/main/index/about.lua	Thu Jul 10 01:02:43 2014 +0200
     1.2 +++ b/app/main/index/about.lua	Thu Jul 10 01:19:48 2014 +0200
     1.3 @@ -1,102 +1,91 @@
     1.4  ui.title(_"About site")
     1.5  
     1.6 -if app.session.member_id and config.use_terms then
     1.7 -  ui.actions(function()
     1.8 -    ui.link{
     1.9 -      module = "index",
    1.10 -      view = "usage_terms",
    1.11 -      text = _"Terms of use"
    1.12 -    }
    1.13 -  end)
    1.14 -end
    1.15 +ui.section( function()
    1.16  
    1.17 +  ui.sectionHead( function()
    1.18 +    ui.heading{ level = 1, content = _"About site" }
    1.19 +  end )
    1.20 +
    1.21 +  ui.sectionRow( function()
    1.22  
    1.23 -slot.put("<br />")
    1.24 -ui.field.text{ attr = { style = "font-weight: bold;" }, value = _"This service is provided by:" }
    1.25 -slot.put("<br />")
    1.26 -
    1.27 -slot.put(config.app_service_provider)
    1.28 +    ui.heading{ level = 3, content = _"This service is provided by:" }
    1.29 +    slot.put(config.app_service_provider)
    1.30  
    1.31 -slot.put("<br />")
    1.32 -slot.put("<br />")
    1.33 -slot.put("<br />")
    1.34 +  end )
    1.35  
    1.36 +  ui.sectionRow( function()
    1.37  
    1.38 -ui.field.text{ attr = { style = "font-weight: bold;" }, value = _"This service is provided using the following software components:" }
    1.39 -slot.put("<br />")
    1.40 +    ui.heading{ level = 3, content = _"This service is provided using the following software components:" }
    1.41  
    1.42 -local tmp = {
    1.43 -  {
    1.44 -    name = "LiquidFeedback Frontend",
    1.45 -    url = "http://www.public-software-group.org/liquid_feedback",
    1.46 -    version = config.app_version,
    1.47 -    license = "MIT/X11",
    1.48 -    license_url = "http://www.public-software-group.org/licenses"
    1.49 -  },
    1.50 -  {
    1.51 -    name = "LiquidFeedback Core",
    1.52 -    url = "http://www.public-software-group.org/liquid_feedback",
    1.53 -    version = db:query("SELECT * from liquid_feedback_version;")[1].string,
    1.54 -    license = "MIT/X11",
    1.55 -    license_url = "http://www.public-software-group.org/licenses"
    1.56 -  },
    1.57 -  {
    1.58 -    name = "WebMCP",
    1.59 -    url = "http://www.public-software-group.org/webmcp",
    1.60 -    version = _WEBMCP_VERSION,
    1.61 -    license = "MIT/X11",
    1.62 -    license_url = "http://www.public-software-group.org/licenses"
    1.63 -  },
    1.64 -  {
    1.65 -    name = "Lua",
    1.66 -    url = "http://www.lua.org",
    1.67 -    version = _VERSION:gsub("Lua ", ""),
    1.68 -    license = "MIT/X11",
    1.69 -    license_url = "http://www.lua.org/license.html"
    1.70 -  },
    1.71 -  {
    1.72 -    name = "PostgreSQL",
    1.73 -    url = "http://www.postgresql.org/",
    1.74 -    version = db:query("SELECT version();")[1].version:gsub("PostgreSQL ", ""):gsub("on.*", ""),
    1.75 -    license = "BSD",
    1.76 -    license_url = "http://www.postgresql.org/about/licence"
    1.77 -  },
    1.78 -}
    1.79 +    local tmp = {
    1.80 +      {
    1.81 +        name = "LiquidFeedback Frontend",
    1.82 +        url = "http://www.public-software-group.org/liquid_feedback",
    1.83 +        version = config.app_version,
    1.84 +        license = "MIT/X11",
    1.85 +        license_url = "http://www.public-software-group.org/licenses"
    1.86 +      },
    1.87 +      {
    1.88 +        name = "LiquidFeedback Core",
    1.89 +        url = "http://www.public-software-group.org/liquid_feedback",
    1.90 +        version = db:query("SELECT * from liquid_feedback_version;")[1].string,
    1.91 +        license = "MIT/X11",
    1.92 +        license_url = "http://www.public-software-group.org/licenses"
    1.93 +      },
    1.94 +      {
    1.95 +        name = "WebMCP",
    1.96 +        url = "http://www.public-software-group.org/webmcp",
    1.97 +        version = _WEBMCP_VERSION,
    1.98 +        license = "MIT/X11",
    1.99 +        license_url = "http://www.public-software-group.org/licenses"
   1.100 +      },
   1.101 +      {
   1.102 +        name = "Lua",
   1.103 +        url = "http://www.lua.org",
   1.104 +        version = _VERSION:gsub("Lua ", ""),
   1.105 +        license = "MIT/X11",
   1.106 +        license_url = "http://www.lua.org/license.html"
   1.107 +      },
   1.108 +      {
   1.109 +        name = "PostgreSQL",
   1.110 +        url = "http://www.postgresql.org/",
   1.111 +        version = db:query("SELECT version();")[1].version:gsub("PostgreSQL ", ""):gsub("on.*", ""),
   1.112 +        license = "BSD",
   1.113 +        license_url = "http://www.postgresql.org/about/licence"
   1.114 +      },
   1.115 +    }
   1.116  
   1.117 -ui.list{
   1.118 -  records = tmp,
   1.119 -  columns = {
   1.120 -    {
   1.121 -      label = _"Software",
   1.122 -      content = function(record) 
   1.123 -        ui.link{
   1.124 -          content = record.name,
   1.125 -          external = record.url
   1.126 +    ui.list{
   1.127 +      records = tmp,
   1.128 +      columns = {
   1.129 +        {
   1.130 +          content = function(record) 
   1.131 +            ui.link{
   1.132 +              content = record.name,
   1.133 +              external = record.url
   1.134 +            }
   1.135 +          end
   1.136 +        },
   1.137 +        {
   1.138 +          content = function(record) ui.field.text{ value = record.version } end
   1.139 +        },
   1.140 +        {
   1.141 +          content = function(record) 
   1.142 +            ui.link{
   1.143 +              content = record.license,
   1.144 +              external = record.license_url
   1.145 +            }
   1.146 +          end
   1.147 +
   1.148          }
   1.149 -      end
   1.150 -    },
   1.151 -    {
   1.152 -      label = _"Version",
   1.153 -      content = function(record) ui.field.text{ value = record.version } end
   1.154 -    },
   1.155 -    {
   1.156 -      label = _"License",
   1.157 -      content = function(record) 
   1.158 -        ui.link{
   1.159 -          content = record.license,
   1.160 -          external = record.license_url
   1.161 -        }
   1.162 -      end
   1.163 +      }
   1.164 +    }
   1.165 +
   1.166 +  end )
   1.167  
   1.168 -    }
   1.169 -  }
   1.170 -}
   1.171 +  ui.sectionRow( function()
   1.172 +    ui.heading{ level = 3, content = "3rd party license information:" }
   1.173 +    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.174  
   1.175 -slot.put("<br />")
   1.176 -slot.put("<br />")
   1.177 -slot.put("<br />")
   1.178 -
   1.179 -ui.field.text{ attr = { style = "font-weight: bold;" }, value = "3rd party license information:" }
   1.180 -slot.put("<br />")
   1.181 -slot.put('The icons used in Liquid Feedback (except national flags) 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.182 -
   1.183 +  end )
   1.184 +end )