diff --git a/item/models.py b/item/models.py
index 6858b9c..237d54a 100644
--- a/item/models.py
+++ b/item/models.py
@@ -11,6 +11,7 @@ from django.db import models
from django.core.files.base import ContentFile
from django.db.models.signals import pre_delete
from django.contrib.auth.models import User, Group
+from django.conf import settings
import ox
from ox.django import fields
@@ -51,13 +52,13 @@ class Item(models.Model):
return ox.format_bytes(size)
def get_absolute_url(self):
- return '/%s' % self.slug
+ return '%s/%s' % (settings.PREFIX, self.slug)
def get_absolute_pdf_url(self):
filename = self.filename
if not filename.endswith('.pdf'):
filename += '.pdf'
- return '/%s/%s' % (self.slug, quote(filename))
+ return '%s/%s' % (self.get_absolute_url(), quote(filename))
def path(self, filename):
if len(filename) > 1024:
diff --git a/item/views.py b/item/views.py
index 478f065..33352eb 100644
--- a/item/views.py
+++ b/item/views.py
@@ -11,6 +11,7 @@ from django.http import HttpResponse, HttpResponseRedirect, HttpResponseNotFound
from django.views.decorators.http import condition
from django import forms
from django.db.models import F
+from django.conf import settings
from ox.django.http import HttpFileResponse
from ox.django.shortcuts import render_to_json_response, json_response
@@ -85,7 +86,8 @@ def add(request):
def index(request):
context = RequestContext(request, {
- 'anonymous': request.user.is_anonymous()
+ 'PREFIX': settings.PREFIX,
+ 'anonymous': request.user.is_anonymous(),
})
return render_to_response('index.html', context)
@@ -93,6 +95,7 @@ def item(request, slug):
item = get_object_or_404(models.Item, slug=slug)
editable = item.editable(request.user)
context = RequestContext(request, {
+ 'PREFIX': settings.PREFIX,
'item': item,
'editable': json.dumps(editable)
})
diff --git a/static/viewer.js b/static/viewer.js
index 292f463..d232a3b 100644
--- a/static/viewer.js
+++ b/static/viewer.js
@@ -27,7 +27,7 @@ var SCROLLBAR_PADDING = 40;
var VERTICAL_PADDING = 5;
var MIN_SCALE = 0.25;
var MAX_SCALE = 4.0;
-var IMAGE_DIR = '/static/images/';
+var IMAGE_DIR = PREFIX + '/static/images/';
var SETTINGS_MEMORY = 20;
var ANNOT_MIN_SIZE = 10;
var RenderingStates = {
@@ -43,7 +43,7 @@ var FindStates = {
FIND_PENDING: 3
};
-PDFJS.workerSrc = '/static/pdf.js';
+PDFJS.workerSrc = PREFIX + '/static/pdf.js';
var mozL10n = document.mozL10n || document.webL10n;
diff --git a/templates/index.html b/templates/index.html
index 21231fe..bf9848c 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -2,9 +2,9 @@
videopdf
-
-
-
+
+
+
videopdf
diff --git a/templates/item.html b/templates/item.html
index 37c98a3..8238848 100644
--- a/templates/item.html
+++ b/templates/item.html
@@ -21,24 +21,25 @@ limitations under the License.
{{item.filename}}
-
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
diff --git a/videopdf/settings.py b/videopdf/settings.py
index 750e292..0f4edc6 100644
--- a/videopdf/settings.py
+++ b/videopdf/settings.py
@@ -69,6 +69,7 @@ STATIC_ROOT = join(PROJECT_ROOT, 'static')
# Example: "http://media.lawrence.com/static/"
STATIC_URL = '/static/'
+PREFIX=''
# Additional locations of static files
STATICFILES_DIRS = (
# Put strings here, like "/home/html/static" or "C:/www/django/static".