From 5ede560f8ceff1d2eb5d2dcd2bd7432acfa18f73 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Mon, 14 May 2007 09:08:18 +0100
Subject: [PATCH] add infobox overlay, layout fixes

---
 functions.js             | 14 ++++++++++++++
 modules/pref-filters.php |  2 +-
 modules/pref-labels.php  |  2 +-
 modules/pref-users.php   |  6 +++---
 prefs.php                |  2 ++
 tt-rss.css               | 12 ++++++++++++
 tt-rss.php               |  2 ++
 7 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/functions.js b/functions.js
index 21a0da79..f308a3d2 100644
--- a/functions.js
+++ b/functions.js
@@ -1319,6 +1319,14 @@ function leading_zero(p) {
 }
 
 function closeInfoBox(cleanup) {
+
+	if (!is_msie()) {
+		var overlay = document.getElementById("dialog_overlay");
+		if (overlay) {
+			overlay.style.display = "none";
+		}
+	}
+
 	var box = document.getElementById('infoBox');
 	var shadow = document.getElementById('infoBoxShadow');
 
@@ -1375,6 +1383,12 @@ function infobox_submit_callback() {
 
 function infobox_callback() {
 	if (xmlhttp.readyState == 4) {
+		var overlay = document.getElementById("dialog_overlay");
+
+		if (overlay) {
+			overlay.style.display = "block";
+		}
+
 		var box = document.getElementById('infoBox');
 		var shadow = document.getElementById('infoBoxShadow');
 		if (box) {			
diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index db2744b2..7445c0e0 100644
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -260,7 +260,7 @@
 			print "<tr class=\"title\">
 						<td align='center' width=\"5%\">&nbsp;</td>
 						<td width=\"20%\"><a href=\"javascript:updateFilterList('reg_exp')\">".__('Filter expression')."</a></td>
-						<td width=\"20%\"><a href=\"javascript:updateFilterList('feed_title')\">".__('Feed')."</a></td>
+						<td width=\"\"><a href=\"javascript:updateFilterList('feed_title')\">".__('Feed')."</a></td>
 						<td width=\"15%\"><a href=\"javascript:updateFilterList('filter_type')\">".__('Match')."</a></td>
 						<td width=\"15%\"><a href=\"javascript:updateFilterList('action_description')\">".__('Action')."</a></td>";
 
diff --git a/modules/pref-labels.php b/modules/pref-labels.php
index 3b1f5829..5260e765 100644
--- a/modules/pref-labels.php
+++ b/modules/pref-labels.php
@@ -234,7 +234,7 @@
 			print "<tr class=\"title\">
 						<td width=\"5%\">&nbsp;</td>
 						<td width=\"30%\"><a href=\"javascript:updateLabelList('description')\">".__('Caption')."</a></td>
-						<td width=\"50%\"><a href=\"javascript:updateLabelList('sql_exp')\">".__('SQL Expression')."</a>
+						<td width=\"\"><a href=\"javascript:updateLabelList('sql_exp')\">".__('SQL Expression')."</a>
 						</td>
 						</tr>";
 			
diff --git a/modules/pref-users.php b/modules/pref-users.php
index b61323ad..156772b7 100644
--- a/modules/pref-users.php
+++ b/modules/pref-users.php
@@ -212,9 +212,9 @@
 
 		print "<tr class=\"title\">
 					<td align='center' width=\"5%\">&nbsp;</td>
-					<td width='40%'><a href=\"javascript:updateUsersList('login')\">".__('Login')."</a></td>
-					<td width='40%'><a href=\"javascript:updateUsersList('access_level')\">".__('Access Level')."</a></td>
-					<td width='30%'><a href=\"javascript:updateUsersList('last_login')\">".__('Last login')."</a></td></tr>";
+					<td width=''><a href=\"javascript:updateUsersList('login')\">".__('Login')."</a></td>
+					<td width='20%'><a href=\"javascript:updateUsersList('access_level')\">".__('Access Level')."</a></td>
+					<td width='20%'><a href=\"javascript:updateUsersList('last_login')\">".__('Last login')."</a></td></tr>";
 		
 		$lnum = 0;
 		
diff --git a/prefs.php b/prefs.php
index be0cd419..ca48f43f 100644
--- a/prefs.php
+++ b/prefs.php
@@ -131,6 +131,8 @@ window.onload = init;
 <div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
 <div id="infoBoxShadow"><div id="infoBox">BAH</div></div>
 
+<div id="dialog_overlay"> </div>
+
 <div id="prefFooter">
 	<?php if (defined('_DEBUG_USER_SWITCH')) { ?>
 		<select id="userSwitch" onchange="userSwitch()">
diff --git a/tt-rss.css b/tt-rss.css
index f8ada76d..e14dcfae 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1068,6 +1068,18 @@ a.cdmToggleLink:hover {
 	font-size : 8pt;
 }
 
+#dialog_overlay {
+	background : white;
+	left : 0;
+	top : 0;
+	height : 100%;
+	width : 100%;
+	z-index : 2;
+	opacity : 0.5;
+	position : absolute;
+	display : none;
+}
+
 #overlay {
 	background : white;
 	left : 0;
diff --git a/tt-rss.php b/tt-rss.php
index a404208b..6ab33161 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -93,6 +93,8 @@
 	<div id="fatal_error_msg">Unknown Error</div>
 </div></div>
 
+<div id="dialog_overlay"> </div>
+
 <script type="text/javascript">
 if (document.addEventListener) {
 	document.addEventListener("DOMContentLoaded", init, null);
-- 
2.39.5