Rebase cleanup, comments and nesting

IPython/html/static/base/js/dialog.js

@@ -15,24 +15,6 b' IPython.dialog = (function (IPython) {'
     "use strict";
     
     var modal = function (options) {
-        // <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-        //   <div class="modal-dialog">
-        //     <div class="modal-content">
-        //       <div class="modal-header">
-        //         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        //         <h4 class="modal-title" id="myModalLabel">Modal title</h4>
-        //       </div>
-        //       <div class="modal-body">
-        //         ...
-        //       </div>
-        //       <div class="modal-footer">
-        //         <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-        //         <button type="button" class="btn btn-primary">Save changes</button>
-        //       </div>
-        //     </div>
-        //   </div>
-        // </div>
-
         var modal = $("<div/>")
             .addClass("modal")
             .addClass("fade")

IPython/html/templates/notebook.html

@@ -83,7 +83,7 b' class="notebook_app"'
                                 <li id="download_py"><a href="#">Python (.py)</a></li>
                                 <li id="download_html"><a href="#">HTML (.html)</a></li>
                                 <li id="download_rst"><a href="#">reST (.rst)</a></li>
-                        <li id="download_pdf"><a href="#">PDF (.pdf)</a></li>
+                                <li id="download_pdf"><a href="#">PDF (.pdf)</a></li>
                             </ul>
                         </li>
                         <li class="divider"></li>
@@ -256,12 +256,12 b' class="notebook_app"'
             </ul>
             <ul class="nav navbar-nav navbar-right">
                 <div id="kernel_indicator">
-       <i id="kernel_indicator_icon"></i>
-    </div>
+                   <i id="kernel_indicator_icon"></i>
+                </div>
                 <div id="modal_indicator">
-       <i id="modal_indicator_icon"></i>
-    </div>
-    <div id="notification_area"></div>
+                   <i id="modal_indicator_icon"></i>
+                </div>
+                <div id="notification_area"></div>
             </ul>
         </div>
     </div>