1.1 --- a/app/main/member/settings_password.lua	Thu Jul 10 01:02:43 2014 +0200
     1.2 +++ b/app/main/member/settings_password.lua	Thu Jul 10 01:19:48 2014 +0200
     1.3 @@ -1,22 +1,58 @@
     1.4 -ui.title(_"Change your password")
     1.5 +ui.titleMember(_"Password")
     1.6  
     1.7 -util.help("member.settings.password", _"Change password")
     1.8 +execute.view {
     1.9 +  module = "member", view = "_sidebar_whatcanido", params = {
    1.10 +    member = app.session.member
    1.11 +  }
    1.12 +}
    1.13  
    1.14  ui.form{
    1.15 -  attr = { class = "vertical" },
    1.16 +  attr = { class = "wide" },
    1.17    module = "member",
    1.18    action = "update_password",
    1.19    routing = {
    1.20      ok = {
    1.21        mode = "redirect",
    1.22 -      module = "index",
    1.23 -      view = "index"
    1.24 +      module = "member",
    1.25 +      view = "show",
    1.26 +      id = app.session.member_id
    1.27      }
    1.28    },
    1.29    content = function()
    1.30 -    ui.field.password{ label = _"Old password", name = "old_password" }
    1.31 -    ui.field.password{ label = _"New password", name = "new_password1" }
    1.32 -    ui.field.password{ label = _"Repeat new password", name = "new_password2" }
    1.33 -    ui.submit{ value = _"Change password" }
    1.34 +    ui.section( function()
    1.35 +      ui.sectionHead( function()
    1.36 +        ui.heading { level = 1, content = _"Password" }
    1.37 +      end )
    1.38 +
    1.39 +      ui.sectionRow( function()
    1.40 +        ui.heading { level = 2, content = _"Enter your current password:" }
    1.41 +        ui.field.password{ name = "old_password" }
    1.42 +
    1.43 +        slot.put("<br />")
    1.44 +        
    1.45 +        ui.heading { level = 2, content = _"Enter a new password:" }
    1.46 +        ui.field.password{ name = "new_password1" }
    1.47 +
    1.48 +        ui.heading { level = 2, content = _"Enter your new password again please:" }
    1.49 +        ui.field.password{ name = "new_password2" }
    1.50 +
    1.51 +        slot.put("<br />")
    1.52 +        
    1.53 +        ui.tag{
    1.54 +          tag = "input",
    1.55 +          attr = {
    1.56 +            type = "submit",
    1.57 +            class = "btn btn-default",
    1.58 +            value = _"Save"
    1.59 +          },
    1.60 +          content = ""
    1.61 +        }
    1.62 +        slot.put("<br /><br /><br />")
    1.63 +        ui.link {
    1.64 +          module = "member", view = "show", id = app.session.member_id, 
    1.65 +          content = _"Cancel"
    1.66 +        }
    1.67 +      end )
    1.68 +    end )
    1.69    end
    1.70  }
    1.71 \ No newline at end of file