Changeset 203:2337fbf66c30

Timestamp:

09/26/09 18:56:36 (11 months ago)

Author:

rgrp

Branch:

default

convert_revision:

svn:0ead1229-0713-0410-96cd-f668dbfad531/trunk@292

Message:

[misc][s]: change guide to refer to 'new' multi controller and fix up minor typo in test.

Location:

shakespeare

Files:

• templates/guide.html (modified) (2 diffs)
• tests/test_model.py (modified) (1 diff)

shakespeare/templates/guide.html

@@ -16 +16 @@
     </h3>
     <p>
-      The <a href="${h.url_for(controller='text', action='index')}">text index
-        page</a> contains a list of all of the material on the system.
+      The <a href="${h.url_for(controller='work', action='index')}">work index
+        page</a> contains a list of all of the works on the system and their
+      associated 'material' (texts etc).
     </p>
-    <h3>
-      Viewing Works
-    </h3>
-    <p>
-      You can view works by clicking on the link available from the index page.
-      If you know the 'name/id' of a text you can view it directly by visiting the
-      url: ${h.url_for(controller='text', action='view', id='name')} (you can work
-      out id names by looking at the link urls on the index page).
-    </p>
-    
-    <h3>Viewing in different formats</h3>
-    <p>
-      You can view a given text in a different format by setting the format
-      argument in the url query string like so:
-    </p>
-    <pre>
-      ${h.url_for(controller='text', action='view', id='name', format='format_name')}
-    </pre>
-    <p>
-      So to view the text with name id 'hamlet_gut' with line numbers shown you
-      would visit (this link will only work if that text is indeed available on
-      your system!):
-    </p>
-    <blockquote><p>
-      <a href="${h.url_for(controller='text', action='view', id='hamlet_gut', format='lineno')}">
-        ${h.url_for(controller='text', action='view', id='hamlet_gut', format='lineno')}</a>
-    </p></blockquote>
-    <p>
-      Available formats are:
-    </p>
-    <ul>
-      <li>format=plain - plain version of the file (default)</li>
-      <li>format=raw - raw file returned as text/plain</li>
-      <li>format=lineno - text with line numbers added</li>
-    </ul> 
 
     <h3>Multiviews</h3>
@@ -60 +26 @@
       separated by '+'. For example to see the Gutenberg folio and non-folio
       Othello side-by-side you would visit: <a
-        href="${h.url_for(controller='text', action='view', id=None, name='othello_gut_f othello_gut')}">
-        ${h.url_for(controller='text', action='view', id=None, name='othello_gut_f othello_gut')}
+        href="${h.url_for(controller='multi', action='view', id=None, text_1='othello_gut_f', text_2='othello_gut')}">
+        ${h.url_for(controller='multi', action='view', id=None, text_1='othello_gut_f', text_2='othello_gut')}
       </a>
     </p>

shakespeare/tests/test_model.py

@@ -67 +67 @@
         cache = shakespeare.cache.default
         sometext = u'baa baa'
-        path = 'testcache.txt'
+        path = u'testcache.txt'
         cache.save(path, sometext)
         res = model.Resource(locator=path, locator_type=u'cache')