Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use the JHtml::_ function instead of calling functions directly.
- Loading branch information
1 parent
3c44236
commit 41cc89f
Showing
76 changed files
with
293 additions
and
120 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
administrator/components/com_media/views/medialist/tmpl/details_doc.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| <?php | ||
| /** | ||
| * @package Joomla.Administrator | ||
| * @subpackage com_media | ||
| * | ||
| * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. | ||
| * @license GNU General Public License version 2 or later; see LICENSE.txt | ||
| */ | ||
| defined('_JEXEC') or die; | ||
|
|
||
| use Joomla\Registry\Registry; | ||
|
|
||
| JHtml::_('bootstrap.tooltip'); | ||
|
|
||
| $user = JFactory::getUser(); | ||
| $params = new Registry; | ||
| $dispatcher = JEventDispatcher::getInstance(); | ||
| $dispatcher->trigger('onContentBeforeDisplay', array('com_media.file', &$this->_tmp_doc, &$params)); | ||
| ?> | ||
|
|
||
| <tr> | ||
| <td> | ||
| <a title="<?php echo $this->_tmp_doc->name; ?>"> | ||
| <?php echo JHtml::_('image', $this->_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);?> </a> | ||
| </td> | ||
| <td class="description" title="<?php echo $this->_tmp_doc->name; ?>"> | ||
| <?php echo $this->_tmp_doc->title; ?> | ||
| </td> | ||
| <td>  | ||
|
|
||
| </td> | ||
| <td class="filesize"> | ||
| <?php echo JHtml::_('number.bytes', $this->_tmp_doc->size); ?> | ||
| </td> | ||
| <?php if ($user->authorise('core.delete', 'com_media')):?> | ||
| <td> | ||
| <a class="delete-item" target="_top" href="index.php?option=com_media&task=file.delete&tmpl=index&<?php echo JSession::getFormToken(); ?>=1&folder=<?php echo $this->state->folder; ?>&rm[]=<?php echo $this->_tmp_doc->name; ?>" rel="<?php echo $this->_tmp_doc->name; ?>"><span class="icon-remove hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JACTION_DELETE');?>"></span></a> | ||
| <input type="checkbox" name="rm[]" value="<?php echo $this->_tmp_doc->name; ?>" /> | ||
| </td> | ||
| <?php endif;?> | ||
| </tr> | ||
| <?php $dispatcher->trigger('onContentAfterDisplay', array('com_media.file', &$this->_tmp_doc, &$params)); |
35 changes: 35 additions & 0 deletions
35
administrator/components/com_media/views/medialist/tmpl/details_folder.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| <?php | ||
| /** | ||
| * @package Joomla.Administrator | ||
| * @subpackage com_media | ||
| * | ||
| * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. | ||
| * @license GNU General Public License version 2 or later; see LICENSE.txt | ||
| */ | ||
| defined('_JEXEC') or die; | ||
|
|
||
| $user = JFactory::getUser(); | ||
|
|
||
| JHtml::_('bootstrap.tooltip'); | ||
| ?> | ||
| <tr> | ||
| <td class="imgTotal"> | ||
| <a href="index.php?option=com_media&view=mediaList&tmpl=component&folder=<?php echo $this->_tmp_folder->path_relative; ?>" target="folderframe"> | ||
| <span class="icon-folder-2"></span></a> | ||
| </td> | ||
| <td class="description"> | ||
| <a href="index.php?option=com_media&view=mediaList&tmpl=component&folder=<?php echo $this->_tmp_folder->path_relative; ?>" target="folderframe"><?php echo $this->_tmp_folder->name; ?></a> | ||
| </td> | ||
| <td>  | ||
|
|
||
| </td> | ||
| <td>  | ||
|
|
||
| </td> | ||
| <?php if ($user->authorise('core.delete', 'com_media')):?> | ||
| <td> | ||
| <a class="delete-item" target="_top" href="index.php?option=com_media&task=folder.delete&tmpl=index&folder=<?php echo $this->state->folder; ?>&<?php echo JSession::getFormToken(); ?>=1&rm[]=<?php echo $this->_tmp_folder->name; ?>" rel="<?php echo $this->_tmp_folder->name; ?>' :: <?php echo $this->_tmp_folder->files + $this->_tmp_folder->folders; ?>"><span class="icon-remove hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JACTION_DELETE');?>"></span></a> | ||
| <input type="checkbox" name="rm[]" value="<?php echo $this->_tmp_folder->name; ?>" /> | ||
| </td> | ||
| <?php endif;?> | ||
| </tr> |
42 changes: 42 additions & 0 deletions
42
administrator/components/com_media/views/medialist/tmpl/details_img.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| <?php | ||
| /** | ||
| * @package Joomla.Administrator | ||
| * @subpackage com_media | ||
| * | ||
| * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. | ||
| * @license GNU General Public License version 2 or later; see LICENSE.txt | ||
| */ | ||
|
|
||
| defined('_JEXEC') or die; | ||
|
|
||
| use Joomla\Registry\Registry; | ||
|
|
||
| JHtml::_('bootstrap.tooltip'); | ||
|
|
||
| $user = JFactory::getUser(); | ||
| $params = new Registry; | ||
| $dispatcher = JEventDispatcher::getInstance(); | ||
| $dispatcher->trigger('onContentBeforeDisplay', array('com_media.file', &$this->_tmp_img, &$params)); | ||
| ?> | ||
|
|
||
| <tr> | ||
| <td> | ||
| <a class="img-preview" href="<?php echo COM_MEDIA_BASEURL . '/' . $this->_tmp_img->path_relative; ?>" title="<?php echo $this->_tmp_img->name; ?>"><?php echo JHtml::_('image', COM_MEDIA_BASEURL . '/' . $this->_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)); ?></a> | ||
| </td> | ||
| <td class="description"> | ||
| <a href="<?php echo COM_MEDIA_BASEURL . '/' . $this->_tmp_img->path_relative; ?>" title="<?php echo $this->_tmp_img->name; ?>" class="preview"><?php echo $this->escape($this->_tmp_img->title); ?></a> | ||
| </td> | ||
| <td class="dimensions"> | ||
| <?php echo JText::sprintf('COM_MEDIA_IMAGE_DIMENSIONS', $this->_tmp_img->width, $this->_tmp_img->height); ?> | ||
| </td> | ||
| <td class="filesize"> | ||
| <?php echo JHtml::_('number.bytes', $this->_tmp_img->size); ?> | ||
| </td> | ||
| <?php if ($user->authorise('core.delete', 'com_media')):?> | ||
| <td> | ||
| <a class="delete-item" target="_top" href="index.php?option=com_media&task=file.delete&tmpl=index&<?php echo JSession::getFormToken(); ?>=1&folder=<?php echo $this->state->folder; ?>&rm[]=<?php echo $this->_tmp_img->name; ?>" rel="<?php echo $this->_tmp_img->name; ?>"><span class="icon-remove hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JACTION_DELETE');?>"></span></a> | ||
| <input type="checkbox" name="rm[]" value="<?php echo $this->_tmp_img->name; ?>" /> | ||
| </td> | ||
| <?php endif;?> | ||
| </tr> | ||
| <?php $dispatcher->trigger('onContentAfterDisplay', array('com_media.file', &$this->_tmp_img, &$params)); |
54 changes: 54 additions & 0 deletions
54
administrator/components/com_media/views/medialist/tmpl/details_video.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| <?php | ||
| /** | ||
| * @package Joomla.Administrator | ||
| * @subpackage com_media | ||
| * | ||
| * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. | ||
| * @license GNU General Public License version 2 or later; see LICENSE.txt | ||
| */ | ||
|
|
||
| defined('_JEXEC') or die; | ||
|
|
||
| use Joomla\Registry\Registry; | ||
|
|
||
| JHtml::_('bootstrap.tooltip'); | ||
|
|
||
| $user = JFactory::getUser(); | ||
| $params = new Registry; | ||
| $dispatcher = JEventDispatcher::getInstance(); | ||
| $dispatcher->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(); | ||
| }); | ||
| }); | ||
| "); | ||
| ?> | ||
|
|
||
| <tr> | ||
| <td> | ||
| <a class="video-preview" href="<?php echo COM_MEDIA_BASEURL . '/' . $this->_tmp_video->name; ?>" title="<?php echo $this->_tmp_video->title; ?>"><?php JHtml::_('image', $this->_tmp_video->icon_16, $this->_tmp_video->title, null, true); ?></a> | ||
| </td> | ||
| <td class="description"> | ||
| <a class="video-preview" href="<?php echo COM_MEDIA_BASEURL . '/' . $this->_tmp_video->name; ?>" title="<?php echo $this->_tmp_video->name; ?>"> | ||
| <?php echo JHtml::_('string.truncate', $this->_tmp_video->name, 10, false); ?> | ||
| </a> | ||
| </td> | ||
| <td class="dimensions"> | ||
| <?php // Can we figure out the dimensions of the video? ?> | ||
| </td> | ||
| <td class="filesize"> | ||
| <?php echo JHtml::_('number.bytes', $this->_tmp_video->size); ?> | ||
| </td> | ||
| <?php if ($user->authorise('core.delete', 'com_media')):?> | ||
| <td> | ||
| <a class="delete-item" target="_top" href="index.php?option=com_media&task=file.delete&tmpl=index&<?php echo JSession::getFormToken(); ?>=1&folder=<?php echo $this->state->folder; ?>&rm[]=<?php echo $this->_tmp_video->name; ?>" rel="<?php echo $this->_tmp_video->name; ?>"><span class="icon-remove hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JACTION_DELETE');?>"></span></a> | ||
| <input type="checkbox" name="rm[]" value="<?php echo $this->_tmp_video->name; ?>" /> | ||
| </td> | ||
| <?php endif;?> | ||
| </tr> | ||
|
|
||
| <?php | ||
| $dispatcher->trigger('onContentAfterDisplay', array('com_media.file', &$this->_tmp_video, &$params)); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.