From 43a8bb9a39ee7405d2fb30f1af1cebf8b03abf3a Mon Sep 17 00:00:00 2001
From: onli <onli89@googlemail.com>
Date: Fri, 14 Jun 2013 23:26:49 +0200
Subject: [PATCH] smartify placement of entryeditor page elements

---
 include/admin/entries.inc.php        | 13 +++++++------
 include/functions_config.inc.php     |  2 +-
 templates/2k11/admin/entries.inc.tpl |  2 ++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/include/admin/entries.inc.php b/include/admin/entries.inc.php
index c3098a6f..b98b75c1 100644
--- a/include/admin/entries.inc.php
+++ b/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');
diff --git a/include/functions_config.inc.php b/include/functions_config.inc.php
index 67ee1765..228063e3 100644
--- a/include/functions_config.inc.php
+++ b/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>';
 }
diff --git a/templates/2k11/admin/entries.inc.tpl b/templates/2k11/admin/entries.inc.tpl
index e0e3149b..26e5049e 100644
--- a/templates/2k11/admin/entries.inc.tpl
+++ b/templates/2k11/admin/entries.inc.tpl
@@ -225,3 +225,5 @@
         </div>
     {/if}
 {/if}
+{$iframe}
+{$entryForm}