diff --git a/administrator/components/com_banners/models/fields/clicks.php b/administrator/components/com_banners/models/fields/clicks.php index f993ffa7150c5..c377f0d2ee2aa 100644 --- a/administrator/components/com_banners/models/fields/clicks.php +++ b/administrator/components/com_banners/models/fields/clicks.php @@ -37,7 +37,7 @@ protected function getInput() return ' ' + . htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '" readonly="readonly" /> ' . JText::_('COM_BANNERS_RESET_CLICKS') . ''; } } diff --git a/administrator/components/com_banners/models/fields/impmade.php b/administrator/components/com_banners/models/fields/impmade.php index aeba9870beac7..a3809a249a5dc 100644 --- a/administrator/components/com_banners/models/fields/impmade.php +++ b/administrator/components/com_banners/models/fields/impmade.php @@ -37,7 +37,7 @@ protected function getInput() return ' ' + . htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '" readonly="readonly" /> ' . JText::_('COM_BANNERS_RESET_IMPMADE') . ''; } } diff --git a/administrator/components/com_categories/models/fields/modal/category.php b/administrator/components/com_categories/models/fields/modal/category.php index 6ac1d02c46622..1aa82963c5174 100644 --- a/administrator/components/com_categories/models/fields/modal/category.php +++ b/administrator/components/com_categories/models/fields/modal/category.php @@ -148,7 +148,7 @@ protected function getInput() . ' title="' . JHtml::tooltipText('COM_CATEGORIES_CHANGE_CATEGORY') . '"' . ' href="' . $link . '&' . JSession::getFormToken() . '=1"' . ' rel="{handler: \'iframe\', size: {x: 800, y: 450}}">' - . ' ' . JText::_('JSELECT') + . '' . JText::_('JSELECT') . ''; // Edit category button @@ -159,7 +159,7 @@ protected function getInput() . ' href="index.php?option=com_categories&layout=modal&tmpl=component&task=category.edit&id=' . $value . '"' . ' target="_blank"' . ' title="' . JHtml::tooltipText('COM_CATEGORIES_EDIT_CATEGORY') . '" >' - . ' ' . JText::_('JACTION_EDIT') + . '' . JText::__('JACTION_EDIT') . ''; } @@ -170,7 +170,7 @@ protected function getInput() . ' id="' . $this->id . '_clear"' . ' class="btn' . ($value ? '' : ' hidden') . '"' . ' onclick="return jClearCategory(\'' . $this->id . '\')">' - . ' ' . JText::_('JCLEAR') + . '' . JText::__('JCLEAR') . ''; } diff --git a/administrator/components/com_categories/views/categories/tmpl/modal.php b/administrator/components/com_categories/views/categories/tmpl/modal.php index 21e420741e5b5..24477b5bd7ac9 100644 --- a/administrator/components/com_categories/views/categories/tmpl/modal.php +++ b/administrator/components/com_categories/views/categories/tmpl/modal.php @@ -1,4 +1,166 @@ isSite()) +{ + JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN')); +} + +require_once JPATH_ROOT . '/components/com_content/helpers/route.php'; + +// Include the component HTML helpers. +JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); +JHtml::_('bootstrap.tooltip'); +JHtml::_('formbehavior.chosen', 'select'); + +$extension = $this->escape($this->state->get('filter.extension')); +$function = $app->input->getCmd('function', 'jSelectCategory'); +$listOrder = $this->escape($this->state->get('list.ordering')); +$listDirn = $this->escape($this->state->get('list.direction')); +?> + +
+
+
+
+ +
+
+ +
+
+ + +
+
+
+
+
+ + + + + state->get('filter.forcedLanguage')) : ?> + + + + + +
+
+ + + + + + + + + + + + + + + + + items as $i => $item) : ?> + language && JLanguageMultilang::isEnabled()) + { + $tag = strlen($item->language); + if ($tag == 5) + { + $lang = substr($item->language, 0, 2); + } + elseif ($tag == 6) + { + $lang = substr($item->language, 0, 3); + } + else + { + $lang = ""; + } + } + elseif (!JLanguageMultilang::isEnabled()) + { + $lang = ""; + } + ?> + + + + + + + + +
+ + + + + state->get('list.direction'), + $this->state->get('list.ordering') + ); + ?> + + +
+ pagination->getListFooter(); ?> +
+ —', $item->level - 1) ?> + + escape($item->title); ?> + + + escape($item->access_level); ?> + + language == '*'): ?> + + + language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + + + id; ?> +
+ + + + + + + + +
/** * @package Joomla.Administrator * @subpackage com_categories diff --git a/administrator/components/com_contact/models/fields/modal/contact.php b/administrator/components/com_contact/models/fields/modal/contact.php index b293fbf05ffb9..aa8611ab2b22e 100644 --- a/administrator/components/com_contact/models/fields/modal/contact.php +++ b/administrator/components/com_contact/models/fields/modal/contact.php @@ -141,7 +141,7 @@ protected function getInput() . ' title="' . JHtml::tooltipText('COM_CONTACT_CHANGE_CONTACT') . '"' . ' href="' . $link . '&' . JSession::getFormToken() . '=1"' . ' rel="{handler: \'iframe\', size: {x: 800, y: 450}}">' - . ' ' . JText::_('JSELECT') + . '' . JText::_('JSELECT') . ''; // Edit contact button. @@ -152,7 +152,7 @@ protected function getInput() . ' href="index.php?option=com_contact&layout=modal&tmpl=component&task=contact.edit&id=' . $value . '"' . ' target="_blank"' . ' title="' . JHtml::tooltipText('COM_CONTACT_EDIT_CONTACT') . '" >' - . ' ' . JText::_('JACTION_EDIT') + . '' . JText::__('JACTION_EDIT') . ''; } @@ -163,7 +163,7 @@ protected function getInput() . ' id="' . $this->id . '_clear"' . ' class="btn' . ($value ? '' : ' hidden') . '"' . ' onclick="return jClearContact(\'' . $this->id . '\')">' - . ' ' . JText::_('JCLEAR') + . '' . JText::__('JCLEAR') . ''; } diff --git a/administrator/components/com_content/models/fields/modal/article.php b/administrator/components/com_content/models/fields/modal/article.php index 8c97292d7ec08..3c50cd1fb4819 100644 --- a/administrator/components/com_content/models/fields/modal/article.php +++ b/administrator/components/com_content/models/fields/modal/article.php @@ -133,19 +133,19 @@ protected function getInput() $html[] = ''; $html[] = ''; $html[] = ' ' . JText::_('JSELECT') . ''; + '=1" rel="{handler: \'iframe\', size: {x: 800, y: 450}}">' . JText::_('JSELECT') . ''; // Edit article button if ($allowEdit) { - $html[] = ' ' . JText::_('JACTION_EDIT') . ''; + $html[] = '' . JText::__('JACTION_EDIT') . ''; } // Clear article button if ($allowClear) { $html[] = ''; + $this->id . '\')">' . JText::__('JCLEAR') . ''; } $html[] = ''; diff --git a/administrator/components/com_content/views/articles/tmpl/modal.php b/administrator/components/com_content/views/articles/tmpl/modal.php index d326db0a66af1..8782e0b747960 100644 --- a/administrator/components/com_content/views/articles/tmpl/modal.php +++ b/administrator/components/com_content/views/articles/tmpl/modal.php @@ -1,4 +1,174 @@ isSite()) +{ + JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN')); +} + +require_once JPATH_ROOT . '/components/com_content/helpers/route.php'; + +JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); +JHtml::_('bootstrap.tooltip'); +JHtml::_('behavior.framework', true); +JHtml::_('formbehavior.chosen', 'select'); + +$function = $app->input->getCmd('function', 'jSelectArticle'); +$listOrder = $this->escape($this->state->get('list.ordering')); +$listDirn = $this->escape($this->state->get('list.direction')); +?> +
+
+
+
+ +
+
+ +
+
+ + +
+
+
+
+
+ + + + + state->get('filter.forcedLanguage')) : ?> + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + items as $i => $item) : ?> + language && JLanguageMultilang::isEnabled()) + { + $tag = strlen($item->language); + if ($tag == 5) + { + $lang = substr($item->language, 0, 2); + } + elseif ($tag == 6) + { + $lang = substr($item->language, 0, 3); + } + else { + $lang = ""; + } + } + elseif (!JLanguageMultilang::isEnabled()) + { + $lang = ""; + } + ?> + + + + + + + + + + +
+ + + + + + + + + + + +
+ pagination->getListFooter(); ?> +
+ + escape($item->title); ?> + + escape($item->access_level); ?> + + escape($item->category_title); ?> + + language == '*'):?> + + + language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + + + created, JText::_('DATE_FORMAT_LC4')); ?> + + id; ?> +
+ +
+ + + + + +
+
/** * @package Joomla.Administrator * @subpackage com_content diff --git a/administrator/components/com_contenthistory/views/history/tmpl/modal.php b/administrator/components/com_contenthistory/views/history/tmpl/modal.php index 5a1c168e285ca..df0f28fa6b5b8 100644 --- a/administrator/components/com_contenthistory/views/history/tmpl/modal.php +++ b/administrator/components/com_contenthistory/views/history/tmpl/modal.php @@ -91,19 +91,19 @@
+ + + + +
diff --git a/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php b/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php index b212809438502..ad9f3b3984427 100644 --- a/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php +++ b/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php @@ -147,14 +147,14 @@ protected function getInput() $html[] = ' ' . JText::_('JACTION_EDIT') . ''; + '" >' . JText::__('JACTION_EDIT') . ''; } // Clear newsfeed button if ($allowClear) { $html[] = ''; + $this->id . '\')">' . JText::__('JCLEAR') . ''; } $html[] = ''; diff --git a/components/com_content/helpers/icon.php b/components/com_content/helpers/icon.php index df9d1a14002dd..aa6234e77eb44 100644 --- a/components/com_content/helpers/icon.php +++ b/components/com_content/helpers/icon.php @@ -44,7 +44,7 @@ public static function create($category, $params, $attribs = array(), $legacy = } else { - $text = ' ' . JText::_('JNEW') . ' '; + $text = ' JText::_('JNEW') . ' '; } } else @@ -99,7 +99,7 @@ public static function email($article, $params, $attribs = array(), $legacy = fa } else { - $text = ' ' . JText::_('JGLOBAL_EMAIL'); + $text = '' . JText::__('JGLOBAL_EMAIL'); } } else @@ -246,7 +246,7 @@ public static function print_popup($article, $params, $attribs = array(), $legac } else { - $text = ' ' . JText::_('JGLOBAL_PRINT') . ' '; + $text = ' JText::_('JGLOBAL_PRINT') . ' '; } } else @@ -282,7 +282,7 @@ public static function print_screen($article, $params, $attribs = array(), $lega } else { - $text = ' ' . JText::_('JGLOBAL_PRINT') . ' '; + $text = ' JText::_('JGLOBAL_PRINT') . ' '; } } else diff --git a/installation/helper/html/installation.php b/installation/helper/html/installation.php index c871df31989b4..6dde159f706c8 100644 --- a/installation/helper/html/installation.php +++ b/installation/helper/html/installation.php @@ -95,7 +95,7 @@ private static function getTab($id, $tabs) $input = JFactory::getApplication()->input; $num = static::getTabNumber($id, $tabs); $view = static::getTabNumber($input->getWord('view'), $tabs); - $tab = '' . $num . ' ' . JText::_('INSTL_STEP_' . strtoupper($id) . '_LABEL'); + $tab = '' . $num . '' . JText::__('INSTL_STEP_' . strtoupper($id) . '_LABEL'); if ($view + 1 == $num) { diff --git a/media/jui/less/bootstrap-rtl.less b/media/jui/less/bootstrap-rtl.less index 42cd7b2d28902..a16ea8d9f31f5 100644 --- a/media/jui/less/bootstrap-rtl.less +++ b/media/jui/less/bootstrap-rtl.less @@ -623,4 +623,18 @@ input[type="url"] { /* Dropdown frontend */ .dropdown-menu { text-align: right; +} + +/* Icon whitespacing */ +[class^="icon-"], +[class*=" icon-"] { + margin-left: .25em; +} +dd > span[class^="icon-"] + time, +dd > span[class*=" icon-"] + time{ + margin-left: -.25em; +} +dl.article-info dd.hits span[class^="icon-"], +dl.article-info dd.hits span[class*=" icon-"]{ + margin-right: 0; } \ No newline at end of file diff --git a/media/jui/less/icomoon.less b/media/jui/less/icomoon.less index efa25652f1bfe..9510c7b6d2ba5 100644 --- a/media/jui/less/icomoon.less +++ b/media/jui/less/icomoon.less @@ -25,9 +25,17 @@ display: inline-block; width: 14px; height: 14px; - .ie7-restore-right-whitespace(); + margin-right: .25em; line-height: 14px; } +dd > span[class^="icon-"] + time, +dd > span[class*=" icon-"] + time{ + margin-left: -.25em; +} +dl.article-info dd.hits span[class^="icon-"], +dl.article-info dd.hits span[class*=" icon-"]{ + margin-right: 0; +} /* Use the following CSS code if you want to have a class per icon */ [class^="icon-"]:before, [class*=" icon-"]:before { @@ -752,4 +760,4 @@ } .icon-expired:before { content: "\4b"; -} \ No newline at end of file +} diff --git a/media/jui/less/sprites.less b/media/jui/less/sprites.less index 1812bf71acbfe..fe1f2a21fd2f6 100644 --- a/media/jui/less/sprites.less +++ b/media/jui/less/sprites.less @@ -19,15 +19,22 @@ display: inline-block; width: 14px; height: 14px; - .ie7-restore-right-whitespace(); line-height: 14px; vertical-align: text-top; background-image: url("@{iconSpritePath}"); background-position: 14px 14px; background-repeat: no-repeat; margin-top: 1px; + margin-right: .25em; +} +dd > span[class^="icon-"] + time, +dd > span[class*=" icon-"] + time{ + margin-left: -.25em; +} +dl.article-info dd.hits span[class^="icon-"], +dl.article-info dd.hits span[class*=" icon-"]{ + margin-right: 0; } - /* White icons with optional class, or on hover/focus/active states of certain elements */ .icon-white, .nav-pills > .active > a > [class^="icon-"],