Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 20f33603153abf96a5165e24e81c63afe226ff35
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Wed Oct 28 04:31:17 2015 +0200

    footer + close

commit b435efa7f4916e5082d7162b3368861c671c98b6
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Wed Oct 28 04:03:14 2015 +0200

    introduce listener for hide event

commit 25aafb2739904b8decd066f8e7b77464401339a7
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Thu Oct 22 17:22:17 2015 +0300

    scripts

commit ef79e3a73af8e6f772890e4c8c1bae679550053c
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Thu Oct 22 17:00:32 2015 +0300

    Compatibility with repeatable BIG Kudos to @Fedik

commit fd0a6f5eab152766a963bb7a6e27cdae12fe734a
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Mon Oct 12 05:28:10 2015 +0300

    element driven approach

commit 7b695b2feb244512d022d997ab208ff9e0f59c83
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Sun Oct 4 04:42:31 2015 +0300

    More changes

    - Drop the overrides in Isis and Protostar (don't ask)
    - Bring the tabs from #3839 thanks @Buddhima

commit 1d67fbd1e5f3201394359400f516c60c09350775
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Sat Oct 3 23:14:28 2015 +0300

    scripts update

commit 30214204249a7cc157ce83cc4404770738d91cfd
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Sat Oct 3 23:09:02 2015 +0300

    oops

commit 82c0a024ad8eaeedcc96740156da68a1f6f16e97
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Sat Oct 3 22:32:33 2015 +0300

    changes for repeatable field

commit dd7e31790fc871c2fe24f726669bf1c3347fe32a
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Sat Oct 3 21:26:36 2015 +0300

    Remove more hardcoded staff

commit 9bee6919e1150621401a1c828688c74e3440e55d
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Sat Oct 3 18:40:52 2015 +0300

    wrong flags

commit 4cc2a26cfbf62998f2f98c7a78e28fd02a778c86
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Sat Oct 3 18:20:47 2015 +0300

    Remove the inline script for field initialization

commit 9aab0e4ad9f2d010b09065037b5dcfa5242a96bc
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Mon Jun 15 06:41:28 2015 +0300

    Better B/C, xtd-btns changes

commit 47b4d29f08d0966409ab00fdcebcff50a8fe789f
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Sat Jun 6 15:30:59 2015 +0300

    set proper height, restore scrolling for ios

commit 027f83611e23c8b4a3bd1a61b57cb8cb28c3b20a
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Sat Jun 6 00:02:09 2015 +0300

    hidden link for editor_xtd image plugin

commit 22bb0c14ae3e90c756b3b2079175a69e67daa3ca
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Wed Jun 3 14:32:04 2015 +0300

    proper usage of JHtml

commit a1f6b119ce3cdbb444f7a25a5b6ef402cb538b94
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Tue May 5 12:33:39 2015 +0300

    needless

commit 9fcc4d52fafcfc26cb0895886b5e33c56bc6b26e
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Fri May 1 23:11:08 2015 +0300

    javascript to file

commit e1edf9010cb22b202b04a4add87df7be14e29e02
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Mon Apr 27 20:03:54 2015 +0300

    oops

commit 2d2a6b97f737650a3dfb158974186dbffdca8ca2
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Mon Apr 27 18:28:52 2015 +0300

    clear button

commit 0283dfd84781c75ed16acc7fe6f4daa57c8e5d90
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Mon Apr 27 17:57:19 2015 +0300

    footer

commit af2dd3feab9767ff1813895ad2f3d5f359b26d50
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Mon Apr 27 14:54:10 2015 +0300

    minor js + class changes

commit d1f36cd3021d959a18e34364ff4550bfbce99664
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Sun Mar 15 23:59:06 2015 +0200

    needless

commit f6ff19773e15769545e2b61cdbb11d9e1d6d6478
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Sun Mar 15 23:41:43 2015 +0200

    tag correction

commit 0295b41123b09c301734be558d1719ece4d7fdeb
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Fri Feb 27 04:07:34 2015 +0200

    Support editor image button plugin

commit 004c91b472e5d2fd7f0db9d6fb59e9e91e770bfe
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Thu Feb 12 15:33:15 2015 +0200

    Use the mootools version as default for B/C

commit 6871f1483d30b1cf0758697f06ea0367016e2791
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Tue Feb 3 16:38:28 2015 +0200

    CS

commit f256aee48f956b0b29957dd490cf29a4b25252be
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Tue Feb 3 16:25:20 2015 +0200

    remove front end views

commit 9c7a6d6df1f88523f4d9b6836cc26c6e42b7dc56
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Tue Feb 3 02:47:56 2015 +0200

    Tooltip follows selection

commit 2e0d0278922a3bfd33d897646b197d2a1de859b2
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Thu Jan 29 02:28:43 2015 +0200

    let media use overrides + better close script

commit ff7934243baa3b546dd9f988c386a53132e6edb9
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Fri Jan 23 13:47:51 2015 +0200

    var format

commit 1ef8d3fc4de6a7a427bba9ee84498eff337a778c
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Fri Jan 23 13:34:29 2015 +0200

    Var descriptions

commit 9fc2312126243de4c9f291cdc51b726c6a091e68
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Fri Jan 23 03:11:50 2015 +0200

    JS

commit 881e78e3fcad6e016340254973c0bf3d04730fb7
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Fri Jan 23 02:07:21 2015 +0200

    CS

commit abbe9a4a95f47b7d642e1eb7a88147ee27ddb969
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Fri Jan 23 01:21:24 2015 +0200

    some checks

commit b45ed910ab3137bb069acabd84df905f215d5e61
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Fri Jan 23 00:48:32 2015 +0200

    CS

commit f95f31a7ce58589e31d1d9f743806b361355fca5
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Thu Jan 22 23:53:13 2015 +0200

    popover

commit 6762aebfdc4b80dceea2a2877c2aa5c9986f0b5a
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Fri Jan 9 23:49:27 2015 +0200

    for review
  • Loading branch information
@dgrammatiko
dgrammatiko committed Oct 28, 2015
1 parent f41465b commit 5838d66
Show file tree
Hide file tree
Showing 14 changed files with 774 additions and 281 deletions.
7 changes: 3 additions & 4 deletions administrator/components/com_media/controller.php
View file
Expand Up @@ -29,7 +29,9 @@ class MediaController extends JControllerLegacy
public function display($cachable = false, $urlparams = false)
{
JPluginHelper::importPlugin('content');
$vName = $this->input->get('view', 'media');

$vType = JFactory::getDocument()->getType();
$vName = $this->input->get('view', 'media');

switch ($vName)
{
Expand Down Expand Up @@ -61,9 +63,6 @@ public function display($cachable = false, $urlparams = false)
break;
}

$document = JFactory::getDocument();
$vType = $document->getType();

// Get/Create the view
$view = $this->getView($vName, $vType, '', array('base_path' => JPATH_COMPONENT_ADMINISTRATOR));

Expand Down
252 changes: 134 additions & 118 deletions administrator/components/com_media/views/images/tmpl/default.php
View file
Expand Up @@ -9,19 +9,19 @@

defined('_JEXEC') or die;

JHtml::_('formbehavior.chosen', 'select');

// Load tooltip instance without HTML support because we have a HTML tag in the tip
JHtml::_('bootstrap.tooltip', '.noHtmlTip', array('html' => false));

$user = JFactory::getUser();
$input = JFactory::getApplication()->input;
$params = JComponentHelper::getParams('com_media');
$lang = JFactory::getLanguage();

JHtml::_('formbehavior.chosen', 'select');

// Load tooltip instance without HTML support because we have a HTML tag in the tip
JHtml::_('bootstrap.tooltip', '.noHtmlTip', array('html' => false));

// Include jQuery
JHtml::_('jquery.framework');
JHtml::_('script', 'media/popup-imagemanager.js', false, true);
JHtml::_('script', 'media/popup-imagemanager.min.js', false, true, false, false, true);
JHtml::_('stylesheet', 'media/popup-imagemanager.css', array(), true);

if ($lang->isRtl())
Expand All @@ -31,126 +31,142 @@

JFactory::getDocument()->addScriptDeclaration(
"
var image_base_path = '" . $params->get('image_path', 'images') . "/';
var image_base_path = '" . $params->get('image_path', 'images') . "/';
"
);
?>
<form action="index.php?option=com_media&amp;asset=<?php echo $input->getCmd('asset');?>&amp;author=<?php echo $input->getCmd('author'); ?>" class="form-vertical" id="imageForm" method="post" enctype="multipart/form-data">
<div id="messages" style="display: none;">
<span id="message"></span><?php echo JHtml::_('image', 'media/dots.gif', '...', array('width' => 22, 'height' => 12), true) ?>
</div>
<div class="well">
<div class="row">
<div class="span9 control-group">
<div class="control-label">
<label class="control-label" for="folder"><?php echo JText::_('COM_MEDIA_DIRECTORY') ?></label>
</div>
<div class="controls">
<?php echo $this->folderList; ?>
<button class="btn" type="button" id="upbutton" title="<?php echo JText::_('COM_MEDIA_DIRECTORY_UP') ?>"><?php echo JText::_('COM_MEDIA_UP') ?></button>
</div>
</div>
<div class="pull-right">
<button class="btn btn-primary" type="button" onclick="<?php if ($this->state->get('field.id')):?>window.parent.jInsertFieldValue(document.getElementById('f_url').value,'<?php echo $this->state->get('field.id');?>');<?php else:?>ImageManager.onok();<?php endif;?>window.parent.jModalClose();"><?php echo JText::_('COM_MEDIA_INSERT') ?></button>
<button class="btn" type="button" onclick="window.parent.jModalClose();"><?php echo JText::_('JCANCEL') ?></button>
</div>
</div>
</div>
<div class="tabbable">
<ul class="nav nav-tabs">
<li class="active"><a href="#browse_tab" data-toggle="tab"><?php echo JText::_('COM_MEDIA_BROWSE_FILES') ?></a></li>
<li><a href="#upload_tab" data-toggle="tab"><?php echo JText::_('COM_MEDIA_UPLOAD') ?></a></li>
</ul>

<iframe id="imageframe" name="imageframe" src="index.php?option=com_media&amp;view=imagesList&amp;tmpl=component&amp;folder=<?php echo $this->state->folder?>&amp;asset=<?php echo $input->getCmd('asset');?>&amp;author=<?php echo $input->getCmd('author');?>"></iframe>

<div class="well">
<div class="row">
<div class="span6 control-group">
<div class="control-label">
<label for="f_url"><?php echo JText::_('COM_MEDIA_IMAGE_URL') ?></label>
</div>
<div class="controls">
<input type="text" id="f_url" value="" />
</div>
</div>
<?php if (!$this->state->get('field.id')):?>
<div class="span6 control-group">
<div class="control-label">
<label title="<?php echo JText::_('COM_MEDIA_ALIGN_DESC'); ?>" class="noHtmlTip" for="f_align"><?php echo JText::_('COM_MEDIA_ALIGN') ?></label>
<div class="tab-content">
<div class="tab-pane active" id="browse_tab">
<form action="index.php?option=com_media&amp;asset=<?php echo $input->getCmd('asset');?>&amp;author=<?php echo $input->getCmd('author'); ?>" class="form-vertical" id="imageForm" method="post" enctype="multipart/form-data">
<div id="messages" style="display: none;">
<span id="message"></span><?php echo JHtml::_('image', 'media/dots.gif', '...', array('width' => 22, 'height' => 12), true) ?>
</div>
<div class="controls">
<select size="1" id="f_align">
<option value="" selected="selected"><?php echo JText::_('COM_MEDIA_NOT_SET') ?></option>
<option value="left"><?php echo JText::_('JGLOBAL_LEFT') ?></option>
<option value="center"><?php echo JText::_('JGLOBAL_CENTER') ?></option>
<option value="right"><?php echo JText::_('JGLOBAL_RIGHT') ?></option>
</select>
</div>
</div>
<?php endif;?>
</div>
<?php if (!$this->state->get('field.id')):?>
<div class="row">
<div class="span6 control-group">
<div class="control-label">
<label for="f_alt"><?php echo JText::_('COM_MEDIA_IMAGE_DESCRIPTION') ?></label>
</div>
<div class="controls">
<input type="text" id="f_alt" value="" />
</div>
</div>
<div class="span6 control-group">
<div class="control-label">
<label for="f_title"><?php echo JText::_('COM_MEDIA_TITLE') ?></label>
</div>
<div class="controls">
<input type="text" id="f_title" value="" />
</div>
</div>
</div>
<div class="row">
<div class="span6 control-group">
<div class="control-label">
<label for="f_caption"><?php echo JText::_('COM_MEDIA_CAPTION') ?></label>
</div>
<div class="controls">
<input type="text" id="f_caption" value="" />
</div>
</div>
<div class="span6 control-group">
<div class="control-label">
<label title="<?php echo JText::_('COM_MEDIA_CAPTION_CLASS_DESC'); ?>" class="noHtmlTip" for="f_caption_class"><?php echo JText::_('COM_MEDIA_CAPTION_CLASS_LABEL') ?></label>
</div>
<div class="controls">
<input type="text" list="d_caption_class" id="f_caption_class" value="" />
<datalist id="d_caption_class">
<option value="text-left">
<option value="text-center">
<option value="text-right">
</datalist>
<div class="well">
<div class="row">
<div class="span12 control-group">
<div class="control-label">
<label class="control-label" for="folder"><?php echo JText::_('COM_MEDIA_DIRECTORY') ?></label>
</div>
<div class="controls">
<?php echo $this->folderList; ?>
<button class="btn" type="button" id="upbutton" title="<?php echo JText::_('COM_MEDIA_DIRECTORY_UP') ?>"><?php echo JText::_('COM_MEDIA_UP') ?></button>
</div>
</div>
<div class="pull-right">
<button class="btn btn-success button-save-selected" type="button" <?php if (!$this->state->get('field.id')) :
// This is for Mootools compatibility ?>onclick="ImageManager.onok(); parent.jModalClose();"<?php endif;?> data-dismiss="modal"><?php echo JText::_('COM_MEDIA_INSERT') ?></button>
<button class="btn button-cancel" type="button" <?php if (!$this->state->get('field.id')) :
// This is for Mootools compatibility ?>onclick="parent.jModalClose();"<?php endif;?> data-dismiss="modal"><?php echo JText::_('JCANCEL') ?></button>
</div>
</div>
</div>
</div>
</div>
<?php endif;?>
<a id="imgBtn" onclick="ImageManager.onok();" class="hidden"></a>

<input type="hidden" id="dirPath" name="dirPath" />
<input type="hidden" id="f_file" name="f_file" />
<input type="hidden" id="tmpl" name="component" />
<iframe id="imageframe" name="imageframe" src="index.php?option=com_media&amp;view=imagesList&amp;tmpl=component&amp;folder=<?php echo $this->state->folder?>&amp;asset=<?php echo $input->getCmd('asset');?>&amp;author=<?php echo $input->getCmd('author');?>"></iframe>

</div>
</form>

<?php if ($user->authorise('core.create', 'com_media')) : ?>
<form action="<?php echo JUri::base(); ?>index.php?option=com_media&amp;task=file.upload&amp;tmpl=component&amp;<?php echo $this->session->getName() . '=' . $this->session->getId(); ?>&amp;<?php echo JSession::getFormToken();?>=1&amp;asset=<?php echo $input->getCmd('asset');?>&amp;author=<?php echo $input->getCmd('author');?>&amp;view=images" id="uploadForm" class="form-horizontal" name="uploadForm" method="post" enctype="multipart/form-data">
<div id="uploadform" class="well">
<fieldset id="upload-noflash" class="actions">
<div class="control-group">
<div class="control-label">
<label for="upload-file" class="control-label"><?php echo JText::_('COM_MEDIA_UPLOAD_FILE'); ?></label>
</div>
<div class="controls">
<input type="file" id="upload-file" name="Filedata[]" multiple /><button class="btn btn-primary" id="upload-submit"><span class="icon-upload icon-white"></span> <?php echo JText::_('COM_MEDIA_START_UPLOAD'); ?></button>
<p class="help-block"><?php echo $this->config->get('upload_maxsize') == '0' ? JText::_('COM_MEDIA_UPLOAD_FILES_NOLIMIT') : JText::sprintf('COM_MEDIA_UPLOAD_FILES', $this->config->get('upload_maxsize')); ?></p>
<div class="well">
<div class="row">
<div class="span6 control-group">
<div class="control-label">
<label for="f_url"><?php echo JText::_('COM_MEDIA_IMAGE_URL') ?></label>
</div>
<div class="controls">
<input type="text" id="f_url" value="" />
</div>
</div>
<?php if (!$this->state->get('field.id')):?>
<div class="span6 control-group">
<div class="control-label">
<label title="<?php echo JText::_('COM_MEDIA_ALIGN_DESC'); ?>" class="noHtmlTip" for="f_align"><?php echo JText::_('COM_MEDIA_ALIGN') ?></label>
</div>
<div class="controls">
<select size="1" id="f_align">
<option value="" selected="selected"><?php echo JText::_('COM_MEDIA_NOT_SET') ?></option>
<option value="left"><?php echo JText::_('JGLOBAL_LEFT') ?></option>
<option value="center"><?php echo JText::_('JGLOBAL_CENTER') ?></option>
<option value="right"><?php echo JText::_('JGLOBAL_RIGHT') ?></option>
</select>
</div>
</div>
<?php endif;?>
</div>
<?php if (!$this->state->get('field.id')):?>
<div class="row">
<div class="span6 control-group">
<div class="control-label">
<label for="f_alt"><?php echo JText::_('COM_MEDIA_IMAGE_DESCRIPTION') ?></label>
</div>
<div class="controls">
<input type="text" id="f_alt" value="" />
</div>
</div>
<div class="span6 control-group">
<div class="control-label">
<label for="f_title"><?php echo JText::_('COM_MEDIA_TITLE') ?></label>
</div>
<div class="controls">
<input type="text" id="f_title" value="" />
</div>
</div>
</div>
<div class="row">
<div class="span6 control-group">
<div class="control-label">
<label for="f_caption"><?php echo JText::_('COM_MEDIA_CAPTION') ?></label>
</div>
<div class="controls">
<input type="text" id="f_caption" value="" />
</div>
</div>
<div class="span6 control-group">
<div class="control-label">
<label title="<?php echo JText::_('COM_MEDIA_CAPTION_CLASS_DESC'); ?>" class="noHtmlTip" for="f_caption_class"><?php echo JText::_('COM_MEDIA_CAPTION_CLASS_LABEL') ?></label>
</div>
<div class="controls">
<input type="text" list="d_caption_class" id="f_caption_class" value="" />
<datalist id="d_caption_class">
<option value="text-left">
<option value="text-center">
<option value="text-right">
</datalist>
</div>
</div>
</div>
<?php endif;?>

<input type="hidden" id="dirPath" name="dirPath" />
<input type="hidden" id="f_file" name="f_file" />
<input type="hidden" id="tmpl" name="component" />

</div>
</fieldset>
<?php JFactory::getSession()->set('com_media.return_url', 'index.php?option=com_media&view=images&tmpl=component&fieldid=' . $input->getCmd('fieldid', '') . '&e_name=' . $input->getCmd('e_name') . '&asset=' . $input->getCmd('asset') . '&author=' . $input->getCmd('author')); ?>
</form>
</div>
</form>
<?php endif;
<div class="tab-pane" id="upload_tab">
<?php if ($user->authorise('core.create', 'com_media')) : ?>
<form action="<?php echo JUri::base(); ?>index.php?option=com_media&amp;task=file.upload&amp;tmpl=component&amp;<?php echo $this->session->getName() . '=' . $this->session->getId(); ?>&amp;<?php echo JSession::getFormToken();?>=1&amp;asset=<?php echo $input->getCmd('asset'); ?>&amp;author=<?php echo $input->getCmd('author'); ?>&amp;view=images" id="uploadForm" class="form-horizontal" name="uploadForm" method="post" enctype="multipart/form-data">
<div id="uploadform" class="well">
<fieldset id="upload-noflash" class="actions">
<div class="control-group">
<div class="control-label">
<label for="upload-file" class="control-label"><?php echo JText::_('COM_MEDIA_UPLOAD_FILE'); ?></label>
</div>
<div class="controls">
<input type="file" id="upload-file" name="Filedata[]" multiple /><button class="btn btn-primary" id="upload-submit"><span class="icon-upload icon-white"></span> <?php echo JText::_('COM_MEDIA_START_UPLOAD'); ?></button>
<p class="help-block"><?php echo $this->config->get('upload_maxsize') == '0' ? JText::_('COM_MEDIA_UPLOAD_FILES_NOLIMIT') : JText::sprintf('COM_MEDIA_UPLOAD_FILES', $this->config->get('upload_maxsize')); ?></p>
</div>
</div>
</fieldset>
<?php JFactory::getSession()->set('com_media.return_url', 'index.php?option=com_media&view=images&tmpl=component&fieldid=' . $input->getCmd('fieldid', '') . '&e_name=' . $input->getCmd('e_name') . '&asset=' . $input->getCmd('asset') . '&author=' . $input->getCmd('author')); ?>
</div>
</form>
<?php endif; ?>

</div>
</div>
</div>
3 changes: 3 additions & 0 deletions administrator/templates/isis/css/template-rtl.css
View file
Expand Up @@ -7271,6 +7271,9 @@ body .navbar-fixed-top {
z-index: 100;
}
@media (max-width: 767px) {
body {
-webkit-overflow-scrolling: touch;
}
.subhead {
margin-left: -20px;
margin-right: -20px;
Expand Down
3 changes: 3 additions & 0 deletions administrator/templates/isis/css/template.css
View file
Expand Up @@ -7271,6 +7271,9 @@ body .navbar-fixed-top {
z-index: 100;
}
@media (max-width: 767px) {
body {
-webkit-overflow-scrolling: touch;
}
.subhead {
margin-left: -20px;
margin-right: -20px;
Expand Down

0 comments on commit 5838d66

Please sign in to comment.