More HTML/EL code fixes, removed assertition as it was to strict (didn't work in...

diff --git a/inc/functions.php b/inc/functions.php
index 5d255e12bfe30e6fce3316f314d887e48cb13dac..ab8907f080b92d09385757972d00a1a802c260ed 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1344,9 +1344,6 @@ function handleExtraValues ($filterFunction, $value, $extraValue) {
 
 // Tries to determine if call-back functions and/or extra values shall be parsed
 function doHandleExtraValues ($filterFunctions, $extraValues, $key, $entries, $userIdColumn, $search, $id = NULL) {
-       // $search shall not be NULL
-       assert(!is_null($search));
-
        // Debug mode enabled?
        if (isDebugModeEnabled()) {
                // Debug message

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 2e500b1617efa3bfb7f4a79d87fb0319d5fb6bb0..0d7c400d1d2feb4794d1f0caf993ec0901648f86 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -2866,7 +2866,7 @@ function search_array ($array, $key, $value, $parentIndex = NULL) {
                // Search for whole array
                foreach ($array as $idx => $dummy) {
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',value=' . $value . ',idx=' . $idx . ',parentIndex[' . gettype($parentIndex) . ']=' . $parentIndex);
-                       //* DEBUG: */ print 'idx=' . $idx . ',parentIndex[' . gettype($parentIndex) . ']=' . $parentIndex . ',key=' . $key . ',value=' . $value . ',array=<pre>'.print_r($array, TRUE).'</pre>';
+                       /* DEBUG: */ print 'idx=' . $idx . ',parentIndex[' . gettype($parentIndex) . ']=' . $parentIndex . ',key=' . $key . ',value=' . $value . ',array=<pre>'.print_r($array, TRUE).'</pre>';
                        // Is dummy an array?
                        if ((is_array($dummy)) && ((is_null($parentIndex)) || ($parentIndex === $value))) {
                                // Then search again

diff --git a/templates/de/html/admin/admin_add_surfbar_url.tpl b/templates/de/html/admin/admin_add_surfbar_url.tpl
index 7517ffd775a59cd344c9248b54947eb6e6b0f5f3..e6f4b9bc81c6d905ea46f7b548dc4f3f154b94b7 100644 (file)
--- a/templates/de/html/admin/admin_add_surfbar_url.tpl
+++ b/templates/de/html/admin/admin_add_surfbar_url.tpl
@@ -6,23 +6,23 @@
        </div>
 
        <div class="admin_input" align="center">
-               <legend for="url">{--ADMIN_ENTER_SURFBAR_URL--}</legend>
+               <label for="url">{--ADMIN_ENTER_SURFBAR_URL--}</label>
                <input type="text" class="form_field" name="url" size="20" maxlength="255" value="http://" />
        </div>
 
        <div class="admin_input bottom" align="center">
-               <legend for="limit">{--ADMIN_ENTER_SURFBAR_LIMIT--}</legend>
+               <label for="limit">{--ADMIN_ENTER_SURFBAR_LIMIT--}</label>
                <input type="text" class="form_field" name="limit" size="5" maxlength="20" value="0" /><br />
                <span class="notice">{--ADMIN_ENTER_SURFBAR_LIMIT_NOTICE--}</span>
        </div>
 
        <div class="admin_input" align="center">
-               <legend for="waiting">{--ADMIN_SELECT_SURFBAR_WAITING--}</legend>
+               <label for="waiting">{--ADMIN_SELECT_SURFBAR_WAITING--}</label>
                $content[waiting]
        </div>
 
        <div class="admin_input bottom" align="center">
-               <legend for="reload">{--ADMIN_SELECT_SURFBAR_RELOAD--}</legend>
+               <label for="reload">{--ADMIN_SELECT_SURFBAR_RELOAD--}</label>
                $content[reload]
        </div>
 

diff --git a/templates/de/html/admin/admin_delete_user_subids_row.tpl b/templates/de/html/admin/admin_delete_user_subids_row.tpl
index d9fa7ee6a60262f2e3a3bbc0226253ed2e7edb40..98ef9ab8dec5b5254e461fa50bf9de12a400933e 100644 (file)
--- a/templates/de/html/admin/admin_delete_user_subids_row.tpl
+++ b/templates/de/html/admin/admin_delete_user_subids_row.tpl
@@ -4,7 +4,7 @@
                <input type="hidden" name="id[$content[id]]" value="1" />
        </td>
        <td align="center" class="bottom right {%template,ColorSwitch%}">
-               <legend for="subid[$content[id]]">{--SUBID_VALUE--}</legend>
+               <label for="subid[$content[id]]">{--SUBID_VALUE--}</label>
                $content[subid]
        </td>
        <td align="center" class="bottom {%template,ColorSwitch%}">

diff --git a/templates/de/html/admin/admin_edit_config_network_type_form.tpl b/templates/de/html/admin/admin_edit_config_network_type_form.tpl
index 35edd3f6242ec31fa7b7d37e6fce927b18da4737..50dc745be7923058ad7500ec38123a50d032e0de 100644 (file)
--- a/templates/de/html/admin/admin_edit_config_network_type_form.tpl
+++ b/templates/de/html/admin/admin_edit_config_network_type_form.tpl
@@ -11,32 +11,32 @@
        </div>
 
        <div class="bottom" style="padding-top:3px;padding-bottom:3px">
-               <legend for="set_all">{--ADMIN_CONFIG_NETWORK_HANDLER_SET_ALL--}</legend>
+               <label for="set_all">{--ADMIN_CONFIG_NETWORK_HANDLER_SET_ALL--}</label>
                {%template,NoYesSelectionBox=set_all%}
        </div>
 
        <div class="bottom" style="padding-top:3px;padding-bottom:3px">
-               <legend for="network_max_reload_time">{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MAX_RELOAD_TIME--} ({--TIME_UNIT--})</legend>
+               <label for="network_max_reload_time">{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MAX_RELOAD_TIME--} ({--TIME_UNIT--})</label>
                $content[network_max_reload_time] ({%pipe,translateTimeUnit=$content[network_type_reload_time_unit]%})
        </div>
 
        <div class="bottom" style="padding-top:3px;padding-bottom:3px">
-               <legend for="network_min_waiting_time">{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_WAITING_TIME</legend>
+               <label for="network_min_waiting_time">{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_WAITING_TIME--}</label>
                <input type="text" class="form_normal" name="network_min_waiting_time" size="5" maxlength="20" value="$content[network_min_waiting_time]" />
        </div>
 
        <div class="bottom" style="padding-top:3px;padding-bottom:3px">
-               <legend for="network_min_remain_clicks">{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_REMAIN_CLICKS</legend>
+               <label for="network_min_remain_clicks">{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_REMAIN_CLICKS--}</label>
                <input type="text" class="form_normal" name="network_min_remain_clicks" size="5" maxlength="20" value="$content[network_min_remain_clicks]" />
        </div>
 
        <div class="bottom" style="padding-top:3px;padding-bottom:3px">
-               <legend for="network_min_payment">{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_PAYMENT</legend>
+               <label for="network_min_payment">{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_PAYMENT--}</label>
                <input type="text" class="form_normal" name="network_min_payment" size="7" maxlength="20" value="$content[network_min_payment]" />
        </div>
 
        <div class="bottom" style="padding-top:3px;padding-bottom:3px">
-               <legend for="network_allow_erotic">{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_ALLOW_EROTIC</legend>
+               <label for="network_allow_erotic">{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_ALLOW_EROTIC--}</label>
                <input type="text" class="form_normal" name="network_allow_erotic" size="5" maxlength="20" value="$content[network_allow_erotic]" />
        </div>
 

diff --git a/templates/de/html/admin/admin_edit_forced_ads_row.tpl b/templates/de/html/admin/admin_edit_forced_ads_row.tpl
index 9892c4a9b804e836c5e4c50c9affaf0d6636fca0..a5612df339b9fdf3fa567587a6e6c312723e6241 100644 (file)
--- a/templates/de/html/admin/admin_edit_forced_ads_row.tpl
+++ b/templates/de/html/admin/admin_edit_forced_ads_row.tpl
@@ -5,37 +5,37 @@
                <strong>$content[forced_ads_added]</strong>
        </td>
        <td class="{%template,ColorSwitch%}">
-               <legend for="forced_ads_ad_url[$content[forced_ads_id]]">{--ADMIN_CHANGE_FORCED_ADS_AD_URL--}</legend>
+               <label for="forced_ads_ad_url[$content[forced_ads_id]]">{--ADMIN_CHANGE_FORCED_ADS_AD_URL--}</label>
                <input type="text" class="form_field" name="forced_ads_ad_url[$content[forced_ads_id]]" size="20" maxlength="255" value="$content[forced_ads_ad_url]" />
        </td>
 </tr>
 <tr>
        <td class="{%template,ColorSwitch%}">
-               <legend for="forced_ads_alt_text[$content[forced_ads_id]]">{--ADMIN_CHANGE_FORCED_ADS_ALTERNATE_TEXT--}</legend>
+               <label for="forced_ads_alt_text[$content[forced_ads_id]]">{--ADMIN_CHANGE_FORCED_ADS_ALTERNATE_TEXT--}</label>
                <input type="text" class="form_field" name="forced_ads_alt_text[$content[forced_ads_id]]" size="15" maxlength="255" value="$content[forced_ads_alt_text]" />
        </td>
        <td class="{%template,ColorSwitch%}">
-               <legend for="forced_ads_click_url[$content[forced_ads_id]]">{--ADMIN_CHANGE_FORCED_ADS_CLICK_URL--}</legend>
+               <label for="forced_ads_click_url[$content[forced_ads_id]]">{--ADMIN_CHANGE_FORCED_ADS_CLICK_URL--}</label>
                <input type="text" class="form_field" name="forced_ads_click_url[$content[forced_ads_id]]" size="30" maxlength="255" value="$content[forced_ads_click_url]" />
        </td>
 </tr>
 <tr>
        <td class="{%template,ColorSwitch%}">
-               <legend for="forced_ads_width[$content[forced_ads_id]]">{--ADMIN_CHANGE_FORCED_ADS_WIDTH--}</legend>
+               <label for="forced_ads_width[$content[forced_ads_id]]">{--ADMIN_CHANGE_FORCED_ADS_WIDTH--}</label>
                <input type="text" class="form_field" name="forced_ads_width[$content[forced_ads_id]]" size="4" maxlength="4" value="$content[forced_ads_width]" />
        </td>
        <td class="{%template,ColorSwitch%}">
-               <legend for="forced_ads_height[$content[forced_ads_id]]">{--ADMIN_CHANGE_FORCED_ADS_HEIGHT--}</legend>
+               <label for="forced_ads_height[$content[forced_ads_id]]">{--ADMIN_CHANGE_FORCED_ADS_HEIGHT--}</label>
                <input type="text" class="form_field" name="forced_ads_height[$content[forced_ads_id]]" size="4" maxlength="4" value="$content[forced_ads_height]" />
        </td>
 </tr>
 <tr>
        <td class="{%template,ColorSwitch%}">
-               <legend for="">{--ADMIN_CHANGE_FORCED_ADS_USERID--}</legend>
+               <label for="">{--ADMIN_CHANGE_FORCED_ADS_USERID--}</label>
                $content[forced_ads_userid]
        </td>
        <td class="{%template,ColorSwitch%}">
-               <legend for="forced_ads_type[$content[forced_ads_id]]">{--ADMIN_CHANGE_FORCED_ADS_TYPE--}</legend>
+               <label for="forced_ads_type[$content[forced_ads_id]]">{--ADMIN_CHANGE_FORCED_ADS_TYPE--}</label>
                <select name="forced_ads_type[$content[forced_ads_id]]" class="form_select" size="1">
                        {%pipe,generateForcedAdsTypeOptions=$content[forced_ads_type]%}
                </select>
@@ -43,7 +43,7 @@
 </tr>
 <tr>
        <td class="{%template,ColorSwitch%} bottom">
-               <legend for="forced_ads_framebreaker[$content[forced_ads_id]]">{--ADMIN_CHANGE_FORCED_ADS_FRAMEBREAKER--}</legend>
+               <label for="forced_ads_framebreaker[$content[forced_ads_id]]">{--ADMIN_CHANGE_FORCED_ADS_FRAMEBREAKER--}</label>
                <select name="forced_ads_framebreaker[$content[forced_ads_id]]" class="form_select" size="1">
                        {%pipe,generateYesNoOptions=$content[forced_ads_framebreaker]%}
                </select>

diff --git a/templates/de/html/admin/admin_edit_forced_campaigns_row.tpl b/templates/de/html/admin/admin_edit_forced_campaigns_row.tpl
index 386e198540e9b7efade4711145c5b048ed4f9c71..74c80f1ccc86fca94b615affaa4c8f44af3119c0 100644 (file)
--- a/templates/de/html/admin/admin_edit_forced_campaigns_row.tpl
+++ b/templates/de/html/admin/admin_edit_forced_campaigns_row.tpl
@@ -5,38 +5,41 @@
                <strong>$content[forced_campaign_created]</strong>
        </td>
        <td class="{%template,ColorSwitch%}">
-               <legend for="forced_campaign_ordered_clicks[$content[forced_campaign_id]]">{--ADMIN_CHANGE_FORCED_CAMPAIGN_ORDERED_CLICKS--}</legend>
+               <label for="forced_campaign_ordered_clicks[$content[forced_campaign_id]]">{--ADMIN_CHANGE_FORCED_CAMPAIGN_ORDERED_CLICKS--}</label>
                <input type="text" class="form_field" name="forced_campaign_ordered_clicks[$content[forced_campaign_id]]" size="5" maxlength="20" value="{%pipe,translateComma=$content[forced_campaign_ordered_clicks]%}" />
        </td>
 </tr>
+
 <tr>
        <td class="{%template,ColorSwitch%}">
-               <legend for="forced_campaign_payment_api[$content[forced_campaign_id]]">{--ADMIN_CHANGE_FORCED_CAMPAIGN_PAYMENT_API--}</legend>
+               <label for="forced_campaign_payment_api[$content[forced_campaign_id]]">{--ADMIN_CHANGE_FORCED_CAMPAIGN_PAYMENT_API--}</label>
                <input type="text" class="form_field" name="forced_campaign_payment_api[$content[forced_campaign_id]]" size="5" maxlength="20" value="{%pipe,translateComma=$content[forced_campaign_payment_api]%}" />
        </td>
        <td class="{%template,ColorSwitch%}">
-               <legend for="">{--ADMIN_CHANGE_FORCED_CAMPAIGN_RELOAD_LOCK--}</legend>
+               <label for="">{--ADMIN_CHANGE_FORCED_CAMPAIGN_RELOAD_LOCK--}</label>
                $content[forced_campaign_reload_lock]
        </td>
 </tr>
+
 <tr>
        <td class="{%template,ColorSwitch%}">
-               <legend for="forced_campaign_minimum_stay[$content[forced_campaign_id]]">{--ADMIN_CHANGE_FORCED_CAMPAIGN_MINIMUM_STAY--}</legend>
+               <label for="forced_campaign_minimum_stay[$content[forced_campaign_id]]">{--ADMIN_CHANGE_FORCED_CAMPAIGN_MINIMUM_STAY--}</label>
                <input type="text" class="form_field" name="forced_campaign_minimum_stay[$content[forced_campaign_id]]" size="5" maxlength="20" value="$content[forced_campaign_minimum_stay]" />
        </td>
        <td class="{%template,ColorSwitch%}">
-               <legend for="">{--ADMIN_CHANGE_FORCED_CAMPAIGN_ADS_ID--}</legend>
+               <label for="">{--ADMIN_CHANGE_FORCED_CAMPAIGN_ADS_ID--}</label>
                {%template,ForcedAdSelectionBox=$content[forced_ads_id]%}
        </td>
 </tr>
+
 <tr>
        <td class="{%template,ColorSwitch%} bottom">
-               <legend for="forced_campaign_userid">{--ADMIN_CHANGE_FORCED_CAMPAIGN_USERID--}</legend>
+               <label for="forced_campaign_userid">{--ADMIN_CHANGE_FORCED_CAMPAIGN_USERID--}</label>
                $content[forced_campaign_userid]
                <!--<input type="hidden" name="forced_campaign_userid_raw[$content[forced_campaign_id]]" value="$content[forced_campaign_userid_raw]" />//-->
        </td>
        <td class="{%template,ColorSwitch%} bottom">
-               <legend for="">{--ADMIN_CHANGE_FORCED_CAMPAIGN_COSTS_ID--}</legend>
+               <label for="">{--ADMIN_CHANGE_FORCED_CAMPAIGN_COSTS_ID--}</label>
                {%template,ForcedCostsSelectionBox=$content[forced_costs_id]%}
        </td>
 </tr>

diff --git a/templates/de/html/admin/admin_edit_forced_costs_row.tpl b/templates/de/html/admin/admin_edit_forced_costs_row.tpl
index 43d37ab64569ff600fd8cebf6bbd0dec8c67582c..ea6925fed889f4aca1eb0fdf3244b980a7be1a18 100644 (file)
--- a/templates/de/html/admin/admin_edit_forced_costs_row.tpl
+++ b/templates/de/html/admin/admin_edit_forced_costs_row.tpl
@@ -1,17 +1,18 @@
 <tr>
        <td class="{%template,ColorSwitch%}">
-               <legend for="forced_costs_price_click[$content[forced_costs_id]]">{--ADMIN_CHANGE_FORCED_COSTS_PRICE_CLICK--}</legend>
+               <label for="forced_costs_price_click[$content[forced_costs_id]]">{--ADMIN_CHANGE_FORCED_COSTS_PRICE_CLICK--}</label>
                <input type="hidden" name="forced_costs_id[$content[forced_costs_id]]" value="1" />
                <input type="text" class="form_field" name="forced_costs_price_click[$content[forced_costs_id]]" size="10" maxlength="20" value="{%pipe,translateComma=$content[forced_costs_price_click]%}" /> ({?POINTS?})
        </td>
        <td class="{%template,ColorSwitch%}">
-               <legend for="forced_costs_payment_click[$content[forced_costs_id]]">{--ADMIN_CHANGE_FORCED_COSTS_PAYMENT_CLICK--}</legend>
+               <label for="forced_costs_payment_click[$content[forced_costs_id]]">{--ADMIN_CHANGE_FORCED_COSTS_PAYMENT_CLICK--}</label>
                <input type="text" class="form_field" name="forced_costs_payment_click[$content[forced_costs_id]]" size="10" maxlength="20" value="{%pipe,translateComma=$content[forced_costs_payment_click]%}" /> ({?POINTS?})
        </td>
 </tr>
+
 <tr>
        <td class="{%template,ColorSwitch%} bottom">
-               <legend for="forced_costs_visibility[$content[forced_costs_id]]">{--ADMIN_CHANGE_FORCED_COSTS_VISIBILITY--}</legend>
+               <label for="forced_costs_visibility[$content[forced_costs_id]]">{--ADMIN_CHANGE_FORCED_COSTS_VISIBILITY--}</label>
                <select name="forced_costs_visibility[$content[forced_costs_id]]" class="form_select" size="1">
                        {%pipe,generateForcedCostsVisibilityOptions=$content[forced_costs_visibility]%}
                </select>

diff --git a/templates/de/html/admin/admin_edit_points_data_row.tpl b/templates/de/html/admin/admin_edit_points_data_row.tpl
index 81da17b8a971af34a00f53c467176f4d397286d0..411e2db5dada3f5debd98ed8d1bb983d2356ed73 100644 (file)
--- a/templates/de/html/admin/admin_edit_points_data_row.tpl
+++ b/templates/de/html/admin/admin_edit_points_data_row.tpl
@@ -5,20 +5,20 @@
                <div class="tiny">({%pipe,translatePointsSubject=$content[subject]%})</div>
        </td>
        <td class="{%template,ColorSwitch%}">
-               <legend for="column_name">{--ADMIN_POINTS_ACCOUNT_COLUMN_NAME</legend>
+               <label for="column_name">{--ADMIN_POINTS_ACCOUNT_COLUMN_NAME--}</label>
                <strong>{%pipe,translatePointsAccountType=$content[column_name]%}</strong>
        </td>
 </tr>
 
 <tr>
        <td class="{%template,ColorSwitch%}">
-               <legend for="locked_mode[$content[id]]">{--ADMIN_CHANGE_POINTS_LOCKED_MODE</legend>
+               <label for="locked_mode[$content[id]]">{--ADMIN_CHANGE_POINTS_LOCKED_MODE--}</label>
                <select name="locked_mode[$content[id]]" class="form_select" size="1">
                        {%pipe,generatePointsLockedModeOptions=$content[locked_mode]%}
                </select>
        </td>
        <td class="{%template,ColorSwitch%}">
-               <legend for="payment_method[$content[id]]">{--ADMIN_CHANGE_POINTS_PAYMENT_METHOD</legend>
+               <label for="payment_method[$content[id]]">{--ADMIN_CHANGE_POINTS_PAYMENT_METHOD--}</label>
                <select name="payment_method[$content[id]]" class="form_select" size="1">
                        {%pipe,generatePointsPaymentMethodOptions=$content[payment_method]%}
                </select>
@@ -27,13 +27,13 @@
 
 <tr>
        <td class="bottom {%template,ColorSwitch%}">
-               <legend for="notify_recipient[$content[id]]">{--ADMIN_CHANGE_POINTS_NOTIFY_RECIPIENT</legend>
+               <label for="notify_recipient[$content[id]]">{--ADMIN_CHANGE_POINTS_NOTIFY_RECIPIENT--}</label>
                <select name="notify_recipient[$content[id]]" class="form_select" size="1">
                        {%pipe,generatePointsNotifyRecipientOptions=$content[notify_recipient]%}
                </select>
        </td>
        <td class="bottom {%template,ColorSwitch%}">
-               <legend for="account_provider">{--ADMIN_POINTS_ACCOUNT_PROVIDER</legend>
+               <label for="account_provider">{--ADMIN_POINTS_ACCOUNT_PROVIDER--}</label>
                <strong>{%pipe,translatePointsAccountProvider=$content[account_provider]%}</strong>
        </td>
 </tr>

diff --git a/templates/de/html/admin/admin_edit_surfbar_actions_row.tpl b/templates/de/html/admin/admin_edit_surfbar_actions_row.tpl
index c3b04903669b1b2ba770eec33b8b1b914e94acf7..a08ee609167281ae80c8cce7c8dea2eacc954b73 100644 (file)
--- a/templates/de/html/admin/admin_edit_surfbar_actions_row.tpl
+++ b/templates/de/html/admin/admin_edit_surfbar_actions_row.tpl
@@ -5,18 +5,18 @@
                <strong>$content[actions_id]</strong>
        </td>
        <td align="center" class="{%template,ColorSwitch%}">
-               <legend for="">{--ADMIN_CHANGE_SURFBAR_ACTIONS_STATUS--}</legend>
+               <label for="">{--ADMIN_CHANGE_SURFBAR_ACTIONS_STATUS--}</label>
                {%template,SurfbarActionsStatusSelectionBox=$content[actions_id]%}
        </td>
 </tr>
 
 <tr>
        <td align="center" class="bottom {%template,ColorSwitch%}">
-               <legend for="">{--ADMIN_CHANGE_SURFBAR_ACTIONS_ACTION--}</legend>
+               <label for="">{--ADMIN_CHANGE_SURFBAR_ACTIONS_ACTION--}</label>
                {%template,SurfbarActionsActionSelectionBox=$content[actions_id]%}
        </td>
        <td align="center" class="bottom {%template,ColorSwitch%}">
-               <legend for="">{--ADMIN_CHANGE_SURFBAR_ACTIONS_NEW_STATUS--}</legend>
+               <label for="">{--ADMIN_CHANGE_SURFBAR_ACTIONS_NEW_STATUS--}</label>
                {%template,SurfbarActionsNewStatusSelectionBox=$content[actions_id]%}
        </td>
 </tr>

diff --git a/templates/de/html/admin/admin_edit_surfbar_urls_row.tpl b/templates/de/html/admin/admin_edit_surfbar_urls_row.tpl
index d7f9c3b6c3a1adae7b0561ed6fdc07dfa9df32ec..aa705846e77bc01d26cdc0e9256d99ce06c5bbb8 100644 (file)
--- a/templates/de/html/admin/admin_edit_surfbar_urls_row.tpl
+++ b/templates/de/html/admin/admin_edit_surfbar_urls_row.tpl
@@ -1,23 +1,23 @@
 <tr>
        <td align="center" class="bottom right {%template,ColorSwitch%}">
-               <legend for="url_userid">{--_USERID--}</legend>
+               <label for="url_userid">{--_USERID--}</label>
                <input type="hidden" name="url_id[$content[url_id]]" value="1" />
                <input type="hidden" name="url_userid[$content[url_id]]" value="{%pipe,convertZeroToNull=$content[url_userid_raw]%}" />
                $content[url_userid]
        </td>
        <td align="center" class="bottom right {%template,ColorSwitch%}">
-               <legend for="url">{--ADMIN_TEST_URL--}</legend>
+               <label for="url">{--ADMIN_TEST_URL--}</label>
                <input type="text" class="form_field" name="url[$content[url_id]]" size="20" maxlength="255" value="$content[url]" />
        </td>
 </tr>
 
 <tr>
        <td align="center" class="bottom right {%template,ColorSwitch%}">
-               <legend for="url_fixed_reload">{--ADMIN_CHANGE_SURFBAR_FIXED_RELOAD--}</legend>
+               <label for="url_fixed_reload">{--ADMIN_CHANGE_SURFBAR_FIXED_RELOAD--}</label>
                $content[url_fixed_reload]
        </td>
        <td align="center" class="bottom right {%template,ColorSwitch%}">
-               <legend for="url_fixed_waiting">{--ADMIN_CHANGE_SURFBAR_FIXED_RELOAD--}</legend>
+               <label for="url_fixed_waiting">{--ADMIN_CHANGE_SURFBAR_FIXED_RELOAD--}</label>
                $content[url_fixed_waiting]
        </td>
 </tr>

diff --git a/templates/de/html/admin/admin_edit_user_subids_row.tpl b/templates/de/html/admin/admin_edit_user_subids_row.tpl
index 0c59f7088ca8f670758d6e7a2d64b091d8ffa0e8..279a6077094daeeb7b92f298618602b1d0d9b68e 100644 (file)
--- a/templates/de/html/admin/admin_edit_user_subids_row.tpl
+++ b/templates/de/html/admin/admin_edit_user_subids_row.tpl
@@ -4,7 +4,7 @@
                <input type="hidden" name="id[$content[id]]" value="1" />
        </td>
        <td align="center" class="bottom right {%template,ColorSwitch%}">
-               <legend for="subid[$content[id]]">{--ADMIN_CHANGE_USER_SUBID--}</legend>
+               <label for="subid[$content[id]]">{--ADMIN_CHANGE_USER_SUBID--}</label>
                <input type="text" class="form_field" name="subid[$content[id]]" size="20" maxlength="255" value="$content[subid]" />
        </td>
        <td align="center" class="bottom {%template,ColorSwitch%}">