mirror of
https://github.com/joomla/joomla-cms.git
synced 2024-08-21 02:29:48 +00:00
Merge branch '4.0-dev' into spinner-nth-attempt
This commit is contained in:
commit
77248737e4
@ -326,8 +326,8 @@ class Postgresql extends Indexer
|
||||
* new term ids.
|
||||
*/
|
||||
$query = $db->getQuery(true)
|
||||
->update($db->quoteName('#__finder_tokens_aggregate') . ' AS ta')
|
||||
->join('INNER', $db->quoteName('#__finder_terms') . ' AS t ON t.term = ta.term')
|
||||
->update($db->quoteName('#__finder_tokens_aggregate', 'ta'))
|
||||
->join('INNER', $db->quoteName('#__finder_terms', 't'), 't.term = ta.term')
|
||||
->set('term_id = t.term_id')
|
||||
->where('ta.term_id = 0');
|
||||
$db->setQuery($query);
|
||||
@ -342,8 +342,8 @@ class Postgresql extends Indexer
|
||||
* the links counter for each term by one.
|
||||
*/
|
||||
$query->clear()
|
||||
->update($db->quoteName('#__finder_terms') . ' AS t')
|
||||
->join('INNER', $db->quoteName('#__finder_tokens_aggregate') . ' AS ta ON ta.term_id = t.term_id')
|
||||
->update($db->quoteName('#__finder_terms', 't'))
|
||||
->join('INNER', $db->quoteName('#__finder_tokens_aggregate', 'ta'), 'ta.term_id = t.term_id')
|
||||
->set($db->quoteName('links') . ' = t.links + 1');
|
||||
$db->setQuery($query);
|
||||
$db->execute();
|
||||
|
@ -59,7 +59,7 @@ $this->useCoreUI = true;
|
||||
|
||||
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'publishing', Text::_('JGLOBAL_FIELDSET_PUBLISHING')); ?>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="col-12 col-lg-6">
|
||||
<fieldset id="fieldset-publishingdata" class="options-grid-form options-grid-form-full">
|
||||
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
|
||||
<div>
|
||||
@ -67,8 +67,13 @@ $this->useCoreUI = true;
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<?php echo $this->loadTemplate('metadata'); ?>
|
||||
<div class="col-12 col-lg-6">
|
||||
<fieldset id="fieldset-metadata" class="options-grid-form options-grid-form-full">
|
||||
<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
|
||||
<div>
|
||||
<?php echo LayoutHelper::render('joomla.edit.metadata', $this); ?>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
<?php echo HTMLHelper::_('uitab.endTab'); ?>
|
||||
|
@ -4,7 +4,7 @@
|
||||
; Note : All ini files need to be saved as UTF-8
|
||||
|
||||
COM_CPANEL="Dashboard$"
|
||||
COM_CPANEL_ADD_DASHBOARD_MODULE="Add dashboard module"
|
||||
COM_CPANEL_ADD_DASHBOARD_MODULE="Add module to the dashboard"
|
||||
COM_CPANEL_ADD_MODULE_MODAL_TITLE="Add Module"
|
||||
COM_CPANEL_DASHBOARD_BASE_ICON="fa fa-home"
|
||||
COM_CPANEL_DASHBOARD_BASE_TITLE="Control Panel"
|
||||
|
@ -47,7 +47,7 @@ MOD_MENU_COM_USERS_USERS="Users"
|
||||
MOD_MENU_COMPONENTS="Components"
|
||||
MOD_MENU_CONFIGURATION="Global Configuration"
|
||||
MOD_MENU_CONTROL_PANEL="Home Dashboard"
|
||||
MOD_MENU_DASHBOARD_LINK="Dashboard"
|
||||
MOD_MENU_DASHBOARD_LINK="%s Dashboard"
|
||||
MOD_MENU_EXTENSIONS_EXTENSION_MANAGER="Manage"
|
||||
MOD_MENU_EXTENSIONS_EXTENSIONS="Extensions"
|
||||
MOD_MENU_EXTENSIONS_LANGUAGE_MANAGER="Languages"
|
||||
|
@ -127,7 +127,7 @@ if ($current->getParams()->get('menu-quicktask', false))
|
||||
|
||||
if ($current->dashboard)
|
||||
{
|
||||
$titleDashboard = Text::_('MOD_MENU_DASHBOARD_LINK') . ': ' . Text::_($current->title);
|
||||
$titleDashboard = Text::sprintf('MOD_MENU_DASHBOARD_LINK', Text::_($current->title));
|
||||
echo '<span class="menu-dashboard"><a href="'
|
||||
. JRoute::_('index.php?option=com_cpanel&view=cpanel&dashboard=' . $current->dashboard) . '">'
|
||||
. '<span class="fa fa-th-large" title="' . $titleDashboard . '" aria-hidden="true"></span>'
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 48 KiB |
Binary file not shown.
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 9.3 KiB |
@ -58,7 +58,7 @@ $alt = preg_replace('/[^a-zA-Z0-9_\-]/', '_', $name);
|
||||
<fieldset id="<?php echo $id; ?>" class="<?php echo trim($class . ' checkboxes'); ?>"
|
||||
<?php echo $required ? 'required' : ''; ?>
|
||||
<?php echo $autofocus ? 'autofocus' : ''; ?>>
|
||||
<legend><?php echo $label; ?></legend>
|
||||
<legend class="sr-only"><?php echo $label; ?></legend>
|
||||
|
||||
<?php foreach ($options as $i => $option) : ?>
|
||||
<?php
|
||||
|
@ -182,7 +182,6 @@
|
||||
name="fullScreenMod"
|
||||
type="checkboxes"
|
||||
label="PLG_CODEMIRROR_FIELD_FULLSCREEN_MOD_LABEL"
|
||||
hiddenLabel="true"
|
||||
>
|
||||
<option value="Shift">PLG_CODEMIRROR_FIELD_VALUE_FULLSCREEN_MOD_SHIFT</option>
|
||||
<option value="Cmd">PLG_CODEMIRROR_FIELD_VALUE_FULLSCREEN_MOD_CMD</option>
|
||||
|
Loading…
Reference in New Issue
Block a user