Changeset 181

Show
Ignore:
Timestamp:
08/16/08 19:21:29 (3 months ago)
Author:
rgrp
Message:

[shakespeare/templates][s]: revert ipe's changes to shakespeare templates in r179 which 'Miltonified' them. We need to create Milton templates but we should not do this in the main shakespeare section but in a separate set of milton templates placed in the milton 'package' (whether in in miltondata or milton_package). Exactly how we do this (together with factoring out the shakespeare-specific stuff) is something to discuss further but we should avoid messing with the core shakespeare stuff too much especially when it breaks tests (as this did).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/shakespeare/templates/guide.html

    Revision 179 Revision 181
    1<html xmlns:py="http://genshi.edgewall.org/" 1<html xmlns:py="http://genshi.edgewall.org/" 
    2  xmlns:xi="http://www.w3.org/2001/XInclude"> 2  xmlns:xi="http://www.w3.org/2001/XInclude"> 
    3   3   
    4  <py:def function="page_title">Guide to the Web Interface</py:def> 4  <py:def function="page_title">Guide to the Web Interface</py:def> 
    5 5 
    6  <div py:match="content"> 6  <div py:match="content"> 
    7    <p> 7    <p> 
    8      This page provides a guide to the features of the Open Milton web 8      This page provides a guide to the features of the Open Shakespeare web 
    9      interface. 9      interface. 
    10    </p> 10    </p> 
    11    <h2> 11    <h2> 
    12      The Index 12      The Index 
    13    </h2> 13    </h2> 
    14    <p> 14    <p> 
    15      The <a href="/index/">index page</a> contains a list of all of the 15      The <a href="/index/">index page</a> contains a list of all of the 
    16      material on the system. 16      material on the system. 
    17    </p> 17    </p> 
    18    <h2> 18    <h2> 
    19      Viewing Works 19      Viewing Works 
    20    </h2> 20    </h2> 
    21    <p> 21    <p> 
    22      You can view works by clicking on the link available from the index page. 22      You can view works by clicking on the link available from the index page. 
    23      If you know the 'id' of a text you can view it directly by visiting the 23      If you know the 'id' of a text you can view it directly by visiting the 
    24                        url: /view?name={id} (you can work out id names by looking at the link 24                        url: /view?name={id} (you can work out id names by looking at the link 
    25                        urls on the index page). 25                        urls on the index page). 
    26    </p> 26    </p> 
    27     27     
    28    <h3>Viewing in different formats</h3> 28    <h3>Viewing in different formats</h3> 
    29    <p> 29    <p> 
    30      You can view a given text in a different format by setting the format 30      You can view a given text in a different format by setting the format 
    31      argument in the url query string like so: 31      argument in the url query string like so: 
    32      /view?name={id}&amp;format={format_name} So to view Areopagitica with line 32      /view?name={id}&amp;format={format_name} So to view hamlet with line 
    33      numbers visit: <a 33      numbers visit: <a 
    34        href="/text/view?format=lineno&amp;name=areopagitica_gut">/text/view?format=lineno&amp;name=areopagitica_gut</a> Available formats are: 34        href="/view?name=hamlet_gut&amp;format=lineno">/view?name=hamlet_gut&amp;format=lineno</a> Available formats are: 
    35    </p> 35    </p> 
    36    <ul> 36    <ul> 
    37      <li>format=plain - plain version of the file (default)</li> 37      <li>format=plain - plain version of the file (default)</li> 
    38      <li>format=raw - raw file returned as text/plain</li> 38      <li>format=raw - raw file returned as text/plain</li> 
    39      <li>format=lineno - text with line numbers added</li> 39      <li>format=lineno - text with line numbers added</li> 
    40    </ul>  40    </ul>  
    41 41 
      42    <h3>Multiviews</h3> 
      43    <p> 
      44      You can view mutiple texts at once by concatenating the name-ids 
      45      separated by '+'. For example to see the Gutenberg folio and non-folio 
      46      Othello side-by-side you would visit: <a 
      47        href="/view?name=othello_gut_f+othello_gut">/view?name=othello_gut_f+othello_gut</a> 
      48    </p> 
      49 
    42    <h2> 50    <h2> 
    43      Concordance 51      Concordance 
    44    </h2> 52    </h2> 
    45    <p> 53    <p> 
    46      The <a href="/concordance/">concordance page</a> provides a concordance of 54      The <a href="/concordance/">concordance page</a> provides a concordance of 
    47      Milton's work along with some associated statistics on word 55      Shakespeare's work along with some associated statistics on word 
    48      occurences. 56      occurences. 
    49    </p> 57    </p> 
    50 58 
    51    <h2>Comments</h2> 59    <h2>Comments</h2> 
    52    <p> 60    <p> 
    53      If you wish to comment on this guide (or help improve it!) please visit 61      If you wish to comment on this guide (or help improve it!) please visit 
    54      <a href="http://www.openshakespeare.org/">http://www.openshakespeare.org</a> 62      <a href="http://www.openshakespeare.org/">http://www.openshakespeare.org</a> 
    55    </p> 63    </p> 
    56  </div> 64  </div> 
    57 65 
    58  <xi:include href="layout.html" /> 66  <xi:include href="layout.html" /> 
    59</html> 67</html> 

  • trunk/shakespeare/templates/index.html

    Revision 179 Revision 181
    1<html xmlns:py="http://genshi.edgewall.org/" 1<html xmlns:py="http://genshi.edgewall.org/" 
    2  xmlns:xi="http://www.w3.org/2001/XInclude"> 2  xmlns:xi="http://www.w3.org/2001/XInclude"> 
    3   3   
    4  <py:def function="page_title">Home</py:def> 4  <py:def function="page_title">Home</py:def> 
    5 5 
    6  <div py:match="content"> 6  <div py:match="content"> 
    7    <p>Welcome to the Open Milton web interface. This site provides access 7    <p>Welcome to the Open Shakespeare web interface. This site provides access 
    8    to many, but by no means all, of the facilities of the Open Shakespeare 8    to many, but by no means all, of the facilities of the Open Shakespeare 
    9    <strong>package</strong>. For example you can:</p> 9    <strong>package</strong>. For example you can:</p> 
    10 10 
    11    <ul> 11    <ul> 
    12      <li><a href="${h.url_for(controller='text', action=None)}">Read any of 12      <li><a href="${h.url_for(controller='text', action=None)}">Read any of 
    13        Milton's works</a></li>  13         Shakespeare's plays or poems</a></li> 
       14       <li><a href="${h.url_for(controller='site', action='guide')}">Compare two 
       15         versions of the same text side-by-side</a></li> 
    14      <li><a href="${h.url_for(controller='site', 16      <li><a href="${h.url_for(controller='site', 
    15        action='concordance')}">Browse the concordance</a></li> 17        action='concordance')}">Browse the concordance</a></li> 
    16    </ul> 18    </ul> 
    17 19 
    18    <p>More information on using this web interface can be found in the <a 20    <p>More information on using this web interface can be found in the <a 
    19      href="${h.url_for(controller='site', action='guide')}">guide</a>.</p> 21      href="${h.url_for(controller='site', action='guide')}">guide</a>.</p> 
    20  </div> 22  </div> 
    21 23 
    22  <xi:include href="layout.html" /> 24  <xi:include href="layout.html" /> 
    23</html> 25</html> 

  • trunk/shakespeare/templates/layout.html

    Revision 179 Revision 181
    1<html xmlns="http://www.w3.org/1999/xhtml" 1<html xmlns="http://www.w3.org/1999/xhtml" 
    2  xmlns:py="http://genshi.edgewall.org/"  2  xmlns:py="http://genshi.edgewall.org/"  
    3  xmlns:xi="http://www.w3.org/2001/XInclude"> 3  xmlns:xi="http://www.w3.org/2001/XInclude"> 
    4 4 
    5<head> 5<head> 
    6  <title>Open Milton - ${page_title()}</title> 6  <title>Open Shakespeare - ${page_title()}</title> 
    7 7 
    8  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 8  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
    9  <link rel="stylesheet" href="/css/master.css" type="text/css" media="screen, print" title="Master stylesheet" charset="utf-8" /> 9  <link rel="stylesheet" href="/css/master.css" type="text/css" media="screen, print" title="Master stylesheet" charset="utf-8" /> 
    10  <script type="text/javascript" src="/scripts/prototype.js"></script> 10  <script type="text/javascript" src="/scripts/prototype.js"></script> 
    11  <script type="text/javascript" src="/scripts/behaviour.js"></script> 11  <script type="text/javascript" src="/scripts/behaviour.js"></script> 
    12  <script type="text/javascript" src="/scripts/master.js"></script> 12  <script type="text/javascript" src="/scripts/master.js"></script> 
    13  <style type="text/css"> 13  <style type="text/css"> 
    14    /* remove login info at top-right */ 14    /* remove login info at top-right */ 
    15    #top-bar { display: none; } 15    #top-bar { display: none; } 
    16    /* mess with standard ckan theme to remove second submenu for time being */ 16    /* mess with standard ckan theme to remove second submenu for time being */ 
    17    #subnav { background: transparent; height: 1px; } 17    #subnav { background: transparent; height: 1px; } 
    18    #subnav * { display: none; } 18    #subnav * { display: none; } 
    19  </style> 19  </style> 
    20<!-- 20 
    21  <py:if test="page_specific_css"> 21  <py:if test="page_specific_css"> 
    22    ${page_specific_css()} 22    ${page_specific_css()} 
    23  </py:if>--> 23  </py:if> 
    24</head> 24</head> 
    25 25 
    26<body> 26<body> 
    27<div id="airlock"> 27<div id="airlock"> 
    28  <!--[if IE]> 28  <!--[if IE]> 
    29    <hr class="holder" /> 29    <hr class="holder" /> 
    30  <![endif]--> 30  <![endif]--> 
    31  <div id="top"> 31  <div id="top"> 
    32    <div id="top-inner"> 32    <div id="top-inner"> 
    33      <div id="top-bar"> 33      <div id="top-bar"> 
    34        <topbar> 34        <topbar> 
    35         35         
    36        <py:choose> 36        <py:choose> 
    37        <py:when test="c.user"> 37        <py:when test="c.user"> 
    38        <p> 38        <p> 
    39          Logged in as <strong>${c.user}</strong>  39          Logged in as <strong>${c.user}</strong>  
    40          | <a href="/account/logout/">Logout</a> 40          | <a href="/account/logout/">Logout</a> 
    41        </p> 41        </p> 
    42        </py:when> 42        </py:when> 
    43        <py:otherwise> 43        <py:otherwise> 
    44          <p> 44          <p> 
    45          <a href="/account/">Register</a> or 45          <a href="/account/">Register</a> or 
    46          <a href="/account/login/">Login</a> 46          <a href="/account/login/">Login</a> 
    47          </p> 47          </p> 
    48        </py:otherwise> 48        </py:otherwise> 
    49        </py:choose> 49        </py:choose> 
    50        </topbar> 50        </topbar> 
    51      </div><!-- /top-bar --> 51      </div><!-- /top-bar --> 
    52    <h1><a href="${h.url_for(controller='site', action='home')}" title="Open Shakespeare Home">Open Milton</a></h1> 52    <h1><a href="${h.url_for(controller='site', action='home')}" title="Open Shakespeare Home">Open Shakespeare</a></h1> 
    53     53     
    54    </div><!-- /top-inner --> 54    </div><!-- /top-inner --> 
    55      55      
    56    <h3 class="hidden">Sections:</h3> 56    <h3 class="hidden">Sections:</h3> 
    57    <ul id="navigation"> 57    <ul id="navigation"> 
    58      <li><a href="${h.url_for('/')}">Home</a></li> 58      <li><a href="${h.url_for('/')}">Home</a></li> 
    59      <li><a href="${h.url_for(controller='text', action='index')}">Texts</a></li> 59      <li><a href="${h.url_for(controller='text', action='index')}">Texts</a></li> 
    60      <li><a href="${h.url_for(controller='search', action='index')}">Search</a></li> 60      <li><a href="${h.url_for(controller='search', action='index')}">Search</a></li> 
    61      <li><a href="${h.url_for(controller='site', action='guide')}">Guide</a></li> 61      <li><a href="${h.url_for(controller='site', action='guide')}">Guide</a></li> 
    62    </ul> 62    </ul> 
    63    <h3 class="hidden">In this section:</h3> 63    <h3 class="hidden">In this section:</h3> 
    64    <ul id="subnav"> 64    <ul id="subnav"> 
    65      <minornavigation> 65      <minornavigation> 
    66      <li><a href="${h.url_for(controller='site', action='index')}">Home</a></li> 66      <li><a href="${h.url_for(controller='site', action='index')}">Home</a></li> 
    67      <py:choose> 67      <py:choose> 
    68      <py:when test="c.user"> 68      <py:when test="c.user"> 
    69      <li><a href="/account/logout/">Logout</a></li> 69      <li><a href="/account/logout/">Logout</a></li> 
    70      </py:when> 70      </py:when> 
    71      <py:otherwise> 71      <py:otherwise> 
    72      <li><a href="/account/">Register</a></li> 72      <li><a href="/account/">Register</a></li> 
    73      <li><a href="/account/login/">Login</a></li> 73      <li><a href="/account/login/">Login</a></li> 
    74      </py:otherwise> 74      </py:otherwise> 
    75      </py:choose> 75      </py:choose> 
    76      <li><a href="/package/new/">New Package</a></li> 76      <li><a href="/package/new/">New Package</a></li> 
    77      </minornavigation> 77      </minornavigation> 
    78    </ul> 78    </ul> 
    79        79        
    80    <!--[if IE]> 80    <!--[if IE]> 
    81    <hr class="holder" /> 81    <hr class="holder" /> 
    82    <![endif]--> 82    <![endif]--> 
    83     83     
    84  </div><!-- /top --> 84  </div><!-- /top --> 
    85   85   
    86  <p class="hidden"><a href="#main" title="Skip to page content">[ Skip to main content ]</a></p>  86  <p class="hidden"><a href="#main" title="Skip to page content">[ Skip to main content ]</a></p>  
    87   87   
    88  <div id="primary" class="sidebar"> 88  <div id="primary" class="sidebar"> 
    89    <div class="box"> 89    <div class="box"> 
    90      <h2>Further Assistance</h2> 90      <h2>Further Assistance</h2> 
    91      <p>For information on using Open Milton check out the 91      <p>For information on using Open Shakespeare check out the 
    92      <a href="${h.url_for(action='guide')}">Guide</a>. 92      <a href="${h.url_for(action='guide')}">Guide</a>. 
    93      If you have a question or have found a bug please post to the <a href="http://lists.okfn.org/mailman/listinfo/okfn-help">okfn-help</a> mailing list. 93      If you have a question or have found a bug please post to the <a href="http://lists.okfn.org/mailman/listinfo/okfn-help">okfn-help</a> mailing list. 
    94      </p> 94      </p> 
    95    </div> 95    </div> 
    96    <primarysidebar> 96    <primarysidebar> 
    97    <!-- Primary Side Bar Goes Here --> 97    <!-- Primary Side Bar Goes Here --> 
    98    </primarysidebar> 98    </primarysidebar> 
    99     99     
    100    <!--[if IE]> 100    <!--[if IE]> 
    101    <hr class="primary" /> 101    <hr class="primary" /> 
    102    <![endif]--> 102    <![endif]--> 
    103     103     
    104  </div><!-- /primary --> 104  </div><!-- /primary --> 
    105 105 
    106  <div id="main"> 106  <div id="main"> 
    107    <h2>${page_title()}</h2> 107    <h2>${page_title()}</h2> 
    108    <content> 108    <content> 
    109      <p>Master content template placeholder &hellip; please replace me.</p> 109      <p>Master content template placeholder &hellip; please replace me.</p> 
    110    </content> 110    </content> 
    111     111     
    112    <div id="footer"> 112    <div id="footer"> 
    113      <p> 113      <p> 
    114        <a href="http://validator.w3.org/check/referer" title="Valid XHTML 1.1">XHTML</a> 114        <a href="http://validator.w3.org/check/referer" title="Valid XHTML 1.1">XHTML</a> 
    115        | <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a> 115        | <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a> 
    116        | <a href="http://www.okfn.org/shakespeare/">Project Home Page</a> 116        | <a href="http://www.okfn.org/shakespeare/">Project Home Page</a> 
    117        | <a href="mailto:info@okfn.org">Contact Us</a> 117        | <a href="mailto:info@okfn.org">Contact Us</a> 
    118      </p> 118      </p> 
    119      <p> 119      <p> 
    120        <img style="margin-bottom: -5px;" src="http://m.okfn.org/images/logo/okf_logo_white_and_green_tiny.png" /> An <a href="http://www.okfn.org/">Open Knowledge Foundation</a> Project 120        <img style="margin-bottom: -5px;" src="http://m.okfn.org/images/logo/okf_logo_white_and_green_tiny.png" /> An <a href="http://www.okfn.org/">Open Knowledge Foundation</a> Project 
    121      </p> 121      </p> 
    122      <p> 122      <p> 
    123        (c) Open Knowledge Foundation 123        (c) Open Knowledge Foundation 
    124        | All material available under an <a href="/license/">open license</a> 124        | All material available under an <a href="/license/">open license</a> 
    125        | <a href="http://www.opendefinition.org/1.0/"><img 125        | <a href="http://www.opendefinition.org/1.0/"><img 
    126            style="border: none; margin-bottom: -4px;" 126            style="border: none; margin-bottom: -4px;" 
    127            src="http://m.okfn.org/images/ok_buttons/ok_90x15_blue.png" 127            src="http://m.okfn.org/images/ok_buttons/ok_90x15_blue.png" 
    128            alt="This Content and Data is Open" /></a> 128            alt="This Content and Data is Open" /></a> 
    129      </p> 129      </p> 
    130    </div><!-- /footer --> 130    </div><!-- /footer --> 
    131     131     
    132    <!--[if IE]> 132    <!--[if IE]> 
    133    <hr class="main" /> 133    <hr class="main" /> 
    134    <![endif]--> 134    <![endif]--> 
    135     135     
    136  </div><!-- /main --> 136  </div><!-- /main --> 
    137 137 
    138</div><!-- /airlock --> 138</div><!-- /airlock --> 
    139</body> 139</body> 
    140</html> 140</html> 

  • trunk/shakespeare/templates/search/index.html

    Revision 179 Revision 181
    1<html xmlns:py="http://genshi.edgewall.org/" 1<html xmlns:py="http://genshi.edgewall.org/" 
    2  xmlns:xi="http://www.w3.org/2001/XInclude"> 2  xmlns:xi="http://www.w3.org/2001/XInclude"> 
    3   3   
    4  <py:def function="page_title">Search Milton's Work</py:def> 4  <py:def function="page_title">Search Shakespeare's Work</py:def> 
    5 5 
    6  <div py:match="content"> 6  <div py:match="content"> 
    7    <form name="test" method="GET" action=""> 7    <form name="test" method="GET" action=""> 
    8      <input type="text" name="query" /> 8      <input type="text" name="query" /> 
    9      <input type="submit" name="submit" value="Submit" /> 9      <input type="submit" name="submit" value="Submit" /> 
    10    </form> 10    </form> 
    11 11 
    12    <div class="search-results" py:if="c.matches is not None"> 12    <div class="search-results" py:if="c.matches is not None"> 
    13      <h3>Search Results</h3> 13      <h3>Search Results</h3> 
    14      There were ${c.total} results. 14      There were ${c.total} results. 
    15      <ul> 15      <ul> 
    16        <li py:for="m in c.matches"> 16        <li py:for="m in c.matches"> 
    17        ${m.document.get_data()} 17        ${m.document.get_data()} 
    18        </li> 18        </li> 
    19      </ul> 19      </ul> 
    20    </div> 20    </div> 
    21  </div> 21  </div> 
    22 22 
    23  <xi:include href="../layout.html" /> 23  <xi:include href="../layout.html" /> 
    24</html> 24</html> 

  • trunk/shakespeare/templates/text/index.html

    Revision 179 Revision 181
    1<html xmlns:py="http://genshi.edgewall.org/" 1<html xmlns:py="http://genshi.edgewall.org/" 
    2  xmlns:xi="http://www.w3.org/2001/XInclude"> 2  xmlns:xi="http://www.w3.org/2001/XInclude"> 
    3   3   
    4  <py:def function="page_title">Milton's Works</py:def> 4  <py:def function="page_title">Shakespeare's Works</py:def> 
    5 5 
    6  <div py:match="content"> 6  <div py:match="content"> 
    7    <table border="1"> 7    <table border="1"> 
    8    <thead> 8    <thead> 
    9      <tr> 9      <tr> 
    10        <th> 10        <th> 
    11          Title 11          Title 
    12        </th> 12        </th> 
    13        <th>Author</th> 13        <th>Author</th> 
    14        <th>Comments</th> 14        <th>Comments</th> 
    15      </tr> 15      </tr> 
    16    </thead> 16    </thead> 
    17    <tbody> 17    <tbody> 
    18      <tr py:for="item in c.works_index"> 18      <tr py:for="item in c.works_index"> 
    19        <td> 19        <td> 
    20          <a href="${h.url_for(controller='text', action='view', 20          <a href="${h.url_for(controller='text', action='view', 
    21            name=item.name, format='lineno')}"> 21            name=item.name, format='lineno')}"> 
    22            ${item.title}</a> 22            ${item.title}</a> 
    23        </td> 23        </td> 
    24        <td> 24        <td> 
    25          ${item.creator} 25          ${item.creator} 
    26        </td> 26        </td> 
    27        <td py:content="item.notes"></td> 27        <td py:content="item.notes"></td> 
    28      </tr> 28      </tr> 
    29    </tbody> 29    </tbody> 
    30    </table> 30    </table> 
    31  </div> 31  </div> 
    32 32 
    33  <xi:include href="../layout.html" /> 33  <xi:include href="../layout.html" /> 
    34</html> 34</html>