<?php
- require_once "functions.php";
+ require_once "functions.php";
require_once "sessions.php";
require_once "sanity_check.php";
- require_once "version.php";
+ require_once "version.php";
require_once "config.php";
require_once "db-prefs.php";
- $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
init_connection($link);
no_cache_incantation();
header('Content-Type: text/html; charset=utf-8');
-
+
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<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" djConfig="parseOnLoad: true"></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>
+
<script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script>
<script type="text/javascript" charset="utf-8" src="tt-rss.js?<?php echo $dt_add ?>"></script>
<script type="text/javascript" charset="utf-8" src="functions.js?<?php echo $dt_add ?>"></script>
<script type="text/javascript" charset="utf-8" src="feedlist.js?<?php echo $dt_add ?>"></script>
<script type="text/javascript" charset="utf-8" src="viewfeed.js?<?php echo $dt_add ?>"></script>
+ <script type="text/javascript" charset="utf-8" src="errors.php?mode=js"></script>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
</div>
<noscript><br/><?php print_error('Javascript is disabled. Please enable it.') ?></noscript>
</div>
-</div>
-
-<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)">
- <?php rounded_table_start("hho"); ?>
- <?php include "help/3.php" ?>
- <?php rounded_table_end(); ?>
</div>
-<div id="notify" class="notify"><span id="notify_body"> </span></div>
-<div id="cmdline" style="display : none"></div>
-<div id="auxDlg" style="display : none"></div>
-<div id="headlines-tmp" style="display : none"></div>
-
-<div id="main" dojoType="dijit.layout.BorderContainer">
-
-<div id="header" dojoType="dijit.layout.ContentPane" region="top">
- <div class="topLinks" id="topLinks">
-
+<div id="header">
<?php if (!SINGLE_USER_MODE) { ?>
<?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
<?php } ?>
<?php } ?>
<?php if (!SINGLE_USER_MODE) { ?>
- | <a href="logout.php"><?php echo __('Logout') ?></a>
+ | <a href="backend.php?op=logout"><?php echo __('Logout') ?></a>
<?php } ?>
- <img id="newVersionIcon" style="display:none;" onclick="newVersionDlg()"
- width="13" height="13"
+ <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!') ?>"
+ title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>"
alt="new_version_icon"/>
+</div>
- </div>
-
- <img src="<?php echo theme_image($link, 'images/ttrss_logo.png') ?>" alt="Tiny Tiny RSS"/>
+<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)">
+ <?php include "help/3.php" ?>
</div>
+<div id="notify" class="notify"><span id="notify_body"> </span></div>
+<div id="cmdline" style="display : none"></div>
+<div id="auxDlg" style="display : none"></div>
+<div id="headlines-tmp" style="display : none"></div>
+
+<div id="main" dojoType="dijit.layout.BorderContainer">
+
<div id="feeds-holder" dojoType="dijit.layout.ContentPane" region="leading" style="width : 20%" splitter="true">
<div id="feedlistLoading">
- <img src='images/indicator_tiny.gif'>
+ <img src='images/indicator_tiny.gif'/>
<?php echo __("Loading, please wait..."); ?></div>
<div id="feedTree"></div>
</div>
+<div dojoType="dijit.layout.BorderContainer" region="center" id="header-wrap" gutters="false">
<div dojoType="dijit.layout.TabContainer" region="center" id="content-tabs">
<div dojoType="dijit.layout.BorderContainer" region="center" id="content-wrap"
- title="News">
+ title="<?php echo __("News") ?>">
<div id="toolbar" dojoType="dijit.layout.ContentPane" region="top">
- <div id="main-toolbar" dojoType="dijit.Toolbar">
+ <div id="main-toolbar" dojoType="dijit.Toolbar">
<form id="main_toolbar_form" action="" onsubmit='return false'>
- <button dojoType="dijit.form.Button" id="collapse_feeds_btn"
+ <button dojoType="dijit.form.Button" id="collapse_feeds_btn"
onclick="collapse_feedlist()"
title="<?php echo __('Collapse feedlist') ?>" style="display : inline">
<<</button>
- <select name="view_mode" title="<?php echo __('Show articles') ?>"
+ <select name="view_mode" title="<?php echo __('Show articles') ?>"
onchange="viewModeChanged()"
dojoType="dijit.form.Select">
<option selected="selected" value="adaptive"><?php echo __('Adaptive') ?></option>
</select>
<select title="<?php echo __('Sort articles') ?>"
- onchange="viewModeChanged()"
+ onchange="viewModeChanged()"
dojoType="dijit.form.Select" name="order_by">
<option selected="selected" value="default"><?php echo __('Default') ?></option>
<option value="date"><?php echo __('Date') ?></option>
<option value="score"><?php echo __('Score') ?></option>
</select>
- <button dojoType="dijit.form.Button" name="update"
+ <button dojoType="dijit.form.Button" name="update"
onclick="scheduleFeedUpdate()">
<?php echo __('Update') ?></button>
- <button dojoType="dijit.form.Button"
+ <button dojoType="dijit.form.Button"
onclick="catchupCurrentFeed()">
<?php echo __('Mark as read') ?></button>
<div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Other actions:') ?></div>
<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcDigest')"><?php echo __('Switch to digest...') ?></div>
<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagCloud')"><?php echo __('Show tag cloud...') ?></div>
+ <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagSelect')"><?php echo __('Select by tags...') ?></div>
<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddLabel')"><?php echo __('Create label...') ?></div>
<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFilter')"><?php echo __('Create filter...') ?></div>
<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div>
+ <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAbout')"><?php echo __('About...') ?></div>
</div>
</div>
</div>
<div id="headlines-toolbar" dojoType="dijit.layout.ContentPane" region="top">
</div>
- <div id="headlines-frame" dojoType="dijit.layout.ContentPane"
+ <div id="headlines-frame" dojoType="dijit.layout.ContentPane"
onscroll="headlines_scroll_handler(this)" region="center">
<div id="headlinesInnerContainer">
<div class="whiteBox"><?php echo __('Loading, please wait...') ?></div>
</div>
</div>
</div>
-
-<!-- <div id="footer" dojoType="dijit.layout.ContentPane" region="bottom">
- <a href="http://tt-rss.org/">Tiny Tiny RSS</a>
- <?php if (!defined('HIDE_VERSION')) { ?>
- v<?php echo VERSION ?>
- <?php } ?>
- © 2005–<?php echo date('Y') ?> <a href="http://fakecake.org/">Andrew Dolgov</a>
-</div> -->
-
+</div>
</div>
<?php db_close($link); ?>
git.wh0rd.org / tt-rss.git / blobdiff