1
0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-02-10 16:01:33 +00:00

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Richard Beales
2013-03-18 07:32:01 +00:00
1617 changed files with 166565 additions and 7637 deletions

View File

@@ -62,8 +62,15 @@
<?php print_user_stylesheet($link) ?>
<script type="text/javascript">
</script>
<style type="text/css">
<?php
foreach ($pluginhost->get_plugins() as $n => $p) {
if (method_exists($p, "get_css")) {
echo $p->get_css();
}
}
?>
</style>
<link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
@@ -78,23 +85,19 @@
<script type="text/javascript">
<?php
require 'lib/jsmin.php';
require 'lib/jshrink/Minifier.php';
global $pluginhost;
foreach ($pluginhost->get_plugins() as $n => $p) {
if (method_exists($p, "get_js")) {
echo JSMin::minify($p->get_js());
echo JShrink\Minifier::minify($p->get_js());
}
}
foreach (array("tt-rss", "functions", "feedlist", "viewfeed", "FeedTree") as $js) {
if (!isset($_GET['debug'])) {
echo JSMin::minify(file_get_contents("js/$js.js"));
} else {
echo file_get_contents("js/$js.js");
}
}
print get_minified_js(array("tt-rss",
"functions", "feedlist", "viewfeed", "FeedTree"));
?>
</script>