Skip to content
This repository has been archived by the owner on Jan 25, 2021. It is now read-only.

Sample data expanded with images and headings h1 #147

Closed
wants to merge 29 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
9237db6
Change show-page-heading to "yes"
chmst Sep 28, 2020
69aa54b
Merge branch 'development' into sample-data-menuitem-alias
richard67 Sep 29, 2020
8632585
Add some more text to newsflash cards
chmst Sep 29, 2020
0809bcf
Add some sample images, j4 rocket
chmst Sep 29, 2020
5f8d011
Add pae-heading-param for H1, change parent in metismenu to type head…
chmst Sep 29, 2020
386e73a
Fix h1 in metis menu blog
chmst Sep 29, 2020
b751877
Merge branch 'development' into sample-data-menuitem-alias
richard67 Sep 30, 2020
e293e4e
Merge branch 'development' into sample-data-menuitem-alias
richard67 Sep 30, 2020
d08fdcd
Merge branch 'development' into sample-data-menuitem-alias
richard67 Oct 1, 2020
8f2ff9a
Merge branch 'development' into sample-data-menuitem-alias
richard67 Oct 1, 2020
eed22d5
Merge branch 'development' into sample-data-menuitem-alias
richard67 Oct 1, 2020
16f5057
fix codestyle
chmst Oct 2, 2020
7baea3c
Merge branch 'development' into sample-data-menuitem-alias
richard67 Oct 2, 2020
a6cf910
Merge branch 'development' into sample-data-menuitem-alias
richard67 Oct 2, 2020
76e18e5
Merge branch 'development' into sample-data-menuitem-alias
richard67 Oct 7, 2020
8c36b6e
Merge branch 'development' into sample-data-menuitem-alias
richard67 Oct 7, 2020
b326f79
Merge branch 'development' into sample-data-menuitem-alias
richard67 Oct 8, 2020
1fb5ed0
Merge branch 'development' into sample-data-menuitem-alias
richard67 Oct 9, 2020
7580362
Merge branch 'development' into sample-data-menuitem-alias
richard67 Oct 13, 2020
6d9c924
Merge branch 'development' into sample-data-menuitem-alias
richard67 Oct 13, 2020
0fb070c
Merge branch 'development' into sample-data-menuitem-alias
richard67 Oct 15, 2020
5828aee
Merge branch 'development' into sample-data-menuitem-alias
richard67 Oct 17, 2020
9384a88
Merge branch 'development' into sample-data-menuitem-alias
richard67 Oct 18, 2020
5511140
Merge branch 'development' into sample-data-menuitem-alias
richard67 Oct 19, 2020
7bd72e7
Merge branch 'development' into sample-data-menuitem-alias
richard67 Oct 19, 2020
7320cb3
Merge branch 'development' into sample-data-menuitem-alias
richard67 Oct 19, 2020
dcb1d34
Merge branch 'development' into sample-data-menuitem-alias
richard67 Oct 20, 2020
966e270
Merge branch 'development' into sample-data-menuitem-alias
richard67 Oct 21, 2020
b2b0ca8
Merge branch 'development' into sample-data-menuitem-alias
richard67 Oct 22, 2020
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
6 changes: 3 additions & 3 deletions administrator/language/en-GB/plg_sampledata_blog.ini
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_FULLTEXT="<p>This blog is insta
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_INTROTEXT="<p>Templates control the look and feel of your website.</p>"
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. <br><br>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="<p>Millions of Websites are built on Joomla!</p>"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_6_INTROTEXT="<p><strong>Millions of Websites are built on Joomla!</strong></p><p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy aliquya</p>"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_6_TITLE="Millions"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_7_FULLTEXT="<p>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.</p> "
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_7_INTROTEXT="<p>We love Joomla to the moon and back! Thank you to all volunteers who have contributed!</p> "
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_7_INTROTEXT="<p><strong>We love Joomla to the moon and back! </strong>Thank you to all volunteers who have contributed!</p> "
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_7_TITLE="Love"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_8_FULLTEXT="<p>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. </p>"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_8_INTROTEXT="<p>We proudly present Joomla Version 4!</p>"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_8_INTROTEXT="<p><strong>We proudly present Joomla Version 4!</strong></p><p>Lorem ipsum dolor, onsetetur sadipscing elitr, sed diam nonumy eirmod ut labore et dolore magna aliquya</p>"
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"
Expand Down
Binary file added images/banners/banner-rocket.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/banners/banner-stars.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sampledata/cassiopeia/blue-rocket-400.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sampledata/cassiopeia/rocket-1000.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sampledata/cassiopeia/rocket-400.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
65 changes: 34 additions & 31 deletions plugins/sampledata/blog/blog.php
Original file line number Diff line number Diff line change
Expand Up @@ -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' => '',
Expand All @@ -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' => '',
Expand All @@ -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' => '',
Expand All @@ -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' => '',
Expand All @@ -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' => '',
Expand All @@ -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' => '',
Expand Down Expand Up @@ -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,
Expand All @@ -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,
),
),
Expand All @@ -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,
Expand All @@ -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,
),
),
Expand All @@ -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,
),
),
Expand Down Expand Up @@ -882,7 +892,7 @@ public function onAjaxSampledataApplyStep2()
'access' => 2,
'params' => array(
'menu_text' => 1,
'show_page_heading' => 0,
'show_page_heading' => 1,
'secure' => 0,
),
),
Expand All @@ -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,
),
),
Expand Down Expand Up @@ -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,
Expand All @@ -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,
),
),
Expand All @@ -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,
),
)
Expand Down Expand Up @@ -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']))
{
Expand Down