From 36d146f8e234bf0b74f3d937fa4e1b47b9b58935 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Fri, 19 Feb 2010 23:33:15 +0300
Subject: [PATCH] notifier: fix icons; support single-user mode

---
 utils/notifier/background.html   |  21 +++++++++++++++------
 utils/notifier/images/alert.png  | Bin 477 -> 1097 bytes
 utils/notifier/images/alert2.png | Bin 263 -> 0 bytes
 utils/notifier/images/error.png  | Bin 496 -> 1112 bytes
 utils/notifier/manifest.json     |   2 +-
 utils/notifier/options.html      |  20 ++++++++++++++++++++
 6 files changed, 36 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 utils/notifier/images/alert.png
 delete mode 100644 utils/notifier/images/alert2.png
 mode change 100644 => 100755 utils/notifier/images/error.png

diff --git a/utils/notifier/background.html b/utils/notifier/background.html
index fdca37e9..bee00560 100644
--- a/utils/notifier/background.html
+++ b/utils/notifier/background.html
@@ -14,6 +14,9 @@ function param_escape(arg) {
 function update() {
 	var d = new Date();
 	var login = localStorage["login"];
+	var single_user = localStorage["single_user"];
+
+	if (single_user == "1") login = "admin";
 
 	var requestUrl = localStorage["site_url"] + "/backend.php";
 	var params = "op=getUnread&fresh=1&login=" + param_escape(login);
@@ -33,6 +36,12 @@ function update() {
 			var badge = new Object();
 			var badge_color = new Object();
 
+			// init stuff
+			icon.path = "images/normal.png";
+			title.title = "";	
+			badge.text = "";
+			badge_color.color = [0, 0, 0, 0];
+
 			var show_badge = localStorage["show_badge"] == "1";
 			var show_fresh = localStorage["show_fresh"] == "1";
 		
@@ -41,21 +50,24 @@ function update() {
 
 				var unread = parseInt(response[0]);
 
-				var fresh;
+				if (isNaN(unread)) unread = 0;
 
+				var fresh;
+	
 				if (response.length == 2)
 					fresh = parseInt(response[1]);
 				else
 					fresh = 0;
 
+				if (isNaN(fresh)) fresh = 0;
+
 				if (unread > 0) {
 					icon.path = "images/alert.png";
 					title.title = "You have %s unread articles.".replace("%s", unread);
 
-					if (show_fresh) {
+					if (show_fresh && fresh > 0) {
 						badge.text = fresh + "";
 						badge_color.color = [0, 200, 0, 255];
-
 					} else {
 						badge.text = unread + "";
 						badge_color.color = [255, 0, 0, 255];
@@ -67,12 +79,9 @@ function update() {
 					var errorMsg = xhr.responseText.split(";")[1];
 
 					title.title = "Error: %s.".replace("%s", errorMsg.trim());
-					badge.text = "";
 
 				} else {
-					icon.path = "images/normal.png";
 					title.title = "You have no unread articles.";
-					badge.text = "";
 				}
 
 				localStorage["last_updated"] = d.getTime();
diff --git a/utils/notifier/images/alert.png b/utils/notifier/images/alert.png
old mode 100644
new mode 100755
index 7922898fb5282eeadd2dab3ecf08123ab9de2cc8..f021b76fc2bf852a7acadecdc7d0b2a37936b2b4
GIT binary patch
literal 1097
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC
z{oH>NSs56Z83KGlT>nqv{6A0S-_hFN@9zJ8`{4IGAbRxs{o_CH9{hR#==X;wzdt<v
z{ps1C4^RGlc>3q#vp*l7{{eD8z4-I#<)6>5{(OG@=gX@<Uta(D`sUBqw|~C9|NH&p
z-yfg<{`~Uq=hweKzy165_3y85e}8}f`|HQwKR^He`St(*f1qPV!Dt8!h7gEfz}W(H
z2WNptWHAE+w-5+3Ub<WN2Pnv1;_2(kevOlxU0a=H`ny!1kbH@2L`iUdT1k0gQ7S_~
zVrE{6o}X)of;|{080(qp8C9;Eb_l3+il>WXh(>Vixj>;N1rdjf>WMQ`rLvX;%o6z>
zpCtbKl=b5Vb{5s!DmS06f5YzdzLb%}n?q=E%YhumWz#i87ccs0$;f~H*Q|>7jL$6^
z%!|%3Dyw=twqRmbP1wQDoUryS<JFt@?pYm}aZTkx&o)zsU~|*!%c9qPmD~{$I<v0D
wclj!oZzUe`Cnid6xE%F-=QURUIELB#o~iRcQv6i-4Cp=vPgg&ebxsLQ0Evs+D*ylh

delta 469
zcmV;`0V@8<2;BoniBL{Q4GJ0x0000DNk~Le0000K0000K2nGNE0F8+q4FCWD24YJ`
zL;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_lV1ZBe*tPqL_t(I%iWW|O2beT
z#(yVvX&1rK#ifIG4KD6JhA6f;2yPji90XsW1rddcZ{Sln_y7gL!Kt%Qk#@NEbGT{J
zBy9v;#Ixj(d-MG}C-B$H=8cAJ{R-&#)c_icFLgNj8Q4Q7>l>BR1)X-iUO4in?||jD
zmQ+!p_ZV7Ce*(@v!*kFADLn@vkb$W{P*mtWGKg+AP@JGR$u28Su;;5>{q8vkq!oHK
zY|G6)<fap;-&Ae&n{u;>+;k#0n`m*MC50~U2d%2*lACho)eP|<aJ?~R5Z!GSF?!=X
zVfoNo4PeH)gc(5cd8P=%P@O_cS;NOAusFfILuSlnf6g7PwyZS6bREhS-EU>RJ9-P=
zOUzNxvVv{-utIT?tKYi}1DX#B2i^shD*=^)$svV{db+4)87IgqBd+;VTxug^<T@v;
zjczL|;}2c}>33@rY*;>J1Gm$K?QXE0&LdN0RQ~G%VB>M0|6gA=S<&pptc5%P0000<
LMNUMn143Ye5^cqZ

diff --git a/utils/notifier/images/alert2.png b/utils/notifier/images/alert2.png
deleted file mode 100644
index 450c8eed02c86f9ec3b98de3e1133ea9ae962a0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 263
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VTavfC3y=napU%7MffQ$fM`SSr
z1Gg{;GcwGYBLNg-FY)wsWxvMB&CM@pd_UO^C^W^>#WBR<baH~kn+CyiQQ!XCyQ;Yw
z8W|ZF7;I4J{@br|IrOw(j#!eYP`0A5BI|!;&tgk%z3Gvi4hB3CodyOG@7+H1@0ygL
zV8(l*=F0+wQw}rKW|V)Fbh_XW(-xo_<iYA9-67+sQay7<N$2U`I!AVO-H1?ok@{qd
zd(ZceyFRSYKH?CRG&@1!(J4U}NspXIvbTV~YE-Ovp&VcXbRUDKtDnm{r-UW|Q5RH5

diff --git a/utils/notifier/images/error.png b/utils/notifier/images/error.png
old mode 100644
new mode 100755
index 17eadd965ed56e99f5ada4029f83ee6466f6aaa7..b9d7be0fb9f53180ad9086ed1e278c4d265513e2
GIT binary patch
literal 1112
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC
z{oH>NSs56Z83KGlT>tZP{?}Ih+f@Ji{{7z%AN_v#`1j){zaKyS{q)(N2ao<ddh+MV
zvp>&(==q;#FMhvx{^!MuKQCVXdGYGc>sNnXz5e_9&EMB=|Gatg=gr%{Z{PiS_wMie
z4}U+r|MTI)-;baEe*W_J%jdsezyAC7?eDkmf4~3u`{Vn+A3*Zw-=Dw!{`&dv*RQ|7
zfB*mgALzVMFd72%4}oU8=QDt|au#?*7Bet#3xP1>rMq>1fP(BLp1!W^*EqS^b>u`Y
ze^><+k}q+MC<)F_D=AMbN@WO0%*-p%^K%VRum=MLV?9$nqsn#D4gr-e_H=O!(Fl$`
z_gbh)L4ftaR2I|CXEaz?bxn7D_;>#L!n&t36WQ!;#A-ygPP!gHNnYSn&2iZS_xCOr
zI8nXdM(lu%V6vjY6SK1ouN!{nXUMoU6lXLDKbpfFk^P%v?pv$d%sqxyO&6mwnJu)h
zGTm_9`bvedRQEN<3&p2`7eahnHx`~+XT|U>b>{K@2Z3?V8hlcmjxgQgn#gE2=d;Pv
fJqNtF4`|7=s0dblcbj4ebS{IZtDnm{r-UW|2w3vZ

delta 488
zcmV<E0T=$*2=D_)iBL{Q4GJ0x0000DNk~Le0000K0000K2nGNE0F8+q4FCWD24YJ`
zL;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_lV1ZBe*t|-L_t(I%iWW)Y8yci
zhQC>>u^TBxAOwS(xKiV%aFus3A;}Y5I9CQiAmC?k;a3U-RcewnF47nzr$~0^PqC-F
zTb-mLZj1+xo12;Y_n-M^;i;Rg9ZgU5D4_Ym07m_wzRv#->}=Zlqd~UE(_W5?l>fR1
z3z&8{Q!;clf5p}X?|<j_<Ol@j-kj@T2cXoi-eBlLi16wKUe&0o3F}l<!}XW80sC|b
zBxJUos-~w(4-ZPql{7xoUK<}Ot(Hp5mC|adzMv(;m^y!QG;FzVN#($|&JYJd`f-OL
z!pZA$BH!<jfeCQW{sw5tF!@%s+mIad?r<X@+r!Y3f42pqtn{kJl8|*<AVoG2%a&8j
zPB;LM1BT(vao5b^X9jjJYuNmBwU1YIm${l{fz~3$zYt@d`%Xaj3>G75Zi9cG4VZdW
zBjvr#YVT}0HEI}0_`8pU+nd44=-VQz4EtwD`~zXslUVr0d;H=<7EQ|kOHGOL3he?M
ey*=mo7TZ6pvft9I)CIBt0000<MNUMnLSTZnnA`6F

diff --git a/utils/notifier/manifest.json b/utils/notifier/manifest.json
index 9142910c..191842a3 100644
--- a/utils/notifier/manifest.json
+++ b/utils/notifier/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "Tiny Tiny RSS Notifier",
   "background_page": "background.html",
-  "version": "0.3",
+  "version": "0.4",
   "description": "This extension displays the number of unread articles in your Tiny Tiny RSS installation",
   "options_page": "options.html",
   "icons": { "48": "images/icon.png", "128": "images/icon.png" },
diff --git a/utils/notifier/options.html b/utils/notifier/options.html
index 014c2a3c..af7de024 100644
--- a/utils/notifier/options.html
+++ b/utils/notifier/options.html
@@ -39,6 +39,7 @@ function save() {
 
 	localStorage['show_badge'] = (f.show_badge.checked) ? "1" : "0";
 	localStorage['show_fresh'] = (f.show_fresh.checked) ? "1" : "0";
+	localStorage['single_user'] = (f.single_user.checked) ? "1" : "0";
 
 	var d = new Date();
 
@@ -49,6 +50,12 @@ function save() {
 	return false;
 }
 
+function single_user_toggle() {
+	var f = document.forms['options'];
+
+	f.login.disabled = f.single_user.checked;
+}
+
 function init() {
 	var f = document.forms['options'];
 
@@ -77,6 +84,13 @@ function init() {
 	else
 		f.show_fresh.checked = false;
 
+	if (localStorage['single_user'])
+		f.single_user.checked = localStorage['single_user'] == "1";
+	else
+		f.single_user.checked = false;
+
+	single_user_toggle();
+
 	var last_updated = $('last_updated');
 
 	var d = new Date();
@@ -141,6 +155,12 @@ fieldset span.note {
 			<input name="login" size="30" value=""/>
 		</fieldset>
 
+		<fieldset>
+			<label>Single-user mode:</label>
+			<input name="single_user" onchange="single_user_toggle()" 
+				type="checkbox"  value="1"/>
+		</fieldset>
+
 		<fieldset>
 			<label>Update interval (in minutes):</label>
 			<input name="update_interval" size="30" value=""/>
-- 
2.39.5