diff --git a/chrome/content/zotero/bindings/guidancepanel.xml b/chrome/content/zotero/bindings/guidancepanel.xml
index 12f40106a..5a925e750 100644
--- a/chrome/content/zotero/bindings/guidancepanel.xml
+++ b/chrome/content/zotero/bindings/guidancepanel.xml
@@ -29,71 +29,130 @@
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/chrome/content/zotero/bindings/itembox.xml b/chrome/content/zotero/bindings/itembox.xml
index 8c91b6b98..750476f1f 100644
--- a/chrome/content/zotero/bindings/itembox.xml
+++ b/chrome/content/zotero/bindings/itembox.xml
@@ -1874,10 +1874,14 @@
if(field === 'creator') {
// Reset creator mode settings here so that flex attribute gets reset
this.switchCreatorMode(row, (otherFields.fieldMode ? 1 : 0), true);
-
+ Zotero.debug("HERE");
if(Zotero.ItemTypes.getName(this.item.itemTypeID) === "bookSection") {
+ Zotero.debug("YES");
var creatorTypeLabels = document.getAnonymousNodes(this)[0].getElementsByClassName("creator-type-label");
- document.getElementById("zotero-author-guidance").show(creatorTypeLabels[creatorTypeLabels.length-1]);
+ Zotero.debug(creatorTypeLabels[creatorTypeLabels.length-1] + "");
+ document.getElementById("zotero-author-guidance").show({
+ forEl: creatorTypeLabels[creatorTypeLabels.length-1]
+ });
}
}
diff --git a/chrome/content/zotero/browser.js b/chrome/content/zotero/browser.js
index 35ee64561..594bbfcfb 100644
--- a/chrome/content/zotero/browser.js
+++ b/chrome/content/zotero/browser.js
@@ -441,14 +441,6 @@ var Zotero_Browser = new function() {
button.tooltipText = tooltiptext;
if (state == tab.CAPTURE_STATE_TRANSLATABLE) {
button.classList.add('translate');
-
- // Show guidance panel if necessary
- if (inToolbar) {
- button.addEventListener("load", function() {
- document.getElementById("zotero-status-image-guidance").show();
- });
- }
- // TODO: Different guidance for web pages?
}
else {
button.classList.remove('translate');
diff --git a/chrome/content/zotero/icon.js b/chrome/content/zotero/icon.js
index de8708297..f5f401fc1 100644
--- a/chrome/content/zotero/icon.js
+++ b/chrome/content/zotero/icon.js
@@ -61,9 +61,10 @@ CustomizableUI.addListener({
var shortcut = Zotero.getString(
Zotero.isMac ? "general.keys.cmdShift" : "general.keys.ctrlShift"
) + Zotero.Prefs.get("keys.openZotero");
- document.getElementById("zotero-toolbar-button-guidance").show(
- null, Zotero.getString(property, shortcut)
- );
+ document.getElementById("zotero-main-button-guidance").show({
+ text: Zotero.getString(property, shortcut)
+ });
+ document.getElementById("zotero-save-button-guidance").show();
}
else if (id == getSingleID('save')) {
Zotero_Browser.updateStatus();
diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index 8c08dd644..f894ecc17 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -50,9 +50,12 @@
-
-
+
+
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index 90df69202..defa75cbc 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -999,12 +999,12 @@ connector.error.title = Zotero Connector Error
connector.standaloneOpen = Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
connector.loadInProgress = Zotero Standalone was launched but is not accessible. If you experienced an error opening Zotero Standalone, restart Firefox.
-firstRunGuidance.saveIcon = Zotero has found a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
firstRunGuidance.authorMenu = Zotero lets you specify editors and translators, too. You can turn an author into an editor or translator by selecting from this menu.
firstRunGuidance.quickFormat = Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Ctrl-\u2193 to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
firstRunGuidance.quickFormatMac = Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Cmd-\u2193 to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
firstRunGuidance.toolbarButton.new = Click here to open Zotero, or use the %S keyboard shortcut.
firstRunGuidance.toolbarButton.upgrade = The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.saveButton = Click this button to save any web page to your Zotero library. On some pages, Zotero will be able to save full details, including author and date.
styles.bibliography = Bibliography
styles.editor.save = Save Citation Style
diff --git a/chrome/skin/default/zotero/bindings/guidancepanel.css b/chrome/skin/default/zotero/bindings/guidancepanel.css
new file mode 100644
index 000000000..97eb0acef
--- /dev/null
+++ b/chrome/skin/default/zotero/bindings/guidancepanel.css
@@ -0,0 +1,51 @@
+stack {
+ max-width: 400px;
+ margin: 0;
+ padding: 0;
+}
+
+*[anonid=nav-buttons] {
+ -moz-box-align: end;
+ -moz-box-pack: end;
+}
+
+*[anonid=nav-buttons] > toolbarbutton {
+ width: 22px;
+ height: 22px;
+ border: 1px solid lightgray;
+ border-radius: 3px;
+ background-position: 5px 5px;
+ background-size: 10px;
+ background-repeat: no-repeat;
+ margin: 0;
+ margin-bottom: -7px;
+}
+
+*[anonid=nav-buttons] > toolbarbutton:hover {
+ border-color: var(--toolbarbutton-hover-bordercolor);
+ box-shadow: var(--toolbarbutton-hover-boxshadow);
+}
+
+*[anonid=nav-buttons] > toolbarbutton:active:hover {
+ border-color: var(--toolbarbutton-active-bordercolor);
+ box-shadow: var(--toolbarbutton-active-boxshadow);
+ transition-duration: 10ms;
+}
+
+*[anonid=back-button] {
+ background-image: url("chrome://zotero/skin/chevron-left_808080_32.png");
+}
+
+*[anonid=forward-button] {
+ margin-right: -16px;
+ background-image: url("chrome://zotero/skin/chevron-right_808080_32.png");
+}
+
+*[anonid=close-button-box] {
+ -moz-box-align: start;
+ -moz-box-pack: end;
+}
+
+*[anonid=close-button] {
+ margin: -16px -16px;
+}
diff --git a/chrome/skin/default/zotero/chevron-left_808080_32.png b/chrome/skin/default/zotero/chevron-left_808080_32.png
new file mode 100644
index 000000000..60613178f
Binary files /dev/null and b/chrome/skin/default/zotero/chevron-left_808080_32.png differ
diff --git a/chrome/skin/default/zotero/chevron-right_808080_32.png b/chrome/skin/default/zotero/chevron-right_808080_32.png
new file mode 100644
index 000000000..9c3b161c0
Binary files /dev/null and b/chrome/skin/default/zotero/chevron-right_808080_32.png differ
diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index 22e882884..089dc2db4 100644
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@@ -1,13 +1,3 @@
-#zotero-status-image {
- width: 16px;
- height: 16px;
- margin-right: 3px;
-}
-
-#zotero-status-image:not(.translate):not(:hover) {
- filter: grayscale(100%);
-}
-
#zotero-pane
{
min-height: 32px; /* must match value in ZoteroPane.updateTagSelectorSize() */