]> git.wh0rd.org - tt-rss.git/blobdiff - tt-rss.php
fall back to the old wide logo; remove main logo
[tt-rss.git] / tt-rss.php
index 0ba76db30f5f324d63aef641fc6f46c31a9fbb0e..b4f8dc293211865f6895f57b29ec577181ba87fe 100644 (file)
@@ -1,6 +1,4 @@
 <?php
-       error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
        require_once "functions.php"; 
        require_once "sessions.php";
        require_once "sanity_check.php";
@@ -10,9 +8,11 @@
 
        $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); 
 
+       init_connection($link);
+
        login_sequence($link);
 
-       $dt_add = get_script_dt_add();
+       $dt_add = time();
 
        no_cache_incantation();
 
 <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   $user_theme = $_SESSION["theme"];
-               if ($user_theme) { ?>
-                       <link rel="stylesheet" type="text/css" href="themes/<?php echo $user_theme ?>/theme.css?<?php echo $dt_add ?>">
-       <?php } ?>
-
-       <?php if ($user_theme) { $theme_image_path = "themes/$user_theme/"; } ?>
-
-       <?php $user_css_url = get_pref($link, 'USER_STYLESHEET_URL'); ?>
-       <?php if ($user_css_url) { ?>
-               <link rel="stylesheet" type="text/css" href="<?php echo $user_css_url ?>"/> 
-       <?php } ?>
+       <?php print_theme_includes($link) ?>
+       <?php print_user_stylesheet($link) ?>
 
        <link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
 
        <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" 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="offline.js?<?php echo $dt_add ?>"></script>
-
-       <script type="text/javascript" src="gears_init.js"></script>
 
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
        <script type="text/javascript">
-       //<![CDATA[
-               if (navigator.userAgent.match("Opera")) {
-                       document.write('<link rel="stylesheet" type="text/css" href="opera.css">');
-               }
-               window.onresize=resize_headlines;
-       //]]>
+               Event.observe(window, 'load', function() {
+                       init();
+               });
        </script>
 </head>
 
-<body id="ttrssMain">
+<body id="ttrssMain" class="claro">
 
 <div id="overlay" style="display : block">
        <div id="overlay_inner">
-               <?php echo __("Loading, please wait...") ?>
-
-               <div id="l_progress_o">
-                       <div id="l_progress_i"></div>
+               <div class="insensitive"><?php echo __("Loading, please wait...") ?></div>
+               <div dojoType="dijit.ProgressBar" places="0" style="width : 300px" id="loading_bar"
+            progress="0" maximum="100">
                </div>
-
-       <noscript>
-               <div class="error"><?php echo
-               __("Your browser doesn't support Javascript, which is required
-               for this application to function properly. Please check your
-               browser settings.") ?></div>
-       </noscript>
+               <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">&nbsp;</span></div>
-
-<div id="dialog_overlay" style="display : none"> </div>
-
-<script type="text/javascript">
-if (document.addEventListener) {
-       document.addEventListener("DOMContentLoaded", init, null);
-}
-window.onload = init;
-</script>
-
-<ul id="debug_output" style='display : none'><li>&nbsp;</li></ul>
-
-<div id="infoBoxShadow" style="display : none"><div id="infoBox">&nbsp;</div></div>
-
-<div id="errorBoxShadow" style="display : none">
-       <div id="errorBox">
-               <div id="xebTitle">Fatal Exception</div><div id="xebContent">&nbsp;</div>
-               <div id="xebBtn" align='center'><input type="submit" 
-                       onclick="closeErrorBox()" value="Close this window"/></div>
-       </div>
-</div>
-
 <div id="header">
-       <div class="topLinks" id="topLinks">
-
-       <span id="topLinksOnline">
+       <!-- <img class="logo" src="<?php echo theme_image($link, 'images/logo.png') ?>" 
+               onclick="window.open('http://tt-rss.org')" title="Tiny Tiny RSS"/> -->
 
        <?php if (!SINGLE_USER_MODE) { ?>
                        <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
@@ -131,213 +81,139 @@ window.onload = init;
                        | <a href="logout.php"><?php echo __('Logout') ?></a>
        <?php } ?>
 
-       <img id="offlineModePic" 
-               onmouseover="enable_selection(false)" 
-               onmouseout="enable_selection(true)"
-               onclick="toggleOfflineModeInfo()"
-               src="images/offline.png" style="display:none"
-               title="<?php echo __('Offline mode') ?>"/>
-
-       <div id="offlineModeDrop" style="display : none">
-               <div id="offlineModeSyncMsg">---</div>
-               <div class="hideWhenSyncing">
-                       <a href="javascript:offlineDownloadStart()">
-                       <?php echo __('Start synchronization') ?></a></div>
-               <div class="hideWhenSyncing"><a href="javascript:offlineClearData()">
-                       <?php echo __('Remove offline data') ?></a></div>
-               <div><a href="javascript:gotoOffline()">
-                       <?php echo __('Restart in offline mode') ?></a></div>
-       </div>
-
-       <img id="newVersionIcon" style="display:none;" onclick="javascript:explainError(2)" 
-               src="images/new_version.png" title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>" 
+       <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>
 
-       </span>
+<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>
 
-       <span id="topLinksOffline" style="display : none">
-               <img id="restartOnlinePic" src="images/online.png" 
-                       onclick="gotoOnline()"
-                       title="<?php echo __('Restart in online mode') ?>"/>
-       </span>
+<div id="notify" class="notify"><span id="notify_body">&nbsp;</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>
+<div id="main" dojoType="dijit.layout.BorderContainer">
 
-       <img src="<?php echo $theme_image_path ?>images/ttrss_logo.png" alt="Tiny Tiny RSS"/>   
+<div id="feeds-holder" dojoType="dijit.layout.ContentPane" region="leading" style="width : 20%" splitter="true">
+       <div id="feedlistLoading">
+               <img src='images/indicator_tiny.gif'>
+               <?php echo  __("Loading, please wait..."); ?></div>
+       <div id="feedTree"></div>
 </div>
 
-<div id="feeds-holder">
-       <div id="dispSwitch"> 
-               <a id="dispSwitchPrompt" 
-                       href="javascript:toggleTags()"><?php echo __("tag cloud") ?></a>
-               <?php if (!SINGLE_USER_MODE) { ?>
-               <br/>
-               <a id="feedBrowserPrompt" onclick="return browseFeeds()" href="#"
-                       title="<?php echo __('More feeds...') ?>">+</a>
-               <?php } ?>
-       </div>
-       <div id="feeds-frame">&nbsp;</div>
+<div dojoType="dijit.layout.BorderContainer" region="center" id="header-wrap" gutters="false">
+<div dojoType="dijit.layout.ContentPane" region="top">
 </div>
+<div dojoType="dijit.layout.TabContainer" region="center" id="content-tabs">
+<div dojoType="dijit.layout.BorderContainer" region="center" id="content-wrap"
+       title="<?php echo __("News") ?>">
 
-<div id="toolbar">
-
-               <div style="float : right">
-                       <select id="quickMenuChooser" onchange="quickMenuChange()">
-                                       <option value="qmcDefault" selected="selected"><?php echo __('Actions...') ?></option>
-                                       <option value="qmcSearch"><?php echo __('Search...') ?></option>
-                                       <!-- <option value="qmcPrefs"><?php echo __('Preferences') ?></option> -->
-                                       <option disabled="disabled">--------</option>
-                                       <option style="color : #5050aa" disabled="disabled"><?php echo __('Feed actions:') ?></option>
-                                       <option value="qmcAddFeed">&nbsp;&nbsp;<?php echo __('Subscribe to feed...') ?></option>
-                                       <option value="qmcEditFeed">&nbsp;&nbsp;<?php echo __('Edit this feed...') ?></option>
-                                       <!-- <option value="qmcClearFeed">&nbsp;&nbsp;<?php echo __('Clear articles') ?></option> -->
-                                       <option value="qmcRescoreFeed">&nbsp;&nbsp;<?php echo __('Rescore feed') ?></option>
-                                       <option value="qmcRemoveFeed">&nbsp;&nbsp;<?php echo __('Unsubscribe') ?></option>
-                                       <option disabled="disabled">--------</option>
-                                       <option style="color : #5050aa" disabled="disabled"><?php echo __('All feeds:') ?></option>
-                                       <option value="qmcCatchupAll">&nbsp;&nbsp;<?php echo __('Mark as read') ?></option>
-                                       <option value="qmcShowOnlyUnread">&nbsp;&nbsp;<?php echo __('(Un)hide read feeds') ?></option>
-                                       <option disabled="disabled">--------</option>
-                                       <option style="color : #5050aa" disabled="disabled"><?php echo __('Other actions:') ?></option>                         
-
-                                       <option value="qmcAddLabel">&nbsp;&nbsp;<?php echo __('Create label...') ?></option>
-                                       <option value="qmcAddFilter">&nbsp;&nbsp;<?php echo __('Create filter...') ?></option>
-                                       <option value="qmcResetUI">&nbsp;&nbsp;<?php echo __('Reset UI layout') ?></option>
-                                       <option value="qmcResetCats">&nbsp;&nbsp;<?php echo __('Reset category order') ?></option>
-                                       <option value="qmcHKhelp"><?php echo __('&nbsp;&nbsp;Keyboard shortcuts') ?></option>
-
-                       </select>
-               </div>
+<div id="toolbar" dojoType="dijit.layout.ContentPane" region="top">
+       <div id="main-toolbar" dojoType="dijit.Toolbar">                
 
                <form id="main_toolbar_form" action="" onsubmit='return false'>
 
-               <input type="submit" value="&lt;&lt;" 
-                       id="collapse_feeds_btn" onclick="collapse_feedlist()" class="button"
-                       title="<?php echo __('Collapse feedlist') ?>" style="display : none"/>
-
-               <input type="submit" value="<?php echo __("Toggle Feedlist") ?>" 
-                       id="toggle_feeds_btn" class="button"
-                       onclick="toggle_feedlist()" style="display : none"/>
-
-               &nbsp;
-
-               <?php if (get_pref($link, 'ENABLE_SEARCH_TOOLBAR')) { ?>
+               <button dojoType="dijit.form.Button" id="collapse_feeds_btn" 
+                       onclick="collapse_feedlist()"
+                       title="<?php echo __('Collapse feedlist') ?>" style="display : inline">
+                       &lt;&lt;</button>
 
-               <?php echo __('Search:') ?>
-               <input name="query" type="text"
-                       onkeypress="return filterCR(event, viewCurrentFeed)"
-                       onblur="javascript:enableHotkeys();" onfocus="javascript:disableHotkeys();"/>
-
-               <?php } ?>
-
-               <select name="view_mode" onchange="viewModeChanged()">
+               <select name="view_mode" title="<?php echo __('Show articles') ?>" 
+                       onchange="viewModeChanged()"
+                       dojoType="dijit.form.Select">
                        <option selected="selected" value="adaptive"><?php echo __('Adaptive') ?></option>
                        <option value="all_articles"><?php echo __('All Articles') ?></option>
                        <option value="marked"><?php echo __('Starred') ?></option>
+                       <option value="published"><?php echo __('Published') ?></option>
                        <option value="unread"><?php echo __('Unread') ?></option>
                        <!-- <option value="noscores"><?php echo __('Ignore Scoring') ?></option> -->
                        <option value="updated"><?php echo __('Updated') ?></option>
                </select>
 
-               <?php echo __('Order:') ?>
-
-               <select name="order_by" onchange="viewModeChanged()">
+               <select title="<?php echo __('Sort articles') ?>"
+                       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="title"><?php echo __('Title') ?></option>
                        <option value="score"><?php echo __('Score') ?></option>
                </select>
 
+               <button dojoType="dijit.form.Button" name="update" 
+                       onclick="scheduleFeedUpdate()">
+                       <?php echo __('Update') ?></button>
 
-               <?php echo __('Limit:') ?>
-               <?php
-               $limits = array(15 => 15, 30 => 30, 60 => 60, 0 => "All");
-                       
-               $def_art_limit = get_pref($link, 'DEFAULT_ARTICLE_LIMIT');
+               <button dojoType="dijit.form.Button" 
+                       onclick="catchupCurrentFeed()">
+                       <?php echo __('Mark as read') ?></button>
 
-               if ($def_art_limit >= 0 && !array_key_exists($def_art_limit, $limits)) {
-                       $limits[$def_art_limit] = $def_art_limit; 
-               }
-
-               asort($limits);
-
-               if (!$def_art_limit) {
-                       $def_art_limit = 30;
-               }
-
-               print_select_hash("limit", $def_art_limit, $limits, 
-                       'onchange="viewLimitChanged()"');
-       
-               ?>              
+               </form>
 
-               &nbsp;
+               <div class="actionChooser">
+                       <div dojoType="dijit.form.DropDownButton">
+                               <span><?php echo __('Actions...') ?></span>
+                               <div dojoType="dijit.Menu" style="display: none">
+                                       <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcSearch')"><?php echo __('Search...') ?></div>
+                                       <div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Feed actions:') ?></div>
+                                       <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFeed')"><?php echo __('Subscribe to feed...') ?></div>
+                                       <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcEditFeed')"><?php echo __('Edit this feed...') ?></div>
+                                       <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcRescoreFeed')"><?php echo __('Rescore feed') ?></div>
+                                       <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcRemoveFeed')"><?php echo __('Unsubscribe') ?></div>
+                                       <div dojoType="dijit.MenuItem" disabled="1"><?php echo __('All feeds:') ?></div>
+                                       <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcCatchupAll')"><?php echo __('Mark as read') ?></div>
+                                       <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcShowOnlyUnread')"><?php echo __('(Un)hide read feeds') ?></div>
+                                       <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('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>
+                       </div>
+               </div>
+       </div> <!-- toolbar -->
+</div> <!-- toolbar pane -->
 
-               <input class="button" type="submit" name="update"
-                       onclick="return viewCurrentFeed('ForceUpdate')" 
-                       value="<?php echo __('Update') ?>"/>
+       <div id="headlines-wrap-inner" dojoType="dijit.layout.BorderContainer" region="center">
 
-               </form>
+               <div id="headlines-toolbar" dojoType="dijit.layout.ContentPane" region="top">
+               </div>
 
-               <!-- &nbsp;<input class="button" type="submit"
-                       onclick="quickMenuGo('qmcSearch')" value="Search (tmp)"> -->
+               <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>
 
-               <!-- <input class="button" type="submit"
-                       onclick="catchupCurrentFeed()" value="Mark as read">  -->
+               <?php if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?>
+               <div id="content-insert" dojoType="dijit.layout.ContentPane" region="bottom"
+                       style="height : 50%" splitter="true"></div>
+               <?php } ?>
 
        </div>
+</div>
+</div>
+</div>
 
-<?php if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?>
-       <div id="headlines-frame" class="headlines_normal">
-               <div class="whiteBox"><?php echo __('No feed selected.') ?></div></div>
-       <div id="content-frame">
-       <div id="resize-grabber"
-               onmouseover="enable_resize(true)" onmouseout="enable_resize(false)"
-               title="<?php echo __('Drag me to resize panels') ?>"> 
-               <img src="images/resize_handle_horiz.png" id="resize-handle" 
-                       onmouseover="enable_resize(true)" onmouseout="enable_resize(false)"
-                       alt=""/>
-               </div>
-       <div id="content-insert">&nbsp;</div>
-       <!-- <div class="whiteBox">&nbsp;</div> --> </div>
-<?php } else { ?>
-       <div id="headlines-frame" class="headlines_cdm">
-               <div class="whiteBox"><?php echo __('No feed selected.') ?></div></div>
-<?php } ?>
-
-<div id="footer">
-       <?php if (defined('_DEBUG_USER_SWITCH')) { ?>
-               <select id="userSwitch" onchange="userSwitch()">
-               <?php 
-                       foreach (array('admin', 'fox', 'test') as $u) {
-                               $op_sel = ($u == $_SESSION["name"]) ? "selected" : "";
-                               print "<option $op_sel>$u</option>";
-                       }
-               ?>
-               </select>
-       <?php } ?>
+<!-- <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 } ?>
-       &copy; 2005&ndash;2009 <a href="http://bah.org.ru/">Andrew Dolgov</a>
+       &copy; 2005&ndash;<?php echo date('Y') ?> <a href="http://fakecake.org/">Andrew Dolgov</a>
+</div> -->
+
 </div>
 
 <?php db_close($link); ?>
 
-<script type="text/javascript">
-       /* for IE */
-       function statechange() {
-               if (document.readyState == "interactive") init();
-       }
-
-       if (document.readyState) {      
-               if (document.readyState == "interactive" || document.readyState == "complete") {
-                       init();
-               } else {
-                       document.onreadystatechange = statechange;
-               }
-       }
-</script>
-
 </body>
 </html>