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

Make report bugs link optional #17803

Merged
merged 2 commits into from Oct 12, 2018
Merged

Make report bugs link optional #17803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bc1c6f
Merge remote-tracking branch 'upstream/2.3-develop' into 2.3-develop
arnoudhgz Aug 26, 2018
9fe66f7
Make it possible to disable report bugs link
arnoudhgz Aug 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions app/code/Magento/Theme/etc/config.xml
View file
Open in desktop
Expand Up @@ -46,6 +46,7 @@ Disallow: /*SID=
</header>
<footer translate="copyright">
<copyright>Copyright &#169; 2013-present Magento, Inc. All rights reserved.</copyright>
<report_bugs>1</report_bugs>
</footer>
</design>
<theme>
Expand Down
4 changes: 4 additions & 0 deletions app/code/Magento/Theme/etc/di.xml
View file
Open in desktop
Expand Up @@ -214,6 +214,10 @@
<item name="path" xsi:type="string">design/footer/absolute_footer</item>
<item name="fieldset" xsi:type="string">other_settings/footer</item>
</item>
<item name="footer_report_bugs" xsi:type="array">
<item name="path" xsi:type="string">design/footer/report_bugs</item>
<item name="fieldset" xsi:type="string">other_settings/footer</item>
</item>
<item name="default_robots" xsi:type="array">
<item name="path" xsi:type="string">design/search_engine_robots/default_robots</item>
<item name="fieldset" xsi:type="string">other_settings/search_engine_robots</item>
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/Theme/i18n/en_US.csv
View file
Open in desktop
Expand Up @@ -188,3 +188,4 @@ Settings,Settings
ID,ID
View,View
Action,Action
"Display Report Bugs Link","Display Report Bugs Link"
14 changes: 14 additions & 0 deletions app/code/Magento/Theme/view/adminhtml/ui_component/design_config_form.xml
View file
Open in desktop
Expand Up @@ -233,6 +233,20 @@
<dataScope>footer_copyright</dataScope>
</settings>
</field>
<field name="footer_report_bugs" formElement="select">
<settings>
<dataType>text</dataType>
<label translate="true">Display Report Bugs Link</label>
<dataScope>footer_report_bugs</dataScope>
</settings>
<formElements>
<select>
<settings>
<options class="Magento\Config\Model\Config\Source\Yesno"/>
</settings>
</select>
</formElements>
</field>
</fieldset>
<fieldset name="search_engine_robots" sortOrder="120">
<settings>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Theme/view/frontend/layout/default.xml
View file
Open in desktop
Expand Up @@ -119,7 +119,7 @@
</arguments>
</block>
<block class="Magento\Theme\Block\Html\Footer" name="copyright" template="Magento_Theme::html/copyright.phtml"/>
<block class="Magento\Framework\View\Element\Template" name="report.bugs" template="Magento_Theme::html/bugreport.phtml" />
<block class="Magento\Framework\View\Element\Template" name="report.bugs" template="Magento_Theme::html/bugreport.phtml" ifconfig="design/footer/report_bugs"/>
</container>
</referenceContainer>
<referenceContainer name="before.body.end">
Expand Down