diff --git a/app/Helpers/form_helper.php b/app/Helpers/form_helper.php deleted file mode 100644 index 5b732a2e..00000000 --- a/app/Helpers/form_helper.php +++ /dev/null @@ -1,81 +0,0 @@ - $options - * @param array $selected - * @param array $customExtra - */ - function form_dropdown( - string $name = '', - array $options = [], - array $selected = [], - array $customExtra = [] - ): string { - $defaultExtra = [ - 'data-select-text' => lang('Common.forms.multiSelect.selectText'), - 'data-loading-text' => lang('Common.forms.multiSelect.loadingText'), - 'data-no-results-text' => lang('Common.forms.multiSelect.noResultsText'), - 'data-no-choices-text' => lang('Common.forms.multiSelect.noChoicesText'), - 'data-max-item-text' => lang('Common.forms.multiSelect.maxItemText'), - ]; - $extra = array_merge($defaultExtra, $customExtra); - $defaults = [ - 'name' => $name, - ]; - - // standardize selected as strings, like the option keys will be. - foreach ($selected as $key => $item) { - $selected[$key] = $item; - } - - $placeholderOption = ''; - if (isset($extra['placeholder'])) { - $placeholderOption = ''; - unset($extra['placeholder']); - } - - $extra = stringify_attributes($extra); - $multiple = (count($selected) > 1 && stripos($extra, 'multiple') === false) ? ' multiple="multiple"' : ''; - $form = '\n"; - } -} diff --git a/app/Views/Components/Forms/Checkbox.php b/app/Views/Components/Forms/Checkbox.php index 440300b7..b93160ca 100644 --- a/app/Views/Components/Forms/Checkbox.php +++ b/app/Views/Components/Forms/Checkbox.php @@ -23,7 +23,7 @@ class Checkbox extends FormComponent 'name' => $this->name, 'class' => 'form-checkbox text-pine-500 border-black border-3 focus:ring-2 focus:ring-pine-500 focus:ring-offset-2 focus:ring-offset-pine-100 w-6 h-6', ], - $this->value, + 'yes', old($this->name) ? old($this->name) === $this->value : $this->isChecked, ); diff --git a/app/Views/Components/Forms/Input.php b/app/Views/Components/Forms/Input.php index 1729e6c3..2b1cb5e4 100644 --- a/app/Views/Components/Forms/Input.php +++ b/app/Views/Components/Forms/Input.php @@ -10,16 +10,7 @@ class Input extends FormComponent public function render(): string { - $class = 'px-3 py-2 bg-white rounded-lg border-3 focus:ring-2 focus:ring-pine-500 focus:ring-offset-2 focus:ring-offset-pine-100 ' . $this->class; - - if (session()->has('errors')) { - $error = session('errors')[$this->name]; - if ($error) { - $class .= ' border-red'; - } - } else { - $class .= ' border-black focus:border-black'; - } + $class = 'px-3 py-2 bg-white border-black rounded-lg focus:border-black border-3 focus:ring-2 focus:ring-pine-500 focus:ring-offset-2 focus:ring-offset-pine-100 ' . $this->class; $this->attributes['class'] = $class; diff --git a/app/Views/Components/Forms/MultiSelect.php b/app/Views/Components/Forms/MultiSelect.php index 9ae032aa..276f8d41 100644 --- a/app/Views/Components/Forms/MultiSelect.php +++ b/app/Views/Components/Forms/MultiSelect.php @@ -31,6 +31,11 @@ class MultiSelect extends FormComponent $defaultAttributes = [ 'data-class' => $this->attributes['class'], 'multiple' => 'multiple', + 'data-select-text' => lang('Common.forms.multiSelect.selectText'), + 'data-loading-text' => lang('Common.forms.multiSelect.loadingText'), + 'data-no-results-text' => lang('Common.forms.multiSelect.noResultsText'), + 'data-no-choices-text' => lang('Common.forms.multiSelect.noChoicesText'), + 'data-max-item-text' => lang('Common.forms.multiSelect.maxItemText'), ]; $extra = array_merge($defaultAttributes, $this->attributes); diff --git a/app/Views/Components/Forms/Select.php b/app/Views/Components/Forms/Select.php index 3cfd062e..ee8ed277 100644 --- a/app/Views/Components/Forms/Select.php +++ b/app/Views/Components/Forms/Select.php @@ -23,6 +23,11 @@ class Select extends FormComponent $defaultAttributes = [ 'class' => 'focus:border-black focus:ring-2 focus:ring-pine-500 focus:ring-offset-2 focus:ring-offset-pine-100 border-3 rounded-lg border-black ' . $this->class, 'data-class' => $this->class, + 'data-select-text' => lang('Common.forms.multiSelect.selectText'), + 'data-loading-text' => lang('Common.forms.multiSelect.loadingText'), + 'data-no-results-text' => lang('Common.forms.multiSelect.noResultsText'), + 'data-no-choices-text' => lang('Common.forms.multiSelect.noChoicesText'), + 'data-max-item-text' => lang('Common.forms.multiSelect.maxItemText'), ]; $extra = array_merge($this->attributes, $defaultAttributes); diff --git a/app/Views/pager/default_full.php b/app/Views/pager/default_full.php index 55685ef7..b712a1e5 100644 --- a/app/Views/pager/default_full.php +++ b/app/Views/pager/default_full.php @@ -30,7 +30,7 @@ $pager->setSurroundCount(2); links() as $link): ?>
  • - + diff --git a/modules/Admin/Controllers/PodcastImportController.php b/modules/Admin/Controllers/PodcastImportController.php index 044f25a6..f3d7a4eb 100644 --- a/modules/Admin/Controllers/PodcastImportController.php +++ b/modules/Admin/Controllers/PodcastImportController.php @@ -285,17 +285,17 @@ class PodcastImportController extends BaseController } } - $numberItems = $feed->channel[0]->item->count(); + $itemsCount = $feed->channel[0]->item->count(); $lastItem = $this->request->getPost('max_episodes') !== '' && - $this->request->getPost('max_episodes') < $numberItems + $this->request->getPost('max_episodes') < $itemsCount ? (int) $this->request->getPost('max_episodes') - : $numberItems; + : $itemsCount; $slugs = []; for ($itemNumber = 1; $itemNumber <= $lastItem; ++$itemNumber) { - $item = $feed->channel[0]->item[$numberItems - $itemNumber]; + $item = $feed->channel[0]->item[$itemsCount - $itemNumber]; $nsItunes = $item->children('http://www.itunes.com/dtds/podcast-1.0.dtd'); $nsPodcast = $item->children( diff --git a/themes/cp_admin/_message_block.php b/themes/cp_admin/_message_block.php index 3794ba39..ffe70e09 100644 --- a/themes/cp_admin/_message_block.php +++ b/themes/cp_admin/_message_block.php @@ -1,15 +1,15 @@ has('message')): ?> - + has('error')): ?> - + has('errors')): ?> - +