remove vestigial graph

full60mm · Jan 23, 2015 · 9314cb9 · 9314cb9
1 parent dd58f23
commit 9314cb9
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 18 deletions.
diff --git a/firefox/content/disconnect.safariextension/opera/chrome/stylesheets/embed.css b/firefox/content/disconnect.safariextension/opera/chrome/stylesheets/embed.css
@@ -325,19 +325,33 @@
 }
 
 #disconnect-dashboard .disconnect-label {
-  width: 66px;
-  height: 16px
+ width: 10px;
+ height: 16px;
+ padding-left: 31px;
+ padding-right: 0px;
+}
+
+#disconnect-dashboard .disconnect-label:last-child {
+ padding-left: 0px;
+ padding-right: 22px;
 }
 
 #disconnect-data { height: 44px }
 
 #disconnect-list #disconnect-tooltips { margin-top: -66px }
 
 #disconnect-list #disconnect-tooltips td {
-  width: 65px;
-  height: 66px
+  width: 25px;
+  height: 66px;
+  padding-left: 90px
 }
 
+#disconnect-list #disconnect-tooltips td:last-child {
+ padding-left: 0px;
+ padding-right: 2px;
+}
+
+
 #disconnect-list #disconnect-tooltips td:after {
   margin-top: 1px;
   font-size: 8px
@@ -348,7 +362,7 @@
 }
 
 #disconnect-list #disconnect-tooltips .disconnect-speed:after {
-  margin-left: -27px
+  margin-left: -5px
 }
 
 #disconnect-list #disconnect-tooltips .disconnect-bandwidth:before {

diff --git a/firefox/content/overlay.js b/firefox/content/overlay.js
@@ -623,7 +623,7 @@ if (typeof Disconnect == 'undefined') {
         dashboard.
           insert('svg:rect', '.disconnect-control.disconnect-speed').
           attr('class', 'disconnect-subtotal disconnect-speed').
-          attr('x', 29).
+          attr('x', 59).
           attr('y', 38 - speedHeight).
           attr('width', 8).
           attr('height', speedHeight).
@@ -632,7 +632,7 @@ if (typeof Disconnect == 'undefined') {
         dashboard.
           insert('svg:rect', '.disconnect-control.disconnect-bandwidth').
           attr('class', 'disconnect-subtotal disconnect-bandwidth').
-          attr('x', 95).
+          attr('x', 127).
           attr('y', 38 - bandwidthHeight).
           attr('width', 8).
           attr('height', bandwidthHeight).
@@ -678,6 +678,7 @@ if (typeof Disconnect == 'undefined') {
      * Outputs a secured request.
      */
     renderSecuredRequest: function(url, securedCount, totalCount) {
+      /*
       if (gBrowser.contentWindow.location == url) {
         Disconnect.
           d3.
@@ -705,6 +706,7 @@ if (typeof Disconnect == 'undefined') {
               (securedCount - 1 ? 's' : '');
         });
       }
+      */
     },
 
     /**
@@ -742,7 +744,7 @@ if (typeof Disconnect == 'undefined') {
             dashboard.
               insert('svg:rect', '.disconnect-subtotal.disconnect-speed').
               attr('class', 'disconnect-total disconnect-speed').
-              attr('x', 28).
+              attr('x', 58).
               attr('y', y).
               attr('width', 10).
               attr('height', height).
@@ -751,11 +753,12 @@ if (typeof Disconnect == 'undefined') {
             dashboard.
               insert('svg:rect', '.disconnect-subtotal.disconnect-bandwidth').
               attr('class', 'disconnect-total disconnect-bandwidth').
-              attr('x', 94).
+              attr('x', 126).
               attr('y', y).
               attr('width', 10).
               attr('height', height).
               attr('fill', '#ff7f00');
+            /*
             d3.select('.disconnect-total.disconnect-security').remove();
             dashboard.
               insert('svg:rect', '.disconnect-subtotal.disconnect-security').
@@ -765,6 +768,7 @@ if (typeof Disconnect == 'undefined') {
               attr('width', 10).
               attr('height', height).
               attr('fill', '#007fff');
+            */
           }
 
           if (index > 15) {
@@ -899,7 +903,15 @@ if (typeof Disconnect == 'undefined') {
       var currentBuild = 32;
       var previousBuild = preferences.getIntPref(buildName);
       var whitelist = preferences.getCharPref(whitelistName);
-      var aurora = navigator.userAgent.split('Firefox/', 2)[1] >= 29;
+      var modernFirefox;
+
+      try {
+        Components.utils.import("resource:///modules/CustomizableUI.jsm");
+        modernFirefox = true;
+      }
+      catch (e) {
+        modernFirefox = false;
+      }
 
       if (!whitelist) {
         whitelist = '{}';
@@ -943,7 +955,7 @@ if (typeof Disconnect == 'undefined') {
       }
 
       if (!previousBuild || previousBuild < 3) {
-        if (aurora) {
+        if (modernFirefox) {
           toolbar.insertItem(itemName);
           toolbar.setAttribute(currentSetName, toolbar.currentSet);
           document.persist(navbarName, currentSetName);
@@ -1324,7 +1336,7 @@ if (typeof Disconnect == 'undefined') {
             getElementsByTagName('html:input')[0];
       if (os == 'WINNT') button.add(badge).addClass('windows');
       else if (os == 'Linux') button.add(badge).addClass('linux');
-      aurora && button.parent().addClass('aurora');
+      modernFirefox && button.parent().addClass('aurora');
 
       tabs.addEventListener('TabOpen', function() {
         clearBadge(button, badge);
@@ -1439,7 +1451,7 @@ if (typeof Disconnect == 'undefined') {
         dashboard.
         append('svg:rect').
         attr('class', 'disconnect-control disconnect-speed').
-        attr('x', 10).
+        attr('x', 58).
         attr('y', 0).
         attr('width', 46).
         attr('height', 40).
@@ -1448,11 +1460,12 @@ if (typeof Disconnect == 'undefined') {
         dashboard.
         append('svg:rect').
         attr('class', 'disconnect-control disconnect-bandwidth').
-        attr('x', 76).
+        attr('x', 127).
         attr('y', 0).
         attr('width', 46).
         attr('height', 40).
         attr('fill', 'transparent');
+      /*
       this.
         dashboard.
         append('svg:rect').
@@ -1462,7 +1475,7 @@ if (typeof Disconnect == 'undefined') {
         attr('width', 46).
         attr('height', 40).
         attr('fill', 'transparent');
-
+      */
       document.getElementById('disconnect-popup').addEventListener(
         'popupshowing', function() {
           var url = gBrowser.contentWindow.location;

diff --git a/firefox/content/overlay.xul b/firefox/content/overlay.xul
@@ -154,9 +154,11 @@
                       <html:td class="disconnect-label">
                         Bandwidth saved
                       </html:td>
+                      <!-- 
                       <html:td class="disconnect-label">
                         Requests secured
                       </html:td>
+                      -->
                     </html:tr>
                     <html:tr>
                       <html:td colspan="3" id="disconnect-data"></html:td>
@@ -173,9 +175,6 @@
                 <html:td
                   class="disconnect-bandwidth hint--top hint--rounded hint--bounce"
                 ></html:td>
-                <html:td
-                  class="disconnect-security hint--top hint--rounded hint--bounce"
-                ></html:td>
               </html:tr>
             </html:table>
           </html:div>