]> git.wh0rd.org - tt-rss.git/blobdiff - tt-rss.php
remove modalbox; use dijit.Dialog; further dojo-related updates
[tt-rss.git] / tt-rss.php
index 2dbf78b7d26564f51cf8552fae70304fe9f0ac66..1abda3b530c60e3e7d8593fe2ee0226ef9054112 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";
@@ -14,7 +12,7 @@
 
        login_sequence($link);
 
-       $dt_add = get_script_dt_add();
+       $dt_add = time();
 
        no_cache_incantation();
 
@@ -28,7 +26,9 @@
        <title>Tiny Tiny RSS</title>
 
        <link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/>
-       <link rel="stylesheet" type="text/css" href="infobox.css?<?php echo $dt_add ?>"/>
+       <link rel="stylesheet" type="text/css" href="cdm.css?<?php echo $dt_add ?>"/>
+
+       <link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/>
 
        <?php   $user_theme = get_user_theme_path($link);
                if ($user_theme) { ?>
        <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/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls,builder"></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">
@@ -61,7 +60,7 @@
        </script>
 </head>
 
-<body id="ttrssMain">
+<body id="ttrssMain" class="claro">
 
 <div id="overlay" style="display : block">
        <div id="overlay_inner">
 </div>
 
 <div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
-<div id="dialog_overlay" style="display : none"> </div>
-<div id="infoBoxShadow" style="display : none"><div id="infoBox">&nbsp;</div></div>
 <div id="cmdline" style="display : none"></div>
 <div id="auxDlg" style="display : none"></div>
 
-<div id="errorBoxShadow" style="display : none">
-       <div id="errorBox">
-       <div id="xebTitle"><?php echo __('Fatal Exception') ?></div><div id="xebContent">&nbsp;</div>
-               <div id="xebBtn" align='center'>
-                       <button onclick="closeErrorBox()"><?php echo __('Close this window') ?></button>
-               </div>
-       </div>
-</div>
+<div id="main" dojoType="dijit.layout.BorderContainer">
 
-<div id="header">
+<div id="header" dojoType="dijit.layout.ContentPane" region="top">
        <div class="topLinks" id="topLinks">
 
-       <span id="topLinksOnline">
-
        <?php if (!SINGLE_USER_MODE) { ?>
                        <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
        <?php } ?>
                        | <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"
-               width="16" height="16"
-               title="<?php echo __('Offline reading') ?>"/>
-
-       <div id="offlineModeDrop" style="display : none">
-               <div id="offlineModeSyncMsg">---</div>
-
-               <div class="showWhenSyncing" style="display : none">
-                       <a href="javascript:offlineDownloadStop()">
-                       <?php echo __('Cancel synchronization') ?></a></div>
-               <div class="hideWhenSyncing">
-                       <a href="javascript:offlineDownloadStart()">
-                       <?php echo __('Synchronize') ?></a></div>
-               <div class="hideWhenSyncing"><a href="javascript:offlineClearData()">
-                       <?php echo __('Remove stored data') ?></a></div>
-               <div><a href="javascript:gotoOffline()">
-                       <?php echo __('Go offline') ?></a></div>
-       </div>
-
        <img id="newVersionIcon" style="display:none;" onclick="javascript:explainError(2)" 
                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"/>
 
-       </span>
-
-       <span id="topLinksOffline" style="display : none">
-               <img id="restartOnlinePic" src="images/online.png" 
-                       height="13" width="13" onclick="gotoOnline()" title="<?php echo __('Go online') ?>"/>
-       </span>
-
        </div>
 
        <img src="<?php echo theme_image($link, 'images/ttrss_logo.png') ?>" alt="Tiny Tiny RSS"/>      
 </div>
 
-<div id="feeds-holder">
+<div id="feeds-holder" dojoType="dijit.layout.ContentPane" region="leading" style="width : 20%" splitter="true">
        <div id="dispSwitch"> 
                <a id="dispSwitchPrompt" 
                        href="javascript:toggleTags()"><?php echo __("tag cloud") ?></a>
        <div id="feeds-frame">&nbsp;</div>
 </div>
 
-<div id="toolbar">
+<div dojoType="dijit.layout.BorderContainer" region="center" id="content-wrap">
+
+<div id="toolbar" dojoType="dijit.layout.ContentPane" region="top">
 
                <div class="actionChooser">
                        <select id="quickMenuChooser" onchange="quickMenuChange()">
                        <option value="score"><?php echo __('Score') ?></option>
                </select>
 
-               <button name="update" onclick="return viewCurrentFeed('ForceUpdate')">
+               <button name="update" onclick="return scheduleFeedUpdate()">
                        <?php echo __('Update') ?></button>
 
                <button onclick="return catchupCurrentFeed()">
 
        </div>
 
-<?php if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?>
-       <div id="headlines-frame" class="headlines_normal">
-               <div class="whiteBox"><?php echo __('Loading, please wait...') ?></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="<?php echo theme_image($link, 
-                       'images/resize_handle_horiz.png') ?>" id="resize-handle" 
-                       onmouseover="enable_resize(true)" onmouseout="enable_resize(false)"
-                       alt=""/>
+       <div id="headlines-wrap-inner" dojoType="dijit.layout.BorderContainer" region="center">
+
+               <div id="headlines-toolbar" dojoType="dijit.layout.ContentPane" region="top">
+               </div>
+
+               <div id="headlines-frame" dojoType="dijit.layout.ContentPane" region="center">
+                       <div id="headlinesInnerContainer">
+                               <div class="whiteBox"><?php echo __('Loading, please wait...') ?></div>
+                       </div>
                </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 __('Loading, please wait...') ?></div></div>
-<?php } ?>
-
-<div id="footer">
+
+               <?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 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 ?> 
        &copy; 2005&ndash;<?php echo date('Y') ?> <a href="http://fakecake.org/">Andrew Dolgov</a>
 </div>
 
+</div>
+
 <?php db_close($link); ?>
 
 </body>