# HG changeset patch # User bsw # Date 1546884942 -3600 # Node ID ad1107fc0fbfed13830213c85fec4b43bcb5d875 # Parent 00ce64d26e9ec8c26be1aece9cec5bbc620e5e00 Updated style for email confirmation notification dialog view diff -r 00ce64d26e9e -r ad1107fc0fbf app/main/index/email_unconfirmed.lua --- a/app/main/index/email_unconfirmed.lua Sun Nov 04 19:32:13 2018 +0100 +++ b/app/main/index/email_unconfirmed.lua Mon Jan 07 19:15:42 2019 +0100 @@ -1,56 +1,65 @@ +ui.title(_"Confirm notification address") + if app.session.member.notify_email_unconfirmed then - local current = Member:new_selector() - :add_where{ "id = ?", app.session.member_id } - :add_where("notify_email_unconfirmed NOTNULL") - :add_where("notify_email_secret_expiry > now()") - :optional_object_mode() - :exec() +ui.grid{ content = function() + ui.cell_full{ content = function() + + ui.container { attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function() - ui.title(_"Confirm notification address") + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Notification address unconfirmed" } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + + local current = Member:new_selector() + :add_where{ "id = ?", app.session.member_id } + :add_where("notify_email_unconfirmed NOTNULL") + :add_where("notify_email_secret_expiry > now()") + :optional_object_mode() + :exec() - ui.section( function() - ui.sectionHead( function() - ui.heading{ level = 1, content = _"Notification address unconfirmed" } - end ) - - ui.sectionRow( function() - if current then - ui.tag{ - tag = "div", - 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 }) + if current then + ui.tag{ + tag = "div", + 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 }) + } + else + ui.tag{ + tag = "div", + content = _("You didn't confirm your email address '#{email}' within 7 days.", { email = app.session.member.notify_email_unconfirmed }) + } + end + slot.put("
") + + ui.link{ + text = _"Change email address", + module = "member", + view = "settings_email", } - else - ui.tag{ - tag = "div", - content = _("You didn't confirm your email address '#{email}' within 7 days.", { email = app.session.member.notify_email_unconfirmed }) - } - end - slot.put("
") + slot.put("
") + slot.put("
") - ui.link{ - text = _"Change email address", - module = "member", - view = "settings_email", - } - slot.put("
") - slot.put("
") - - ui.link{ - text = _("Resend activation email to '#{email}'", { email = app.session.member.notify_email_unconfirmed }), - module = "member", - action = "update_email", - params = { - resend = true - }, - routing = { - default = { - mode = "redirect", - module = "index", - view = "index" + ui.link{ + text = _("Resend activation email to '#{email}'", { email = app.session.member.notify_email_unconfirmed }), + module = "member", + action = "update_email", + params = { + resend = true + }, + routing = { + default = { + mode = "redirect", + module = "index", + view = "index" + } } } - } - end ) - end ) + + end } + end } + end } +end } + + end