removed search button, new options and welcome page

corbindavenport · Mar 29, 2014 · e161ab2 · e161ab2
1 parent 16b73ab
commit e161ab2
Show file tree

Hide file tree

Showing 8 changed files with 797 additions and 224 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 Wikipedia Search
 ================
-This extension allows you to type in a topic, click enter on your keyboard, and the article will appear in a new tab. Numerous Wikipedia extensions are available on the Chrome web store, but only this one opens results in the desktop Wikipedia. It opens the full blown site and not the dummed-down mobile version. Instant access to the millions of articles of articles on Wikipedia.
+This extension allows you to type the word 'wiki' into your search bar, press the space key, and search for an article on Wikipedia. Instant access to the millions of articles of articles on Wikipedia.
 
-You can aso select your language of choice from the Options page, with access to every language Wikipedia has to offer. Simply right click the Wikipedia button, select Options, select a language from the simple list, and click Save. After that, the next time you search it will send you to the Wikipedia site for the language you chose.
+You can aso select your language of choice from the Options page, with access to every language Wikipedia has to offer. Simply click the Chrome menu button, go to Tools > Extensions > Wikipedia Search > Options, select a language from the simple list, and click Save. After that, the next time you search it will send you to the Wikipedia site for the language you chose.
 
 Wikipedia Search is free to use in any browser extension, but I would like a link somewhere linking back to this Github page.
 
@@ -11,8 +11,10 @@ __Wikipedia is a trademark of the Wikimedia Foundation.__
 ---------------------------------------------------------
 __New in Wikipedia Serch 5.0:__
 * Search from the Chrome Omnibar by selecting it, typing 'wiki', pressing space, and start typing (Based on [OmniWiki](https://github.com/hamczu/OmniWiki))
+* Removal of the old search button
 * Right-click a word or phrase inside any web page and select 'Wikipedia Search' to lookup
 * Added new languages (Hayeren, Latina, Saxa Tyla, Cebuano, Srpskohrvatski)
+* New options screen with clean interface
 * Various bug fixes
 
 __New in Wikipedia Serch 4.1.1:__

diff --git a/background.js b/background.js
@@ -6,6 +6,17 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/.
 */
 
+// Update Message
+
+chrome.runtime.onInstalled.addListener(function(details){
+    if(details.reason == "install"){
+        console.log("This is a first install!");
+    }else if(details.reason == "update"){
+        var thisVersion = chrome.runtime.getManifest().version;
+        chrome.tabs.create({'url': chrome.extension.getURL('welcome.html')});
+    }
+});
+
 // Context Menu Search
 
 function onSearch(info, tab) {

diff --git a/index.html b/index.html
diff --git a/language.js b/language.js
@@ -10,11 +10,6 @@ function save_options() {
   var select = document.getElementById("language");
   var language = select.children[select.selectedIndex].value;
   localStorage["launguage"] = language;
-  var status = document.getElementById("status");
-  status.innerHTML = "Saved!";
-  setTimeout(function() {
-    status.innerHTML = "";
-  }, 750);
 }
 function restore_options() {
   var launguage = localStorage["launguage"];

diff --git a/manifest.json b/manifest.json
@@ -10,13 +10,8 @@ You should have received a copy of the GNU General Public License along with thi
 	"manifest_version": 2,
 	"name": "Wikipedia Search",
 	"version": "5.0",
-	"description": "Search Wikipedia in every language and open results in a new tab.",
+	"description": "Search Wikipedia in every language from the search bar.",
         "options_page": "options.html",
-	"browser_action":	{
-		"default_icon": "icon128.png",
-		"default_popup": "index.html",
-		"default_title": "Wikipedia Search"
-	},
 	"omnibox": {
     	"keyword": "wiki"
   	},

diff --git a/options.html b/options.html
@@ -8,76 +8,85 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Wikipedia Search - Options</title>
+<title>Wikipedia Search</title>
 <link rel="icon" type="image/png" href="icon16.png">
 <script src="language.js"></script>
 <link href="styles.css" rel="stylesheet" type="text/css">
 </head>
-<body class="options">
-<div align="center">
-	<img src="icon128.png">
-	<div id="content"><select size="10" id="language" name="language">
-<option value="ar" lang="ar">العربية</option><!-- Al-ʿArabīyah -->
-<option value="bg" lang="bg">Български</option><!-- Bulgarski -->
-<option value="ca" lang="ca">Català</option>
-<option value="cs" lang="cs">Česky</option>
-<option value="da" lang="da">Dansk</option>
-<option value="de" lang="de">Deutsch</option>
-<option value="en" lang="en" selected="selected">English</option>
-<option value="es" lang="es">Español</option>
-<option value="eo" lang="eo">Esperanto</option>
-<option value="et" lang="et">Eesti</option>
-<option value="eu" lang="eu">Euskara</option>
-<option value="fa" lang="fa">فارسی</option><!-- Fārsi -->
-<option value="fr" lang="fr">Français</option>
-<option value="gl" lang="gl">Galego</option>
-<option value="ko" lang="ko">한국어</option><!-- Hangugeo -->
-<option value="hy" lang="hy">Հայերեն</option><!-- Hayeren -->
-<option value="hi" lang="hi">हिन्दी</option><!-- Hindī -->
-<option value="hr" lang="hr">Hrvatski</option>
-<option value="id" lang="id">Bahasa Indonesia</option>
-<option value="it" lang="it">Italiano</option>
-<option value="he" lang="he">עברית</option><!-- ‘Ivrit -->
-<option value="la" lang="la">Latina</option>
-<option value="lt" lang="lt">Lietuvių</option>
-<option value="hu" lang="hu">Magyar</option>
-<option value="ms" lang="ms">Bahasa Melayu</option>
-<option value="min" lang="min">Baso Minangkabau</option>
-<option value="nl" lang="nl">Nederlands</option>
-<option value="ja" lang="ja">日本語</option><!-- Nihongo -->
-<option value="no" lang="nb">Norsk (bokmål)</option>
-<option value="nn" lang="nn">Norsk (nynorsk)</option>
-<option value="uz" lang="uz">Oʻzbekcha</option>
-<option value="pl" lang="pl">Polski</option>
-<option value="pt" lang="pt">Português</option>
-<option value="kk" lang="kk">Қазақша / Qazaqşa / قازاقشا</option>
-<option value="ro" lang="ro">Română</option>
-<option value="ru" lang="ru">Русский</option><!-- Russkiy -->
-<option value="sah" lang="sah">Саха Тыла</option><!-- Saxa Tyla -->
-<option value="simple" lang="en">Simple English</option>
-<option value="ceb" lang="ceb">Sinugboanong</option><!-- Cebuano -->
-<option value="sk" lang="sk">Slovenčina</option>
-<option value="sl" lang="sl">Slovenščina</option>
-<option value="sr" lang="sr">Српски / Srpski</option>
-<option value="sh" lang="sh">Srpskohrvatski / Српскохрватски</option>
-<option value="fi" lang="fi">Suomi</option>
-<option value="sv" lang="sv">Svenska</option>
-<option value="tr" lang="tr">Türkçe</option>
-<option value="uk" lang="uk">Українська</option><!-- Ukrayins’ka -->
-<option value="vi" lang="vi">Tiếng Việt</option>
-<option value="vo" lang="vo">Volapük</option>
-<option value="war" lang="war">Winaray</option>
-<option value="zh" lang="zh">中文</option><!-- Zhōngwén -->
-</select><table width="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr>
-    <td><div id="status"></div></td>
-    <td width="80"><input type="button" onClick="window.location.reload()" value="Cancel" /></td>
-    <td width="80" style="text-align:right"><input type="button" onClick="save_options()" value="Save" /></td>
-  </tr>
-</table>
-</div>
-</div>
-<div id="github-buttons"><iframe src="http://ghbtns.com/github-btn.html?user=corbindavenport&repo=wikipedia-search&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="110" height="20"></iframe><iframe src="http://ghbtns.com/github-btn.html?user=corbindavenport&repo=wikipedia-search&type=fork&count=true"
-  allowtransparency="true" frameborder="0" scrolling="0" width="95" height="20"></iframe></div>
+<body>
+	<section id="wrapper" class="wrapper enabled">
+    	<h1>Wikipedia Search - Settings</h1>
+    	<article>
+       	<section class="settings-card">
+        <h2>Language</h2>
+          <select size="8" id="language" name="language">
+				<option value="ar" lang="ar">العربية</option><!-- Al-ʿArabīyah -->
+				<option value="bg" lang="bg">Български</option><!-- Bulgarski -->
+				<option value="ca" lang="ca">Català</option>
+				<option value="cs" lang="cs">Česky</option>
+				<option value="da" lang="da">Dansk</option>
+				<option value="de" lang="de">Deutsch</option>
+				<option value="en" lang="en" selected="selected">English</option>
+				<option value="es" lang="es">Español</option>
+				<option value="eo" lang="eo">Esperanto</option>
+				<option value="et" lang="et">Eesti</option>
+				<option value="eu" lang="eu">Euskara</option>
+				<option value="fa" lang="fa">فارسی</option><!-- Fārsi -->
+				<option value="fr" lang="fr">Français</option>
+				<option value="gl" lang="gl">Galego</option>
+				<option value="ko" lang="ko">한국어</option><!-- Hangugeo -->
+				<option value="hy" lang="hy">Հայերեն</option><!-- Hayeren -->
+				<option value="hi" lang="hi">हिन्दी</option><!-- Hindī -->
+				<option value="hr" lang="hr">Hrvatski</option>
+				<option value="id" lang="id">Bahasa Indonesia</option>
+				<option value="it" lang="it">Italiano</option>
+				<option value="he" lang="he">עברית</option><!-- ‘Ivrit -->
+				<option value="la" lang="la">Latina</option>
+				<option value="lt" lang="lt">Lietuvių</option>
+				<option value="hu" lang="hu">Magyar</option>
+				<option value="ms" lang="ms">Bahasa Melayu</option>
+				<option value="min" lang="min">Baso Minangkabau</option>
+				<option value="nl" lang="nl">Nederlands</option>
+				<option value="ja" lang="ja">日本語</option><!-- Nihongo -->
+				<option value="no" lang="nb">Norsk (bokmål)</option>
+				<option value="nn" lang="nn">Norsk (nynorsk)</option>
+				<option value="uz" lang="uz">Oʻzbekcha</option>
+				<option value="pl" lang="pl">Polski</option>
+				<option value="pt" lang="pt">Português</option>
+				<option value="kk" lang="kk">Қазақша / Qazaqşa / قازاقشا</option>
+				<option value="ro" lang="ro">Română</option>
+				<option value="ru" lang="ru">Русский</option><!-- Russkiy -->
+				<option value="sah" lang="sah">Саха Тыла</option><!-- Saxa Tyla -->
+				<option value="simple" lang="en">Simple English</option>
+				<option value="ceb" lang="ceb">Sinugboanong</option><!-- Cebuano -->
+				<option value="sk" lang="sk">Slovenčina</option>
+				<option value="sl" lang="sl">Slovenščina</option>
+				<option value="sr" lang="sr">Српски / Srpski</option>
+				<option value="sh" lang="sh">Srpskohrvatski / Српскохрватски</option>
+				<option value="fi" lang="fi">Suomi</option>
+				<option value="sv" lang="sv">Svenska</option>
+				<option value="tr" lang="tr">Türkçe</option>
+				<option value="uk" lang="uk">Українська</option><!-- Ukrayins’ka -->
+				<option value="vi" lang="vi">Tiếng Việt</option>
+				<option value="vo" lang="vo">Volapük</option>
+				<option value="war" lang="war">Winaray</option>
+				<option value="zh" lang="zh">中文</option><!-- Zhōngwén -->
+			</select>
+        </section>
+        <section id="settings-buttons" class="buttons" style="display: block;">
+          <input class="g-button g-button-submit" type="button" onclick="save_options()" value="Save">
+        </section>
+      </article>
+
+      <article>
+        <h2>How it works</h2>
+        <p>You can search Wikipedia straight from Chrome's search bar.</p>
+        <p>Just type 'wiki', then a space, then the name of the article you want. Live suggestions from Wikipedia are automatically displayed as you type.</p>
+        <p>You can also right-click on any word or phrase on the web and pick 'Wikipedia Search' to open in Wikipedia.</p>
+        <p>Wikipedia Search is open-source under the GPLv3 license <a href="https://github.com/corbindavenport/wikipedia-search">on GitHub</a>. You can browse the code, help fix bugs, or even make your own Wikipedia Search!</p>
+        <iframe src="http://ghbtns.com/github-btn.html?user=corbindavenport&repo=wikipedia-search&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="110" height="20"></iframe><iframe src="http://ghbtns.com/github-btn.html?user=corbindavenport&repo=wikipedia-search&type=fork&count=true"
+  allowtransparency="true" frameborder="0" scrolling="0" width="95" height="20"></iframe>
+      </article>
+    </section>
 </body>
 </html>