Skip to content
This repository was archived by the owner on Jan 25, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
51a910b
Replace the button on the cassiopeia banner by a text.
chmst Nov 8, 2020
971a6f5
New Text in typography - Link to typography in banner
chmst Nov 14, 2020
94d891a
Merge branch 'development' into cassiopeia-banner-change
richard67 Nov 14, 2020
c0c4691
show colors in typography
chmst Nov 14, 2020
7e58fc6
Merge branch 'cassiopeia-banner-change' of github.com:joomla/cassiope…
chmst Nov 14, 2020
bf2d8d9
Merge branch 'development' into cassiopeia-banner-change
richard67 Nov 14, 2020
6c62992
Merge branch 'cassiopeia-banner-change' of github.com:joomla/cassiope…
chmst Nov 14, 2020
de182a6
Add buttons for presenting colours
chmst Nov 14, 2020
2eae7a6
Merge branch 'development' into cassiopeia-banner-change
richard67 Nov 14, 2020
2265f11
fix some spaces
chmst Nov 14, 2020
8e49879
Merge branch 'cassiopeia-banner-change' of github.com:joomla/cassiope…
chmst Nov 14, 2020
9256127
fixes in tags
chmst Nov 14, 2020
3889d2b
alphaorder languages strings, add space in text
chmst Nov 14, 2020
4bd7ba5
alphaorder
chmst Nov 14, 2020
1b70848
Improve structure, separate buttons
chmst Nov 14, 2020
ad6c3c2
Merge branch 'development' into cassiopeia-banner-change
richard67 Nov 14, 2020
88b9111
Fix link. Change colour presentation
chmst Nov 14, 2020
1ddfa07
Merge branch 'cassiopeia-banner-change' of github.com:joomla/cassiope…
chmst Nov 14, 2020
3cf4111
Move text-colours examples on top. Add the strong tag to a piece of text
chmst Nov 14, 2020
e57864d
Fix missing title
chmst Nov 14, 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
8 changes: 6 additions & 2 deletions administrator/language/en-GB/plg_sampledata_blog.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@ PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_0_TITLE="About"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_1_FULLTEXT=""
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_1_INTROTEXT="<p>Here are some basic tips for working on your site.</p><ul><li>Joomla! has a 'front end' that you are looking at now and an 'administrator' or 'back end' which is where you do the more advanced work of creating your site such as setting up the menus and deciding what modules to show. You need to login to the administrator separately using the same user name and password that you used to login to this part of the site.</li><li>One of the first things you will probably want to do is change the site title and tag line and to add a logo. To do this select the Template Settings link in the top menu. To change your site description, browser title, default email and other items, select Site Settings. More advanced configuration options are available in the administrator.</li><li>To totally change the look of your site you will probably want to install a new template. In the Systems menu on the Install module, select Extensions from the list and then go to the Install tab. There are many free and commercial templates available for Joomla.</li><li>As you have already seen, you can control who can see different parts of you site. When you work with modules and articles, setting the Access level to Registered will mean that only logged in users can see them</li><li>When you create a new article or other kind of content you also can save it as Published or Unpublished. If it is Unpublished site visitors will not be able to see it but you will.</li><li>You can learn much more about working with Joomla from the <a href='https://docs.joomla.org/'>Joomla documentation site</a> and get help from other users at the <a href='https://forum.joomla.org/'>Joomla forums</a>. In the administrator there are help buttons on every page that provide detailed information about the functions on that page.</li></ul>"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_1_TITLE="Working on Your Site"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_10_FULLTEXT=""
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_10_INTROTEXT="<div><h1>Colour scheme standard</h1> <p> <span class=\"btn btn-secondary\">secondary</span> <span class=\"btn btn-primary\">primary</span> <span class=\"btn btn-info\">info</span> <span class=\"btn btn-success\">success</span> <span class=\"btn btn-warning\">warning</span> <span class=\"btn btn-danger\">danger</span> </p> <p><span class=\"text text-secondary\">text-secondary</span> <span class=\"text text-primary\">text-primary</span> <span class=\"text text-info\">text-info</span> <span class=\"text text-success\">text-success</span> <span class=\"text text-warning\">text-warning</span> <span class=\"text text-danger\">text-danger</span></p><h1>Typography (h1)</h1><p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex. (p)</p><h2>Lorem ipsum dolor sit amet (h2)</h2><p><strong>Lorem ipsum dolor sit amet, consectetuer adipiscing elit </strong> (strong), sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex. (p)</p><h3>Lorem ipsum dolor sit amet (h3)</h3><p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex. (p)</p><h4>Lorem ipsum dolor sit amet (h4)</h4><p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex. (p)</p><h5>Lorem ipsum dolor sit amet (h5)</h5><p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex. (p)</p> <p><a href=\"index.php\"> Lorem ipsum dolor (a)</a></p><h1>Lists</h1> <p>(ol)(li)</p> <ol> <li>Lorem ipsum dolor sit amet consectetur</li> <li>Lorem ipsum dolor sit amet consectetur</li> </ol> <p>(ul)(li)</p> <ul> <li>Lorem ipsum dolor sit amet consectetur</li> <li>Lorem ipsum dolor sit amet consectetur</li> </ul> <h1>Displays</h1><p class=\"display-1\">Lorem (display-1)</p><p class=\"display-2\">Lorem (display-2)</p><p class=\"display-3\">Lorem ipsum (display-3)</p><p class=\"display-4\">Lorem ipsum (display-4)</p></div>"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_10_TITLE="Typography"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_2_FULLTEXT=""
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_2_INTROTEXT="<p>This is a sample blog posting.</p><p>If you log in to the site (the Author Login link is on the very bottom of this page) you will be able to edit it and all of the other existing articles. You will also be able to create a new article and make other changes to the site.</p><p>As you add and modify articles you will see how your site changes and also how you can customise it in various ways.</p><p>Go ahead, you can't break it.</p>"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_2_TITLE="Welcome to your blog"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_FIELD_0="Uurnip greens yarrow ricebean endive cauliflower sea lettuce kohlrabi amaranth water spinach avocado daikon napa cabbage asparagus winter purslane kale."
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_FULLTEXT="<p>On the full page you will see both the introductory content and the rest of the article. You can change the settings to hide the introduction if you want.</p>"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_INTROTEXT="<p>Your home page is set to display the four most recent articles from the blog category in a column. Then there are links to the next two oldest articles. You can change those numbers by editing the content options settings in the blog tab in your site administrator. There is a link to your site administrator in the top menu.</p><p>If you want to have your blog post broken into two parts, an introduction and then a full length separate page, use the Read More button to insert a break.</p>"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_INTROTEXT="<p>Your home page is set to display the four most recent articles from the blog category in a column. Then there are links to the next two oldest articles. You can change those numbers by editing the content options settings in the blog tab in your site administrator. There is a link to your site administrator in the top menu.</p><p>If you want to have your blog post broken into two parts, an introduction and then a full length separate page, use the Read More span to insert a break.</p>"
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_INTROTEXT="<p>Your site has some commonly used modules already preconfigured. </p>"
Expand Down Expand Up @@ -93,6 +96,7 @@ PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_10_TITLE="Template Settings"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_11_TITLE="Sample Layouts"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_12_TITLE="Category List"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_13_TITLE="Articles"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_14_TITLE="Typography"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_1_TITLE="About"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_2_TITLE="Login"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_3_TITLE="Create a Post"
Expand All @@ -119,8 +123,8 @@ PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_4_TITLE="Latest Posts"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_5_TITLE="Older Posts"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_6_TITLE="Bottom Menu"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_7_TITLE="Search"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_8_CONTENT="<h1 class=\"display-4 text-thin\">Welcome to Joomla on Cassiopeia!</h1><p class=\"lead\"><strong>You have chosen one of the most powerful CMS Systems in the world.</strong></p><p class=\"lead\">Cassiopeia is the multi-purpose frontend template for Joomla 4.</p><p><a class=\"btn btn-primary btn-lg\" href=\"%s\">Typography »</a></p>"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_8_TITLE="Image"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_8_CONTENT="<h1 class=\"display-4 text-thin\">Welcome to Joomla on Cassiopeia!</h1><p class=\"lead\"><strong>You have chosen one of the most powerful CMS Systems in the world.</strong></p><p class=\"lead\">Cassiopeia is the multi-purpose frontend template for Joomla 4.</p><p><a class=\"btn btn-primary btn-lg\" href=\"index.php\">Learn more »</a></p>"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_9_TITLE="Popular Tags"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_TAG_0_TITLE="Millions"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_TAG_1_TITLE="Love"
Expand Down
44 changes: 42 additions & 2 deletions plugins/sampledata/blog/blog.php
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,7 @@ public function onAjaxSampledataApplyStep1()
'access' => 3,
),

// Category 0 = Blog
// Category 0 = Blog
array(
// Article 2 - Welcome to your blog
Expand Down Expand Up @@ -673,6 +674,15 @@ public function onAjaxSampledataApplyStep1()
'catid' => $catIds[1],
'authorValue' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_9_FIELD_0'),
),

array(
// Article 10 - Typography
'catid' => $catIds[2],
'images' => array(
'image_intro' => 'images/banners/banner.jpg',
'image_intro_caption' => 'Cassiopeia',
)
),
);

$mvcFactory = $this->app->bootComponent('com_content')->getMVCFactory();
Expand Down Expand Up @@ -963,6 +973,32 @@ public function onAjaxSampledataApplyStep2()
'secure' => 0,
),
),
array(
// Typography
'menutype' => $menuTypes[0],
'title' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_14_TITLE'),
'link' => 'index.php?option=com_content&view=article&id=&id=' . (int) $articleIds[10],
'component_id' => ExtensionHelper::getExtensionRecord('com_content', 'component')->extension_id,
'params' => array(
'show_title' => 0,
'link_titles' => 0,
'show_intro' => 1,
'info_block_position' => '',
'info_block_show_title' => 0,
'show_category' => 0,
'show_author' => 0,
'show_create_date' => 0,
'show_modify_date' => 0,
'show_publish_date' => 0,
'show_item_navigation' => 0,
'show_hits' => 0,
'show_tags' => 0,
'menu_text' => 1,
'menu_show' => 1,
'page_title' => '',
'secure' => 0,
),
),
array(
'menutype' => $menuTypes[1],
'title' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_3_TITLE'),
Expand Down Expand Up @@ -1282,7 +1318,11 @@ public function onAjaxSampledataApplyStep3()
// Get previously entered Data from UserStates
$menuTypes = $this->app->getUserState('sampledata.blog.menutypes');

$catids = $this->app->getUserState('sampledata.blog.articles.catids');
$catids = $this->app->getUserState('sampledata.blog.articles.catids');
$articleIds = $this->app->getUserState('sampledata.blog.articles');

// Link to article "typography" in banner module
$headerLink = 'index.php?option=com_content&view=article&id=' . $articleIds[10];

$modules = array(
array(
Expand Down Expand Up @@ -1492,7 +1532,7 @@ public function onAjaxSampledataApplyStep3()
array(
// Header image
'title' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_8_TITLE'),
'content' => '<p>' . Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_8_CONTENT') . '</p>',
'content' => '<p>' . Text::sprintf('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_8_CONTENT', $headerLink) . '</p>',
'ordering' => 1,
'position' => 'banner',
'module' => 'mod_custom',
Expand Down
7 changes: 5 additions & 2 deletions templates/cassiopeia/scss/blocks/_banner.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,13 @@
&::after {
display: block;
width: 30%;
height: 6px;
height: 4px;
margin: 1rem auto 2rem;
content: "";
background: var(--cassiopeia-color-hover);
background: white;
}
.lead {
font-size: 150vh;
}
}
}
Expand Down