]> git.wh0rd.org - tt-rss.git/blobdiff - tt-rss.php
release 1.2.0
[tt-rss.git] / tt-rss.php
index 71a866c684ac66cc60ca6fd896715eff06909dd5..06121c2a1237d312d85ba9dd1eae939f2342fc3c 100644 (file)
@@ -28,6 +28,8 @@
                <link rel="stylesheet" type="text/css" href="themes/<?= $user_theme ?>/theme.css">
        <? } ?>
 
+       <? if ($user_theme) { $theme_image_path = "themes/$user_theme/"; } ?>
+
        <? $user_css_url = get_pref($link, 'USER_STYLESHEET_URL'); ?>
        <? if ($user_css_url) { ?>
                <link type="text/css" href="<?= $user_css_url ?>"/> 
@@ -44,6 +46,8 @@
 
        <? } ?>
 
+       <script type="text/javascript" src="prototype.js"></script>
+
        <script type="text/javascript" src="tt-rss.js?<?= $dt_add ?>"></script>
        <script type="text/javascript" src="functions.js?<?= $dt_add ?>"></script>
        <!--[if gte IE 5.5000]>
@@ -56,6 +60,9 @@
                if (navigator.userAgent.match("Opera")) {
                        document.write('<link rel="stylesheet" type="text/css" href="opera.css">');
                }
+               if (navigator.userAgent.match("Gecko") && !navigator.userAgent.match("KHTML")) {
+                       document.write('<link rel="stylesheet" type="text/css" href="gecko.css">');
+               }
        </script>
 </head>
 
@@ -64,7 +71,7 @@
 <div id="overlay"><div id="overlay_inner">Loading, please wait...</div></div>
 <div id="fatal_error"><div id="fatal_error_inner">
        <h1>Fatal Error</h1>
-       <pre id="fatal_error_msg">Unknown Error</pre>
+       <div id="fatal_error_msg">Unknown Error</div>
 </div></div>
 
 <script type="text/javascript">
@@ -74,13 +81,11 @@ if (document.addEventListener) {
 window.onload = init;
 </script>
 
-<? if (ENABLE_UPDATE_DAEMON && !file_is_locked("update_daemon.lock")) { ?>
-       <div class="warning">
-               <b>Warning:</b> Update daemon is enabled in configuration, but daemon
-               process is not running, which prevents all feeds from updating. Please
-               start the daemon process or contact instance owner.
-       </div>
-<? } ?>
+<div id="noDaemonWarning">
+       <b>Warning:</b> Update daemon is enabled in configuration, but daemon
+       process is not running, which prevents all feeds from updating. Please
+       start the daemon process or contact instance owner.
+</div>
 
 <ul id="debug_output"></ul>
 
@@ -90,13 +95,13 @@ window.onload = init;
        <td colspan="2" class="headerBox" id="mainHeader">
                <table cellspacing="0" cellpadding="0" width="100%"><tr>
                        <td rowspan="2" class="header" valign="middle"> 
-                               <img src="images/ttrss_logo.png" alt="logo">    
+                               <img src="<?= $theme_image_path ?>images/ttrss_logo.png" alt="logo">    
                        </td>
                        <td valign="top" class="notifyBox">
                                <div id="notify"><span id="notify_body">&nbsp;</span></div>
                        </td>
 
-                       <div id="userDlgShadow"><div id="userDlg">&nbsp;</div></div>
+                       <div id="infoBoxShadow"><div id="infoBox">&nbsp;</div></div>
 
                </tr><tr><td class="welcomePrompt">
                        <? if (!SINGLE_USER_MODE) { ?>
@@ -135,8 +140,7 @@ window.onload = init;
                <tr><td height="100%" width="100%" valign="top">
 
                <iframe frameborder="0" 
-                       src="backend.php?op=error&msg=Loading,%20please wait..."
-                       id="feeds-frame" name="feeds-frame" class="feedsFrame"> </iframe>
+                       id="feeds-frame" name="feeds-frame" class="feedsFrame"></iframe>
 
                </td></tr></table>
 
@@ -146,101 +150,77 @@ window.onload = init;
 
                <tr><td class="headlinesToolbar" id="headlinesToolbar">
 
-               <? if (get_pref($link, 'ENABLE_SEARCH_TOOLBAR')) { ?>
+               <form id="main_toolbar_form">
 
-               <input id="searchbox"
+               <? if (get_pref($link, 'ENABLE_SEARCH_TOOLBAR')) { ?>
+               <input name="query"
+                       onKeyPress="return filterCR(event)"
                        onblur="javascript:enableHotkeys();" onfocus="javascript:disableHotkeys();">
-               <select id="searchmodebox">
-                       <option>This feed</option>
-                       <? if (get_pref($link, 'ENABLE_FEED_CATS')) { ?>
-                       <option>This category</option>
-                       <? } ?>
-                       <option>All feeds</option>
-               </select>
-               
-               <input type="submit" 
-                       class="button" onclick="javascript:search()" value="Search">
-
-               &nbsp;
-               
+               <input class="button" type="submit"
+                       onclick="return viewCurrentFeed(0)" value="Search">
+               &nbsp; 
                <? } ?>
-               
-               View: 
-               
-               <select id="viewbox" onchange="javascript:viewCurrentFeed(0, '')">
-                       <option selected>Adaptive</option>
-                       <option>All Articles</option>
-                       <option>Starred</option>
-                       <option>Unread</option>
-               </select>
-
-               &nbsp;Limit:
 
-               <select id="limitbox" onchange="javascript:viewCurrentFeed(0, '')">
+               View:           
+               <select name="view_mode" onchange="viewCurrentFeed(0, '')">
+                       <option selected value="adaptive">Adaptive</option>
+                       <option value="all_articles">All Articles</option>
+                       <option value="marked">Starred</option>
+                       <option value="unread">Unread</option>
+               </select>
                
+               &nbsp;Limit:            
                <?
-                       $limits = array(15 => 15, 30 => 30, 60 => 60);
+               $limits = array(15 => 15, 30 => 30, 60 => 60, 0 => "All");
                        
-                       $def_art_limit = get_pref($link, 'DEFAULT_ARTICLE_LIMIT');
-
-                       if ($def_art_limit >= 0 && !array_key_exists($def_art_limit, $limits)) {
-                               $limits[$def_art_limit] = $def_art_limit; 
-                       }
-
-                       asort($limits);
-                       array_push($limits, 0);
-
-                       if (!$def_art_limit) {
-                               $def_art_limit = 30;
-                       }
-
-                       foreach ($limits as $key) {
-                               print "<option";
-                               if ($key == $def_art_limit) { print " selected"; }
-                               print ">";
-                               
-                               if ($limits[$key] == 0) { print "All"; } else { print $limits[$key]; }
-                               
-                               print "</option>";
-                       } ?>
-               
-               </select>
+               $def_art_limit = get_pref($link, 'DEFAULT_ARTICLE_LIMIT');
 
-<!--           &nbsp;Selection:
+               if ($def_art_limit >= 0 && !array_key_exists($def_art_limit, $limits)) {
+                       $limits[$def_art_limit] = $def_art_limit; 
+               }
 
-               <select id="headopbox">
-                       <option id="hopToggleRead">Toggle (un)read</option>
-               </select>
+               asort($limits);
+
+               if (!$def_art_limit) {
+                       $def_art_limit = 30;
+               }
+
+               print_select_hash("limit", $def_art_limit, $limits, 
+                       'onchange="viewCurrentFeed(0, \'\')"');
+       
+               ?>              
+               </form>
 
-               <input class="button" type="submit" onclick="headopGo()" value="Go"> -->
+               <!-- &nbsp;<input class="button" type="submit"
+                       onclick="quickMenuGo('qmcSearch')" value="Search (tmp)"> -->
 
-               &nbsp;Feed: <input class="button" type="submit"
-                       onclick="javascript:viewCurrentFeed(0, 'ForceUpdate')" value="Update">
+               &nbsp;<input class="button" type="submit"
+                       onclick="viewCurrentFeed(0, 'ForceUpdate')" value="Update">
 
-               <input class="button" type="submit" id="btnMarkFeedAsRead"
-                       onclick="javascript:viewCurrentFeed(0, 'MarkAllRead')" value="Mark as read"> 
+               <input class="button" type="submit"
+                       onclick="viewCurrentFeed(0, 'MarkAllRead')" value="Mark as read"> 
 
                </td>
                <td align="right">
                        <select id="quickMenuChooser" onchange="quickMenuChange()">
-                               <option id="qmcDefault" selected>Actions...</option>
-                               <option id="qmcPrefs">Preferences</option>
-                               <option id="qmcSearch">Search</option>
+                               <option value="qmcDefault" selected>Actions...</option>
+                               <option value="qmcPrefs">Preferences</option>
+                               <option value="qmcSearch">Search</option>
                                <option disabled>--------</option>
                                <option style="color : #5050aa" disabled>Feed actions:</option>
-                               <option id="qmcAddFeed">&nbsp;&nbsp;Add new feed</option>
-                               <option id="qmcRemoveFeed">&nbsp;&nbsp;Remove this feed</option>
+                               <option value="qmcAddFeed">&nbsp;&nbsp;Subscribe to feed</option>
+                               <option value="qmcRemoveFeed">&nbsp;&nbsp;Unsubscribe</option>
                                <!-- <option>Edit this feed</option> -->
                                <option disabled>--------</option>
                                <option style="color : #5050aa" disabled>All feeds:</option>
-                               <? if (!ENABLE_UPDATE_DAEMON) { ?>
-                               <option id="qmcUpdateFeeds">&nbsp;&nbsp;Update</option>
+                               <? if (!ENABLE_UPDATE_DAEMON && !DAEMON_REFRESH_ONLY) { ?>
+                               <option value="qmcUpdateFeeds">&nbsp;&nbsp;Update</option>
                                <? } ?>
-                               <option id="qmcCatchupAll">&nbsp;&nbsp;Mark as read</option>                            
-                               <option id="qmcShowOnlyUnread">&nbsp;&nbsp;Show only unread</option>
+                               <option value="qmcCatchupAll">&nbsp;&nbsp;Mark as read</option>                         
+                               <option value="qmcShowOnlyUnread">&nbsp;&nbsp;Show only unread</option>
                                <option disabled>--------</option>
                                <option style="color : #5050aa" disabled>Other actions:</option>                                
-                               <option id="qmcAddFilter">&nbsp;&nbsp;Add filter</option>
+                               <option value="qmcAddFilter">&nbsp;&nbsp;Create filter</option>
                        </select>
                </td>
                </tr>
@@ -251,16 +231,14 @@ window.onload = init;
 <tr>
        <td id="headlines" class="headlines2" valign="top">
                <iframe frameborder="0" name="headlines-frame" 
-                       id="headlines-frame" class="headlinesFrame" 
-                               src="backend.php?op=error&msg=No%20feed%20selected."></iframe>
+                       id="headlines-frame" class="headlinesFrame"></iframe>
        </td>
 </tr>
 <? } else { ?>
 <tr>
        <td id="headlines" class="headlines" valign="top">
                <iframe frameborder="0" name="headlines-frame" 
-                       id="headlines-frame" class="headlinesFrame" 
-                               src="backend.php?op=error&msg=No%20feed%20selected."></iframe>
+                       id="headlines-frame" class="headlinesFrame"></iframe>
        </td>
 </tr><tr>
        <td class="content" id="content" valign="top">