Skip to content

Commit

Permalink
Merge branch 'staging' of github.com:joomla/joomla-cms into com_contact
Browse files Browse the repository at this point in the history
  • Loading branch information
@zero-24
zero-24 committed Sep 2, 2017
2 parents 2efc080 + c909e9c commit 2966ded
Show file tree
Hide file tree
Showing 64 changed files with 11,855 additions and 322 deletions.
2 changes: 1 addition & 1 deletion administrator/components/com_contact/views/contact/tmpl/edit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', empty($this->item->id) ? JText::_('COM_CONTACT_NEW_CONTACT') : JText::_('COM_CONTACT_EDIT_CONTACT')); ?>
<div class="row-fluid">
<div class="span9">
<div class="row-fluid form-horizontal-desktop">
<div class="row-fluid form-horizontal-desktop float-cols" >
<div class="span6">
<?php echo $this->form->renderField('user_id'); ?>
<?php echo $this->form->renderField('image'); ?>
Expand Down
23 changes: 23 additions & 0 deletions administrator/components/com_menus/views/item/tmpl/edit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,30 @@
$('#jform_parent_id').trigger('liszt:updated');
});
});
// Menu type Login Form specific
$('#item-form').on('submit', function() {
if ($('#jform_params_login_redirect_url') && $('#jform_params_logout_redirect_url')) {
// Login
if ($('#jform_params_login_redirect_url').closest('.control-group').css('display') === 'block') {
$('#jform_params_login_redirect_menuitem_id').val('');
}
if ($('#jform_params_login_redirect_menuitem_name').closest('.control-group').css('display') === 'block') {
$('#jform_params_login_redirect_url').val('');
}
// Logout
if ($('#jform_params_logout_redirect_url').closest('.control-group').css('display') === 'block') {
$('#jform_params_logout_redirect_menuitem_id').val('');
}
if ($('#jform_params_logout_redirect_menuitem_id').closest('.control-group').css('display') === 'block') {
$('#jform_params_logout_redirect_url').val('');
}
}
});
});
Joomla.submitbutton = function(task, type){
if (task == 'item.setType' || task == 'item.setMenuType')
{
Expand Down
3 changes: 2 additions & 1 deletion administrator/components/com_plugins/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
filter="rules"
validate="rules"
component="com_plugins"
section="component" />
section="component"
/>
</fieldset>
</config>
2 changes: 1 addition & 1 deletion administrator/language/en-GB/en-GB.com_config.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ COM_CONFIG_FIELD_SECRET_LABEL="Secret"
COM_CONFIG_FIELD_SEF_REWRITE_DESC="Select to use a server's rewrite engine to catch URLs that meet specific conditions and rewrite them as directed. Available for IIS 7 and Apache. <br /><strong>Apache users only!</strong><br />Rename htaccess.txt to .htaccess before activating.<br /><strong>IIS 7 users only!</strong><br />Rename web.config.txt to web.config and install IIS URL Rewrite Module before activating.<br />"
COM_CONFIG_FIELD_SEF_REWRITE_LABEL="Use URL Rewriting"
COM_CONFIG_FIELD_SEF_SUFFIX_DESC="If yes, the system will add a suffix to the URL based on the document type."
COM_CONFIG_FIELD_SEF_SUFFIX_LABEL="Adds Suffix to URL"
COM_CONFIG_FIELD_SEF_SUFFIX_LABEL="Add Suffix to URL"
COM_CONFIG_FIELD_SEF_URL_DESC="Select if the URLs are optimised for Search Engines."
COM_CONFIG_FIELD_SEF_URL_LABEL="Search Engine Friendly URLs"
COM_CONFIG_FIELD_SERVER_TIMEZONE_DESC="Choose a city in the list to configure the date and time for display."
Expand Down
8 changes: 8 additions & 0 deletions administrator/templates/isis/css/template-rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1660,6 +1660,14 @@ legend + .control-group {
.subform-repeatable-wrapper tr.ui-sortable-helper {
display: table;
}
@media (min-width: 980px) and (max-width: 1215px) {
.float-cols .control-label {
float: none;
}
.float-cols .controls {
margin-left: 0;
}
}
table {
max-width: 100%;
background-color: transparent;
Expand Down
8 changes: 8 additions & 0 deletions administrator/templates/isis/css/template.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1660,6 +1660,14 @@ legend + .control-group {
.subform-repeatable-wrapper tr.ui-sortable-helper {
display: table;
}
@media (min-width: 980px) and (max-width: 1215px) {
.float-cols .control-label {
float: none;
}
.float-cols .controls {
margin-left: 0;
}
}
table {
max-width: 100%;
background-color: transparent;
Expand Down
2 changes: 1 addition & 1 deletion administrator/templates/isis/login.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
$layout = $app->input->getCmd('layout', '');
$task = $app->input->getCmd('task', '');
$itemid = $app->input->getCmd('Itemid', '');
$sitename = $app->get('sitename');
$sitename = htmlspecialchars($app->get('sitename', ''), ENT_QUOTES, 'UTF-8');

function colorIsLight($color)
{
Expand Down
6 changes: 0 additions & 6 deletions components/com_users/models/rules/loginuniquefield.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@ public function test(SimpleXMLElement $element, $value, $group = null, Registry
throw new InvalidArgumentException(sprintf('The value for $input must not be null in %s', get_class($this)));
}

// Test the input values for login.
if ($loginRedirectUrl != '' && $loginRedirectMenuitem != '')
{
return false;
}

return true;
}
}
6 changes: 0 additions & 6 deletions components/com_users/models/rules/logoutuniquefield.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@ public function test(SimpleXMLElement $element, $value, $group = null, Registry
throw new InvalidArgumentException(sprintf('The value for $input must not be null in %s', get_class($this)));
}

// Test the input values for logout.
if ($logoutRedirectUrl != '' && $logoutRedirectMenuitem != '')
{
return false;
}

return true;
}
}
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"ircmaxell/password-compat": "1.*",
"leafo/lessphp": "0.5.0",
"paragonie/random_compat": "~1.0",
"paragonie/sodium_compat": "^1.0.1",
"paragonie/sodium_compat": "~1.2",
"phpmailer/phpmailer": "^5.2.20",
"symfony/polyfill-php55": "~1.2",
"symfony/polyfill-php56": "~1.0",
Expand Down
12 changes: 6 additions & 6 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions libraries/src/Extension/ExtensionHelper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ class ExtensionHelper
array('module', 'mod_multilangstatus', '', 1),
array('module', 'mod_popular', '', 1),
array('module', 'mod_quickicon', '', 1),
array('module', 'mod_sampledata', '', 1),
array('module', 'mod_stats_admin', '', 1),
array('module', 'mod_status', '', 1),
array('module', 'mod_submenu', '', 1),
Expand Down Expand Up @@ -199,6 +200,9 @@ class ExtensionHelper
array('plugin', 'joomlaupdate', 'quickicon', 0),
array('plugin', 'phpversioncheck', 'quickicon', 0),

// Core plugin extensions - sample data
array('plugin', 'blog', 'sampledata', 0),

// Core plugin extensions - search
array('plugin', 'categories', 'search', 0),
array('plugin', 'contacts', 'search', 0),
Expand Down
49 changes: 49 additions & 0 deletions libraries/vendor/composer/autoload_classmap.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,33 @@
'Joomla\\DI\\ContainerAwareTrait' => $vendorDir . '/joomla/di/src/ContainerAwareTrait.php',
'Joomla\\DI\\Exception\\DependencyResolutionException' => $vendorDir . '/joomla/di/src/Exception/DependencyResolutionException.php',
'Joomla\\DI\\ServiceProviderInterface' => $vendorDir . '/joomla/di/src/ServiceProviderInterface.php',
'Joomla\\DI\\Tests\\AliasingTest' => $vendorDir . '/joomla/di/Tests/AliasingTest.php',
'Joomla\\DI\\Tests\\ContainerAccessTest' => $vendorDir . '/joomla/di/Tests/ContainerAccessTest.php',
'Joomla\\DI\\Tests\\ContainerAwareTraitTest' => $vendorDir . '/joomla/di/Tests/ContainerAwareTraitTest.php',
'Joomla\\DI\\Tests\\ContainerSetupTest' => $vendorDir . '/joomla/di/Tests/ContainerSetupTest.php',
'Joomla\\DI\\Tests\\HierachicalTest' => $vendorDir . '/joomla/di/Tests/HierachicalTest.php',
'Joomla\\DI\\Tests\\ObjectBuildingTest' => $vendorDir . '/joomla/di/Tests/ObjectBuildingTest.php',
'Joomla\\DI\\Tests\\ResourceDecoration' => $vendorDir . '/joomla/di/Tests/ResourceDecorationTest.php',
'Joomla\\DI\\Tests\\ResourceTest' => $vendorDir . '/joomla/di/Tests/ResourceTest.php',
'Joomla\\DI\\Tests\\ServiceProviderTest' => $vendorDir . '/joomla/di/Tests/ServiceProviderTest.php',
'Joomla\\DI\\Tests\\Stub1' => $vendorDir . '/joomla/di/Tests/Stubs/stubs.php',
'Joomla\\DI\\Tests\\Stub2' => $vendorDir . '/joomla/di/Tests/Stubs/stubs.php',
'Joomla\\DI\\Tests\\Stub3' => $vendorDir . '/joomla/di/Tests/Stubs/stubs.php',
'Joomla\\DI\\Tests\\Stub4' => $vendorDir . '/joomla/di/Tests/Stubs/stubs.php',
'Joomla\\DI\\Tests\\Stub5' => $vendorDir . '/joomla/di/Tests/Stubs/stubs.php',
'Joomla\\DI\\Tests\\Stub6' => $vendorDir . '/joomla/di/Tests/Stubs/stubs.php',
'Joomla\\DI\\Tests\\Stub7' => $vendorDir . '/joomla/di/Tests/Stubs/stubs.php',
'Joomla\\DI\\Tests\\Stub8' => $vendorDir . '/joomla/di/Tests/Stubs/stubs.php',
'Joomla\\DI\\Tests\\Stub9' => $vendorDir . '/joomla/di/Tests/Stubs/stubs.php',
'Joomla\\DI\\Tests\\StubInterface' => $vendorDir . '/joomla/di/Tests/Stubs/stubs.php',
'Joomla\\Data\\DataObject' => $vendorDir . '/joomla/data/src/DataObject.php',
'Joomla\\Data\\DataSet' => $vendorDir . '/joomla/data/src/DataSet.php',
'Joomla\\Data\\DumpableInterface' => $vendorDir . '/joomla/data/src/DumpableInterface.php',
'Joomla\\Data\\Tests\\DataObjectTest' => $vendorDir . '/joomla/data/Tests/DataObjectTest.php',
'Joomla\\Data\\Tests\\DataSetTest' => $vendorDir . '/joomla/data/Tests/DataSetTest.php',
'Joomla\\Data\\Tests\\JDataBuran' => $vendorDir . '/joomla/data/Tests/Stubs/buran.php',
'Joomla\\Data\\Tests\\JDataCapitaliser' => $vendorDir . '/joomla/data/Tests/Stubs/capitaliser.php',
'Joomla\\Data\\Tests\\JDataVostok' => $vendorDir . '/joomla/data/Tests/Stubs/vostok.php',
'Joomla\\Event\\AbstractEvent' => $vendorDir . '/joomla/event/src/AbstractEvent.php',
'Joomla\\Event\\DelegatingDispatcher' => $vendorDir . '/joomla/event/src/DelegatingDispatcher.php',
'Joomla\\Event\\Dispatcher' => $vendorDir . '/joomla/event/src/Dispatcher.php',
Expand All @@ -46,6 +70,17 @@
'Joomla\\Event\\EventInterface' => $vendorDir . '/joomla/event/src/EventInterface.php',
'Joomla\\Event\\ListenersPriorityQueue' => $vendorDir . '/joomla/event/src/ListenersPriorityQueue.php',
'Joomla\\Event\\Priority' => $vendorDir . '/joomla/event/src/Priority.php',
'Joomla\\Event\\Tests\\AbstractEventTest' => $vendorDir . '/joomla/event/Tests/AbstractEventTest.php',
'Joomla\\Event\\Tests\\DelegatingDispatcherTest' => $vendorDir . '/joomla/event/Tests/DelegatingDispatcherTest.php',
'Joomla\\Event\\Tests\\DispatcherTest' => $vendorDir . '/joomla/event/Tests/DispatcherTest.php',
'Joomla\\Event\\Tests\\EventImmutableTest' => $vendorDir . '/joomla/event/Tests/EventImmutableTest.php',
'Joomla\\Event\\Tests\\EventTest' => $vendorDir . '/joomla/event/Tests/EventTest.php',
'Joomla\\Event\\Tests\\ListenersPriorityQueueTest' => $vendorDir . '/joomla/event/Tests/ListenersPriorityQueueTest.php',
'Joomla\\Event\\Tests\\Stubs\\EmptyListener' => $vendorDir . '/joomla/event/Tests/Stubs/EmptyListener.php',
'Joomla\\Event\\Tests\\Stubs\\FirstListener' => $vendorDir . '/joomla/event/Tests/Stubs/FirstListener.php',
'Joomla\\Event\\Tests\\Stubs\\SecondListener' => $vendorDir . '/joomla/event/Tests/Stubs/SecondListener.php',
'Joomla\\Event\\Tests\\Stubs\\SomethingListener' => $vendorDir . '/joomla/event/Tests/Stubs/SomethingListener.php',
'Joomla\\Event\\Tests\\Stubs\\ThirdListener' => $vendorDir . '/joomla/event/Tests/Stubs/ThirdListener.php',
'Joomla\\Filesystem\\Buffer' => $vendorDir . '/joomla/filesystem/src/Buffer.php',
'Joomla\\Filesystem\\Clients\\FtpClient' => $vendorDir . '/joomla/filesystem/src/Clients/FtpClient.php',
'Joomla\\Filesystem\\Exception\\FilesystemException' => $vendorDir . '/joomla/filesystem/src/Exception/FilesystemException.php',
Expand Down Expand Up @@ -77,6 +112,7 @@
'Joomla\\Input\\Input' => $vendorDir . '/joomla/input/src/Input.php',
'Joomla\\Input\\Json' => $vendorDir . '/joomla/input/src/Json.php',
'Joomla\\Ldap\\LdapClient' => $vendorDir . '/joomla/ldap/src/LdapClient.php',
'Joomla\\Ldap\\Tests\\LdapClientTest' => $vendorDir . '/joomla/ldap/Tests/LdapClientTest.php',
'Joomla\\Registry\\AbstractRegistryFormat' => $vendorDir . '/joomla/registry/src/AbstractRegistryFormat.php',
'Joomla\\Registry\\Factory' => $vendorDir . '/joomla/registry/src/Factory.php',
'Joomla\\Registry\\FormatInterface' => $vendorDir . '/joomla/registry/src/FormatInterface.php',
Expand All @@ -95,11 +131,23 @@
'Joomla\\Session\\Storage\\None' => $vendorDir . '/joomla/session/Joomla/Session/Storage/None.php',
'Joomla\\Session\\Storage\\Wincache' => $vendorDir . '/joomla/session/Joomla/Session/Storage/Wincache.php',
'Joomla\\Session\\Storage\\Xcache' => $vendorDir . '/joomla/session/Joomla/Session/Storage/Xcache.php',
'Joomla\\Session\\Tests\\Handler\\ApcuHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/ApcuHandlerTest.php',
'Joomla\\Session\\Tests\\Handler\\DatabaseHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/DatabaseHandlerTest.php',
'Joomla\\Session\\Tests\\Handler\\FilesystemHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/FilesystemHandlerTest.php',
'Joomla\\Session\\Tests\\Handler\\MemcachedHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/MemcachedHandlerTest.php',
'Joomla\\Session\\Tests\\Handler\\NativeStorageTest' => $vendorDir . '/joomla/session/tests/Storage/NativeStorageTest.php',
'Joomla\\Session\\Tests\\Handler\\RedisHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/RedisHandlerTest.php',
'Joomla\\Session\\Tests\\Handler\\WincacheHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/WincacheHandlerTest.php',
'Joomla\\Session\\Tests\\Handler\\XCacheHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/XCacheHandlerTest.php',
'Joomla\\Session\\Tests\\SessionTest' => $vendorDir . '/joomla/session/tests/SessionTest.php',
'Joomla\\String\\Inflector' => $vendorDir . '/joomla/string/src/Inflector.php',
'Joomla\\String\\Normalise' => $vendorDir . '/joomla/string/src/Normalise.php',
'Joomla\\String\\String' => $vendorDir . '/joomla/string/src/String.php',
'Joomla\\String\\StringHelper' => $vendorDir . '/joomla/string/src/StringHelper.php',
'Joomla\\Uri\\AbstractUri' => $vendorDir . '/joomla/uri/src/AbstractUri.php',
'Joomla\\Uri\\Tests\\UriHelperTest' => $vendorDir . '/joomla/uri/Tests/UriHelperTest.php',
'Joomla\\Uri\\Tests\\UriImmuteableTest' => $vendorDir . '/joomla/uri/Tests/UriImmutableTest.php',
'Joomla\\Uri\\Tests\\UriTest' => $vendorDir . '/joomla/uri/Tests/UriTest.php',
'Joomla\\Uri\\Uri' => $vendorDir . '/joomla/uri/src/Uri.php',
'Joomla\\Uri\\UriHelper' => $vendorDir . '/joomla/uri/src/UriHelper.php',
'Joomla\\Uri\\UriImmutable' => $vendorDir . '/joomla/uri/src/UriImmutable.php',
Expand Down Expand Up @@ -170,6 +218,7 @@
'Symfony\\Polyfill\\Util\\Binary' => $vendorDir . '/symfony/polyfill-util/Binary.php',
'Symfony\\Polyfill\\Util\\BinaryNoFuncOverload' => $vendorDir . '/symfony/polyfill-util/BinaryNoFuncOverload.php',
'Symfony\\Polyfill\\Util\\BinaryOnFuncOverload' => $vendorDir . '/symfony/polyfill-util/BinaryOnFuncOverload.php',
'Symfony\\Polyfill\\Util\\TestListener' => $vendorDir . '/symfony/polyfill-util/TestListener.php',
'lessc' => $vendorDir . '/leafo/lessphp/lessc.inc.php',
'lessc_formatter_classic' => $vendorDir . '/leafo/lessphp/lessc.inc.php',
'lessc_formatter_compressed' => $vendorDir . '/leafo/lessphp/lessc.inc.php',
Expand Down
2 changes: 1 addition & 1 deletion libraries/vendor/composer/autoload_files.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
'5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
'e40631d46120a9c38ea139981f8dab26' => $vendorDir . '/ircmaxell/password-compat/lib/password.php',
'edc6464955a37aa4d5fbf39d40fb6ee7' => $vendorDir . '/symfony/polyfill-php55/bootstrap.php',
'3109cb1a231dcd04bee1f9f620d46975' => $vendorDir . '/paragonie/sodium_compat/autoload.php',
'bd9634f2d41831496de0d3dfe4c94881' => $vendorDir . '/symfony/polyfill-php56/bootstrap.php',
'3109cb1a231dcd04bee1f9f620d46975' => $vendorDir . '/paragonie/sodium_compat/autoload.php',
);

0 comments on commit 2966ded

Please sign in to comment.