浏览代码

2018-03-19

Visman 7 年之前
父节点
当前提交
c113435be3

+ 5 - 5
app/Models/Pages/Admin/Categories.php

@@ -76,7 +76,7 @@ class Categories extends Admin
                 'type'      => 'text',
                 'maxlength' => 80,
                 'value'     => $row['cat_name'],
-                'title'     => \ForkBB\__('Category name label'),
+                'caption'     => \ForkBB\__('Category name label'),
                 'required'  => true,
             ];
             $fieldset["form[{$key}][disp_position]"] = [
@@ -85,13 +85,13 @@ class Categories extends Admin
                 'min'   => 0,
                 'max'   => 9999999999,
                 'value' => $row['disp_position'],
-                'title' => \ForkBB\__('Category position label'),
+                'caption' => \ForkBB\__('Category position label'),
             ];
             $fieldset[] = [
                 'class' => ['delete', 'inline'],
                 'type'  => 'btn',
                 'value' => '❌',
-                'title' => \ForkBB\__('Delete'),
+                'caption' => \ForkBB\__('Delete'),
                 'link'  => $this->c->Router->link('AdminCategoriesDelete', ['id' => $key]),
             ];
         }
@@ -105,7 +105,7 @@ class Categories extends Admin
                     'class'     => 'new',
                     'type'      => 'text',
                     'maxlength' => 80,
-                    'title'     => \ForkBB\__('Add category label'),
+                    'caption'     => \ForkBB\__('Add category label'),
                     'info'      => \ForkBB\__('Add category help', $this->c->Router->link('AdminForums'), \ForkBB\__('Forums')),
                 ],
             ],
@@ -189,7 +189,7 @@ class Categories extends Admin
         $form['sets'][] = [
             'fields' => [
                 'confirm' => [
-                    'title'   => \ForkBB\__('Confirm delete'),
+                    'caption'   => \ForkBB\__('Confirm delete'),
                     'type'    => 'checkbox',
                     'label'   => \ForkBB\__('I want to delete the category %s', $category['cat_name']),
                     'value'   => '1',

+ 5 - 5
app/Models/Pages/Admin/Censoring.php

@@ -60,7 +60,7 @@ class Censoring extends Admin
                             'type'   => 'radio',
                             'value'  => $this->c->config->o_censoring,
                             'values' => [1 => \ForkBB\__('Yes'), 0 => \ForkBB\__('No')],
-                            'title'  => \ForkBB\__('Censor words label'),
+                            'caption'  => \ForkBB\__('Censor words label'),
                             'info'   => \ForkBB\__('Censor words help'),
                         ],
                     ],
@@ -91,14 +91,14 @@ class Censoring extends Admin
                 'type'      => 'text',
                 'maxlength' => 60,
                 'value'     => $row['search_for'],
-                'title'     => \ForkBB\__('Censored word label'),
+                'caption'     => \ForkBB\__('Censored word label'),
             ];
             $fieldset["form[{$id}][replace_with]"] = [
                 'class'     => ['censor', 'inline'],
                 'type'      => 'text',
                 'maxlength' => 60,
                 'value'     => $row['replace_with'],
-                'title'     => \ForkBB\__('Replacement label'),
+                'caption'     => \ForkBB\__('Replacement label'),
             ];
         }
         $fieldset["form[0][search_for]"] = [
@@ -106,14 +106,14 @@ class Censoring extends Admin
             'type'      => 'text',
             'maxlength' => 60,
             'value'     => '',
-            'title'     => \ForkBB\__('Censored word label'),
+            'caption'     => \ForkBB\__('Censored word label'),
         ];
         $fieldset["form[0][replace_with]"] = [
             'class'     => ['censor', 'inline'],
             'type'      => 'text',
             'maxlength' => 60,
             'value'     => '',
-            'title'     => \ForkBB\__('Replacement label'),
+            'caption'     => \ForkBB\__('Replacement label'),
         ];
 
         $form['sets'][] = [

+ 12 - 12
app/Models/Pages/Admin/Forums.php

@@ -171,7 +171,7 @@ class Forums extends Admin
                     'class'     => ['name', 'inline', 'depth' . $forum->depth],
                     'type'      => 'btn',
                     'value'     => $forum->forum_name,
-                    'title'     => \ForkBB\__('Forum label'),
+                    'caption'     => \ForkBB\__('Forum label'),
                     'link'      => $this->c->Router->link('AdminForumsEdit', ['id' => $forum->id]),
                 ];
                 $fieldset["form[{$forum->id}][disp_position]"] = [
@@ -180,14 +180,14 @@ class Forums extends Admin
                     'min'   => 0,
                     'max'   => 9999999999,
                     'value' => $forum->disp_position,
-                    'title' => \ForkBB\__('Position label'),
+                    'caption' => \ForkBB\__('Position label'),
                 ];
                 $disabled = (bool) $forum->subforums;
                 $fieldset[] = [
                     'class'       => ['delete', 'inline'],
                     'type'     => 'btn',
                     'value'    => '❌',
-                    'title'    => \ForkBB\__('Delete'),
+                    'caption'    => \ForkBB\__('Delete'),
                     'link'     => $disabled ? '#' : $this->c->Router->link('AdminForumsDelete', ['id' => $forum->id]),
                     'disabled' => $disabled,
                 ];
@@ -277,7 +277,7 @@ class Forums extends Admin
         $form['sets'][] = [
             'fields' => [
                 'confirm' => [
-                    'title'   => \ForkBB\__('Confirm delete'),
+                    'caption'   => \ForkBB\__('Confirm delete'),
                     'type'    => 'checkbox',
                     'label'   => \ForkBB\__('I want to delete forum %s', $forum->forum_name),
                     'value'   => '1',
@@ -447,19 +447,19 @@ class Forums extends Admin
                     'type'      => 'text',
                     'maxlength' => 80,
                     'value'     => $forum->forum_name,
-                    'title'     => \ForkBB\__('Forum name label'),
+                    'caption'     => \ForkBB\__('Forum name label'),
                     'required'  => true,
                 ],
                 'forum_desc' => [
                     'type'      => 'textarea',
                     'value'     => $forum->forum_desc,
-                    'title'     => \ForkBB\__('Forum description label'),
+                    'caption'     => \ForkBB\__('Forum description label'),
                 ],
                 'parent' => [
                     'type'     => 'select',
                     'options'  => $this->listForOptions,
                     'value'    => $forum->parent_forum_id ? $forum->parent_forum_id : -$forum->cat_id,
-                    'title'    => \ForkBB\__('Parent label'),
+                    'caption'    => \ForkBB\__('Parent label'),
                     'info'     => \ForkBB\__('Parent help'),
                     'required' => true,
                 ],
@@ -471,13 +471,13 @@ class Forums extends Admin
                         2 => \ForkBB\__('Subject option'),
                     ],
                     'value'   => $forum->sort_by,
-                    'title'   => \ForkBB\__('Sort by label'),
+                    'caption'   => \ForkBB\__('Sort by label'),
                 ],
                 'redirect_url' => [
                     'type'      => 'text',
                     'maxlength' => 255,
                     'value'     => $forum->redirect_url,
-                    'title'     => \ForkBB\__('Redirect label'),
+                    'caption'     => \ForkBB\__('Redirect label'),
                     'info'      => \ForkBB\__('Redirect help'),
                     'disabled'  => $forum->num_topics || $forum->subforums ? true : null,
                 ],
@@ -502,7 +502,7 @@ class Forums extends Admin
                 'class'    => $group->def_read_forum ? $aOn : $aOff,
                 'type'     => 'checkbox',
                 'value'    => '1',
-                'title'    => \ForkBB\__('Read forum label'),
+                'caption'    => \ForkBB\__('Read forum label'),
                 'label'    => \ForkBB\__('<span></span>'),
                 'checked'  => $group->set_read_forum,
                 'disabled' => $group->dis_read_forum,
@@ -511,7 +511,7 @@ class Forums extends Admin
                 'class'    => $group->def_post_replies ? $aOn : $aOff,
                 'type'     => 'checkbox',
                 'value'    => '1',
-                'title'    => \ForkBB\__('Post replies label'),
+                'caption'    => \ForkBB\__('Post replies label'),
                 'label'    => \ForkBB\__('<span></span>'),
                 'checked'  => $group->set_post_replies,
                 'disabled' => $group->dis_post_replies,
@@ -520,7 +520,7 @@ class Forums extends Admin
                 'class'    => $group->def_post_topics ? $aOn : $aOff,
                 'type'     => 'checkbox',
                 'value'    => '1',
-                'title'    => \ForkBB\__('Post topics label'),
+                'caption'    => \ForkBB\__('Post topics label'),
                 'label'    => \ForkBB\__('<span></span>'),
                 'checked'  => $group->set_post_topics,
                 'disabled' => $group->dis_post_topics,

+ 31 - 31
app/Models/Pages/Admin/Groups.php

@@ -62,7 +62,7 @@ class Groups extends Admin
                         'type'      => 'select',
                         'options'   => $this->groupsNew,
                         'value'     => $this->c->config->o_default_user_group,
-                        'title'     => \ForkBB\__('New group label'),
+                        'caption'     => \ForkBB\__('New group label'),
                         'info'      => \ForkBB\__('New group help'),
 #                       'autofocus' => true,
                     ],
@@ -87,7 +87,7 @@ class Groups extends Admin
                         'type'    => 'select',
                         'options' => $this->groupsDefault,
                         'value'   => $this->c->config->o_default_user_group,
-                        'title'   => \ForkBB\__('Default group label'),
+                        'caption'   => \ForkBB\__('Default group label'),
                         'info'    => \ForkBB\__('Default group help'),
                     ],
                 ],
@@ -347,7 +347,7 @@ class Groups extends Admin
             'type'      => 'text',
             'maxlength' => 50,
             'value'     => $group->g_title,
-            'title'     => \ForkBB\__('Group title label'),
+            'caption'     => \ForkBB\__('Group title label'),
             'required'  => true,
 #           'autofocus' => true,
         ];
@@ -355,7 +355,7 @@ class Groups extends Admin
             'type'      => 'text',
             'maxlength' => 50,
             'value'     => $group->g_user_title,
-            'title'     => \ForkBB\__('User title label'),
+            'caption'     => \ForkBB\__('User title label'),
             'info'      => \ForkBB\__('User title help', $group->groupGuest ? \ForkBB\__('Guest') : \ForkBB\__('Member')),
         ];
 
@@ -380,7 +380,7 @@ class Groups extends Admin
                 'type'    => 'select',
                 'options' => $options,
                 'value'   => $group->g_promote_next_group,
-                'title'   => \ForkBB\__('Promote users label'),
+                'caption'   => \ForkBB\__('Promote users label'),
                 'info'    => \ForkBB\__('Promote users help', \ForkBB\__('Disable promotion')),
             ];
             $fieldset['g_promote_min_posts'] = [
@@ -388,7 +388,7 @@ class Groups extends Admin
                 'min'   => 0,
                 'max'   => 9999999999,
                 'value' => $group->g_promote_min_posts,
-                'title' => \ForkBB\__('Number for promotion label'),
+                'caption' => \ForkBB\__('Number for promotion label'),
                 'info'  => \ForkBB\__('Number for promotion help'),
             ];
         }
@@ -400,42 +400,42 @@ class Groups extends Admin
                 'type'   => 'radio',
                 'value'  => $group->g_moderator,
                 'values' => $yn,
-                'title'  => \ForkBB\__('Mod privileges label'),
+                'caption'  => \ForkBB\__('Mod privileges label'),
                 'info'   => \ForkBB\__('Mod privileges help'),
             ];
             $fieldset['g_mod_edit_users'] = [
                 'type'   => 'radio',
                 'value'  => $group->g_mod_edit_users,
                 'values' => $yn,
-                'title'  => \ForkBB\__('Edit profile label'),
+                'caption'  => \ForkBB\__('Edit profile label'),
                 'info'   => \ForkBB\__('Edit profile help'),
             ];
             $fieldset['g_mod_rename_users'] = [
                 'type'   => 'radio',
                 'value'  => $group->g_mod_rename_users,
                 'values' => $yn,
-                'title'  => \ForkBB\__('Rename users label'),
+                'caption'  => \ForkBB\__('Rename users label'),
                 'info'   => \ForkBB\__('Rename users help'),
             ];
             $fieldset['g_mod_change_passwords'] = [
                 'type'   => 'radio',
                 'value'  => $group->g_mod_change_passwords,
                 'values' => $yn,
-                'title'  => \ForkBB\__('Change passwords label'),
+                'caption'  => \ForkBB\__('Change passwords label'),
                 'info'   => \ForkBB\__('Change passwords help'),
             ];
             $fieldset['g_mod_promote_users'] = [
                 'type'   => 'radio',
                 'value'  => $group->g_mod_promote_users,
                 'values' => $yn,
-                'title'  => \ForkBB\__('Mod promote users label'),
+                'caption'  => \ForkBB\__('Mod promote users label'),
                 'info'   => \ForkBB\__('Mod promote users help'),
             ];
             $fieldset['g_mod_ban_users'] = [
                 'type'   => 'radio',
                 'value'  => $group->g_mod_ban_users,
                 'values' => $yn,
-                'title'  => \ForkBB\__('Ban users label'),
+                'caption'  => \ForkBB\__('Ban users label'),
                 'info'   => \ForkBB\__('Ban users help'),
             ];
         }
@@ -444,28 +444,28 @@ class Groups extends Admin
             'type'   => 'radio',
             'value'  => $group->g_read_board,
             'values' => $yn,
-            'title'  => \ForkBB\__('Read board label'),
+            'caption'  => \ForkBB\__('Read board label'),
             'info'   => \ForkBB\__('Read board help'),
         ];
         $fieldset['g_view_users'] = [
             'type'   => 'radio',
             'value'  => $group->g_view_users,
             'values' => $yn,
-            'title'  => \ForkBB\__('View user info label'),
+            'caption'  => \ForkBB\__('View user info label'),
             'info'   => \ForkBB\__('View user info help'),
         ];
         $fieldset['g_post_replies'] = [
             'type'   => 'radio',
             'value'  => $group->g_post_replies,
             'values' => $yn,
-            'title'  => \ForkBB\__('Post replies label'),
+            'caption'  => \ForkBB\__('Post replies label'),
             'info'   => \ForkBB\__('Post replies help'),
         ];
         $fieldset['g_post_topics'] = [
             'type'   => 'radio',
             'value'  => $group->g_post_topics,
             'values' => $yn,
-            'title'  => \ForkBB\__('Post topics label'),
+            'caption'  => \ForkBB\__('Post topics label'),
             'info'   => \ForkBB\__('Post topics help'),
         ];
 
@@ -474,21 +474,21 @@ class Groups extends Admin
                 'type'   => 'radio',
                 'value'  => $group->g_edit_posts,
                 'values' => $yn,
-                'title'  => \ForkBB\__('Edit posts label'),
+                'caption'  => \ForkBB\__('Edit posts label'),
                 'info'   => \ForkBB\__('Edit posts help'),
             ];
             $fieldset['g_delete_posts'] = [
                 'type'   => 'radio',
                 'value'  => $group->g_delete_posts,
                 'values' => $yn,
-                'title'  => \ForkBB\__('Delete posts label'),
+                'caption'  => \ForkBB\__('Delete posts label'),
                 'info'   => \ForkBB\__('Delete posts help'),
             ];
             $fieldset['g_delete_topics'] = [
                 'type'   => 'radio',
                 'value'  => $group->g_delete_topics,
                 'values' => $yn,
-                'title'  => \ForkBB\__('Delete topics label'),
+                'caption'  => \ForkBB\__('Delete topics label'),
                 'info'   => \ForkBB\__('Delete topics help'),
             ];
             $fieldset['g_deledit_interval'] = [
@@ -496,14 +496,14 @@ class Groups extends Admin
                 'min'   => 0,
                 'max'   => 999999,
                 'value' => $group->g_deledit_interval,
-                'title' => \ForkBB\__('Delete-edit interval label'),
+                'caption' => \ForkBB\__('Delete-edit interval label'),
                 'info'  => \ForkBB\__('Delete-edit interval help'),
             ];
             $fieldset['g_set_title'] = [
                 'type'   => 'radio',
                 'value'  => $group->g_set_title,
                 'values' => $yn,
-                'title'  => \ForkBB\__('Set own title label'),
+                'caption'  => \ForkBB\__('Set own title label'),
                 'info'   => \ForkBB\__('Set own title help'),
             ];
         }
@@ -512,21 +512,21 @@ class Groups extends Admin
             'type'   => 'radio',
             'value'  => $group->g_post_links,
             'values' => $yn,
-            'title'  => \ForkBB\__('Post links label'),
+            'caption'  => \ForkBB\__('Post links label'),
             'info'   => \ForkBB\__('Post links help'),
         ];
         $fieldset['g_search'] = [
             'type'   => 'radio',
             'value'  => $group->g_search,
             'values' => $yn,
-            'title'  => \ForkBB\__('User search label'),
+            'caption'  => \ForkBB\__('User search label'),
             'info'   => \ForkBB\__('User search help'),
         ];
         $fieldset['g_search_users'] = [
             'type'   => 'radio',
             'value'  => $group->g_search_users,
             'values' => $yn,
-            'title'  => \ForkBB\__('User list search label'),
+            'caption'  => \ForkBB\__('User list search label'),
             'info'   => \ForkBB\__('User list search help'),
         ];
 
@@ -535,7 +535,7 @@ class Groups extends Admin
                 'type'   => 'radio',
                 'value'  => $group->g_send_email,
                 'values' => $yn,
-                'title'  => \ForkBB\__('Send e-mails label'),
+                'caption'  => \ForkBB\__('Send e-mails label'),
                 'info'   => \ForkBB\__('Send e-mails help'),
             ];
         }
@@ -545,7 +545,7 @@ class Groups extends Admin
             'min'   => 0,
             'max'   => 999999,
             'value' => $group->g_post_flood,
-            'title' => \ForkBB\__('Post flood label'),
+            'caption' => \ForkBB\__('Post flood label'),
             'info'  => \ForkBB\__('Post flood help'),
         ];
         $fieldset['g_search_flood'] = [
@@ -553,7 +553,7 @@ class Groups extends Admin
             'min'   => 0,
             'max'   => 999999,
             'value' => $group->g_search_flood,
-            'title' => \ForkBB\__('Search flood label'),
+            'caption' => \ForkBB\__('Search flood label'),
             'info'  => \ForkBB\__('Search flood help'),
         ];
 
@@ -563,7 +563,7 @@ class Groups extends Admin
                 'min'   => 0,
                 'max'   => 999999,
                 'value' => $group->g_email_flood,
-                'title' => \ForkBB\__('E-mail flood label'),
+                'caption' => \ForkBB\__('E-mail flood label'),
                 'info'  => \ForkBB\__('E-mail flood help'),
             ];
             $fieldset['g_report_flood'] = [
@@ -571,7 +571,7 @@ class Groups extends Admin
                 'min'   => 0,
                 'max'   => 999999,
                 'value' => $group->g_report_flood,
-                'title' => \ForkBB\__('Report flood label'),
+                'caption' => \ForkBB\__('Report flood label'),
                 'info'  => \ForkBB\__('Report flood help'),
             ];
         }
@@ -683,7 +683,7 @@ class Groups extends Admin
                         'type'      => 'select',
                         'options'   => $groups,
                         'value'     => $this->c->config->o_default_user_group,
-                        'title'     => \ForkBB\__('Move users label'),
+                        'caption'     => \ForkBB\__('Move users label'),
                         'info'      => \ForkBB\__('Move users info', $group->g_title, $count),
                     ],
                 ],
@@ -693,7 +693,7 @@ class Groups extends Admin
         $form['sets'][] = [
             'fields' => [
                 'confirm' => [
-                    'title'   => \ForkBB\__('Confirm delete'),
+                    'caption'   => \ForkBB\__('Confirm delete'),
                     'type'    => 'checkbox',
                     'label'   => \ForkBB\__('I want to delete this group', $group->g_title),
                     'value'   => '1',

+ 5 - 5
app/Models/Pages/Admin/Maintenance.php

@@ -62,13 +62,13 @@ class Maintenance extends Admin
                             'type'   => 'radio',
                             'value'  => $config->o_maintenance,
                             'values' => [1 => \ForkBB\__('Yes'), 0 => \ForkBB\__('No')],
-                            'title'  => \ForkBB\__('Maintenance mode label'),
+                            'caption'  => \ForkBB\__('Maintenance mode label'),
                             'info'   => \ForkBB\__('Maintenance mode help'),
                         ],
                         'o_maintenance_message' => [
                             'type'      => 'textarea',
                             'value'     => $config->o_maintenance_message,
-                            'title'     => \ForkBB\__('Maintenance message label'),
+                            'caption'     => \ForkBB\__('Maintenance message label'),
                             'info'      => \ForkBB\__('Maintenance message help'),
                         ],
                     ],
@@ -105,7 +105,7 @@ class Maintenance extends Admin
                             'min'   => 1,
                             'max'   => 9999,
                             'value' => 100,
-                            'title' => \ForkBB\__('Posts per cycle label'),
+                            'caption' => \ForkBB\__('Posts per cycle label'),
                             'info'  => \ForkBB\__('Posts per cycle help'),
                         ],
                         'start' => [
@@ -113,14 +113,14 @@ class Maintenance extends Admin
                             'min'   => 1,
                             'max'   => 9999999999,
                             'value' => 1,
-                            'title' => \ForkBB\__('Starting post label'),
+                            'caption' => \ForkBB\__('Starting post label'),
                             'info'  => \ForkBB\__('Starting post help'),
                         ],
                         'clear' => [
                             'type'    => 'checkbox',
                             'value'   => '1',
                             'checked' => true,
-                            'title'   => \ForkBB\__('Empty index label'),
+                            'caption'   => \ForkBB\__('Empty index label'),
                             'label'   => \ForkBB\__('Empty index help'),
                         ],
                     ],

+ 57 - 57
app/Models/Pages/Admin/Options.php

@@ -215,7 +215,7 @@ class Options extends Admin
                     'type'      => 'text',
                     'maxlength' => 255,
                     'value'     => $config->o_board_title,
-                    'title'     => \ForkBB\__('Board title label'),
+                    'caption'     => \ForkBB\__('Board title label'),
                     'info'      => \ForkBB\__('Board title help'),
                     'required'  => true,
 #                   'autofocus' => true,
@@ -223,7 +223,7 @@ class Options extends Admin
                 'o_board_desc' => [
                     'type'      => 'textarea',
                     'value'     => $config->o_board_desc,
-                    'title'     => \ForkBB\__('Board desc label'),
+                    'caption'     => \ForkBB\__('Board desc label'),
                     'info'      => \ForkBB\__('Board desc help'),
                 ],
                 'o_default_timezone' => [
@@ -271,28 +271,28 @@ class Options extends Admin
                         '14'    => \ForkBB\__('UTC+14:00'),
                     ],
                     'value'   => $config->o_default_timezone,
-                    'title'   => \ForkBB\__('Timezone label'),
+                    'caption'   => \ForkBB\__('Timezone label'),
                     'info'    => \ForkBB\__('Timezone help'),
                 ],
                 'o_default_dst' => [
                     'type'   => 'radio',
                     'value'  => $config->o_default_dst,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('DST label'),
+                    'caption'  => \ForkBB\__('DST label'),
                     'info'   => \ForkBB\__('DST help'),
                 ],
                 'o_default_lang' => [
                     'type'    => 'select',
                     'options' => $langs,
                     'value'   => $config->o_default_lang,
-                    'title'   => \ForkBB\__('Language label'),
+                    'caption'   => \ForkBB\__('Language label'),
                     'info'    => \ForkBB\__('Language help'),
                 ],
                 'o_default_style' => [
                     'type'    => 'select',
                     'options' => $styles,
                     'value'   => $config->o_default_style,
-                    'title'   => \ForkBB\__('Default style label'),
+                    'caption'   => \ForkBB\__('Default style label'),
                     'info'    => \ForkBB\__('Default style help'),
                 ],
             ],
@@ -309,7 +309,7 @@ class Options extends Admin
                     'type'      => 'text',
                     'maxlength' => 25,
                     'value'     => $config->o_time_format,
-                    'title'     => \ForkBB\__('Time format label'),
+                    'caption'     => \ForkBB\__('Time format label'),
                     'info'      => \ForkBB\__('Time format help', $time),
                     'required'  => true,
                 ],
@@ -317,7 +317,7 @@ class Options extends Admin
                     'type'      => 'text',
                     'maxlength' => 25,
                     'value'     => $config->o_date_format,
-                    'title'     => \ForkBB\__('Date format label'),
+                    'caption'     => \ForkBB\__('Date format label'),
                     'info'      => \ForkBB\__('Date format help', $date),
                     'required'  => true,
                 ],
@@ -326,7 +326,7 @@ class Options extends Admin
                     'min'   => 0,
                     'max'   => 99999,
                     'value' => $config->o_timeout_visit,
-                    'title' => \ForkBB\__('Visit timeout label'),
+                    'caption' => \ForkBB\__('Visit timeout label'),
                     'info'  => \ForkBB\__('Visit timeout help'),
                 ],
                 'o_timeout_online' => [
@@ -334,7 +334,7 @@ class Options extends Admin
                     'min'   => 0,
                     'max'   => 99999,
                     'value' => $config->o_timeout_online,
-                    'title' => \ForkBB\__('Online timeout label'),
+                    'caption' => \ForkBB\__('Online timeout label'),
                     'info'  => \ForkBB\__('Online timeout help'),
                 ],
                 'o_redirect_delay' => [
@@ -342,7 +342,7 @@ class Options extends Admin
                     'min'   => 0,
                     'max'   => 99999,
                     'value' => $config->o_redirect_delay,
-                    'title' => \ForkBB\__('Redirect time label'),
+                    'caption' => \ForkBB\__('Redirect time label'),
                     'info'  => \ForkBB\__('Redirect time help'),
                 ],
             ],
@@ -355,35 +355,35 @@ class Options extends Admin
                     'type'   => 'radio',
                     'value'  => $config->o_show_user_info,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Info in posts label'),
+                    'caption'  => \ForkBB\__('Info in posts label'),
                     'info'   => \ForkBB\__('Info in posts help'),
                 ],
                 'o_show_post_count' => [
                     'type'   => 'radio',
                     'value'  => $config->o_show_post_count,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Post count label'),
+                    'caption'  => \ForkBB\__('Post count label'),
                     'info'   => \ForkBB\__('Post count help'),
                 ],
                 'o_smilies' => [
                     'type'   => 'radio',
                     'value'  => $config->o_smilies,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Smilies label'),
+                    'caption'  => \ForkBB\__('Smilies label'),
                     'info'   => \ForkBB\__('Smilies help'),
                 ],
                 'o_smilies_sig' => [
                     'type'   => 'radio',
                     'value'  => $config->o_smilies_sig,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Smilies sigs label'),
+                    'caption'  => \ForkBB\__('Smilies sigs label'),
                     'info'   => \ForkBB\__('Smilies sigs help'),
                 ],
                 'o_make_links' => [
                     'type'   => 'radio',
                     'value'  => $config->o_make_links,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Clickable links label'),
+                    'caption'  => \ForkBB\__('Clickable links label'),
                     'info'   => \ForkBB\__('Clickable links help'),
                 ],
                 'o_disp_topics_default' => [
@@ -391,7 +391,7 @@ class Options extends Admin
                     'min'   => 10,
                     'max'   => 50,
                     'value' => $config->o_disp_topics_default,
-                    'title' => \ForkBB\__('Topics per page label'),
+                    'caption' => \ForkBB\__('Topics per page label'),
                     'info'  => \ForkBB\__('Topics per page help'),
                 ],
                 'o_disp_posts_default' => [
@@ -399,7 +399,7 @@ class Options extends Admin
                     'min'   => 10,
                     'max'   => 50,
                     'value' => $config->o_disp_posts_default,
-                    'title' => \ForkBB\__('Posts per page label'),
+                    'caption' => \ForkBB\__('Posts per page label'),
                     'info'  => \ForkBB\__('Posts per page help'),
                 ],
                 'o_disp_users' => [
@@ -407,7 +407,7 @@ class Options extends Admin
                     'min'   => 10,
                     'max'   => 50,
                     'value' => $config->o_disp_users,
-                    'title' => \ForkBB\__('Users per page label'),
+                    'caption' => \ForkBB\__('Users per page label'),
                     'info'  => \ForkBB\__('Users per page help'),
                 ],
                 'o_topic_review' => [
@@ -415,7 +415,7 @@ class Options extends Admin
                     'min'   => 0,
                     'max'   => 50,
                     'value' => $config->o_topic_review,
-                    'title' => \ForkBB\__('Topic review label'),
+                    'caption' => \ForkBB\__('Topic review label'),
                     'info'  => \ForkBB\__('Topic review help'),
                 ],
                 'o_indent_num_spaces' => [
@@ -423,7 +423,7 @@ class Options extends Admin
                     'min'   => 0,
                     'max'   => 99,
                     'value' => $config->o_indent_num_spaces,
-                    'title' => \ForkBB\__('Indent label'),
+                    'caption' => \ForkBB\__('Indent label'),
                     'info'  => \ForkBB\__('Indent help'),
                 ],
                 'o_quote_depth' => [
@@ -431,7 +431,7 @@ class Options extends Admin
                     'min'   => 0,
                     'max'   => 9,
                     'value' => $config->o_quote_depth,
-                    'title' => \ForkBB\__('Quote depth label'),
+                    'caption' => \ForkBB\__('Quote depth label'),
                     'info'  => \ForkBB\__('Quote depth help'),
                 ],
             ],
@@ -444,62 +444,62 @@ class Options extends Admin
                     'type'   => 'radio',
                     'value'  => $config->o_quickpost,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Quick post label'),
+                    'caption'  => \ForkBB\__('Quick post label'),
                     'info'   => \ForkBB\__('Quick post help'),
                 ],
                 'o_users_online' => [
                     'type'   => 'radio',
                     'value'  => $config->o_users_online,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Users online label'),
+                    'caption'  => \ForkBB\__('Users online label'),
                     'info'   => \ForkBB\__('Users online help'),
                 ],
                 'o_signatures' => [
                     'type'   => 'radio',
                     'value'  => $config->o_signatures,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Signatures label'),
+                    'caption'  => \ForkBB\__('Signatures label'),
                     'info'   => \ForkBB\__('Signatures help'),
                 ],
                 'o_show_dot' => [
                     'type'   => 'radio',
                     'value'  => $config->o_show_dot,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('User has posted label'),
+                    'caption'  => \ForkBB\__('User has posted label'),
                     'info'   => \ForkBB\__('User has posted help'),
                 ],
                 'o_topic_views' => [
                     'type'   => 'radio',
                     'value'  => $config->o_topic_views,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Topic views label'),
+                    'caption'  => \ForkBB\__('Topic views label'),
                     'info'   => \ForkBB\__('Topic views help'),
                 ],
                 'o_quickjump' => [
                     'type'   => 'radio',
                     'value'  => $config->o_quickjump,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Quick jump label'),
+                    'caption'  => \ForkBB\__('Quick jump label'),
                     'info'   => \ForkBB\__('Quick jump help'),
                 ],
                 'o_gzip' => [ //????
                     'type'   => 'radio',
                     'value'  => $config->o_gzip,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('GZip label'),
+                    'caption'  => \ForkBB\__('GZip label'),
                     'info'   => \ForkBB\__('GZip help'),
                 ],
                 'o_search_all_forums' => [ //????
                     'type'   => 'radio',
                     'value'  => $config->o_search_all_forums,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Search all label'),
+                    'caption'  => \ForkBB\__('Search all label'),
                     'info'   => \ForkBB\__('Search all help'),
                 ],
                 'o_additional_navlinks' => [
                     'type'      => 'textarea',
                     'value'     => $config->o_additional_navlinks,
-                    'title'     => \ForkBB\__('Menu items label'),
+                    'caption'     => \ForkBB\__('Menu items label'),
                     'info'      => \ForkBB\__('Menu items help'),
                 ],
 
@@ -517,7 +517,7 @@ class Options extends Admin
                         1 => \ForkBB\__('RSS'),
                         2 => \ForkBB\__('Atom'),
                     ],
-                    'title'  => \ForkBB\__('Default feed label'),
+                    'caption'  => \ForkBB\__('Default feed label'),
                     'info'   => \ForkBB\__('Default feed help'),
                 ],
                 'o_feed_ttl' => [
@@ -530,7 +530,7 @@ class Options extends Admin
                         60 => \ForkBB\__('%d Minutes', 60),
                     ],
                     'value'   => $config->o_feed_ttl,
-                    'title'   => \ForkBB\__('Feed TTL label'),
+                    'caption'   => \ForkBB\__('Feed TTL label'),
                     'info'    => \ForkBB\__('Feed TTL help'),
                 ],
 
@@ -548,13 +548,13 @@ class Options extends Admin
                         1 => \ForkBB\__('By e-mail'),
                         2 => \ForkBB\__('Both'),
                     ],
-                    'title'  => \ForkBB\__('Reporting method label'),
+                    'caption'  => \ForkBB\__('Reporting method label'),
                     'info'   => \ForkBB\__('Reporting method help'),
                 ],
                 'o_mailing_list' => [
                     'type'      => 'textarea',
                     'value'     => $config->o_mailing_list,
-                    'title'     => \ForkBB\__('Mailing list label'),
+                    'caption'     => \ForkBB\__('Mailing list label'),
                     'info'      => \ForkBB\__('Mailing list help'),
                 ],
             ],
@@ -567,14 +567,14 @@ class Options extends Admin
                     'type'   => 'radio',
                     'value'  => $config->o_avatars,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Use avatars label'),
+                    'caption'  => \ForkBB\__('Use avatars label'),
                     'info'   => \ForkBB\__('Use avatars help'),
                 ],
                 'o_avatars_dir' => [ //????
                     'type'      => 'text',
                     'maxlength' => 255,
                     'value'     => $config->o_avatars_dir,
-                    'title'     => \ForkBB\__('Upload directory label'),
+                    'caption'     => \ForkBB\__('Upload directory label'),
                     'info'      => \ForkBB\__('Upload directory help'),
                     'required'  => true,
                 ],
@@ -583,7 +583,7 @@ class Options extends Admin
                     'min'   => 50,
                     'max'   => 999,
                     'value' => $config->o_avatars_width,
-                    'title' => \ForkBB\__('Max width label'),
+                    'caption' => \ForkBB\__('Max width label'),
                     'info'  => \ForkBB\__('Max width help'),
                 ],
                 'o_avatars_height' => [
@@ -591,7 +591,7 @@ class Options extends Admin
                     'min'   => 50,
                     'max'   => 999,
                     'value' => $config->o_avatars_height,
-                    'title' => \ForkBB\__('Max height label'),
+                    'caption' => \ForkBB\__('Max height label'),
                     'info'  => \ForkBB\__('Max height help'),
                 ],
                 'o_avatars_size' => [
@@ -599,7 +599,7 @@ class Options extends Admin
                     'min'   => 0,
                     'max'   => 9999999,
                     'value' => $config->o_avatars_size,
-                    'title' => \ForkBB\__('Max size label'),
+                    'caption' => \ForkBB\__('Max size label'),
                     'info'  => \ForkBB\__('Max size help'),
                 ],
             ],
@@ -612,7 +612,7 @@ class Options extends Admin
                     'type'      => 'text',
                     'maxlength' => 80,
                     'value'     => $config->o_admin_email,
-                    'title'     => \ForkBB\__('Admin e-mail label'),
+                    'caption'     => \ForkBB\__('Admin e-mail label'),
                     'info'      => \ForkBB\__('Admin e-mail help'),
                     'required'  => true,
                 ],
@@ -620,7 +620,7 @@ class Options extends Admin
                     'type'      => 'text',
                     'maxlength' => 80,
                     'value'     => $config->o_webmaster_email,
-                    'title'     => \ForkBB\__('Webmaster e-mail label'),
+                    'caption'     => \ForkBB\__('Webmaster e-mail label'),
                     'info'      => \ForkBB\__('Webmaster e-mail help'),
                     'required'  => true,
                 ],
@@ -628,48 +628,48 @@ class Options extends Admin
                     'type'   => 'radio',
                     'value'  => $config->o_forum_subscriptions,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Forum subscriptions label'),
+                    'caption'  => \ForkBB\__('Forum subscriptions label'),
                     'info'   => \ForkBB\__('Forum subscriptions help'),
                 ],
                 'o_topic_subscriptions' => [
                     'type'   => 'radio',
                     'value'  => $config->o_topic_subscriptions,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Topic subscriptions label'),
+                    'caption'  => \ForkBB\__('Topic subscriptions label'),
                     'info'   => \ForkBB\__('Topic subscriptions help'),
                 ],
                 'o_smtp_host' => [
                     'type'      => 'text',
                     'maxlength' => 255,
                     'value'     => $config->o_smtp_host,
-                    'title'     => \ForkBB\__('SMTP address label'),
+                    'caption'     => \ForkBB\__('SMTP address label'),
                     'info'      => \ForkBB\__('SMTP address help'),
                 ],
                 'o_smtp_user' => [
                     'type'      => 'text',
                     'maxlength' => 255,
                     'value'     => $config->o_smtp_user,
-                    'title'     => \ForkBB\__('SMTP username label'),
+                    'caption'     => \ForkBB\__('SMTP username label'),
                     'info'      => \ForkBB\__('SMTP username help'),
                 ],
                 'o_smtp_pass' => [
                     'type'      => 'password',
                     'maxlength' => 255,
                     'value'     => $config->o_smtp_pass ? '          ' : null,
-                    'title'     => \ForkBB\__('SMTP password label'),
+                    'caption'     => \ForkBB\__('SMTP password label'),
                     'info'      => \ForkBB\__('SMTP password help'),
                 ],
                 'changeSmtpPassword' => [
                     'type'  => 'checkbox',
                     'value' => '1',
-                    'title' => '',
+                    'caption' => '',
                     'label' => \ForkBB\__('SMTP change password help'),
                 ],
                 'o_smtp_ssl' => [
                     'type'   => 'radio',
                     'value'  => $config->o_smtp_ssl,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('SMTP SSL label'),
+                    'caption'  => \ForkBB\__('SMTP SSL label'),
                     'info'   => \ForkBB\__('SMTP SSL help'),
                 ],
             ],
@@ -682,34 +682,34 @@ class Options extends Admin
                     'type'   => 'radio',
                     'value'  => $config->o_regs_allow,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Allow new label'),
+                    'caption'  => \ForkBB\__('Allow new label'),
                     'info'   => \ForkBB\__('Allow new help'),
                 ],
                 'o_regs_verify' => [
                     'type'   => 'radio',
                     'value'  => $config->o_regs_verify,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Verify label'),
+                    'caption'  => \ForkBB\__('Verify label'),
                     'info'   => \ForkBB\__('Verify help'),
                 ],
                 'o_regs_report' => [
                     'type'   => 'radio',
                     'value'  => $config->o_regs_report,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Report new label'),
+                    'caption'  => \ForkBB\__('Report new label'),
                     'info'   => \ForkBB\__('Report new help'),
                 ],
                 'o_rules' => [
                     'type'   => 'radio',
                     'value'  => $config->o_rules,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Use rules label'),
+                    'caption'  => \ForkBB\__('Use rules label'),
                     'info'   => \ForkBB\__('Use rules help'),
                 ],
                 'o_rules_message' => [
                     'type'      => 'textarea',
                     'value'     => $config->o_rules_message,
-                    'title'     => \ForkBB\__('Rules label'),
+                    'caption'     => \ForkBB\__('Rules label'),
                     'info'      => \ForkBB\__('Rules help'),
                 ],
                 'o_default_email_setting' => [
@@ -721,7 +721,7 @@ class Options extends Admin
                         1 => \ForkBB\__('Hide allow form label'),
                         2 => \ForkBB\__('Hide both label'),
                     ],
-                    'title'  => \ForkBB\__('E-mail default label'),
+                    'caption'  => \ForkBB\__('E-mail default label'),
                     'info'   => \ForkBB\__('E-mail default help'),
                 ],
             ],
@@ -734,13 +734,13 @@ class Options extends Admin
                     'type'   => 'radio',
                     'value'  => $config->o_announcement,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Display announcement label'),
+                    'caption'  => \ForkBB\__('Display announcement label'),
                     'info'   => \ForkBB\__('Display announcement help'),
                 ],
                 'o_announcement_message' => [
                     'type'      => 'textarea',
                     'value'     => $config->o_announcement_message,
-                    'title'     => \ForkBB\__('Announcement message label'),
+                    'caption'     => \ForkBB\__('Announcement message label'),
                     'info'      => \ForkBB\__('Announcement message help'),
                 ],
 

+ 14 - 14
app/Models/Pages/Admin/Permissions.php

@@ -53,10 +53,10 @@ class Permissions extends Admin
 
             if ($valid) {
                 $config->save();
-                
+
                 return $this->c->Redirect->page('AdminPermissions')->message('Perms updated redirect');
             }
-    
+
             $this->fIswev  = $v->getErrors();
         }
 
@@ -69,12 +69,12 @@ class Permissions extends Admin
 
         return $this;
     }
-    
+
     /**
      * Формирует данные для формы
      *
      * @param Config $config
-     * 
+     *
      * @return array
      */
     protected function viewForm(Config $config)
@@ -103,35 +103,35 @@ class Permissions extends Admin
                     'type'   => 'radio',
                     'value'  => $config->p_message_bbcode,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('BBCode label'),
+                    'caption'  => \ForkBB\__('BBCode label'),
                     'info'   => \ForkBB\__('BBCode help'),
                 ],
                 'p_message_img_tag' => [
                     'type'   => 'radio',
                     'value'  => $config->p_message_img_tag,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Image tag label'),
+                    'caption'  => \ForkBB\__('Image tag label'),
                     'info'   => \ForkBB\__('Image tag help'),
                 ],
                 'p_message_all_caps' => [
                     'type'   => 'radio',
                     'value'  => $config->p_message_all_caps,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('All caps message label'),
+                    'caption'  => \ForkBB\__('All caps message label'),
                     'info'   => \ForkBB\__('All caps message help'),
                 ],
                 'p_subject_all_caps' => [
                     'type'   => 'radio',
                     'value'  => $config->p_subject_all_caps,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('All caps subject label'),
+                    'caption'  => \ForkBB\__('All caps subject label'),
                     'info'   => \ForkBB\__('All caps subject help'),
                 ],
                 'p_force_guest_email' => [
                     'type'   => 'radio',
                     'value'  => $config->p_force_guest_email,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Require e-mail label'),
+                    'caption'  => \ForkBB\__('Require e-mail label'),
                     'info'   => \ForkBB\__('Require e-mail help'),
                 ],
             ],
@@ -144,21 +144,21 @@ class Permissions extends Admin
                     'type'   => 'radio',
                     'value'  => $config->p_sig_bbcode,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('BBCode sigs label'),
+                    'caption'  => \ForkBB\__('BBCode sigs label'),
                     'info'   => \ForkBB\__('BBCode sigs help'),
                 ],
                 'p_sig_img_tag' => [
                     'type'   => 'radio',
                     'value'  => $config->p_sig_img_tag,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('Image tag sigs label'),
+                    'caption'  => \ForkBB\__('Image tag sigs label'),
                     'info'   => \ForkBB\__('Image tag sigs help'),
                 ],
                 'p_sig_all_caps' => [
                     'type'   => 'radio',
                     'value'  => $config->p_sig_all_caps,
                     'values' => $yn,
-                    'title'  => \ForkBB\__('All caps sigs label'),
+                    'caption'  => \ForkBB\__('All caps sigs label'),
                     'info'   => \ForkBB\__('All caps sigs help'),
                 ],
                 'p_sig_length' => [
@@ -166,7 +166,7 @@ class Permissions extends Admin
                     'min'   => 0,
                     'max'   => 16000,
                     'value' => $config->p_sig_length,
-                    'title' => \ForkBB\__('Max sig length label'),
+                    'caption' => \ForkBB\__('Max sig length label'),
                     'info'  => \ForkBB\__('Max sig length help'),
                 ],
                 'p_sig_lines' => [
@@ -174,7 +174,7 @@ class Permissions extends Admin
                     'min'   => 0,
                     'max'   => 100,
                     'value' => $config->p_sig_lines,
-                    'title' => \ForkBB\__('Max sig lines label'),
+                    'caption' => \ForkBB\__('Max sig lines label'),
                     'info'  => \ForkBB\__('Max sig lines help'),
                 ],
 

+ 15 - 15
app/Models/Pages/Install.php

@@ -185,7 +185,7 @@ class Install extends Page
                                 'type'    => 'select',
                                 'options' => \array_combine($langs, $langs),
                                 'value'   => $this->user->language,
-                                'title'   => \ForkBB\__('Install language'),
+                                'caption'   => \ForkBB\__('Install language'),
                                 'info'    => \ForkBB\__('Choose install language info'),
                             ],
                         ],
@@ -226,40 +226,40 @@ class Install extends Page
                             'type'     => 'select',
                             'options'  => $this->dbTypes,
                             'value'    => $v ? $v->dbtype : 'mysql_innodb',
-                            'title'    => \ForkBB\__('Database type'),
+                            'caption'    => \ForkBB\__('Database type'),
                             'info'     => \ForkBB\__('Info 2'),
                             'required' => true,
                         ],
                         'dbhost' => [
                             'type'      => 'text',
                             'value'     => $v ? $v->dbhost : 'localhost',
-                            'title'     => \ForkBB\__('Database server hostname'),
+                            'caption'     => \ForkBB\__('Database server hostname'),
                             'info'      => \ForkBB\__('Info 3'),
                             'required'  => true,
                         ],
                         'dbname' => [
                             'type'      => 'text',
                             'value'     => $v ? $v->dbname : '',
-                            'title'     => \ForkBB\__('Database name'),
+                            'caption'     => \ForkBB\__('Database name'),
                             'info'      => \ForkBB\__('Info 4'),
                             'required'  => true,
                         ],
                         'dbuser' => [
                             'type'      => 'text',
                             'value'     => $v ? $v->dbuser : '',
-                            'title'     => \ForkBB\__('Database username'),
+                            'caption'     => \ForkBB\__('Database username'),
                         ],
                         'dbpass' => [
                             'type'      => 'password',
                             'value'     => '',
-                            'title'     => \ForkBB\__('Database password'),
+                            'caption'     => \ForkBB\__('Database password'),
                             'info'      => \ForkBB\__('Info 5'),
                         ],
                         'dbprefix' => [
                             'type'      => 'text',
                             'maxlength' => 40,
                             'value'     => $v ? $v->dbprefix : '',
-                            'title'     => \ForkBB\__('Table prefix'),
+                            'caption'     => \ForkBB\__('Table prefix'),
                             'info'      => \ForkBB\__('Info 6'),
                         ],
                     ],
@@ -284,7 +284,7 @@ class Install extends Page
                             'maxlength' => 25,
                             'pattern'   => '^.{2,25}$',
                             'value'     => $v ? $v->username : '',
-                            'title'     => \ForkBB\__('Administrator username'),
+                            'caption'     => \ForkBB\__('Administrator username'),
                             'info'      => \ForkBB\__('Info 8'),
                             'required'  => true,
                         ],
@@ -292,7 +292,7 @@ class Install extends Page
                             'type'      => 'password',
                             'pattern'   => '^.{16,}$',
                             'value'     => '',
-                            'title'     => \ForkBB\__('Administrator passphrase'),
+                            'caption'     => \ForkBB\__('Administrator passphrase'),
                             'info'      => \ForkBB\__('Info 9'),
                             'required'  => true,
                         ],
@@ -301,7 +301,7 @@ class Install extends Page
                             'maxlength' => 80,
                             'pattern'   => '.+@.+',
                             'value'     => $v ? $v->email : '',
-                            'title'     => \ForkBB\__('Administrator email'),
+                            'caption'     => \ForkBB\__('Administrator email'),
                             'info'      => \ForkBB\__('Info 10'),
                             'required'  => true,
                         ],
@@ -327,34 +327,34 @@ class Install extends Page
                             'type'      => 'text',
                             'maxlength' => 255,
                             'value'     => $v ? $v->title : \ForkBB\__('My ForkBB Forum'),
-                            'title'     => \ForkBB\__('Board title'),
+                            'caption'     => \ForkBB\__('Board title'),
                             'required'  => true,
                         ],
                         'descr' => [
                             'type'      => 'text',
                             'maxlength' => 16000,
                             'value'     => $v ? $v->descr : \ForkBB\__('Description'),
-                            'title'     => \ForkBB\__('Board description'),
+                            'caption'     => \ForkBB\__('Board description'),
                         ],
                         'baseurl' => [
                             'type'      => 'text',
                             'maxlength' => 1024,
                             'value'     => $v ? $v->baseurl : $this->c->BASE_URL,
-                            'title'     => \ForkBB\__('Base URL'),
+                            'caption'     => \ForkBB\__('Base URL'),
                             'required'  => true,
                         ],
                         'defaultlang' => [
                             'type'      => 'select',
                             'options'   => \array_combine($langs, $langs),
                             'value'     => $v ? $v->defaultlang : $this->user->language,
-                            'title'     => \ForkBB\__('Default language'),
+                            'caption'     => \ForkBB\__('Default language'),
                             'required'  => true,
                         ],
                         'defaultstyle' => [
                             'type'      => 'select',
                             'options'   => \array_combine($styles, $styles),
                             'value'     => $v ? $v->defaultstyle : $this->user->style,
-                            'title'     => \ForkBB\__('Default style'),
+                            'caption'     => \ForkBB\__('Default style'),
                             'required'  => true,
                         ],
 

+ 4 - 4
app/Models/Pages/PostFormTrait.php

@@ -51,7 +51,7 @@ trait PostFormTrait
                 'class'     => 'w1',
                 'type'      => 'text',
                 'maxlength' => 25,
-                'title'     => \ForkBB\__('Username'),
+                'caption'     => \ForkBB\__('Username'),
                 'required'  => true,
                 'pattern'   => '^.{2,25}$',
                 'value'     => isset($vars['username']) ? $vars['username'] : null,
@@ -61,7 +61,7 @@ trait PostFormTrait
                 'class'     => 'w2',
                 'type'      => 'text',
                 'maxlength' => 80,
-                'title'     => \ForkBB\__('Email'),
+                'caption'     => \ForkBB\__('Email'),
                 'required'  => '1' == $this->c->config->p_force_guest_email,
                 'pattern'   => '.+@.+',
                 'value'     => isset($vars['email']) ? $vars['email'] : null,
@@ -73,7 +73,7 @@ trait PostFormTrait
             $fieldset['subject'] = [
                 'type'      => 'text',
                 'maxlength' => 70,
-                'title'     => \ForkBB\__('Subject'),
+                'caption'     => \ForkBB\__('Subject'),
                 'required'  => true,
                 'value'     => isset($vars['subject']) ? $vars['subject'] : null,
                 'autofocus' => $autofocus,
@@ -83,7 +83,7 @@ trait PostFormTrait
 
         $fieldset['message'] = [
             'type'     => 'textarea',
-            'title'    => \ForkBB\__('Message'),
+            'caption'    => \ForkBB\__('Message'),
             'required' => true,
             'value'    => isset($vars['message']) ? $vars['message'] : null,
             'bb'       => [

+ 16 - 16
app/Models/Pages/Profile.php

@@ -57,7 +57,7 @@ class Profile extends Page
             'id'        => 'username',
             'type'      => 'text',
             'maxlength' => 25,
-            'title'     => \ForkBB\__('Username'),
+            'caption'     => \ForkBB\__('Username'),
             'required'  => true,
             'pattern'   => '^.{2,25}$',
             'value'     => $curUser->username,
@@ -66,7 +66,7 @@ class Profile extends Page
             'id'        => 'title',
             'type'      => 'text',
             'maxlength' => 50,
-            'title'     => \ForkBB\__('Title'),
+            'caption'     => \ForkBB\__('Title'),
             'value'     => $isEdit ? $curUser->title : $curUser->title(),
         ];
         $fieldset[] = [
@@ -76,7 +76,7 @@ class Profile extends Page
             $fieldset['avatar'] = [
                 'id'        => 'avatar',
                 'type'      => 'yield',
-                'title'     => \ForkBB\__('Avatar'),
+                'caption'     => \ForkBB\__('Avatar'),
                 'value'     => 'avatar',
             ];
         }
@@ -93,7 +93,7 @@ class Profile extends Page
                 'id'        => 'realname',
                 'type'      => 'text',
                 'maxlength' => 40,
-                'title'     => \ForkBB\__('Realname'),
+                'caption'     => \ForkBB\__('Realname'),
                 'value'     => $isEdit ? $curUser->realname : \ForkBB\cens($curUser->realname),
             ];
         }
@@ -107,7 +107,7 @@ class Profile extends Page
                     1 => \ForkBB\__('Male'),
                     2 => \ForkBB\__('Female'),
                 ],
-                'title'  => \ForkBB\__('Gender'),
+                'caption'  => \ForkBB\__('Gender'),
             ];
         }
         if ($isEdit || $curUser->location) {
@@ -115,7 +115,7 @@ class Profile extends Page
                 'id'        => 'location',
                 'type'      => 'text',
                 'maxlength' => 40,
-                'title'     => \ForkBB\__('Location'),
+                'caption'     => \ForkBB\__('Location'),
                 'value'     => $isEdit ? $curUser->location : \ForkBB\cens($curUser->location),
             ];
         }
@@ -124,7 +124,7 @@ class Profile extends Page
                 'id'        => 'website',
                 'type'      => 'text',
                 'maxlength' => 100,
-                'title'     => \ForkBB\__('Website'),
+                'caption'     => \ForkBB\__('Website'),
                 'value'     => $isEdit ? $curUser->url : \ForkBB\cens($curUser->url),
             ];
         }
@@ -143,13 +143,13 @@ class Profile extends Page
                 'id'        => 'signature',
                 'type'      => 'textarea',
                 'value'     => $curUser->signature,
-                'title'     => \ForkBB\__('Signature'),
+                'caption'     => \ForkBB\__('Signature'),
             ];
         } elseif ($curUser->signature) { //????
             $fieldset['signature'] = [
                 'id'        => 'signature',
                 'type'      => 'yield',
-                'title'     => \ForkBB\__('Signature'),
+                'caption'     => \ForkBB\__('Signature'),
                 'value'     => 'signature',
             ];
         }
@@ -167,45 +167,45 @@ class Profile extends Page
             'id'        => 'registered',
             'type'      => 'str',
             'value'     => \ForkBB\dt($curUser->registered, true),
-            'title'     => \ForkBB\__('Registered info'),
+            'caption'     => \ForkBB\__('Registered info'),
         ];
         $fieldset['lastvisit'] = [
             'id'        => 'lastvisit',
             'type'      => 'str',
             'value'     => \ForkBB\dt($curUser->last_visit, true),
-            'title'     => \ForkBB\__('Last visit info'),
+            'caption'     => \ForkBB\__('Last visit info'),
         ];
         $fieldset['lastpost'] = [
             'id'        => 'lastpost',
             'type'      => 'str',
             'value'     => \ForkBB\dt($curUser->last_post, true),
-            'title'     => \ForkBB\__('Last post info'),
+            'caption'     => \ForkBB\__('Last post info'),
         ];
         if ($curUser->num_posts) {
             if ('1' == $this->user->g_search && $this->user->showPostCount) {
                 $fieldset['posts'] = [
                     'id'        => 'posts',
                     'type'      => 'yield',
-                    'title'     => \ForkBB\__('Posts info'),
+                    'caption'     => \ForkBB\__('Posts info'),
                     'value'     => 'totalposts',
                 ];
                 $fieldset['topics'] = [
                     'id'        => 'topics',
                     'type'      => 'yield',
-                    'title'     => \ForkBB\__('Topics info'),
+                    'caption'     => \ForkBB\__('Topics info'),
                     'value'     => 'totaltopics',
                 ];
             } elseif ($this->user->showPostCount) {
                 $fieldset['posts'] = [
                     'id'        => 'posts',
                     'type'      => 'str',
-                    'title'     => \ForkBB\__('Posts info'),
+                    'caption'     => \ForkBB\__('Posts info'),
                     'value'     => \ForkBB\num($curUser->num_posts),
                 ];
                 $fieldset['topics'] = [
                     'id'        => 'topics',
                     'type'      => 'str',
-                    'title'     => \ForkBB\__('Topics info'),
+                    'caption'     => \ForkBB\__('Topics info'),
                     'value'     => \ForkBB\num($curUser->num_topics),
                 ];
             }

+ 8 - 8
app/Models/Pages/Search.php

@@ -153,7 +153,7 @@ class Search extends Page
                         'class'     => 'w2',
                         'type'      => 'text',
                         'maxlength' => 100,
-                        'title'     => \ForkBB\__('Keyword search'),
+                        'caption'     => \ForkBB\__('Keyword search'),
                         'value'     => $v ? $v->keywords : '',
                         'required'  => true,
                         'autofocus' => true,
@@ -162,7 +162,7 @@ class Search extends Page
                         'class'     => 'w1',
                         'type'      => 'text',
                         'maxlength' => 25,
-                        'title'     => \ForkBB\__('Author search'),
+                        'caption'     => \ForkBB\__('Author search'),
                         'value'     => $v ? $v->author : '*',
                         'required'  => true,
                     ],
@@ -180,7 +180,7 @@ class Search extends Page
                         'type'    => 'multiselect',
                         'options' => $this->listForOptions,
                         'value'   => $v ? \explode('.', $v->forums) : null,
-                        'title'   => \ForkBB\__('Forum search'),
+                        'caption'   => \ForkBB\__('Forum search'),
                         'size'    => \min(\count($this->listForOptions), 10),
                     ],
                     'serch_in' => [
@@ -192,7 +192,7 @@ class Search extends Page
                             2 => \ForkBB\__('Topic only'),
                         ],
                         'value'   => $v ? $v->serch_in : 0,
-                        'title'   => \ForkBB\__('Search in'),
+                        'caption'   => \ForkBB\__('Search in'),
                     ],
                     [
                         'type'    => 'info',
@@ -218,7 +218,7 @@ class Search extends Page
                             3 => \ForkBB\__('Sort by forum'),
                         ],
                         'value'   => $v ? $v->sort_by : 0,
-                        'title'   => \ForkBB\__('Sort by'),
+                        'caption'   => \ForkBB\__('Sort by'),
                     ],
                     'sort_dir' => [
                         'class'   => 'w4',
@@ -228,7 +228,7 @@ class Search extends Page
                             1 => \ForkBB\__('Ascending'),
                         ],
                         'value'   => $v ? $v->sort_dir : 0,
-                        'title'   => \ForkBB\__('Sort order'),
+                        'caption'   => \ForkBB\__('Sort order'),
                     ],
                     'show_as' => [
                         'class'   => 'w4',
@@ -238,7 +238,7 @@ class Search extends Page
                             1 => \ForkBB\__('Show as topics'),
                         ],
                         'value'   => $v ? $v->show_as : 0,
-                        'title'   => \ForkBB\__('Show as'),
+                        'caption'   => \ForkBB\__('Show as'),
                     ],
                     [
                         'type'    => 'info',
@@ -258,7 +258,7 @@ class Search extends Page
                     'keywords' => [
                         'type'      => 'text',
                         'maxlength' => 100,
-                        'title'     => \ForkBB\__('Keyword search'),
+                        'caption'     => \ForkBB\__('Keyword search'),
                         'value'     => $v ? $v->keywords : '',
                         'required'  => true,
                         'autofocus' => true,

+ 4 - 4
app/Models/Pages/Userlist.php

@@ -134,7 +134,7 @@ class Userlist extends Page
                 'type'      => 'text',
                 'maxlength' => 25,
                 'value'     => $v->name ?: '*',
-                'title'     => \ForkBB\__('Username'),
+                'caption'     => \ForkBB\__('Username'),
                 'info'      => \ForkBB\__('User search info'),
                 'required'  => true,
 #               'autofocus' => true,
@@ -149,7 +149,7 @@ class Userlist extends Page
                     return [$group->g_id, $group->g_title];
                 }, $groups),
             'value'   => $v->group,
-            'title'   => \ForkBB\__('User group'),
+            'caption'   => \ForkBB\__('User group'),
         ];
         $fields['sort'] = [
             'class'   => 'w4',
@@ -160,7 +160,7 @@ class Userlist extends Page
                 ['registered', \ForkBB\__('Sort by date')],
             ],
             'value'   => $v->sort,
-            'title'   => \ForkBB\__('Sort users by'),
+            'caption'   => \ForkBB\__('Sort users by'),
         ];
         $fields['dir'] = [
             'class'  => 'w4',
@@ -170,7 +170,7 @@ class Userlist extends Page
                 'ASC'  => \ForkBB\__('Ascending'),
                 'DESC' => \ForkBB\__('Descending'),
             ],
-            'title'  => \ForkBB\__('User sort order'),
+            'caption'  => \ForkBB\__('User sort order'),
         ];
         $form['sets'][] = ['fields' => $fields];
 

+ 1 - 1
app/templates/layouts/form.forkbb.php

@@ -25,7 +25,7 @@
             </div>
             @else
             <dl @if ($cur['id']) id="id-dl-{{ $cur['id'] }}" @endif @if ($cur['class']) class="f-field-{!! implode(' f-field-', (array) $cur['class']) !!}" @endif>
-              <dt> @if ($cur['title'])<label class="f-child1 @if ($cur['required']) f-req @endif" @if (is_string($key) && 'radio' !== $cur['type'] && 'yield' !== $cur['type']) for="id-{{ $key }}" @endif>{!! $cur['title'] !!}</label> @endif</dt>
+              <dt> @if ($cur['caption'])<label class="f-child1 @if ($cur['required']) f-req @endif" @if (is_string($key) && 'radio' !== $cur['type'] && 'yield' !== $cur['type']) for="id-{{ $key }}" @endif>{!! $cur['caption'] !!}</label> @endif</dt>
               <dd>
                 @if ('text' === $cur['type'])
                     @if ($form['action'])