mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
IGN:Planet now deployed at planet.calibre-ebook.com
This commit is contained in:
parent
5ba21804da
commit
b094f3bbb9
@ -4,10 +4,10 @@ from calibre.www.settings import DEBUG, TEMPLATE_DEBUG, ADMINS, MANAGERS, \
|
|||||||
TEMPLATE_LOADERS, TEMPLATE_DIRS, MIDDLEWARE_CLASSES, MEDIA_ROOT, \
|
TEMPLATE_LOADERS, TEMPLATE_DIRS, MIDDLEWARE_CLASSES, MEDIA_ROOT, \
|
||||||
MEDIA_URL, ADMIN_MEDIA_PREFIX
|
MEDIA_URL, ADMIN_MEDIA_PREFIX
|
||||||
|
|
||||||
DATABASE_USER = '' # Not used with sqlite3.
|
if not DEBUG:
|
||||||
DATABASE_PASSWORD = '' # Not used with sqlite3.
|
MEDIA_URL = 'http://planet.calibre-ebook.com/site_media/'
|
||||||
DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3.
|
ADMIN_MEDIA_PREFIX = 'http://planet.calibre-ebook.com/admin_media/'
|
||||||
DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.
|
MEDIA_ROOT = '/usr/local/calibre/src/calibre/www/static/'
|
||||||
|
|
||||||
|
|
||||||
if DEBUG:
|
if DEBUG:
|
||||||
@ -28,7 +28,7 @@ else:
|
|||||||
SECRET_KEY = open('/var/www/planet.calibre-ebook.com/django_secret_key').read().strip()
|
SECRET_KEY = open('/var/www/planet.calibre-ebook.com/django_secret_key').read().strip()
|
||||||
|
|
||||||
|
|
||||||
ROOT_URLCONF = 'planet.urls'
|
ROOT_URLCONF = 'calibre.www.planet.urls'
|
||||||
|
|
||||||
INSTALLED_APPS = (
|
INSTALLED_APPS = (
|
||||||
'django.contrib.auth',
|
'django.contrib.auth',
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
from django.conf.urls.defaults import patterns, include
|
from django.conf.urls.defaults import patterns, include, handler404, handler500
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
|
||||||
# Uncomment the next two lines to enable the admin:
|
# Uncomment the next two lines to enable the admin:
|
||||||
@ -7,7 +7,6 @@ admin.autodiscover()
|
|||||||
|
|
||||||
urlpatterns = patterns('',
|
urlpatterns = patterns('',
|
||||||
|
|
||||||
#(r'^admin/', include('django.contrib.admin.urls')),
|
|
||||||
(r'^admin/(.*)', admin.site.root),
|
(r'^admin/(.*)', admin.site.root),
|
||||||
|
|
||||||
|
|
||||||
|
@ -72,6 +72,7 @@ if DEBUG:
|
|||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
TEMPLATE_DIRS = (
|
TEMPLATE_DIRS = (
|
||||||
|
'/usr/local/calibre/src/calibre/www/templates',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
12
src/calibre/www/templates/404.html
Normal file
12
src/calibre/www/templates/404.html
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
{% extends "base.html" %}
|
||||||
|
|
||||||
|
{% block title %}Page not found{% endblock %}
|
||||||
|
|
||||||
|
{% block header_text %}Page not found{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
|
||||||
|
<p>Sorry, but the requested page could not be found.</p>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block footer_text %} {% endblock %}
|
16
src/calibre/www/templates/500.html
Normal file
16
src/calibre/www/templates/500.html
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
|
||||||
|
"http://www.w3.org/TR/html4/strict.dtd">
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<title>Page unavailable</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<h1>Page unavailable</h1>
|
||||||
|
|
||||||
|
<p>Sorry, but the requested page is unavailable due to a
|
||||||
|
server hiccup.</p>
|
||||||
|
|
||||||
|
<p>Our engineers have been notified, so check back later.</p>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
@ -23,10 +23,12 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="_footer">
|
<div id="_footer">
|
||||||
|
{% block footer_text %}
|
||||||
Created by Kovid Goyal.
|
Created by Kovid Goyal.
|
||||||
Powered by <a href="http://www.djangoproject.com">
|
Powered by <a href="http://www.djangoproject.com">
|
||||||
<img alt="Django" src="{{ media_url }}/img/button-django.png"/>
|
<img alt="Django" src="{{ media_url }}/img/button-django.png"/>
|
||||||
</a>
|
</a>
|
||||||
|
{% endblock %}
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user