diff --git a/administrator/language/en-GB/plg_sampledata_blog.ini b/administrator/language/en-GB/plg_sampledata_blog.ini index 2a193294a0..c963754e44 100644 --- a/administrator/language/en-GB/plg_sampledata_blog.ini +++ b/administrator/language/en-GB/plg_sampledata_blog.ini @@ -25,13 +25,13 @@ PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_FULLTEXT="

This blog is insta PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_INTROTEXT="

Templates control the look and feel of your website.

" PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_TITLE="Your Template" PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_6_FULLTEXT=" This will be a nice documentation on multi column Layouts in J4.

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est " -PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_6_INTROTEXT="

Millions of Websites are built on Joomla!

" +PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_6_INTROTEXT="

Millions of Websites are built on Joomla!

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy aliquya

" PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_6_TITLE="Millions" PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_7_FULLTEXT="

Uurnip greens yarrow ricebean rutabaga endive cauliflower sea lettuce kohlrabi amaranth water spinach avocado daikon napa cabbage asparagus winter purslane kale. Celery potato scallion desert raisin horseradish spinach carrot soko. Lotus root water spinach fennel kombu maize bamboo shoot green bean swiss chard seakale pumpkin onion chickpea gram corn pea. Brussels sprout coriander water chestnut gourd swiss chard wakame kohlrabi beetroot carrot watercress. Corn amaranth salsify bunya nuts nori azuki bean chickweed potato bell pepper artichoke.

" -PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_7_INTROTEXT="

We love Joomla to the moon and back! Thank you to all volunteers who have contributed!

" +PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_7_INTROTEXT="

We love Joomla to the moon and back! Thank you to all volunteers who have contributed!

" PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_7_TITLE="Love" PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_8_FULLTEXT="

Cupcake ipsum dolor. Sit amet cotton candy ice cream sesame snaps cake marshmallow powder. Ice cream chocolate cake marshmallow halvah bonbon. Dragée carrot cake danish candy muffin brownie. Candy sugar plum ice cream chupa chups macaroon tiramisu soufflé oat cake. Topping cheesecake lollipop gummi bears icing sweet roll donut liquorice. Pie jelly-o candy donut oat cake cotton candy.

" -PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_8_INTROTEXT="

We proudly present Joomla Version 4!

" +PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_8_INTROTEXT="

We proudly present Joomla Version 4!

Lorem ipsum dolor, onsetetur sadipscing elitr, sed diam nonumy eirmod ut labore et dolore magna aliquya

" PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_8_TITLE="Joomla" PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_0_TITLE="Blog" PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_1_TITLE="Help" diff --git a/images/banners/banner-rocket.png b/images/banners/banner-rocket.png new file mode 100644 index 0000000000..441be91b6c Binary files /dev/null and b/images/banners/banner-rocket.png differ diff --git a/images/banners/banner-stars.jpg b/images/banners/banner-stars.jpg new file mode 100644 index 0000000000..2f9b5664c9 Binary files /dev/null and b/images/banners/banner-stars.jpg differ diff --git a/images/sampledata/cassiopeia/blue-rocket-400.jpg b/images/sampledata/cassiopeia/blue-rocket-400.jpg new file mode 100644 index 0000000000..ae1211f706 Binary files /dev/null and b/images/sampledata/cassiopeia/blue-rocket-400.jpg differ diff --git a/images/sampledata/cassiopeia/rocket-1000.jpg b/images/sampledata/cassiopeia/rocket-1000.jpg new file mode 100644 index 0000000000..ff7b5cef57 Binary files /dev/null and b/images/sampledata/cassiopeia/rocket-1000.jpg differ diff --git a/images/sampledata/cassiopeia/rocket-400.jpg b/images/sampledata/cassiopeia/rocket-400.jpg new file mode 100644 index 0000000000..ef657a2d9f Binary files /dev/null and b/images/sampledata/cassiopeia/rocket-400.jpg differ diff --git a/plugins/sampledata/blog/blog.php b/plugins/sampledata/blog/blog.php index b7891ec14e..376d8fdfa2 100644 --- a/plugins/sampledata/blog/blog.php +++ b/plugins/sampledata/blog/blog.php @@ -492,7 +492,8 @@ public function onAjaxSampledataApplyStep1() 'ordering' => 2, 'state' => 0, 'images' => array( - 'image_intro' => 'images/banners/banner.jpg', + 'show_page_heading' => '1', + 'image_intro' => 'images/sampledata/cassiopeia/rocket-1000.jpg', 'float_intro' => 'left', 'image_intro_alt' => '', 'image_intro_caption' => '', @@ -508,7 +509,8 @@ public function onAjaxSampledataApplyStep1() 'ordering' => 1, 'state' => 0, 'images' => array( - 'image_intro' => 'images/banners/banner.jpg', + 'show_page_heading' => '1', + 'image_intro' => 'images/sampledata/cassiopeia/rocket-1000.jpg', 'float_intro' => 'right', 'image_intro_alt' => '', 'image_intro_caption' => '', @@ -524,7 +526,8 @@ public function onAjaxSampledataApplyStep1() 'ordering' => 0, 'state' => 0, 'images' => array( - 'image_intro' => 'images/banners/banner.jpg', + 'show_page_heading' => '1', + 'image_intro' => 'images/sampledata/cassiopeia/rocket-1000.jpg', 'float_intro' => 'left', 'image_intro_alt' => '', 'image_intro_caption' => '', @@ -548,7 +551,8 @@ public function onAjaxSampledataApplyStep1() 'ordering' => 0, 'state' => 1, 'images' => array( - 'image_intro' => 'images/banners/banner.jpg', + 'show_page_heading' => '1', + 'image_intro' => 'images/sampledata/cassiopeia/blue-rocket-400.jpg', 'float_intro' => '', 'image_intro_alt' => '', 'image_intro_caption' => '', @@ -564,7 +568,8 @@ public function onAjaxSampledataApplyStep1() 'ordering' => 0, 'state' => 1, 'images' => array( - 'image_intro' => 'images/banners/banner.jpg', + 'show_page_heading' => '1', + 'image_intro' => 'images/sampledata/cassiopeia/rocket-400.jpg', 'float_intro' => '', 'image_intro_alt' => '', 'image_intro_caption' => '', @@ -580,7 +585,8 @@ public function onAjaxSampledataApplyStep1() 'ordering' => 0, 'state' => 1, 'images' => array( - 'image_intro' => 'images/banners/banner.jpg', + 'show_page_heading' => '1', + 'image_intro' => 'images/sampledata/cassiopeia/blue-rocket-400.jpg', 'float_intro' => '', 'image_intro_alt' => '', 'image_intro_caption' => '', @@ -771,6 +777,8 @@ public function onAjaxSampledataApplyStep2() 'component_id' => ExtensionHelper::getExtensionRecord('com_content', 'component')->extension_id, 'params' => array( 'layout_type' => 'blog', + 'show-titles' => 1, + 'link-titles' => 0, 'show_category_title' => 0, 'num_leading_articles' => 4, 'num_intro_articles' => 0, @@ -786,7 +794,7 @@ public function onAjaxSampledataApplyStep2() 'show_hits' => 0, 'show_feed_link' => 1, 'menu_text' => 1, - 'show_page_heading' => 0, + 'show_page_heading' => 1, 'secure' => 0, ), ), @@ -797,6 +805,7 @@ public function onAjaxSampledataApplyStep2() 'link' => 'index.php?option=com_content&view=article&id=' . $articleIds[0], 'component_id' => ExtensionHelper::getExtensionRecord('com_content', 'component')->extension_id, 'params' => array( + 'show_title' => 0, 'info_block_position' => 0, 'show_category' => 0, 'link_category' => 0, @@ -805,7 +814,7 @@ public function onAjaxSampledataApplyStep2() 'show_publish_date' => 0, 'show_hits' => 0, 'menu_text' => 1, - 'show_page_heading' => 0, + 'show_page_heading' => 1, 'secure' => 0, ), ), @@ -816,10 +825,11 @@ public function onAjaxSampledataApplyStep2() 'link' => 'index.php?option=com_users&view=login', 'component_id' => ExtensionHelper::getExtensionRecord('com_users', 'component')->extension_id, 'params' => array( + 'show_title' => 0, 'logindescription_show' => 1, 'logoutdescription_show' => 1, 'menu_text' => 1, - 'show_page_heading' => 0, + 'show_page_heading' => 1, 'secure' => 0, ), ), @@ -882,7 +892,7 @@ public function onAjaxSampledataApplyStep2() 'access' => 2, 'params' => array( 'menu_text' => 1, - 'show_page_heading' => 0, + 'show_page_heading' => 1, 'secure' => 0, ), ), @@ -895,7 +905,7 @@ public function onAjaxSampledataApplyStep2() 'logindescription_show' => 1, 'logoutdescription_show' => 1, 'menu_text' => 1, - 'show_page_heading' => 0, + 'show_page_heading' => 1, 'secure' => 0, ), ), @@ -984,6 +994,7 @@ public function onAjaxSampledataApplyStep2() 'component_id' => ExtensionHelper::getExtensionRecord('com_content', 'component')->extension_id, 'params' => array( 'layout_type' => 'blog', + 'link_titles' => 0, 'show_category_title' => 0, 'num_leading_articles' => 1, 'num_intro_articles' => 2, @@ -1000,7 +1011,7 @@ public function onAjaxSampledataApplyStep2() 'show_hits' => 0, 'show_feed_link' => 0, 'menu_text' => 1, - 'show_page_heading' => 0, + 'show_page_heading' => 1, 'secure' => 0, ), ), @@ -1022,28 +1033,14 @@ public function onAjaxSampledataApplyStep2() // Articles (menu header) 'menutype' => $menuTypes[0], 'title' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_13_TITLE'), - 'link' => 'index.php?option=com_content&view=category&layout=blog&id=' . $catids[2], + 'type' => 'heading', + 'link' => '', + 'component_id' => 0, 'parent_id' => $menuIdsLevel1[3], - 'component_id' => ExtensionHelper::getExtensionRecord('com_content', 'component')->extension_id, 'params' => array( - 'layout_type' => 'blog', - 'show_category_title' => 0, - 'num_leading_articles' => 3, - 'num_intro_articles' => 0, - 'num_links' => 2, - 'orderby_sec' => 'front', - 'order_date' => 'published', - 'blog_class_leading' => 'boxed columns-3', - 'blog_class' => '', - 'show_pagination' => 2, - 'show_pagination_results' => 1, - 'show_category' => 0, - 'info_bloc_position' => 0, - 'show_publish_date' => 0, - 'show_hits' => 0, - 'show_feed_link' => 0, + 'layout_type' => 'heading', 'menu_text' => 1, - 'show_page_heading' => 0, + 'show_page_heading' => 1, 'secure' => 0, ), ) @@ -1624,6 +1621,12 @@ private function addMenuItems(array $menuItems, $level) $menuItem['level'] = $level; $menuItem['home'] = 0; + // Set pageheading = title to enforce h1 headings + if (isset($menuItem['show_page_heading']) && $menuItem['show_page_heading']) + { + $menuItem['page_heading'] = $menuItem['title']; + } + // Set browserNav to default if not set if (!isset($menuItem['browserNav'])) {