From: Jakub Vrana <jakub@vrana.cz>
Date: Fri, 10 Jan 2014 18:05:57 +0000 (-0800)
Subject: Move JUSH loading to Adminer customization
X-Git-Tag: v4.0.1~10
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=ad00e5e965a2fd7dd7093caf426a961c89b4098a;p=adminer.git

Move JUSH loading to Adminer customization
---

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index d2bbd118..bb1557a2 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -68,6 +68,13 @@ class Adminer {
 	* @return bool true to link adminer.css if exists
 	*/
 	function head() {
+		global $jush;
+		?>
+<link rel="stylesheet" type="text/css" href="../externals/jush/jush.css">
+<script type="text/javascript" src="../externals/jush/modules/jush.js"></script>
+<script type="text/javascript" src="../externals/jush/modules/jush-textarea.js"></script>
+<script type="text/javascript" src="../externals/jush/modules/jush-<?php echo $jush; ?>.js"></script>
+<?php
 		return true;
 	}
 
diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php
index cc06c2e4..6a3930f0 100644
--- a/adminer/include/design.inc.php
+++ b/adminer/include/design.inc.php
@@ -19,12 +19,8 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 <meta name="robots" content="noindex">
 <title><?php echo $title_page; ?></title>
 <link rel="stylesheet" type="text/css" href="../adminer/static/default.css">
-<link rel="stylesheet" type="text/css" href="../externals/jush/jush.css">
 <script type="text/javascript" src="../adminer/static/functions.js"></script>
 <script type="text/javascript" src="static/editing.js"></script>
-<script type="text/javascript" src="../externals/jush/modules/jush.js"></script>
-<script type="text/javascript" src="../externals/jush/modules/jush-textarea.js"></script>
-<script type="text/javascript" src="../externals/jush/modules/jush-<?php echo $jush; ?>.js"></script>
 <?php if ($adminer->head()) { ?>
 <link rel="shortcut icon" type="image/x-icon" href="../adminer/static/favicon.ico">
 <link rel="apple-touch-icon" href="../adminer/static/favicon.ico">