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

Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Browse Source
This commit is contained in:
Garvin Hicking
2014-05-28 10:37:16 +02:00
parent ffb1a0769a e7e8f19d02
commit 0d43f5dea7
8 changed files with 61 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/2k11/admin/serendipity_editor.js.tpl
+13 -2
View File
@@ -164,7 +164,7 @@
// Opens media db image selection in new window
serendipity.choose_media = function(id) {
serendipity.openPopup('serendipity_admin.php?serendipity[adminModule]=media&serendipity[noBanner]=true&serendipity[noSidebar]=true&serendipity[noFooter]=true&serendipity[showMediaToolbar]=false&serendipity[htmltarget]=' + id + '&serendipity[filename_only]=true');
serendipity.openPopup('serendipity_admin.php?serendipity[adminModule]=media&serendipity[noBanner]=true&serendipity[noSidebar]=true&serendipity[noFooter]=true&serendipity[showMediaToolbar]=false&serendipity[showUpload]=true&serendipity[htmltarget]=' + id + '&serendipity[filename_only]=true');
}
// "Transfer" value from media db popup to form element, used for example for selecting a category-icon
@@ -1404,7 +1404,18 @@ $(function() {
progress.disabled = true;
progressContainer.innerHTML += "{$CONST.ERROR_UNKNOWN_NOUPLOAD}";
$(progressContainer).find('.uploadIcon').replaceWith(errorIcon.cloneNode(true));
})
}).always(function() {
if ($('#ml_link').length == 0) {
var mlLink = document.createElement('a');
mlLink.id = "ml_link";
mlLink.className = "button_link";
mlLink.href = $('#uploadform').attr('action');
mlLink.innerHTML = "{$CONST.MEDIA_LIBRARY}";
$(mlLink).hide();
$('.form_buttons').prepend(mlLink);
$(mlLink).fadeIn();
}
});
}, type);
}
image.src = readerEvent.target.result;