# HG changeset patch # User bsw # Date 1331465700 -3600 # Node ID 58647c8a03390e554ec3cfb3ddf6f9761ece6833 # Parent eb162e2b48c415ed576bb412298e587116d91283 Show language chooser on all public pages diff -r eb162e2b48c4 -r 58647c8a0339 app/main/index/_lang_chooser.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/index/_lang_chooser.lua Sun Mar 11 12:35:00 2012 +0100 @@ -0,0 +1,31 @@ +slot.select("title", function() + ui.container{ + attr = { class = "lang_chooser" }, + content = function() + for i, lang in ipairs{"en", "de", "eo"} do + ui.link{ + content = function() + ui.image{ + static = "lang/" .. lang .. ".png", + attr = { style = "margin-left: 0.5em;", alt = lang, title = lang } + } + end, + text = _('Select language "#{langcode}"', { langcode = lang }), + module = "index", + action = "set_lang", + params = { lang = lang }, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = param.get_id_cgi(), + params = param.get_all_cgi() + } + } + } + end + end + } +end) + diff -r eb162e2b48c4 -r 58647c8a0339 app/main/index/index.lua --- a/app/main/index/index.lua Sun Mar 11 12:31:26 2012 +0100 +++ b/app/main/index/index.lua Sun Mar 11 12:35:00 2012 +0100 @@ -1,33 +1,4 @@ -slot.select("title", function() - ui.container{ - attr = { class = "lang_chooser" }, - content = function() - for i, lang in ipairs{"en", "de", "eo"} do - ui.link{ - content = function() - ui.image{ - static = "lang/" .. lang .. ".png", - attr = { style = "margin-left: 0.5em;", alt = lang } - } - end, - text = _('Select language "#{langcode}"', { langcode = lang }), - module = "index", - action = "set_lang", - params = { lang = lang }, - routing = { - default = { - mode = "redirect", - module = request.get_module(), - view = request.get_view(), - id = param.get_id_cgi(), - params = param.get_all_cgi() - } - } - } - end - end - } -end) +execute.view{ module = "index", view = "_lang_chooser" } slot.put_into("title", encode.html(config.app_title)) diff -r eb162e2b48c4 -r 58647c8a0339 app/main/index/login.lua --- a/app/main/index/login.lua Sun Mar 11 12:31:26 2012 +0100 +++ b/app/main/index/login.lua Sun Mar 11 12:35:00 2012 +0100 @@ -10,39 +10,11 @@ end } +execute.view{ module = "index", view = "_lang_chooser" } + slot.put_into("title", encode.html(config.app_title)) app.html_title.title = _"Login" -slot.select("title", function() - ui.container{ - attr = { class = "lang_chooser" }, - content = function() - for i, lang in ipairs{"en", "de", "eo"} do - ui.link{ - content = function() - ui.image{ - static = "lang/" .. lang .. ".png", - attr = { style = "margin-left: 0.5em;", alt = lang } - } - end, - text = _('Select language "#{langcode}"', { langcode = lang }), - module = "index", - action = "set_lang", - params = { lang = lang }, - routing = { - default = { - mode = "redirect", - module = request.get_module(), - view = request.get_view(), - id = param.get_id_cgi(), - params = param.get_all_cgi() - } - } - } - end - end - } -end) if config.motd_public then local help_text = config.motd_public diff -r eb162e2b48c4 -r 58647c8a0339 app/main/index/register.lua --- a/app/main/index/register.lua Sun Mar 11 12:31:26 2012 +0100 +++ b/app/main/index/register.lua Sun Mar 11 12:35:00 2012 +0100 @@ -1,3 +1,5 @@ +execute.view{ module = "index", view = "_lang_chooser" } + slot.put_into("title", _"Registration") local step = param.get("step", atom.integer) diff -r eb162e2b48c4 -r 58647c8a0339 app/main/index/reset_password.lua --- a/app/main/index/reset_password.lua Sun Mar 11 12:31:26 2012 +0100 +++ b/app/main/index/reset_password.lua Sun Mar 11 12:35:00 2012 +0100 @@ -1,3 +1,5 @@ +execute.view{ module = "index", view = "_lang_chooser" } + slot.put_into("title", _"Reset password") slot.select("actions", function()