X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=tt-rss.php;h=65dcdde830cd59fa25d713a7ec9ed33e99ce5b5c;hb=e0d91d846dd5ac42a95a0832777cc76aaf579bc2;hp=087582152554650d7baf99f20306e5ed111e6999;hpb=1bf679a304856d07979467486843a47cf3906878;p=tt-rss.git

diff --git a/tt-rss.php b/tt-rss.php
index 08758215..65dcdde8 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -1,12 +1,12 @@
 <?php
-	require_once "functions.php"; 
+	require_once "functions.php";
 	require_once "sessions.php";
 	require_once "sanity_check.php";
-	require_once "version.php"; 
+	require_once "version.php";
 	require_once "config.php";
 	require_once "db-prefs.php";
 
-	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);	
+	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
 	init_connection($link);
 
@@ -17,9 +17,9 @@
 	no_cache_incantation();
 
 	header('Content-Type: text/html; charset=utf-8');
-	
+
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
@@ -35,12 +35,16 @@
 
 	<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>
+	<script type="text/javascript" src="lib/dojo/dojo.js"></script>
+	<script type="text/javascript" src="lib/dijit/dijit.js"></script>
+	<script type="text/javascript" src="lib/dojo/tt-rss-layer.js"></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="errors.php?mode=js"></script>
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
@@ -59,30 +63,11 @@
 		<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">&nbsp;</span></div>
-<div id="cmdline" style="display : none"></div>
-<div id="auxDlg" style="display : none"></div>
-
-<div id="main" dojoType="dijit.layout.BorderContainer">
-
-<div id="header" dojoType="dijit.layout.ContentPane" region="top">
-	<div class="topLinks" id="topLinks">
-
+<div id="header">
 	<?php if (!SINGLE_USER_MODE) { ?>
 			<?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
 	<?php } ?>
@@ -94,20 +79,29 @@
 	<?php } ?>
 
 	<?php if (!SINGLE_USER_MODE) { ?>
-			| <a href="logout.php"><?php echo __('Logout') ?></a>
+			| <a href="backend.php?op=logout"><?php echo __('Logout') ?></a>
 	<?php } ?>
 
-	<img id="newVersionIcon" style="display:none;" onclick="newVersionDlg()" 
-		width="13" height="13" 
+	<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!') ?>" 
+		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="notify" class="notify"><span id="notify_body">&nbsp;</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'>
@@ -115,24 +109,24 @@
 	<div id="feedTree"></div>
 </div>
 
+<div dojoType="dijit.layout.BorderContainer" region="center" id="header-wrap" gutters="false">
 <div dojoType="dijit.layout.TabContainer" region="center" id="content-tabs">
 <div dojoType="dijit.layout.BorderContainer" region="center" id="content-wrap"
-	title="News">
+	title="<?php echo __("News") ?>">
 
 <div id="toolbar" dojoType="dijit.layout.ContentPane" region="top">
-
-	<div id="main-toolbar" dojoType="dijit.Toolbar">		
+	<div id="main-toolbar" dojoType="dijit.Toolbar">
 
 		<form id="main_toolbar_form" action="" onsubmit='return false'>
 
-		<button dojoType="dijit.form.Button" id="collapse_feeds_btn" 
+		<button dojoType="dijit.form.Button" id="collapse_feeds_btn"
 			onclick="collapse_feedlist()"
 			title="<?php echo __('Collapse feedlist') ?>" style="display : inline">
 			&lt;&lt;</button>
 
-		<select name="view_mode" title="<?php echo __('Show articles') ?>" 
+		<select name="view_mode" title="<?php echo __('Show articles') ?>"
 			onchange="viewModeChanged()"
-			dojoType="dijit.form.Select" style="width : 100px">
+			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>
@@ -143,56 +137,57 @@
 		</select>
 
 		<select title="<?php echo __('Sort articles') ?>"
-			onchange="viewModeChanged()" 
-			dojoType="dijit.form.Select" name="order_by" style="width : 100px">
+			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 dojoType="dijit.form.Button" name="update" 
+		<button dojoType="dijit.form.Button" name="update"
 			onclick="scheduleFeedUpdate()">
 			<?php echo __('Update') ?></button>
 
-		<button dojoType="dijit.form.Button" 
+		<button dojoType="dijit.form.Button"
 			onclick="catchupCurrentFeed()">
 			<?php echo __('Mark as read') ?></button>
 
 		</form>
 
 		<div class="actionChooser">
-			<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>
-					<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>
-					<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>
-					<option disabled="1" value="x"><?php echo __('Other actions:') ?></option>
-					<option value="qmcDigest"><?php echo __('Switch to digest...') ?></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>
-			</select>
-		</div>
-
+			<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('qmcTagSelect')"><?php echo __('Select by tags...') ?></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 dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAbout')"><?php echo __('About...') ?></div>
+				</div>
+			</div>
 		</div>
-
-	</div>
+	</div> <!-- toolbar -->
+</div> <!-- toolbar pane -->
 
 	<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" 
+		<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>
@@ -207,15 +202,7 @@
 	</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 } ?>
-	&copy; 2005&ndash;<?php echo date('Y') ?> <a href="http://fakecake.org/">Andrew Dolgov</a>
-</div> -->
-
+</div>
 </div>
 
 <?php db_close($link); ?>
