1.1 --- a/app/main/index/email_unconfirmed.lua	Sun Nov 04 19:32:13 2018 +0100
     1.2 +++ b/app/main/index/email_unconfirmed.lua	Mon Jan 07 19:15:42 2019 +0100
     1.3 @@ -1,56 +1,65 @@
     1.4 +ui.title(_"Confirm notification address")
     1.5 +
     1.6  if app.session.member.notify_email_unconfirmed then
     1.7  
     1.8 -  local current = Member:new_selector()
     1.9 -    :add_where{ "id = ?", app.session.member_id }
    1.10 -    :add_where("notify_email_unconfirmed NOTNULL")
    1.11 -    :add_where("notify_email_secret_expiry > now()")
    1.12 -    :optional_object_mode()
    1.13 -    :exec()
    1.14 +ui.grid{ content = function()
    1.15 +  ui.cell_full{ content = function()
    1.16 +
    1.17 +    ui.container { attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function()
    1.18  
    1.19 -  ui.title(_"Confirm notification address")
    1.20 +      ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
    1.21 +        ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Notification address unconfirmed" }
    1.22 +      end }
    1.23 +      ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function()
    1.24 +
    1.25 +        local current = Member:new_selector()
    1.26 +          :add_where{ "id = ?", app.session.member_id }
    1.27 +          :add_where("notify_email_unconfirmed NOTNULL")
    1.28 +          :add_where("notify_email_secret_expiry > now()")
    1.29 +          :optional_object_mode()
    1.30 +          :exec()
    1.31  
    1.32 -  ui.section( function()
    1.33 -    ui.sectionHead( function()
    1.34 -      ui.heading{ level = 1, content = _"Notification address unconfirmed" }
    1.35 -    end )
    1.36 -    
    1.37 -    ui.sectionRow( function()
    1.38 -      if current then
    1.39 -        ui.tag{
    1.40 -          tag = "div",
    1.41 -          content = _("You didn't confirm your email address '#{email}'. You have received an email with an activation link.", { email = app.session.member.notify_email_unconfirmed })
    1.42 +        if current then
    1.43 +          ui.tag{
    1.44 +            tag = "div",
    1.45 +            content = _("You didn't confirm your email address '#{email}'. You have received an email with an activation link.", { email = app.session.member.notify_email_unconfirmed })
    1.46 +          }
    1.47 +        else
    1.48 +          ui.tag{
    1.49 +            tag = "div",
    1.50 +            content = _("You didn't confirm your email address '#{email}' within 7 days.", { email = app.session.member.notify_email_unconfirmed })
    1.51 +          }
    1.52 +        end
    1.53 +        slot.put("<br />")
    1.54 +
    1.55 +        ui.link{
    1.56 +          text = _"Change email address",
    1.57 +          module = "member",
    1.58 +          view = "settings_email",
    1.59          }
    1.60 -      else
    1.61 -        ui.tag{
    1.62 -          tag = "div",
    1.63 -          content = _("You didn't confirm your email address '#{email}' within 7 days.", { email = app.session.member.notify_email_unconfirmed })
    1.64 -        }
    1.65 -      end
    1.66 -      slot.put("<br />")
    1.67 +        slot.put("<br />")
    1.68 +        slot.put("<br />")
    1.69  
    1.70 -      ui.link{
    1.71 -        text = _"Change email address",
    1.72 -        module = "member",
    1.73 -        view = "settings_email",
    1.74 -      }
    1.75 -      slot.put("<br />")
    1.76 -      slot.put("<br />")
    1.77 -
    1.78 -      ui.link{
    1.79 -        text = _("Resend activation email to '#{email}'", { email = app.session.member.notify_email_unconfirmed }),
    1.80 -        module = "member",
    1.81 -        action = "update_email",
    1.82 -        params = {
    1.83 -          resend = true
    1.84 -        },
    1.85 -        routing = {
    1.86 -          default = {
    1.87 -            mode = "redirect",
    1.88 -            module = "index",
    1.89 -            view = "index"
    1.90 +        ui.link{
    1.91 +          text = _("Resend activation email to '#{email}'", { email = app.session.member.notify_email_unconfirmed }),
    1.92 +          module = "member",
    1.93 +          action = "update_email",
    1.94 +          params = {
    1.95 +            resend = true
    1.96 +          },
    1.97 +          routing = {
    1.98 +            default = {
    1.99 +              mode = "redirect",
   1.100 +              module = "index",
   1.101 +              view = "index"
   1.102 +            }
   1.103            }
   1.104          }
   1.105 -      }
   1.106 -    end )
   1.107 -  end )
   1.108 +
   1.109 +      end }
   1.110 +    end }
   1.111 +  end }
   1.112 +end }
   1.113 +
   1.114 +
   1.115  end