From 692c88eed614fd3cfe41843e6c2b29a3bfd8ced2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 25 Jan 2013 09:06:11 +0000 Subject: [PATCH] Fixes for display problems with labeled input fields --- .../de/html/admin/admin_add_tester_user.tpl | 48 ++++++------- templates/de/html/admin/admin_config_ | 2 +- .../de/html/admin/admin_config_admin.tpl | 12 ++-- .../de/html/admin/admin_config_autopurge.tpl | 68 +++++++++---------- .../de/html/admin/admin_config_blacklist.tpl | 12 ++-- .../de/html/admin/admin_config_network.tpl | 6 +- .../html/admin/admin_config_network_api.tpl | 4 ++ .../de/html/admin/admin_config_order.tpl | 48 ++++++------- .../de/html/admin/admin_config_refid.tpl | 16 ++--- .../de/html/admin/admin_config_title.tpl | 24 +++---- templates/de/html/admin/admin_config_user.tpl | 52 +++++++------- .../de/html/admin/admin_config_user_subid.tpl | 4 +- .../admin/admin_delete_user_subids_row.tpl | 2 + .../admin_edit_config_network_type_form.tpl | 20 +++--- .../html/admin/admin_edit_forced_ads_row.tpl | 9 +++ .../admin/admin_edit_forced_costs_row.tpl | 2 + .../html/admin/admin_edit_points_data_row.tpl | 3 + .../admin/admin_edit_surfbar_actions_row.tpl | 2 + .../admin/admin_edit_surfbar_urls_row.tpl | 2 + .../html/admin/admin_edit_user_subids_row.tpl | 2 + .../de/html/admin/admin_receive_table.tpl | 2 +- theme/business/css/general.css | 4 +- theme/default/css/general.css | 3 +- theme/desert/css/general.css | 3 +- theme/org/css/general.css | 4 +- theme/schleuder/css/general.css | 7 ++ theme/ship-simu/css/general.css | 7 ++ 27 files changed, 207 insertions(+), 161 deletions(-) diff --git a/templates/de/html/admin/admin_add_tester_user.tpl b/templates/de/html/admin/admin_add_tester_user.tpl index 7add97cbef..88491f4261 100644 --- a/templates/de/html/admin/admin_add_tester_user.tpl +++ b/templates/de/html/admin/admin_add_tester_user.tpl @@ -7,56 +7,56 @@
{--ADMIN_ADD_TESTER_USER_LEGEND--} -
- +
+
{%config,generateGenderSelectionBox=tester_user_gender%}
-
- +
+
{?tester_user_surname_prefix?}{%pipe,getNextFreeTesterUserNumber%}
-
- +
+
-
- +
+
-
- +
+
{%pipe,addCountryCodeSelectionBox%}
-
- +
+
-
- +
+
-
- +
+
-
- +
+
01.01.1970
-
- +
+
{%pipe,addTesterUserDefaultRefidSelectionBox=refid%}
@@ -76,13 +76,13 @@
{--ADMIN_ADD_TESTER_USER_PASSWORDS_LEGEND--} -
- +
+
-
- +
+
diff --git a/templates/de/html/admin/admin_config_ b/templates/de/html/admin/admin_config_ index 128424f65d..381567612f 100644 --- a/templates/de/html/admin/admin_config_ +++ b/templates/de/html/admin/admin_config_ @@ -8,7 +8,7 @@
{--ADMIN_CONFIG_FOO_MY_STUFF_LEGEND--} -
+
diff --git a/templates/de/html/admin/admin_config_admin.tpl b/templates/de/html/admin/admin_config_admin.tpl index 252ef449f5..35b1ac63f7 100644 --- a/templates/de/html/admin/admin_config_admin.tpl +++ b/templates/de/html/admin/admin_config_admin.tpl @@ -8,15 +8,15 @@
{--ADMIN_CONFIG_ADMIN_MENU_TYPE_LEGEND--} -
- +
+
-
- +
+
@@ -26,8 +26,8 @@
{--ADMIN_CONFIG_ADMIN_MENU_MISC_LEGEND--} -
- +
+
{%template,ConfigurationYesNoSelectionBox=admin_menu_javascript%}
diff --git a/templates/de/html/admin/admin_config_autopurge.tpl b/templates/de/html/admin/admin_config_autopurge.tpl index dfeb75b7bf..4f2b71ae98 100644 --- a/templates/de/html/admin/admin_config_autopurge.tpl +++ b/templates/de/html/admin/admin_config_autopurge.tpl @@ -8,18 +8,18 @@
{--ADMIN_CONFIG_AUTOPURGE_INACTIVE_LEGEND--} -
- +
+
{%template,ConfigurationYesNoSelectionBox=ap_inactive_selection%}
-
- +
+
$content[ap_in_since]
-
- +
+
$content[ap_in_time]
@@ -27,13 +27,13 @@
{--ADMIN_CONFIG_AUTOPURGE_UNCONFIRMED_LEGEND--} -
- +
+
{%template,ConfigurationYesNoSelectionBox=ap_unconfirmed_selection%}
-
- +
+
$content[ap_un_time]
@@ -41,13 +41,13 @@
{--ADMIN_CONFIG_AUTOPURGE_TASKS_LEGEND--} -
- +
+
{%template,ConfigurationYesNoSelectionBox=ap_tasks_selection%}
-
- +
+
$content[ap_task_time]
@@ -55,18 +55,18 @@
{--ADMIN_CONFIG_AUTOPURGE_MAILID_LEGEND--} -
- +
+
{%template,ConfigurationYesNoSelectionBox=auto_purge%}
-
- +
+
$content[auto_purge]
-
- +
+
{%template,ConfigurationYesNoSelectionBox=ap_notify_del_mails%}
@@ -74,13 +74,13 @@
{--ADMIN_CONFIG_AUTOPURGE_DELETE_MAILS_LEGEND--} -
- +
+
{%template,ConfigurationYesNoSelectionBox=ap_del_mails_selection%}
-
- +
+
$content[ap_del_mails_time]
@@ -88,13 +88,13 @@
{--ADMIN_CONFIG_AUTOPURGE_SERVER_NAME_LOG_LEGEND--} -
- +
+
{%template,ConfigurationYesNoSelectionBox=ap_server_name%}
-
- +
+
$content[ap_server_name_since]
@@ -102,18 +102,18 @@
{--ADMIN_CONFIG_AUTOPURGE_NOTIFICATION_LEGEND--} -
- +
+
{%template,ConfigurationYesNoSelectionBox=ap_notify_inactive%}
-
- +
+
{%template,ConfigurationYesNoSelectionBox=ap_notify_unconfirmed%}
-
- +
+
{%template,ConfigurationYesNoSelectionBox=ap_notify_tasks%}
diff --git a/templates/de/html/admin/admin_config_blacklist.tpl b/templates/de/html/admin/admin_config_blacklist.tpl index 7ab90d7716..fef984e962 100644 --- a/templates/de/html/admin/admin_config_blacklist.tpl +++ b/templates/de/html/admin/admin_config_blacklist.tpl @@ -8,22 +8,22 @@
{--ADMIN_CONFIG_BLACKLIST_LEGEND--} -
- +
+
{%template,ConfigurationYesNoSelectionBox=email_blacklist%}
-
- +
+
{%template,ConfigurationYesNoSelectionBox=ip_blacklist%}
-
- +
+
{%template,ConfigurationYesNoSelectionBox=url_blacklist%}
diff --git a/templates/de/html/admin/admin_config_network.tpl b/templates/de/html/admin/admin_config_network.tpl index e0ea4f1010..e6b1ce59fb 100644 --- a/templates/de/html/admin/admin_config_network.tpl +++ b/templates/de/html/admin/admin_config_network.tpl @@ -8,7 +8,7 @@
{--ADMIN_CONFIG_NETWORK_CACHE_LEGEND--} -
+
$content[network_cache_refresh] @@ -19,14 +19,14 @@
{--ADMIN_CONFIG_NETWORK_LOGGING_LEGEND--} -
+
$content[network_logging_purge]
-
+
+ @@ -23,6 +24,7 @@ + + @@ -48,6 +51,7 @@ {%pipe,translateComma=$content[network_query_amount]%} + diff --git a/templates/de/html/admin/admin_config_order.tpl b/templates/de/html/admin/admin_config_order.tpl index 711ce88e1b..1bfd8b76b7 100644 --- a/templates/de/html/admin/admin_config_order.tpl +++ b/templates/de/html/admin/admin_config_order.tpl @@ -8,15 +8,15 @@
{--ADMIN_CONFIG_ORDER_SELECT_MAX_LEGEND--} -
- +
+
-
- +
+
@@ -26,36 +26,36 @@
{--ADMIN_CONFIG_ORDER_MEMBER_LEGEND--} -
- +
+
-
- +
+
-
- +
+
{%template,ConfigurationYesNoSelectionBox=allow_url_in_text%}
-
- +
+
{%template,ConfigurationYesNoSelectionBox=allow_url_in_subject%}
-
- +
+
{%config,addOrderSelectionOptions=order_select%} @@ -85,8 +85,8 @@
-
- +
+
-
- +
+
{%template,ConfigurationYesNoSelectionBox=autosend_member_mails%}
diff --git a/templates/de/html/admin/admin_config_refid.tpl b/templates/de/html/admin/admin_config_refid.tpl index 4ceb1d2669..26f27a745d 100644 --- a/templates/de/html/admin/admin_config_refid.tpl +++ b/templates/de/html/admin/admin_config_refid.tpl @@ -8,15 +8,15 @@
{--ADMIN_CONFIG_REFID_GENERAL_LEGEND--} -
- +
+
$content[def_refid]
-
- +
+
@@ -39,8 +39,8 @@
-
- +
+
diff --git a/templates/de/html/admin/admin_config_title.tpl b/templates/de/html/admin/admin_config_title.tpl index da73e4be5c..7f0176f583 100644 --- a/templates/de/html/admin/admin_config_title.tpl +++ b/templates/de/html/admin/admin_config_title.tpl @@ -7,18 +7,18 @@
{--ADMIN_CONFIG_TITLE_LEGEND--} -
- +
+
{%template,ConfigurationYesNoSelectionBox=enable_title_deco%}
-
- +
+
{%template,ConfigurationYesNoSelectionBox=enable_mod_title%}
-
- +
+
{%template,ConfigurationYesNoSelectionBox=enable_what_title%}
@@ -26,18 +26,18 @@
{--ADMIN_CONFIG_TITLE_DECORATIONS--} -
- +
+
-
- +
+
-
- +
+
diff --git a/templates/de/html/admin/admin_config_user.tpl b/templates/de/html/admin/admin_config_user.tpl index 907865f94e..801aadeb00 100644 --- a/templates/de/html/admin/admin_config_user.tpl +++ b/templates/de/html/admin/admin_config_user.tpl @@ -7,66 +7,66 @@
{--ADMIN_CONFIG_USER_LEGEND--} -
- +
+
-
- +
+
{--ADMIN_CONFIG_TESTER_USER_LEGEND--} -
- +
+
-
- +
+
$content[tester_user_gender_selection]
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
{%template,ConfigurationYesNoSelectionBox=tester_user_check_cat%}
@@ -74,8 +74,8 @@
-
- +
+
{%pipe,addTesterUserDefaultRefidSelectionBox%}
diff --git a/templates/de/html/admin/admin_config_user_subid.tpl b/templates/de/html/admin/admin_config_user_subid.tpl index ef39790903..8096db408d 100644 --- a/templates/de/html/admin/admin_config_user_subid.tpl +++ b/templates/de/html/admin/admin_config_user_subid.tpl @@ -8,14 +8,14 @@
{--ADMIN_CONFIG_USER_SUBID_AUTOPURGE_LEGEND--} -
+
{%template,ConfigurationYesNoSelectionBox=ap_subids%}
-
+
$content[ap_subids_since] 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 98ef9ab8de..ba06a79557 100644 --- a/templates/de/html/admin/admin_delete_user_subids_row.tpl +++ b/templates/de/html/admin/admin_delete_user_subids_row.tpl @@ -3,10 +3,12 @@ $content[id] + $content[subid] + $content[subid_added] 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 62aa71a729..a20e6a7c40 100644 --- a/templates/de/html/admin/admin_edit_config_network_type_form.tpl +++ b/templates/de/html/admin/admin_edit_config_network_type_form.tpl @@ -10,52 +10,52 @@
-
+
{%template,NoYesSelectionBox=set_all%}
-
+
{%message,ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MAX_RELOAD_TIME=$content[network_type_reload_time_unit]%}
$content[network_max_reload_time]
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
$content[forced_ads_added] + + + + + + $content[forced_ads_userid] + + @@ -48,5 +56,6 @@ {%pipe,generateYesNoOptions=$content[forced_ads_framebreaker]%} +   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 ea6925fed8..d6688fef7a 100644 --- a/templates/de/html/admin/admin_edit_forced_costs_row.tpl +++ b/templates/de/html/admin/admin_edit_forced_costs_row.tpl @@ -4,6 +4,7 @@ ({?POINTS?}) + ({?POINTS?}) @@ -17,5 +18,6 @@ {%pipe,generateForcedCostsVisibilityOptions=$content[forced_costs_visibility]%} +   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 411e2db5da..3434f38251 100644 --- a/templates/de/html/admin/admin_edit_points_data_row.tpl +++ b/templates/de/html/admin/admin_edit_points_data_row.tpl @@ -4,6 +4,7 @@ $content[subject]
({%pipe,translatePointsSubject=$content[subject]%})
+ {%pipe,translatePointsAccountType=$content[column_name]%} @@ -17,6 +18,7 @@ {%pipe,generatePointsLockedModeOptions=$content[locked_mode]%} + + {%pipe,translatePointsAccountProvider=$content[account_provider]%} 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 a08ee60916..4cab916445 100644 --- a/templates/de/html/admin/admin_edit_surfbar_actions_row.tpl +++ b/templates/de/html/admin/admin_edit_surfbar_actions_row.tpl @@ -4,6 +4,7 @@ $content[actions_id] + {%template,SurfbarActionsStatusSelectionBox=$content[actions_id]%} @@ -15,6 +16,7 @@ {%template,SurfbarActionsActionSelectionBox=$content[actions_id]%} + {%template,SurfbarActionsNewStatusSelectionBox=$content[actions_id]%} 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 aa705846e7..558a258a4b 100644 --- a/templates/de/html/admin/admin_edit_surfbar_urls_row.tpl +++ b/templates/de/html/admin/admin_edit_surfbar_urls_row.tpl @@ -5,6 +5,7 @@ $content[url_userid] + @@ -16,6 +17,7 @@ $content[url_fixed_reload] + $content[url_fixed_waiting] 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 279a607709..7eb4b046b7 100644 --- a/templates/de/html/admin/admin_edit_user_subids_row.tpl +++ b/templates/de/html/admin/admin_edit_user_subids_row.tpl @@ -3,10 +3,12 @@ $content[id] + + $content[subid_added] diff --git a/templates/de/html/admin/admin_receive_table.tpl b/templates/de/html/admin/admin_receive_table.tpl index 507288d470..2a15a3b127 100644 --- a/templates/de/html/admin/admin_receive_table.tpl +++ b/templates/de/html/admin/admin_receive_table.tpl @@ -1,5 +1,5 @@
- +