From da497babda5b85504f3d0471751490c88f025b57 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 18 Apr 2011 16:29:10 +0400
Subject: about dialog, UI tweaks

---
 prefs.php | 53 ++++++++++++++++++++++-------------------------------
 1 file changed, 22 insertions(+), 31 deletions(-)

(limited to 'prefs.php')
diff --git a/prefs.php b/prefs.php
index 417443570..5b70b2cad 100644
--- a/prefs.php
+++ b/prefs.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);
 
@@ -15,11 +15,11 @@
 	$dt_add = time();
 
 	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>
@@ -29,7 +29,7 @@
 
 	<?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>
@@ -47,7 +47,7 @@
 	<script type="text/javascript" charset="utf-8" src="prefs.js?<?php echo $dt_add ?>"></script>
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-		
+
 	<script type="text/javascript">
 		Event.observe(window, 'load', function() {
 			init();
@@ -69,7 +69,7 @@
 		</div>
 		<noscript><br/><?php print_error('Javascript is disabled. Please enable it.') ?></noscript>
 	</div>
-</div> 
+</div>
 
 <div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)">
 	<?php rounded_table_start("hho"); ?>
@@ -79,47 +79,38 @@
 
 <img id="piggie" src="images/piggie.png" style="display : none" alt="piggie"/>
 
-<div id="main" dojoType="dijit.layout.BorderContainer">
-
 <div id="header" dojoType="dijit.layout.ContentPane" region="top">
-	<img style="float : left" src="<?php echo theme_image($link, 'images/logo_wide.png') ?>" title="Tiny Tiny RSS"/>	
-
-	<?php if (!SINGLE_USER_MODE) { ?>
-		<?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
-	<?php } ?>
-	<a href="#" onclick="gotoMain()"><?php echo __('Exit preferences') ?></a> | 
-	<a href='#' onclick="Effect.Appear('hotkey_help_overlay', {duration: 0.3})"><?php echo __("Keyboard shortcuts") ?></a>
-	<?php if (!SINGLE_USER_MODE) { ?>
-		| <a href="logout.php"><?php echo __('Logout') ?></a>
-	<?php } ?>
+	<a href='#' onclick="Effect.Appear('hotkey_help_overlay', {duration: 0.3})"><?php echo __("Keyboard shortcuts") ?></a> |
+	<a href="#" onclick="gotoMain()"><?php echo __('Exit preferences') ?></a>
 </div>
 
+<div id="main" dojoType="dijit.layout.BorderContainer">
+
 <div dojoType="dijit.layout.TabContainer" region="center" id="pref-tabs">
-<div id="genConfigTab" dojoType="dijit.layout.ContentPane" 
+<div id="genConfigTab" dojoType="dijit.layout.ContentPane"
 	href="backend.php?op=pref-prefs"
 	title="<?php echo __('Preferences') ?>"></div>
-<div id="feedConfigTab" dojoType="dijit.layout.ContentPane" 
+<div id="feedConfigTab" dojoType="dijit.layout.ContentPane"
 	href="backend.php?op=pref-feeds"
 	title="<?php echo __('Feeds') ?>"></div>
-<div id="filterConfigTab" dojoType="dijit.layout.ContentPane" 
+<div id="filterConfigTab" dojoType="dijit.layout.ContentPane"
 	href="backend.php?op=pref-filters"
 	title="<?php echo __('Filters') ?>"></div>
-<div id="labelConfigTab" dojoType="dijit.layout.ContentPane" 
+<div id="labelConfigTab" dojoType="dijit.layout.ContentPane"
 	href="backend.php?op=pref-labels"
 	title="<?php echo __('Labels') ?>"></div>
 <?php if ($_SESSION["access_level"] >= 10) { ?>
-	<div id="userConfigTab" dojoType="dijit.layout.ContentPane" 
+	<div id="userConfigTab" dojoType="dijit.layout.ContentPane"
 		href="backend.php?op=pref-users"
 		title="<?php echo __('Users') ?>"></div>
 <?php } ?>
 </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>
+	<a class="insensitive" target="_blank" href="http://tt-rss.org/">
+	Tiny Tiny RSS</a> &copy; 2005-<?php echo date('Y') ?>
+	<a class="insensitive" target="_blank"
+	href="http://fakecake.org/">Andrew Dolgov</a>
 </div> <!-- footer -->
 
 </div>
-- 
cgit v1.2.3-54-g00ecf

