diff options
| author | supriya <supriya@dragbox.(none)> | 2012-09-26 15:49:52 +0530 |
|---|---|---|
| committer | supriya <supriya@dragbox.(none)> | 2012-09-26 15:49:52 +0530 |
| commit | 94535d4adc3a4960795d22e3b229a8375de10b74 (patch) | |
| tree | 8d77de86b443495d67360dcd40786f2b8208d334 /demo | |
| parent | cad11e2f7ed848cdfd7779451bb0f4f931e062c3 (diff) | |
| download | gnowsys-94535d4adc3a4960795d22e3b229a8375de10b74.tar.gz | |
all modules integrated
Diffstat (limited to 'demo')
| -rw-r--r-- | demo/dashboard.py | 16 | ||||
| -rw-r--r-- | demo/grappelli/templates/admin/includes_grappelli/header.html | 2 | ||||
| -rw-r--r-- | demo/settings.py | 13 |
3 files changed, 18 insertions, 13 deletions
diff --git a/demo/dashboard.py b/demo/dashboard.py index 3e4c726..8996cb6 100644 --- a/demo/dashboard.py +++ b/demo/dashboard.py @@ -96,10 +96,12 @@ class CustomIndexDashboard(Dashboard): column=1, collapsible=False, models=( - 'gstudio.models.Objecttype', - 'gstudio.models.Attributetype', - 'gstudio.models.Relationtype', 'objectapp.models.Gbobject', + 'objectapp.models.System', + 'gstudio.models.Relation', + 'gstudio.models.Attribute', + + ), ), @@ -111,10 +113,10 @@ class CustomIndexDashboard(Dashboard): column=1, collapsible=True, models=( - + 'gstudio.models.Objecttype', + 'gstudio.models.Attributetype', + 'gstudio.models.Relationtype', 'gstudio.models.Metatype', - 'gstudio.models.Relation', - 'gstudio.models.Attribute', 'gstudio.models.Systemtype', 'gstudio.models.Processtype', 'gstudio.models.AttributeSpecification', @@ -135,7 +137,7 @@ class CustomIndexDashboard(Dashboard): collapsible=True, models=( 'objectapp.models.Process', - 'objectapp.models.System', + ), ), diff --git a/demo/grappelli/templates/admin/includes_grappelli/header.html b/demo/grappelli/templates/admin/includes_grappelli/header.html index fa79f9d..f1d4eff 100644 --- a/demo/grappelli/templates/admin/includes_grappelli/header.html +++ b/demo/grappelli/templates/admin/includes_grappelli/header.html @@ -38,7 +38,7 @@ <!-- Documentation --> {% url django-admindocs-docroot as docsroot %} {% if docsroot %} - <li><a href="{{ docsroot }}">{% trans 'Documentation' %}</a></li> + <!-- <li><a href="{{ docsroot }}">{% trans 'Documentation' %}</a></li>--> {% endif %} {% endblock %} </ul> diff --git a/demo/settings.py b/demo/settings.py index b64e64d..10ed306 100644 --- a/demo/settings.py +++ b/demo/settings.py @@ -29,6 +29,8 @@ DATABASES = {'default': } STATIC_URL = '/static/' +RECAPTCHA_PUBLIC_KEY = '6LcBr9USAAAAAJNHxpA5_2nQK9JnKQCU3kTUstEK' +RECAPTCHA_PRIVATE_KEY = '6LcBr9USAAAAABYW6VgsQeupDHy2R42G4aGsHxXr' MEDIA_URL = '/static' MEDIA_ROOT = os.path.join(os.path.dirname(__file__), '../demo/grappelli/static/grappelli/img') @@ -40,6 +42,7 @@ MEDIA_ROOTNEW = os.path.join(os.path.dirname(__file__), '../demo/media') 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') VIDEO_PANDORA_URL = os.getenv("HOME")+"/.ox/client.json" +FILE_URL = os.path.join(os.path.dirname(__file__), '/tmp/beta/') FILE_UPLOAD_MAX_MEMORY_SIZE= 524288000 JPEG_ROOT = None @@ -57,7 +60,7 @@ SITE_ID = 1 LANGUAGE_CODE = 'en' -GRAPPELLI_ADMIN_TITLE = '<a href="/nodetypes/" title="Gnowledge Studio">Gnowledge Studio</a>' +GRAPPELLI_ADMIN_TITLE = '<a href="/" title="Gnowledge Studio">Gnowledge Studio</a>' GRAPPELLI_INDEX_DASHBOARD = "demo.dashboard.CustomIndexDashboard" @@ -158,10 +161,10 @@ INSTALLED_APPS = ( ) -if DEBUG: - EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend' +#if DEBUG: +# EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend' -from gstudio.xmlrpc import GSTUDIO_XMLRPC_METHODS -XMLRPC_METHODS = GSTUDIO_XMLRPC_METHODS +#from gstudio.xmlrpc import GSTUDIO_XMLRPC_METHODS +#XMLRPC_METHODS = GSTUDIO_XMLRPC_METHODS |