Merge 16070:16110 from trunk.

[rails.git] / app / views / site / _sidebar.html.erb

diff --git a/app/views/site/_sidebar.html.erb b/app/views/site/_sidebar.html.erb
index dd15ef7ba64b2e00ac17de7da3066d3a11c38f0f..2dbcef432c9d11020a3ce390b38264ab6238d8e5 100644 (file)
--- a/app/views/site/_sidebar.html.erb
+++ b/app/views/site/_sidebar.html.erb
@@ -21,6 +21,8 @@
        onclose = null;
     }
 
        onclose = null;
     }
 

+    if (options.title) { $("sidebar_title").innerHTML = options.title; }
+

     if (options.width) { $("sidebar").style.width = options.width; }
     else { $("sidebar").style.width = "30%"; }
 
     if (options.width) { $("sidebar").style.width = options.width; }
     else { $("sidebar").style.width = "30%"; }
 


@@ -46,10 +48,5 @@
     $("sidebar_title").innerHTML = title;
     $("sidebar_content").innerHTML = content;
   }
     $("sidebar_title").innerHTML = title;
     $("sidebar_content").innerHTML = content;
   }

-
-  function sidebarOpen(title) {
-    return $("sidebar").style.display == "block" &&
-           $("sidebar_title").innerHTML == title;
-  }

 // -->
 </script>
 // -->
 </script>