From 6d5c24af2f08ca45802614d0c5777dd03904cbb6 Mon Sep 17 00:00:00 2001 From: Matthias Mees Date: Tue, 11 Mar 2014 10:44:10 +0100 Subject: [PATCH] Move serendipity_editor.js reference back to The document ready shorthand function needed a little adapting as well (which is not an issue since we abandoned noConflict mode). References #91 --- templates/2k11/admin/index.tpl | 2 +- templates/2k11/admin/installer.inc.tpl | 3 +-- templates/2k11/admin/media_choose.tpl | 3 ++- templates/2k11/admin/serendipity_editor.js.tpl | 4 ++-- templates/2k11/admin/upgrader.inc.tpl | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/2k11/admin/index.tpl b/templates/2k11/admin/index.tpl index 66534f8c..df68d50c 100644 --- a/templates/2k11/admin/index.tpl +++ b/templates/2k11/admin/index.tpl @@ -12,6 +12,7 @@ {if $admin_vars.admin_installed}{serendipity_hookPlugin hook="backend_header" hookAll="true"}{/if} + {if NOT $admin_vars.no_banner} @@ -164,6 +165,5 @@

{$admin_vars.version_info}

{/if} - diff --git a/templates/2k11/admin/installer.inc.tpl b/templates/2k11/admin/installer.inc.tpl index bc4f25dc..2a8c046d 100644 --- a/templates/2k11/admin/installer.inc.tpl +++ b/templates/2k11/admin/installer.inc.tpl @@ -11,6 +11,7 @@ +
@@ -295,7 +296,5 @@

{$ADMIN_FOOTER_POWERED_BY|sprintf:$versionInstalled:$phpversion}

- - diff --git a/templates/2k11/admin/media_choose.tpl b/templates/2k11/admin/media_choose.tpl index c25ee74f..f17a7601 100644 --- a/templates/2k11/admin/media_choose.tpl +++ b/templates/2k11/admin/media_choose.tpl @@ -11,6 +11,7 @@ {serendipity_hookPlugin hook="backend_header" hookAll="true"} + + {if $media.case == 'tree'} {if $admin_vars.admin_installed}{serendipity_hookPlugin hook="backend_header" hookAll="true"}{/if} + {if NOT $admin_vars.no_banner} @@ -168,6 +169,5 @@ {/if} {/if} - \ No newline at end of file