summaryrefslogtreecommitdiff
path: root/demo
diff options
context:
space:
mode:
authorDhiru <dhiru@labadmin-P5E-Deluxe.(none)>2012-06-16 18:38:21 +0530
committerDhiru <dhiru@labadmin-P5E-Deluxe.(none)>2012-06-16 18:38:21 +0530
commit6d7c90142f6cd3f08e0ee28216392c421711a209 (patch)
tree8f09a817c710358a680908fd3c0e9abb643974bc /demo
parentc09d5d8fc986e4df80e617d298ae3ecef00860fa (diff)
downloadgnowsys-6d7c90142f6cd3f08e0ee28216392c421711a209.tar.gz
cleaned up the interface, search and rss feeds in the header, home page, third column removed, versions as a series of '+' marks below the title.
Diffstat (limited to 'demo')
-rw-r--r--demo/settings.py2
-rw-r--r--demo/urls.py6
-rw-r--r--demo/views.py16
3 files changed, 20 insertions, 4 deletions
diff --git a/demo/settings.py b/demo/settings.py
index 545381d1..1c7e776d 100644
--- a/demo/settings.py
+++ b/demo/settings.py
@@ -97,7 +97,7 @@ SITE_ID = 1
LANGUAGE_CODE = 'en'
-GRAPPELLI_ADMIN_TITLE = '<a href="/">Gnowledge Studio</a>'
+GRAPPELLI_ADMIN_TITLE = '<a href="/nodetypes/" title="Gnowledge Studio">Gnowledge Studio</a>'
GRAPPELLI_INDEX_DASHBOARD = "demo.dashboard.CustomIndexDashboard"
diff --git a/demo/urls.py b/demo/urls.py
index 552e06ca..f36152ae 100644
--- a/demo/urls.py
+++ b/demo/urls.py
@@ -78,7 +78,7 @@ from objectapp.sitemaps import GbobjectSitemap
# import gstudio.regbackend
from gstudio.forms import *
from registration.views import register
-
+from views import home_view, more_view
admin.autodiscover()
@@ -88,7 +88,9 @@ handler404 = 'django.views.defaults.page_not_found'
urlpatterns = patterns(
'',
(r'^$', 'django.views.generic.simple.redirect_to',
- {'url': '/nodetypes/'}),
+ {'url': '/home/'}),
+ url(r'^home/', home_view),
+ url(r'^more/',more_view),
url(r'^nodetypes/', include('gstudio.urls')),
url(r'^objects/', include('objectapp.urls')),
url(r'^comments/', include('django.contrib.comments.urls')),
diff --git a/demo/views.py b/demo/views.py
index bf23bda6..2476a3a4 100644
--- a/demo/views.py
+++ b/demo/views.py
@@ -50,7 +50,10 @@ from django.conf import settings
from django.template import loader
from django.template import Context
from django.http import HttpResponseServerError
-
+from django.shortcuts import render_to_response, get_object_or_404
+from django.contrib.auth.models import User
+from django.contrib.sites.models import Site
+from gstudio.models import Nodetype
def server_error(request, template_name='500.html'):
"""
@@ -63,3 +66,14 @@ def server_error(request, template_name='500.html'):
t = loader.get_template(template_name)
return HttpResponseServerError(
t.render(Context({'STATIC_URL': settings.STATIC_URL})))
+
+def __init__(self):
+ self.site = Site.objects.get_current()
+
+def home_view(request):
+ site = Site.objects.get_current()
+ return render_to_response('gstudio/home.html', {'user':request.user,'data':request.POST , 'site':site})
+
+def more_view(request):
+ return render_to_response('gstudio/more.html', {'user':request.user,'data':request.POST })
+