diff --git a/administrator/components/com_banners/views/banners/tmpl/default.php b/administrator/components/com_banners/views/banners/tmpl/default.php index 1b5c3996df917..337e6ec746304 100644 --- a/administrator/components/com_banners/views/banners/tmpl/default.php +++ b/administrator/components/com_banners/views/banners/tmpl/default.php @@ -103,7 +103,7 @@ } elseif (!$saveOrder) { - $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED'); + $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED'); } ?> diff --git a/administrator/components/com_categories/views/categories/tmpl/default.php b/administrator/components/com_categories/views/categories/tmpl/default.php index ac920b3811bf0..04dbe1b46c8e0 100644 --- a/administrator/components/com_categories/views/categories/tmpl/default.php +++ b/administrator/components/com_categories/views/categories/tmpl/default.php @@ -170,7 +170,7 @@ } elseif (!$saveOrder) { - $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED'); + $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED'); } ?> diff --git a/administrator/components/com_contact/helpers/html/contact.php b/administrator/components/com_contact/helpers/html/contact.php index 0bf28d423547e..aff48320506c3 100644 --- a/administrator/components/com_contact/helpers/html/contact.php +++ b/administrator/components/com_contact/helpers/html/contact.php @@ -114,11 +114,11 @@ public static function featured($value = 0, $i, $canChange = true) if ($canChange) { $html = ''; + . ($value == 1 ? ' active' : '') . '" title="' . JHtml::_('tooltipText', $state[3]) . '">'; } else { - $html = ''; } diff --git a/administrator/components/com_contact/views/contacts/tmpl/default.php b/administrator/components/com_contact/views/contacts/tmpl/default.php index 61366f519112b..d3b788f62549d 100644 --- a/administrator/components/com_contact/views/contacts/tmpl/default.php +++ b/administrator/components/com_contact/views/contacts/tmpl/default.php @@ -107,7 +107,7 @@ } elseif (!$saveOrder) { - $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED'); + $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED'); } ?> diff --git a/administrator/components/com_content/helpers/html/contentadministrator.php b/administrator/components/com_content/helpers/html/contentadministrator.php index c7a32df0341c1..b3f7bd06dd9e3 100644 --- a/administrator/components/com_content/helpers/html/contentadministrator.php +++ b/administrator/components/com_content/helpers/html/contentadministrator.php @@ -114,12 +114,12 @@ public static function featured($value = 0, $i, $canChange = true) if ($canChange) { $html = ''; + . ($value == 1 ? ' active' : '') . '" title="' . JHtml::_('tooltipText', $state[3]) . '">'; } else { $html = ''; + . JHtml::_('tooltipText', $state[2]) . '">'; } return $html; diff --git a/administrator/components/com_content/views/articles/tmpl/default.php b/administrator/components/com_content/views/articles/tmpl/default.php index 0e26b68a17e36..1fcdb578a2ba4 100644 --- a/administrator/components/com_content/views/articles/tmpl/default.php +++ b/administrator/components/com_content/views/articles/tmpl/default.php @@ -140,7 +140,7 @@ } elseif (!$saveOrder) { - $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED'); + $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED'); } ?> diff --git a/administrator/components/com_content/views/featured/tmpl/default.php b/administrator/components/com_content/views/featured/tmpl/default.php index 757be0b8a06f9..69580eb870c53 100644 --- a/administrator/components/com_content/views/featured/tmpl/default.php +++ b/administrator/components/com_content/views/featured/tmpl/default.php @@ -134,7 +134,7 @@ } elseif (!$saveOrder) { - $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED'); + $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED'); } ?> diff --git a/administrator/components/com_installer/views/discover/tmpl/default.php b/administrator/components/com_installer/views/discover/tmpl/default.php index cebb9b4a4301a..5d184b9e5bb30 100644 --- a/administrator/components/com_installer/views/discover/tmpl/default.php +++ b/administrator/components/com_installer/views/discover/tmpl/default.php @@ -83,8 +83,8 @@ extension_id); ?> - - + name; ?> diff --git a/administrator/components/com_languages/views/languages/tmpl/default.php b/administrator/components/com_languages/views/languages/tmpl/default.php index 3f1a0de23cab2..dc4382fb2a056 100644 --- a/administrator/components/com_languages/views/languages/tmpl/default.php +++ b/administrator/components/com_languages/views/languages/tmpl/default.php @@ -121,7 +121,7 @@ published, $i, 'languages.', $canChange); ?> - + escape($item->title); ?> diff --git a/administrator/components/com_languages/views/overrides/tmpl/default.php b/administrator/components/com_languages/views/overrides/tmpl/default.php index 238acb4400adb..f7cf21f49267d 100644 --- a/administrator/components/com_languages/views/overrides/tmpl/default.php +++ b/administrator/components/com_languages/views/overrides/tmpl/default.php @@ -35,11 +35,11 @@
- +
- - + +
diff --git a/administrator/components/com_media/views/medialist/tmpl/details_doc.php b/administrator/components/com_media/views/medialist/tmpl/details_doc.php new file mode 100644 index 0000000000000..70af24ba0e96e --- /dev/null +++ b/administrator/components/com_media/views/medialist/tmpl/details_doc.php @@ -0,0 +1,42 @@ +trigger('onContentBeforeDisplay', array('com_media.file', &$this->_tmp_doc, &$params)); +?> + + + + + _tmp_doc->icon_16, $this->_tmp_doc->title, null, true, true) ? JHtml::_('image', $this->_tmp_doc->icon_16, $this->_tmp_doc->title, array('width' => 16, 'height' => 16), true) : JHtml::_('image', 'media/con_info.png', $this->_tmp_doc->title, array('width' => 16, 'height' => 16), true);?> + + + _tmp_doc->title; ?> + +   + + + + _tmp_doc->size); ?> + +authorise('core.delete', 'com_media')):?> + + + + + + +trigger('onContentAfterDisplay', array('com_media.file', &$this->_tmp_doc, &$params)); diff --git a/administrator/components/com_media/views/medialist/tmpl/details_folder.php b/administrator/components/com_media/views/medialist/tmpl/details_folder.php new file mode 100644 index 0000000000000..2465ebbca2d13 --- /dev/null +++ b/administrator/components/com_media/views/medialist/tmpl/details_folder.php @@ -0,0 +1,35 @@ + + + + + + + + _tmp_folder->name; ?> + +   + + +   + + + authorise('core.delete', 'com_media')):?> + + + + + + diff --git a/administrator/components/com_media/views/medialist/tmpl/details_img.php b/administrator/components/com_media/views/medialist/tmpl/details_img.php new file mode 100644 index 0000000000000..218c78db502d9 --- /dev/null +++ b/administrator/components/com_media/views/medialist/tmpl/details_img.php @@ -0,0 +1,42 @@ +trigger('onContentBeforeDisplay', array('com_media.file', &$this->_tmp_img, &$params)); +?> + + + + _tmp_img->path_relative, JText::sprintf('COM_MEDIA_IMAGE_TITLE', $this->_tmp_img->title, JHtml::_('number.bytes', $this->_tmp_img->size)), array('width' => $this->_tmp_img->width_16, 'height' => $this->_tmp_img->height_16)); ?> + + + escape($this->_tmp_img->title); ?> + + + _tmp_img->width, $this->_tmp_img->height); ?> + + + _tmp_img->size); ?> + + authorise('core.delete', 'com_media')):?> + + + + + + +trigger('onContentAfterDisplay', array('com_media.file', &$this->_tmp_img, &$params)); diff --git a/administrator/components/com_media/views/medialist/tmpl/details_video.php b/administrator/components/com_media/views/medialist/tmpl/details_video.php new file mode 100644 index 0000000000000..4f74a50e79524 --- /dev/null +++ b/administrator/components/com_media/views/medialist/tmpl/details_video.php @@ -0,0 +1,54 @@ +trigger('onContentBeforeDisplay', array('com_media.file', &$this->_tmp_video, &$params)); + +JFactory::getDocument()->addScriptDeclaration(" +jQuery(document).ready(function($){ + window.parent.jQuery('#videoPreview').on('hidden', function () { + window.parent.jQuery('#mejsPlayer')[0].player.pause(); + }); +}); +"); +?> + + + + _tmp_video->icon_16, $this->_tmp_video->title, null, true); ?> + + + + _tmp_video->name, 10, false); ?> + + + + + + + _tmp_video->size); ?> + + authorise('core.delete', 'com_media')):?> + + + + + + + +trigger('onContentAfterDisplay', array('com_media.file', &$this->_tmp_video, &$params)); diff --git a/administrator/components/com_menus/views/items/tmpl/default.php b/administrator/components/com_menus/views/items/tmpl/default.php index 2a2ee6674bdc3..bd8d615f43c81 100644 --- a/administrator/components/com_menus/views/items/tmpl/default.php +++ b/administrator/components/com_menus/views/items/tmpl/default.php @@ -154,7 +154,7 @@ } elseif (!$saveOrder) { - $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED'); + $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED'); } ?> diff --git a/administrator/components/com_messages/helpers/html/messages.php b/administrator/components/com_messages/helpers/html/messages.php index 0c8fb4fb6f32a..03ddc489d9604 100644 --- a/administrator/components/com_messages/helpers/html/messages.php +++ b/administrator/components/com_messages/helpers/html/messages.php @@ -88,7 +88,7 @@ public static function status($i, $value = 0, $canChange = false) if ($canChange) { $html = ''; + . ($value == 1 ? ' active' : '') . '" title="' . JHtml::_('tooltipText', $state[3]) . '">'; } return $html; diff --git a/administrator/components/com_modules/views/module/tmpl/edit.php b/administrator/components/com_modules/views/module/tmpl/edit.php index edb061e7695b8..cb792ef98dcc2 100644 --- a/administrator/components/com_modules/views/module/tmpl/edit.php +++ b/administrator/components/com_modules/views/module/tmpl/edit.php @@ -185,7 +185,7 @@ ?>
- + item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?>
diff --git a/administrator/components/com_modules/views/modules/tmpl/default.php b/administrator/components/com_modules/views/modules/tmpl/default.php index cff05508f0a82..e95fec0292c58 100644 --- a/administrator/components/com_modules/views/modules/tmpl/default.php +++ b/administrator/components/com_modules/views/modules/tmpl/default.php @@ -98,7 +98,7 @@ } elseif (!$saveOrder) { - $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED'); + $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED'); } ?> diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php index c06e84b47ad4b..5ebc366ac4b81 100644 --- a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php +++ b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php @@ -107,7 +107,7 @@ } elseif (!$saveOrder) { - $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED'); + $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED'); } ?> diff --git a/administrator/components/com_plugins/views/plugin/tmpl/edit.php b/administrator/components/com_plugins/views/plugin/tmpl/edit.php index b099b8ebf1b1b..bd1a040931a1e 100644 --- a/administrator/components/com_plugins/views/plugin/tmpl/edit.php +++ b/administrator/components/com_plugins/views/plugin/tmpl/edit.php @@ -51,10 +51,10 @@ ?>
- + form->getValue('folder'); ?> / - + form->getValue('element'); ?>
diff --git a/administrator/components/com_plugins/views/plugins/tmpl/default.php b/administrator/components/com_plugins/views/plugins/tmpl/default.php index 681ee79bb6fac..aea6d47c678e7 100644 --- a/administrator/components/com_plugins/views/plugins/tmpl/default.php +++ b/administrator/components/com_plugins/views/plugins/tmpl/default.php @@ -96,7 +96,7 @@ } elseif (!$saveOrder) { - $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED'); + $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED'); } ?> diff --git a/administrator/components/com_redirect/helpers/html/redirect.php b/administrator/components/com_redirect/helpers/html/redirect.php index 5d0f8d3248cbe..4ade7ce273c20 100644 --- a/administrator/components/com_redirect/helpers/html/redirect.php +++ b/administrator/components/com_redirect/helpers/html/redirect.php @@ -53,7 +53,7 @@ public static function published($value = 0, $i = null, $canChange = true) if ($canChange) { $html = ''; + . ($value == 1 ? ' active' : '') . '" title="' . JHtml::_('tooltipText', $state[3]) . '">'; } return $html; diff --git a/administrator/components/com_tags/views/tags/tmpl/default.php b/administrator/components/com_tags/views/tags/tmpl/default.php index fd3c9a3783e1e..a57b2d8615680 100644 --- a/administrator/components/com_tags/views/tags/tmpl/default.php +++ b/administrator/components/com_tags/views/tags/tmpl/default.php @@ -178,7 +178,7 @@ } elseif (!$saveOrder) { - $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED'); + $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED'); } ?> diff --git a/administrator/components/com_templates/helpers/html/templates.php b/administrator/components/com_templates/helpers/html/templates.php index 7891440d7d770..c2d0d02bea098 100644 --- a/administrator/components/com_templates/helpers/html/templates.php +++ b/administrator/components/com_templates/helpers/html/templates.php @@ -45,7 +45,7 @@ public static function thumb($template, $clientId = 0) if (file_exists($preview)) { $html = '' . $html . ''; + JHtml::_('tooltipText', 'COM_TEMPLATES_CLICK_TO_ENLARGE') . '">' . $html . ''; } } diff --git a/administrator/components/com_templates/views/style/tmpl/edit.php b/administrator/components/com_templates/views/style/tmpl/edit.php index 3c941869c0b1a..f9daadf4b80f4 100644 --- a/administrator/components/com_templates/views/style/tmpl/edit.php +++ b/administrator/components/com_templates/views/style/tmpl/edit.php @@ -41,7 +41,7 @@ item->template); ?>
- + item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?>
diff --git a/administrator/components/com_templates/views/styles/tmpl/default.php b/administrator/components/com_templates/views/styles/tmpl/default.php index 3ce318459959c..894bb57acf171 100644 --- a/administrator/components/com_templates/views/styles/tmpl/default.php +++ b/administrator/components/com_templates/views/styles/tmpl/default.php @@ -78,11 +78,11 @@ preview && $item->client_id == '0') : ?> - + client_id == '1') : ?> - - - + + + diff --git a/administrator/components/com_templates/views/template/tmpl/default_modal_file_body.php b/administrator/components/com_templates/views/template/tmpl/default_modal_file_body.php index ed48023c6b426..112c33361bb4e 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_modal_file_body.php +++ b/administrator/components/com_templates/views/template/tmpl/default_modal_file_body.php @@ -50,8 +50,8 @@
-
-
diff --git a/administrator/components/com_templates/views/template/tmpl/default_modal_resize_body.php b/administrator/components/com_templates/views/template/tmpl/default_modal_resize_body.php index 50e4f40862a1b..2d49855572492 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_modal_resize_body.php +++ b/administrator/components/com_templates/views/template/tmpl/default_modal_resize_body.php @@ -12,8 +12,8 @@
-
@@ -22,8 +22,8 @@
-
diff --git a/administrator/components/com_templates/views/templates/tmpl/default.php b/administrator/components/com_templates/views/templates/tmpl/default.php index cf7b006bea045..37ad97f3d020d 100644 --- a/administrator/components/com_templates/views/templates/tmpl/default.php +++ b/administrator/components/com_templates/views/templates/tmpl/default.php @@ -76,7 +76,7 @@ client_id == '1') : ?> - +
diff --git a/administrator/components/com_users/views/debuggroup/tmpl/default.php b/administrator/components/com_users/views/debuggroup/tmpl/default.php index 0810c76ce9eb3..f44a8fd4bc025 100644 --- a/administrator/components/com_users/views/debuggroup/tmpl/default.php +++ b/administrator/components/com_users/views/debuggroup/tmpl/default.php @@ -41,7 +41,7 @@ actions as $key => $action) : ?> - + diff --git a/administrator/components/com_users/views/debuguser/tmpl/default.php b/administrator/components/com_users/views/debuguser/tmpl/default.php index 86f5211b74bd7..86332536c194c 100644 --- a/administrator/components/com_users/views/debuguser/tmpl/default.php +++ b/administrator/components/com_users/views/debuguser/tmpl/default.php @@ -41,7 +41,7 @@ actions as $key => $action) : ?> - + diff --git a/administrator/components/com_users/views/levels/tmpl/default.php b/administrator/components/com_users/views/levels/tmpl/default.php index 4a5ef0c3e29e7..348f7d660d871 100644 --- a/administrator/components/com_users/views/levels/tmpl/default.php +++ b/administrator/components/com_users/views/levels/tmpl/default.php @@ -89,7 +89,7 @@ } elseif (!$saveOrder) { - $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED'); + $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED'); } ?> diff --git a/administrator/components/com_users/views/notes/tmpl/modal.php b/administrator/components/com_users/views/notes/tmpl/modal.php index 05ef39b9e2aa7..38e513a328f22 100644 --- a/administrator/components/com_users/views/notes/tmpl/modal.php +++ b/administrator/components/com_users/views/notes/tmpl/modal.php @@ -28,7 +28,7 @@
- created_time, 'D d M Y H:i'); ?> + created_time, 'D d M Y H:i'); ?>
cparams->get('image'); ?> diff --git a/administrator/components/com_users/views/users/tmpl/default.php b/administrator/components/com_users/views/users/tmpl/default.php index d07e4eece6ea3..555f093432e5e 100644 --- a/administrator/components/com_users/views/users/tmpl/default.php +++ b/administrator/components/com_users/views/users/tmpl/default.php @@ -139,7 +139,7 @@ group_names, "\n") > 1) : ?> - + group_names); ?> diff --git a/administrator/modules/mod_latest/tmpl/default.php b/administrator/modules/mod_latest/tmpl/default.php index 4596e63f19859..130ec0afe2f0b 100644 --- a/administrator/modules/mod_latest/tmpl/default.php +++ b/administrator/modules/mod_latest/tmpl/default.php @@ -30,12 +30,12 @@ - + author_name; ?>
-
+
created, JText::_('DATE_FORMAT_LC5')); ?>
diff --git a/administrator/modules/mod_logged/tmpl/default.php b/administrator/modules/mod_logged/tmpl/default.php index 1d666f0aa99c9..fa25e8c84b6e2 100644 --- a/administrator/modules/mod_logged/tmpl/default.php +++ b/administrator/modules/mod_logged/tmpl/default.php @@ -16,21 +16,21 @@
client_id == 0) : ?> - + editLink)) : ?> - + name; ?> name; ?> - + client_id === null) : ?> client_id) : ?> @@ -41,7 +41,7 @@
-
+
time, JText::_('DATE_FORMAT_LC5')); ?>
diff --git a/administrator/modules/mod_login/tmpl/default.php b/administrator/modules/mod_login/tmpl/default.php index 3996deebe5992..d55a733452d00 100644 --- a/administrator/modules/mod_login/tmpl/default.php +++ b/administrator/modules/mod_login/tmpl/default.php @@ -75,7 +75,7 @@
- + diff --git a/administrator/modules/mod_popular/tmpl/default.php b/administrator/modules/mod_popular/tmpl/default.php index 84332c3d0f753..8b0dfb4b6dfba 100644 --- a/administrator/modules/mod_popular/tmpl/default.php +++ b/administrator/modules/mod_popular/tmpl/default.php @@ -19,7 +19,7 @@ = 10000 ? 'important' : ($hits >= 1000 ? 'warning' : ($hits >= 100 ? 'info' : ''))); ?>
- hits; ?> + hits; ?> checked_out) : ?> editor, $item->checked_out_time); ?> @@ -34,7 +34,7 @@
-
+
created, JText::_('DATE_FORMAT_LC5')); ?>
diff --git a/administrator/templates/hathor/html/com_finder/index/default.php b/administrator/templates/hathor/html/com_finder/index/default.php index 1994b7b2e2f32..59f8dfb8e7ec2 100644 --- a/administrator/templates/hathor/html/com_finder/index/default.php +++ b/administrator/templates/hathor/html/com_finder/index/default.php @@ -132,7 +132,7 @@ publish_start_date or (int) $item->publish_end_date or (int) $item->start_date or (int) $item->end_date) : ?> - + escape($item->title); ?> diff --git a/administrator/templates/hathor/html/com_installer/discover/default.php b/administrator/templates/hathor/html/com_installer/discover/default.php index b23d9c02dc7f1..bf56352e0a454 100644 --- a/administrator/templates/hathor/html/com_installer/discover/default.php +++ b/administrator/templates/hathor/html/com_installer/discover/default.php @@ -54,14 +54,14 @@ items as $i => $item) : ?> extension_id); ?> - name; ?> + name; ?> type); ?> version != '' ? $item->version : ' '; ?> creationDate != '' ? $item->creationDate : ' '; ?> folder != '' ? $item->folder : JText::_('COM_INSTALLER_TYPE_NONAPPLICABLE'); ?> client; ?> - + author != '' ? $item->author : ' '; ?> diff --git a/administrator/templates/hathor/html/com_installer/manage/default.php b/administrator/templates/hathor/html/com_installer/manage/default.php index d7830d3d3865b..0ba3fcfedb992 100644 --- a/administrator/templates/hathor/html/com_installer/manage/default.php +++ b/administrator/templates/hathor/html/com_installer/manage/default.php @@ -83,7 +83,7 @@ extension_id); ?> - + name; ?> @@ -107,7 +107,7 @@ creationDate != '' ? $item->creationDate : ' '; ?> - + author != '' ? $item->author : ' '; ?> diff --git a/administrator/templates/hathor/html/com_installer/update/default.php b/administrator/templates/hathor/html/com_installer/update/default.php index 8a615e566678e..c764965a3920d 100644 --- a/administrator/templates/hathor/html/com_installer/update/default.php +++ b/administrator/templates/hathor/html/com_installer/update/default.php @@ -55,7 +55,7 @@ update_id); ?> - + name; ?> diff --git a/administrator/templates/hathor/html/com_languages/languages/default.php b/administrator/templates/hathor/html/com_languages/languages/default.php index c326e792b3ba6..c7a8409ea2070 100644 --- a/administrator/templates/hathor/html/com_languages/languages/default.php +++ b/administrator/templates/hathor/html/com_languages/languages/default.php @@ -107,7 +107,7 @@ lang_id); ?> - + escape($item->title); ?> diff --git a/administrator/templates/hathor/html/com_templates/styles/default.php b/administrator/templates/hathor/html/com_templates/styles/default.php index 1a89c3d2a77a6..b3b530531d100 100644 --- a/administrator/templates/hathor/html/com_templates/styles/default.php +++ b/administrator/templates/hathor/html/com_templates/styles/default.php @@ -95,11 +95,11 @@ preview && $item->client_id == '0') : ?> - + client_id == '1') : ?> - + - + diff --git a/administrator/templates/hathor/html/com_templates/template/default.php b/administrator/templates/hathor/html/com_templates/template/default.php index 531227ef8833e..8490b9539f1fc 100644 --- a/administrator/templates/hathor/html/com_templates/template/default.php +++ b/administrator/templates/hathor/html/com_templates/template/default.php @@ -230,7 +230,7 @@ function clearCoords()
- +
@@ -261,12 +261,12 @@ function clearCoords()
- +

- +
@@ -441,7 +441,7 @@ function clearCoords()
- +
@@ -452,7 +452,7 @@ function clearCoords()
- +
diff --git a/administrator/templates/hathor/html/com_templates/templates/default.php b/administrator/templates/hathor/html/com_templates/templates/default.php index 873c37142e715..b83e251f8782c 100644 --- a/administrator/templates/hathor/html/com_templates/templates/default.php +++ b/administrator/templates/hathor/html/com_templates/templates/default.php @@ -91,7 +91,7 @@ client_id == '1') : ?> - +

diff --git a/administrator/templates/hathor/html/com_users/debuggroup/default.php b/administrator/templates/hathor/html/com_users/debuggroup/default.php index 419ece6623261..a250d37599ffc 100644 --- a/administrator/templates/hathor/html/com_users/debuggroup/default.php +++ b/administrator/templates/hathor/html/com_users/debuggroup/default.php @@ -83,7 +83,7 @@ actions as $key => $action) : ?> - + diff --git a/administrator/templates/hathor/html/com_users/debuguser/default.php b/administrator/templates/hathor/html/com_users/debuguser/default.php index 80792aa8cb93e..fa064372c0a0f 100644 --- a/administrator/templates/hathor/html/com_users/debuguser/default.php +++ b/administrator/templates/hathor/html/com_users/debuguser/default.php @@ -83,7 +83,7 @@ actions as $key => $action) : ?> - + diff --git a/administrator/templates/hathor/html/com_users/users/default.php b/administrator/templates/hathor/html/com_users/users/default.php index 218fb127f65d5..dc5118a5ea5ab 100644 --- a/administrator/templates/hathor/html/com_users/users/default.php +++ b/administrator/templates/hathor/html/com_users/users/default.php @@ -181,7 +181,7 @@ group_names, "\n") > 1) : ?> - + group_names); ?> diff --git a/administrator/templates/isis/login.php b/administrator/templates/isis/login.php index 8e1eabba412ea..d9c68acf30595 100644 --- a/administrator/templates/isis/login.php +++ b/administrator/templates/isis/login.php @@ -130,7 +130,7 @@ function colorIsLight($color)

©

- +
diff --git a/components/com_contact/views/categories/tmpl/default_items.php b/components/com_contact/views/categories/tmpl/default_items.php index c9d763d207491..3b47f2b8c535b 100644 --- a/components/com_contact/views/categories/tmpl/default_items.php +++ b/components/com_contact/views/categories/tmpl/default_items.php @@ -27,8 +27,8 @@

escape($item->title); ?> - params->get('show_cat_items_cat') == 1) : ?> - + params->get('show_cat_items_cat') == 1) :?> +   numitems; ?> diff --git a/components/com_content/helpers/icon.php b/components/com_content/helpers/icon.php index 7739a03f671ba..d9eb4a81da04c 100644 --- a/components/com_content/helpers/icon.php +++ b/components/com_content/helpers/icon.php @@ -48,7 +48,7 @@ public static function create($category, $params, $attribs = array(), $legacy = $button = JHtml::_('link', JRoute::_($url), $text, $attribs); - $output = '' . $button . ''; + $output = '' . $button . ''; return $output; } diff --git a/components/com_content/views/categories/tmpl/default_items.php b/components/com_content/views/categories/tmpl/default_items.php index 5a9beef6f894a..62e83113fbb6f 100644 --- a/components/com_content/views/categories/tmpl/default_items.php +++ b/components/com_content/views/categories/tmpl/default_items.php @@ -29,8 +29,8 @@

escape($item->title); ?> - params->get('show_cat_num_articles_cat') == 1) : ?> - + params->get('show_cat_num_articles_cat') == 1) :?> +   numitems; ?> diff --git a/components/com_content/views/category/tmpl/blog_children.php b/components/com_content/views/category/tmpl/blog_children.php index 9c465b4d0a471..c68fdb575a7cb 100644 --- a/components/com_content/views/category/tmpl/blog_children.php +++ b/components/com_content/views/category/tmpl/blog_children.php @@ -28,7 +28,7 @@ isRtl()) : ?>

params->get('show_cat_num_articles', 1)) : ?> - + getNumItems(true); ?> @@ -43,7 +43,7 @@

escape($child->title); ?> params->get('show_cat_num_articles', 1)) : ?> - +   getNumItems(true); ?> diff --git a/components/com_content/views/category/tmpl/default_children.php b/components/com_content/views/category/tmpl/default_children.php index ea542485fb6ca..a950123454398 100644 --- a/components/com_content/views/category/tmpl/default_children.php +++ b/components/com_content/views/category/tmpl/default_children.php @@ -29,7 +29,7 @@ isRtl()) : ?>

params->get('show_cat_num_articles', 1)) : ?> - + getNumItems(true); ?> @@ -44,7 +44,7 @@

escape($child->title); ?> params->get('show_cat_num_articles', 1)) : ?> - + getNumItems(true); ?> diff --git a/components/com_finder/helpers/html/filter.php b/components/com_finder/helpers/html/filter.php index 9847bdaf2c9d6..4ba1440c2f65b 100644 --- a/components/com_finder/helpers/html/filter.php +++ b/components/com_finder/helpers/html/filter.php @@ -458,7 +458,7 @@ public static function dates($idxQuery, $options) 'select.genericlist', $operators, 'w1', 'class="inputbox filter-date-operator advancedSelect"', 'value', 'text', $idxQuery->when1, 'finder-filter-w1' ); - $html .= JHtml::calendar($idxQuery->date1, 'd1', 'filter_date1', '%Y-%m-%d', $attribs); + $html .= JHtml::_('calendar', $idxQuery->date1, 'd1', 'filter_date1', '%Y-%m-%d', $attribs); $html .= ''; // End date filter. @@ -471,7 +471,7 @@ public static function dates($idxQuery, $options) 'select.genericlist', $operators, 'w2', 'class="inputbox filter-date-operator advancedSelect"', 'value', 'text', $idxQuery->when2, 'finder-filter-w2' ); - $html .= JHtml::calendar($idxQuery->date2, 'd2', 'filter_date2', '%Y-%m-%d', $attribs); + $html .= JHtml::_('calendar', $idxQuery->date2, 'd2', 'filter_date2', '%Y-%m-%d', $attribs); $html .= ''; // Close the widget. diff --git a/components/com_finder/views/search/view.feed.php b/components/com_finder/views/search/view.feed.php index 3bb513bf5c791..915ab45cbbcd5 100644 --- a/components/com_finder/views/search/view.feed.php +++ b/components/com_finder/views/search/view.feed.php @@ -84,7 +84,7 @@ public function display($tpl = null) $item->title = $result->title; $item->link = JRoute::_($result->route); $item->description = $result->description; - $item->date = (int) $result->start_date ? JHtml::date($result->start_date, 'l d F Y') : $result->indexdate; + $item->date = (int) $result->start_date ? JHtml::_('date', $result->start_date, 'l d F Y') : $result->indexdate; // Get the taxonomy data. $taxonomy = $result->getTaxonomy(); diff --git a/components/com_newsfeeds/views/categories/tmpl/default_items.php b/components/com_newsfeeds/views/categories/tmpl/default_items.php index 3dff6df533a86..9d2d9bcfd6415 100644 --- a/components/com_newsfeeds/views/categories/tmpl/default_items.php +++ b/components/com_newsfeeds/views/categories/tmpl/default_items.php @@ -27,8 +27,8 @@

escape($item->title); ?> - params->get('show_cat_items_cat') == 1) : ?> - + params->get('show_cat_items_cat') == 1) :?> +   numitems; ?> diff --git a/components/com_search/views/search/tmpl/default_form.php b/components/com_search/views/search/tmpl/default_form.php index 5e63cd7a7e2ae..84ec016395600 100644 --- a/components/com_search/views/search/tmpl/default_form.php +++ b/components/com_search/views/search/tmpl/default_form.php @@ -21,7 +21,7 @@

- +
diff --git a/layouts/joomla/content/blog_style_default_links.php b/layouts/joomla/content/blog_style_default_links.php index 9698f54f4689a..8e1ed773fba21 100644 --- a/layouts/joomla/content/blog_style_default_links.php +++ b/layouts/joomla/content/blog_style_default_links.php @@ -12,7 +12,7 @@
    get('link_items') as $item) : ?>
  1. - slug, $item->catid, $item->language)), $item->title); ?> + slug, $item->catid, $item->language)), $item->title); ?>
diff --git a/layouts/joomla/edit/frontediting_modules.php b/layouts/joomla/edit/frontediting_modules.php index 2a06d64273a2d..6c43bc6a46a01 100644 --- a/layouts/joomla/edit/frontediting_modules.php +++ b/layouts/joomla/edit/frontediting_modules.php @@ -41,7 +41,7 @@ '/^(\s*<(?:div|span|nav|ul|ol|h\d|section|aside|nav|address|article) [^>]*class="[^"]*)"/', // By itself, adding class jmoddiv and data attributes for the url and tooltip: '\\1 jmoddiv" data-jmodediturl="' . $editUrl . '" data-target="' . $target . '" data-jmodtip="' - . JHtml::tooltipText( + . JHtml::_('tooltipText', JText::_('JLIB_HTML_EDIT_MODULE'), htmlspecialchars($mod->title, ENT_COMPAT, 'UTF-8') . '
' . sprintf(JText::_('JLIB_HTML_EDIT_MODULE_IN_POSITION'), htmlspecialchars($position, ENT_COMPAT, 'UTF-8')), 0 @@ -49,7 +49,7 @@ . '"' // And if menu editing is enabled and allowed and it's a menu module, add data attributes for menu editing: . ($menusEditing && $mod->module === 'mod_menu' ? - '" data-jmenuedittip="' . JHtml::tooltipText('JLIB_HTML_EDIT_MENU_ITEM', 'JLIB_HTML_EDIT_MENU_ITEM_ID') . '"' + '" data-jmenuedittip="' . JHtml::_('tooltipText', 'JLIB_HTML_EDIT_MENU_ITEM', 'JLIB_HTML_EDIT_MENU_ITEM_ID') . '"' : '' ), diff --git a/layouts/joomla/form/field/media.php b/layouts/joomla/form/field/media.php index cbe5243e6db85..9c5a58aa629c1 100644 --- a/layouts/joomla/form/field/media.php +++ b/layouts/joomla/form/field/media.php @@ -136,7 +136,7 @@ 'style' => $style, ); - $img = JHtml::image($src, JText::_('JLIB_FORM_MEDIA_PREVIEW_ALT'), $imgattr); + $img = JHtml::_('image', $src, JText::_('JLIB_FORM_MEDIA_PREVIEW_ALT'), $imgattr); $previewImg = ''; $previewImgEmpty = ''; @@ -151,7 +151,7 @@ 'class' => 'hasTipPreview' ); - echo JHtml::tooltip($tooltip, $options); + echo JHtml::_('tooltip', $tooltip, $options); echo '
'; } else diff --git a/layouts/joomla/form/renderlabel.php b/layouts/joomla/form/renderlabel.php index da8f63669ebda..ecb8b6abd8b61 100644 --- a/layouts/joomla/form/renderlabel.php +++ b/layouts/joomla/form/renderlabel.php @@ -45,7 +45,7 @@ { JHtml::_('bootstrap.tooltip'); $classes[] = 'hasTooltip'; - $title = ' title="' . JHtml::tooltipText(trim($text, ':'), $description, 0) . '"'; + $title = ' title="' . JHtml::_('tooltipText', trim($text, ':'), $description, 0) . '"'; } } diff --git a/layouts/joomla/searchtools/default/bar.php b/layouts/joomla/searchtools/default/bar.php index c1821666e8978..f6e491349fef5 100644 --- a/layouts/joomla/searchtools/default/bar.php +++ b/layouts/joomla/searchtools/default/bar.php @@ -42,20 +42,20 @@ description) : ?> JText::_($filters['filter_search']->description))); ?> -
-
-
diff --git a/libraries/cms/html/grid.php b/libraries/cms/html/grid.php index 9d044e290e595..2f6b609764e0a 100644 --- a/libraries/cms/html/grid.php +++ b/libraries/cms/html/grid.php @@ -36,7 +36,7 @@ public static function boolean($i, $value, $taskOn = null, $taskOff = null) // Build the title. $title = $value ? JText::_('JYES') : JText::_('JNO'); - $title = JHtml::tooltipText($title, JText::_('JGLOBAL_CLICK_TO_TOGGLE_STATE'), 0); + $title = JHtml::_('tooltipText', $title, JText::_('JGLOBAL_CLICK_TO_TOGGLE_STATE'), 0); // Build the tag. $bool = $value ? 'true' : 'false'; @@ -126,7 +126,7 @@ public static function checkall($name = 'checkall-toggle', $tip = 'JGLOBAL_CHECK JHtml::_('behavior.core'); JHtml::_('bootstrap.tooltip'); - return ''; } @@ -299,8 +299,8 @@ protected static function _checkedOut(&$row, $overlib = true) $date = JHtml::_('date', $row->checked_out_time, JText::_('DATE_FORMAT_LC1')); $time = JHtml::_('date', $row->checked_out_time, 'H:i'); - $hover = ''; + $hover = ''; } return $hover . JHtml::_('image', 'admin/checked_out.png', null, null, true) . ''; diff --git a/libraries/cms/html/jgrid.php b/libraries/cms/html/jgrid.php index 158ccc3301b6a..ea914334a5575 100644 --- a/libraries/cms/html/jgrid.php +++ b/libraries/cms/html/jgrid.php @@ -61,7 +61,7 @@ public static function action($i, $task, $prefix = '', $text = '', $active_title $title = $enabled ? $active_title : $inactive_title; $title = $translate ? JText::_($title) : $title; - $title = JHtml::tooltipText($title, '', 0); + $title = JHtml::_('tooltipText', $title, '', 0); } if ($enabled) @@ -339,8 +339,8 @@ public static function checkedout($i, $editorName, $time, $prefix = '', $enabled } $text = $editorName . '
' . JHtml::_('date', $time, JText::_('DATE_FORMAT_LC')) . '
' . JHtml::_('date', $time, 'H:i'); - $active_title = JHtml::tooltipText(JText::_('JLIB_HTML_CHECKIN'), $text, 0); - $inactive_title = JHtml::tooltipText(JText::_('JLIB_HTML_CHECKED_OUT'), $text, 0); + $active_title = JHtml::_('tooltipText', JText::_('JLIB_HTML_CHECKIN'), $text, 0); + $inactive_title = JHtml::_('tooltipText', JText::_('JLIB_HTML_CHECKED_OUT'), $text, 0); return static::action( $i, 'checkin', $prefix, JText::_('JLIB_HTML_CHECKED_OUT'), html_entity_decode($active_title, ENT_QUOTES, 'UTF-8'), diff --git a/libraries/fof/form/field/imagelist.php b/libraries/fof/form/field/imagelist.php index 59d29169eb2aa..c0c41ce81e2d0 100644 --- a/libraries/fof/form/field/imagelist.php +++ b/libraries/fof/form/field/imagelist.php @@ -135,7 +135,7 @@ public function getStatic() $src = ''; } - return JHtml::image($src, $alt, $imgattr); + return JHtml::_('image', $src, $alt, $imgattr); } /** diff --git a/libraries/fof/form/field/media.php b/libraries/fof/form/field/media.php index 58968b36f657e..6a26fcb023e83 100644 --- a/libraries/fof/form/field/media.php +++ b/libraries/fof/form/field/media.php @@ -132,7 +132,7 @@ public function getStatic() $src = ''; } - return JHtml::image($src, $alt, $imgattr); + return JHtml::_('image', $src, $alt, $imgattr); } /** diff --git a/libraries/joomla/form/fields/spacer.php b/libraries/joomla/form/fields/spacer.php index 6c6df71f01bff..11c165bcf4ef7 100644 --- a/libraries/joomla/form/fields/spacer.php +++ b/libraries/joomla/form/fields/spacer.php @@ -78,7 +78,7 @@ protected function getLabel() if (!empty($this->description)) { JHtml::_('bootstrap.tooltip'); - $label .= ' title="' . JHtml::tooltipText(trim($text, ':'), JText::_($this->description), 0) . '"'; + $label .= ' title="' . JHtml::_('tooltipText', trim($text, ':'), JText::_($this->description), 0) . '"'; } // Add the label text and closing tag. diff --git a/plugins/system/debug/debug.php b/plugins/system/debug/debug.php index 63f23967fce22..cc15971c9995e 100644 --- a/plugins/system/debug/debug.php +++ b/plugins/system/debug/debug.php @@ -1151,7 +1151,7 @@ protected function displayQueries() } $htmlQuery = '
' . JText::_('PLG_DEBUG_QUERY_DUPLICATES') . ': ' . implode('  ', $dups) . '
' - . '
' . $text . '
'; + . '
' . $text . '
'; } else { @@ -1307,7 +1307,7 @@ protected function renderBars(&$bars, $class = '', $id = null) if (isset($bar->tip) && $bar->tip) { $barClass .= ' hasTooltip'; - $tip = JHtml::tooltipText($bar->tip, '', 0); + $tip = JHtml::_('tooltipText', $bar->tip, '', 0); } $html[] = '' + . JHtml::_('tooltipText', 'PLG_DEBUG_WARNING_NO_INDEX_DESC') . '">' . JText::_('PLG_DEBUG_WARNING_NO_INDEX') . '' . ''; $hasWarnings = true; } @@ -1421,7 +1421,7 @@ protected function tableToHtml($table, &$hasWarnings) $htmlTdWithWarnings = str_replace( 'Using filesort', '' + . JHtml::_('tooltipText', 'PLG_DEBUG_WARNING_USING_FILESORT_DESC') . '">' . JText::_('PLG_DEBUG_WARNING_USING_FILESORT') . '', $htmlTd );