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

[5.2] Fixed a set of options for the demo data plugin #44166

Merged
merged 4 commits into from
Oct 26, 2024
Merged

[5.2] Fixed a set of options for the demo data plugin #44166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
61fafe6
Fixed a set of options for the demo data plugin
Kostelano Sep 30, 2024
bc1415d
CS att1
Kostelano Sep 30, 2024
9636172
Merge branch 'joomla:5.2-dev' into 5-2-mod-art-plg-sample
Kostelano Oct 21, 2024
d1fb0b5
Merge branch '5.2-dev' into 5-2-mod-art-plg-sample
pe7er Oct 26, 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
2 changes: 1 addition & 1 deletion administrator/language/en-GB/plg_sampledata_blog.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_INTROTEXT="<p>Your home page is
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_TITLE="About your home page"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_FULLTEXT=""
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_FULLTEXTIMAGE_ALT="Crab Nebula"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_INTROTEXT="<p>Your site has some commonly used modules already preconfigured. These include:</p><ul><li>Image (type: Custom), which holds the image beneath the menu. This is a Custom module that you can edit to change the image.</li><li>Popular Tags (type: Tags - Popular), which will appear if you use tagging on your articles. Enter a tag in the Tags field when editing.</li><li>Older Posts (type: Articles - Category), which lists out articles by categories.</li><li>Syndication (type: Syndication Feeds), which allows your readers to read your posts in a news reader.</li><li>Login Form (type: Login), which allows your users to access restricted areas of the website.</li></ul><p>Each of these modules has many options which you can experiment with in the Module Manager in your site Administrator. When you are logged in you can also select the edit icon in the top right corner which will take you to an edit screen for that module. Always be sure to save and close any module you edit.</p><p>Joomla! also includes many other modules you can incorporate in your site. As you develop your site you may want to add more modules that you can find at the <a href=\"https://extensions.joomla.org/\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla Extensions Directory.</a></p>"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_INTROTEXT="<p>Your site has some commonly used modules already preconfigured. These include:</p><ul><li>Image (type: Custom), which holds the image beneath the menu. This is a Custom module that you can edit to change the image.</li><li>Popular Tags (type: Tags - Popular), which will appear if you use tagging on your articles. Enter a tag in the Tags field when editing.</li><li>Older Posts (type: Articles), which lists out articles by categories.</li><li>Syndication (type: Syndication Feeds), which allows your readers to read your posts in a news reader.</li><li>Login Form (type: Login), which allows your users to access restricted areas of the website.</li></ul><p>Each of these modules has many options which you can experiment with in the Module Manager in your site Administrator. When you are logged in you can also select the edit icon in the top right corner which will take you to an edit screen for that module. Always be sure to save and close any module you edit.</p><p>Joomla! also includes many other modules you can incorporate in your site. As you develop your site you may want to add more modules that you can find at the <a href=\"https://extensions.joomla.org/\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla Extensions Directory.</a></p>"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_TITLE="Your Modules"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_FULLTEXT=""
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_INTROTEXT="<p>Templates control the look and feel of your website.</p><p>This blog is installed with the Cassiopeia template.</p><p>You can edit the options by selecting the Working on Your Site, Template Settings link in the menu which is visible when you log in.</p><p>For example you can change the site background colour, highlights colour, site title, site description and title font used.</p><p>More options are available in the site administrator. You may also install a new template using the extension manager.</p>"
Expand Down
4 changes: 2 additions & 2 deletions modules/mod_articles/mod_articles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,8 @@
filter="integer"
showon="title_only:0[AND]show_category:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>

<field
Expand Down
13 changes: 9 additions & 4 deletions plugins/sampledata/blog/src/Extension/Blog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1438,6 +1438,7 @@ public function onAjaxSampledataApplyStep3()
'category_filtering_type' => 1,
'show_child_category_articles' => 0,
'levels' => 1,
'ex_or_include_articles' => 0,
'exclude_current' => 1,
'excluded_articles' => '',
'included_articles' => '',
Expand Down Expand Up @@ -1507,19 +1508,23 @@ public function onAjaxSampledataApplyStep3()
'catid' => $catIds[2],
'show_child_category_articles' => 0,
'levels' => 1,
'ex_or_include_articles' => 0,
'exclude_current' => 1,
'excluded_articles' => '',
'included_articles' => '',
'title_only' => 0,
'articles_layout' => 1,
'layout_columns' => 3,
'item_title' => 1,
'item_heading' => 'h3',
'link_titles' => 1,
'show_author' => 0,
'show_category' => 0,
'show_category_link' => 1,
'show_date' => 0,
'show_date_field' => 'created',
'show_date_format' => $this->getApplication()->getLanguage()->_('DATE_FORMAT_LC5'),
'show_category' => 0,
'show_category_link' => 1,
'show_hits' => 0,
'show_author' => 0,
'info_layout' => 1,
'show_tags' => 0,
'trigger_events' => 0,
Expand All @@ -1534,7 +1539,6 @@ public function onAjaxSampledataApplyStep3()
'show_archived' => 'hide',
'author_filtering_type' => 1,
'author_alias_filtering_type' => 1,
'excluded_articles' => '',
'date_filtering' => 'off',
'date_field' => 'a.created',
'start_date_range' => '',
Expand Down Expand Up @@ -1571,6 +1575,7 @@ public function onAjaxSampledataApplyStep3()
'catid' => $catIds[0],
'show_child_category_articles' => 0,
'levels' => 1,
'ex_or_include_articles' => 0,
'exclude_current' => 1,
'excluded_articles' => '',
'included_articles' => '',
Expand Down