diff --git a/NEWS b/NEWS
index 8c87d961..345d9f04 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@
2007-xx-xx:
* version 0.6
* THIS VERSION ONLY WORKS WITH FIREFOX 3.0
+ * merge the existing status bar with the standard FF status bar so that
+ security information and extension buttons are included
* added full zoom, and changed keybindings slightly for text zoom
* :buffer partial_string works now as in vim, and with ! even better
* new :time command for profiling
diff --git a/chrome/content/vimperator/default.css b/chrome/content/vimperator/default.css
index 3ec465c7..ae566269 100644
--- a/chrome/content/vimperator/default.css
+++ b/chrome/content/vimperator/default.css
@@ -124,7 +124,7 @@ fieldset.paypal {
* TODO: move to the standard location: chrome/skin/vimperator.css...if I can
* ever convince MS ;-) -- djk
*/
-#vimperator-toolbar {
+#vimperator-container {
font-family: monospace;
}
@@ -144,21 +144,30 @@ fieldset.paypal {
color: HighlightText !important;
}
+statusbarpanel {
+ -moz-appearance: none !important;
+ border: none !important;
+}
+#vimperator-statusline {
+ font-family: monospace;
+ margin: 0
+}
#vimperator-statusline > label {
padding: 0px 0px 0px 8px;
}
#vimperator-statusline > label:first-child {
padding: 0px;
}
-
-#vimperator-commandline {
- background-color: white;
+#vimperator-statusline-field-url {
+ background-color: transparent;
color: black;
}
-#vimperator-commandline-prompt {
+
+#vimperator-commandline {
/* FIXME: black on white or default skin colors? */
background-color: white;
color: black;
+ padding: 1px;
}
#vimperator-multiline-output {
@@ -170,9 +179,10 @@ fieldset.paypal {
background-color: black;
}
+/*
.status_insecure, .status_insecure * {
- background-color: transparent;
}
+*/
.status_secure, .status_secure * {
background-color: #B0FF00; /* light green */
color: black;
diff --git a/chrome/content/vimperator/options.js b/chrome/content/vimperator/options.js
index a73b949b..ef7beda5 100644
--- a/chrome/content/vimperator/options.js
+++ b/chrome/content/vimperator/options.js
@@ -407,9 +407,9 @@ function Options() //{{{
"m: menubar" +
"T: toolbar" +
"b: bookmark bar" +
- "s: original Firefox statusbar",
+ "s: statusbar",
setter: function(value) { Options.setPref("guioptions", value); setGuiOptions(value); },
- default_value: "",
+ default_value: "s",
validator: function (value) { if (/[^mTbs]/.test(value)) return false; else return true; }
}
));
diff --git a/chrome/content/vimperator/ui.js b/chrome/content/vimperator/ui.js
index 094688b3..3e741e1e 100644
--- a/chrome/content/vimperator/ui.js
+++ b/chrome/content/vimperator/ui.js
@@ -1005,6 +1005,8 @@ function StatusLine() //{{{
////////////////////// PRIVATE SECTION /////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////{{{
+ var status_bar = document.getElementById("status-bar");
+
// our status bar fields
var statusline_widget = document.getElementById("vimperator-statusline");
var url_widget = document.getElementById("vimperator-statusline-field-url");
@@ -1017,16 +1019,9 @@ function StatusLine() //{{{
////////////////////// PUBLIC SECTION //////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////{{{
- // use names for the color or "transparent" to remove color information
- this.setColor = function(color)
- {
- if (!color)
- color = "transparent";
- statusline_widget.setAttribute("style", "background-color: " + color);
- };
this.setClass = function(type)
{
- statusline_widget.setAttribute("class", "status_" + type);
+ status_bar.setAttribute("class", "chromeclass-status status_" + type);
};
this.updateUrl = function(url)
diff --git a/chrome/content/vimperator/vimperator.xul b/chrome/content/vimperator/vimperator.xul
index fa4b0ac7..cb52c380 100644
--- a/chrome/content/vimperator/vimperator.xul
+++ b/chrome/content/vimperator/vimperator.xul
@@ -58,70 +58,14 @@ the terms of any one of the MPL, the GPL or the LGPL.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+