1.1 --- a/app/main/member/developer_settings.lua	Thu Jul 10 01:02:43 2014 +0200
     1.2 +++ b/app/main/member/developer_settings.lua	Thu Jul 10 01:19:48 2014 +0200
     1.3 @@ -1,96 +1,116 @@
     1.4  ui.title(_"Developer settings")
     1.5  
     1.6 +execute.view {
     1.7 +  module = "member", view = "_sidebar_whatcanido", params = {
     1.8 +    member = app.session.member
     1.9 +  }
    1.10 +}
    1.11  
    1.12  local setting_key = "liquidfeedback_frontend_developer_features"
    1.13  local setting = Setting:by_pk(app.session.member.id, setting_key)
    1.14  
    1.15 -if setting then
    1.16 -  ui.form{
    1.17 -    attr = { class = "vertical" },
    1.18 -    module = "member",
    1.19 -    action = "update_stylesheet_url",
    1.20 -    routing = {
    1.21 -      ok = {
    1.22 -        mode = "redirect",
    1.23 -        module = "index",
    1.24 -        view = "index"
    1.25 +if true or setting then
    1.26 +  ui.section( function()
    1.27 +    ui.sectionHead( function ()
    1.28 +      ui.heading{ content = "CSS development settings" }
    1.29 +    end )
    1.30 +
    1.31 +    ui.sectionRow( function()
    1.32 +      ui.form{
    1.33 +        attr = { class = "vertical" },
    1.34 +        module = "member",
    1.35 +        action = "update_stylesheet_url",
    1.36 +        routing = {
    1.37 +          ok = {
    1.38 +            mode = "redirect",
    1.39 +            module = "member",
    1.40 +            view = "show",
    1.41 +            id = app.session.member_id
    1.42 +          }
    1.43 +        },
    1.44 +        content = function()
    1.45 +          local setting_key = "liquidfeedback_frontend_stylesheet_url"
    1.46 +          local setting = Setting:by_pk(app.session.member.id, setting_key)
    1.47 +          local value = setting and setting.value
    1.48 +          ui.field.text{ 
    1.49 +            label = "stylesheet URL",
    1.50 +            name = "stylesheet_url",
    1.51 +            value = value
    1.52 +          }
    1.53 +          ui.submit{ value = _"Set URL" }
    1.54 +        end
    1.55        }
    1.56 -    },
    1.57 -    content = function()
    1.58 -      local setting_key = "liquidfeedback_frontend_stylesheet_url"
    1.59 -      local setting = Setting:by_pk(app.session.member.id, setting_key)
    1.60 -      local value = setting and setting.value
    1.61 -      ui.field.text{ 
    1.62 -        label = _"Stylesheet URL",
    1.63 -        name = "stylesheet_url",
    1.64 -        value = value
    1.65 -      }
    1.66 -      ui.submit{ value = _"Set URL" }
    1.67 -    end
    1.68 -  }
    1.69 +    end )
    1.70 +  end )
    1.71  end
    1.72  
    1.73 -ui.heading{ content = _"API keys" }
    1.74 +ui.section( function()
    1.75 +  ui.sectionHead( function ()
    1.76 +    ui.heading{ content = "API keys" }
    1.77 +  end )
    1.78  
    1.79 -local member_applications = MemberApplication:new_selector()
    1.80 -  :add_where{ "member_id = ?", app.session.member.id }
    1.81 -  :add_order_by("name, id")
    1.82 -  :exec()
    1.83 -  
    1.84 -if #member_applications > 0 then
    1.85 +  ui.sectionRow( function()
    1.86 +    local member_applications = MemberApplication:new_selector()
    1.87 +      :add_where{ "member_id = ?", app.session.member.id }
    1.88 +      :add_order_by("name, id")
    1.89 +      :exec()
    1.90 +      
    1.91 +    if #member_applications > 0 then
    1.92  
    1.93 -  ui.list{
    1.94 -    records = member_applications,
    1.95 -    columns = {
    1.96 -      {
    1.97 -        name = "name",
    1.98 -        label = _"Name"
    1.99 -      },
   1.100 -      {
   1.101 -        name = "access_level",
   1.102 -        label = _"Access level"
   1.103 -      },
   1.104 -      {
   1.105 -        name = "key",
   1.106 -        label = _"API Key"
   1.107 -      },
   1.108 -      {
   1.109 -        name = "last_usage",
   1.110 -        label = "Last usage"
   1.111 -      },
   1.112 -      {
   1.113 -        content = function(member_application)
   1.114 -          ui.link{
   1.115 -            text = _"Delete",
   1.116 -            module = "member", action = "update_api_key", id = member_application.id,
   1.117 -            params = { delete = true },
   1.118 -            routing = {
   1.119 -              default = {
   1.120 -                mode = "redirect",
   1.121 -                module = "member",
   1.122 -                view = "developer_settings"
   1.123 +      ui.list{
   1.124 +        records = member_applications,
   1.125 +        columns = {
   1.126 +          {
   1.127 +            name = "name",
   1.128 +            label = "Name"
   1.129 +          },
   1.130 +          {
   1.131 +            name = "access_level",
   1.132 +            label = "Access level"
   1.133 +          },
   1.134 +          {
   1.135 +            name = "key",
   1.136 +            label = "API Key"
   1.137 +          },
   1.138 +          {
   1.139 +            name = "last_usage",
   1.140 +            label = "Last usage"
   1.141 +          },
   1.142 +          {
   1.143 +            content = function(member_application)
   1.144 +              ui.link{
   1.145 +                text = "delete",
   1.146 +                module = "member", action = "update_api_key", id = member_application.id,
   1.147 +                params = { delete = true },
   1.148 +                routing = {
   1.149 +                  default = {
   1.150 +                    mode = "redirect",
   1.151 +                    module = "member",
   1.152 +                    view = "developer_settings"
   1.153 +                  }
   1.154 +                }
   1.155                }
   1.156 -            }
   1.157 -          }
   1.158 -        end
   1.159 -      },
   1.160 -    }
   1.161 -  }
   1.162 +            end
   1.163 +          },
   1.164 +        }
   1.165 +      }
   1.166  
   1.167 -else
   1.168 -  
   1.169 -  slot.put(_"Currently no API key is set.")
   1.170 -  slot.put(" ")
   1.171 -  ui.link{
   1.172 -    text = _"Generate API key",
   1.173 -    module = "member",
   1.174 -    action = "update_api_key",
   1.175 -    routing = {
   1.176 -      default = {
   1.177 -        mode = "redirect",
   1.178 +    else
   1.179 +      
   1.180 +      slot.put(_"Currently no API key is set.")
   1.181 +      slot.put(" ")
   1.182 +      ui.link{
   1.183 +        text = _"Generate API key",
   1.184          module = "member",
   1.185 -        view = "developer_settings"
   1.186 +        action = "update_api_key",
   1.187 +        routing = {
   1.188 +          default = {
   1.189 +            mode = "redirect",
   1.190 +            module = "member",
   1.191 +            view = "developer_settings"
   1.192 +          }
   1.193 +        }
   1.194        }
   1.195 -    }
   1.196 -  }
   1.197 -end
   1.198 +    end
   1.199 +  end )
   1.200 +end )
   1.201 \ No newline at end of file