www

commit 8f0bc38da3ad1f0a9f81098cee592437bdc93c8f
parent 40222ebf9378e5698c8af3bb3c59896f37f6960a
Author: Dan Stillman <dstillman@zotero.org>
Date:   Thu,  4 Feb 2010 04:45:29 +0000

- Use a different sync error icon for version cut-offs
- Use full sync error for icon tooltip


Diffstat:
M
chrome/content/zotero/xpcom/sync.js
 | 
17
++++++++++++++---
A
chrome/skin/default/zotero/bell_error.png
 | 
0

M
chrome/skin/default/zotero/overlay.css
 | 
9
+++++++--

3 files changed, 21 insertions(+), 5 deletions(-)
diff --git 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
Binary files differ.
diff --git 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;