Ticket #7786: trac_7786-template-jinja-idiomatic.10.patch

deleted file sagenb/data/highlight/prettify.css

@@ -1 @@
-/* Pretty printing styles. Used with prettify.js. */
-
-.str { color: #080; }
-.kwd { color: #008; }
-.com { color: #800; }
-.typ { color: #606; }
-.lit { color: #066; }
-.pun { color: #660; }
-.pln { color: #000; }
-.tag { color: #008; }
-.atn { color: #606; }
-.atv { color: #080; }
-.dec { color: #606; }
-pre.prettyprint { padding: 2px; border: 1px solid #888; }
-
-@media print {
-  .str { color: #060; }
-  .kwd { color: #006; font-weight: bold; }
-  .com { color: #600; font-style: italic; }
-  .typ { color: #404; font-weight: bold; }
-  .lit { color: #044; }
-  .pun { color: #440; }
-  .pln { color: #000; }
-  .tag { color: #006; font-weight: bold; }
-  .atn { color: #404; }
-  .atv { color: #060; }
-}

deleted file sagenb/data/sage/css/account_settings.css

@@ -1 @@
-html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td { margin: 0; padding: 0; border: 0; outline: 0; font-weight: inherit; font-style: inherit; font-size: 100%; font-family: inherit; vertical-align: baseline; }
-
-*:focus { outline: 0; }
-
-body { line-height: 1em; color: black; background: #fff; }
-
-ol, ul { list-style: none; }
-
-/* tables still need 'cellspacing="0"' in the markup */
-table { border-collapse: separate; border-spacing: 0; vertical-align: middle; }
-
-caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; }
-
-q, blockquote { quotes: "" ""; }
-q:before, q:after, blockquote:before, blockquote:after { content: ""; }
-
-img a { border: none; }
-
-html { font-size: 100.1%; }
-
-body { font: 100%/1.4 Arial, Helvetica, sans-serif; }
-
-h1 { background: #DCDCDC; border-bottom: 1px solid #CCC; font-size: 2em; padding: 0 5px; }
-
-label { display: block; }
-
-#buttons { background: #DCDCDC; padding: 5px; }
-#buttons button { margin-right: 1em; }
-
-h2 { font-size: 1.5em; }
-
-.section { border-bottom: 1px solid #CCC; padding: 5px; }
-.section div { margin-bottom: 0.5em; }
-
-.error { color: red; }
-
-.updated { color: green; }
-
-input.c1 { width: 200px; }

sagenb/data/sage/css/main.css

@@ +1 @@
+/* Warning: These .css files are automatically generated and will be overwritten */
+/* when they are next generated. Please edit the SASS source located at */
+/* <sagenb-spkg-root>/sass/src. Kindly refer to the readme for editing */
+/* instructions at <sagenb-spkg-root>/sass */
 thead { font-weight: bold; }
 
-body { background-color: white; }
+body { background-color: white; font-family: "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif; }
 body.worksheet-online { margin-bottom: 80%; }
 
 .hidden { display: none; }
 
 div.fivepix { height: 5px; }
 
-/* ****** Top Bar (Banner, controls, etc.) ******** */
 body div#banner { font-size: 1.2em; float: left; margin: 0; max-width: 35%; }
 body div#banner a.banner { text-decoration: none; border: none; margin-top: 2px; float: left; position: relative; }
 body div#banner a.banner:visited { color: #1950c8; }
@@ -16 +19 @@
 body div#banner #ping { float: left; }
 body div#banner div.version { float: left; clear: left; font-size: xx-small; text-indent: 13px; color: black; }
 
-#controls { float: right; width: 65%; }
-#controls ul { list-style: none; margin: 0; padding: 0; text-align: right; }
-#controls ul li { border-right: 1px solid #000; color: #112abb; display: inline; font-size: 14px; margin: 0; padding: 0 0.5em; }
-#controls ul li:last-child { border-right: 0; }
-#controls ul li.username { border: 0; color: #000; font-family: sans-serif; font-weight: bold; padding: 0; }
-#controls ul a { text-decoration: underline; white-space: nowrap; }
-#controls ul a:hover { cursor: pointer; }
+#main-controls { float: right; width: 65%; }
+#main-controls ul { list-style: none; margin: 0; padding: 0; text-align: right; }
+#main-controls ul li { border-right: 1px solid #000; color: #112abb; display: inline; font-size: 14px; margin: 0; padding: 0 0.5em; }
+#main-controls ul li:last-child { border-right: 0; }
+#main-controls ul li.username { border: 0; color: #000; font-family: sans-serif; font-weight: bold; padding: 0; }
+#main-controls ul a { text-decoration: underline; white-space: nowrap; }
+#main-controls ul a:hover { cursor: pointer; }
+#main-controls ul #toggle-link { display: none; }
+
+.worksheet-online #main-controls ul #toggle-link { display: inline; }
 
 #top-bar { position: relative; padding: 10px 5px; border-bottom: 1px solid #c9d7f1; min-height: 40px; margin-bottom: 0.5em; overflow: hidden; display: inline-block; }
 #top-bar { display: block; }
@@ -31 +37 @@
 
 hr.usercontrol { clear: both; float: left; }
 
-div#usercontrols { overflow: hidden; display: inline-block; clear: both; border-bottom: 1px solid #c9d7f1; padding: 10px; }
-div#usercontrols { display: block; }
+div#user-controls { overflow: hidden; display: inline-block; clear: both; border-bottom: 1px solid #c9d7f1; padding: 10px; }
+div#user-controls { display: block; }
 div#worksheet-list-controls { padding: 10px; clear: both; overflow: hidden; display: inline-block; }
 div#worksheet-list-controls { display: block; }
 div#worksheet-list-controls div.action-buttons { float: left; }
@@ -172 +178 @@
 a.new_worksheet { font-family: arial, monospace; font-size: 12pt; text-align: right; color: #0000aa; }
 a.new_worksheet:hover { cursor: pointer; }
 
-div.worksheet_bottom_padding { height: 50%; }
-div.worksheet_top_padding { height: 5%; }
 div.worksheet_menu { top: 50px; }
 
 a.worksheet_title { text-decoration: none; font-size: 20px; font-family: arial; font-weight: bold; color: #000000; }
@@ -212 +216 @@
 span.control:hover a.cs, span.control a:hover.cs { color: black; border: 1px solid #333333; }
 
 /* *********** WORKSHEET ************************* */
-div.worksheet { background-color: white; border: 1px solid #aaa; }
+div.worksheet { background-color: white; border: 1px solid #aaa; padding: .75em 0.2em; }
 div.banner { background-color: white; font-family: sans-serif; font-size: 18px; text-decoration: none; color: #1950c8; }
 div.banner a.banner { text-decoration: none; border: none; margin-top: 2px; }
 
@@ -248 +252 @@
 textarea.cell_input_active { background-color: white; border: 2px solid  #8888fe; font-family: monospace; font-size: 12pt; overflow: hidden; padding-bottom: 0px; padding-left: 5px; padding-right: 0px; padding-top: 3px; margin-top: 0px; margin-bottom: 0px; line-height: 1.2em; width: 97%; }
 
 div.cell_input_active { background-color: white; border: 2px solid  #8888fe; font-family: monospace; font-size: 12pt; padding-bottom: 0px; padding-left: 5px; padding-right: 0px; padding-top: 3px; margin-top: 0px; margin-bottom: 0px; line-height: 1.2em; width: 97%; z-index: -100; visibility: hidden; position: absolute; }
-div.cell_input_print { background-color: white; border: 1px solid  #a8a8a8; font-family: monospace; font-size: 12pt; padding-bottom: 1px; padding-left: 6px; padding-right: 1px; padding-top: 4px; margin-top: 0px; margin-bottom: 0px; line-height: 1.2em; width: 97%; }
+div.cell_input_print { background-color: white; border: 1px solid  #a8a8a8; font-family: monospace; font-size: 12pt; padding-bottom: 1px; padding-left: 6px; padding-right: 1px; padding-top: 4px; margin-top: 0px; margin-bottom: 0px; line-height: 1.2em; width: 97%; white-space: pre-wrap; }
 
 textarea.cell_input:hover { cursor: text; }
 
@@ -304 +308 @@
 .thin-right { position: absolute; top: auto; right: 0; width: 70%; }
 
 /* *********** User Home (Worksheet listing) ************************* */
-span.ratingmsg { color: #112abb; padding: 0.3em; font-size: 14px; }
-span.pubmsg { font-family: sans-serif; color: #112abb; padding: 0.3em; font-size: 12px; }
+.ratingmsg { color: #112abb; padding: 0.3em; font-size: 14px; }
+
+.pubmsg { font-family: sans-serif; color: #112abb; padding: 0.3em; font-size: 12px; }
 
 #worksheet-list { clear: both; width: 100%; }
 #worksheet-list thead { background-color: #e8eef7; }
 #worksheet-list td.checkbox { padding: 4px; }
 
-a.usercontrol { color: #112abb; padding: 0.3em; font-size: 14px; text-decoration: underline; }
-a.usercontrol:hover { cursor: pointer; }
+.controls a, .usercontrol { color: #112abb; font-size: 14px; text-decoration: underline; }
+.controls a:hover, .usercontrol:hover { cursor: pointer; }
 
-span.usercontrol { color: #112abb; padding: 0.3em; font-size: 14px; }
+.controls span { color: #112abb; padding: 0.3em; font-size: 14px; }
 
-a.boldusercontrol { color: #112abb; padding: 0.5em; font-weight: bold; font-size: 14px; }
+.user-controls a, .boldusercontrol { color: #112abb; font-weight: bold; font-size: 14px; }
+
+.user-controls a, .controls a, .controls span { padding: 0.3em; }
+
 a.control, a.control-select { background-color: #7799bb; font-family: sans-serif; color: #ffffff; padding-top: 0.25em; padding-bottom: 0.25em; padding-left: 0.5em; padding-right: 0.5em; font-size: 15px; font-weight: bold; text-decoration: none; }
 a.control:hover { cursor: pointer; }
 a.control-select { background-color: #4477aa; }
 a.control-select:hover { cursor: pointer; }
 
-span.sharebar { background-color: #4477aa; font-family: sans-serif; color: #ffffff; position: absolute; left: 0.5em; right: 0ex; padding-top: 0.5em; padding-bottom: 0.5em; padding-left: 2em; font-size: 18px; font-weight: bold; }
+.sharebar { background-color: #4477aa; font-family: sans-serif; color: #ffffff; padding-top: 0.5em; padding-bottom: 0.5em; padding-left: 2em; font-size: 1.25em; font-weight: bold; }
 
 textarea.edit { font-family: courier, monospace; font-size: 10pt; border: 1px solid #8cacbb; color: black; background-color: white; padding: 3px; overflow: auto; margin-top: 0.5em; }
 
@@ -347 +355 @@
 
 div.ultrathinspace { border: 0; height: 0px; }
 
-span.lastedit { font-family: sans-serif; font-size: 10px; color: #717171; }
-span.revs { font-family: sans-serif; font-size: 12px; font-weight: bold; color: #333333; }
-span.users { font-family: sans-serif; font-size: 13px; color: #222222; }
+.lastedit { font-family: sans-serif; font-size: 10px; color: #717171; }
+
+.revs { font-family: sans-serif; font-size: 12px; font-weight: bold; color: #333333; }
+
+.users { font-family: sans-serif; font-size: 13px; color: #222222; }
 
 a.share { font-family: sans-serif; font-size: 10px; color: #7777cc; }
 
@@ -368 +378 @@
 div.docidx { text-align: center; font-family: sans-serif; font-size: 16px; color: #222; font-weight: bold; }
 
 span.ping { display: none; }
-span.pingdown { font-family: sans-serif; font-size: 15px; font-weight: bold; color: white; background-color: #990000; }
+span.pingdown { font-family: sans-serif; font-size: 15px; font-weight: bold; color: white; background-color: #990000; margin-left: 1em; }
 
-/* These have been scraped directly from pygment. */
+#source-code-page .str { color: #080; }
+#source-code-page .kwd { color: #008; }
+#source-code-page .com { color: #800; }
+#source-code-page .typ { color: #606; }
+#source-code-page .lit { color: #066; }
+#source-code-page .pun { color: #660; }
+#source-code-page .pln { color: #000; }
+#source-code-page .tag { color: #008; }
+#source-code-page .atn { color: #606; }
+#source-code-page .atv { color: #080; }
+#source-code-page .dec { color: #606; }
+
+#source-code-page h1, #source-code-page h2 { text-align: center; }
+#source-code-page .filename { font-family: monospace; }
+#source-code-page code { display: block; border-top: 1px solid #ccc; border-bottom: 1px solid #ccc; padding: 1em; }
+
+#print-page h1 { text-align: center; }
+
+#guest-worksheet-page h1, #guest-worksheet-page h2 { text-align: center; }
+#guest-worksheet-page ul.controls { margin: 0; padding: 0; border: 0; outline: 0; overflow: hidden; display: inline-block; }
+#guest-worksheet-page ul.controls { display: block; }
+#guest-worksheet-page ul.controls li { list-style-type: none; margin-left: 0px; white-space: nowrap; display: inline; float: left; padding-left: 0.5em; padding-right: 0.5em; }
+#guest-worksheet-page ul.controls li.first { padding-left: 0px; }
+#guest-worksheet-page ul.controls li.last { padding-right: 0px; }
+
+#before-publish-page form a { text-decoration: none; }
+#before-publish-page form button { margin-left: 1em; margin-bottom: 0.5em; }
+#before-publish-page form input { margin-left: 1em; }
+
+#after-publish-page input { margin-top: 1em; }
+
+#edit-page .sharebar span { margin-right: 2em; }
+
+.settings-page { line-height: 1.4; }
+.settings-page h1 { font-size: 2em; padding: 0 5px; }
+.settings-page label { display: block; }
+.settings-page #buttons { padding: 5px; }
+.settings-page #buttons button { margin-right: 1em; }
+.settings-page #buttons a { text-decoration: none; }
+.settings-page h2 { font-size: 1.5em; margin: 0 0 0.75em; }
+.settings-page .section { border-bottom: 1px solid #CCC; padding: 5px; margin: 0.5em 0; }
+.settings-page .section div { margin-bottom: 0.5em; }
+.settings-page .error, .settings-page .error_found { color: red; }
+.settings-page .error_found { font-size: 1.2em; }
+.settings-page .updated { color: green; }
+.settings-page input.c1 { width: 200px; }
+
+#settings-nav { margin: 0; padding: 0; border: 0; outline: 0; overflow: hidden; display: inline-block; }
+#settings-nav { display: block; }
+#settings-nav li { list-style-type: none; margin-left: 0px; white-space: nowrap; display: inline; float: left; padding-left: 0.5em; padding-right: 0.5em; }
+#settings-nav li.first { padding-left: 0px; }
+#settings-nav li.last { padding-right: 0px; }
+#settings-nav li { border-right: 1px solid #ccc; }
+#settings-nav li:last-child, #settings-nav li.last { border-right: none; }
+
+#user-management-page table { border-collapse: collapse; }
+#user-management-page th, #user-management-page td { border: 1px solid #696969; padding: 0.25em; }
+#user-management-page th { background: #CCC; }
+#user-management-page a:link, #user-management-page a:visited { color: #112abb; }
+
+.accounts-page #wrapper { margin: 0 auto; max-width: 600px; }
+.accounts-page h1, .accounts-page h2, .accounts-page h3, .accounts-page h4, .accounts-page h5 { font-weight: normal; }
+.accounts-page h1 { border-bottom: 1px solid #696969; font-size: 2em; padding: 10px 0; }
+.accounts-page h2 { font-weight: bold; }
+.accounts-page h1, .accounts-page h2, .accounts-page p, .accounts-page li { margin-bottom: 10px; }
+.accounts-page .entry { margin-bottom: 10px; border: 1px solid #999; padding: 3px; width: 200; }
+.accounts-page li { border-bottom: 1px solid #CCC; }
+.accounts-page .error { color: red; }
+.accounts-page .error_found { color: red; font-size: 1.5em; }
+.accounts-page button { margin-right: 1em; }
+.accounts-page form label { display: block; }
+.accounts-page form div { margin-bottom: 1em; }
+.accounts-page form a { text-decoration: none; }
+
+#login-page h2 { font-size: 1.5em; margin-bottom: 0.375em; }
+#login-page h1, #login-page h2, #login-page h3, #login-page h4, #login-page h5, #login-page h6 { line-height: 1em; }
+#login-page p { margin-bottom: 1em; }
+#login-page strong { font-weight: bold; }
+#login-page #desc { float: left; margin-right: 400px; }
+#login-page div { padding: 0.5em 1em; }
+#login-page #sign-in-box { background-color: #efefff; float: left; margin-left: -400px; width: 350px; }
+#login-page #sign-in-box form label { display: block; }
+#login-page #sign-in-box a { font-size: 0.875em; }
+
 .hll { background-color: #ffffcc; }
 
 .c { color: #408090; font-style: italic; }
@@ -474 +567 @@
 .vc, .vg, .vi { color: #bb60d5; }
 
 .il { color: #208050; }
-
-/* end stuff scraped from pygment */

deleted file sagenb/data/sage/css/master.css

@@ -1 @@
-html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td { margin: 0; padding: 0; border: 0; outline: 0; font-weight: inherit; font-style: inherit; font-size: 100%; font-family: inherit; vertical-align: baseline; }
-
-*:focus { outline: 0; }
-
-body { line-height: 1em; color: black; background: #fff; }
-
-ol, ul { list-style: none; }
-
-/* tables still need 'cellspacing="0"' in the markup */
-table { border-collapse: separate; border-spacing: 0; vertical-align: middle; }
-
-caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; }
-
-q, blockquote { quotes: "" ""; }
-q:before, q:after, blockquote:before, blockquote:after { content: ""; }
-
-img a { border: none; }
-
-html { font-size: 100.1%; }
-
-body { font: .9em/1.2em Arial, Helvetica, sans-serif; }
-
-div { padding: 0.5em 1em; }
-
-#desc { float: left; margin-right: 400px; }
-
-#sign-in-box { float: left; margin-left: -400px; width: 350px; background-color: #efefff; }
-#sign-in-box form label { display: block; }
-
-p { margin-bottom: 1em; }
-
-h1, h2, h3, h4, h5, h6 { line-height: 1em; }
-
-h2 { font-size: 1.5em; margin-bottom: 0.375em; }
-
-#banner { font-size: 1.2em; float: left; clear: both; margin-bottom: 0.25em; }
-#banner a.banner { text-decoration: none; border: none; margin-top: 2px; float: left; }
-#banner a.banner:visited { color: #1950c8; }
-#banner #ping { display: none; }
-#banner div.version { float: left; clear: left; font-size: xx-small; text-indent: 13px; color: black; }
-
-.section { border-bottom: 1px solid #CCC; padding: 5px; }
-.section > div { max-width: 350px; text-align: right; }
-
-input.c1 { width: 200px; }
-
-strong { font-weight: bold; }

deleted file sagenb/data/sage/css/registration.css

@@ -1 @@
-html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, table, caption, tbody, tfoot, thead, tr, th, td { border: 0; font-family: inherit; font-size: 100%; font-style: inherit; font-weight: inherit; margin: 0; outline: 0; padding: 0; text-decoration: none; vertical-align: baseline; }
-
-html { font-size: 100.1%; }
-
-body { font: 0.88em/1.4 Arial, Helvetica, sans-serif; }
-
-#wrapper { margin: 0 auto; max-width: 600px; }
-
-h1, h2, h3, h4, h5 { font-wieght: normal; }
-
-h1 { border-bottom: 1px solid #696969; font-size: 2em; padding: 10px 0; }
-
-h2 { font-weight: bold; }
-
-h1, h2, p, li { margin-bottom: 10px; }
-
-.entry { margin-bottom: 10px; border: 1px solid #999; padding: 3px; width: 200; }
-
-li { border-bottom: 1px solid #CCC; }
-
-.error { color: red; }
-
-.error_found { color: red; font-size: 1.5em; }
-
-button { margin-right: 1em; }
-
-form label { display: block; }
-form div { margin-bottom: 1em; }

sagenb/data/sage/css/test_report.css

@@ +1 @@
+/* Warning: These .css files are automatically generated and will be overwritten */
+/* when they are next generated. Please edit the SASS source located at */
+/* <sagenb-spkg-root>/sass/src. Kindly refer to the readme for editing */
+/* instructions at <sagenb-spkg-root>/sass */
 body, table { background-color: #fff; color: #111; font-family: sans-serif; -moz-border-radius: 0.25em; -webkit-border-radius: 0.25em; }
 
 pre { margin: 0; padding: 0; padding-top: 0.25em; }

deleted file sagenb/data/sage/css/user_management.css

@@ -1 @@
-html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td { margin: 0; padding: 0; border: 0; outline: 0; font-weight: inherit; font-style: inherit; font-size: 100%; font-family: inherit; vertical-align: baseline; }
-
-*:focus { outline: 0; }
-
-body { line-height: 1em; color: black; background: #fff; }
-
-ol, ul { list-style: none; }
-
-/* tables still need 'cellspacing="0"' in the markup */
-table { border-collapse: separate; border-spacing: 0; vertical-align: middle; }
-
-caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; }
-
-q, blockquote { quotes: "" ""; }
-q:before, q:after, blockquote:before, blockquote:after { content: ""; }
-
-img a { border: none; }
-
-html { font-size: 100.1%; }
-
-body { font: .9em/1.2em Arial, Helvetica, sans-serif; }
-
-div { padding: 0.5em 1em; }
-
-#desc { float: left; margin-right: 400px; }
-
-#sign-in-box { float: left; margin-left: -400px; width: 350px; background-color: #efefff; }
-#sign-in-box form label { display: block; }
-
-p { margin-bottom: 1em; }
-
-h1, h2, h3, h4, h5, h6 { line-height: 1em; }
-
-h2 { font-size: 1.5em; margin-bottom: 0.375em; }
-
-#banner { font-size: 1.2em; float: left; clear: both; margin-bottom: 0.25em; }
-#banner a.banner { text-decoration: none; border: none; margin-top: 2px; float: left; }
-#banner a.banner:visited { color: #1950c8; }
-#banner #ping { display: none; }
-#banner div.version { float: left; clear: left; font-size: xx-small; text-indent: 13px; color: black; }
-
-.section { border-bottom: 1px solid #CCC; padding: 5px; }
-.section > div { max-width: 350px; text-align: right; }
-
-input.c1 { width: 200px; }
-
-strong { font-weight: bold; }
-
-body { margin: 10px; }

deleted file sagenb/data/sage/html/account_recovery.html

@@ -1 @@
-{% extends "html/base.html" %}
-
-{% block title %}Account Recovery{% endblock %}
-{% block css %}registration{% endblock %}
-
-{% block body %}
-<div id="wrapper">
-    <h1>Account Recovery</h1>
-    <p>A new password will be emailed to the email address connected to your account. However if you didn't confirm your email address you will be unable to recover your account.</p>  
-
-    <form method="GET" action="/forgotpass">
-        <div>
-            <label for="username">Username</label>
-            <input type="text" name="username" size="15" />
-        </div>
-        <div>
-            <button type="submit">Submit</button> <a href="/"><button >Cancel</button></a>
-        </div>
-</form>
-</div>
-
-
-{% endblock %}

deleted file sagenb/data/sage/html/account_settings.html

@@ -1 @@
-{% extends "html/base.html" %}
-
-{% block title %}Account Settings{% endblock %}
-{% block css %}account_settings{% endblock %}
-{% block page_id %}account-settings-page{% endblock %}
-{% block body %}
-<h1>Account Settings</h1>
-<div class="section">{% if admin %}<a href="/users">Manage Users</a> | <a href="/notebooksettings">Notebook Settings</a> | {% endif %}<a href="/">My Worksheets</a> | <a href="/logout">Sign Out</a></div>
-
-  <form method="post" action="/settings">
-    
-    <div class="section">
-      <h2>Change Auto-Save Interval</h2>
-      <div>
-        Minutes:
-        <select name="autosave">
-        {% for i, selected in autosave_intervals %}
-          <option{{ selected }}>{{ i }}</option>
-        {% endfor %}
-        </select>
-      </div>
-    </div>
-    <div class="section">
-      <h2>Change Password</h2>
-      <div id="passwd">
-          <div>
-              <label for="old-pass">Old password</label>
-              <input type="password" name="old-pass" />
-          </div>
-          <div>
-              <label for="new-pass">New password</label>
-              <input type="password" name="new-pass" />
-          </div>
-          <div>
-              <label for="retype-pass">Retype new password</label>
-              <input type="password" name="retype-pass" />
-          </div>
-      </div>
-    </div>
-
-    {% if true %}
-        <div class="section">
-          <h2>Change E-mail Address</h2>
-    
-          <div>
-              <div>
-                  <label>Current e-mail</label>
-                  {{ email_address }} {{ email_confirmed }}
-              </div>
-              <div>
-                  <label for="new-email">New e-mail</label>
-                  <input type="text" name="new-email" class="c1" />
-              </div>
-          </div>
-        </div>
-        {% endif %}
-    <div id="buttons">
-    <button type="submit">Save</button>
-    <a href="/"><button>Cancel</button></a>
-    </div>
-  </form>
-{% endblock %}

new file sagenb/data/sage/html/accounts/account_recovery.html

@@ +1 @@
+{% extends "html/accounts/base.html" %}
+
+{% block title %}Account Recovery{% endblock %}
+{% block page_id %}account-recovery-page{% endblock %}
+
+{% block body %}
+<div id="wrapper">
+    <h1>Account Recovery</h1>
+    <p>A new password will be emailed to the email address connected to your account. However if you didn't confirm your email address you will be unable to recover your account.</p>  
+
+    <form method="GET" action="/forgotpass">
+        <div>
+            <label for="username">Username</label>
+            <input type="text" name="username" size="15" />
+        </div>
+        <div>
+            <button type="submit">Submit</button> <a href="/"><button >Cancel</button></a>
+        </div>
+</form>
+</div>
+{% endblock %}

new file sagenb/data/sage/html/accounts/base.html

@@ +1 @@
+{% extends "html/base.html" %}
+{% block body_classes %}accounts-page{% endblock %}

new file sagenb/data/sage/html/accounts/registration.html

@@ +1 @@
+{% extends "html/accounts/base.html" %}
+
+{% block title %}Sign up{% endblock %}
+
+{% block page_id %}registration-page{% endblock %}
+
+{% block body %}
+<div id="wrapper">
+    <h1>Sign up for a Sage Notebook account</h1>
+    {% if error %}
+    <h2 class="error_found">Error{{ error[1:] }}found</h2>
+    {% endif %}
+    <form method="POST" action="/register">
+        <ol>
+            <li>
+                <h2>Create a username</h2>
+                <p>Your username must start with a letter and be between 3 and 64
+                characters long. You may only use letters, numbers, underscores, @,
+                and dots.</p>
+                <input type="text" name="username" value="{{ username }}" class="entry" tabindex="1" />
+                {% if username_missing %}
+                <p><span class="error">Error:</span> No username given</p>
+                {% endif %}
+                {% if username_taken %}
+                <p><span class="error">Error:</span> Username already in use</p>
+                {% endif %}
+                {% if username_invalid %}
+                <p><span class="error">Error:</span> Bad username</p>
+                {% endif %}
+            </li>
+            <li>
+                <h2>Create a good password</h2>
+                <p>
+                    Your password must be between 4 and 32 characters
+                    long. Your password can not contain your username nor spaces.
+                </p>
+                <input type="password" name="password" class="entry" tabindex="2" />
+                {% if password_missing %}
+                <p><span class="error">Error:</span> No password given</p>
+                {% endif %}
+                {% if password_invalid %}
+                <p><span class="error">Error:</span> Bad password</p>
+                {% endif %}
+            </li>
+            <li><h2>Re-type your password</h2>
+            <input type="password" name="retype_password" class="entry" tabindex="3" />
+            {% if passwords_dont_match or retype_password_missing %}
+            <p><span class="error">Error:</span> Passwords didn't match</p>
+            {% endif %}
+            </li>
+            {% if email or email_missing or email_invaild %}
+            <li>
+                <h2>Enter your email address</h2>
+                <p>
+                    Your email address is required for account
+                    confirmation and recovery. You will be emailed a confirmation link
+                    right after you successfully sign up.
+                </p>
+                <input type="text" name="email" value="{{ email_address }}" class="entry" tabindex="4" />
+                {% if email_missing %}
+                <p><span class="error">Error:</span> No email address given</p>
+                {% endif %}
+                {% if email_invalid %}
+                <p><span class="error">Error:</span> Invalid email address</p>
+                {% endif %}
+            </li>
+            {% endif %}
+            {% if challenge %}
+            <li>
+                <h2>Answer a challenge</h2>
+                {{ challenge_html }}
+                {% if challenge_missing %}
+                <p><span class="error">Error:</span> No challenge response given</p>
+                {% endif %}
+                {% if challenge_invalid %}
+                <p><span class="error">Error:</span> Invalid challenge response</p>
+                {% endif %}
+            </li>
+            {% endif %}
+        </ol>
+        <button type="submit" tabindex="100" id="create-account-button">Create account</button>
+        <a href="/"><button tabindex="101">Cancel</button></a>
+    </form>
+</div> 
+{% endblock %}
+ No newline at end of file

deleted file sagenb/data/sage/html/admin_add_user.html

@@ -1 @@
-<html>
-<head>
-<title>Add New User | {{ sitename }}</title>
-<style>
-/***** Global Settings *****/
-
-html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,dl,dt,dd,ol,ul,li,table,caption,tbody,tfoot,thead,tr,th,td {
-border:0;
-font-family:inherit;
-font-size:100%;
-font-style:inherit;
-font-weight:inherit;
-margin:0;
-outline:0;
-padding:0;
-text-decoration:none;
-vertical-align:baseline
-}
-
-html {
-font-size:100.1%
-}
-
-body {
-font:0.88em/1.4 Arial, Helvetica, sans-serif;
-}
-
-#wrapper {
-margin:0 auto;
-max-width:600px
-}
-
-/***** Headings *****/
-
-h1,h2,h3,h4,h5 {
-font-wieght:normal
-}
-
-h1 {
-border-bottom:1px solid #696969;
-font-size:2em;
-padding:10px 0
-}
-
-h2 {
-font-weight:bold
-}
-
-h1, h2, p, li, .entry {
-margin-bottom:10px
-}
-
-.entry {
-border:1px solid #999;
-padding:3px;
-width:200
-}
-
-li {
-border-bottom:1px solid #CCC
-}
-
-.error, .error_found {
-color:red
-}
-
-.error_found {
-font-size:1.5em
-}
-
-.button {
-font-size:1.2em
-}
-</style>
-</head>
-<body>
-<div id="wrapper">
-<h1>Add New User</h1>
-{% if error %}
-<h2 class="error_found">Username Error</h2>
-{% endif %}
-<form method="POST" action="/adduser">
-<ol>
-<li><h2>Pick a username</h2>
-<p>The username must start with a letter and be between 4 and 32 characters long. It can only consist of letters, numbers, underscores, and one dot (.).</p>
-<input type="text" name="username" value="{{ username }}" class="entry" />
-{% if username_error %}
-{% if username_error == 'invalid' %}
-<p><span class="error">Error:</span> Invalid username</p>
-{% else %}
-<p><span class="error">Error:</span> Username taken</p>
-{% endif %}
-{% endif %}
-</li>
-</ol>
-<input type="submit" value="Create account" class="button" />
-<input type="button" value="Cancel" style="margin-left:10px" onClick="parent.location='/users'" class="button" />
-</form>
-</div>
-</body>
-</html>
- No newline at end of file

deleted file sagenb/data/sage/html/banner.html

@@ -1 @@
-<div id="banner">
-    <a class="banner" href="http://nb.sagemath.org/">
-        <img align="top" src="/images/sagenb.png" alt="Sage" /><span>The Sage Notebook</span>
-    </a>
-        <span class="ping" id="ping">Searching for Sage server...</span>
-    <div class="version">
-        Version {{ sage_version }}
-    </div>
-</div>

sagenb/data/sage/html/base.html

@@ +1 @@
+{%- macro render_title -%}{% block title %}{% endblock %}{%- endmacro -%}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
     <head>
-        <title>{% block title %}{% endblock %}</title>
+        <title>{{ render_title() }} -- Sage</title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         {% block pre_main_css %}{% endblock %}
-        <link type="text/css" rel="stylesheet" href="/css/{% block css %}master{% endblock %}.css" media="screen" />
+        <link type="text/css" rel="stylesheet" href="/css/{% block css %}main{% endblock %}.css" />
         {% block more_css %}{% endblock %}
-        <!-- jQuery - general-purpose functions -->
+        {# jQuery and other universally used libraries #}
         <script type="text/javascript" src="/javascript/jquery/jquery-1.3.2.min.js"></script>
         {% block javascript %}
-        <!-- Worksheet list functions -->
+        {# Page-specific libraries #}
         <script type="text/javascript" src="/javascript/sage/ws_list.js"></script>
         {% endblock %}
+        {# Behavior #}
+        <script type="text/javascript" src="/javascript/sage/master.js"></script>
     </head>
-    <body {% block body_attrs %}{% endblock %} id="{% block page_id %}{% endblock %}">
-        {% block body %}{% endblock %}
+    <body id="{% block page_id %}{% endblock %}"
+          class="{% block body_classes %}{% endblock %}">
+        {% block body %}
+        <div id="header">
+            {% block header %}
+            <div id="top-bar">
+                <div id="banner">
+                    <a class="banner" href="http://nb.sagemath.org/">
+                        <img align="top" src="/images/sagenb.png" alt="Sage" /><span>The Sage Notebook</span>
+                    </a>
+                    <span class="ping" id="ping">Searching for Sage server...</span>
+                    <div class="version">
+                        Version {{ sage_version }}
+                    </div>
+                </div>
+                {% block controls %}
+                {% endblock %}
+            </div>
+            {% endblock %}
+        </div>
+        <div id="main">
+            {% block main %}
+
+            {% endblock %}
+        </div>
+        {% endblock %}
     </body>
-</html>
+</html>
+ No newline at end of file

new file sagenb/data/sage/html/base_authenticated.html

@@ +1 @@
+{% extends "html/base.html" %}
+{% block controls %}
+<div id="main-controls" class="controls">
+    <ul>
+        <li class="username">{{ username }}</li>
+        {% if username == 'guest' %}
+        <li><a title="Please log in to the Sage notebook" href="/">Log in</a></li>
+        {% else %}
+        <li><a id="toggle-link" title="Toggle the top bar" onClick="$('#worksheet-bar').toggle()">Toggle</a></li>
+        <li><a title="Back to your personal worksheet list" href="/home/{{ username }}">Home</a></li>
+        {% if pub %}
+        <li><span>Published</span></li>
+        {% else %}
+        <li><a title="Browse the published worksheets" href="/pub">Published</a></li>
+        <li><a title="View a log of recent computations" href="#" onClick="history_window()">Log</a></li>
+        {% endif %}
+        <li><a title="Change account settings including password" href="/settings">Settings</a></li>
+        <li><a title="Documentation" href="#" onClick="help()">Help</a></li>
+        <li><a title="Report a problem or submit a bug to improve Sage" href="#" onClick="bugreport()">Report a Problem</a></li>
+        <li><a title="Log out of the Sage notebook" href="/logout">Sign out</a></li>
+        {% endif %}
+    </ul>
+</div>
+{% endblock %}

deleted file sagenb/data/sage/html/command_history.html

@@ -1 @@
-
-{#
-INPUT:
-    - history_text - a string containing the history text of the notebook
-#}
-<html>
-    <head>
-        <title>Command History</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    </head>
-    <body> 
-        <pre>{{history_text}}</pre>
-        <a name="bottom"></a>
-        <script type="text/javascript"> window.location="#bottom"</script>
-    </body>
-</html>
- No newline at end of file

sagenb/data/sage/html/docs.html

@@ -1 @@
-{% extends "html/base.html" %}
+{% extends "html/base_authenticated.html" %}
 
 {% block title %}Sage Documentation{% endblock %}
 
-{% block css %}main{% endblock %}
-
 {% block javascript %}
 <script type="text/javascript" src="/javascript/sage/ws_list.js"></script>
 {% endblock%}
 
 {% block page_id %}docs-main-page{% endblock %}
 
-{% block body %}
-
-{% include "html/top_bar.html" %}
+{% block main %}
 
 <div class="control-bar">
     <ul class="controls">
         <li><a title="To quickly try out Sage start here" href="/doc/live/tutorial/index.html">Tutorial</a></li>
-        <li><a title="View a 2000 page reference manual about Sage" href="/doc/live/reference/index.html">Reference Manual</a></li>
+        <li><a title="View a 4000+ page reference manual about Sage" href="/doc/live/reference/index.html">Reference Manual</a></li>
         <li><a title="Learn to write Sage programs" href="/doc/live/developer/index.html">Developer Guide</a></li>
         <li><a title="How do I construct ... in Sage?" href="/doc/live/constructions/index.html">Constructions</a></li>
     </ul>

sagenb/data/sage/html/error_message.html

@@ -1 @@
-{% extends "html/base.html" %}
+{% extends "html/base_authenticated.html" %}
 
 {% block title %}Error{% endblock %}
 
-{% block body %}
-<br><a class="usercontrol" href="/">Home</a>
-<hr class="usercontrol">
-<br/><br/>
-{{ msg }}
-<br/><br/>
+{% block main %}
+<div>
+    {{ msg }}
+</div>
 {% if cont %}
-<center><a class="boldusercontrol" href="{{ cont }}"><font size=+1>Continue</font></a></center>
+<div>
+    <a class="boldusercontrol" href="{{ cont }}">Continue</a>
+</div>
 {% endif %}
 {% endblock %}

sagenb/data/sage/html/history.html

@@ -2 +2 @@
 
 {% block title %}Sage: History for {{username}} {% endblock %}
 
-{% block css %}main{% endblock %}
-
 {% block javascript %}
 <script type="text/javascript" src="/javascript/sage/ws_list.js"></script>
 {% endblock %}
@@ -11 +9 @@
 {% block page_id %}history-page{% endblock %}
 
 {% block body %}
-
-{% include "html/top_bar.html" %}
-
     <pre>{{ text | escape }}</pre>
     <a title="Click here to turn the above into a Sage worksheet" href="/live_history">Create a new Sage worksheet version of the last 100 commands in the above log.</a>
     <a name="bottom"></a>
-    <script type="text/javascript">$(document).load(function(){window.location="#bottom"});</script>
-
+    <script type="text/javascript">
+      $(window).load(function () {
+          window.location = "#bottom";
+      });
+    </script>
 {% endblock %}

deleted file sagenb/data/sage/html/list_top.html

@@ -1 @@
-{% include "html/top_bar.html" %}
-
-<div id="usercontrols">
-    {% if pub is not defined or not pub %}
-    <a class="boldusercontrol" href="/new_worksheet" target="_blank">New Worksheet</a>
-    <a class="boldusercontrol" href="/upload">Upload</a>
-    {% if not accounts %}
-    <a class="boldusercontrol" href="/download_worksheets.zip">Download All Active</a>
-    {% endif %}
-    {% endif %}
-
-    <div id='search-area'>
-      <form action="." method="GET">
-        <input type="hidden" value="{{ typ if not pub else 'pub' }}" name="typ" />
-        <input id="search-worksheets" size="20" value="{{ search if search else "" }}" name="search" />
-        <button class="add_new_worksheet_menu" id="search-worksheets-button" type="submit">Search Worksheets</button>
-      </form>
-    </div>
-</div>

sagenb/data/sage/html/login.html

@@ -2 +2 @@
 
 {% block title %}Sign in{% endblock %}
 
-{% block body %}
-{% include "html/banner.html" %}        
+{% block page_id %}login-page{% endblock %}
 
+{% block main %}
 {% if welcome %}
 <h2>Congratulations {{ welcome }}! You can now sign into the Sage Notebook.</h2>
 {% endif %}
@@ -58 +58 @@
             <label for="email">Username</label>
             <input type="text" name="email" value="{{ default_user }}" size="15" />
             {% if username_error %}
-            <span style="color:red">Error:</span>Username is not in the system
+            <span style="color:red">Error: </span>Username is not in the system
             {% endif %}
         </div>
         <div>
             <label for="password">Password</label>
             <input type="password" name="password" size="15" />
             {% if password_error %}
-            <span style="color:red">Error:</span>Wrong password
+            <span style="color:red">Error: </span>Wrong password
             {% endif %}
         </div>
         <div>
-            <input type="checkbox" name="remember" />Remember me
+            <input type="checkbox" name="remember" /> Remember me
         </div>
         <div>
             <button type="submit">Sign in</button>
         </div>
     </form>
+    {% if accounts %}
     <div>
-        {% if accounts %}
         <a href="/register" id="register-link"><strong>Sign up for a new Sage Notebook account</strong></a>
-        {% endif %}
     </div>
+    {% endif %}
     <div>
         <a href="/pub"><strong>Browse published Sage worksheets<br>(no login required)</strong></a>
     </div>
+    {% if recovery %}
     <div>
-        {% if recovery %}
         <a href="/forgotpass"><strong>Forgot password</strong></a>
-        {% endif %}
     </div>
+    {% endif %}
 </div>
 {% endblock %}
 

sagenb/data/sage/html/notebook/afterpublish_window.html

@@ -1 @@
-{% extends "html/notebook/worksheet_page_template.html" %}
-{#
-INPUT:
-- worksheet - an instance of Worksheet
-- worksheet_filename - a string containing a worksheet's filename
-- username - a string containing a username
-- url - a string containing the url of the published page
-- time - a string representing the time of publication
-- JSMATH - a boolean stating whether to include jsMath
-- JEDITABLE_TINYMCE - a boolean stating whether to include jEditable and TinyMCE
-#}
+{% extends "html/notebook/base_aux.html" %}
+
+{% block page_id %}after-publish-page{% endblock %}
 
 {% set checked = 'checked="true"' if worksheet.is_auto_publish() else '' %}
 
 {% block sharebar_title %}
-Worksheet is publicly viewable at <a href="{{ url }}" style="color:#FFF" target="_blank">{{ url }}</a>
-<br />
-Published on {{ time }}
-<br />
-<br />
-<input type="button" value="Re-publish worksheet" onClick="parent.location='?re'" />
-<input type="button" value="Stop publishing" style="margin-left:5px" onClick="parent.location='?stop'" />
-<br /><br />
+<p>Worksheet is publicly viewable at <a href="{{ url }}" style="color:#FFF" target="_blank">{{ url }}</a></p>
+<p>Published on {{ time }}</p>
+<div>
+    <a href=".?re"><button>Re-publish worksheet</button></a>
+    <a onClick="parent.location+='?stop'"><button>Stop publishing</button></p></a>
+</div>
 <input type="checkbox" name="auto" {{ checked }} onchange="parent.location='?auto'"/> <label for="auto">Automatically re-publish when changes are made</label>
 {% endblock %}
 {% set select = "publish" %}

new file sagenb/data/sage/html/notebook/base.html

@@ +1 @@
+{% extends "html/base_authenticated.html" %}
+{#
+INPUT:
+- notebook - an instance of Notebook
+- worksheet - an instance of Worksheet
+- username  - a string containing a username
+- title - a string
+- select    - a string containing the control that is selected
+- backwards - a boolean
+#}
+
+{% set system_names = worksheet.notebook().system_names() %}
+{% block title %}{{ worksheet.name() }}{% endblock %}
+
+
+{% block javascript %}
+<!-- jQuery UI - interacts, widgets, drag-drop, etc. -->
+<link rel="stylesheet" href="/javascript/jqueryui/css/sage/jquery-ui-1.7.2.custom.css" />
+<script type="text/javascript" src="/javascript/jqueryui/js/jquery-ui-1.7.2.custom.min.js"></script>
+
+<!-- jQuery plugins - color pickers, shift-click, AJAX forms, IE fixes -->
+<link rel="stylesheet" href="/javascript/jquery/plugins/farbtastic/farbtastic.css" type="text/css" />
+<script type="text/javascript" src="/javascript/jquery/plugins/farbtastic/farbtastic.min.js"></script>
+<script type="text/javascript" src="/javascript/jquery/plugins/extendedclick/jquery.event.extendedclick.min.js"></script>
+<script type="text/javascript" src="/javascript/jquery/plugins/form/jquery.form.min.js"></script>
+<script type="text/javascript" src="/javascript/jquery/plugins/jquery.bgiframe.min.js"></script>
+<link rel="stylesheet" href="/javascript/jquery/plugins/jpicker/css/jPicker-1.0.11.css" type="text/css" />
+<script type="text/javascript" src="/javascript/jquery/plugins/jpicker/jpicker-1.0.11.min.js"></script>
+<link rel="stylesheet" media="screen" type="text/css" href="/javascript/jquery/plugins/colorpicker/css/colorpicker.css" />
+<script type="text/javascript" src="/javascript/jquery/plugins/colorpicker/js/colorpicker.min.js"></script>
+
+<script type="text/javascript" src="/javascript/sage/main.js"></script>
+
+{% if JSMATH %}
+<!-- jsMath - typeset mathematics -->
+<script type="text/javascript" src="/javascript/sage/jsmath.js"></script>
+{% endif %}
+
+<!-- Sage3d - accelerated 3D graphics -->
+<script type="text/javascript" src="/javascript/sage3d/sage3d.js"></script>
+
+<!-- Jmol - embedded 3D graphics -->
+<script type="text/javascript" src="/java/jmol/appletweb/Jmol.js"></script>
+<!-- This must stay in head -->
+<script>jmolInitialize("/java/jmol");jmolSetCallback("menuFile","/java/jmol/appletweb/SageMenu.mnu");</script>
+
+{% if JEDITABLE_TINYMCE and not worksheet.docbrowser() and not worksheet.is_published() %}
+<!-- TinyMCE and jEditable - in-place editing of text cells -->
+<script type="text/javascript" src="/javascript/tiny_mce/tiny_mce.js"></script>
+<script type="text/javascript" src="/javascript/jquery/plugins/jeditable/jquery.jeditable.mini.js" charset="utf-8"></script>
+<script type="text/javascript" src="/javascript/sage/tinymce.js"></script>
+{% endif %}
+
+<script type="text/javascript">user_name= "{{ username }}";</script>
+{% if worksheet.filename() %}
+<script  type="text/javascript">
+    worksheet_filename = "{{ worksheet.filename() }}";
+    worksheet_name = "{{ worksheet.name() }}";
+    server_ping_while_alive();
+</script>
+{% endif %}
+
+{% endblock %}
+
+{% block main %}
+<div id="worksheet-bar">
+    <div class="worksheet_title">
+        <a id="worksheet_title" class="worksheet_title"
+           onClick="rename_worksheet(); return false;"
+           title="Click to rename this worksheet">
+            {{ worksheet.name() }}
+        </a>
+        <div><span class="lastedit">{{ worksheet.html_time_last_edited() }}</span></div>
+        {% if worksheet.warn_about_other_person_editing(username) and username != 'guest' and not worksheet.is_doc_worksheet() %}
+        <span class="pingdown">(Someone else is viewing this worksheet)</span>
+        {% endif %}
+    </div>
+    <div id="save-discard-buttons">
+        {% if not worksheet.is_doc_worksheet() %}
+        <button name="button_save" title="Save changes" onClick="save_worksheet();">Save</button><button title="Save changes and close window" onClick="save_worksheet_and_close();" name="button_save">Save & quit</button><button title="Discard changes to this worksheet" onClick="worksheet_discard();">Discard & quit</button>
+        {% endif %}
+    </div>
+    
+    <div id="worksheet-menu">
+        <select class="worksheet"  onchange="go_option(this);" id="file-menu">
+            <option title="Select a file related function" value=""  selected>File...</option>
+            <option title="Load a new worksheet stored in a file" value="upload_worksheet_button();">Load worksheet from a file...</option>
+            <option title="Create a new worksheet" value="new_worksheet();">New worksheet</option>
+            <option title="Save this worksheet to an sws file" value="download_worksheet();">Save worksheet to a file...</option>
+            <option title="Print this worksheet" value="print_worksheet();">Print</option>
+            <option title="Rename this worksheet" value="rename_worksheet();">Rename worksheet</option>
+            <option title="Copy this worksheet" value="copy_worksheet();">Copy worksheet</option>
+            <option title="Move this worksheet to the trash" value="delete_worksheet('{{ worksheet.filename() }}');">Delete worksheet</option>
+        </select>
+
+        <select class="worksheet"  onchange="go_option(this);"  id="action-menu">
+            <option title="Select a worksheet function" value="" selected>Action...</option>
+            <option title="Interrupt currently running calculations, if possible" value="interrupt();">Interrupt</option>
+            <option title="Restart the worksheet process" value="restart_sage();">Restart worksheet</option>
+            <option title="Quit the worksheet process" value="save_worksheet_and_close();">Save and quit worksheet</option> 
+            <option value="">---------------------------</option>
+            <option title="Evaluate all input cells in the worksheet" value="evaluate_all();">Evaluate All</option>
+            <option title="Hide all output" value="hide_all();">Hide All Output</option>
+            <option title="Show all output" value="show_all();">Show All Output</option>
+            <option title="Delete all output" value="delete_all_output();">Delete All Output</option>
+            <option value="">---------------------------</option>
+            <option title="Switch to single-cell mode" value="slide_mode();">One Cell Mode</option>
+            <option title="Switch to multi-cell mode" value="cell_mode();">Multi Cell Mode</option> 
+        </select>
+        <select class="worksheet" onchange="handle_data_menu(this);" id="data-menu">
+            <option title="Select an attached file" value="" selected>Data...</option>
+            <option title="Upload or create a data file in a wide range of formats" value="__upload_data_file__">Upload or create file...</option>
+            <option value="">--------------------</option>
+            {% for name in worksheet.attached_data_files()|sort %}
+            <option value="datafile?name={{ name }}">{{ name }}</option>
+            {% endfor %}
+        </select>
+
+        {% if not worksheet.is_doc_worksheet() %}
+        <select onchange="go_system_select(this, {{ worksheet.system_index() }});" class="worksheet" id="systems-menu">
+            {% for system_name in worksheet.notebook().systems() %}
+            <option title="Evaluate all input cells using {{ system_names[loop.index0] }}"
+                    {{ "selected" if worksheet.system_index() == loop.index0 else "" }} value="{{ system_names[loop.index0] }}">
+                {{ system_name }}
+            </option>
+            {% endfor %}
+        </select>    
+        <input type="checkbox" title="Enable/disable pretty_printing"
+               onchange="pretty_print_check(this.checked);"
+               class="worksheet" value="pretty_print" {{ "checked" if worksheet.pretty_print() else "" }} />&nbsp;Typeset
+        {% endif %}
+    </div>
+    <div id="share-publish-buttons">
+        {% if not worksheet.is_doc_worksheet() %}
+        {% macro cls(x) %}
+        {{ "control-select" if x == select else "control" }}
+        {% endmacro %}
+        {% macro backwards_text() %}{{ "../" if backwards else "" }}{% endmacro %}
+        <a title="Print this worksheet" class="print-link" onClick="print_worksheet()"><img border=0 src="/images/icon_print.gif" alt="Print">Print</a>
+        <a class="{{ cls('use') }}" title="Interactively use this worksheet" onClick="edit_worksheet();">Worksheet</a>        
+        <a class="{{ cls('edit') }}" title="Edit text version of this worksheet" href="{{ backwards_text() }}edit">Edit</a>
+        <a class="{{ cls('text') }}" title="View plain text version of this worksheet" href="{{ backwards_text() }}text">Text</a>
+        <a class="{{ cls('undo') }}" title="View changes to this worksheet over time" href="{{ backwards_text() }}revisions">Undo</a>
+        <a class="{{ cls('share') }}" title="Let others edit this worksheet" href="{{ backwards_text() }}share">Share</a>
+        <a class="{{ cls('publish') }}" title="Make this worksheet publicly viewable" href="{{ backwards_text() }}publish">Publish</a>
+        {% endif %}
+    </div>
+</div>
+<div class="hidden" id="slide_controls">
+    <div class="slideshow_control">
+        <a class="slide_arrow" onClick="slide_next()">&gt;</a>
+        <a class="slide_arrow" onClick="slide_last()">&gt;&gt;</a> <span class="vbar"></span>
+        <a class="cell_mode" onClick="cell_mode()">Exit</a>
+    </div>
+    <div class="slideshow_progress" id="slideshow_progress" onClick="slide_next()">
+        <div class="slideshow_progress_bar" id="slideshow_progress_bar">&nbsp;</div>
+        <div class="slideshow_progress_text" id="slideshow_progress_text">&nbsp;</div>
+    </div>
+    <div class="slideshow_control">
+        <a class="slide_arrow" onClick="slide_first()">&lt;&lt;</a>
+        <a class="slide_arrow" onClick="slide_prev()">&lt;</a>
+    </div>
+</div>
+{% block worksheet_main %}{% endblock %}
+{% endblock %}
+

new file sagenb/data/sage/html/notebook/base_aux.html

@@ +1 @@
+{% extends "html/notebook/base.html" %}
+{# Base template for auxilliary pages (Edit, Text, etc.) #}
+
+{% block worksheet_main %}
+{% block before_sharebar %}{% endblock %}
+<div class="sharebar">{% block sharebar_title %}{% endblock %}</div>
+{% block after_sharebar %}{% endblock %}
+{% endblock %}

sagenb/data/sage/html/notebook/beforepublish_window.html

@@ -1 @@
-{% extends "html/notebook/worksheet_page_template.html" %}
-{#
-INPUT:
-- worksheet - an instance of Worksheet
-- worksheet_filename - a string containing a worksheet's filename
-- username - a string containing a username
-- JSMATH - a boolean stating whether to include jsMath
-- JEDITABLE_TINYMCE - a boolean stating whether to include jEditable and TinyMCE
-#}
+{% extends "html/notebook/base_aux.html" %}
 
+{% block page_id %}before-publish-page{% endblock %}
 {% block sharebar_title %}
 <p>You can publish your worksheet to the Internet, where anyone will be able to access and view it online.</p>
 
@@ -17 +10 @@
 
 <form method="get" action=".">
     <input type="hidden" name="yes" value="" />
-    <input type="submit" value="Yes" style="margin-left:10px" />
-    <input type="button" value="No" style="margin-left:5px" onClick="parent.location='../'" />
-    <br/>
-    <br/>
-    <input type="checkbox" name="auto" style="margin-left:13px" /> Automatically re-publish when changes are made
+    <div>
+        <button type="submit">Yes</button>
+        <a href="../"><button>No</button></a>
+    </div>
+    <div>
+        <input type="checkbox" name="auto" /> <label for="auto"> Automatically re-publish when changes are made</label>
+    </div>
 </form>
 {% endblock %}
 {% set select = "publish" %}

new file sagenb/data/sage/html/notebook/cell.html

@@ +1 @@
+{#
+INPUT:
+
+        - ``cell`` -- Cell instance
+
+        - ``wrap`` - an integer stating column position to wrap lines. Defaults to
+          configuration if not given.
+
+        - ``div_wrap`` - a boolean stating whether to wrap ``div``.
+
+        - ``do_print`` - a boolean stating whether the HTML is for
+        print or not.
+#}
+{% if do_print %}
+    {% set wrap = 68 %}
+    {% set div_wrap = true %}
+{% endif %}
+{% set cell_cls = "cell_evaluated" if cell.evaluated() or do_print else "cell_not_evaluated" %}
+
+{% if div_wrap %}
+<div id="cell_outer_{{ cell.id() }}" class="cell_visible">
+    <div id="cell_{{ cell.id() }}" class="{{ cell_cls }}">
+{% endif %}
+        {% if 'hideall' not in cell.percent_directives() %}
+        {# input #}
+        {% if not do_print %}
+            <div class="insert_new_cell" id="insert_new_cell_before{{ cell.id() }}">
+            </div>
+            <script type="text/javascript">
+                $("#insert_new_cell_before{{ cell.id() }}").plainclick(function (e) {
+                    insert_new_cell_before({{ cell.id() }});
+                });
+                {% if not cell.worksheet().docbrowser() %}
+                $("#insert_new_cell_before{{ cell.id() }}").shiftclick(function (e) {
+                    insert_new_text_cell_before({{ cell.id() }});
+                });
+                {% endif %}
+            </script>
+        {% endif %}
+            {% if 'hide' in cell.percent_directives() %}
+                {% set input_cls = 'cell_input_hide' %}
+            {% else %}
+                {% set input_cls = 'cell_input' %}
+            {% endif %}
+            {% if do_print %}
+                <div class="cell_input_print">{{ cell.input_text().rstrip()|escape }}&nbsp;</div>
+            {% else %}
+                <textarea class="cell_input" rows="{{ (1, cell.input_text().strip()|number_of_rows(80))|max }}"
+                          cols="80"
+                          id="cell_input_{{ cell.id() }}"
+                          {# TODO: Migrate these 'on' handlers to a .js file #}
+                          onKeyPress="return input_keypress({{ cell.id() }}, event);"
+                          onKeyDown="return input_keydown({{ cell.id() }},event);"
+                          onKeyUp="return input_keyup({{ cell.id() }}, event);"
+                          onBlur="cell_blur({{ cell.id() }}); return true;"
+                          onFocus="cell_focused(this, {{ cell.id() }}); return true;">{{ cell.input_text().rstrip() }}</textarea>
+                <a href="javascript:evaluate_cell({{ cell.id() }},0)"
+                   class="eval_button"
+                   id="eval_button{{ cell.id() }}"
+                   alt="Click here or press shift-return to evaluate">
+                    evaluate
+                </a>
+            {% endif %}
+            {# end input #}
+
+            <div id='introspect_div_{{ cell.id() }}' class='introspection'></div>
+        {% endif %}
+
+        {% if do_print and cell.cell_output_type() == 'hidden' %}
+        <pre>
+        </pre>
+        {% else %}
+        {% set output_cls = 'cell_div_output_running' if cell.computing() else 'cell_div_output_' + cell.cell_output_type() %}
+        <div class="cell_output_div">
+            <table class="cell_output_box">
+                <tr>
+                    <td class="cell_number" id="cell_number_{{ cell.id() }}"
+                        {{ '' if do_print else 'onClick="cycle_cell_output_type(%s);"'|format(cell.id()) }} >
+                        {% for i in range(7) %}&nbsp;{% endfor %}
+                    </td>
+                    <td class="output_cell">
+                        <div class="{{ output_cls }}" id="cell_div_output_{{ cell.id() }}">
+                            <div class="cell_output_{{ "print_" if do_print else '' }}{{ cell.cell_output_type() }}"
+                                id="cell_output_{{ cell.id() }}">
+                                {% if cell.introspect() %}
+                                    {{ cell.output_text(0, html=true) }}
+                                {% else %}
+                                    {{ cell.output_text(wrap, html=true) }}
+                                {% endif %}
+                            </div>
+                            {% if not do_print %}
+                                <div class="cell_output_{{ 'print_' if do_print else '' }}nowrap_{{ cell.cell_output_type() }}"
+                                     id="cell_output_nowrap_{{ cell.id() }}">
+                                    {{ cell.output_text(0, html=true) }}
+                                </div>
+                            {% endif %}
+                                <div class="cell_output_html_{{ cell.cell_output_type() }}"
+                                     id="cell_output_html_{{ cell.id() }}">
+                                    {{ cell.output_html() }}
+                                </div>
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
+        {% endif %}
+        
+{% if div_wrap %}
+    </div>
+</div>
+{% endif %}

deleted file sagenb/data/sage/html/notebook/debug_window.html

@@ -1 @@
-
-<div class='debug_window'>
-    <div class='debug_output'><pre id='debug_output'></pre></div>
-    <textarea rows=5 id='debug_input' class='debug_input' 
-              onKeyPress='return debug_keypress(event);' 
-              onFocus='debug_focus();' onBlur='debug_blur();'></textarea>
-</div>
- No newline at end of file

sagenb/data/sage/html/notebook/doc_page.html

@@ -1 @@
-{% extends "html/notebook/index.html" %}
+{% extends "html/notebook/worksheet_page.html" %}
 
 {% block pre_main_css %}
 <link type="text/css" rel="stylesheet" href="_static/default.css" media="screen" />

sagenb/data/sage/html/notebook/download_or_delete_datafile.html

@@ -1 @@
-{% extends "html/notebook/worksheet_page_template.html" %}
+{% extends "html/notebook/base_aux.html" %}
 {#
 INPUT:
 - worksheet - an instance of Worksheet
-- worksheet_filename - a string containing a worksheet's filename
 - username - a string containing a username
-- active_worksheets - a list of the Worksheet instances that are active for username
 - filename_ - the name of the file
-- path - the path to the file
 - file_is_image - a boolean stating whether the file is an image
 - file_is_text - a boolean stating whether the file is a text file
 - text_file_content - a string containing the content of a text file
-- JSMATH - a boolean stating whether to include jsMath
-- JEDITABLE_TINYMCE - a boolean stating whether to include jEditable and TinyMCE
 #}
 
+{% set path = "/home/%s/data/%s"|format(worksheet.filename(), filename_) %}
+
 {% block sharebar_title %}
 Data file: {{ filename_ }}
 {% endblock %}
@@ -21 +18 @@
 {% block after_sharebar %}
 <p>You may download <a href="{{ path }}">{{ filename_ }}</a> or create a linked copy to the worksheet <select onchange="go_option(this);" class="worksheet">
 <option selected>select worksheet</option>
-{% for worksheet in active_worksheets %}
+{% for worksheet in notebook.active_worksheets_for(username) %}
     <option value='link_datafile("{{ worksheet.filename() }}","{{ filename_ }}")'>{{ worksheet.name() }}</option>
 {% endfor %}
 </select> or <a href="/home/{{ worksheet.filename() }}/datafile?name={{ filename_ }}&action=delete">delete {{ filename_ }}.</a></p>
@@ -35 +32 @@
 {% elif file_is_text %}
 <form method="post" action="savedatafile" enctype="multipart/form-data">
     <input type="submit" value="Save Changes" name="button_save" /> <input type="submit" value="Cancel" name="button_cancel" style="display:block" />
-    <textarea class="edit" name="textfield" rows=17 cols=70 id="textfield">{{ text_file_content }}</textarea>
+    <textarea class="edit" name="textfield" rows=17 cols=70 id="textfield">{{ text_file_content | escape }}</textarea>
     <input type="hidden" name="filename" value="{{ filename_ }}" id="filename" />
 </form>
 {% endif %}

sagenb/data/sage/html/notebook/edit_window.html

@@ -1 @@
-{% extends "html/notebook/worksheet_page_template.html" %}
-{#
-INPUT:
-- worksheet - an instance of Worksheet
-- worksheet_filename - a string containing a worksheet's filename
-- username - a string containing a username
-- text - a string containing the text of the worksheet
-- n_lines - number of lines of the text of the worksheet
-- JSMATH - a boolean stating whether to include jsMath
-- JEDITABLE_TINYMCE - a boolean stating whether to include jEditable and TinyMCE
-#}
+{% extends "html/notebook/base_aux.html" %}
 
-{% block sharebar_title %}
-Edit plain text &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" value="Save Changes" name="button_save" id="button_save"> <input type="submit" value="Cancel" name="button_cancel">
-{% endblock %}
-{% set select = "edit" %}
+{% block page_id %}edit-page{% endblock %}
 
 {% block before_sharebar %}
 <form method="post" action="save" enctype="multipart/form-data">
 {% endblock %}
+    
+{% block sharebar_title %}
+    <span>Edit plain text</span>
+    <button type="submit" name="button_save" id="button_save">Save Changes</button>
+    <button type="submit" name="button_cancel">Cancel</button>
+{% endblock %}
+{% set select = "edit" %}
+
 {% block after_sharebar %}
 <script type="text/javascript">
     function save_worksheet() {
@@ -25 +20 @@
     function save_worksheet_and_close() {
     }
 </script>
-    <textarea class="plaintextedit" id="cell_intext" name="textfield" rows="{{ n_lines }}">{{ text }}</textarea>
+    <textarea class="plaintextedit" id="cell_intext" name="textfield" rows="{{ worksheet.edit_text().count("\n")+1 }}">{{ worksheet.edit_text()|escape }}</textarea>
 </form>
 {% endblock %}

deleted file sagenb/data/sage/html/notebook/guest_top_bar_and_worksheet.html

@@ -1 @@
-
-{#
-INPUT:
-- original_worksheet - an instance of Worksheet
-- worksheet - an instance of Worksheet
-- notebook - an instance of Notebook which contains worksheet
-- worksheet_html - a string containing the html for the worksheet
-- username - a string containing a username
-#}
-{% if original_worksheet.is_collaborator(username) or original_worksheet.is_owner(username) %}
-    {% set edit_text = "Edit this." %}
-    {% set url       = "edit_published_page" %}
-{% elif notebook.user_is_guest(username) %}
-    {% set edit_text = "Log in to edit a copy." %}
-    {% set url       = "/" %}
-{% else %}
-    {% set edit_text = "Edit a copy." %}
-    {% set url       = "edit_published_page" %}
-{% endif %}
-
-{% set download_name = worksheet.download_name() %}
-
-<a class="usercontrol" href="{{ url }}">{{ edit_text }}</a>
-&nbsp;&nbsp;<a class="usercontrol" href="download/{{ download_name }}.sws">Download.</a>
-&nbsp;&nbsp;<span class="ratingmsg">
-    {% if worksheet.rating() != -1 %}
-        <a class="usercontrol" href="rating_info">
-            This page is rated {{ "%.1f"|format(worksheet.rating()) }}.
-        </a>
-    {% endif %}
-    {% if not notebook.user_is_guest(username)
-        and not worksheet.is_publisher(username) %}
-        &nbsp;&nbsp;
-        <span class="usercontrol">
-            {{ "Rerate" if worksheet.is_rater(username) else "Rate" }} it: 
-        </span>
-        {% for i in range(5) %}
-            <a class="usercontrol"
-               onClick="rate_worksheet({{ i }})">
-                &nbsp;{{ i }}&nbsp;
-            </a>
-        {% endfor %}
-            &nbsp;&nbsp; <input name="rating_comment" id="rating_comment"></input>
-    {% endif %}
-</span>
-<span class="pubmsg">
-    <a href="/pub/">Other published documents...</a>
-</span>
-<hr class="usercontrol" />
-<h1 align="center" class="title">{{ worksheet.name() }}</h1>
-<h2 align="center">{{ worksheet.html_time_since_last_edited() }}</h2>
-{{ worksheet_html }}
-<hr class="usercontrol" />
-{% for i in range(10) %}
-&nbsp;
-{% endfor %}
-
-
-

new file sagenb/data/sage/html/notebook/guest_worksheet_page.html

@@ +1 @@
+{% extends "html/notebook/base.html" %}
+{#
+INPUT:
+- worksheet - an instance of Worksheet
+- notebook - an instance of Notebook which contains worksheet
+- username - a string containing a username
+#}
+
+{% block page_id %}guest-worksheet-page{% endblock %}
+
+{% set original_worksheet = worksheet.worksheet_that_was_published() %}
+{% if original_worksheet.is_collaborator(username) or original_worksheet.is_owner(username) %}
+    {% set edit_text = "Edit this." %}
+    {% set url       = "edit_published_page" %}
+{% elif notebook.user_is_guest(username) %}
+    {% set edit_text = "Log in to edit a copy." %}
+    {% set url       = "/" %}
+{% else %}
+    {% set edit_text = "Edit a copy." %}
+    {% set url       = "edit_published_page" %}
+{% endif %}
+
+{% set download_name = worksheet.download_name() %}
+
+{% block body %}
+<ul class="controls">
+    <li><a href="{{ url }}">{{ edit_text }}</a></li>
+    <li><a href="download/{{ download_name }}.sws">Download.</a></li>
+    {% if worksheet.rating() != -1 or
+       not (notebook.user_is_guest(username) or worksheet.is_publisher(username)) %}
+    <li>
+        {% if worksheet.rating() != -1 %}
+            <a class="usercontrol" href="rating_info">
+                This page is rated {{ "%.1f"|format(worksheet.rating()) }}.
+            </a>
+        {% endif %}
+        {% if not (notebook.user_is_guest(username) or worksheet.is_publisher(username)) %}
+            <span>
+                {{ "Rerate" if worksheet.is_rater(username) else "Rate" }} it: 
+            </span>
+            {% for i in range(5) %}
+                <a class="usercontrol"
+                   onClick="rate_worksheet({{ i }})">{{ i }}</a>
+            {% endfor %}
+                &nbsp;&nbsp; <input name="rating_comment" id="rating_comment" />
+        {% endif %}
+    </li>
+    {% endif %}
+    <li><a href="/pub/">Other published documents...</a></li>
+</ul>
+<hr class="usercontrol" />
+<h1 class="title">{{ worksheet.name() }}</h1>
+<h2 class="lastedit">{{ worksheet.html_time_since_last_edited() }}</h2>
+{{ worksheet.html(do_print=false, publish=true) }}
+<hr class="usercontrol" />
+{% for i in range(10) %}
+&nbsp;
+{% endfor %}
+{% endblock %}
+
+
+

deleted file sagenb/data/sage/html/notebook/head.tmpl

@@ -1 @@
-{#
-INPUT:
-- worksheet - an instance of Worksheet
-- worksheet_filename - a string containing a worksheet's filename
-- username - a string containing a user's name
-- JSMATH - a boolean stating whether to include jsMath
-- JEDITABLE_TINYMCE - a boolean stating whether to include jEditable and TinyMCE
-  #}
-{% macro common_title(worksheet_filename, worksheet) %}
-    {% if worksheet_filename %}
-        {{ worksheet.name() }} (Sage)
-    {% else %}
-        Sage Notebook | Welcome
-    {% endif %}
-{% endmacro %}
-
-{% macro common_javascript(worksheet, worksheet_filename, username, JSMATH, JEDITABLE_TINYMCE) %}
-<!-- jQuery UI - interacts, widgets, drag-drop, etc. -->
-<link rel="stylesheet" href="/javascript/jqueryui/css/sage/jquery-ui-1.7.2.custom.css" />
-<script type="text/javascript" src="/javascript/jqueryui/js/jquery-ui-1.7.2.custom.min.js"></script>
-
-<!-- jQuery plugins - color pickers, shift-click, AJAX forms, IE fixes -->
-<link rel="stylesheet" href="/javascript/jquery/plugins/farbtastic/farbtastic.css" type="text/css" />
-<script type="text/javascript" src="/javascript/jquery/plugins/farbtastic/farbtastic.min.js"></script>
-<script type="text/javascript" src="/javascript/jquery/plugins/extendedclick/jquery.event.extendedclick.min.js"></script>
-<script type="text/javascript" src="/javascript/jquery/plugins/form/jquery.form.min.js"></script>
-<script type="text/javascript" src="/javascript/jquery/plugins/jquery.bgiframe.min.js"></script>
-<link rel="stylesheet" href="/javascript/jquery/plugins/jpicker/css/jPicker-1.0.11.css" type="text/css" />
-<script type="text/javascript" src="/javascript/jquery/plugins/jpicker/jpicker-1.0.11.min.js"></script>
-<link rel="stylesheet" media="screen" type="text/css" href="/javascript/jquery/plugins/colorpicker/css/colorpicker.css" />
-<script type="text/javascript" src="/javascript/jquery/plugins/colorpicker/js/colorpicker.min.js"></script>
-
-<script type="text/javascript" src="/javascript/sage/main.js"></script>
-  
-{% if JSMATH %}
-<!-- jsMath - typeset mathematics -->
-<script type="text/javascript" src="/javascript/sage/jsmath.js"></script>
-{% endif %}
-
-<!-- Sage3d - accelerated 3D graphics -->
-<script type="text/javascript" src="/javascript/sage3d/sage3d.js"></script>
-
-<!-- Jmol - embedded 3D graphics -->
-<script type="text/javascript" src="/java/jmol/appletweb/Jmol.js"></script>
-<!-- This must stay in head -->
-<script>jmolInitialize("/java/jmol");jmolSetCallback("menuFile","/java/jmol/appletweb/SageMenu.mnu");</script>
-
-{% if JEDITABLE_TINYMCE and not worksheet.docbrowser() and not worksheet.is_published() %}
-<!-- TinyMCE and jEditable - in-place editing of text cells -->
-<script type="text/javascript" src="/javascript/tiny_mce/tiny_mce.js"></script>
-<script type="text/javascript" src="/javascript/jquery/plugins/jeditable/jquery.jeditable.mini.js" charset="utf-8"></script>
-<script type="text/javascript" src="/javascript/sage/tinymce.js"></script>
-{% endif %}
-
-<script type="text/javascript">user_name= "{{ username }}";</script>
-{% if worksheet_filename %}
-<script  type="text/javascript">
-  worksheet_filename="{{ worksheet_filename }}";
-  worksheet_name="{{ worksheet.name() }}";
-  server_ping_while_alive();
-</script>
-{% endif %}
-
-{% endmacro %}

deleted file sagenb/data/sage/html/notebook/index.html

@@ -1 @@
-{% extends "html/base.html" %}
- {#
- INPUT:
- - worksheet - an instance of Worksheet
- - worksheet_filename - a string containing a worksheet's filename
- - notebook - an instance of Notebook which contains worksheet
- - username  - a string containing a username
- - show_debug - a boolean stating whether to show debug information
- - JSMATH - a boolean stating whether to include jsMath
- - JSMATH_IMAGE_FONTS - a boolean stating whether to include jsMath iamage fonts
- - JEDITABLE_TINYMCE - a boolean stating whether to include jEditable and TinyMCE
- - sage_jsmath_macros - an array containing strings of Javascript of Sage macros for jsMath
- - do_print - a boolean stating whether the file is for print mode
- - worksheet_html - a string containing the html for a worksheet
- - select    - a string containing the control that is selected
- - backwards - a boolean
- - warn - boolean stating whether to warn that another user is viewing
-          the worksheet
-#}
-
-{% if not select %}
-    {% set select = none %}
-{% endif %}
-
-{% if not backwards %}
-    {% set backwards = false %}
-{% endif %}
-    
-{% include "html/notebook/head.tmpl"%}
-
-{% block title %}
-{{ common_title(worksheet_filename, worksheet) }}
-{% endblock %}
-    
-{% block css %}main{% endblock %}
-
-{% block javascript %}
-{{ common_javascript(worksheet, worksheet_filename, username, JSMATH, JEDITABLE_TINYMCE) }}
-{% endblock %}
-
-{# TODO: Hack until the template restructuring #}
-{% block body_attrs %}
-{% if worksheet.is_published() or notebook.user_is_guest(username) %}
-        class="worksheet-online" onLoad="initialize_the_notebook();"
-    {% else %}
-        class="worksheet-online" onLoad="initialize_the_notebook();" id="user-worksheet-index"
-{% endif %}
-{% endblock %}
-
-
-{% block body %}
-{% if worksheet.is_published() or notebook.user_is_guest(username) %}
-    {% set original_worksheet = worksheet.worksheet_that_was_published() %}
-    {% include "html/notebook/guest_top_bar_and_worksheet.html" %}
-{% else %}
-    {% include "html/notebook/top_bar_and_worksheet.html" %}
-{% endif %}
-{% if not worksheet %}
-    </td></tr></table></span>
-{% endif %}
-{% if worksheet.is_only_viewer(username) %}
-    <script type="text/javascript">worksheet_locked=true;</script>
-{% else %}
-    <script type="text/javascript">worksheet_locked=false;</script>
-{% endif %}
-{% if worksheet.computing() %}
-    <!-- Set the update checking back in motion. -->
-    <script type="text/javascript">
-        active_cell_list = {{ worksheet.queue_id_list() }};
-        for(var i = 0; i < active_cell_list.length; i++) {
-            cell_set_running(active_cell_list[i]);
-        }
-        start_update_check();
-    </script>
-{% endif %}
-{% endblock %}

sagenb/data/sage/html/notebook/plain_text_window.html

@@ -1 @@
-{% extends "html/notebook/worksheet_page_template.html" %}
-{#
-INPUT:
-- worksheet - an instance of Worksheet
-- worksheet_filename - a string containing a worksheet's filename
-- username - a string containing a username
-- plain_text - a string containing the plain text version
-- JSMATH - a boolean stating whether to include jsMath
-- JEDITABLE_TINYMCE - a boolean stating whether to include jEditable and TinyMCE
-#}
+{% extends "html/notebook/base_aux.html" %}
 
 {% block sharebar_title %}
 View plain text
@@ -16 +7 @@
 {% set select = "text" %}
 
 {% block after_sharebar %}
-<pre class="plaintext" id="cell_intext" name="textfield">{{ plain_text }}</pre>
+<pre class="plaintext" id="cell_intext" name="textfield">{{ worksheet.plain_text(prompts=true, banner=false)|escape|trim }}</pre>
 {% endblock %}

deleted file sagenb/data/sage/html/notebook/plain_text_worksheet.html

@@ -1 @@
-
-{#
-INPUT:
-     - worksheet_name - a string containing a worksheet's name
-     - worksheet_plain_text - a string containing the plain text version of a worksheet
-#}
-<head>
-    <title>Sage Worksheet: {{ worksheet_name }}</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-</head>
-<body>
-    <h1><a href=".">Sage Worksheet: %s</a></h1>
-    <pre>{{ worksheet_plain_text }}</pre>
-</body>
- No newline at end of file

new file sagenb/data/sage/html/notebook/print_worksheet.html

@@ +1 @@
+{% extends "html/notebook/base.html" %}
+
+{% block page_id %}print-page{% endblock %}
+
+{% block body %}
+<h1>{{ worksheet.name() }}</h1>
+{{ worksheet.html(do_print=true) }}
+{% endblock %}
+
+ 
+ No newline at end of file

deleted file sagenb/data/sage/html/notebook/slide_controls.html

@@ -1 @@
-
-<div class="hidden" id="slide_controls">
-    <div class="slideshow_control">
-        <a class="slide_arrow" onClick="slide_next()">&gt;</a>
-        <a class="slide_arrow" onClick="slide_last()">&gt;&gt;</a> <span class="vbar"></span>
-        <a class="cell_mode" onClick="cell_mode()">Exit</a>
-    </div>
-    <div class="slideshow_progress" id="slideshow_progress" onClick="slide_next()">
-        <div class="slideshow_progress_bar" id="slideshow_progress_bar">&nbsp;</div>
-        <div class="slideshow_progress_text" id="slideshow_progress_text">&nbsp;</div>
-    </div>
-    <div class="slideshow_control">
-        <a class="slide_arrow" onClick="slide_first()">&lt;&lt;</a>
-        <a class="slide_arrow" onClick="slide_prev()">&lt;</a>
-    </div>
-</div>
-
-
-
-
-
-
-

sagenb/data/sage/html/notebook/specific_revision.html

@@ -1 @@
-{% extends "html/notebook/worksheet_page_template.html" %}
-{#
-INPUT:
-- worksheet - an instance of Worksheet
-- worksheet_filename - a string containing a worksheet's filename
-- username - a string containing a username
-- rev - this revision's key
-- prev_rev - the previous revision's key
-- next_rev - the next revision's key
-- time_ago - a string containing the time since revision
-- body_worksheet_html - the body html of the worksheet
-- JSMATH - a boolean stating whether to include jsMath
-- JEDITABLE_TINYMCE - a boolean stating whether to include jEditable and TinyMCE
-#}
+{% extends "html/notebook/base_aux.html" %}
 
 {% set select = "revisions" %}
 {% block sharebar_title %}
@@ -40 +27 @@
 {% block after_sharebar %}
 {{ actions() }}
 <div id="revision-data">
-    {{ body_worksheet_html }}
+    {{ worksheet.html(do_print=true, publish=true) }}
 </div>
 {{ actions() }}
 <script type="text/javascript">

new file sagenb/data/sage/html/notebook/text_cell.html

@@ +1 @@
+{#
+INPUT:
+
+- cell -- Cell instance
+
+- wrap -- number of columns to wrap
+
+- do_print -- whether to display for printing
+
+- do_math_parse -- whether to parse jsMath
+
+- editing -- whether user is editing the cell
+#}
+<span id="cell_outer_{{ cell.id() }}">
+    {% if not do_print and not cell.worksheet().docbrowser() %}
+    <div class="insert_new_cell" id="insert_new_cell_before{{ cell.id() }}">
+    </div>
+    <script type="text/javascript">
+        $("#insert_new_cell_before{{ cell.id() }}").plainclick(function (e) {
+            insert_new_cell_before({{ cell.id() }});
+        });
+        $("#insert_new_cell_before{{ cell.id() }}").shiftclick(function (e) {
+            insert_new_text_cell_before({{ cell.id() }});
+        });
+    </script>
+    {% endif %}
+    <div class="text_cell" id="cell_text_{{ cell.id() }}">
+        {% if do_math_parse %}
+            {{ cell.plain_text()|math_parse }}
+        {% else %}
+            {{ cell.plain_text() }}
+    {% endif %}
+    </div>
+{% if JEDITABLE_TINYMCE and not cell.worksheet().is_published() and not cell.worksheet().docbrowser() and not do_print %}
+    <script type="text/javascript">
+        $("#cell_text_{{ cell.id() }}").unbind('dblclick').editable(function(value,settings) {
+            evaluate_text_cell_input({{ cell.id() }},value,settings);
+            return(value);
+            },
+            {
+                tooltip   : "",
+                placeholder : "",
+        //      type   : 'textarea',
+                type   : 'mce',
+                onblur : 'ignore',
+                select : false,
+                submit : 'Save changes',
+                cancel : 'Cancel changes',
+                event  : "dblclick",
+                style  : "inherit",
+        });
+    </script>
+{% endif %}
+
+{% if editing and not do_print %}
+    <script>
+        $("#cell_text_{{ cell.id() }}").trigger('dblclick');
+    </script>
+{% endif %}
+</span>

deleted file sagenb/data/sage/html/notebook/top_bar_and_worksheet.html

@@ -1 @@
-{#
-INPUT:
-- username - a string containing a username
-- worksheet_filename - a string containing a worksheet's filename
-- worksheet_html - a string containing the html for a worksheet
-- show_debug - a boolean stating whether to show debug information
-  #}
-{% include "html/notebook/worksheet_topbar.tmpl" %}
-{% set toggle=true %}
-{% include "html/top_bar.html" %}
-{% if worksheet.filename() %}
-    {{ worksheet_topbar(worksheet, "use", username) }}
-{% endif %}
-{% if show_debug %}
-    {% include "html/notebook/debug_window.html" %}
-{% endif %}
-
-<div class="worksheet" id="worksheet">
-    {{ worksheet_html }}
-</div>
-

sagenb/data/sage/html/notebook/upload_data_window.html

@@ -1 @@
-{% extends "html/notebook/worksheet_page_template.html" %}
-{#
-INPUT:
-- worksheet - an instance of Worksheet
-- worksheet_filename - a string containing a worksheet's filename
-- username - a string containing a username
-- JSMATH - a boolean stating whether to include jsMath
-- JEDITABLE_TINYMCE - a boolean stating whether to include jEditable and TinyMCE
-#}
+{% extends "html/notebook/base_aux.html" %}
+
 
 {% block page_id %}upload-data-page{% endblock %}
 
@@ -20 +13 @@
           name="upload" enctype="multipart/form-data">
         <div>
             <label for="file">Browse your computer to select a worksheet file to upload:</label>
-            <input size="50" type="file" name="file"></input>
+            <input size="50" type="file" name="file" />
         </div>
         <div>
             <label for="url">Or enter the url of a worksheet file on the web:</label>
-            <input size="50" type="text" name="url"></input>
+            <input size="50" type="text" name="url" />
         </div>
         <div>
             <label for="new">Or enter the name of a new file, which will be created:</label>
-            <input size="50" type="text" name="new"></input>
+            <input size="50" type="text" name="new" />
         </div>
         <div>
             <label for="name">What do you want to call it? (if different than the original name)</label>
-            <input size="50" type="text" name="name"></input>
+            <input size="50" type="text" name="name" />
         </div>
         <button type="submit">Upload or Create Data File</button>
     </form>

sagenb/data/sage/html/notebook/worksheet.html

@@ -1 +1 @@
 {#
 INPUT:
-     - worksheet_name - a string containing a worksheet's name
-     - worksheet_html - a string containing the html for a worksheet
-     - do_print - a boolean stating whether to render a print version of the
-                  worksheet
-  #}
-{% extends "html/base.html" %}
 
-{% block title %}Sage Worksheet: {{ worksheet_name }}{% endblock %}
+- worksheet -- Worksheet object
 
-{% block css %}main{% endblock %}
+- publish -- boolean whether this is for the published version
 
-{% block javascript %}
-<script type="text/javascript" src="/javascript/sage/main.js"></script>
-{% if do_print %}
-<script type="text/javascript" src="/javascript/sage/jsmath.js"></script>
-{% endif %}    
-{% endblock %}
+- do_print -- boolean whether this is for a print version
 
-{% block body_attrs %}
-{% if not do_print %}
-    class="worksheet-online" onLoad="initialize_the_notebook();"
+#}
+
+{% set wrap = conf['word_wrap_cols'] %}
+{% if not publish %}
+    {% set publish = worksheet.is_published() %}
 {% endif %}
-{% endblock %}
 
-{% block body %}
-{% if do_print %}
-    <div class="worksheet_print_title"> {{ worksheet_name }}</div>
+<div class="cell_input_active" id="cell_resizer"></div>
+{% if not publish %}
+<div class="worksheet_cell_list" id="worksheet_cell_list">
 {% endif %}
-{{ worksheet_html }}
-{% if do_print %}
-    <script type="text/javascript">jsMath.Process();</script>
+
+{% for cell in worksheet.cell_list() %}
+    {{ cell.html(wrap = wrap, div_wrap = true, do_print = do_print or publish) }}
+{% endfor %}
+
+{% if not do_print and not publish %}
+</div>
+<div class="insert_new_cell" id="insert_last_cell"></div>
+<script type="text/javascript">
+    $("#insert_last_cell").plainclick(function (e) {
+        insert_new_cell_after(cell_id_list[cell_id_list.length - 1]);
+    });
+{% if not worksheet.docbrowser() %}
+    $("#insert_last_cell").shiftclick(function (e) {
+        insert_new_text_cell_after(cell_id_list[cell_id_list.length - 1]);
+    });
 {% endif %}
-{% endblock %}
+</script>
+{% endif %}

new file sagenb/data/sage/html/notebook/worksheet_page.html

@@ +1 @@
+{% extends "html/notebook/base.html" %}
+{#
+INPUT:
+- worksheet - an instance of Worksheet
+- notebook - an instance of Notebook which contains worksheet
+- show_debug - a boolean stating whether to show debug information
+- do_print - a boolean stating whether the file is for print mode
+#}
+
+{% block body_classes %}worksheet-online{% if not (worksheet.is_published() or notebook.user_is_guest(username) or worksheet.is_doc_worksheet()) %} active-worksheet-page{% endif %}{% endblock %}
+{% block page_id %}user-worksheet-index{% endblock %}
+
+{% block worksheet_main %}
+{% set toggle=true %}
+<div class="worksheet" id="worksheet">
+    {{ worksheet.html() }}
+    {% if do_print %}
+    <script>
+        jsMath.ProcessBeforeShowing();
+    </script>
+    {% else %}
+    <script type="text/javascript">
+        cell_id_list = {{ worksheet.cell_id_list() }};
+        state_number = {{ worksheet.state_number() }};
+        {% if not published %}
+        $(document).ready(function () {
+            if (worksheet_name === "Untitled") {
+                rename_worksheet();
+            }
+         });
+        {% endif %}
+    </script>
+    {% endif %}
+</div>
+
+{% if show_debug %}
+<div class='debug_window'>
+    <div class='debug_output'><pre id='debug_output'></pre></div>
+    <textarea rows=5 id='debug_input' class='debug_input' 
+              onKeyPress='return debug_keypress(event);' 
+              onFocus='debug_focus();' onBlur='debug_blur();'>
+    </textarea>
+</div>
+{% endif %}
+
+<script type="text/javascript">
+{% if worksheet.is_only_viewer(username) %}
+    worksheet_locked = true;
+{% else %}
+    worksheet_locked = false;
+{% endif %}
+</script>
+
+{% if worksheet.computing() %}
+<!-- Set the update checking back in motion. -->
+<script type="text/javascript">
+    active_cell_list = {{ worksheet.queue_id_list() }};
+    for (var i = 0; i < active_cell_list.length; i += 1) {
+        cell_set_running(active_cell_list[i]);
+    }
+    start_update_check();
+</script>
+{% endif %}
+{% endblock %}

deleted file sagenb/data/sage/html/notebook/worksheet_page_template.html

@@ -1 @@
-{% extends "html/base.html" %}
-{#
-INPUT:
-- worksheet - an instance of Worksheet
-- worksheet_filename - a string containing a worksheet's filename
-- username  - a string containing a username
-- title - a string
-- select    - a string containing the control that is selected
-- backwards - a boolean
-- JSMATH - a boolean stating whether to include jsMath
-- JEDITABLE_TINYMCE - a boolean stating whether to include jEditable and TinyMCE
-#}
-
-{% if not select %}
-    {% set select = none %}
-{% endif %}
-
-{% if not backwards %}
-    {% set backwards = false %}
-{% endif %}
-    
-{% include "html/notebook/head.tmpl" %}
-{% include "html/notebook/worksheet_topbar.tmpl" %}
-
-{% block title %}
-{{ common_title(worksheet_filename, worksheet) }}
-{% endblock %}
-    
-{% block css %}main{% endblock %}
-
-{% block javascript %}
-{{ common_javascript(worksheet, worksheet_filename, username, JSMATH, JEDITABLE_TINYMCE) }}
-{% endblock %}
-
-{% block body %}
-{% set toggle=true %}
-{% include "html/top_bar.html" %}
-{{ worksheet_topbar(worksheet, select, username, backwards) }}
-<hr class="usercontrol" />
-{% block before_sharebar %}{% endblock %}
-<span class="sharebar">{% block sharebar_title %}{% endblock %}</span>
-<br /><br /><br />
-{% block after_sharebar %}{% endblock %}
-{% endblock %}
-

sagenb/data/sage/html/notebook/worksheet_revision_list.html

@@ -1 @@
-{% extends "html/notebook/worksheet_page_template.html" %}
-{#
-INPUT:
-- data - a list of pairs of the form ('how long ago', key)
-- worksheet - an instance of Worksheet
-- worksheet_filename - a string containing a worksheet's filename
-- username - a string containing a username
-- JSMATH - a boolean stating whether to include jsMath
-- JEDITABLE_TINYMCE - a boolean stating whether to include jEditable and TinyMCE
-#}
+{% extends "html/notebook/base_aux.html" %}
 
 {% block page_id %}revision-list-page{% endblock %}
 
@@ -26 +17 @@
         </tr>
     </thead>
     <tbody>
-        {% for desc, key in data|reverse %}
+        {% for desc, key in worksheet.snapshot_data()|reverse %}
         <tr>
             <td><a href="revisions?rev={{ key }}">Revision {{ loop.revindex0 }}</a></td>
             <td><span class="revs">{{ desc }}</span></td>

deleted file sagenb/data/sage/html/notebook/worksheet_settings.html

@@ -1 @@
-{% extends "html/notebook/worksheet_page_template.html" %}
-{#
-INPUT:
-- worksheet - an instance of Worksheet
-- worksheet_filename - a string containing a worksheet's filename
-- username - a string containing a username
-- JSMATH - a boolean stating whether to include jsMath
-- JEDITABLE_TINYMCE - a boolean stating whether to include jEditable and TinyMCE
-#}
-
-{% block sharebar_title %}
-Worksheet Settings &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<button name="button_save">Save Settings</button>  <input type="submit" value="Cancel" name="button_cancel"/>
-{% endblock %}
-
-{% block before_sharebar %}
-<form width=70% method="post" action="input_settings"  enctype="multipart/form-data">
-{% endblock %}
-{% block after_sharebar %}
-</form>
-{% endblock %}
-
-
-

sagenb/data/sage/html/notebook/worksheet_share.html

@@ -1 @@
-{% extends "html/notebook/worksheet_page_template.html" %}
+{% extends "html/notebook/base_aux.html" %}
 {#
 INPUT:
     - worksheet - an instance of Worksheet
-    - worksheet_filename - a string containing a worksheet's filename
     - username - a string containing a username
     - other_users - a list of strings containing other users names
-    - user_is_admin - a boolean stating whether the user is an admin
-    - JSMATH - a boolean stating whether to include jsMath
-    - JEDITABLE_TINYMCE - a boolean stating whether to include jEditable and TinyMCE
 #}
 
 {% block sharebar_title %}
@@ -17 +13 @@
 {% set select = "share" %}
 
 {% block after_sharebar %}
-{% if not (user_is_admin or username == worksheet.owner()) %}
+{% if not (notebook.user_is_admin(username) or username == worksheet.owner()) %}
     Only the owner of a worksheet is allowed to share it. You can do whatever you want if you <a href="copy">make your own copy</a>.
 {% else %}
 <p>This Sage Worksheet is currently shared with the people listed in the box below.</p>

deleted file sagenb/data/sage/html/notebook/worksheet_topbar.tmpl

@@ -1 @@
-{#
-INPUT:
-- worksheet - an instance of Worksheet
-- select    - a string containing the control that is selected
-- username  - a string containing a username
-- backwards - a boolean
-#}
-{% macro worksheet_topbar(worksheet, select=None, username='guest',
-backwards=false, warn=false) %}
-<div id="worksheet-bar">
-    <div class="worksheet_title">
-        <a id="worksheet_title" class="worksheet_title"
-           onClick="rename_worksheet(); return false;"
-           title="Click to rename this worksheet">
-            {{ worksheet.name() }}
-        </a>
-        <br> {{ worksheet.html_time_last_edited() }}
-        {% if worksheet.warn_about_other_person_editing(username) and username != 'guest' and not worksheet.is_doc_worksheet() %}
-        &nbsp;&nbsp;<span class="pingdown">(Someone else is viewing this worksheet)</span>
-        {% endif %}
-    </div>
-    <div id="save-discard-buttons">
-        {{ worksheet.html_save_discard_buttons() }}
-    </div>
-    
-    <div id="worksheet-menu">
-        {{ worksheet.html_menu() }}
-    </div>
-    <div id="share-publish-buttons">
-        {{ worksheet.html_share_publish_buttons(select, backwards) }}
-    </div>
-</div>
-<div class="hidden" id="slide_controls">
-    <div class="slideshow_control">
-        <a class="slide_arrow" onClick="slide_next()">&gt;</a>
-        <a class="slide_arrow" onClick="slide_last()">&gt;&gt;</a> <span class="vbar"></span>
-        <a class="cell_mode" onClick="cell_mode()">Exit</a>
-    </div>
-    <div class="slideshow_progress" id="slideshow_progress" onClick="slide_next()">
-        <div class="slideshow_progress_bar" id="slideshow_progress_bar">&nbsp;</div>
-        <div class="slideshow_progress_text" id="slideshow_progress_text">&nbsp;</div>
-    </div>
-    <div class="slideshow_control">
-        <a class="slide_arrow" onClick="slide_first()">&lt;&lt;</a>
-        <a class="slide_arrow" onClick="slide_prev()">&lt;</a>
-    </div>
-</div> 
-{% endmacro %}

deleted file sagenb/data/sage/html/notebook_settings.html

@@ -1 @@
-{% extends "html/base.html" %}
-
-{% block title %}Notebook Settings{% endblock %}
-{% block css %}account_settings{% endblock %}
-{% block more_css %}
-<link rel="stylesheet" href="/javascript/jquery/plugins/farbtastic/farbtastic.css" type="text/css" />  
-{% endblock %}
-
-{% block javascript %}
-<script type="text/javascript" src="/javascript/jquery/plugins/farbtastic/farbtastic.min.js"></script>
-{% endblock %}
-
-{% block body %}
-<h1>Notebook Settings</h1>
-<div class="section"><a href="/users">Manage Users</a> | <a href="/settings">My Settings</a> | <a href="/">My Worksheets</a> | <a href="/logout">Sign Out</a></div>
-
-<form method="get" action="/notebooksettings">
-  <input type="hidden" name="form" value="on" />
-  {%- if auto_table %}
-  {{ auto_table }}
-  {%- endif %}
-  <div id="buttons">
-    <input type="submit" value="Save">
-    <input type="button" value="Cancel" style="margin-left:5px" onClick="parent.location='/'">
-  </div>
-</form>
-{% endblock %}

deleted file sagenb/data/sage/html/registration.html

@@ -1 @@
-{% extends "html/base.html" %}
-
-{% block title %}Sign up{% endblock %}
-
-{% block css %}registration{% endblock %}
-
-{% block body %}
-<div id="wrapper">
-  <h1>Sign up for a Sage Notebook account</h1>
-  {% if error %}
-  <h2 class="error_found">Error{{ error[1:] }}found</h2>
-  {% endif %}
-  <form method="POST" action="/register">
-    <ol>
-      <li><h2>Create a username</h2>
-        <p>Your username must start with a letter and be between 3 and 64
-          characters long. You may only use letters, numbers, underscores, @,
-          and dots.</p>
-        <input type="text" name="username" value="{{ username }}" class="entry" tabindex="1" />
-        {% if username_missing %}
-        <p><span class="error">Error:</span> No username given</p>
-        {% endif %}
-        {% if username_taken %}
-        <p><span class="error">Error:</span> Username already in use</p>
-        {% endif %}
-        {% if username_invalid %}
-        <p><span class="error">Error:</span> Bad username</p>
-        {% endif %}
-      </li>
-      <li><h2>Create a good password</h2>
-        <p>Your password must be between 4 and 32 characters long. Your password can not contain your username nor spaces.</p>
-        <input type="password" name="password" class="entry" tabindex="2" />
-        {% if password_missing %}
-        <p><span class="error">Error:</span> No password given</p>
-        {% endif %}
-        {% if password_invalid %}
-        <p><span class="error">Error:</span> Bad password</p>
-        {% endif %}
-      </li>
-      <li><h2>Re-type your password</h2>
-        <input type="password" name="retype_password" class="entry" tabindex="3" />
-        {% if passwords_dont_match or retype_password_missing %}
-        <p><span class="error">Error:</span> Passwords didn't match</p>
-        {% endif %}
-      </li>
-      {% if email or email_missing or email_invaild %}
-      <li><h2>Enter your email address</h2>
-        <p>Your email address is required for account confirmation and recovery. You will be emailed a confirmation link right after you successfully sign up.</p>
-        <input type="text" name="email" value="{{ email_address }}" class="entry" tabindex="4" />
-        {% if email_missing %}
-        <p><span class="error">Error:</span> No email address given</p>
-        {% endif %}
-        {% if email_invalid %}
-        <p><span class="error">Error:</span> Invalid email address</p>
-        {% endif %}
-      </li>
-      {% endif %}
-      {% if challenge %}
-      <li><h2>Answer a challenge</h2>
-        {{ challenge_html }}
-        {% if challenge_missing %}
-        <p><span class="error">Error:</span> No challenge response given</p>
-        {% endif %}
-        {% if challenge_invalid %}
-        <p><span class="error">Error:</span> Invalid challenge response</p>
-        {% endif %}
-      </li>
-      {% endif %}
-    </ol>
-    <button type="submit" tabindex="100" id="create-account-button">Create account</button>
-    <a href="/"><button tabindex="101">Cancel</button></a>
-  </form>
-</div> 
-{% endblock %}

new file sagenb/data/sage/html/settings/account_settings.html

@@ +1 @@
+{% extends "html/settings/base.html" %}
+
+{% block title %}Account Settings{% endblock %}
+{% block page_id %}account-settings-page{% endblock %}
+
+{% block settings_main %}
+<form method="post" action="/settings">
+    
+    <div class="section">
+        <h2>Change Auto-Save Interval</h2>
+        <div>
+            Minutes:
+            <select name="autosave">
+                {% for i, selected in autosave_intervals %}
+                <option{{ selected }}>{{ i }}</option>
+                {% endfor %}
+            </select>
+        </div>
+    </div>
+    <div class="section">
+        <h2>Change Password</h2>
+        <div id="passwd">
+            <div>
+                <label for="old-pass">Old password</label>
+                <input type="password" name="old-pass" />
+            </div>
+            <div>
+                <label for="new-pass">New password</label>
+                <input type="password" name="new-pass" />
+            </div>
+            <div>
+                <label for="retype-pass">Retype new password</label>
+                <input type="password" name="retype-pass" />
+            </div>
+        </div>
+    </div>
+
+    {% if true %}
+    <div class="section">
+        <h2>Change E-mail Address</h2>
+        
+        <div>
+            <div>
+                <label>Current e-mail</label>
+                {{ email_address }} {{ email_confirmed }}
+            </div>
+            <div>
+                <label for="new-email">New e-mail</label>
+                <input type="text" name="new-email" class="c1" />
+            </div>
+        </div>
+    </div>
+    {% endif %}
+    <div id="buttons">
+        <button type="submit">Save</button>
+        <a href="/"><button>Cancel</button></a>
+    </div>
+</form>
+{% endblock %}

new file sagenb/data/sage/html/settings/admin_add_user.html

@@ +1 @@
+{% extends "html/settings/base.html" %}
+{% block title %}Add New User{% endblock %}
+{% block page_id %}add-user-page{% endblock %}
+
+{% block main %}
+<h1>Add New User</h1>
+{% if error %}
+<h2 class="error_found">Username Error</h2>
+{% endif %}
+<form method="POST" action="/adduser">
+  <ol>
+    <li><h2>Pick a username</h2>
+      <p>The username must start with a letter and be between 4 and 32 characters long. It can only consist of letters, numbers, underscores, and one dot (.).</p>
+      <input type="text" name="username" value="{{ username_input if username_input else '' }}" />
+      {% if username_error %}
+      {% if username_error == 'invalid' %}
+      <p><span class="error">Error:</span> Invalid username</p>
+      {% else %}
+      <p><span class="error">Error:</span> Username taken</p>
+      {% endif %}
+      {% endif %}
+    </li>
+  </ol>
+  <div id="buttons">
+    <button type="submit">Create Account</buttoN>
+    <a href="/users"><button>Cancel</button></a>
+  </div>
+</form>
+</div>
+{% endblock %}
+

new file sagenb/data/sage/html/settings/base.html

@@ +1 @@
+{% extends "html/base_authenticated.html" %}
+
+{% block body_classes %}settings-page{% endblock %}
+
+{% block main %}
+<h1>{{ render_title() }}</h1>
+{% block settings_nav %}
+<ul id="settings-nav" class="user-controls">
+    {% if admin %}
+    <li><a href="/users">Manage Users</a></li>
+    <li><a href="/notebooksettings">Notebook Settings</a></li>
+    {% endif %}
+    <li><a href="/settings">Account Settings</a></li>
+</ul>
+{% endblock %}
+{% block settings_main %}
+{% endblock %}
+{% endblock %}

new file sagenb/data/sage/html/settings/notebook_settings.html

@@ +1 @@
+{% extends "html/settings/base.html" %}
+{% block title %}Notebook Settings{% endblock %}
+
+{% block more_css %}
+<link rel="stylesheet" href="/javascript/jquery/plugins/farbtastic/farbtastic.css" type="text/css" />  
+{% endblock %}
+
+{% block javascript %}
+<script type="text/javascript" src="/javascript/sage/ws_list.js"></script>
+<script type="text/javascript" src="/javascript/jquery/plugins/farbtastic/farbtastic.min.js"></script>
+{% endblock %}
+
+{% block page_id %}notebook-settings-page{% endblock %}
+
+{% block settings_main %}
+<form method="get" action="/notebooksettings">
+  <input type="hidden" name="form" value="on" />
+  {%- if auto_table %}
+  {{ auto_table }}
+  {%- endif %}
+  <div id="buttons">
+    <input type="submit" value="Save" />
+    <input type="button" value="Cancel" style="margin-left:5px" onClick="parent.location='/'" />
+  </div>
+</form>
+{% endblock %}

new file sagenb/data/sage/html/settings/user_management.html

@@ +1 @@
+{% extends "html/settings/base.html" %}
+
+{% block title %}Users{% endblock %}
+{% block page_id %}user-management-page{% endblock %}
+
+{% block settings_main %}
+    <h1>User Management</h1>
+    <a href="/adduser" class="boldusercontrol">Add User</a>
+    {% if reset %}
+    <p>The password for the user {{ reset[0] }} has been reset to <strong>{{ reset[1] }}</strong></p>
+    {% endif %}
+    <table>
+      <tr><th>Users</th><th>Password</th><th>Suspension</th></tr>
+      {% for user in users %}
+      {% if user != 'admin' %}
+      <tr><td><a href="/home/{{ user }}/">{{ user }}</a></td><td><a href="/users/?reset={{ user }}">Reset</a></td><td><a href="/users/?suspension={{ user }}">{% if user.is_suspended() %}Unsuspend{% else %}Suspend{% endif %}</td></tr>
+      {% endif %}
+      {% endfor %}
+    </table>
+{% endblock %}

sagenb/data/sage/html/source_code.html

@@ -1 @@
-{% extends "html/base.html" %}
+{% extends "html/base_authenticated.html" %}
 
 {% block title %}{{ src_filename }} - Source Code{% endblock %}
 
 {% block css %}main{% endblock %}
 
+{% block more_css %}<link type="text/css" ref="stylesheet" href="/javascript/highlight/prettify.css" />{% endblock %}
+
+{% block page_id %}source-code-page{% endblock %}
+
 {% block body %}
-{% include "html/top_bar.html" %}
-<h1 align=center>Sage Source Browser</h1>
-<h2 align=center><tt>{{ src_filename }}  <a href="..">(browse directory)</a></tt></h2>
-<br><hr><br>
-<font size=+1><pre id="code">{{ src }}</pre></font>
-<br><hr><br>
+<div>
+<h1>Sage Source Browser</h1>
+<h2 class="filename" >{{ src_filename }}  <a href="..">(browse directory)</a></h2>
+</div>
+
+<code id="code">{{ src }}</code>
+
 <script src="/javascript/highlight/prettify.js" type="text/javascript"></script>
 <script type="text/javascript">
-function get_element(id) {
-  if(document.getElementById)
-    return document.getElementById(id);
-  if(document.all)
-    return document.all[id];
-  if(document.layers)
-    return document.layers[id];
-}
-
-var x = get_element("code");
-x.innerHTML = prettyPrintOne(x.innerHTML);
+    code = $('code');
+    code.html(prettyPrintOne(code.html()))
 </script>
 {% endblock %}

deleted file sagenb/data/sage/html/template_error.html

@@ -1 @@
-{% extends "html/base.html" %}
-
-{% block title %}Error{% endblock %}
-
-{% block body %}
-<span style="color:red;font-weight:bold;">Internal Server Error:</span> The template <em>{{ template }}</em> wasn't found.
-{% endblock %}

sagenb/data/sage/html/test_report.html

@@ -86 +86 @@
           <td class="value">{{ sage_version }}</td>
         </tr>
         {% endif %}
+        {%- if environment %}
+        <tr>
+          <td class="label">Environment</td>
+          <td class="value">{{ environment }}</td>
+        </tr>
+        {% endif %}
         <tr>
           <td class="label">Start</td>
           <td class="value">{{ start_time }}</td>

deleted file sagenb/data/sage/html/top_bar.html

@@ -1 @@
-<div id="top-bar">
-  {% include "html/banner.html" %}
-  <div id="controls">
-    <ul>
-      <li class="username">{{ username }}</li>
-      {% if username == 'guest' %}
-      <li><a title="Please log in to the Sage notebook" class="usercontrol" href="/">Log in</a></li>
-      {% else %}
-      {# TODO: Hack-ish. Remove on template cleanup. #}
-      {% if toggle %}
-      <li><a title="Toggle the top bar" class="usercontrol" onClick="$('#worksheet-bar').toggle()">Toggle</a></li>
-      {% endif %}
-      <li><a title="Back to your personal worksheet list" class="usercontrol" href="/home/{{ username }}">Home</a></li>
-      {% if pub %}
-      <li><span class="usercontrol">Published</span></li>
-      {% else %}
-      <li><a title="Browse the published worksheets" class="usercontrol" href="/pub">Published</a></li>
-      <li><a title="View a log of recent computations" class="usercontrol" href="#" onClick="history_window()">Log</a></li>
-      {% endif %}
-      <li><a title="Change account settings including password" class="usercontrol" href="/settings">Settings</a></li>
-      <li><a title="Documentation" class="usercontrol" href="#" onClick="help()">Help</a></li>
-      <li><a title="Report a problem or submit a bug to improve Sage" class="usercontrol" href="#" onClick="bugreport()">Report a Problem</a></li>
-      <li><a title="Log out of the Sage notebook" class="usercontrol" href="/logout">Sign out</a></li>
-      {% endif %}
-    </ul>
-  </div>
-</div>

sagenb/data/sage/html/upload.html

@@ -1 @@
-{% extends "html/base.html" %}
+{% extends "html/base_authenticated.html" %}
 
 {% block title %}Upload File{% endblock %}
 
-{% block css %}main{% endblock %}
-
 {% block page_id %}upload-worksheet-page{% endblock %}
 
-{% block body %}
+{% block main %}
 
-{% include "html/top_bar.html" %}
 <div>
     <h2>Upload worksheet (an sws or txt file) to the Sage Notebook</h2>
     <form method="POST" action="upload_worksheet"
           name="upload" enctype="multipart/form-data">
         <div>
             <label for="file">Browse your computer to select a worksheet file to upload:</label>
-            <input size="50" type="file" name="file"></input>
+            <input size="50" type="file" name="file" />
         </div>
         <div>
             <label for="url">Or enter the url of a worksheet file on the web:</label>
-            <input size="50" type="text" name="url"></input>
+            <input size="50" type="text" name="url" />
         </div>
         <div>
             <label for="name">What do you want to call it? (if different than the original name)</label>
-            <input size="50" type="text" name="name"></input>
+            <input size="50" type="text" name="name" />
         </div>
         <button type="submit">Upload Worksheet</button>
     </form>

deleted file sagenb/data/sage/html/user_management.html

@@ -1 @@
-<html>
-  <head>
-    <title>Users | {{ sitename }}</title>
-    <style>
-      body {
-      font:1em Arial, Sans-serif;
-      }
-
-      table {
-      border-collapse:collapse
-      }
-
-      th, td {
-      border:1px solid #696969;
-      padding:5px
-      }
-
-      th {
-      background:#CCC
-      }
-
-      a:link, a:visited {
-      color:blue
-      }
-    </style>
-  </head>
-  <body>
-    <h1>User Management</h1>
-    <a href="/adduser">Add User</a> | <a href="/notebooksettings">Notebook Settings</a> | <a href="/settings">My Settings</a> | <a href="/">My Worksheets</a> | <a href="/logout">Sign Out</a> {% if number_of_users %} <br/><br/>{{ number_of_users }} users {% endif %}<br/><br/>
-    {% if reset %}
-    <p>The password for the user {{ reset[0] }} has been reset to <strong>{{ reset[1] }}</strong></p>
-    {% endif %}
-    <table>
-      <tr><th>Users</th><th>Password</th><th>Suspension</th></tr>
-      {% for user in users %}
-      {% if user != 'admin' %}
-      <tr><td><a href="/home/{{ user }}/">{{ user }}</a></td><td><a href="/users/?reset={{ user }}">Reset</a></td><td><a href="/users/?suspension={{ user }}">{% if user.is_suspended() %}Unsuspend{% else %}Suspend{% endif %}</td></tr>
-      {% endif %}
-      {% endfor %}
-    </table>
-  </body>
-</html>

deleted file sagenb/data/sage/html/worksheet/menu.html

@@ -1 @@
-{#
-INPUT
-- name - string with worksheet name
-- filename_ - string with worksheet filename
-- data - list of data to put in the Data menu
-- systems_enumerated - enumerated list of systems
-- system_names - list of system names
-- current_system_index - the currently selected system_index
-- pretty_print - a boolean stating whether to typeset as default
-- doc_worksheet - a boolean stating whether the worksheet is the doc worksheet
-#}
-<select class="worksheet"  onchange="go_option(this);" id="file-menu">
-    <option title="Select a file related function" value=""  selected>File...</option>
-    <option title="Load a new worksheet stored in a file" value="upload_worksheet_button();">Load worksheet from a file...</option>
-    <option title="Create a new worksheet" value="new_worksheet();">New worksheet</option>
-    <option title="Save this worksheet to an sws file" value="download_worksheet();">Save worksheet to a file...</option>
-    <option title="Print this worksheet" value="print_worksheet();">Print</option>
-    <option title="Rename this worksheet" value="rename_worksheet();">Rename worksheet</option>
-    <option title="Copy this worksheet" value="copy_worksheet();">Copy worksheet</option>
-    <option title="Move this worksheet to the trash" value="delete_worksheet('{{ filename_ }}');">Delete worksheet</option>
-</select>
-
-<select class="worksheet"  onchange="go_option(this);"  id="action-menu">
-    <option title="Select a worksheet function" value="" selected>Action...</option>
-    <option title="Interrupt currently running calculations, if possible" value="interrupt();">Interrupt</option>
-    <option title="Restart the worksheet process" value="restart_sage();">Restart worksheet</option>
-    <option title="Quit the worksheet process" value="save_worksheet_and_close();">Save and quit worksheet</option> 
-    <option value="">---------------------------</option>
-    <option title="Evaluate all input cells in the worksheet" value="evaluate_all();">Evaluate All</option>
-    <option title="Hide all output" value="hide_all();">Hide All Output</option>
-    <option title="Show all output" value="show_all();">Show All Output</option>
-    <option title="Delete all output" value="delete_all_output();">Delete All Output</option>
-    <option value="">---------------------------</option>
-    <option title="Switch to single-cell mode" value="slide_mode();">One Cell Mode</option>
-    <option title="Switch to multi-cell mode" value="cell_mode();">Multi Cell Mode</option> 
-</select>
-<select class="worksheet" onchange="handle_data_menu(this);" id="data-menu">
-    <option title="Select an attached file" value="" selected>Data...</option>
-    <option title="Upload or create a data file in a wide range of formats" value="__upload_data_file__">Upload or create file...</option>
-    <option value="">--------------------</option>
-    {% for name in data %}
-    <option value="datafile?name={{ name }}">{{ name }}</option>
-    {% endfor %}
-</select>
-
-{% if not doc_worksheet %}
-<select onchange="go_system_select(this, {{ current_system_index }});" class="worksheet" id="systems-menu">
-    {% for system_index, system_name in systems_enumerated %}
-        <option title="Evaluate all input cells using {{ system_names[system_index] }}"
-            {{ "selected" if current_system_index == system_index else "" }} value="{{ system_names[system_index] }}">
-            {{ system_name }}
-        </option>
-    {% endfor %}
-</select>    
-<input type="checkbox" title="Enable/disable pretty_printing"
-       onchange="pretty_print_check(this.checked);"
-       class="worksheet" value="pretty_print" {{ "checked" if pretty_print else "" }} />&nbsp;Typeset
-{% endif %}

deleted file sagenb/data/sage/html/worksheet/published_worksheet.html

@@ -1 @@
-{#
-INPUT:
-- cell_id_list - a list of cell id's
-- cells_html - string of cells HTML
-#}
-{% set published = true %}
-{% set do_print = true %}
-
-{% include "html/worksheet/worksheet_body.html" %}
-
-
-<script language=javascript>jsMath.ProcessBeforeShowing();</script>

new file sagenb/data/sage/html/worksheet/ratings_info.html

@@ +1 @@
+{% extends "html/base.html" %}
+
+{% block title %}Ratings for {{ worksheet.name() }}{% endblock %}
+
+{% block body %}
+<h2 align=center>Ratings for {{ worksheet.name() }}</h2>
+<h3 align=center><a href='/home/{{ worksheet.filename() }}'>Go to the worksheet.</a>
+<table width=70%%align=center border=1 cellpadding=10 cellspacing=0>
+    <tr bgcolor="#7799bb"><td width=30em>User</td><td width=10em align=center>Rating</td><td width=10em align=center width=60em>Comment</td></tr>
+    {% for rating in worksheet.ratings()|sort %}
+    <tr>
+        <td>{{ rating[0] }}{# User #}</td>
+        <td>{{ rating[1] }}{# Rating #}</td>
+        <td>{{'' if rating|length < 3 else rating[2]}}{# Comment #}</td>
+    </tr>
+    {% endfor %}
+</table>
+{% endblock %}

deleted file sagenb/data/sage/html/worksheet/save_discard_buttons.html

@@ -1 @@
-{#
-INPUT:
-doc_worksheet - boolean stating whether this worksheet is the doc worksheet
-#}
-{% if not doc_worksheet %}
-<button name="button_save" title="Save changes" onClick="save_worksheet();">Save</button><button title="Save changes and close window" onClick="save_worksheet_and_close();" name="button_save">Save & quit</button><button title="Discard changes to this worksheet" onClick="worksheet_discard();">Discard & quit</button>
-{% endif %}

deleted file sagenb/data/sage/html/worksheet/share_publish_buttons.html

@@ -1 @@
-
-{#
-INPUT:
-- worksheet - Worksheet instance
-- select - a boolean
-- backwards - a boolean
-#}
-{% if not worksheet.is_doc_worksheet() %}
-{% macro cls(x) %}
-{{ "control-select" if x == select else "control" }}
-{% endmacro %}
-{% macro backwards_text() %}
-{{ "../" if backwards else "" }}
-{% endmacro %}
-<a title="Print this worksheet" class="print-link" onClick="print_worksheet()"><img border=0 src="/images/icon_print.gif" alt="Print">Print</a>
-<a class="{{ cls('use') }}" title="Interactively use this worksheet" onClick="edit_worksheet();">Worksheet</a>        
-<a class="{{ cls('edit') }}" title="Edit text version of this worksheet" href="{{ backwards_text() }}edit">Edit</a>
-<a class="{{ cls('text') }}" title="View plain text version of this worksheet" href="{{ backwards_text() }}text">Text</a>
-<a class="{{ cls('undo') }}" title="View changes to this worksheet over time" href="{{ backwards_text() }}revisions">Undo</a>
-<a class="{{ cls('share') }}" title="Let others edit this worksheet" href="{{ backwards_text() }}share">Share</a>
-<a class="{{ cls('publish') }}" title="Make this worksheet publicly viewable" href="{{ backwards_text() }}publish">Publish</a>
-{% endif %}

deleted file sagenb/data/sage/html/worksheet/title.html

@@ -1 @@
-{#
-MARKED FOR DELETION.
-- worksheet - Worksheet instance
-- name - escaped name of the worksheet
-- username - string of username
-#}
-<div class="worksheet_title">
-     <a id="worksheet_title" class="worksheet_title" onClick="rename_worksheet(); return false;" title="Click to rename this worksheet">{{ name }}</a>
-     <br> {{ worksheet.html_time_last_edited() }}
-     {% if warn and username != 'guest' and not doc_worksheet%}
-     &nbsp;&nbsp;<span class="pingdown">(Someone else is viewing this worksheet)</span>
-     {% endif %}
- </div>
- No newline at end of file

deleted file sagenb/data/sage/html/worksheet/worksheet.html

@@ -1 @@
-{#
-INPUT:
-- do_print - a boolean
-- cell_id_list - a list of cell id's
-- confirm_before_leave - a boolean stating whether to popup a js confirm
-  dialog before leaving
-- cells_html - string of cells HTML
-- published - a boolean stating whether the worksheet is published
-- state_number - worksheet.state_number()
-#}
-{% include "html/worksheet/worksheet_body.html" %}
-
-{% if do_print %}
-<script language="javascript">jsMath.ProcessBeforeShowing();</script>
-{% else %}
-<script type="text/javascript">
-$(document).ready(function() {                              
-   cell_id_list={{ cell_id_list }};
-   state_number={{ state_number }};
-   {% if not published %}if(worksheet_name == "Untitled") rename_worksheet();{% endif %}
-});                     
-</script>
-{% endif %}
-
-{% if not do_print and confirm_before_leave %}
-<script type="text/javascript">
-$(document).ready(function() {                                  
-            window.onbeforeunload = confirmBrowseAway;
-            function confirmBrowseAway()
-            {
-            return "Unsubmitted cells will be lost.";
-            }
-});                              
-</script>
-{% endif %}
-

deleted file sagenb/data/sage/html/worksheet/worksheet_body.html

@@ -1 @@
-{#
-INPUT:
-- cells_html - string of cells HTML
-- published - a boolean stating whether the worksheet is published
-#}
-
-<div class="cell_input_active" id="cell_resizer"></div>
-{% if not published %}
-<div class="worksheet_cell_list" id="worksheet_cell_list">
-{% endif %}
-
-{{ cells_html }}
-
-{% if not do_print and not published %}
-</div>
-<div class="insert_new_cell" id="insert_last_cell"></div>
-<script type="text/javascript">
-        $("#insert_last_cell").plainclick(function(e) {insert_new_cell_after(cell_id_list[cell_id_list.length-1]);});
-        $("#insert_last_cell").shiftclick(function(e) {insert_new_text_cell_after(cell_id_list[cell_id_list.length-1]);});
-</script>
-<div class="worksheet_bottom_padding"></div>
-{% endif %}
-
-

sagenb/data/sage/html/worksheet_listing.html

@@ -1 @@
-{% extends "html/base.html" %}
+{% extends "html/base_authenticated.html" %}
 {#
 INPUT:
-- pub - a boolean stating whether to show in public mode.
-- typ - a string stating what kind of worksheets this listing shows
+- pub -- a boolean stating whether to show in public mode.
+- typ -- a string stating what kind of worksheets this listing shows
+- worksheets -- list of Worksheet objects
 #}
 {% if pub %}
 {% set worksheet_heading='Published Worksheets' %}
@@ -14 +15 @@
 {% set worksheet_heading='Archived Worksheets' %}
 {% endif %}  
 
-
 {% block title %}
 {{ worksheet_heading }}
 {% endblock %}
 
-{% block css %}main{% endblock %}
+{% block page_id %}worksheet-listing-page{% endblock %}
 
 {% block javascript %}
 {% if not pub %}
@@ -27 +27 @@
 <script type="text/javascript" src="/javascript/jqueryui/js/jquery-ui-1.7.2.custom.min.js"></script>
 <script type="text/javascript" src="/javascript/jquery/plugins/form/jquery.form.min.js"></script>
 <script type="text/javascript" src="/javascript/jquery/plugins/jquery.bgiframe.min.js"></script>
-{% endif %}
-{% if not pub %}
 <script type="text/javascript">
-                    var worksheet_filenames = {{ worksheet_filenames }}; 
+    var worksheet_filenames = {{ worksheet_filenames }}; 
 </script>
 <script type="text/javascript" src="/javascript/sage/main.js"></script>
 <script type="text/javascript" src="/javascript/gears/gears_init.js"></script> 
@@ -40 +38 @@
 {% endif %}
 {% endblock %}
 
-{% block onload %} onLoad="checkForGearsInstalled();"{% endblock %}
 
-{% block body %}
+{% block main %}
+<div id="user-main-controls" class="user-controls">
+    {% if pub is not defined or not pub %}
+    <a href="/new_worksheet" target="_blank">New Worksheet</a>
+    <a href="/upload">Upload</a>
+    {% if not accounts %}
+    <a href="/download_worksheets.zip">Download All Active</a>
+    {% endif %}
+    {% endif %}
 
-{% include "html/list_top.html" %}
-
-<div id="worksheet-list-controls">
+    <div id="search-area">
+        <form action="." method="GET">
+            <input type="hidden" value="{{ typ if not pub else 'pub' }}" name="typ" />
+            <input id="search-worksheets" size="20" value="{{ search if search else "" }}" name="search" />
+            <button class="add_new_worksheet_menu" id="search-worksheets-button" type="submit">Search Worksheets</button>
+        </form>
+    </div>
+</div>       
+<div id="worksheet-list-controls" class="controls">
     {% if not pub %}
     <div class="action-buttons">
         {% if typ == 'archive' %}
@@ -81 +92 @@
 
 <table cellspacing="0" cellpadding="0" id="worksheet-list">
     <thead>
-      <tr>
-        {% if not pub %}
-        <td class="checkbox">
-            <input id="controlbox" onClick="set_worksheet_list_checks();" class="entry" type="checkbox" />
-        </td>
-        {% else %}
-        <td><a class="listcontrol" href=".?sort=rating">Rating</a></td>
-        {% endif %}
+        <tr>
+            {% if not pub %}
+            <td class="checkbox">
+                <input id="controlbox" onClick="set_worksheet_list_checks();" class="entry" type="checkbox" />
+            </td>
+            {% else %}
+            <td><a class="listcontrol" href=".?sort=rating">Rating</a></td>
+            {% endif %}
 
-        <td>
-            <a class="listcontrol" href=".?typ={{ typ }}&sort=name{{ '' if sort != 'name' or reverse else '&reverse=True' }}">
-                {{ worksheet_heading }}
-            </a>
-        </td>
-        
-        <td>
-            <a class="listcontrol" href=".?typ={{ typ }}&sort=owner{{ '' if sort != 'owner' or reverse else '&reverse=True' }}">
-                Owner {{ '' if pub else ' / Collaborators' }}
-            </a>
-        </td>
+            <td>
+                <a class="listcontrol" href=".?typ={{ typ }}&sort=name{{ '' if sort != 'name' or reverse else '&reverse=True' }}">
+                    {{ worksheet_heading }}
+                </a>
+            </td>
+            
+            <td>
+                <a class="listcontrol" href=".?typ={{ typ }}&sort=owner{{ '' if sort != 'owner' or reverse else '&reverse=True' }}">
+                    Owner {{ '' if pub else ' / Collaborators' }}
+                </a>
+            </td>
 
-        <td>
-            <a class="listcontrol" href=".?typ={{ typ }}&{{ '' if sort != 'last_edited' or reverse else 'reverse=True' }}">
-                Last Edited
-            </a>
-        </td>
-      </tr>
+            <td>
+                <a class="listcontrol" href=".?typ={{ typ }}{{ '' if sort != 'last_edited' or reverse else 'reverse&=True' }}">
+                    Last Edited
+                </a>
+            </td>
+        </tr>
     </thead>
     <tbody>
         {% if not worksheets %}
         {% if pub %}
         <tr>
-            <td colspan="5" style="padding:20px;text-align:center">
+            <td colspan="5">
                 There are no published worksheets.
             </td>
         </tr>
         {% elif typ == 'active' %}
         <tr>
-            <td colspan="5" style="padding:20px;text-align:center">
+            <td colspan="5">
                 Welcome to Sage! You can <a href="/new_worksheet">create a new worksheet</a>,
                 view <a href="/pub/">published worksheets</a>, or read the
                 <a href="/help" target="_new">documentation</a>.
@@ -145 +156 @@
                 {% else %}
                 
                 <input type="checkbox" unchecked id="{{ name|css_escape }}" />
-                    {# I'm removing this select since it is a massive performance killer and these 
-                    serve no real purpose at all.  Plus google docs got rid of the analogous menu.
-                    <select onchange="go_option(this);" class="worksheet_edit">
-                        <option value="" title="File options" selected>File</option>
-                        <option value="list_rename_worksheet('{{ name }}','{{ worksheet.name() }}');" title="Change the name of this worksheet.">
-                            Rename...
-                        </option>            
-                        <option value="list_edit_worksheet('{{ name }}');" title="Open this worksheet and edit it">Edit</option>
-                        <option value="list_copy_worksheet('{{ name }}');" title="Copy this worksheet">Copy Worksheet</option>
-                        <option value="list_share_worksheet('{{ name }}');" title="Share this worksheet with others">Collaborate</option>
-                        <option value="list_publish_worksheet('{{ name }}');" title="Publish this worksheet on the internet">Publish</option>
-                        <option value="list_revisions_of_worksheet('{{ name }}');" title="See all revisions of this worksheet">Revisions</option>
-                    </select>
-                    #}      
-                    {% endif %}
-                </td>
+                {# I'm removing this select since it is a massive performance killer and these 
+                serve no real purpose at all.  Plus google docs got rid of the analogous menu.
+                <select onchange="go_option(this);" class="worksheet_edit">
+                    <option value="" title="File options" selected>File</option>
+                    <option value="list_rename_worksheet('{{ name }}','{{ worksheet.name() }}');" title="Change the name of this worksheet.">
+                        Rename...
+                    </option>            
+                    <option value="list_edit_worksheet('{{ name }}');" title="Open this worksheet and edit it">Edit</option>
+                    <option value="list_copy_worksheet('{{ name }}');" title="Copy this worksheet">Copy Worksheet</option>
+                    <option value="list_share_worksheet('{{ name }}');" title="Share this worksheet with others">Collaborate</option>
+                    <option value="list_publish_worksheet('{{ name }}');" title="Publish this worksheet on the internet">Publish</option>
+                    <option value="list_revisions_of_worksheet('{{ name }}');" title="See all revisions of this worksheet">Revisions</option>
+                </select>
+                #}      
+                {% endif %}
+            </td>
 
-                <td class="worksheet_link">
-                    <a title="{{ worksheet.name() | escape }}" id="name-{{ name|css_escape }}" class="worksheetname" href="/home/{{ name }}">
-                        {% if worksheet.compute_process_has_been_started() %}(running) {% endif %}
-                        {{ worksheet.truncated_name(50) | escape}}
-                    </a>
-                    
-                    {% if not pub and worksheet.is_published() %}(Published){% endif %}
-                </td>
-                <td class="owner_collab">
+            <td class="worksheet_link">
+                <a title="{{ worksheet.name() | escape }}" id="name-{{ name|css_escape }}" class="worksheetname" href="/home/{{ name }}">
+                    {% if worksheet.compute_process_has_been_started() %}(running) {% endif %}
+                    {{ worksheet.truncated_name(50) | escape}}
+                </a>
+                
+                {% if not pub and worksheet.is_published() %}(Published){% endif %}
+            </td>
+            <td class="owner_collab">
 
-                    {% if not pub %}
-                    {{ worksheet.owner() }}
-                    {% else %}
-                    {{worksheet.worksheet_that_was_published().owner()}}
-                    {% endif %}
-                    
-                    {% if not pub and typ != 'trash' %}
+                {% if not pub %}
+                {{ worksheet.owner() }}
+                {% else %}
+                {{worksheet.worksheet_that_was_published().owner()}}
+                {% endif %}
+                
+                {% if not pub and typ != 'trash' %}
 
-                    {% set shared = False %}
+                {% set shared = False %}
 
-                    {% if worksheet.collaborator_names() %}
-                    / {{ worksheet.collaborator_names(5) }}
-                    {% set shared = True %}
-                    {% endif %}
+                {% if worksheet.collaborator_names() %}
+                / {{ worksheet.collaborator_names(5) }}
+                {% set shared = True %}
+                {% endif %}
 
-                    {% if worksheet.viewer_names() %}
-                    / {{ worksheet.viewer_names(5) }}
-                    {% set shared = True %}
-                    {% endif %}
+                {% if worksheet.viewer_names() %}
+                / {{ worksheet.viewer_names(5) }}
+                {% set shared = True %}
+                {% endif %}
 
-                    {% if (worksheet.owner() != username) or username == 'admin' %}
-                    {% set shared = False %}
-                    {% endif %}
-                    
-                    {% if shared %}
-                    <a class="share" href="/home/{{ worksheet.filename() }}/share">Add or Delete</a>
-                    {% else %}
-                    <a class="share" href="/home/{{ worksheet.filename() }}/share">Share now</a>
-                    {% endif %}
+                {% if (worksheet.owner() != username) or username == 'admin' %}
+                {% set shared = False %}
+                {% endif %}
+                
+                {% if shared %}
+                <a class="share" href="/home/{{ worksheet.filename() }}/share">Add or Delete</a>
+                {% else %}
+                <a class="share" href="/home/{{ worksheet.filename() }}/share">Share now</a>
+                {% endif %}
 
-                    {% if worksheet.has_published_version() %}
-                    <a href="/home/{{ worksheet.published_version().filename() }}">
-                        (published)
-                    </a>
-                    {% endif %}
-                    
-                    {% endif %}
-                </td>
-                <td>
-                    {{ worksheet.html_time_since_last_edited() }}
-                </td>
-            </tr>
-            {% endfor %}
-            {% endif %}
-        </tbody>
-    </table>
-    {% endblock %}
+                {% if worksheet.has_published_version() %}
+                <a href="/home/{{ worksheet.published_version().filename() }}">
+                    (published)
+                </a>
+                {% endif %}
+                
+                {% endif %}
+            </td>
+            <td>
+                {{ worksheet.html_time_since_last_edited() }}
+            </td>
+        </tr>
+        {% endfor %}
+        {% endif %}
+    </tbody>
+</table>
+{% endblock %}

sagenb/data/sage/html/yes_no.html

@@ -4 +4 @@
 
 {% block body %}
 <table align=center border=1 cellpadding=20 bgcolor="efefef">
-<tr><td>
-{{ message }}
-<br><br>
-<font size=+3><a href="yes">Yes</a> or <a href="no">No</a>?</font>
-</td></tr>
+  <tr><td>
+      {{ message }}
+      <br><br>
+      <font size=+3><a href="yes">Yes</a> or <a href="no">No</a>?</font>
+  </td></tr>
 </table>
 {% endblock %}

new file sagenb/data/sage/js/master.js

@@ +1 @@
+$(window).load(function () {
+    body = $('body'), body_id = body.attr('id');
+    if (body_id === 'worksheet-listing-page') {
+        checkForGearsInstalled();
+    }
+
+    if (body.hasClass('worksheet-online')) {
+        initialize_the_notebook();
+    }
+});

sagenb/notebook/cell.py

@@ -39 +39 @@
 # we don't get several of these combined in one.
 re_cell = re.compile('"cell://.*?"')
 re_cell_2 = re.compile("'cell://.*?'")   # same, but with single quotes
+# Matches script blocks
+re_script = re.compile(r'<script[^>]*?>.*?</script>', re.DOTALL | re.I)
 
 JEDITABLE_TINYMCE = True
 
@@ -48 +50 @@
 from sphinx.application import Sphinx
 _SAGE_INTROSPECT = None
 
+
 class Cell_generic:
     def is_interactive_cell(self):
         """
@@ -79 +82 @@
         """
         raise NotImplementedError
 
-    def html_new_cell_before(self):
-        """
-        Returns the HTML code for inserting a new cell before self.
-
-        EXAMPLES::
-
-            sage: C = sagenb.notebook.cell.Cell(0, '2+3', '5', None)
-            sage: print C.html_new_cell_before()
-            <div class="insert_new_cell" id="insert_new_cell_before0">...
-        """
-        return """<div class="insert_new_cell" id="insert_new_cell_before%(id)s">
-                 </div>
-<script type="text/javascript">
-$("#insert_new_cell_before%(id)s").plainclick(function(e) {insert_new_cell_before(%(id)s);});
-$("#insert_new_cell_before%(id)s").shiftclick(function(e) {insert_new_text_cell_before(%(id)s);});
-</script>"""%{'id': self.id()}
-
-    def html_new_cell_after(self):
-        """
-        Returns the HTML code for inserting a new cell after self.
-
-        EXAMPLES::
-
-            sage: C = sagenb.notebook.cell.Cell(0, '2+3', '5', None)
-            sage: print C.html_new_cell_after()
-            <div class="insert_new_cell" id="insert_new_cell_after0">...
-        """
-        return """<div class="insert_new_cell" id="insert_new_cell_after%(id)s">
-                 </div>
-<script type="text/javascript">
-$("#insert_new_cell_after%(id)s").plainclick(function(e) {insert_new_cell_after(%(id)s);});
-$("#insert_new_cell_after%(id)s").shiftclick(function(e) {insert_new_text_cell_after(%(id)s);});
-</script>"""%{'id': self.id()}
-
-
 class TextCell(Cell_generic):
     def __init__(self, id, text, worksheet):
         """
@@ -202 +170 @@
         """
         return self.__worksheet
 
-    def html(self, ncols=0, do_print=False, do_math_parse=True, editing=False):
+    def html(self, wrap=None, div_wrap=True, do_print=False, do_math_parse=True, editing=False):
         """
         Returns an HTML version of self as a string.
 
         INPUT:
 
+        - ``wrap`` -- number of columns to wrap at (not used)
+
+        - ``div_wrap`` -- whether to wrap in a div (not used)
+        
         - ``do_math_parse`` - bool (default: True)
           If True, call math_parse (defined in cell.py)
           on the html.
 
+        - ``do_print`` - bool (default: False)
+          If True, display for printing
+
+        - ``editing`` - bool (default: False)
+          If True, # TODO: figure out what this does
+
         EXAMPLES::
 
             sage: C = sagenb.notebook.cell.TextCell(0, '2+3', None)
             sage: C.html()
-            '...<div class="text_cell" id="cell_text_0">2+3...'
+            u'...text_cell...2+3...'
             sage: C.set_input_text("$2+3$")
             sage: C.html(do_math_parse=True)
-            '...<div class="text_cell" id="cell_text_0"><span class="math">2+3</span>...'
+            u'...text_cell...class="math"...2+3...'
         """
-        s = '<span id="cell_outer_%s">'%self.__id
-
-        if not do_print:
-            s += self.html_new_cell_before()
-
-        s += """<div class="text_cell" id="cell_text_%s">%s</div>"""%(
-            self.__id,
-            self.html_inner(ncols=ncols, do_print=do_print, do_math_parse=do_math_parse, editing=editing))
-
-        if JEDITABLE_TINYMCE and hasattr(self.worksheet(),'is_published') and not self.worksheet().is_published() and not self.worksheet().docbrowser() and not do_print:
-
-            try:
-                z = ((self.__text).decode('utf-8')).encode('ascii', 'xmlcharrefreplace')
-            except Exception, msg:
-                print msg
-                # better to get the worksheet at all than to get a blank screen and nothing.
-                z = self.__text
-
-            s += """<script>$("#cell_text_%s").unbind('dblclick').editable(function(value,settings) {
-evaluate_text_cell_input(%s,value,settings);
-return(value);
-}, {
-      tooltip   : "",
-      placeholder : "",
-//      type   : 'textarea',
-      type   : 'mce',
-      onblur : 'ignore',
-      select : false,
-      submit : 'Save changes',
-      cancel : 'Cancel changes',
-      event  : "dblclick",
-      style  : "inherit",
-      data   : %r
-  });
-</script>"""%(self.__id,self.__id, z)
-
-
-        if editing and not do_print:
-            s += """<script>$("#cell_text_%s").trigger('dblclick');</script>"""%self.__id
-
-        s += '</span>'
-        return s
-
-    def html_inner(self,ncols=0, do_print=False, do_math_parse=True, editing=False):
-        """
-        Returns an HTML version of the content of self as a string.
-
-        INPUT:
-
-        - ``do_math_parse`` - bool (default: True)
-          If True, call math_parse (defined in cell.py)
-          on the html.
-
-        EXAMPLES::
-
-            sage: C = sagenb.notebook.cell.TextCell(0, '2+3', None)
-            sage: C.html_inner()
-            '2+3...'
-            sage: C.set_input_text("$2+3$")
-            sage: C.html_inner(do_math_parse=True)
-            '<span class="math">2+3</span>...'
-        """
-        t = self.__text
-        if do_math_parse:
-            # Do dollar sign math parsing
-            try:
-                t = math_parse(t)
-            except Exception, msg:
-                # Since there is no guarantee the user's input/output
-                # is in any way valid, and we don't want to stop the
-                # server process (which is doing this work).
-                pass
-        s = """%s"""%t
-        return s
+        from template import template
+        return template(os.path.join('html', 'notebook', 'text_cell.html'),
+                        cell = self, wrap = wrap, do_print = do_print,
+                        do_math_parse = do_math_parse, editing = editing,
+                        div_wrap=div_wrap)
 
 
     def plain_text(self, prompts=False):
@@ -1381 +1290 @@
             sage: W = nb.create_new_worksheet('Test', 'sage')
             sage: C = sagenb.notebook.cell.Cell(0, '2+3', '5', W)
             sage: C.process_cell_urls('"cell://foobar"')
-            '/home/sage/0/cells/0/foobar?0"'
+            '/home/sage/0/cells/0/foobar?0'
         """
-        end = '?%d"'%self.version()
+        end = '?%d' % self.version()
         begin = self.url_to_self()
         for s in re_cell.findall(urls) + re_cell_2.findall(urls):
             urls = urls.replace(s,begin + s[7:-1] + end)
@@ -1493 +1402 @@
         # Everything not wrapped in <html> ... </html> should be
         # escaped and word wrapped.
         t = ''
+
         while len(s) > 0:
             i = s.find('<html>')
             if i == -1:
@@ -1510 +1420 @@
         # be evaluated twice.  They are only evaluated in the wrapped
         # version of the output.
         if ncols == 0:
-            while True:
-                i = t.lower().find('<script>')
-                if i == -1: break
-                j = t[i:].lower().find('</script>')
-                if j == -1: break
-                t = t[:i] + t[i+j+len('</script>'):]
-
+            t = re_script.sub('', t)
         return t
 
 
@@ -1802 +1706 @@
         TODO: Remove this hack (:meth:`doc_html`)
         """
         self.evaluate()
-        if wrap is None:
-            wrap = self.notebook().conf()['word_wrap_cols']
-        evaluated = self.evaluated()
-        if evaluated:
-            cls = 'cell_evaluated'
-        else:
-            cls = 'cell_not_evaluated'
-
-        html_in  = self.html_in(do_print=do_print)
-        introspect = "<div id='introspect_div_%s' class='introspection'></div>"%self.id()
-        #html_out = self.html_out(wrap, do_print=do_print)
-        html_out = self.html()
-        s = html_out
-        if div_wrap:
-            s = '\n\n<div id="cell_outer_%s" class="cell_visible"><div id="cell_%s" class="%s">'%(self.id(), self.id(), cls) + s + '</div></div>'
-        return s
+        return self.html(wrap, div_wrap, do_print)
 
     def html(self, wrap=None, div_wrap=True, do_print=False):
         r"""
@@ -1825 +1714 @@
 
         INPUT:
 
-        - ``wrap`` - None or an integer stating column position to wrap lines. Defaults to
-          configuration if not given.
+        - ``wrap`` - None or an integer stating column position to
+          wrap lines. Defaults to configuration if not given.
 
         - ``div_wrap`` - a boolean stating whether to wrap ``div``.
 
@@ -1835 +1724 @@
 
         EXAMPLES::
 
-            sage: nb = sagenb.notebook.notebook.Notebook(tmp_dir()+'.sagenb')
+            sage: nb = sagenb.notebook.notebook.load_notebook(tmp_dir()+'.sagenb')
             sage: nb.add_user('sage','sage','sage@sagemath.org',force=True)
             sage: W = nb.create_new_worksheet('Test', 'sage')
             sage: C = sagenb.notebook.cell.Cell(0, '2+3', '5', W)
             sage: C.html()
-            '\n\n<div id="cell_outer_0" cl...</div>'
+            u'...cell_outer_0...2+3...5...'
         """
-        if do_print:
-            wrap = 68
-            div_wrap = 68
-        key = (wrap,div_wrap,do_print)
+        from template import template
 
         if wrap is None:
             wrap = self.notebook().conf()['word_wrap_cols']
-        evaluated = self.evaluated()
-        if evaluated or do_print:
-            cls = 'cell_evaluated'
-        else:
-            cls = 'cell_not_evaluated'
-
-        html_in  = self.html_in(do_print=do_print)
-        introspect = "<div id='introspect_div_%s' class='introspection'></div>"%self.id()
-        html_out = self.html_out(wrap, do_print=do_print)
-
-        if 'hideall' in self.percent_directives():
-            s = html_out
-        else:
-            s = html_in + introspect + html_out
-
-        if div_wrap:
-            s = '\n\n<div id="cell_outer_%s" class="cell_visible"><div id="cell_%s" class="%s">'%(self.id(), self.id(), cls) + s + '</div></div>'
-
-        #self._html_cache[key] = s
-        return s
-
-    def html_in(self, do_print=False, ncols=80):
-        """
-        Returns the HTML code for the input of this cell.
-
-        EXAMPLES::
-
-            sage: C = sagenb.notebook.cell.Cell(0, '2+3', '5', None)
-            sage: print C.html_in()
-            <div class="insert_new_cell" id="insert_new_cell_before0"...</a>
-        """
-        s = ''
-        id = self.__id
-        t = self.__in.rstrip()
-
-        cls = "cell_input_hide" if 'hide' in self.percent_directives() else "cell_input"
-
-        if not do_print:
-            s += self.html_new_cell_before()
-
-        r = max(1, number_of_rows(t.strip(), ncols))
-
-        if do_print:
-            if 'hide' in self.percent_directives():
-                return ''
-
-            tt = escape(t).replace('\n','<br>').replace('  ',' &nbsp;') + '&nbsp;'
-            s += '<div class="cell_input_print">%s</div>'%tt
-        else:
-            s += """
-               <textarea class="%s" rows=%s cols=%s
-                  id         = 'cell_input_%s'
-                  onKeyPress = 'return input_keypress(%s,event);'
-                  onKeyDown  = 'return input_keydown(%s,event);'
-                  onKeyUp    = 'return input_keyup(%s, event);'
-                  onBlur     = 'cell_blur(%s); return true;'
-                  onFocus    = 'cell_focused(this,%s); return true;'
-               >%s</textarea>
-            """%(cls, r, ncols, id, id, id, id, id, id, t)
-
-        if not do_print:
-           s+= '<a href="javascript:evaluate_cell(%s,0)" class="eval_button" id="eval_button%s" alt="Click here or press shift-return to evaluate">evaluate</a>'%(id,id)
-
-        t = escape(t)+" "
-
-        return s
-
+            
+        return template(os.path.join('html', 'notebook', 'cell.html'),
+                        cell=self, wrap=wrap,
+                        div_wrap=div_wrap, do_print=do_print)
 
     def url_to_self(self):
         """
@@ -2087 +1910 @@
             files  = ('&nbsp'*3).join(files)
         return images + files
 
-    def html_out(self, ncols=0, do_print=False):
-        r"""
-        Returns the HTML for self's output.
-
-        INPUT:
-
-        - ``do_print`` -- a boolean stating whether to output HTML
-          for print
-
-        - ``ncols`` -- the number of columns
-
-        EXAMPLES::
-
-            sage: nb = sagenb.notebook.notebook.Notebook(tmp_dir()+'.sagenb')
-            sage: nb.add_user('sage','sage','sage@sagemath.org',force=True)
-            sage: W = nb.create_new_worksheet('Test', 'sage')
-            sage: C = sagenb.notebook.cell.Cell(0, '2+3', '5', W)
-            sage: C.html_out()
-            '\n...<div class="cell_output_div">\n...</div>'
-        """
-        if do_print and self.cell_output_type() == 'hidden':
-            return '<pre>\n</pre>'
-
-        out_nowrap = self.output_text(0, html=True)
-
-        out_html = self.output_html()
-        if self.introspect():
-            out_wrap = out_nowrap
-        else:
-            out_wrap = self.output_text(ncols, html=True)
-
-        typ = self.cell_output_type()
-
-        if self.computing():
-            cls = "cell_div_output_running"
-        else:
-            cls = 'cell_div_output_' + typ
-
-        top = '<div class="%s" id="cell_div_output_%s">'%(
-                         cls, self.__id)
-
-        if do_print:
-            prnt = "print_"
-        else:
-            prnt = ""
-
-        out_wrap   = '<div class="cell_output_%s%s" id="cell_output_%s">%s</div>'%(
-            prnt, typ, self.__id, out_wrap)
-        if not do_print:
-            out_nowrap = '<div class="cell_output_%snowrap_%s" id="cell_output_nowrap_%s">%s</div>'%(
-                prnt, typ, self.__id, out_nowrap)
-        out_html   = '<div class="cell_output_html_%s" id="cell_output_html_%s">%s </div>'%(
-            typ, self.__id, out_html)
-
-        if do_print:
-            out = out_wrap + out_html
-        else:
-            out = out_wrap + out_nowrap + out_html
-
-        s = top + out + '</div>'
-
-        r = ''
-        r += '&nbsp;'*(7-len(r))
-        tbl = """
-               <div class="cell_output_div">
-               <table class="cell_output_box"><tr>
-               <td class="cell_number" id="cell_number_%s" %s>
-                 %s
-               </td>
-               <td class="output_cell">%s</td></tr></table></div>"""%(
-                   self.__id,
-                   '' if do_print else 'onClick="cycle_cell_output_type(%s);"'%self.__id,
-                   r, s)
-
-        return tbl
-
-
-
 ########
 
 def format_exception(s0, ncols):

sagenb/notebook/challenge.py

@@ -443 +443 @@
             sage: nb = n.Notebook(tmp)
             sage: chal = reCAPTCHAChallenge(nb.conf(), remote_ip = 'localhost')
             sage: chal.html()
-            '<script type="text/javascript">...</script>'
+            u'...recaptcha...'
             sage: chal.html('incorrect-captcha-sol')
-            '<script...incorrect-captcha-sol...</script>'
+            u'...incorrect-captcha-sol...'
 
         """
         error_param = ''

sagenb/notebook/js.py

@@ -14 +14 @@
 interesting Javascript code is contained under
 ``data/sage/js/notebook_lib.js``.
 """
-
-import os
-from sagenb.misc.misc import SAGE_URL 
-from compress.JavaScriptCompressor import JavaScriptCompressor
-import keyboards
-
 ###########################################################################
 #       Copyright (C) 2006 William Stein <wstein@gmail.com>
 #                     2006 Tom Boothby <boothby@u.washington.edu>
 #
 #   Released under the *modified* BSD license.
-#     Tom wrote in email to me at wstein@gmail.com on March 2, 2008: "You have my permission
-#     to change the license on anything I've contributed to the notebook, to whatever suits you."
+#     Tom wrote in email to me at wstein@gmail.com on March 2, 2008:
+#     "You have my permission to change the license on anything I've
+#     contributed to the notebook, to whatever suits you."
 #
 ###########################################################################
 
+import os
+import keyboards
+from template import template
+from sagenb.misc.misc import SAGE_URL
+from compress.JavaScriptCompressor import JavaScriptCompressor
+
+# Debug mode?  If sagenb lives under SAGE_ROOT/, we minify and cache
+# the Notebook JS library.
+try:
+    from sage.misc.misc import SAGE_ROOT
+    from pkg_resources import Requirement, working_set
+    sagenb_path = working_set.find(Requirement.parse('sagenb')).location
+    debug_mode = not SAGE_ROOT in os.path.realpath(sagenb_path)
+except AttributeError, ImportError:
+    debug_mode = False
+
 
 _cache_javascript = None
 def javascript():
@@ -60 +71 @@
     if _cache_javascript is not None:
         return _cache_javascript
 
-    from template import template
     s = template(os.path.join('js', 'notebook_lib.js'),
                  SAGE_URL=SAGE_URL,
                  KEY_CODES=keyhandler.all_tests())
@@ -71 +81 @@
     # Evil" clause in the license.  Does that prevent us from
     # distributing it (i.e., it adds an extra condition to the
     # software)?  See http://www.crockford.com/javascript/jsmin.py.txt
-    s = JavaScriptCompressor().getPacked(s)
+    global debug_mode
+    if debug_mode:
+        return s
+
+    s = JavaScriptCompressor().getPacked(s.encode('utf-8'))
     _cache_javascript = s
+
     return s
 
 
-
 class JSKeyHandler:
     """
     This class is used to make javascript functions to check 

sagenb/notebook/notebook.py

@@ -43 +43 @@
 import server_conf  # server configuration
 import user_conf    # user configuration
 import user         # users
-from   template import template
+from   template import template, prettify_time_ago
 
 
 try:
@@ -1178 +1178 @@
 
 
     ##########################################################
-    # Importing and exporting worksheets to a plain text format
-    ##########################################################
-
-    def plain_text_worksheet_html(self, filename, prompts=True):
-        """
-        Return HTML containing the plain text version of a worksheet.
-
-        INPUT:
-
-        - ``filename`` - a string; filename of a worksheet
-
-        - ``prompts`` - a bool (default: True); whether to format the
-          text for inclusion in docstrings
-
-        OUTPUT:
-
-        - a string - the worksheet's HTML representation
-        """
-        worksheet = self.get_worksheet_with_filename(filename)
-        text = escape(worksheet.plain_text(prompts = prompts))
-        return template(os.path.join("html", "notebook", "plain_text_worksheet.html"),
-                        worksheet_name = worksheet.name(),
-                        worksheet_plain_text = text)
-
-    ##########################################################
     # Server configuration
     ##########################################################
     def conf(self):
@@ -1247 +1222 @@
     ##########################################################
     # Worksheet HTML generation
     ##########################################################
-    def worksheet_html(self, filename, do_print=False):
-        r"""
-        Return the HTML for a given worksheet.
-
-        INPUT:
-
-        - ``filename`` - a string; the worksheet's filename
-
-        - ``do_print`` - a bool (default: False); whether this is a
-          printed worksheet
-
-        OUTPUT:
-
-        - a string - the worksheet rendered as HTML
-
-        EXAMPLES::
-
-            sage: nb = sagenb.notebook.notebook.load_notebook(tmp_dir()+'.sagenb')
-            sage: W = nb.create_new_worksheet('Test', 'admin')
-            sage: nb.worksheet_html(W.filename())
-            '...<!D...Test...cell_id_list=[1]...</body>...</html>'
-        """
-        worksheet = self.get_worksheet_with_filename(filename)
-        return template(os.path.join("html", "notebook", "worksheet.html"),
-                        worksheet_name = worksheet.name(),
-                 worksheet_html = worksheet.html(include_title=False, do_print=do_print),
-                        do_print = do_print)
-
-
-
     def worksheet_list_for_public(self, username, sort='last_edited', reverse=False, search=None):
         W = [x for x in self.__worksheets.itervalues() if x.is_published() and not x.is_trashed(user)]
 
@@ -1324 +1269 @@
             '\n\n{{{id=1|\n\n///\n}}}'
             sage: W.save_snapshot('admin')
             sage: nb.html_worksheet_revision_list('admin', W)
-            '...Revision...Last Edited...seconds...ago...'
+            u'...Revision...Last Edited...ago...'
         """
         data = worksheet.snapshot_data()  # pairs ('how long ago', key)
 
         return template(os.path.join("html", "notebook", "worksheet_revision_list.html"),
                         data = data, worksheet = worksheet,
                         worksheet_filename = worksheet.filename(),
-                        username = username, JSMATH = JSMATH,
-                        JEDITABLE_TINYMCE = JEDITABLE_TINYMCE)
+                        username = username)
 
 
     def html_specific_revision(self, username, ws, rev):
@@ -1352 +1296 @@
         - a string - the revision rendered as HTML
         """
         t = time.time() - float(rev[:-4])
-        time_ago = worksheet.convert_seconds_to_meaningful_time_span(t)
+        time_ago = prettify_time_ago(t)
 
         filename = ws.get_snapshot_text_filename(rev)
         txt = bz2.decompress(open(filename).read())
         W = self.scratch_worksheet()
         W.delete_cells_directory()
         W.edit_save(txt)
-        body_worksheet_html = W.html_worksheet_body(do_print=True, publish=True)
 
         data = ws.snapshot_data()  # pairs ('how long ago', key)
         prev_rev = None
@@ -1373 +1316 @@
                 break
 
         return template(os.path.join("html", "notebook", "specific_revision.html"),
-                        worksheet = ws, worksheet_filename = ws.filename(),
+                        worksheet = ws,
                         username = username, rev = rev, prev_rev = prev_rev,
-                        next_rev = next_rev, time_ago = time_ago,
-                        body_worksheet_html = body_worksheet_html,
-                        JSMATH = JSMATH, JEDITABLE_TINYMCE = JEDITABLE_TINYMCE)
+                        next_rev = next_rev, time_ago = time_ago)
 
     def html_share(self, worksheet, username):
         r"""
@@ -1398 +1339 @@
             sage: nb = sagenb.notebook.notebook.Notebook(tmp_dir()+'.sagenb')
             sage: W = nb.create_new_worksheet('Test', 'admin')
             sage: nb.html_share(W, 'admin')
-            '...currently shared...add or remove collaborators...'
+            u'...currently shared...add or remove collaborators...'
         """
         U = self.users()
         other_users = [x for x, u in U.iteritems() if not u.is_guest() and not u.username() in [username, 'pub', '_sage_']]
@@ -1407 +1348 @@
         return template(os.path.join("html", "notebook", "worksheet_share.html"),
                         worksheet = worksheet,
                         worksheet_filename = worksheet.filename(),
-                        username = username, other_users = other_users,
-                        user_is_admin = self.user(username).is_admin(),
-                        JSMATH = JSMATH, JEDITABLE_TINYMCE = JEDITABLE_TINYMCE)
-
+                        username = username, other_users = other_users)
+    
     def html_download_or_delete_datafile(self, ws, username, filename):
         r"""
         Return the HTML for the download or delete datafile page.
@@ -1432 +1371 @@
             sage: nb = sagenb.notebook.notebook.Notebook(tmp_dir()+'.sagenb')
             sage: W = nb.create_new_worksheet('Test', 'admin')
             sage: nb.html_download_or_delete_datafile(W, 'admin', 'bar')
-            '...Data file: bar...DATA is a special variable...uploaded...'
+            u'...Data file: bar...DATA is a special variable...uploaded...'
         """
-        path = "/home/%s/data/%s"%(ws.filename(), filename)
-
-        worksheets = self.get_worksheets_with_viewer(username)
-        active_worksheets = [worksheet for worksheet in worksheets if worksheet.is_active(username)]
-        sort_worksheet_list(active_worksheets, 'name', False)
-
         ext = os.path.splitext(filename)[1].lower()
         file_is_image, file_is_text = False, False
         text_file_content = ""
@@ -1453 +1386 @@
         return template(os.path.join("html", "notebook", "download_or_delete_datafile.html"),
                         worksheet = ws, worksheet_filename = ws.filename(),
                         username = username,
-                        active_worksheets = active_worksheets,
-                        filename_ = filename, path = path,
+                        filename_ = filename,
                         file_is_image = file_is_image,
                         file_is_text = file_is_text,
-                        text_file_content = text_file_content,
-                        JSMATH = JSMATH, JEDITABLE_TINYMCE = JEDITABLE_TINYMCE)
+                        text_file_content = text_file_content)
 
 
     ##########################################################
     # Accessing all worksheets with certain properties.
     ##########################################################
+    def active_worksheets_for(self, username):
+        return [ws for ws in self.get_worksheets_with_viewer(username) if ws.is_active(username)]
+    
     def get_all_worksheets(self):
         return [x for x in self.__worksheets.itervalues() if not x.owner() in ['_sage_', 'pub']]
 
@@ -1543 +1477 @@
     ###########################################################
     # HTML -- generate most html related to the whole notebook page
     ###########################################################
-    def html_debug_window(self):
-        r"""
-        Return the HTML for the debug window.
-
-        OUTPUT:
-
-        - a string - the debug window rendered as HTML
-
-        EXAMPLES::
-
-            sage: nb = sagenb.notebook.notebook.Notebook(tmp_dir()+'.sagenb')
-            sage: nb.html_debug_window()
-            "\n<div class='debug_window'>...</div>"
-        """
-        return template(os.path.join("html", "notebook", "debug_window.html"))
-
-
     def html_plain_text_window(self, worksheet, username):
         r"""
         Return HTML for the window that displays a plain text version
@@ -1580 +1497 @@
             sage: nb = sagenb.notebook.notebook.Notebook(tmp_dir()+'.sagenb')
             sage: W = nb.create_new_worksheet('Test', 'admin')
             sage: nb.html_plain_text_window(W, 'admin')
-            '...pre class="plaintext"...cell_intext...textfield...'
+            u'...pre class="plaintext"...cell_intext...textfield...'
         """
         plain_text = worksheet.plain_text(prompts=True, banner=False)
         plain_text = escape(plain_text).strip()
@@ -1610 +1527 @@
             sage: nb = sagenb.notebook.notebook.Notebook(tmp_dir()+'.sagenb')
             sage: W = nb.create_new_worksheet('Test', 'admin')
             sage: nb.html_edit_window(W, 'admin')
-            '...textarea class="plaintextedit"...{{{id=1|...//...}}}...'
+            u'...textarea class="plaintextedit"...{{{id=1|...//...}}}...'
         """
-        text = worksheet.edit_text()
-        text = escape(text)
-        n_lines = text.count("\n")+1
 
         return template(os.path.join("html", "notebook", "edit_window.html"),
                         worksheet = worksheet,
                         worksheet_filename = worksheet.filename(),
-                        username = username, text = text, n_lines = n_lines,
-                        JSMATH = JSMATH, JEDITABLE_TINYMCE = JEDITABLE_TINYMCE)
+                        username = username)
 
     def html_beforepublish_window(self, worksheet, username):
         r"""
@@ -1642 +1555 @@
             sage: nb = sagenb.notebook.notebook.Notebook(tmp_dir()+'.sagenb')
             sage: W = nb.create_new_worksheet('Test', 'admin')
             sage: nb.html_beforepublish_window(W, 'admin')
-            '...want to publish this worksheet?...re-publish when changes...'
+            u'...want to publish this worksheet?...re-publish when changes...'
         """
         msg = """You can publish your worksheet to the Internet, where anyone will be able to access and view it online.
         Your worksheet will be assigned a unique address (URL) that you can send to your friends and colleagues.<br/><br/>
@@ -1708 +1621 @@
             sage: nb = sagenb.notebook.notebook.Notebook(tmp_dir()+'.sagenb')
             sage: W = nb.create_new_worksheet('Test', 'admin')
             sage: nb.html_upload_data_window(W, 'admin')
-            '...Upload or Create Data File...Browse...url...name of a new...'
+            u'...Upload or Create Data File...Browse...url...name of a new...'
         """
         return template(os.path.join("html", "notebook", "upload_data_window.html"),
-                        worksheet = ws, worksheet_filename = ws.filename(),
-                        username = username,
-                        JSMATH = JSMATH, JEDITABLE_TINYMCE = JEDITABLE_TINYMCE)
+                        worksheet = ws, username = username)
 
-    def html(self, worksheet_filename=None, username='guest', show_debug=False, admin=False):
+    def html(self, worksheet_filename=None, username='guest', show_debug=False,
+             admin=False, do_print=False):
         r"""
         Return the HTML for a worksheet's index page.
 
@@ -1738 +1650 @@
             sage: nb = sagenb.notebook.notebook.Notebook(tmp_dir()+'.sagenb')
             sage: W = nb.create_new_worksheet('Test', 'admin')
             sage: nb.html(W.filename(), 'admin')
-            '...Test...cell_input...plainclick...state_number...worksheet_locked=false...'
+            u'...Test...cell_input...plainclick...state_number...'
         """
         if worksheet_filename is None or worksheet_filename == '':
             worksheet_filename = None
@@ -1749 +1661 @@
             except KeyError:
                 W = None
 
-        template_page = os.path.join("html", "notebook", "index.html")
+        template_page = os.path.join("html", "notebook", "worksheet_page.html")
         if W.docbrowser():
             template_page = os.path.join("html", "notebook", "doc_page.html")
+        elif do_print:
+            template_page = os.path.join('html', 'notebook', 'print_worksheet.html')
+        elif W.is_published() or self.user_is_guest(username):
+            template_page = os.path.join('html', 'notebook', 'guest_worksheet_page.html')
 
         return template(template_page, worksheet = W,
-                        worksheet_filename = W.filename(),
-                        worksheet_html = W.html(), notebook = self,
-                        username = username, show_debug = show_debug,
-                        JSMATH = JSMATH, JEDITABLE_TINYMCE = JEDITABLE_TINYMCE)
+                        notebook = self, do_print=do_print,
+                        username = username, show_debug = show_debug)
 
 ####################################################################
 
@@ -1994 +1908 @@
 # Misc
 ##########################################################
 
-def clean_name(name):
-    return ''.join([x if (x.isalnum() or x == '_') else '_' for x in name])
 
 def sort_worksheet_list(v, sort, reverse):
     """

sagenb/notebook/template.py

@@ -17 +17 @@
 
 import jinja
 
-from jinja.filters import stringfilter
+from jinja.filters import stringfilter, simplefilter
 
 import os, re, sys
 
 from sagenb.misc.misc import SAGE_VERSION, DATA
+from sagenb.notebook.cell import number_of_rows
+from sagenb.notebook.jsmath import math_parse
 
 
 TEMPLATE_PATH = os.path.join(DATA, 'sage')
@@ -41 +43 @@
 
     EXAMPLES::
 
-        sage: from sagenb.notebook.template import contained_in, env, css_escape
+        sage: from sagenb.notebook.template import env, css_escape
         sage: escaper = css_escape()
         sage: print(escaper(env, {}, '12abcd'))
         12abcd
@@ -71 +73 @@
     """
     return css_illegal_re.sub('-', string)
 
-def contained_in(container):
+def prettify_time_ago(t):
     """
-    Given a container, returns a function which takes an environment,
-    context, and value and returns True if that value is in the
-    container and False otherwise.  This is registered and used as a
-    test in the templates.
+    Converts seconds to a meaningful string.
+
+    INPUT
+
+    - t -- time in seconds
+
+    """
+    if t < 60:
+        s = int(t)
+        if s == 1:
+            return "1 second"
+        return "%d seconds"%s
+    if t < 3600:
+        m = int(t/60)
+        if m == 1:
+            return "1 minute"
+        return "%d minutes"%m
+    if t < 3600*24:
+        h = int(t/3600)
+        if h == 1:
+            return "1 hour"
+        return "%d hours"%h
+    d = int(t/(3600*24))
+    if d == 1:
+        return "1 day"
+    return "%d days"%d
+
+def clean_name(name):
+    """
+    Converts a string to a safe/clean name by converting non-alphanumeric characters to underscores.
 
     INPUT:
 
-    - ``container`` - a container, e.g., a list or dictionary
+    - name -- a string
 
     EXAMPLES::
 
-        sage: from sagenb.notebook.template import contained_in
-        sage: f = contained_in([1,2,3])
-        sage: f(None, None, 2)
-        True
-        sage: f(None, None, 4)
-        False
+        sage: from sagenb.notebook.template import clean_name
+        sage: print clean_name('this!is@bad+string')
+        this_is_bad_string
     """
-    def wrapped(env, context, value):
-        return value in container
-    return wrapped
-
+    return ''.join([x if x.isalnum() else '_' for x in name])
 
 env.filters['css_escape'] = css_escape
-env.tests['contained_in'] = contained_in
-
-#A dictionary containing the default context
-#The values in this dictionary will be updated
-#by the
-default_context = {'sitename': 'Sage Notebook',
-                   'sage_version': SAGE_VERSION}
+env.filters['number_of_rows'] = simplefilter(number_of_rows)
+env.filters['clean_name'] = stringfilter(clean_name)
+env.filters['prettify_time_ago'] = simplefilter(prettify_time_ago)
+env.filters['math_parse'] = stringfilter(math_parse)
+env.filters['max'] = simplefilter(max)
 
 def template(filename, **user_context):
     """
@@ -126 +146 @@
 
         sage: from sagenb.notebook.template import template
         sage: s = template(os.path.join('html', 'yes_no.html')); type(s)
-        <type 'str'>
+        <type 'unicode'>
         sage: 'Yes' in s
         True
-
-        sage: from sagenb.notebook.template import template
         sage: u = unicode('Are Gröbner bases awesome?','utf-8')
         sage: s = template(os.path.join('html', 'yes_no.html'), message=u)
-        sage: 'Gr\xc3\xb6bner' in s
+        sage: u'Gr\xf6bner' in s
         True
     """
+    from sagenb.notebook.notebook import JSMATH, JEDITABLE_TINYMCE
+    from twist import notebook
+    #A dictionary containing the default context
+    default_context = {'sitename': 'Sage Notebook',
+                       'sage_version': SAGE_VERSION,
+                       'JSMATH': JSMATH,
+                       'JEDITABLE_TINYMCE': JEDITABLE_TINYMCE,
+                       'conf': notebook.conf() if notebook else None}
     try:
         tmpl = env.get_template(filename)
     except jinja.exceptions.TemplateNotFound:
@@ -143 +169 @@
     context = dict(default_context)
     context.update(user_context)
     r = tmpl.render(**context)
-    return r.encode('utf-8')
+    return r

sagenb/notebook/twist.py

@@ -135 +135 @@
     return template(os.path.join('html', 'error_message.html'),
                     **template_dict)
 
+class Response(http.Response):
+    """
+    An adapter for ``twisted.web2.http.Response`` that automatically
+    encodes its stream into UTF-8.
+
+    INPUT:
+
+    - code -- HTTP status code for the response
+
+    - headers -- headers to be sent
+
+    - stream -- content body to send
+    """
+    def __init__(self, code=None, headers=None, stream=None):
+        if stream is not None:
+            if isinstance(stream, unicode):
+                stream = stream.encode('utf-8', 'ignore')
+        super(Response, self).__init__(code, headers, stream)
+
 def HTMLResponse(*args, **kwds):
     """
     Returns an HTMLResponse object whose 'Content-Type' header has been set
@@ -148 +167 @@
         <Headers: Raw: {'content-type': ['text/html; charset=utf-8']} Parsed: {'content-type': <RecalcNeeded>}>
 
     """
-    response = http.Response(*args, **kwds)
+    response = Response(*args, **kwds)
     response.headers.addRawHeader('Content-Type', 'text/html; charset=utf-8')
     return response
 
@@ -1008 +1027 @@
 
         td['admin'] = nu.is_admin()
 
-        s = template(os.path.join('html', 'account_settings.html'), **td)
+        s = template(os.path.join('html', 'settings', 'account_settings.html'), **td)
         return HTMLResponse(stream = s)
 
 
@@ -1023 +1042 @@
 
         template_dict = {}
         template_dict['auto_table'] = notebook.conf().html_table(updated)
-        s = template(os.path.join('html', 'notebook_settings.html'),
+        template_dict['admin'] = notebook.user(self.username).is_admin()
+        template_dict['username'] = self.username
+        s = template(os.path.join('html', 'settings', 'notebook_settings.html'),
                      **template_dict)
-        return http.Response(stream = s)
+        return HTMLResponse(stream = s)
 
 
 ########################################################
@@ -1038 +1059 @@
     """
     def render(self, ctx):
         W = self.worksheet
-        v = encode_list([W.state_number(), W.html_cell_list()])
+        # TODO: Send and actually use the body's HTML.
+        v = encode_list([W.state_number(), ''])
+#        v = encode_list([W.state_number(), W.html_cell_list()])
         return HTMLResponse(stream=v)
 
 
@@ -1324 +1347 @@
 class Worksheet_rating_info(WorksheetResource, resource.Resource):
     def render(self, ctx):
         s = self.worksheet.html_ratings_info()
-        return HTMLResponse(stream=message('''
-        <h2 align=center>Ratings for %s</h2>
-        <h3 align=center><a href='/home/%s'>Go to the worksheet.</a>
-        <br><br>
-        <table width=70%%align=center border=1 cellpadding=10 cellspacing=0>
-        <tr bgcolor="#7799bb"><td width=30em>User</td><td width=10em align=center>Rating</td><td width=10em align=center width=60em>Comment</td></tr>
-        %s
-        </table>
-        <br><br>
-        '''%(self.worksheet.name(), self.worksheet.filename(), s)))
-
+        return HTMLResponse(stream=s)
 
 class Worksheet_rate(WorksheetResource, resource.Resource):
     def render(self, ctx):
@@ -1439 +1452 @@
         s = self.worksheet.interrupt()
         return HTMLResponse(stream='ok' if s else 'failed')
 
-class Worksheet_plain(WorksheetResource, resource.Resource):
-    def render(self, ctx):
-        s = notebook.plain_text_worksheet_html(self.name)
-        return HTMLResponse(stream=s)
-
 class Worksheet_hide_all(WorksheetResource, resource.Resource):
     def render(self, ctx):
         self.worksheet.hide_all()
@@ -1466 +1474 @@
 
 class Worksheet_print(WorksheetResource, resource.Resource):
     def render(self, ctx):
-        s = notebook.worksheet_html(self.name, do_print=True)
+        s = notebook.html(self.name, do_print=True)
         return HTMLResponse(stream=s)
 
 
@@ -1804 +1812 @@
     def render(self, ctx):
         s = css.css()
         gzip_handler(ctx)
-        response = http.Response(stream=s)
+        response = Response(stream=s)
         response.headers.addRawHeader('Content-Type', 'text/css; charset=utf-8')
         return response
 
-class Reset_css(resource.Resource):
-    def render(self, ctx):
-        s = template(os.path.join('css', 'reset.css'))
-        gzip_handler(ctx)
-        return http.Response(stream=s)
-
 class CSS(resource.Resource):
     addSlash = True
 
@@ -1825 +1827 @@
         return static.File(os.path.join(css_path, name))
 
 setattr(CSS, 'child_main.css', Main_css())
-setattr(CSS, 'child_reset.css', Reset_css())
 
 ############################
 
@@ -1842 +1843 @@
                      jsmath_macros = jsmath_macros,
                      jsmath_image_fonts = jsmath_image_fonts)
 
-        return http.Response(stream=s)
+        return Response(stream=s)
 
 class Main_js(resource.Resource):
     def render(self, ctx):
         gzip_handler(ctx)
         s = js.javascript()
-        return http.Response(stream=s)
+        return Response(stream=s)
 
 class Keyboard_js_specific(resource.Resource):
     def __init__(self, browser_os):
@@ -1856 +1857 @@
 
     def render(self, ctx):
         gzip_handler(ctx)
-        return http.Response(stream = self.s)
+        return Response(stream = self.s)
 
 class Keyboard_js(resource.Resource):
     def childFactory(self, request, browser_os):
@@ -2166 +2167 @@
         # VALIDATE OVERALL.
         if empty == required:
             # All required fields are empty.  Not really an error.
-            form = template(os.path.join('html', 'registration.html'),
+            form = template(os.path.join('html', 'accounts', 'registration.html'),
                             **empty_form_dict)
             return HTMLResponse(stream = form)
         elif validated != required:
@@ -2174 +2175 @@
             errors = len(required) - len(validated)
             template_dict['error'] = 'E ' if errors == 1 else 'Es '
 
-            form = template(os.path.join('html', 'registration.html'),
+            form = template(os.path.join('html', 'accounts', 'registration.html'),
                             **template_dict)
             return HTMLResponse(stream = form)
 
@@ -2185 +2186 @@
             template_dict['username_taken'] = True
             template_dict['error'] = 'E '
 
-            form = template(os.path.join('html', 'registration.html'),
+            form = template(os.path.join('html', 'accounts', 'registration.html'),
                             **template_dict)
             return HTMLResponse(stream = form)
 
@@ -2266 +2267 @@
 
             return HTMLResponse(stream=message("A new password has been sent to your e-mail address.", '/'))
         else:
-            s = template(os.path.join('html', 'account_recovery.html'))
+            s = template(os.path.join('html', 'accounts', 'account_recovery.html'))
         return HTMLResponse(stream=s)
 
 class ListOfUsers(resource.Resource):
@@ -2303 +2304 @@
         users = sorted(notebook.valid_login_names())
         del users[users.index('admin')]
         template_dict['users'] = [notebook.user(i) for i in users]
-        return HTMLResponse(stream = template(os.path.join('html', 'user_management.html'), **template_dict))
+        template_dict['admin'] = notebook.user(self.username).is_admin()
+        template_dict['username'] = self.username
+        return HTMLResponse(stream = template(os.path.join('html', 'settings', 'user_management.html'), **template_dict))
 
 class AdminAddUser(resource.PostableResource):
-    def __init__(self, userdb):
-        self.userdb = userdb
+    def __init__(self, username):
+        self.username = username
 
     def render(self, request):
-
+        template_dict = {'admin': notebook.user(self.username).is_admin(),
+                         'username': self.username}
         if 'username' in request.args:
             username = request.args['username'][0]
             if not is_valid_username(username):
-                return HTMLResponse(stream=template(os.path.join('html', 'admin_add_user.html'), error='username_invalid', username=username))
+                return HTMLResponse(stream=template(os.path.join('html', 'settings', 'admin_add_user.html'),
+                                                    error='username_invalid', username=username, **template_dict))
 
             from random import choice
             import string
             chara = string.letters + string.digits
             password = ''.join([choice(chara) for i in range(8)])
             if username in notebook.usernames():
-                return HTMLResponse(stream=template(os.path.join('html', 'admin_add_user.html'), error='username_taken', username=username))
+                return HTMLResponse(stream=template(os.path.join('html', 'settings', 'admin_add_user.html'),
+                                                    error='username_taken', username_input=username, **template_dict))
             notebook.add_user(username, password, '', force=True)
-            return HTMLResponse(stream=message('The temporary password for the new user <em>%s</em> is <em>%s</em>' % (username, password), '/adduser'))
+            return HTMLResponse(stream=message('The temporary password for the new user <em>%s</em> is <em>%s</em>' %
+                                               (username, password), '/adduser'))
         else:
-            return HTMLResponse(stream=template(os.path.join('html', 'admin_add_user.html')))
+            
+            return HTMLResponse(stream=template(os.path.join('html', 'settings', 'admin_add_user.html'), **template_dict))
 
 class InvalidPage(resource.Resource):
     addSlash = True
@@ -2481 +2489 @@
     # better call userchildFactory it in the base class (Toplevel)!
     def userchildFactory(self, request, name):
         try:
-            return UserToplevel.__dict__['userchild_%s'%name](username = self.username)
-        except KeyError:
+            return getattr(self.__class__, 'userchild_%s' % name )(username = self.username)
+        except AttributeError:
             pass
 
     userchild_doc = Doc
@@ -2524 +2532 @@
 
 class AdminToplevel(UserToplevel):
     addSlash = True
-
+    
     userchild_home = WorksheetsAdmin
-    child_users = ListOfUsers
-    child_adduser = AdminAddUser
-    child_notebooksettings = NotebookSettingsPage
+    userchild_users = ListOfUsers
+    userchild_adduser = AdminAddUser
+    userchild_notebooksettings = NotebookSettingsPage
 
 def user_type(username):
     # one of admin, guest, user

sagenb/notebook/worksheet.py

@@ -44 +44 @@
 
 # Imports specifically relevant to the sage notebook
 from   cell import Cell, TextCell
-from template import template
+from template import template, clean_name, prettify_time_ago
 
 # Set some constants that will be used for regular expressions below.
 whitespace = re.compile('\s')  # Match any whitespace character
@@ -111 +111 @@
         sage: sagenb.notebook.worksheet.worksheet_filename('Example#%&! work\\sheet 3', 'sage10')
         'sage10/Example_____work_sheet_3'
     """
-    return os.path.join(owner, _notebook.clean_name(name))
+    return os.path.join(owner, clean_name(name))
 
 def Worksheet_from_basic(obj, notebook_worksheet_directory):
     """
@@ -1185 +1185 @@
                 del self.__published_version
                 raise ValueError
         except AttributeError:
-            raise ValueError, "no published version"
+            raise ValueError("no published version")
 
     def set_worksheet_that_was_published(self, W):
         """
@@ -1245 +1245 @@
             [('hilbert', 3, 'this is great'), ('riemann', 0, 'this lacks content')]
         """
         r = self.ratings()
+        x = int(x)
         for i in range(len(r)):
             if r[i][0] == username:
                 r[i] = (username, x, comment)
@@ -1320 +1321 @@
             sage: W.rate(0, 'this lacks content', 'riemann')
             sage: W.rate(3, 'this is great', 'hilbert')
             sage: W.html_ratings_info()
-            '<tr><td>hilbert</td><td align=center>3</td><td>this is great</td></tr>\n<tr><td>riemann</td><td align=center>0</td><td>this lacks content</td></tr>'
+            u'...hilbert...3...this is great...this lacks content...'
         """
-        ratings = self.ratings()
-        lines = []
-        for z in sorted(ratings):
-            if len(z) == 2:
-                person, rating = z
-                comment = ''
-            else:
-                person, rating, comment = z
-            lines.append('<tr><td>%s</td><td align=center>%s</td><td>%s</td></tr>'%(
-                person, rating, '&nbsp;' if not comment else comment))
-        return '\n'.join(lines)
+        return template(os.path.join('html', 'worksheet', 'ratings_info.html'),
+                        worksheet = self)
 
     def rating(self):
         """
@@ -1973 +1965 @@
         filenames = os.listdir(self.snapshot_directory())
         filenames.sort()
         t = time.time()
-        v = [(convert_seconds_to_meaningful_time_span(t - float(os.path.splitext(x)[0]))+ self._saved_by_info(x), x)  \
+        v = [(prettify_time_ago(t - float(os.path.splitext(x)[0]))+ self._saved_by_info(x), x)  \
              for x in filenames]
         self.__snapshot_data = v
         return v
@@ -2269 +2261 @@
                 print msg
         return cells_html
 
-    def html(self, include_title=True, do_print=False,
-             confirm_before_leave=False, read_only=False):
+    def html(self, do_print=False, publish=False):
         r"""
         INPUT:
 
@@ -2287 +2278 @@
             sage: nb = sagenb.notebook.notebook.Notebook(tmp_dir()+'.sagenb')
             sage: W = nb.create_new_worksheet('Test', 'admin')
             sage: W.html()
-            '\n\n\n<div class="cell_input_active" id="cell_resizer"></div>\n\n<div class="worksheet_cell_list" id...'
+            u'...cell_input_active...worksheet_cell_list...cell_1...cell_output_html_1...'
         """
-        return template(os.path.join("html", "worksheet", "worksheet.html"),
-                        published = self.is_published(),
-                        do_print = do_print, confirm_before_leave = confirm_before_leave,
-                        cells_html = self.html_cell_list(do_print=do_print),
-                        cell_id_list = self.cell_id_list(),
-                        state_number = self.state_number())
+        return template(os.path.join("html", "notebook", "worksheet.html"),
+                        do_print=do_print, publish=publish, worksheet=self)
 
     def truncated_name(self, max=30):
         name = self.name()
@@ -2311 +2298 @@
     def set_is_doc_worksheet(self, value):
         self.__is_doc_worksheet = value
 
-    def html_save_discard_buttons(self):
-        r"""
-        OUTPUT:
-
-        - string -- the HTML for the save, discard, etc. buttons
-
-        EXAMPLES::
-
-            sage: nb = sagenb.notebook.notebook.Notebook(tmp_dir()+'.sagenb')
-            sage: W = nb.create_new_worksheet('Test', 'admin')
-            sage: W.html_save_discard_buttons()
-            '\n\n<button name="button_save" title="Save changes" onClick="save_worksheet();">Save<...'
-        """
-        return template(os.path.join("html", "worksheet", "save_discard_buttons.html"),
-                        doc_worksheet = self.is_doc_worksheet())
-
-    def html_share_publish_buttons(self, select=None, backwards=False):
-        r"""
-        INPUT:
-
-        - select - a boolean
-
-        - backwards - a boolean
-
-        OUTPUT:
-
-        - string -- the HTML for the share, publish, etc. buttons
-
-        EXAMPLES::
-
-            sage: nb = sagenb.notebook.notebook.Notebook(tmp_dir()+'.sagenb')
-            sage: W = nb.create_new_worksheet('Test', 'admin')
-            sage: W.html_share_publish_buttons()
-            '...Print...Worksheet...Edit...Undo...Share...Publish...'
-        """
-        return template(os.path.join("html", "worksheet", "share_publish_buttons.html"),
-                        worksheet = self, select = select, backwards = backwards)
-
-    def html_menu(self):
-        r"""
-        OUTPUT:
-
-        - string -- the HTML for the menus of the worksheet
-
-        EXAMPLES::
-
-            sage: nb = sagenb.notebook.notebook.Notebook(tmp_dir()+'.sagenb')
-            sage: W = nb.create_new_worksheet('Test', 'admin')
-            sage: W.html_menu()
-            '...File...Action...Data...pretty_print...'
-        """
-        return template(os.path.join("html", "worksheet", "menu.html"),
-                        name = _notebook.clean_name(self.name()),
-                        filename_ = self.filename(), data = sorted(self.attached_data_files()),
-                        systems_enumerated = enumerate(self.notebook().systems()),
-                        system_names = self.notebook().system_names(),
-                        current_system_index = self.system_index(),
-                        pretty_print = self.pretty_print(),
-                        doc_worksheet = self.is_doc_worksheet())
-
-    def html_worksheet_body(self, do_print, publish=False):
-        r"""
-        INPUT:
-
-        - publish - a boolean stating whether the worksheet is published
-
-        - do_print - a boolean
-
-        OUTPUT:
-
-        - string -- the HTML for the File menu of the worksheet
-
-        EXAMPLES::
-
-            sage: nb = sagenb.notebook.notebook.Notebook(tmp_dir()+'.sagenb')
-            sage: W = nb.create_new_worksheet('Test', 'admin')
-            sage: W.html_worksheet_body(false)
-            '\n\n<div class="cell_input_active" id="cell_resizer"></div>\n\n<div class="worksheet_cell_list" id...'
-        """
-        published = self.is_published() or publish
-        ncols = self.notebook().conf()['word_wrap_cols']
-        cells_html = ""
-        for cell in self.cell_list():
-            cells_html += cell.html(ncols, do_print=do_print) + '\n'
-
-        return template(os.path.join("html", "worksheet", "worksheet_body.html"),
-                        cells_html = cells_html,
-                        published = published,
-                        do_print = do_print)
-
 
     ##########################################################
     # Last edited
@@ -2446 +2343 @@
             sage: W.last_to_edit()
             'john'
             sage: W.date_edited()
-            time.struct_time(tm_year=2009, tm_mon=10, tm_mday=8, tm_hour=12, tm_min=23, tm_sec=20, tm_wday=3, tm_yday=281, tm_isdst=1)
+            time.struct_time(tm_year=2009, tm_mon=10, tm_mday=..., tm_hour=..., tm_min=23, tm_sec=20, tm_wday=..., tm_yday=..., tm_isdst=...)
             sage: t = W.time_since_last_edited() # just test that call works
         """
         username = str(username); tm = float(tm)
@@ -2515 +2412 @@
 
     def html_time_since_last_edited(self):
         t = self.time_since_last_edited()
-        tm = convert_seconds_to_meaningful_time_span(t)
+        tm = prettify_time_ago(t)
         return template(os.path.join("html", "worksheet", "time_since_last_edited.html"),
                         last_editor = self.last_to_edit(),
                         time = tm)
@@ -3746 +3643 @@
 
         EXAMPLES: First, we set up a new notebook and worksheet.::
 
-            sage: nb = sagenb.notebook.notebook.Notebook(tmp_dir()+'.sagenb')
+            sage: nb = sagenb.notebook.notebook.load_notebook(tmp_dir()+'.sagenb')
             sage: nb.add_user('sage','sage','sage@sagemath.org',force=True)
             sage: W = nb.create_new_worksheet('Test', 'sage')
 
@@ -4119 +4016 @@
     return i
 
 
-def convert_seconds_to_meaningful_time_span(t):
-    if t < 60:
-        s = int(t)
-        if s == 1:
-            return "1 second"
-        return "%d seconds"%s
-    if t < 3600:
-        m = int(t/60)
-        if m == 1:
-            return "1 minute"
-        return "%d minutes"%m
-    if t < 3600*24:
-        h = int(t/3600)
-        if h == 1:
-            return "1 hour"
-        return "%d hours"%h
-    d = int(t/(3600*24))
-    if d == 1:
-        return "1 day"
-    return "%d days"%d
-
-
 def convert_time_to_string(t):
     return time.strftime('%B %d, %Y %I:%M %p', time.localtime(float(t)))
 

sagenb/testing/HTMLTestRunner.py

@@ -347 +347 @@
     results.
     """
     def __init__(self, stream=sys.stdout, verbosity=1, title=None,
-                 description=None):
+                 description=None, **extra_args):
         """
         Initialize variables.
         """
@@ -355 +355 @@
         self.verbosity = verbosity
         self.title = title
         self.description = description
+        self.extra_args = extra_args
 
         # Set up Pygments syntax highlighting.
         self.formatter = get_formatter_by_name('html', noclasses=True,
@@ -407 +408 @@
         template_dict['title'] = jinja2.escape(self.title)
         template_dict['description'] = jinja2.escape(self.description)
         template_dict['sagenb_version'] = SAGENB_VERSION
+        template_dict['environment'] = self.extra_args.get('environment')
         template_dict['start_time'] = str(self.start_time)[:19]
         template_dict['stop_time'] = str(self.stop_time)[:19]
         template_dict['elapsed_time'] = self.elapsed_time

sagenb/testing/notebook_test_case.py

@@ -5 +5 @@
 This contains the base class for all SageNB test cases.
 """
 
-from selenium.selenium import selenium
+import copy
+import os
+import pexpect
+import re
+import shutil
+import signal
+import subprocess
+import tempfile
+import time
 import unittest
 
-import os, subprocess, pexpect, shutil, time, re, tempfile, signal
+from selenium.selenium import selenium
+
+# Default options.
+NB_OPTIONS = {
+    'address': 'localhost',   # Should *not* be left empty.
+    'directory': '',          # Set automatically if empty.  Must end
+                              # in '.sagenb'.
+    'open_viewer': False,
+    'port': 8000,
+    'secure': False
+}
+SEL_OPTIONS = {
+    'server_host': 'localhost',
+    'server_port': 4444,
+    'environment': '*firefox3 /usr/bin/firefox',
+    'browser_url': ''         # Set automatically if empty.
+}
+
+# This is for Google Chrome, which caches '/new_worksheet', for some
+# reason.
+CACHE_SKIP = 0
+
+KEY_CODES = {
+    'tab': 9,
+    'enter': 10,
+    'shift': 16
+}
+
 
 class NotebookTestCase(unittest.TestCase):
     """
     Base class for SageNB test cases. Contains multiple utility
     functions, and sets up fixtures.
     """
-    tags = ('seleniumtest',) 
+    tags = ('seleniumtest',)
+
+    def cleanup(self):
+        nb_dir = self.nb_options['directory']
+
+        if os.path.exists(nb_dir):
+            twistd_pid_path = os.path.join(nb_dir, 'twistd.pid')
+            if os.path.exists(twistd_pid_path):
+                twistd_pid_fd = open(twistd_pid_path, 'r')
+                twistd_pid = int(twistd_pid_fd.read())
+                try:
+                    os.kill(twistd_pid, signal.SIGTERM)
+                    os.kill(twistd_pid, signal.SIGKILL)
+                except OSError:
+                    pass
+                twistd_pid_fd.close()
+            shutil.rmtree(nb_dir, ignore_errors=True)
+
     def setUp(self):
         """
         Makes sure that the tests start from a fresh slate, and starts
         the server.
         """
-        self.temp_dir = os.path.join(tempfile.gettempdir(), 'sagenb_tests')
-        if os.path.exists(self.temp_dir + '.sagenb'):
-            twistd_pid_path = os.path.join(self.temp_dir + '.sagenb', 'twistd.pid')
-            if os.path.exists(twistd_pid_path):
-                twistd_pid = int(open(twistd_pid_path, 'r').read())
-                try:
-                    os.kill(twistd_pid, signal.SIGTERM)
-                    os.kill(twistd_pid, signal.SIGKILL)
-                except OSError:
-                    pass
-            shutil.rmtree(self.temp_dir + '.sagenb')
-        os.mkdir(self.temp_dir + '.sagenb')
-        self.verification_errors = []
+        self.nb_options = copy.deepcopy(NB_OPTIONS)
+        self.nb_options['directory'] = (self.nb_options['directory'] or
+                                        os.path.join(tempfile.gettempdir(),
+                                                     'sagenb_tests.sagenb'))
+        self.sel_options = copy.deepcopy(SEL_OPTIONS)
+
+        self.cleanup()
+        os.mkdir(self.nb_options['directory'])
         self.start_notebook(initial=True)
-        self.selenium = selenium("localhost", 4444, "*firefox3 /usr/bin/firefox", "http://localhost:%d" % self.sagenb_port)
+
+        self.selenium = selenium(self.sel_options['server_host'],
+                                 self.sel_options['server_port'],
+                                 self.sel_options['environment'],
+                                 self.sel_options['browser_url'])
         self.selenium.start()
         self.selenium.open("/")
-            
+
     def start_notebook(self, initial=False):
         """
-        Starts the Sage notebook.  If initial is True, then it expects to have to enter
-        the initial password twice.
+        Starts the Sage notebook.  If initial is True, then it expects
+        to have to enter the initial password twice.
         """
         self._p = pexpect.spawn(self._sage_startup_command())
         if initial:
             self._p.sendline("asdfasdf")
             self._p.sendline("asdfasdf")
 
-        port_re = re.compile(r'http://localhost:(\d+)')
+        port_re = re.compile(r'http(?:s)?://' + self.nb_options['address'] +
+                             r':(\d+)')
 
         line = self._p.readline()
         while not port_re.search(line):
             line = self._p.readline()
-        
-        self.sagenb_port = int(port_re.search(line).group(1))
+
+        m = port_re.search(line)
+        self.sel_options['browser_url'] = (self.sel_options['browser_url'] or
+                                           m.group(0))
+        self.sagenb_port = int(m.group(1))
+
         self._p.expect("Starting factory")
-        
+
     def _sage_startup_command(self):
         """
         Command to send to pexpect to start the notebook.
         """
-        return 'sage -c "notebook(open_viewer=False, directory=\'%s\', port=8000)"'\
-            % self.temp_dir
+        return 'sage -c "notebook(**%r)"' % self.nb_options
 
     def focus_cell(self, id):
         """
@@ -71 +126 @@
         """
         sel = self.selenium
         sel.focus("cell_input_%s" % id)
-    
+
     def eval_cell(self, id, text, timeout=20000, output=True):
         """
         Evaluates the cell id with input text text.
@@ -81 +136 @@
         sel = self.selenium
         id = str(id)
         sel.type("cell_input_"+id, text)
-        self.shift_enter("cell_input_"+id)
+        self.evaluate(id)
         self.wait_for_no_active_cells()
         if output:
             return self.get_cell_output(id)
 
+    def evaluate(self, id):
+        """
+        Triggers evaluation of a given cell.
+        """
+#        self.shift_enter("cell_input_"+id)
+        self.selenium.get_eval('window.evaluate_cell(%s, 0);' % id)
+
     def _get_cell_output_type(self, id, type='nowrap'):
         out = ''
         try:
-            out =  self.selenium.get_eval("window.document.getElementById('cell_output_%s_%s').innerHTML"%(type, id)).strip()
+            out =  self.selenium.get_eval("window.document.getElementById('cell_output_%s_%s').innerHTML" % (type, id)).strip()
         except:
             pass
         return out
@@ -102 +164 @@
         out = self._get_cell_output_type(id, 'nowrap')
         if out == '':
             out = self._get_cell_output_type(id, 'html')
-            
+
+        # Browser contortions. TODO: Simplify this with regular
+        # expressions.
         preshrunk = '<pre class="shrunk">'
-        if out.startswith(preshrunk):
+        PREshrunk = '<PRE class="shrunk">'
+        PREshrunk2 = '<PRE class=shrunk>'
+
+        if out.startswith(preshrunk) or out.startswith(PREshrunk):
             out = out[len(preshrunk):-6]
+        if out.startswith(PREshrunk2):
+            out = out[len(PREshrunk2):-6]
+
         out = out.strip()
         return out
-   
+
     def wait_for_no_active_cells(self, timeout=20000):
         """
-        Tells Selenium to wait until they're are no active cells on the worksheet.
+        Tells Selenium to wait until they're are no active cells on
+        the worksheet.
         """
         self.selenium.wait_for_condition("selenium.browserbot.getCurrentWindow().active_cell_list.length == 0", "%s"%timeout)
 
@@ -119 +190 @@
         """
         Presses enter in the element ``locator``.
         """
+#        self.selenium.focus(locator)
         self.selenium.key_press(locator, '13')
-        
+#        self.selenium.key_press_native(KEY_CODES['enter'])
+
     def shift_enter(self, locator):
         """
         Presses shift-enter in the element ``locator``.   For example,
         self.shift_enter('cell_input_0')
         """
         sel = self.selenium
+#        self.selenium.focus(locator)
         sel.shift_key_down()
+#        sel.key_down_native(KEY_CODES['shift'])
         self.enter(locator)
         sel.shift_key_up()
+#        sel.key_up_native(KEY_CODES['shift'])
 
     def tab(self, locator):
         """
         Presses tab in the element ``locator``.
         """
         self.selenium.focus(locator)
-        self.selenium.key_press_native(9)
-        
+        self.selenium.key_press_native(KEY_CODES['tab'])
+
+    def introspect(self, id):
+        """
+        Evaluates introspection in the given cell.
+        """
+#        self.tab('cell_input_%s' % id)
+        self.selenium.get_eval('window.set_cursor_position(window.get_cell(%s), 100);' % id)
+        self.selenium.get_eval('window.evaluate_cell_introspection(%s, null, null);' % id)
+
     def save_and_quit(self):
         """
         Save and close the current worksheet and wait until we
@@ -145 +229 @@
         """
         sel = self.selenium
         sel.click("//button[@name='button_save' and @onclick='save_worksheet_and_close();']")
-        self.wait_for_title('Active Worksheets')
         sel.wait_for_page_to_load("30000")
+        self.wait_for_title('Active Worksheets -- Sage')
 
     def wait_for_title(self, title):
         """
-        Tells Selenium to wait until the title of the page has changed to
-        title since it doesn't recognize many of the page reloads in the Sage
-        notebook.
+        Tells Selenium to wait until the title of the page has changed
+        to title since it doesn't recognize many of the page reloads
+        in the Sage notebook.
         """
-        self.selenium.wait_for_condition('selenium.browserbot.getCurrentWindow().document.title == "%s"'%title, 30000)
+        self.selenium.wait_for_condition('selenium.browserbot.getCurrentWindow().document.title.replace(/^\s+|\s+$/g, "") == "%s"'%title, 30000)
 
     def rename_worksheet(self, new_title):
         """
@@ -162 +246 @@
         """
         sel = self.selenium
         sel.click("worksheet_title")
-        # Note: These locators also detect modal prompts that have been hidden, but not deleted.
+        # Note: These locators also detect modal prompts that have
+        # been hidden, but not deleted.
         sel.type('//div[contains(@class,"modal-prompt")]//input[@type="text"]', new_title)
         sel.click('//div[contains(@class, "modal-prompt")]/form/div[@class="button-div"]/button[@type="submit"]')
         sel.wait_for_condition('selenium.browserbot.getCurrentWindow().$("#worksheet_title").text() == "%s"' % new_title, 5000)
@@ -170 +255 @@
     def register_user(self, username, password='asdfasdf'):
         """
         Registers a new user for the Sage notebook.
-        
+
         This assumes that you're at the login page.
         """
         sel = self.selenium
         sel.click("id=register-link")
         sel.wait_for_page_to_load(30000)
-        self.wait_for_title("Sign up")
+        self.wait_for_title("Sign up -- Sage")
 
         sel.type("username", username)
         sel.type("password", password)
         sel.type("retype_password", password)
         sel.click("id=create-account-button")
         sel.wait_for_page_to_load(30000)
-        self.wait_for_title('Sign in')
-        self.assertTrue(sel.is_text_present('regexp:Congratulations '))
+        self.wait_for_title('Sign in -- Sage')
+        self.assertTrue(sel.is_text_present('regexp:Congratulations'))
 
     def login_as(self, username, password='asdfasdf'):
         """
@@ -208 +293 @@
         self.password = None
 
         sel = self.selenium
-        sel.click("//a[@href='/logout']")
+        sel.click("link=Sign out")
         sel.wait_for_page_to_load("30000")
 
     def go_home(self):
@@ -222 +307 @@
 
     def create_new_worksheet(self, title = "My New Worksheet"):
         sel = self.selenium
-        sel.open('/new_worksheet')
+        self.go_home()
+
+        global CACHE_SKIP
+        CACHE_SKIP += 1
+        sel.open('/new_worksheet?%d' % CACHE_SKIP)
         sel.wait_for_page_to_load("30000")
         self.assert_(sel.is_element_present('//a[@id="worksheet_title" and contains(text(),"Untitled")]'))
         sel.type('//div[contains(@class,"modal-prompt")]//input[@type="text"]', title)
@@ -231 +320 @@
 
     def open_worksheet_with_title(self, title):
         """
-        Open the worksheet with the given title, starting at 
+        Open the worksheet with the given title, starting at
         worksheet list.  This assumes the list contains the title.
         """
         self.go_home()
@@ -248 +337 @@
         sel = self.selenium
         sel.click("link=Publish")
         sel.wait_for_page_to_load("30000")
-        sel.click("//input[@value='Yes']")
+        sel.click("//button[text()='Yes']")
         sel.wait_for_page_to_load("30000")
         sel.click("link=Worksheet")
         sel.wait_for_page_to_load("30000")
@@ -261 +350 @@
         sel = self.selenium
         sel.click("link=Publish")
         sel.wait_for_page_to_load("30000")
-        sel.click("//input[@value='Re-publish worksheet']")
+        sel.click("//button[text()='Re-publish worksheet']")
         sel.wait_for_page_to_load("30000")
         sel.click("link=Worksheet")
         sel.wait_for_page_to_load("30000")
@@ -272 +361 @@
         """
         sel = self.selenium
         sel.open('/pub')
-        sel.wait_for_page_to_load("30000")        
+        sel.wait_for_page_to_load("30000")
 
     def goto_published_worksheet(self, id):
         """
@@ -283 +372 @@
         sel.click("link=Published")
         sel.wait_for_page_to_load("30000")
         sel.click("name-pub-"+id)
-        sel.wait_for_condition('selenium.browserbot.getCurrentWindow().worksheet_filename == "%s"'%('pub/'+id), 30000)        
+        sel.wait_for_condition('selenium.browserbot.getCurrentWindow().worksheet_filename == "%s"'%('pub/'+id), 30000)
 
     def open_worksheet_with_name(self, name):
         """
-        Opens the worksheet with the given name. Assumes that client is at list page.
+        Opens the worksheet with the given name. Assumes that client
+        is at list page.
         """
         sel = self.selenium
         self.wait_in_window('return this.$("a.worksheetname").attr("title").indexOf("{0}") != -1'.format(name),
@@ -313 +403 @@
         browser window. Use ``this`` to access the browser window.
         """
         self.selenium.wait_for_condition('(function(){ %s }).apply(selenium.browserbot.getCurrentWindow())'
-                                         % string,
-                                         timeout)
+                                         % string, timeout)
 
     def stop_notebook(self):
         """
@@ -323 +412 @@
         self._p.sendline(chr(3)+chr(3))
         self._p.kill(signal.SIGKILL)
         self._p = None
-        
+
     def tearDown(self):
         """
         Stops the notebook and cleans up.
         """
         self.stop_notebook()
-        try:
-            shutil.rmtree(self.temp_dir + '.sagenb')
-        except OSError:
-            pass
+        self.cleanup()
         self.selenium.stop()

sagenb/testing/run_tests.py

@@ -7 +7 @@
 
 NOTE:
 
-Selenium tests assume a Selenium server is running on port 4444. The
+The SageNB tests tests assume a Selenium server or Grid hub is running
+with the options given in :mod:`sagenb.testing.notebook_test_case` or
+set by :func:`setup_tests`.
+
+
 Selenium server can be downloaded from the Selenium `download page
 <http://seleniumhq.org/download/>`_ as part of the Selenium RC package
-and can be run with `java -jar selenium-server.jar`.
+and can be run with `java -jar selenium-server.jar`.  To set up
+Selenium Grid, please visit its `home page
+<http://selenium-grid.seleniumhq.org/>`_ for instructions.
 
 TODO:
 
@@ -23 +29 @@
 # of the possibility of incompatible libraries and binaries with
 # those of the user's browser (e.g., Python, etc.)
 
-from subprocess import Popen
-import unittest, os
+import unittest
 
+import notebook_test_case
 from sagenb.misc.misc import browser
+from tests import test_accounts, test_worksheet, test_worksheet_list
 
-from tests import test_accounts, test_worksheet, test_worksheet_list
+CASES = {
+    'TestAccounts': test_accounts,
+    'TestWorksheet': test_worksheet,
+    'TestWorksheetList': test_worksheet_list
+    }
 
 all_tests = unittest.TestSuite((test_accounts.suite,
                                test_worksheet.suite,
                                test_worksheet_list.suite))
 
-def run_tests():
+
+def setup_tests(address='localhost', secure=False,
+                environment='*firefox3 /usr/bin/firefox'):
     """
-    Runs all SageNB tests. This assumes that a Selenium server is running on port 4444.
+    Sets selected options for SageNB Selenium tests.
+
+    INPUT:
+
+    - ``address`` - a string (default: 'localhost'); address of the
+      network interface at which the notebook server listens.  Do not
+      leave this empty; see :mod:`sagenb.testing.notebook_test_case`
+      for details.
+
+    - ``secure`` - a boolean (default: False); whether to launch a
+      secure notebook server.  Note: Browser security warnings will
+      yield failed tests.  To work around these in Firefox, close all
+      windows, create a new profile (e.g., `firefox -P selenium`),
+      browse to a secure notebook server, accept the certificate, and
+      quit.  Then launch the Selenium server with, e.g.,
+
+        java -jar selenium-server -firefoxProfileTemplate $HOME/selenium/firefox
+
+      and run the tests.  A minimal profile template directory can
+      contain just the files `cert8.db` and `cert_override.txt`.
+
+    - ``environment`` - a string (default: '*firefox3
+      /usr/bin/firefox'); the browser environment in which to run the
+      tests.  The path is optional.  However, for the Selenium server
+      to have complete control over the launched browser, it's best to
+      give the full path to the browser *executable* (i.e., not a
+      shell script).
+
+      Possible environments include '*chrome', '*firefox',
+      '*firefox3', '*googlechrome', '*iexplore', '*opera', '*safari'.
+
+    EXAMPLES::
+
+        sage: import sagenb.testing.run_tests as rt               # not tested
+        sage: env = '*firefox3 /usr/lib64/firefox-3.5.6/firefox'  # not tested
+        sage: rt.setup_tests('localhost', True, env)              # not tested
+        sage: rt.run_any()                                        # not tested
+        sage: rt.setup_tests('localhost', True, '*opera')         # not tested
+        sage: rt.run_and_report()                                 # not tested
     """
-    unittest.TextTestRunner(verbosity=2).run(all_tests)
+    # TODO: Add a directory option for parallel testing.
+    notebook_test_case.NB_OPTIONS['address'] = address
+    notebook_test_case.NB_OPTIONS['secure'] = secure
+    notebook_test_case.SEL_OPTIONS['environment'] = environment
 
-def run_test(suite):
+
+def run_any(tests=all_tests, make_report=False, **kwargs):
     """
-    Runs a test suite. This assumes that a Selenium server is running on port 4444.
+    Creates and runs an ad hoc test suite from a test name, case,
+    suite, or a mixed list thereof.  If no matching tests are found,
+    no tests are run.
+
+    INPUT:
+
+    - ``tests`` - a string, :class:`unittest.TestCase`,
+      :class:`unittest.TestSuite`, or a mixed list thereof.  Strings
+      can be test names, with or without the prefix 'test_'.
+
+    - ``make_report`` - a boolean (default: False); whether to
+      generate a HTML report of the test results.
+
+    - ``kwargs`` - a dictionary; additional keyword options to pass to
+      :func:`run_suite` or :func:`run_and_report`.
+
+    EXAMPLES::
+
+        sage: import sagenb.testing.run_tests as rt              # not tested
+        sage: rt.run_any('simple_evaluation', make_report=True)  # not tested
+        sage: rt.run_any(['4088', 'test_3711'], verbosity=1)     # not tested
+        sage: rt.run_any('foo', False)                           # not tested
+        sage: rt.run_any(rt.test_accounts.TestAccounts)          # not tested
+        sage: rt.run_any(make_report=True)                       # not tested
     """
-    unittest.TextTestRunner(verbosity=2).run(suite)
-    
+    import inspect
+    from_name = unittest.TestLoader().loadTestsFromName
+    from_case = unittest.TestLoader().loadTestsFromTestCase
+
+    if not isinstance(tests, list):
+        tests = [tests]
+
+    alist = []
+    for t in tests:
+        if isinstance(t, str):
+            if not t.startswith('test_'):
+                t = 'test_' + t
+            for c in CASES:
+                try:
+                    alist.append(from_name(c + '.' + t, module = CASES[c]))
+                except AttributeError:
+                    pass
+        elif inspect.isclass(t) and issubclass(t, unittest.TestCase):
+            alist.append(from_case(t))
+        elif isinstance(t, unittest.TestSuite):
+            alist.append(t)
+
+    if alist:
+        suite = unittest.TestSuite(alist)
+        tot = suite.countTestCases()
+
+        environment = notebook_test_case.SEL_OPTIONS['environment']
+        print 'Running %d test%s in environment %s...' % (tot, '' if tot == 1 else 's', environment)
+
+        if make_report:
+            run_and_report(suite, environment = environment, **kwargs)
+        else:
+            run_suite(suite, **kwargs)
+
+
+def run_suite(suite=all_tests, verbosity=2):
+    """
+    Runs a test suite.
+
+    For the SageNB test suite, this assumes a Selenium server or Grid
+    hub is running with the options given in
+    :mod:`sagenb.testing.notebook_test_case` or set by
+    :func:`setup_tests`
+
+    INPUT:
+
+    - ``suite`` - a TestSuite instance (default: all_tests); the test
+      suite to run
+
+    - ``verbosity`` - an integer (default: 2); how verbosely to report
+      instantaneous test results
+
+    EXAMPLES::
+
+        sage: import sagenb.testing.run_tests as rt               # not tested
+        sage: rt.run_suite()                                      # not tested
+        sage: rt.run_suite(rt.test_worksheet.suite, verbosity=1)  # not tested
+    """
+    unittest.TextTestRunner(verbosity=verbosity).run(suite)
+
+
 def run_and_report(suite=all_tests, verbosity=2, report_filename='report.html',
                    title='Sage Notebook Tests',
                    description='Selenium test results',
-                   open_viewer=True):
+                   open_viewer=True, **kwargs):
     """
     Runs a test suite and generates a HTML report with the outcome
     (pass, fail, or error) and output, including any tracebacks, for
-    each test, plus overall statistics.  This assumes that a Selenium
-    server is running on port 4444.
+    each test, plus overall statistics.
+
+    For the SageNB test suite, this assumes a Selenium server or Grid
+    hub is running with the options given in
+    :mod:`sagenb.testing.notebook_test_case` or set by
+    :func:`setup_tests`.
 
     INPUT:
 
@@ -75 +216 @@
 
     - ``open_viewer`` - a boolean (default: True); whether to open
       the report in a web browser
+
+    - ``kwargs`` - a dictionary; extra keyword arguments passed to the
+      test runner's constructor
+
+    EXAMPLES::
+
+        sage: import sagenb.testing.run_tests as rt             # not tested
+        sage: rt.run_and_report()                               # not tested
+        sage: rt.run_and_report(report_filename='test1.html')   # not tested
+        sage: rt.run_and_report(rt.test_accounts.suite)         # not tested
     """
     from HTMLTestRunner import HTMLTestRunner
 
     report_fd = open(report_filename, 'w')
     runner = HTMLTestRunner(verbosity = verbosity, stream = report_fd,
-                            title = title, description = description)
+                            title = title, description = description,
+                            **kwargs)
     runner.run(suite)
 
     if open_viewer:
-        Popen(browser() + ' ' + os.path.abspath(report_filename), shell=True)
+        import os, subprocess
+        subprocess.Popen(browser() + ' ' + os.path.abspath(report_filename),
+                         shell=True)
 
 
 if __name__ == '__main__':
-    run_tests()
-
-
-
-
-
-
+    run_suite()

sagenb/testing/tests/test_accounts.py

@@ -6 +6 @@
 
 - Mike Hansen (?) -- initial revision
 
-- Tim Dumol (Oct. 28, 2009) -- made the tests work again. Separated this out.
+- Tim Dumol (Oct. 28, 2009) -- made the tests work again. Separated
+  this out.
 """
 import unittest
 
@@ -14 +15 @@
 
 class TestAccounts(NotebookTestCase):
     def _sage_startup_command(self):
-        return 'sage -c "notebook(open_viewer=False, directory=\'%s\', accounts=True)"'\
-            % self.temp_dir
+        self.nb_options['accounts'] = True
+        return super(TestAccounts, self)._sage_startup_command()
+
+    def setUp(self):
+        super(TestAccounts, self).setUp()
+        self.register_user('mike')
+        self.register_user('chris')
 
     def test_3960(self):
         """
         Tests to make sure that Trac ticket #3960 is actually fixed.
         """
         sel = self.selenium
-        
-        self.register_user('mike')
-        self.register_user('chris')
 
         self.login_as('mike')
         self.create_new_worksheet()
@@ -34 +37 @@
 
         self.login_as('chris')
         self.goto_published_worksheet(0)
-        
+
         sel.click("link=Edit a copy.")
         # Simply waiting for the page to load fails with slow computers.
-        self.wait_in_window('return this.location == "http://localhost:%d/home/chris/0/"'
-                           % self.sagenb_port, 30000)
+#        self.wait_in_window('return this.location == "%s/home/chris/0/"' %
+#                            self.sel_options['browser_url'], 30000)
         sel.wait_for_page_to_load(30000)
+
         self.wait_in_window('return this.$.trim(this.$("#cell_output_nowrap_1").text()) == 4', 30000)
 
-        self.assertEqual(sel.get_location(), 'http://localhost:%d/home/chris/0/' % self.sagenb_port)
+        self.assertEqual(sel.get_location(), '%s/home/chris/0/' %
+                         self.sel_options['browser_url'])
         self.assertEqual(self.get_cell_output(1), '4')
-        self.assert_(sel.is_text_present('by chris'), 'chris does not own the worksheet')
+        self.assert_(sel.is_text_present('by chris'),
+                     'chris does not own the worksheet')
 
     def test_4088(self):
         """
-        Check to see that the 'Welcome to Sage!' message is not visible on the
-        published worksheets screen when there are no worksheets.
+        Check to see that the 'Welcome to Sage!' message is not
+        visible on the published worksheets screen when there are no
+        worksheets.
         """
         sel = self.selenium
 
-        self.login_as('admin')
+        self.login_as('mike')
         sel.click("link=Published")
         sel.wait_for_page_to_load("30000")
 
-        self.assert_(not sel.is_text_present('Welcome to Sage!'), 'welcome message is still present')
-
+        self.assert_(not sel.is_text_present('Welcome to Sage!'),
+                     'welcome message is still present')
 
     def test_4050(self):
         """
         Tests to make sure that Trac ticket #4050 is actually fixed.
         """
         sel = self.selenium
-        
-        self.register_user('mike')
-        self.register_user('chris')
 
         self.login_as('mike')
         self.create_new_worksheet()
@@ -80 +84 @@
         self.login_as('chris')
         sel.click("name-mike-0")
         sel.wait_for_page_to_load("30000")