Merge pull request #2256 from 0ip/develop

Fix active button UI, when a popup is shown

src/static/css/pad.css

@@ -160,11 +160,11 @@ a img {
   border: 1px solid #ccc;
   outline: none;
 }
-#usericon a {
+li[data-key=showusers] > a {
   min-width: 30px;
   text-align: left;
 }
-#usericon a #online_count {
+li[data-key=showusers] > a #online_count {
   color: #777;
   font-size: 10px;
   position: relative;
@@ -814,7 +814,7 @@ input[type=checkbox] {
   float: left;
 }
 #settings,
-#importexport,
+#import_export,
 #embed,
 #connectivity,
 #users {
@@ -1070,15 +1070,4 @@ input[type=checkbox] {
   text-shadow: none;
 }
 
-/* End of gritter stuff */
-.activeButton{
-  background: #eee;
-  background: -webkit-linear-gradient(#ddd, #fff);
-  background: -moz-linear-gradient(#ddd, #fff);
-  background: -o-linear-gradient(#ddd, #fff);
-  background: -ms-linear-gradient(#ddd, #fff);
-  background: linear-gradient(#ddd, #fff);
-  -webkit-box-shadow: 0 0 8px rgba(0,0,0,.1) inset;
-  -moz-box-shadow: 0 0 8px rgba(0,0,0,.1) inset;
-  box-shadow: 0 0 8px rgba(0,0,0,.1) inset;
-}
+/* End of gritter stuff */

src/static/css/timeslider.css

@@ -158,17 +158,20 @@
   float: right
 }
 #settings,
-#importexport,
+#import_export,
 #embed,
 #connectivity,
 #users {
     top: 62px;
 }
-#importexport .popup {
-  width: 185px
+#import_export .popup {
+  width: 183px;
+  border-top: none;
+  border-right: none;
+  border-radius: 0 0 0 6px;
 }
-#importexport {
-  top: 118px;
+#import_export {
+  top: 115px;
   width: 185px;
 }
 .timeslider-bar {

src/static/js/pad_editbar.js

@@ -206,7 +206,7 @@ var padeditbar = (function()
 
           if(module.css('display') != "none")
           {
-            $("#" + self.dropdowns[i] + "link").removeClass("selected");
+            $("li[data-key=" + self.dropdowns[i] + "] > a").removeClass("selected");
             module.slideUp("fast", cb);
             returned = true;
           }
@@ -223,12 +223,12 @@ var padeditbar = (function()
 
           if(module.css('display') != "none")
           {
-            $("#" + self.dropdowns[i] + "link").removeClass("selected");
+            $("li[data-key=" + self.dropdowns[i] + "] > a").removeClass("selected");
             module.slideUp("fast");
           }
           else if(self.dropdowns[i]==moduleName)
           {
-            $("#" + self.dropdowns[i] + "link").addClass("selected");
+            $("li[data-key=" + self.dropdowns[i] + "] > a").addClass("selected");
             module.slideDown("fast", cb);
           }
         }
@@ -271,7 +271,7 @@ var padeditbar = (function()
     toolbar.registerDropdownCommand("showusers", "users");
     toolbar.registerDropdownCommand("settings");
     toolbar.registerDropdownCommand("connectivity");
-    toolbar.registerDropdownCommand("import_export", "importexport");
+    toolbar.registerDropdownCommand("import_export");
     toolbar.registerDropdownCommand("embed");
 
     toolbar.registerCommand("embed", function () {

src/templates/pad.html

@@ -174,7 +174,7 @@
             </div>
         </div>
 
-        <div id="importexport" class="popup">
+        <div id="import_export" class="popup">
             <h1 data-l10n-id="pad.importExport.import_export"></h1>
             <div class="column acl-write">
                 <% e.begin_block("importColumn"); %>

src/templates/timeslider.html

@@ -177,7 +177,7 @@
 </div>
 
 <!-- export code -->
-<div id="importexport">
+<div id="import_export">
 
 <div id="export" class="popup">
   <p data-l10n-id="timeslider.exportCurrent"></p>