projects
/
mailer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
83936cb
)
This should display the data?
author
Roland Häder
<roland@mxchange.org>
Fri, 16 Sep 2011 23:00:53 +0000
(23:00 +0000)
committer
Roland Häder
<roland@mxchange.org>
Fri, 16 Sep 2011 23:00:53 +0000
(23:00 +0000)
inc/modules/admin/what-send_coupon.php
patch
|
blob
|
history
js/menu-common.js
patch
|
blob
|
history
mailid_top.php
patch
|
blob
|
history
templates/de/emails/admin/admin_coupon_cashed.tpl
patch
|
blob
|
history
templates/de/emails/admin/admin_coupon_purge.tpl
patch
|
blob
|
history
templates/de/emails/admin/admin_coupon_purge_row.tpl
patch
|
blob
|
history
templates/de/html/install/install_main.tpl
patch
|
blob
|
history
theme/default/css/install.css
patch
|
blob
|
history
diff --git
a/inc/modules/admin/what-send_coupon.php
b/inc/modules/admin/what-send_coupon.php
index 262a4c8c73eaa4021217515f8f3929032fef0435..469329ba74ed1f08ef0e9c234312b8d6285d8979 100644
(file)
--- 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) {
// 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.
* 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 76146fdb7fb71edd7d6cb11af5c539e387202fd5..d469daf17197ec92325bc42b0dc545a74f2e91b3 100644
(file)
--- a/
js/menu-common.js
+++ b/
js/menu-common.js
@@
-1,10
+1,10
@@
/*
* JavaScript for folding/unfolding menus
* --------------------------------------------------------------------
/*
* 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
* --------------------------------------------------------------------
* 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 6df0ca9c20d2bd806e236985dc9b9453d6179678..282cb6fd19f34b45d4d390453d11c51f7be17deb 100644
(file)
--- 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('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())) {
// 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 95a70e3d1fbc22cfa4e61e0fe45cb69dc30c5797..0cd1ce58b6620000413abbcb616b3505ff8a7fd3 100644
(file)
--- a/
templates/de/emails/admin/admin_coupon_cashed.tpl
+++ b/
templates/de/emails/admin/admin_coupon_cashed.tpl
@@
-1,5
+1,7
@@
Hallo Administrator,
Hallo Administrator,
+es wurde soeben ein Gutschein durch ein Mitglied eingelöst.
+
Hier sind alle Daten des Gutscheins:
------------------------------------
Gutschein-Id: $content[coupon_id]
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 77f319c362e32b7c232e67e888a1f00c0071ff7c..8cb0d7e61ee28bafa1e1e512e4e242a2f3a86c08 100644
(file)
--- 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):
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
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 a35a53213298b6497d7d54f5be5c1e71c4832b4b..b4a48ab4e9caf5b387b0a26da9b9ec60080af9a0 100644
(file)
--- 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]
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]
------------------------------------
Beschreibung/Hinweis:
$content[coupon_description]
+------------------------------------
diff --git
a/templates/de/html/install/install_main.tpl
b/templates/de/html/install/install_main.tpl
index bd6c0745083741ad030931ea75b8ec7d5e293a43..da0297132a5a5d1421785c539363b9710d050331 100644
(file)
--- a/
templates/de/html/install/install_main.tpl
+++ b/
templates/de/html/install/install_main.tpl
@@
-2,6
+2,10
@@
<strong>: : : {--INSTALLER_MAIN_HEADER--} : : :</strong>
</div>
<strong>: : : {--INSTALLER_MAIN_HEADER--} : : :</strong>
</div>
+<div class="install_menu">
+ Menu!!!!!!
+</div>
+
<div class="install_main">
{%pipe,getInstallerContent%}
</div>
<div class="install_main">
{%pipe,getInstallerContent%}
</div>
diff --git
a/theme/default/css/install.css
b/theme/default/css/install.css
index 1029390699ca988ec86fa2b37d11a694af2681db..c0d492e67f17d458bd448299315447f149e3b7a5 100644
(file)
--- a/
theme/default/css/install.css
+++ b/
theme/default/css/install.css
@@
-42,3
+42,9
@@
text-align: right;
padding-right: 5px;
}
text-align: right;
padding-right: 5px;
}
+
+.install_menu {
+ float: left;
+ width: 120px;
+ border: 1px solid #ff0000;
+}