From 5a2b02c4fa356697df382b2567a797a8c490caf3 Mon Sep 17 00:00:00 2001 From: chmst Date: Sun, 20 Sep 2020 22:29:34 +0200 Subject: [PATCH 01/42] Separate Metismenu, speaking names for menu items --- .../language/en-GB/plg_sampledata_blog.ini | 21 ++-- plugins/sampledata/blog/blog.php | 104 +++++++++--------- 2 files changed, 61 insertions(+), 64 deletions(-) diff --git a/administrator/language/en-GB/plg_sampledata_blog.ini b/administrator/language/en-GB/plg_sampledata_blog.ini index bf9e553d6e..d07c624af8 100644 --- a/administrator/language/en-GB/plg_sampledata_blog.ini +++ b/administrator/language/en-GB/plg_sampledata_blog.ini @@ -21,30 +21,29 @@ 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="

Your site has some commonly used modules already preconfigured.

" PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_TITLE="Your Modules" -PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_FULLTEXT="

These include:

Each of these modules has many options which you can experiment with in the Module Manager in your site Administrator. Moving your mouse over a module and selecting the edit icon will take you to an edit screen for that module. Always be sure to save and close any module you edit.

Joomla! also includes many other modules you can incorporate in your site. As you develop your site you may want to add more module that you can find at the Joomla Extensions Directory.

" -PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_INTROTEXT="

Templates control the look and feel of your website. This blog is installed with the Cassiopeia template.

You can edit the options by selecting the Working on Your Site, Template Settings link in the top menu (visible when you login).

For example you can change the site background color, highlights color, site title, site description and title font used.
More options are available in the site administrator. You may also install a new template using the extension manager.

" +PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_FULLTEXT="

This blog is installed with the Cassiopeia template.

You can edit the options by selecting the Working on Your Site, Template Settings link in the top menu (visible when you login).

For example you can change the site background color, highlights color, site title, site description and title font used.

More options are available in the site administrator. You may also install a new template using the extension manager.

" +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_TITLE="Multilingual" -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 voluteers who have contributed!

" +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_TITLE="Flexible System" 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_TITLE="Security First!" PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_0_TITLE="Blog" PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_1_TITLE="Help" -PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_2_TITLE="Template" +PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_2_TITLE="Joomla V4" PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_0_TITLE="Blog" PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_10_TITLE="Template Settings" -PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_11_TITLE="Template" +PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_11_TITLE="Metismenu" PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_12_TITLE="Category List" -PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_14_TITLE="Article" -PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_15_TITLE="Archive" -PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_16_TITLE="Articles" -PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_17_TITLE="Lorem" -PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_18_TITLE="Ipsum" +PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_13_TITLE="Articles" +PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_14_TITLE="Joomla V4" +PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_15_TITLE="Millions of Websites" +PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_16_TITLE="Flexible System" PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_1_TITLE="About" PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_2_TITLE="Author Login" PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_3_TITLE="Create a Post" diff --git a/plugins/sampledata/blog/blog.php b/plugins/sampledata/blog/blog.php index bfb18adee8..a25c0458d8 100644 --- a/plugins/sampledata/blog/blog.php +++ b/plugins/sampledata/blog/blog.php @@ -534,7 +534,7 @@ public function onAjaxSampledataApplyStep2() 'num_leading_articles' => 4, 'num_intro_articles' => 0, 'num_links' => 2, - 'orderby_sec' => 'front', + 'orderby_sec' => 'rdate', 'order_date' => 'published', 'blog_class_leading' => 'boxed masonry-2', 'show_pagination' => 2, @@ -582,29 +582,15 @@ public function onAjaxSampledataApplyStep2() 'secure' => 0, ), ), - // Blog with 3 columns array( + // Sample metismenu (heading) 'menutype' => $menuTypes[0], 'title' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_11_TITLE'), - 'link' => 'index.php?option=com_content&view=category&layout=blog&id=' . $catids[2], - 'component_id' => ExtensionHelper::getExtensionRecord('com_content', 'component')->extension_id, + 'type' => 'heading', + 'link' => '', + 'component_id' => 0, 'params' => array( - 'layout_type' => 'blog', - 'blog_class_leading' => '', - 'blog_class' => 'boxed columns-2', - 'show_category_title' => 0, - 'num_leading_articles' => 1, - 'num_intro_articles' => 2, - 'num_links' => 0, - 'orderby_sec' => 'rdate', - 'order_date' => 'published', - 'show_pagination' => 2, - 'show_pagination_results' => 1, - 'show_category' => 0, - 'info_bloc_position' => 0, - 'show_publish_date' => 0, - 'show_hits' => 0, - 'show_feed_link' => 1, + 'layout_type' => 'heading', 'menu_text' => 1, 'show_page_heading' => 0, 'secure' => 0, @@ -747,52 +733,55 @@ public function onAjaxSampledataApplyStep2() ), ), array( - // Category List - 'menutype' => $menuTypes[0], - 'title' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_12_TITLE'), - 'link' => 'index.php?option=com_content&view=category&layout=list&id=8', - 'parent_id' => $menuIdsLevel1[0], - 'component_id' => ExtensionHelper::getExtensionRecord('com_content', 'component')->extension_id, - 'params' => array( - 'page_subheading' => 'Subheading of List', - 'menu_text' => 1, - 'show_page_heading' => 1, - 'secure' => 0, - ), - ), - array( - // Single article + // Blog 'menutype' => $menuTypes[0], - 'title' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_14_TITLE'), - 'link' => 'index.php?option=com_content&view=article&id=3', - 'parent_id' => $menuIdsLevel1[0], + 'title' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_0_TITLE'), + 'link' => 'index.php?option=com_content&view=category&layout=blog&id=' . $catids[0], + 'parent_id' => $menuIdsLevel1[3], 'component_id' => ExtensionHelper::getExtensionRecord('com_content', 'component')->extension_id, 'params' => array( - 'menu_text' => 1, - 'show_page_heading' => 1, - 'secure' => 0, + 'layout_type' => 'blog', + 'show_category_title' => 0, + 'num_leading_articles' => 1, + 'num_intro_articles' => 4, + 'num_links' => 2, + 'orderby_sec' => 'front', + 'order_date' => 'published', + 'blog_class_leading' => 'boxed columns-1', + 'blog_class' => 'columns-2', + '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, + 'menu_text' => 1, + 'show_page_heading' => 0, + 'secure' => 0, ), ), array( // Category List 'menutype' => $menuTypes[0], - 'title' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_15_TITLE'), - 'link' => 'index.php?option=com_content&view=featured', - 'parent_id' => $menuIdsLevel1[0], + 'title' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_12_TITLE'), + 'link' => 'index.php?option=com_content&view=category&layout=list&id=' . $catids[0], + 'parent_id' => $menuIdsLevel1[3], 'component_id' => ExtensionHelper::getExtensionRecord('com_content', 'component')->extension_id, 'params' => array( + 'page_subheading' => 'Subheading of List', 'menu_text' => 1, 'show_page_heading' => 1, 'secure' => 0, ), ), array( - // Articles (menun header) + // Articles (menu header) 'menutype' => $menuTypes[0], - 'title' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_16_TITLE'), + 'title' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_13_TITLE'), 'type' => 'heading', 'link' => '', - 'parent_id' => $menuIdsLevel1[0], + 'parent_id' => $menuIdsLevel1[3], 'component_id' => '', 'params' => array( 'menu_text' => 1, @@ -818,11 +807,21 @@ public function onAjaxSampledataApplyStep2() // Add a third level of menuItems $menuItems = array( array( - // Article1 'menutype' => $menuTypes[0], - 'title' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_17_TITLE'), + 'title' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_14_TITLE'), + 'link' => 'index.php?option=com_content&view=article&id=&id=' . (int) $articleIds[5], + 'parent_id' => $menuIdsLevel2[4], + 'component_id' => ExtensionHelper::getExtensionRecord('com_content', 'component')->extension_id, + 'params' => array( + 'menu_show' => 1, + 'secure' => 0, + ), + ), + array( + 'menutype' => $menuTypes[0], + 'title' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_15_TITLE'), 'link' => 'index.php?option=com_content&view=article&id=&id=' . (int) $articleIds[6], - 'parent_id' => $menuIdsLevel2[5], + 'parent_id' => $menuIdsLevel2[4], 'component_id' => ExtensionHelper::getExtensionRecord('com_content', 'component')->extension_id, 'params' => array( 'menu_show' => 1, @@ -830,11 +829,10 @@ public function onAjaxSampledataApplyStep2() ), ), array( - // Article2 'menutype' => $menuTypes[0], - 'title' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_18_TITLE'), + 'title' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_16_TITLE'), 'link' => 'index.php?option=com_content&view=article&id=' . (int) $articleIds[7], - 'parent_id' => $menuIdsLevel2[5], + 'parent_id' => $menuIdsLevel2[4], 'component_id' => ExtensionHelper::getExtensionRecord('com_content', 'component')->extension_id, 'params' => array( 'menu_show' => 1, From 4db6f01b7012b363e3405cbfb7d022bb72ee4a3f Mon Sep 17 00:00:00 2001 From: chmst Date: Mon, 21 Sep 2020 09:37:06 +0200 Subject: [PATCH 02/42] Fix parent_id in author menu --- plugins/sampledata/blog/blog.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/sampledata/blog/blog.php b/plugins/sampledata/blog/blog.php index a25c0458d8..d6ff5fbb9e 100644 --- a/plugins/sampledata/blog/blog.php +++ b/plugins/sampledata/blog/blog.php @@ -711,7 +711,7 @@ public function onAjaxSampledataApplyStep2() 'menutype' => $menuTypes[1], 'title' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_9_TITLE'), 'link' => 'index.php?option=com_config&view=config', - 'parent_id' => $menuIdsLevel1[4], + 'parent_id' => $menuIdsLevel1[5], 'component_id' => ExtensionHelper::getExtensionRecord('com_config', 'component')->extension_id, 'access' => 6, 'params' => array( @@ -724,7 +724,7 @@ public function onAjaxSampledataApplyStep2() 'menutype' => $menuTypes[1], 'title' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_10_TITLE'), 'link' => 'index.php?option=com_config&view=templates', - 'parent_id' => $menuIdsLevel1[4], + 'parent_id' => $menuIdsLevel1[5], 'component_id' => ExtensionHelper::getExtensionRecord('com_config', 'component')->extension_id, 'params' => array( 'menu_text' => 1, From 183cb6b590e3b72f3c977484d18deb3adfeff0f2 Mon Sep 17 00:00:00 2001 From: Viviana Menzel Date: Mon, 21 Sep 2020 10:17:08 +0200 Subject: [PATCH 03/42] Several improvements to solve issues . Remove display:grid for top and bottom positions . Move rtl definition for footer to _footer.scss ([dir=rtl] & ) . Add margin to form control-group . Add underline for links without class (e.g. in text) . Change padding and position for mod-list on sidebar . Improve links in mod-menu on sidebar --- .../cassiopeia/scss/blocks/_css-grid.scss | 21 --------------- templates/cassiopeia/scss/blocks/_footer.scss | 9 +++++++ templates/cassiopeia/scss/blocks/_form.scss | 4 +++ templates/cassiopeia/scss/blocks/_global.scss | 4 +++ .../cassiopeia/scss/blocks/_modifiers.scss | 27 +++++++++++++++++++ templates/cassiopeia/scss/template-rtl.scss | 8 ------ 6 files changed, 44 insertions(+), 29 deletions(-) diff --git a/templates/cassiopeia/scss/blocks/_css-grid.scss b/templates/cassiopeia/scss/blocks/_css-grid.scss index 8f09dca895..cab5c8e080 100644 --- a/templates/cassiopeia/scss/blocks/_css-grid.scss +++ b/templates/cassiopeia/scss/blocks/_css-grid.scss @@ -135,24 +135,3 @@ .system-debug { grid-area: debug; } - -.container-top-a, -.container-top-b, -.container-bottom-a, -.container-bottom-b { - display: grid; - grid-gap: $cassiopeia-grid-gutter; - grid-template-columns: 1fr; - - > * { - margin: 0; - } - - @include media-breakpoint-up(sm) { - grid-template-columns: 1fr 1fr; - } - - @include media-breakpoint-up(md) { - grid-template-columns: repeat(auto-fit, minmax(24%, 1fr)); - } -} diff --git a/templates/cassiopeia/scss/blocks/_footer.scss b/templates/cassiopeia/scss/blocks/_footer.scss index 1259e8bd24..5e071cfd5b 100644 --- a/templates/cassiopeia/scss/blocks/_footer.scss +++ b/templates/cassiopeia/scss/blocks/_footer.scss @@ -23,4 +23,13 @@ background: $white; border-radius: $border-radius; } + + [dir=rtl] & { + background-image: $cassiopeia-header-grad-rtl; + + .back-top { + margin-right: auto; + margin-left: 0; + } + } } diff --git a/templates/cassiopeia/scss/blocks/_form.scss b/templates/cassiopeia/scss/blocks/_form.scss index 9a77b1e533..8bc814525c 100644 --- a/templates/cassiopeia/scss/blocks/_form.scss +++ b/templates/cassiopeia/scss/blocks/_form.scss @@ -112,3 +112,7 @@ td .form-control { top: 100%; bottom: auto; } + +.control-group { + margin-top: $cassiopeia-grid-gutter*2; +} diff --git a/templates/cassiopeia/scss/blocks/_global.scss b/templates/cassiopeia/scss/blocks/_global.scss index 021df806bb..1b571e4a72 100644 --- a/templates/cassiopeia/scss/blocks/_global.scss +++ b/templates/cassiopeia/scss/blocks/_global.scss @@ -26,6 +26,10 @@ h6 { a { color: var(--cassiopeia-color-primary); + &:not([class]) { + text-decoration: underline; + } + &:hover, &:focus { color: var(--cassiopeia-color-hover); diff --git a/templates/cassiopeia/scss/blocks/_modifiers.scss b/templates/cassiopeia/scss/blocks/_modifiers.scss index d85dc22825..531fb4104f 100644 --- a/templates/cassiopeia/scss/blocks/_modifiers.scss +++ b/templates/cassiopeia/scss/blocks/_modifiers.scss @@ -275,3 +275,30 @@ } } } + +.mod-list { + padding-left: 0; + list-style-position: inside; + + [dir=rtl] & { + padding-right: 0; + } +} + +.mod-menu.nav { + li { + padding: ($cassiopeia-grid-gutter/2) 0; + + a { + text-decoration: none; + } + + &.active > a { + text-decoration: underline; + } + + .mod-menu__sub { + padding-left: $cassiopeia-grid-gutter; + } + } +} diff --git a/templates/cassiopeia/scss/template-rtl.scss b/templates/cassiopeia/scss/template-rtl.scss index 400ac4f697..614c80c8e8 100644 --- a/templates/cassiopeia/scss/template-rtl.scss +++ b/templates/cassiopeia/scss/template-rtl.scss @@ -116,11 +116,3 @@ dd { .btn-group > .btn-group:not(:first-child) { @include border-right-radius(0); } - -.footer { - background-image: $cassiopeia-header-grad-rtl; - .back-top { - margin-right: auto; - margin-left: 0; - } -} From 9fd947c3d64b2331635c03c286f8eeb4f80bf6ea Mon Sep 17 00:00:00 2001 From: Viviana Menzel Date: Mon, 21 Sep 2020 10:22:29 +0200 Subject: [PATCH 04/42] Underlines in metismenu --- templates/cassiopeia/scss/vendor/metismenu/_metismenu.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/templates/cassiopeia/scss/vendor/metismenu/_metismenu.scss b/templates/cassiopeia/scss/vendor/metismenu/_metismenu.scss index 0df8159902..4a659ac008 100644 --- a/templates/cassiopeia/scss/vendor/metismenu/_metismenu.scss +++ b/templates/cassiopeia/scss/vendor/metismenu/_metismenu.scss @@ -31,8 +31,13 @@ > a { flex: 1 0 0%; overflow: hidden; + text-decoration: none; text-overflow: ellipsis; white-space: nowrap; + + &:hover { + text-decoration: underline; + } } } From 1805cf1f5f5e4a0813e31eca13ee064a89f3a440 Mon Sep 17 00:00:00 2001 From: Viviana Menzel Date: Mon, 21 Sep 2020 10:29:02 +0200 Subject: [PATCH 05/42] Resolve issue #97 --- templates/cassiopeia/scss/vendor/metismenu/_metismenu.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/cassiopeia/scss/vendor/metismenu/_metismenu.scss b/templates/cassiopeia/scss/vendor/metismenu/_metismenu.scss index 4a659ac008..b7bc32e76e 100644 --- a/templates/cassiopeia/scss/vendor/metismenu/_metismenu.scss +++ b/templates/cassiopeia/scss/vendor/metismenu/_metismenu.scss @@ -23,7 +23,7 @@ @include media-breakpoint-down(md) { width: 100%; } - .active a { + .active > a { text-decoration: underline; } } From 6707bfa6349c6e89de8039140088ceaa7ef0c933 Mon Sep 17 00:00:00 2001 From: Viviana Menzel Date: Mon, 21 Sep 2020 15:52:20 +0200 Subject: [PATCH 06/42] Correct margin fieldset Issue #92 --- templates/cassiopeia/scss/blocks/_form.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/templates/cassiopeia/scss/blocks/_form.scss b/templates/cassiopeia/scss/blocks/_form.scss index 8bc814525c..1cb89fb8bb 100644 --- a/templates/cassiopeia/scss/blocks/_form.scss +++ b/templates/cassiopeia/scss/blocks/_form.scss @@ -108,6 +108,10 @@ td .form-control { bottom: 100%; } +fieldset + fieldset { + margin-top: $cassiopeia-grid-gutter*2; +} + .container-popup [id="filter[search]-desc"] { top: 100%; bottom: auto; @@ -116,3 +120,7 @@ td .form-control { .control-group { margin-top: $cassiopeia-grid-gutter*2; } + +.com-users-login__options { + margin-top: $cassiopeia-grid-gutter*2; +} From 96e3c63c14263d8e4c255aff3198b653d677b5e3 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Mon, 21 Sep 2020 20:34:58 +0100 Subject: [PATCH 07/42] [4.0] codestyle (#30724) * [4.0] codestyle fix typo in code comments - code review only required * spelling --- libraries/src/Component/Router/Rules/MenuRules.php | 4 ++-- libraries/src/Component/Router/Rules/NomenuRules.php | 2 +- libraries/src/Component/Router/Rules/StandardRules.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/src/Component/Router/Rules/MenuRules.php b/libraries/src/Component/Router/Rules/MenuRules.php index 3a3eac2dcb..dcc2a18ebe 100644 --- a/libraries/src/Component/Router/Rules/MenuRules.php +++ b/libraries/src/Component/Router/Rules/MenuRules.php @@ -272,7 +272,7 @@ protected function buildLookup($language = '*') } /** - * Dummymethod to fullfill the interface requirements + * Dummy method to fulfill the interface requirements * * @param array &$segments The URL segments to parse * @param array &$vars The vars that result from the segments @@ -287,7 +287,7 @@ public function parse(&$segments, &$vars) } /** - * Dummymethod to fullfill the interface requirements + * Dummy method to fulfill the interface requirements * * @param array &$query The vars that should be converted * @param array &$segments The URL segments to create diff --git a/libraries/src/Component/Router/Rules/NomenuRules.php b/libraries/src/Component/Router/Rules/NomenuRules.php index 358cacf4a4..eebffac784 100644 --- a/libraries/src/Component/Router/Rules/NomenuRules.php +++ b/libraries/src/Component/Router/Rules/NomenuRules.php @@ -40,7 +40,7 @@ public function __construct(RouterView $router) } /** - * Dummymethod to fullfill the interface requirements + * Dummy method to fulfill the interface requirements * * @param array &$query The query array to process * diff --git a/libraries/src/Component/Router/Rules/StandardRules.php b/libraries/src/Component/Router/Rules/StandardRules.php index 1c4bab1d5e..903db50d91 100644 --- a/libraries/src/Component/Router/Rules/StandardRules.php +++ b/libraries/src/Component/Router/Rules/StandardRules.php @@ -40,7 +40,7 @@ public function __construct(RouterView $router) } /** - * Dummymethod to fullfill the interface requirements + * Dummy method to fulfill the interface requirements * * @param array &$query The query array to process * From e16597b493ba331dc4d03ef5f92f00931ded46d1 Mon Sep 17 00:00:00 2001 From: Viviana Menzel Date: Tue, 22 Sep 2020 11:55:28 +0200 Subject: [PATCH 08/42] Margin for fieldset, correct underline for metismenu --- templates/cassiopeia/scss/blocks/_form.scss | 4 ++++ .../cassiopeia/scss/vendor/metismenu/_metismenu.scss | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/templates/cassiopeia/scss/blocks/_form.scss b/templates/cassiopeia/scss/blocks/_form.scss index 1cb89fb8bb..881f76f837 100644 --- a/templates/cassiopeia/scss/blocks/_form.scss +++ b/templates/cassiopeia/scss/blocks/_form.scss @@ -112,6 +112,10 @@ fieldset + fieldset { margin-top: $cassiopeia-grid-gutter*2; } +fieldset:only-child { + margin-top: $cassiopeia-grid-gutter*2; +} + .container-popup [id="filter[search]-desc"] { top: 100%; bottom: auto; diff --git a/templates/cassiopeia/scss/vendor/metismenu/_metismenu.scss b/templates/cassiopeia/scss/vendor/metismenu/_metismenu.scss index b7bc32e76e..5f84000808 100644 --- a/templates/cassiopeia/scss/vendor/metismenu/_metismenu.scss +++ b/templates/cassiopeia/scss/vendor/metismenu/_metismenu.scss @@ -26,6 +26,11 @@ .active > a { text-decoration: underline; } + + span:hover, + a:hover { + text-decoration: underline; + } } > span, > a { @@ -34,10 +39,6 @@ text-decoration: none; text-overflow: ellipsis; white-space: nowrap; - - &:hover { - text-decoration: underline; - } } } From 9924470c43b5afcb2b262158bd68aec441e558de Mon Sep 17 00:00:00 2001 From: chmst Date: Tue, 22 Sep 2020 15:33:02 +0200 Subject: [PATCH 09/42] Change the name "metismenu2 to "Sample Layouts" --- administrator/language/en-GB/plg_sampledata_blog.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/language/en-GB/plg_sampledata_blog.ini b/administrator/language/en-GB/plg_sampledata_blog.ini index d07c624af8..aa43d24268 100644 --- a/administrator/language/en-GB/plg_sampledata_blog.ini +++ b/administrator/language/en-GB/plg_sampledata_blog.ini @@ -38,7 +38,7 @@ PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_1_TITLE="Help" PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_2_TITLE="Joomla V4" PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_0_TITLE="Blog" PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_10_TITLE="Template Settings" -PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_11_TITLE="Metismenu" +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="Joomla V4" From 1ee3192779d52d23a6657cad42d3a3829758799f Mon Sep 17 00:00:00 2001 From: Viviana Menzel Date: Tue, 22 Sep 2020 15:50:58 +0200 Subject: [PATCH 10/42] Improve error and offline pages --- templates/cassiopeia/error.php | 139 ++++++++++++++++--------- templates/cassiopeia/offline.php | 27 ++++- templates/cassiopeia/scss/offline.scss | 35 ++----- 3 files changed, 126 insertions(+), 75 deletions(-) diff --git a/templates/cassiopeia/error.php b/templates/cassiopeia/error.php index 2ed2a53852..aef8bdafbb 100644 --- a/templates/cassiopeia/error.php +++ b/templates/cassiopeia/error.php @@ -28,6 +28,29 @@ $menu = $app->getMenu()->getActive(); $pageclass = $menu !== null ? $menu->getParams()->get('pageclass_sfx', '') : ''; +// Getting params from template +$params = $app->getTemplate(true)->params; + +// Template path +$templatePath = 'templates/' . $this->template; + +// Color Theme +$paramsColorName = $params->get('colorName', 'colors_standard'); +$assetColorName = 'theme.' . $paramsColorName; +$wa->registerAndUseStyle($assetColorName, $templatePath . '/css/global/' . $paramsColorName . '.css'); +$this->getPreloadManager()->preload($wa->getAsset('style', $assetColorName)->getUri(), ['as' => 'style']); + +// Use a font scheme if not "None" is set in the template style options +$paramsFontScheme = $params->get('useFontScheme', 'fonts-local_roboto'); + +if ($paramsFontScheme) +{ + // Preload the stylesheet for the font scheme, actually we need to preload the font(s) + $assetFontScheme = 'fontscheme.' . $paramsFontScheme; + $wa->registerAndUseStyle($assetFontScheme, $templatePath . '/css/global/' . $paramsFontScheme . '.css'); + $this->getPreloadManager()->preload($wa->getAsset('style', $assetFontScheme)->getUri(), ['as' => 'style']); +} + // Enable assets $wa->usePreset('template.cassiopeia.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr')) ->useStyle('template.active.language') @@ -38,13 +61,13 @@ $wa->registerStyle('template.active', '', [], [], ['template.cassiopeia.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr')]); // Logo file or site title param -if ($this->params->get('logoFile')) +if ($params->get('logoFile')) { - $logo = '' . $sitename . ''; + $logo = '' . $sitename . ''; } -elseif ($this->params->get('siteTitle')) +elseif ($params->get('siteTitle')) { - $logo = '' . htmlspecialchars($this->params->get('siteTitle'), ENT_COMPAT, 'UTF-8') . ''; + $logo = '' . htmlspecialchars($params->get('siteTitle'), ENT_COMPAT, 'UTF-8') . ''; } else { @@ -54,8 +77,20 @@ // Header bottom margin $headerMargin = !$this->countModules('banner') ? ' mb-4' : ''; +$hasClass = ''; + +if ($this->countModules('sidebar-left')) +{ + $hasClass .= ' has-sidebar-left'; +} + +if ($this->countModules('sidebar-right')) +{ + $hasClass .= ' has-sidebar-right'; +} + // Container -$wrapper = $this->params->get('fluidContainer') ? 'wrapper-fluid' : 'wrapper-static'; +$wrapper = $params->get('fluidContainer') ? 'wrapper-fluid' : 'wrapper-static'; $this->setMetaData('viewport', 'width=device-width, initial-scale=1'); ?> @@ -73,41 +108,50 @@ . ($layout ? ' layout-' . $layout : ' no-layout') . ($task ? ' task-' . $task : ' no-task') . ($itemid ? ' itemid-' . $itemid : '') - . ' ' . $pageclass; + . ' ' . $pageclass + . $hasClass; echo ($this->direction == 'rtl' ? ' rtl' : ''); ?>"> -
- - countModules('banner')) : ?> -
- -
+ + +
+ countModules('banner')) : ?> +
+ +
+ + countModules('top-a')) : ?>
@@ -120,15 +164,14 @@
-
- - countModules('sidebar-left')) : ?> -
+ countModules('sidebar-left')) : ?> +
- + -
+
+

@@ -171,14 +214,13 @@
+
- countModules('sidebar-right')) : ?> -
- -
- - + countModules('sidebar-right')) : ?> +
+
+ countModules('bottom-a')) : ?>
@@ -192,16 +234,17 @@
- countModules('footer')) : ?> -