Floater added, admin_header.tpl added, EL code improved:

- Floater HTML prepared, this will be later moved by the jquery library
- admin_header.tpl extracted from admin_welcome.tpl so all areas have a header
  template
- The expression function for template EL code does now tollerate missing
  call-back functions

diff --git a/.gitattributes b/.gitattributes
index 64c96d33544419d5ddc35eef41ae9928df56a15a..4e8cbc6a63bbe85b13b9aaa0977408d7737c7c3c 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1137,6 +1137,7 @@ templates/de/html/admin/admin_extensions_text.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_footer.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_form_selection_box.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_guest_menu_status.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_header.tpl svneol=native#text/plain
 templates/de/html/admin/admin_import_theme.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_import_theme_none.tpl svneol=native#text/plain
 templates/de/html/admin/admin_import_theme_row.tpl -text svneol=unset#text/plain

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index b3ee099725fead995c04ca8e44694ea05f6721ab..e1098bf30180d37f6ba6543a3181e5ad7734e0e3 100644 (file)
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -263,19 +263,25 @@ function doExpressionMessage ($data) {
 
 // Expression call-back for template functions
 function doExpressionTemplate ($data) {
-       // Do the replacement
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'template='.$GLOBALS['current_template']);
-       $replacer = '{DQUOTE} . doTemplate' . $data['callback'] . "('" . $GLOBALS['current_template'] . "', true";
-
-       // Is 'value' set?
-       if (!empty($data['value'])) {
-               // Then include it as well
-               $replacer .= ", '" . $data['value'] . "'";
+       // Init replacer
+       $replacer = '<!-- ['.__FUNCTION__.':'.__LINE__.'] Call-back function doTemplate' . $data['callback']  . ' does not exist. //-->';
+
+       // Is the function there?
+       if (function_exists($data['callback'])) {
+               // Do the replacement
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'template='.$GLOBALS['current_template']);
+               $replacer = '{DQUOTE} . doTemplate' . $data['callback'] . "('" . $GLOBALS['current_template'] . "', true";
+
+               // Is 'value' set?
+               if (!empty($data['value'])) {
+                       // Then include it as well
+                       $replacer .= ", '" . $data['value'] . "'";
+               } // END - if
+
+               // Replacer is ready
+               $replacer .= ') . {DQUOTE}';
        } // END - if
 
-       // Replacer is ready
-       $replacer .= ') . {DQUOTE}';
-
        // Replace the code
        $code = replaceExpressionCode($data, $replacer);
 

diff --git a/templates/de/html/admin/admin_header.tpl b/templates/de/html/admin/admin_header.tpl
new file mode 100644 (file)
index 0000000..d6613b0
--- /dev/null
+++ b/templates/de/html/admin/admin_header.tpl
@@ -0,0 +1,7 @@
+<div id="floater">
+       {%template,MessageFloater%}
+</div>
+
+<div align="center">
+       <strong class="big">: : : Willkommen zum Administrationsbereich : : :</strong>
+</div>

diff --git a/templates/de/html/admin/admin_welcome.tpl b/templates/de/html/admin/admin_welcome.tpl
index 74251c207ad0cede6f270949b653cdb609a5cfa2..e9914b79cde0a75944be9c05478764810b8866ba 100644 (file)
--- a/templates/de/html/admin/admin_welcome.tpl
+++ b/templates/de/html/admin/admin_welcome.tpl
@@ -1,7 +1,3 @@
-<div align="center">
-       <strong class="big">: : : Willkommen zum Administrationsbereich : : :</strong>
-</div>
-
 <div align="center">
 <table border="0" cellspacing="0" cellpadding="0" width="100%">
        <tr>

diff --git a/templates/de/html/admin/admin_welcome_admins.tpl b/templates/de/html/admin/admin_welcome_admins.tpl
index 8b574d39dfad2df283356ce77760331a5e2205c6..f52cc61a37d981c8573c66c00ebecb1cb488ca21 100644 (file)
--- a/templates/de/html/admin/admin_welcome_admins.tpl
+++ b/templates/de/html/admin/admin_welcome_admins.tpl
@@ -1,7 +1,3 @@
-<div align="center">
-       <strong class="big">: : : Willkommen zum Administrationsbereich : : :</strong>
-</div>
-
 <div align="center">
 <table border="0" cellspacing="0" cellpadding="0" width="100%">
        <tr>

diff --git a/templates/de/html/guest/guest_header.tpl b/templates/de/html/guest/guest_header.tpl
index ef483cc32fa52ddf2b60de56e8fde646a5686e9d..106908a6a046379bc9a6b13edbbc239fd69e3c8c 100644 (file)
--- a/templates/de/html/guest/guest_header.tpl
+++ b/templates/de/html/guest/guest_header.tpl
@@ -1,4 +1,8 @@
 <!-- Gast-Tabelle - Anfang //-->
+<div id="floater">
+       {%template,MessageFloater%}
+</div>
+
 <table border="0" cellspacing="0" cellpadding="0" width="100%" class="guest">
        <tr>
                <td colspan="3" align="center" valign="top" class="table_header">

diff --git a/templates/de/html/member/member_header.tpl b/templates/de/html/member/member_header.tpl
index ec61a8dcb484699cde641ec9aa58870f8535b4be..1a56aac049214693a37882a7df02e9a4e6bad48f 100644 (file)
--- a/templates/de/html/member/member_header.tpl
+++ b/templates/de/html/member/member_header.tpl
@@ -1,3 +1,7 @@
+<div id="floater">
+       {%template,MessageFloater%}
+</div>
+
 <a name="TOP"></a>
 <table border="0" cellspacing="0" cellpadding="0" width="100%" class="member_main">
 <tr>

diff --git a/templates/de/html/sponsor/sponsor_header.tpl b/templates/de/html/sponsor/sponsor_header.tpl
index 1c9460c2e948a9ea866e483812ce0a095e5626ec..740370b346991c289a0262d9d9aec399ff9e7517 100644 (file)
--- a/templates/de/html/sponsor/sponsor_header.tpl
+++ b/templates/de/html/sponsor/sponsor_header.tpl
@@ -1,3 +1,7 @@
+<div id="floater">
+       {%template,MessageFloater%}
+</div>
+
 <div class="big">
        Willkommen zum Sponsorenbereich von {?MAIN_TITLE?}
 </div>