From 33d0dd57d524695bf40c095be705627a2e65337a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 16 Sep 2011 23:00:53 +0000 Subject: [PATCH] This should display the data? --- inc/modules/admin/what-send_coupon.php | 2 +- js/menu-common.js | 8 ++++---- mailid_top.php | 2 +- templates/de/emails/admin/admin_coupon_cashed.tpl | 2 ++ templates/de/emails/admin/admin_coupon_purge.tpl | 2 +- templates/de/emails/admin/admin_coupon_purge_row.tpl | 2 +- templates/de/html/install/install_main.tpl | 4 ++++ theme/default/css/install.css | 6 ++++++ 8 files changed, 20 insertions(+), 8 deletions(-) diff --git a/inc/modules/admin/what-send_coupon.php b/inc/modules/admin/what-send_coupon.php index 262a4c8c73..469329ba74 100644 --- a/inc/modules/admin/what-send_coupon.php +++ b/inc/modules/admin/what-send_coupon.php @@ -83,7 +83,7 @@ if (isFormSent()) { // Look for a unique id while (!$isUnique) { - /** + /* * Add a coupon for this user, first we need to create a * table-unique "id". The function generatePassword() can do * this job for us but we want to exclude some characters. diff --git a/js/menu-common.js b/js/menu-common.js index 76146fdb7f..d469daf171 100644 --- a/js/menu-common.js +++ b/js/menu-common.js @@ -1,10 +1,10 @@ /* * JavaScript for folding/unfolding menus * -------------------------------------------------------------------- - * $Revision:: $ - * $Date:: $ - * $Tag:: 0.2.1-FINAL$ - * $Author:: $ + * $Revision:: $ + * $Date:: $ + * $Tag:: 0.2.1-FINAL $ + * $Author:: $ * -------------------------------------------------------------------- * Copyright (c) 2003 - 2009 by Roland Haeder * Copyright (c) 2009 - 2011 by Mailer Developer Team diff --git a/mailid_top.php b/mailid_top.php index 6df0ca9c20..282cb6fd19 100644 --- a/mailid_top.php +++ b/mailid_top.php @@ -72,7 +72,7 @@ if (isGetRequestElementSet('userid')) $userId = bigintval(getRequestElement('u if (isGetRequestElementSet('mailid')) $mailId = bigintval(getRequestElement('mailid')); if (isGetRequestElementSet('bonusid')) $bonusId = bigintval(getRequestElement('bonusid')); if (isGetRequestElementSet('code')) $code = bigintval(getRequestElement('code')); -if (isGetRequestElementSet('do')) $do = getRequestElement('do'); +if (isGetRequestElementSet('do')) $do = getRequestElement('do'); // 01 2 21 12 2 2 21 1 2210 if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalErrorsDetected())) { diff --git a/templates/de/emails/admin/admin_coupon_cashed.tpl b/templates/de/emails/admin/admin_coupon_cashed.tpl index 95a70e3d1f..0cd1ce58b6 100644 --- a/templates/de/emails/admin/admin_coupon_cashed.tpl +++ b/templates/de/emails/admin/admin_coupon_cashed.tpl @@ -1,5 +1,7 @@ Hallo Administrator, +es wurde soeben ein Gutschein durch ein Mitglied eingelöst. + Hier sind alle Daten des Gutscheins: ------------------------------------ Gutschein-Id: $content[coupon_id] diff --git a/templates/de/emails/admin/admin_coupon_purge.tpl b/templates/de/emails/admin/admin_coupon_purge.tpl index 77f319c362..8cb0d7e61e 100644 --- a/templates/de/emails/admin/admin_coupon_purge.tpl +++ b/templates/de/emails/admin/admin_coupon_purge.tpl @@ -3,8 +3,8 @@ Hallo Administrator, es wurden soeben abgelaufene Gutscheine, die mehr als {%config,createFancyTime=coupon_autopurge_time%} noch gespeichert waren. Hier sind alle Daten der/des Gutscheine(s): -$content ------------------------------------ +$content Mit freundlichen Grüßen, Ihr {?MAIN_TITLE?} Team diff --git a/templates/de/emails/admin/admin_coupon_purge_row.tpl b/templates/de/emails/admin/admin_coupon_purge_row.tpl index a35a532132..b4a48ab4e9 100644 --- a/templates/de/emails/admin/admin_coupon_purge_row.tpl +++ b/templates/de/emails/admin/admin_coupon_purge_row.tpl @@ -1,4 +1,3 @@ ------------------------------------- Gutschein-Id: $content[id] Vergütung: {%pipe,translateComma=$content[points]%} {?POINTS?} Einstellungszeitpunkt: $content[coupon_created] @@ -8,3 +7,4 @@ Anzahl eingelöst: $content[total_cashed] ------------------------------------ Beschreibung/Hinweis: $content[coupon_description] +------------------------------------ diff --git a/templates/de/html/install/install_main.tpl b/templates/de/html/install/install_main.tpl index bd6c074508..da0297132a 100644 --- a/templates/de/html/install/install_main.tpl +++ b/templates/de/html/install/install_main.tpl @@ -2,6 +2,10 @@ : : : {--INSTALLER_MAIN_HEADER--} : : : +
+ Menu!!!!!! +
+
{%pipe,getInstallerContent%}
diff --git a/theme/default/css/install.css b/theme/default/css/install.css index 1029390699..c0d492e67f 100644 --- a/theme/default/css/install.css +++ b/theme/default/css/install.css @@ -42,3 +42,9 @@ text-align: right; padding-right: 5px; } + +.install_menu { + float: left; + width: 120px; + border: 1px solid #ff0000; +} -- 2.39.5