1.1 --- a/app/main/member/edit_images.lua	Thu Jul 10 01:02:43 2014 +0200
     1.2 +++ b/app/main/member/edit_images.lua	Thu Jul 10 01:19:48 2014 +0200
     1.3 @@ -1,11 +1,15 @@
     1.4 -ui.title(_"Upload images")
     1.5 +ui.titleMember(_"avatar/photo")
     1.6  
     1.7 -util.help("member.edit_images", _"Images")
     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    record = app.session.member,
    1.16    attr = { 
    1.17 -    class = "vertical",
    1.18 +    class = "vertical section",
    1.19      enctype = 'multipart/form-data'
    1.20    },
    1.21    module = "member",
    1.22 @@ -19,24 +23,52 @@
    1.23      }
    1.24    },
    1.25    content = function()
    1.26 -    execute.view{
    1.27 -      module = "member_image",
    1.28 -      view = "_show",
    1.29 -      params = {
    1.30 -        member = app.session.member, 
    1.31 -        image_type = "avatar"
    1.32 +    ui.sectionHead( function()
    1.33 +      ui.heading { level = 1, content = _"Upload avatar/photo" }
    1.34 +    end )
    1.35 +    ui.sectionRow( function()
    1.36 +      execute.view{
    1.37 +        module = "member_image",
    1.38 +        view = "_show",
    1.39 +        params = {
    1.40 +          class = "right",
    1.41 +          member = app.session.member, 
    1.42 +          image_type = "avatar"
    1.43 +        }
    1.44        }
    1.45 -    }
    1.46 -    ui.field.image{ field_name = "avatar", label = _"Avatar" }
    1.47 -    execute.view{
    1.48 -      module = "member_image",
    1.49 -      view = "_show",
    1.50 -      params = {
    1.51 -        member = app.session.member, 
    1.52 -        image_type = "photo"
    1.53 +      ui.heading { level = 2, content = _"Avatar"}
    1.54 +      ui.container { content = _"Your avatar is a small photo, which will be shown always next to your name." }
    1.55 +      slot.put("<br />")
    1.56 +      ui.field.image{ field_name = "avatar" }
    1.57 +      slot.put("<br /><br />")
    1.58 +      execute.view{
    1.59 +        module = "member_image",
    1.60 +        view = "_show",
    1.61 +        params = {
    1.62 +          class = "right",
    1.63 +          member = app.session.member, 
    1.64 +          image_type = "photo"
    1.65 +        }
    1.66        }
    1.67 -    }
    1.68 -    ui.field.image{ field_name = "photo", label = _"Photo" }
    1.69 -    ui.submit{ value = _"Save" }
    1.70 +      ui.heading { level = 2, content = _"Photo"}
    1.71 +      ui.container { content = _"Your photo will be shown in your profile." }
    1.72 +      slot.put("<br />")
    1.73 +      ui.field.image{ field_name = "photo" }
    1.74 +      slot.put("<br style='clear: right;' />")
    1.75 +      ui.tag{
    1.76 +        tag = "input",
    1.77 +        attr = {
    1.78 +          type = "submit",
    1.79 +          class = "btn btn-default",
    1.80 +          value = _"publish avatar/photo"
    1.81 +        },
    1.82 +        content = ""
    1.83 +      }
    1.84 +      slot.put("<br /><br /><br />")
    1.85 +      ui.link{
    1.86 +        content = _"cancel",
    1.87 +        module = "member", view = "show", id = app.session.member.id
    1.88 +      }
    1.89 +    end )
    1.90    end
    1.91  }
    1.92 \ No newline at end of file