Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable badges for now #1116

Merged
merged 9 commits into from
Sep 13, 2024
Merged

Disable badges for now #1116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4e336b6
Remove headers & disable badges for now
melroy89 Sep 12, 2024
4c2ca44
Remove badges from entry type form builder
melroy89 Sep 12, 2024
5df8817
Restore headers and add header tag as well
melroy89 Sep 12, 2024
764aaf7
Restore headers and add header tag as well
melroy89 Sep 12, 2024
167a7a0
Restore headers and add header tag as well
melroy89 Sep 12, 2024
7da2b0d
Fix indent
melroy89 Sep 12, 2024
f5a2f72
Comment out BadgesType
melroy89 Sep 12, 2024
5671cf2
Merge branch 'main' into remove_badge_field
melroy89 Sep 12, 2024
ea22535
Merge branch 'main' into remove_badge_field
melroy89 Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/Form/EntryArticleType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use App\Form\EventListener\DefaultLanguage;
use App\Form\EventListener\DisableFieldsOnEntryEdit;
use App\Form\EventListener\ImageListener;
use App\Form\Type\BadgesType;
// use App\Form\Type\BadgesType;
use App\Form\Type\LanguageType;
use App\Form\Type\MagazineAutocompleteType;
use Symfony\Component\Form\AbstractType;
Expand Down Expand Up @@ -47,13 +47,13 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
'delimiter' => ' ',
],
])
->add(
'badges',
BadgesType::class,
[
'required' => false,
]
)
// ->add(
// 'badges',
// BadgesType::class,
// [
// 'required' => false,
// ]
// )
->add(
'image',
FileType::class,
Expand Down
16 changes: 8 additions & 8 deletions src/Form/EntryEditType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use App\Form\EventListener\DefaultLanguage;
use App\Form\EventListener\DisableFieldsOnEntryEdit;
use App\Form\EventListener\ImageListener;
use App\Form\Type\BadgesType;
// use App\Form\Type\BadgesType;
use App\Form\Type\LanguageType;
use App\Form\Type\MagazineAutocompleteType;
use Symfony\Component\Form\AbstractType;
Expand Down Expand Up @@ -48,13 +48,13 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
'delimiter' => ' ',
],
])
->add(
'badges',
BadgesType::class,
[
'required' => false,
]
)
// ->add(
// 'badges',
// BadgesType::class,
// [
// 'required' => false,
// ]
// )
->add(
'image',
FileType::class,
Expand Down
16 changes: 8 additions & 8 deletions src/Form/EntryImageType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use App\Form\EventListener\DisableFieldsOnEntryEdit;
use App\Form\EventListener\ImageListener;
use App\Form\EventListener\RemoveFieldsOnEntryImageEdit;
use App\Form\Type\BadgesType;
// use App\Form\Type\BadgesType;
use App\Form\Type\LanguageType;
use App\Form\Type\MagazineAutocompleteType;
use Symfony\Component\Form\AbstractType;
Expand Down Expand Up @@ -48,13 +48,13 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
'delimiter' => ' ',
],
])
->add(
'badges',
BadgesType::class,
[
'required' => false,
]
)
// ->add(
// 'badges',
// BadgesType::class,
// [
// 'required' => false,
// ]
// )
->add(
'image',
FileType::class,
Expand Down
16 changes: 8 additions & 8 deletions src/Form/EntryLinkType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use App\Form\EventListener\DefaultLanguage;
use App\Form\EventListener\DisableFieldsOnEntryEdit;
use App\Form\EventListener\ImageListener;
use App\Form\Type\BadgesType;
// use App\Form\Type\BadgesType;
use App\Form\Type\LanguageType;
use App\Form\Type\MagazineAutocompleteType;
use Symfony\Component\Form\AbstractType;
Expand Down Expand Up @@ -51,13 +51,13 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
->add('body', TextareaType::class, [
'required' => false,
])
->add(
'badges',
BadgesType::class,
[
'required' => false,
]
)
// ->add(
// 'badges',
// BadgesType::class,
// [
// 'required' => false,
// ]
// )
->add('magazine', MagazineAutocompleteType::class)
->add(
'image',
Expand Down
2 changes: 1 addition & 1 deletion templates/entry/_form_article.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
}}) }}
{{ form_row(form.magazine, {label: false}) }}
{{ form_row(form.tags, {label: 'tags'}) }}
{{ form_row(form.badges, {label: 'badges'}) }}
{# form_row(form.badges, {label: 'badges'}) #}
<div class="row params">
{{ form_row(form.isAdult, {label: 'is_adult', row_attr: {class: 'checkbox'}}) }}
{{ form_row(form.isOc, {label: 'oc', row_attr: {class: 'checkbox'}}) }}
Expand Down
2 changes: 1 addition & 1 deletion templates/entry/_form_edit.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
}}) }}
{{ form_row(form.magazine, {label: false}) }}
{{ form_row(form.tags, {label: 'tags'}) }}
{{ form_row(form.badges, {label: 'badges'}) }}
{# form_row(form.badges, {label: 'badges'}) #}
<div class="row params">
{{ form_row(form.isAdult, {label: 'is_adult', row_attr: {class: 'checkbox'}}) }}
{{ form_row(form.isOc, {label: 'oc', row_attr: {class: 'checkbox'}}) }}
Expand Down
2 changes: 1 addition & 1 deletion templates/entry/_form_image.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}}) }}
{{ form_row(form.magazine, {label: false}) }}
{{ form_row(form.tags, {label: 'tags'}) }}
{{ form_row(form.badges, {label: 'badges'}) }}
{# form_row(form.badges, {label: 'badges'}) #}
<div class="row params">
{{ form_row(form.isAdult, {label: 'is_adult', row_attr: {class: 'checkbox'}}) }}
{{ form_row(form.isOc, {label: 'oc', row_attr: {class: 'checkbox'}}) }}
Expand Down
2 changes: 1 addition & 1 deletion templates/entry/_form_link.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
}}) }}
{{ form_row(form.magazine, {label: false}) }}
{{ form_row(form.tags, {label: 'tags'}) }}
{{ form_row(form.badges, {label: 'badges'}) }}
{# form_row(form.badges, {label: 'badges'}) #}
<div class="row params">
{{ form_row(form.isAdult, {label: 'is_adult', row_attr: {class: 'checkbox'}}) }}
{{ form_row(form.isOc, {label: 'oc', row_attr: {class: 'checkbox'}}) }}
Expand Down
4 changes: 3 additions & 1 deletion templates/entry/create_article.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

{% block body %}
{% include 'entry/_create_options.html.twig' %}
<h1 hidden>{{ 'add_new_article'|trans }}</h1>
<header>
<h1 hidden>{{ 'add_new_article'|trans }}</h1>
</header>
{% include 'layout/_flash.html.twig' %}
{% include('user/_visibility_info.html.twig') %}

Expand Down
4 changes: 3 additions & 1 deletion templates/entry/create_image.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

{% block body %}
{% include 'entry/_create_options.html.twig' %}
<h1 hidden>{{ 'add_new_photo'|trans }}</h1>
<header>
<h1 hidden>{{ 'add_new_photo'|trans }}</h1>
</header>
{% include('user/_visibility_info.html.twig') %}
{% include 'layout/_flash.html.twig' %}

Expand Down
4 changes: 3 additions & 1 deletion templates/entry/create_link.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

{% block body %}
{% include 'entry/_create_options.html.twig' %}
<h1 hidden>{{ 'add_new_link'|trans }}</h1>
<header>
<h1 hidden>{{ 'add_new_link'|trans }}</h1>
</header>
{% include 'layout/_flash.html.twig' %}
{% include('user/_visibility_info.html.twig') %}

Expand Down
4 changes: 3 additions & 1 deletion templates/entry/edit_entry.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
class: 'section--top'
}) }}

<h1 hidden>{{ 'edit_entry'|trans }}</h1>
<header>
<h1 hidden>{{ 'edit_entry'|trans }}</h1>
</header>
{% include 'layout/_flash.html.twig' %}
<div id="content" class="section">
<div class="container" data-controller="entry-link-create">
Expand Down
4 changes: 3 additions & 1 deletion templates/magazine/create.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
{% include('user/_visibility_info.html.twig') %}

{% if user.visibility is same as 'visible' %}
<h1 hidden>{{ 'create_new_magazine'|trans }}</h1>
<header>
<h1 hidden>{{ 'create_new_magazine'|trans }}</h1>
</header>
<div id="content" class="section">
<div class="container">
{{ form_start(form) }}
Expand Down
1 change: 1 addition & 0 deletions templates/magazine/list_abandoned.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<header>
<h1 hidden>{{ 'magazines'|trans }}</h1>
</header>

{% include 'magazine/_options.html.twig' %}
<div id="content">
{% if magazines|length %}
Expand Down
Loading