Changeset 41:f1b317847f5b

Show
Ignore:
Timestamp:
08/24/08 11:57:34 (3 months ago)
Author:
Jeffrey Gelens
Parents:
40:d9dcd0379538 (diff), 38:5386a7c8c14d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Branch:
default
Message:

Merge

Files:
6 modified

Legend:

Unmodified
Added
Removed

  • settings.py

    r38 r41  
    2020    'django.middleware.gzip.GZipMiddleware', 
    2121    'django.contrib.csrf.middleware.CsrfMiddleware', 
    22     'gelens_org.utils.middleware.http.XhtmlMortifierMiddleware', 
     22#    'gelens_org.utils.middleware.http.XhtmlMortifierMiddleware', 
    2323    'django.contrib.sessions.middleware.SessionMiddleware', 
    2424    'django.contrib.auth.middleware.AuthenticationMiddleware', 

  • settings.py

    r40 r41  
    44USE_I18N = False 
    55USE_ETAGS = True 
    6 DEFAULT_CONTENT_TYPE="application/xhtml+xml" 
     6#DEFAULT_CONTENT_TYPE="application/xhtml+xml" 
    77DJANGO_ROOT = os.path.abspath(os.path.dirname(__file__)) 
    88 

  • templates/base.html

    r38 r41  
    5555      unless otherwise noted.<br />Powered by 
    5656      <a href="http://www.djangoproject.com">Django</a> and  
    57       <a href="https://manage.slicehost.com/customers/new?referrer=105926733">SliceHost</a>. 
     57      <a href="http://www.linode.com/?r=9e07717ba17b7283ecc8d000a8b0737b17c64a3f">Linode</a>. 
    5858    </p> 
    5959  </div> 

  • templates/base.html

    r39 r41  
    2626    <div id="logo"> 
    2727      <a href="/" title="Back to homepage"> 
    28         <img src="/static/images/logo.png" alt="Back to main page" /> 
     28        <img src="/static/images/logo_corner.png" alt="Back to main page" /> 
    2929      </a> 
    3030    </div> 

  • templates/blog_base.html

    r38 r41  
    3737        <a href="http://www.python.org">Python</a> 2.5.2 and served by 
    3838        <a href="http://httpd.apache.org">Apache</a> 2.2.8 with 
    39         <a href="http://code.google.com/p/modwsgi/">mod_wsgi</a> 2.0c4, proxied by  
     39        <a href="http://code.google.com/p/modwsgi/">mod_wsgi</a> 2.1, proxied by  
    4040        <a href="http://www.nginx.net/">Nginx</a> 0.6.31. The database is 
    4141        <a href="http://www.postgresql.org">PostgreSQL</a> 8.3.3. All of this is running on the latest 
    42         <a href="http://www.archlinux.org">ArchLinux</a> on a 265MB 
    43         <a href="https://manage.slicehost.com/customers/new?referrer=105926733">Slicehost VPS</a>. 
     42        <a href="http://www.archlinux.org">Arch Linux</a> on a 360MB 
     43        <a href="http://www.linode.com/?r=9e07717ba17b7283ecc8d000a8b0737b17c64a3f">Linode Xen VPS</a>. 
    4444      </p> 
    4545    </div> 

  • templates/blog_base.html

    r39 r41  
    2222      {% latest_comments %} 
    2323 
     24      <h2>Articles</h2> 
     25      {% show_links "A" %} 
     26 
    2427      <h2>Links</h2> 
    2528      {% show_links "G" %}