diff options
Diffstat (limited to 'templates/base.html')
| -rw-r--r-- | templates/base.html | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/templates/base.html b/templates/base.html index 2b933c4a..b4751be1 100644 --- a/templates/base.html +++ b/templates/base.html @@ -18,7 +18,12 @@ <script src="http://www.google.com/jsapi" type="text/javascript"></script> <script type="text/javascript">google.load("jquery", "1.2.6");</script> <script type="text/javascript"> +<<<<<<< HEAD:templates/base.html var i18nLang = '{{settings.LANGUAGE_CODE}}'; +======= + var i18nLang = '{{settings.LANGUAGE_CODE}}'; + var scriptUrl = '/{{settings.FORUM_SCRIPT_ALIAS}}' +>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/base.html </script> <script type='text/javascript' src='{% href "/content/js/com.cnprog.i18n.js" %}'></script> <script type='text/javascript' src='{% href "/content/js/jquery.i18n.js" %}'></script> @@ -74,7 +79,6 @@ {% endblock%} </div> - <div id="CARight"> {% block sidebar%} {% endblock%} |