diff --git a/plugins/box/blocks/blocks.admin.php b/plugins/box/blocks/blocks.admin.php index cf40d89..2640de8 100644 --- a/plugins/box/blocks/blocks.admin.php +++ b/plugins/box/blocks/blocks.admin.php @@ -31,7 +31,7 @@ if (Security::check(Request::post('csrf'))) { - if (trim(Request::post('name')) == '') $errors['blocks_empty_name'] = __('This field should not be empty', 'blocks'); + if (trim(Request::post('name')) == '') $errors['blocks_empty_name'] = __('Required field', 'blocks'); if (file_exists($blocks_path.Security::safeName(Request::post('name')).'.block.html')) $errors['blocks_exists'] = __('This block already exists', 'blocks'); if (count($errors) == 0) { @@ -71,7 +71,7 @@ if (Security::check(Request::post('csrf'))) { - if (trim(Request::post('name')) == '') $errors['blocks_empty_name'] = __('This field should not be empty', 'blocks'); + if (trim(Request::post('name')) == '') $errors['blocks_empty_name'] = __('Required field', 'blocks'); if ((file_exists($blocks_path.Security::safeName(Request::post('name')).'.block.html')) and (Security::safeName(Request::post('blocks_old_name')) !== Security::safeName(Request::post('name')))) $errors['blocks_exists'] = __('This block already exists', 'blocks'); // Save fields diff --git a/plugins/box/blocks/languages/en.lang.php b/plugins/box/blocks/languages/en.lang.php index c7f8e54..ee38c64 100644 --- a/plugins/box/blocks/languages/en.lang.php +++ b/plugins/box/blocks/languages/en.lang.php @@ -13,7 +13,7 @@ 'Save' => 'Save', 'Save and exit' => 'Save and exit', 'Actions' => 'Actions', - 'This field should not be empty' => 'This field should not be empty', + 'Required field' => 'Required field', 'This block already exists' => 'This block already exists', 'This block does not exist' => 'This block does not exist', 'Delete block: :block' => 'Delete block: :block', diff --git a/plugins/box/blocks/views/backend/add.view.php b/plugins/box/blocks/views/backend/add.view.php index 89ab1fd..dc0de86 100644 --- a/plugins/box/blocks/views/backend/add.view.php +++ b/plugins/box/blocks/views/backend/add.view.php @@ -13,12 +13,12 @@ - 'span5'))); ?> + (isset($errors['blocks_empty_name']) || isset($errors['blocks_exists'])) ? 'span5 error-field' : 'span5'))); ?> - '.$errors['blocks_empty_name'].''; - if (isset($errors['blocks_exists'])) echo '   '.$errors['blocks_exists'].''; - ?> + '.$errors['blocks_empty_name'].''; + if (isset($errors['blocks_exists'])) echo '   '.$errors['blocks_exists'].''; + ?>

- 'span5'))); ?> + (isset($errors['blocks_empty_name']) || isset($errors['blocks_exists'])) ? 'span5 error-field' : 'span5'))); ?> '.$errors['blocks_empty_name'].''; diff --git a/plugins/box/menu/views/backend/add.view.php b/plugins/box/menu/views/backend/add.view.php index 51bc05a..e875d01 100644 --- a/plugins/box/menu/views/backend/add.view.php +++ b/plugins/box/menu/views/backend/add.view.php @@ -14,9 +14,9 @@ 'span3'.$error_class)); + echo Form::input('menu_item_name', $menu_item_name, array('class' => (isset($errors['menu_item_name_empty']) || isset($errors['menu_item_name_empty'])) ? 'span3 error-field' : 'span3')); - if (isset($errors['menu_item_name_empty'])) echo Html::nbsp(4).''.$errors['menu_item_name_empty'].''; + if (isset($errors['menu_item_name_empty'])) echo Html::nbsp(4).''.$errors['menu_item_name_empty'].''; echo ( Form::label('menu_item_link', __('Item link', 'menu')). diff --git a/plugins/box/menu/views/backend/edit.view.php b/plugins/box/menu/views/backend/edit.view.php index 2aa0cfb..bcba540 100644 --- a/plugins/box/menu/views/backend/edit.view.php +++ b/plugins/box/menu/views/backend/edit.view.php @@ -14,9 +14,9 @@ 'span3'.$error_class)); + echo Form::input('menu_item_name', $menu_item_name, array('class' => (isset($errors['menu_item_name_empty']) || isset($errors['menu_item_name_empty'])) ? 'span3 error-field' : 'span3')); - if (isset($errors['menu_item_name_empty'])) echo Html::nbsp(4).''.$errors['menu_item_name_empty'].''; + if (isset($errors['menu_item_name_empty'])) echo Html::nbsp(4).''.$errors['menu_item_name_empty'].''; echo ( Form::label('menu_item_link', __('Item link', 'menu')). diff --git a/plugins/box/snippets/views/backend/add.view.php b/plugins/box/snippets/views/backend/add.view.php index eab440f..3f4fb31 100644 --- a/plugins/box/snippets/views/backend/add.view.php +++ b/plugins/box/snippets/views/backend/add.view.php @@ -14,7 +14,7 @@
- 'input-xlarge'))); ?>.snippet.php + (isset($errors['snippets_empty_name']) || isset($errors['snippets_exists'])) ? 'input-xlarge error-field' : 'input-xlarge'))); ?>.snippet.php
- 'input-xlarge'))); ?>.snippet.php + (isset($errors['snippets_empty_name']) || isset($errors['snippets_exists'])) ? 'input-xlarge error-field' : 'input-xlarge'))); ?>.snippet.php
- 'input-xlarge'))); ?> + (isset($errors['file_empty_name']) || isset($errors['file_exists'])) ? 'input-xlarge error-field' : 'input-xlarge'))); ?> .chunk.php .template.php .css diff --git a/plugins/box/themes/views/backend/edit.view.php b/plugins/box/themes/views/backend/edit.view.php index d8997ef..250e65d 100644 --- a/plugins/box/themes/views/backend/edit.view.php +++ b/plugins/box/themes/views/backend/edit.view.php @@ -26,7 +26,7 @@
- 'input-xlarge'))); ?> + (isset($errors['file_empty_name']) || isset($errors['file_exists'])) ? 'input-xlarge error-field' : 'input-xlarge'))); ?> .chunk.php .template.php .css diff --git a/plugins/box/users/views/backend/add.view.php b/plugins/box/users/views/backend/add.view.php index 90d09ea..057111c 100644 --- a/plugins/box/users/views/backend/add.view.php +++ b/plugins/box/users/views/backend/add.view.php @@ -7,18 +7,18 @@ Form::open(). Form::hidden('csrf', Security::token()). Form::label('login', __('Username', 'users')). - Form::input('login', null, array('class' => 'span3')) + Form::input('login', null, array('class' => (isset($errors['users_this_user_alredy_exists']) || isset($errors['users_empty_login'])) ? 'span3 error-field' : 'span3')) ); if (isset($errors['users_this_user_alredy_exists'])) echo Html::nbsp(3).''.$errors['users_this_user_alredy_exists'].''; - if (isset($errors['users_empty_login'])) echo Html::nbsp(3).''.$errors['users_empty_login'].''; + if (isset($errors['users_empty_login'])) echo Html::nbsp(3).''.$errors['users_empty_login'].''; echo ( Form::label('password', __('Password', 'users')). - Form::password('password', null, array('class' => 'span3')) + Form::password('password', null, array('class' => (isset($errors['users_empty_password'])) ? 'span3 error-field' : 'span3')) ); - if (isset($errors['users_empty_password'])) echo Html::nbsp(3).''.$errors['users_empty_password'].''; + if (isset($errors['users_empty_password'])) echo Html::nbsp(3).''.$errors['users_empty_password'].''; echo ( Form::label('email', __('Email', 'users')).