mirror of
https://github.com/joomla/joomla-cms.git
synced 2024-09-06 02:14:40 +00:00
Merge commit '5da070d' into 4.0-dev
This commit is contained in:
commit
7d981259f3
@ -67,7 +67,7 @@ $listDirn = $this->escape($this->state->get('list.direction'));
|
||||
<?php echo $item->count; ?>
|
||||
</td>
|
||||
<td class="d-none d-md-table-cell">
|
||||
<?php echo HTMLHelper::_('date', $item->track_date, Text::_('DATE_FORMAT_LC4') . ' H:i'); ?>
|
||||
<?php echo HTMLHelper::_('date', $item->track_date, Text::_('DATE_FORMAT_LC5')); ?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
|
@ -87,7 +87,7 @@ class CompareModel extends ItemModel
|
||||
$object->version_note = $table->version_note;
|
||||
|
||||
// Let's use custom calendars when present
|
||||
$object->save_date = HTMLHelper::_('date', $table->save_date, 'Y-m-d H:i:s');
|
||||
$object->save_date = HTMLHelper::_('date', $table->save_date, Text::_('DATE_FORMAT_LC6'));
|
||||
|
||||
$dateProperties = array (
|
||||
'modified_time',
|
||||
@ -103,7 +103,7 @@ class CompareModel extends ItemModel
|
||||
{
|
||||
if (array_key_exists($dateProperty, $object->data) && $object->data->$dateProperty->value != $nullDate)
|
||||
{
|
||||
$object->data->$dateProperty->value = HTMLHelper::_('date', $object->data->$dateProperty->value, 'Y-m-d H:i:s');
|
||||
$object->data->$dateProperty->value = HTMLHelper::_('date', $object->data->$dateProperty->value, Text::_('DATE_FORMAT_LC6'));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -75,7 +75,7 @@ class PreviewModel extends ItemModel
|
||||
$result->data = ContenthistoryHelper::prepareData($table);
|
||||
|
||||
// Let's use custom calendars when present
|
||||
$result->save_date = HTMLHelper::_('date', $table->save_date, 'Y-m-d H:i:s');
|
||||
$result->save_date = HTMLHelper::_('date', $table->save_date, Text::_('DATE_FORMAT_LC6'));
|
||||
|
||||
$dateProperties = array (
|
||||
'modified_time',
|
||||
@ -93,7 +93,7 @@ class PreviewModel extends ItemModel
|
||||
{
|
||||
if (array_key_exists($dateProperty, $result->data) && $result->data->$dateProperty->value != $nullDate)
|
||||
{
|
||||
$result->data->$dateProperty->value = HTMLHelper::_('date', $result->data->$dateProperty->value, 'Y-m-d H:i:s');
|
||||
$result->data->$dateProperty->value = HTMLHelper::_('date', $result->data->$dateProperty->value, Text::_('DATE_FORMAT_LC6'));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -101,7 +101,7 @@ HTMLHelper::_('script', 'com_contenthistory/admin-history-modal.min.js', array('
|
||||
<th scope="row">
|
||||
<a class="save-date" onclick="window.open(this.href,'win2','width=800,height=600,resizable=yes,scrollbars=yes'); return false;"
|
||||
href="<?php echo Route::_('index.php?option=com_contenthistory&view=preview&layout=preview&tmpl=component&' . Session::getFormToken() . '=1&version_id=' . $item->version_id); ?>">
|
||||
<?php echo HTMLHelper::_('date', $item->save_date, 'Y-m-d H:i:s'); ?>
|
||||
<?php echo HTMLHelper::_('date', $item->save_date, Text::_('DATE_FORMAT_LC6')); ?>
|
||||
</a>
|
||||
<?php if ($item->sha1_hash == $hash) : ?>
|
||||
<span class="icon-featured" aria-hidden="true"><span class="sr-only"><?php echo Text::_('JFEATURED'); ?></span></span>
|
||||
|
@ -564,8 +564,9 @@ class ItemsModel extends ListModel
|
||||
|
||||
if (!isset($this->cache[$store]))
|
||||
{
|
||||
$items = parent::getItems();
|
||||
$lang = Factory::getLanguage();
|
||||
$items = parent::getItems();
|
||||
$lang = Factory::getLanguage();
|
||||
$client = $this->state->get('filter.client_id');
|
||||
|
||||
if ($items)
|
||||
{
|
||||
@ -578,7 +579,10 @@ class ItemsModel extends ListModel
|
||||
}
|
||||
|
||||
// Translate component name
|
||||
$item->title = Text::_($item->title);
|
||||
if ($client === 1)
|
||||
{
|
||||
$item->title = Text::_($item->title);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -30,7 +30,7 @@ HTMLHelper::_('behavior.core');
|
||||
<?php echo Text::_('COM_MESSAGES_FIELD_DATE_TIME_LABEL'); ?>
|
||||
</div>
|
||||
<div class="controls">
|
||||
<?php echo HTMLHelper::_('date', $this->item->date_time); ?>
|
||||
<?php echo HTMLHelper::_('date', $this->item->date_time, Text::_('DATE_FORMAT_LC2')); ?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
|
@ -31,7 +31,7 @@ HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html');
|
||||
</div>
|
||||
|
||||
<div class="fltlft utitle">
|
||||
<?php echo HTMLHelper::_('date', $item->created_time, 'D d M Y H:i'); ?>
|
||||
<?php echo HTMLHelper::_('date', $item->created_time, Text::_('DATE_FORMAT_LC2')); ?>
|
||||
</div>
|
||||
|
||||
<?php $category_image = $item->cparams->get('image'); ?>
|
||||
|
@ -153,13 +153,13 @@ $debugUsers = $this->state->get('params')->get('debugUsers', 1);
|
||||
</td>
|
||||
<td class="d-none d-lg-table-cell text-center">
|
||||
<?php if ($item->lastvisitDate != $this->db->getNullDate()) : ?>
|
||||
<?php echo HTMLHelper::_('date', $item->lastvisitDate, 'Y-m-d H:i:s'); ?>
|
||||
<?php echo HTMLHelper::_('date', $item->lastvisitDate, Text::_('DATE_FORMAT_LC6')); ?>
|
||||
<?php else : ?>
|
||||
<?php echo Text::_('JNEVER'); ?>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<td class="d-none d-lg-table-cell text-center">
|
||||
<?php echo HTMLHelper::_('date', $item->registerDate, 'Y-m-d H:i:s'); ?>
|
||||
<?php echo HTMLHelper::_('date', $item->registerDate, Text::_('DATE_FORMAT_LC6')); ?>
|
||||
</td>
|
||||
<td class="d-none d-md-table-cell text-center">
|
||||
<?php echo (int) $item->id; ?>
|
||||
|
@ -950,6 +950,7 @@ DATE_FORMAT_LC2="l, d F Y H:i"
|
||||
DATE_FORMAT_LC3="d F Y"
|
||||
DATE_FORMAT_LC4="Y-m-d"
|
||||
DATE_FORMAT_LC5="Y-m-d H:i"
|
||||
DATE_FORMAT_LC6="Y-m-d H:i:s"
|
||||
DATE_FORMAT_JS1="y-m-d"
|
||||
DATE_FORMAT_CALENDAR_DATE="%Y-%m-%d"
|
||||
DATE_FORMAT_CALENDAR_DATETIME="%Y-%m-%d %H:%M:%S"
|
||||
|
@ -214,7 +214,12 @@
|
||||
return isValid;
|
||||
}
|
||||
|
||||
this.handleResponse(false, element);
|
||||
if (element.attr('required') || element.hasClass('required')) {
|
||||
this.handleResponse(false, element, 'empty');
|
||||
return false;
|
||||
}
|
||||
|
||||
this.handleResponse(true, element);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -81,6 +81,14 @@ abstract class ContentHelperRoute
|
||||
{
|
||||
$link .= '&lang=' . $language;
|
||||
}
|
||||
|
||||
$jinput = JFactory::getApplication()->input;
|
||||
$layout = $jinput->get('layout');
|
||||
|
||||
if ($layout !== '')
|
||||
{
|
||||
$link .= '&layout=' . $layout;
|
||||
}
|
||||
}
|
||||
|
||||
return $link;
|
||||
|
@ -34,14 +34,14 @@ use Joomla\CMS\Language\Text;
|
||||
<?php echo Text::_('COM_USERS_PROFILE_REGISTERED_DATE_LABEL'); ?>
|
||||
</dt>
|
||||
<dd>
|
||||
<?php echo HTMLHelper::_('date', $this->data->registerDate); ?>
|
||||
<?php echo HTMLHelper::_('date', $this->data->registerDate, Text::_('DATE_FORMAT_LC1')); ?>
|
||||
</dd>
|
||||
<dt>
|
||||
<?php echo Text::_('COM_USERS_PROFILE_LAST_VISITED_DATE_LABEL'); ?>
|
||||
</dt>
|
||||
<?php if ($this->data->lastvisitDate != $this->db->getNullDate()) : ?>
|
||||
<dd>
|
||||
<?php echo HTMLHelper::_('date', $this->data->lastvisitDate); ?>
|
||||
<?php echo HTMLHelper::_('date', $this->data->lastvisitDate, Text::_('DATE_FORMAT_LC1')); ?>
|
||||
</dd>
|
||||
<?php else : ?>
|
||||
<dd>
|
||||
|
@ -324,6 +324,7 @@ DATE_FORMAT_LC2="l, d F Y H:i"
|
||||
DATE_FORMAT_LC3="d F Y"
|
||||
DATE_FORMAT_LC4="Y-m-d"
|
||||
DATE_FORMAT_LC5="Y-m-d H:i"
|
||||
DATE_FORMAT_LC6="Y-m-d H:i:s"
|
||||
DATE_FORMAT_JS1="y-m-d"
|
||||
DATE_FORMAT_CALENDAR_DATE="%Y-%m-%d"
|
||||
DATE_FORMAT_CALENDAR_DATETIME="%Y-%m-%d %H:%M:%S"
|
||||
|
@ -76,7 +76,7 @@ else
|
||||
<joomla-field-subform class="subform-repeatable" name="<?php echo $name; ?>"
|
||||
button-add=".group-add" button-remove=".group-remove" button-move="<?php echo empty($buttons['move']) ? '' : '.group-move' ?>"
|
||||
repeatable-element=".subform-repeatable-group"
|
||||
rows-container="tbody.subform-repeatable-rows-container" minimum="<?php echo $min; ?>" maximum="<?php echo $max; ?>">
|
||||
rows-container="tbody.subform-repeatable-container" minimum="<?php echo $min; ?>" maximum="<?php echo $max; ?>">
|
||||
|
||||
<table class="adminlist table table-striped table-bordered">
|
||||
<thead>
|
||||
@ -94,7 +94,7 @@ else
|
||||
<?php endif; ?>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="subform-repeatable-rows-container">
|
||||
<tbody class="subform-repeatable-container">
|
||||
<?php
|
||||
foreach ($forms as $k => $form) :
|
||||
echo $this->sublayout($sublayout, array('form' => $form, 'basegroup' => $fieldname, 'group' => $fieldname . $k, 'buttons' => $buttons));
|
||||
|
Loading…
Reference in New Issue
Block a user