Ticket #6568: sage-trac-6568.4.patch

File sage-trac-6568.4.patch, 2.5 KB (added by timdumol, 13 years ago)

Fixed bug in styling of documentation pages.

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

    # HG changeset patch
    # User Tim Dumol <tim@timdumol.com>
    # Date 1250171422 -28800
    # Node ID 070cb9209b5155e4e043af7b37abd329ca09743e
    # Parent  70c794ffda2dad20d3130911cea8c7a7a4bd1e37
    * Fixed bug in styling of documentation pages
    
    diff -r 70c794ffda2d -r 070cb9209b51 sage/server/notebook/templates/base.html
    a b  
    1111    <body {% block body_attrs %}{% endblock %}>
    1212        {% block body %}{% endblock %}
    1313    </body>
    14 </html>
     14</html>
     15 No newline at end of file
  • sage/server/notebook/templates/notebook/doc.html

    diff -r 70c794ffda2d -r 070cb9209b51 sage/server/notebook/templates/notebook/doc.html
    a b  
    1 
    21{% extends "base.html" %}
    32{#
    43INPUT:
     
    1918   
    2019{% block css %}main{% endblock %}
    2120
     21{% block morecss %}<style type="text/css" rel="stylesheet" href="_static/default.css" media="screen" />{% endblock %}
     22
    2223{% block javascript %}
    2324{{ common_javascript(worksheet, worksheet_filename, username, JSMATH, JSMATH_IMAGE_FONTS, JEDITABLE_TINYMCE, sage_jsmath_macros) }}
    2425{% endblock %}
  • sage/server/notebook/templates/notebook/worksheet_page_template.html

    diff -r 70c794ffda2d -r 070cb9209b51 sage/server/notebook/templates/notebook/worksheet_page_template.html
    a b  
    4343<span class="sharebar">{{ title }}</span>
    4444<br /><br /><br />
    4545{% block body_addition %}{% endblock %}
    46 {% endblock %}
    47 
     46{% endblock %}
     47 No newline at end of file
  • sage/server/notebook/twist.py

    diff -r 70c794ffda2d -r 070cb9209b51 sage/server/notebook/twist.py
    a b  
    191191        s = notebook.html(worksheet_filename = W.filename(),
    192192                          username = self.username)
    193193
    194         #Hack to add in the needed CSS to get it to display nicely
    195         css_tag = lambda path: r'<link rel=stylesheet href="%s" type="text/css">'%path
     194        # FIXME: Hack to add in the needed CSS to get it to display nicely
     195        css_tag = lambda path: r'<link type="text/css" rel="stylesheet" href="%s" media="screen" />'%path
    196196        main_css = css_tag('/css/main.css')
    197197        s = s.replace(main_css,css_tag('_static/default.css')+"\n"+main_css )
    198198