1.1 --- a/app/main/index/register.lua	Fri Dec 25 12:00:00 2009 +0100
     1.2 +++ b/app/main/index/register.lua	Sat Jan 02 12:00:00 2010 +0100
     1.3 @@ -1,32 +1,26 @@
     1.4  slot.put_into("title", _"Registration")
     1.5  
     1.6 -slot.select("actions", function()
     1.7 -  ui.link{
     1.8 -    content = function()
     1.9 -        ui.image{ static = "icons/16/cancel.png" }
    1.10 -        slot.put(_"Cancel")
    1.11 -    end,
    1.12 -    module = "index",
    1.13 -    view = "index"
    1.14 -  }
    1.15 -end)
    1.16  
    1.17  local code = param.get("code")
    1.18 +local notify_email = param.get("notify_email")
    1.19  local name = param.get("name")
    1.20  local login = param.get("login")
    1.21  
    1.22 +slot.put_into("title", " (")
    1.23  ui.form{
    1.24 -  attr = { class = "login" },
    1.25 +  attr = { class = "vertical" },
    1.26    module = 'index',
    1.27    action = 'register',
    1.28    params = {
    1.29      code = code,
    1.30 +    notify_email = notify_email,
    1.31      name = name,
    1.32      login = login
    1.33    },
    1.34    content = function()
    1.35  
    1.36      if not code then
    1.37 +      slot.put_into("title", _"Step 1/5: Invite code")
    1.38        ui.tag{
    1.39          tag = "p",
    1.40          content = _"Please enter the invite code you've received."
    1.41 @@ -34,9 +28,48 @@
    1.42        ui.field.text{
    1.43          label     = _'Invite code',
    1.44          name = 'code',
    1.45 +        value = param.get("invite")
    1.46 +      }
    1.47 +
    1.48 +    elseif not notify_email then
    1.49 +      slot.put_into("title", _"Step 2/5: Email address")
    1.50 +      slot.select("actions", function()
    1.51 +        ui.link{
    1.52 +          content = function()
    1.53 +              ui.image{ static = "icons/16/resultset_previous.png" }
    1.54 +              slot.put(_"One step back")
    1.55 +          end,
    1.56 +          module = "index",
    1.57 +          view = "register",
    1.58 +          params = {
    1.59 +          }
    1.60 +        }
    1.61 +      end)
    1.62 +      ui.tag{
    1.63 +        tag = "p",
    1.64 +        content = _"Please enter your email address. This address will be used for automatic notifications (if you request them) and in case you've lost your password. This address will not be published. After registration you will receive an email with a confirmation link."
    1.65 +      }
    1.66 +      ui.field.text{
    1.67 +        label     = _'Email address',
    1.68 +        name      = 'notify_email',
    1.69 +        value     = param.get("notify_email")
    1.70        }
    1.71  
    1.72      elseif not name then
    1.73 +      slot.put_into("title", _"Step 3/5: Username")
    1.74 +      slot.select("actions", function()
    1.75 +        ui.link{
    1.76 +          content = function()
    1.77 +              ui.image{ static = "icons/16/resultset_previous.png" }
    1.78 +              slot.put(_"One step back")
    1.79 +          end,
    1.80 +          module = "index",
    1.81 +          view = "register",
    1.82 +          params = {
    1.83 +            code = code
    1.84 +          }
    1.85 +        }
    1.86 +      end)
    1.87        ui.tag{
    1.88          tag = "p",
    1.89          content = _"Please choose a name, i.e. your real name or your nick name. This name will be shown to others to identify you. You CAN'T change this name later, so please choose it wisely!"
    1.90 @@ -48,6 +81,21 @@
    1.91        }
    1.92  
    1.93      elseif not login then
    1.94 +      slot.put_into("title", _"Step 4/5: Login name")
    1.95 +      slot.select("actions", function()
    1.96 +        ui.link{
    1.97 +          content = function()
    1.98 +              ui.image{ static = "icons/16/resultset_previous.png" }
    1.99 +              slot.put(_"One step back")
   1.100 +          end,
   1.101 +          module = "index",
   1.102 +          view = "register",
   1.103 +          params = {
   1.104 +            code = code,
   1.105 +            notify_email = notify_email
   1.106 +          }
   1.107 +        }
   1.108 +      end)
   1.109        ui.tag{
   1.110          tag = "p",
   1.111          content = _"Please choose a login name. This name will not be shown to others and is used only by you to login into the system. The login name is case sensitive."
   1.112 @@ -59,18 +107,54 @@
   1.113        }
   1.114  
   1.115      else
   1.116 +      slot.put_into("title", _"Step 5/5: Terms of use and password")
   1.117 +      slot.select("actions", function()
   1.118 +        ui.link{
   1.119 +          content = function()
   1.120 +              ui.image{ static = "icons/16/resultset_previous.png" }
   1.121 +              slot.put(_"One step back")
   1.122 +          end,
   1.123 +          module = "index",
   1.124 +          view = "register",
   1.125 +          params = {
   1.126 +            code = code,
   1.127 +            notify_email = notify_email,
   1.128 +            name = name,
   1.129 +          }
   1.130 +        }
   1.131 +      end)
   1.132 +      ui.container{
   1.133 +        attr = { class = "wiki use_terms" },
   1.134 +        content = function()
   1.135 +          slot.put(format.wiki_text(config.use_terms))
   1.136 +        end
   1.137 +      }
   1.138 +      slot.put("<br />")
   1.139 +      ui.field.text{
   1.140 +        label     = _'Email address',
   1.141 +        value     = param.get("notify_email"),
   1.142 +        readonly = true
   1.143 +      }
   1.144        ui.field.text{
   1.145          label     = _'Name',
   1.146 -        name      = 'name',
   1.147          value     = param.get("name"),
   1.148          readonly = true
   1.149        }
   1.150        ui.field.text{
   1.151          label     = _'Login name',
   1.152 -        name      = 'login',
   1.153          value     = param.get("login"),
   1.154          readonly = true
   1.155        }
   1.156 +
   1.157 +      ui.tag{
   1.158 +        tag = "p",
   1.159 +        content = _"I accept the terms of use by checking the following checkbox:"
   1.160 +      }
   1.161 +      ui.field.boolean{
   1.162 +        label     = _"Terms accepted",
   1.163 +        name      = "use_terms_accepted",
   1.164 +      }
   1.165 +
   1.166        ui.tag{
   1.167          tag = "p",
   1.168          content = _"Please choose a password and enter it twice. The password is case sensitive."
   1.169 @@ -90,6 +174,18 @@
   1.170        text = _'Register'
   1.171      }
   1.172  
   1.173 +    slot.put_into("title", ")")
   1.174 +    slot.select("actions", function()
   1.175 +      ui.link{
   1.176 +        content = function()
   1.177 +            ui.image{ static = "icons/16/cancel.png" }
   1.178 +            slot.put(_"Cancel registration")
   1.179 +        end,
   1.180 +        module = "index",
   1.181 +        view = "index"
   1.182 +      }
   1.183 +    end)
   1.184 +
   1.185    end
   1.186  }
   1.187