Surfbar continued:

- Missing template added for deleting URLs in surfbar by members
- Deletion mails extended
- Missing "action execute function" added
- Some minor fixes

diff --git a/.gitattributes b/.gitattributes
index 471c8fa0b30a50c0a7cf8c4611142450b8eea81e..0721643c2c475839832994ba9fe416de267c71f8 100644 (file)
--- 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 d6dbd0eabd70571bd7dfaf30afa996cca6d4050c..2038c0174aa0e773829141a7784b92202377b476 100644 (file)
--- 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 26ab9647ce1df4061e20f2379a5b1666bf212220..a4ec015a78888ee04a1ec48ad554cb984aa18963 100644 (file)
--- 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 972b196dad52074f3c117c631fb6e10a343c0f66..99c1b3070579d86c19a5e61e60a7507a98badc32 100644 (file)
--- 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 fa78ec5f1f35a15a7926e5991f1c685ea85d2240..db8540029acd222f926c3f210ac7624cdc48bb35 100644 (file)
--- 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 cba33e5f8392322833fcfc2e7ce3ec2afa1671e8..c535bca5cf4547b197ed32d5d927cc0542329978 100644 (file)
--- 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 (file)
index 0000000..684da34
--- /dev/null
+++ b/templates/de/html/member/member_surfbar_delete_action_form.tpl
@@ -0,0 +1,36 @@
+<form id="delete" action="{!URL!}/modules.php?module=login&amp;what=surfbar_list" method="post">
+<div class="member_table dashed" style="width:600px;margin-top:10px">
+       <div class="member_title2 bottom2" style="padding-top:5px;padding-bottom:5px">
+               <strong>URL in Surfbar l&ouml;schen:</strong>
+       </div>
+
+       <div class="member_input" style="padding-top:5px;padding-bottom:5px">
+               Gebuchte URL: <strong>$content[url]</strong>
+       </div>
+
+       <div class="member_input" style="padding-top:5px;padding-bottom:5px">
+               Angemeldet: <strong>$content[registered]</strong>
+       </div>
+
+       <div class="member_input" style="padding-top:5px;padding-bottom:5px">
+               Gesamtaufrufe: <strong>$content[views_total]</strong>
+       </div>
+
+       <div class="member_input" style="padding-top:5px;padding-bottom:5px">
+               Aufrufe begrenzt auf: <strong>$content[views_max]</strong> (0=Unbegrenzt)
+       </div>
+
+       <div class="member_title2 top2" style="padding-top:5px;padding-bottom:5px">
+               <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />
+               <input type="hidden" name="id" value="$content[id]" />
+               <input type="hidden" name="action" value="delete" />
+               <input type="hidden" name="execute" value="1" />
+               <input type="submit" class="member_submit" name="ok" value="{--MEMBER_SURFBAR_ACTION_DELETE_NOW_SUBMIT--}" />
+       </div>
+</div>
+</form>
+
+<div class="note">
+       <strong>Hinweis:</strong> Irt&uuml;mlich gel&ouml;schte URLs k&ouml;nnen nur
+       durch unsere Administratoren wiederhergestellt werden.
+</div>

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 9c53c92d7947b2bf670c3aac1dddf9cd997e1fa8..8c7036c06d7327f3ada9539ad03c7a9075a884e5 100644 (file)
--- 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 @@
                <input type="hidden" name="id" value="$content[id]" />
                <input type="hidden" name="action" value="edit" />
                <input type="hidden" name="execute" value="1" />
-               <input type="submit" class="member_submit" name="ok" value="{--MEMBER_SURFBAR_ACTION_EDIT_SUBMIT--}" />
+               <input type="submit" class="member_submit" name="ok" value="{--MEMBER_SURFBAR_ACTION_EDIT_NOW_SUBMIT--}" />
        </div>
 </div>
 

diff --git a/theme/desert/css/general.css b/theme/desert/css/general.css
index 2d788a922bebd1189f64c80e66632cc75764c54b..a55217416725a4a19cccdf3b304532b386949725 100644 (file)
--- 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;
 }