From 00241871a99a2d1b1eae10586bf981ebf24867e3 Mon Sep 17 00:00:00 2001
From: ElbertF <info@elbertf.com>
Date: Tue, 27 Dec 2011 10:39:29 +1100
Subject: [PATCH] Added Firefox preferences

---
 adapters/firefox/content/js/adapter.js        | 167 +++++++++++++++---
 adapters/firefox/content/js/options.js        |  19 --
 .../xul/{options.xul => categories.xul}       | 147 +++------------
 adapters/firefox/content/xul/wappalyzer.xul   |  28 ++-
 .../firefox/defaults/preferences/defaults.js  |  64 ++++---
 adapters/firefox/install.rdf                  |   2 +
 adapters/firefox/locale/en-US/wappalyzer.dtd  |  69 ++++----
 adapters/firefox/skin/css/wappalyzer.css      |   9 +
 adapters/firefox/skin/images/gplus.ico        | Bin 0 -> 22382 bytes
 share/images/donate.png                       | Bin 0 -> 714 bytes
 share/images/feedback.png                     | Bin 0 -> 782 bytes
 share/images/github.ico                       | Bin 0 -> 1150 bytes
 share/images/options.png                      | Bin 0 -> 610 bytes
 share/images/twitter.ico                      | Bin 0 -> 1150 bytes
 share/js/wappalyzer.js                        |   1 +
 15 files changed, 271 insertions(+), 235 deletions(-)
 delete mode 100644 adapters/firefox/content/js/options.js
 rename adapters/firefox/content/xul/{options.xul => categories.xul} (53%)
 create mode 100644 adapters/firefox/skin/images/gplus.ico
 create mode 100644 share/images/donate.png
 create mode 100644 share/images/feedback.png
 create mode 100644 share/images/github.ico
 create mode 100644 share/images/options.png
 create mode 100644 share/images/twitter.ico

diff --git a/adapters/firefox/content/js/adapter.js b/adapters/firefox/content/js/adapter.js
index efddd488f..46347c6e8 100644
--- a/adapters/firefox/content/js/adapter.js
+++ b/adapters/firefox/content/js/adapter.js
@@ -7,16 +7,18 @@
 
 	var w = wappalyzer;
 
-	var $, strings;
+	var $, prefs, strings;
 
 	w.adapter = {
 		/**
 		 * Log messages to console
 		 */
 		log: function(args) {
-			var consoleService = Components.classes["@mozilla.org/consoleservice;1"].getService(Components.interfaces.nsIConsoleService);
+			if ( prefs != null && prefs.getBoolPref('debug') ) {
+				var consoleService = Components.classes['@mozilla.org/consoleservice;1'].getService(Components.interfaces.nsIConsoleService);
 
-			consoleService.logStringMessage(args.message);
+				consoleService.logStringMessage(args.message);
+			}
 		},
 
 		/**
@@ -31,8 +33,6 @@
 				strings = document.getElementById('wappalyzer-strings');
 
 				AddonManager.getAddonByID('wappalyzer@crunchlabz.com', function(addon) {
-					addon.version = addon.version;
-
 					// Load jQuery
 					(function () {
 						var window;
@@ -42,6 +42,22 @@
 						$ = jQuery.noConflict(true);
 					})();
 
+					// Preferences
+					prefs = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces.nsIPrefService).getBranch('extensions.wappalyzer.');
+
+					container();
+
+					// Version check
+					addon.version = addon.version;
+
+					if ( !prefs.getCharPref('version') ) {
+						w.config.firstRun = true;
+					} else if ( prefs.getCharPref('version') != addon.version ) {
+						w.config.upgraded = true;
+					}
+
+					prefs.setCharPref('version', addon.version);
+
 					// Listen for messages from content script
 					messageManager.addMessageListener('wappalyzer', content);
 
@@ -56,7 +72,7 @@
 
 						// Get response headers
 						onStateChange: function(progress, request, flags, status) {
-							if ( flags & Components.interfaces.nsIWebProgressListener.STATE_STOP ) {
+							if ( request.nsIHttpChannel != null && flags & Components.interfaces.nsIWebProgressListener.STATE_STOP ) {
 								var headers = new Object();
 
 								request.nsIHttpChannel.visitResponseHeaders(function(header, value) {
@@ -83,38 +99,68 @@
 		displayApps: function() {
 			var url = gBrowser.currentURI.spec;
 
-			$('#wappalyzer-menu > menuitem, #wappalyzer-menu > menuseparator').remove();
+			$('#wappalyzer-container > image, #wappalyzer-menu > menuitem, #wappalyzer-menu > menuseparator').remove();
 
 			if ( w.detected[url] != null && w.detected[url].length ) {
-				$('#wappalyzer-icon').attr('src', 'chrome://wappalyzer/skin/images/icon16x16_hot.ico');
+				if ( !prefs.getBoolPref('showIcons') ) {
+					var image = $('<image/>')
+						.attr('src', 'chrome://wappalyzer/skin/images/icon16x16_hot.ico')
+						;
+
+					$('#wappalyzer-container').prepend(image);
+				}
 
 				w.detected[url].map(function(app, i) {
-					var menuSeparator = $('<menuseparator/>');
+					var display = false;
 
-					$('#wappalyzer-menu').append(menuSeparator);
+					for ( cat in w.apps[app].cats ) {
+						if ( prefs.getBoolPref('cat' + w.apps[app].cats[cat]) ) {
+							display = true;
 
-					var menuItem = $('<menuitem/>')
-						.attr('image', 'chrome://wappalyzer/skin/images/icons/' + app + '.ico')
-						.attr('label', app)
-						;
+							break;
+						}
+					}
 
-					menuItem.bind('command', function() {
-						w.adapter.goToURL({ url: w.config.websiteURL + 'stats/app/' + escape(app) });
-					});
+					if ( display ) {
+						if ( prefs.getBoolPref('showIcons') ) {
+							var image = $('<image/>')
+								.attr('src', 'chrome://wappalyzer/skin/images/icons/' + app + '.ico')
+								;
+
+							$('#wappalyzer-container').prepend(image);
+						}
 
-					$('#wappalyzer-menu').append(menuItem);
+						var menuSeparator = $('<menuseparator/>');
+
+						$('#wappalyzer-menu').append(menuSeparator);
 
-					for ( cat in w.apps[app].cats ) {
 						var menuItem = $('<menuitem/>')
-							.attr('disabled', 'true')
-							.attr('label', w.categories[cat].name)
+							.attr('image', 'chrome://wappalyzer/skin/images/icons/' + app + '.ico')
+							.attr('label', app)
 							;
 
+						menuItem.bind('command', function() {
+							w.adapter.goToURL({ url: w.config.websiteURL + 'stats/app/' + escape(app) });
+						});
+
 						$('#wappalyzer-menu').append(menuItem);
+
+						for ( cat in w.apps[app].cats ) {
+							var menuItem = $('<menuitem/>')
+								.attr('disabled', 'true')
+								.attr('label', w.categories[w.apps[app].cats[cat]].name)
+								;
+
+							$('#wappalyzer-menu').append(menuItem);
+						}
 					}
 				});
 			} else {
-				$('#wappalyzer-icon').attr('src', 'chrome://wappalyzer/skin/images/icon16x16.ico');
+				var image = $('<image/>')
+					.attr('src', 'chrome://wappalyzer/skin/images/icon16x16.ico')
+					;
+
+				$('#wappalyzer-container').prepend(image);
 
 				var menuSeparator = $('<menuseparator/>');
 
@@ -133,7 +179,7 @@
 		 * Go to URL
 		 */
 		goToURL: function(args) {
-			gBrowser.addTab(args.url);
+			gBrowser.selectedTab = gBrowser.addTab(args.url);
 		}
 	};
 
@@ -148,5 +194,80 @@
 		delete msg;
 	}
 
+	/**
+	 * Move container to address or addon bar
+	 */
+	function container() {
+		$('#wappalyzer-container')
+			.remove()
+			.prependTo(prefs.getBoolPref('addonBar') ? $('#wappalyzer-addonbar') : $('#urlbar-icons'));
+
+		// Menu items
+		var prefix = '#wappalyzer-menu-';
+
+		$(prefix + 'icons')
+			.attr('checked', prefs.getBoolPref('showIcons') ? 'true' : 'false')
+			.bind('command', function() {
+				prefs.setBoolPref('showIcons', !prefs.getBoolPref('showIcons'));
+
+				$(this).attr('checked', prefs.getBoolPref('showIcons') ? 'true' : 'false');
+
+				w.adapter.displayApps();
+			});
+
+		$(prefix + 'tracking'  )
+			.attr('checked', prefs.getBoolPref('tracking') ? 'true' : 'false')
+			.bind('command', function() {
+				prefs.setBoolPref('tracking', !prefs.getBoolPref('tracking'));
+
+				$(this).attr('checked', prefs.getBoolPref('tracking') ? 'true' : 'false');
+			});
+
+		$(prefix + 'addonbar'  )
+			.attr('checked', prefs.getBoolPref('addonBar') ? 'true' : 'false')
+			.bind('command', function() {
+				prefs.setBoolPref('addonBar', !prefs.getBoolPref('addonBar'));
+
+				$(this).attr('checked', prefs.getBoolPref('addonBar') ? 'true' : 'false');
+
+				container();
+			});
+
+		$(prefix + 'categories')
+			.bind('command', function() {
+				w.adapter.goToURL({ url: 'chrome://wappalyzer/content/xul/categories.xul' })
+			});
+
+		$(prefix + 'donate')
+			.bind('command', function() {
+				w.adapter.goToURL({ url: w.config.websiteURL + 'donate/' })
+			});
+
+		$(prefix + 'feedback')
+			.bind('command', function() {
+				w.adapter.goToURL({ url: w.config.websiteURL + '?redirect=feedback' })
+			});
+
+		$(prefix + 'website')
+			.bind('command', function() {
+				w.adapter.goToURL({ url: w.config.websiteURL })
+			});
+
+		$(prefix + 'github' )
+			.bind('command', function() {
+				w.adapter.goToURL({ url: w.config.githubURL })
+			});
+
+		$(prefix + 'twitter')
+			.bind('command', function() {
+				w.adapter.goToURL({ url: w.config.twitterURL})
+			});
+
+		$(prefix + 'gplus')
+			.bind('command', function() {
+				w.adapter.goToURL({ url: w.config.gplusURL })
+			});
+	}
+
 	w.init();
 })();
diff --git a/adapters/firefox/content/js/options.js b/adapters/firefox/content/js/options.js
deleted file mode 100644
index 292fdcda6..000000000
--- a/adapters/firefox/content/js/options.js
+++ /dev/null
@@ -1,19 +0,0 @@
-addEventListener('load', function() {
-	if ( typeof wappalyzer != undefined ) {
-		var preferences = document.getElementById('wappalyzer-options')
-			.getElementsByTagName('preferences')[0]
-			;
-
-		if ( preferences ) {
-			for ( i in wappalyzer.cats ) {
-				var preference = document.createElement('preference');
-
-				preference.setAttribute('id',   'wappalyzer-cat' + i);
-				preference.setAttribute('name', 'wappalyzer.cat' + i);
-				preference.setAttribute('type', 'bool');
-
-				preferences.appendChild(preference);
-			}
-		}
-	}
-}, false);
diff --git a/adapters/firefox/content/xul/options.xul b/adapters/firefox/content/xul/categories.xul
similarity index 53%
rename from adapters/firefox/content/xul/options.xul
rename to adapters/firefox/content/xul/categories.xul
index 15bd93743..cc6bf18c1 100755
--- a/adapters/firefox/content/xul/options.xul
+++ b/adapters/firefox/content/xul/categories.xul
@@ -1,103 +1,45 @@
 <?xml version="1.0"?>
 
 <?xml-stylesheet type="text/css" href="chrome://global/skin/"?>
-<?xml-stylesheet type="text/css" href="chrome://wappalyzer/skin/wappalyzer.css"?>
+<?xml-stylesheet type="text/css" href="chrome://wappalyzer/skin/css/wappalyzer.css"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://wappalyzer/locale/wappalyzer.dtd">
 
-<prefwindow
-	id="wappalyzer-options"
-	title="&wappalyzer.options;"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
-
-	<script type="application/x-javascript" src="chrome://wappalyzer/content/evaluate.js"/>
-	<script type="application/x-javascript" src="chrome://wappalyzer/content/apps.js"/>
-	<script type="application/x-javascript" src="chrome://wappalyzer/content/options.js"/>
-
-	<prefpane label="&wappalyzer.options;">
+<prefwindow id="wappalyzer-options" title="&wappalyzer.name; - &wappalyzer.categories;" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
+	<prefpane label="&wappalyzer.categories;">
 		<preferences>
-			<preference id="wappalyzer-location"        name="wappalyzer.location"       type="int"   />
-			<preference id="wappalyzer-enable-tracking" name="wappalyzer.enableTracking" type="bool"  />
-			<preference id="wappalyzer-show-apps"       name="wappalyzer.showApps"       type="int"   />
-			<preference id="wappalyzer-popup"           name="wappalyzer.popupOnHover"   type="bool"  />
-			<preference id="wappalyzer-custom-apps"     name="wappalyzer.customApps"     type="string"/>
-			<!-- Category preferences are injected by options.js -->
+			<preference id="wappalyzer-cat1"  name="extensions.wappalyzer.cat1"  type="bool"/>
+			<preference id="wappalyzer-cat2"  name="extensions.wappalyzer.cat2"  type="bool"/>
+			<preference id="wappalyzer-cat3"  name="extensions.wappalyzer.cat3"  type="bool"/>
+			<preference id="wappalyzer-cat4"  name="extensions.wappalyzer.cat4"  type="bool"/>
+			<preference id="wappalyzer-cat5"  name="extensions.wappalyzer.cat5"  type="bool"/>
+			<preference id="wappalyzer-cat6"  name="extensions.wappalyzer.cat6"  type="bool"/>
+			<preference id="wappalyzer-cat7"  name="extensions.wappalyzer.cat7"  type="bool"/>
+			<preference id="wappalyzer-cat8"  name="extensions.wappalyzer.cat8"  type="bool"/>
+			<preference id="wappalyzer-cat9"  name="extensions.wappalyzer.cat9"  type="bool"/>
+			<preference id="wappalyzer-cat10" name="extensions.wappalyzer.cat10" type="bool"/>
+			<preference id="wappalyzer-cat11" name="extensions.wappalyzer.cat11" type="bool"/>
+			<preference id="wappalyzer-cat12" name="extensions.wappalyzer.cat12" type="bool"/>
+			<preference id="wappalyzer-cat13" name="extensions.wappalyzer.cat13" type="bool"/>
+			<preference id="wappalyzer-cat14" name="extensions.wappalyzer.cat14" type="bool"/>
+			<preference id="wappalyzer-cat15" name="extensions.wappalyzer.cat15" type="bool"/>
+			<preference id="wappalyzer-cat16" name="extensions.wappalyzer.cat16" type="bool"/>
+			<preference id="wappalyzer-cat17" name="extensions.wappalyzer.cat17" type="bool"/>
+			<preference id="wappalyzer-cat18" name="extensions.wappalyzer.cat18" type="bool"/>
+			<preference id="wappalyzer-cat19" name="extensions.wappalyzer.cat19" type="bool"/>
+			<preference id="wappalyzer-cat20" name="extensions.wappalyzer.cat20" type="bool"/>
+			<preference id="wappalyzer-cat21" name="extensions.wappalyzer.cat21" type="bool"/>
+			<preference id="wappalyzer-cat22" name="extensions.wappalyzer.cat22" type="bool"/>
+			<preference id="wappalyzer-cat23" name="extensions.wappalyzer.cat23" type="bool"/>
+			<preference id="wappalyzer-cat24" name="extensions.wappalyzer.cat24" type="bool"/>
+			<preference id="wappalyzer-cat25" name="extensions.wappalyzer.cat25" type="bool"/>
 		</preferences>
 
 		<tabbox>
 			<tabs>
-				<tab label="&wappalyzer.general;"   />
 				<tab label="&wappalyzer.categories;"/>
-				<tab label="&wappalyzer.custom;"    />
 			</tabs>
 			<tabpanels>
-				<tabpanel id="tab-general">
-					<groupbox>
-						<grid>
-							<columns>
-								<column/>
-								<column flex="1"/>
-							</columns>
-							<rows>
-								<row>
-									<hbox align="center">
-										<label control="wappalyzer-location" value="&wappalyzer.location;:"/>
-									</hbox>
-									<hbox align="center">
-										<menulist preference="wappalyzer-location" id="wappalyzer-option-location">
-											<menupopup>
-												<menuitem label="&wappalyzer.addressBar;" value="0"/>
-												<menuitem label="&wappalyzer.statusBar;"  value="1"/>
-											</menupopup>
-										</menulist>
-									</hbox>
-								</row>
-								<row>
-									<hbox align="center">
-										<label control="wappalyzer-show-apps" value="&wappalyzer.showApps;:"/>
-									</hbox>
-									<hbox align="center">
-										<menulist preference="wappalyzer-show-apps" id="wappalyzer-show-apps">
-											<menupopup>
-												<menuitem label="&wappalyzer.labels;" value="0"/>
-												<menuitem label="&wappalyzer.icons;"  value="1"/>
-												<menuitem label="&wappalyzer.popup;"  value="2"/>
-											</menupopup>
-										</menulist>
-									</hbox>
-								</row>
-								<row>
-									<hbox align="center">
-										<label control="wappalyzer-popup" value="&wappalyzer.popupOnHover;:"/>
-									</hbox>
-									<hbox align="center">
-										<menulist preference="wappalyzer-popup" id="wappalyzer-popup">
-											<menupopup>
-												<menuitem label="&wappalyzer.onHover;" value="true" />
-												<menuitem label="&wappalyzer.onClick;" value="false"/>
-											</menupopup>
-										</menulist>
-									</hbox>
-								</row>
-							</rows>
-						</grid>
-
-						<separator/>
-
-						<grid>
-							<columns>
-								<column flex="1"/>
-							</columns>
-							<rows>
-								<row>
-									<hbox align="center">
-										<checkbox preference="wappalyzer-enable-tracking" id="wappalyzer-option-enable-tracking" label="&wappalyzer.enableTracking;"/>
-									</hbox>
-								</row>
-							</rows>
-						</grid>
-					</groupbox>
-				</tabpanel>
 				<tabpanel id="tab-categories">
 					<groupbox>
 						<grid>
@@ -191,8 +133,6 @@
 									<hbox align="center">
 										<checkbox preference="wappalyzer-cat23" id="wappalyzer-option-cat23" label="&wappalyzer.cat23;"/>
 									</hbox>
-								</row>
-								<row>
 									<hbox align="center">
 										<checkbox preference="wappalyzer-cat24" id="wappalyzer-option-cat24" label="&wappalyzer.cat24;"/>
 									</hbox>
@@ -206,37 +146,6 @@
 						</grid>
 					</groupbox>
 				</tabpanel>
-				<tabpanel id="tab-custom">
-					<groupbox>
-						<grid>
-							<columns>
-								<column flex="0"/>
-							</columns>
-							<rows>
-								<row>
-									<hbox align="center">
-										<description>&wappalyzer.customBody;</description>
-									</hbox>
-								</row>
-								<row>
-									<hbox align="center">
-										<label class="text-link" onclick="window.open('http://wappalyzer.com/custom/', 'helpWindow'); void(0);" value="&wappalyzer.customMoreInfo;"/>
-									</hbox>
-								</row>
-								<row>
-									<hbox align="center">
-										<textbox preference="wappalyzer-custom-apps" id="wappalyzer-option-custom-apps" multiline="true" rows="10" cols="60"></textbox>
-									</hbox>
-								</row>
-								<row>
-									<hbox align="center">
-										<button label="&wappalyzer.evaluate;" oncommand="wappalyzer.evaluateCustomApps(document.getElementById('wappalyzer-option-custom-apps').value, true);"/>
-									</hbox>
-								</row>
-							</rows>
-						</grid>
-					</groupbox>
-				</tabpanel>
 			</tabpanels>
 		</tabbox>
 	</prefpane>
diff --git a/adapters/firefox/content/xul/wappalyzer.xul b/adapters/firefox/content/xul/wappalyzer.xul
index 2c5e9c915..0c60aec4d 100755
--- a/adapters/firefox/content/xul/wappalyzer.xul
+++ b/adapters/firefox/content/xul/wappalyzer.xul
@@ -15,20 +15,25 @@
 
 	<hbox id="urlbar-icons">
 		<hbox id="wappalyzer-container" popup="wappalyzer-menu">
-			<image id="wappalyzer-icon" src="chrome://wappalyzer/skin/images/icon16x16.ico" label="&wappalyzer.name;"/>
-			
 			<menupopup id="wappalyzer-menu" position="after_end">
 				<menu label="&wappalyzer.name;">
 					<menupopup>
-						<menuitem label="&wappalyzer.options;"  oncommand="" image="chrome://wappalyzer/skin/images/options.png"/>
+						<menuitem id="wappalyzer-menu-icons"      label="&wappalyzer.showIcons;" />
+						<menuitem id="wappalyzer-menu-tracking"   label="&wappalyzer.tracking;"  />
+						<menuitem id="wappalyzer-menu-addonbar"   label="&wappalyzer.addonBar;"  />
+						<menuitem id="wappalyzer-menu-categories" label="&wappalyzer.categories;"/> 
 
 						<menuseparator/>
 
-						<menuitem label="&wappalyzer.donate;"   oncommand="wappalyzer.adapter.goToURL({ url: wappalyzer.config.websiteURL + 'donate/'            });" image="chrome://wappalyzer/skin/images/donate.png"/>
-						<menuitem label="&wappalyzer.feedback;" oncommand="wappalyzer.adapter.goToURL({ url: wappalyzer.config.websiteURL + '?redirect=feedback' });" image="chrome://wappalyzer/skin/images/feedback.png"/>
-						<menuitem label="&wappalyzer.github;"   oncommand="wappalyzer.adapter.goToURL({ url: wappalyzer.config.githubURL                         });" image="chrome://wappalyzer/skin/images/github.ico"/>
-						<menuitem label="&wappalyzer.twitter;"  oncommand="wappalyzer.adapter.goToURL({ url: wappalyzer.config.twitterURL                        });" image="chrome://wappalyzer/skin/images/twitter.ico"/>
-						<menuitem label="&wappalyzer.website;"  oncommand="wappalyzer.adapter.goToURL({ url: wappalyzer.config.websiteURL                        });" image="chrome://wappalyzer/skin/images/icon16x16_hot.ico"/>
+						<menuitem id="wappalyzer-menu-donate"     label="&wappalyzer.donate;"  />
+						<menuitem id="wappalyzer-menu-feedback"   label="&wappalyzer.feedback;"/>
+						<menuitem id="wappalyzer-menu-website"    label="&wappalyzer.website;" />
+
+						<menuseparator/>
+
+						<menuitem id="wappalyzer-menu-github"     label="&wappalyzer.github;"  image="chrome://wappalyzer/skin/images/github.ico" />
+						<menuitem id="wappalyzer-menu-twitter"    label="&wappalyzer.twitter;" image="chrome://wappalyzer/skin/images/twitter.ico"/>
+						<menuitem id="wappalyzer-menu-gplus"      label="&wappalyzer.gplus;"   image="chrome://wappalyzer/skin/images/gplus.ico"  />
 					</menupopup>
 				</menu>
 
@@ -36,4 +41,11 @@
 			</menupopup>
 		</hbox>
 	</hbox>
+
+	<statusbar id="status-bar">
+		<statusbarpanel
+			id="wappalyzer-addonbar"
+			popup="wappalyzer-menu"
+			/>
+	</statusbar>
 </overlay>
diff --git a/adapters/firefox/defaults/preferences/defaults.js b/adapters/firefox/defaults/preferences/defaults.js
index 9b78d3a7d..ae978ff25 100644
--- a/adapters/firefox/defaults/preferences/defaults.js
+++ b/adapters/firefox/defaults/preferences/defaults.js
@@ -1,35 +1,31 @@
-pref('extensions.wappalyzer.autoDetect',     true);
-pref('extensions.wappalyzer.debug',          false);
-pref('extensions.wappalyzer.location',       0);
-pref('extensions.wappalyzer.enableTracking', true);
-pref('extensions.wappalyzer.newInstall',     true);
-pref('extensions.wappalyzer.showApps',       1);
-pref('extensions.wappalyzer.customApps',     '');
-pref('extensions.wappalyzer.version',        '');
-pref('extensions.wappalyzer.popupOnHover',   true);
+pref('extensions.wappalyzer.debug',     false);
+pref('extensions.wappalyzer.showIcons', true);
+pref('extensions.wappalyzer.tracking',  true);
+pref('extensions.wappalyzer.addonBar',  false);
+pref('extensions.wappalyzer.version',   '');
 
-pref('extensions.wappalyzer.cat1',           true);
-pref('extensions.wappalyzer.cat2',           true);
-pref('extensions.wappalyzer.cat3',           true);
-pref('extensions.wappalyzer.cat4',           true);
-pref('extensions.wappalyzer.cat5',           true);
-pref('extensions.wappalyzer.cat6',           true);
-pref('extensions.wappalyzer.cat7',           true);
-pref('extensions.wappalyzer.cat8',           true);
-pref('extensions.wappalyzer.cat9',           true);
-pref('extensions.wappalyzer.cat10',          true);
-pref('extensions.wappalyzer.cat11',          true);
-pref('extensions.wappalyzer.cat12',          true);
-pref('extensions.wappalyzer.cat13',          true);
-pref('extensions.wappalyzer.cat14',          true);
-pref('extensions.wappalyzer.cat15',          true);
-pref('extensions.wappalyzer.cat16',          true);
-pref('extensions.wappalyzer.cat17',          true);
-pref('extensions.wappalyzer.cat18',          true);
-pref('extensions.wappalyzer.cat19',          true);
-pref('extensions.wappalyzer.cat20',          true);
-pref('extensions.wappalyzer.cat21',          true);
-pref('extensions.wappalyzer.cat22',          true);
-pref('extensions.wappalyzer.cat23',          true);
-pref('extensions.wappalyzer.cat24',          true);
-pref('extensions.wappalyzer.cat25',          true);
+pref('extensions.wappalyzer.cat1',      true);
+pref('extensions.wappalyzer.cat2',      true);
+pref('extensions.wappalyzer.cat3',      true);
+pref('extensions.wappalyzer.cat4',      true);
+pref('extensions.wappalyzer.cat5',      true);
+pref('extensions.wappalyzer.cat6',      true);
+pref('extensions.wappalyzer.cat7',      true);
+pref('extensions.wappalyzer.cat8',      true);
+pref('extensions.wappalyzer.cat9',      true);
+pref('extensions.wappalyzer.cat10',     true);
+pref('extensions.wappalyzer.cat11',     true);
+pref('extensions.wappalyzer.cat12',     true);
+pref('extensions.wappalyzer.cat13',     true);
+pref('extensions.wappalyzer.cat14',     true);
+pref('extensions.wappalyzer.cat15',     true);
+pref('extensions.wappalyzer.cat16',     true);
+pref('extensions.wappalyzer.cat17',     true);
+pref('extensions.wappalyzer.cat18',     true);
+pref('extensions.wappalyzer.cat19',     true);
+pref('extensions.wappalyzer.cat20',     true);
+pref('extensions.wappalyzer.cat21',     true);
+pref('extensions.wappalyzer.cat22',     true);
+pref('extensions.wappalyzer.cat23',     true);
+pref('extensions.wappalyzer.cat24',     true);
+pref('extensions.wappalyzer.cat25',     true);
diff --git a/adapters/firefox/install.rdf b/adapters/firefox/install.rdf
index 809cc20e6..6dbea9ba3 100644
--- a/adapters/firefox/install.rdf
+++ b/adapters/firefox/install.rdf
@@ -16,7 +16,9 @@
 			</Description>
 		</em:targetApplication>
 
+		<!--
 		<em:optionsURL>chrome://wappalyzer/content/options.xul</em:optionsURL>
+		-->
 
 		<em:name>Wappalyzer</em:name>
 		<em:description>Wappalyzer is an add-on for Firefox that uncovers the technologies used on websites.</em:description>
diff --git a/adapters/firefox/locale/en-US/wappalyzer.dtd b/adapters/firefox/locale/en-US/wappalyzer.dtd
index 6cbc2a825..a666969e5 100755
--- a/adapters/firefox/locale/en-US/wappalyzer.dtd
+++ b/adapters/firefox/locale/en-US/wappalyzer.dtd
@@ -1,34 +1,39 @@
-<!ENTITY wappalyzer.name           "Wappalyzer">
+<!ENTITY wappalyzer.name       "Wappalyzer">
 
-<!ENTITY wappalyzer.options        "Options">
-<!ENTITY wappalyzer.donate         "Donate!">
-<!ENTITY wappalyzer.feedback       "Feedback">
-<!ENTITY wappalyzer.github         "Fork on Github">
-<!ENTITY wappalyzer.twitter        "Twitter">
-<!ENTITY wappalyzer.website        "Visit Wappalyzer">
+<!ENTITY wappalyzer.showIcons  "Show application icons">
+<!ENTITY wappalyzer.tracking   "Allow anonymous tracking">
+<!ENTITY wappalyzer.addonBar   "Place in addon-bar">
+<!ENTITY wappalyzer.categories "Manage categories">
 
-<!ENTITY wappalyzer.cat1           "CMS">
-<!ENTITY wappalyzer.cat2           "Message boards">
-<!ENTITY wappalyzer.cat3           "Database managers">
-<!ENTITY wappalyzer.cat4           "Documentation tools">
-<!ENTITY wappalyzer.cat5           "Widgets">
-<!ENTITY wappalyzer.cat6           "Web shops">
-<!ENTITY wappalyzer.cat7           "Photo galleries">
-<!ENTITY wappalyzer.cat8           "Wikis">
-<!ENTITY wappalyzer.cat9           "Hosting panels">
-<!ENTITY wappalyzer.cat10          "Analytics">
-<!ENTITY wappalyzer.cat11          "Blogs">
-<!ENTITY wappalyzer.cat12          "JavaScript frameworks">
-<!ENTITY wappalyzer.cat13          "Issue trackers">
-<!ENTITY wappalyzer.cat14          "Video players">
-<!ENTITY wappalyzer.cat15          "Comment systems">
-<!ENTITY wappalyzer.cat16          "CAPTCHAs">
-<!ENTITY wappalyzer.cat17          "Font scripts">
-<!ENTITY wappalyzer.cat18          "Web frameworks">
-<!ENTITY wappalyzer.cat19          "Miscellaneous">
-<!ENTITY wappalyzer.cat20          "Editors">
-<!ENTITY wappalyzer.cat21          "LMS">
-<!ENTITY wappalyzer.cat22          "Web servers">
-<!ENTITY wappalyzer.cat23          "Cache tools">
-<!ENTITY wappalyzer.cat24          "Rich text editors">
-<!ENTITY wappalyzer.cat25          "Javascript Graphics">
+<!ENTITY wappalyzer.donate     "Donate!">
+<!ENTITY wappalyzer.feedback   "Feedback">
+<!ENTITY wappalyzer.github     "Fork on Github">
+<!ENTITY wappalyzer.twitter    "Twitter">
+<!ENTITY wappalyzer.gplus      "Google Plus">
+<!ENTITY wappalyzer.website    "Visit wappalyzer.com">
+
+<!ENTITY wappalyzer.cat1       "CMS">
+<!ENTITY wappalyzer.cat2       "Message boards">
+<!ENTITY wappalyzer.cat3       "Database managers">
+<!ENTITY wappalyzer.cat4       "Documentation tools">
+<!ENTITY wappalyzer.cat5       "Widgets">
+<!ENTITY wappalyzer.cat6       "Web shops">
+<!ENTITY wappalyzer.cat7       "Photo galleries">
+<!ENTITY wappalyzer.cat8       "Wikis">
+<!ENTITY wappalyzer.cat9       "Hosting panels">
+<!ENTITY wappalyzer.cat10      "Analytics">
+<!ENTITY wappalyzer.cat11      "Blogs">
+<!ENTITY wappalyzer.cat12      "JavaScript frameworks">
+<!ENTITY wappalyzer.cat13      "Issue trackers">
+<!ENTITY wappalyzer.cat14      "Video players">
+<!ENTITY wappalyzer.cat15      "Comment systems">
+<!ENTITY wappalyzer.cat16      "CAPTCHAs">
+<!ENTITY wappalyzer.cat17      "Font scripts">
+<!ENTITY wappalyzer.cat18      "Web frameworks">
+<!ENTITY wappalyzer.cat19      "Miscellaneous">
+<!ENTITY wappalyzer.cat20      "Editors">
+<!ENTITY wappalyzer.cat21      "LMS">
+<!ENTITY wappalyzer.cat22      "Web servers">
+<!ENTITY wappalyzer.cat23      "Cache tools">
+<!ENTITY wappalyzer.cat24      "Rich text editors">
+<!ENTITY wappalyzer.cat25      "Javascript Graphics">
diff --git a/adapters/firefox/skin/css/wappalyzer.css b/adapters/firefox/skin/css/wappalyzer.css
index e69de29bb..57ed47d34 100755
--- a/adapters/firefox/skin/css/wappalyzer.css
+++ b/adapters/firefox/skin/css/wappalyzer.css
@@ -0,0 +1,9 @@
+#wappalyzer-container {
+	margin: 0 3px;
+}
+
+	#wappalyzer-container > image {
+		height: 16px;
+		margin-left: 3px;
+		width: 16px;
+	}
diff --git a/adapters/firefox/skin/images/gplus.ico b/adapters/firefox/skin/images/gplus.ico
new file mode 100644
index 0000000000000000000000000000000000000000..7aae1e6a27eeeaec89e042c7c1bae51019b9431d
GIT binary patch
literal 22382
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

literal 0
HcmV?d00001

diff --git a/share/images/donate.png b/share/images/donate.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc60c5e1cd0dfd034d9e755302c9cd163d317a9b
GIT binary patch
literal 714
zcmV;*0yX`KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!TuDShR5;6}
zlg&%iQ51%s`<rq6nz2!libByO$dF3IR$&`Sk`_g^X;r&g3U0Fg0-=4hD2NCuj38ww
zFsy}Ogj5?dYcN3*KgMiy<~R4=b6NzGR<x+IJe>1zIPd!!Rpoyw`fI~IH*r;ZRp=I>
zLlsmQ7a^s>^~6cdZk{)rFL2LIrwX@BeP5$VcA&8uP><%8@R<q14+CitE>xe=(cb`W
z#GKM(=U}koJX*00zcGn~%c#qPDI+Lr#@K-H^8><#(bIM3^idIDM@)?>Gm+MNaS7J&
z`83#Xhzn7l{{a!jl-3g|ZRP9O#jFSoJJ0J%0H8u|(9j>(7)Y1~x6a7pC6EI60xzC{
z*eq`C9X|X>#lHTyczOW>01<jj^${eWMqLgS%dr#Xs94lnj&^2I2~nHHt-dCj+>3a6
ziYkcELTMF}TV?ufHJAjLU*u6m-3q&Fo&q7>(^v$kkW-hB;T<&%?Nrq6!32@5`{G$&
zc!RDDfhr<IeqP{7V{-=~MrAxlVtX?|v}6mw+YrAzj0q|bAH{}DZ~noMU7Ene>IuS8
z?8Y3h*`bPE`v}YTiB=sTw={z-FjSN=Gid5W_!K{KCoc9qZheMGvWJpn8>lB-d`V&U
zCXw=8n5yH<Jh_y0mZn2jbg^ip#rx(=w65zxS^a5<e8Xj4;d67S%VVMmB8h`|n#fEJ
zlbK4LZR^*Ezgc<yuIUobjmnn3##rrsf|3Bl;X=>){1jit2GY)Qx&5l9{+I=T+1n;A
wo<0$}y{E$!z*)wfCFLvwhp+u5O#f2f0aLAAZZV~`sQ>@~07*qoM6N<$g0=}oVE_OC

literal 0
HcmV?d00001

diff --git a/share/images/feedback.png b/share/images/feedback.png
new file mode 100644
index 0000000000000000000000000000000000000000..d22fde8ba46eabd4335e4fa88077e80f96b92d62
GIT binary patch
literal 782
zcmV+p1M&QcP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!ph-kQR5;6(
zlIu%TaTv#a(VOVK(H{^I6cQFlZ%j;$+>0XYhLR!1P*SpVQi>)dUV<_*6qInHGcnEb
zQfX6|c{lO4l#RKaZC-XZ&u-_k%Q@eEE?Qa!_Tt0u@H@}<^E~``A^=3}gr(l4vU*i7
zyV6Lx=4yE7RGGkx6gV71cjvY=iqb#p!ylZn>j-Cf+b>x95wMRT==lzjH$f681f9ze
zR{P)>$i_z3RfAovII&B>n%*Ds>XegyS_9EX5sW0f1d*FX&^tjGBX?Rzej4t{=ddW_
z9h>UH!(o9}TURNVdq{y5qM#$E1yaxnNWKtKkRh^p1YA9U=z#4*HY{(h_k{(nnF>pQ
znJ2Y6(rFb^z)nJ2p<svrP5v2);3J_8f^`b|7cqQTu=VwkPvlk+WXBQYX2|$jGWG(3
z?pYF;ByTW+fcrB9+bi(aJcwQj%ay03u)wa)HTyOvNcTnX<|5Le987mQm|i)Uo($Mq
zW#BDkVD&fPr>nqIQ&_2v{yl+xxUhm5uO{Q#!J8DY)klFd<r5x&HOR?%A8X|Y;aN(A
zB<W#o&xN60HWU^(M@tWE_R5z%i!I~<^`M(#LSfF51(r$!XUxM!O(aBi7_M&}(3Tz(
zES<SWckKcFr7&u}BbD|nw8Gh$`BOkTZ-+VKJ=mLNU^ETTmK+aIZJ9U!TBL1kpYl%|
zRJYgH8WX{*lOe7pLA1sppt%e~Q6%QdqTS~9JBfR4;xC3&Pm*gNXZV|IAEK`6ES{E}
zK|xMBuEn2})XI``|6Jvr6f5MEvZWPDWgF`18&Uo2C9WjL(|gtKDNy9x8XXuMgv~}{
zdU^)0o0^d#i`DI0FrcbPOSyD`O-MK|#l^)+7n5SS?uO#5eGC4FA2kmZ^8r4%O#lD@
M07*qoM6N<$f{2b{H2?qr

literal 0
HcmV?d00001

diff --git a/share/images/github.ico b/share/images/github.ico
new file mode 100644
index 0000000000000000000000000000000000000000..9db08f28661458b3b699bcb1dd261cba137c72e4
GIT binary patch
literal 1150
zcma)+Pe+7N6o+q`MWbj)k;tJatxBti+Vlb1MhtC=Xxp;%1zNRj6%o<4RT&~;Xxl3K
z0MROjdY-1s_4fBSo_Wtb=lt$_-}l~`lzR9y8j0^no3)fiQcBZ6icB}pB`s4M>hI$C
z4~<iw|HSyeTBq?I-YS^0_LJ%qF5nrq;SBN|55!ww?Huf_N^c9sU;*sQe($ZU*<)|1
zH3p9`2$x{}7P9|_ILjV;^<+7J6OO=V^gg?g{ino>kkuq8*YwIbKa>6rWN&$Oer2y7
z@8i4=pa#Hv>8ZwfFZJjx{j+~~oy&fe{jMRef0(!f)q9rX8S3Tw8KyRD7@!j<`^(sx
zvR6-*d+`MB%`xb4pYOo;?A6>pe7Aq3KhBGuRhTqUk?(B<?D1?><uiF^UtkBOAj|p8
zS+ghaHQ^WeENyVTo_8@eSDrbBzv^GV-_BCR^I*hPFHA)2&B16yqc0+AUHBJ?!#eq%
Nh*m4&`k?F4`wkg9e>DIA

literal 0
HcmV?d00001

diff --git a/share/images/options.png b/share/images/options.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c8213fef5ab969f03189d4367e32e597e38bd7f
GIT binary patch
literal 610
zcmV-o0-gPdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz^hrcPR5;6(
zlgn=sQ5ePfU;JB)8e@zrS1w(P(S@XGn&CAJ9Uu+`XB?mlZLpTs7)o14)NzKF$>^jb
z4`0v}DG1te)wmeb(>p90leRz?_mO+^JKy=v&2<29Od6?F%9%(c8los#f*@G`-%W&*
z$)uBj2i<NLrfDJ`kK<ed1a5RX9rXKs<nwt%qtWvT@H}tX)pcD5$8m~%77mBOvMhqZ
zpfyo|SpL^)wNNUR5Q#+Ig+d`UlgXgjY=Wlg@dB|}>@u-@SgX}gtyWPe6d*|w6h%R?
zScK2#Yn%$sum0cy>90DmY*i{1XqpClEtktsRTZ)<!|U}PxZQ5&37A>l<r4Wm_>CUe
z<<Bq-1G!ud48t7SmPu91<MA{oigKO^k+$K@9t!#&NFPnGYaPsp1_FV=U%%gf;WW3$
z8((^t6A1i@fN6PvC$E1ZTm22{=?-o&#{08!8cm+19gbh`LHb}~>FogV^*tm>8*AlX
za4oiR!&85LrobG57qUHUX#{>Vz(RHpB5|@>9O6N$jqB8>%($0wxE5R3)b>Y~xtCo$
zCgEk&A?_#IxHdN)9tqre^o{ho4{?hmPuf@^@I3-wncaRd%|~<Ge)vVRgIZCBcqR{V
wSNM)gGt<GxA>O3xbrKY=&TiwPYkJroM{;WUQTuMY8vp<R07*qoM6N<$g5pFD$^ZZW

literal 0
HcmV?d00001

diff --git a/share/images/twitter.ico b/share/images/twitter.ico
new file mode 100644
index 0000000000000000000000000000000000000000..00450d4fe367de0e7b12d251ee9965b32d2d0f5f
GIT binary patch
literal 1150
zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYJy!T<mN8K{N-{rkrc#P&d(
zfP_7OYz=&N0Oi?%IN;m+M-v|$?>l&9eZ;-18zSz3=zE8nj=#FSV+Bw?9f&2+%>jx1
z{Pv;Z?52X_+dAa_@9CBQe`K=a|5MYI{-2o%!KY^^{lB=v>-oo*S0<vH@#e|ptkv!2
z57za$p5Htzc>m%m>Hi>ej!jjB>xY?hYPR0@4==8CBfH_y+S<MkuOG@Ii`_dld-;iJ
znEFBPI62Se9ncL1$m(Hipg1TT!Y{0ixO)ny7G^IpeR8_u|7TZLEeEOtg|R(MFNpr}
z^}X7~O{rJU&ei`8vI}Geh(^{A;-6h)^X~M@@Ou~c^vs0m2b#qX^xH&`A3<SvXp+MJ
z{rw96k4;fTF#}{KNPJDB?EjmmR@A}te}4DS=D<{)?*}I;{NLFv50>9K-R(Sx4RSNg
z4WMw{)~o&X>Fp!-SC21G0O<$XE&uZV(S=*OwZ5*bm-)Y>UgO=#ZC#BZxy}6+PY+B`
z0Q&`G&h8%h{|A;N?S$D2q95Nn;xngI>i^DpiR)ly!sKt9T%NG5S@!?FJ_Rsd+a&w{
z$*m*yFnJISiofq)-t!}iA+z@{FPOiqM&|#zHm%POu57D8mLrx8au>)?C$>WTMXWyB
zt78D>e+GsJ_6!UM_!$@)*cliqfcOV91H%VkVex<wh=J^bKzzO(sJ0)7pF{M3^Z@`D
CO69Ns

literal 0
HcmV?d00001

diff --git a/share/js/wappalyzer.js b/share/js/wappalyzer.js
index abc06e846..6a9a9fbc2 100644
--- a/share/js/wappalyzer.js
+++ b/share/js/wappalyzer.js
@@ -38,6 +38,7 @@ var wappalyzer = wappalyzer || (function() {
 			websiteURL: 'http://wappalyzer.com/',
 			twitterURL: 'https://twitter.com/Wappalyzer',
 			githubURL:  'https://github.com/ElbertF/Wappalyzer',
+			gplusURL:   'https://plus.google.com/107008529118023432137/posts',
 
 			firstRun: false,
 			upgraded: false