${lang("open.comment.htmltitle")}

From b1aaf9da12d95b57f2b385adcb7d4939211344f1 Mon Sep 17 00:00:00 2001 From: bruno Date: Tue, 3 Sep 2002 14:29:41 +0000 Subject: [PATCH] config keys are now passed directly to the templates, so some variables ${config.bla} had to be renamed. --- templates-dist/admin/commentlist.template | 2 +- templates-dist/admin/foot.template | 2 +- templates-dist/admin/head.template | 2 +- templates-dist/admin/head_nonavi.template | 2 +- templates-dist/admin/login.template | 15 ++-- templates-dist/open/comment.template | 44 +++++------ templates-dist/open/comment_done.template | 12 +-- templates-dist/open/comment_dupe.template | 10 +-- templates-dist/open/posting.template | 94 +++++++++++------------ templates-dist/open/posting_done.template | 10 +-- templates-dist/open/posting_dupe.template | 10 +-- templates-dist/producer/config.template | 4 +- templates-dist/producer/content.template | 6 +- templates-dist/producer/featuresRSS.template | 16 ++-- templates-dist/producer/navigation.template | 4 +- templates-dist/producer/openposting.template | 4 +- templates-dist/producer/printablecontent.template | 2 +- templates-dist/producer/startpage.template | 6 +- templates-dist/producer/topiclist.template | 6 +- 19 files changed, 128 insertions(+), 123 deletions(-) diff --git a/templates-dist/admin/commentlist.template b/templates-dist/admin/commentlist.template index 5cd065a3..c8556720 100755 --- a/templates-dist/admin/commentlist.template +++ b/templates-dist/admin/commentlist.template @@ -65,7 +65,7 @@ ${data.articleHash[entry.to_media]["title"]}
edit | - + view diff --git a/templates-dist/admin/foot.template b/templates-dist/admin/foot.template index 31fb0a40..f88083e5 100755 --- a/templates-dist/admin/foot.template +++ b/templates-dist/admin/foot.template @@ -6,6 +6,6 @@ ${lang("foot.top")} - ${lang("imc.shortname")} - ${config.mirVersion} + ${config["Mir.Shortname"]} - ${config["Mir.Version"]} diff --git a/templates-dist/admin/head.template b/templates-dist/admin/head.template index b705a824..91e4ba39 100755 --- a/templates-dist/admin/head.template +++ b/templates-dist/admin/head.template @@ -1,7 +1,7 @@ + ${config["Mir.Name"]} @@ -19,16 +19,16 @@

- ${lang("imc.name")}

${lang("head.start")} | ${lang("head.logout")} | diff --git a/templates-dist/admin/head_nonavi.template b/templates-dist/admin/head_nonavi.template index 9dd5106d..894e9401 100755 --- a/templates-dist/admin/head_nonavi.template +++ b/templates-dist/admin/head_nonavi.template @@ -1,7 +1,7 @@ + ${config["Mir.Name"]} @@ -19,16 +19,16 @@

- ${lang("imc.name")}

${login_user.login} ${lang("head.logged_in")} / ${lang("head.logout")} diff --git a/templates-dist/admin/login.template b/templates-dist/admin/login.template index b127603b..804cbd65 100755 --- a/templates-dist/admin/login.template +++ b/templates-dist/admin/login.template @@ -15,10 +15,10 @@

${lang("login.info")} - ${lang("imc.contact-email.name")}. + ${config["Mir.Contact-email.name"]}.

+ @@ -52,9 +52,14 @@ - - - + + + + + + + + diff --git a/templates-dist/open/comment.template b/templates-dist/open/comment.template index 7105365c..3f4e9bab 100755 --- a/templates-dist/open/comment.template +++ b/templates-dist/open/comment.template @@ -1,21 +1,21 @@ -${lang("open.comment.htmltitle")} +${lang("comment.htmltitle")} - +

@@ -33,67 +33,67 @@ diff --git a/templates-dist/open/comment_done.template b/templates-dist/open/comment_done.template index c19210e2..bf9d1ed4 100755 --- a/templates-dist/open/comment_done.template +++ b/templates-dist/open/comment_done.template @@ -2,7 +2,7 @@ - ${lang("open.commentdone.htmltitle")} + ${lang("commentdone.htmltitle")} @@ -10,25 +10,25 @@

- ${lang("open.comment.title")} + ${lang("comment.title")}
- ${lang("open.comment.note")} + ${lang("comment.note")} ${data.passwd} @@ -24,7 +24,7 @@
- ${lang("open.comment.formtitle")} + ${lang("comment.formtitle")}
- ${lang("open.comment.title")}: + ${lang("comment.title")}:	- (${lang("open.required")}) + (${lang("required")})
- ${lang("open.comment.name")}: + ${lang("comment.name")}:	- (${lang("open.required")}) + (${lang("required")})
- ${lang("open.comment.email")}: + ${lang("comment.email")}:	- (${lang("open.optional")}) + (${lang("optional")})
- ${lang("open.comment.url")}: + ${lang("comment.url")}:	- (${lang("open.optional")}) + (${lang("optional")})
- ${lang("open.comment.phone")}: + ${lang("comment.phone")}:	- (${lang("open.optional")}) + (${lang("optional")})
- ${lang("open.comment.address")}: + ${lang("comment.address")}:	- (${lang("open.optional")}) + (${lang("optional")})
- ${lang("open.comment.language")}: + ${lang("comment.language")}:	- (${lang("open.optional")}) + (${lang("optional")})
- ${lang("open.comment.text")}: + ${lang("comment.text")}:	@@ -105,12 +105,12 @@	- +	- +

- ${lang("open.commentdone.thanks")}${lang("commentdone.thanks")}

- ${lang("open.commentdone.wait")} + ${lang("commentdone.wait")}
- ${lang("open.commentdone.criteria")} + ${lang("commentdone.criteria")}
- ${lang("open.commentdone.stay_calm")}
+ ${lang("commentdone.stay_calm")}

- >> ${lang("open.commentdone.back")} + >> ${lang("commentdone.back")}

diff --git a/templates-dist/open/comment_dupe.template b/templates-dist/open/comment_dupe.template index 38c51517..2e9ce66e 100755 --- a/templates-dist/open/comment_dupe.template +++ b/templates-dist/open/comment_dupe.template @@ -2,7 +2,7 @@ - ${lang("open.commentdupe.htmltitle")} + ${lang("commentdupe.htmltitle")} @@ -11,7 +11,7 @@

- ${lang("open.commentdupe.title")} + ${lang("commentdupe.title")}

- ${lang("open.commentdupe.explanation")} + ${lang("commentdupe.explanation")}
- ${lang("open.commentdupe.no_panic")}
+ ${lang("commentdupe.no_panic")}

- >> ${lang("open.commentdupe.back")} + >> ${lang("commentdupe.back")}

- >> ${lang("open.posting.jump_to_form")} + >> ${lang("posting.jump_to_form")}
- ${lang("open.posting.title")} + ${lang("posting.title")}
${lang("open.posting.nr_of_media")} - ${lang("open.posting.nr_of_media.info")}	+		${lang("posting.nr_of_media")} + ${lang("posting.nr_of_media.info")}
- ${lang("open.posting.form.title")} + ${lang("posting.form.title")}
- ${lang("open.posting.title")}: - ${lang("open.posting.title.info")} + ${lang("posting.title")}: + ${lang("posting.title.info")}	- (${lang("open.required")}) + (${lang("required")})
- ${lang("open.posting.topic")}: - ${lang("open.posting.topic.info")} + ${lang("posting.topic")}: + ${lang("posting.topic.info")}	- (${lang("open.optional")}) + (${lang("optional")})
- ${lang("open.posting.author")}: + ${lang("posting.author")}:	- ${lang("open.required")} + ${lang("required")}
- ${lang("open.posting.abstract")}: - ${lang("open.posting.abstract.info")} + ${lang("posting.abstract")}: + ${lang("posting.abstract.info")}	- ${lang("open.posting.abstract.constraint")} + ${lang("posting.abstract.constraint")}
- ${lang("open.posting.contact.info")} + ${lang("posting.contact.info")}
- ${lang("open.posting.email")}: + ${lang("posting.email")}:	- (${lang("open.optional")}) + (${lang("optional")})
- ${lang("open.posting.url")}: + ${lang("posting.url")}:	- (${lang("open.optional")}) + (${lang("optional")})
- ${lang("open.posting.address")}: + ${lang("posting.address")}:	- (${lang("open.optional")}) + (${lang("optional")})
- ${lang("open.posting.phone")}: + ${lang("posting.phone")}:	- (${lang("open.optional")}) + (${lang("optional")})
- ${lang("open.posting.language")}: + ${lang("posting.language")}:	- (${lang("open.optional")}) + (${lang("optional")})
- ${lang("open.posting.text")}: - ${lang("open.posting.text.info")} + ${lang("posting.text")}: + ${lang("posting.text.info")}	@@ -172,24 +172,24 @@
- ${lang("open.posting.media")}: + ${lang("posting.media")}:	- ${lang("open.posting.media.info")} - ${lang("open.posting.media.howto")} + ${lang("posting.media.info")} + ${lang("posting.media.howto")}
${lang("open.posting.media.media")} ${m}	${lang("posting.media.media")} ${m}	- (${lang("open.optional")}) + (${lang("optional")})
- ${lang("open.posting.media.title")} ${m}: + ${lang("posting.media.title")} ${m}:	@@ -205,18 +205,18 @@		- ${lang("open.posting.submit.info")} + ${lang("posting.submit.info")} - ${lang("open.posting.criteria")} + ${lang("posting.criteria")}	- +	- +