mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Externalized click handler for cloning upload form.

Browse Source 
Also fixed duplicated id in upload form and fixed setting the target
directory in cloned form.
This commit is contained in:
Matthias Mees
2013-05-31 23:26:37 +02:00
parent b4e18b48f3
commit be832ceb4d
2 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
templates/2k11/admin/media_upload.tpl
View File

@ -35,20 +35,20 @@
<span class="standalone hilite_b">{$CONST.WORD_OR}</span>
</div>
<div id="upload_template">
<div id="upload_template" class="hidden">
<div class="form_field clearfix">
<label for="userfile_1" class="uploadform_userfile_label">{$CONST.ENTER_MEDIA_UPLOAD}</label>
<input id="userfile_1" class="uploadform_userfile" name="serendipity[userfile][1]" type="file" onchange="checkInputs();">
<label for="userfile_0" class="uploadform_userfile_label">{$CONST.ENTER_MEDIA_UPLOAD}</label>
<input id="userfile_0" class="uploadform_userfile" name="serendipity[userfile][1]" type="file" onchange="checkInputs();">
</div>
<div class="form_field clearfix">
<label for="target_filename_1" class="uploadform_target_filename_label">{$CONST.SAVE_FILE_AS} <span class="input-desc image-upload">{$CONST.PLAIN_ASCII_NAMES}</span></label>
<input id="target_filename_1" class="uploadform_target_filename" name="serendipity[target_filename][1]" type="text" value="">
<label for="target_filename_0" class="uploadform_target_filename_label">{$CONST.SAVE_FILE_AS} <span class="input-desc image-upload">{$CONST.PLAIN_ASCII_NAMES}</span></label>
<input id="target_filename_0" class="uploadform_target_filename" name="serendipity[target_filename][1]" type="text" value="">
</div>
<div class="form_select clearfix">
<label for="target_directory_1" class="uploadform_target_directory_label">{$CONST.STORE_IN_DIRECTORY}</label>
<select id="target_directory_1" class="uploadform_target_directory" name="serendipity[target_directory][1]">
<label for="target_directory_0" class="uploadform_target_directory_label">{$CONST.STORE_IN_DIRECTORY}</label>
<select id="target_directory_0" class="uploadform_target_directory" name="serendipity[target_directory][1]">
<option value="">{$CONST.BASE_DIRECTORY}</option>
{foreach from=$media.folders item="folder"}
<option{if $media.only_path == $folder.relpath} selected{/if} value="{$folder.relpath}">{'&nbsp;'|@str_repeat:($folder.depth*2)} {$folder.name}</option>
@ -56,23 +56,16 @@
</select>
</div>
<div id="ccounter"><input id="column_count_1" class="uploadform_column_count" type="hidden" name="serendipity[column_count][1]" value="true"></div>
<div id="ccounter"><input id="column_count_0" class="uploadform_column_count" type="hidden" name="serendipity[column_count][1]" value="true"></div>
</div>
<div id="debug">
</div>
{* Placeholder for upload form, gets duplicated if users uploads multiple files *}
<span id="upload_form"></span>
<script>
document.getElementById('upload_template').style.display = 'none';
addUploadField();
</script>
<div id="debug"></div>
{* Placeholder for upload form, gets duplicated if users uploads multiple files *}
<span id="upload_form"></span>
{serendipity_hookPlugin hook="backend_image_addform" hookAll=true}
<div class="form_buttons">
<input type="button" value="{$CONST.IMAGE_MORE_INPUT}" onclick="hideForeign(); addUploadField()">
<input id="add_upload" type="button" value="{$CONST.IMAGE_MORE_INPUT}">
<input id="all_authors" name="serendipity[all_authors]" type="hidden" value="true" checked="checked">
</div>

20
templates/2k11/admin/serendipity_editor.js.tpl
View File

@ -491,7 +491,7 @@ function addUploadField() {
var $fields = $('#upload_template').clone();
$fields.attr('id', 'upload_form_' + upload_fieldcount);
$fields.css('display', 'block');
$fields.removeClass('hidden');
var userfile = $('.uploadform_userfile', $fields);
var userfile_label = $('.uploadform_userfile_label', $fields);
@ -513,8 +513,8 @@ function addUploadField() {
targetdir_label.attr('for', 'target_directory_' + upload_fieldcount);
$fields.insertBefore('#upload_form');
// This throws: "Uncaught TypeError: Cannot read property 'selectedIndex' of null" …?
document.getElementById(targetdir.attr('id')).selectedIndex = document.getElementById('target_directory_' + (upload_fieldcount - 1)).selectedIndex;
// This looks weird, but works. If anyone can improve this, by all means do so.
$('#' + targetdir.attr('id')).val($($('#target_directory_' + (upload_fieldcount - 1))).val());
}
// Collapse/expand the full length comment in comments list
@ -670,11 +670,25 @@ function highlightComment(id, checkvalue) {
spawn();
// Click events
//
// Show entry timestamp
$('.status_timestamp > a').click(function(e) {
alert($(this).attr('title'));
e.preventDefault();
});
// Add media db upload field
var $uploadForm = $('body').has('#uploadform');
if($uploadForm.size() > 0) {
addUploadField();
}
$('#add_upload').click(function(e) {
hideForeign();
addUploadField();
});
// Equal Heights
var $eqHeights = $('body').has('.equal_heights');