diff --git a/src/controllers/components/StoreComponent.php b/src/controllers/components/StoreComponent.php index 1ce13cdcd..9fb53942f 100644 --- a/src/controllers/components/StoreComponent.php +++ b/src/controllers/components/StoreComponent.php @@ -245,29 +245,38 @@ class StoreComponent extends Component $data[$field] = $parent->clean($_REQUEST[$field], $type); } } + $initial_display_state = 'false'; if (isset($_REQUEST['EDIT_AD'])) { - unset($_REQUEST['CALCULATE']); - unset($_REQUEST['arg']); + if ($_REQUEST['EDIT_AD'] != "true") { + unset($_REQUEST['CALCULATE']); + unset($_REQUEST['arg']); + } + $initial_display_state = 'true'; } - $initial_display_state = 'false'; if (isset($_REQUEST['CALCULATE']) || (isset($_REQUEST['arg']) && $_REQUEST['arg'] == "addadvertisement")) { if (empty($_REQUEST['NAME']) || empty($_REQUEST['DESCRIPTION']) || empty($_REQUEST['DESTINATION'])) { + $_REQUEST['EDIT_AD'] = "true"; return $parent->redirectWithMessage( tl('store_component_fields_cannot_be_empty'), - array_merge([$_REQUEST['arg']], $request_fields)); + array_merge([$_REQUEST['arg'], 'EDIT_AD'], + $request_fields)); } if (!isset($_REQUEST['DURATION']) || $_REQUEST['DURATION'] == 0) { + $_REQUEST['EDIT_AD'] = "true"; return $parent->redirectWithMessage( tl('store_component_duration_cannot_be_empty'), - array_merge([$_REQUEST['arg']], $request_fields)); + array_merge([$_REQUEST['arg'], 'EDIT_AD'], + $request_fields)); } if (empty($_REQUEST['KEYWORDS'])) { + $_REQUEST['EDIT_AD'] = "true"; return $parent->redirectWithMessage( tl('store_component_enter_keywords'), - array_merge([$_REQUEST['arg']], $request_fields)); + array_merge([$_REQUEST['arg'], 'EDIT_AD'], + $request_fields)); } $data['START_DATE'] = date(C\AD_DATE_FORMAT); $_REQUEST['START_DATE'] = $data['START_DATE']; @@ -304,20 +313,23 @@ class StoreComponent extends Component } } if (empty($_REQUEST['KEYWORDS'])) { + $_REQUEST['EDIT_AD'] = "true"; return $parent->redirectWithMessage( tl('store_component_enter_keywords'), - array_merge(['arg'], $request_fields)); + array_merge(['arg', 'EDIT_AD'], $request_fields)); } $ad_start_date = $data['START_DATE']; if ($advertisement["BUDGET"] < $data['AD_MIN_BID']) { + $_REQUEST['EDIT_AD'] = "true"; return $parent->redirectWithMessage( tl('store_component_bid_too_low'), - array_merge(['arg'], $request_fields)); + array_merge(['arg', 'EDIT_AD'], $request_fields)); } if ($data['BALANCE'] < $advertisement["BUDGET"]) { + $_REQUEST['EDIT_AD'] = "true"; return $parent->redirectWithMessage( tl('store_component_too_few_credits'), - array_merge(['arg'], $request_fields)); + array_merge(['arg', 'EDIT_AD'], $request_fields)); } $message = ""; $strings_to_translate_for_model = diff --git a/src/css/search.css b/src/css/search.css index 35a8412f8..cafc53b90 100755 --- a/src/css/search.css +++ b/src/css/search.css @@ -1309,7 +1309,10 @@ body.mobile width: 150px; height: 30px; } - +.full-width +{ + width: 100%; +} .small-icon { height: 0.5in; diff --git a/src/locale/ar/configure.ini b/src/locale/ar/configure.ini index 8455d8b98..f3e66c8c3 100755 --- a/src/locale/ar/configure.ini +++ b/src/locale/ar/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "في انتظار الحالات آلات..." @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "" pageoptions_element_test_options = "" pageoptions_element_save_options = "حفظ" pageoptions_element_run_tests = "" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "" pageoptions_element_page_range = "نطاق البايت للتحميل (0-القيمة):" pageoptions_element_summarizer = "" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "" groupfeed_element_thread_no_exist = "" groupfeed_element_edit = "" groupfeed_element_delete = "" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "" groupfeed_element_num_views = "" groupfeed_element_start_thread_in_group = "" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "" groupfeed_element_post_vote = "" groupfeed_element_last_post_info = "" diff --git a/src/locale/bn/configure.ini b/src/locale/bn/configure.ini index 63d6465c9..533237fe9 100755 --- a/src/locale/bn/configure.ini +++ b/src/locale/bn/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "" @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "" pageoptions_element_test_options = "" pageoptions_element_save_options = "" pageoptions_element_run_tests = "" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "" pageoptions_element_page_range = "" pageoptions_element_summarizer = "" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "" groupfeed_element_thread_no_exist = "" groupfeed_element_edit = "" groupfeed_element_delete = "" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "" groupfeed_element_num_views = "" groupfeed_element_start_thread_in_group = "" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "" groupfeed_element_post_vote = "" groupfeed_element_last_post_info = "" diff --git a/src/locale/de/configure.ini b/src/locale/de/configure.ini index abb89002f..d7ec02777 100755 --- a/src/locale/de/configure.ini +++ b/src/locale/de/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "" @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "" pageoptions_element_test_options = "" pageoptions_element_save_options = "" pageoptions_element_run_tests = "" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "" pageoptions_element_page_range = "" pageoptions_element_summarizer = "" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "" groupfeed_element_thread_no_exist = "" groupfeed_element_edit = "" groupfeed_element_delete = "" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "" groupfeed_element_num_views = "" groupfeed_element_start_thread_in_group = "" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "" groupfeed_element_post_vote = "" groupfeed_element_last_post_info = "" diff --git a/src/locale/en_US/configure.ini b/src/locale/en_US/configure.ini index 54454139c..d051c5ebb 100644 --- a/src/locale/en_US/configure.ini +++ b/src/locale/en_US/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "%s Feed" groupbar_element_no_path_info = "No Path Info" groupbar_element_userfeed = "User: %s" groupbar_element_myfeeds = "My Feeds" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "Awaiting statuses of machines..." @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "Search Time" pageoptions_element_test_options = "Test Options" pageoptions_element_save_options = "Save" pageoptions_element_run_tests = "Test Process Page" -pageoptions_element_plugin_back = "Back" pageoptions_element_load_options = "Get Page Options From:" pageoptions_element_page_range = "Byte Range to Download (0 - Value):" pageoptions_element_summarizer = "Summarizer:" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "No posts yet!" groupfeed_element_thread_no_exist = "Thread does not exist! Maybe it was deleted?" groupfeed_element_edit = "Edit" groupfeed_element_delete = "Delete" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "%s posts" groupfeed_element_num_views = "%s views" groupfeed_element_start_thread_in_group = "Start New Thread in %s" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "Last Edited: %s" groupfeed_element_post_vote = "Vote:" groupfeed_element_last_post_info = "Last Post:" diff --git a/src/locale/en_US/statistics.txt b/src/locale/en_US/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/en_US/statistics.txt +++ b/src/locale/en_US/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/es/configure.ini b/src/locale/es/configure.ini index 61ce48fc8..b421fdc40 100755 --- a/src/locale/es/configure.ini +++ b/src/locale/es/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "" @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "" pageoptions_element_test_options = "" pageoptions_element_save_options = "" pageoptions_element_run_tests = "" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "" pageoptions_element_page_range = "" pageoptions_element_summarizer = "" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "" groupfeed_element_thread_no_exist = "" groupfeed_element_edit = "" groupfeed_element_delete = "" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "" groupfeed_element_num_views = "" groupfeed_element_start_thread_in_group = "" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "" groupfeed_element_post_vote = "" groupfeed_element_last_post_info = "" diff --git a/src/locale/fa/configure.ini b/src/locale/fa/configure.ini index a23d9fad5..402289e7e 100755 --- a/src/locale/fa/configure.ini +++ b/src/locale/fa/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "منتظر وضعیت دستگاه‌ها..." @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "" pageoptions_element_test_options = "" pageoptions_element_save_options = "ذخیره" pageoptions_element_run_tests = "" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "" pageoptions_element_page_range = "دامنهٔ میزان بایتی که بارگذاری می‌شود (۰ - میزان):" pageoptions_element_summarizer = "" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "" groupfeed_element_thread_no_exist = "" groupfeed_element_edit = "" groupfeed_element_delete = "" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "" groupfeed_element_num_views = "" groupfeed_element_start_thread_in_group = "" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "" groupfeed_element_post_vote = "" groupfeed_element_last_post_info = "" diff --git a/src/locale/fr_FR/configure.ini b/src/locale/fr_FR/configure.ini index 1eb0b1503..402ec7fc7 100755 --- a/src/locale/fr_FR/configure.ini +++ b/src/locale/fr_FR/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "" @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "" pageoptions_element_test_options = "" pageoptions_element_save_options = "" pageoptions_element_run_tests = "" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "" pageoptions_element_page_range = "" pageoptions_element_summarizer = "" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "" groupfeed_element_thread_no_exist = "" groupfeed_element_edit = "" groupfeed_element_delete = "" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "" groupfeed_element_num_views = "" groupfeed_element_start_thread_in_group = "" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "" groupfeed_element_post_vote = "" groupfeed_element_last_post_info = "" diff --git a/src/locale/he/configure.ini b/src/locale/he/configure.ini index 3ad4fc812..8b2a8514e 100755 --- a/src/locale/he/configure.ini +++ b/src/locale/he/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "" @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "" pageoptions_element_test_options = "" pageoptions_element_save_options = "" pageoptions_element_run_tests = "" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "" pageoptions_element_page_range = "" pageoptions_element_summarizer = "" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "" groupfeed_element_thread_no_exist = "" groupfeed_element_edit = "" groupfeed_element_delete = "" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "" groupfeed_element_num_views = "" groupfeed_element_start_thread_in_group = "" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "" groupfeed_element_post_vote = "" groupfeed_element_last_post_info = "" diff --git a/src/locale/hi/configure.ini b/src/locale/hi/configure.ini index 98162abe4..9e29d05bc 100755 --- a/src/locale/hi/configure.ini +++ b/src/locale/hi/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "" @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "" pageoptions_element_test_options = "" pageoptions_element_save_options = "" pageoptions_element_run_tests = "" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "" pageoptions_element_page_range = "" pageoptions_element_summarizer = "" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "" groupfeed_element_thread_no_exist = "" groupfeed_element_edit = "" groupfeed_element_delete = "" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "" groupfeed_element_num_views = "" groupfeed_element_start_thread_in_group = "" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "" groupfeed_element_post_vote = "" groupfeed_element_last_post_info = "" diff --git a/src/locale/in_ID/configure.ini b/src/locale/in_ID/configure.ini index cce871ba9..efaeebc8e 100755 --- a/src/locale/in_ID/configure.ini +++ b/src/locale/in_ID/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "" @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "" pageoptions_element_test_options = "" pageoptions_element_save_options = "" pageoptions_element_run_tests = "" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "" pageoptions_element_page_range = "" pageoptions_element_summarizer = "" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "" groupfeed_element_thread_no_exist = "" groupfeed_element_edit = "" groupfeed_element_delete = "" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "" groupfeed_element_num_views = "" groupfeed_element_start_thread_in_group = "" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "" groupfeed_element_post_vote = "" groupfeed_element_last_post_info = "" diff --git a/src/locale/it/configure.ini b/src/locale/it/configure.ini index 3bc267a14..4ff99a6ab 100755 --- a/src/locale/it/configure.ini +++ b/src/locale/it/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "In attesa stato Macchine..." @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "" pageoptions_element_test_options = "" pageoptions_element_save_options = "Salva" pageoptions_element_run_tests = "" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "" pageoptions_element_page_range = "Quantità Byte da scaricare (0 - Valore):" pageoptions_element_summarizer = "" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "" groupfeed_element_thread_no_exist = "" groupfeed_element_edit = "" groupfeed_element_delete = "" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "" groupfeed_element_num_views = "" groupfeed_element_start_thread_in_group = "" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "" groupfeed_element_post_vote = "" groupfeed_element_last_post_info = "" diff --git a/src/locale/ja/configure.ini b/src/locale/ja/configure.ini index 8f0dac9b8..86969f4ea 100755 --- a/src/locale/ja/configure.ini +++ b/src/locale/ja/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "" @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "" pageoptions_element_test_options = "" pageoptions_element_save_options = "" pageoptions_element_run_tests = "" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "" pageoptions_element_page_range = "" pageoptions_element_summarizer = "" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "" groupfeed_element_thread_no_exist = "" groupfeed_element_edit = "" groupfeed_element_delete = "" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "" groupfeed_element_num_views = "" groupfeed_element_start_thread_in_group = "" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "" groupfeed_element_post_vote = "" groupfeed_element_last_post_info = "" diff --git a/src/locale/kn/configure.ini b/src/locale/kn/configure.ini index 91d9e3367..4fe8f49bf 100755 --- a/src/locale/kn/configure.ini +++ b/src/locale/kn/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "" @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "" pageoptions_element_test_options = "" pageoptions_element_save_options = "" pageoptions_element_run_tests = "" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "" pageoptions_element_page_range = "" pageoptions_element_summarizer = "" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "" groupfeed_element_thread_no_exist = "" groupfeed_element_edit = "" groupfeed_element_delete = "" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "" groupfeed_element_num_views = "" groupfeed_element_start_thread_in_group = "" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "" groupfeed_element_post_vote = "" groupfeed_element_last_post_info = "" diff --git a/src/locale/ko/configure.ini b/src/locale/ko/configure.ini index 23fd09177..a673dadc7 100755 --- a/src/locale/ko/configure.ini +++ b/src/locale/ko/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "" @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "" pageoptions_element_test_options = "" pageoptions_element_save_options = "" pageoptions_element_run_tests = "" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "" pageoptions_element_page_range = "" pageoptions_element_summarizer = "" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "" groupfeed_element_thread_no_exist = "" groupfeed_element_edit = "" groupfeed_element_delete = "" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "" groupfeed_element_num_views = "" groupfeed_element_start_thread_in_group = "" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "" groupfeed_element_post_vote = "" groupfeed_element_last_post_info = "" diff --git a/src/locale/nl/configure.ini b/src/locale/nl/configure.ini index 990699a15..dec956086 100644 --- a/src/locale/nl/configure.ini +++ b/src/locale/nl/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "In afwachting van statussen van machines ..." @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "Zoek Tijd" pageoptions_element_test_options = "Test Opties" pageoptions_element_save_options = "Opslaan" pageoptions_element_run_tests = "Test Process Pagina" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "Krijg Pagina opties van:" pageoptions_element_page_range = "Byte Range te downloaden (0 - Waarde):" pageoptions_element_summarizer = "Summarizer:" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "Deze groep heeft nog geen berichten!" groupfeed_element_thread_no_exist = "Draad bestaat niet! Misschien was verwijderd?" groupfeed_element_edit = "uitgeven" groupfeed_element_delete = "verwijderen" +groupfeed_element_usericon = "" groupfeed_element_num_posts = " %s berichten" groupfeed_element_num_views = "uitzicht %s" groupfeed_element_start_thread_in_group = "Start nieuw onderwerp in %s" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "Laatst gewijzigd: %s" groupfeed_element_post_vote = "stem:" groupfeed_element_last_post_info = "Laatste bericht:" diff --git a/src/locale/pl/configure.ini b/src/locale/pl/configure.ini index 95da3ed69..c3c15904c 100755 --- a/src/locale/pl/configure.ini +++ b/src/locale/pl/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "" @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "" pageoptions_element_test_options = "" pageoptions_element_save_options = "" pageoptions_element_run_tests = "" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "" pageoptions_element_page_range = "" pageoptions_element_summarizer = "" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "" groupfeed_element_thread_no_exist = "" groupfeed_element_edit = "" groupfeed_element_delete = "" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "" groupfeed_element_num_views = "" groupfeed_element_start_thread_in_group = "" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "" groupfeed_element_post_vote = "" groupfeed_element_last_post_info = "" diff --git a/src/locale/pt/configure.ini b/src/locale/pt/configure.ini index 8ec6cf9bc..929d2dad4 100755 --- a/src/locale/pt/configure.ini +++ b/src/locale/pt/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "" @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "" pageoptions_element_test_options = "" pageoptions_element_save_options = "" pageoptions_element_run_tests = "" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "" pageoptions_element_page_range = "" pageoptions_element_summarizer = "" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "" groupfeed_element_thread_no_exist = "" groupfeed_element_edit = "" groupfeed_element_delete = "" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "" groupfeed_element_num_views = "" groupfeed_element_start_thread_in_group = "" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "" groupfeed_element_post_vote = "" groupfeed_element_last_post_info = "" diff --git a/src/locale/ru/configure.ini b/src/locale/ru/configure.ini index 4b1484acd..f520ac126 100755 --- a/src/locale/ru/configure.ini +++ b/src/locale/ru/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "" @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "" pageoptions_element_test_options = "" pageoptions_element_save_options = "" pageoptions_element_run_tests = "" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "" pageoptions_element_page_range = "" pageoptions_element_summarizer = "" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "" groupfeed_element_thread_no_exist = "" groupfeed_element_edit = "" groupfeed_element_delete = "" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "" groupfeed_element_num_views = "" groupfeed_element_start_thread_in_group = "" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "" groupfeed_element_post_vote = "" groupfeed_element_last_post_info = "" diff --git a/src/locale/te/configure.ini b/src/locale/te/configure.ini index 9ead1bf4d..4f8a929bf 100644 --- a/src/locale/te/configure.ini +++ b/src/locale/te/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "మెషిన్ స్టేటస్ కోసం వేచి ఉన్నాము..." @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "" pageoptions_element_test_options = "" pageoptions_element_save_options = "" pageoptions_element_run_tests = "" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "" pageoptions_element_page_range = "" pageoptions_element_summarizer = "" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "ఈ గ్రూప్ లో ఇంకా ప groupfeed_element_thread_no_exist = "థ్రెడ్ ఉనికిలో లేదు! ఇది తొలగించబడి ఉండవచ్చు?" groupfeed_element_edit = "ఎడిట్" groupfeed_element_delete = "డిలీట్" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "%s పోస్ట్లు" groupfeed_element_num_views = "%s వ్యూస్" groupfeed_element_start_thread_in_group = "క్రొత్త థ్రెడ్ %s" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "చివరిగా సవరించబడింది: %s" groupfeed_element_post_vote = "వోట్:" groupfeed_element_last_post_info = "ఆఖరి పోస్ట్:" diff --git a/src/locale/th/configure.ini b/src/locale/th/configure.ini index 6dbd111e7..b657f4c82 100755 --- a/src/locale/th/configure.ini +++ b/src/locale/th/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "" @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "" pageoptions_element_test_options = "" pageoptions_element_save_options = "" pageoptions_element_run_tests = "" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "" pageoptions_element_page_range = "" pageoptions_element_summarizer = "" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "" groupfeed_element_thread_no_exist = "" groupfeed_element_edit = "" groupfeed_element_delete = "" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "" groupfeed_element_num_views = "" groupfeed_element_start_thread_in_group = "" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "" groupfeed_element_post_vote = "" groupfeed_element_last_post_info = "" diff --git a/src/locale/tr/configure.ini b/src/locale/tr/configure.ini index 00f4acb0c..3b64905f9 100755 --- a/src/locale/tr/configure.ini +++ b/src/locale/tr/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "" @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "" pageoptions_element_test_options = "" pageoptions_element_save_options = "" pageoptions_element_run_tests = "" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "" pageoptions_element_page_range = "" pageoptions_element_summarizer = "" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "" groupfeed_element_thread_no_exist = "" groupfeed_element_edit = "" groupfeed_element_delete = "" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "" groupfeed_element_num_views = "" groupfeed_element_start_thread_in_group = "" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "" groupfeed_element_post_vote = "" groupfeed_element_last_post_info = "" diff --git a/src/locale/vi_VN/configure.ini b/src/locale/vi_VN/configure.ini index 8b64d41e2..0b8971271 100755 --- a/src/locale/vi_VN/configure.ini +++ b/src/locale/vi_VN/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "" @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "" pageoptions_element_test_options = "" pageoptions_element_save_options = "" pageoptions_element_run_tests = "" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "" pageoptions_element_page_range = "" pageoptions_element_summarizer = "" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "" groupfeed_element_thread_no_exist = "" groupfeed_element_edit = "" groupfeed_element_delete = "" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "" groupfeed_element_num_views = "" groupfeed_element_start_thread_in_group = "" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "" groupfeed_element_post_vote = "" groupfeed_element_last_post_info = "" diff --git a/src/locale/zh_CN/configure.ini b/src/locale/zh_CN/configure.ini index ebbb59954..620cd9eac 100755 --- a/src/locale/zh_CN/configure.ini +++ b/src/locale/zh_CN/configure.ini @@ -1159,6 +1159,8 @@ groupbar_element_groupfeed = "" groupbar_element_no_path_info = "" groupbar_element_userfeed = "" groupbar_element_myfeeds = "" +groupbar_element_ungrouped_icon = "" +groupbar_element_grouped_icon = "" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "" @@ -1261,7 +1263,6 @@ pageoptions_element_search_time = "" pageoptions_element_test_options = "" pageoptions_element_save_options = "" pageoptions_element_run_tests = "" -pageoptions_element_plugin_back = "" pageoptions_element_load_options = "" pageoptions_element_page_range = "" pageoptions_element_summarizer = "" @@ -1373,9 +1374,11 @@ groupfeed_element_no_posts_yet = "" groupfeed_element_thread_no_exist = "" groupfeed_element_edit = "" groupfeed_element_delete = "" +groupfeed_element_usericon = "" groupfeed_element_num_posts = "" groupfeed_element_num_views = "" groupfeed_element_start_thread_in_group = "" +groupfeed_element_new_thread_icon = "" groupfeed_element_last_edited = "" groupfeed_element_post_vote = "" groupfeed_element_last_post_info = "" diff --git a/src/views/elements/AppearanceElement.php b/src/views/elements/AppearanceElement.php index 918f59627..bcfbe8088 100644 --- a/src/views/elements/AppearanceElement.php +++ b/src/views/elements/AppearanceElement.php @@ -169,7 +169,8 @@ class AppearanceElement extends Element </div> <div class="top-margin"><label for="auxiliary-css"><?= tl('appearance_element_auxiliary_css') ?></label> - <textarea class="short-text-area" name="AUXILIARY_CSS" ><?= + <textarea class="short-text-area" id="auxiliary-css" + name="AUXILIARY_CSS" ><?= $data['AUXILIARY_CSS'] ?></textarea></div> <div class="center"> [<a href="<?= $appearance_url . '&arg=reset' ?>"><?= @@ -180,8 +181,8 @@ class AppearanceElement extends Element <button class="button-box" type="submit"><?= tl('appearance_element_save') ?></button> </div> - </div> - </form> + </form> + </div> </div> <?php } diff --git a/src/views/elements/BotstoryElement.php b/src/views/elements/BotstoryElement.php index 5551b6f41..59ace7fc7 100644 --- a/src/views/elements/BotstoryElement.php +++ b/src/views/elements/BotstoryElement.php @@ -81,7 +81,7 @@ class BotstoryElement extends Element </tr> <tr> <th><?= tl('botstory_element_pattern_header') ?></th> - <th colspan="3"><?= tl('botstory_element_actions')?> + <th colspan="2"><?= tl('botstory_element_actions')?> </th> </tr><?php foreach ($data['PATTERNS'] as $pattern) { diff --git a/src/views/elements/ConfigureElement.php b/src/views/elements/ConfigureElement.php index e8bcf5d01..d915b0af9 100644 --- a/src/views/elements/ConfigureElement.php +++ b/src/views/elements/ConfigureElement.php @@ -144,7 +144,7 @@ class ConfigureElement extends Element tl('configure_element_site_access')?> <?= $this->view->helper("helpbutton")->render( "Search Access", $data[C\CSRF_TOKEN]) ?></legend> - <label for="web-access"><input id='error-info' type="checkbox" + <label for="web-access"><input id='web-access' type="checkbox" name="WEB_ACCESS" value="true" <?php if ( $data['WEB_ACCESS']==true) { e("checked='checked'");}?> @@ -183,7 +183,8 @@ class ConfigureElement extends Element tl('configure_element_robot_description') ?></b></label> </div> - <textarea class="tall-text-area" name="ROBOT_DESCRIPTION" ><?= + <textarea class="tall-text-area" id='robot-description' + name="ROBOT_DESCRIPTION" ><?= $data['ROBOT_DESCRIPTION'] ?></textarea> </fieldset> </div> diff --git a/src/views/elements/GroupbarElement.php b/src/views/elements/GroupbarElement.php index c23889f56..98549b9bc 100644 --- a/src/views/elements/GroupbarElement.php +++ b/src/views/elements/GroupbarElement.php @@ -126,10 +126,10 @@ class GroupbarElement extends Element !isset($data['JUST_USER_ID']) && !$is_wiki) { ?><span style="position:relative;top:5px;" > <a href="<?= $base_query. '&v=ungrouped&'. $token_string - ?>" ><img + ?>" ><img alt="<?=tl('groupbar_element_ungrouped_icon')?>" src="<?=C\BASE_URL ?>resources/list.png" /></a> <a href="<?= $base_query. '&v=grouped&' . $token_string - ?>" ><img + ?>" ><img alt="<?=tl('groupbar_element_grouped_icon')?>" src="<?=C\BASE_URL ?>resources/grouped.png" /></a> </span><?php } diff --git a/src/views/elements/GroupfeedElement.php b/src/views/elements/GroupfeedElement.php index 4d811edfa..4ba39ee4a 100644 --- a/src/views/elements/GroupfeedElement.php +++ b/src/views/elements/GroupfeedElement.php @@ -310,7 +310,8 @@ class GroupfeedElement extends Element implements CrawlConstants ?> <div id='result-<?= $page['ID'] ?>' > <div class="float-same center" > - <img class="feed-user-icon" src="<?=$page['USER_ICON'] ?>" /><br /> + <img class="feed-user-icon" src="<?=$page['USER_ICON'] ?>" + alt="<?=tl('groupfeed_element_usericon') ?>"/><br /> <a class="feed-user-link echo-link" <?= $no_follow ?> href="<?= htmlentities(B\feedsUrl("user", $page['USER_ID'], true, $data['CONTROLLER'])) . $token_string; @@ -366,7 +367,8 @@ class GroupfeedElement extends Element implements CrawlConstants $page[self::SOURCE_NAME]) ?>")' title='<?= tl('groupfeed_element_start_thread_in_group', $page[self::SOURCE_NAME]) ?>'><img - class="new-thread-icon" src='<?=C\BASE_URL + alt="<?=tl('groupfeed_element_new_thread_icon') + ?>" class="new-thread-icon" src='<?=C\BASE_URL ?>resources/new_thread.png' /></a> <?php } diff --git a/src/views/elements/ManageadvertisementsElement.php b/src/views/elements/ManageadvertisementsElement.php index 7be85486f..e749bd5d1 100644 --- a/src/views/elements/ManageadvertisementsElement.php +++ b/src/views/elements/ManageadvertisementsElement.php @@ -379,8 +379,8 @@ class ManageadvertisementsElement extends Element $data["DURATION"] ?>" /> <?php } - $this->view->helper('options')->render('duration', 'DURATION', - $data['DURATIONS'], $data['DURATION'], false, + $this->view->helper('options')->render('ad-duration', + 'DURATION', $data['DURATIONS'], $data['DURATION'], false, $attributes); ?></td></tr> <tr> @@ -395,7 +395,7 @@ class ManageadvertisementsElement extends Element </label></th> <td> <textarea class="short-text-area-two narrow-field" - name="KEYWORDS" placeholder="<?= + id="ad-keywords" name="KEYWORDS" placeholder="<?= tl('manageadvertisements_element_keyword_help')?>" <?php if ($edit_advertisement || isset($data['AD_MIN_BID'])) { e(' readonly="readonly"'); @@ -437,17 +437,7 @@ class ManageadvertisementsElement extends Element type="submit"/></div></td></tr> <?php } - if (!$edit_advertisement) { - ?> - <tr> - <td> - <input type="hidden" id="ad-min-bid" - name="AD_MIN_BID" value="<?= isset($data['AD_MIN_BID']) ? - $data['AD_MIN_BID']:"" ?>" class="narrow-field" /> - </td> - </tr> - <?php - } else { + if ($edit_advertisement) { ?> <tr> <td></td> diff --git a/src/views/elements/ManagecreditsElement.php b/src/views/elements/ManagecreditsElement.php index 5f0cd6067..3632fa974 100644 --- a/src/views/elements/ManagecreditsElement.php +++ b/src/views/elements/ManagecreditsElement.php @@ -118,12 +118,12 @@ class ManagecreditsElement extends Element <input type="hidden" id="credit-token" name="CREDIT_TOKEN" value="" /> <table class='name-table'> - <tr><th class="table-label"><label for="num-credit"><?= + <tr><th class="table-label"><label for="num-credits"><?= tl('managecredit_element_num_credits') ?>: </label></th> <td> <?php - $this->view->helper('options')->render('num-dollars', 'NUM_DOLLARS', + $this->view->helper('options')->render('num-credits', 'NUM_DOLLARS', $data["AMOUNTS"], 0); ?> </td> diff --git a/src/views/elements/ManagelocalesElement.php b/src/views/elements/ManagelocalesElement.php index cc2c53066..00df6d7f1 100644 --- a/src/views/elements/ManagelocalesElement.php +++ b/src/views/elements/ManagelocalesElement.php @@ -209,7 +209,7 @@ class ManagelocalesElement extends Element e(' disabled="disabled" '); } ?> /> - </td><td></td> + </td> </tr> <tr><th><label for="locale-tag"><?= tl('managelocales_element_localetaglabel')?></label></th> diff --git a/src/views/elements/SecurityElement.php b/src/views/elements/SecurityElement.php index d17f81b34..c279d125f 100755 --- a/src/views/elements/SecurityElement.php +++ b/src/views/elements/SecurityElement.php @@ -108,13 +108,13 @@ class SecurityElement extends Element </div> <div class="top-margin"> <fieldset> - <legend><label - for="privacy-mode"><b><?php - e(tl('security_element_privacy')); - e(" " . $this->view->helper("helpbutton")->render( + <legend><b><label + for="privacy-mode"><?=tl('security_element_privacy') ?> + </label> + <?= tl($this->view->helper("helpbutton")->render( "Privacy", $data[C\CSRF_TOKEN])) ?></b> - </label></legend> + </legend> <table> <tr><td> <label><b><?= @@ -149,16 +149,17 @@ class SecurityElement extends Element $data['SEARCH_ANALYTICS_MODE']); ?> </td></tr></table> + </fieldset> </div> <div class="top-margin"> <fieldset> - <legend><label - for="captcha-mode"><b><?php - e(tl('security_element_captcha_type')); - e(" " . $this->view->helper("helpbutton")->render( - "Captcha Type", $data[C\CSRF_TOKEN])) + <legend><b><label + for="captcha-mode"><?=tl('security_element_captcha_type') ?> + </label> + <?=$this->view->helper("helpbutton")->render( + "Captcha Type", $data[C\CSRF_TOKEN]) ?></b> - </label></legend> + </legend> <?php $this->view->helper("options")->render("captcha-mode", "CAPTCHA_MODE", $data['CAPTCHA_MODES'], @@ -174,13 +175,13 @@ class SecurityElement extends Element </div> <div class="top-margin"> <fieldset> - <legend><label - for="recovery-mode"><b><?php - e(tl('security_element_recovery_type')); - e(" " . $this->view->helper("helpbutton")->render( - "Recovery Type", $data[C\CSRF_TOKEN])) + <legend><b><label + for="recovery-mode"><?=tl('security_element_recovery_type')?> + </label> + <?=$this->view->helper("helpbutton")->render( + "Recovery Type", $data[C\CSRF_TOKEN]) ?></b> - </label></legend> + </legend> <?php $this->view->helper("options")->render("recovery-mode", "RECOVERY_MODE", $data['RECOVERY_MODES'], diff --git a/src/views/elements/ServersettingsElement.php b/src/views/elements/ServersettingsElement.php index 15735d693..cbb5ea461 100644 --- a/src/views/elements/ServersettingsElement.php +++ b/src/views/elements/ServersettingsElement.php @@ -126,7 +126,7 @@ class ServersettingsElement extends Element <div class="top-margin"><b><label for="database-host"><?= tl('serversettings_element_databasehost') ?></label></b> - <input type="text" id="database-user" name="DB_HOST" + <input type="text" id="database-host" name="DB_HOST" value="<?= $data['DB_HOST'] ?>" class="wide-field" /> </div> @@ -150,12 +150,12 @@ class ServersettingsElement extends Element </div> <div class = "top-margin"> <fieldset > - <legend><label - for="account-registration"><?= - tl('serversettings_element_account_registration'). - " " .$this->view->helper("helpbutton")->render( - "Account Registration",$data[c\CSRF_TOKEN]) - ?></label></legend> + <legend><label for="account-registration"><?= + tl('serversettings_element_account_registration') ?> + </label> + <?= $this->view->helper("helpbutton")->render( + "Account Registration", $data[c\CSRF_TOKEN]) + ?></legend> <?php $this->view->helper("options")->render( "account-registration", "REGISTRATION_TYPE", $data['REGISTRATION_TYPES'], @@ -164,7 +164,7 @@ class ServersettingsElement extends Element <div id="registration-info"> <div class="top-margin"><b><label for="mail-sender"><?= tl('serversettings_element_mail_sender')?></label></b> - <input type="email" id="mail-server" name="MAIL_SENDER" + <input type="email" id="mail-sender" name="MAIL_SENDER" value="<?= $data['MAIL_SENDER'] ?>" class="wide-field" /> </div> @@ -191,7 +191,7 @@ class ServersettingsElement extends Element value="<?=$data['MAIL_SERVER'] ?>" class="wide-field" /> </div> - <div class="top-margin"><b><label for="mail-serverport"><?= + <div class="top-margin"><b><label for="mail-port"><?= tl('serversettings_element_mail_serverport') ?></label></b> <input type="text" id="mail-port" name="MAIL_SERVERPORT" @@ -254,9 +254,9 @@ class ServersettingsElement extends Element " " . $this->view->helper("helpbutton")->render( "Monetization", $data[C\CSRF_TOKEN]) ?></legend> <div> - <legend><label for="monetization-type"><?= + <label for="monetization-type"><?= tl('serversettings_element_monetization_type') - ?></label></legend> + ?></label> <?php $this->view->helper("options")->render( "monetization-type", "MONETIZATION_TYPE", $data['MONETIZATION_TYPES'], @@ -277,23 +277,24 @@ class ServersettingsElement extends Element </div> <div id="ad-location-info"> <br /><b><?=tl('serversettings_element_ad_location') ?></b><br /> - <input type='radio' name='AD_LOCATION' value="top" - onchange="showHideScriptdiv();" <?= + <input id='ad-location-top' type='radio' name='AD_LOCATION' + value="top" onchange="showHideScriptdiv();" <?= ($data['AD_LOCATION'] == 'top') ?'checked' : '' ?> /><label for="ad-location-top"><?= tl('serversettings_element_top') ?></label> - <input type='radio' name='AD_LOCATION' value="side" - onclick="showHideScriptdiv();" <?= + <input id='ad-location-side' type='radio' name='AD_LOCATION' + value="side" onclick="showHideScriptdiv();" <?= ($data['AD_LOCATION'] == 'side') ? - 'checked' : '' ?> /><label for="ad-location-top"><?= + 'checked' : '' ?> /><label for="ad-location-side"><?= tl('serversettings_element_side') ?></label> - <input type='radio' name='AD_LOCATION' value="both" + <input type='radio' id='ad-location-both' + name='AD_LOCATION' value="both" onclick="showHideScriptdiv();" <?= ($data['AD_LOCATION'] == 'both') ? 'checked' :'' ?> /><label for="ad-location-both"><?= tl('serversettings_element_both') ?></label> - <input type='radio' name='AD_LOCATION' value="none" - onclick="showHideScriptdiv();" <?= + <input type='radio' id='ad-location-none' name='AD_LOCATION' + value="none" onclick="showHideScriptdiv();" <?= ($data['AD_LOCATION'] == 'none') ? 'checked' : '' ?> /><label for="ad-location-none"><?= tl('serversettings_element_none') ?></label> @@ -328,9 +329,9 @@ class ServersettingsElement extends Element " " . $this->view->helper("helpbutton")->render( "Bot Configuration", $data[C\CSRF_TOKEN]) ?></legend> <div> - <legend><label for="bot-configuration"><?= + <label for="bot-configuration"><?= tl('serversettings_element_bot_settings') - ?></label></legend> + ?></label> <?php $this->view->helper("options")->render( "bot-configuration","CONFIGURE_BOT", $data['CONFIGURE_BOTS'], diff --git a/src/views/helpers/FileuploadHelper.php b/src/views/helpers/FileuploadHelper.php index ee6d8d74c..7fd5dfc5a 100644 --- a/src/views/helpers/FileuploadHelper.php +++ b/src/views/helpers/FileuploadHelper.php @@ -82,7 +82,7 @@ class FileUploadHelper extends Helper name="<?= $form_name ?>" class="none" <?php if ($drop_kind == "image") { - e(' accept="image/*" capture="true" '); + e(' accept="image/*" '); } else if ($multiple) { e(' multiple="multiple" '); } ?> /> diff --git a/src/views/helpers/PagingtableHelper.php b/src/views/helpers/PagingtableHelper.php index e149d8bc6..0f5f4bc05 100644 --- a/src/views/helpers/PagingtableHelper.php +++ b/src/views/helpers/PagingtableHelper.php @@ -318,7 +318,7 @@ class PagingtableHelper extends Helper href="javascript:toggleDisplay('<?= $toggle_id ?>')" ><b>⊞</b></a><?php } else { ?> - <b class='admin-add-link light-gray'>⊞</b></a><?php + <b class='admin-add-link light-gray'>⊞</b><?php } }?> </h2><?php diff --git a/src/views/helpers/SearchformHelper.php b/src/views/helpers/SearchformHelper.php index 5a45a8b43..05d8d0dc9 100644 --- a/src/views/helpers/SearchformHelper.php +++ b/src/views/helpers/SearchformHelper.php @@ -103,20 +103,14 @@ class SearchformHelper extends Helper e("<tr><td class='table-label'><label for='{$name}-id'>". "$label:</label>"); e($item_sep); - ?> - <style> - #<?= $name ?>-comparison { - width:100%; - } - </style> - <?php $view->helper("options")->render( "{$name}-comparison", "${name}_comparison", - $comparison_types, $data["{$name}_comparison"]); + $comparison_types, $data["{$name}_comparison"], false, + ['class' => 'full-width']); e($item_sep_center); $out_name = $name; if ($postfix != "") { - $out_name = $name."_$postfix"; + $out_name = $name . "_$postfix"; } if (isset($dropdowns[$name]) && in_array($dropdowns[$name], ['date', 'time'])) { @@ -143,16 +137,13 @@ class SearchformHelper extends Helper $dropdowns[$name] = ['-1' => tl('searchform_helper_any')] + $dropdowns[$name]; - ?> - <style> - #<?= $name ?>-id { - width:100%; + if ($data["{$out_name}"] == "") { + $data["{$out_name}"] = '-1'; } - </style> - <?php - if ($data["{$out_name}"] == "") { $data["{$out_name}"] = '-1'; } $view->helper("options")->render("{$name}-id", - "{$out_name}", $dropdowns[$name], $data["{$out_name}"]); + "{$out_name}", $dropdowns[$name], $data["{$out_name}"], + false, ['class' => 'full-width']); + ?><?php } else { e("<input type='text' id='{$name}-id' name='$out_name' ". "maxlength='". C\LONG_NAME_LEN. "' ". @@ -171,7 +162,7 @@ class SearchformHelper extends Helper } ?>><button class="button-box" type="submit"><?= tl('searchform_helper_search') - ?></button></td> + ?></button></td><td></td> </tr> </table> </form>