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

fix: put back front image first in product edit form #7772

Merged
merged 1 commit into from
Nov 30, 2022
Merged

fix: put back front image first in product edit form #7772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cgi/product_multilingual.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,7 @@ ($product_ref, $field, $language)

# For moderators, add a checkbox to move all data and photos to the main language
# this needs to be below the "add (language name) in all field labels" above, so that it does not change this label.
if (($User{moderator}) and ($tabsid eq "product")) {
if (($User{moderator}) and ($tabsid eq "front_image")) {

my $msg = f_lang(
"f_move_data_and_photos_to_main_language",
Expand Down
2 changes: 1 addition & 1 deletion templates/web/pages/product_edit/display_input_tabs.tt.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
[% IF tab.tabid != "new" %]
<div class="tabs content[% tab.active %][% tab.new_lc %] tabs_[% tab.tabid %]" id="tabs_[% tabsid %]_[% tab.tabid %]">

[% IF moderator && tabsid == "product" %]
[% IF moderator && tabsid == "front_image" %]
<div class="move_data_and_images_to_main_language" id="[% tab.moveid %]_div" style="display:none;">
<input class="move_data_and_images_to_main_language_checkbox" type="checkbox" id="[% tab.moveid %]" name="[% tab.moveid %]" />
<label for="[% tab.moveid %]" class="checkbox_label">[% tab.msg %]</label><br/>
Expand Down
25 changes: 13 additions & 12 deletions templates/web/pages/product_edit/product_edit_form_display.tt.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,12 @@ <h1>[% title %]</h1>
[% END %]

</div>
</section>

<section id="product_characteristics" class="fieldset card">
</section>
<section id="product_image" class="card fieldset">
<div class="card-section">
<legend>[% lang('product_characteristics') %]</legend>
<legend>[% lang("product_image") %]</legend>
<input type="hidden" id="sorted_langs" name="sorted_langs" value="[% product_ref_sorted_langs %]"/>

<label for="lang"> [% lang('lang') %] </label>
<select name="lang" id="lang">
Expand All @@ -118,6 +119,14 @@ <h1>[% title %]</h1>
[% END %]
</select>

[% display_tab_product_picture %]
</div>
</section>

<section id="product_characteristics" class="fieldset card">
<div class="card-section">
<legend>[% lang('product_characteristics') %]</legend>

[% display_tab_product_characteristics %]

[% FOREACH field IN display_fields_arr %]
Expand All @@ -126,14 +135,6 @@ <h1>[% title %]</h1>
</div>
</section>

<section id="product_image" class="card fieldset">
<div class="card-section">
<legend>[% lang("product_image") %]</legend>
<input type="hidden" id="sorted_langs" name="sorted_langs" value="[% product_ref_sorted_langs %]"/>
[% display_tab_product_picture %]
</div>
</section>

<section id="ingredients" class="card fieldset">
<div class="card-section">
<legend>[% lang('ingredients') %]</legend>
Expand Down