From f037e83763b1b62e048e1fc433d52b9564ce3ba0 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sat, 23 Aug 2014 11:40:25 +0100
Subject: Allow passing of keys to the underlying page.

---
 pages/options.html | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'pages/options.html')

diff --git a/pages/options.html b/pages/options.html
index b71625e8..fc0f189d 100644
--- a/pages/options.html
+++ b/pages/options.html
@@ -197,15 +197,30 @@
         </tr>
         <tr>
           <td colspan="3">
-              Excluded URLs<br/>
+              Excluded URLs and keys<br/>
               <div class="help">
                 <div class="example">
-                  e.g. http*://mail.google.com/*<br/>
-                  This will disable Vimium on Gmail.<br/><br/>
-                  Enter one URL per line.<br/>
+                  <p>
+                    To disable Vimium on a site, use:<br/>
+                    <tt>http*://mail.google.com/*</tt><br/>
+                    This will <i>wholly disable</i> Vimium on Gmail.<br/><br/>
+                    To use Vimium together with a website's own<br/>
+                    key bindings, use:<br/>
+                    <tt>http*://mail.google.com/* jknpc</tt><br/>
+                    This will <i>enable</i> Vimium on Gmail, but pass<br/>
+                    the five listed keys through to Gmail itself.<br/><br/>
+                    One entry per line.<br/>
+                  </p>
                 </div>
               </div>
-              <textarea id="excludedUrls"></textarea>
+              <!-- Hack: fix a minimum size for the text area (below) so that it is
+                   not too much smaller than its help text (above). -->
+              <!-- FIXME:
+                   This text area should really be broken out into an array
+                   separate inputs.  However, the whole options page really
+                   needs a workover, so I'm leaving it like this, for now
+                   (Steve, 23 Aug, 14). -->
+              <textarea id="excludedUrls" style="min-height:180px"></textarea>
           </td>
         </tr>
         <tbody id='advancedOptions'>
-- 
cgit v1.2.3