<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="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"/>
+ <?php if (ENABLE_TWEET_BUTTON) { ?>
+ <script src="http://platform.twitter.com/widgets.js" type="text/javascript"></script>
+ <?php } ?>
+
<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/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
<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
| <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!') ?>"
<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()"
+ <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" style="width : 100px">
<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" style="width : 100px">
<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 class="actionChooser">
- <select id="quickMenuChooser" onchange="quickMenuChange()">
+ <select onchange="quickMenuChange(this)" dojoType="dijit.form.Select"
+ style="width : 150px">
<option value="qmcDefault" selected="selected"><?php echo __('Actions...') ?></option>
<option value="qmcSearch"><?php echo __('Search...') ?></option>
- <optgroup label="<?php echo __('Feed actions:') ?>">
+ <option disabled="1" value="x"><?php echo __('Feed actions:') ?></option>
<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 disabled="1" value="x"><?php echo __('All feeds:') ?></option>
<option value="qmcCatchupAll"><?php echo __('Mark as read') ?></option>
<option value="qmcShowOnlyUnread"><?php echo __('(Un)hide read feeds') ?></option>
- </optgroup>
-
- <optgroup label="<?php echo __('Other actions:') ?>">
-
+ <option disabled="1" value="x"><?php echo __('Other actions:') ?></option>
<option value="qmcTagCloud"><?php echo __('Show tag cloud...') ?></option>
<option value="qmcAddLabel"><?php echo __('Create label...') ?></option>
<option value="qmcAddFilter"><?php echo __('Create filter...') ?></option>
<option value="qmcHKhelp"><?php echo __('Keyboard shortcuts help') ?></option>
- </optgroup>
-
</select>
</div>
+ </div>
+
</div>
<div id="headlines-wrap-inner" dojoType="dijit.layout.BorderContainer" region="center">
git.wh0rd.org / tt-rss.git / blobdiff