diff options
| author | Ankita <ankita@ankita-Inspiron-N5010.(none)> | 2012-07-13 12:31:27 +0530 |
|---|---|---|
| committer | Ankita <ankita@ankita-Inspiron-N5010.(none)> | 2012-07-13 12:31:27 +0530 |
| commit | 527ab688a8608ded5fc854cf8641228181efa981 (patch) | |
| tree | 825f17422ce610922f8f34854c5e54db7a7f35ad /demo | |
| parent | ef3793b349be5744d6ef98a034f0c009159ed85b (diff) | |
| download | gnowsys-527ab688a8608ded5fc854cf8641228181efa981.tar.gz | |
this patch was added for metastudio by BITS Pilani team in 2012.
Diffstat (limited to 'demo')
| -rw-r--r-- | demo/grappelli/static/grappelli/img/docs.png | bin | 0 -> 73312 bytes | |||
| -rw-r--r-- | demo/grappelli/static/grappelli/img/imagenation.jpg | bin | 0 -> 38028 bytes | |||
| -rw-r--r-- | demo/grappelli/static/grappelli/img/videos.jpg | bin | 0 -> 37399 bytes | |||
| -rw-r--r-- | demo/settings.py | 12 | ||||
| -rw-r--r-- | demo/urls.py | 1 |
5 files changed, 10 insertions, 3 deletions
diff --git a/demo/grappelli/static/grappelli/img/docs.png b/demo/grappelli/static/grappelli/img/docs.png Binary files differnew file mode 100644 index 0000000..f3aa2cb --- /dev/null +++ b/demo/grappelli/static/grappelli/img/docs.png diff --git a/demo/grappelli/static/grappelli/img/imagenation.jpg b/demo/grappelli/static/grappelli/img/imagenation.jpg Binary files differnew file mode 100644 index 0000000..d36ae44 --- /dev/null +++ b/demo/grappelli/static/grappelli/img/imagenation.jpg diff --git a/demo/grappelli/static/grappelli/img/videos.jpg b/demo/grappelli/static/grappelli/img/videos.jpg Binary files differnew file mode 100644 index 0000000..310298e --- /dev/null +++ b/demo/grappelli/static/grappelli/img/videos.jpg diff --git a/demo/settings.py b/demo/settings.py index 2935520..e2b24e0 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 9a16e61..34291bf 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')), |