1.1 --- a/app/main/member/developer_settings.lua	Tue Jun 19 22:39:57 2012 +0200
     1.2 +++ b/app/main/member/developer_settings.lua	Tue Jun 19 22:44:18 2012 +0200
     1.3 @@ -1,108 +1,96 @@
     1.4 -slot.put_into("title", _"Developer settings")
     1.5 +ui.title(_"Developer settings")
     1.6 +
     1.7  
     1.8 -slot.select("actions", function()
     1.9 -  ui.link{
    1.10 -    content = function()
    1.11 -        ui.image{ static = "icons/16/cancel.png" }
    1.12 -        slot.put(_"Cancel")
    1.13 -    end,
    1.14 -    module = "member",
    1.15 -    view = "settings"
    1.16 -  }
    1.17 -end)
    1.18 -
    1.19 -  local setting_key = "liquidfeedback_frontend_developer_features"
    1.20 -  local setting = Setting:by_pk(app.session.member.id, setting_key)
    1.21 +local setting_key = "liquidfeedback_frontend_developer_features"
    1.22 +local setting = Setting:by_pk(app.session.member.id, setting_key)
    1.23  
    1.24 -  if setting then
    1.25 -    ui.form{
    1.26 -      attr = { class = "vertical" },
    1.27 -      module = "member",
    1.28 -      action = "update_stylesheet_url",
    1.29 -      routing = {
    1.30 -        ok = {
    1.31 -          mode = "redirect",
    1.32 -          module = "index",
    1.33 -          view = "index"
    1.34 -        }
    1.35 -      },
    1.36 -      content = function()
    1.37 -        local setting_key = "liquidfeedback_frontend_stylesheet_url"
    1.38 -        local setting = Setting:by_pk(app.session.member.id, setting_key)
    1.39 -        local value = setting and setting.value
    1.40 -        ui.field.text{ 
    1.41 -          label = _"Stylesheet URL",
    1.42 -          name = "stylesheet_url",
    1.43 -          value = value
    1.44 -        }
    1.45 -        ui.submit{ value = _"Set URL" }
    1.46 -      end
    1.47 -    }
    1.48 -  end
    1.49 +if setting then
    1.50 +  ui.form{
    1.51 +    attr = { class = "vertical" },
    1.52 +    module = "member",
    1.53 +    action = "update_stylesheet_url",
    1.54 +    routing = {
    1.55 +      ok = {
    1.56 +        mode = "redirect",
    1.57 +        module = "index",
    1.58 +        view = "index"
    1.59 +      }
    1.60 +    },
    1.61 +    content = function()
    1.62 +      local setting_key = "liquidfeedback_frontend_stylesheet_url"
    1.63 +      local setting = Setting:by_pk(app.session.member.id, setting_key)
    1.64 +      local value = setting and setting.value
    1.65 +      ui.field.text{ 
    1.66 +        label = _"Stylesheet URL",
    1.67 +        name = "stylesheet_url",
    1.68 +        value = value
    1.69 +      }
    1.70 +      ui.submit{ value = _"Set URL" }
    1.71 +    end
    1.72 +  }
    1.73 +end
    1.74 +
    1.75 +ui.heading{ content = _"API keys" }
    1.76  
    1.77 -  ui.heading{ content = _"API keys" }
    1.78 +local member_applications = MemberApplication:new_selector()
    1.79 +  :add_where{ "member_id = ?", app.session.member.id }
    1.80 +  :add_order_by("name, id")
    1.81 +  :exec()
    1.82    
    1.83 ---  util.help("member.developer_settings.api_key", _"API key")
    1.84 -
    1.85 -  local member_applications = MemberApplication:new_selector()
    1.86 -    :add_where{ "member_id = ?", app.session.member.id }
    1.87 -    :add_order_by("name, id")
    1.88 -    :exec()
    1.89 -    
    1.90 -  if #member_applications > 0 then
    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 -                }
   1.124 +  ui.list{
   1.125 +    records = member_applications,
   1.126 +    columns = {
   1.127 +      {
   1.128 +        name = "name",
   1.129 +        label = _"Name"
   1.130 +      },
   1.131 +      {
   1.132 +        name = "access_level",
   1.133 +        label = _"Access level"
   1.134 +      },
   1.135 +      {
   1.136 +        name = "key",
   1.137 +        label = _"API Key"
   1.138 +      },
   1.139 +      {
   1.140 +        name = "last_usage",
   1.141 +        label = "Last usage"
   1.142 +      },
   1.143 +      {
   1.144 +        content = function(member_application)
   1.145 +          ui.link{
   1.146 +            text = _"Delete",
   1.147 +            module = "member", action = "update_api_key", id = member_application.id,
   1.148 +            params = { delete = true },
   1.149 +            routing = {
   1.150 +              default = {
   1.151 +                mode = "redirect",
   1.152 +                module = "member",
   1.153 +                view = "developer_settings"
   1.154                }
   1.155              }
   1.156 -          end
   1.157 -        },
   1.158 +          }
   1.159 +        end
   1.160 +      },
   1.161 +    }
   1.162 +  }
   1.163 +
   1.164 +else
   1.165 +  
   1.166 +  slot.put(_"Currently no API key is set.")
   1.167 +  slot.put(" ")
   1.168 +  ui.link{
   1.169 +    text = _"Generate API key",
   1.170 +    module = "member",
   1.171 +    action = "update_api_key",
   1.172 +    routing = {
   1.173 +      default = {
   1.174 +        mode = "redirect",
   1.175 +        module = "member",
   1.176 +        view = "developer_settings"
   1.177        }
   1.178      }
   1.179 -  
   1.180 -  else
   1.181 -    
   1.182 -    slot.put(_"Currently no API key is set.")
   1.183 -    slot.put(" ")
   1.184 -    ui.link{
   1.185 -      text = _"Generate API key",
   1.186 -      module = "member",
   1.187 -      action = "update_api_key",
   1.188 -      routing = {
   1.189 -        default = {
   1.190 -          mode = "redirect",
   1.191 -          module = "member",
   1.192 -          view = "developer_settings"
   1.193 -        }
   1.194 -      }
   1.195 -    }
   1.196 -  end
   1.197 +  }
   1.198 +end