1.1 --- a/app/main/member/edit_images.lua	Thu Jun 23 03:30:57 2016 +0200
     1.2 +++ b/app/main/member/edit_images.lua	Sun Jul 15 14:07:29 2018 +0200
     1.3 @@ -1,76 +1,88 @@
     1.4  ui.titleMember(_"avatar/photo")
     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 +ui.grid{ content = function()
    1.12 +  ui.cell_main{ content = function()
    1.13 +
    1.14 +    ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function()
    1.15 +      ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
    1.16 +        ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Upload avatar/photo" }
    1.17 +      end }
    1.18 +      ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function()
    1.19 +
    1.20 +        ui.form{
    1.21 +          record = app.session.member,
    1.22 +          attr = { 
    1.23 +            class = "vertical section",
    1.24 +            enctype = 'multipart/form-data'
    1.25 +          },
    1.26 +          module = "member",
    1.27 +          action = "update_images",
    1.28 +          routing = {
    1.29 +            ok = {
    1.30 +              mode = "redirect",
    1.31 +              module = "member",
    1.32 +              view = "settings"
    1.33 +            }
    1.34 +          },
    1.35 +          content = function()
    1.36 +            execute.view{
    1.37 +              module = "member_image",
    1.38 +              view = "_show",
    1.39 +              params = {
    1.40 +                class = "float-right",
    1.41 +                member = app.session.member, 
    1.42 +                image_type = "avatar",
    1.43 +                force_update = true
    1.44 +              }
    1.45 +            }
    1.46 +            ui.heading { level = 4, content = _"Avatar"}
    1.47 +            ui.container { content = _"Your avatar is a small photo, which will be shown always next to your name." }
    1.48 +            slot.put("<br />")
    1.49 +            ui.field.image{ field_name = "avatar" }
    1.50  
    1.51 -ui.form{
    1.52 -  record = app.session.member,
    1.53 -  attr = { 
    1.54 -    class = "vertical section",
    1.55 -    enctype = 'multipart/form-data'
    1.56 -  },
    1.57 -  module = "member",
    1.58 -  action = "update_images",
    1.59 -  routing = {
    1.60 -    ok = {
    1.61 -      mode = "redirect",
    1.62 -      module = "member",
    1.63 -      view = "show",
    1.64 -      id = app.session.member_id
    1.65 -    }
    1.66 -  },
    1.67 -  content = function()
    1.68 -    ui.sectionHead( function()
    1.69 -      ui.heading { level = 1, content = _"Upload avatar/photo" }
    1.70 -    end )
    1.71 -    ui.sectionRow( function()
    1.72 -      execute.view{
    1.73 -        module = "member_image",
    1.74 -        view = "_show",
    1.75 -        params = {
    1.76 -          class = "right",
    1.77 -          member = app.session.member, 
    1.78 -          image_type = "avatar",
    1.79 -          force_update = true
    1.80 +            execute.view{
    1.81 +              module = "member_image",
    1.82 +              view = "_show",
    1.83 +              params = {
    1.84 +                class = "float-right",
    1.85 +                member = app.session.member, 
    1.86 +                image_type = "photo",
    1.87 +                force_update = true
    1.88 +              }
    1.89 +            }
    1.90 +            ui.heading { level = 4, content = _"Photo"}
    1.91 +            ui.container { content = _"Your photo will be shown in your profile." }
    1.92 +            slot.put("<br />")
    1.93 +            ui.field.image{ field_name = "photo" }
    1.94 +            slot.put("<br style='clear: right;' />")
    1.95 +            ui.tag{
    1.96 +              tag = "input",
    1.97 +              attr = {
    1.98 +                type = "submit",
    1.99 +                class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored",
   1.100 +                value = _"publish avatar/photo"
   1.101 +              },
   1.102 +              content = ""
   1.103 +            }
   1.104 +            slot.put(" &nbsp; ")
   1.105 +            ui.link{
   1.106 +              attr = { class = "mdl-button mdl-js-button mdl-button--raised" },
   1.107 +              content = _"cancel",
   1.108 +              module = "member", view = "settings"
   1.109 +            }
   1.110 +          end
   1.111          }
   1.112 +        
   1.113 +      end }
   1.114 +    end }
   1.115 +  end }
   1.116 +
   1.117 +  ui.cell_sidebar{ content = function()
   1.118 +    execute.view {
   1.119 +      module = "member", view = "_sidebar_whatcanido", params = {
   1.120 +        member = app.session.member
   1.121        }
   1.122 -      ui.heading { level = 2, content = _"Avatar"}
   1.123 -      ui.container { content = _"Your avatar is a small photo, which will be shown always next to your name." }
   1.124 -      slot.put("<br />")
   1.125 -      ui.field.image{ field_name = "avatar" }
   1.126 -      slot.put("<br /><br />")
   1.127 -      execute.view{
   1.128 -        module = "member_image",
   1.129 -        view = "_show",
   1.130 -        params = {
   1.131 -          class = "right",
   1.132 -          member = app.session.member, 
   1.133 -          image_type = "photo",
   1.134 -          force_update = true
   1.135 -        }
   1.136 -      }
   1.137 -      ui.heading { level = 2, content = _"Photo"}
   1.138 -      ui.container { content = _"Your photo will be shown in your profile." }
   1.139 -      slot.put("<br />")
   1.140 -      ui.field.image{ field_name = "photo" }
   1.141 -      slot.put("<br style='clear: right;' />")
   1.142 -      ui.tag{
   1.143 -        tag = "input",
   1.144 -        attr = {
   1.145 -          type = "submit",
   1.146 -          class = "btn btn-default",
   1.147 -          value = _"publish avatar/photo"
   1.148 -        },
   1.149 -        content = ""
   1.150 -      }
   1.151 -      slot.put("<br /><br /><br />")
   1.152 -      ui.link{
   1.153 -        content = _"cancel",
   1.154 -        module = "member", view = "show", id = app.session.member.id
   1.155 -      }
   1.156 -    end )
   1.157 -  end
   1.158 -}
   1.159 \ No newline at end of file
   1.160 +    }
   1.161 +  end }
   1.162 +
   1.163 +end }