joomla
/
weblinks
mirror of https://github.com/joomla-extensions/weblinks.git
30
1
Fork 0
Code Issues Releases Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Yves Hoppe 2016-04-27 14:48:36 +02:00
parent 7298ebe146 51a9d7f7ca
commit af78c83357
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/administrator/components/com_weblinks/models/weblinks.php
View File

@ -139,7 +139,7 @@ class WeblinksModelWeblinks extends JModelList
$query->from($db->quoteName('#__weblinks') . ' AS a');
// Join over the language
$query->select('l.title AS language_title')
$query->select('l.title AS language_title, l.image AS language_image')
->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language');
// Join over the users for the checked out user.

4
src/administrator/components/com_weblinks/views/weblinks/tmpl/default.php
View File

@ -111,7 +111,7 @@ JFactory::getDocument()->addScriptDeclaration('
<th width="5%" class="nowrap center hidden-phone">
<?php echo JHtml::_('grid.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
</th>
<th width="5%" class="nowrap hidden-phone">
<th width="10%" class="nowrap hidden-phone">
<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
</th>
<th width="1%" class="nowrap center hidden-phone">
@ -188,7 +188,7 @@ JFactory::getDocument()->addScriptDeclaration('
<?php if ($item->language == '*'):?>
<?php echo JText::alt('JALL', 'language'); ?>
<?php else:?>
<?php echo $item->language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?>
<?php echo $item->language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . '&nbsp;' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?>
<?php endif;?>
</td>
<td class="center hidden-phone">