Merge commit '30d26a1' into 4.0-dev

This commit is contained in:
wilsonge 2021-05-02 23:53:05 +01:00
commit 6bfdcb2ac1
No known key found for this signature in database
GPG Key ID: EF81319318FC9D04
7 changed files with 12 additions and 10 deletions

2
.github/SUPPORT.md vendored
View File

@ -5,4 +5,4 @@ Where can you get support and help?
* Find the [information you need](https://docs.joomla.org/Special:MyLanguage/Start_here).
* Find [help and other users](https://www.joomla.org/about-joomla/create-and-share.html).
* Post questions at [our forums](https://forum.joomla.org).
* [Joomla Resources Directory](https://resources.joomla.org) (JRD).
* [Joomla Resources Directory](https://community.joomla.org/service-providers-directory/) (JRD).

View File

@ -1,4 +1,4 @@
Joomla! CMS™ [![Analytics](https://ga-beacon.appspot.com/UA-544070-3/joomla-cms/readme)](https://github.com/igrigorik/ga-beacon)
Joomla! CMS™ [![Analytics](https://ga-beacon.appspot.com/UA-544070-3/joomla-cms/readme)](https://github.com/igrigorik/ga-beacon)
====================
Build Status

View File

@ -52,7 +52,7 @@ Joomla! CMS™
* Find the information you need: https://docs.joomla.org/Special:MyLanguage/Start_here
* Find help and other users: https://www.joomla.org/about-joomla/create-and-share.html
* Post questions at our forums: https://forum.joomla.org
* Joomla! Resources Directory (JRD): https://resources.joomla.org/
* Joomla! Resources Directory (JRD): https://community.joomla.org/service-providers-directory/
11- Do you already have a Joomla! site that's not built with Joomla! 4.x ?
* What's new in Joomla! 4.x: https://www.joomla.org/4

View File

@ -595,7 +595,7 @@
type="url"
target="_blank"
title="MOD_MENU_HELP_RESOURCES"
link="https://resources.joomla.org"
link="https://community.joomla.org/service-providers-directory/"
scope="help"
/>

View File

@ -61,7 +61,7 @@
title="MOD_MENU_HELP_RESOURCES"
type="url"
target="_blank"
link="https://resources.joomla.org"
link="https://community.joomla.org/service-providers-directory/"
/>
<menuitem

View File

@ -195,18 +195,20 @@ class HtmlView extends BaseHtmlView
}
else
{
$base = $this->state->get('filter.client_id') == 0 ? JPATH_SITE : JPATH_ADMINISTRATOR;
// Get XML file from component folder for standard layouts
$file = JPATH_SITE . '/components/' . $item->componentname . '/tmpl/' . $vars['view']
$file = $base . '/components/' . $item->componentname . '/tmpl/' . $vars['view']
. '/' . $vars['layout'] . '.xml';
if (!file_exists($file))
{
$file = JPATH_SITE . '/components/' . $item->componentname . '/views/'
$file = $base . '/components/' . $item->componentname . '/views/'
. $vars['view'] . '/tmpl/' . $vars['layout'] . '.xml';
if (!file_exists($file))
{
$file = JPATH_SITE . '/components/' . $item->componentname . '/view/'
$file = $base . '/components/' . $item->componentname . '/view/'
. $vars['view'] . '/tmpl/' . $vars['layout'] . '.xml';
}
}

View File

@ -89,7 +89,7 @@ PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_05_TITLE="Australian Parks "
PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_06_FULLTEXT=""
PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_06_INTROTEXT="<p>The banner module is used to display the banners that are managed by the banners component in the site administrator. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help40:Extensions_Module_Manager_Banners'>Help</a>.</p><div class='sample-module'>{loadmodule banners,Banners}</div>"
PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_06_TITLE="Banner Module"
PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_07_FULLTEXT="<p>Explore the articles and other resources right here on your site data to learn more about how Joomla works. (When you're done reading, you can delete or archive all of this.) You will also probably want to visit the Beginners' Areas of the <a href='https://docs.joomla.org/Beginners'>Joomla documentation</a> and <a href='http://forum.joomla.org'>support forums</a>.</p><p>You'll also want to sign up for the Joomla Security Mailing list and the Announcements mailing list. For inspiration visit the <a href='http://community.joomla.org/showcase/'>Joomla! Site Showcase</a> to see an amazing array of ways people use Joomla to tell their stories on the web.</p><p>The basic Joomla installation will let you get a great site up and running, but when you are ready for more features the power of Joomla is in the creative ways that developers have extended it to do all kinds of things. Visit the <a href='http://extensions.joomla.org/'>Joomla! Extensions Directory</a> to see thousands of extensions that can do almost anything you could want on a website. Can't find what you need? You may want to find a Joomla professional in the <a href='http://resources.joomla.org/'>Joomla! Resource Directory</a>.</p><p>Want to learn more? Consider attending a <a href='http://community.joomla.org/events.html'>Joomla! Day</a> or other event or joining a local <a href='http://community.joomla.org/user-groups.html'>Joomla! Users Group</a>. Can't find one near you? Start one yourself.</p>"
PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_07_FULLTEXT="<p>Explore the articles and other resources right here on your site data to learn more about how Joomla works. (When you're done reading, you can delete or archive all of this.) You will also probably want to visit the Beginners' Areas of the <a href='https://docs.joomla.org/Beginners'>Joomla documentation</a> and <a href='http://forum.joomla.org'>support forums</a>.</p><p>You'll also want to sign up for the Joomla Security Mailing list and the Announcements mailing list. For inspiration visit the <a href='http://community.joomla.org/showcase/'>Joomla! Site Showcase</a> to see an amazing array of ways people use Joomla to tell their stories on the web.</p><p>The basic Joomla installation will let you get a great site up and running, but when you are ready for more features the power of Joomla is in the creative ways that developers have extended it to do all kinds of things. Visit the <a href='http://extensions.joomla.org/'>Joomla! Extensions Directory</a> to see thousands of extensions that can do almost anything you could want on a website. Can't find what you need? You may want to find a Joomla professional in the <a href='https://community.joomla.org/service-providers-directory/'>Joomla! Resource Directory</a>.</p><p>Want to learn more? Consider attending a <a href='http://community.joomla.org/events.html'>Joomla! Day</a> or other event or joining a local <a href='http://community.joomla.org/user-groups.html'>Joomla! Users Group</a>. Can't find one near you? Start one yourself.</p>"
PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_07_INTROTEXT="<p>If this is your first Joomla! site or your first web site, you have come to the right place. Joomla will help you get your website up and running quickly.</p><p>Start off using your site by logging in using the administrator account you created when you installed Joomla.</p>"
PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_07_TITLE="Beginners"
PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_08_FULLTEXT=""
@ -129,7 +129,7 @@ PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_19_FULLTEXT=""
PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_19_INTROTEXT="<h2>Welcome to the Fruit Shop</h2><p>We sell fruits from around the world. Please use our website to learn more about our business. We hope you will come to our shop and buy some fruit.</p><p><em>This mini site will show you how you might want to set up a site for a business, in this example one selling fruit. It shows how to use access controls to manage your site content. If you were building a real site, you might want to extend it with e-commerce, a catalog, mailing lists or other enhancements, many of which are available through the</em><a href='http://extensions.joomla.org'><em> Joomla! Extensions Directory</em></a>.</p><p><em>To understand this site you will probably want to make one user with group set to customer and one with group set to grower. By logging in with different privileges you can see how access control works.</em></p>"
PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_19_TITLE="Fruit Shop"
PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_20_FULLTEXT=""
PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_20_INTROTEXT="<p>There are lots of places you can get help with Joomla!. In many places in your site administrator you will see the help icon. Click on this for more information about the options and functions of items on your screen. Other places to get help are:</p><ul><li><a href='http://forum.joomla.org'>Support Forums</a></li><li><a href='https://docs.joomla.org'>Documentation</a></li><li><a href='http://resources.joomla.org'>Professionals</a></li><li><a href='http://shop.joomla.org/amazoncom-bookstores.html'>Books</a></li></ul>"
PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_20_INTROTEXT="<p>There are lots of places you can get help with Joomla!. In many places in your site administrator you will see the help icon. Click on this for more information about the options and functions of items on your screen. Other places to get help are:</p><ul><li><a href='http://forum.joomla.org'>Support Forums</a></li><li><a href='https://docs.joomla.org'>Documentation</a></li><li><a href='https://community.joomla.org/service-providers-directory/'>Professionals</a></li><li><a href='http://shop.joomla.org/amazoncom-bookstores.html'>Books</a></li></ul>"
PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_20_TITLE="Getting Help"
PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_21_FULLTEXT=""
PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_21_INTROTEXT="<p>It's easy to get started creating your website. Knowing some of the basics will help.</p><h3>What is a Content Management System?</h3><p>A content management system is software that allows you to create and manage webpages by separating the creation of your content from the mechanics required to present it on the web.</p><p>In this site, the content is stored in a <em>database</em>. The look and feel are created by a <em>template</em>. The Joomla! software brings together the template and the content to create web pages.</p><h3>Site and Administrator</h3><p>Your site actually has two separate sites. The site (also called the front end) is what visitors to your site will see. The administrator (also called the back end) is only used by people managing your site. You can access the administrator by clicking the \"Site Administrator\" link on the \"This Site\" menu or by adding /administrator to the end of you domain name.</p><p>Log in to the administrator using the username and password created during the installation of Joomla.</p><h3>Logging in</h3><p>To login to the front end of your site use the login form or the login menu link on the \"This Site\" menu. Use the user name and password that were created as part of the installation process. Once logged-in you will be able to create and edit articles.</p><p>In managing your site, you will be able to create content that only logged-in users are able to see.</p><h3>Creating an article</h3><p>Once you are logged-in, a new menu will be visible. To create a new article, click on the \"submit article\" link on that menu.</p><p>The new article interface gives you a lot of options, but all you need to do is add a title and put something in the content area. To make it easy to find, set the state to published and put it in the Joomla category.</p><div>You can edit an existing article by clicking on the edit icon (this only displays to users who have the right to edit).</div><h3>Learn more</h3><p>There is much more to learn about how to use Joomla! to create the web site you envision. You can learn much more at the <a href='https://docs.joomla.org'>Joomla! documentation site</a> and on the<a href='http://forum.joomla.org'> Joomla! forums</a>.</p>"