summaryrefslogtreecommitdiff
path: root/index.php
diff options
context:
space:
mode:
Diffstat (limited to 'index.php')
-rw-r--r--index.php77
1 files changed, 36 insertions, 41 deletions
diff --git a/index.php b/index.php
index 6584d8d2e..c634235ab 100644
--- a/index.php
+++ b/index.php
@@ -35,17 +35,12 @@
if ($mobile->isTablet() && $pluginhost->get_plugin("digest")) {
header('Location: backend.php?op=digest');
exit;
- } else if ($mobile->isMobile()) {
- header('Location: mobile/index.php');
- exit;
}
}
login_sequence($link);
- $dt_add = time();
-
no_cache_incantation();
header('Content-Type: text/html; charset=utf-8');
@@ -56,45 +51,54 @@
<html>
<head>
<title>Tiny Tiny RSS</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 ?>"/>
- <link rel="stylesheet" type="text/css" href="cdm.css?<?php echo $dt_add ?>"/>
+
+ <?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
+ <?php echo stylesheet_tag("tt-rss.css"); ?>
+ <?php echo stylesheet_tag("cdm.css"); ?>
<?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"/>
+ <link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png" />
+
+ <?php
+ foreach (array("lib/prototype.js",
+ "lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls",
+ "lib/dojo/dojo.js",
+ "lib/dijit/dijit.js",
+ "lib/dojo/tt-rss-layer.js",
+ "errors.php?mode=js") as $jsfile) {
- <script type="text/javascript" src="lib/prototype.js"></script>
- <script type="text/javascript" src="lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script>
- <script type="text/javascript" src="lib/dojo/dojo.js"></script>
- <script type="text/javascript" src="lib/dijit/dijit.js"></script>
- <script type="text/javascript" src="lib/dojo/tt-rss-layer.js"></script>
+ echo javascript_tag($jsfile);
- <script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script>
- <script type="text/javascript" charset="utf-8" src="errors.php?mode=js"></script>
+ } ?>
<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"));
+
+ init_js_translations();
?>
</script>
@@ -119,17 +123,7 @@
</div>
</div>
-<div id="header">
- <img id="net-alert" style="display : none"
- title="<?php echo __("Communication problem with server.") ?>"
- src="<?php echo theme_image($link, 'images/alert.png') ?>"/>
-
- <img id="newVersionIcon" style="display:none" onclick="newVersionDlg()"
- width="13" height="13"
- src="<?php echo theme_image($link, 'images/new_version.png') ?>"
- title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>"
- alt="new_version_icon"/>
-</div>
+<div style="display : none" onclick="Element.hide(this)" id="small_article_preview"></div>
<div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
<div id="cmdline" style="display : none"></div>
@@ -166,8 +160,8 @@
<option value="marked"><?php echo __('Starred') ?></option>
<option value="published"><?php echo __('Published') ?></option>
<option value="unread"><?php echo __('Unread') ?></option>
+ <option value="unread_first"><?php echo __('Unread First') ?></option>
<!-- <option value="noscores"><?php echo __('Ignore Scoring') ?></option> -->
- <option value="updated"><?php echo __('Updated') ?></option>
</select>
<select title="<?php echo __('Sort articles') ?>"
@@ -179,7 +173,8 @@
<option value="score"><?php echo __('Score') ?></option>
</select>
- <button dojoType="dijit.form.Button" name="update"
+ <!-- deprecated -->
+ <button dojoType="dijit.form.Button" name="update" style="display : none"
onclick="viewCurrentFeed()">
<?php echo __('Update') ?></button>
@@ -194,12 +189,12 @@
<button id="net-alert" dojoType="dijit.form.Button" style="display : none" disabled="true"
title="<?php echo __("Communication problem with server.") ?>">
<img
- src="<?php echo theme_image($link, 'images/alert.png') ?>" />
+ src="images/alert.png" />
</button>
<button id="newVersionIcon" dojoType="dijit.form.Button" style="display : none">
<img onclick="newVersionDlg()"
- src="<?php echo theme_image($link, 'images/new_version.png') ?>"
+ src="images/new_version.png"
title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>" />
</button>