Skip to content

Commit

Permalink
Merge pull request #5568 from pineray/remaining-migration-to-bs5
Browse files Browse the repository at this point in the history 
Remaining migration to Bootstrap5
  • Loading branch information
@chihiro-adachi
chihiro-adachi authored Aug 24, 2022
2 parents 412fbe8 + dedc05d commit 7c58070
Show file tree
Hide file tree
Showing 65 changed files with 369 additions and 377 deletions.
6 changes: 3 additions & 3 deletions codeception/_support/Page/Admin/OrderEditPage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ public function 注文者パネルを開く()

public function 商品検索($value = '')
{
$this->tester->scrollTo(['css' => '#orderItem > div > div.row.justify-content-between.mb-2 > div.col-6 > a.btn.btn-ec-regular.mr-2.add'], 0, -50);
$this->tester->click(['css' => '#orderItem > div > div.row.justify-content-between.mb-2 > div.col-6 > a.btn.btn-ec-regular.mr-2.add']);
$this->tester->scrollTo(['css' => '#orderItem > div > div.row.justify-content-between.mb-2 > div.col-6 > a.btn.btn-ec-regular.me-2.add'], 0, -50);
$this->tester->click(['css' => '#orderItem > div > div.row.justify-content-between.mb-2 > div.col-6 > a.btn.btn-ec-regular.me-2.add']);
$this->tester->waitForElementVisible(['id' => 'addProduct']);
$this->tester->fillField(['id' => 'admin_search_product_id'], $value);
$this->tester->click('#searchProductModalButton');
Expand Down Expand Up @@ -187,7 +187,7 @@ public function 明細の項目名を取得($row)
public function 明細を削除($row)
{
$this->tester->scrollTo(['css' => '#order-product']);
$this->tester->click("#table-form-field > tbody > tr:nth-child({$row}) > td.align-middle.text-end.pe-3 > div > div > div.d-inline-block.mr-3 > a");
$this->tester->click("#table-form-field > tbody > tr:nth-child({$row}) > td.align-middle.text-end.pe-3 > div > div > div.d-inline-block.me-3 > a");
$this->tester->waitForElementVisible("#table-form-field > tbody > tr:nth-child({$row}) > td.align-middle.text-end.pe-3 > div > div > div.modal");

return $this;
Expand Down
2 changes: 1 addition & 1 deletion codeception/_support/Page/Admin/TaxManagePage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function 一覧_編集($rowNum)

public function 一覧_削除($rowNum)
{
$this->tester->click("table tbody tr:nth-child(${rowNum}) > td.align-middle.action > div > div > div:nth-child(2) > div.d-inline-block.mr-3 > a");
$this->tester->click("table tbody tr:nth-child(${rowNum}) > td.align-middle.action > div > div > div:nth-child(2) > div.d-inline-block.me-3 > a");

// accept modal
$this->tester->waitForElementVisible("table tbody tr:nth-child(${rowNum}) > td.align-middle.action > div > div > div:nth-child(2) > div.modal");
Expand Down
2 changes: 1 addition & 1 deletion src/Eccube/Command/PluginGenerateCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ public function configureOptions(OptionsResolver \$resolver)
<div class="card-body">
<div class="row">
<div class="col-3"><span>名前</span><span
class="badge badge-primary ml-1">必須</span></div>
class="badge bg-primary ml-1">必須</span></div>
<div class="col mb-2">
{{ form_widget(form.name) }}
{{ form_errors(form.name) }}
Expand Down
6 changes: 3 additions & 3 deletions src/Eccube/Resource/template/admin/Content/block.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,14 @@ file that was distributed with this source code.
<div class="row">
<div class="col-6 text-end">
<a href="{{ url('admin_content_block_edit', {id: Block.id}) }}"
class="btn btn-ec-actionIcon mr-3" data-bs-toggle="tooltip"
class="btn btn-ec-actionIcon me-3" data-bs-toggle="tooltip"
data-bs-placement="top" title="{{ 'admin.common.edit'|trans }}">
<i class="fa fa-pencil fa-lg text-secondary"></i>
</a>
</div>
{% if Block.deletable %}
<div class="col-6">
<div class="d-inline-block mr-3" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ 'admin.common.delete'|trans }}">
<div class="d-inline-block me-3" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ 'admin.common.delete'|trans }}">
<a href="#" data-bs-toggle="modal" data-bs-target="#confirmModal-{{ Block.id }}" class="btn btn-ec-actionIcon">
<i class="fa fa-close fa-lg text-secondary"></i>
</a>
Expand All @@ -99,7 +99,7 @@ file that was distributed with this source code.
<div class="modal-header">
<h5 class="modal-title fw-bold">{{ 'admin.common.delete_modal__title'|trans }}</h5>
<button class="btn-close" type="button" data-bs-dismiss="modal" aria-label="Close">

</button>
</div>
<div class="modal-body text-start">
Expand Down
12 changes: 6 additions & 6 deletions src/Eccube/Resource/template/admin/Content/block_edit.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ file that was distributed with this source code.
<div class="row mb-2">
<div class="col-2">
<div class="d-inline-block" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ 'tooltip.content.block_name'|trans }}">
<span>{{ 'admin.content.block_name'|trans }}</span><i class="fa fa-question-circle fa-lg ml-1"></i>
<span>{{ 'admin.content.block_name'|trans }}</span><i class="fa fa-question-circle fa-lg ms-1"></i>
</div>
<span class="badge bg-primary ml-1">{{ 'admin.common.required'|trans }}</span>
<span class="badge bg-primary ms-1">{{ 'admin.common.required'|trans }}</span>
</div>
<div class="col-10">
{{ form_widget(form.name) }}
Expand All @@ -89,9 +89,9 @@ file that was distributed with this source code.
<div class="row mb-2">
<div class="col-2">
<div class="d-inline-block" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ 'tooltip.content.block_file_name'|trans }}">
<span>{{ 'admin.content.block_file_name'|trans }}</span><i class="fa fa-question-circle fa-lg ml-1"></i>
<span>{{ 'admin.content.block_file_name'|trans }}</span><i class="fa fa-question-circle fa-lg ms-1"></i>
</div>
<span class="badge bg-primary ml-1">{{ 'admin.common.required'|trans }}</span>
<span class="badge bg-primary ms-1">{{ 'admin.common.required'|trans }}</span>
</div>
<div class="col-10">
{% if deletable %}
Expand All @@ -108,9 +108,9 @@ file that was distributed with this source code.
<div class="row mb-2">
<div class="col-2">
<div class="d-inline-block" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ 'tooltip.content.block_source_code'|trans }}">
<span>{{ 'admin.content.block_source_code'|trans }}</span><i class="fa fa-question-circle fa-lg ml-1"></i>
<span>{{ 'admin.content.block_source_code'|trans }}</span><i class="fa fa-question-circle fa-lg ms-1"></i>
</div>
<span class="badge bg-primary ml-1">{{ 'admin.common.required'|trans }}</span>
<span class="badge bg-primary ms-1">{{ 'admin.common.required'|trans }}</span>
</div>
<div class="col-10">
<div id="editor" style="height: 480px" class="form-control{{ has_errors(form.block_html) ? ' is-invalid' }}"></div>
Expand Down
4 changes: 2 additions & 2 deletions src/Eccube/Resource/template/admin/Content/css.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@
<div class="row mb-2">
<div class="col-2">
<div class="d-inline-block" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ 'tooltip.content.css_source_code'|trans }}">
<span>{{ 'admin.content.page_source_code'|trans }}</span><i class="fa fa-question-circle fa-lg ml-1"></i>
<span>{{ 'admin.content.page_source_code'|trans }}</span><i class="fa fa-question-circle fa-lg ms-1"></i>
</div>
<span class="badge bg-primary ml-1">{{ 'admin.common.required'|trans }}</span>
<span class="badge bg-primary ms-1">{{ 'admin.common.required'|trans }}</span>
</div>
<div class="col-10">
<div id="editor" style="height: 480px" class="form-control{{ has_errors(form.css) ? ' is-invalid' }}"></div>
Expand Down
2 changes: 1 addition & 1 deletion src/Eccube/Resource/template/admin/Content/file.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ file that was distributed with this source code.
<div class="card-header"><span class="card-title">{{ 'admin.content.file.add_file__card_title'|trans }}</span></div>
<div class="card-body">
<div id="upload_box__file" class="row mb-2">
<div class="col-2" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ 'tooltip.content.file.upload_file'|trans }}"><span>{{ 'admin.content.file.add_file'|trans }}</span><i class="fa fa-question-circle fa-lg ml-1"></i></div>
<div class="col-2" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ 'tooltip.content.file.upload_file'|trans }}"><span>{{ 'admin.content.file.add_file'|trans }}</span><i class="fa fa-question-circle fa-lg ms-1"></i></div>
<div class="col mb-3">
<div class="mb-2">
{{ form_widget(form.file) }}{# TODO input type="file" の装飾 #}
Expand Down
4 changes: 2 additions & 2 deletions src/Eccube/Resource/template/admin/Content/js.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@
<div class="row mb-2">
<div class="col-2">
<div class="d-inline-block" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ 'tooltip.content.js_source_code'|trans }}">
<span>{{ 'admin.content.page_source_code'|trans }}</span><i class="fa fa-question-circle fa-lg ml-1"></i>
<span>{{ 'admin.content.page_source_code'|trans }}</span><i class="fa fa-question-circle fa-lg ms-1"></i>
</div>
<span class="badge bg-primary ml-1">{{ 'admin.common.required'|trans }}</span>
<span class="badge bg-primary ms-1">{{ 'admin.common.required'|trans }}</span>
</div>
<div class="col-10">
<div id="editor" style="height: 480px" class="form-control{{ has_errors(form.js) ? ' is-invalid' }}"></div>
Expand Down
14 changes: 7 additions & 7 deletions src/Eccube/Resource/template/admin/Content/layout.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ file that was distributed with this source code.
<div class="collapse show ec-cardCollapse" id="layoutOverview">
<div class="card-body">
<div class="row mb-2">
<div class="col-3 pe-0"><span>{{ 'admin.content.layout_name'|trans }}</span><span class="badge bg-primary ml-1">{{ 'admin.common.required'|trans }}</span></div>
<div class="col-3 pe-0"><span>{{ 'admin.content.layout_name'|trans }}</span><span class="badge bg-primary ms-1">{{ 'admin.common.required'|trans }}</span></div>
<div class="col">
{{ form_widget(form.name) }}
{{ form_errors(form.name) }}
Expand Down Expand Up @@ -239,7 +239,7 @@ file that was distributed with this source code.
<div class="card-header">
<div class="row">
<div class="col-8">
<div class="d-inline-block" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ 'tooltip.content.layout_edit'|trans }}"><span class="card-title">{{ 'admin.content.layout_edit__card_title'|trans }}</span><i class="fa fa-question-circle fa-lg ml-1"></i></div>
<div class="d-inline-block" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ 'tooltip.content.layout_edit'|trans }}"><span class="card-title">{{ 'admin.content.layout_edit__card_title'|trans }}</span><i class="fa fa-question-circle fa-lg ms-1"></i></div>
</div>
<div class="col-4 text-end"><a data-bs-toggle="collapse" href="#layoutBlockEdit" aria-expanded="false" aria-controls="layoutBlockEdit"><i class="fa fa-angle-up fa-lg"></i></a></div>
</div>
Expand Down Expand Up @@ -442,7 +442,7 @@ file that was distributed with this source code.
class="block sort{% if loop.first %} first{% endif %} border border-ec-gray bg-ec-lightGray p-2 mb-2">
<div class="row justify-content-between">
<div class="col">
<i class="fa fa-bars text-ec-gray mr-3"></i>
<i class="fa fa-bars text-ec-gray me-3"></i>
<span class="view_readme" data-bs-toggle="modal"
data-bs-target="#blockModal"
data-id="{{ UnusedBlock.id }}"
Expand Down Expand Up @@ -516,16 +516,16 @@ file that was distributed with this source code.
<div id="context-menu" style="display: none">
<div class='list-group'>
<a href='javascript:;' class='context-moveup list-group-item list-group-item-action border-0'>
<i class='fa fa-long-arrow-up mr-1'></i>{{ 'admin.content.layout_up'|trans }}
<i class='fa fa-long-arrow-up me-1'></i>{{ 'admin.content.layout_up'|trans }}
</a>
<a href='javascript:;' class='context-movedown list-group-item list-group-item-action border-0'>
<i class='fa fa-long-arrow-down mr-1'></i>{{ 'admin.content.layout_down'|trans }}
<i class='fa fa-long-arrow-down me-1'></i>{{ 'admin.content.layout_down'|trans }}
</a>
<a href='javascript:;' class='context-movesection list-group-item list-group-item-action border-0'>
<i class='fa fa-arrows mr-1'></i>{{ 'admin.content.layout_move_to'|trans }}
<i class='fa fa-arrows me-1'></i>{{ 'admin.content.layout_move_to'|trans }}
</a>
<a href='javascript:;' class='context-preview list-group-item list-group-item-action border-0'>
<i class='fa fa-code mr-1'></i>{{ 'admin.content.layout_preview_code'|trans }}
<i class='fa fa-code me-1'></i>{{ 'admin.content.layout_preview_code'|trans }}
</a>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Eccube/Resource/template/admin/Content/layout_block.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ file that was distributed with this source code.
<div id="detail_box__layout_item--{{ BlockPosition.Block.id }}" class="block sort border border-ec-gray bg-ec-lightGray p-2 mb-2">
<div class="row justify-content-between">
<div class="col">
<i class="fa fa-bars text-ec-gray mr-3"></i>
<i class="fa fa-bars text-ec-gray me-3"></i>
<span class="view_readme" data-bs-toggle="modal"
data-bs-target="#blockModal"
data-id="{{ BlockPosition.Block.id }}"
Expand Down
4 changes: 2 additions & 2 deletions src/Eccube/Resource/template/admin/Content/layout_list.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ file that was distributed with this source code.
{% else %}
{% set icon = 'fa-mobile' %}
{% endif %}
<i class="fa fa-fw {{ icon }} fa-lg mr-2"></i>
<i class="fa fa-fw {{ icon }} fa-lg me-2"></i>
<a class="card-title align-middle"
href="{{ url('admin_content_layout_edit', { id : Layout.id } ) }}">{{ Layout.name }}</a>
</div>
<div class="col-4 text-end">
{% if Layout.isDefault() == false %}
<button class="btn btn-ec-sub mr-3" type="button" data-bs-toggle="modal" data-bs-target="#DeleteModal"
<button class="btn btn-ec-sub me-3" type="button" data-bs-toggle="modal" data-bs-target="#DeleteModal"
data-url="{{ url('admin_content_layout_delete', { id: Layout.id }) }}"
data-message="{{ 'admin.common.delete_modal__message'|trans({ '%name%' : Layout.name }) }}">
<i class="fa fa-close fa-lg text-secondary" aria-hidden="true"></i>
Expand Down
Loading

0 comments on commit 7c58070

Please sign in to comment.