Merging jambazov --> trunk.

[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 b0ee37dc68f44db0ab820e51c25af1995c6ddb41..2281f0e6e3cc36ec8f17ad30b22ff405f88cf123 100644 (file)
--- a/forum/skins/default/templates/base_content.html
+++ b/forum/skins/default/templates/base_content.html
@@ -22,7 +22,7 @@
         <script type="text/javascript">
         /* <![CDATA[ */
             var i18nLang = '{{settings.LANGUAGE_CODE}}';
         <script type="text/javascript">
         /* <![CDATA[ */
             var i18nLang = '{{settings.LANGUAGE_CODE}}';

-            var scriptUrl = '/{{settings.FORUM_SCRIPT_ALIAS}}'
+            var scriptUrl = '{{settings.FORCE_SCRIPT_NAME}}/'

             var osqaSkin = '{{settings.OSQA_SKIN}}';
 
             var messages = {
             var osqaSkin = '{{settings.OSQA_SKIN}}';
 
             var messages = {


@@ -75,7 +75,7 @@
         </div>
         {% if settings.USE_CUSTOM_HEADER|or_preview:request %}
             <div id="custom_header">
         </div>
         {% if settings.USE_CUSTOM_HEADER|or_preview:request %}
             <div id="custom_header">

-                {{ settings.CUSTOM_HEADER|or_preview:request|safe }}
+                {{ settings.CUSTOM_HEADER|or_preview:request|static_content:settings.CUSTOM_HEADER_RENDER_MODE }}

             </div>
         {% endif %}
         {% include "header.html" %}
             </div>
         {% endif %}
         {% include "header.html" %}


@@ -98,19 +98,19 @@
         {% if settings.USE_CUSTOM_FOOTER|or_preview:request %}
             {% ifequal settings.CUSTOM_FOOTER_MODE|or_preview:request "above" %}
                 <div id="custom_footer">
         {% 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|safe }}
+                    {{ settings.CUSTOM_FOOTER|or_preview:request|static_content:settings.CUSTOM_FOOTER_RENDER_MODE }}

                 </div>
             {% endifequal %}
             <div id="ground">
                 {% ifequal settings.CUSTOM_FOOTER_MODE|or_preview:request "replace" %}
                 </div>
             {% endifequal %}
             <div id="ground">
                 {% ifequal settings.CUSTOM_FOOTER_MODE|or_preview:request "replace" %}

-                    {{ settings.CUSTOM_FOOTER|or_preview:request|safe }}
+                    {{ settings.CUSTOM_FOOTER|or_preview:request|static_content:settings.CUSTOM_FOOTER_RENDER_MODE }}

                 {% else %}
                     {% include "footer.html" %}
                 {% endifequal %}
             </div>
             {% ifequal settings.CUSTOM_FOOTER_MODE|or_preview:request "below" %}
                 <div id="custom_footer">
                 {% 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|safe }}
+                    {{ settings.CUSTOM_FOOTER|or_preview:request|static_content:settings.CUSTOM_FOOTER_RENDER_MODE }}

                 </div>
             {% endifequal %}
         {% else %}
                 </div>
             {% endifequal %}
         {% else %}