Ticket #3950: trac_3950-folded.patch

a/sage/server/notebook/notebook.py

@@ -94 +94 @@
-        # This must happen after twist.notebook is set. 
-        self.save()
-
-        
-    def _migrate_worksheets(self):
-        v = []
-        for key, W in self.__worksheets.iteritems():
@@ -1260 +1259 @@
-        s += '\n</body>\n'
-        return s
-
+    
-
-
-
+
-        W = [x for x in self.__worksheets.itervalues() if x.is_published() and not x.is_trashed(user)]
-
-        if search:
-            W = [x for x in W if x.satisfies_search(search)]
-
-        sort_worksheet_list(W, sort, reverse)  # changed W in place
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
-        X = self.get_worksheets_with_viewer(user)
-        if typ == "trash":
-            worksheet_heading = "Trash"
-            W = [x for x in X if x.is_trashed(user)]
-        elif typ == "active":
-            worksheet_heading = "Active Worksheets"
-            W = [x for x in X if x.is_active(user)]
-        else: # typ must be archived or "all"
-            worksheet_heading = "Archived and Active"
-            W = [x for x in X if not x.is_trashed(user)]
-        if search:
-            W = [x for x in W if x.satisfies_search(search)]
-
-        sort_worksheet_list(W, sort, reverse)  # changed W in place
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    def html_topbar(self, user, pub=False):
-        s = ''
@@ -1336 +1292 @@
-        else:
-            entries.append(('/home/%s'%user, 'Home', 'Back to your personal worksheet list'))
-            entries.append(('/pub', 'Published', 'Browse the published worksheets'))
-            #entries.append(('/settings', 'Settings', 'Change user settings'))   # TODO -- settings
-            entries.append(('help()', 'Help', 'Documentation'))
-
-        ## TODO -- settings
@@ -1398 +1353 @@
-        """%ver
-        return s
-
-    def html_search(self, search, typ):
-        s = """
-        <span class="flush-right">
-        <input id="search_worksheets" size=20 onkeypress="return search_worksheets_enter_pressed(event, '%s');" value="%s"></input>
-        <button class="add_new_worksheet_menu" onClick="search_worksheets('%s');">Search Worksheets</button>
-        &nbsp;&nbsp;&nbsp;
-        </span>
-        """%(typ, '' if search is None else search.replace('"',"'"), typ)
-        return s
-
-    def html_new_or_upload(self):
-        s = """
-        <a class="boldusercontrol" href="/new_worksheet">New Worksheet</a>\n
-        <a class="boldusercontrol" href="/upload">Upload</a>\n
-        """
-        return s
-
-    def html_worksheet_actions(self, user, typ):
-##
-##          <option onClick="save_worksheets('sws');" title="Save the selected worksheets to disk">Save ...</option>
-##          <option onClick="save_worksheets('html');" title="Save the selected worksheets as a single HTML web page">Save as HTML (zipped) ... </option>
-##          <option onClick="save_worksheets('latex');" title="Save the selected worksheets as a single LaTeX document">Save as LaTeX (zipped) ... </option>
-##          <option onClick="save_worksheets('pdf');" title="Save the selected worksheets as a single PDF document">Save as PDF...</option>
-##          <option onClick="save_worksheets('txt');" title="Save the selected worksheets to a single text file">Save as Text...</option>
-##         s = """
-##          <select class="worksheet_list">
-##          <option onClick="archive_button();" title="Archive selected worksheets so they do not appear in the default worksheet list">Archive</option>
-##          <option onClick="make_active_button();" title="Unarchive this worksheet so it appears in the default worksheet list">Unarchive</option>
-##          <option onClick="uncollaborate_me();" title="Remove myself from collaboration or viewing of this worksheet">Un-collaborate me</option>                           
-##         </select>
-##         """
-        s = ''
-        
-        if not self.user_is_guest(user):
@@ -1457 +1383 @@
-            s += '</span>'
-        return s
-        
-
-    def html_worksheet_list(self, worksheets, user, worksheet_heading, sort, reverse, typ, pub=False):
-        s = ''
-
-        s = '<br><br>'
-        s += '<table width="100%" border=0 cellspacing=0 cellpadding=0>'
-        s += '<tr class="greybox"><td colspan=4><div class="thinspace"></div></td></tr>'
-        s += '<tr  class="greybox">'
-
-        if not pub:
-            s += '<td>&nbsp;<input id="controlbox" onClick="set_worksheet_list_checks();" class="entry" type=checkbox></td>'
-        else:
-            s += '<td>&nbsp;&nbsp;<a class="listcontrol" href=".?sort=rating">Rating</a></td>'
-            worksheet_heading = "Published Worksheets"
-
-        s += '<td><a class="listcontrol" href=".?typ=%s&sort=name%s">%s</a> </td>'%(typ,
-            '' if sort != 'name' or reverse else '&reverse=True', worksheet_heading)
-        s += '<td><a class="listcontrol" href=".?typ=%s&sort=owner%s">Owner%s</a> </td>'%(typ,
-            '' if sort != 'owner' or reverse else '&reverse=True',
-            '' if pub else ' / Collaborators')
-        s += '<td><a class="listcontrol" href=".?typ=%s&%s">Last Edited</a> </td>'%(typ,
-            '' if sort != 'last_edited' or reverse else 'reverse=True')
-        s += '</tr>'
-        s += '<tr class="greybox"><td colspan=4><div class="thinspace"></div></td></tr>'        
-
-        v = []
-        for w in worksheets:
-            k = '<tr>'
-            k += '<td class="entry">%s</td>'%self.html_check_col(w, user, pub)
-            name = self.html_worksheet_link(w, pub)
-            if w.compute_process_has_been_started():
-                name = '(running) %s'%name
-            if w.is_active(user):
-                k += '<td class="worksheet_link">%s</td>'%name
-            else:
-                k += '<td class="archived_worksheet_link">%s</td>'%name
-            k += '<td class="owner_collab">%s</td>'%self.html_owner_collab_view(w, user, typ)
-            k += '<td class="last_edited">%s</td>'%w.html_time_since_last_edited()
-            k += '</tr>'
-            k += '<tr class="thingreybox"><td colspan=4><div class="ultrathinspace"></div></td></tr>'        
-            v.append(k)
-
-        s += ''.join(v)
-        if not v and typ != 'trash' and not pub:
-            s += """<tr><td colspan="5" style="padding:20px;text-align:center">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>.</td></tr>"""
-        s += '</table>'
-
-        return s
-
-    def html_check_col(self, worksheet, user, pub):
-        def doc_options(name):
-            if pub:
-                rating = worksheet.rating()
-                if rating == -1:
-                    r = "----"
-                else:
-                    r = "%.1f"%rating
-                if not self.user_is_guest(user) and not worksheet.is_rater(user):
-                    r = '<i>%s</i>'%r
-                if r != '----':
-                    r = '<a class="worksheet_edit" href="/home/%s/rating_info">%s</a>'%(name,r)                    
-                return r
-                
-            return """
-            <select onchange="go_option(this);" class="worksheet_edit">
-            <option value="" title="File options" selected>File</option>
-            <option value="list_rename_worksheet('%s','%s');" title="Change the name of this worksheet.">Rename...</option>            
-            <option value="list_edit_worksheet('%s');" title="Open this worksheet and edit it">Edit</option>
-            <option value="list_copy_worksheet('%s');" title="Copy this worksheet">Copy Worksheet</option>
-            <option value="list_share_worksheet('%s');" title="Share this worksheet with others">Collaborate</option>
-            <option value="list_publish_worksheet('%s');" title="Publish this worksheet on the internet">Publish</option>
-            <option value="list_revisions_of_worksheet('%s');" title="See all revisions of this worksheet">Revisions</option>
-            </select>
-            """%(name, worksheet.name(), name, name,name,name,name)
-        
-        k = ''
-        if not pub:
-            k += '<input type=checkbox unchecked id="%s">'%worksheet.filename()
-        k += '&nbsp;'*4
-        k += doc_options(worksheet.filename())
-        k += '&nbsp;'*4
-        return k
-
-    def html_worksheet_link(self, worksheet, pub):
-        name = worksheet.truncated_name(35)
-        if not pub and worksheet.is_published():
-            name += ' (published)'
-        return '<a title="%s" id="name/%s" class="worksheetname" href="/home/%s">%s</a>\n'%(
-            worksheet.name(), worksheet.filename(), worksheet.filename(), name)
-
-    def html_owner_collab_view(self, worksheet, user, typ):
-        v = []
-        
-        owner = worksheet.owner()
-        pub = False
-        if owner == 'pub':
-            pub = True
-            owner = worksheet.worksheet_that_was_published().owner()
-
-        v.append(owner)
-            
-        collab = [x for x in worksheet.collaborators() if not x == owner]
-        share = ''
-
-        if not pub and typ != 'trash' or self.user(user).is_admin():
-            if len(collab) == 0:
-                share = '<a class="share" href="/home/%s/share">Share now</a>'%(worksheet.filename())
-            else:
-                collaborators = ', '.join([x for x in collab])
-                if len(collaborators) > 21:
-                    collaborators = collaborators[:21] + '...'
-                v.append(collaborators)
-                share = '<a class="share" href="/home/%s/share">Add or Delete</a>'%(worksheet.filename())
-        if not (self.user(user).is_admin() or owner == user):
-            share = ''
-            
-        if worksheet.has_published_version():
-            pub_ver = worksheet.published_version().filename()
-            share += ' <a href="/home/%s">(published)'%pub_ver
-
-        viewers = worksheet.viewers()
-        if len(viewers) > 0:
-            viewers = '<i>' + ', '.join(viewers) + '</i>'
-            v.append(viewers)
-
-        s = ' / '.join([str(w) for w in v]) + ' ' + share
-
-        return s
-
-        
-    ##########################################################
-    # Revision history for a worksheet
@@ -2612 +2408 @@
-def sort_worksheet_list(v, sort, reverse):
-    """
-    INPUT:
-
+'rating', 
-        reverse -- if True, reverse the order of the sort.
-    """
-    f = None
@@ -2635 +2431 @@
-    else:
-        raise ValueError, "invalid sort key '%s'"%sort
-    v.sort(cmp = f, reverse=reverse)
-
-
-

a/sage/server/notebook/template.py

@@ -1 @@
-"""nodoctest
-"""
+HTML templating for the notebook
-
+AUTHORS:
+    -- Bobby Moretti (2007-07-18): initial version
+    -- Timothy Clemans and Mike Hansen (2008-10-27): major update
+
+"""
-#############################################################################
-#       Copyright (C) 2007 William Stein <wstein@gmail.com>
-#  Distributed under the terms of the GNU General Public License (GPL)
-#  The full text of the GPL is available at:
-#                  http://www.gnu.org/licenses/
-#############################################################################
+import jinja
+import sage.misc.misc
+from sage.version import version
-
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

/dev/null

@@ +1 @@
+<div class="banner">
+  <table width="100%%">
+    <tr>
+      <td>
+        <a class="banner" href="http://www.sagemath.org">
+        <img align="top" src="/images/sagelogo.png" alt="Sage">Notebook</a>
+      </td>
+      <td>
+        <span class="ping" id="ping">Searching for Sage server...</span>
+      </td>
+    </tr>
+    <tr>
+      <td style="font-size:xx-small; text-indent:13px;color:black">Version {{ sage_version }}</td>
+      <td></td>
+    </tr>
+  </table>
+</div>

a/sage/server/notebook/templates/base.html

@@ -1 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html lang="en">
-<head>
-
-
+
+
+
-</head>
-<body>
-    {% block body %}{% endblock %}

/dev/null

@@ +1 @@
+{% include 'top_bar.html' %}
+
+<a class="boldusercontrol" href="/new_worksheet">New Worksheet</a>
+<a class="boldusercontrol" href="/upload">Upload</a>
+
+{% include 'search.html' %}
+
+<br>
+<hr class="usercontrol">
+
+
+{% if typ == 'archive' %}
+<button onClick="make_active_button();" title="Unarchive selected worksheets so it appears in the default worksheet list">Unarchive</button>
+{% else %}
+<button onClick="archive_button();" title="Archive selected worksheets so they do not appear in the default worksheet list">Archive</button>
+{% endif %}
+
+
+{% if typ != 'trash' %}
+<button onClick="delete_button();" title="Move the selected worksheets to the trash">Delete</button>
+{% else %}
+<button onClick="make_active_button();" title="Move the selected worksheets out of the trash">Undelete</button>
+{% endif %}
+                        
+<button onClick="stop_worksheets_button();" title="Stop selected worksheets">Stop</button>
+
+<span style="padding-left:100px;">
+    Current Folder:
+    <a class="{{ 'bold' if typ == 'active' else '' }}usercontrol" href=".">Active</a>
+    <a class="{{ 'bold' if typ == 'archive' else '' }}usercontrol" href=".?typ=archive">Archived</a>
+    <a class="{{ 'bold' if typ == 'trash' else '' }}usercontrol" href=".?typ=trash">Trash</a>
+
+    {% if typ == 'trash' %}
+      <a class="boldusercontrol" onClick="empty_trash();return false;" href="">(Empty Trash)</a>
+    {% endif %}
+</span>

/dev/null

@@ +1 @@
+{% include 'top_bar.html' %}
+
+{% include 'search.html' %}
+
+<br>
+<hr class="usercontrol">

/dev/null

@@ +1 @@
+<span class="flush-right">
+<input id="search_worksheets" size=20 onkeypress="return search_worksheets_enter_pressed(event, '{{ typ }}');" value="{{ search }}"></input>
+<button class="add_new_worksheet_menu" onClick="search_worksheets('{{ typ }}');">Search Worksheets</button>
+</span>

/dev/null

@@ +1 @@
+<table width="100%%">
+  <tr>
+    <td>
+      {% include 'banner.html' %}
+    </td>
+    <td align=right>
+      <span class="username">{{ username }}</span>
+
+      {% if username == 'guest' %}
+        <span class="vbar"></span><a title="Please log in to the Sage notebook" class="usercontrol" href="/">Log in</a>
+      {% else %}
+        <span class="vbar"></span><a title="Back to your personal worksheet list" class="usercontrol" href="/home/{{ username }}">Home</a>
+        {% if pub %}
+          <span class="vbar"></span><span class="usercontrol">Published</span>
+        {% else %}
+          <span class="vbar"></span><a title="Browse the published worksheets" class="usercontrol" href="/pub">Published</a>
+          <span class="vbar"></span><a title="View a log of recent computations" class="usercontrol" onClick="history_window()">Log</a>
+        {% endif %}
+
+        <span class="vbar"></span><a title="Documentation" class="usercontrol" onClick="help()">Help</a>
+        <span class="vbar"></span><a title="Change account settings including password" class="usercontrol" href="/settings">Settings</a>
+        <span class="vbar"></span><a title="Log out of the Sage notebook" class="usercontrol" href="/logout">Sign out</a>
+      {% endif %}
+    </td>
+  </tr>
+</table>
+<hr class="usercontrol">

/dev/null

@@ +1 @@
+{% extends "base.html" %}
+
+{% if pub %}
+  {% set worksheet_heading='Published Worksheets' %}
+{% elif typ == 'trash' %}
+  {% set worksheet_heading='Deleted Worksheets' %}
+{% elif typ == 'active' %}
+  {% set worksheet_heading='Active Worksheets' %}
+{% else %}
+  {% set worksheet_heading='Archived and Active Worksheets' %}
+{% endif %}  
+
+
+{% block title %}
+{{ worksheet_heading }}
+{% endblock %}
+
+{% block css %}main{% endblock %}
+
+{% block javascript %}
+  <script type="text/javascript" src="/javascript/main.js"></script>
+  {% if not pub %}
+    <script type="text/javascript">
+    var worksheet_filenames = {{ worksheet_filenames }}; 
+    </script>
+  {% endif %}
+{% endblock %}
+
+{% block body %}
+
+{% if pub %}
+  {% include "list_top_public.html" %}
+{% else %}
+  {% include "list_top.html" %}
+{% endif %}
+
+<br><br>
+
+<table width="100%" border=0 cellspacing=0 cellpadding=0>
+  <tr class="greybox"><td colspan=4><div class="thinspace"></div></td></tr>
+  <tr class="greybox">
+    {% if not pub %}
+    <td><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 }}&{{ '' if sort != 'last_edited' or reverse else 'reverse=True' }}">
+      Last Edited
+      </a>
+    </td>
+  </tr>
+
+  <tr class="greybox"><td colspan=4><div class="thinspace"></div></td></tr>
+
+  {% if not worksheets %}
+    {% if pub %}
+    <tr>
+      <td colspan="5" style="padding:20px;text-align:center">
+        There are no published worksheets.
+      </td>
+    </tr>
+    {% elif typ == 'active' %}
+    <tr>
+      <td colspan="5" style="padding:20px;text-align:center">
+        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>.
+      </td>
+    </tr>
+    {% endif %}
+  {% else %}
+
+    {% for worksheet in worksheets %}
+    {% set name = worksheet.filename() %}
+    <tr>
+      <td class="entry">
+        {% if pub %}
+        
+        <a class="worksheet_edit" href="/home/{{ name }}/rating_info">
+        {% if worksheet.rating() < 0 %}
+        ----
+        {% else %}
+        {{ worksheet.rating() }}
+        {% endif %}
+        </a>
+        
+        {% else %}
+        
+        <input type=checkbox unchecked id="{{ name }}">
+        <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>
+
+      {% if worksheet.is_active(username) %}
+      <td class="worksheet_link">
+      {% else %}
+      <td class="archived_worksheet_link">
+      {% endif %}
+        <a title="{{ worksheet_name }}" id="name/{{ name }}" class="worksheetname" href="/home/{{ name }}">
+        {% if worksheet.compute_process_has_been_started() %}(running) {% endif %}
+        {{ worksheet.truncated_name(35) }}
+        </a>
+        
+        {% if not pub and worksheet.is_published() %}(Published){% endif %}
+      </td>
+      <td class="owner_collab">
+        {{ worksheet.owner() }}
+        
+        {% if not pub and typ != 'trash' %}
+
+        {% set shared = False %}
+
+        {% 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.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>
+    
+    <tr class="thingreybox"><td colspan=4><div class="ultrathinspace"></div></td></tr>
+    {% endfor %}
+  {% endif %}
+  </table>
+{% endblock %}

a/sage/server/notebook/twist.py

@@ -31 +31 @@
-############################################################
-
-import os, shutil, time
-
+
-import bz2
-
-from twisted.web2 import server, http, resource, channel
@@ -41 +41 @@
-
-import notebook as _notebook
-
-import sage.server.notebook.template as
+from sage.server.notebook.template import
-
-HISTORY_MAX_OUTPUT = 92*5
-HISTORY_NCOLS = 90
@@ -118 +118 @@
-# An error message
-############################
-def message(msg, cont=None):
-
+
+
-
-############################
-# Create a Sage worksheet from a latex2html'd file
@@ -930 +931 @@
-        if template_dict['email']:
-            template_dict['email_address'] = 'None' if not notebook.user(self.username)._User__email else notebook.user(self.username)._User__email
-            template_dict['email_confirmed'] = 'Not confirmed' if not notebook.user(self.username).is_email_confirmed() else 'Confirmed'
-.account_settings(
+('account_settings.html', 
-
-########################################################
-# Set output type of a cell
@@ -1164 +1165 @@
-class Worksheet_rating_info(WorksheetResource, resource.Resource):
-    def render(self, ctx):
-        s = self.worksheet.html_ratings_info()
-"""
+'''
-        <h2 align=center>Ratings for %s</h2>
-        <h3 align=center><a href='/home/%s'>Go to the worksheet.</a>
-        <br><br>
@@ -1173 +1174 @@
-        %s
-        </table>
-        <br><br>
-"""
+'''
-        
-    
-class Worksheet_rate(WorksheetResource, resource.Resource):
@@ -1307 +1308 @@
-                    return static.File(h)
-            return NotImplementedWorksheetOp(op, self.worksheet)
-
+    
-def render_worksheet_list(args, pub, username):
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    else:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-class WorksheetsByUser(resource.Resource):
@@ -1712 +1719 @@
-            user.set_email_confirmation(True)
-        except KeyError:
-            return http.Response(stream=message(invalid_confirm_key, '/register'))
-Hello, %s. Thank you for registering!
+Email address confirmed for user %s
-        del waiting[key]
-        return http.Response(stream=message(success)) 
-
@@ -1888 +1895 @@
-                    missing[i] = True
-            
-            if set(missing) == set([True]):
-.registration(
+('registration.html', 
-            elif set(missing) == set([False]):
-                for i, box in enumerate(input_boxes):
-                    filled_in[box] = request.args[box][0]
@@ -1914 +1921 @@
-        
-        if template_dict and set(template_dict) != set(['email']):
-            errors_found()
-.registration(
+('registration.html', 
-        else:
-            try:
-                e = filled_in['email'] if notebook.conf()['email'] else ''
@@ -1923 +1930 @@
-            except ValueError:
-                template_dict['username_taken'] = True
-                errors_found()
-.registration(
+('registration.html', 
-            
-            if notebook.conf()['email']:
-                destaddr = filled_in['email']
@@ -1944 +1951 @@
-                except ValueError:
-                    pass
-            
-
-
-
+
+
+
+
+
-    
-class ForgotPassPage(resource.Resource):
-        
@@ -1992 +2001 @@
-            
-            return http.Response(stream=message("A new password has been sent to your e-mail address.", '/'))
-        else:
-.account_recovery(
+('account_recovery.html'
-        return http.Response(stream=s)
-
-class ListOfUsers(resource.Resource):
@@ -2003 +2012 @@
-            if user_type(self.username) != 'admin':
-                s = message('You must an admin to manage other users.')
-            else:
-.user_management(users=notebook.valid_login_names()
+('user_management.html', {'users':notebook.valid_login_names()}
-            return http.Response(stream = s)
-
-class InvalidPage(resource.Resource):
@@ -2043 +2052 @@
-        self.username = username if username else 'guest'
-
-    def render(self, ctx):
-
-
+
+
+
+
+
-    def userchildFactory(self, request, name):
-        return InvalidPage(msg = "unauthorized request", username = self.username)
-
@@ -2055 +2067 @@
-
-class LoginResourceClass(resource.Resource):
-    def render(self, ctx):
-
+
+
+
+
-    
-    def childFactory(self, request, name):
-        return LoginResource
@@ -2090 +2105 @@
-    #child_login = LoginResource
-    
-    def render(self, ctx):
-
+
+
+
+
-        response.headers.setHeader("set-cookie", [http_headers.Cookie('cookie_test', 'cookie_test')])
-        return response
-
@@ -2105 +2123 @@
-        # worksheets and ratings, this gives no new information way.
-        # If published pages were disabled, then this should be disabled too.
-        if self.problem == 'username':
-
+
+
+
+
+
-        elif self.problem == 'password':
-
+
+
+
+
+
-        else:
-            return http.Response(stream = message("Please enable cookies and try again."))
-

a/sage/server/notebook/worksheet.py

@@ -387 +387 @@
-            return self.__collaborators
-        except AttributeError:
-            self.__collaborators = []
-
+
+
+
+
+
+
+
+
+
+
+
+
+