Moved soc/site/home.html to soc/site/home/public.html and updated default template for public() in home.py
authorPawel Solyga <Pawel.Solyga@gmail.com>
Tue, 19 Aug 2008 22:26:24 +0000
changeset 81 b03b1ec17727
parent 80 55542eddada5
child 82 1456e633bf8a
Moved soc/site/home.html to soc/site/home/public.html and updated default template for public() in home.py
app/soc/templates/soc/site/home.html
app/soc/templates/soc/site/home/public.html
app/soc/views/site/home.py
--- a/app/soc/templates/soc/site/home.html	Tue Aug 19 18:06:23 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-{% extends "soc/base.html" %}
-{% comment %}
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-{% endcomment %}
-
-{% block scripts %}
-    <script type="text/javascript" src="http://www.google.com/jsapi"></script>
-    <script type="text/javascript" src="/soc/content/js/blog.js"></script>
-    <script type="text/javascript">
-
-    google.load("feeds", "1");
-
-    function initialize() {
-      var blog = new BlogPreview(document.getElementById("blog"));
-      blog.show("http://google-opensource.blogspot.com/feeds/posts/default");
-    }
-    google.setOnLoadCallback(initialize);
-
-    </script>
-{% endblock %}
-
-{% block body %}
-	{{ block.super }}
-    <div id="blog"></div>
-{% endblock %}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/soc/templates/soc/site/home/public.html	Tue Aug 19 22:26:24 2008 +0000
@@ -0,0 +1,35 @@
+{% extends "soc/base.html" %}
+{% comment %}
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+{% endcomment %}
+
+{% block scripts %}
+    <script type="text/javascript" src="http://www.google.com/jsapi"></script>
+    <script type="text/javascript" src="/soc/content/js/blog.js"></script>
+    <script type="text/javascript">
+
+    google.load("feeds", "1");
+
+    function initialize() {
+      var blog = new BlogPreview(document.getElementById("blog"));
+      blog.show("http://google-opensource.blogspot.com/feeds/posts/default");
+    }
+    google.setOnLoadCallback(initialize);
+
+    </script>
+{% endblock %}
+
+{% block body %}
+	{{ block.super }}
+    <div id="blog"></div>
+{% endblock %}
\ No newline at end of file
--- a/app/soc/views/site/home.py	Tue Aug 19 18:06:23 2008 +0000
+++ b/app/soc/views/site/home.py	Tue Aug 19 22:26:24 2008 +0000
@@ -25,8 +25,9 @@
 from google.appengine.api import users
 from django import http
 from django import shortcuts
+from soc.views.helpers import response_helpers
 
-def public(request, template='soc/site/home.html'):
+def public(request, template='soc/site/home/public.html'):
   """Home site view of Melange.
 
   Args:
@@ -36,8 +37,5 @@
   Returns:
     A subclass of django.http.HttpResponse with generated template.
   """
-	
-  user = users.get_current_user()
-
-  return shortcuts.render_to_response(
-      template, dictionary={'template': template, 'user': user})
+  return response_helpers.respond(request,
+      template, {'template': template})