]> git.wh0rd.org - tt-rss.git/blobdiff - index.php
more work on singleton-based DB
[tt-rss.git] / index.php
index 963e5940cf2bcde2d237711da48705c406a85994..66e236dae28664e781243d8603f767b831d0a2fe 100644 (file)
--- a/index.php
+++ b/index.php
@@ -19,6 +19,7 @@
        set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
                get_include_path());
 
+       require_once "autoload.php";
        require_once "sessions.php";
        require_once "functions.php";
        require_once "sanity_check.php";
@@ -31,7 +32,7 @@
 
        $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-       if (!init_connection($link)) return;
+       if (!init_plugins($link)) return;
 
        global $pluginhost;
 
@@ -50,8 +51,6 @@
 
        login_sequence($link);
 
-       no_cache_incantation();
-
        header('Content-Type: text/html; charset=utf-8');
 
 ?>
        <?php echo stylesheet_tag("tt-rss.css"); ?>
        <?php echo stylesheet_tag("cdm.css"); ?>
 
+       <?php if ($_SESSION["uid"]) {
+               $theme = get_pref($link, "USER_CSS_THEME", $_SESSION["uid"], false);
+               if ($theme) {
+                       echo stylesheet_tag("themes/$theme");
+               }
+       }
+       ?>
+
        <?php print_user_stylesheet($link) ?>
 
        <style type="text/css">
        <?php
                require 'lib/jshrink/Minifier.php';
 
+               print get_minified_js(array("tt-rss",
+                       "functions", "feedlist", "viewfeed", "FeedTree"));
+
                global $pluginhost;
 
                foreach ($pluginhost->get_plugins() as $n => $p) {
                        }
                }
 
-               print get_minified_js(array("tt-rss",
-                       "functions", "feedlist", "viewfeed", "FeedTree"));
-
                init_js_translations();
        ?>
        </script>
        </div>
 </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="notify" class="notify" style="display : none"></div>
 <div id="cmdline" style="display : none"></div>
 <div id="headlines-tmp" style="display : none"></div>
 
                        onchange="viewModeChanged()"
                        dojoType="dijit.form.Select" name="order_by">
                        <option selected="selected" value="default"><?php echo __('Default') ?></option>
+                       <option value="feed_dates"><?php echo __('Newest first') ?></option>
                        <option value="date_reverse"><?php echo __('Oldest first') ?></option>
+                       <option value="title"><?php echo __('Title') ?></option>
                </select>
 
-               <!-- deprecated -->
-               <button dojoType="dijit.form.Button" name="update" style="display : none"
-                       onclick="viewCurrentFeed()">
-                       <?php echo __('Update') ?></button>
-
-               <button dojoType="dijit.form.Button"
-                       onclick="catchupCurrentFeed()">
-                       <?php echo __('Mark as read') ?></button>
+               <div dojoType="dijit.form.ComboButton" onclick="catchupCurrentFeed()">
+                       <span><?php echo __('Mark as read') ?></span>
+                       <div dojoType="dijit.DropDownMenu">
+                               <div dojoType="dijit.MenuItem" onclick="catchupCurrentFeed('1day')">
+                                       <?php echo __('Older than one day') ?>
+                               </div>
+                               <div dojoType="dijit.MenuItem" onclick="catchupCurrentFeed('1week')">
+                                       <?php echo __('Older than one week') ?>
+                               </div>
+                               <div dojoType="dijit.MenuItem" onclick="catchupCurrentFeed('2week')">
+                                       <?php echo __('Older than two weeks') ?>
+                               </div>
+                       </div>
+               </div>
 
                </form>
 
                <div class="actionChooser">
 
+                       <?php
+                               global $pluginhost;
+                               foreach ($pluginhost->get_hooks($pluginhost::HOOK_TOOLBAR_BUTTON) as $p) {
+                                        echo $p->hook_toolbar_button();
+                               }
+                       ?>
+
                        <button id="net-alert" dojoType="dijit.form.Button" style="display : none" disabled="true"
                                title="<?php echo __("Communication problem with server.") ?>">
                        <img
                                        <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('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>
-                                       <?php if ($pluginhost->get_plugin("digest")) { ?>
+                                       <!-- <?php if ($pluginhost->get_plugin("digest")) { ?>
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcDigest')"><?php echo __('Switch to digest...') ?></div>
-                                       <?php } ?>
-                                               <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagCloud')"><?php echo __('Show tag cloud...') ?></div>
-                                       <?php if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?>
-                                                       <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></div>
-                                       <?php } ?>
+                                       <?php } ?> -->
+                                               <!-- <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagCloud')"><?php echo __('Show tag cloud...') ?></div> -->
+                                               <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></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('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>
+
+                                       <?php
+                                               foreach ($pluginhost->get_hooks($pluginhost::HOOK_ACTION_ITEM) as $p) {
+                                                echo $p->hook_action_item();
+                                               }
+                                       ?>
+
                                        <?php if (!$_SESSION["hide_logout"]) { ?>
                                                <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcLogout')"><?php echo __('Logout') ?></div>
                                        <?php } ?>
                        </div>
                </div>
 
-               <?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>