Conflicts

joomla · Jun 7, 2017 · c7d890a · c7d890a
2 parents 76ffc00 + b8de81f
commit c7d890a
Show file tree

Hide file tree

Showing 23 changed files with 10,379 additions and 116 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -201,6 +201,7 @@ module.exports = function(grunt) {
 				},
 				files: {
 					'<%= folder.adminTemplate %>/css/template.css': '<%= folder.adminTemplate %>/scss/template.scss',
+					'<%= folder.adminTemplate %>/css/template-rtl.css': '<%= folder.adminTemplate %>/scss/template-rtl.scss',
 					'<%= folder.siteTemplate %>/css/template.css' : '<%= folder.siteTemplate %>/scss/template.scss',
 				}
 			}
@@ -342,6 +343,7 @@ module.exports = function(grunt) {
 			dist: {
 				src: [
 					'<%= folder.adminTemplate %>/css/template.css',
+					'<%= folder.adminTemplate %>/css/template-rtl.css',
 					'<%= folder.siteTemplate %>/css/template.css'
 				]
 			}

diff --git a/README.md b/README.md
@@ -1,21 +1,97 @@
-Joomla! CMS™
+Joomla! CMS™ [![Analytics](https://ga-beacon.appspot.com/UA-544070-3/joomla-cms/readme)](https://github.com/igrigorik/ga-beacon)
 ====================
 
 Build Status
 ---------------------
-Travis-CI: [![Build Status](https://travis-ci.org/joomla-projects/media-manager-improvement.svg?branch=milestone1)](https://travis-ci.org/joomla-projects/media-manager-improvement)
+Travis-CI: [![Build Status](https://travis-ci.org/joomla/joomla-cms.svg?branch=staging)](https://travis-ci.org/joomla/joomla-cms)
 
-Drone-CI: [![Build Status](http://213.160.72.75/api/badges/joomla-projects/media-manager-improvement/status.svg)](http://213.160.72.75/joomla-projects/media-manager-improvement)
+Drone -CI: [![Build Status](http://213.160.72.75/api/badges/joomla/joomla-cms/status.svg)](http://213.160.72.75/joomla/joomla-cms)
 
-[![Taylor Swift](https://img.shields.io/badge/secured%20by-taylor%20swift-brightgreen.svg)](https://twitter.com/SwiftOnSecurity)
+AppVeyor: [![Build status](https://ci.appveyor.com/api/projects/status/bpcxulw6nnxlv8kb/branch/staging?svg=true)](https://ci.appveyor.com/project/joomla/joomla-cms)
+
+Jenkins: [![Build Status](http://build.joomla.org/job/cms/badge/icon)](http://build.joomla.org/job/cms/)
 
 What is this?
 ---------------------
-This is the official New Media Manager repository. Please have a look on the [wiki](https://github.com/joomla-projects/media-manager-improvement/wiki) for the roadmap of the project.
+* This is a Joomla! 4.x installation/upgrade package.
+* Joomla's [Official website](https://www.joomla.org).
+* Joomla! 4.0 [version history](https://docs.joomla.org/Joomla_4.0_version_history).
+* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/master).
+
+What is Joomla?
+---------------------
+* [Joomla!](https://www.joomla.org/about-joomla.html) is a **Content Management System** (CMS) which enables you to build websites and powerful online applications.
+* It is a simple and powerful web server application which requires a server with PHP and either MySQL or PostgreSQL to run. You can find [full technical requirements here](https://downloads.joomla.org/technical-requirements).
+* Joomla! is **free and Open Source software** distributed under the GNU General Public License version 2 or later.
+
+Is Joomla! for you?
+---------------------
+* Joomla! is [the right solution for most content web projects](https://docs.joomla.org/Special:MyLanguage/Portal:Learn_More).
+* View Joomla's [core features here](https://www.joomla.org/core-features.html).
+* Try it out for yourself in our [online demo](https://demo.joomla.org).
+
+How to find a Joomla! translation?
+---------------------
+* Repository of [accredited language packs](https://community.joomla.org/translations.html).
+* You can also [add languages](https://docs.joomla.org/Special:MyLanguage/J4.x:Setup_a_Multilingual_Site/Installing_New_Language) directly to your website via your Joomla! administration panel.
+* Learn how to [setup a Multilingual Joomla! Site](https://docs.joomla.org/Special:MyLanguage/J4.x:Setup_a_Multilingual_Site)
+
+Learn Joomla!
+---------------------
+* Read ['Getting Started with Joomla!'](https://docs.joomla.org/Special:MyLanguage/J4.x:Getting_Started_with_Joomla!) to learn the basics.
+* Before installing, read the ['Beginners' Guide'](https://docs.joomla.org/Special:MyLanguage/Portal:Beginners).
+
+What are the benefits of Joomla?
+---------------------
+* The functionality of a Joomla! website can be extended by installing extensions that you can create (or download) to suit your needs.
+* There are many ready-made extensions that you can download and install.
+* Check out the [Joomla! Extensions Directory (JED)](https://extensions.joomla.org).
+
+Is it easy to change the layout display?
+---------------------
+* The layout is controlled by templates that you can edit.
+* There are a lot of ready-made professional templates that you can download.
+* Template management information is [available here](https://docs.joomla.org/Special:MyLanguage/Portal:Template_Management).
+
+Ready to install Joomla?
+---------------------
+* Check the [minimum requirements](https://downloads.joomla.org/technical-requirements). 
+* How do you [install Joomla](https://docs.joomla.org/Special:MyLanguage/J4.x:Installing_Joomla)?
+* You could start your Joomla! experience by [building your site on a local test server](https://docs.joomla.org/Special:MyLanguage/Installing_Joomla_locally).
+When ready, it can be moved to an online hosting account of your choice.
+
+Updates are free!
+---------------------
+* Always use the [latest version](https://downloads.joomla.org/latest).
+
+Where can you get support and help?
+---------------------
+* [The Joomla! Documentation](https://docs.joomla.org/Special:MyLanguage/Main_Page);
+* [Frequently Asked Questions](https://docs.joomla.org/Special:MyLanguage/Category:FAQ) (FAQ);
+* 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).
+
+Do you already have a Joomla! site that isn't built with Joomla! 4.x?
+---------------------
+* What's [new in Joomla! 4.x](https://www.joomla.org/4)?
+* What are the [main differences between 3.x and 4.x](https://docs.joomla.org/Special:MyLanguage/What_are_the_major_differences_between_Joomla!_3.x_and_4.x)?
+* How to [migrate from 3.x to 4.x](https://docs.joomla.org/Special:MyLanguage/Joomla_3.x_to_4.x_Step_by_Step_Migration).
+* How to [migrate from 2.5.x to 3.x](https://docs.joomla.org/Special:MyLanguage/Joomla_2.5_to_3.x_Step_by_Step_Migration).
+* How to [migrate from 1.5.x to 3.x](https://docs.joomla.org/Special:MyLanguage/Joomla_1.5_to_3.x_Step_by_Step_Migration).
+
+Do you want to improve Joomla?
+--------------------
+* Where to [request a feature](https://issues.joomla.org/)?
+* How do you [report a bug](https://docs.joomla.org/Special:MyLanguage/Filing_bugs_and_issues) on the [Issue Tracker](https://issues.joomla.org/)?
+* Get Involved: Joomla! is community developed software. [Join the community](https://volunteers.joomla.org/).
+* Documentation for [Developers](https://docs.joomla.org/Special:MyLanguage/Portal:Developers).
+* Documentation for [Web designers](https://docs.joomla.org/Special:MyLanguage/Web_designers).
 
 Copyright
 ---------------------
 * Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
-* [Special Thanks](https://docs.joomla.org/Joomla!_Credits_and_Thanks)
+* [Special Thanks](https://docs.joomla.org/Special:MyLanguage/Joomla!_Credits_and_Thanks)
 * Distributed under the GNU General Public License version 2 or later
-* See [License details](https://docs.joomla.org/Joomla_Licenses)
+* See [License details](https://docs.joomla.org/Special:MyLanguage/Joomla_Licenses)
diff --git a/administrator/components/com_fields/models/forms/filter_fields.xml b/administrator/components/com_fields/models/forms/filter_fields.xml
@@ -4,6 +4,7 @@
 		<field
 			name="context"
 			type="fieldcontexts"
+			filtermode="selector"
 			onchange="this.form.submit();"
 		/>
 	</fieldset>

diff --git a/administrator/components/com_fields/models/forms/filter_groups.xml b/administrator/components/com_fields/models/forms/filter_groups.xml
@@ -4,6 +4,7 @@
 		<field
 			name="context"
 			type="fieldcontexts"
+			filtermode="selector"
 			onchange="this.form.submit();"
 		/>
 	</fieldset>

diff --git a/administrator/components/com_fields/tmpl/fields/default.php b/administrator/components/com_fields/tmpl/fields/default.php
@@ -41,16 +41,7 @@
 		</div>
 		<div class="col-md-10">
 			<div id="j-main-container" class="j-main-container">
-				<div id="filter-bar" class="js-stools clearfix">
-					<div class="js-stools-container-list hidden-md-down">
-						<div class="hidden-sm-down">
-							<div class="js-stools-field-list">
-								<?php echo $this->filterForm->getField('context')->input; ?>
-							</div>
-						</div>
-					</div>
-				</div>
-				<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+				<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('selectorFieldName' => 'context'))); ?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-warning alert-no-items">
 						<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>

diff --git a/administrator/components/com_fields/tmpl/groups/default.php b/administrator/components/com_fields/tmpl/groups/default.php
@@ -46,16 +46,7 @@
 		</div>
 		<div class="col-md-10">
 			<div id="j-main-container" class="j-main-container">
-				<div id="filter-bar" class="js-stools clearfix">
-					<div class="js-stools-container-list hidden-md-down">
-						<div class="hidden-sm-down">
-							<div class="js-stools-field-list">
-								<?php echo $this->filterForm->getField('context')->input; ?>
-							</div>
-						</div>
-					</div>
-				</div>
-				<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+				<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('selectorFieldName' => 'context'))); ?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-warning alert-no-items">
 						<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>

diff --git a/administrator/components/com_templates/views/template/tmpl/default.php b/administrator/components/com_templates/views/template/tmpl/default.php
@@ -74,25 +74,13 @@
 			<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm">
 				<input type="hidden" name="task" value="">
 				<?php echo JHtml::_('form.token'); ?>
-<<<<<<< HEAD
 				<h2><?php echo JText::_('COM_TEMPLATES_HOME_HEADING'); ?></h2>
 				<p><?php echo JText::_('COM_TEMPLATES_HOME_TEXT'); ?></p>
 				<p>
-					<a href="https://docs.joomla.org/J3.x:How_to_use_the_Template_Manager" target="_blank" class="btn btn-primary btn-lg">
+					<a href="https://docs.joomla.org/Special:MyLanguage/J3.x:How_to_use_the_Template_Manager" target="_blank" class="btn btn-primary btn-lg">
 						<?php echo JText::_('COM_TEMPLATES_HOME_BUTTON'); ?>
 					</a>
 				</p>
-=======
-				<div class="hero-unit" style="text-align: justify;">
-					<h2><?php echo JText::_('COM_TEMPLATES_HOME_HEADING'); ?></h2>
-					<p><?php echo JText::_('COM_TEMPLATES_HOME_TEXT'); ?></p>
-					<p>
-						<a href="https://docs.joomla.org/Special:MyLanguage/J3.x:How_to_use_the_Template_Manager" target="_blank" class="btn btn-primary btn-large">
-							<?php echo JText::_('COM_TEMPLATES_HOME_BUTTON'); ?>
-						</a>
-					</p>
-				</div>
->>>>>>> 3.9-dev
 			</form>
 		<?php endif; ?>
 		<?php if ($this->type == 'file') : ?>