<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 ?>"/>
- <link rel="stylesheet" type="text/css" href="lib/modalbox/modalbox.css"/>
-
- <?php $user_theme = get_user_theme_path($link);
- if ($user_theme) { ?>
- <link rel="stylesheet" type="text/css" href="<?php echo $user_theme ?>/theme.css?<?php echo $dt_add ?>">
- <?php } ?>
-
- <?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,builder"></script>
- <script type="text/javascript" src="lib/modalbox/modalbox.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>
</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>
- <p>
- <?php print_error(__("Your browser doesn't support Javascript, which is required
- for this application to function properly. Please check your
- browser settings.")) ?></p>
- </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"> </span></div>
-<div id="cmdline" style="display : none"></div>
-<div id="auxDlg" style="display : none"></div>
-
<div id="header">
- <div class="topLinks" id="topLinks">
+ <!-- <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> |
| <a href="logout.php"><?php echo __('Logout') ?></a>
<?php } ?>
- <img id="newVersionIcon" style="display:none;" onclick="javascript:explainError(2)"
+ <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>
- </div>
-
- <img src="<?php echo theme_image($link, 'images/ttrss_logo.png') ?>" alt="Tiny Tiny RSS"/>
+<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="feeds-holder">
- <div id="dispSwitch">
- <a id="dispSwitchPrompt"
- href="javascript:toggleTags()"><?php echo __("tag cloud") ?></a>
- </div>
- <div id="feeds-frame"> </div>
+<div id="notify" class="notify"><span id="notify_body"> </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 id="main" dojoType="dijit.layout.BorderContainer">
+
+<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="toolbar">
+<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 class="actionChooser">
- <select id="quickMenuChooser" onchange="quickMenuChange()">
- <option value="qmcDefault" selected="selected"><?php echo __('Actions...') ?></option>
- <option value="qmcSearch"><?php echo __('Search...') ?></option>
- <optgroup label="<?php echo __('Feed actions:') ?>">
- <option value="qmcAddFeed"><?php echo __('Subscribe to feed...') ?></option>
- <option value="qmcEditFeed"><?php echo __('Edit this feed...') ?></option>
- <option value="qmcRescoreFeed"><?php echo __('Rescore feed') ?></option>
- <option value="qmcRemoveFeed"><?php echo __('Unsubscribe') ?></option>
- </optgroup>
- <optgroup label="<?php echo __('All feeds:') ?>">
- <option value="qmcCatchupAll"><?php echo __('Mark as read') ?></option>
- <option value="qmcShowOnlyUnread"><?php echo __('(Un)hide read feeds') ?></option>
- </optgroup>
- <optgroup label="<?php echo __('Categories:') ?>">
-
- <option value="qmcToggleReorder"><?php echo __('Toggle reordering mode') ?></option>
- <option value="qmcResetCats"><?php echo __('Reset order') ?></option>
- </optgroup>
-
- <optgroup label="<?php echo __('Other actions:') ?>">
-
- <option value="qmcAddLabel"><?php echo __('Create label...') ?></option>
- <option value="qmcAddFilter"><?php echo __('Create filter...') ?></option>
- <option value="qmcResetUI"><?php echo __('Reset UI layout') ?></option>
- <option value="qmcHKhelp"><?php echo __('Keyboard shortcuts help') ?></option>
- </optgroup>
-
- </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'>
- <button id="collapse_feeds_btn" onclick="collapse_feedlist()"
- title="<?php echo __('Collapse feedlist') ?>" style="display : none">
+ <button dojoType="dijit.form.Button" id="collapse_feeds_btn"
+ onclick="collapse_feedlist()"
+ title="<?php echo __('Collapse feedlist') ?>" style="display : inline">
<<</button>
<select name="view_mode" title="<?php echo __('Show articles') ?>"
- onchange="viewModeChanged()">
+ 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="updated"><?php echo __('Updated') ?></option>
</select>
- <select title="<?php echo __('Sort articles') ?>"
- 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 name="update" onclick="return scheduleFeedUpdate()">
+ <button dojoType="dijit.form.Button" name="update"
+ onclick="scheduleFeedUpdate()">
<?php echo __('Update') ?></button>
- <button onclick="return catchupCurrentFeed()">
+ <button dojoType="dijit.form.Button"
+ onclick="catchupCurrentFeed()">
<?php echo __('Mark as read') ?></button>
</form>
- </div>
+ <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 -->
-<?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"
+ onscroll="headlines_scroll_handler(this)" region="center">
+ <div id="headlinesInnerContainer">
+ <div class="whiteBox"><?php echo __('Loading, please wait...') ?></div>
+ </div>
</div>
- <div id="content-insert"> </div>
- <!-- <div class="whiteBox"> </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>
+</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 ?>
<?php } ?>
© 2005–<?php echo date('Y') ?> <a href="http://fakecake.org/">Andrew Dolgov</a>
+</div> -->
+
</div>
<?php db_close($link); ?>
git.wh0rd.org / tt-rss.git / blobdiff