Add upload button to imageselector

This commit is contained in:
onli
2014-01-23 23:13:09 +01:00
parent 580de6574e
commit 3873826036
8 changed files with 65 additions and 48 deletions
+4
View File
@@ -1,3 +1,7 @@
{foreach $messages as $message}
<span class="msg_notice"><span class="icon-info-circled"></span> {$message}</span>
{/foreach}
{if $case_doSync}
{if !$perm_adminImagesSync}
<span class="msg_error"><span class="icon-attention-circled"></span> {$CONST.PERM_DENIED}</span>
+1 -1
View File
@@ -1,5 +1,5 @@
{foreach from=$media.files item="file" name="mediafiles" key="mediakey"}
{if NOT $media.manage}
{if $smarty.get.serendipity.showUpload}
{* ML got called for inserting media *}
<article class="media_wrap_thumb {cycle values="odd,even"}">
<div class="media_file_thumb{if $media.enclose} equal_heights{/if}">
+10 -7
View File
@@ -151,13 +151,16 @@
{if $media.nr_files < 1}
<span class="msg_notice"><span class="icon-info-circled"></span> {$CONST.NO_IMAGES_FOUND}</span>
{else}
{if $smarty.get.serendipity.adminModule == 'media'}
<form id="formMultiDelete" name="formMultiDelete" action="?" method="post">
{$media.token}
<input name="serendipity[action]" type="hidden" value="admin">
<input name="serendipity[adminModule]" type="hidden" value="media">
<input name="serendipity[adminAction]" type="hidden" value="multidelete">
{if $smarty.get.serendipity.showUpload}
<a class="button_link" href="?serendipity[adminModule]=media&serendipity[adminAction]=addSelect&{$media.extraParems}">{$CONST.ADD_MEDIA}</a>
{else}
<form id="formMultiDelete" name="formMultiDelete" action="?" method="post">
{$media.token}
<input name="serendipity[action]" type="hidden" value="admin">
<input name="serendipity[adminModule]" type="hidden" value="media">
<input name="serendipity[adminAction]" type="hidden" value="multidelete">
{/if}
<div class="clearfix media_pane" data-thumbmaxwidth="{$media.thumbSize}">
{$MEDIA_ITEMS}
{if ($media.page != 1 && $media.page <= $media.pages)||$media.page != $media.pages}
@@ -171,7 +174,7 @@
</nav>
{/if}
</div>
{if $smarty.get.serendipity.adminModule == 'media'}
{if NOT $smarty.get.serendipity.showUpload}
{if $media.manage}
<div class="form_buttons">
<input class="invert_selection" name="toggle" type="button" value="{$CONST.INVERT_SELECTIONS}">
+5 -3
View File
@@ -1,12 +1,12 @@
<h2>{$CONST.ADD_MEDIA}</h2>
<form id="uploadform" action="?" method="POST" enctype="multipart/form-data">
<form id="uploadform" action="?{$media.extraParems}" method="POST" enctype="multipart/form-data">
{if $media.max_file_size}
<input name="MAX_FILE_SIZE" type="hidden" value="{$max_file_size}">
{/if}
{$media.token}
<input name="serendipity[action]" type="hidden" value="admin">
<input name="serendipity[adminModule]" type="hidden" value="images">
<input name="serendipity[adminModule]" type="hidden" value="media">
<input name="serendipity[adminAction]" type="hidden" value="add">
{$media.form_hidden}
@@ -70,7 +70,9 @@
<input id="all_authors" name="serendipity[all_authors]" type="hidden" value="true" checked="checked">
<input class="check_inputs" type="submit" value="{$CONST.GO}">
<input class="check_inputs" name="go_properties" type="submit" value="{$CONST.GO_ADD_PROPERTIES|@escape}">
{if NOT $smarty.get.serendipity.showUpload}
<input class="check_inputs" name="go_properties" type="submit" value="{$CONST.GO_ADD_PROPERTIES|@escape}">
{/if}
</div>
</form>
<script src="{serendipity_getFile file='admin/js/jquery.tabs.js'}"></script>
@@ -799,7 +799,7 @@ var AccessifyHTML5 = function (defaults, more_fixes) {
});
$('.wrap_insmedia').click(function() {
serendipity.openPopup('serendipity_admin.php?serendipity[adminModule]=media&serendipity[noBanner]=true&serendipity[noSidebar]=true&serendipity[noFooter]=true&serendipity[showMediaToolbar]=false&serendipity[textarea]=' + $(this).attr('data-tarea'));
serendipity.openPopup('serendipity_admin.php?serendipity[adminModule]=media&serendipity[noBanner]=true&serendipity[noSidebar]=true&serendipity[noFooter]=true&serendipity[showMediaToolbar]=false&serendipity[showUpload]=true&serendipity[textarea]=' + $(this).attr('data-tarea'));
});
// Advanced options
+1 -1
View File
@@ -7,7 +7,7 @@
init: function( editor ) {
editor.addCommand( 'openML', {
exec : function( editor ) {
serendipity.openPopup('serendipity_admin.php?serendipity[adminModule]=media&serendipity[noBanner]=true&serendipity[noSidebar]=true&serendipity[noFooter]=true&serendipity[showMediaToolbar]=false&serendipity[textarea]={$item}');
serendipity.openPopup('serendipity_admin.php?serendipity[adminModule]=media&serendipity[noBanner]=true&serendipity[noSidebar]=true&serendipity[noFooter]=true&serendipity[showMediaToolbar]=false&serendipity[showUpload]=true&serendipity[textarea]={$item}');
}
});
editor.ui.addButton('s9y_medialibrary{$item}', {