changed these files to use blocktrans instead.

[osqa.git] / forum / skins / default / templates / base_content.html
diff --git a/forum/skins/default/templates/base_content.html b/forum/skins/default/templates/base_content.html

index ac6b9da3063755dc1a9db69f3ba209c2e9257032..4f0aa301524da663875aa67bf236c8f0ac814dfa 100644 (file)
--- a/forum/skins/default/templates/base_content.html
+++ b/forum/skins/default/templates/base_content.html
@@ -1,7 +1,6 @@
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <!-- base_content.html -->
-{% load i18n %}
-{% load extra_tags %}
+{% load i18n extra_tags extra_filters markup %}
  <html xmlns="http://www.w3.org/1999/xhtml">
      <head>
          <title>{% block fulltitle %}{% block title %}{% endblock %} - {{ settings.APP_SHORT_NAME }}{% endblock %}</title>
@@ -14,6 +13,9 @@
          {% endif %}
          <link rel="shortcut icon" href="{{ settings.APP_FAVICON }}" />
          <link href="{% media  "/media/style/style.css" %}" rel="stylesheet" type="text/css" />
+        {% if settings.USE_CUSTOM_CSS|or_preview:request %}
+        <link href="{% url custom_css %}" rel="stylesheet" type="text/css" />
+        {% endif %}
          {% block forestyle %}{% endblock %}
          <script src="http://www.google.com/jsapi" type="text/javascript"></script>
          <script type="text/javascript">google.load("jquery", "1.4.2");</script>
@@ -48,6 +50,9 @@
              });
          </script>
          {% endif %}
+        {% if settings.USE_CUSTOM_HEAD|or_preview:request %}
+            {{ settings.CUSTOM_HEAD|or_preview:request|safe }}
+        {% endif %}
          {% block forejs %}{% endblock %}
          <link rel="search" type="application/opensearchdescription+xml" href="{% url opensearch %}" title="{{ settings.APP_SHORT_NAME }} Search" />
      </head>
@@ -62,6 +67,11 @@
              {% endautoescape %}
              <a id="close-notify" onclick="notify.close(true)">&times;</a>
          </div>
+        {% if settings.USE_CUSTOM_HEADER|or_preview:request %}
+            <div id="custom_header">
+                {{ settings.CUSTOM_HEADER|or_preview:request|markdown:"settingsparser" }}    
+            </div>
+        {% endif %}
          {% include "header.html" %}
          {% block page_center %}
          <div id="wrapper">
@@ -79,7 +89,29 @@
              <div class="spacer3"></div>
          </div>
          {% endblock %}
-        {% include "footer.html" %}
+        {% if settings.USE_CUSTOM_FOOTER|or_preview:request %}
+            {% ifequal settings.CUSTOM_FOOTER_MODE|or_preview:request "above" %}
+                <div id="custom_footer">
+                    {{ settings.CUSTOM_FOOTER|or_preview:request|markdown:"settingsparser" }}
+                </div>
+            {% endifequal %}
+            <div id="ground">
+                {% ifequal settings.CUSTOM_FOOTER_MODE|or_preview:request "replace" %}
+                    {{ settings.CUSTOM_FOOTER|or_preview:request|markdown:"settingsparser" }}
+                {% else %}
+                    {% include "footer.html" %}
+                {% endifequal %}
+            </div>
+            {% ifequal settings.CUSTOM_FOOTER_MODE|or_preview:request "below" %}
+                <div id="custom_footer">
+                    {{ settings.CUSTOM_FOOTER|or_preview:request|markdown:"settingsparser" }}
+                </div>
+            {% endifequal %}
+        {% else %}
+            <div id="ground">
+                {% include "footer.html" %}
+            </div>
+        {% endif %}
          {% block endjs %}
          {% endblock %}
          {% if settings.GOOGLE_ANALYTICS_KEY %}