Merge branch 'feature/chrome_ext' into develop

gregmalcolm · May 8, 2011 · ecc609b · ecc609b
2 parents 4d24a83 + d80e7ec
commit ecc609b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/extensions/chrome_ext/bookie-chrome.js b/extensions/chrome_ext/bookie-chrome.js
@@ -44,12 +44,20 @@
     $b.populateForm = function () {
         if (window.chrome !== undefined && chrome.tabs) {
             chrome.tabs.getSelected(null, $b.populateFormBase);
+
+            var api_url = $b.settings.get('api_url');
+            console.log('api_url');
+            console.log(api_url);
+
+            $('#bookie_site').attr('href', api_url).attr('title', api_url);
         } else {
             // when running unit tests the chrome stuff isn't available
             // so we have to fake it
             $b.populateFormBase({'url':window.location.href,
                 'title': "Testing stuff"
             });
+
+
         }
     };
 
@@ -129,6 +137,7 @@
         $b.log($);
         $($b.EVENTID).bind($b.events.LOAD, $b.events.onload);
         $($b.EVENTID).trigger($b.events.LOAD);
+
     };
 
     return $b;

diff --git a/extensions/chrome_ext/manifest.json b/extensions/chrome_ext/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Bookie",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Bookie Bookmarks",
   "permissions": [
     "tabs",

diff --git a/extensions/chrome_ext/popup.html b/extensions/chrome_ext/popup.html
@@ -129,7 +129,12 @@
         </style>
     </head>
     <body id="bmarkbody">
-        <h1>Post to Bookie</h1>
+        <div>
+            <span style="float: right;">
+                <a href="" title="" target="_blank" id="bookie_site"><img src="logo.16.png" /></a>
+            </span> 
+            <h1>Post to Bookie</h1>
+        </div>
         <form id="form" name="form">
             <input type="hidden" id="url" name="url" />
             <input type="text" id="description" placeholder="title" name="description" />