From 527ab688a8608ded5fc854cf8641228181efa981 Mon Sep 17 00:00:00 2001 From: Ankita Date: Fri, 13 Jul 2012 12:31:27 +0530 Subject: this patch was added for metastudio by BITS Pilani team in 2012. --- demo/grappelli/static/grappelli/img/docs.png | Bin 0 -> 73312 bytes demo/grappelli/static/grappelli/img/imagenation.jpg | Bin 0 -> 38028 bytes demo/grappelli/static/grappelli/img/videos.jpg | Bin 0 -> 37399 bytes demo/settings.py | 12 +++++++++--- demo/urls.py | 1 + 5 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 demo/grappelli/static/grappelli/img/docs.png create mode 100644 demo/grappelli/static/grappelli/img/imagenation.jpg create mode 100644 demo/grappelli/static/grappelli/img/videos.jpg (limited to 'demo') diff --git a/demo/grappelli/static/grappelli/img/docs.png b/demo/grappelli/static/grappelli/img/docs.png new file mode 100644 index 00000000..f3aa2cb0 Binary files /dev/null and b/demo/grappelli/static/grappelli/img/docs.png differ diff --git a/demo/grappelli/static/grappelli/img/imagenation.jpg b/demo/grappelli/static/grappelli/img/imagenation.jpg new file mode 100644 index 00000000..d36ae44d Binary files /dev/null and b/demo/grappelli/static/grappelli/img/imagenation.jpg differ diff --git a/demo/grappelli/static/grappelli/img/videos.jpg b/demo/grappelli/static/grappelli/img/videos.jpg new file mode 100644 index 00000000..310298e6 Binary files /dev/null and b/demo/grappelli/static/grappelli/img/videos.jpg differ diff --git a/demo/settings.py b/demo/settings.py index 2935520b..e2b24e07 100644 --- a/demo/settings.py +++ b/demo/settings.py @@ -17,7 +17,7 @@ """This file has the settings for Gstudio Demo""" import os - +TIME_ZONE = None gettext = lambda s: s DEBUG = True @@ -31,10 +31,16 @@ DATABASES = {'default': STATIC_URL = '/static/' MEDIA_URL = '/static' +MEDIA_ROOT = os.path.join(os.path.dirname(__file__), '../demo/grappelli/static/grappelli/img') +MEDIA_ROOTNEW2 = os.path.join(os.path.dirname(__file__), '../demo/grappelli/static/grappelli/img') +MEDIA_ROOTNEW3 = os.path.join(os.path.dirname(__file__), '../gstudio/static/gstudio/documents') +MEDIA_ROOTNEW = os.path.join(os.path.dirname(__file__), '../media') #MEDIA_ROOT = '/static' -MEDIA_ROOT = os.path.join(os.path.dirname(__file__), '../gstudio/static') +#MEDIA_ROOT = os.path.join(os.path.dirname(__file__), '../gstudio/static') PYSCRIPT_URL_GSTUDIO = os.path.join(os.path.dirname(__file__), '../gstudio/createhtml.py') PYSCRIPT_URL_OBJECTAPP = os.path.join(os.path.dirname(__file__), '../objectapp/createhtml.py') +FILE_UPLOAD_MAX_MEMORY_SIZE= 524288000 +JPEG_ROOT = None GSTUDIO_UPLOAD_TO = 'img/' @@ -145,7 +151,7 @@ INSTALLED_APPS = ( # Uncomment the south entry to activate south for database migrations # Please do install south before uncommenting # command: sudo pip install south - # 'south', + #'south', ) diff --git a/demo/urls.py b/demo/urls.py index 9a16e61f..34291bf4 100644 --- a/demo/urls.py +++ b/demo/urls.py @@ -45,6 +45,7 @@ urlpatterns = patterns( url(r'^home/', home_view), url(r'^more/',more_view), url(r'^nodetypes/', include('gstudio.urls')), + url(r'^gstudio/', include('gstudio.urls')), url(r'^objects/', include('objectapp.urls')), url(r'^comments/', include('django.contrib.comments.urls')), -- cgit v1.2.3-70-g09d2