loading progress bar for main window (2)

[tt-rss.git] / tt-rss.php

diff --git a/tt-rss.php b/tt-rss.php
index 163686d702e3bc5f25c1815f5d8fae48c8882f08..c2ef53ce0bab7f513901045f12dfd1dc5ef633f6 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -72,7 +72,12 @@
 
 <div id="overlay">
        <div id="overlay_inner">
-       <p><?php echo __("Loading, please wait...") ?></p>
+               <?php echo __("Loading, please wait...") ?>
+
+               <div id="l_progress_o">
+                       <div id="l_progress_i"></div>
+               </div>
+
        <noscript>
                <div class="error"><?php echo
                __("Your browser doesn't support Javascript, which is required
@@ -82,6 +87,12 @@
        </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="fatal_error"><div id="fatal_error_inner">
@@ -145,6 +156,7 @@ window.onload = init;
                                        <option value="qmcAddFeed"><?php echo __('&nbsp;&nbsp;Subscribe to feed') ?></option>
                                        <option value="qmcEditFeed"><?php echo __('&nbsp;&nbsp;Edit this feed') ?></option>
                                        <!-- <option value="qmcClearFeed"><?php echo __('&nbsp;&nbsp;Clear articles') ?></option> -->
+                                       <option value="qmcRescoreFeed"><?php echo __('&nbsp;&nbsp;Rescore feed') ?></option>
                                        <option value="qmcRemoveFeed"><?php echo __('&nbsp;&nbsp;Unsubscribe') ?></option>
                                        <option disabled>--------</option>
                                        <option style="color : #5050aa" disabled><?php echo __('All feeds:') ?></option>
@@ -153,11 +165,22 @@ window.onload = init;
                                        <option disabled>--------</option>
                                        <option style="color : #5050aa" disabled><?php echo __('Other actions:') ?></option>                            
                                        <option value="qmcAddFilter"><?php echo __('&nbsp;&nbsp;Create filter') ?></option>
+                                       <option value="qmcHKhelp"><?php echo __('&nbsp;&nbsp;Keyboard shortcuts') ?></option>
                        </select>
                </div>
 
                <form id="main_toolbar_form" 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')) { ?>
 
                <?php echo __('Search:') ?>
@@ -168,7 +191,7 @@ window.onload = init;
                <?php } ?>
 
                <?php echo __('View:') ?>
-               <select name="view_mode" onchange="viewCurrentFeed(0, '')">
+               <select name="view_mode" onchange="viewModeChanged()">
                        <option selected value="adaptive"><?php echo __('Adaptive') ?></option>
                        <option value="all_articles"><?php echo __('All Articles') ?></option>
                        <option value="marked"><?php echo __('Starred') ?></option>
@@ -192,7 +215,7 @@ window.onload = init;
                }
 
                print_select_hash("limit", $def_art_limit, $limits, 
-                       'onchange="viewCurrentFeed(0, \'\')"');
+                       'onchange="viewLimitChanged()"');
        
                ?>              
 
@@ -232,7 +255,7 @@ window.onload = init;
                ?>
                </select>
        <?php } ?>
-       <a href="http://tt-rss.org/">Tiny Tiny RSS</a> v<?php echo VERSION ?> &copy; 2005&ndash;2007 <a href="http://bah.org.ru/">Andrew Dolgov</a>
+       <a href="http://tt-rss.org/">Tiny Tiny RSS</a> v<?php echo VERSION ?> &copy; 2005&ndash;2008 <a href="http://bah.org.ru/">Andrew Dolgov</a>
 </div>
 
 <?php db_close($link); ?>