X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=prefs.php;h=85838861c2b076b69d34c22a32ffe554c6514f85;hb=23419d117bf6db266ce2fc4b7e8d14e96b788f9b;hp=1399d9f58adef1c2ece78f58038a5a7ab0dd69da;hpb=0d421af86fdfe270e7396f308cf53f3b908e3d74;p=tt-rss.git

diff --git a/prefs.php b/prefs.php
index 1399d9f5..85838861 100644
--- a/prefs.php
+++ b/prefs.php
@@ -1,9 +1,9 @@
 <?php
-	set_include_path(get_include_path() . PATH_SEPARATOR .
-		dirname(__FILE__) . "/include");
+	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+		get_include_path());
 
-	require_once "functions.php";
 	require_once "sessions.php";
+	require_once "functions.php";
 	require_once "sanity_check.php";
 	require_once "version.php";
 	require_once "config.php";
@@ -20,13 +20,12 @@
 	no_cache_incantation();
 
 	header('Content-Type: text/html; charset=utf-8');
-
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-	<title>Tiny Tiny RSS : Preferences</title>
+	<title>Tiny Tiny RSS : <?php echo __("Preferences") ?></title>
 	<link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/>
 	<link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/>
 
@@ -44,9 +43,27 @@
 
 	<script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script>
 
-	<script type="text/javascript" charset="utf-8" src="js/functions.js?<?php echo $dt_add ?>"></script>
-	<script type="text/javascript" charset="utf-8" src="js/deprecated.js?<?php echo $dt_add ?>"></script>
-	<script type="text/javascript" charset="utf-8" src="js/prefs.js?<?php echo $dt_add ?>"></script>
+	<script type="text/javascript">
+	<?php
+		require 'lib/jsmin.php';
+
+		global $pluginhost;
+
+		foreach ($pluginhost->get_plugins() as $n => $p) {
+			if (method_exists($p, "get_prefs_js")) {
+				echo JSMin::minify($p->get_prefs_js());
+			}
+		}
+
+		foreach (array("functions", "deprecated", "prefs") as $js) {
+			if (!isset($_GET['debug'])) {
+				echo JSMin::minify(file_get_contents("js/$js.js"));
+			} else {
+				echo file_get_contents("js/$js.js");
+			}
+		}
+	?>
+	</script>
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
@@ -73,12 +90,10 @@
 	</div>
 </div>
 
-<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)"></div>
-
 <img id="piggie" src="images/piggie.png" style="display : none" alt="piggie"/>
 
 <div id="header" dojoType="dijit.layout.ContentPane" region="top">
-	<a href='#' onclick="showHelp()"><?php echo __("Keyboard shortcuts") ?></a> |
+	<!-- <a href='#' onclick="showHelp()"><?php echo __("Keyboard shortcuts") ?></a> | -->
 	<a href="#" onclick="gotoMain()"><?php echo __('Exit preferences') ?></a>
 </div>
 
@@ -102,12 +117,10 @@
 		href="backend.php?op=pref-users"
 		title="<?php echo __('Users') ?>"></div>
 <?php } ?>
-<?php if ($_SESSION["access_level"] >= 10 || SINGLE_USER_MODE) { ?>
-	<div id="instanceConfigTab" dojoType="dijit.layout.ContentPane"
-		href="backend.php?op=pref-instances"
-		title="<?php echo __('Linked') ?>"></div>
-<?php } ?>
-
+<?php
+	$pluginhost->run_hooks($pluginhost::HOOK_PREFS_TABS,
+		"hook_prefs_tabs", false);
+?>
 </div>
 
 <div id="footer" dojoType="dijit.layout.ContentPane" region="bottom">
