Added button to open options page from pageAction popup

_locales/de/messages.json

@@ -342,6 +342,10 @@
 		"message": "Benachrichtigungen deaktivieren",
 		"description": ""
 	},
+	"showOptions": {
+		"message": "Einstellungen anzeigen",
+		"description": ""
+	},
 	"displayCallingStack": {
 		"message": "Aufrufestack anzeigen",
 		"description": ""

_locales/en/messages.json

@@ -342,6 +342,10 @@
 		"message": "disable notifications",
 		"description": ""
 	},
+	"showOptions": {
+		"message": "display settings",
+		"description": ""
+	},
 	"displayCallingStack": {
 		"message": "display calling stack",
 		"description": ""

pageAction/gui.js

@@ -36,7 +36,7 @@
 	}();
 
 		
-	scope.createActionButtons = function createActionButtons(container, actions, data){
+	scope.createActionButtons = function createActionButtons(container, actions, data, horizontal){
 		actions.forEach(function(action, i){
 			var button = document.createElement("button");
 			button.className = action.name + " action";
@@ -52,7 +52,7 @@
 			}
 			button.addEventListener("click", action.callback.bind(undefined, data));
 			container.appendChild(button);
-			if (i % 3 === 2){
+			if (horizontal || i % 3 === 2){
 				container.appendChild(document.createElement("br"));
 			}
 		});

pageAction/pageAction.css

@@ -67,6 +67,10 @@ button.action img {
 	text-align: right;
 }
 
+#globalActions .action {
+	margin-bottom: 4px;
+}
+
 .notifications .fakedCanvasContent {
 	display: block;
 	width: 100%;

pageAction/pageAction.js

@@ -23,15 +23,30 @@
 
 		createActionButtons(
 			document.getElementById("globalActions"),
-			[{
-				name: "disableNotifications",
-				isIcon: true,
-				callback: function(){
-					settings.showNotifications = false;
-					window.close();
+			[
+				{
+					name: "showOptions",
+					isIcon: true,
+					callback: function(){
+						if (browser.runtime && browser.runtime.openOptionsPage){
+							browser.runtime.openOptionsPage();
+						}
+						else {
+							window.open(browser.extension.getURL("options/options.html"), "_blank");
+						}
+					}
+				},
+				{
+					name: "disableNotifications",
+					isIcon: true,
+					callback: function(){
+						settings.showNotifications = false;
+						window.close();
+					}
 				}
-			}],
-			undefined
+			],
+			undefined,
+			true
 		);
 		
 		if (!tabs.length){