remove close button and now displays blocking status using the toolba…

…r icon badge
thbishop · Dec 27, 2010 · 9d14e7b · 9d14e7b
1 parent f1c639c
commit 9d14e7b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 21 deletions.
diff --git a/css/style.css b/css/style.css
@@ -36,14 +36,6 @@
   list-style-type: none;
 }
 
-#close_container{
-  text-align: center;
-}
-
-#close_window_button {
-  width: 110px;
-}
-
 .med_button {
   padding: 2px 0px;
   width: 110px;

diff --git a/js/app.js b/js/app.js
@@ -105,21 +105,23 @@ function registerBlockedUrlsRemoveButtons() {
 }
 
 // handles the text and style of our block sites button
-function fillAndStyleBlockSitesButton() {
+function styleForCurrentBlockingState() {
   var sitesBlockElem = $('#block_sites_button');
   if (settings.all.blockSites) {
     if (sitesBlockElem.hasClass('green')) {
       sitesBlockElem.removeClass('green');
     }
-    sitesBlockElem.text("Don't Block Sites"); 
+    sitesBlockElem.text("Disable Site Blocking"); 
     sitesBlockElem.addClass('red');
+    toggleBadge([255, 0, 0, 255], '    ');
   }
   else {
     if (sitesBlockElem.hasClass('red')) {
       sitesBlockElem.removeClass('red');
     }
-    sitesBlockElem.text("Block Sites");
+    sitesBlockElem.text("Enable Site Blocking");
     sitesBlockElem.addClass('green');
+    toggleBadge([119, 212, 42, 255], '    ');
   }
 }
 
@@ -134,11 +136,16 @@ function populateBlockedUrls() {
   registerBlockedUrlsRemoveButtons(); 
 }
 
+function toggleBadge(rgbColor, badgeText) {
+  chrome.browserAction.setBadgeBackgroundColor({'color': rgbColor});
+  chrome.browserAction.setBadgeText({'text': badgeText});
+}
+
 $(document).ready(function() {
   urlSet.load();
   settings.load();
 
-  fillAndStyleBlockSitesButton();
+  styleForCurrentBlockingState();
 
   populateBlockedUrls();
 
@@ -155,12 +162,7 @@ $(document).ready(function() {
   // handler to toggle site blocking
   $('#block_sites_button').click(function() {
     settings.toggle_site_blocking('#block_sites_button');
-    fillAndStyleBlockSitesButton();
-    window.close();
-  });
-
-  // handler to close the window
-  $('#close_window_button').click(function() {
+    styleForCurrentBlockingState();
     window.close();
   });
 

diff --git a/settings.html b/settings.html
@@ -14,9 +14,6 @@
         <button id='block_this_site_button' class='grey med_button'>Block this site</button>
       </div>
       <div id="blocked_sites"></div>
-      <div id='close_container'>
-        <button id='close_window_button' class='grey med_button'>Close</button>
-      </div>
     </div>
   </body>
 </html>