From ad491d75a67574c1b76bfe7b269e6c22511eaede Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Tue, 12 Jan 2010 15:27:04 +0300
Subject: [PATCH] more button styles work

---
 images/button.png        | Bin 270 -> 879 bytes
 modules/popup-dialog.php |  31 +++++++++----------------------
 modules/pref-feeds.php   |  10 ++++------
 tt-rss.css               |  35 +++++++++++++++++++++++++++++++++++
 tt-rss.php               |   8 +++-----
 5 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/images/button.png b/images/button.png
index e8e741613911ff6de84854fe59045af5f69aef63..db2278279c4c4ee7f036ac2c87d3bb68224c2597 100644
GIT binary patch
delta 870
zcmV-s1DX7e0`CTYiBL{Q4GJ0x0000DNk~Le000020000U2m$~A0Exg@lK=n$?rB3q
zP)S2WAW(8|W@&6?004Lag;dXL6G0UIHg2iVA_!V*4zhTVB1u`RXhqaE{Sjho4BH>J
zMUZ4ON!D&Q>+UACrHJI>(JJ0W?V$(%fF64AWG_mET16;--m55Lp%*Rj&2CJ#rRu=W
ze)HZp?|pA}-vAAA(lqse1mq3JQlb%QY<xm${D=UKq6tAXB~{z(P9z3FgLC<N=h%7=
zfm>F?d;52?cdeSzwweco{XpPHn%OF_?-y|jSrP(>Jl~-y$8-qa<Jj`-k2y|xc)_&~
zD?P+nB78u9H7(A6O}JCdCDTBINH~=BaZ)~<*Nc?b9S3P{X2!@6y-$#)yUgyZVxgQ)
z_70G}o%DWAv)(?!A;Jq8tv^P%jh^+4)j#54;iTrohCLh@HT3vk6}K9x_%*^5Ul2_v
zqEvC&E)DURuKiZ>N`i2ZILc&UfOA?%PuEOt__~LG1$`#h6R+ZTR#D-3j}vF!)ZOnz
z+5)dI4jl{{44Mr{P!L4~VVJN`K!!XTF*LGrKO?IK8<Tr7btG!LbYeuYL3=jbJ-1P$
z-8}v%B5{;MwFr{@LH;VQ$xr2Z`O93e*jD$Ht(%&<^58qg<(at}9@o>z<8w`3e3jI8
zlUGN7maKVtyqfG9KkQeRG3J6bkHmAZ`|&MbmCTnZj1<M=RrBgggmqdmH{YLZe>*+m
zF3&Et)^n|ii#JxAmuLNINc--pyp!ft`A=T;@%(4a#AD(qF(!73=OKxg#V+xZ*h{Mm
z;$UsZ2%VLNDbj6``Xtq0V4A%3FI_)dc)dn{e+>0elo`y@REhV0!YX7mow*Kg`j6Yk
z{1@c+iszpw0xxXf$eFrrQ*rMQp=G6RbFKmxztMg0wr*>qemMLDSUjs1tx`3gAiMz_
zc87W%=qZ@fmX^&qQim*`le+23Vp7ad+e1=P*Cp3wOBS=4RbuIO*qPHEZXBUGLifZW
zr%Gj$`mga3u>G)7`T49;*?vwM)`6G$Z@|3$MZkEAiIE`~JSRy+K~xAGWBmXBKLY~;
w6A)94V)_01H_$MaKY#upQK*6_JgV9b0NT<Q>XUBZ-2eap07*qoM6N<$g7hPyQUCw|

literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^AT~b-6Oas=domJ8aTa()7Bet#3xhBt!>l<HKtYyt
zM_)$<hQpDSuDla~e1&9>AYTTCY9O=z2Lr?BjSLJOoeT_lAq))9UNbN_RWL9pS{i=(
zUI|pt;_2cTQgN$hq9dP^A`fdi$9Mac-rN5@Z~Dfq=H=w%W$n}5pZ;U7nvx2`wKlz(
z%nYpd7riD~D&$@Ka+fchiOnr_$%C_n$wDHBWG3A`_c@oH>ESu;b-d;-0@K5}XQkR1
zq*s@1mAg18Uh7_#rkl?5tgof1@+ZHa*?ZM#Znam#$^G)x{0yAdrXD`V*LDNl!{F)a
K=d#Wzp$P!(TUKcR

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 12c912ea..affb3e84 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -133,11 +133,7 @@
 
 			print "<div class=\"dlgSecCont\">";
 
-			print "<input name=\"query\" size=\"20\" type=\"search\"
-				onkeypress=\"return filterCR(event, search)\"
-				onchange=\"toggleSubmitNotEmpty(this, 'search_submit_btn')\"
-				onkeyup=\"toggleSubmitNotEmpty(this, 'search_submit_btn')\"
-				value=\"\">";
+			print "<input name=\"query\" size=\"20\" type=\"search\"	value=''>";
 
 			print " " . __('match on')." ";
 
@@ -185,13 +181,9 @@
 			print "</form>";
 
 			print "<div class=\"dlgButtons\">
-			<input type=\"submit\" 
-				class=\"button\" onclick=\"javascript:search()\" 
-				id=\"search_submit_btn\" disabled=\"true\"
-				value=\"".__('Search')."\">
-			<input class=\"button\"
-				type=\"submit\" onclick=\"javascript:searchCancel()\" 
-				value=\"".__('Cancel')."\"></div>";
+			<button disabled='true' onclick=\"javascript:search()\">".__('Search')."</button>
+			<button onclick=\"javascript:searchCancel()\">".__('Cancel')."</button>
+			</div>";
 
 			print "</div>";
 
@@ -238,9 +230,7 @@
 			print "&nbsp;</span>";
 
 			print "<input onkeypress=\"return filterCR(event, createFilter)\"
-					 onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
-					 onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
-					 name=\"reg_exp\" size=\"30\" value=\"$reg_exp\">";
+				 name=\"reg_exp\" size=\"30\" value=\"$reg_exp\">";
 
 			print "<span id=\"filter_dlg_date_chk_box\" style=\"display : none\">";
 			print "&nbsp;<input class=\"button\"
@@ -307,14 +297,11 @@
 
 			print "<div class=\"dlgButtons\">";
 
-			print "<input type=\"submit\" 
-				id=\"infobox_submit\"
-				class=\"button\" onclick=\"return createFilter()\" 
-				disabled=\"true\" value=\"".__('Create')."\"> ";
+			print "<button onclick=\"return createFilter()\">".
+				__('Create')."</button> ";
 
-			print "<input class=\"button\"
-				type=\"submit\" onclick=\"return closeInfoBox()\" 
-				value=\"".__('Cancel')."\">";
+			print "<button onclick=\"return closeInfoBox()\">".__('Cancel').
+				"</button>";
 
 			print "</div>";
 
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index f02ae6c4..fb5a1eca 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -403,13 +403,11 @@
 
 			print "<div class='dlgButtons'>
 				<div style=\"float : left\">
-					<input type='submit' class='button'			
-					onclick='return unsubscribeFeed($feed_id, \"$title\")' value=\"".__('Unsubscribe')."\">
+				<button onclick='return unsubscribeFeed($feed_id, \"$title\")'>".
+					__('Unsubscribe')."</button>
 				</div>
-				<input type=\"submit\" class=\"button\" 
-				onclick=\"return feedEditSave()\" value=\"".__('Save')."\">
-				<input type='submit' class='button'			
-				onclick=\"return feedEditCancel()\" value=\"".__('Cancel')."\">
+				<button onclick=\"return feedEditSave()\">".__('Save')."</button>
+				<button onclick=\"return feedEditCancel()\">".__('Cancel')."</button>
 				</div>";
 
 			return;
diff --git a/tt-rss.css b/tt-rss.css
index 0172d6c3..300ddcac 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -2257,3 +2257,38 @@ div#auxDlg {
 div#auxDlg a {
 	color : #4684ff;
 }
+
+button, select {
+	background-color : transparent;
+	background-repeat : repeat-x;
+	background-position : top left;
+	background-image : url("images/button.png");
+	border : 1px solid #bebebe;
+/*	border-top : 1px solid #f0f0f0;
+	border-left : 1px solid #f0f0f0; */
+	font-family : "Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+	font-size : 100%;
+/*	line-height : 120%; */
+	text-decoration : none;
+	font-weight : bold;
+	color : #565656;
+	cursor : pointer;
+	padding : 1px 3px 1px 3px;
+}
+
+select {
+	background : #ffffff;
+	padding : 1px 0px 1px 3px;
+}
+
+button:hover {
+	background-color : #f9faff;
+	border : 1px solid #88b0f0;
+	color : #336699;
+}
+
+button[disabled] {
+	background : #f0f0f0;
+	color : #dedede;
+	border : 1px solid #dedede;
+}
diff --git a/tt-rss.php b/tt-rss.php
index 6e40333c..ccd4a4b9 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -203,9 +203,9 @@
 
 		<form id="main_toolbar_form" action="" onsubmit='return false'>
 
-		<input type="submit" value="&lt;&lt;" 
-			id="collapse_feeds_btn" onclick="collapse_feedlist()" class="button"
-			title="<?php echo __('Collapse feedlist') ?>" style="display : none"/>
+		<button id="collapse_feeds_btn" onclick="collapse_feedlist()"
+			title="<?php echo __('Collapse feedlist') ?>" style="display : none">
+			&lt;&lt;</button>
 
 		&nbsp;
 
@@ -219,8 +219,6 @@
 			<option value="updated"><?php echo __('Updated') ?></option>
 		</select>
 
-		&nbsp;
-
 		<select title="<?php echo __('Sort articles') ?>" 
 				name="order_by" onchange="viewModeChanged()">
 			<option selected="selected" value="default"><?php echo __('Default') ?></option>
-- 
2.39.5