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

smartify placement of entryeditor page elements

Browse Source
This commit is contained in:
onli 2013-06-14 23:26:49 +02:00
parent d6857176d8
commit 43a8bb9a39
3 changed files with 10 additions and 7 deletions

13
include/admin/entries.inc.php

@ -89,9 +89,9 @@ switch($serendipity['GET']['adminAction']) {
} else {
if ($serendipity['use_iframe']) {
$data['is_iframe'] = true;
serendipity_iframe_create('save', $entry);
$data['iframe'] = serendipity_iframe_create('save', $entry);
} else {
serendipity_iframe($entry, 'save');
$data['iframe'] = serendipity_iframe($entry, 'save');
}
}
} else {
@ -146,9 +146,9 @@ switch($serendipity['GET']['adminAction']) {
if ($serendipity['use_iframe']) {
$data['is_iframepreview'] = true;
serendipity_iframe_create('preview', $entry);
$data['iframe'] = serendipity_iframe_create('preview', $entry);
} else {
serendipity_iframe($entry, 'preview');
$data['iframe'] = serendipity_iframe($entry, 'preview');
}
}
}
@ -162,7 +162,7 @@ switch($serendipity['GET']['adminAction']) {
if (!$preview_only) {
include_once S9Y_INCLUDE_PATH . 'include/functions_entries_admin.inc.php';
serendipity_printEntryForm(
$entryForm = serendipity_printEntryForm(
'?',
array(
'serendipity[action]' => 'admin',
@ -385,7 +385,7 @@ switch($serendipity['GET']['adminAction']) {
default:
include_once S9Y_INCLUDE_PATH . 'include/functions_entries_admin.inc.php';
// edit entry mode
serendipity_printEntryForm(
$entryForm = serendipity_printEntryForm(
'?',
array(
'serendipity[action]' => 'admin',
@ -396,6 +396,7 @@ switch($serendipity['GET']['adminAction']) {
);
}
$data['entryForm'] = $entryForm;
$data['get'] = $serendipity['GET']; // don't trust {$smarty.get.vars} if not proofed, as we often change GET vars via serendipty['GET'] by runtime
// make sure we've got these
if(!isset($data['urltoken'])) $data['urltoken'] = serendipity_setFormToken('url');

2
include/functions_config.inc.php

@ -843,7 +843,7 @@ function serendipity_iframe_create($mode, &$entry) {
break;
}
echo '<iframe src="serendipity_admin.php?serendipity[is_iframe]=true&amp;serendipity[iframe_mode]=' . $mode . '" id="serendipity_iframe" name="serendipity_iframe" ' . $attr . ' width="100%" frameborder="0" marginwidth="0" marginheight="0" scrolling="auto" title="Serendipity">'
return '<iframe src="serendipity_admin.php?serendipity[is_iframe]=true&amp;serendipity[iframe_mode]=' . $mode . '" id="serendipity_iframe" name="serendipity_iframe" ' . $attr . ' width="100%" frameborder="0" marginwidth="0" marginheight="0" scrolling="auto" title="Serendipity">'
. IFRAME_WARNING
. '</iframe>';
}

2
templates/2k11/admin/entries.inc.tpl

@ -225,3 +225,5 @@
</div>
{/if}
{/if}
{$iframe}
{$entryForm}