From feebadf040cbdef72bde8a34c7c79e1d15adc1f3 Mon Sep 17 00:00:00 2001 From: quix0r Date: Fri, 28 Nov 2008 00:44:54 +0000 Subject: [PATCH] Surfbar continued: - Missing template added for deleting URLs in surfbar by members - Deletion mails extended - Missing "action execute function" added - Some minor fixes --- .gitattributes | 1 + inc/databases.php | 2 +- inc/language/surfbar_de.php | 4 +++ inc/libs/surfbar_functions.php | 5 +++ .../admin/admin_surfbar_url_deleted.tpl | 2 +- .../member/member_surfbar_url_deleted.tpl | 2 +- .../member_surfbar_delete_action_form.tpl | 36 +++++++++++++++++++ .../member_surfbar_edit_action_form.tpl | 2 +- theme/desert/css/general.css | 3 +- 9 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 templates/de/html/member/member_surfbar_delete_action_form.tpl diff --git a/.gitattributes b/.gitattributes index 471c8fa0b3..0721643c2c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1394,6 +1394,7 @@ templates/de/html/member/member_support_form.tpl -text templates/de/html/member/member_surfbar_book_dynamic.tpl -text templates/de/html/member/member_surfbar_book_static.tp -text templates/de/html/member/member_surfbar_book_static.tpl -text +templates/de/html/member/member_surfbar_delete_action_form.tpl -text templates/de/html/member/member_surfbar_edit_action_form.tpl -text templates/de/html/member/member_surfbar_link.tpl -text templates/de/html/member/member_surfbar_list.tpl -text diff --git a/inc/databases.php b/inc/databases.php index d6dbd0eabd..2038c0174a 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -114,7 +114,7 @@ define('USAGE_BASE', "usage"); define('SERVER_URL', "http://www.mxchange.org"); // This current patch level -define('CURR_SVN_REVISION', "571"); +define('CURR_SVN_REVISION', "572"); // Take a prime number which is long (if you know a longer one please try it out!) define('_PRIME', 591623); diff --git a/inc/language/surfbar_de.php b/inc/language/surfbar_de.php index 26ab9647ce..a4ec015a78 100644 --- a/inc/language/surfbar_de.php +++ b/inc/language/surfbar_de.php @@ -199,6 +199,10 @@ define('MEMBER_SURFBAR_ACTION_BOOKNOW_SUBMIT', "Jetzt buchen"); define('MEMBER_SURFBAR_ACTION_PAUSE_SUBMIT', "Anhalten"); define('MEMBER_SURFBAR_ACTION_UNPAUSE_SUBMIT', "Fortfahren"); +// Member actions - "now" submit buttons +define('MEMBER_SURFBAR_ACTION_DELETE_NOW_SUBMIT', "Jetzt löschen"); +define('MEMBER_SURFBAR_ACTION_EDIT_NOW_SUBMIT', "Jetzt ändern"); + // Member actions - button titles define('MEMBER_SURFBAR_ACTION_RETREAT_TITLE', "Nehmen Sie hiermit Ihre Buchung wieder zurück, falls Sie diese doch nicht bewerben wollten."); define('MEMBER_SURFBAR_ACTION_FRAMETEST_TITLE', "Testen Sie die Seite auf Framekiller hin, diese sind in unserer Surfbar grundsätzlich nicht gestattet."); diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index 972b196dad..99c1b30705 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -428,6 +428,11 @@ function SURFBAR_MEMBER_EXECUTE_EDIT_ACTION ($urlData) { // Not updated return false; } +// "Execute delete" function: Does nothing... +function SURFBAR_MEMBER_EXECUTE_DELETE_ACTION ($urlData) { + // Nothing special to do (see above function for such "special actions" to perform) + return true; +} // // ----------------------------------------------------------------------------- // Self-maintenance functions diff --git a/templates/de/emails/admin/admin_surfbar_url_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_deleted.tpl index fa78ec5f1f..db8540029a 100644 --- a/templates/de/emails/admin/admin_surfbar_url_deleted.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_deleted.tpl @@ -1,6 +1,6 @@ {--HELLO_ADMIN--}, -eines unserer Mitglieder hat soeben seine URL-Buchung zurückgezogen. +eines unserer Mitglieder hat soeben seine URL-Buchung zurückgezogen bzw. gel&oum;scht. Hier sind alle Daten dazu: ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_deleted.tpl b/templates/de/emails/member/member_surfbar_url_deleted.tpl index cba33e5f83..c535bca5cf 100644 --- a/templates/de/emails/member/member_surfbar_url_deleted.tpl +++ b/templates/de/emails/member/member_surfbar_url_deleted.tpl @@ -1,6 +1,6 @@ Hallo $content[surname] $content[family],, -Sie haben soeben eine in unserer Surfbar gebuchte URL zurückgenommen. +Sie haben soeben eine in unserer Surfbar gebuchte URL zurückgenommen bzw. gelöscht. Hier sind alle Daten dazu: ------------------------------------------ diff --git a/templates/de/html/member/member_surfbar_delete_action_form.tpl b/templates/de/html/member/member_surfbar_delete_action_form.tpl new file mode 100644 index 0000000000..684da34689 --- /dev/null +++ b/templates/de/html/member/member_surfbar_delete_action_form.tpl @@ -0,0 +1,36 @@ +
+
+
+ URL in Surfbar löschen: +
+ +
+ Gebuchte URL: $content[url] +
+ +
+ Angemeldet: $content[registered] +
+ +
+ Gesamtaufrufe: $content[views_total] +
+ +
+ Aufrufe begrenzt auf: $content[views_max] (0=Unbegrenzt) +
+ +
+ + + + + +
+
+
+ +
+ Hinweis: Irtümlich gelöschte URLs können nur + durch unsere Administratoren wiederhergestellt werden. +
diff --git a/templates/de/html/member/member_surfbar_edit_action_form.tpl b/templates/de/html/member/member_surfbar_edit_action_form.tpl index 9c53c92d79..8c7036c06d 100644 --- a/templates/de/html/member/member_surfbar_edit_action_form.tpl +++ b/templates/de/html/member/member_surfbar_edit_action_form.tpl @@ -23,7 +23,7 @@ - + diff --git a/theme/desert/css/general.css b/theme/desert/css/general.css index 2d788a922b..a552174167 100644 --- a/theme/desert/css/general.css +++ b/theme/desert/css/general.css @@ -233,8 +233,7 @@ DIV.admin_note { .admin_normal, .guest_normal, .member_normal { border-style : solid; - border : solid 1px; - border-color : #880000; + border : solid 1px #880000; background-color : #DDDDAA; } -- 2.39.5