# HG changeset patch
# User jorges
# Date 1284980264 -7200
# Node ID 44e5b94e3c6513d717174735c9ce96c9449eff64
# Parent  4785cb961a761bb22dda2afe98cedacc2b0b426c
fixing html title (totally forgot to add new filter before!)

diff -r 4785cb961a76 -r 44e5b94e3c65 app/main/_filter_view/36_html_title.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/_filter_view/36_html_title.lua	Mon Sep 20 12:57:44 2010 +0200
@@ -0,0 +1,76 @@
+
+app.html_title = {}
+
+  execute.inner()
+
+-- add ":" to prefix
+if app.html_title.prefix then
+	app.html_title.prefix = app.html_title.prefix .. ": " 
+	app.html_title.prefix = encode.html( app.html_title.prefix )
+end
+
+-- add "-" to title 
+if app.html_title.title then
+	app.html_title.title = app.html_title.title .. " - " 
+	app.html_title.title = encode.html( app.html_title.title )
+-- or pull from <h1>title<h1> 
+-- but only if it does not contain config.app_title
+-- (otherwise config.app_title would appear twice in title)
+elseif slot.get_content( "title" ) ~= encode.html( config.app_title ) then
+	app.html_title.title = slot.get_content( "title" ) .. " - "
+end
+
+-- add "-" to subtitle
+if app.html_title.subtitle then
+	app.html_title.subtitle = app.html_title.subtitle .. " - " 
+	app.html_title.subtitle = encode.html( app.html_title.subtitle )
+end
+
+
+--slot.put_into("html_title", encode.html( config.app_title ) )
+slot.put_into("html_title", 
+	( app.html_title.prefix or "" )
+	..
+	( app.html_title.title  or "" )
+	..
+	( app.html_title.subtitle or "" )
+	..
+	config.app_title
+)
+
+
+--[[
+
+[prefix: ]main - [subtitle - ]appname
+
+
+Aktueller Entwurf:
+	Pro BGE - Initiative #33 - Liquidfeedback PP Dtl.
+Anregungen zu: Pro BGE - Initiative #33 - Liquidfeedback PP Dtl.
+Entwurfshistorie zu: Pro BGE - Initiative #33 - Liquidfeedback PP Dtl.
+Details zu: Pro BGE - Initiative #33 - Liquidfeedback PP Dtl.
+
+Thema #34 - Liquidfeedback Dtl.
+
+
+Themenbereiche - Liquidfeedback Dtl
+
+Wirtschaft & Soziales - Themenbereich - Liquidfeedback Piratenpartei Deutschland
+Wirtschaft & Soziales - Liquidfeedback Piratenpartei Deutschland
+
+Standard proceeding - Regelwerk - Piratenpartei Deutschland
+
+Registrierung - Piratenpartei Deutschland
+
+
+Mitgliederliste - Piratenpartei Deutschland
+
+Administrator - Mitglied - Piratenpartei Deutschland
+
+
+
+--]]
+
+--slot.put_into("html_title", slot.get_content("title") .. config.app.html_title)
+--print (slot.get_content("title"))
+--exit()
diff -r 4785cb961a76 -r 44e5b94e3c65 app/main/index/login.lua
--- a/app/main/index/login.lua	Mon Sep 20 01:43:19 2010 +0200
+++ b/app/main/index/login.lua	Mon Sep 20 12:57:44 2010 +0200
@@ -11,6 +11,7 @@
 }
 
 slot.put_into("title", encode.html(config.app_title))
+app.html_title.title = _"Login"
 
 slot.select("title", function()
   ui.container{