From 8f0bc38da3ad1f0a9f81098cee592437bdc93c8f Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 4 Feb 2010 04:45:29 +0000 Subject: [PATCH] - Use a different sync error icon for version cut-offs - Use full sync error for icon tooltip --- chrome/content/zotero/xpcom/sync.js | 17 ++++++++++++++--- chrome/skin/default/zotero/bell_error.png | Bin 0 -> 813 bytes chrome/skin/default/zotero/overlay.css | 9 +++++++-- 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 chrome/skin/default/zotero/bell_error.png diff --git a/chrome/content/zotero/xpcom/sync.js b/chrome/content/zotero/xpcom/sync.js index 1c7af5747a..b97d3c3c3c 100644 --- a/chrome/content/zotero/xpcom/sync.js +++ b/chrome/content/zotero/xpcom/sync.js @@ -785,9 +785,15 @@ Zotero.Sync.Runner = new function () { if (status == 'warning' || status == 'error') { icon.setAttribute('status', ''); warning.hidden = false; - warning.setAttribute('mode', status); - warning.setAttribute('error', status == 'error'); - warning.tooltipText = "A sync error occurred. Click to view details."; + if (Zotero.Sync.Server.upgradeRequired) { + Zotero.Sync.Server.upgradeRequired = false; + warning.setAttribute('mode', 'upgrade'); + buttonText = null; + } + else { + warning.setAttribute('mode', status); + } + warning.tooltipText = message; warning.onclick = function () { var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] .getService(Components.interfaces.nsIWindowMediator); @@ -1132,6 +1138,7 @@ Zotero.Sync.Server = new function () { this.canAutoResetClient = true; this.manualSyncRequired = false; + this.upgradeRequired = false; this.nextLocalSyncDate = false; this.apiVersion = 8; @@ -1823,6 +1830,10 @@ Zotero.Sync.Server = new function () { } } break; + + case 'UPGRADE_REQUIRED': + Zotero.Sync.Server.upgradeRequired = true; + break; } } } diff --git a/chrome/skin/default/zotero/bell_error.png b/chrome/skin/default/zotero/bell_error.png new file mode 100644 index 0000000000000000000000000000000000000000..a0ddc002810338ce423552488f54ff4bb590221d GIT binary patch literal 813 zcmV+|1JeA7P)CQtw$vWGj$RSg4MP#$JT9~>*(5N&#&*-6OANOx%eB+tcDd0+ph(OOzXSet)ue=n#fRxPKJ!7q4Td0;96nICJD&_1!IjO3|5$ zB?m6qJ0|JPj^WOKMAWJi)R#~rO?G5}x#h+&;9;Orbn?K3RQBnYtlT7BF%S3ddx+;E zzK5AgqM-}%ezvFMqYrZN->*2k%otxsA%lG*M~%!Q2k}?GqPcJtab3bqk4-Ou*)vQk zDnq0+U6BWX8G8DGJ+wPN{OsFCkL?rG-p6duqJhu-)h6q87fEEXA3KI;W|2r(Z^=@p zLD1B~ww^3r>mIkSO_N9nU7BVaVE1;h?4`+#PGRTwuyWHvyat}HGo1$RhFq!L`k65F z>Fyq7{+3N`shc}8&i3)+G+Q8Ie$oM+J6S$aE8V+xclHZ*?tYS> z-Dcvo1MJ!NI;-mz1BEwXbC#J47fEMaq9}$_7)f>jfEP|x_O4XdO21tFlDt!(R$fHK zCp)|stFMiCRZt{<8WT42~V9+p44CDi|?-{ImoJvRNYc z_%M+doc!kO*b~N9Yn(YhF+cvs#i5va2MyPNzyFxTQVvTuuT#2w_R^MH2t7YJ`|*^k rqKHUbBZ;dBDypdXDyoQ}s)K(4xVc{-Vpqm500000NkvXXu0mjfWm$>@ literal 0 HcmV?d00001 diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css index 95122257d0..b88ed1d982 100644 --- a/chrome/skin/default/zotero/overlay.css +++ b/chrome/skin/default/zotero/overlay.css @@ -212,17 +212,22 @@ font-weight: bold; } -#zotero-tb-sync-warning +#zotero-tb-sync-warning, #zotero-tb-sync-warning[mode=warning] { list-style-image: url(chrome://zotero/skin/error.png); margin-right: -5px; } -#zotero-tb-sync-warning[error=true] +#zotero-tb-sync-warning[mode=error] { list-style-image: url(chrome://zotero/skin/exclamation.png); } +#zotero-tb-sync-warning[mode=upgrade] +{ + list-style-image: url(chrome://zotero/skin/bell_error.png); +} + #zotero-tb-sync { list-style-image: url(chrome://zotero/skin/arrow_rotate_static.png); margin-left: -2px;