Direct call now possible, template renamed

diff --git a/.gitattributes b/.gitattributes
index 38756deb79d8e3cc45e1be9a7f3a9bf81e9f298a..64c96d33544419d5ddc35eef41ae9928df56a15a 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1135,6 +1135,7 @@ templates/de/html/admin/admin_extensions_edit_row.tpl -text svneol=unset#text/pl
 templates/de/html/admin/admin_extensions_row.tpl -text svneol=unset#text/plain
 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_import_theme.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_import_theme_none.tpl svneol=native#text/plain

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index c5a8c22577302188c112623bdc9aad8727943b60..41b280822365ab27cc43dfecb56aca9417f485bc 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -258,6 +258,7 @@
 ./templates/de/html/admin/admin_del_sponsor.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_del_transfer_row.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_del_user.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_member_selection_box.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_mods_edit_row.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_mods_edit.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_theme_edit_row.tpl:1:<!-- @DEPRECATED //-->

diff --git a/inc/language/holiday_de.php b/inc/language/holiday_de.php
index 4473d021588672a1c2fd6951e8539ade7e67fe35..ba58ac1dc17ee059aac223fa93998e24f8cdbea6 100644 (file)
--- a/inc/language/holiday_de.php
+++ b/inc/language/holiday_de.php
@@ -47,7 +47,6 @@ addMessages(array(
        // Admin & member strings
        'HOLIDAY_COMMENTS' => "Sonstige Hinweise an uns",
        // Admin strings
-       'ADMIN_HOLIDAY_NO_DIRECT_CALL' => "Bite rufen Sie dieses Script über Auflisten auf.",
        'ADMIN_TASK_IS_HOLIDAY_REQUEST' => "Urlaubsanfrage",
        'ADMIN_HOLIDAY_NOTHING_FOUND' => "Niemand hat Urlaub beantragt.",
        'ADMIN_HOLIDAY_TSTART' => "Anfang",

diff --git a/inc/modules/admin/what-del_holiday.php b/inc/modules/admin/what-del_holiday.php
index ae2a6a8931f8f051e0bd2fce1030b260833c761e..320349d3820fbdfc3236c95e3d93471c2e7bcc97 100644 (file)
--- a/inc/modules/admin/what-del_holiday.php
+++ b/inc/modules/admin/what-del_holiday.php
@@ -130,8 +130,8 @@ LIMIT 1", array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
        // Output message
        loadTemplate('admin_settings_saved', false, $message);
 } else {
-       // Please call me over other scripts... ;)
-       loadTemplate('admin_settings_saved', false, '{--HOLIDAY_NO_DIRECT_CALL--}');
+       // Add member selection box
+       addMemberSelectionBox();
 }
 
 // [EOF]

diff --git a/templates/de/html/admin/admin_form_selection_box.tpl b/templates/de/html/admin/admin_form_selection_box.tpl
new file mode 100644 (file)
index 0000000..ff85013
--- /dev/null
+++ b/templates/de/html/admin/admin_form_selection_box.tpl
@@ -0,0 +1,21 @@
+<div align="center">
+<form accept-charset="utf-8" action="{?URL?}/modules.php" method="get">
+<input type="hidden" name="module" value="admin" />
+<input type="hidden" name="what" value="$content[what]" />
+<div class="table dashed">
+       <div class="table_header bottom">
+               <strong>{--ADMIN_SELECTION_BOX_TITLE--}</strong>
+       </div>
+       <div align="center" class="bottom">
+               {--ADMIN_SELECT_USER--}:
+               <select name="userid" size="1" class="form_select">
+                       $content[form_selection]
+               </select>
+       </div>
+       <div align="center" class="table_footer">
+               <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
+               <input type="submit" class="form_submit" value="{--ADMIN_DO_ACTION--}" />
+       </div>
+</div>
+</form>
+</div>

diff --git a/templates/de/html/admin/admin_member_selection_box.tpl b/templates/de/html/admin/admin_member_selection_box.tpl
index ff850137546bcc5ed541e5150635cb954b2a8d46..11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f 100644 (file)
--- a/templates/de/html/admin/admin_member_selection_box.tpl
+++ b/templates/de/html/admin/admin_member_selection_box.tpl
@@ -1,21 +1 @@
-<div align="center">
-<form accept-charset="utf-8" action="{?URL?}/modules.php" method="get">
-<input type="hidden" name="module" value="admin" />
-<input type="hidden" name="what" value="$content[what]" />
-<div class="table dashed">
-       <div class="table_header bottom">
-               <strong>{--ADMIN_SELECTION_BOX_TITLE--}</strong>
-       </div>
-       <div align="center" class="bottom">
-               {--ADMIN_SELECT_USER--}:
-               <select name="userid" size="1" class="form_select">
-                       $content[form_selection]
-               </select>
-       </div>
-       <div align="center" class="table_footer">
-               <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-               <input type="submit" class="form_submit" value="{--ADMIN_DO_ACTION--}" />
-       </div>
-</div>
-</form>
-</div>
+<!-- @DEPRECATED //-->