diff -r 31927f21970d -r 0b479d573a4c app/soc/templates/soc/home/public.html
--- a/app/soc/templates/soc/home/public.html Wed Nov 05 23:36:28 2008 +0000
+++ b/app/soc/templates/soc/home/public.html Wed Nov 05 23:38:00 2008 +0000
@@ -1,4 +1,4 @@
-{% extends "soc/home_settings/public.html" %}
+{% 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.
@@ -13,15 +13,50 @@
limitations under the License.
{% endcomment %}
+{% block scripts %}
+{% if home_settings.feed_url %}
+
+
+
+{% endif %}
+{% endblock %}
+
+{% block page_title %}
+{% if home_document %}
+{{ home_document.title }}
+{% else %}
+{{ page.long_name }}
+{% endif %}
+{% endblock %}
+
+{% block header_title %}
+{% if home_document %}
+{{ home_document.short_name }}
+{% else %}
+{{ page.short_name }}
+{% endif %}
+{% endblock %}
+
+{% block body %}
+ {% if home_document %}
+ {{ home_document.content|safe }}
+ Last updated on: {{ home_document.modified }}
+ {% else %}
{% block missing_doc %}
-The contents of this default Site home page can be changed by
-creating a new Document or
-editing an existing Document and then selecting
-that Document in the
-Site Settings interface.
-Other elements of this page, such as a feed to be displayed below this
-content, can also be set using the
-Site Settings interface.
-You need to sign in as site Developer in order to change
-Site Settings.
+This is the default home page can be edited via Settings.
{% endblock %}
+ {% endif %}
+ {% if home_settings.feed_url %}
+
+ {% endif %}
+{% endblock %}