# HG changeset patch # User jorges # Date 1284938283 -7200 # Node ID 7d0f4721d2f309f53fcefd2e2863f6e591d30486 # Parent d4b4adb9a4dfd4a2f293486c4802978b783a3f93 setting tag. fallback: take class="title"-contents diff -r d4b4adb9a4df -r 7d0f4721d2f3 app/main/_layout/default.html --- a/app/main/_layout/default.html Sun Sep 19 16:00:38 2010 +0200 +++ b/app/main/_layout/default.html Mon Sep 20 01:18:03 2010 +0200 @@ -1,7 +1,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title><!-- WEBMCP SLOTNODIV app_name --> + <!-- WEBMCP SLOTNODIV html_title --> @@ -84,4 +84,4 @@ - \ No newline at end of file + diff -r d4b4adb9a4df -r 7d0f4721d2f3 app/main/area/show.lua --- a/app/main/area/show.lua Sun Sep 19 16:00:38 2010 +0200 +++ b/app/main/area/show.lua Mon Sep 20 01:18:03 2010 +0200 @@ -1,5 +1,8 @@ local area = Area:new_selector():add_where{ "id = ?", param.get_id() }:single_object_mode():exec() +app.html_title.title = area.name +app.html_title.subtitle = _("Area") + if config.feature_rss_enabled then util.html_rss_head{ title = _"Initiatives in this area (last created first)", module = "initiative", view = "list_rss", params = { area_id = area.id } } util.html_rss_head{ title = _"Initiatives in this area (last updated first)", module = "initiative", view = "list_rss", params = { area_id = area.id } } diff -r d4b4adb9a4df -r 7d0f4721d2f3 app/main/index/index.lua --- a/app/main/index/index.lua Sun Sep 19 16:00:38 2010 +0200 +++ b/app/main/index/index.lua Mon Sep 20 01:18:03 2010 +0200 @@ -44,6 +44,11 @@ slot.put_into("title", encode.html(config.app_title)) +if app.session.member then + app.html_title.title = app.session.member.name +end + + slot.select("actions", function() if app.session.member then diff -r d4b4adb9a4df -r 7d0f4721d2f3 app/main/initiative/show.lua --- a/app/main/initiative/show.lua Sun Sep 19 16:00:38 2010 +0200 +++ b/app/main/initiative/show.lua Mon Sep 20 01:18:03 2010 +0200 @@ -4,6 +4,10 @@ initiative = Initiative:new_selector():add_where{ "id = ?", param.get_id()}:single_object_mode():exec() end +app.html_title.title = initiative.name +app.html_title.subtitle = _("Initiative ##{id}", { id = initiative.id }) + + if request.get_json_request_slots() then execute.view{ module = "initiative", @@ -33,4 +37,4 @@ initiative = initiative } } -end \ No newline at end of file +end diff -r d4b4adb9a4df -r 7d0f4721d2f3 app/main/issue/show.lua --- a/app/main/issue/show.lua Sun Sep 19 16:00:38 2010 +0200 +++ b/app/main/issue/show.lua Mon Sep 20 01:18:03 2010 +0200 @@ -1,5 +1,7 @@ local issue = Issue:by_id(param.get_id()) +app.html_title.title = _("Issue ##{id}", { id = issue.id }) + execute.view{ module = "issue", view = "_show_head", diff -r d4b4adb9a4df -r 7d0f4721d2f3 app/main/member/show.lua --- a/app/main/member/show.lua Sun Sep 19 16:00:38 2010 +0200 +++ b/app/main/member/show.lua Mon Sep 20 01:18:03 2010 +0200 @@ -1,5 +1,8 @@ local member = Member:by_id(param.get_id()) +app.html_title.title = member.name +app.html_title.subtitle = _("Member") + slot.select("title", function() execute.view{ module = "member_image", diff -r d4b4adb9a4df -r 7d0f4721d2f3 app/main/suggestion/show.lua --- a/app/main/suggestion/show.lua Sun Sep 19 16:00:38 2010 +0200 +++ b/app/main/suggestion/show.lua Mon Sep 20 01:18:03 2010 +0200 @@ -1,5 +1,8 @@ local suggestion = Suggestion:by_id(param.get_id()) +app.html_title.title = suggestion.name +app.html_title.subtitle = _("Suggestion ##{id}", { id = suggestion.id }) + slot.put_into("title", encode.html(_"Suggestion for initiative: '#{name}'":gsub("#{name}", suggestion.initiative.name) )) slot.select("actions", function() @@ -21,4 +24,4 @@ params = { suggestion = suggestion } -} \ No newline at end of file +} diff -r d4b4adb9a4df -r 7d0f4721d2f3 env/ui/tabs.lua --- a/env/ui/tabs.lua Sun Sep 19 16:00:38 2010 +0200 +++ b/env/ui/tabs.lua Mon Sep 20 01:18:03 2010 +0200 @@ -26,6 +26,10 @@ end end + if active and not first then + app.html_title.prefix = tab.label + end + local link_tabs = {} if config.user_tab_mode == "accordeon" or config.user_tab_mode == "accordeon_first_expanded" @@ -209,6 +213,9 @@ end } for i, tab in ipairs(tabs) do + if tab.name == current_tab and i > 1 then + app.html_title.prefix = tab.label + end if tab.name == current_tab or not current_tab and i == 1 then ui.container{ attr = { class = "ui_tabs_content" }, diff -r d4b4adb9a4df -r 7d0f4721d2f3 locale/translations.de.lua --- a/locale/translations.de.lua Sun Sep 19 16:00:38 2010 +0200 +++ b/locale/translations.de.lua Mon Sep 20 01:18:03 2010 +0200 @@ -195,6 +195,7 @@ ["Initiative successfully created"] = "Initiative erfolgreich erzeugt"; ["Initiative successfully updated"] = "Initiative erfolgreich aktualisiert"; ["Initiative: '#{name}'"] = "Initiative: '#{name}'"; +["Initiative ##{id}"] = "Initiative ##{id}"; ["Initiatives"] = "Initiativen"; ["Initiatives in this area (last created first)"] = "Initiativen in diesem Themenbereich (zuletzt angelegte zuerst)"; ["Initiatives in this area (last updated first)"] = "Initiativen in diesem Themenbereich (zuletzt aktualisierte zuerst)"; @@ -440,6 +441,7 @@ ["Suggest no initiative"] = "Keine Initiative empfehlen"; ["Suggested initiative"] = "Empfohlene Initiative"; ["Suggestion"] = "Anregung"; +["Suggestion ##{id}"] = "Anregung ##{id}"; ["Suggestion currently implemented"] = "Anregung zur Zeit umgesetzt"; ["Suggestion currently not implemented"] = "Anregung zur Zeit nicht umgesetzt"; ["Suggestion for initiative: '#{name}'"] = "Anregung für Initiative '#{name}'";