1.1 --- a/app/main/index/email_unconfirmed.lua	Thu Jul 10 01:02:43 2014 +0200
     1.2 +++ b/app/main/index/email_unconfirmed.lua	Thu Jul 10 01:19:48 2014 +0200
     1.3 @@ -7,48 +7,50 @@
     1.4      :optional_object_mode()
     1.5      :exec()
     1.6  
     1.7 -  slot.select("head", function()
     1.8 -    ui.container{
     1.9 -      attr = { class = "title" },
    1.10 -      content = _"Notification address unconfirmed"
    1.11 -    }
    1.12 -  end )
    1.13 +  ui.title(_"Confirm notification address")
    1.14  
    1.15 -  if current then
    1.16 -    ui.tag{
    1.17 -      tag = "div",
    1.18 -      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.19 -    }
    1.20 -  else
    1.21 -    ui.tag{
    1.22 -      tag = "div",
    1.23 -      content = _("You didn't confirm your email address '#{email}' within 7 days.", { email = app.session.member.notify_email_unconfirmed })
    1.24 -    }
    1.25 -  end
    1.26 -  slot.put("<br />")
    1.27 +  ui.section( function()
    1.28 +    ui.sectionHead( function()
    1.29 +      ui.heading{ level = 1, content = _"Notification address unconfirmed" }
    1.30 +    end )
    1.31 +    
    1.32 +    ui.sectionRow( function()
    1.33 +      if current then
    1.34 +        ui.tag{
    1.35 +          tag = "div",
    1.36 +          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.37 +        }
    1.38 +      else
    1.39 +        ui.tag{
    1.40 +          tag = "div",
    1.41 +          content = _("You didn't confirm your email address '#{email}' within 7 days.", { email = app.session.member.notify_email_unconfirmed })
    1.42 +        }
    1.43 +      end
    1.44 +      slot.put("<br />")
    1.45  
    1.46 -  ui.link{
    1.47 -    text = _"Change email address",
    1.48 -    module = "member",
    1.49 -    view = "settings_email",
    1.50 -  }
    1.51 -  slot.put("<br />")
    1.52 -  slot.put("<br />")
    1.53 +      ui.link{
    1.54 +        text = _"Change email address",
    1.55 +        module = "member",
    1.56 +        view = "settings_email",
    1.57 +      }
    1.58 +      slot.put("<br />")
    1.59 +      slot.put("<br />")
    1.60  
    1.61 -  ui.link{
    1.62 -    text = _("Resend activation email to '#{email}'", { email = app.session.member.notify_email_unconfirmed }),
    1.63 -    module = "member",
    1.64 -    action = "update_email",
    1.65 -    params = {
    1.66 -      resend = true
    1.67 -    },
    1.68 -    routing = {
    1.69 -      default = {
    1.70 -        mode = "redirect",
    1.71 -        module = "index",
    1.72 -        view = "index"
    1.73 +      ui.link{
    1.74 +        text = _("Resend activation email to '#{email}'", { email = app.session.member.notify_email_unconfirmed }),
    1.75 +        module = "member",
    1.76 +        action = "update_email",
    1.77 +        params = {
    1.78 +          resend = true
    1.79 +        },
    1.80 +        routing = {
    1.81 +          default = {
    1.82 +            mode = "redirect",
    1.83 +            module = "index",
    1.84 +            view = "index"
    1.85 +          }
    1.86 +        }
    1.87        }
    1.88 -    }
    1.89 -  }
    1.90 -
    1.91 +    end )
    1.92 +  end )
    1.93  end