Merge branch 'stable'

This commit is contained in:
following 2013-02-05 21:28:14 +01:00
commit efc9b12039
2 changed files with 7 additions and 1 deletions

View File

@ -19,6 +19,12 @@
if (!$tpl->is_cached())
{
// welcome message
if (isset ($opt['page']['message']))
$tpl->assign('message',$opt['page']['message']);
else
$tpl->assign('message',$translate->t('You can find everything you need to go Geocaching ...', '', '', 0));
// news entries
$tpl->assign('news_onstart', $opt['news']['onstart'] );

View File

@ -9,7 +9,7 @@
{t}What do i find on this website?{/t}
</div>
<div class="content-txtbox-noshade">
<p style="line-height: 1.6em;">{t}You can find everything you need to go Geocaching ...{/t}</p>
<p style="line-height: 1.6em;">{$message}</p>
<div class="buffer" style="width: 500px;">&nbsp;</div>
</div>
</div>