Move a bunch of stuff under pages/ for tidiness.

Also correct a bug with the show / hide advanced commands button.

9 files changed, 9 insertions, 9 deletions

diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee
index 90220145..0d00f9ab 100644
--- a/background_scripts/main.coffee
+++ b/background_scripts/main.coffee
@@ -101,7 +101,7 @@ root.helpDialogHtml = (showUnboundCommands, showCommandNames, customTitle) ->
     command = Commands.keyToCommandRegistry[key].command
     commandsToKey[command] = (commandsToKey[command] || []).concat(key)
 
-  dialogHtml = fetchFileContents("help_dialog.html")
+  dialogHtml = fetchFileContents("pages/help_dialog.html")
   for group of Commands.commandGroups
     dialogHtml = dialogHtml.replace("{{#{group}}}",
         helpDialogHtmlForCommandGroup(group, commandsToKey, Commands.availableCommands,
@@ -501,7 +501,7 @@ shouldShowUpgradeMessage = ->
 
 openOptionsPageInNewTab = ->
   chrome.tabs.getSelected(null, (tab) ->
-    chrome.tabs.create({ url: chrome.extension.getURL("options/options.html"), index: tab.index + 1 }))
+    chrome.tabs.create({ url: chrome.extension.getURL("pages/options.html"), index: tab.index + 1 }))
 
 registerFrame = (request, sender) ->
   unless framesForTab[sender.tab.id]
diff --git a/vimium.css b/content_scripts/vimium.css
index 24619a30..24619a30 100644
--- a/vimium.css
+++ b/content_scripts/vimium.css
diff --git a/manifest.json b/manifest.json
index 04b97c1a..da497706 100644
--- a/manifest.json
+++ b/manifest.json
@@ -17,7 +17,7 @@
       "background_scripts/main.js"
     ]
   },
-  "options_page": "options/options.html",
+  "options_page": "pages/options.html",
   "permissions": [
     "tabs",
     "bookmarks",
@@ -39,13 +39,13 @@
              "content_scripts/marks.js",
              "content_scripts/vimium_frontend.js"
             ],
-      "css": ["vimium.css"],
+      "css": ["content_scripts/vimium.css"],
       "run_at": "document_start",
       "all_frames": true
     }
   ],
   "browser_action": {
     "default_icon": "icons/browser_action_disabled.png",
-    "default_popup": "popup.html"
+    "default_popup": "pages/popup.html"
   }
 }
diff --git a/help_dialog.html b/pages/help_dialog.html
index 2a69ea03..2a69ea03 100644
--- a/help_dialog.html
+++ b/pages/help_dialog.html
diff --git a/options/options.coffee b/pages/options.coffee
index abe3fee7..117ce4a6 100644
--- a/options/options.coffee
+++ b/pages/options.coffee
@@ -100,7 +100,7 @@ setFieldValue = (field, value) ->
 
 toggleAdvancedOptions = do (advancedMode=false) -> (event) ->
   if advancedMode
-    $("advancedOptions").style.display = "table-row-group"
+    $("advancedOptions").style.display = "none"
     $("advancedOptionsLink").innerHTML = "Show advanced options…"
   else
     $("advancedOptions").style.display = "table-row-group"
diff --git a/options/options.html b/pages/options.html
index f6059618..8c7c007a 100644
--- a/options/options.html
+++ b/pages/options.html
@@ -175,7 +175,7 @@
         border-top: 1px solid #eee;
       }
     </style>
-  <link rel="stylesheet" type="text/css" href="../vimium.css" />
+  <link rel="stylesheet" type="text/css" href="../content_scripts/vimium.css" />
 
   <script type="text/javascript" src="options.js"></script>
 
diff --git a/popup.html b/pages/popup.html
index c3cd3832..c3cd3832 100644
--- a/popup.html
+++ b/pages/popup.html
diff --git a/popup.js b/pages/popup.js
index 2c98e6ab..1ade3696 100644
--- a/popup.js
+++ b/pages/popup.js
@@ -1,5 +1,5 @@
 function onLoad() {
-  document.getElementById("optionsLink").setAttribute("href", chrome.extension.getURL("options/options.html"));
+  document.getElementById("optionsLink").setAttribute("href", chrome.extension.getURL("pages/options.html"));
   chrome.tabs.getSelected(null, function(tab) {
     // The common use case is to disable Vimium at the domain level.
     // This regexp will match "http://www.example.com/" from "http://www.example.com/path/to/page.html".
diff --git a/tests/dom_tests/dom_tests.html b/tests/dom_tests/dom_tests.html
index 898546dc..feddafac 100644
--- a/tests/dom_tests/dom_tests.html
+++ b/tests/dom_tests/dom_tests.html
@@ -26,7 +26,7 @@
         border-bottom: dashed 1px #999;
       }
     </style>
-    <link rel="stylesheet" type="text/css" href="../../vimium.css" />
+    <link rel="stylesheet" type="text/css" href="../../content_scripts/vimium.css" />
     <script type="text/javascript" src="bind.js"></script>
     <script type="text/javascript" src="chrome.js"></script>
     <script type="text/javascript" src="../../lib/utils.js"></script>